From 5611c8c0da8927cd4831a9dd23a022a2d9bcfa18 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 30 May 2026 21:44:25 +0100
Subject: [PATCH 01/72] Maintenance: Started work on PHPStan Level 5

---
 app/Access/ExternalBaseUserProvider.php        | 2 +-
 app/Access/Guards/ExternalBaseSessionGuard.php | 8 ++++++--
 app/Access/Guards/LdapSessionGuard.php         | 4 ++++
 app/Access/Oidc/OidcJwtWithClaims.php          | 2 --
 app/Activity/Models/Comment.php                | 8 +++++++-
 app/Api/ApiDocsGenerator.php                   | 4 ++--
 app/App/Providers/ThemeServiceProvider.php     | 7 ++++++-
 app/App/helpers.php                            | 3 ++-
 app/Entities/Models/Entity.php                 | 2 +-
 app/Entities/Queries/QueryPopular.php          | 2 ++
 app/Entities/Queries/QueryRecentlyViewed.php   | 2 ++
 app/Entities/Queries/QueryTopFavourites.php    | 2 ++
 app/Http/Controller.php                        | 3 ++-
 app/Util/DatabaseTransaction.php               | 3 ++-
 phpstan.neon.dist                              | 2 +-
 15 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/app/Access/ExternalBaseUserProvider.php b/app/Access/ExternalBaseUserProvider.php
index 2165fd459..2bc15cb03 100644
--- a/app/Access/ExternalBaseUserProvider.php
+++ b/app/Access/ExternalBaseUserProvider.php
@@ -42,7 +42,7 @@ class ExternalBaseUserProvider implements UserProvider
     /**
      * Retrieve a user by the given credentials.
      */
-    public function retrieveByCredentials(array $credentials): ?Authenticatable
+    public function retrieveByCredentials(array $credentials): ?User
     {
         return User::query()
             ->where('external_auth_id', $credentials['external_auth_id'])
diff --git a/app/Access/Guards/ExternalBaseSessionGuard.php b/app/Access/Guards/ExternalBaseSessionGuard.php
index 91239599b..b7bf174a1 100644
--- a/app/Access/Guards/ExternalBaseSessionGuard.php
+++ b/app/Access/Guards/ExternalBaseSessionGuard.php
@@ -50,8 +50,12 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * Create a new authentication guard.
      */
-    public function __construct(string $name, UserProvider $provider, Session $session, RegistrationService $registrationService)
-    {
+    public function __construct(
+        string $name,
+        UserProvider $provider,
+        Session $session,
+        RegistrationService $registrationService
+    ) {
         $this->name = $name;
         $this->session = $session;
         $this->provider = $provider;
diff --git a/app/Access/Guards/LdapSessionGuard.php b/app/Access/Guards/LdapSessionGuard.php
index 9455d530d..f3628c897 100644
--- a/app/Access/Guards/LdapSessionGuard.php
+++ b/app/Access/Guards/LdapSessionGuard.php
@@ -83,6 +83,10 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
             }
         }
 
+        if (!($user instanceof User)) {
+            throw new LoginAttemptException('Could not find or create a user for LDAP login.');
+        }
+
         // Sync LDAP groups if required
         if ($this->ldapService->shouldSyncGroups()) {
             $this->ldapService->syncGroups($user, $username);
diff --git a/app/Access/Oidc/OidcJwtWithClaims.php b/app/Access/Oidc/OidcJwtWithClaims.php
index 9d7eeead1..9763ab158 100644
--- a/app/Access/Oidc/OidcJwtWithClaims.php
+++ b/app/Access/Oidc/OidcJwtWithClaims.php
@@ -131,8 +131,6 @@ class OidcJwtWithClaims implements ProvidesClaims
             }
         }, $this->keys);
 
-        $parsedKeys = array_filter($parsedKeys);
-
         $contentToSign = $this->tokenParts[0] . '.' . $this->tokenParts[1];
         /** @var OidcJwtSigningKey $parsedKey */
         foreach ($parsedKeys as $parsedKey) {
diff --git a/app/Activity/Models/Comment.php b/app/Activity/Models/Comment.php
index 3faa76657..b49eb4564 100644
--- a/app/Activity/Models/Comment.php
+++ b/app/Activity/Models/Comment.php
@@ -3,6 +3,7 @@
 namespace BookStack\Activity\Models;
 
 use BookStack\App\Model;
+use BookStack\Entities\Models\Page;
 use BookStack\Permissions\Models\JointPermission;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\HasCreatorAndUpdater;
@@ -40,6 +41,9 @@ class Comment extends Model implements Loggable, OwnableInterface
 
     /**
      * Get the entity that this comment belongs to.
+     * It's only pages right now hence the typing below.
+     * Would need a deeper audit if that changes as many areas assume this is always a page.
+     * @return MorphTo<Page, $this>
      */
     public function entity(): MorphTo
     {
@@ -55,7 +59,9 @@ class Comment extends Model implements Loggable, OwnableInterface
 
         // Ultimately, we could just align the method name to 'commentable' but that would be a potential
         // breaking change and not really worthwhile in a patch due to the risk of creating extra problems.
-        return $this->morphTo(null, 'commentable_type', 'commentable_id');
+        /** @var MorphTo<Page, $this> $relation */
+        $relation = $this->morphTo(null, 'commentable_type', 'commentable_id');
+        return $relation;
     }
 
     /**
diff --git a/app/Api/ApiDocsGenerator.php b/app/Api/ApiDocsGenerator.php
index 53cb2890a..8d1be79c8 100644
--- a/app/Api/ApiDocsGenerator.php
+++ b/app/Api/ApiDocsGenerator.php
@@ -138,8 +138,8 @@ class ApiDocsGenerator
             return $validation;
         }
 
-        if (is_object($validation) && method_exists($validation, '__toString')) {
-            return strval($validation);
+        if (is_object($validation) && $validation instanceof \Stringable) {
+            return $validation->__toString();
         }
 
         if ($validation instanceof Password) {
diff --git a/app/App/Providers/ThemeServiceProvider.php b/app/App/Providers/ThemeServiceProvider.php
index 671e5e1df..9b0f7001e 100644
--- a/app/App/Providers/ThemeServiceProvider.php
+++ b/app/App/Providers/ThemeServiceProvider.php
@@ -7,6 +7,7 @@ use BookStack\Theming\ThemeService;
 use BookStack\Theming\ThemeViews;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\View\FileViewFinder;
 
 class ThemeServiceProvider extends ServiceProvider
 {
@@ -27,7 +28,11 @@ class ThemeServiceProvider extends ServiceProvider
         // Boot up the theme system
         $themeService = $this->app->make(ThemeService::class);
         $viewFactory = $this->app->make('view');
-        $themeViews = new ThemeViews($viewFactory->getFinder());
+        $viewFinder = $viewFactory->getFinder();
+        if (!($viewFinder instanceof FileViewFinder)) {
+            throw new \Exception('Only the file view finder is supported for the theme system');
+        }
+        $themeViews = new ThemeViews($viewFinder);
 
         // Use a custom include so that we can insert theme views before/after includes.
         // This is done, even if no theme is active, so that view caching does not create problems
diff --git a/app/App/helpers.php b/app/App/helpers.php
index 8f210ecaf..45a84da8d 100644
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -6,6 +6,7 @@ use BookStack\Facades\Theme;
 use BookStack\Permissions\Permission;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Settings\SettingService;
+use BookStack\Users\Models\OwnableInterface;
 use BookStack\Users\Models\User;
 
 /**
@@ -40,7 +41,7 @@ function user(): User
  * Check if the current user has a permission. If an ownable element
  * is passed in the jointPermissions are checked against that particular item.
  */
-function userCan(string|Permission $permission, ?Model $ownable = null): bool
+function userCan(string|Permission $permission, (Model&OwnableInterface)|null $ownable = null): bool
 {
     if (is_null($ownable)) {
         return user()->can($permission);
diff --git a/app/Entities/Models/Entity.php b/app/Entities/Models/Entity.php
index 27cfccaa8..296bd3a66 100644
--- a/app/Entities/Models/Entity.php
+++ b/app/Entities/Models/Entity.php
@@ -46,7 +46,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int|null   $created_by
  * @property int|null   $updated_by
  * @property int|null   $owned_by
- * @property Collection $tags
+ * @property Collection<int, Tag> $tags
  *
  * @method static Entity|Builder visible()
  * @method static Builder withLastView()
diff --git a/app/Entities/Queries/QueryPopular.php b/app/Entities/Queries/QueryPopular.php
index 065ae82ef..1782070de 100644
--- a/app/Entities/Queries/QueryPopular.php
+++ b/app/Entities/Queries/QueryPopular.php
@@ -6,6 +6,7 @@ use BookStack\Activity\Models\View;
 use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Tools\MixedEntityListLoader;
 use BookStack\Permissions\PermissionApplicator;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
@@ -20,6 +21,7 @@ class QueryPopular
 
     public function run(int $count, int $page, array $filterModels): Collection
     {
+        /** @var Builder<View> $query */
         $query = $this->permissions
             ->restrictEntityRelationQuery(View::query(), 'views', 'viewable_id', 'viewable_type')
             ->select('*', 'viewable_id', 'viewable_type', DB::raw('SUM(views) as view_count'))
diff --git a/app/Entities/Queries/QueryRecentlyViewed.php b/app/Entities/Queries/QueryRecentlyViewed.php
index f28b8f865..8ba1a57ba 100644
--- a/app/Entities/Queries/QueryRecentlyViewed.php
+++ b/app/Entities/Queries/QueryRecentlyViewed.php
@@ -5,6 +5,7 @@ namespace BookStack\Entities\Queries;
 use BookStack\Activity\Models\View;
 use BookStack\Entities\Tools\MixedEntityListLoader;
 use BookStack\Permissions\PermissionApplicator;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 
 class QueryRecentlyViewed
@@ -22,6 +23,7 @@ class QueryRecentlyViewed
             return collect();
         }
 
+        /** @var Builder<View> $query */
         $query = $this->permissions->restrictEntityRelationQuery(
             View::query(),
             'views',
diff --git a/app/Entities/Queries/QueryTopFavourites.php b/app/Entities/Queries/QueryTopFavourites.php
index 6340e35ef..2719e94bc 100644
--- a/app/Entities/Queries/QueryTopFavourites.php
+++ b/app/Entities/Queries/QueryTopFavourites.php
@@ -5,6 +5,7 @@ namespace BookStack\Entities\Queries;
 use BookStack\Activity\Models\Favourite;
 use BookStack\Entities\Tools\MixedEntityListLoader;
 use BookStack\Permissions\PermissionApplicator;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
 
 class QueryTopFavourites
@@ -22,6 +23,7 @@ class QueryTopFavourites
             return collect();
         }
 
+        /** @var Builder<Favourite> $query */
         $query = $this->permissions
             ->restrictEntityRelationQuery(Favourite::query(), 'favourites', 'favouritable_id', 'favouritable_type')
             ->select('favourites.*')
diff --git a/app/Http/Controller.php b/app/Http/Controller.php
index 796505795..09c38ee61 100644
--- a/app/Http/Controller.php
+++ b/app/Http/Controller.php
@@ -7,6 +7,7 @@ use BookStack\App\Model;
 use BookStack\Exceptions\NotifyException;
 use BookStack\Facades\Activity;
 use BookStack\Permissions\Permission;
+use BookStack\Users\Models\OwnableInterface;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Http\JsonResponse;
@@ -80,7 +81,7 @@ abstract class Controller extends BaseController
     /**
      * Check the current user's permissions against an ownable item otherwise throw an exception.
      */
-    protected function checkOwnablePermission(string|Permission $permission, Model $ownable, string $redirectLocation = '/'): void
+    protected function checkOwnablePermission(string|Permission $permission, Model&OwnableInterface $ownable, string $redirectLocation = '/'): void
     {
         if (!userCan($permission, $ownable)) {
             $this->showPermissionError($redirectLocation);
diff --git a/app/Util/DatabaseTransaction.php b/app/Util/DatabaseTransaction.php
index e36bd2ef3..2e57b6479 100644
--- a/app/Util/DatabaseTransaction.php
+++ b/app/Util/DatabaseTransaction.php
@@ -3,6 +3,7 @@
 namespace BookStack\Util;
 
 use Closure;
+use Illuminate\Database\Connection;
 use Illuminate\Support\Facades\DB;
 use Throwable;
 
@@ -24,7 +25,7 @@ use Throwable;
 class DatabaseTransaction
 {
     /**
-     * @param  (Closure(static): TReturn)  $callback
+     * @param  (Closure(Connection): TReturn)  $callback
      */
     public function __construct(
         protected Closure $callback
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index bab28ea0e..54403adfe 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -7,7 +7,7 @@ parameters:
         - app
 
     # The level 8 is the highest level
-    level: 4
+    level: 5
 
     phpVersion:
         min: 80200

From 03c9ddd14fed16177ebe59adaef36fd6eb5bded4 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 31 May 2026 11:12:23 +0100
Subject: [PATCH 02/72] Maintenance: Further PHPStan level 5 type fixes

---
 app/Access/Oidc/OidcService.php               |  1 +
 app/Activity/ActivityQueries.php              |  3 ++
 app/Activity/Tools/WebhookFormatter.php       |  8 +++-
 .../Controllers/PageApiController.php         | 20 ++++++----
 app/Entities/Controllers/PageController.php   |  5 ++-
 .../Controllers/PageRevisionController.php    |  2 +-
 .../Tools/Markdown/CustomListItemRenderer.php |  6 ++-
 app/Entities/Tools/PageContent.php            | 37 +++++++++++++------
 app/Entities/Tools/PageIncludeParser.php      |  4 +-
 app/Entities/Tools/SlugGenerator.php          |  2 +-
 10 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index a84bd3205..19120e2d3 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -80,6 +80,7 @@ class OidcService
         $provider->setPkceCode($pkceCode);
 
         // Try to exchange authorization code for access token
+        /** @var OidcAccessToken $accessToken */
         $accessToken = $provider->getAccessToken('authorization_code', [
             'code' => $authorizationCode,
         ]);
diff --git a/app/Activity/ActivityQueries.php b/app/Activity/ActivityQueries.php
index d5b047937..a3383e809 100644
--- a/app/Activity/ActivityQueries.php
+++ b/app/Activity/ActivityQueries.php
@@ -11,6 +11,7 @@ use BookStack\Entities\Tools\MixedEntityListLoader;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\Relation;
 
@@ -27,6 +28,7 @@ class ActivityQueries
      */
     public function latest(int $count = 20, int $page = 0): array
     {
+        /** @var Collection<int, Activity> $activityList */
         $activityList = $this->permissions
             ->restrictEntityRelationQuery(Activity::query(), 'activities', 'loggable_id', 'loggable_type')
             ->orderBy('created_at', 'desc')
@@ -83,6 +85,7 @@ class ActivityQueries
      */
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {
+        /** @var Collection<int, Activity> $activityList */
         $activityList = $this->permissions
             ->restrictEntityRelationQuery(Activity::query(), 'activities', 'loggable_id', 'loggable_type')
             ->orderBy('created_at', 'desc')
diff --git a/app/Activity/Tools/WebhookFormatter.php b/app/Activity/Tools/WebhookFormatter.php
index cb4e9cb0a..111efd5d4 100644
--- a/app/Activity/Tools/WebhookFormatter.php
+++ b/app/Activity/Tools/WebhookFormatter.php
@@ -73,13 +73,17 @@ class WebhookFormatter
         // Load entity owner, creator, updater details
         $this->addModelFormatter(
             fn ($event, $model) => ($model instanceof Entity),
-            fn ($model) => $model->load(['ownedBy', 'createdBy', 'updatedBy'])
+            function ($model) {
+                $model->load(['ownedBy', 'createdBy', 'updatedBy']);
+            }
         );
 
         // Load revision detail for page update and create events
         $this->addModelFormatter(
             fn ($event, $model) => ($model instanceof Page && ($event === ActivityType::PAGE_CREATE || $event === ActivityType::PAGE_UPDATE)),
-            fn ($model) => $model->load('currentRevision')
+            function ($model) {
+                $model->load('currentRevision');
+            }
         );
     }
 
diff --git a/app/Entities/Controllers/PageApiController.php b/app/Entities/Controllers/PageApiController.php
index 38042e670..ca8989f07 100644
--- a/app/Entities/Controllers/PageApiController.php
+++ b/app/Entities/Controllers/PageApiController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Activity\Tools\CommentTree;
@@ -10,7 +12,9 @@ use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\ApiController;
 use BookStack\Permissions\Permission;
 use Exception;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class PageApiController extends ApiController
 {
@@ -45,7 +49,7 @@ class PageApiController extends ApiController
     /**
      * Get a listing of pages visible to the user.
      */
-    public function list()
+    public function list(): JsonResponse
     {
         $pages = $this->queries->visibleForList()
             ->addSelect(['created_by', 'updated_by', 'revision_count', 'editor']);
@@ -69,7 +73,7 @@ class PageApiController extends ApiController
      * Any images included via base64 data URIs will be extracted and saved as gallery
      * images against the page during upload.
      */
-    public function create(Request $request)
+    public function create(Request $request): JsonResponse
     {
         $this->validate($request, $this->rules['create']);
 
@@ -102,9 +106,9 @@ class PageApiController extends ApiController
      * Comments for the page are provided in a tree-structure representing the hierarchy of top-level
      * comments and replies, for both archived and active comments.
      */
-    public function read(string $id)
+    public function read(string $id): JsonResponse
     {
-        $page = $this->queries->findVisibleByIdOrFail($id);
+        $page = $this->queries->findVisibleByIdOrFail(intval($id));
 
         $page = $page->forJsonDisplay();
         $commentTree = (new CommentTree($page));
@@ -124,11 +128,11 @@ class PageApiController extends ApiController
      * Providing a 'book_id' or 'chapter_id' property will essentially move
      * the page into that parent element if you have permissions to do so.
      */
-    public function update(Request $request, string $id)
+    public function update(Request $request, string $id): JsonResponse
     {
         $requestData = $this->validate($request, $this->rules['update']);
 
-        $page = $this->queries->findVisibleByIdOrFail($id);
+        $page = $this->queries->findVisibleByIdOrFail(intval($id));
         $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         $parent = null;
@@ -161,9 +165,9 @@ class PageApiController extends ApiController
      * Delete a page.
      * This will typically send the page to the recycle bin.
      */
-    public function delete(string $id)
+    public function delete(string $id): Response
     {
-        $page = $this->queries->findVisibleByIdOrFail($id);
+        $page = $this->queries->findVisibleByIdOrFail(intval($id));
         $this->checkOwnablePermission(Permission::PageDelete, $page);
 
         $this->pageRepo->destroy($page);
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index 82edfbc27..dd655e7ab 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -25,6 +25,7 @@ use BookStack\Util\HtmlContentFilter;
 use BookStack\Util\HtmlContentFilterConfig;
 use Exception;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
@@ -358,8 +359,8 @@ class PageController extends Controller
      */
     public function showRecentlyUpdated()
     {
-        $visibleBelongsScope = function (BelongsTo $query) {
-            $query->scopes('visible');
+        $visibleBelongsScope = function (Relation $relation): void {
+            $relation->scopes('visible');
         };
 
         $pages = $this->queries->visibleForList()
diff --git a/app/Entities/Controllers/PageRevisionController.php b/app/Entities/Controllers/PageRevisionController.php
index cc6b79bfe..801aeed3e 100644
--- a/app/Entities/Controllers/PageRevisionController.php
+++ b/app/Entities/Controllers/PageRevisionController.php
@@ -177,7 +177,7 @@ class PageRevisionController extends Controller
      */
     public function destroyUserDraft(string $pageId)
     {
-        $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
+        $page = $this->pageQueries->findVisibleByIdOrFail(intval($pageId));
         $this->revisionRepo->deleteDraftsForCurrentUser($page);
 
         return response('', 200);
diff --git a/app/Entities/Tools/Markdown/CustomListItemRenderer.php b/app/Entities/Tools/Markdown/CustomListItemRenderer.php
index 0c506d7f9..14cdaa2ea 100644
--- a/app/Entities/Tools/Markdown/CustomListItemRenderer.php
+++ b/app/Entities/Tools/Markdown/CustomListItemRenderer.php
@@ -25,9 +25,13 @@ class CustomListItemRenderer implements NodeRendererInterface
      */
     public function render(Node $node, ChildNodeRendererInterface $childRenderer)
     {
+        if (!($node instanceof ListItem)) {
+            return null;
+        }
+
         $listItem = $this->baseRenderer->render($node, $childRenderer);
 
-        if ($node instanceof ListItem && $this->startsTaskListItem($node) && $listItem instanceof HtmlElement) {
+        if ($this->startsTaskListItem($node) && $listItem instanceof HtmlElement) {
             $listItem->setAttribute('class', 'task-list-item');
         }
 
diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.php
index 9fb4596f5..c66dcbe41 100644
--- a/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@ -421,28 +421,41 @@ class PageContent
      */
     protected function headerNodesToLevelList(DOMNodeList $nodeList): array
     {
-        $tree = collect($nodeList)->map(function (DOMElement $header) {
+        $minLevel = 6;
+
+        $headerDetails = array_map(function (DOMNode $header) use (&$minLevel) {
+            if (!$header instanceof DOMElement) {
+                return null;
+            }
+
             $text = trim(str_replace("\xc2\xa0", ' ', $header->nodeValue));
             $text = mb_substr($text, 0, 100);
 
+            if (empty($text)) {
+                return null;
+            }
+
+            $level = intval(str_replace('h', '', $header->nodeName));
+            if ($level < $minLevel) {
+                $minLevel = $level;
+            }
+
             return [
                 'nodeName' => strtolower($header->nodeName),
-                'level'    => intval(str_replace('h', '', $header->nodeName)),
+                'level'    => $level,
                 'link'     => '#' . $header->getAttribute('id'),
                 'text'     => $text,
             ];
-        })->filter(function ($header) {
-            return mb_strlen($header['text']) > 0;
-        });
+        }, [...$nodeList]);
+
+        $filtered = array_values(array_filter($headerDetails));
 
         // Shift headers if only smaller headers have been used
-        $levelChange = ($tree->pluck('level')->min() - 1);
-        $tree = $tree->map(function ($header) use ($levelChange) {
-            $header['level'] -= ($levelChange);
+        $levelChange = ($minLevel - 1);
+        foreach ($filtered as $index => $header) {
+            $filtered[$index]['level'] -= $levelChange;
+        }
 
-            return $header;
-        });
-
-        return $tree->toArray();
+        return $filtered;
     }
 }
diff --git a/app/Entities/Tools/PageIncludeParser.php b/app/Entities/Tools/PageIncludeParser.php
index af7ed4fc6..16917f41c 100644
--- a/app/Entities/Tools/PageIncludeParser.php
+++ b/app/Entities/Tools/PageIncludeParser.php
@@ -192,10 +192,10 @@ class PageIncludeParser
     /**
      * Get the parent paragraph of the given node, if existing.
      */
-    protected function getParentParagraph(DOMNode $parent): ?DOMNode
+    protected function getParentParagraph(DOMNode $parent): ?DOMElement
     {
         do {
-            if (strtolower($parent->nodeName) === 'p') {
+            if (strtolower($parent->nodeName) === 'p' && $parent instanceof DOMElement) {
                 return $parent;
             }
 
diff --git a/app/Entities/Tools/SlugGenerator.php b/app/Entities/Tools/SlugGenerator.php
index 6eec84a91..ac003b97a 100644
--- a/app/Entities/Tools/SlugGenerator.php
+++ b/app/Entities/Tools/SlugGenerator.php
@@ -52,7 +52,7 @@ class SlugGenerator
     {
         $slug = Str::slug($name);
         if ($slug === '') {
-            $slug = substr(md5(rand(1, 500)), 0, 5);
+            $slug = substr(md5(strval(rand(1, 500))), 0, 5);
         }
 
         return $slug;

From fa3b7f77b9d430304ac5683a0db374adca2f85d3 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 31 May 2026 15:42:54 +0100
Subject: [PATCH 03/72] Maintenance: Addressed all phpstan level 5 issues

---
 app/Entities/Models/Book.php                |  8 ++++----
 app/Entities/Models/Page.php                |  4 ++--
 app/Exports/ImportRepo.php                  |  5 +++++
 app/Exports/ZipExports/ZipImportRunner.php  |  2 +-
 app/Permissions/JointPermissionBuilder.php  |  3 +++
 app/References/Reference.php                |  2 +-
 app/References/ReferenceFetcher.php         |  4 ++++
 app/Search/SearchRunner.php                 |  4 ++++
 app/Settings/SettingService.php             |  6 +++---
 app/Sorting/SortRule.php                    | 14 ++++++++++++++
 app/Uploads/AttachmentService.php           |  2 +-
 app/Users/Controllers/RoleApiController.php |  2 +-
 app/Users/Controllers/RoleController.php    |  6 +++---
 app/Users/Controllers/UserApiController.php |  8 ++++----
 14 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/app/Entities/Models/Book.php b/app/Entities/Models/Book.php
index 10f04695a..abb081d71 100644
--- a/app/Entities/Models/Book.php
+++ b/app/Entities/Models/Book.php
@@ -20,10 +20,10 @@ use Illuminate\Support\Collection;
  * @property ?int                                     $image_id
  * @property ?int                                     $default_template_id
  * @property ?int                                     $sort_rule_id
- * @property \Illuminate\Database\Eloquent\Collection $chapters
- * @property \Illuminate\Database\Eloquent\Collection $pages
- * @property \Illuminate\Database\Eloquent\Collection $directPages
- * @property \Illuminate\Database\Eloquent\Collection $shelves
+ * @property \Illuminate\Database\Eloquent\Collection<int, Chapter> $chapters
+ * @property \Illuminate\Database\Eloquent\Collection<int, Page> $pages
+ * @property \Illuminate\Database\Eloquent\Collection<int, Page> $directPages
+ * @property \Illuminate\Database\Eloquent\Collection<int, Bookshelf> $shelves
  * @property ?SortRule                                $sortRule
  */
 class Book extends Entity implements HasDescriptionInterface, HasCoverInterface, HasDefaultTemplateInterface
diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php
index d3a392da6..c38f33af3 100644
--- a/app/Entities/Models/Page.php
+++ b/app/Entities/Models/Page.php
@@ -24,8 +24,8 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
  * @property int          $revision_count
  * @property string       $editor
  * @property Chapter|null $chapter
- * @property Collection   $attachments
- * @property Collection   $revisions
+ * @property Collection<int, Attachment>   $attachments
+ * @property Collection<int, PageRevision>   $revisions
  * @property PageRevision $currentRevision
  */
 class Page extends BookChild
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index 79db69fca..ed631409b 100644
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -3,6 +3,8 @@
 namespace BookStack\Exports;
 
 use BookStack\Activity\ActivityType;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\FileUploadException;
@@ -119,6 +121,9 @@ class ImportRepo
         $parentModel = null;
         if ($import->type === 'page' || $import->type === 'chapter') {
             $parentModel = $parent ? $this->entityQueries->findVisibleByStringIdentifier($parent) : null;
+            if ($parentModel && !($parentModel instanceof Book || $parentModel instanceof Chapter)) {
+                throw new ZipImportException(['Selected parent is not a book or chapter']);
+            }
         }
 
         DB::beginTransaction();
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
index 9fa7dec3a..37f6c0b8d 100644
--- a/app/Exports/ZipExports/ZipImportRunner.php
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -48,7 +48,7 @@ class ZipImportRunner
      * Returns the top-level entity item which was imported.
      * @throws ZipImportException
      */
-    public function run(Import $import, ?Entity $parent = null): Entity
+    public function run(Import $import, Book|Chapter|null $parent = null): Entity
     {
         $zipPath = $this->getZipPath($import);
         $reader = new ZipExportReader($zipPath);
diff --git a/app/Permissions/JointPermissionBuilder.php b/app/Permissions/JointPermissionBuilder.php
index 94f18916d..f2159375d 100644
--- a/app/Permissions/JointPermissionBuilder.php
+++ b/app/Permissions/JointPermissionBuilder.php
@@ -101,6 +101,7 @@ class JointPermissionBuilder
 
     /**
      * Get a query for fetching a book with its children.
+     * @return Builder<Book>
      */
     protected function bookFetchQuery(): Builder
     {
@@ -117,9 +118,11 @@ class JointPermissionBuilder
 
     /**
      * Build joint permissions for the given book and role combinations.
+     * @param EloquentCollection<int, Book> $books
      */
     protected function buildJointPermissionsForBooks(EloquentCollection $books, array $roles, bool $deleteOld = false): void
     {
+        /** @var EloquentCollection<int, Entity> $entities */
         $entities = clone $books;
 
         /** @var Book $book */
diff --git a/app/References/Reference.php b/app/References/Reference.php
index df8a3a789..602e19eab 100644
--- a/app/References/Reference.php
+++ b/app/References/Reference.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\References;
 
+use BookStack\App\Model;
 use BookStack\Permissions\Models\JointPermission;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
diff --git a/app/References/ReferenceFetcher.php b/app/References/ReferenceFetcher.php
index 8588c6e2c..0c76b4698 100644
--- a/app/References/ReferenceFetcher.php
+++ b/app/References/ReferenceFetcher.php
@@ -22,6 +22,7 @@ class ReferenceFetcher
      */
     public function getReferencesToEntity(Entity $entity, bool $withContents = false): Collection
     {
+        /** @var Collection<int, Reference> $references */
         $references = $this->queryReferencesToEntity($entity)->get();
         $this->mixedEntityListLoader->loadIntoRelations($references->all(), 'from', false, $withContents);
 
@@ -37,6 +38,9 @@ class ReferenceFetcher
         return $this->queryReferencesToEntity($entity)->count();
     }
 
+    /**
+     * @return Builder<Reference>
+     */
     protected function queryReferencesToEntity(Entity $entity): Builder
     {
         $baseQuery = Reference::query()
diff --git a/app/Search/SearchRunner.php b/app/Search/SearchRunner.php
index 391254172..c2f3b96c9 100644
--- a/app/Search/SearchRunner.php
+++ b/app/Search/SearchRunner.php
@@ -4,6 +4,7 @@ namespace BookStack\Search;
 
 use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\EntityTable;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\EntityHydrator;
 use BookStack\Permissions\PermissionApplicator;
@@ -90,6 +91,8 @@ class SearchRunner
 
     /**
      * Get a page of result data from the given query based on the provided page parameters.
+     * @param EloquentBuilder<EntityTable> $query
+     * @return Collection<Entity>
      */
     protected function getPageOfDataFromQuery(EloquentBuilder $query, int $page, int $count): Collection
     {
@@ -106,6 +109,7 @@ class SearchRunner
     /**
      * Create a search query for an entity.
      * @param string[] $entityTypes
+     * @return EloquentBuilder<EntityTable>
      */
     protected function buildQuery(SearchOptions $searchOpts, array $entityTypes): EloquentBuilder
     {
diff --git a/app/Settings/SettingService.php b/app/Settings/SettingService.php
index e0b136180..d35f77117 100644
--- a/app/Settings/SettingService.php
+++ b/app/Settings/SettingService.php
@@ -243,9 +243,9 @@ class SettingService
     /**
      * Convert a setting key into a user-specific key.
      */
-    protected function userKey(string $userId, string $key = ''): string
+    protected function userKey(int $userId, string $key = ''): string
     {
-        return 'user:' . $userId . ':' . $key;
+        return 'user:' . strval($userId) . ':' . $key;
     }
 
     /**
@@ -267,7 +267,7 @@ class SettingService
     /**
      * Delete settings for a given user id.
      */
-    public function deleteUserSettings(string $userId): void
+    public function deleteUserSettings(int $userId): void
     {
         Setting::query()
             ->where('setting_key', 'like', $this->userKey($userId) . '%')
diff --git a/app/Sorting/SortRule.php b/app/Sorting/SortRule.php
index bf53365a2..ffe2d4115 100644
--- a/app/Sorting/SortRule.php
+++ b/app/Sorting/SortRule.php
@@ -38,21 +38,35 @@ class SortRule extends Model implements Loggable
         $this->sequence = implode(',', $values);
     }
 
+    /**
+     * @inheritDoc
+     */
     public function logDescriptor(): string
     {
         return "({$this->id}) {$this->name}";
     }
 
+    /**
+     * Get the URL to where this rule can be managed.
+     */
     public function getUrl(): string
     {
         return url("/settings/sorting/rules/{$this->id}");
     }
 
+    /**
+     * Get the books which are specifically set to use this sort rule.
+     * @return HasMany<Book, $this>
+     */
     public function books(): HasMany
     {
         return $this->hasMany(Book::class, 'entity_container_data.sort_rule_id', 'id');
     }
 
+    /**
+     * Get all the available sort rules, ordered by name, with the number of books using each.
+     * @return Collection<SortRule>
+     */
     public static function allByName(): Collection
     {
         return static::query()
diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index dabd53729..3de84bdd0 100644
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -102,7 +102,7 @@ class AttachmentService
     /**
      * Updates the ordering for a listing of attached files.
      */
-    public function updateFileOrderWithinPage(array $attachmentOrder, string $pageId)
+    public function updateFileOrderWithinPage(array $attachmentOrder, int $pageId)
     {
         foreach ($attachmentOrder as $index => $attachmentId) {
             Attachment::query()->where('uploaded_to', '=', $pageId)
diff --git a/app/Users/Controllers/RoleApiController.php b/app/Users/Controllers/RoleApiController.php
index 93ecc549b..6f0c59651 100644
--- a/app/Users/Controllers/RoleApiController.php
+++ b/app/Users/Controllers/RoleApiController.php
@@ -87,7 +87,7 @@ class RoleApiController extends ApiController
      */
     public function read(string $id)
     {
-        $role = $this->permissionsRepo->getRoleById($id);
+        $role = $this->permissionsRepo->getRoleById(intval($id));
         $this->singleFormatter($role);
 
         return response()->json($role);
diff --git a/app/Users/Controllers/RoleController.php b/app/Users/Controllers/RoleController.php
index b9f06dace..56a6c7416 100644
--- a/app/Users/Controllers/RoleController.php
+++ b/app/Users/Controllers/RoleController.php
@@ -94,7 +94,7 @@ class RoleController extends Controller
     public function edit(string $id)
     {
         $this->checkPermission(Permission::UserRolesManage);
-        $role = $this->permissionsRepo->getRoleById($id);
+        $role = $this->permissionsRepo->getRoleById(intval($id));
 
         $this->setPageTitle(trans('settings.role_edit'));
 
@@ -129,7 +129,7 @@ class RoleController extends Controller
     public function showDelete(string $id)
     {
         $this->checkPermission(Permission::UserRolesManage);
-        $role = $this->permissionsRepo->getRoleById($id);
+        $role = $this->permissionsRepo->getRoleById(intval($id));
         $roles = $this->permissionsRepo->getAllRolesExcept($role);
         $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]);
         $roles->prepend($blankRole);
@@ -151,7 +151,7 @@ class RoleController extends Controller
 
         try {
             $migrateRoleId = intval($request->input('migrate_role_id') ?: "0");
-            $this->permissionsRepo->deleteRole($id, $migrateRoleId);
+            $this->permissionsRepo->deleteRole(intval($id), $migrateRoleId);
         } catch (PermissionsException $e) {
             $this->showErrorNotification($e->getMessage());
 
diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.php
index ebc17e262..07eefadc7 100644
--- a/app/Users/Controllers/UserApiController.php
+++ b/app/Users/Controllers/UserApiController.php
@@ -110,7 +110,7 @@ class UserApiController extends ApiController
      */
     public function read(string $id)
     {
-        $user = $this->userRepo->getById($id);
+        $user = $this->userRepo->getById(intval($id));
         $this->singleFormatter($user);
 
         return response()->json($user);
@@ -124,8 +124,8 @@ class UserApiController extends ApiController
      */
     public function update(Request $request, string $id)
     {
-        $data = $this->validate($request, $this->rules($id)['update']);
-        $user = $this->userRepo->getById($id);
+        $data = $this->validate($request, $this->rules(intval($id))['update']);
+        $user = $this->userRepo->getById(intval($id));
         $this->userRepo->update($user, $data, userCan(Permission::UsersManage));
         $this->singleFormatter($user);
 
@@ -140,7 +140,7 @@ class UserApiController extends ApiController
      */
     public function delete(Request $request, string $id)
     {
-        $user = $this->userRepo->getById($id);
+        $user = $this->userRepo->getById(intval($id));
         $newOwnerId = $request->input('migrate_ownership_id', null);
 
         $this->userRepo->destroy($user, $newOwnerId);

From 16e60b39398476e1963cf3922da7137fe65b004b Mon Sep 17 00:00:00 2001
From: Mesar Hameed <mesar.hameed@gmail.com>
Date: Thu, 16 Jul 2026 06:32:57 +0000
Subject: [PATCH 04/72] Views: Added aria-labels to custom checkbox components
 for screen readers

The custom checkbox components (custom-checkbox.blade.php and
toggle-switch.blade.php) use a <span role="checkbox"> as the
visual/interactive element while hiding the native <input type="checkbox">
with display:none. The span had no accessible name, so screen readers
would announce "checkbox" without any label context.

Added aria-label to the role="checkbox" span in both templates.
Also added optional  parameter to custom-checkbox that
falls back to  when not provided, allowing callers to supply
a more descriptive accessible name.
---
 resources/views/form/custom-checkbox.blade.php          | 2 ++
 resources/views/form/toggle-switch.blade.php            | 1 +
 resources/views/settings/roles/parts/checkbox.blade.php | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/views/form/custom-checkbox.blade.php b/resources/views/form/custom-checkbox.blade.php
index 7750c6f00..736baf521 100644
--- a/resources/views/form/custom-checkbox.blade.php
+++ b/resources/views/form/custom-checkbox.blade.php
@@ -3,11 +3,13 @@ $name
 $value
 $checked
 $label
+$ariaLabel? (optional, falls back to $label)
 --}}
 <label component="custom-checkbox" class="toggle-switch @if($errors->has($name)) text-neg @endif">
     <input type="checkbox" name="{{$name}}" value="{{ $value }}" @if($checked) checked="checked" @endif @if($disabled ?? false) disabled="disabled" @endif>
     <span tabindex="0" role="checkbox"
           aria-checked="{{ $checked ? 'true' : 'false' }}"
+          aria-label="{{ $ariaLabel ?? $label }}"
           class="custom-checkbox text-primary">@icon('check')</span>
     <span class="label">{{$label}}</span>
 </label>
\ No newline at end of file
diff --git a/resources/views/form/toggle-switch.blade.php b/resources/views/form/toggle-switch.blade.php
index 375eda3d7..32ce1092c 100644
--- a/resources/views/form/toggle-switch.blade.php
+++ b/resources/views/form/toggle-switch.blade.php
@@ -3,6 +3,7 @@
     <input type="checkbox" @if($value) checked="checked" @endif>
     <span tabindex="0" role="checkbox"
           aria-checked="{{ $value ? 'true' : 'false' }}"
+          aria-label="{{ $label }}"
           class="custom-checkbox text-primary">@icon('check')</span>
     <span class="label">{{ $label }}</span>
 </label>
\ No newline at end of file
diff --git a/resources/views/settings/roles/parts/checkbox.blade.php b/resources/views/settings/roles/parts/checkbox.blade.php
index 44cdd22bd..5818888d7 100644
--- a/resources/views/settings/roles/parts/checkbox.blade.php
+++ b/resources/views/settings/roles/parts/checkbox.blade.php
@@ -3,5 +3,6 @@
        'name' => 'permissions[' . $permission . ']',
        'value' => 'true',
        'checked' => old('permissions'.$permission, false)|| (!old('display_name', false) && (isset($role) && $role->hasPermission($permission))),
-       'label' => $label
+       'label' => $label,
+       'ariaLabel' => $ariaLabel ?? null
 ])
\ No newline at end of file

From 9a242ca44968e0f572dc1b25023c3fc3d8f3aff6 Mon Sep 17 00:00:00 2001
From: Mesar Hameed <mesar.hameed@gmail.com>
Date: Thu, 16 Jul 2026 06:33:56 +0000
Subject: [PATCH 05/72] Views: Added translatable aria-labels for role
 permission checkboxes

Role permission checkboxes (shelves, books, chapters, pages, revisions,
images, attachments) used short labels like 'Own' and 'All' for their
aria-labels. Screen readers would announce these without any context
about what resource or action the permission applies to.

Added 'role_permission_aria' translation key with the pattern
':action :resource: :value' and updated all permission row templates
to use trans() with parameters. This gives translators full control
over word order and separators while providing screen readers with
descriptive labels like 'Create books: All'.
---
 lang/en/settings.php                          |  1 +
 .../parts/asset-permissions-row.blade.php     | 26 ++++++++++++-------
 .../related-asset-permissions-row.blade.php   | 17 +++++++-----
 .../parts/revisions-permissions-row.blade.php |  3 ++-
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/lang/en/settings.php b/lang/en/settings.php
index 0e5ce84cf..ac483f8fd 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -206,6 +206,7 @@ return [
     'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'All',
     'role_own' => 'Own',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
     'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Save Role',
diff --git a/resources/views/settings/roles/parts/asset-permissions-row.blade.php b/resources/views/settings/roles/parts/asset-permissions-row.blade.php
index 8bff570cb..200153b1b 100644
--- a/resources/views/settings/roles/parts/asset-permissions-row.blade.php
+++ b/resources/views/settings/roles/parts/asset-permissions-row.blade.php
@@ -6,27 +6,35 @@
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.create') }}<br></small>
         @if($permissionPrefix === 'page' || $permissionPrefix === 'chapter')
-            @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-own', 'label' => trans('settings.role_own')])
+            @php $createOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.create'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+            @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $createOwnAria])
             <br>
         @endif
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-all', 'label' => trans('settings.role_all')])
+        @php $createAllAria = trans('settings.role_permission_aria', ['action' => trans('common.create'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $createAllAria])
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.view') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-view-own', 'label' => trans('settings.role_own')])
+        @php $viewOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.view'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-view-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $viewOwnAria])
         <br>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-view-all', 'label' => trans('settings.role_all')])
+        @php $viewAllAria = trans('settings.role_permission_aria', ['action' => trans('common.view'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-view-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $viewAllAria])
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.edit') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-own', 'label' => trans('settings.role_own')])
+        @php $editOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.edit'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $editOwnAria])
         <br>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-all', 'label' => trans('settings.role_all')])
+        @php $editAllAria = trans('settings.role_permission_aria', ['action' => trans('common.edit'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $editAllAria])
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.delete') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-own', 'label' => trans('settings.role_own')])
+        @php $deleteOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.delete'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $deleteOwnAria])
         <br>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-all', 'label' => trans('settings.role_all')])
+        @php $deleteAllAria = trans('settings.role_permission_aria', ['action' => trans('common.delete'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $deleteAllAria])
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/settings/roles/parts/related-asset-permissions-row.blade.php b/resources/views/settings/roles/parts/related-asset-permissions-row.blade.php
index b9bf5427f..ac8e7422e 100644
--- a/resources/views/settings/roles/parts/related-asset-permissions-row.blade.php
+++ b/resources/views/settings/roles/parts/related-asset-permissions-row.blade.php
@@ -5,7 +5,8 @@
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.create') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-all', 'label' => ''])
+        @php $createAllAria = trans('settings.role_permission_aria', ['action' => trans('common.create'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-all', 'label' => '', 'ariaLabel' => $createAllAria])
         @if($permissionPrefix === 'comment')<sup class="text-muted">2</sup>@endif
     </div>
     <div class="flex py-s px-m min-width-xxs">
@@ -14,16 +15,20 @@
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.edit') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-own', 'label' => trans('settings.role_own')])
+        @php $editOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.edit'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $editOwnAria])
         @if($permissionPrefix === 'comment')<sup class="text-muted">2</sup>@endif
         <br>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-all', 'label' => trans('settings.role_all')])
+        @php $editAllAria = trans('settings.role_permission_aria', ['action' => trans('common.edit'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $editAllAria])
         @if($permissionPrefix === 'comment')<sup class="text-muted">2</sup>@endif
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.delete') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-own', 'label' => trans('settings.role_own')])
+        @php $deleteOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.delete'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $deleteOwnAria])
         <br>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-all', 'label' => trans('settings.role_all')])
+        @php $deleteAllAria = trans('settings.role_permission_aria', ['action' => trans('common.delete'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $deleteAllAria])
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/settings/roles/parts/revisions-permissions-row.blade.php b/resources/views/settings/roles/parts/revisions-permissions-row.blade.php
index 326925ef9..50b714de4 100644
--- a/resources/views/settings/roles/parts/revisions-permissions-row.blade.php
+++ b/resources/views/settings/roles/parts/revisions-permissions-row.blade.php
@@ -9,7 +9,8 @@
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.view') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-view-all', 'label' => trans('settings.role_all')])
+        @php $viewAllAria = trans('settings.role_permission_aria', ['action' => trans('common.view'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-view-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $viewAllAria])
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.edit') }}<br></small>

From fa27485b2252e0d9ceb2fd10e588aa20e5cf70f9 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 2 Aug 2026 16:06:51 +0100
Subject: [PATCH 06/72] Front End: Added page scroll progress indicator to
 back-to-top element

---
 resources/js/components/back-to-top.js        | 79 +++++++++++++++++--
 resources/sass/_components.scss               | 34 ++++++--
 resources/views/layouts/base.blade.php        |  7 +-
 .../views/layouts/parts/back-to-top.blade.php | 15 ++++
 4 files changed, 119 insertions(+), 16 deletions(-)
 create mode 100644 resources/views/layouts/parts/back-to-top.blade.php

diff --git a/resources/js/components/back-to-top.js b/resources/js/components/back-to-top.js
index 046e640d1..9b319a3bd 100644
--- a/resources/js/components/back-to-top.js
+++ b/resources/js/components/back-to-top.js
@@ -3,10 +3,15 @@ import {Component} from './component';
 export class BackToTop extends Component {
 
     setup() {
-        this.button = this.$el;
+        this.container = this.$el;
+        this.button = this.$refs.button;
+        this.progress = this.$refs.progress;
+        this.progressPath = this.$refs.progressPath;
+
         this.targetElem = document.getElementById('header');
         this.showing = false;
         this.breakPoint = 1200;
+        this.isAnimating = false;
 
         if (document.body.classList.contains('flexbox')) {
             this.button.style.display = 'none';
@@ -15,23 +20,46 @@ export class BackToTop extends Component {
 
         this.button.addEventListener('click', this.scrollToTop.bind(this));
         window.addEventListener('scroll', this.onPageScroll.bind(this));
+
+        this.setupProgressBar();
+    }
+
+    setupProgressBar() {
+        this.button.addEventListener('transitionstart', event => {
+            if (event.target !== this.button) return;
+            this.isAnimating = true;
+            this.renderProgressPath();
+        });
+        const stopAnimating = event => {
+            if (event.target !== this.button) return;
+            this.isAnimating = false;
+        };
+        this.button.addEventListener('transitionend', stopAnimating);
+        this.button.addEventListener('transitioncancel', stopAnimating);
+        this.renderProgressPath();
     }
 
     onPageScroll() {
         const scrollTopPos = document.documentElement.scrollTop || document.body.scrollTop || 0;
         if (!this.showing && scrollTopPos > this.breakPoint) {
-            this.button.style.display = 'block';
+            this.container.display = 'block';
             this.showing = true;
             setTimeout(() => {
-                this.button.style.opacity = 0.4;
+                this.container.style.opacity = '0.4';
             }, 1);
         } else if (this.showing && scrollTopPos < this.breakPoint) {
-            this.button.style.opacity = 0;
+            this.container.style.opacity = '0';
             this.showing = false;
             setTimeout(() => {
-                this.button.style.display = 'none';
+                this.container.display = 'none';
             }, 500);
         }
+
+        if (this.showing) {
+            const maxScrollTop = document.documentElement.scrollHeight - window.innerHeight;
+            const scrollTopPercent = (scrollTopPos / maxScrollTop) * 100;
+            this.updateProgress(scrollTopPercent);
+        }
     }
 
     scrollToTop() {
@@ -55,4 +83,45 @@ export class BackToTop extends Component {
         requestAnimationFrame(setPos.bind(this));
     }
 
+    renderProgressPath() {
+        const bounds = this.button.getBoundingClientRect();
+        const progressInset = window.getComputedStyle(this.progress).insetInlineStart;
+        const offset = Math.abs(Number(progressInset.replace('px', '') || 0));
+        const path = this.roundedRectPath(bounds.width, bounds.height, bounds.height / 2, offset);
+        this.progressPath.setAttribute('d', path);
+        if (this.isAnimating) {
+            window.requestAnimationFrame(this.renderProgressPath.bind(this));
+        }
+    }
+
+    updateProgress(percentComplete) {
+        if (percentComplete < 5) {
+            percentComplete = 5;
+        }
+        this.progressPath.setAttribute('stroke-dasharray', `${Math.ceil(percentComplete)} 100`);
+    }
+
+    roundedRectPath(w, h, r, offset = 1.5) {
+        // Expand dimensions outward by the offset
+        const W = w + 2 * offset;
+        const H = h + 2 * offset;
+
+        // The corner radius also grows by the offset
+        const R = Math.min(r + offset, W / 2, H / 2);
+
+        return [
+            `M ${W / 2} 0`,                       // start at top center
+            `H ${W - R}`,                          // line to top-right (before arc)
+            `A ${R} ${R} 0 0 1 ${W} ${R}`,        // arc: top-right corner
+            `V ${H - R}`,                          // line down right edge
+            `A ${R} ${R} 0 0 1 ${W - R} ${H}`,    // arc: bottom-right corner
+            `H ${R}`,                              // line across bottom edge
+            `A ${R} ${R} 0 0 1 ${0} ${H - R}`,    // arc: bottom-left corner
+            `V ${R}`,                              // line up left edge
+            `A ${R} ${R} 0 0 1 ${R} ${0}`,        // arc: top-left corner
+            `Z`                                    // close path back to start
+        ].join(' ');
+    }
+
+
 }
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 8608427d8..bc7a0ed88 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -1098,16 +1098,24 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 
 // Back to top link
 $btt-size: 40px;
-.back-to-top {
-  background-color: var(--color-primary);
+.back-to-top-container {
   position: fixed;
   bottom: vars.$m;
   right: vars.$l;
+  opacity: 0;
+  z-index: 999;
+  transition: opacity ease-in-out 180ms;
+  &:hover {
+    opacity: 1 !important;
+  }
+}
+.back-to-top {
+  background-color: var(--color-primary);
   padding: 5px 7px;
   cursor: pointer;
   color: #FFF;
   fill: #FFF;
-  svg {
+  .inner svg {
     width: math.div($btt-size, 1.5);
     height: math.div($btt-size, 1.5);
     margin-inline-end: 4px;
@@ -1116,8 +1124,6 @@ $btt-size: 40px;
   height: $btt-size;
   border-radius: $btt-size;
   transition: all ease-in-out 180ms;
-  opacity: 0;
-  z-index: 999;
   overflow: hidden;
   &:hover {
     width: $btt-size*3.4;
@@ -1125,6 +1131,7 @@ $btt-size: 40px;
   }
   .inner {
     width: $btt-size*3.4;
+    text-align: start;
   }
   span {
     position: relative;
@@ -1133,6 +1140,23 @@ $btt-size: 40px;
   }
 }
 
+.back-to-top-progress {
+  position: absolute;
+  top: -3px;
+  inset-inline-start: -3px;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  overflow: visible;
+  path {
+    fill: none;
+    stroke: var(--color-primary);
+    stroke-width: 2px;
+    stroke-linecap: butt;
+    transition: stroke-dasharray ease-in-out 120ms;
+  }
+}
+
 // Sortable scroll boxes
 .scroll-box {
   list-style: none;
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index b868cb888..90d987ccb 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -61,12 +61,7 @@
     </div>
 
     @include('layouts.parts.footer')
-
-    <div component="back-to-top" class="back-to-top print-hidden">
-        <div class="inner">
-            @icon('chevron-up') <span>{{ trans('common.back_to_top') }}</span>
-        </div>
-    </div>
+    @include('layouts.parts.back-to-top')
 
     @if($cspNonce ?? false)
         <script src="{{ versioned_asset('dist/app.js') }}" type="module" nonce="{{ $cspNonce }}"></script>
diff --git a/resources/views/layouts/parts/back-to-top.blade.php b/resources/views/layouts/parts/back-to-top.blade.php
new file mode 100644
index 000000000..741859d1c
--- /dev/null
+++ b/resources/views/layouts/parts/back-to-top.blade.php
@@ -0,0 +1,15 @@
+<div component="back-to-top" class="back-to-top-container">
+    <svg refs="back-to-top@progress" class="back-to-top-progress" width="100%" height="100%">
+        <path
+            refs="back-to-top@progress-path"
+            d=""
+            pathLength="100"
+            stroke-dasharray="0 100"
+        />
+    </svg>
+    <button refs="back-to-top@button" class="back-to-top print-hidden">
+        <div class="inner">
+            @icon('chevron-up') <span>{{ trans('common.back_to_top') }}</span>
+        </div>
+    </button>
+</div>
\ No newline at end of file

From 36fe7c375f4d6961724918fd4e06791fcd0242fd Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 2 Aug 2026 16:15:16 +0100
Subject: [PATCH 07/72] JS: Converted back-to-top component to TS

---
 .../{back-to-top.js => back-to-top.ts}        | 49 ++++++++++---------
 .../views/layouts/parts/back-to-top.blade.php |  2 +-
 2 files changed, 28 insertions(+), 23 deletions(-)
 rename resources/js/components/{back-to-top.js => back-to-top.ts} (78%)

diff --git a/resources/js/components/back-to-top.js b/resources/js/components/back-to-top.ts
similarity index 78%
rename from resources/js/components/back-to-top.js
rename to resources/js/components/back-to-top.ts
index 9b319a3bd..e47a0478a 100644
--- a/resources/js/components/back-to-top.js
+++ b/resources/js/components/back-to-top.ts
@@ -2,19 +2,26 @@ import {Component} from './component';
 
 export class BackToTop extends Component {
 
-    setup() {
+    private container!: HTMLElement;
+    private button!: HTMLElement;
+    private progress!: HTMLElement;
+    private progressPath!: SVGPathElement;
+    private targetElem!: HTMLElement;
+
+    private showing: boolean = false;
+    private breakPoint: number = 1200;
+    private isAnimating: boolean = false;
+
+    setup(): void {
         this.container = this.$el;
         this.button = this.$refs.button;
         this.progress = this.$refs.progress;
-        this.progressPath = this.$refs.progressPath;
+        this.progressPath = this.$refs.progressPath as unknown as SVGPathElement;
 
-        this.targetElem = document.getElementById('header');
-        this.showing = false;
-        this.breakPoint = 1200;
-        this.isAnimating = false;
+        this.targetElem = document.getElementById('header') as HTMLElement;
 
         if (document.body.classList.contains('flexbox')) {
-            this.button.style.display = 'none';
+            this.container.style.display = 'none';
             return;
         }
 
@@ -24,13 +31,13 @@ export class BackToTop extends Component {
         this.setupProgressBar();
     }
 
-    setupProgressBar() {
+    private setupProgressBar(): void {
         this.button.addEventListener('transitionstart', event => {
             if (event.target !== this.button) return;
             this.isAnimating = true;
             this.renderProgressPath();
         });
-        const stopAnimating = event => {
+        const stopAnimating = (event: TransitionEvent) => {
             if (event.target !== this.button) return;
             this.isAnimating = false;
         };
@@ -39,10 +46,10 @@ export class BackToTop extends Component {
         this.renderProgressPath();
     }
 
-    onPageScroll() {
+    private onPageScroll(): void {
         const scrollTopPos = document.documentElement.scrollTop || document.body.scrollTop || 0;
         if (!this.showing && scrollTopPos > this.breakPoint) {
-            this.container.display = 'block';
+            this.container.style.display = 'block';
             this.showing = true;
             setTimeout(() => {
                 this.container.style.opacity = '0.4';
@@ -51,7 +58,7 @@ export class BackToTop extends Component {
             this.container.style.opacity = '0';
             this.showing = false;
             setTimeout(() => {
-                this.container.display = 'none';
+                this.container.style.display = 'none';
             }, 500);
         }
 
@@ -62,28 +69,28 @@ export class BackToTop extends Component {
         }
     }
 
-    scrollToTop() {
+    private scrollToTop(): void {
         const targetTop = this.targetElem.getBoundingClientRect().top;
         const scrollElem = document.documentElement.scrollTop ? document.documentElement : document.body;
         const duration = 300;
         const start = Date.now();
         const scrollStart = this.targetElem.getBoundingClientRect().top;
 
-        function setPos() {
+        const setPos = () => {
             const percentComplete = (1 - ((Date.now() - start) / duration));
             const target = Math.abs(percentComplete * scrollStart);
             if (percentComplete > 0) {
                 scrollElem.scrollTop = target;
-                requestAnimationFrame(setPos.bind(this));
+                requestAnimationFrame(setPos);
             } else {
                 scrollElem.scrollTop = targetTop;
             }
-        }
+        };
 
-        requestAnimationFrame(setPos.bind(this));
+        requestAnimationFrame(setPos);
     }
 
-    renderProgressPath() {
+    private renderProgressPath(): void {
         const bounds = this.button.getBoundingClientRect();
         const progressInset = window.getComputedStyle(this.progress).insetInlineStart;
         const offset = Math.abs(Number(progressInset.replace('px', '') || 0));
@@ -94,14 +101,14 @@ export class BackToTop extends Component {
         }
     }
 
-    updateProgress(percentComplete) {
+    private updateProgress(percentComplete: number): void {
         if (percentComplete < 5) {
             percentComplete = 5;
         }
         this.progressPath.setAttribute('stroke-dasharray', `${Math.ceil(percentComplete)} 100`);
     }
 
-    roundedRectPath(w, h, r, offset = 1.5) {
+    private roundedRectPath(w: number, h: number, r: number, offset: number = 1.5): string {
         // Expand dimensions outward by the offset
         const W = w + 2 * offset;
         const H = h + 2 * offset;
@@ -122,6 +129,4 @@ export class BackToTop extends Component {
             `Z`                                    // close path back to start
         ].join(' ');
     }
-
-
 }
diff --git a/resources/views/layouts/parts/back-to-top.blade.php b/resources/views/layouts/parts/back-to-top.blade.php
index 741859d1c..b6efc9749 100644
--- a/resources/views/layouts/parts/back-to-top.blade.php
+++ b/resources/views/layouts/parts/back-to-top.blade.php
@@ -12,4 +12,4 @@
             @icon('chevron-up') <span>{{ trans('common.back_to_top') }}</span>
         </div>
     </button>
-</div>
\ No newline at end of file
+</div>

From 26a3cb8b7e36a421c4491ad987e053d96ee84075 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Thu, 6 Aug 2026 15:32:17 +0100
Subject: [PATCH 08/72] Views: Started implementation of new sidebar back-end

---
 .../Providers/ViewTweaksServiceProvider.php   |  2 +
 app/Entities/Controllers/BookController.php   |  2 -
 app/View/SidebarSection.php                   | 16 ++++++
 app/View/SidebarSectionInterface.php          | 20 ++++++++
 app/View/SidebarSectionManager.php            | 51 +++++++++++++++++++
 .../SidebarSections/BooksIndexRecents.php     | 26 ++++++++++
 resources/views/books/index.blade.php         |  4 +-
 7 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 app/View/SidebarSection.php
 create mode 100644 app/View/SidebarSectionInterface.php
 create mode 100644 app/View/SidebarSectionManager.php
 create mode 100644 app/View/SidebarSections/BooksIndexRecents.php

diff --git a/app/App/Providers/ViewTweaksServiceProvider.php b/app/App/Providers/ViewTweaksServiceProvider.php
index 6771e513f..d2d45abcc 100644
--- a/app/App/Providers/ViewTweaksServiceProvider.php
+++ b/app/App/Providers/ViewTweaksServiceProvider.php
@@ -4,6 +4,7 @@ namespace BookStack\App\Providers;
 
 use BookStack\Entities\BreadcrumbsViewComposer;
 use BookStack\Util\DateFormatter;
+use BookStack\View\SidebarSectionManager;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\View;
@@ -33,6 +34,7 @@ class ViewTweaksServiceProvider extends ServiceProvider
 
         // View Globals
         View::share('dates', $this->app->make(DateFormatter::class));
+        View::share('sidebar', $this->app->make(SidebarSectionManager::class));
 
         // Custom blade view directives
         Blade::directive('icon', function ($expression) {
diff --git a/app/Entities/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
index 98470d91c..9fa64d293 100644
--- a/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -53,7 +53,6 @@ class BookController extends Controller
         $books = $this->queries->visibleForListWithCover()
             ->orderBy($listOptions->getSort(), $listOptions->getOrder())
             ->paginate(setting()->getInteger('lists-page-count-books', 18, 1, 1000));
-        $recents = $this->isSignedIn() ? $this->queries->recentlyViewedForCurrentUser()->take(4)->get() : false;
         $popular = $this->queries->popularForList()->take(4)->get();
         $new = $this->queries->visibleForList()->orderBy('created_at', 'desc')->take(4)->get();
 
@@ -63,7 +62,6 @@ class BookController extends Controller
 
         return view('books.index', [
             'books'   => $books,
-            'recents' => $recents,
             'popular' => $popular,
             'new'     => $new,
             'view'    => $view,
diff --git a/app/View/SidebarSection.php b/app/View/SidebarSection.php
new file mode 100644
index 000000000..68e1aa291
--- /dev/null
+++ b/app/View/SidebarSection.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace BookStack\View;
+
+abstract class SidebarSection implements SidebarSectionInterface
+{
+    protected string $view;
+
+    /**
+     * @inheritDoc
+     */
+    public function getView(): string
+    {
+        return $this->view;
+    }
+}
diff --git a/app/View/SidebarSectionInterface.php b/app/View/SidebarSectionInterface.php
new file mode 100644
index 000000000..84032ab61
--- /dev/null
+++ b/app/View/SidebarSectionInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace BookStack\View;
+
+use Illuminate\Http\Request;
+
+interface SidebarSectionInterface
+{
+    /**
+     * Get the view to render for this section.
+     */
+    public function getView(): string;
+
+    /**
+     * Specify the data to pass to the view on render.
+     * Is provided with the existing parent view data and the original request.
+     * @return array<string, mixed>
+     */
+    public function withData(array $viewData, Request $request): array;
+}
diff --git a/app/View/SidebarSectionManager.php b/app/View/SidebarSectionManager.php
new file mode 100644
index 000000000..82af3721e
--- /dev/null
+++ b/app/View/SidebarSectionManager.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace BookStack\View;
+
+use BookStack\View\SidebarSections\BooksIndexRecents;
+use Illuminate\Contracts\Container\BindingResolutionException;
+
+class SidebarSectionManager
+{
+    /**
+     * @var array<string, array<string, class-string<SidebarSectionInterface>[]>>
+     */
+    protected array $sectionByLocation = [
+        'books-index' => [
+            'left' => [
+                BooksIndexRecents::class,
+            ]
+        ],
+    ];
+
+    /**
+     * Register a sidebar section to be displayed at the given location and position.
+     * @param class-string<SidebarSectionInterface> $sectionClass
+     */
+    public function register(string $location, string $position, string $sectionClass): void
+    {
+        if (!isset($this->sectionByLocation[$location])) {
+            $this->sectionByLocation[$location] = [];
+        }
+
+        if (!isset($this->sectionByLocation[$location][$position])) {
+            $this->sectionByLocation[$location][$position] = [];
+        }
+
+        $this->sectionByLocation[$location][$position][] = $sectionClass;
+    }
+
+    /**
+     * Get all sidebar sections registered for a given location.
+     *
+     * @return SidebarSectionInterface[]
+     * @throws BindingResolutionException
+     */
+    public function getSectionsForLocation(string $location, string $position): array
+    {
+        $sections = array_unique($this->sectionByLocation[$location][$position] ?? []);
+        return array_map(function (string $className) {
+            return app()->make($className);
+        }, $sections);
+    }
+}
diff --git a/app/View/SidebarSections/BooksIndexRecents.php b/app/View/SidebarSections/BooksIndexRecents.php
new file mode 100644
index 000000000..485e6d431
--- /dev/null
+++ b/app/View/SidebarSections/BooksIndexRecents.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Queries\BookQueries;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class BooksIndexRecents extends SidebarSection
+{
+    protected string $view = 'books.parts.index-sidebar-section-recents';
+
+    public function __construct(
+        protected BookQueries $queries,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        $userSignedIn = !user()->isGuest();
+        $recents = $userSignedIn ? $this->queries->recentlyViewedForCurrentUser()->take(4)->get() : null;
+        return [
+            'recents' => $recents,
+        ];
+    }
+}
diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index 660c008df..60152410c 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -5,7 +5,9 @@
 @stop
 
 @section('left')
-    @include('books.parts.index-sidebar-section-recents', ['recents' => $recents])
+    @foreach($sidebar->getSectionsForLocation('books-index', 'left') as $section)
+        @include($section->getView(), $section->withData(get_defined_vars(), request()))
+    @endforeach
     @include('books.parts.index-sidebar-section-popular', ['popular' => $popular])
     @include('books.parts.index-sidebar-section-new', ['new' => $new])
 @stop

From dead0bfb5fd5b725230a5020973ddd4fa9560a95 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Fri, 7 Aug 2026 08:32:27 +0100
Subject: [PATCH 09/72] Views: Extracted books index/show sidebar sections

---
 app/Entities/Controllers/BookController.php   | 15 +--------
 app/View/SidebarSectionManager.php            | 28 +++++++++++++++-
 .../SidebarSections/BooksIndexActions.php     | 18 +++++++++++
 app/View/SidebarSections/BooksIndexNew.php    | 29 +++++++++++++++++
 .../SidebarSections/BooksIndexPopular.php     | 24 ++++++++++++++
 app/View/SidebarSections/BooksShowActions.php | 24 ++++++++++++++
 .../SidebarSections/BooksShowActivity.php     | 28 ++++++++++++++++
 app/View/SidebarSections/BooksShowDetails.php | 32 +++++++++++++++++++
 .../SidebarSections/BooksShowSearchForm.php   | 18 +++++++++++
 app/View/SidebarSections/BooksShowShelves.php | 23 +++++++++++++
 app/View/SidebarSections/BooksShowTags.php    | 18 +++++++++++
 resources/views/books/index.blade.php         |  8 ++---
 .../show-sidebar-section-details.blade.php    |  2 +-
 .../show-sidebar-section-shelves.blade.php    |  4 +--
 resources/views/books/show.blade.php          | 13 +++-----
 .../views/common/sidebar-sections.blade.php   | 11 +++++++
 16 files changed, 262 insertions(+), 33 deletions(-)
 create mode 100644 app/View/SidebarSections/BooksIndexActions.php
 create mode 100644 app/View/SidebarSections/BooksIndexNew.php
 create mode 100644 app/View/SidebarSections/BooksIndexPopular.php
 create mode 100644 app/View/SidebarSections/BooksShowActions.php
 create mode 100644 app/View/SidebarSections/BooksShowActivity.php
 create mode 100644 app/View/SidebarSections/BooksShowDetails.php
 create mode 100644 app/View/SidebarSections/BooksShowSearchForm.php
 create mode 100644 app/View/SidebarSections/BooksShowShelves.php
 create mode 100644 app/View/SidebarSections/BooksShowTags.php
 create mode 100644 resources/views/common/sidebar-sections.blade.php

diff --git a/app/Entities/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
index 9fa64d293..aa4f99daa 100644
--- a/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -2,10 +2,8 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Activity\ActivityQueries;
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\View;
-use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Queries\BookshelfQueries;
 use BookStack\Entities\Queries\EntityQueries;
@@ -19,7 +17,6 @@ use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
-use BookStack\References\ReferenceFetcher;
 use BookStack\Util\DatabaseTransaction;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
@@ -34,7 +31,6 @@ class BookController extends Controller
         protected BookQueries $queries,
         protected EntityQueries $entityQueries,
         protected BookshelfQueries $shelfQueries,
-        protected ReferenceFetcher $referenceFetcher,
     ) {
     }
 
@@ -53,8 +49,6 @@ class BookController extends Controller
         $books = $this->queries->visibleForListWithCover()
             ->orderBy($listOptions->getSort(), $listOptions->getOrder())
             ->paginate(setting()->getInteger('lists-page-count-books', 18, 1, 1000));
-        $popular = $this->queries->popularForList()->take(4)->get();
-        $new = $this->queries->visibleForList()->orderBy('created_at', 'desc')->take(4)->get();
 
         $this->shelfContext->clearShelfContext();
 
@@ -62,8 +56,6 @@ class BookController extends Controller
 
         return view('books.index', [
             'books'   => $books,
-            'popular' => $popular,
-            'new'     => $new,
             'view'    => $view,
             'listOptions' => $listOptions,
         ]);
@@ -125,7 +117,7 @@ class BookController extends Controller
     /**
      * Display the specified book.
      */
-    public function show(Request $request, ActivityQueries $activities, string $slug)
+    public function show(Request $request, string $slug)
     {
         try {
             $book = $this->queries->findVisibleBySlugOrFail($slug);
@@ -138,7 +130,6 @@ class BookController extends Controller
         }
 
         $bookChildren = (new BookContents($book))->getTree(true);
-        $bookParentShelves = $book->shelves()->scopes('visible')->get();
 
         View::incrementFor($book);
         if ($request->has('shelf')) {
@@ -151,10 +142,6 @@ class BookController extends Controller
             'book'              => $book,
             'current'           => $book,
             'bookChildren'      => $bookChildren,
-            'bookParentShelves' => $bookParentShelves,
-            'watchOptions'      => new UserEntityWatchOptions(user(), $book),
-            'activity'          => $activities->entityActivity($book, 20, 1),
-            'referenceCount'    => $this->referenceFetcher->getReferenceCountToEntity($book),
         ]);
     }
 
diff --git a/app/View/SidebarSectionManager.php b/app/View/SidebarSectionManager.php
index 82af3721e..d83b7afb0 100644
--- a/app/View/SidebarSectionManager.php
+++ b/app/View/SidebarSectionManager.php
@@ -2,7 +2,16 @@
 
 namespace BookStack\View;
 
+use BookStack\View\SidebarSections\BooksIndexActions;
+use BookStack\View\SidebarSections\BooksIndexNew;
+use BookStack\View\SidebarSections\BooksIndexPopular;
 use BookStack\View\SidebarSections\BooksIndexRecents;
+use BookStack\View\SidebarSections\BooksShowActions;
+use BookStack\View\SidebarSections\BooksShowActivity;
+use BookStack\View\SidebarSections\BooksShowDetails;
+use BookStack\View\SidebarSections\BooksShowSearchForm;
+use BookStack\View\SidebarSections\BooksShowShelves;
+use BookStack\View\SidebarSections\BooksShowTags;
 use Illuminate\Contracts\Container\BindingResolutionException;
 
 class SidebarSectionManager
@@ -14,7 +23,24 @@ class SidebarSectionManager
         'books-index' => [
             'left' => [
                 BooksIndexRecents::class,
-            ]
+                BooksIndexPopular::class,
+                BooksIndexNew::class,
+            ],
+            'right' => [
+                BooksIndexActions::class,
+            ],
+        ],
+        'books-show' => [
+            'left' => [
+                BooksShowSearchForm::class,
+                BooksShowTags::class,
+                BooksShowShelves::class,
+                BooksShowActivity::class,
+            ],
+            'right' => [
+                BooksShowDetails::class,
+                BooksShowActions::class,
+            ],
         ],
     ];
 
diff --git a/app/View/SidebarSections/BooksIndexActions.php b/app/View/SidebarSections/BooksIndexActions.php
new file mode 100644
index 000000000..62f856a65
--- /dev/null
+++ b/app/View/SidebarSections/BooksIndexActions.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class BooksIndexActions extends SidebarSection
+{
+    protected string $view = 'books.parts.index-sidebar-section-actions';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        return [
+            'view' => $viewData['view'],
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/BooksIndexNew.php b/app/View/SidebarSections/BooksIndexNew.php
new file mode 100644
index 000000000..33a57f9d9
--- /dev/null
+++ b/app/View/SidebarSections/BooksIndexNew.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Queries\BookQueries;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class BooksIndexNew extends SidebarSection
+{
+    protected string $view = 'books.parts.index-sidebar-section-new';
+
+    public function __construct(
+        protected BookQueries $queries,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        $new = $this->queries->visibleForList()
+            ->orderBy('created_at', 'desc')
+            ->take(4)
+            ->get();
+
+        return [
+            'new' => $new,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/BooksIndexPopular.php b/app/View/SidebarSections/BooksIndexPopular.php
new file mode 100644
index 000000000..9f5cc613f
--- /dev/null
+++ b/app/View/SidebarSections/BooksIndexPopular.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Queries\BookQueries;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class BooksIndexPopular extends SidebarSection
+{
+    protected string $view = 'books.parts.index-sidebar-section-popular';
+
+    public function __construct(
+        protected BookQueries $queries,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        return [
+            'popular' => $this->queries->popularForList()->take(4)->get(),
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/BooksShowActions.php b/app/View/SidebarSections/BooksShowActions.php
new file mode 100644
index 000000000..0f97e625c
--- /dev/null
+++ b/app/View/SidebarSections/BooksShowActions.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Book;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class BooksShowActions extends SidebarSection
+{
+    protected string $view = 'books.parts.show-sidebar-section-actions';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+
+        return [
+            'book' => $book,
+            'watchOptions' => new UserEntityWatchOptions(user(), $book),
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/BooksShowActivity.php b/app/View/SidebarSections/BooksShowActivity.php
new file mode 100644
index 000000000..d892c5ea7
--- /dev/null
+++ b/app/View/SidebarSections/BooksShowActivity.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Activity\ActivityQueries;
+use BookStack\Entities\Models\Book;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class BooksShowActivity extends SidebarSection
+{
+    protected string $view = 'books.parts.show-sidebar-section-activity';
+
+    public function __construct(
+        protected ActivityQueries $activityQueries,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+
+        return [
+            'activity' => $this->activityQueries->entityActivity($book, 20, 1),
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/BooksShowDetails.php b/app/View/SidebarSections/BooksShowDetails.php
new file mode 100644
index 000000000..bd91663b2
--- /dev/null
+++ b/app/View/SidebarSections/BooksShowDetails.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Book;
+use BookStack\References\ReferenceFetcher;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class BooksShowDetails extends SidebarSection
+{
+    protected string $view = 'books.parts.show-sidebar-section-details';
+
+    public function __construct(
+        protected ReferenceFetcher $referenceFetcher,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+        $referenceCount = $this->referenceFetcher->getReferenceCountToEntity($book);
+
+        return [
+            'book' => $book,
+            'watchOptions' => new UserEntityWatchOptions(user(), $book),
+            'referenceCount' => $referenceCount,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/BooksShowSearchForm.php b/app/View/SidebarSections/BooksShowSearchForm.php
new file mode 100644
index 000000000..8fa24134b
--- /dev/null
+++ b/app/View/SidebarSections/BooksShowSearchForm.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class BooksShowSearchForm extends SidebarSection
+{
+    protected string $view = 'entities.search-form';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        return [
+            'label' => trans('entities.books_search_this'),
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/BooksShowShelves.php b/app/View/SidebarSections/BooksShowShelves.php
new file mode 100644
index 000000000..28d2d8aa9
--- /dev/null
+++ b/app/View/SidebarSections/BooksShowShelves.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Models\Book;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class BooksShowShelves extends SidebarSection
+{
+    protected string $view = 'books.parts.show-sidebar-section-shelves';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+        $shelves = $book->shelves()->scopes('visible')->get();
+
+        return [
+            'shelves' => $shelves,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/BooksShowTags.php b/app/View/SidebarSections/BooksShowTags.php
new file mode 100644
index 000000000..351686c7f
--- /dev/null
+++ b/app/View/SidebarSections/BooksShowTags.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class BooksShowTags extends SidebarSection
+{
+    protected string $view = 'books.parts.show-sidebar-section-tags';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        return [
+            'book' => $viewData['book'],
+        ];
+    }
+}
diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index 60152410c..020cb0966 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -5,13 +5,9 @@
 @stop
 
 @section('left')
-    @foreach($sidebar->getSectionsForLocation('books-index', 'left') as $section)
-        @include($section->getView(), $section->withData(get_defined_vars(), request()))
-    @endforeach
-    @include('books.parts.index-sidebar-section-popular', ['popular' => $popular])
-    @include('books.parts.index-sidebar-section-new', ['new' => $new])
+    @include('common.sidebar-sections', ['location' => 'books-index', 'position' => 'left'])
 @stop
 
 @section('right')
-    @include('books.parts.index-sidebar-section-actions', ['view' => $view])
+    @include('common.sidebar-sections', ['location' => 'books-index', 'position' => 'right'])
 @stop
diff --git a/resources/views/books/parts/show-sidebar-section-details.blade.php b/resources/views/books/parts/show-sidebar-section-details.blade.php
index 709d0ffd9..2c3d6d141 100644
--- a/resources/views/books/parts/show-sidebar-section-details.blade.php
+++ b/resources/views/books/parts/show-sidebar-section-details.blade.php
@@ -1,7 +1,7 @@
 <div class="mb-xl">
     <h5>{{ trans('common.details') }}</h5>
     <div class="blended-links">
-        @include('entities.meta', ['entity' => $book, 'watchOptions' => $watchOptions])
+        @include('entities.meta', ['entity' => $book, 'watchOptions' => $watchOptions, 'referenceCount' => $referenceCount])
         @if($book->hasPermissions())
             <div class="active-restriction">
                 @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
diff --git a/resources/views/books/parts/show-sidebar-section-shelves.blade.php b/resources/views/books/parts/show-sidebar-section-shelves.blade.php
index 9de9b95c6..9704c180c 100644
--- a/resources/views/books/parts/show-sidebar-section-shelves.blade.php
+++ b/resources/views/books/parts/show-sidebar-section-shelves.blade.php
@@ -1,6 +1,6 @@
-@if(count($bookParentShelves) > 0)
+@if(count($shelves) > 0)
     <div class="actions mb-xl">
         <h5>{{ trans('entities.shelves') }}</h5>
-        @include('entities.list', ['entities' => $bookParentShelves, 'style' => 'compact'])
+        @include('entities.list', ['entities' => $shelves, 'style' => 'compact'])
     </div>
 @endif
\ No newline at end of file
diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index 4eb83164f..48a951132 100644
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -66,15 +66,10 @@
 
 @stop
 
-@section('right')
-    @include('books.parts.show-sidebar-section-details', ['book' => $book, 'watchOptions' => $watchOptions])
-    @include('books.parts.show-sidebar-section-actions', ['book' => $book, 'watchOptions' => $watchOptions])
-@stop
-
 @section('left')
-    @include('entities.search-form', ['label' => trans('entities.books_search_this')])
-    @include('books.parts.show-sidebar-section-tags', ['book' => $book])
-    @include('books.parts.show-sidebar-section-shelves', ['bookParentShelves' => $bookParentShelves])
-    @include('books.parts.show-sidebar-section-activity', ['activity' => $activity])
+    @include('common.sidebar-sections', ['location' => 'books-show', 'position' => 'left'])
 @stop
 
+@section('right')
+    @include('common.sidebar-sections', ['location' => 'books-show', 'position' => 'right'])
+@stop
diff --git a/resources/views/common/sidebar-sections.blade.php b/resources/views/common/sidebar-sections.blade.php
new file mode 100644
index 000000000..a4a055e6a
--- /dev/null
+++ b/resources/views/common/sidebar-sections.blade.php
@@ -0,0 +1,11 @@
+{{--
+$location - string
+$position - string
+--}}
+@php
+    $sectionVars = get_defined_vars();
+    $sectionRequest = request();
+@endphp
+@foreach($sidebar->getSectionsForLocation($location, $position) as $section)
+    @include($section->getView(), $section->withData($sectionVars, $sectionRequest))
+@endforeach
\ No newline at end of file

From b462c67e2ff7a44c1942486967888d48b0d06380 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Fri, 7 Aug 2026 12:54:38 +0100
Subject: [PATCH 10/72] Views: Extracted sidebar blocks for main entity pages

---
 .../Controllers/BookshelfController.php       | 16 +----
 .../Controllers/ChapterController.php         | 11 +---
 app/Entities/Controllers/PageController.php   | 13 +---
 app/View/SidebarSectionManager.php            | 62 +++++++++++++++++++
 .../SidebarSections/BooksIndexRecents.php     |  7 ++-
 .../SidebarSections/ChaptersShowActions.php   | 24 +++++++
 .../SidebarSections/ChaptersShowBookTree.php  | 23 +++++++
 .../SidebarSections/ChaptersShowDetails.php   | 37 +++++++++++
 .../ChaptersShowSearchForm.php                | 18 ++++++
 app/View/SidebarSections/ChaptersShowTags.php | 22 +++++++
 app/View/SidebarSections/PagesShowActions.php | 24 +++++++
 .../SidebarSections/PagesShowAttachments.php  | 22 +++++++
 .../SidebarSections/PagesShowBookTree.php     | 23 +++++++
 app/View/SidebarSections/PagesShowDetails.php | 37 +++++++++++
 app/View/SidebarSections/PagesShowPageNav.php | 26 ++++++++
 app/View/SidebarSections/PagesShowTags.php    | 22 +++++++
 .../SidebarSections/ShelvesIndexActions.php   | 18 ++++++
 app/View/SidebarSections/ShelvesIndexNew.php  | 29 +++++++++
 .../SidebarSections/ShelvesIndexPopular.php   | 24 +++++++
 .../SidebarSections/ShelvesIndexRecents.php   | 29 +++++++++
 .../SidebarSections/ShelvesShowActions.php    | 22 +++++++
 .../SidebarSections/ShelvesShowActivity.php   | 28 +++++++++
 .../SidebarSections/ShelvesShowDetails.php    | 30 +++++++++
 app/View/SidebarSections/ShelvesShowTags.php  | 18 ++++++
 resources/views/chapters/show.blade.php       | 13 ++--
 resources/views/entities/book-tree.blade.php  |  2 +-
 resources/views/pages/show.blade.php          |  8 +--
 resources/views/shelves/index.blade.php       | 12 ++--
 resources/views/shelves/show.blade.php        | 10 +--
 29 files changed, 564 insertions(+), 66 deletions(-)
 create mode 100644 app/View/SidebarSections/ChaptersShowActions.php
 create mode 100644 app/View/SidebarSections/ChaptersShowBookTree.php
 create mode 100644 app/View/SidebarSections/ChaptersShowDetails.php
 create mode 100644 app/View/SidebarSections/ChaptersShowSearchForm.php
 create mode 100644 app/View/SidebarSections/ChaptersShowTags.php
 create mode 100644 app/View/SidebarSections/PagesShowActions.php
 create mode 100644 app/View/SidebarSections/PagesShowAttachments.php
 create mode 100644 app/View/SidebarSections/PagesShowBookTree.php
 create mode 100644 app/View/SidebarSections/PagesShowDetails.php
 create mode 100644 app/View/SidebarSections/PagesShowPageNav.php
 create mode 100644 app/View/SidebarSections/PagesShowTags.php
 create mode 100644 app/View/SidebarSections/ShelvesIndexActions.php
 create mode 100644 app/View/SidebarSections/ShelvesIndexNew.php
 create mode 100644 app/View/SidebarSections/ShelvesIndexPopular.php
 create mode 100644 app/View/SidebarSections/ShelvesIndexRecents.php
 create mode 100644 app/View/SidebarSections/ShelvesShowActions.php
 create mode 100644 app/View/SidebarSections/ShelvesShowActivity.php
 create mode 100644 app/View/SidebarSections/ShelvesShowDetails.php
 create mode 100644 app/View/SidebarSections/ShelvesShowTags.php

diff --git a/app/Entities/Controllers/BookshelfController.php b/app/Entities/Controllers/BookshelfController.php
index 1e8b26b51..a918c48f1 100644
--- a/app/Entities/Controllers/BookshelfController.php
+++ b/app/Entities/Controllers/BookshelfController.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Activity\ActivityQueries;
 use BookStack\Activity\Models\View;
 use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Queries\BookshelfQueries;
@@ -13,7 +12,6 @@ use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
-use BookStack\References\ReferenceFetcher;
 use BookStack\Util\SimpleListOptions;
 use Exception;
 use Illuminate\Http\Request;
@@ -27,7 +25,6 @@ class BookshelfController extends Controller
         protected EntityQueries $entityQueries,
         protected BookQueries $bookQueries,
         protected ShelfContext $shelfContext,
-        protected ReferenceFetcher $referenceFetcher,
     ) {
     }
 
@@ -46,21 +43,12 @@ class BookshelfController extends Controller
         $shelves = $this->queries->visibleForListWithCover()
             ->orderBy($listOptions->getSort(), $listOptions->getOrder())
             ->paginate(setting()->getInteger('lists-page-count-shelves', 18, 1, 1000));
-        $recents = $this->isSignedIn() ? $this->queries->recentlyViewedForCurrentUser()->get() : false;
-        $popular = $this->queries->popularForList()->get();
-        $new = $this->queries->visibleForList()
-            ->orderBy('created_at', 'desc')
-            ->take(4)
-            ->get();
 
         $this->shelfContext->clearShelfContext();
         $this->setPageTitle(trans('entities.shelves'));
 
         return view('shelves.index', [
             'shelves'     => $shelves,
-            'recents'     => $recents,
-            'popular'     => $popular,
-            'new'         => $new,
             'view'        => $view,
             'listOptions' => $listOptions,
         ]);
@@ -105,7 +93,7 @@ class BookshelfController extends Controller
      *
      * @throws NotFoundException
      */
-    public function show(Request $request, ActivityQueries $activities, string $slug)
+    public function show(Request $request, string $slug)
     {
         try {
             $shelf = $this->queries->findVisibleBySlugOrFail($slug);
@@ -144,9 +132,7 @@ class BookshelfController extends Controller
             'shelf'                   => $shelf,
             'sortedVisibleShelfBooks' => $sortedVisibleShelfBooks,
             'view'                    => $view,
-            'activity'                => $activities->entityActivity($shelf, 20, 1),
             'listOptions'             => $listOptions,
-            'referenceCount'          => $this->referenceFetcher->getReferenceCountToEntity($shelf),
         ]);
     }
 
diff --git a/app/Entities/Controllers/ChapterController.php b/app/Entities/Controllers/ChapterController.php
index db2391599..c089d3575 100644
--- a/app/Entities/Controllers/ChapterController.php
+++ b/app/Entities/Controllers/ChapterController.php
@@ -3,7 +3,6 @@
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Activity\Models\View;
-use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Queries\ChapterQueries;
 use BookStack\Entities\Queries\EntityQueries;
@@ -18,7 +17,6 @@ use BookStack\Exceptions\NotifyException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
-use BookStack\References\ReferenceFetcher;
 use BookStack\Util\DatabaseTransaction;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
@@ -30,7 +28,6 @@ class ChapterController extends Controller
         protected ChapterRepo $chapterRepo,
         protected ChapterQueries $queries,
         protected EntityQueries $entityQueries,
-        protected ReferenceFetcher $referenceFetcher,
     ) {
     }
 
@@ -87,10 +84,10 @@ class ChapterController extends Controller
             return redirect($chapter->getUrl());
         }
 
-        $sidebarTree = (new BookContents($chapter->book))->getTree();
         $pages = $this->entityQueries->pages->visibleForChapterList($chapter->id)->get();
 
-        $nextPreviousLocator = new NextPreviousContentLocator($chapter, $sidebarTree);
+        $bookTree = (new BookContents($chapter->book))->getTree();
+        $nextPreviousLocator = new NextPreviousContentLocator($chapter, $bookTree);
         View::incrementFor($chapter);
 
         $this->setPageTitle($chapter->getShortName());
@@ -99,12 +96,10 @@ class ChapterController extends Controller
             'book'           => $chapter->book,
             'chapter'        => $chapter,
             'current'        => $chapter,
-            'sidebarTree'    => $sidebarTree,
-            'watchOptions'   => new UserEntityWatchOptions(user(), $chapter),
             'pages'          => $pages,
             'next'           => $nextPreviousLocator->getNext(),
             'previous'       => $nextPreviousLocator->getPrevious(),
-            'referenceCount' => $this->referenceFetcher->getReferenceCountToEntity($chapter),
+            'bookTree'       => $bookTree,
         ]);
     }
 
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index 82edfbc27..ec3affc60 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -4,7 +4,6 @@ namespace BookStack\Entities\Controllers;
 
 use BookStack\Activity\Models\View;
 use BookStack\Activity\Tools\CommentTree;
-use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Queries\EntityQueries;
@@ -20,7 +19,6 @@ use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
-use BookStack\References\ReferenceFetcher;
 use BookStack\Util\HtmlContentFilter;
 use BookStack\Util\HtmlContentFilterConfig;
 use Exception;
@@ -35,7 +33,6 @@ class PageController extends Controller
         protected PageRepo $pageRepo,
         protected PageQueries $queries,
         protected EntityQueries $entityQueries,
-        protected ReferenceFetcher $referenceFetcher
     ) {
     }
 
@@ -151,11 +148,10 @@ class PageController extends Controller
 
         $pageContent = (new PageContent($page));
         $page->html = $pageContent->render();
-        $pageNav = $pageContent->getNavigation($page->html);
 
-        $sidebarTree = (new BookContents($page->book))->getTree();
+        $bookTree = (new BookContents($page->book))->getTree();
         $commentTree = (new CommentTree($page));
-        $nextPreviousLocator = new NextPreviousContentLocator($page, $sidebarTree);
+        $nextPreviousLocator = new NextPreviousContentLocator($page, $bookTree);
 
         View::incrementFor($page);
         $this->setPageTitle($page->getShortName());
@@ -164,13 +160,10 @@ class PageController extends Controller
             'page'            => $page,
             'book'            => $page->book,
             'current'         => $page,
-            'sidebarTree'     => $sidebarTree,
+            'bookTree'        => $bookTree,
             'commentTree'     => $commentTree,
-            'pageNav'         => $pageNav,
-            'watchOptions'    => new UserEntityWatchOptions(user(), $page),
             'next'            => $nextPreviousLocator->getNext(),
             'previous'        => $nextPreviousLocator->getPrevious(),
-            'referenceCount'  => $this->referenceFetcher->getReferenceCountToEntity($page),
         ]);
     }
 
diff --git a/app/View/SidebarSectionManager.php b/app/View/SidebarSectionManager.php
index d83b7afb0..d0105fef3 100644
--- a/app/View/SidebarSectionManager.php
+++ b/app/View/SidebarSectionManager.php
@@ -12,6 +12,25 @@ use BookStack\View\SidebarSections\BooksShowDetails;
 use BookStack\View\SidebarSections\BooksShowSearchForm;
 use BookStack\View\SidebarSections\BooksShowShelves;
 use BookStack\View\SidebarSections\BooksShowTags;
+use BookStack\View\SidebarSections\ChaptersShowActions;
+use BookStack\View\SidebarSections\ChaptersShowBookTree;
+use BookStack\View\SidebarSections\ChaptersShowDetails;
+use BookStack\View\SidebarSections\ChaptersShowSearchForm;
+use BookStack\View\SidebarSections\ChaptersShowTags;
+use BookStack\View\SidebarSections\PagesShowActions;
+use BookStack\View\SidebarSections\PagesShowAttachments;
+use BookStack\View\SidebarSections\PagesShowBookTree;
+use BookStack\View\SidebarSections\PagesShowDetails;
+use BookStack\View\SidebarSections\PagesShowPageNav;
+use BookStack\View\SidebarSections\PagesShowTags;
+use BookStack\View\SidebarSections\ShelvesIndexActions;
+use BookStack\View\SidebarSections\ShelvesIndexNew;
+use BookStack\View\SidebarSections\ShelvesIndexPopular;
+use BookStack\View\SidebarSections\ShelvesIndexRecents;
+use BookStack\View\SidebarSections\ShelvesShowActions;
+use BookStack\View\SidebarSections\ShelvesShowActivity;
+use BookStack\View\SidebarSections\ShelvesShowDetails;
+use BookStack\View\SidebarSections\ShelvesShowTags;
 use Illuminate\Contracts\Container\BindingResolutionException;
 
 class SidebarSectionManager
@@ -20,6 +39,26 @@ class SidebarSectionManager
      * @var array<string, array<string, class-string<SidebarSectionInterface>[]>>
      */
     protected array $sectionByLocation = [
+        'shelves-index' => [
+            'left' => [
+                ShelvesIndexRecents::class,
+                ShelvesIndexPopular::class,
+                ShelvesIndexNew::class,
+            ],
+            'right' => [
+                ShelvesIndexActions::class,
+            ],
+        ],
+        'shelves-show' => [
+            'left' => [
+                ShelvesShowTags::class,
+                ShelvesShowDetails::class,
+                ShelvesShowActivity::class,
+            ],
+            'right' => [
+                ShelvesShowActions::class,
+            ],
+        ],
         'books-index' => [
             'left' => [
                 BooksIndexRecents::class,
@@ -42,6 +81,29 @@ class SidebarSectionManager
                 BooksShowActions::class,
             ],
         ],
+        'chapters-show' => [
+            'left' => [
+                ChaptersShowSearchForm::class,
+                ChaptersShowTags::class,
+                ChaptersShowBookTree::class,
+            ],
+            'right' => [
+                ChaptersShowDetails::class,
+                ChaptersShowActions::class,
+            ],
+        ],
+        'pages-show' => [
+            'left' => [
+                PagesShowTags::class,
+                PagesShowAttachments::class,
+                PagesShowPageNav::class,
+                PagesShowBookTree::class,
+            ],
+            'right' => [
+                PagesShowDetails::class,
+                PagesShowActions::class,
+            ],
+        ],
     ];
 
     /**
diff --git a/app/View/SidebarSections/BooksIndexRecents.php b/app/View/SidebarSections/BooksIndexRecents.php
index 485e6d431..dcc5c94de 100644
--- a/app/View/SidebarSections/BooksIndexRecents.php
+++ b/app/View/SidebarSections/BooksIndexRecents.php
@@ -17,8 +17,11 @@ class BooksIndexRecents extends SidebarSection
 
     public function withData(array $viewData, Request $request): array
     {
-        $userSignedIn = !user()->isGuest();
-        $recents = $userSignedIn ? $this->queries->recentlyViewedForCurrentUser()->take(4)->get() : null;
+        $recents = null;
+        if (!user()->isGuest()) {
+            $recents = $this->queries->recentlyViewedForCurrentUser()->take(4)->get();
+        }
+
         return [
             'recents' => $recents,
         ];
diff --git a/app/View/SidebarSections/ChaptersShowActions.php b/app/View/SidebarSections/ChaptersShowActions.php
new file mode 100644
index 000000000..91e990d2f
--- /dev/null
+++ b/app/View/SidebarSections/ChaptersShowActions.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Chapter;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ChaptersShowActions extends SidebarSection
+{
+    protected string $view = 'chapters.parts.show-sidebar-section-actions';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Chapter $chapter */
+        $chapter = $viewData['chapter'];
+
+        return [
+            'chapter' => $chapter,
+            'watchOptions' => new UserEntityWatchOptions(user(), $chapter),
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ChaptersShowBookTree.php b/app/View/SidebarSections/ChaptersShowBookTree.php
new file mode 100644
index 000000000..d0de183f9
--- /dev/null
+++ b/app/View/SidebarSections/ChaptersShowBookTree.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Models\Book;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ChaptersShowBookTree extends SidebarSection
+{
+    protected string $view = 'entities.book-tree';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+
+        return [
+            'book' => $book,
+            'bookTree' => $viewData['bookTree'],
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ChaptersShowDetails.php b/app/View/SidebarSections/ChaptersShowDetails.php
new file mode 100644
index 000000000..1453ceb9d
--- /dev/null
+++ b/app/View/SidebarSections/ChaptersShowDetails.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\References\ReferenceFetcher;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ChaptersShowDetails extends SidebarSection
+{
+    protected string $view = 'chapters.parts.show-sidebar-section-details';
+
+    public function __construct(
+        protected ReferenceFetcher $referenceFetcher,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+        /** @var Chapter $chapter */
+        $chapter = $viewData['chapter'];
+
+        $referenceCount = $this->referenceFetcher->getReferenceCountToEntity($chapter);
+
+        return [
+            'chapter' => $chapter,
+            'book' => $book,
+            'watchOptions' => new UserEntityWatchOptions(user(), $chapter),
+            'referenceCount' => $referenceCount,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ChaptersShowSearchForm.php b/app/View/SidebarSections/ChaptersShowSearchForm.php
new file mode 100644
index 000000000..2ae71bc05
--- /dev/null
+++ b/app/View/SidebarSections/ChaptersShowSearchForm.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ChaptersShowSearchForm extends SidebarSection
+{
+    protected string $view = 'entities.search-form';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        return [
+            'label' => trans('entities.chapters_search_this'),
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ChaptersShowTags.php b/app/View/SidebarSections/ChaptersShowTags.php
new file mode 100644
index 000000000..df806d191
--- /dev/null
+++ b/app/View/SidebarSections/ChaptersShowTags.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Models\Chapter;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ChaptersShowTags extends SidebarSection
+{
+    protected string $view = 'chapters.parts.show-sidebar-section-tags';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Chapter $chapter */
+        $chapter = $viewData['chapter'];
+
+        return [
+            'chapter' => $chapter,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/PagesShowActions.php b/app/View/SidebarSections/PagesShowActions.php
new file mode 100644
index 000000000..de832e775
--- /dev/null
+++ b/app/View/SidebarSections/PagesShowActions.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Page;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class PagesShowActions extends SidebarSection
+{
+    protected string $view = 'pages.parts.show-sidebar-section-actions';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Page $page */
+        $page = $viewData['page'];
+
+        return [
+            'page' => $page,
+            'watchOptions' => new UserEntityWatchOptions(user(), $page),
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/PagesShowAttachments.php b/app/View/SidebarSections/PagesShowAttachments.php
new file mode 100644
index 000000000..ef1dec4a0
--- /dev/null
+++ b/app/View/SidebarSections/PagesShowAttachments.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Models\Page;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class PagesShowAttachments extends SidebarSection
+{
+    protected string $view = 'pages.parts.show-sidebar-section-attachments';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Page $page */
+        $page = $viewData['page'];
+
+        return [
+            'page' => $page,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/PagesShowBookTree.php b/app/View/SidebarSections/PagesShowBookTree.php
new file mode 100644
index 000000000..3de85db49
--- /dev/null
+++ b/app/View/SidebarSections/PagesShowBookTree.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Models\Book;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class PagesShowBookTree extends SidebarSection
+{
+    protected string $view = 'entities.book-tree';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+
+        return [
+            'book' => $book,
+            'bookTree' => $viewData['bookTree'],
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/PagesShowDetails.php b/app/View/SidebarSections/PagesShowDetails.php
new file mode 100644
index 000000000..e8ddfd341
--- /dev/null
+++ b/app/View/SidebarSections/PagesShowDetails.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Page;
+use BookStack\References\ReferenceFetcher;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class PagesShowDetails extends SidebarSection
+{
+    protected string $view = 'pages.parts.show-sidebar-section-details';
+
+    public function __construct(
+        protected ReferenceFetcher $referenceFetcher,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+        /** @var Page $page */
+        $page = $viewData['page'];
+
+        $referenceCount = $this->referenceFetcher->getReferenceCountToEntity($page);
+
+        return [
+            'page' => $page,
+            'book' => $book,
+            'watchOptions' => new UserEntityWatchOptions(user(), $page),
+            'referenceCount' => $referenceCount,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/PagesShowPageNav.php b/app/View/SidebarSections/PagesShowPageNav.php
new file mode 100644
index 000000000..6f9d96652
--- /dev/null
+++ b/app/View/SidebarSections/PagesShowPageNav.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Tools\PageContent;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class PagesShowPageNav extends SidebarSection
+{
+    protected string $view = 'pages.parts.show-sidebar-section-page-nav';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Page $page */
+        $page = $viewData['page'];
+
+        $pageContent = new PageContent($page);
+        $pageNav = $pageContent->getNavigation($page->html);
+
+        return [
+            'pageNav' => $pageNav,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/PagesShowTags.php b/app/View/SidebarSections/PagesShowTags.php
new file mode 100644
index 000000000..5fa46dc17
--- /dev/null
+++ b/app/View/SidebarSections/PagesShowTags.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Models\Page;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class PagesShowTags extends SidebarSection
+{
+    protected string $view = 'pages.parts.show-sidebar-section-tags';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Page $page */
+        $page = $viewData['page'];
+
+        return [
+            'page' => $page,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ShelvesIndexActions.php b/app/View/SidebarSections/ShelvesIndexActions.php
new file mode 100644
index 000000000..f15feecbe
--- /dev/null
+++ b/app/View/SidebarSections/ShelvesIndexActions.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ShelvesIndexActions extends SidebarSection
+{
+    protected string $view = 'shelves.parts.index-sidebar-section-actions';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        return [
+            'view' => $viewData['view'],
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ShelvesIndexNew.php b/app/View/SidebarSections/ShelvesIndexNew.php
new file mode 100644
index 000000000..90fda4985
--- /dev/null
+++ b/app/View/SidebarSections/ShelvesIndexNew.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Queries\BookshelfQueries;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ShelvesIndexNew extends SidebarSection
+{
+    protected string $view = 'shelves.parts.index-sidebar-section-new';
+
+    public function __construct(
+        protected BookshelfQueries $queries,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        $new = $this->queries->visibleForList()
+            ->orderBy('created_at', 'desc')
+            ->take(4)
+            ->get();
+
+        return [
+            'new' => $new,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ShelvesIndexPopular.php b/app/View/SidebarSections/ShelvesIndexPopular.php
new file mode 100644
index 000000000..4860b8c71
--- /dev/null
+++ b/app/View/SidebarSections/ShelvesIndexPopular.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Queries\BookshelfQueries;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ShelvesIndexPopular extends SidebarSection
+{
+    protected string $view = 'shelves.parts.index-sidebar-section-popular';
+
+    public function __construct(
+        protected BookshelfQueries $queries,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        return [
+            'popular' => $this->queries->popularForList()->take(4)->get(),
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ShelvesIndexRecents.php b/app/View/SidebarSections/ShelvesIndexRecents.php
new file mode 100644
index 000000000..72b6430eb
--- /dev/null
+++ b/app/View/SidebarSections/ShelvesIndexRecents.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Queries\BookshelfQueries;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ShelvesIndexRecents extends SidebarSection
+{
+    protected string $view = 'shelves.parts.index-sidebar-section-recents';
+
+    public function __construct(
+        protected BookshelfQueries $queries,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        $recents = null;
+        if (!user()->isGuest()) {
+            $recents = $this->queries->recentlyViewedForCurrentUser()->take(4)->get();
+        }
+
+        return [
+            'recents' => $recents,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ShelvesShowActions.php b/app/View/SidebarSections/ShelvesShowActions.php
new file mode 100644
index 000000000..b28abab6f
--- /dev/null
+++ b/app/View/SidebarSections/ShelvesShowActions.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ShelvesShowActions extends SidebarSection
+{
+    protected string $view = 'shelves.parts.show-sidebar-section-actions';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Bookshelf $shelf */
+        $shelf = $viewData['shelf'];
+
+        return [
+            'shelf' => $shelf,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ShelvesShowActivity.php b/app/View/SidebarSections/ShelvesShowActivity.php
new file mode 100644
index 000000000..90de335e2
--- /dev/null
+++ b/app/View/SidebarSections/ShelvesShowActivity.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Activity\ActivityQueries;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ShelvesShowActivity extends SidebarSection
+{
+    protected string $view = 'shelves.parts.show-sidebar-section-activity';
+
+    public function __construct(
+        protected ActivityQueries $activityQueries,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Bookshelf $shelf */
+        $shelf = $viewData['shelf'];
+
+        return [
+            'activity' => $this->activityQueries->entityActivity($shelf, 20, 1),
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ShelvesShowDetails.php b/app/View/SidebarSections/ShelvesShowDetails.php
new file mode 100644
index 000000000..62dc9bab2
--- /dev/null
+++ b/app/View/SidebarSections/ShelvesShowDetails.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\References\ReferenceFetcher;
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ShelvesShowDetails extends SidebarSection
+{
+    protected string $view = 'shelves.parts.show-sidebar-section-details';
+
+    public function __construct(
+        protected ReferenceFetcher $referenceFetcher,
+    ) {
+    }
+
+    public function withData(array $viewData, Request $request): array
+    {
+        /** @var Bookshelf $shelf */
+        $shelf = $viewData['shelf'];
+        $referenceCount = $this->referenceFetcher->getReferenceCountToEntity($shelf);
+
+        return [
+            'shelf' => $shelf,
+            'referenceCount' => $referenceCount,
+        ];
+    }
+}
diff --git a/app/View/SidebarSections/ShelvesShowTags.php b/app/View/SidebarSections/ShelvesShowTags.php
new file mode 100644
index 000000000..7c02c50fc
--- /dev/null
+++ b/app/View/SidebarSections/ShelvesShowTags.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace BookStack\View\SidebarSections;
+
+use BookStack\View\SidebarSection;
+use Illuminate\Http\Request;
+
+class ShelvesShowTags extends SidebarSection
+{
+    protected string $view = 'shelves.parts.show-sidebar-section-tags';
+
+    public function withData(array $viewData, Request $request): array
+    {
+        return [
+            'book' => $viewData['book'],
+        ];
+    }
+}
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 7ef877661..569d901f6 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -62,15 +62,10 @@
 
 @stop
 
-@section('right')
-    @include('chapters.parts.show-sidebar-section-details', ['chapter' => $chapter, 'book' => $book, 'watchOptions' => $watchOptions])
-    @include('chapters.parts.show-sidebar-section-actions', ['chapter' => $chapter, 'watchOptions' => $watchOptions])
-@stop
-
 @section('left')
-    @include('entities.search-form', ['label' => trans('entities.chapters_search_this')])
-    @include('chapters.parts.show-sidebar-section-tags', ['chapter' => $chapter])
-    @include('entities.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
+    @include('common.sidebar-sections', ['location' => 'chapters-show', 'position' => 'left'])
 @stop
 
-
+@section('right')
+    @include('common.sidebar-sections', ['location' => 'chapters-show', 'position' => 'right'])
+@stop
diff --git a/resources/views/entities/book-tree.blade.php b/resources/views/entities/book-tree.blade.php
index c95b1eebc..81dbd302e 100644
--- a/resources/views/entities/book-tree.blade.php
+++ b/resources/views/entities/book-tree.blade.php
@@ -11,7 +11,7 @@
             </li>
         @endif
 
-        @foreach($sidebarTree as $bookChild)
+        @foreach($bookTree as $bookChild)
             <li class="list-item-{{ $bookChild->getType() }} {{ $bookChild->getType() }} {{ $bookChild->isA('page') && $bookChild->draft ? 'draft' : '' }}">
                 @include('entities.list-item-basic', ['entity' => $bookChild, 'classes' => $current->matches($bookChild)? 'selected' : ''])
 
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index d34bfc6ae..08d01973d 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -36,13 +36,9 @@
 @stop
 
 @section('left')
-    @include('pages.parts.show-sidebar-section-tags', ['page' => $page])
-    @include('pages.parts.show-sidebar-section-attachments', ['page' => $page])
-    @include('pages.parts.show-sidebar-section-page-nav', ['pageNav' => $pageNav])
-    @include('entities.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
+    @include('common.sidebar-sections', ['location' => 'pages-show', 'position' => 'left'])
 @stop
 
 @section('right')
-    @include('pages.parts.show-sidebar-section-details', ['page' => $page, 'watchOptions' => $watchOptions, 'book' => $book])
-    @include('pages.parts.show-sidebar-section-actions', ['page' => $page, 'watchOptions' => $watchOptions])
+    @include('common.sidebar-sections', ['location' => 'pages-show', 'position' => 'right'])
 @stop
diff --git a/resources/views/shelves/index.blade.php b/resources/views/shelves/index.blade.php
index 70357068d..2fc78fa50 100644
--- a/resources/views/shelves/index.blade.php
+++ b/resources/views/shelves/index.blade.php
@@ -4,12 +4,10 @@
     @include('shelves.parts.list', ['shelves' => $shelves, 'view' => $view, 'listOptions' => $listOptions])
 @stop
 
-@section('right')
-    @include('shelves.parts.index-sidebar-section-actions', ['view' => $view])
+@section('left')
+    @include('common.sidebar-sections', ['location' => 'shelves-index', 'position' => 'left'])
 @stop
 
-@section('left')
-    @include('shelves.parts.index-sidebar-section-recents', ['recents' => $recents])
-    @include('shelves.parts.index-sidebar-section-popular', ['popular' => $popular])
-    @include('shelves.parts.index-sidebar-section-new', ['new' => $new])
-@stop
\ No newline at end of file
+@section('right')
+    @include('common.sidebar-sections', ['location' => 'shelves-index', 'position' => 'right'])
+@stop
diff --git a/resources/views/shelves/show.blade.php b/resources/views/shelves/show.blade.php
index 9d07e5da0..320e1066c 100644
--- a/resources/views/shelves/show.blade.php
+++ b/resources/views/shelves/show.blade.php
@@ -69,15 +69,9 @@
 @stop
 
 @section('left')
-    @include('shelves.parts.show-sidebar-section-tags', ['shelf' => $shelf])
-    @include('shelves.parts.show-sidebar-section-details', ['shelf' => $shelf])
-    @include('shelves.parts.show-sidebar-section-activity', ['activity' => $activity])
+    @include('common.sidebar-sections', ['location' => 'shelves-show', 'position' => 'left'])
 @stop
 
 @section('right')
-    @include('shelves.parts.show-sidebar-section-actions', ['shelf' => $shelf, 'view' => $view])
+    @include('common.sidebar-sections', ['location' => 'shelves-show', 'position' => 'right'])
 @stop
-
-
-
-

From d4d90cc39c803f10f27bf8501088b116bcfc8d6c Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Fri, 7 Aug 2026 16:00:04 +0100
Subject: [PATCH 11/72] Views: Renamed SidebarSections to ViewBlocks

---
 .../Providers/ViewTweaksServiceProvider.php   |   4 +-
 app/View/SidebarSectionManager.php            | 139 ------------------
 .../{SidebarSection.php => ViewBlock.php}     |   2 +-
 ...onInterface.php => ViewBlockInterface.php} |   4 +-
 app/View/ViewBlockManager.php                 | 139 ++++++++++++++++++
 .../BooksIndexActions.php                     |   6 +-
 .../BooksIndexNew.php                         |   6 +-
 .../BooksIndexPopular.php                     |   6 +-
 .../BooksIndexRecents.php                     |   6 +-
 .../BooksShowActions.php                      |   6 +-
 .../BooksShowActivity.php                     |   6 +-
 .../BooksShowDetails.php                      |   6 +-
 .../BooksShowSearchForm.php                   |   6 +-
 .../BooksShowShelves.php                      |   6 +-
 .../BooksShowTags.php                         |   6 +-
 .../ChaptersShowActions.php                   |   6 +-
 .../ChaptersShowBookTree.php                  |   6 +-
 .../ChaptersShowDetails.php                   |   6 +-
 .../ChaptersShowSearchForm.php                |   6 +-
 .../ChaptersShowTags.php                      |   6 +-
 .../PagesShowActions.php                      |   6 +-
 .../PagesShowAttachments.php                  |   6 +-
 .../PagesShowBookTree.php                     |   6 +-
 .../PagesShowDetails.php                      |   6 +-
 .../PagesShowPageNav.php                      |   6 +-
 .../PagesShowTags.php                         |   6 +-
 .../ShelvesIndexActions.php                   |   6 +-
 .../ShelvesIndexNew.php                       |   6 +-
 .../ShelvesIndexPopular.php                   |   6 +-
 .../ShelvesIndexRecents.php                   |   6 +-
 .../ShelvesShowActions.php                    |   6 +-
 .../ShelvesShowActivity.php                   |   6 +-
 .../ShelvesShowDetails.php                    |   6 +-
 .../ShelvesShowTags.php                       |   6 +-
 .../views/common/sidebar-sections.blade.php   |   2 +-
 35 files changed, 232 insertions(+), 232 deletions(-)
 delete mode 100644 app/View/SidebarSectionManager.php
 rename app/View/{SidebarSection.php => ViewBlock.php} (73%)
 rename app/View/{SidebarSectionInterface.php => ViewBlockInterface.php} (82%)
 create mode 100644 app/View/ViewBlockManager.php
 rename app/View/{SidebarSections => ViewBlocks}/BooksIndexActions.php (68%)
 rename app/View/{SidebarSections => ViewBlocks}/BooksIndexNew.php (81%)
 rename app/View/{SidebarSections => ViewBlocks}/BooksIndexPopular.php (77%)
 rename app/View/{SidebarSections => ViewBlocks}/BooksIndexRecents.php (81%)
 rename app/View/{SidebarSections => ViewBlocks}/BooksShowActions.php (79%)
 rename app/View/{SidebarSections => ViewBlocks}/BooksShowActivity.php (81%)
 rename app/View/{SidebarSections => ViewBlocks}/BooksShowDetails.php (86%)
 rename app/View/{SidebarSections => ViewBlocks}/BooksShowSearchForm.php (67%)
 rename app/View/{SidebarSections => ViewBlocks}/BooksShowShelves.php (77%)
 rename app/View/{SidebarSections => ViewBlocks}/BooksShowTags.php (68%)
 rename app/View/{SidebarSections => ViewBlocks}/ChaptersShowActions.php (80%)
 rename app/View/{SidebarSections => ViewBlocks}/ChaptersShowBookTree.php (75%)
 rename app/View/{SidebarSections => ViewBlocks}/ChaptersShowDetails.php (88%)
 rename app/View/{SidebarSections => ViewBlocks}/ChaptersShowSearchForm.php (67%)
 rename app/View/{SidebarSections => ViewBlocks}/ChaptersShowTags.php (75%)
 rename app/View/{SidebarSections => ViewBlocks}/PagesShowActions.php (79%)
 rename app/View/{SidebarSections => ViewBlocks}/PagesShowAttachments.php (74%)
 rename app/View/{SidebarSections => ViewBlocks}/PagesShowBookTree.php (75%)
 rename app/View/{SidebarSections => ViewBlocks}/PagesShowDetails.php (87%)
 rename app/View/{SidebarSections => ViewBlocks}/PagesShowPageNav.php (80%)
 rename app/View/{SidebarSections => ViewBlocks}/PagesShowTags.php (74%)
 rename app/View/{SidebarSections => ViewBlocks}/ShelvesIndexActions.php (68%)
 rename app/View/{SidebarSections => ViewBlocks}/ShelvesIndexNew.php (81%)
 rename app/View/{SidebarSections => ViewBlocks}/ShelvesIndexPopular.php (78%)
 rename app/View/{SidebarSections => ViewBlocks}/ShelvesIndexRecents.php (81%)
 rename app/View/{SidebarSections => ViewBlocks}/ShelvesShowActions.php (75%)
 rename app/View/{SidebarSections => ViewBlocks}/ShelvesShowActivity.php (81%)
 rename app/View/{SidebarSections => ViewBlocks}/ShelvesShowDetails.php (83%)
 rename app/View/{SidebarSections => ViewBlocks}/ShelvesShowTags.php (68%)

diff --git a/app/App/Providers/ViewTweaksServiceProvider.php b/app/App/Providers/ViewTweaksServiceProvider.php
index d2d45abcc..0c68aa1c0 100644
--- a/app/App/Providers/ViewTweaksServiceProvider.php
+++ b/app/App/Providers/ViewTweaksServiceProvider.php
@@ -4,7 +4,7 @@ namespace BookStack\App\Providers;
 
 use BookStack\Entities\BreadcrumbsViewComposer;
 use BookStack\Util\DateFormatter;
-use BookStack\View\SidebarSectionManager;
+use BookStack\View\ViewBlockManager;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\View;
@@ -34,7 +34,7 @@ class ViewTweaksServiceProvider extends ServiceProvider
 
         // View Globals
         View::share('dates', $this->app->make(DateFormatter::class));
-        View::share('sidebar', $this->app->make(SidebarSectionManager::class));
+        View::share('viewBlocks', $this->app->make(ViewBlockManager::class));
 
         // Custom blade view directives
         Blade::directive('icon', function ($expression) {
diff --git a/app/View/SidebarSectionManager.php b/app/View/SidebarSectionManager.php
deleted file mode 100644
index d0105fef3..000000000
--- a/app/View/SidebarSectionManager.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-namespace BookStack\View;
-
-use BookStack\View\SidebarSections\BooksIndexActions;
-use BookStack\View\SidebarSections\BooksIndexNew;
-use BookStack\View\SidebarSections\BooksIndexPopular;
-use BookStack\View\SidebarSections\BooksIndexRecents;
-use BookStack\View\SidebarSections\BooksShowActions;
-use BookStack\View\SidebarSections\BooksShowActivity;
-use BookStack\View\SidebarSections\BooksShowDetails;
-use BookStack\View\SidebarSections\BooksShowSearchForm;
-use BookStack\View\SidebarSections\BooksShowShelves;
-use BookStack\View\SidebarSections\BooksShowTags;
-use BookStack\View\SidebarSections\ChaptersShowActions;
-use BookStack\View\SidebarSections\ChaptersShowBookTree;
-use BookStack\View\SidebarSections\ChaptersShowDetails;
-use BookStack\View\SidebarSections\ChaptersShowSearchForm;
-use BookStack\View\SidebarSections\ChaptersShowTags;
-use BookStack\View\SidebarSections\PagesShowActions;
-use BookStack\View\SidebarSections\PagesShowAttachments;
-use BookStack\View\SidebarSections\PagesShowBookTree;
-use BookStack\View\SidebarSections\PagesShowDetails;
-use BookStack\View\SidebarSections\PagesShowPageNav;
-use BookStack\View\SidebarSections\PagesShowTags;
-use BookStack\View\SidebarSections\ShelvesIndexActions;
-use BookStack\View\SidebarSections\ShelvesIndexNew;
-use BookStack\View\SidebarSections\ShelvesIndexPopular;
-use BookStack\View\SidebarSections\ShelvesIndexRecents;
-use BookStack\View\SidebarSections\ShelvesShowActions;
-use BookStack\View\SidebarSections\ShelvesShowActivity;
-use BookStack\View\SidebarSections\ShelvesShowDetails;
-use BookStack\View\SidebarSections\ShelvesShowTags;
-use Illuminate\Contracts\Container\BindingResolutionException;
-
-class SidebarSectionManager
-{
-    /**
-     * @var array<string, array<string, class-string<SidebarSectionInterface>[]>>
-     */
-    protected array $sectionByLocation = [
-        'shelves-index' => [
-            'left' => [
-                ShelvesIndexRecents::class,
-                ShelvesIndexPopular::class,
-                ShelvesIndexNew::class,
-            ],
-            'right' => [
-                ShelvesIndexActions::class,
-            ],
-        ],
-        'shelves-show' => [
-            'left' => [
-                ShelvesShowTags::class,
-                ShelvesShowDetails::class,
-                ShelvesShowActivity::class,
-            ],
-            'right' => [
-                ShelvesShowActions::class,
-            ],
-        ],
-        'books-index' => [
-            'left' => [
-                BooksIndexRecents::class,
-                BooksIndexPopular::class,
-                BooksIndexNew::class,
-            ],
-            'right' => [
-                BooksIndexActions::class,
-            ],
-        ],
-        'books-show' => [
-            'left' => [
-                BooksShowSearchForm::class,
-                BooksShowTags::class,
-                BooksShowShelves::class,
-                BooksShowActivity::class,
-            ],
-            'right' => [
-                BooksShowDetails::class,
-                BooksShowActions::class,
-            ],
-        ],
-        'chapters-show' => [
-            'left' => [
-                ChaptersShowSearchForm::class,
-                ChaptersShowTags::class,
-                ChaptersShowBookTree::class,
-            ],
-            'right' => [
-                ChaptersShowDetails::class,
-                ChaptersShowActions::class,
-            ],
-        ],
-        'pages-show' => [
-            'left' => [
-                PagesShowTags::class,
-                PagesShowAttachments::class,
-                PagesShowPageNav::class,
-                PagesShowBookTree::class,
-            ],
-            'right' => [
-                PagesShowDetails::class,
-                PagesShowActions::class,
-            ],
-        ],
-    ];
-
-    /**
-     * Register a sidebar section to be displayed at the given location and position.
-     * @param class-string<SidebarSectionInterface> $sectionClass
-     */
-    public function register(string $location, string $position, string $sectionClass): void
-    {
-        if (!isset($this->sectionByLocation[$location])) {
-            $this->sectionByLocation[$location] = [];
-        }
-
-        if (!isset($this->sectionByLocation[$location][$position])) {
-            $this->sectionByLocation[$location][$position] = [];
-        }
-
-        $this->sectionByLocation[$location][$position][] = $sectionClass;
-    }
-
-    /**
-     * Get all sidebar sections registered for a given location.
-     *
-     * @return SidebarSectionInterface[]
-     * @throws BindingResolutionException
-     */
-    public function getSectionsForLocation(string $location, string $position): array
-    {
-        $sections = array_unique($this->sectionByLocation[$location][$position] ?? []);
-        return array_map(function (string $className) {
-            return app()->make($className);
-        }, $sections);
-    }
-}
diff --git a/app/View/SidebarSection.php b/app/View/ViewBlock.php
similarity index 73%
rename from app/View/SidebarSection.php
rename to app/View/ViewBlock.php
index 68e1aa291..a835e7075 100644
--- a/app/View/SidebarSection.php
+++ b/app/View/ViewBlock.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\View;
 
-abstract class SidebarSection implements SidebarSectionInterface
+abstract class ViewBlock implements ViewBlockInterface
 {
     protected string $view;
 
diff --git a/app/View/SidebarSectionInterface.php b/app/View/ViewBlockInterface.php
similarity index 82%
rename from app/View/SidebarSectionInterface.php
rename to app/View/ViewBlockInterface.php
index 84032ab61..b9c25e9f6 100644
--- a/app/View/SidebarSectionInterface.php
+++ b/app/View/ViewBlockInterface.php
@@ -4,10 +4,10 @@ namespace BookStack\View;
 
 use Illuminate\Http\Request;
 
-interface SidebarSectionInterface
+interface ViewBlockInterface
 {
     /**
-     * Get the view to render for this section.
+     * Get the view to render for this block.
      */
     public function getView(): string;
 
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
new file mode 100644
index 000000000..88d866135
--- /dev/null
+++ b/app/View/ViewBlockManager.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace BookStack\View;
+
+use BookStack\View\ViewBlocks\BooksIndexActions;
+use BookStack\View\ViewBlocks\BooksIndexNew;
+use BookStack\View\ViewBlocks\BooksIndexPopular;
+use BookStack\View\ViewBlocks\BooksIndexRecents;
+use BookStack\View\ViewBlocks\BooksShowActions;
+use BookStack\View\ViewBlocks\BooksShowActivity;
+use BookStack\View\ViewBlocks\BooksShowDetails;
+use BookStack\View\ViewBlocks\BooksShowSearchForm;
+use BookStack\View\ViewBlocks\BooksShowShelves;
+use BookStack\View\ViewBlocks\BooksShowTags;
+use BookStack\View\ViewBlocks\ChaptersShowActions;
+use BookStack\View\ViewBlocks\ChaptersShowBookTree;
+use BookStack\View\ViewBlocks\ChaptersShowDetails;
+use BookStack\View\ViewBlocks\ChaptersShowSearchForm;
+use BookStack\View\ViewBlocks\ChaptersShowTags;
+use BookStack\View\ViewBlocks\PagesShowActions;
+use BookStack\View\ViewBlocks\PagesShowAttachments;
+use BookStack\View\ViewBlocks\PagesShowBookTree;
+use BookStack\View\ViewBlocks\PagesShowDetails;
+use BookStack\View\ViewBlocks\PagesShowPageNav;
+use BookStack\View\ViewBlocks\PagesShowTags;
+use BookStack\View\ViewBlocks\ShelvesIndexActions;
+use BookStack\View\ViewBlocks\ShelvesIndexNew;
+use BookStack\View\ViewBlocks\ShelvesIndexPopular;
+use BookStack\View\ViewBlocks\ShelvesIndexRecents;
+use BookStack\View\ViewBlocks\ShelvesShowActions;
+use BookStack\View\ViewBlocks\ShelvesShowActivity;
+use BookStack\View\ViewBlocks\ShelvesShowDetails;
+use BookStack\View\ViewBlocks\ShelvesShowTags;
+use Illuminate\Contracts\Container\BindingResolutionException;
+
+class ViewBlockManager
+{
+    /**
+     * @var array<string, array<string, class-string<ViewBlockInterface>[]>>
+     */
+    protected array $blocksByLocationAndPosition = [
+        'shelves-index' => [
+            'left' => [
+                ShelvesIndexRecents::class,
+                ShelvesIndexPopular::class,
+                ShelvesIndexNew::class,
+            ],
+            'right' => [
+                ShelvesIndexActions::class,
+            ],
+        ],
+        'shelves-show' => [
+            'left' => [
+                ShelvesShowTags::class,
+                ShelvesShowDetails::class,
+                ShelvesShowActivity::class,
+            ],
+            'right' => [
+                ShelvesShowActions::class,
+            ],
+        ],
+        'books-index' => [
+            'left' => [
+                BooksIndexRecents::class,
+                BooksIndexPopular::class,
+                BooksIndexNew::class,
+            ],
+            'right' => [
+                BooksIndexActions::class,
+            ],
+        ],
+        'books-show' => [
+            'left' => [
+                BooksShowSearchForm::class,
+                BooksShowTags::class,
+                BooksShowShelves::class,
+                BooksShowActivity::class,
+            ],
+            'right' => [
+                BooksShowDetails::class,
+                BooksShowActions::class,
+            ],
+        ],
+        'chapters-show' => [
+            'left' => [
+                ChaptersShowSearchForm::class,
+                ChaptersShowTags::class,
+                ChaptersShowBookTree::class,
+            ],
+            'right' => [
+                ChaptersShowDetails::class,
+                ChaptersShowActions::class,
+            ],
+        ],
+        'pages-show' => [
+            'left' => [
+                PagesShowTags::class,
+                PagesShowAttachments::class,
+                PagesShowPageNav::class,
+                PagesShowBookTree::class,
+            ],
+            'right' => [
+                PagesShowDetails::class,
+                PagesShowActions::class,
+            ],
+        ],
+    ];
+
+    /**
+     * Register a block type to be displayed at the given location and position.
+     * @param class-string<ViewBlockInterface> $blockClass
+     */
+    public function register(string $location, string $position, string $blockClass): void
+    {
+        if (!isset($this->blocksByLocationAndPosition[$location])) {
+            $this->blocksByLocationAndPosition[$location] = [];
+        }
+
+        if (!isset($this->blocksByLocationAndPosition[$location][$position])) {
+            $this->blocksByLocationAndPosition[$location][$position] = [];
+        }
+
+        $this->blocksByLocationAndPosition[$location][$position][] = $blockClass;
+    }
+
+    /**
+     * Get all blocks registered for a given location and position.
+     *
+     * @return ViewBlockInterface[]
+     * @throws BindingResolutionException
+     */
+    public function getForLocation(string $location, string $position): array
+    {
+        $sections = array_unique($this->blocksByLocationAndPosition[$location][$position] ?? []);
+        return array_map(function (string $className) {
+            return app()->make($className);
+        }, $sections);
+    }
+}
diff --git a/app/View/SidebarSections/BooksIndexActions.php b/app/View/ViewBlocks/BooksIndexActions.php
similarity index 68%
rename from app/View/SidebarSections/BooksIndexActions.php
rename to app/View/ViewBlocks/BooksIndexActions.php
index 62f856a65..fd290c601 100644
--- a/app/View/SidebarSections/BooksIndexActions.php
+++ b/app/View/ViewBlocks/BooksIndexActions.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class BooksIndexActions extends SidebarSection
+class BooksIndexActions extends ViewBlock
 {
     protected string $view = 'books.parts.index-sidebar-section-actions';
 
diff --git a/app/View/SidebarSections/BooksIndexNew.php b/app/View/ViewBlocks/BooksIndexNew.php
similarity index 81%
rename from app/View/SidebarSections/BooksIndexNew.php
rename to app/View/ViewBlocks/BooksIndexNew.php
index 33a57f9d9..dee863b36 100644
--- a/app/View/SidebarSections/BooksIndexNew.php
+++ b/app/View/ViewBlocks/BooksIndexNew.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Queries\BookQueries;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class BooksIndexNew extends SidebarSection
+class BooksIndexNew extends ViewBlock
 {
     protected string $view = 'books.parts.index-sidebar-section-new';
 
diff --git a/app/View/SidebarSections/BooksIndexPopular.php b/app/View/ViewBlocks/BooksIndexPopular.php
similarity index 77%
rename from app/View/SidebarSections/BooksIndexPopular.php
rename to app/View/ViewBlocks/BooksIndexPopular.php
index 9f5cc613f..cb478170d 100644
--- a/app/View/SidebarSections/BooksIndexPopular.php
+++ b/app/View/ViewBlocks/BooksIndexPopular.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Queries\BookQueries;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class BooksIndexPopular extends SidebarSection
+class BooksIndexPopular extends ViewBlock
 {
     protected string $view = 'books.parts.index-sidebar-section-popular';
 
diff --git a/app/View/SidebarSections/BooksIndexRecents.php b/app/View/ViewBlocks/BooksIndexRecents.php
similarity index 81%
rename from app/View/SidebarSections/BooksIndexRecents.php
rename to app/View/ViewBlocks/BooksIndexRecents.php
index dcc5c94de..e3a632e54 100644
--- a/app/View/SidebarSections/BooksIndexRecents.php
+++ b/app/View/ViewBlocks/BooksIndexRecents.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Queries\BookQueries;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class BooksIndexRecents extends SidebarSection
+class BooksIndexRecents extends ViewBlock
 {
     protected string $view = 'books.parts.index-sidebar-section-recents';
 
diff --git a/app/View/SidebarSections/BooksShowActions.php b/app/View/ViewBlocks/BooksShowActions.php
similarity index 79%
rename from app/View/SidebarSections/BooksShowActions.php
rename to app/View/ViewBlocks/BooksShowActions.php
index 0f97e625c..43f63c24e 100644
--- a/app/View/SidebarSections/BooksShowActions.php
+++ b/app/View/ViewBlocks/BooksShowActions.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class BooksShowActions extends SidebarSection
+class BooksShowActions extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-actions';
 
diff --git a/app/View/SidebarSections/BooksShowActivity.php b/app/View/ViewBlocks/BooksShowActivity.php
similarity index 81%
rename from app/View/SidebarSections/BooksShowActivity.php
rename to app/View/ViewBlocks/BooksShowActivity.php
index d892c5ea7..4ba8697c5 100644
--- a/app/View/SidebarSections/BooksShowActivity.php
+++ b/app/View/ViewBlocks/BooksShowActivity.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Activity\ActivityQueries;
 use BookStack\Entities\Models\Book;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class BooksShowActivity extends SidebarSection
+class BooksShowActivity extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-activity';
 
diff --git a/app/View/SidebarSections/BooksShowDetails.php b/app/View/ViewBlocks/BooksShowDetails.php
similarity index 86%
rename from app/View/SidebarSections/BooksShowDetails.php
rename to app/View/ViewBlocks/BooksShowDetails.php
index bd91663b2..12699d5a0 100644
--- a/app/View/SidebarSections/BooksShowDetails.php
+++ b/app/View/ViewBlocks/BooksShowDetails.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
 use BookStack\References\ReferenceFetcher;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class BooksShowDetails extends SidebarSection
+class BooksShowDetails extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-details';
 
diff --git a/app/View/SidebarSections/BooksShowSearchForm.php b/app/View/ViewBlocks/BooksShowSearchForm.php
similarity index 67%
rename from app/View/SidebarSections/BooksShowSearchForm.php
rename to app/View/ViewBlocks/BooksShowSearchForm.php
index 8fa24134b..d75db3d93 100644
--- a/app/View/SidebarSections/BooksShowSearchForm.php
+++ b/app/View/ViewBlocks/BooksShowSearchForm.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class BooksShowSearchForm extends SidebarSection
+class BooksShowSearchForm extends ViewBlock
 {
     protected string $view = 'entities.search-form';
 
diff --git a/app/View/SidebarSections/BooksShowShelves.php b/app/View/ViewBlocks/BooksShowShelves.php
similarity index 77%
rename from app/View/SidebarSections/BooksShowShelves.php
rename to app/View/ViewBlocks/BooksShowShelves.php
index 28d2d8aa9..48a3208fc 100644
--- a/app/View/SidebarSections/BooksShowShelves.php
+++ b/app/View/ViewBlocks/BooksShowShelves.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Models\Book;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class BooksShowShelves extends SidebarSection
+class BooksShowShelves extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-shelves';
 
diff --git a/app/View/SidebarSections/BooksShowTags.php b/app/View/ViewBlocks/BooksShowTags.php
similarity index 68%
rename from app/View/SidebarSections/BooksShowTags.php
rename to app/View/ViewBlocks/BooksShowTags.php
index 351686c7f..60603b91a 100644
--- a/app/View/SidebarSections/BooksShowTags.php
+++ b/app/View/ViewBlocks/BooksShowTags.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class BooksShowTags extends SidebarSection
+class BooksShowTags extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-tags';
 
diff --git a/app/View/SidebarSections/ChaptersShowActions.php b/app/View/ViewBlocks/ChaptersShowActions.php
similarity index 80%
rename from app/View/SidebarSections/ChaptersShowActions.php
rename to app/View/ViewBlocks/ChaptersShowActions.php
index 91e990d2f..e75b86a1e 100644
--- a/app/View/SidebarSections/ChaptersShowActions.php
+++ b/app/View/ViewBlocks/ChaptersShowActions.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Chapter;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ChaptersShowActions extends SidebarSection
+class ChaptersShowActions extends ViewBlock
 {
     protected string $view = 'chapters.parts.show-sidebar-section-actions';
 
diff --git a/app/View/SidebarSections/ChaptersShowBookTree.php b/app/View/ViewBlocks/ChaptersShowBookTree.php
similarity index 75%
rename from app/View/SidebarSections/ChaptersShowBookTree.php
rename to app/View/ViewBlocks/ChaptersShowBookTree.php
index d0de183f9..79e65908b 100644
--- a/app/View/SidebarSections/ChaptersShowBookTree.php
+++ b/app/View/ViewBlocks/ChaptersShowBookTree.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Models\Book;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ChaptersShowBookTree extends SidebarSection
+class ChaptersShowBookTree extends ViewBlock
 {
     protected string $view = 'entities.book-tree';
 
diff --git a/app/View/SidebarSections/ChaptersShowDetails.php b/app/View/ViewBlocks/ChaptersShowDetails.php
similarity index 88%
rename from app/View/SidebarSections/ChaptersShowDetails.php
rename to app/View/ViewBlocks/ChaptersShowDetails.php
index 1453ceb9d..ed7efaa89 100644
--- a/app/View/SidebarSections/ChaptersShowDetails.php
+++ b/app/View/ViewBlocks/ChaptersShowDetails.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\References\ReferenceFetcher;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ChaptersShowDetails extends SidebarSection
+class ChaptersShowDetails extends ViewBlock
 {
     protected string $view = 'chapters.parts.show-sidebar-section-details';
 
diff --git a/app/View/SidebarSections/ChaptersShowSearchForm.php b/app/View/ViewBlocks/ChaptersShowSearchForm.php
similarity index 67%
rename from app/View/SidebarSections/ChaptersShowSearchForm.php
rename to app/View/ViewBlocks/ChaptersShowSearchForm.php
index 2ae71bc05..ad671a2d3 100644
--- a/app/View/SidebarSections/ChaptersShowSearchForm.php
+++ b/app/View/ViewBlocks/ChaptersShowSearchForm.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ChaptersShowSearchForm extends SidebarSection
+class ChaptersShowSearchForm extends ViewBlock
 {
     protected string $view = 'entities.search-form';
 
diff --git a/app/View/SidebarSections/ChaptersShowTags.php b/app/View/ViewBlocks/ChaptersShowTags.php
similarity index 75%
rename from app/View/SidebarSections/ChaptersShowTags.php
rename to app/View/ViewBlocks/ChaptersShowTags.php
index df806d191..369946e2b 100644
--- a/app/View/SidebarSections/ChaptersShowTags.php
+++ b/app/View/ViewBlocks/ChaptersShowTags.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Models\Chapter;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ChaptersShowTags extends SidebarSection
+class ChaptersShowTags extends ViewBlock
 {
     protected string $view = 'chapters.parts.show-sidebar-section-tags';
 
diff --git a/app/View/SidebarSections/PagesShowActions.php b/app/View/ViewBlocks/PagesShowActions.php
similarity index 79%
rename from app/View/SidebarSections/PagesShowActions.php
rename to app/View/ViewBlocks/PagesShowActions.php
index de832e775..b09a64081 100644
--- a/app/View/SidebarSections/PagesShowActions.php
+++ b/app/View/ViewBlocks/PagesShowActions.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Page;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class PagesShowActions extends SidebarSection
+class PagesShowActions extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-actions';
 
diff --git a/app/View/SidebarSections/PagesShowAttachments.php b/app/View/ViewBlocks/PagesShowAttachments.php
similarity index 74%
rename from app/View/SidebarSections/PagesShowAttachments.php
rename to app/View/ViewBlocks/PagesShowAttachments.php
index ef1dec4a0..43e076671 100644
--- a/app/View/SidebarSections/PagesShowAttachments.php
+++ b/app/View/ViewBlocks/PagesShowAttachments.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Models\Page;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class PagesShowAttachments extends SidebarSection
+class PagesShowAttachments extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-attachments';
 
diff --git a/app/View/SidebarSections/PagesShowBookTree.php b/app/View/ViewBlocks/PagesShowBookTree.php
similarity index 75%
rename from app/View/SidebarSections/PagesShowBookTree.php
rename to app/View/ViewBlocks/PagesShowBookTree.php
index 3de85db49..4631e4ef4 100644
--- a/app/View/SidebarSections/PagesShowBookTree.php
+++ b/app/View/ViewBlocks/PagesShowBookTree.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Models\Book;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class PagesShowBookTree extends SidebarSection
+class PagesShowBookTree extends ViewBlock
 {
     protected string $view = 'entities.book-tree';
 
diff --git a/app/View/SidebarSections/PagesShowDetails.php b/app/View/ViewBlocks/PagesShowDetails.php
similarity index 87%
rename from app/View/SidebarSections/PagesShowDetails.php
rename to app/View/ViewBlocks/PagesShowDetails.php
index e8ddfd341..9fcaadac9 100644
--- a/app/View/SidebarSections/PagesShowDetails.php
+++ b/app/View/ViewBlocks/PagesShowDetails.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
 use BookStack\References\ReferenceFetcher;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class PagesShowDetails extends SidebarSection
+class PagesShowDetails extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-details';
 
diff --git a/app/View/SidebarSections/PagesShowPageNav.php b/app/View/ViewBlocks/PagesShowPageNav.php
similarity index 80%
rename from app/View/SidebarSections/PagesShowPageNav.php
rename to app/View/ViewBlocks/PagesShowPageNav.php
index 6f9d96652..c43b4d7f8 100644
--- a/app/View/SidebarSections/PagesShowPageNav.php
+++ b/app/View/ViewBlocks/PagesShowPageNav.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\PageContent;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class PagesShowPageNav extends SidebarSection
+class PagesShowPageNav extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-page-nav';
 
diff --git a/app/View/SidebarSections/PagesShowTags.php b/app/View/ViewBlocks/PagesShowTags.php
similarity index 74%
rename from app/View/SidebarSections/PagesShowTags.php
rename to app/View/ViewBlocks/PagesShowTags.php
index 5fa46dc17..bee6846f1 100644
--- a/app/View/SidebarSections/PagesShowTags.php
+++ b/app/View/ViewBlocks/PagesShowTags.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Models\Page;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class PagesShowTags extends SidebarSection
+class PagesShowTags extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-tags';
 
diff --git a/app/View/SidebarSections/ShelvesIndexActions.php b/app/View/ViewBlocks/ShelvesIndexActions.php
similarity index 68%
rename from app/View/SidebarSections/ShelvesIndexActions.php
rename to app/View/ViewBlocks/ShelvesIndexActions.php
index f15feecbe..51d4b3a89 100644
--- a/app/View/SidebarSections/ShelvesIndexActions.php
+++ b/app/View/ViewBlocks/ShelvesIndexActions.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ShelvesIndexActions extends SidebarSection
+class ShelvesIndexActions extends ViewBlock
 {
     protected string $view = 'shelves.parts.index-sidebar-section-actions';
 
diff --git a/app/View/SidebarSections/ShelvesIndexNew.php b/app/View/ViewBlocks/ShelvesIndexNew.php
similarity index 81%
rename from app/View/SidebarSections/ShelvesIndexNew.php
rename to app/View/ViewBlocks/ShelvesIndexNew.php
index 90fda4985..f3ad4a650 100644
--- a/app/View/SidebarSections/ShelvesIndexNew.php
+++ b/app/View/ViewBlocks/ShelvesIndexNew.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Queries\BookshelfQueries;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ShelvesIndexNew extends SidebarSection
+class ShelvesIndexNew extends ViewBlock
 {
     protected string $view = 'shelves.parts.index-sidebar-section-new';
 
diff --git a/app/View/SidebarSections/ShelvesIndexPopular.php b/app/View/ViewBlocks/ShelvesIndexPopular.php
similarity index 78%
rename from app/View/SidebarSections/ShelvesIndexPopular.php
rename to app/View/ViewBlocks/ShelvesIndexPopular.php
index 4860b8c71..5e880e18e 100644
--- a/app/View/SidebarSections/ShelvesIndexPopular.php
+++ b/app/View/ViewBlocks/ShelvesIndexPopular.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Queries\BookshelfQueries;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ShelvesIndexPopular extends SidebarSection
+class ShelvesIndexPopular extends ViewBlock
 {
     protected string $view = 'shelves.parts.index-sidebar-section-popular';
 
diff --git a/app/View/SidebarSections/ShelvesIndexRecents.php b/app/View/ViewBlocks/ShelvesIndexRecents.php
similarity index 81%
rename from app/View/SidebarSections/ShelvesIndexRecents.php
rename to app/View/ViewBlocks/ShelvesIndexRecents.php
index 72b6430eb..77e3a2af4 100644
--- a/app/View/SidebarSections/ShelvesIndexRecents.php
+++ b/app/View/ViewBlocks/ShelvesIndexRecents.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Queries\BookshelfQueries;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ShelvesIndexRecents extends SidebarSection
+class ShelvesIndexRecents extends ViewBlock
 {
     protected string $view = 'shelves.parts.index-sidebar-section-recents';
 
diff --git a/app/View/SidebarSections/ShelvesShowActions.php b/app/View/ViewBlocks/ShelvesShowActions.php
similarity index 75%
rename from app/View/SidebarSections/ShelvesShowActions.php
rename to app/View/ViewBlocks/ShelvesShowActions.php
index b28abab6f..9c0ab7321 100644
--- a/app/View/SidebarSections/ShelvesShowActions.php
+++ b/app/View/ViewBlocks/ShelvesShowActions.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Models\Bookshelf;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ShelvesShowActions extends SidebarSection
+class ShelvesShowActions extends ViewBlock
 {
     protected string $view = 'shelves.parts.show-sidebar-section-actions';
 
diff --git a/app/View/SidebarSections/ShelvesShowActivity.php b/app/View/ViewBlocks/ShelvesShowActivity.php
similarity index 81%
rename from app/View/SidebarSections/ShelvesShowActivity.php
rename to app/View/ViewBlocks/ShelvesShowActivity.php
index 90de335e2..a4ae874be 100644
--- a/app/View/SidebarSections/ShelvesShowActivity.php
+++ b/app/View/ViewBlocks/ShelvesShowActivity.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Activity\ActivityQueries;
 use BookStack\Entities\Models\Bookshelf;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ShelvesShowActivity extends SidebarSection
+class ShelvesShowActivity extends ViewBlock
 {
     protected string $view = 'shelves.parts.show-sidebar-section-activity';
 
diff --git a/app/View/SidebarSections/ShelvesShowDetails.php b/app/View/ViewBlocks/ShelvesShowDetails.php
similarity index 83%
rename from app/View/SidebarSections/ShelvesShowDetails.php
rename to app/View/ViewBlocks/ShelvesShowDetails.php
index 62dc9bab2..2a892cf88 100644
--- a/app/View/SidebarSections/ShelvesShowDetails.php
+++ b/app/View/ViewBlocks/ShelvesShowDetails.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\References\ReferenceFetcher;
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ShelvesShowDetails extends SidebarSection
+class ShelvesShowDetails extends ViewBlock
 {
     protected string $view = 'shelves.parts.show-sidebar-section-details';
 
diff --git a/app/View/SidebarSections/ShelvesShowTags.php b/app/View/ViewBlocks/ShelvesShowTags.php
similarity index 68%
rename from app/View/SidebarSections/ShelvesShowTags.php
rename to app/View/ViewBlocks/ShelvesShowTags.php
index 7c02c50fc..35dd56ede 100644
--- a/app/View/SidebarSections/ShelvesShowTags.php
+++ b/app/View/ViewBlocks/ShelvesShowTags.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BookStack\View\SidebarSections;
+namespace BookStack\View\ViewBlocks;
 
-use BookStack\View\SidebarSection;
+use BookStack\View\ViewBlock;
 use Illuminate\Http\Request;
 
-class ShelvesShowTags extends SidebarSection
+class ShelvesShowTags extends ViewBlock
 {
     protected string $view = 'shelves.parts.show-sidebar-section-tags';
 
diff --git a/resources/views/common/sidebar-sections.blade.php b/resources/views/common/sidebar-sections.blade.php
index a4a055e6a..f18f9e4c2 100644
--- a/resources/views/common/sidebar-sections.blade.php
+++ b/resources/views/common/sidebar-sections.blade.php
@@ -6,6 +6,6 @@ $position - string
     $sectionVars = get_defined_vars();
     $sectionRequest = request();
 @endphp
-@foreach($sidebar->getSectionsForLocation($location, $position) as $section)
+@foreach($viewBlocks->getForLocation($location, $position) as $section)
     @include($section->getView(), $section->withData($sectionVars, $sectionRequest))
 @endforeach
\ No newline at end of file

From e3ebcb22508112f6e599151f3d134e93c5851209 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 9 Aug 2026 11:54:42 +0100
Subject: [PATCH 12/72] Views: Extracted homepage sections into their own views

---
 resources/views/home/default.blade.php        | 57 ++-----------------
 .../default-card-recent-activity.blade.php    |  6 ++
 .../default-card-recent-drafts.blade.php      | 11 ++++
 ...ault-card-recently-updates-pages.blade.php | 16 ++++++
 ...-recently-viewed-or-recent-books.blade.php | 14 +++++
 .../default-card-top-favourites.blade.php     | 15 +++++
 .../sidebar-section-recent-activity.blade.php |  7 +++
 .../sidebar-section-recent-drafts.blade.php   |  9 +++
 ...r-section-recently-updated-pages.blade.php | 14 +++++
 ...-recently-viewed-or-recent-books.blade.php | 11 ++++
 .../sidebar-section-top-favourites.blade.php  | 13 +++++
 resources/views/home/parts/sidebar.blade.php  | 48 ++--------------
 12 files changed, 126 insertions(+), 95 deletions(-)
 create mode 100644 resources/views/home/parts/default-card-recent-activity.blade.php
 create mode 100644 resources/views/home/parts/default-card-recent-drafts.blade.php
 create mode 100644 resources/views/home/parts/default-card-recently-updates-pages.blade.php
 create mode 100644 resources/views/home/parts/default-card-recently-viewed-or-recent-books.blade.php
 create mode 100644 resources/views/home/parts/default-card-top-favourites.blade.php
 create mode 100644 resources/views/home/parts/sidebar-section-recent-activity.blade.php
 create mode 100644 resources/views/home/parts/sidebar-section-recent-drafts.blade.php
 create mode 100644 resources/views/home/parts/sidebar-section-recently-updated-pages.blade.php
 create mode 100644 resources/views/home/parts/sidebar-section-recently-viewed-or-recent-books.blade.php
 create mode 100644 resources/views/home/parts/sidebar-section-top-favourites.blade.php

diff --git a/resources/views/home/default.blade.php b/resources/views/home/default.blade.php
index a546ddeca..7d229d6ac 100644
--- a/resources/views/home/default.blade.php
+++ b/resources/views/home/default.blade.php
@@ -16,65 +16,18 @@
     <div class="container" id="home-default">
         <div class="grid third gap-x-xxl no-row-gap">
             <div>
-                @if(count($draftPages) > 0)
-                    <div id="recent-drafts" class="card mb-xl">
-                        <h3 class="card-title">{{ trans('entities.my_recent_drafts') }}</h3>
-                        <div class="px-m">
-                            @include('entities.list', ['entities' => $draftPages, 'style' => 'compact'])
-                        </div>
-                    </div>
-                @endif
-
-                <div id="{{ auth()->check() ? 'recently-viewed' : 'recent-books' }}" class="card mb-xl">
-                    <h3 class="card-title">{{ trans('entities.' . (auth()->check() ? 'my_recently_viewed' : 'books_recent')) }}</h3>
-                    <div class="px-m">
-                        @include('entities.list', [
-                        'entities' => $recents,
-                        'style' => 'compact',
-                        'emptyText' => auth()->check() ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
-                        ])
-                    </div>
-                </div>
+                @include('home.parts.default-card-recent-drafts', ['draftPages' => $draftPages])
+                @include('home.parts.default-card-recently-viewed-or-recent-books', ['recents' => $recents])
             </div>
 
             <div>
-                @if(count($favourites) > 0)
-                    <div id="top-favourites" class="card mb-xl">
-                        <h3 class="card-title">{{ trans('entities.my_most_viewed_favourites') }}</h3>
-                        <div class="px-m">
-                            @include('entities.list', [
-                            'entities' => $favourites,
-                            'style' => 'compact',
-                            ])
-                        </div>
-                        <a href="{{ url('/favourites')  }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
-                    </div>
-                @endif
-
-                <div id="recent-pages" class="card mb-xl">
-                    <h3 class="card-title">{{ trans('entities.recently_updated_pages') }}</h3>
-                    <div id="recently-updated-pages" class="px-m">
-                        @include('entities.list', [
-                        'entities' => $recentlyUpdatedPages,
-                        'style' => 'compact',
-                        'emptyText' => trans('entities.no_pages_recently_updated'),
-                        ])
-                    </div>
-                    @if(count($recentlyUpdatedPages) > 0)
-                        <a href="{{ url("/pages/recently-updated") }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
-                    @endif
-                </div>
+                @include('home.parts.default-card-top-favourites', ['favourites' => $favourites])
+                @include('home.parts.default-card-recently-updates-pages', ['recentlyUpdatedPages' => $recentlyUpdatedPages])
             </div>
 
             <div>
-                <div id="recent-activity" class="card mb-xl">
-                    <h3 class="card-title">{{ trans('entities.recent_activity') }}</h3>
-                    <div class="px-m">
-                        @include('common.activity-list', ['activity' => $activity])
-                    </div>
-                </div>
+                @include('home.parts.default-card-recent-activity', ['activity' => $activity])
             </div>
-
         </div>
     </div>
 
diff --git a/resources/views/home/parts/default-card-recent-activity.blade.php b/resources/views/home/parts/default-card-recent-activity.blade.php
new file mode 100644
index 000000000..035cd9987
--- /dev/null
+++ b/resources/views/home/parts/default-card-recent-activity.blade.php
@@ -0,0 +1,6 @@
+<div id="recent-activity" class="card mb-xl">
+    <h3 class="card-title">{{ trans('entities.recent_activity') }}</h3>
+    <div class="px-m">
+        @include('common.activity-list', ['activity' => $activity])
+    </div>
+</div>j
\ No newline at end of file
diff --git a/resources/views/home/parts/default-card-recent-drafts.blade.php b/resources/views/home/parts/default-card-recent-drafts.blade.php
new file mode 100644
index 000000000..d9d7a5130
--- /dev/null
+++ b/resources/views/home/parts/default-card-recent-drafts.blade.php
@@ -0,0 +1,11 @@
+{{--
+$draftPages - array
+--}}
+@if(count($draftPages) > 0)
+    <div id="recent-drafts" class="card mb-xl">
+        <h3 class="card-title">{{ trans('entities.my_recent_drafts') }}</h3>
+        <div class="px-m">
+            @include('entities.list', ['entities' => $draftPages, 'style' => 'compact'])
+        </div>
+    </div>
+@endif
diff --git a/resources/views/home/parts/default-card-recently-updates-pages.blade.php b/resources/views/home/parts/default-card-recently-updates-pages.blade.php
new file mode 100644
index 000000000..6e637d710
--- /dev/null
+++ b/resources/views/home/parts/default-card-recently-updates-pages.blade.php
@@ -0,0 +1,16 @@
+{{--
+$recentlyUpdatedPages - array
+--}}
+<div id="recent-pages" class="card mb-xl">
+    <h3 class="card-title">{{ trans('entities.recently_updated_pages') }}</h3>
+    <div id="recently-updated-pages" class="px-m">
+        @include('entities.list', [
+        'entities' => $recentlyUpdatedPages,
+        'style' => 'compact',
+        'emptyText' => trans('entities.no_pages_recently_updated'),
+        ])
+    </div>
+    @if(count($recentlyUpdatedPages) > 0)
+        <a href="{{ url("/pages/recently-updated") }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
+    @endif
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/default-card-recently-viewed-or-recent-books.blade.php b/resources/views/home/parts/default-card-recently-viewed-or-recent-books.blade.php
new file mode 100644
index 000000000..31bafaa2b
--- /dev/null
+++ b/resources/views/home/parts/default-card-recently-viewed-or-recent-books.blade.php
@@ -0,0 +1,14 @@
+{{--
+$recents - array
+--}}
+
+<div id="{{ auth()->check() ? 'recently-viewed' : 'recent-books' }}" class="card mb-xl">
+    <h3 class="card-title">{{ trans('entities.' . (auth()->check() ? 'my_recently_viewed' : 'books_recent')) }}</h3>
+    <div class="px-m">
+        @include('entities.list', [
+        'entities' => $recents,
+        'style' => 'compact',
+        'emptyText' => auth()->check() ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
+        ])
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/default-card-top-favourites.blade.php b/resources/views/home/parts/default-card-top-favourites.blade.php
new file mode 100644
index 000000000..81f3895c6
--- /dev/null
+++ b/resources/views/home/parts/default-card-top-favourites.blade.php
@@ -0,0 +1,15 @@
+{{--
+$favourites - array
+--}}
+@if(count($favourites) > 0)
+    <div id="top-favourites" class="card mb-xl">
+        <h3 class="card-title">{{ trans('entities.my_most_viewed_favourites') }}</h3>
+        <div class="px-m">
+            @include('entities.list', [
+            'entities' => $favourites,
+            'style' => 'compact',
+            ])
+        </div>
+        <a href="{{ url('/favourites')  }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/home/parts/sidebar-section-recent-activity.blade.php b/resources/views/home/parts/sidebar-section-recent-activity.blade.php
new file mode 100644
index 000000000..8a82f9006
--- /dev/null
+++ b/resources/views/home/parts/sidebar-section-recent-activity.blade.php
@@ -0,0 +1,7 @@
+{{--
+$activity - array
+--}}
+<div id="recent-activity" class="mb-xl">
+    <h5>{{ trans('entities.recent_activity') }}</h5>
+    @include('common.activity-list', ['activity' => $activity])
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/sidebar-section-recent-drafts.blade.php b/resources/views/home/parts/sidebar-section-recent-drafts.blade.php
new file mode 100644
index 000000000..648f54155
--- /dev/null
+++ b/resources/views/home/parts/sidebar-section-recent-drafts.blade.php
@@ -0,0 +1,9 @@
+{{--
+$draftPages - array
+--}}
+@if(count($draftPages) > 0)
+    <div id="recent-drafts" class="mb-xl">
+        <h5>{{ trans('entities.my_recent_drafts') }}</h5>
+        @include('entities.list', ['entities' => $draftPages, 'style' => 'compact'])
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/home/parts/sidebar-section-recently-updated-pages.blade.php b/resources/views/home/parts/sidebar-section-recently-updated-pages.blade.php
new file mode 100644
index 000000000..290c385a1
--- /dev/null
+++ b/resources/views/home/parts/sidebar-section-recently-updated-pages.blade.php
@@ -0,0 +1,14 @@
+{{--
+$recentlyUpdatedPages - array
+--}}
+<div class="mb-xl">
+    <h5>{{ trans('entities.recently_updated_pages') }}</h5>
+    <div id="recently-updated-pages">
+        @include('entities.list', [
+        'entities' => $recentlyUpdatedPages,
+        'style' => 'compact',
+        'emptyText' => trans('entities.no_pages_recently_updated')
+        ])
+    </div>
+    <a href="{{ url('/pages/recently-updated')  }}" class="text-muted block py-xs">{{ trans('common.view_all') }}</a>
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/sidebar-section-recently-viewed-or-recent-books.blade.php b/resources/views/home/parts/sidebar-section-recently-viewed-or-recent-books.blade.php
new file mode 100644
index 000000000..d9c6edea8
--- /dev/null
+++ b/resources/views/home/parts/sidebar-section-recently-viewed-or-recent-books.blade.php
@@ -0,0 +1,11 @@
+{{--
+$recents - array
+--}}
+<div class="mb-xl">
+    <h5>{{ trans('entities.' . (auth()->check() ? 'my_recently_viewed' : 'books_recent')) }}</h5>
+    @include('entities.list', [
+        'entities' => $recents,
+        'style' => 'compact',
+        'emptyText' => auth()->check() ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
+        ])
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/sidebar-section-top-favourites.blade.php b/resources/views/home/parts/sidebar-section-top-favourites.blade.php
new file mode 100644
index 000000000..09b33b176
--- /dev/null
+++ b/resources/views/home/parts/sidebar-section-top-favourites.blade.php
@@ -0,0 +1,13 @@
+{{--
+$favourites - array
+--}}
+@if(count($favourites) > 0)
+    <div id="top-favourites" class="mb-xl">
+        <h5>{{ trans('entities.my_most_viewed_favourites') }}</h5>
+        @include('entities.list', [
+            'entities' => $favourites,
+            'style' => 'compact',
+        ])
+        <a href="{{ url('/favourites')  }}" class="text-muted block py-xs">{{ trans('common.view_all') }}</a>
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/home/parts/sidebar.blade.php b/resources/views/home/parts/sidebar.blade.php
index 78f7e7a80..07c199f9e 100644
--- a/resources/views/home/parts/sidebar.blade.php
+++ b/resources/views/home/parts/sidebar.blade.php
@@ -1,43 +1,5 @@
-@if(count($draftPages) > 0)
-    <div id="recent-drafts" class="mb-xl">
-        <h5>{{ trans('entities.my_recent_drafts') }}</h5>
-        @include('entities.list', ['entities' => $draftPages, 'style' => 'compact'])
-    </div>
-@endif
-
-@if(count($favourites) > 0)
-    <div id="top-favourites" class="mb-xl">
-        <h5>{{ trans('entities.my_most_viewed_favourites') }}</h5>
-        @include('entities.list', [
-            'entities' => $favourites,
-            'style' => 'compact',
-        ])
-        <a href="{{ url('/favourites')  }}" class="text-muted block py-xs">{{ trans('common.view_all') }}</a>
-    </div>
-@endif
-
-<div class="mb-xl">
-    <h5>{{ trans('entities.' . (auth()->check() ? 'my_recently_viewed' : 'books_recent')) }}</h5>
-    @include('entities.list', [
-        'entities' => $recents,
-        'style' => 'compact',
-        'emptyText' => auth()->check() ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
-        ])
-</div>
-
-<div class="mb-xl">
-    <h5>{{ trans('entities.recently_updated_pages') }}</h5>
-    <div id="recently-updated-pages">
-        @include('entities.list', [
-        'entities' => $recentlyUpdatedPages,
-        'style' => 'compact',
-        'emptyText' => trans('entities.no_pages_recently_updated')
-        ])
-    </div>
-    <a href="{{ url('/pages/recently-updated')  }}" class="text-muted block py-xs">{{ trans('common.view_all') }}</a>
-</div>
-
-<div id="recent-activity" class="mb-xl">
-    <h5>{{ trans('entities.recent_activity') }}</h5>
-    @include('common.activity-list', ['activity' => $activity])
-</div>
\ No newline at end of file
+@include('home.parts.sidebar-section-recent-drafts', ['draftPages' => $draftPages])
+@include('home.parts.sidebar-section-top-favourites', ['favourites' => $favourites])
+@include('home.parts.sidebar-section-recently-viewed-or-recent-books', ['recents' => $recents])
+@include('home.parts.sidebar-section-recently-updated-pages', ['recentlyUpdatedPages' => $recentlyUpdatedPages])
+@include('home.parts.sidebar-section-recent-activity', ['activity' => $activity])
\ No newline at end of file

From 600497b1109d65c3c3c7853dc3a924b75e6e124b Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 9 Aug 2026 15:12:07 +0100
Subject: [PATCH 13/72] Views: Extracted home view sections into blocks

Also removed unused request from block interface.
---
 app/App/HomeController.php                    | 51 ++++---------------
 app/View/ViewBlock.php                        |  2 +-
 app/View/ViewBlockInterface.php               |  7 ++-
 app/View/ViewBlockManager.php                 | 31 +++++++++++
 app/View/ViewBlocks/BooksIndexActions.php     |  2 +-
 app/View/ViewBlocks/BooksIndexNew.php         |  2 +-
 app/View/ViewBlocks/BooksIndexPopular.php     |  2 +-
 app/View/ViewBlocks/BooksIndexRecents.php     |  2 +-
 app/View/ViewBlocks/BooksShowActions.php      |  2 +-
 app/View/ViewBlocks/BooksShowActivity.php     |  2 +-
 app/View/ViewBlocks/BooksShowDetails.php      |  2 +-
 app/View/ViewBlocks/BooksShowSearchForm.php   |  2 +-
 app/View/ViewBlocks/BooksShowShelves.php      |  2 +-
 app/View/ViewBlocks/BooksShowTags.php         |  2 +-
 app/View/ViewBlocks/ChaptersShowActions.php   |  2 +-
 app/View/ViewBlocks/ChaptersShowBookTree.php  |  2 +-
 app/View/ViewBlocks/ChaptersShowDetails.php   |  2 +-
 .../ViewBlocks/ChaptersShowSearchForm.php     |  2 +-
 app/View/ViewBlocks/ChaptersShowTags.php      |  2 +-
 app/View/ViewBlocks/HomeActions.php           | 19 +++++++
 app/View/ViewBlocks/HomeRecentActivity.php    | 32 ++++++++++++
 app/View/ViewBlocks/HomeRecentDrafts.php      | 40 +++++++++++++++
 .../ViewBlocks/HomeRecentlyUpdatedPages.php   | 37 ++++++++++++++
 .../HomeRecentlyViewedOrRecentBooks.php       | 43 ++++++++++++++++
 app/View/ViewBlocks/HomeTopFavourites.php     | 32 ++++++++++++
 app/View/ViewBlocks/PagesShowActions.php      |  2 +-
 app/View/ViewBlocks/PagesShowAttachments.php  |  2 +-
 app/View/ViewBlocks/PagesShowBookTree.php     |  2 +-
 app/View/ViewBlocks/PagesShowDetails.php      |  2 +-
 app/View/ViewBlocks/PagesShowPageNav.php      |  2 +-
 app/View/ViewBlocks/PagesShowTags.php         |  2 +-
 app/View/ViewBlocks/ShelvesIndexActions.php   |  2 +-
 app/View/ViewBlocks/ShelvesIndexNew.php       |  2 +-
 app/View/ViewBlocks/ShelvesIndexPopular.php   |  2 +-
 app/View/ViewBlocks/ShelvesIndexRecents.php   |  2 +-
 app/View/ViewBlocks/ShelvesShowActions.php    |  2 +-
 app/View/ViewBlocks/ShelvesShowActivity.php   |  2 +-
 app/View/ViewBlocks/ShelvesShowDetails.php    |  2 +-
 app/View/ViewBlocks/ShelvesShowTags.php       |  2 +-
 resources/views/books/index.blade.php         |  4 +-
 resources/views/books/show.blade.php          |  4 +-
 resources/views/chapters/show.blade.php       |  4 +-
 ...ctions.blade.php => view-blocks.blade.php} |  3 +-
 resources/views/home/books.blade.php          | 21 +-------
 resources/views/home/default.blade.php        |  8 ++-
 .../configured-section-actions.blade.php      | 36 +++++++++++++
 ...figured-section-recent-activity.blade.php} |  0
 ...onfigured-section-recent-drafts.blade.php} |  0
 ...-section-recently-updated-pages.blade.php} |  0
 ...recently-viewed-or-recent-books.blade.php} |  0
 ...nfigured-section-top-favourites.blade.php} |  0
 .../default-card-recent-activity.blade.php    |  5 +-
 ...ult-card-recently-updated-pages.blade.php} |  0
 resources/views/home/parts/sidebar.blade.php  |  5 --
 resources/views/home/shelves.blade.php        | 21 +-------
 resources/views/home/specific-page.blade.php  | 10 +---
 resources/views/pages/show.blade.php          |  4 +-
 resources/views/shelves/index.blade.php       |  4 +-
 resources/views/shelves/show.blade.php        |  4 +-
 59 files changed, 338 insertions(+), 147 deletions(-)
 create mode 100644 app/View/ViewBlocks/HomeActions.php
 create mode 100644 app/View/ViewBlocks/HomeRecentActivity.php
 create mode 100644 app/View/ViewBlocks/HomeRecentDrafts.php
 create mode 100644 app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
 create mode 100644 app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
 create mode 100644 app/View/ViewBlocks/HomeTopFavourites.php
 rename resources/views/common/{sidebar-sections.blade.php => view-blocks.blade.php} (60%)
 create mode 100644 resources/views/home/parts/configured-section-actions.blade.php
 rename resources/views/home/parts/{sidebar-section-recent-activity.blade.php => configured-section-recent-activity.blade.php} (100%)
 rename resources/views/home/parts/{sidebar-section-recent-drafts.blade.php => configured-section-recent-drafts.blade.php} (100%)
 rename resources/views/home/parts/{sidebar-section-recently-updated-pages.blade.php => configured-section-recently-updated-pages.blade.php} (100%)
 rename resources/views/home/parts/{sidebar-section-recently-viewed-or-recent-books.blade.php => configured-section-recently-viewed-or-recent-books.blade.php} (100%)
 rename resources/views/home/parts/{sidebar-section-top-favourites.blade.php => configured-section-top-favourites.blade.php} (100%)
 rename resources/views/home/parts/{default-card-recently-updates-pages.blade.php => default-card-recently-updated-pages.blade.php} (100%)
 delete mode 100644 resources/views/home/parts/sidebar.blade.php

diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index 00e2db3df..bbff07902 100644
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@ -2,11 +2,8 @@
 
 namespace BookStack\App;
 
-use BookStack\Activity\ActivityQueries;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
-use BookStack\Entities\Queries\QueryRecentlyViewed;
-use BookStack\Entities\Queries\QueryTopFavourites;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Http\Controller;
 use BookStack\Util\SimpleListOptions;
@@ -24,49 +21,19 @@ class HomeController extends Controller
      */
     public function index(
         Request $request,
-        ActivityQueries $activities,
-        QueryRecentlyViewed $recentlyViewed,
-        QueryTopFavourites $topFavourites,
     ) {
-        $activity = $activities->latest(10);
-        $draftPages = [];
-
-        if ($this->isSignedIn()) {
-            $draftPages = $this->queries->pages->currentUserDraftsForList()
-                ->orderBy('updated_at', 'desc')
-                ->with('book')
-                ->take(6)
-                ->get();
-        }
-
-        $recentFactor = count($draftPages) > 0 ? 0.5 : 1;
-        $recents = $this->isSignedIn() ?
-            $recentlyViewed->run(12 * $recentFactor, 1)
-            : $this->queries->books->visibleForList()->orderBy('created_at', 'desc')->take(12 * $recentFactor)->get();
-        $favourites = $topFavourites->run(6);
-        $recentlyUpdatedPages = $this->queries->pages->visibleForList()
-            ->where('draft', false)
-            ->orderBy('updated_at', 'desc')
-            ->take($favourites->count() > 0 ? 5 : 10)
-            ->get();
-
-        $homepageOptions = ['default', 'books', 'bookshelves', 'page'];
-        $homepageOption = setting('app-homepage-type', 'default');
-        if (!in_array($homepageOption, $homepageOptions)) {
-            $homepageOption = 'default';
+        $homepageType = setting('app-homepage-type', 'default');
+        if (!in_array($homepageType, ['default', 'books', 'bookshelves', 'page'])) {
+            $homepageType = 'default';
         }
 
         $commonData = [
-            'activity'             => $activity,
-            'recents'              => $recents,
-            'recentlyUpdatedPages' => $recentlyUpdatedPages,
-            'draftPages'           => $draftPages,
-            'favourites'           => $favourites,
+            'homeView' => $homepageType,
         ];
 
         // Add required list ordering & sorting for books & shelves views.
-        if ($homepageOption === 'bookshelves' || $homepageOption === 'books') {
-            $key = $homepageOption;
+        if ($homepageType === 'bookshelves' || $homepageType === 'books') {
+            $key = $homepageType;
             $view = setting()->getForCurrentUser($key . '_view_type');
             $listOptions = SimpleListOptions::fromRequest($request, $key)->withSortOptions([
                 'name' => trans('common.sort_name'),
@@ -80,7 +47,7 @@ class HomeController extends Controller
             ]);
         }
 
-        if ($homepageOption === 'bookshelves') {
+        if ($homepageType === 'bookshelves') {
             $shelves = $this->queries->shelves->visibleForListWithCover()
                 ->orderBy($commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder())
                 ->paginate(setting()->getInteger('lists-page-count-shelves', 18, 1, 1000));
@@ -89,7 +56,7 @@ class HomeController extends Controller
             return view('home.shelves', $data);
         }
 
-        if ($homepageOption === 'books') {
+        if ($homepageType === 'books') {
             $books = $this->queries->books->visibleForListWithCover()
                 ->orderBy($commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder())
                 ->paginate(setting()->getInteger('lists-page-count-books', 18, 1, 1000));
@@ -98,7 +65,7 @@ class HomeController extends Controller
             return view('home.books', $data);
         }
 
-        if ($homepageOption === 'page') {
+        if ($homepageType === 'page') {
             $homepageSetting = setting('app-homepage', '0:');
             $id = intval(explode(':', $homepageSetting)[0]);
             /** @var Page $customHomepage */
diff --git a/app/View/ViewBlock.php b/app/View/ViewBlock.php
index a835e7075..636746044 100644
--- a/app/View/ViewBlock.php
+++ b/app/View/ViewBlock.php
@@ -9,7 +9,7 @@ abstract class ViewBlock implements ViewBlockInterface
     /**
      * @inheritDoc
      */
-    public function getView(): string
+    public function getView(array $viewData): string
     {
         return $this->view;
     }
diff --git a/app/View/ViewBlockInterface.php b/app/View/ViewBlockInterface.php
index b9c25e9f6..756cf4298 100644
--- a/app/View/ViewBlockInterface.php
+++ b/app/View/ViewBlockInterface.php
@@ -2,19 +2,18 @@
 
 namespace BookStack\View;
 
-use Illuminate\Http\Request;
-
 interface ViewBlockInterface
 {
     /**
      * Get the view to render for this block.
+     * Is provided with the existing parent view data.
      */
-    public function getView(): string;
+    public function getView(array $viewData): string;
 
     /**
      * Specify the data to pass to the view on render.
      * Is provided with the existing parent view data and the original request.
      * @return array<string, mixed>
      */
-    public function withData(array $viewData, Request $request): array;
+    public function withData(array $viewData): array;
 }
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
index 88d866135..7287c0293 100644
--- a/app/View/ViewBlockManager.php
+++ b/app/View/ViewBlockManager.php
@@ -17,6 +17,12 @@ use BookStack\View\ViewBlocks\ChaptersShowBookTree;
 use BookStack\View\ViewBlocks\ChaptersShowDetails;
 use BookStack\View\ViewBlocks\ChaptersShowSearchForm;
 use BookStack\View\ViewBlocks\ChaptersShowTags;
+use BookStack\View\ViewBlocks\HomeActions;
+use BookStack\View\ViewBlocks\HomeRecentActivity;
+use BookStack\View\ViewBlocks\HomeRecentDrafts;
+use BookStack\View\ViewBlocks\HomeRecentlyUpdatedPages;
+use BookStack\View\ViewBlocks\HomeRecentlyViewedOrRecentBooks;
+use BookStack\View\ViewBlocks\HomeTopFavourites;
 use BookStack\View\ViewBlocks\PagesShowActions;
 use BookStack\View\ViewBlocks\PagesShowAttachments;
 use BookStack\View\ViewBlocks\PagesShowBookTree;
@@ -39,6 +45,31 @@ class ViewBlockManager
      * @var array<string, array<string, class-string<ViewBlockInterface>[]>>
      */
     protected array $blocksByLocationAndPosition = [
+        'home-default' => [
+            'left' => [
+                HomeRecentDrafts::class,
+                HomeRecentlyViewedOrRecentBooks::class,
+            ],
+            'center' => [
+                HomeTopFavourites::class,
+                HomeRecentlyUpdatedPages::class,
+            ],
+            'right' => [
+                HomeRecentActivity::class,
+            ],
+        ],
+        'home-non-default' => [
+            'left' => [
+                HomeRecentDrafts::class,
+                HomeTopFavourites::class,
+                HomeRecentlyViewedOrRecentBooks::class,
+                HomeRecentlyUpdatedPages::class,
+                HomeRecentActivity::class,
+            ],
+            'right' => [
+                HomeActions::class,
+            ],
+        ],
         'shelves-index' => [
             'left' => [
                 ShelvesIndexRecents::class,
diff --git a/app/View/ViewBlocks/BooksIndexActions.php b/app/View/ViewBlocks/BooksIndexActions.php
index fd290c601..8e6721ddf 100644
--- a/app/View/ViewBlocks/BooksIndexActions.php
+++ b/app/View/ViewBlocks/BooksIndexActions.php
@@ -9,7 +9,7 @@ class BooksIndexActions extends ViewBlock
 {
     protected string $view = 'books.parts.index-sidebar-section-actions';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         return [
             'view' => $viewData['view'],
diff --git a/app/View/ViewBlocks/BooksIndexNew.php b/app/View/ViewBlocks/BooksIndexNew.php
index dee863b36..76d2750ba 100644
--- a/app/View/ViewBlocks/BooksIndexNew.php
+++ b/app/View/ViewBlocks/BooksIndexNew.php
@@ -15,7 +15,7 @@ class BooksIndexNew extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         $new = $this->queries->visibleForList()
             ->orderBy('created_at', 'desc')
diff --git a/app/View/ViewBlocks/BooksIndexPopular.php b/app/View/ViewBlocks/BooksIndexPopular.php
index cb478170d..ee3138f79 100644
--- a/app/View/ViewBlocks/BooksIndexPopular.php
+++ b/app/View/ViewBlocks/BooksIndexPopular.php
@@ -15,7 +15,7 @@ class BooksIndexPopular extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         return [
             'popular' => $this->queries->popularForList()->take(4)->get(),
diff --git a/app/View/ViewBlocks/BooksIndexRecents.php b/app/View/ViewBlocks/BooksIndexRecents.php
index e3a632e54..1c7b865d8 100644
--- a/app/View/ViewBlocks/BooksIndexRecents.php
+++ b/app/View/ViewBlocks/BooksIndexRecents.php
@@ -15,7 +15,7 @@ class BooksIndexRecents extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         $recents = null;
         if (!user()->isGuest()) {
diff --git a/app/View/ViewBlocks/BooksShowActions.php b/app/View/ViewBlocks/BooksShowActions.php
index 43f63c24e..155c0c7ba 100644
--- a/app/View/ViewBlocks/BooksShowActions.php
+++ b/app/View/ViewBlocks/BooksShowActions.php
@@ -11,7 +11,7 @@ class BooksShowActions extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-actions';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Book $book */
         $book = $viewData['book'];
diff --git a/app/View/ViewBlocks/BooksShowActivity.php b/app/View/ViewBlocks/BooksShowActivity.php
index 4ba8697c5..ecf626df5 100644
--- a/app/View/ViewBlocks/BooksShowActivity.php
+++ b/app/View/ViewBlocks/BooksShowActivity.php
@@ -16,7 +16,7 @@ class BooksShowActivity extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Book $book */
         $book = $viewData['book'];
diff --git a/app/View/ViewBlocks/BooksShowDetails.php b/app/View/ViewBlocks/BooksShowDetails.php
index 12699d5a0..9a0ef8b47 100644
--- a/app/View/ViewBlocks/BooksShowDetails.php
+++ b/app/View/ViewBlocks/BooksShowDetails.php
@@ -17,7 +17,7 @@ class BooksShowDetails extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Book $book */
         $book = $viewData['book'];
diff --git a/app/View/ViewBlocks/BooksShowSearchForm.php b/app/View/ViewBlocks/BooksShowSearchForm.php
index d75db3d93..061875d3d 100644
--- a/app/View/ViewBlocks/BooksShowSearchForm.php
+++ b/app/View/ViewBlocks/BooksShowSearchForm.php
@@ -9,7 +9,7 @@ class BooksShowSearchForm extends ViewBlock
 {
     protected string $view = 'entities.search-form';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         return [
             'label' => trans('entities.books_search_this'),
diff --git a/app/View/ViewBlocks/BooksShowShelves.php b/app/View/ViewBlocks/BooksShowShelves.php
index 48a3208fc..42d832589 100644
--- a/app/View/ViewBlocks/BooksShowShelves.php
+++ b/app/View/ViewBlocks/BooksShowShelves.php
@@ -10,7 +10,7 @@ class BooksShowShelves extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-shelves';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Book $book */
         $book = $viewData['book'];
diff --git a/app/View/ViewBlocks/BooksShowTags.php b/app/View/ViewBlocks/BooksShowTags.php
index 60603b91a..5c5aa8fd9 100644
--- a/app/View/ViewBlocks/BooksShowTags.php
+++ b/app/View/ViewBlocks/BooksShowTags.php
@@ -9,7 +9,7 @@ class BooksShowTags extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-tags';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         return [
             'book' => $viewData['book'],
diff --git a/app/View/ViewBlocks/ChaptersShowActions.php b/app/View/ViewBlocks/ChaptersShowActions.php
index e75b86a1e..9b6137a20 100644
--- a/app/View/ViewBlocks/ChaptersShowActions.php
+++ b/app/View/ViewBlocks/ChaptersShowActions.php
@@ -11,7 +11,7 @@ class ChaptersShowActions extends ViewBlock
 {
     protected string $view = 'chapters.parts.show-sidebar-section-actions';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Chapter $chapter */
         $chapter = $viewData['chapter'];
diff --git a/app/View/ViewBlocks/ChaptersShowBookTree.php b/app/View/ViewBlocks/ChaptersShowBookTree.php
index 79e65908b..827e8d917 100644
--- a/app/View/ViewBlocks/ChaptersShowBookTree.php
+++ b/app/View/ViewBlocks/ChaptersShowBookTree.php
@@ -10,7 +10,7 @@ class ChaptersShowBookTree extends ViewBlock
 {
     protected string $view = 'entities.book-tree';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Book $book */
         $book = $viewData['book'];
diff --git a/app/View/ViewBlocks/ChaptersShowDetails.php b/app/View/ViewBlocks/ChaptersShowDetails.php
index ed7efaa89..fd235fbe1 100644
--- a/app/View/ViewBlocks/ChaptersShowDetails.php
+++ b/app/View/ViewBlocks/ChaptersShowDetails.php
@@ -18,7 +18,7 @@ class ChaptersShowDetails extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Book $book */
         $book = $viewData['book'];
diff --git a/app/View/ViewBlocks/ChaptersShowSearchForm.php b/app/View/ViewBlocks/ChaptersShowSearchForm.php
index ad671a2d3..92664e5f5 100644
--- a/app/View/ViewBlocks/ChaptersShowSearchForm.php
+++ b/app/View/ViewBlocks/ChaptersShowSearchForm.php
@@ -9,7 +9,7 @@ class ChaptersShowSearchForm extends ViewBlock
 {
     protected string $view = 'entities.search-form';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         return [
             'label' => trans('entities.chapters_search_this'),
diff --git a/app/View/ViewBlocks/ChaptersShowTags.php b/app/View/ViewBlocks/ChaptersShowTags.php
index 369946e2b..198604eee 100644
--- a/app/View/ViewBlocks/ChaptersShowTags.php
+++ b/app/View/ViewBlocks/ChaptersShowTags.php
@@ -10,7 +10,7 @@ class ChaptersShowTags extends ViewBlock
 {
     protected string $view = 'chapters.parts.show-sidebar-section-tags';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Chapter $chapter */
         $chapter = $viewData['chapter'];
diff --git a/app/View/ViewBlocks/HomeActions.php b/app/View/ViewBlocks/HomeActions.php
new file mode 100644
index 000000000..f4e4295b8
--- /dev/null
+++ b/app/View/ViewBlocks/HomeActions.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\View\ViewBlock;
+use Illuminate\Http\Request;
+
+class HomeActions extends ViewBlock
+{
+    protected string $view = 'home.parts.configured-section-actions';
+
+    public function withData(array $viewData): array
+    {
+        return [
+            'view' => $viewData['view'] ?? '',
+            'homeView' => $viewData['homeView'] ?? 'default',
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/HomeRecentActivity.php b/app/View/ViewBlocks/HomeRecentActivity.php
new file mode 100644
index 000000000..1f915061c
--- /dev/null
+++ b/app/View/ViewBlocks/HomeRecentActivity.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Activity\ActivityQueries;
+use BookStack\View\ViewBlockInterface;
+use Illuminate\Http\Request;
+
+class HomeRecentActivity implements ViewBlockInterface
+{
+    public function __construct(
+        protected ActivityQueries $activityQueries
+    ) {
+    }
+
+    public function getView(array $viewData): string
+    {
+        if ($viewData['homeView'] === 'default') {
+            return 'home.parts.default-card-recent-activity';
+        }
+
+        return 'home.parts.configured-section-recent-activity';
+    }
+
+    public function withData(array $viewData): array
+    {
+        $activity = $this->activityQueries->latest(10);
+        return [
+            'activity' => $activity,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/HomeRecentDrafts.php b/app/View/ViewBlocks/HomeRecentDrafts.php
new file mode 100644
index 000000000..71586d83a
--- /dev/null
+++ b/app/View/ViewBlocks/HomeRecentDrafts.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\PageQueries;
+use BookStack\View\ViewBlockInterface;
+
+class HomeRecentDrafts implements ViewBlockInterface
+{
+    public function __construct(
+        protected PageQueries $pageQueries
+    ) {
+    }
+
+    public function getView(array $viewData): string
+    {
+        if ($viewData['homeView'] === 'default') {
+            return 'home.parts.default-card-recent-drafts';
+        }
+
+        return 'home.parts.configured-section-recent-drafts';
+    }
+
+    public function withData(array $viewData): array
+    {
+        $draftPages = [];
+
+        if (!user()->isGuest()) {
+            $draftPages = $this->pageQueries->currentUserDraftsForList()
+                ->orderBy('updated_at', 'desc')
+                ->with('book')
+                ->take(6)
+                ->get();
+        }
+
+        return [
+            'draftPages' => $draftPages,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php b/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
new file mode 100644
index 000000000..3f669ee6e
--- /dev/null
+++ b/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\PageQueries;
+use BookStack\View\ViewBlockInterface;
+use Illuminate\Http\Request;
+
+class HomeRecentlyUpdatedPages implements ViewBlockInterface
+{
+    public function __construct(
+        protected PageQueries $queries
+    ) {
+    }
+
+    public function getView(array $viewData): string
+    {
+        if ($viewData['homeView'] === 'default') {
+            return 'home.parts.default-card-recently-updated-pages';
+        }
+
+        return 'home.parts.configured-section-recently-updated-pages';
+    }
+
+    public function withData(array $viewData): array
+    {
+        $recentlyUpdatedPages = $this->queries->visibleForList()
+            ->where('draft', false)
+            ->orderBy('updated_at', 'desc')
+            ->take(8)
+            ->get();
+
+        return [
+            'recentlyUpdatedPages' => $recentlyUpdatedPages,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php b/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
new file mode 100644
index 000000000..7db3d7935
--- /dev/null
+++ b/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\EntityQueries;
+use BookStack\Entities\Queries\QueryRecentlyViewed;
+use BookStack\Entities\Queries\QueryTopFavourites;
+use BookStack\View\ViewBlockInterface;
+use Illuminate\Http\Request;
+
+class HomeRecentlyViewedOrRecentBooks implements ViewBlockInterface
+{
+    public function __construct(
+        protected EntityQueries $queries,
+        protected QueryRecentlyViewed $recentlyViewed,
+    ) {
+    }
+
+    public function getView(array $viewData): string
+    {
+        if ($viewData['homeView'] === 'default') {
+            return 'home.parts.default-card-recently-viewed-or-recent-books';
+        }
+
+        return 'home.parts.configured-section-recently-viewed-or-recent-books';
+    }
+
+    public function withData(array $viewData): array
+    {
+        if (user()->isGuest()) {
+            $recents = $this->queries->books->visibleForList()
+                ->orderBy('created_at', 'desc')
+                ->take(10)
+                ->get();
+        } else {
+            $recents = $this->recentlyViewed->run(10, 1);
+        }
+
+        return [
+            'recents' => $recents
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/HomeTopFavourites.php b/app/View/ViewBlocks/HomeTopFavourites.php
new file mode 100644
index 000000000..9ce84aa3d
--- /dev/null
+++ b/app/View/ViewBlocks/HomeTopFavourites.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\QueryTopFavourites;
+use BookStack\View\ViewBlockInterface;
+use Illuminate\Http\Request;
+
+class HomeTopFavourites implements ViewBlockInterface
+{
+    public function __construct(
+        protected QueryTopFavourites $topFavourites
+    ) {
+    }
+
+    public function getView(array $viewData): string
+    {
+        if ($viewData['homeView'] === 'default') {
+            return 'home.parts.default-card-top-favourites';
+        }
+
+        return 'home.parts.configured-section-top-favourites';
+    }
+
+    public function withData(array $viewData): array
+    {
+        $favourites = $this->topFavourites->run(6);
+        return [
+            'favourites' => $favourites
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/PagesShowActions.php b/app/View/ViewBlocks/PagesShowActions.php
index b09a64081..5486b59a4 100644
--- a/app/View/ViewBlocks/PagesShowActions.php
+++ b/app/View/ViewBlocks/PagesShowActions.php
@@ -11,7 +11,7 @@ class PagesShowActions extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-actions';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Page $page */
         $page = $viewData['page'];
diff --git a/app/View/ViewBlocks/PagesShowAttachments.php b/app/View/ViewBlocks/PagesShowAttachments.php
index 43e076671..5d0cd23ba 100644
--- a/app/View/ViewBlocks/PagesShowAttachments.php
+++ b/app/View/ViewBlocks/PagesShowAttachments.php
@@ -10,7 +10,7 @@ class PagesShowAttachments extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-attachments';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Page $page */
         $page = $viewData['page'];
diff --git a/app/View/ViewBlocks/PagesShowBookTree.php b/app/View/ViewBlocks/PagesShowBookTree.php
index 4631e4ef4..b0947a208 100644
--- a/app/View/ViewBlocks/PagesShowBookTree.php
+++ b/app/View/ViewBlocks/PagesShowBookTree.php
@@ -10,7 +10,7 @@ class PagesShowBookTree extends ViewBlock
 {
     protected string $view = 'entities.book-tree';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Book $book */
         $book = $viewData['book'];
diff --git a/app/View/ViewBlocks/PagesShowDetails.php b/app/View/ViewBlocks/PagesShowDetails.php
index 9fcaadac9..2dfd61417 100644
--- a/app/View/ViewBlocks/PagesShowDetails.php
+++ b/app/View/ViewBlocks/PagesShowDetails.php
@@ -18,7 +18,7 @@ class PagesShowDetails extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Book $book */
         $book = $viewData['book'];
diff --git a/app/View/ViewBlocks/PagesShowPageNav.php b/app/View/ViewBlocks/PagesShowPageNav.php
index c43b4d7f8..dbee578ab 100644
--- a/app/View/ViewBlocks/PagesShowPageNav.php
+++ b/app/View/ViewBlocks/PagesShowPageNav.php
@@ -11,7 +11,7 @@ class PagesShowPageNav extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-page-nav';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Page $page */
         $page = $viewData['page'];
diff --git a/app/View/ViewBlocks/PagesShowTags.php b/app/View/ViewBlocks/PagesShowTags.php
index bee6846f1..a2197a161 100644
--- a/app/View/ViewBlocks/PagesShowTags.php
+++ b/app/View/ViewBlocks/PagesShowTags.php
@@ -10,7 +10,7 @@ class PagesShowTags extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-tags';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Page $page */
         $page = $viewData['page'];
diff --git a/app/View/ViewBlocks/ShelvesIndexActions.php b/app/View/ViewBlocks/ShelvesIndexActions.php
index 51d4b3a89..2cc436116 100644
--- a/app/View/ViewBlocks/ShelvesIndexActions.php
+++ b/app/View/ViewBlocks/ShelvesIndexActions.php
@@ -9,7 +9,7 @@ class ShelvesIndexActions extends ViewBlock
 {
     protected string $view = 'shelves.parts.index-sidebar-section-actions';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         return [
             'view' => $viewData['view'],
diff --git a/app/View/ViewBlocks/ShelvesIndexNew.php b/app/View/ViewBlocks/ShelvesIndexNew.php
index f3ad4a650..1d6af72c0 100644
--- a/app/View/ViewBlocks/ShelvesIndexNew.php
+++ b/app/View/ViewBlocks/ShelvesIndexNew.php
@@ -15,7 +15,7 @@ class ShelvesIndexNew extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         $new = $this->queries->visibleForList()
             ->orderBy('created_at', 'desc')
diff --git a/app/View/ViewBlocks/ShelvesIndexPopular.php b/app/View/ViewBlocks/ShelvesIndexPopular.php
index 5e880e18e..fc2950b92 100644
--- a/app/View/ViewBlocks/ShelvesIndexPopular.php
+++ b/app/View/ViewBlocks/ShelvesIndexPopular.php
@@ -15,7 +15,7 @@ class ShelvesIndexPopular extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         return [
             'popular' => $this->queries->popularForList()->take(4)->get(),
diff --git a/app/View/ViewBlocks/ShelvesIndexRecents.php b/app/View/ViewBlocks/ShelvesIndexRecents.php
index 77e3a2af4..6570841a9 100644
--- a/app/View/ViewBlocks/ShelvesIndexRecents.php
+++ b/app/View/ViewBlocks/ShelvesIndexRecents.php
@@ -15,7 +15,7 @@ class ShelvesIndexRecents extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         $recents = null;
         if (!user()->isGuest()) {
diff --git a/app/View/ViewBlocks/ShelvesShowActions.php b/app/View/ViewBlocks/ShelvesShowActions.php
index 9c0ab7321..d1bb965c8 100644
--- a/app/View/ViewBlocks/ShelvesShowActions.php
+++ b/app/View/ViewBlocks/ShelvesShowActions.php
@@ -10,7 +10,7 @@ class ShelvesShowActions extends ViewBlock
 {
     protected string $view = 'shelves.parts.show-sidebar-section-actions';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Bookshelf $shelf */
         $shelf = $viewData['shelf'];
diff --git a/app/View/ViewBlocks/ShelvesShowActivity.php b/app/View/ViewBlocks/ShelvesShowActivity.php
index a4ae874be..40e715bcd 100644
--- a/app/View/ViewBlocks/ShelvesShowActivity.php
+++ b/app/View/ViewBlocks/ShelvesShowActivity.php
@@ -16,7 +16,7 @@ class ShelvesShowActivity extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Bookshelf $shelf */
         $shelf = $viewData['shelf'];
diff --git a/app/View/ViewBlocks/ShelvesShowDetails.php b/app/View/ViewBlocks/ShelvesShowDetails.php
index 2a892cf88..413b4796c 100644
--- a/app/View/ViewBlocks/ShelvesShowDetails.php
+++ b/app/View/ViewBlocks/ShelvesShowDetails.php
@@ -16,7 +16,7 @@ class ShelvesShowDetails extends ViewBlock
     ) {
     }
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         /** @var Bookshelf $shelf */
         $shelf = $viewData['shelf'];
diff --git a/app/View/ViewBlocks/ShelvesShowTags.php b/app/View/ViewBlocks/ShelvesShowTags.php
index 35dd56ede..9a61cc94d 100644
--- a/app/View/ViewBlocks/ShelvesShowTags.php
+++ b/app/View/ViewBlocks/ShelvesShowTags.php
@@ -9,7 +9,7 @@ class ShelvesShowTags extends ViewBlock
 {
     protected string $view = 'shelves.parts.show-sidebar-section-tags';
 
-    public function withData(array $viewData, Request $request): array
+    public function withData(array $viewData): array
     {
         return [
             'book' => $viewData['book'],
diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index 020cb0966..6e311a88b 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -5,9 +5,9 @@
 @stop
 
 @section('left')
-    @include('common.sidebar-sections', ['location' => 'books-index', 'position' => 'left'])
+    @include('common.view-blocks', ['location' => 'books-index', 'position' => 'left'])
 @stop
 
 @section('right')
-    @include('common.sidebar-sections', ['location' => 'books-index', 'position' => 'right'])
+    @include('common.view-blocks', ['location' => 'books-index', 'position' => 'right'])
 @stop
diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index 48a951132..b2fa0b393 100644
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -67,9 +67,9 @@
 @stop
 
 @section('left')
-    @include('common.sidebar-sections', ['location' => 'books-show', 'position' => 'left'])
+    @include('common.view-blocks', ['location' => 'books-show', 'position' => 'left'])
 @stop
 
 @section('right')
-    @include('common.sidebar-sections', ['location' => 'books-show', 'position' => 'right'])
+    @include('common.view-blocks', ['location' => 'books-show', 'position' => 'right'])
 @stop
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 569d901f6..2c481ee14 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -63,9 +63,9 @@
 @stop
 
 @section('left')
-    @include('common.sidebar-sections', ['location' => 'chapters-show', 'position' => 'left'])
+    @include('common.view-blocks', ['location' => 'chapters-show', 'position' => 'left'])
 @stop
 
 @section('right')
-    @include('common.sidebar-sections', ['location' => 'chapters-show', 'position' => 'right'])
+    @include('common.view-blocks', ['location' => 'chapters-show', 'position' => 'right'])
 @stop
diff --git a/resources/views/common/sidebar-sections.blade.php b/resources/views/common/view-blocks.blade.php
similarity index 60%
rename from resources/views/common/sidebar-sections.blade.php
rename to resources/views/common/view-blocks.blade.php
index f18f9e4c2..fb5e83e19 100644
--- a/resources/views/common/sidebar-sections.blade.php
+++ b/resources/views/common/view-blocks.blade.php
@@ -4,8 +4,7 @@ $position - string
 --}}
 @php
     $sectionVars = get_defined_vars();
-    $sectionRequest = request();
 @endphp
 @foreach($viewBlocks->getForLocation($location, $position) as $section)
-    @include($section->getView(), $section->withData($sectionVars, $sectionRequest))
+    @include($section->getView($sectionVars), $section->withData($sectionVars))
 @endforeach
\ No newline at end of file
diff --git a/resources/views/home/books.blade.php b/resources/views/home/books.blade.php
index afd3f30fc..3c4225b56 100644
--- a/resources/views/home/books.blade.php
+++ b/resources/views/home/books.blade.php
@@ -5,26 +5,9 @@
 @stop
 
 @section('left')
-    @include('home.parts.sidebar')
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'left'])
 @stop
 
 @section('right')
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-link">
-            @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
-                <a href="{{ url("/create-book") }}" class="icon-list-item">
-                    <span>@icon('add')</span>
-                    <span>{{ trans('entities.books_create') }}</span>
-                </a>
-            @endif
-            @include('entities.view-toggle', ['view' => $view, 'type' => 'books'])
-            <a href="{{ url('/tags') }}" class="icon-list-item">
-                <span>@icon('tag')</span>
-                <span>{{ trans('entities.tags_view_tags') }}</span>
-            </a>
-            @include('home.parts.expand-toggle', ['classes' => 'text-link', 'target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
-            @include('common.dark-mode-toggle', ['classes' => 'icon-list-item text-link'])
-        </div>
-    </div>
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'right'])
 @stop
diff --git a/resources/views/home/default.blade.php b/resources/views/home/default.blade.php
index 7d229d6ac..508631c8c 100644
--- a/resources/views/home/default.blade.php
+++ b/resources/views/home/default.blade.php
@@ -16,17 +16,15 @@
     <div class="container" id="home-default">
         <div class="grid third gap-x-xxl no-row-gap">
             <div>
-                @include('home.parts.default-card-recent-drafts', ['draftPages' => $draftPages])
-                @include('home.parts.default-card-recently-viewed-or-recent-books', ['recents' => $recents])
+                @include('common.view-blocks', ['location' => 'home-default', 'position' => 'left'])
             </div>
 
             <div>
-                @include('home.parts.default-card-top-favourites', ['favourites' => $favourites])
-                @include('home.parts.default-card-recently-updates-pages', ['recentlyUpdatedPages' => $recentlyUpdatedPages])
+                @include('common.view-blocks', ['location' => 'home-default', 'position' => 'center'])
             </div>
 
             <div>
-                @include('home.parts.default-card-recent-activity', ['activity' => $activity])
+                @include('common.view-blocks', ['location' => 'home-default', 'position' => 'right'])
             </div>
         </div>
     </div>
diff --git a/resources/views/home/parts/configured-section-actions.blade.php b/resources/views/home/parts/configured-section-actions.blade.php
new file mode 100644
index 000000000..6386670d5
--- /dev/null
+++ b/resources/views/home/parts/configured-section-actions.blade.php
@@ -0,0 +1,36 @@
+{{--
+$homeView - string - The type of home view being used
+$view - string - Configured view type from parent (for books/shelves list/grid view)
+--}}
+<div class="actions mb-xl">
+    <h5>{{ trans('common.actions') }}</h5>
+    <div class="icon-list text-link">
+        @if($homeView === 'books')
+            @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
+                <a href="{{ url("/create-book") }}" class="icon-list-item">
+                    <span>@icon('add')</span>
+                    <span>{{ trans('entities.books_create') }}</span>
+                </a>
+            @endif
+            @include('entities.view-toggle', ['view' => $view, 'type' => 'books'])
+            <a href="{{ url('/tags') }}" class="icon-list-item">
+                <span>@icon('tag')</span>
+                <span>{{ trans('entities.tags_view_tags') }}</span>
+            </a>
+        @elseif ($homeView === 'bookshelves')
+            @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))
+                <a href="{{ url("/create-shelf") }}" class="icon-list-item">
+                    <span>@icon('add')</span>
+                    <span>{{ trans('entities.shelves_new_action') }}</span>
+                </a>
+            @endif
+            @include('entities.view-toggle', ['view' => $view, 'type' => 'bookshelves'])
+            <a href="{{ url('/tags') }}" class="icon-list-item">
+                <span>@icon('tag')</span>
+                <span>{{ trans('entities.tags_view_tags') }}</span>
+            </a>
+        @endif
+        @include('home.parts.expand-toggle', ['classes' => 'text-link', 'target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
+        @include('common.dark-mode-toggle', ['classes' => 'icon-list-item text-link'])
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/sidebar-section-recent-activity.blade.php b/resources/views/home/parts/configured-section-recent-activity.blade.php
similarity index 100%
rename from resources/views/home/parts/sidebar-section-recent-activity.blade.php
rename to resources/views/home/parts/configured-section-recent-activity.blade.php
diff --git a/resources/views/home/parts/sidebar-section-recent-drafts.blade.php b/resources/views/home/parts/configured-section-recent-drafts.blade.php
similarity index 100%
rename from resources/views/home/parts/sidebar-section-recent-drafts.blade.php
rename to resources/views/home/parts/configured-section-recent-drafts.blade.php
diff --git a/resources/views/home/parts/sidebar-section-recently-updated-pages.blade.php b/resources/views/home/parts/configured-section-recently-updated-pages.blade.php
similarity index 100%
rename from resources/views/home/parts/sidebar-section-recently-updated-pages.blade.php
rename to resources/views/home/parts/configured-section-recently-updated-pages.blade.php
diff --git a/resources/views/home/parts/sidebar-section-recently-viewed-or-recent-books.blade.php b/resources/views/home/parts/configured-section-recently-viewed-or-recent-books.blade.php
similarity index 100%
rename from resources/views/home/parts/sidebar-section-recently-viewed-or-recent-books.blade.php
rename to resources/views/home/parts/configured-section-recently-viewed-or-recent-books.blade.php
diff --git a/resources/views/home/parts/sidebar-section-top-favourites.blade.php b/resources/views/home/parts/configured-section-top-favourites.blade.php
similarity index 100%
rename from resources/views/home/parts/sidebar-section-top-favourites.blade.php
rename to resources/views/home/parts/configured-section-top-favourites.blade.php
diff --git a/resources/views/home/parts/default-card-recent-activity.blade.php b/resources/views/home/parts/default-card-recent-activity.blade.php
index 035cd9987..c848ff1bc 100644
--- a/resources/views/home/parts/default-card-recent-activity.blade.php
+++ b/resources/views/home/parts/default-card-recent-activity.blade.php
@@ -1,6 +1,9 @@
+{{--
+$activity - array
+--}}
 <div id="recent-activity" class="card mb-xl">
     <h3 class="card-title">{{ trans('entities.recent_activity') }}</h3>
     <div class="px-m">
         @include('common.activity-list', ['activity' => $activity])
     </div>
-</div>j
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/default-card-recently-updates-pages.blade.php b/resources/views/home/parts/default-card-recently-updated-pages.blade.php
similarity index 100%
rename from resources/views/home/parts/default-card-recently-updates-pages.blade.php
rename to resources/views/home/parts/default-card-recently-updated-pages.blade.php
diff --git a/resources/views/home/parts/sidebar.blade.php b/resources/views/home/parts/sidebar.blade.php
deleted file mode 100644
index 07c199f9e..000000000
--- a/resources/views/home/parts/sidebar.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@include('home.parts.sidebar-section-recent-drafts', ['draftPages' => $draftPages])
-@include('home.parts.sidebar-section-top-favourites', ['favourites' => $favourites])
-@include('home.parts.sidebar-section-recently-viewed-or-recent-books', ['recents' => $recents])
-@include('home.parts.sidebar-section-recently-updated-pages', ['recentlyUpdatedPages' => $recentlyUpdatedPages])
-@include('home.parts.sidebar-section-recent-activity', ['activity' => $activity])
\ No newline at end of file
diff --git a/resources/views/home/shelves.blade.php b/resources/views/home/shelves.blade.php
index 7a4d002a0..647951543 100644
--- a/resources/views/home/shelves.blade.php
+++ b/resources/views/home/shelves.blade.php
@@ -5,26 +5,9 @@
 @stop
 
 @section('left')
-    @include('home.parts.sidebar')
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'left'])
 @stop
 
 @section('right')
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-link">
-            @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))
-                <a href="{{ url("/create-shelf") }}" class="icon-list-item">
-                    <span>@icon('add')</span>
-                    <span>{{ trans('entities.shelves_new_action') }}</span>
-                </a>
-            @endif
-            @include('entities.view-toggle', ['view' => $view, 'type' => 'bookshelves'])
-            <a href="{{ url('/tags') }}" class="icon-list-item">
-                <span>@icon('tag')</span>
-                <span>{{ trans('entities.tags_view_tags') }}</span>
-            </a>
-            @include('home.parts.expand-toggle', ['classes' => 'text-link', 'target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
-            @include('common.dark-mode-toggle', ['classes' => 'icon-list-item text-link'])
-        </div>
-    </div>
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'right'])
 @stop
diff --git a/resources/views/home/specific-page.blade.php b/resources/views/home/specific-page.blade.php
index 10ffe9629..329c4a6c2 100644
--- a/resources/views/home/specific-page.blade.php
+++ b/resources/views/home/specific-page.blade.php
@@ -13,15 +13,9 @@
 @stop
 
 @section('left')
-    @include('home.parts.sidebar')
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'left'])
 @stop
 
 @section('right')
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-link">
-            @include('home.parts.expand-toggle', ['classes' => 'text-link', 'target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
-            @include('common.dark-mode-toggle', ['classes' => 'icon-list-item text-link'])
-        </div>
-    </div>
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'right'])
 @stop
\ No newline at end of file
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 08d01973d..eef559320 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -36,9 +36,9 @@
 @stop
 
 @section('left')
-    @include('common.sidebar-sections', ['location' => 'pages-show', 'position' => 'left'])
+    @include('common.view-blocks', ['location' => 'pages-show', 'position' => 'left'])
 @stop
 
 @section('right')
-    @include('common.sidebar-sections', ['location' => 'pages-show', 'position' => 'right'])
+    @include('common.view-blocks', ['location' => 'pages-show', 'position' => 'right'])
 @stop
diff --git a/resources/views/shelves/index.blade.php b/resources/views/shelves/index.blade.php
index 2fc78fa50..87c639298 100644
--- a/resources/views/shelves/index.blade.php
+++ b/resources/views/shelves/index.blade.php
@@ -5,9 +5,9 @@
 @stop
 
 @section('left')
-    @include('common.sidebar-sections', ['location' => 'shelves-index', 'position' => 'left'])
+    @include('common.view-blocks', ['location' => 'shelves-index', 'position' => 'left'])
 @stop
 
 @section('right')
-    @include('common.sidebar-sections', ['location' => 'shelves-index', 'position' => 'right'])
+    @include('common.view-blocks', ['location' => 'shelves-index', 'position' => 'right'])
 @stop
diff --git a/resources/views/shelves/show.blade.php b/resources/views/shelves/show.blade.php
index 320e1066c..b942f35ff 100644
--- a/resources/views/shelves/show.blade.php
+++ b/resources/views/shelves/show.blade.php
@@ -69,9 +69,9 @@
 @stop
 
 @section('left')
-    @include('common.sidebar-sections', ['location' => 'shelves-show', 'position' => 'left'])
+    @include('common.view-blocks', ['location' => 'shelves-show', 'position' => 'left'])
 @stop
 
 @section('right')
-    @include('common.sidebar-sections', ['location' => 'shelves-show', 'position' => 'right'])
+    @include('common.view-blocks', ['location' => 'shelves-show', 'position' => 'right'])
 @stop

From 45ff36714ff78afa27078b4948edeae1e854b105 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 9 Aug 2026 18:35:10 +0100
Subject: [PATCH 14/72] View Blocks: Extracted default set, added labels to
 each

---
 app/View/ViewBlock.php                        |   9 ++
 app/View/ViewBlockDefaults.php                | 110 +++++++++++++++
 app/View/ViewBlockInterface.php               |   5 +
 app/View/ViewBlockManager.php                 | 133 +-----------------
 app/View/ViewBlocks/BooksIndexActions.php     |   1 +
 app/View/ViewBlocks/BooksIndexNew.php         |   1 +
 app/View/ViewBlocks/BooksIndexPopular.php     |   1 +
 app/View/ViewBlocks/BooksIndexRecents.php     |   1 +
 app/View/ViewBlocks/BooksShowActions.php      |   1 +
 app/View/ViewBlocks/BooksShowActivity.php     |   1 +
 app/View/ViewBlocks/BooksShowDetails.php      |   1 +
 app/View/ViewBlocks/BooksShowSearchForm.php   |   1 +
 app/View/ViewBlocks/BooksShowShelves.php      |   1 +
 app/View/ViewBlocks/BooksShowTags.php         |   1 +
 app/View/ViewBlocks/ChaptersShowActions.php   |   1 +
 app/View/ViewBlocks/ChaptersShowBookTree.php  |   1 +
 app/View/ViewBlocks/ChaptersShowDetails.php   |   1 +
 .../ViewBlocks/ChaptersShowSearchForm.php     |   1 +
 app/View/ViewBlocks/ChaptersShowTags.php      |   1 +
 app/View/ViewBlocks/HomeActions.php           |   2 +-
 app/View/ViewBlocks/HomeRecentActivity.php    |   5 +
 app/View/ViewBlocks/HomeRecentDrafts.php      |   5 +
 .../ViewBlocks/HomeRecentlyUpdatedPages.php   |   5 +
 .../HomeRecentlyViewedOrRecentBooks.php       |   6 +
 app/View/ViewBlocks/HomeTopFavourites.php     |   5 +
 app/View/ViewBlocks/PagesShowActions.php      |   1 +
 app/View/ViewBlocks/PagesShowAttachments.php  |   1 +
 app/View/ViewBlocks/PagesShowBookTree.php     |   1 +
 app/View/ViewBlocks/PagesShowDetails.php      |   1 +
 app/View/ViewBlocks/PagesShowPageNav.php      |   1 +
 app/View/ViewBlocks/PagesShowTags.php         |   1 +
 app/View/ViewBlocks/ShelvesIndexActions.php   |   1 +
 app/View/ViewBlocks/ShelvesIndexNew.php       |   1 +
 app/View/ViewBlocks/ShelvesIndexPopular.php   |   1 +
 app/View/ViewBlocks/ShelvesIndexRecents.php   |   1 +
 app/View/ViewBlocks/ShelvesShowActions.php    |   1 +
 app/View/ViewBlocks/ShelvesShowActivity.php   |   1 +
 app/View/ViewBlocks/ShelvesShowDetails.php    |   1 +
 app/View/ViewBlocks/ShelvesShowTags.php       |   1 +
 39 files changed, 185 insertions(+), 129 deletions(-)
 create mode 100644 app/View/ViewBlockDefaults.php

diff --git a/app/View/ViewBlock.php b/app/View/ViewBlock.php
index 636746044..921ecd342 100644
--- a/app/View/ViewBlock.php
+++ b/app/View/ViewBlock.php
@@ -5,6 +5,7 @@ namespace BookStack\View;
 abstract class ViewBlock implements ViewBlockInterface
 {
     protected string $view;
+    protected string $labelTranslationKey;
 
     /**
      * @inheritDoc
@@ -13,4 +14,12 @@ abstract class ViewBlock implements ViewBlockInterface
     {
         return $this->view;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLabel(): string
+    {
+        return trans($this->labelTranslationKey);
+    }
 }
diff --git a/app/View/ViewBlockDefaults.php b/app/View/ViewBlockDefaults.php
new file mode 100644
index 000000000..33a08adc1
--- /dev/null
+++ b/app/View/ViewBlockDefaults.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace BookStack\View;
+
+class ViewBlockDefaults
+{
+    /**
+     * @var array<string, array<string, class-string<ViewBlockInterface>[]>>
+     */
+    protected static array $defaults = [
+        'home-default' => [
+            'left' => [
+                ViewBlocks\HomeRecentDrafts::class,
+                ViewBlocks\HomeRecentlyViewedOrRecentBooks::class,
+            ],
+            'center' => [
+                ViewBlocks\HomeTopFavourites::class,
+                ViewBlocks\HomeRecentlyUpdatedPages::class,
+            ],
+            'right' => [
+                ViewBlocks\HomeRecentActivity::class,
+            ],
+        ],
+        'home-non-default' => [
+            'left' => [
+                ViewBlocks\HomeRecentDrafts::class,
+                ViewBlocks\HomeTopFavourites::class,
+                ViewBlocks\HomeRecentlyViewedOrRecentBooks::class,
+                ViewBlocks\HomeRecentlyUpdatedPages::class,
+                ViewBlocks\HomeRecentActivity::class,
+            ],
+            'right' => [
+                ViewBlocks\HomeActions::class,
+            ],
+        ],
+        'shelves-index' => [
+            'left' => [
+                ViewBlocks\ShelvesIndexRecents::class,
+                ViewBlocks\ShelvesIndexPopular::class,
+                ViewBlocks\ShelvesIndexNew::class,
+            ],
+            'right' => [
+                ViewBlocks\ShelvesIndexActions::class,
+            ],
+        ],
+        'shelves-show' => [
+            'left' => [
+                ViewBlocks\ShelvesShowTags::class,
+                ViewBlocks\ShelvesShowDetails::class,
+                ViewBlocks\ShelvesShowActivity::class,
+            ],
+            'right' => [
+                ViewBlocks\ShelvesShowActions::class,
+            ],
+        ],
+        'books-index' => [
+            'left' => [
+                ViewBlocks\BooksIndexRecents::class,
+                ViewBlocks\BooksIndexPopular::class,
+                ViewBlocks\BooksIndexNew::class,
+            ],
+            'right' => [
+                ViewBlocks\BooksIndexActions::class,
+            ],
+        ],
+        'books-show' => [
+            'left' => [
+                ViewBlocks\BooksShowSearchForm::class,
+                ViewBlocks\BooksShowTags::class,
+                ViewBlocks\BooksShowShelves::class,
+                ViewBlocks\BooksShowActivity::class,
+            ],
+            'right' => [
+                ViewBlocks\BooksShowDetails::class,
+                ViewBlocks\BooksShowActions::class,
+            ],
+        ],
+        'chapters-show' => [
+            'left' => [
+                ViewBlocks\ChaptersShowSearchForm::class,
+                ViewBlocks\ChaptersShowTags::class,
+                ViewBlocks\ChaptersShowBookTree::class,
+            ],
+            'right' => [
+                ViewBlocks\ChaptersShowDetails::class,
+                ViewBlocks\ChaptersShowActions::class,
+            ],
+        ],
+        'pages-show' => [
+            'left' => [
+                ViewBlocks\PagesShowTags::class,
+                ViewBlocks\PagesShowAttachments::class,
+                ViewBlocks\PagesShowPageNav::class,
+                ViewBlocks\PagesShowBookTree::class,
+            ],
+            'right' => [
+                ViewBlocks\PagesShowDetails::class,
+                ViewBlocks\PagesShowActions::class,
+            ],
+        ],
+    ];
+
+    /**
+     * Get the default view blocks for the given location.
+     */
+    public static function getForLocation(string $location): array
+    {
+        return self::$defaults[$location] ?? [];
+    }
+}
diff --git a/app/View/ViewBlockInterface.php b/app/View/ViewBlockInterface.php
index 756cf4298..d72456870 100644
--- a/app/View/ViewBlockInterface.php
+++ b/app/View/ViewBlockInterface.php
@@ -4,6 +4,11 @@ namespace BookStack\View;
 
 interface ViewBlockInterface
 {
+    /**
+     * Get the label for this block.
+     */
+    public function getLabel(): string;
+
     /**
      * Get the view to render for this block.
      * Is provided with the existing parent view data.
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
index 7287c0293..00535b2c1 100644
--- a/app/View/ViewBlockManager.php
+++ b/app/View/ViewBlockManager.php
@@ -2,41 +2,6 @@
 
 namespace BookStack\View;
 
-use BookStack\View\ViewBlocks\BooksIndexActions;
-use BookStack\View\ViewBlocks\BooksIndexNew;
-use BookStack\View\ViewBlocks\BooksIndexPopular;
-use BookStack\View\ViewBlocks\BooksIndexRecents;
-use BookStack\View\ViewBlocks\BooksShowActions;
-use BookStack\View\ViewBlocks\BooksShowActivity;
-use BookStack\View\ViewBlocks\BooksShowDetails;
-use BookStack\View\ViewBlocks\BooksShowSearchForm;
-use BookStack\View\ViewBlocks\BooksShowShelves;
-use BookStack\View\ViewBlocks\BooksShowTags;
-use BookStack\View\ViewBlocks\ChaptersShowActions;
-use BookStack\View\ViewBlocks\ChaptersShowBookTree;
-use BookStack\View\ViewBlocks\ChaptersShowDetails;
-use BookStack\View\ViewBlocks\ChaptersShowSearchForm;
-use BookStack\View\ViewBlocks\ChaptersShowTags;
-use BookStack\View\ViewBlocks\HomeActions;
-use BookStack\View\ViewBlocks\HomeRecentActivity;
-use BookStack\View\ViewBlocks\HomeRecentDrafts;
-use BookStack\View\ViewBlocks\HomeRecentlyUpdatedPages;
-use BookStack\View\ViewBlocks\HomeRecentlyViewedOrRecentBooks;
-use BookStack\View\ViewBlocks\HomeTopFavourites;
-use BookStack\View\ViewBlocks\PagesShowActions;
-use BookStack\View\ViewBlocks\PagesShowAttachments;
-use BookStack\View\ViewBlocks\PagesShowBookTree;
-use BookStack\View\ViewBlocks\PagesShowDetails;
-use BookStack\View\ViewBlocks\PagesShowPageNav;
-use BookStack\View\ViewBlocks\PagesShowTags;
-use BookStack\View\ViewBlocks\ShelvesIndexActions;
-use BookStack\View\ViewBlocks\ShelvesIndexNew;
-use BookStack\View\ViewBlocks\ShelvesIndexPopular;
-use BookStack\View\ViewBlocks\ShelvesIndexRecents;
-use BookStack\View\ViewBlocks\ShelvesShowActions;
-use BookStack\View\ViewBlocks\ShelvesShowActivity;
-use BookStack\View\ViewBlocks\ShelvesShowDetails;
-use BookStack\View\ViewBlocks\ShelvesShowTags;
 use Illuminate\Contracts\Container\BindingResolutionException;
 
 class ViewBlockManager
@@ -44,98 +9,7 @@ class ViewBlockManager
     /**
      * @var array<string, array<string, class-string<ViewBlockInterface>[]>>
      */
-    protected array $blocksByLocationAndPosition = [
-        'home-default' => [
-            'left' => [
-                HomeRecentDrafts::class,
-                HomeRecentlyViewedOrRecentBooks::class,
-            ],
-            'center' => [
-                HomeTopFavourites::class,
-                HomeRecentlyUpdatedPages::class,
-            ],
-            'right' => [
-                HomeRecentActivity::class,
-            ],
-        ],
-        'home-non-default' => [
-            'left' => [
-                HomeRecentDrafts::class,
-                HomeTopFavourites::class,
-                HomeRecentlyViewedOrRecentBooks::class,
-                HomeRecentlyUpdatedPages::class,
-                HomeRecentActivity::class,
-            ],
-            'right' => [
-                HomeActions::class,
-            ],
-        ],
-        'shelves-index' => [
-            'left' => [
-                ShelvesIndexRecents::class,
-                ShelvesIndexPopular::class,
-                ShelvesIndexNew::class,
-            ],
-            'right' => [
-                ShelvesIndexActions::class,
-            ],
-        ],
-        'shelves-show' => [
-            'left' => [
-                ShelvesShowTags::class,
-                ShelvesShowDetails::class,
-                ShelvesShowActivity::class,
-            ],
-            'right' => [
-                ShelvesShowActions::class,
-            ],
-        ],
-        'books-index' => [
-            'left' => [
-                BooksIndexRecents::class,
-                BooksIndexPopular::class,
-                BooksIndexNew::class,
-            ],
-            'right' => [
-                BooksIndexActions::class,
-            ],
-        ],
-        'books-show' => [
-            'left' => [
-                BooksShowSearchForm::class,
-                BooksShowTags::class,
-                BooksShowShelves::class,
-                BooksShowActivity::class,
-            ],
-            'right' => [
-                BooksShowDetails::class,
-                BooksShowActions::class,
-            ],
-        ],
-        'chapters-show' => [
-            'left' => [
-                ChaptersShowSearchForm::class,
-                ChaptersShowTags::class,
-                ChaptersShowBookTree::class,
-            ],
-            'right' => [
-                ChaptersShowDetails::class,
-                ChaptersShowActions::class,
-            ],
-        ],
-        'pages-show' => [
-            'left' => [
-                PagesShowTags::class,
-                PagesShowAttachments::class,
-                PagesShowPageNav::class,
-                PagesShowBookTree::class,
-            ],
-            'right' => [
-                PagesShowDetails::class,
-                PagesShowActions::class,
-            ],
-        ],
-    ];
+    protected array $blocksByLocationAndPosition = [];
 
     /**
      * Register a block type to be displayed at the given location and position.
@@ -162,7 +36,10 @@ class ViewBlockManager
      */
     public function getForLocation(string $location, string $position): array
     {
-        $sections = array_unique($this->blocksByLocationAndPosition[$location][$position] ?? []);
+        $defaults = ViewBlockDefaults::getForLocation($location)[$position] ?? [];
+        $registered = $this->blocksByLocationAndPosition[$location][$position] ?? [];
+        $sections = array_unique(array_merge($defaults, $registered));
+
         return array_map(function (string $className) {
             return app()->make($className);
         }, $sections);
diff --git a/app/View/ViewBlocks/BooksIndexActions.php b/app/View/ViewBlocks/BooksIndexActions.php
index 8e6721ddf..2802809f5 100644
--- a/app/View/ViewBlocks/BooksIndexActions.php
+++ b/app/View/ViewBlocks/BooksIndexActions.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 class BooksIndexActions extends ViewBlock
 {
     protected string $view = 'books.parts.index-sidebar-section-actions';
+    protected string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/BooksIndexNew.php b/app/View/ViewBlocks/BooksIndexNew.php
index 76d2750ba..ef88976e3 100644
--- a/app/View/ViewBlocks/BooksIndexNew.php
+++ b/app/View/ViewBlocks/BooksIndexNew.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class BooksIndexNew extends ViewBlock
 {
     protected string $view = 'books.parts.index-sidebar-section-new';
+    protected string $labelTranslationKey = 'entities.books_new';
 
     public function __construct(
         protected BookQueries $queries,
diff --git a/app/View/ViewBlocks/BooksIndexPopular.php b/app/View/ViewBlocks/BooksIndexPopular.php
index ee3138f79..6428a6098 100644
--- a/app/View/ViewBlocks/BooksIndexPopular.php
+++ b/app/View/ViewBlocks/BooksIndexPopular.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class BooksIndexPopular extends ViewBlock
 {
     protected string $view = 'books.parts.index-sidebar-section-popular';
+    protected string $labelTranslationKey = 'entities.books_popular';
 
     public function __construct(
         protected BookQueries $queries,
diff --git a/app/View/ViewBlocks/BooksIndexRecents.php b/app/View/ViewBlocks/BooksIndexRecents.php
index 1c7b865d8..a6bb90a84 100644
--- a/app/View/ViewBlocks/BooksIndexRecents.php
+++ b/app/View/ViewBlocks/BooksIndexRecents.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class BooksIndexRecents extends ViewBlock
 {
     protected string $view = 'books.parts.index-sidebar-section-recents';
+    protected string $labelTranslationKey = 'entities.recently_viewed';
 
     public function __construct(
         protected BookQueries $queries,
diff --git a/app/View/ViewBlocks/BooksShowActions.php b/app/View/ViewBlocks/BooksShowActions.php
index 155c0c7ba..4f868e4a3 100644
--- a/app/View/ViewBlocks/BooksShowActions.php
+++ b/app/View/ViewBlocks/BooksShowActions.php
@@ -10,6 +10,7 @@ use Illuminate\Http\Request;
 class BooksShowActions extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-actions';
+    protected string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/BooksShowActivity.php b/app/View/ViewBlocks/BooksShowActivity.php
index ecf626df5..e5c0acdd2 100644
--- a/app/View/ViewBlocks/BooksShowActivity.php
+++ b/app/View/ViewBlocks/BooksShowActivity.php
@@ -10,6 +10,7 @@ use Illuminate\Http\Request;
 class BooksShowActivity extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-activity';
+    protected string $labelTranslationKey = 'entities.recent_activity';
 
     public function __construct(
         protected ActivityQueries $activityQueries,
diff --git a/app/View/ViewBlocks/BooksShowDetails.php b/app/View/ViewBlocks/BooksShowDetails.php
index 9a0ef8b47..ccd7a7704 100644
--- a/app/View/ViewBlocks/BooksShowDetails.php
+++ b/app/View/ViewBlocks/BooksShowDetails.php
@@ -11,6 +11,7 @@ use Illuminate\Http\Request;
 class BooksShowDetails extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-details';
+    protected string $labelTranslationKey = 'common.details';
 
     public function __construct(
         protected ReferenceFetcher $referenceFetcher,
diff --git a/app/View/ViewBlocks/BooksShowSearchForm.php b/app/View/ViewBlocks/BooksShowSearchForm.php
index 061875d3d..492579505 100644
--- a/app/View/ViewBlocks/BooksShowSearchForm.php
+++ b/app/View/ViewBlocks/BooksShowSearchForm.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 class BooksShowSearchForm extends ViewBlock
 {
     protected string $view = 'entities.search-form';
+    protected string $labelTranslationKey = 'common.search';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/BooksShowShelves.php b/app/View/ViewBlocks/BooksShowShelves.php
index 42d832589..310bdffef 100644
--- a/app/View/ViewBlocks/BooksShowShelves.php
+++ b/app/View/ViewBlocks/BooksShowShelves.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class BooksShowShelves extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-shelves';
+    protected string $labelTranslationKey = 'entities.shelves';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/BooksShowTags.php b/app/View/ViewBlocks/BooksShowTags.php
index 5c5aa8fd9..ac9f4c1ef 100644
--- a/app/View/ViewBlocks/BooksShowTags.php
+++ b/app/View/ViewBlocks/BooksShowTags.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 class BooksShowTags extends ViewBlock
 {
     protected string $view = 'books.parts.show-sidebar-section-tags';
+    protected string $labelTranslationKey = 'entities.tags';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ChaptersShowActions.php b/app/View/ViewBlocks/ChaptersShowActions.php
index 9b6137a20..6fe1b6955 100644
--- a/app/View/ViewBlocks/ChaptersShowActions.php
+++ b/app/View/ViewBlocks/ChaptersShowActions.php
@@ -10,6 +10,7 @@ use Illuminate\Http\Request;
 class ChaptersShowActions extends ViewBlock
 {
     protected string $view = 'chapters.parts.show-sidebar-section-actions';
+    protected string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ChaptersShowBookTree.php b/app/View/ViewBlocks/ChaptersShowBookTree.php
index 827e8d917..3f6d93418 100644
--- a/app/View/ViewBlocks/ChaptersShowBookTree.php
+++ b/app/View/ViewBlocks/ChaptersShowBookTree.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class ChaptersShowBookTree extends ViewBlock
 {
     protected string $view = 'entities.book-tree';
+    protected string $labelTranslationKey = 'entities.books_navigation';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ChaptersShowDetails.php b/app/View/ViewBlocks/ChaptersShowDetails.php
index fd235fbe1..7a90c9058 100644
--- a/app/View/ViewBlocks/ChaptersShowDetails.php
+++ b/app/View/ViewBlocks/ChaptersShowDetails.php
@@ -12,6 +12,7 @@ use Illuminate\Http\Request;
 class ChaptersShowDetails extends ViewBlock
 {
     protected string $view = 'chapters.parts.show-sidebar-section-details';
+    protected string $labelTranslationKey = 'common.details';
 
     public function __construct(
         protected ReferenceFetcher $referenceFetcher,
diff --git a/app/View/ViewBlocks/ChaptersShowSearchForm.php b/app/View/ViewBlocks/ChaptersShowSearchForm.php
index 92664e5f5..6c2b8aa5a 100644
--- a/app/View/ViewBlocks/ChaptersShowSearchForm.php
+++ b/app/View/ViewBlocks/ChaptersShowSearchForm.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 class ChaptersShowSearchForm extends ViewBlock
 {
     protected string $view = 'entities.search-form';
+    protected string $labelTranslationKey = 'common.search';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ChaptersShowTags.php b/app/View/ViewBlocks/ChaptersShowTags.php
index 198604eee..fa7fa200d 100644
--- a/app/View/ViewBlocks/ChaptersShowTags.php
+++ b/app/View/ViewBlocks/ChaptersShowTags.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class ChaptersShowTags extends ViewBlock
 {
     protected string $view = 'chapters.parts.show-sidebar-section-tags';
+    protected string $labelTranslationKey = 'entities.tags';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/HomeActions.php b/app/View/ViewBlocks/HomeActions.php
index f4e4295b8..2e64c97fb 100644
--- a/app/View/ViewBlocks/HomeActions.php
+++ b/app/View/ViewBlocks/HomeActions.php
@@ -3,11 +3,11 @@
 namespace BookStack\View\ViewBlocks;
 
 use BookStack\View\ViewBlock;
-use Illuminate\Http\Request;
 
 class HomeActions extends ViewBlock
 {
     protected string $view = 'home.parts.configured-section-actions';
+    protected string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/HomeRecentActivity.php b/app/View/ViewBlocks/HomeRecentActivity.php
index 1f915061c..7b5a74ecb 100644
--- a/app/View/ViewBlocks/HomeRecentActivity.php
+++ b/app/View/ViewBlocks/HomeRecentActivity.php
@@ -13,6 +13,11 @@ class HomeRecentActivity implements ViewBlockInterface
     ) {
     }
 
+    public function getLabel(): string
+    {
+        return trans('entities.recent_activity');
+    }
+
     public function getView(array $viewData): string
     {
         if ($viewData['homeView'] === 'default') {
diff --git a/app/View/ViewBlocks/HomeRecentDrafts.php b/app/View/ViewBlocks/HomeRecentDrafts.php
index 71586d83a..e65078cb4 100644
--- a/app/View/ViewBlocks/HomeRecentDrafts.php
+++ b/app/View/ViewBlocks/HomeRecentDrafts.php
@@ -12,6 +12,11 @@ class HomeRecentDrafts implements ViewBlockInterface
     ) {
     }
 
+    public function getLabel(): string
+    {
+        return trans('entities.my_recent_drafts');
+    }
+
     public function getView(array $viewData): string
     {
         if ($viewData['homeView'] === 'default') {
diff --git a/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php b/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
index 3f669ee6e..b56a91acd 100644
--- a/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
+++ b/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
@@ -13,6 +13,11 @@ class HomeRecentlyUpdatedPages implements ViewBlockInterface
     ) {
     }
 
+    public function getLabel(): string
+    {
+        return trans('entities.recently_updated_pages');
+    }
+
     public function getView(array $viewData): string
     {
         if ($viewData['homeView'] === 'default') {
diff --git a/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php b/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
index 7db3d7935..99666e2c8 100644
--- a/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
+++ b/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
@@ -16,6 +16,12 @@ class HomeRecentlyViewedOrRecentBooks implements ViewBlockInterface
     ) {
     }
 
+    public function getLabel(): string
+    {
+        $key = user()->isGuest() ? 'books_recent' : 'my_recently_viewed';
+        return trans("entities.{$key}");
+    }
+
     public function getView(array $viewData): string
     {
         if ($viewData['homeView'] === 'default') {
diff --git a/app/View/ViewBlocks/HomeTopFavourites.php b/app/View/ViewBlocks/HomeTopFavourites.php
index 9ce84aa3d..be753a719 100644
--- a/app/View/ViewBlocks/HomeTopFavourites.php
+++ b/app/View/ViewBlocks/HomeTopFavourites.php
@@ -13,6 +13,11 @@ class HomeTopFavourites implements ViewBlockInterface
     ) {
     }
 
+    public function getLabel(): string
+    {
+        return trans('entities.my_most_viewed_favourites');
+    }
+
     public function getView(array $viewData): string
     {
         if ($viewData['homeView'] === 'default') {
diff --git a/app/View/ViewBlocks/PagesShowActions.php b/app/View/ViewBlocks/PagesShowActions.php
index 5486b59a4..8abfc8a6e 100644
--- a/app/View/ViewBlocks/PagesShowActions.php
+++ b/app/View/ViewBlocks/PagesShowActions.php
@@ -10,6 +10,7 @@ use Illuminate\Http\Request;
 class PagesShowActions extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-actions';
+    protected string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/PagesShowAttachments.php b/app/View/ViewBlocks/PagesShowAttachments.php
index 5d0cd23ba..baf8713f1 100644
--- a/app/View/ViewBlocks/PagesShowAttachments.php
+++ b/app/View/ViewBlocks/PagesShowAttachments.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class PagesShowAttachments extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-attachments';
+    protected string $labelTranslationKey = 'entities.pages_attachments';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/PagesShowBookTree.php b/app/View/ViewBlocks/PagesShowBookTree.php
index b0947a208..05c4c9a1f 100644
--- a/app/View/ViewBlocks/PagesShowBookTree.php
+++ b/app/View/ViewBlocks/PagesShowBookTree.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class PagesShowBookTree extends ViewBlock
 {
     protected string $view = 'entities.book-tree';
+    protected string $labelTranslationKey = 'entities.books_navigation';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/PagesShowDetails.php b/app/View/ViewBlocks/PagesShowDetails.php
index 2dfd61417..eb50e859c 100644
--- a/app/View/ViewBlocks/PagesShowDetails.php
+++ b/app/View/ViewBlocks/PagesShowDetails.php
@@ -12,6 +12,7 @@ use Illuminate\Http\Request;
 class PagesShowDetails extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-details';
+    protected string $labelTranslationKey = 'common.details';
 
     public function __construct(
         protected ReferenceFetcher $referenceFetcher,
diff --git a/app/View/ViewBlocks/PagesShowPageNav.php b/app/View/ViewBlocks/PagesShowPageNav.php
index dbee578ab..cbde72f21 100644
--- a/app/View/ViewBlocks/PagesShowPageNav.php
+++ b/app/View/ViewBlocks/PagesShowPageNav.php
@@ -10,6 +10,7 @@ use Illuminate\Http\Request;
 class PagesShowPageNav extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-page-nav';
+    protected string $labelTranslationKey = 'entities.pages_navigation';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/PagesShowTags.php b/app/View/ViewBlocks/PagesShowTags.php
index a2197a161..c200f197a 100644
--- a/app/View/ViewBlocks/PagesShowTags.php
+++ b/app/View/ViewBlocks/PagesShowTags.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class PagesShowTags extends ViewBlock
 {
     protected string $view = 'pages.parts.show-sidebar-section-tags';
+    protected string $labelTranslationKey = 'entities.tags';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ShelvesIndexActions.php b/app/View/ViewBlocks/ShelvesIndexActions.php
index 2cc436116..81a35ded6 100644
--- a/app/View/ViewBlocks/ShelvesIndexActions.php
+++ b/app/View/ViewBlocks/ShelvesIndexActions.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 class ShelvesIndexActions extends ViewBlock
 {
     protected string $view = 'shelves.parts.index-sidebar-section-actions';
+    protected string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ShelvesIndexNew.php b/app/View/ViewBlocks/ShelvesIndexNew.php
index 1d6af72c0..5a09a46af 100644
--- a/app/View/ViewBlocks/ShelvesIndexNew.php
+++ b/app/View/ViewBlocks/ShelvesIndexNew.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class ShelvesIndexNew extends ViewBlock
 {
     protected string $view = 'shelves.parts.index-sidebar-section-new';
+    protected string $labelTranslationKey = 'entities.shelves_new';
 
     public function __construct(
         protected BookshelfQueries $queries,
diff --git a/app/View/ViewBlocks/ShelvesIndexPopular.php b/app/View/ViewBlocks/ShelvesIndexPopular.php
index fc2950b92..5bf811ac5 100644
--- a/app/View/ViewBlocks/ShelvesIndexPopular.php
+++ b/app/View/ViewBlocks/ShelvesIndexPopular.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class ShelvesIndexPopular extends ViewBlock
 {
     protected string $view = 'shelves.parts.index-sidebar-section-popular';
+    protected string $labelTranslationKey = 'entities.shelves_popular';
 
     public function __construct(
         protected BookshelfQueries $queries,
diff --git a/app/View/ViewBlocks/ShelvesIndexRecents.php b/app/View/ViewBlocks/ShelvesIndexRecents.php
index 6570841a9..219cae559 100644
--- a/app/View/ViewBlocks/ShelvesIndexRecents.php
+++ b/app/View/ViewBlocks/ShelvesIndexRecents.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class ShelvesIndexRecents extends ViewBlock
 {
     protected string $view = 'shelves.parts.index-sidebar-section-recents';
+    protected string $labelTranslationKey = 'entities.recently_viewed';
 
     public function __construct(
         protected BookshelfQueries $queries,
diff --git a/app/View/ViewBlocks/ShelvesShowActions.php b/app/View/ViewBlocks/ShelvesShowActions.php
index d1bb965c8..d9683714d 100644
--- a/app/View/ViewBlocks/ShelvesShowActions.php
+++ b/app/View/ViewBlocks/ShelvesShowActions.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 class ShelvesShowActions extends ViewBlock
 {
     protected string $view = 'shelves.parts.show-sidebar-section-actions';
+    protected string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ShelvesShowActivity.php b/app/View/ViewBlocks/ShelvesShowActivity.php
index 40e715bcd..e6bb612cc 100644
--- a/app/View/ViewBlocks/ShelvesShowActivity.php
+++ b/app/View/ViewBlocks/ShelvesShowActivity.php
@@ -10,6 +10,7 @@ use Illuminate\Http\Request;
 class ShelvesShowActivity extends ViewBlock
 {
     protected string $view = 'shelves.parts.show-sidebar-section-activity';
+    protected string $labelTranslationKey = 'entities.recent_activity';
 
     public function __construct(
         protected ActivityQueries $activityQueries,
diff --git a/app/View/ViewBlocks/ShelvesShowDetails.php b/app/View/ViewBlocks/ShelvesShowDetails.php
index 413b4796c..1d5d69cec 100644
--- a/app/View/ViewBlocks/ShelvesShowDetails.php
+++ b/app/View/ViewBlocks/ShelvesShowDetails.php
@@ -10,6 +10,7 @@ use Illuminate\Http\Request;
 class ShelvesShowDetails extends ViewBlock
 {
     protected string $view = 'shelves.parts.show-sidebar-section-details';
+    protected string $labelTranslationKey = 'common.details';
 
     public function __construct(
         protected ReferenceFetcher $referenceFetcher,
diff --git a/app/View/ViewBlocks/ShelvesShowTags.php b/app/View/ViewBlocks/ShelvesShowTags.php
index 9a61cc94d..c8efa2431 100644
--- a/app/View/ViewBlocks/ShelvesShowTags.php
+++ b/app/View/ViewBlocks/ShelvesShowTags.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 class ShelvesShowTags extends ViewBlock
 {
     protected string $view = 'shelves.parts.show-sidebar-section-tags';
+    protected string $labelTranslationKey = 'entities.tags';
 
     public function withData(array $viewData): array
     {

From 3205e73bb933cfcd26c0a74fedde99bac1afcb23 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 10 Aug 2026 19:18:05 +0100
Subject: [PATCH 15/72] User Prefs: Added new interface preferences section

---
 .../Controllers/UserAccountController.php     | 14 +++++
 app/View/ViewBlockDefaults.php                | 22 ++++++++
 app/View/ViewBlockManager.php                 | 21 ++++++++
 lang/en/preferences.php                       |  6 +++
 resources/icons/interface.svg                 |  1 +
 .../views/users/account/interface.blade.php   | 53 +++++++++++++++++++
 .../views/users/account/layout.blade.php      |  1 +
 routes/web.php                                |  1 +
 8 files changed, 119 insertions(+)
 create mode 100644 resources/icons/interface.svg
 create mode 100644 resources/views/users/account/interface.blade.php

diff --git a/app/Users/Controllers/UserAccountController.php b/app/Users/Controllers/UserAccountController.php
index 21816d5b8..a72025422 100644
--- a/app/Users/Controllers/UserAccountController.php
+++ b/app/Users/Controllers/UserAccountController.php
@@ -10,6 +10,7 @@ use BookStack\Settings\UserNotificationPreferences;
 use BookStack\Settings\UserShortcutMap;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Users\UserRepo;
+use BookStack\View\ViewBlockManager;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rules\Password;
@@ -159,6 +160,19 @@ class UserAccountController extends Controller
         return redirect('/my-account/notifications');
     }
 
+    /**
+     * Show the view for the "Interface Preferences" user account area.
+     */
+    public function showInterface(ViewBlockManager $viewBlockManager)
+    {
+        // TODO - Handle language save
+
+        return view('users.account.interface', [
+            'category'       => 'interface',
+            'namedLocations' => $viewBlockManager->getNamedLocations(),
+        ]);
+    }
+
     /**
      * Show the view for the "Access & Security" account options.
      */
diff --git a/app/View/ViewBlockDefaults.php b/app/View/ViewBlockDefaults.php
index 33a08adc1..1e235b751 100644
--- a/app/View/ViewBlockDefaults.php
+++ b/app/View/ViewBlockDefaults.php
@@ -107,4 +107,26 @@ class ViewBlockDefaults
     {
         return self::$defaults[$location] ?? [];
     }
+
+    /**
+     * Get the locations for all default blocks.
+     */
+    public static function getLocations(): array
+    {
+        return array_keys(self::$defaults);
+    }
+
+    public static function getLocationLabels(): array
+    {
+        return [
+            'home-default' => trans('common.homepage'),
+            'home-non-default' => trans('preferences.layouts_home_non_default'),
+            'shelves-index' => trans('entities.shelves'),
+            'shelves-show' => trans('entities.shelf'),
+            'books-index' => trans('entities.books'),
+            'books-show' => trans('entities.book'),
+            'chapters-show' => trans('entities.chapter'),
+            'pages-show' => trans('entities.page'),
+        ];
+    }
 }
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
index 00535b2c1..939e4107d 100644
--- a/app/View/ViewBlockManager.php
+++ b/app/View/ViewBlockManager.php
@@ -44,4 +44,25 @@ class ViewBlockManager
             return app()->make($className);
         }, $sections);
     }
+
+    /**
+     * Get the names of all locations where blocks are registered.
+     * Returns an array where the keys are location strings, and the
+     * values are translated labels for that location.
+     * @return array<string, string>
+     */
+    public function getNamedLocations(): array
+    {
+        $labels = ViewBlockDefaults::getLocationLabels();
+        $defaults = ViewBlockDefaults::getLocations();
+        $registered = array_keys($this->blocksByLocationAndPosition);
+        $merged = array_unique(array_merge($defaults, $registered));
+
+        $results = [];
+        foreach ($merged as $location) {
+            $results[$location] = $labels[$location] ?? $location;
+        }
+
+        return $results;
+    }
 }
diff --git a/lang/en/preferences.php b/lang/en/preferences.php
index f4459d738..e197efd97 100644
--- a/lang/en/preferences.php
+++ b/lang/en/preferences.php
@@ -19,6 +19,12 @@ return [
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Customize various user interface elements you see across the application.',
+    'layouts' => 'Customize UI Layout',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface across various views.',
+    'layouts_home_non_default' => 'Homepage (non-default)',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
diff --git a/resources/icons/interface.svg b/resources/icons/interface.svg
new file mode 100644
index 000000000..af1c5fc49
--- /dev/null
+++ b/resources/icons/interface.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"><path d="M440-120H200q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h240v720Zm-80-80v-560H200v560h160Zm160-320v-320h240q33 0 56.5 23.5T840-760v240H520Zm80-80h160v-160H600v160Zm-80 480v-320h320v240q0 33-23.5 56.5T760-120H520Zm80-80h160v-160H600v160ZM360-480Zm240-120Zm0 240Z"/></svg>
\ No newline at end of file
diff --git a/resources/views/users/account/interface.blade.php b/resources/views/users/account/interface.blade.php
new file mode 100644
index 000000000..8831b055a
--- /dev/null
+++ b/resources/views/users/account/interface.blade.php
@@ -0,0 +1,53 @@
+@extends('users.account.layout')
+
+@section('main')
+    <section class="card content-wrap auto-height">
+        <form action="{{ url('/my-account/interface') }}" method="post">
+            {{ method_field('put') }}
+            {{ csrf_field() }}
+
+            <h1 class="list-heading">{{ trans('preferences.interface') }}</h1>
+            <p class="text-small text-muted mb-none">{{ trans('preferences.interface_desc') }}</p>
+
+            <div class="setting-list">
+                @include('users.parts.language-option-row', ['value' => old('language') ?? user()->getLocale()->appLocale()])
+            </div>
+
+            <div class="form-group text-right">
+                <button class="button">{{ trans('common.save') }}</button>
+            </div>
+
+        </form>
+    </section>
+
+    <section class="card content-wrap auto-height">
+        <h2 class="list-heading">{{ trans('preferences.layouts') }}</h2>
+        <p class="text-small text-muted">{{ trans('preferences.layouts_desc') }}</p>
+
+        <div class="item-list mb-m">
+            @foreach($namedLocations as $locationKey => $locationName)
+                <div class="flex-container-row justify-space-between item-list-row items-center wrap px-xs">
+                    <div class="py-xs px-s min-width-m">
+                        <a href="#{{ $locationKey }}">{{ $locationName }}</a>
+                    </div>
+                    <div class="py-xs min-width-m text-m-right px-m">
+                        <a class="button outline small" href="#{{ $locationKey }}">{{ trans('common.configure') }}</a>
+                    </div>
+                </div>
+            @endforeach
+        </div>
+
+    </section>
+
+    <section class="card content-wrap auto-height">
+        <div class="flex-container-row gap-l items-center wrap">
+            <div class="flex">
+                <h2 class="list-heading">{{ trans('preferences.shortcuts_interface') }}</h2>
+                <p class="text-small text-muted">{{ trans('preferences.shortcuts_overview_desc') }}</p>
+            </div>
+            <div class="text-m-right">
+                <a class="button outline" href="{{ url('/my-account/shortcuts') }}">{{ trans('common.open') }}</a>
+            </div>
+        </div>
+    </section>
+@stop
diff --git a/resources/views/users/account/layout.blade.php b/resources/views/users/account/layout.blade.php
index df8ebc2d9..94f1f328d 100644
--- a/resources/views/users/account/layout.blade.php
+++ b/resources/views/users/account/layout.blade.php
@@ -11,6 +11,7 @@
                     <nav class="active-link-list in-sidebar">
                         <a href="{{ url('/my-account/profile') }}" class="{{ $category === 'profile' ? 'active' : '' }}">@icon('user') {{ trans('preferences.profile') }}</a>
                         <a href="{{ url('/my-account/auth') }}" class="{{ $category === 'auth' ? 'active' : '' }}">@icon('security') {{ trans('preferences.auth') }}</a>
+                        <a href="{{ url('/my-account/interface') }}" class="{{ $category === 'interface' ? 'active' : '' }}">@icon('interface') {{ trans('preferences.interface') }}</a>
                         <a href="{{ url('/my-account/shortcuts') }}" class="{{ $category === 'shortcuts' ? 'active' : '' }}">@icon('shortcuts') {{ trans('preferences.shortcuts_interface') }}</a>
                         @if(userCan(\BookStack\Permissions\Permission::ReceiveNotifications))
                             <a href="{{ url('/my-account/notifications') }}" class="{{ $category === 'notifications' ? 'active' : '' }}">@icon('notifications') {{ trans('preferences.notifications') }}</a>
diff --git a/routes/web.php b/routes/web.php
index 3e3b5aef3..7722e80bb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -261,6 +261,7 @@ Route::middleware('auth')->group(function () {
     Route::put('/my-account/shortcuts', [UserControllers\UserAccountController::class, 'updateShortcuts']);
     Route::get('/my-account/notifications', [UserControllers\UserAccountController::class, 'showNotifications']);
     Route::put('/my-account/notifications', [UserControllers\UserAccountController::class, 'updateNotifications']);
+    Route::get('/my-account/interface', [UserControllers\UserAccountController::class, 'showInterface']);
     Route::get('/my-account/auth', [UserControllers\UserAccountController::class, 'showAuth']);
     Route::put('/my-account/auth/password', [UserControllers\UserAccountController::class, 'updatePassword']);
     Route::get('/my-account/delete', [UserControllers\UserAccountController::class, 'delete']);

From c79997e552cc61c6359785c2c00ec10b24598870 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 11 Aug 2026 14:32:18 +0100
Subject: [PATCH 16/72] User Prefs: Added handling for lang and display mode

Included test to cover.
---
 .../Controllers/UserAccountController.php     | 20 ++++++++++++++++--
 app/Users/UserRepo.php                        |  7 ++++++-
 lang/en/preferences.php                       |  2 ++
 .../views/users/account/interface.blade.php   |  1 +
 .../parts/display-mode-option-row.blade.php   | 18 ++++++++++++++++
 routes/web.php                                |  1 +
 tests/User/UserMyAccountTest.php              | 21 +++++++++++++++++++
 7 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 resources/views/users/account/parts/display-mode-option-row.blade.php

diff --git a/app/Users/Controllers/UserAccountController.php b/app/Users/Controllers/UserAccountController.php
index a72025422..08c8c541b 100644
--- a/app/Users/Controllers/UserAccountController.php
+++ b/app/Users/Controllers/UserAccountController.php
@@ -165,14 +165,30 @@ class UserAccountController extends Controller
      */
     public function showInterface(ViewBlockManager $viewBlockManager)
     {
-        // TODO - Handle language save
-
         return view('users.account.interface', [
             'category'       => 'interface',
             'namedLocations' => $viewBlockManager->getNamedLocations(),
         ]);
     }
 
+    /**
+     * Handle the submission of the interface preferences form.
+     */
+    public function updateInterface(Request $request)
+    {
+        $this->preventAccessInDemoMode();
+
+        $user = user();
+        $validated = $this->validate($request, [
+            'language' => ['string', 'max:15', 'alpha_dash'],
+            'display_mode' => ['string', 'max:15', 'alpha_dash'],
+        ]);
+
+        $this->userRepo->update($user, $validated, userCan(Permission::UsersManage));
+
+        return redirect('/my-account/interface');
+    }
+
     /**
      * Show the view for the "Access & Security" account options.
      */
diff --git a/app/Users/UserRepo.php b/app/Users/UserRepo.php
index 1643756c8..e8b3c27e0 100644
--- a/app/Users/UserRepo.php
+++ b/app/Users/UserRepo.php
@@ -122,7 +122,7 @@ class UserRepo
     /**
      * Update the given user with the given data, but do not create an activity.
      *
-     * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string} $data
+     * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string, display_mode: ?string} $data
      *
      * @throws UserUpdateException
      */
@@ -153,6 +153,11 @@ class UserRepo
             setting()->putUser($user, 'language', $data['language']);
         }
 
+        if (!empty($data['display_mode'])) {
+            $value = $data['display_mode'] === 'dark' ? 'true' : 'false';
+            setting()->putUser($user, 'dark-mode-enabled', $value);
+        }
+
         $user->save();
 
         return $user;
diff --git a/lang/en/preferences.php b/lang/en/preferences.php
index e197efd97..924e769aa 100644
--- a/lang/en/preferences.php
+++ b/lang/en/preferences.php
@@ -21,6 +21,8 @@ return [
 
     'interface' => 'Interface Preferences',
     'interface_desc' => 'Customize various user interface elements you see across the application.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
     'layouts' => 'Customize UI Layout',
     'layouts_desc' => 'Customize the layout of sections shown in the user interface across various views.',
     'layouts_home_non_default' => 'Homepage (non-default)',
diff --git a/resources/views/users/account/interface.blade.php b/resources/views/users/account/interface.blade.php
index 8831b055a..73d828277 100644
--- a/resources/views/users/account/interface.blade.php
+++ b/resources/views/users/account/interface.blade.php
@@ -11,6 +11,7 @@
 
             <div class="setting-list">
                 @include('users.parts.language-option-row', ['value' => old('language') ?? user()->getLocale()->appLocale()])
+                @include('users.account.parts.display-mode-option-row')
             </div>
 
             <div class="form-group text-right">
diff --git a/resources/views/users/account/parts/display-mode-option-row.blade.php b/resources/views/users/account/parts/display-mode-option-row.blade.php
new file mode 100644
index 000000000..a6e78c5ae
--- /dev/null
+++ b/resources/views/users/account/parts/display-mode-option-row.blade.php
@@ -0,0 +1,18 @@
+<div class="grid half gap-xl v-center">
+    <div>
+        <label for="user-language" class="setting-list-label">{{ trans('preferences.interface_display_mode') }}</label>
+        <p class="small">
+            {{ trans('preferences.interface_display_mode_desc') }}
+        </p>
+    </div>
+    <div>
+        @php
+            $userOptions = setting()->getForCurrentUser('dark-mode-enabled') ? 'dark' : 'light';
+            $value = old('display_mode') ?? $userOptions;
+        @endphp
+        <select name="display_mode" id="display-mode">
+            <option @if($value === 'light') selected @endif value="light">{{ trans('common.light_mode') }}</option>
+            <option @if($value === 'dark') selected @endif value="dark">{{ trans('common.dark_mode') }}</option>
+        </select>
+    </div>
+</div>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 7722e80bb..2caf4355f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -262,6 +262,7 @@ Route::middleware('auth')->group(function () {
     Route::get('/my-account/notifications', [UserControllers\UserAccountController::class, 'showNotifications']);
     Route::put('/my-account/notifications', [UserControllers\UserAccountController::class, 'updateNotifications']);
     Route::get('/my-account/interface', [UserControllers\UserAccountController::class, 'showInterface']);
+    Route::put('/my-account/interface', [UserControllers\UserAccountController::class, 'updateInterface']);
     Route::get('/my-account/auth', [UserControllers\UserAccountController::class, 'showAuth']);
     Route::put('/my-account/auth/password', [UserControllers\UserAccountController::class, 'updatePassword']);
     Route::get('/my-account/delete', [UserControllers\UserAccountController::class, 'delete']);
diff --git a/tests/User/UserMyAccountTest.php b/tests/User/UserMyAccountTest.php
index dbb53b061..1b03c84bd 100644
--- a/tests/User/UserMyAccountTest.php
+++ b/tests/User/UserMyAccountTest.php
@@ -344,4 +344,25 @@ class UserMyAccountTest extends TestCase
         $resp = $this->asEditor()->get('/my-account/notifications');
         $this->withHtml($resp)->assertElementExists('input[name="preferences[comment-mentions]"][value="true"]');
     }
+
+    public function test_update_interface_preferences()
+    {
+        $editor = $this->users->editor();
+        $this->actingAs($editor);
+
+        $this->assertEquals('en', $editor->getLocale()->appLocale());
+        $this->assertFalse(setting()->getUser($editor, 'dark-mode-enabled'));
+
+        $resp = $this->get('/my-account/interface');
+        $resp->assertOk();
+
+        $resp->assertSeeText('Preferred Language');
+        $resp->assertSeeText('Customize UI Layout');
+
+        $resp = $this->put('/my-account/interface', ['language' => 'fr', 'display_mode' => 'dark']);
+        $resp->assertRedirect('/my-account/interface');
+
+        $this->assertEquals('fr', $editor->getLocale()->appLocale());
+        $this->assertTrue(setting()->getUser($editor, 'dark-mode-enabled'));
+    }
 }

From 78610a2a1484802f08c1c238d5024f3b71d17213 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 11 Aug 2026 16:43:56 +0100
Subject: [PATCH 17/72] Layouts: Started building views/actions for layout
 configuration

---
 app/View/LayoutController.php                 | 36 +++++++++++++++
 lang/en/preferences.php                       |  5 +++
 .../views/settings/layouts/edit.blade.php     | 45 +++++++++++++++++++
 .../views/users/account/interface.blade.php   |  4 +-
 routes/web.php                                |  5 +++
 5 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 app/View/LayoutController.php
 create mode 100644 resources/views/settings/layouts/edit.blade.php

diff --git a/app/View/LayoutController.php b/app/View/LayoutController.php
new file mode 100644
index 000000000..190938433
--- /dev/null
+++ b/app/View/LayoutController.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace BookStack\View;
+
+use Illuminate\Http\Request;
+
+class LayoutController
+{
+    public function __construct(
+        protected ViewBlockManager $viewBlocks
+    ) {
+    }
+
+    /**
+     * Start editing the layout for a specific location.
+     */
+    public function edit(string $location)
+    {
+        $namedLocations = $this->viewBlocks->getNamedLocations();
+        $locationName = $namedLocations[$location] ?? $location;
+
+        return view('settings.layouts.edit', [
+            'location' => $location,
+            'locationName' => $locationName,
+            'namedLocations' => $namedLocations,
+        ]);
+    }
+
+    /**
+     * Update the layout for a specific location.
+     */
+    public function update(string $location, Request $request)
+    {
+        // TODO
+    }
+}
diff --git a/lang/en/preferences.php b/lang/en/preferences.php
index 924e769aa..2cfcb9cce 100644
--- a/lang/en/preferences.php
+++ b/lang/en/preferences.php
@@ -26,6 +26,11 @@ return [
     'layouts' => 'Customize UI Layout',
     'layouts_desc' => 'Customize the layout of sections shown in the user interface across various views.',
     'layouts_home_non_default' => 'Homepage (non-default)',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the controls found on them, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
 
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
diff --git a/resources/views/settings/layouts/edit.blade.php b/resources/views/settings/layouts/edit.blade.php
new file mode 100644
index 000000000..ac6ad8daf
--- /dev/null
+++ b/resources/views/settings/layouts/edit.blade.php
@@ -0,0 +1,45 @@
+@extends('layouts.simple')
+
+@section('body')
+
+    <div class="container medium my-xl">
+
+        <div class="grid gap-xxl right-focus">
+
+            <div>
+                <div class="mb-l">
+                    <a href="{{ url('/my-account/interface') }}" class="text-link">@icon('back') {{ trans('preferences.layout_edit_back_to_preferences') }}</a>
+                </div>
+                <h5>{{ trans('preferences.layout_edit_layouts') }}</h5>
+                <nav class="active-link-list in-sidebar">
+                    @foreach($namedLocations as $locationOptKey => $locationOptName)
+                        <a href="{{ url('/layouts/' . $locationOptKey) }}" class="{{ $locationOptKey === $location ? 'active' : '' }}">@icon('layouts') {{ $locationOptName }}</a>
+                    @endforeach
+                </nav>
+            </div>
+
+            <div>
+                <div class="card content-wrap auto-height">
+                    <div class="flex-container-row justify-space-between items-center">
+                        <h1 class="list-heading">{{ trans('preferences.layout_edit') }}</h1>
+                        <span class="text-muted text-bigger">{{ $locationName }}</span>
+                    </div>
+                    <p class="small text-muted">{{ trans('preferences.layout_edit_desc') }}</p>
+
+                    <form action="{{ url('layouts/' . $location) }}" method="POST">
+                        {{ method_field('PUT') }}
+                        {{ csrf_field() }}
+
+                        <div class="form-group text-right">
+                            <a href="{{ url('/my-account/interface') }}" class="button outline">{{ trans('common.cancel') }}</a>
+                            <button type="submit" class="button">{{ trans('preferences.layout_edit_save') }}</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+
+@stop
diff --git a/resources/views/users/account/interface.blade.php b/resources/views/users/account/interface.blade.php
index 73d828277..7d78f08c8 100644
--- a/resources/views/users/account/interface.blade.php
+++ b/resources/views/users/account/interface.blade.php
@@ -29,10 +29,10 @@
             @foreach($namedLocations as $locationKey => $locationName)
                 <div class="flex-container-row justify-space-between item-list-row items-center wrap px-xs">
                     <div class="py-xs px-s min-width-m">
-                        <a href="#{{ $locationKey }}">{{ $locationName }}</a>
+                        <a href="{{ url('/layouts/' . $locationKey) }}">{{ $locationName }}</a>
                     </div>
                     <div class="py-xs min-width-m text-m-right px-m">
-                        <a class="button outline small" href="#{{ $locationKey }}">{{ trans('common.configure') }}</a>
+                        <a class="button outline small" href="{{ url('/layouts/' . $locationKey) }}">{{ trans('common.configure') }}</a>
                     </div>
                 </div>
             @endforeach
diff --git a/routes/web.php b/routes/web.php
index 2caf4355f..c6c3ed97e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -17,6 +17,7 @@ use BookStack\Sorting as SortingControllers;
 use BookStack\Theming\ThemeController;
 use BookStack\Uploads\Controllers as UploadControllers;
 use BookStack\Users\Controllers as UserControllers;
+use BookStack\View\LayoutController;
 use Illuminate\Session\Middleware\StartSession;
 use Illuminate\Support\Facades\Route;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
@@ -275,6 +276,10 @@ Route::middleware('auth')->group(function () {
     Route::patch('/preferences/toggle-dark-mode', [UserControllers\UserPreferencesController::class, 'toggleDarkMode']);
     Route::patch('/preferences/update-code-language-favourite', [UserControllers\UserPreferencesController::class, 'updateCodeLanguageFavourite']);
 
+    // Layout endpoints
+    Route::get('/layouts/{location}', [LayoutController::class, 'edit']);
+    Route::put('/layouts/{location}', [LayoutController::class, 'update']);
+
     // User API Tokens
     Route::get('/api-tokens/{userId}/create', [UserApiTokenController::class, 'create']);
     Route::post('/api-tokens/{userId}/create', [UserApiTokenController::class, 'store']);

From 10cf1285982410e06065b2594a0d01bc78337267 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 12 Aug 2026 15:43:00 +0100
Subject: [PATCH 18/72] Layouts: Started edit form ui, added block IDs

---
 app/View/LayoutController.php                 |  2 +
 app/View/ViewBlock.php                        |  9 +++++
 app/View/ViewBlockDefaults.php                |  1 +
 app/View/ViewBlockInterface.php               |  5 +++
 app/View/ViewBlockManager.php                 | 24 +++++++++++-
 app/View/ViewBlocks/BooksIndexActions.php     |  1 +
 app/View/ViewBlocks/BooksIndexNew.php         |  1 +
 app/View/ViewBlocks/BooksIndexPopular.php     |  1 +
 app/View/ViewBlocks/BooksIndexRecents.php     |  1 +
 app/View/ViewBlocks/BooksShowActions.php      |  1 +
 app/View/ViewBlocks/BooksShowActivity.php     |  1 +
 app/View/ViewBlocks/BooksShowDetails.php      |  1 +
 app/View/ViewBlocks/BooksShowSearchForm.php   |  1 +
 app/View/ViewBlocks/BooksShowShelves.php      |  1 +
 app/View/ViewBlocks/BooksShowTags.php         |  1 +
 app/View/ViewBlocks/ChaptersShowActions.php   |  1 +
 app/View/ViewBlocks/ChaptersShowBookTree.php  |  1 +
 app/View/ViewBlocks/ChaptersShowDetails.php   |  1 +
 .../ViewBlocks/ChaptersShowSearchForm.php     |  1 +
 app/View/ViewBlocks/ChaptersShowTags.php      |  1 +
 app/View/ViewBlocks/HomeActions.php           |  1 +
 app/View/ViewBlocks/HomeRecentActivity.php    |  5 +++
 app/View/ViewBlocks/HomeRecentDrafts.php      |  5 +++
 .../ViewBlocks/HomeRecentlyUpdatedPages.php   |  5 +++
 .../HomeRecentlyViewedOrRecentBooks.php       |  5 +++
 app/View/ViewBlocks/HomeTopFavourites.php     |  5 +++
 app/View/ViewBlocks/PagesShowActions.php      |  1 +
 app/View/ViewBlocks/PagesShowAttachments.php  |  1 +
 app/View/ViewBlocks/PagesShowBookTree.php     |  1 +
 app/View/ViewBlocks/PagesShowDetails.php      |  1 +
 app/View/ViewBlocks/PagesShowPageNav.php      |  1 +
 app/View/ViewBlocks/PagesShowTags.php         |  1 +
 app/View/ViewBlocks/ShelvesIndexActions.php   |  1 +
 app/View/ViewBlocks/ShelvesIndexNew.php       |  1 +
 app/View/ViewBlocks/ShelvesIndexPopular.php   |  1 +
 app/View/ViewBlocks/ShelvesIndexRecents.php   |  1 +
 app/View/ViewBlocks/ShelvesShowActions.php    |  1 +
 app/View/ViewBlocks/ShelvesShowActivity.php   |  1 +
 app/View/ViewBlocks/ShelvesShowDetails.php    |  1 +
 app/View/ViewBlocks/ShelvesShowTags.php       |  1 +
 lang/en/preferences.php                       |  5 +++
 resources/views/common/view-blocks.blade.php  |  2 +-
 .../views/settings/layouts/edit.blade.php     | 10 +++++
 .../layouts/parts/block-column.blade.php      | 17 +++++++++
 .../settings/layouts/parts/block.blade.php    | 18 +++++++++
 tests/View/ViewBlockDefaultsTest.php          | 38 +++++++++++++++++++
 46 files changed, 184 insertions(+), 2 deletions(-)
 create mode 100644 resources/views/settings/layouts/parts/block-column.blade.php
 create mode 100644 resources/views/settings/layouts/parts/block.blade.php
 create mode 100644 tests/View/ViewBlockDefaultsTest.php

diff --git a/app/View/LayoutController.php b/app/View/LayoutController.php
index 190938433..df6d2512a 100644
--- a/app/View/LayoutController.php
+++ b/app/View/LayoutController.php
@@ -18,11 +18,13 @@ class LayoutController
     {
         $namedLocations = $this->viewBlocks->getNamedLocations();
         $locationName = $namedLocations[$location] ?? $location;
+        $blocks = $this->viewBlocks->getForLocation($location);
 
         return view('settings.layouts.edit', [
             'location' => $location,
             'locationName' => $locationName,
             'namedLocations' => $namedLocations,
+            'blocks' => $blocks,
         ]);
     }
 
diff --git a/app/View/ViewBlock.php b/app/View/ViewBlock.php
index 921ecd342..beba07cb7 100644
--- a/app/View/ViewBlock.php
+++ b/app/View/ViewBlock.php
@@ -4,9 +4,18 @@ namespace BookStack\View;
 
 abstract class ViewBlock implements ViewBlockInterface
 {
+    protected string $id;
     protected string $view;
     protected string $labelTranslationKey;
 
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
     /**
      * @inheritDoc
      */
diff --git a/app/View/ViewBlockDefaults.php b/app/View/ViewBlockDefaults.php
index 1e235b751..efed833fd 100644
--- a/app/View/ViewBlockDefaults.php
+++ b/app/View/ViewBlockDefaults.php
@@ -110,6 +110,7 @@ class ViewBlockDefaults
 
     /**
      * Get the locations for all default blocks.
+     * @return string[]
      */
     public static function getLocations(): array
     {
diff --git a/app/View/ViewBlockInterface.php b/app/View/ViewBlockInterface.php
index d72456870..35dcb79fc 100644
--- a/app/View/ViewBlockInterface.php
+++ b/app/View/ViewBlockInterface.php
@@ -4,6 +4,11 @@ namespace BookStack\View;
 
 interface ViewBlockInterface
 {
+    /**
+     * Get the unique ID for this block.
+     */
+    public function getId(): string;
+
     /**
      * Get the label for this block.
      */
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
index 939e4107d..cf1dd6d0a 100644
--- a/app/View/ViewBlockManager.php
+++ b/app/View/ViewBlockManager.php
@@ -34,7 +34,7 @@ class ViewBlockManager
      * @return ViewBlockInterface[]
      * @throws BindingResolutionException
      */
-    public function getForLocation(string $location, string $position): array
+    public function getForLocationAndPosition(string $location, string $position): array
     {
         $defaults = ViewBlockDefaults::getForLocation($location)[$position] ?? [];
         $registered = $this->blocksByLocationAndPosition[$location][$position] ?? [];
@@ -45,6 +45,28 @@ class ViewBlockManager
         }, $sections);
     }
 
+    /**
+     * Get all blocks registered for a given location, as sets of arrays
+     * keyed by position.
+     * @return array<string, ViewBlockInterface[]>
+     * @throws BindingResolutionException
+     */
+    public function getForLocation(string $location): array
+    {
+        $defaults = ViewBlockDefaults::getForLocation($location) ?? [];
+        $registered = $this->blocksByLocationAndPosition[$location] ?? [];
+        $sections = array_merge_recursive($defaults, $registered);
+
+        $instances = [];
+        foreach ($sections as $position => $blocks) {
+            $instances[$position] = array_map(function (string $className) {
+                return app()->make($className);
+            }, $blocks);
+        }
+
+        return $instances;
+    }
+
     /**
      * Get the names of all locations where blocks are registered.
      * Returns an array where the keys are location strings, and the
diff --git a/app/View/ViewBlocks/BooksIndexActions.php b/app/View/ViewBlocks/BooksIndexActions.php
index 2802809f5..2d4f3df30 100644
--- a/app/View/ViewBlocks/BooksIndexActions.php
+++ b/app/View/ViewBlocks/BooksIndexActions.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 
 class BooksIndexActions extends ViewBlock
 {
+    protected string $id = 'builtin_books-index-actions';
     protected string $view = 'books.parts.index-sidebar-section-actions';
     protected string $labelTranslationKey = 'common.actions';
 
diff --git a/app/View/ViewBlocks/BooksIndexNew.php b/app/View/ViewBlocks/BooksIndexNew.php
index ef88976e3..620b650f9 100644
--- a/app/View/ViewBlocks/BooksIndexNew.php
+++ b/app/View/ViewBlocks/BooksIndexNew.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class BooksIndexNew extends ViewBlock
 {
+    protected string $id = 'builtin_books-index-new';
     protected string $view = 'books.parts.index-sidebar-section-new';
     protected string $labelTranslationKey = 'entities.books_new';
 
diff --git a/app/View/ViewBlocks/BooksIndexPopular.php b/app/View/ViewBlocks/BooksIndexPopular.php
index 6428a6098..a7b2241cb 100644
--- a/app/View/ViewBlocks/BooksIndexPopular.php
+++ b/app/View/ViewBlocks/BooksIndexPopular.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class BooksIndexPopular extends ViewBlock
 {
+    protected string $id = 'builtin_books-index-popular';
     protected string $view = 'books.parts.index-sidebar-section-popular';
     protected string $labelTranslationKey = 'entities.books_popular';
 
diff --git a/app/View/ViewBlocks/BooksIndexRecents.php b/app/View/ViewBlocks/BooksIndexRecents.php
index a6bb90a84..e4d76e23b 100644
--- a/app/View/ViewBlocks/BooksIndexRecents.php
+++ b/app/View/ViewBlocks/BooksIndexRecents.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class BooksIndexRecents extends ViewBlock
 {
+    protected string $id = 'builtin_books-index-recents';
     protected string $view = 'books.parts.index-sidebar-section-recents';
     protected string $labelTranslationKey = 'entities.recently_viewed';
 
diff --git a/app/View/ViewBlocks/BooksShowActions.php b/app/View/ViewBlocks/BooksShowActions.php
index 4f868e4a3..946805c63 100644
--- a/app/View/ViewBlocks/BooksShowActions.php
+++ b/app/View/ViewBlocks/BooksShowActions.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 
 class BooksShowActions extends ViewBlock
 {
+    protected string $id = 'builtin_books-show-actions';
     protected string $view = 'books.parts.show-sidebar-section-actions';
     protected string $labelTranslationKey = 'common.actions';
 
diff --git a/app/View/ViewBlocks/BooksShowActivity.php b/app/View/ViewBlocks/BooksShowActivity.php
index e5c0acdd2..7c723ffc0 100644
--- a/app/View/ViewBlocks/BooksShowActivity.php
+++ b/app/View/ViewBlocks/BooksShowActivity.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 
 class BooksShowActivity extends ViewBlock
 {
+    protected string $id = 'builtin_books-show-activity';
     protected string $view = 'books.parts.show-sidebar-section-activity';
     protected string $labelTranslationKey = 'entities.recent_activity';
 
diff --git a/app/View/ViewBlocks/BooksShowDetails.php b/app/View/ViewBlocks/BooksShowDetails.php
index ccd7a7704..5c690d613 100644
--- a/app/View/ViewBlocks/BooksShowDetails.php
+++ b/app/View/ViewBlocks/BooksShowDetails.php
@@ -10,6 +10,7 @@ use Illuminate\Http\Request;
 
 class BooksShowDetails extends ViewBlock
 {
+    protected string $id = 'builtin_books-show-details';
     protected string $view = 'books.parts.show-sidebar-section-details';
     protected string $labelTranslationKey = 'common.details';
 
diff --git a/app/View/ViewBlocks/BooksShowSearchForm.php b/app/View/ViewBlocks/BooksShowSearchForm.php
index 492579505..17e770e17 100644
--- a/app/View/ViewBlocks/BooksShowSearchForm.php
+++ b/app/View/ViewBlocks/BooksShowSearchForm.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 
 class BooksShowSearchForm extends ViewBlock
 {
+    protected string $id = 'builtin_books-show-search-form';
     protected string $view = 'entities.search-form';
     protected string $labelTranslationKey = 'common.search';
 
diff --git a/app/View/ViewBlocks/BooksShowShelves.php b/app/View/ViewBlocks/BooksShowShelves.php
index 310bdffef..5a0424db5 100644
--- a/app/View/ViewBlocks/BooksShowShelves.php
+++ b/app/View/ViewBlocks/BooksShowShelves.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class BooksShowShelves extends ViewBlock
 {
+    protected string $id = 'builtin_books-show-shelves';
     protected string $view = 'books.parts.show-sidebar-section-shelves';
     protected string $labelTranslationKey = 'entities.shelves';
 
diff --git a/app/View/ViewBlocks/BooksShowTags.php b/app/View/ViewBlocks/BooksShowTags.php
index ac9f4c1ef..90de1e9c8 100644
--- a/app/View/ViewBlocks/BooksShowTags.php
+++ b/app/View/ViewBlocks/BooksShowTags.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 
 class BooksShowTags extends ViewBlock
 {
+    protected string $id = 'builtin_books-show-tags';
     protected string $view = 'books.parts.show-sidebar-section-tags';
     protected string $labelTranslationKey = 'entities.tags';
 
diff --git a/app/View/ViewBlocks/ChaptersShowActions.php b/app/View/ViewBlocks/ChaptersShowActions.php
index 6fe1b6955..1f06a89c5 100644
--- a/app/View/ViewBlocks/ChaptersShowActions.php
+++ b/app/View/ViewBlocks/ChaptersShowActions.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 
 class ChaptersShowActions extends ViewBlock
 {
+    protected string $id = 'builtin_chapters-show-actions';
     protected string $view = 'chapters.parts.show-sidebar-section-actions';
     protected string $labelTranslationKey = 'common.actions';
 
diff --git a/app/View/ViewBlocks/ChaptersShowBookTree.php b/app/View/ViewBlocks/ChaptersShowBookTree.php
index 3f6d93418..a0bec8c7b 100644
--- a/app/View/ViewBlocks/ChaptersShowBookTree.php
+++ b/app/View/ViewBlocks/ChaptersShowBookTree.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class ChaptersShowBookTree extends ViewBlock
 {
+    protected string $id = 'builtin_chapters-show-book-tree';
     protected string $view = 'entities.book-tree';
     protected string $labelTranslationKey = 'entities.books_navigation';
 
diff --git a/app/View/ViewBlocks/ChaptersShowDetails.php b/app/View/ViewBlocks/ChaptersShowDetails.php
index 7a90c9058..a65d17e2f 100644
--- a/app/View/ViewBlocks/ChaptersShowDetails.php
+++ b/app/View/ViewBlocks/ChaptersShowDetails.php
@@ -11,6 +11,7 @@ use Illuminate\Http\Request;
 
 class ChaptersShowDetails extends ViewBlock
 {
+    protected string $id = 'builtin_chapters-show-details';
     protected string $view = 'chapters.parts.show-sidebar-section-details';
     protected string $labelTranslationKey = 'common.details';
 
diff --git a/app/View/ViewBlocks/ChaptersShowSearchForm.php b/app/View/ViewBlocks/ChaptersShowSearchForm.php
index 6c2b8aa5a..9443994bb 100644
--- a/app/View/ViewBlocks/ChaptersShowSearchForm.php
+++ b/app/View/ViewBlocks/ChaptersShowSearchForm.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 
 class ChaptersShowSearchForm extends ViewBlock
 {
+    protected string $id = 'builtin_chapters-show-search-form';
     protected string $view = 'entities.search-form';
     protected string $labelTranslationKey = 'common.search';
 
diff --git a/app/View/ViewBlocks/ChaptersShowTags.php b/app/View/ViewBlocks/ChaptersShowTags.php
index fa7fa200d..fd42283cb 100644
--- a/app/View/ViewBlocks/ChaptersShowTags.php
+++ b/app/View/ViewBlocks/ChaptersShowTags.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class ChaptersShowTags extends ViewBlock
 {
+    protected string $id = 'builtin_chapters-show-tags';
     protected string $view = 'chapters.parts.show-sidebar-section-tags';
     protected string $labelTranslationKey = 'entities.tags';
 
diff --git a/app/View/ViewBlocks/HomeActions.php b/app/View/ViewBlocks/HomeActions.php
index 2e64c97fb..94788c522 100644
--- a/app/View/ViewBlocks/HomeActions.php
+++ b/app/View/ViewBlocks/HomeActions.php
@@ -6,6 +6,7 @@ use BookStack\View\ViewBlock;
 
 class HomeActions extends ViewBlock
 {
+    protected string $id = 'builtin_home-actions';
     protected string $view = 'home.parts.configured-section-actions';
     protected string $labelTranslationKey = 'common.actions';
 
diff --git a/app/View/ViewBlocks/HomeRecentActivity.php b/app/View/ViewBlocks/HomeRecentActivity.php
index 7b5a74ecb..b5b252fbf 100644
--- a/app/View/ViewBlocks/HomeRecentActivity.php
+++ b/app/View/ViewBlocks/HomeRecentActivity.php
@@ -13,6 +13,11 @@ class HomeRecentActivity implements ViewBlockInterface
     ) {
     }
 
+    public function getId(): string
+    {
+        return 'builtin_home-recent-activity';
+    }
+
     public function getLabel(): string
     {
         return trans('entities.recent_activity');
diff --git a/app/View/ViewBlocks/HomeRecentDrafts.php b/app/View/ViewBlocks/HomeRecentDrafts.php
index e65078cb4..458353a57 100644
--- a/app/View/ViewBlocks/HomeRecentDrafts.php
+++ b/app/View/ViewBlocks/HomeRecentDrafts.php
@@ -12,6 +12,11 @@ class HomeRecentDrafts implements ViewBlockInterface
     ) {
     }
 
+    public function getId(): string
+    {
+        return 'builtin_home-recent-drafts';
+    }
+
     public function getLabel(): string
     {
         return trans('entities.my_recent_drafts');
diff --git a/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php b/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
index b56a91acd..032ef6b46 100644
--- a/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
+++ b/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
@@ -13,6 +13,11 @@ class HomeRecentlyUpdatedPages implements ViewBlockInterface
     ) {
     }
 
+    public function getId(): string
+    {
+        return 'builtin_home-recently-updated-pages';
+    }
+
     public function getLabel(): string
     {
         return trans('entities.recently_updated_pages');
diff --git a/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php b/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
index 99666e2c8..2259b3513 100644
--- a/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
+++ b/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
@@ -16,6 +16,11 @@ class HomeRecentlyViewedOrRecentBooks implements ViewBlockInterface
     ) {
     }
 
+    public function getId(): string
+    {
+        return 'builtin_home-recently-viewed-or-recent-books';
+    }
+
     public function getLabel(): string
     {
         $key = user()->isGuest() ? 'books_recent' : 'my_recently_viewed';
diff --git a/app/View/ViewBlocks/HomeTopFavourites.php b/app/View/ViewBlocks/HomeTopFavourites.php
index be753a719..b1b929f03 100644
--- a/app/View/ViewBlocks/HomeTopFavourites.php
+++ b/app/View/ViewBlocks/HomeTopFavourites.php
@@ -13,6 +13,11 @@ class HomeTopFavourites implements ViewBlockInterface
     ) {
     }
 
+    public function getId(): string
+    {
+        return 'builtin_home-top-favourites';
+    }
+
     public function getLabel(): string
     {
         return trans('entities.my_most_viewed_favourites');
diff --git a/app/View/ViewBlocks/PagesShowActions.php b/app/View/ViewBlocks/PagesShowActions.php
index 8abfc8a6e..62b814926 100644
--- a/app/View/ViewBlocks/PagesShowActions.php
+++ b/app/View/ViewBlocks/PagesShowActions.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 
 class PagesShowActions extends ViewBlock
 {
+    protected string $id = 'builtin_pages-show-actions';
     protected string $view = 'pages.parts.show-sidebar-section-actions';
     protected string $labelTranslationKey = 'common.actions';
 
diff --git a/app/View/ViewBlocks/PagesShowAttachments.php b/app/View/ViewBlocks/PagesShowAttachments.php
index baf8713f1..a50123c07 100644
--- a/app/View/ViewBlocks/PagesShowAttachments.php
+++ b/app/View/ViewBlocks/PagesShowAttachments.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class PagesShowAttachments extends ViewBlock
 {
+    protected string $id = 'builtin_pages-show-attachments';
     protected string $view = 'pages.parts.show-sidebar-section-attachments';
     protected string $labelTranslationKey = 'entities.pages_attachments';
 
diff --git a/app/View/ViewBlocks/PagesShowBookTree.php b/app/View/ViewBlocks/PagesShowBookTree.php
index 05c4c9a1f..c09285c71 100644
--- a/app/View/ViewBlocks/PagesShowBookTree.php
+++ b/app/View/ViewBlocks/PagesShowBookTree.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class PagesShowBookTree extends ViewBlock
 {
+    protected string $id = 'builtin_pages-show-book-tree';
     protected string $view = 'entities.book-tree';
     protected string $labelTranslationKey = 'entities.books_navigation';
 
diff --git a/app/View/ViewBlocks/PagesShowDetails.php b/app/View/ViewBlocks/PagesShowDetails.php
index eb50e859c..098baac5f 100644
--- a/app/View/ViewBlocks/PagesShowDetails.php
+++ b/app/View/ViewBlocks/PagesShowDetails.php
@@ -11,6 +11,7 @@ use Illuminate\Http\Request;
 
 class PagesShowDetails extends ViewBlock
 {
+    protected string $id = 'builtin_pages-show-details';
     protected string $view = 'pages.parts.show-sidebar-section-details';
     protected string $labelTranslationKey = 'common.details';
 
diff --git a/app/View/ViewBlocks/PagesShowPageNav.php b/app/View/ViewBlocks/PagesShowPageNav.php
index cbde72f21..952bc9b8c 100644
--- a/app/View/ViewBlocks/PagesShowPageNav.php
+++ b/app/View/ViewBlocks/PagesShowPageNav.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 
 class PagesShowPageNav extends ViewBlock
 {
+    protected string $id = 'builtin_pages-show-page-nav';
     protected string $view = 'pages.parts.show-sidebar-section-page-nav';
     protected string $labelTranslationKey = 'entities.pages_navigation';
 
diff --git a/app/View/ViewBlocks/PagesShowTags.php b/app/View/ViewBlocks/PagesShowTags.php
index c200f197a..d8a9a8c7a 100644
--- a/app/View/ViewBlocks/PagesShowTags.php
+++ b/app/View/ViewBlocks/PagesShowTags.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class PagesShowTags extends ViewBlock
 {
+    protected string $id = 'builtin_pages-show-tags';
     protected string $view = 'pages.parts.show-sidebar-section-tags';
     protected string $labelTranslationKey = 'entities.tags';
 
diff --git a/app/View/ViewBlocks/ShelvesIndexActions.php b/app/View/ViewBlocks/ShelvesIndexActions.php
index 81a35ded6..63c0ae344 100644
--- a/app/View/ViewBlocks/ShelvesIndexActions.php
+++ b/app/View/ViewBlocks/ShelvesIndexActions.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 
 class ShelvesIndexActions extends ViewBlock
 {
+    protected string $id = 'builtin_shelves-index-actions';
     protected string $view = 'shelves.parts.index-sidebar-section-actions';
     protected string $labelTranslationKey = 'common.actions';
 
diff --git a/app/View/ViewBlocks/ShelvesIndexNew.php b/app/View/ViewBlocks/ShelvesIndexNew.php
index 5a09a46af..28d5771ff 100644
--- a/app/View/ViewBlocks/ShelvesIndexNew.php
+++ b/app/View/ViewBlocks/ShelvesIndexNew.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class ShelvesIndexNew extends ViewBlock
 {
+    protected string $id = 'builtin_shelves-index-new';
     protected string $view = 'shelves.parts.index-sidebar-section-new';
     protected string $labelTranslationKey = 'entities.shelves_new';
 
diff --git a/app/View/ViewBlocks/ShelvesIndexPopular.php b/app/View/ViewBlocks/ShelvesIndexPopular.php
index 5bf811ac5..454759815 100644
--- a/app/View/ViewBlocks/ShelvesIndexPopular.php
+++ b/app/View/ViewBlocks/ShelvesIndexPopular.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class ShelvesIndexPopular extends ViewBlock
 {
+    protected string $id = 'builtin_shelves-index-popular';
     protected string $view = 'shelves.parts.index-sidebar-section-popular';
     protected string $labelTranslationKey = 'entities.shelves_popular';
 
diff --git a/app/View/ViewBlocks/ShelvesIndexRecents.php b/app/View/ViewBlocks/ShelvesIndexRecents.php
index 219cae559..8025bf3ea 100644
--- a/app/View/ViewBlocks/ShelvesIndexRecents.php
+++ b/app/View/ViewBlocks/ShelvesIndexRecents.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class ShelvesIndexRecents extends ViewBlock
 {
+    protected string $id = 'builtin_shelves-index-recents';
     protected string $view = 'shelves.parts.index-sidebar-section-recents';
     protected string $labelTranslationKey = 'entities.recently_viewed';
 
diff --git a/app/View/ViewBlocks/ShelvesShowActions.php b/app/View/ViewBlocks/ShelvesShowActions.php
index d9683714d..dd8a22bd0 100644
--- a/app/View/ViewBlocks/ShelvesShowActions.php
+++ b/app/View/ViewBlocks/ShelvesShowActions.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 
 class ShelvesShowActions extends ViewBlock
 {
+    protected string $id = 'builtin_shelves-show-actions';
     protected string $view = 'shelves.parts.show-sidebar-section-actions';
     protected string $labelTranslationKey = 'common.actions';
 
diff --git a/app/View/ViewBlocks/ShelvesShowActivity.php b/app/View/ViewBlocks/ShelvesShowActivity.php
index e6bb612cc..0d254bb3e 100644
--- a/app/View/ViewBlocks/ShelvesShowActivity.php
+++ b/app/View/ViewBlocks/ShelvesShowActivity.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 
 class ShelvesShowActivity extends ViewBlock
 {
+    protected string $id = 'builtin_shelves-show-activity';
     protected string $view = 'shelves.parts.show-sidebar-section-activity';
     protected string $labelTranslationKey = 'entities.recent_activity';
 
diff --git a/app/View/ViewBlocks/ShelvesShowDetails.php b/app/View/ViewBlocks/ShelvesShowDetails.php
index 1d5d69cec..31d7c6b4b 100644
--- a/app/View/ViewBlocks/ShelvesShowDetails.php
+++ b/app/View/ViewBlocks/ShelvesShowDetails.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
 
 class ShelvesShowDetails extends ViewBlock
 {
+    protected string $id = 'builtin_shelves-show-details';
     protected string $view = 'shelves.parts.show-sidebar-section-details';
     protected string $labelTranslationKey = 'common.details';
 
diff --git a/app/View/ViewBlocks/ShelvesShowTags.php b/app/View/ViewBlocks/ShelvesShowTags.php
index c8efa2431..105e1c22b 100644
--- a/app/View/ViewBlocks/ShelvesShowTags.php
+++ b/app/View/ViewBlocks/ShelvesShowTags.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 
 class ShelvesShowTags extends ViewBlock
 {
+    protected string $id = 'builtin_shelves-show-tags';
     protected string $view = 'shelves.parts.show-sidebar-section-tags';
     protected string $labelTranslationKey = 'entities.tags';
 
diff --git a/lang/en/preferences.php b/lang/en/preferences.php
index 2cfcb9cce..8ad5a4935 100644
--- a/lang/en/preferences.php
+++ b/lang/en/preferences.php
@@ -31,6 +31,11 @@ return [
     'layout_edit_save' => 'Save Layout',
     'layout_edit_layouts' => 'Layouts',
     'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
 
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
diff --git a/resources/views/common/view-blocks.blade.php b/resources/views/common/view-blocks.blade.php
index fb5e83e19..8a19a81be 100644
--- a/resources/views/common/view-blocks.blade.php
+++ b/resources/views/common/view-blocks.blade.php
@@ -5,6 +5,6 @@ $position - string
 @php
     $sectionVars = get_defined_vars();
 @endphp
-@foreach($viewBlocks->getForLocation($location, $position) as $section)
+@foreach($viewBlocks->getForLocationAndPosition($location, $position) as $section)
     @include($section->getView($sectionVars), $section->withData($sectionVars))
 @endforeach
\ No newline at end of file
diff --git a/resources/views/settings/layouts/edit.blade.php b/resources/views/settings/layouts/edit.blade.php
index ac6ad8daf..2fad7c138 100644
--- a/resources/views/settings/layouts/edit.blade.php
+++ b/resources/views/settings/layouts/edit.blade.php
@@ -30,6 +30,16 @@
                         {{ method_field('PUT') }}
                         {{ csrf_field() }}
 
+                        <div class="flex-container-row gap-m">
+                            @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['left'] ?? [], 'label' => trans('preferences.layout_edit_left'), 'id' => 'left'])
+                            @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['center'] ?? [], 'label' => trans('preferences.layout_edit_center'), 'id' => 'center'])
+                            @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['right'] ?? [], 'label' => trans('preferences.layout_edit_right'), 'id' => 'right'])
+                        </div>
+
+                        <div>
+                            @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['unused'] ?? [], 'label' => trans('preferences.layout_edit_unused'), 'id' => 'unused'])
+                        </div>
+
                         <div class="form-group text-right">
                             <a href="{{ url('/my-account/interface') }}" class="button outline">{{ trans('common.cancel') }}</a>
                             <button type="submit" class="button">{{ trans('preferences.layout_edit_save') }}</button>
diff --git a/resources/views/settings/layouts/parts/block-column.blade.php b/resources/views/settings/layouts/parts/block-column.blade.php
new file mode 100644
index 000000000..87fee9a2f
--- /dev/null
+++ b/resources/views/settings/layouts/parts/block-column.blade.php
@@ -0,0 +1,17 @@
+{{--
+$columnBlocks - array - Blocks to list
+$label - string - Section title
+$id - string - identifier for location/column
+--}}
+<div class="form-group flex">
+    <label id="layout-blocks-{{ $id }}">{{ $label }}</label>
+    <ul refs="layout-editor@column"
+        data-column="{{ $id }}"
+        aria-labelledby="layout-blocks-{{ $id }}"
+        class="scroll-box available-option-list">
+        <li class="text-muted empty-state px-m py-s italic text-small">{{ trans('preferences.layout_edit_empty') }}</li>
+        @foreach($columnBlocks as $block)
+            @include('settings.layouts.parts.block', ['block' => $block])
+        @endforeach
+    </ul>
+</div>
\ No newline at end of file
diff --git a/resources/views/settings/layouts/parts/block.blade.php b/resources/views/settings/layouts/parts/block.blade.php
new file mode 100644
index 000000000..929098652
--- /dev/null
+++ b/resources/views/settings/layouts/parts/block.blade.php
@@ -0,0 +1,18 @@
+{{--
+$block - View Block instance to show
+--}}
+<li data-id="{{ $block->getLabel() }}"
+    class="scroll-box-item items-center">
+    <div class="handle px-s">@icon('grip')</div>
+    <div class="text-small">{{ $block->getLabel() }}</div>
+    <div class="buttons flex-container-row items-center ml-auto px-xxs py-xxs">
+        <button type="button" data-action="move_up" class="icon-button p-xxs"
+                title="{{ trans('entities.books_sort_move_up') }}">@icon('chevron-up')</button>
+        <button type="button" data-action="move_down" class="icon-button p-xxs"
+                title="{{ trans('entities.books_sort_move_down') }}">@icon('chevron-down')</button>
+        <button type="button" data-action="remove" class="icon-button p-xxs"
+                title="{{ trans('common.remove') }}">@icon('remove')</button>
+        <button type="button" data-action="add" class="icon-button p-xxs"
+                title="{{ trans('common.add') }}">@icon('add-small')</button>
+    </div>
+</li>
\ No newline at end of file
diff --git a/tests/View/ViewBlockDefaultsTest.php b/tests/View/ViewBlockDefaultsTest.php
new file mode 100644
index 000000000..a19ba3629
--- /dev/null
+++ b/tests/View/ViewBlockDefaultsTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Tests\View;
+
+use BookStack\View\ViewBlockDefaults;
+use Tests\TestCase;
+
+class ViewBlockDefaultsTest extends TestCase
+{
+    public function test_each_has_a_unique_id_and_non_key_label()
+    {
+        $locations = ViewBlockDefaults::getLocations();
+        $classes = [];
+        $trueById = [];
+
+        foreach ($locations as $location) {
+            $blocksByPosition = ViewBlockDefaults::getForLocation($location);
+            foreach ($blocksByPosition as $blocks) {
+                array_push($classes, ...$blocks);
+            }
+        }
+
+        $blocks = array_unique($classes);
+        foreach ($blocks as $block) {
+            $instance = app()->make($block);
+
+            $id = $instance->getId();
+            $this->assertArrayNotHasKey($id, $trueById);
+            $trueById[$id] = true;
+
+            $label = $instance->getLabel();
+            $this->assertIsString($label);
+            $this->assertDoesNotMatchRegularExpression('/^[a-z]{1,10}\./', $label);
+        }
+
+        $this->assertGreaterThan(10, count($trueById));
+    }
+}

From 9dfa8857457acb8fc59c57968d5f6c3347cd7a4a Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 15 Aug 2026 16:50:12 +0100
Subject: [PATCH 19/72] Layout Editor: Added front-end logic

---
 lang/en/common.php                            |  2 +
 resources/icons/chevron-left.svg              |  1 +
 resources/js/components/index.ts              |  1 +
 resources/js/components/layout-editor.ts      | 80 +++++++++++++++++++
 resources/js/components/shelf-sort.js         |  2 +-
 resources/js/components/sort-rule-manager.ts  |  2 +-
 .../{dual-lists.ts => multi-lists.ts}         | 27 +++++--
 resources/sass/_components.scss               | 14 +++-
 .../views/settings/layouts/edit.blade.php     |  4 +-
 .../layouts/parts/block-column.blade.php      |  2 +-
 .../settings/layouts/parts/block.blade.php    | 12 ++-
 11 files changed, 131 insertions(+), 16 deletions(-)
 create mode 100644 resources/icons/chevron-left.svg
 create mode 100644 resources/js/components/layout-editor.ts
 rename resources/js/services/{dual-lists.ts => multi-lists.ts} (61%)

diff --git a/lang/en/common.php b/lang/en/common.php
index 06a9e855c..46b2a187c 100644
--- a/lang/en/common.php
+++ b/lang/en/common.php
@@ -84,6 +84,8 @@ return [
     'status_inactive' => 'Inactive',
     'never' => 'Never',
     'none' => 'None',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Homepage',
diff --git a/resources/icons/chevron-left.svg b/resources/icons/chevron-left.svg
new file mode 100644
index 000000000..e64210047
--- /dev/null
+++ b/resources/icons/chevron-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M14.59 6 16 7.41 11.42 12 16 16.59 14.59 18l-6-6z"/></svg>
\ No newline at end of file
diff --git a/resources/js/components/index.ts b/resources/js/components/index.ts
index 688877227..e124046b9 100644
--- a/resources/js/components/index.ts
+++ b/resources/js/components/index.ts
@@ -30,6 +30,7 @@ export {GlobalSearch} from './global-search';
 export {HeaderMobileToggle} from './header-mobile-toggle';
 export {ImageManager} from './image-manager';
 export {ImagePicker} from './image-picker';
+export {LayoutEditor} from './layout-editor';
 export {ListSortControl} from './list-sort-control';
 export {LoadingButton} from './loading-button';
 export {MarkdownEditor} from './markdown-editor';
diff --git a/resources/js/components/layout-editor.ts b/resources/js/components/layout-editor.ts
new file mode 100644
index 000000000..925dfcaea
--- /dev/null
+++ b/resources/js/components/layout-editor.ts
@@ -0,0 +1,80 @@
+import Sortable from "sortablejs";
+import {Component} from "./component";
+import {buildListActions, sortActionClickListener} from "../services/multi-lists";
+
+
+export class LayoutEditor extends Component {
+    protected input!: HTMLInputElement;
+    protected columns!: HTMLElement[];
+
+    setup(): void {
+        this.input = this.$refs.input as HTMLInputElement;
+        this.columns = this.$manyRefs.column || [];
+
+        this.initSortable();
+
+        const unusedColumn = this.columns.find(column => column.dataset.column === 'unused') as HTMLElement;
+        const listActions = buildListActions(...this.columns);
+        listActions.add = this.addBlockToLeastPopulated.bind(this);
+        listActions.remove = function (item: HTMLElement) {
+            unusedColumn.appendChild(item);
+        };
+        const sortActionListener = sortActionClickListener(listActions, this.onChange.bind(this));
+        this.$el.addEventListener('click', sortActionListener);
+    }
+
+    protected initSortable(): void {
+        const sortAction = this.onChange.bind(this);
+
+        for (const column of this.columns) {
+            new Sortable(column, {
+                group: 'layout-editor-blocks',
+                ghostClass: 'primary-background-light',
+                handle: '.handle',
+                animation: 150,
+                onSort: sortAction,
+            });
+        }
+    }
+
+    protected onChange(): void {
+        const configured: Record<string, string[]> = {};
+        for (const column of this.columns) {
+            const location = column.dataset.column || '';
+            if (!location) continue;
+            configured[location] = [];
+
+            const blockNodes = column.children;
+            for (let i = 0; i < blockNodes.length; i++) {
+                const blockNode = blockNodes[i] as HTMLElement;
+                const blockId = blockNode.dataset.blockId || '';
+                if (!blockId) continue;
+                configured[location].push(blockId);
+            }
+        }
+
+        const data = JSON.stringify(configured, null, 2);
+        console.log('layout-editor-change: \n' + data);
+        this.input.value = data;
+    }
+
+    protected addBlockToLeastPopulated(item: HTMLElement): void {
+        let populationCount = 100;
+        let leastPopulated: null|HTMLElement = null
+        for (const column of this.columns) {
+            const blockCount = column.children.length;
+            if (column.dataset.column === 'unused') {
+                continue;
+            }
+
+            if (blockCount < populationCount) {
+                leastPopulated = column;
+                populationCount = blockCount;
+            }
+        }
+
+        if (leastPopulated) {
+            leastPopulated.appendChild(item);
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/js/components/shelf-sort.js b/resources/js/components/shelf-sort.js
index b56b01980..593bf03a6 100644
--- a/resources/js/components/shelf-sort.js
+++ b/resources/js/components/shelf-sort.js
@@ -1,6 +1,6 @@
 import Sortable from 'sortablejs';
 import {Component} from './component';
-import {buildListActions, sortActionClickListener} from '../services/dual-lists.ts';
+import {buildListActions, sortActionClickListener} from '../services/multi-lists.ts';
 
 export class ShelfSort extends Component {
 
diff --git a/resources/js/components/sort-rule-manager.ts b/resources/js/components/sort-rule-manager.ts
index ff08f4ab8..70d885815 100644
--- a/resources/js/components/sort-rule-manager.ts
+++ b/resources/js/components/sort-rule-manager.ts
@@ -1,6 +1,6 @@
 import {Component} from "./component.js";
 import Sortable from "sortablejs";
-import {buildListActions, sortActionClickListener} from "../services/dual-lists";
+import {buildListActions, sortActionClickListener} from "../services/multi-lists";
 
 
 export class SortRuleManager extends Component {
diff --git a/resources/js/services/dual-lists.ts b/resources/js/services/multi-lists.ts
similarity index 61%
rename from resources/js/services/dual-lists.ts
rename to resources/js/services/multi-lists.ts
index 98f2af92d..29c88d238 100644
--- a/resources/js/services/dual-lists.ts
+++ b/resources/js/services/multi-lists.ts
@@ -1,13 +1,12 @@
 /**
  * Service for helping manage common dual-list scenarios.
- * (Shelf book manager, sort set manager).
+ * (Shelf book manager, sort set manager, layout-editor).
  */
 
 type ListActionsSet = Record<string, ((item: HTMLElement) => void)>;
 
 export function buildListActions(
-    availableList: HTMLElement,
-    configuredList: HTMLElement,
+    ...lists: HTMLElement[]
 ): ListActionsSet {
     return {
         move_up(item) {
@@ -22,11 +21,29 @@ export function buildListActions(
             const newIndex = Math.min(index + 2, list.children.length);
             list.insertBefore(item, list.children[newIndex] || null);
         },
+        move_right(item) {
+            const list = item.parentNode as HTMLElement;
+            const listIndex = lists.indexOf(list);
+            const targetListIndex = Math.min(listIndex + 1, lists.length - 1);
+            lists[targetListIndex].appendChild(item);
+        },
+        move_left(item) {
+            const list = item.parentNode as HTMLElement;
+            const listIndex = lists.indexOf(list);
+            const targetListIndex = Math.max(listIndex - 1, 0);
+            lists[targetListIndex].appendChild(item);
+        },
         remove(item) {
-            availableList.appendChild(item);
+            const otherList = lists.find(list => list !== item.parentNode);
+            if (otherList) {
+                otherList.appendChild(item);
+            }
         },
         add(item) {
-            configuredList.appendChild(item);
+            const otherList = lists.find(list => list !== item.parentNode);
+            if (otherList) {
+                otherList.appendChild(item);
+            }
         },
     };
 }
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 8608427d8..2e5eda7a1 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -1222,11 +1222,19 @@ input.scroll-box-search, .scroll-box-header-item {
   display: none;
 }
 
-.scroll-box > li.empty-state {
+.scroll-box.layout-editor-column-left [data-action="move_left"],
+.scroll-box.layout-editor-column-right [data-action="move_right"],
+.scroll-box.layout-editor-column-unused [data-action="move_right"],
+.scroll-box.layout-editor-column-unused [data-action="move_left"],
+.scroll-box.layout-editor-column-unused [data-action="remove"],
+.scroll-box.layout-editor-column-left [data-action="add"],
+.scroll-box.layout-editor-column-right [data-action="add"],
+.scroll-box.layout-editor-column-center [data-action="add"],
+{
   display: none;
 }
-.scroll-box > li.empty-state:last-child {
-  display: list-item;
+.scroll-box:has(> li:not(.empty-state)) .empty-state {
+  display: none;
 }
 
 details.section-expander summary {
diff --git a/resources/views/settings/layouts/edit.blade.php b/resources/views/settings/layouts/edit.blade.php
index 2fad7c138..e90c39ada 100644
--- a/resources/views/settings/layouts/edit.blade.php
+++ b/resources/views/settings/layouts/edit.blade.php
@@ -26,10 +26,12 @@
                     </div>
                     <p class="small text-muted">{{ trans('preferences.layout_edit_desc') }}</p>
 
-                    <form action="{{ url('layouts/' . $location) }}" method="POST">
+                    <form component="layout-editor" action="{{ url('layouts/' . $location) }}" method="POST">
                         {{ method_field('PUT') }}
                         {{ csrf_field() }}
 
+                        <input refs="layout-editor@input" type="hidden" name="layout" value="">
+
                         <div class="flex-container-row gap-m">
                             @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['left'] ?? [], 'label' => trans('preferences.layout_edit_left'), 'id' => 'left'])
                             @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['center'] ?? [], 'label' => trans('preferences.layout_edit_center'), 'id' => 'center'])
diff --git a/resources/views/settings/layouts/parts/block-column.blade.php b/resources/views/settings/layouts/parts/block-column.blade.php
index 87fee9a2f..b9ad5ea8f 100644
--- a/resources/views/settings/layouts/parts/block-column.blade.php
+++ b/resources/views/settings/layouts/parts/block-column.blade.php
@@ -8,7 +8,7 @@ $id - string - identifier for location/column
     <ul refs="layout-editor@column"
         data-column="{{ $id }}"
         aria-labelledby="layout-blocks-{{ $id }}"
-        class="scroll-box available-option-list">
+        class="scroll-box layout-editor-column-{{ $id }}">
         <li class="text-muted empty-state px-m py-s italic text-small">{{ trans('preferences.layout_edit_empty') }}</li>
         @foreach($columnBlocks as $block)
             @include('settings.layouts.parts.block', ['block' => $block])
diff --git a/resources/views/settings/layouts/parts/block.blade.php b/resources/views/settings/layouts/parts/block.blade.php
index 929098652..398496ec0 100644
--- a/resources/views/settings/layouts/parts/block.blade.php
+++ b/resources/views/settings/layouts/parts/block.blade.php
@@ -1,18 +1,22 @@
 {{--
-$block - View Block instance to show
+$block - ViewBlockInterface - View Block instance to show
 --}}
-<li data-id="{{ $block->getLabel() }}"
+<li data-block-id="{{ $block->getId() }}"
     class="scroll-box-item items-center">
     <div class="handle px-s">@icon('grip')</div>
     <div class="text-small">{{ $block->getLabel() }}</div>
     <div class="buttons flex-container-row items-center ml-auto px-xxs py-xxs">
+        <button type="button" data-action="move_left" class="icon-button p-xxs"
+                title="{{ trans('common.move_left') }}">@icon('chevron-left')</button>
         <button type="button" data-action="move_up" class="icon-button p-xxs"
                 title="{{ trans('entities.books_sort_move_up') }}">@icon('chevron-up')</button>
         <button type="button" data-action="move_down" class="icon-button p-xxs"
                 title="{{ trans('entities.books_sort_move_down') }}">@icon('chevron-down')</button>
-        <button type="button" data-action="remove" class="icon-button p-xxs"
-                title="{{ trans('common.remove') }}">@icon('remove')</button>
+        <button type="button" data-action="move_right" class="icon-button p-xxs"
+                title="{{ trans('common.move_right') }}">@icon('chevron-right')</button>
         <button type="button" data-action="add" class="icon-button p-xxs"
                 title="{{ trans('common.add') }}">@icon('add-small')</button>
+        <button type="button" data-action="remove" class="icon-button p-xxs"
+                title="{{ trans('common.remove') }}">@icon('remove')</button>
     </div>
 </li>
\ No newline at end of file

From f98492e725e75695b6ca7c70ad0378b1743d5cdd Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 15 Aug 2026 20:43:56 +0100
Subject: [PATCH 20/72] Layouts: Added update logic and testing

---
 app/View/LayoutController.php     | 26 ++++++++++--
 app/View/ViewBlockPreferences.php | 70 +++++++++++++++++++++++++++++++
 lang/en/preferences.php           |  1 +
 tests/View/LayoutEditTest.php     | 65 ++++++++++++++++++++++++++++
 4 files changed, 159 insertions(+), 3 deletions(-)
 create mode 100644 app/View/ViewBlockPreferences.php
 create mode 100644 tests/View/LayoutEditTest.php

diff --git a/app/View/LayoutController.php b/app/View/LayoutController.php
index df6d2512a..ed46d5217 100644
--- a/app/View/LayoutController.php
+++ b/app/View/LayoutController.php
@@ -2,13 +2,20 @@
 
 namespace BookStack\View;
 
+use BookStack\Http\Controller;
+use Closure;
 use Illuminate\Http\Request;
 
-class LayoutController
+class LayoutController extends Controller
 {
     public function __construct(
-        protected ViewBlockManager $viewBlocks
+        protected ViewBlockManager $viewBlocks,
+        protected ViewBlockPreferences $viewBlockPreferences,
     ) {
+        $this->middleware(function (Request $request, Closure $next) {
+            $this->preventGuestAccess();
+            return $next($request);
+        });
     }
 
     /**
@@ -20,6 +27,10 @@ class LayoutController
         $locationName = $namedLocations[$location] ?? $location;
         $blocks = $this->viewBlocks->getForLocation($location);
 
+        // TODO - Load from preferences via ViewBlockPreferences
+
+        $this->setPageTitle(trans('preferences.layout_edit'));
+
         return view('settings.layouts.edit', [
             'location' => $location,
             'locationName' => $locationName,
@@ -33,6 +44,15 @@ class LayoutController
      */
     public function update(string $location, Request $request)
     {
-        // TODO
+        $data = $this->validate($request, [
+            'layout' => ['required', 'string', 'json'],
+        ]);
+
+        $layoutData = json_decode($data['layout'], true, 5);
+        $this->viewBlockPreferences->storeFromLayoutRequestData($location, $layoutData);
+
+        $this->showSuccessNotification(trans('preferences.layout_update_success'));
+
+        return redirect("/layouts/{$location}");
     }
 }
diff --git a/app/View/ViewBlockPreferences.php b/app/View/ViewBlockPreferences.php
new file mode 100644
index 000000000..a80c8d70c
--- /dev/null
+++ b/app/View/ViewBlockPreferences.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace BookStack\View;
+
+class ViewBlockPreferences
+{
+    public function __construct(
+        protected ViewBlockManager $blockManager
+    ) {
+    }
+
+    /**
+     * From the request data of the layout editor, validate the request data to ensure the blocks
+     * and locations are valid and then store the layout data.
+     * The request data is expected to be in the format of:
+     * [
+     *     'position-1' => ['block-id-1', 'block-id-2'],
+     *     'position-2' => ['block-id-3'],
+     * ]
+     * @param array<string, string[]> $layoutData
+     */
+    public function storeFromLayoutRequestData(string $location, array $layoutData): void
+    {
+        $validBlocks = $this->blockManager->getForLocation($location);
+        $validIds = $this->extractValidBlockIds($validBlocks);
+        $validPositions = array_keys($validBlocks);
+        $validPositions[] = 'unused';
+
+        // Ignore updates for invalid/unknown locations
+        if (empty($validBlocks)) {
+            return;
+        }
+
+        /** @var array<string, string[]> $validatedLayoutData */
+        $validatedLayoutData = [];
+
+        foreach ($layoutData as $position => $blockIds) {
+            if (!in_array($position, $validPositions)) {
+                continue;
+            }
+
+            $validatedLayoutData[$position] = array_intersect($blockIds, $validIds);
+        }
+
+        $settingKey = $this->getSettingKey($location);
+        setting()->putForCurrentUser($settingKey, json_encode($validatedLayoutData));
+    }
+
+    protected function getSettingKey(string $location): string
+    {
+        return 'view-layout#' . $location;
+    }
+
+    /**
+     * @param array<string, ViewBlockInterface[]> $blocksByPosition
+     * @return string[]
+     */
+    protected function extractValidBlockIds(array $blocksByPosition): array
+    {
+        $ids = [];
+
+        foreach ($blocksByPosition as $blocks) {
+            foreach ($blocks as $block) {
+                $ids[] = $block->getId();
+            }
+        }
+
+        return array_unique($ids);
+    }
+}
diff --git a/lang/en/preferences.php b/lang/en/preferences.php
index 8ad5a4935..06dd351e4 100644
--- a/lang/en/preferences.php
+++ b/lang/en/preferences.php
@@ -36,6 +36,7 @@ return [
     'layout_edit_center' => 'Center',
     'layout_edit_unused' => 'Unused',
     'layout_edit_empty' => 'No sections to display',
+    'layout_update_success' => 'Layout preferences have been updated!',
 
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
diff --git a/tests/View/LayoutEditTest.php b/tests/View/LayoutEditTest.php
new file mode 100644
index 000000000..a3d1890a3
--- /dev/null
+++ b/tests/View/LayoutEditTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Tests\View;
+
+use Tests\TestCase;
+
+class LayoutEditTest extends TestCase
+{
+    public function test_view()
+    {
+        $resp = $this->asEditor()->get('/layouts/books-index');
+        $resp->assertOk();
+
+        $resp->assertSee('Back to Preferences');
+        $resp->assertSee('Edit Layout');
+        $resp->assertSee('Popular Books');
+        $resp->assertDontSee('My Recent Drafts');
+    }
+
+    public function test_view_loads_existing_preferences()
+    {
+        // TODO
+    }
+
+    public function test_update()
+    {
+        $layout = [
+            'left' => [
+                'builtin_books-show-search-form',
+                'builtin_books-show-actions',
+            ],
+            'center' => [
+                'builtin_books-show-tags', // Should be ignored as there's no center position
+            ],
+            'right' => [
+                'builtin_books-show-activity',
+                'totally_invalid_value', // Should be removed
+            ],
+            'unused' => [
+                'builtin_books-show-shelves',
+            ],
+        ];
+
+        $resp = $this->asEditor()->put('/layouts/books-show', ['layout' => json_encode($layout)]);
+        $resp->assertRedirect('/layouts/books-show');
+        $this->assertSessionHas('success');
+
+        $userPreferenceString = setting()->getForCurrentUser('view-layout#books-show');
+        $this->assertJson($userPreferenceString);
+        $storedData = json_decode($userPreferenceString, true);
+
+        $this->assertEquals([
+            'left' => [
+                'builtin_books-show-search-form',
+                'builtin_books-show-actions',
+            ],
+            'right' => [
+                'builtin_books-show-activity',
+            ],
+            'unused' => [
+                'builtin_books-show-shelves',
+            ],
+        ], $storedData);
+    }
+}

From b1c1cd134c8729d62ed36f79c81b30a22ac42aa6 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 15 Aug 2026 23:05:32 +0100
Subject: [PATCH 21/72] Layouts: Added user preference load logic

---
 app/View/LayoutController.php                |   7 +-
 app/View/ViewBlockManager.php                | 120 +++++++++++++++++--
 app/View/ViewBlockPreferences.php            |  35 ++++--
 resources/js/components/layout-editor.ts     |   4 +-
 resources/views/common/view-blocks.blade.php |   2 +-
 tests/View/LayoutEditTest.php                |  24 +++-
 6 files changed, 162 insertions(+), 30 deletions(-)

diff --git a/app/View/LayoutController.php b/app/View/LayoutController.php
index ed46d5217..1d3091dbd 100644
--- a/app/View/LayoutController.php
+++ b/app/View/LayoutController.php
@@ -10,7 +10,6 @@ class LayoutController extends Controller
 {
     public function __construct(
         protected ViewBlockManager $viewBlocks,
-        protected ViewBlockPreferences $viewBlockPreferences,
     ) {
         $this->middleware(function (Request $request, Closure $next) {
             $this->preventGuestAccess();
@@ -25,9 +24,7 @@ class LayoutController extends Controller
     {
         $namedLocations = $this->viewBlocks->getNamedLocations();
         $locationName = $namedLocations[$location] ?? $location;
-        $blocks = $this->viewBlocks->getForLocation($location);
-
-        // TODO - Load from preferences via ViewBlockPreferences
+        $blocks = $this->viewBlocks->getForLocationForCurrentUser($location);
 
         $this->setPageTitle(trans('preferences.layout_edit'));
 
@@ -49,7 +46,7 @@ class LayoutController extends Controller
         ]);
 
         $layoutData = json_decode($data['layout'], true, 5);
-        $this->viewBlockPreferences->storeFromLayoutRequestData($location, $layoutData);
+        $this->viewBlocks->updatePreferencesFromIdPositionMap($location, $layoutData);
 
         $this->showSuccessNotification(trans('preferences.layout_update_success'));
 
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
index cf1dd6d0a..ac6da116b 100644
--- a/app/View/ViewBlockManager.php
+++ b/app/View/ViewBlockManager.php
@@ -6,11 +6,21 @@ use Illuminate\Contracts\Container\BindingResolutionException;
 
 class ViewBlockManager
 {
+    public function __construct(
+        protected ViewBlockPreferences $preferences,
+    ) {
+    }
+
     /**
      * @var array<string, array<string, class-string<ViewBlockInterface>[]>>
      */
     protected array $blocksByLocationAndPosition = [];
 
+    /**
+     * @var array<string, array<string, ViewBlockInterface[]>
+     */
+    protected array $locationBlockCache = [];
+
     /**
      * Register a block type to be displayed at the given location and position.
      * @param class-string<ViewBlockInterface> $blockClass
@@ -29,20 +39,22 @@ class ViewBlockManager
     }
 
     /**
-     * Get all blocks registered for a given location and position.
-     *
+     * Get all blocks registered for a given location and position, considering the
+     * preferences for the current user.
      * @return ViewBlockInterface[]
      * @throws BindingResolutionException
      */
-    public function getForLocationAndPosition(string $location, string $position): array
+    public function getForLocationAndPositionForCurrentUser(string $location, string $position): array
     {
-        $defaults = ViewBlockDefaults::getForLocation($location)[$position] ?? [];
-        $registered = $this->blocksByLocationAndPosition[$location][$position] ?? [];
-        $sections = array_unique(array_merge($defaults, $registered));
+        $key = user()->id . ':' . $location;
+        if (isset($this->locationBlockCache[$key])) {
+            return $this->locationBlockCache[$key][$position] ?? [];
+        }
 
-        return array_map(function (string $className) {
-            return app()->make($className);
-        }, $sections);
+        $forLocation = $this->getForLocationForCurrentUser($location);
+        $this->locationBlockCache[$key] = $forLocation;
+
+        return $forLocation[$position] ?? [];
     }
 
     /**
@@ -67,6 +79,49 @@ class ViewBlockManager
         return $instances;
     }
 
+    /**
+     * Get all blocks registered for a given location, as sets of arrays
+     * keyed by position, for the current user.
+     * Same as above but with user-specific preferences applied.
+     * @return array<string, ViewBlockInterface[]>
+     * @throws BindingResolutionException
+     */
+    public function getForLocationForCurrentUser(string $location): array
+    {
+        $forLocation = $this->getForLocation($location);
+        $userBlocksByPosition = $this->preferences->getIdByPositionMap($location);
+        if (empty($userBlocksByPosition)) {
+            return $forLocation;
+        }
+
+        $results = [];
+        $blocksById = $this->blocksByPositionToIdMap($forLocation);
+        $idPositionMap = $this->blocksByPositionToIdPositionMap($forLocation);
+        $locations = array_keys($forLocation);
+        $locations[] = 'unused';
+
+        // Add based on user preferences
+        foreach ($locations as $position) {
+            $userBlockIds = $userBlocksByPosition[$position] ?? [];
+            $results[$position] = [];
+            foreach ($userBlockIds as $blockId) {
+                $block = $blocksById[$blockId] ?? null;
+                if ($block && isset($blocksById[$blockId])) {
+                    $results[$position][] = $block;
+                    unset($blocksById[$blockId]);
+                }
+            }
+        }
+
+        // Add remaining blocks based on their default locations
+        foreach ($blocksById as $block) {
+            $position = $idPositionMap[$block->getId()] ?? 'unused';
+            $results[$position][] = $block;
+        }
+
+        return $results;
+    }
+
     /**
      * Get the names of all locations where blocks are registered.
      * Returns an array where the keys are location strings, and the
@@ -87,4 +142,51 @@ class ViewBlockManager
 
         return $results;
     }
+
+
+    /**
+     * Update user preferences for a given location to match the given layout data map.
+     * @param array<string, string[]> $layoutData
+     * @throws BindingResolutionException
+     */
+    public function updatePreferencesFromIdPositionMap(string $location, array $layoutData): void
+    {
+        $this->preferences->storeByIdPositionMap(
+            $location,
+            $layoutData,
+            $this->getForLocation($location),
+        );
+    }
+
+    /**
+     * Convert a blocksByPosition array into a map of block IDs to blocks.
+     * @param array<string, ViewBlockInterface[]> $blocksByPosition
+     * @return array<string, ViewBlockInterface>
+     */
+    protected function blocksByPositionToIdMap(array $blocksByPosition): array
+    {
+        $map = [];
+        foreach ($blocksByPosition as $position => $blocks) {
+            foreach ($blocks as $block) {
+                $map[$block->getId()] = $block;
+            }
+        }
+        return $map;
+    }
+
+    /**
+     * Convert a blocksByPosition array into a map of block IDs to their positions.
+     * @param array<string, ViewBlockInterface[]> $blocksByPosition
+     * @return array<string, string>
+     */
+    protected function blocksByPositionToIdPositionMap(array $blocksByPosition): array
+    {
+        $map = [];
+        foreach ($blocksByPosition as $position => $blocks) {
+            foreach ($blocks as $block) {
+                $map[$block->getId()] = $position;
+            }
+        }
+        return $map;
+    }
 }
diff --git a/app/View/ViewBlockPreferences.php b/app/View/ViewBlockPreferences.php
index a80c8d70c..ee965d5d1 100644
--- a/app/View/ViewBlockPreferences.php
+++ b/app/View/ViewBlockPreferences.php
@@ -2,13 +2,10 @@
 
 namespace BookStack\View;
 
+use Illuminate\Contracts\Container\BindingResolutionException;
+
 class ViewBlockPreferences
 {
-    public function __construct(
-        protected ViewBlockManager $blockManager
-    ) {
-    }
-
     /**
      * From the request data of the layout editor, validate the request data to ensure the blocks
      * and locations are valid and then store the layout data.
@@ -18,16 +15,20 @@ class ViewBlockPreferences
      *     'position-2' => ['block-id-3'],
      * ]
      * @param array<string, string[]> $layoutData
+     * @param array<string, ViewBlockInterface[]> $validBlocksByPosition
+     * @throws BindingResolutionException
      */
-    public function storeFromLayoutRequestData(string $location, array $layoutData): void
-    {
-        $validBlocks = $this->blockManager->getForLocation($location);
-        $validIds = $this->extractValidBlockIds($validBlocks);
-        $validPositions = array_keys($validBlocks);
+    public function storeByIdPositionMap(
+        string $location,
+        array $layoutData,
+        array $validBlocksByPosition,
+    ): void {
+        $validIds = $this->extractValidBlockIds($validBlocksByPosition);
+        $validPositions = array_keys($validBlocksByPosition);
         $validPositions[] = 'unused';
 
         // Ignore updates for invalid/unknown locations
-        if (empty($validBlocks)) {
+        if (empty($validBlocksByPosition)) {
             return;
         }
 
@@ -46,6 +47,18 @@ class ViewBlockPreferences
         setting()->putForCurrentUser($settingKey, json_encode($validatedLayoutData));
     }
 
+    /**
+     * Get the layou data for a given location.
+     * Provides arrays of block ids keyed by position.
+     * @return array<string, string[]>
+     */
+    public function getIdByPositionMap(string $location): array
+    {
+        $settingKey = $this->getSettingKey($location);
+        $layoutData = setting()->getForCurrentUser($settingKey, '{}');
+        return json_decode($layoutData, true) ?? [];
+    }
+
     protected function getSettingKey(string $location): string
     {
         return 'view-layout#' . $location;
diff --git a/resources/js/components/layout-editor.ts b/resources/js/components/layout-editor.ts
index 925dfcaea..e24e53384 100644
--- a/resources/js/components/layout-editor.ts
+++ b/resources/js/components/layout-editor.ts
@@ -53,9 +53,7 @@ export class LayoutEditor extends Component {
             }
         }
 
-        const data = JSON.stringify(configured, null, 2);
-        console.log('layout-editor-change: \n' + data);
-        this.input.value = data;
+        this.input.value = JSON.stringify(configured, null, 2);
     }
 
     protected addBlockToLeastPopulated(item: HTMLElement): void {
diff --git a/resources/views/common/view-blocks.blade.php b/resources/views/common/view-blocks.blade.php
index 8a19a81be..31d854286 100644
--- a/resources/views/common/view-blocks.blade.php
+++ b/resources/views/common/view-blocks.blade.php
@@ -5,6 +5,6 @@ $position - string
 @php
     $sectionVars = get_defined_vars();
 @endphp
-@foreach($viewBlocks->getForLocationAndPosition($location, $position) as $section)
+@foreach($viewBlocks->getForLocationAndPositionForCurrentUser($location, $position) as $section)
     @include($section->getView($sectionVars), $section->withData($sectionVars))
 @endforeach
\ No newline at end of file
diff --git a/tests/View/LayoutEditTest.php b/tests/View/LayoutEditTest.php
index a3d1890a3..4eb264707 100644
--- a/tests/View/LayoutEditTest.php
+++ b/tests/View/LayoutEditTest.php
@@ -19,7 +19,29 @@ class LayoutEditTest extends TestCase
 
     public function test_view_loads_existing_preferences()
     {
-        // TODO
+        $this->asEditor();
+        setting()->putForCurrentUser('view-layout#books-show', json_encode([
+            'left' => [
+            ],
+            'right' => [
+            ],
+            'unused' => [
+                'builtin_books-show-search-form',
+                'builtin_books-show-actions',
+                'builtin_books-show-activity',
+                'builtin_books-show-shelves',
+                'builtin_books-show-tags',
+                'builtin_books-show-details',
+            ],
+        ]));
+
+        $resp = $this->get('/layouts/books-show');
+        $resp->assertOk();
+        $html = $this->withHtml($resp);
+
+        $html->assertElementCount('[data-column="unused"] > li', 7);
+        $html->assertElementCount('[data-column="left"] > li', 1);
+        $html->assertElementCount('[data-column="right"] > li', 1);
     }
 
     public function test_update()

From 01b29515c8a73d30b1424c88d355fb08a2263106 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 16 Aug 2026 10:41:43 +0100
Subject: [PATCH 22/72] Layouts: Updated view block ids/labels to be static

So that their metadata can be read without having to create instances
and fullfill dependancy injection just to list.

Also added title to interface prefs page.
---
 .../Controllers/UserAccountController.php     |  2 +
 app/View/ViewBlock.php                        | 26 +++++------
 app/View/ViewBlockInterface.php               |  4 +-
 app/View/ViewBlockManager.php                 | 45 ++++++++++---------
 app/View/ViewBlockPreferences.php             |  6 +--
 app/View/ViewBlocks/BooksIndexActions.php     |  6 +--
 app/View/ViewBlocks/BooksIndexNew.php         |  6 +--
 app/View/ViewBlocks/BooksIndexPopular.php     |  6 +--
 app/View/ViewBlocks/BooksIndexRecents.php     |  6 +--
 app/View/ViewBlocks/BooksShowActions.php      |  6 +--
 app/View/ViewBlocks/BooksShowActivity.php     |  6 +--
 app/View/ViewBlocks/BooksShowDetails.php      |  6 +--
 app/View/ViewBlocks/BooksShowSearchForm.php   |  6 +--
 app/View/ViewBlocks/BooksShowShelves.php      |  6 +--
 app/View/ViewBlocks/BooksShowTags.php         |  6 +--
 app/View/ViewBlocks/ChaptersShowActions.php   |  6 +--
 app/View/ViewBlocks/ChaptersShowBookTree.php  |  6 +--
 app/View/ViewBlocks/ChaptersShowDetails.php   |  6 +--
 .../ViewBlocks/ChaptersShowSearchForm.php     |  6 +--
 app/View/ViewBlocks/ChaptersShowTags.php      |  6 +--
 app/View/ViewBlocks/HomeActions.php           |  6 +--
 app/View/ViewBlocks/HomeRecentActivity.php    |  4 +-
 app/View/ViewBlocks/HomeRecentDrafts.php      |  4 +-
 .../ViewBlocks/HomeRecentlyUpdatedPages.php   |  4 +-
 .../HomeRecentlyViewedOrRecentBooks.php       |  4 +-
 app/View/ViewBlocks/HomeTopFavourites.php     |  4 +-
 app/View/ViewBlocks/PagesShowActions.php      |  6 +--
 app/View/ViewBlocks/PagesShowAttachments.php  |  6 +--
 app/View/ViewBlocks/PagesShowBookTree.php     |  6 +--
 app/View/ViewBlocks/PagesShowDetails.php      |  6 +--
 app/View/ViewBlocks/PagesShowPageNav.php      |  6 +--
 app/View/ViewBlocks/PagesShowTags.php         |  6 +--
 app/View/ViewBlocks/ShelvesIndexActions.php   |  6 +--
 app/View/ViewBlocks/ShelvesIndexNew.php       |  6 +--
 app/View/ViewBlocks/ShelvesIndexPopular.php   |  6 +--
 app/View/ViewBlocks/ShelvesIndexRecents.php   |  6 +--
 app/View/ViewBlocks/ShelvesShowActions.php    |  6 +--
 app/View/ViewBlocks/ShelvesShowActivity.php   |  6 +--
 app/View/ViewBlocks/ShelvesShowDetails.php    |  6 +--
 app/View/ViewBlocks/ShelvesShowTags.php       |  6 +--
 resources/views/common/view-blocks.blade.php  |  4 +-
 .../settings/layouts/parts/block.blade.php    |  8 ++--
 tests/View/ViewBlockDefaultsTest.php          |  6 +--
 43 files changed, 151 insertions(+), 150 deletions(-)

diff --git a/app/Users/Controllers/UserAccountController.php b/app/Users/Controllers/UserAccountController.php
index 08c8c541b..71d8ca78d 100644
--- a/app/Users/Controllers/UserAccountController.php
+++ b/app/Users/Controllers/UserAccountController.php
@@ -165,6 +165,8 @@ class UserAccountController extends Controller
      */
     public function showInterface(ViewBlockManager $viewBlockManager)
     {
+        $this->setPageTitle(trans('preferences.interface'));
+
         return view('users.account.interface', [
             'category'       => 'interface',
             'namedLocations' => $viewBlockManager->getNamedLocations(),
diff --git a/app/View/ViewBlock.php b/app/View/ViewBlock.php
index beba07cb7..8907174bc 100644
--- a/app/View/ViewBlock.php
+++ b/app/View/ViewBlock.php
@@ -4,16 +4,24 @@ namespace BookStack\View;
 
 abstract class ViewBlock implements ViewBlockInterface
 {
-    protected string $id;
-    protected string $view;
-    protected string $labelTranslationKey;
+    protected static string $id;
+    protected static string $view;
+    protected static string $labelTranslationKey;
 
     /**
      * @inheritDoc
      */
-    public function getId(): string
+    public static function getId(): string
     {
-        return $this->id;
+        return static::$id;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getLabel(): string
+    {
+        return trans(static::$labelTranslationKey);
     }
 
     /**
@@ -23,12 +31,4 @@ abstract class ViewBlock implements ViewBlockInterface
     {
         return $this->view;
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function getLabel(): string
-    {
-        return trans($this->labelTranslationKey);
-    }
 }
diff --git a/app/View/ViewBlockInterface.php b/app/View/ViewBlockInterface.php
index 35dcb79fc..3d05d34d8 100644
--- a/app/View/ViewBlockInterface.php
+++ b/app/View/ViewBlockInterface.php
@@ -7,12 +7,12 @@ interface ViewBlockInterface
     /**
      * Get the unique ID for this block.
      */
-    public function getId(): string;
+    public static function getId(): string;
 
     /**
      * Get the label for this block.
      */
-    public function getLabel(): string;
+    public static function getLabel(): string;
 
     /**
      * Get the view to render for this block.
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
index ac6da116b..f87d57d4b 100644
--- a/app/View/ViewBlockManager.php
+++ b/app/View/ViewBlockManager.php
@@ -44,46 +44,49 @@ class ViewBlockManager
      * @return ViewBlockInterface[]
      * @throws BindingResolutionException
      */
-    public function getForLocationAndPositionForCurrentUser(string $location, string $position): array
+    public function getInstancesForLocationAndPositionForCurrentUser(string $location, string $position): array
     {
         $key = user()->id . ':' . $location;
         if (isset($this->locationBlockCache[$key])) {
-            return $this->locationBlockCache[$key][$position] ?? [];
+            $blocks = $this->locationBlockCache[$key][$position] ?? [];
+            return $this->blocksToInstances($blocks);
         }
 
         $forLocation = $this->getForLocationForCurrentUser($location);
         $this->locationBlockCache[$key] = $forLocation;
 
-        return $forLocation[$position] ?? [];
+        $blocks = $forLocation[$position] ?? [];
+        return $this->blocksToInstances($blocks);
+    }
+
+    /**
+     * Create instances of the given block classes.
+     * @param class-string<ViewBlockInterface>[] $blocks
+     * @return ViewBlockInterface[]
+     * @throws BindingResolutionException
+     */
+    protected function blocksToInstances(array $blocks): array
+    {
+        return array_map(fn (string $blockClass) => app()->make($blockClass), $blocks);
     }
 
     /**
      * Get all blocks registered for a given location, as sets of arrays
      * keyed by position.
-     * @return array<string, ViewBlockInterface[]>
-     * @throws BindingResolutionException
+     * @return array<string, class-string<ViewBlockInterface>[]>
      */
-    public function getForLocation(string $location): array
+    protected function getForLocation(string $location): array
     {
         $defaults = ViewBlockDefaults::getForLocation($location) ?? [];
         $registered = $this->blocksByLocationAndPosition[$location] ?? [];
-        $sections = array_merge_recursive($defaults, $registered);
-
-        $instances = [];
-        foreach ($sections as $position => $blocks) {
-            $instances[$position] = array_map(function (string $className) {
-                return app()->make($className);
-            }, $blocks);
-        }
-
-        return $instances;
+        return array_merge_recursive($defaults, $registered);
     }
 
     /**
      * Get all blocks registered for a given location, as sets of arrays
      * keyed by position, for the current user.
      * Same as above but with user-specific preferences applied.
-     * @return array<string, ViewBlockInterface[]>
+     * @return array<string, class-string<ViewBlockInterface>[]>
      * @throws BindingResolutionException
      */
     public function getForLocationForCurrentUser(string $location): array
@@ -160,7 +163,7 @@ class ViewBlockManager
 
     /**
      * Convert a blocksByPosition array into a map of block IDs to blocks.
-     * @param array<string, ViewBlockInterface[]> $blocksByPosition
+     * @param array<string, class-string<ViewBlockInterface>[]> $blocksByPosition
      * @return array<string, ViewBlockInterface>
      */
     protected function blocksByPositionToIdMap(array $blocksByPosition): array
@@ -168,7 +171,7 @@ class ViewBlockManager
         $map = [];
         foreach ($blocksByPosition as $position => $blocks) {
             foreach ($blocks as $block) {
-                $map[$block->getId()] = $block;
+                $map[$block::getId()] = $block;
             }
         }
         return $map;
@@ -176,7 +179,7 @@ class ViewBlockManager
 
     /**
      * Convert a blocksByPosition array into a map of block IDs to their positions.
-     * @param array<string, ViewBlockInterface[]> $blocksByPosition
+     * @param array<string, class-string<ViewBlockInterface>[]> $blocksByPosition
      * @return array<string, string>
      */
     protected function blocksByPositionToIdPositionMap(array $blocksByPosition): array
@@ -184,7 +187,7 @@ class ViewBlockManager
         $map = [];
         foreach ($blocksByPosition as $position => $blocks) {
             foreach ($blocks as $block) {
-                $map[$block->getId()] = $position;
+                $map[$block::getId()] = $position;
             }
         }
         return $map;
diff --git a/app/View/ViewBlockPreferences.php b/app/View/ViewBlockPreferences.php
index ee965d5d1..77703068a 100644
--- a/app/View/ViewBlockPreferences.php
+++ b/app/View/ViewBlockPreferences.php
@@ -15,7 +15,7 @@ class ViewBlockPreferences
      *     'position-2' => ['block-id-3'],
      * ]
      * @param array<string, string[]> $layoutData
-     * @param array<string, ViewBlockInterface[]> $validBlocksByPosition
+     * @param array<string, class-string<ViewBlockInterface>[]> $validBlocksByPosition
      * @throws BindingResolutionException
      */
     public function storeByIdPositionMap(
@@ -65,7 +65,7 @@ class ViewBlockPreferences
     }
 
     /**
-     * @param array<string, ViewBlockInterface[]> $blocksByPosition
+     * @param array<string, class-string<ViewBlockInterface>[]> $blocksByPosition
      * @return string[]
      */
     protected function extractValidBlockIds(array $blocksByPosition): array
@@ -74,7 +74,7 @@ class ViewBlockPreferences
 
         foreach ($blocksByPosition as $blocks) {
             foreach ($blocks as $block) {
-                $ids[] = $block->getId();
+                $ids[] = $block::getId();
             }
         }
 
diff --git a/app/View/ViewBlocks/BooksIndexActions.php b/app/View/ViewBlocks/BooksIndexActions.php
index 2d4f3df30..83327d63d 100644
--- a/app/View/ViewBlocks/BooksIndexActions.php
+++ b/app/View/ViewBlocks/BooksIndexActions.php
@@ -7,9 +7,9 @@ use Illuminate\Http\Request;
 
 class BooksIndexActions extends ViewBlock
 {
-    protected string $id = 'builtin_books-index-actions';
-    protected string $view = 'books.parts.index-sidebar-section-actions';
-    protected string $labelTranslationKey = 'common.actions';
+    protected static string $id = 'builtin_books-index-actions';
+    protected static string $view = 'books.parts.index-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/BooksIndexNew.php b/app/View/ViewBlocks/BooksIndexNew.php
index 620b650f9..daab45a46 100644
--- a/app/View/ViewBlocks/BooksIndexNew.php
+++ b/app/View/ViewBlocks/BooksIndexNew.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class BooksIndexNew extends ViewBlock
 {
-    protected string $id = 'builtin_books-index-new';
-    protected string $view = 'books.parts.index-sidebar-section-new';
-    protected string $labelTranslationKey = 'entities.books_new';
+    protected static string $id = 'builtin_books-index-new';
+    protected static string $view = 'books.parts.index-sidebar-section-new';
+    protected static string $labelTranslationKey = 'entities.books_new';
 
     public function __construct(
         protected BookQueries $queries,
diff --git a/app/View/ViewBlocks/BooksIndexPopular.php b/app/View/ViewBlocks/BooksIndexPopular.php
index a7b2241cb..bfaee41e8 100644
--- a/app/View/ViewBlocks/BooksIndexPopular.php
+++ b/app/View/ViewBlocks/BooksIndexPopular.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class BooksIndexPopular extends ViewBlock
 {
-    protected string $id = 'builtin_books-index-popular';
-    protected string $view = 'books.parts.index-sidebar-section-popular';
-    protected string $labelTranslationKey = 'entities.books_popular';
+    protected static string $id = 'builtin_books-index-popular';
+    protected static string $view = 'books.parts.index-sidebar-section-popular';
+    protected static string $labelTranslationKey = 'entities.books_popular';
 
     public function __construct(
         protected BookQueries $queries,
diff --git a/app/View/ViewBlocks/BooksIndexRecents.php b/app/View/ViewBlocks/BooksIndexRecents.php
index e4d76e23b..48abeb486 100644
--- a/app/View/ViewBlocks/BooksIndexRecents.php
+++ b/app/View/ViewBlocks/BooksIndexRecents.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class BooksIndexRecents extends ViewBlock
 {
-    protected string $id = 'builtin_books-index-recents';
-    protected string $view = 'books.parts.index-sidebar-section-recents';
-    protected string $labelTranslationKey = 'entities.recently_viewed';
+    protected static string $id = 'builtin_books-index-recents';
+    protected static string $view = 'books.parts.index-sidebar-section-recents';
+    protected static string $labelTranslationKey = 'entities.recently_viewed';
 
     public function __construct(
         protected BookQueries $queries,
diff --git a/app/View/ViewBlocks/BooksShowActions.php b/app/View/ViewBlocks/BooksShowActions.php
index 946805c63..c7312f285 100644
--- a/app/View/ViewBlocks/BooksShowActions.php
+++ b/app/View/ViewBlocks/BooksShowActions.php
@@ -9,9 +9,9 @@ use Illuminate\Http\Request;
 
 class BooksShowActions extends ViewBlock
 {
-    protected string $id = 'builtin_books-show-actions';
-    protected string $view = 'books.parts.show-sidebar-section-actions';
-    protected string $labelTranslationKey = 'common.actions';
+    protected static string $id = 'builtin_books-show-actions';
+    protected static string $view = 'books.parts.show-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/BooksShowActivity.php b/app/View/ViewBlocks/BooksShowActivity.php
index 7c723ffc0..14943bb8d 100644
--- a/app/View/ViewBlocks/BooksShowActivity.php
+++ b/app/View/ViewBlocks/BooksShowActivity.php
@@ -9,9 +9,9 @@ use Illuminate\Http\Request;
 
 class BooksShowActivity extends ViewBlock
 {
-    protected string $id = 'builtin_books-show-activity';
-    protected string $view = 'books.parts.show-sidebar-section-activity';
-    protected string $labelTranslationKey = 'entities.recent_activity';
+    protected static string $id = 'builtin_books-show-activity';
+    protected static string $view = 'books.parts.show-sidebar-section-activity';
+    protected static string $labelTranslationKey = 'entities.recent_activity';
 
     public function __construct(
         protected ActivityQueries $activityQueries,
diff --git a/app/View/ViewBlocks/BooksShowDetails.php b/app/View/ViewBlocks/BooksShowDetails.php
index 5c690d613..582aec8b9 100644
--- a/app/View/ViewBlocks/BooksShowDetails.php
+++ b/app/View/ViewBlocks/BooksShowDetails.php
@@ -10,9 +10,9 @@ use Illuminate\Http\Request;
 
 class BooksShowDetails extends ViewBlock
 {
-    protected string $id = 'builtin_books-show-details';
-    protected string $view = 'books.parts.show-sidebar-section-details';
-    protected string $labelTranslationKey = 'common.details';
+    protected static string $id = 'builtin_books-show-details';
+    protected static string $view = 'books.parts.show-sidebar-section-details';
+    protected static string $labelTranslationKey = 'common.details';
 
     public function __construct(
         protected ReferenceFetcher $referenceFetcher,
diff --git a/app/View/ViewBlocks/BooksShowSearchForm.php b/app/View/ViewBlocks/BooksShowSearchForm.php
index 17e770e17..2fe099047 100644
--- a/app/View/ViewBlocks/BooksShowSearchForm.php
+++ b/app/View/ViewBlocks/BooksShowSearchForm.php
@@ -7,9 +7,9 @@ use Illuminate\Http\Request;
 
 class BooksShowSearchForm extends ViewBlock
 {
-    protected string $id = 'builtin_books-show-search-form';
-    protected string $view = 'entities.search-form';
-    protected string $labelTranslationKey = 'common.search';
+    protected static string $id = 'builtin_books-show-search-form';
+    protected static string $view = 'entities.search-form';
+    protected static string $labelTranslationKey = 'common.search';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/BooksShowShelves.php b/app/View/ViewBlocks/BooksShowShelves.php
index 5a0424db5..590311c7f 100644
--- a/app/View/ViewBlocks/BooksShowShelves.php
+++ b/app/View/ViewBlocks/BooksShowShelves.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class BooksShowShelves extends ViewBlock
 {
-    protected string $id = 'builtin_books-show-shelves';
-    protected string $view = 'books.parts.show-sidebar-section-shelves';
-    protected string $labelTranslationKey = 'entities.shelves';
+    protected static string $id = 'builtin_books-show-shelves';
+    protected static string $view = 'books.parts.show-sidebar-section-shelves';
+    protected static string $labelTranslationKey = 'entities.shelves';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/BooksShowTags.php b/app/View/ViewBlocks/BooksShowTags.php
index 90de1e9c8..0448cd970 100644
--- a/app/View/ViewBlocks/BooksShowTags.php
+++ b/app/View/ViewBlocks/BooksShowTags.php
@@ -7,9 +7,9 @@ use Illuminate\Http\Request;
 
 class BooksShowTags extends ViewBlock
 {
-    protected string $id = 'builtin_books-show-tags';
-    protected string $view = 'books.parts.show-sidebar-section-tags';
-    protected string $labelTranslationKey = 'entities.tags';
+    protected static string $id = 'builtin_books-show-tags';
+    protected static string $view = 'books.parts.show-sidebar-section-tags';
+    protected static string $labelTranslationKey = 'entities.tags';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ChaptersShowActions.php b/app/View/ViewBlocks/ChaptersShowActions.php
index 1f06a89c5..1beb9c591 100644
--- a/app/View/ViewBlocks/ChaptersShowActions.php
+++ b/app/View/ViewBlocks/ChaptersShowActions.php
@@ -9,9 +9,9 @@ use Illuminate\Http\Request;
 
 class ChaptersShowActions extends ViewBlock
 {
-    protected string $id = 'builtin_chapters-show-actions';
-    protected string $view = 'chapters.parts.show-sidebar-section-actions';
-    protected string $labelTranslationKey = 'common.actions';
+    protected static string $id = 'builtin_chapters-show-actions';
+    protected static string $view = 'chapters.parts.show-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ChaptersShowBookTree.php b/app/View/ViewBlocks/ChaptersShowBookTree.php
index a0bec8c7b..03f36862d 100644
--- a/app/View/ViewBlocks/ChaptersShowBookTree.php
+++ b/app/View/ViewBlocks/ChaptersShowBookTree.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class ChaptersShowBookTree extends ViewBlock
 {
-    protected string $id = 'builtin_chapters-show-book-tree';
-    protected string $view = 'entities.book-tree';
-    protected string $labelTranslationKey = 'entities.books_navigation';
+    protected static string $id = 'builtin_chapters-show-book-tree';
+    protected static string $view = 'entities.book-tree';
+    protected static string $labelTranslationKey = 'entities.books_navigation';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ChaptersShowDetails.php b/app/View/ViewBlocks/ChaptersShowDetails.php
index a65d17e2f..700b848f4 100644
--- a/app/View/ViewBlocks/ChaptersShowDetails.php
+++ b/app/View/ViewBlocks/ChaptersShowDetails.php
@@ -11,9 +11,9 @@ use Illuminate\Http\Request;
 
 class ChaptersShowDetails extends ViewBlock
 {
-    protected string $id = 'builtin_chapters-show-details';
-    protected string $view = 'chapters.parts.show-sidebar-section-details';
-    protected string $labelTranslationKey = 'common.details';
+    protected static string $id = 'builtin_chapters-show-details';
+    protected static string $view = 'chapters.parts.show-sidebar-section-details';
+    protected static string $labelTranslationKey = 'common.details';
 
     public function __construct(
         protected ReferenceFetcher $referenceFetcher,
diff --git a/app/View/ViewBlocks/ChaptersShowSearchForm.php b/app/View/ViewBlocks/ChaptersShowSearchForm.php
index 9443994bb..0014e30ea 100644
--- a/app/View/ViewBlocks/ChaptersShowSearchForm.php
+++ b/app/View/ViewBlocks/ChaptersShowSearchForm.php
@@ -7,9 +7,9 @@ use Illuminate\Http\Request;
 
 class ChaptersShowSearchForm extends ViewBlock
 {
-    protected string $id = 'builtin_chapters-show-search-form';
-    protected string $view = 'entities.search-form';
-    protected string $labelTranslationKey = 'common.search';
+    protected static string $id = 'builtin_chapters-show-search-form';
+    protected static string $view = 'entities.search-form';
+    protected static string $labelTranslationKey = 'common.search';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ChaptersShowTags.php b/app/View/ViewBlocks/ChaptersShowTags.php
index fd42283cb..e513ee66b 100644
--- a/app/View/ViewBlocks/ChaptersShowTags.php
+++ b/app/View/ViewBlocks/ChaptersShowTags.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class ChaptersShowTags extends ViewBlock
 {
-    protected string $id = 'builtin_chapters-show-tags';
-    protected string $view = 'chapters.parts.show-sidebar-section-tags';
-    protected string $labelTranslationKey = 'entities.tags';
+    protected static string $id = 'builtin_chapters-show-tags';
+    protected static string $view = 'chapters.parts.show-sidebar-section-tags';
+    protected static string $labelTranslationKey = 'entities.tags';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/HomeActions.php b/app/View/ViewBlocks/HomeActions.php
index 94788c522..211a60df5 100644
--- a/app/View/ViewBlocks/HomeActions.php
+++ b/app/View/ViewBlocks/HomeActions.php
@@ -6,9 +6,9 @@ use BookStack\View\ViewBlock;
 
 class HomeActions extends ViewBlock
 {
-    protected string $id = 'builtin_home-actions';
-    protected string $view = 'home.parts.configured-section-actions';
-    protected string $labelTranslationKey = 'common.actions';
+    protected static string $id = 'builtin_home-actions';
+    protected static string $view = 'home.parts.configured-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/HomeRecentActivity.php b/app/View/ViewBlocks/HomeRecentActivity.php
index b5b252fbf..06869990f 100644
--- a/app/View/ViewBlocks/HomeRecentActivity.php
+++ b/app/View/ViewBlocks/HomeRecentActivity.php
@@ -13,12 +13,12 @@ class HomeRecentActivity implements ViewBlockInterface
     ) {
     }
 
-    public function getId(): string
+    public static function getId(): string
     {
         return 'builtin_home-recent-activity';
     }
 
-    public function getLabel(): string
+    public static function getLabel(): string
     {
         return trans('entities.recent_activity');
     }
diff --git a/app/View/ViewBlocks/HomeRecentDrafts.php b/app/View/ViewBlocks/HomeRecentDrafts.php
index 458353a57..dc8892513 100644
--- a/app/View/ViewBlocks/HomeRecentDrafts.php
+++ b/app/View/ViewBlocks/HomeRecentDrafts.php
@@ -12,12 +12,12 @@ class HomeRecentDrafts implements ViewBlockInterface
     ) {
     }
 
-    public function getId(): string
+    public static function getId(): string
     {
         return 'builtin_home-recent-drafts';
     }
 
-    public function getLabel(): string
+    public static function getLabel(): string
     {
         return trans('entities.my_recent_drafts');
     }
diff --git a/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php b/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
index 032ef6b46..99bec7928 100644
--- a/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
+++ b/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
@@ -13,12 +13,12 @@ class HomeRecentlyUpdatedPages implements ViewBlockInterface
     ) {
     }
 
-    public function getId(): string
+    public static function getId(): string
     {
         return 'builtin_home-recently-updated-pages';
     }
 
-    public function getLabel(): string
+    public static function getLabel(): string
     {
         return trans('entities.recently_updated_pages');
     }
diff --git a/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php b/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
index 2259b3513..64cb897ef 100644
--- a/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
+++ b/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
@@ -16,12 +16,12 @@ class HomeRecentlyViewedOrRecentBooks implements ViewBlockInterface
     ) {
     }
 
-    public function getId(): string
+    public static function getId(): string
     {
         return 'builtin_home-recently-viewed-or-recent-books';
     }
 
-    public function getLabel(): string
+    public static function getLabel(): string
     {
         $key = user()->isGuest() ? 'books_recent' : 'my_recently_viewed';
         return trans("entities.{$key}");
diff --git a/app/View/ViewBlocks/HomeTopFavourites.php b/app/View/ViewBlocks/HomeTopFavourites.php
index b1b929f03..28eeed15d 100644
--- a/app/View/ViewBlocks/HomeTopFavourites.php
+++ b/app/View/ViewBlocks/HomeTopFavourites.php
@@ -13,12 +13,12 @@ class HomeTopFavourites implements ViewBlockInterface
     ) {
     }
 
-    public function getId(): string
+    public static function getId(): string
     {
         return 'builtin_home-top-favourites';
     }
 
-    public function getLabel(): string
+    public static function getLabel(): string
     {
         return trans('entities.my_most_viewed_favourites');
     }
diff --git a/app/View/ViewBlocks/PagesShowActions.php b/app/View/ViewBlocks/PagesShowActions.php
index 62b814926..06a184fa3 100644
--- a/app/View/ViewBlocks/PagesShowActions.php
+++ b/app/View/ViewBlocks/PagesShowActions.php
@@ -9,9 +9,9 @@ use Illuminate\Http\Request;
 
 class PagesShowActions extends ViewBlock
 {
-    protected string $id = 'builtin_pages-show-actions';
-    protected string $view = 'pages.parts.show-sidebar-section-actions';
-    protected string $labelTranslationKey = 'common.actions';
+    protected static string $id = 'builtin_pages-show-actions';
+    protected static string $view = 'pages.parts.show-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/PagesShowAttachments.php b/app/View/ViewBlocks/PagesShowAttachments.php
index a50123c07..d29e9e9a6 100644
--- a/app/View/ViewBlocks/PagesShowAttachments.php
+++ b/app/View/ViewBlocks/PagesShowAttachments.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class PagesShowAttachments extends ViewBlock
 {
-    protected string $id = 'builtin_pages-show-attachments';
-    protected string $view = 'pages.parts.show-sidebar-section-attachments';
-    protected string $labelTranslationKey = 'entities.pages_attachments';
+    protected static string $id = 'builtin_pages-show-attachments';
+    protected static string $view = 'pages.parts.show-sidebar-section-attachments';
+    protected static string $labelTranslationKey = 'entities.pages_attachments';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/PagesShowBookTree.php b/app/View/ViewBlocks/PagesShowBookTree.php
index c09285c71..4f5b6af6c 100644
--- a/app/View/ViewBlocks/PagesShowBookTree.php
+++ b/app/View/ViewBlocks/PagesShowBookTree.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class PagesShowBookTree extends ViewBlock
 {
-    protected string $id = 'builtin_pages-show-book-tree';
-    protected string $view = 'entities.book-tree';
-    protected string $labelTranslationKey = 'entities.books_navigation';
+    protected static string $id = 'builtin_pages-show-book-tree';
+    protected static string $view = 'entities.book-tree';
+    protected static string $labelTranslationKey = 'entities.books_navigation';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/PagesShowDetails.php b/app/View/ViewBlocks/PagesShowDetails.php
index 098baac5f..6bbe9a8b2 100644
--- a/app/View/ViewBlocks/PagesShowDetails.php
+++ b/app/View/ViewBlocks/PagesShowDetails.php
@@ -11,9 +11,9 @@ use Illuminate\Http\Request;
 
 class PagesShowDetails extends ViewBlock
 {
-    protected string $id = 'builtin_pages-show-details';
-    protected string $view = 'pages.parts.show-sidebar-section-details';
-    protected string $labelTranslationKey = 'common.details';
+    protected static string $id = 'builtin_pages-show-details';
+    protected static string $view = 'pages.parts.show-sidebar-section-details';
+    protected static string $labelTranslationKey = 'common.details';
 
     public function __construct(
         protected ReferenceFetcher $referenceFetcher,
diff --git a/app/View/ViewBlocks/PagesShowPageNav.php b/app/View/ViewBlocks/PagesShowPageNav.php
index 952bc9b8c..2a013ec2f 100644
--- a/app/View/ViewBlocks/PagesShowPageNav.php
+++ b/app/View/ViewBlocks/PagesShowPageNav.php
@@ -9,9 +9,9 @@ use Illuminate\Http\Request;
 
 class PagesShowPageNav extends ViewBlock
 {
-    protected string $id = 'builtin_pages-show-page-nav';
-    protected string $view = 'pages.parts.show-sidebar-section-page-nav';
-    protected string $labelTranslationKey = 'entities.pages_navigation';
+    protected static string $id = 'builtin_pages-show-page-nav';
+    protected static string $view = 'pages.parts.show-sidebar-section-page-nav';
+    protected static string $labelTranslationKey = 'entities.pages_navigation';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/PagesShowTags.php b/app/View/ViewBlocks/PagesShowTags.php
index d8a9a8c7a..3edbb3288 100644
--- a/app/View/ViewBlocks/PagesShowTags.php
+++ b/app/View/ViewBlocks/PagesShowTags.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class PagesShowTags extends ViewBlock
 {
-    protected string $id = 'builtin_pages-show-tags';
-    protected string $view = 'pages.parts.show-sidebar-section-tags';
-    protected string $labelTranslationKey = 'entities.tags';
+    protected static string $id = 'builtin_pages-show-tags';
+    protected static string $view = 'pages.parts.show-sidebar-section-tags';
+    protected static string $labelTranslationKey = 'entities.tags';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ShelvesIndexActions.php b/app/View/ViewBlocks/ShelvesIndexActions.php
index 63c0ae344..8cd0f47d3 100644
--- a/app/View/ViewBlocks/ShelvesIndexActions.php
+++ b/app/View/ViewBlocks/ShelvesIndexActions.php
@@ -7,9 +7,9 @@ use Illuminate\Http\Request;
 
 class ShelvesIndexActions extends ViewBlock
 {
-    protected string $id = 'builtin_shelves-index-actions';
-    protected string $view = 'shelves.parts.index-sidebar-section-actions';
-    protected string $labelTranslationKey = 'common.actions';
+    protected static string $id = 'builtin_shelves-index-actions';
+    protected static string $view = 'shelves.parts.index-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ShelvesIndexNew.php b/app/View/ViewBlocks/ShelvesIndexNew.php
index 28d5771ff..21f21a4cf 100644
--- a/app/View/ViewBlocks/ShelvesIndexNew.php
+++ b/app/View/ViewBlocks/ShelvesIndexNew.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class ShelvesIndexNew extends ViewBlock
 {
-    protected string $id = 'builtin_shelves-index-new';
-    protected string $view = 'shelves.parts.index-sidebar-section-new';
-    protected string $labelTranslationKey = 'entities.shelves_new';
+    protected static string $id = 'builtin_shelves-index-new';
+    protected static string $view = 'shelves.parts.index-sidebar-section-new';
+    protected static string $labelTranslationKey = 'entities.shelves_new';
 
     public function __construct(
         protected BookshelfQueries $queries,
diff --git a/app/View/ViewBlocks/ShelvesIndexPopular.php b/app/View/ViewBlocks/ShelvesIndexPopular.php
index 454759815..df62f7c59 100644
--- a/app/View/ViewBlocks/ShelvesIndexPopular.php
+++ b/app/View/ViewBlocks/ShelvesIndexPopular.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class ShelvesIndexPopular extends ViewBlock
 {
-    protected string $id = 'builtin_shelves-index-popular';
-    protected string $view = 'shelves.parts.index-sidebar-section-popular';
-    protected string $labelTranslationKey = 'entities.shelves_popular';
+    protected static string $id = 'builtin_shelves-index-popular';
+    protected static string $view = 'shelves.parts.index-sidebar-section-popular';
+    protected static string $labelTranslationKey = 'entities.shelves_popular';
 
     public function __construct(
         protected BookshelfQueries $queries,
diff --git a/app/View/ViewBlocks/ShelvesIndexRecents.php b/app/View/ViewBlocks/ShelvesIndexRecents.php
index 8025bf3ea..5f42d395c 100644
--- a/app/View/ViewBlocks/ShelvesIndexRecents.php
+++ b/app/View/ViewBlocks/ShelvesIndexRecents.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class ShelvesIndexRecents extends ViewBlock
 {
-    protected string $id = 'builtin_shelves-index-recents';
-    protected string $view = 'shelves.parts.index-sidebar-section-recents';
-    protected string $labelTranslationKey = 'entities.recently_viewed';
+    protected static string $id = 'builtin_shelves-index-recents';
+    protected static string $view = 'shelves.parts.index-sidebar-section-recents';
+    protected static string $labelTranslationKey = 'entities.recently_viewed';
 
     public function __construct(
         protected BookshelfQueries $queries,
diff --git a/app/View/ViewBlocks/ShelvesShowActions.php b/app/View/ViewBlocks/ShelvesShowActions.php
index dd8a22bd0..08a3cdee1 100644
--- a/app/View/ViewBlocks/ShelvesShowActions.php
+++ b/app/View/ViewBlocks/ShelvesShowActions.php
@@ -8,9 +8,9 @@ use Illuminate\Http\Request;
 
 class ShelvesShowActions extends ViewBlock
 {
-    protected string $id = 'builtin_shelves-show-actions';
-    protected string $view = 'shelves.parts.show-sidebar-section-actions';
-    protected string $labelTranslationKey = 'common.actions';
+    protected static string $id = 'builtin_shelves-show-actions';
+    protected static string $view = 'shelves.parts.show-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
 
     public function withData(array $viewData): array
     {
diff --git a/app/View/ViewBlocks/ShelvesShowActivity.php b/app/View/ViewBlocks/ShelvesShowActivity.php
index 0d254bb3e..a14dbed5f 100644
--- a/app/View/ViewBlocks/ShelvesShowActivity.php
+++ b/app/View/ViewBlocks/ShelvesShowActivity.php
@@ -9,9 +9,9 @@ use Illuminate\Http\Request;
 
 class ShelvesShowActivity extends ViewBlock
 {
-    protected string $id = 'builtin_shelves-show-activity';
-    protected string $view = 'shelves.parts.show-sidebar-section-activity';
-    protected string $labelTranslationKey = 'entities.recent_activity';
+    protected static string $id = 'builtin_shelves-show-activity';
+    protected static string $view = 'shelves.parts.show-sidebar-section-activity';
+    protected static string $labelTranslationKey = 'entities.recent_activity';
 
     public function __construct(
         protected ActivityQueries $activityQueries,
diff --git a/app/View/ViewBlocks/ShelvesShowDetails.php b/app/View/ViewBlocks/ShelvesShowDetails.php
index 31d7c6b4b..1ceb21b6f 100644
--- a/app/View/ViewBlocks/ShelvesShowDetails.php
+++ b/app/View/ViewBlocks/ShelvesShowDetails.php
@@ -9,9 +9,9 @@ use Illuminate\Http\Request;
 
 class ShelvesShowDetails extends ViewBlock
 {
-    protected string $id = 'builtin_shelves-show-details';
-    protected string $view = 'shelves.parts.show-sidebar-section-details';
-    protected string $labelTranslationKey = 'common.details';
+    protected static string $id = 'builtin_shelves-show-details';
+    protected static string $view = 'shelves.parts.show-sidebar-section-details';
+    protected static string $labelTranslationKey = 'common.details';
 
     public function __construct(
         protected ReferenceFetcher $referenceFetcher,
diff --git a/app/View/ViewBlocks/ShelvesShowTags.php b/app/View/ViewBlocks/ShelvesShowTags.php
index 105e1c22b..37bc4b471 100644
--- a/app/View/ViewBlocks/ShelvesShowTags.php
+++ b/app/View/ViewBlocks/ShelvesShowTags.php
@@ -7,9 +7,9 @@ use Illuminate\Http\Request;
 
 class ShelvesShowTags extends ViewBlock
 {
-    protected string $id = 'builtin_shelves-show-tags';
-    protected string $view = 'shelves.parts.show-sidebar-section-tags';
-    protected string $labelTranslationKey = 'entities.tags';
+    protected static string $id = 'builtin_shelves-show-tags';
+    protected static string $view = 'shelves.parts.show-sidebar-section-tags';
+    protected static string $labelTranslationKey = 'entities.tags';
 
     public function withData(array $viewData): array
     {
diff --git a/resources/views/common/view-blocks.blade.php b/resources/views/common/view-blocks.blade.php
index 31d854286..7d26e38b4 100644
--- a/resources/views/common/view-blocks.blade.php
+++ b/resources/views/common/view-blocks.blade.php
@@ -5,6 +5,6 @@ $position - string
 @php
     $sectionVars = get_defined_vars();
 @endphp
-@foreach($viewBlocks->getForLocationAndPositionForCurrentUser($location, $position) as $section)
-    @include($section->getView($sectionVars), $section->withData($sectionVars))
+@foreach($viewBlocks->getInstancesForLocationAndPositionForCurrentUser($location, $position) as $block)
+    @include($block->getView($sectionVars), $block->withData($sectionVars))
 @endforeach
\ No newline at end of file
diff --git a/resources/views/settings/layouts/parts/block.blade.php b/resources/views/settings/layouts/parts/block.blade.php
index 398496ec0..9b36ee290 100644
--- a/resources/views/settings/layouts/parts/block.blade.php
+++ b/resources/views/settings/layouts/parts/block.blade.php
@@ -1,10 +1,8 @@
-{{--
-$block - ViewBlockInterface - View Block instance to show
---}}
-<li data-block-id="{{ $block->getId() }}"
+@php /** @var $block class-string<\BookStack\View\ViewBlockInterface> */ @endphp
+<li data-block-id="{{ $block::getId() }}"
     class="scroll-box-item items-center">
     <div class="handle px-s">@icon('grip')</div>
-    <div class="text-small">{{ $block->getLabel() }}</div>
+    <div class="text-small">{{ $block::getLabel() }}</div>
     <div class="buttons flex-container-row items-center ml-auto px-xxs py-xxs">
         <button type="button" data-action="move_left" class="icon-button p-xxs"
                 title="{{ trans('common.move_left') }}">@icon('chevron-left')</button>
diff --git a/tests/View/ViewBlockDefaultsTest.php b/tests/View/ViewBlockDefaultsTest.php
index a19ba3629..6b47bcea7 100644
--- a/tests/View/ViewBlockDefaultsTest.php
+++ b/tests/View/ViewBlockDefaultsTest.php
@@ -22,13 +22,11 @@ class ViewBlockDefaultsTest extends TestCase
 
         $blocks = array_unique($classes);
         foreach ($blocks as $block) {
-            $instance = app()->make($block);
-
-            $id = $instance->getId();
+            $id = $block::getId();
             $this->assertArrayNotHasKey($id, $trueById);
             $trueById[$id] = true;
 
-            $label = $instance->getLabel();
+            $label = $block::getLabel();
             $this->assertIsString($label);
             $this->assertDoesNotMatchRegularExpression('/^[a-z]{1,10}\./', $label);
         }

From 404e048588750f2f25d158ab50195088e167e42e Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 16 Aug 2026 14:12:30 +0100
Subject: [PATCH 23/72] Layouts: Added reset to default action, made views
 dynamic

Shows only one homepage option depending on app homepage setting.
Only shows center column in editor for supported locations.
---
 app/App/HomeController.php                    |  2 +-
 app/Config/setting-defaults.php               |  1 +
 app/Settings/SettingService.php               |  8 ++++
 app/View/LayoutController.php                 | 16 +++++++-
 app/View/ViewBlock.php                        |  2 +-
 app/View/ViewBlockDefaults.php                |  2 +-
 app/View/ViewBlockManager.php                 |  6 ++-
 app/View/ViewBlockPreferences.php             | 11 ++++-
 lang/en/preferences.php                       |  3 +-
 .../views/settings/layouts/edit.blade.php     | 12 +++++-
 routes/web.php                                |  1 +
 tests/View/LayoutEditTest.php                 | 40 +++++++++++++++++++
 12 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index bbff07902..d8193e234 100644
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@ -22,7 +22,7 @@ class HomeController extends Controller
     public function index(
         Request $request,
     ) {
-        $homepageType = setting('app-homepage-type', 'default');
+        $homepageType = setting('app-homepage-type');
         if (!in_array($homepageType, ['default', 'books', 'bookshelves', 'page'])) {
             $homepageType = 'default';
         }
diff --git a/app/Config/setting-defaults.php b/app/Config/setting-defaults.php
index 2f270b283..594254495 100644
--- a/app/Config/setting-defaults.php
+++ b/app/Config/setting-defaults.php
@@ -32,6 +32,7 @@ return [
     'page-draft-color-dark' => '#a66ce8',
     'app-custom-head'      => false,
     'registration-enabled' => false,
+    'app-homepage-type'    => 'default',
 
     // User-level default settings
     'user' => [
diff --git a/app/Settings/SettingService.php b/app/Settings/SettingService.php
index e0b136180..a86730c1b 100644
--- a/app/Settings/SettingService.php
+++ b/app/Settings/SettingService.php
@@ -264,6 +264,14 @@ class SettingService
         }
     }
 
+    /**
+     * Remove a user-specific setting from the database, for the current access user.
+     */
+    public function removeForCurrentUser(string $key): void
+    {
+        $this->remove($this->userKey(user()->id, $key));
+    }
+
     /**
      * Delete settings for a given user id.
      */
diff --git a/app/View/LayoutController.php b/app/View/LayoutController.php
index 1d3091dbd..ee59389ef 100644
--- a/app/View/LayoutController.php
+++ b/app/View/LayoutController.php
@@ -10,6 +10,7 @@ class LayoutController extends Controller
 {
     public function __construct(
         protected ViewBlockManager $viewBlocks,
+        protected ViewBlockPreferences $viewBlockPreferences,
     ) {
         $this->middleware(function (Request $request, Closure $next) {
             $this->preventGuestAccess();
@@ -37,7 +38,7 @@ class LayoutController extends Controller
     }
 
     /**
-     * Update the layout for a specific location.
+     * Update the layout for a specific location for the current user.
      */
     public function update(string $location, Request $request)
     {
@@ -52,4 +53,17 @@ class LayoutController extends Controller
 
         return redirect("/layouts/{$location}");
     }
+
+    /**
+     * Reset the layout for a specific location, for the current user,
+     * back to system defaults by removing any user-specific preferences.
+     */
+    public function reset(string $location)
+    {
+        $this->viewBlockPreferences->clearForLocation($location);
+
+        $this->showSuccessNotification(trans('preferences.layout_reset_success'));
+
+        return redirect("/layouts/{$location}");
+    }
 }
diff --git a/app/View/ViewBlock.php b/app/View/ViewBlock.php
index 8907174bc..f4ec62be4 100644
--- a/app/View/ViewBlock.php
+++ b/app/View/ViewBlock.php
@@ -29,6 +29,6 @@ abstract class ViewBlock implements ViewBlockInterface
      */
     public function getView(array $viewData): string
     {
-        return $this->view;
+        return static::$view;
     }
 }
diff --git a/app/View/ViewBlockDefaults.php b/app/View/ViewBlockDefaults.php
index efed833fd..d313a2cf2 100644
--- a/app/View/ViewBlockDefaults.php
+++ b/app/View/ViewBlockDefaults.php
@@ -121,7 +121,7 @@ class ViewBlockDefaults
     {
         return [
             'home-default' => trans('common.homepage'),
-            'home-non-default' => trans('preferences.layouts_home_non_default'),
+            'home-non-default' => trans('common.homepage'),
             'shelves-index' => trans('entities.shelves'),
             'shelves-show' => trans('entities.shelf'),
             'books-index' => trans('entities.books'),
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
index f87d57d4b..f7b187b38 100644
--- a/app/View/ViewBlockManager.php
+++ b/app/View/ViewBlockManager.php
@@ -118,7 +118,7 @@ class ViewBlockManager
 
         // Add remaining blocks based on their default locations
         foreach ($blocksById as $block) {
-            $position = $idPositionMap[$block->getId()] ?? 'unused';
+            $position = $idPositionMap[$block::getId()] ?? 'unused';
             $results[$position][] = $block;
         }
 
@@ -143,6 +143,10 @@ class ViewBlockManager
             $results[$location] = $labels[$location] ?? $location;
         }
 
+        $usingDefaultHome = setting('app-homepage-type') === 'default';
+        $toIgnore = $usingDefaultHome ? 'home-non-default' : 'home-default';
+        unset($results[$toIgnore]);
+
         return $results;
     }
 
diff --git a/app/View/ViewBlockPreferences.php b/app/View/ViewBlockPreferences.php
index 77703068a..7b94a0d7f 100644
--- a/app/View/ViewBlockPreferences.php
+++ b/app/View/ViewBlockPreferences.php
@@ -48,7 +48,16 @@ class ViewBlockPreferences
     }
 
     /**
-     * Get the layou data for a given location.
+     * Clear the view block preferences for a given location for the current user.
+     */
+    public function clearForLocation(string $location): void
+    {
+        $settingKey = $this->getSettingKey($location);
+        setting()->removeForCurrentUser($settingKey);
+    }
+
+    /**
+     * Get the layout data for a given location.
      * Provides arrays of block ids keyed by position.
      * @return array<string, string[]>
      */
diff --git a/lang/en/preferences.php b/lang/en/preferences.php
index 06dd351e4..0fa7a44c9 100644
--- a/lang/en/preferences.php
+++ b/lang/en/preferences.php
@@ -25,7 +25,6 @@ return [
     'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
     'layouts' => 'Customize UI Layout',
     'layouts_desc' => 'Customize the layout of sections shown in the user interface across various views.',
-    'layouts_home_non_default' => 'Homepage (non-default)',
     'layout_edit' => 'Edit Layout',
     'layout_edit_desc' => 'Drag and drop sections, or use the controls found on them, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
     'layout_edit_save' => 'Save Layout',
@@ -36,7 +35,9 @@ return [
     'layout_edit_center' => 'Center',
     'layout_edit_unused' => 'Unused',
     'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
     'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
 
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
diff --git a/resources/views/settings/layouts/edit.blade.php b/resources/views/settings/layouts/edit.blade.php
index e90c39ada..00bde0550 100644
--- a/resources/views/settings/layouts/edit.blade.php
+++ b/resources/views/settings/layouts/edit.blade.php
@@ -13,7 +13,7 @@
                 <h5>{{ trans('preferences.layout_edit_layouts') }}</h5>
                 <nav class="active-link-list in-sidebar">
                     @foreach($namedLocations as $locationOptKey => $locationOptName)
-                        <a href="{{ url('/layouts/' . $locationOptKey) }}" class="{{ $locationOptKey === $location ? 'active' : '' }}">@icon('layouts') {{ $locationOptName }}</a>
+                        <a href="{{ url('/layouts/' . $locationOptKey) }}" class="{{ $locationOptKey === $location ? 'active' : '' }}">{{ $locationOptName }}</a>
                     @endforeach
                 </nav>
             </div>
@@ -34,7 +34,9 @@
 
                         <div class="flex-container-row gap-m">
                             @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['left'] ?? [], 'label' => trans('preferences.layout_edit_left'), 'id' => 'left'])
-                            @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['center'] ?? [], 'label' => trans('preferences.layout_edit_center'), 'id' => 'center'])
+                            @if(isset($blocks['center']))
+                                @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['center'] ?? [], 'label' => trans('preferences.layout_edit_center'), 'id' => 'center'])
+                            @endif
                             @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['right'] ?? [], 'label' => trans('preferences.layout_edit_right'), 'id' => 'right'])
                         </div>
 
@@ -44,9 +46,15 @@
 
                         <div class="form-group text-right">
                             <a href="{{ url('/my-account/interface') }}" class="button outline">{{ trans('common.cancel') }}</a>
+                            <button type="submit" form="layout-reset-form" class="button outline">{{ trans('preferences.layout_edit_reset_to_defaults') }}</button>
                             <button type="submit" class="button">{{ trans('preferences.layout_edit_save') }}</button>
                         </div>
                     </form>
+
+                    <form id="layout-reset-form" action="{{ url('/layouts/' . $location . '/reset') }}" method="POST">
+                        {{ csrf_field() }}
+                        {{ method_field('PUT') }}
+                    </form>
                 </div>
             </div>
 
diff --git a/routes/web.php b/routes/web.php
index c6c3ed97e..74c7e6509 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -279,6 +279,7 @@ Route::middleware('auth')->group(function () {
     // Layout endpoints
     Route::get('/layouts/{location}', [LayoutController::class, 'edit']);
     Route::put('/layouts/{location}', [LayoutController::class, 'update']);
+    Route::put('/layouts/{location}/reset', [LayoutController::class, 'reset']);
 
     // User API Tokens
     Route::get('/api-tokens/{userId}/create', [UserApiTokenController::class, 'create']);
diff --git a/tests/View/LayoutEditTest.php b/tests/View/LayoutEditTest.php
index 4eb264707..ddc8d6bbb 100644
--- a/tests/View/LayoutEditTest.php
+++ b/tests/View/LayoutEditTest.php
@@ -44,6 +44,32 @@ class LayoutEditTest extends TestCase
         $html->assertElementCount('[data-column="right"] > li', 1);
     }
 
+    public function test_view_only_shows_center_column_for_relevant_layouts()
+    {
+        $resp = $this->asEditor()->get('/layouts/books-show');
+        $html = $this->withHtml($resp);
+        $html->assertElementCount('[data-column="center"]', 0);
+
+        $resp = $this->asEditor()->get('/layouts/home-default');
+        $html = $this->withHtml($resp);
+        $html->assertElementCount('[data-column="center"]', 1);
+    }
+
+    public function test_only_single_homepage_option_shows_depending_on_app_homepage_setting()
+    {
+        $resp = $this->asEditor()->get('/layouts/books-show');
+        $html = $this->withHtml($resp);
+        $html->assertLinkExists(url('/layouts/home-default'), 'Homepage');
+        $html->assertLinkNotExists(url('/layouts/home-non-default'), 'Homepage');
+
+        $this->setSettings(['app-homepage-type' => 'books']);
+
+        $resp = $this->asEditor()->get('/layouts/books-show');
+        $html = $this->withHtml($resp);
+        $html->assertLinkExists(url('/layouts/home-non-default'), 'Homepage');
+        $html->assertLinkNotExists(url('/layouts/home-default'), 'Homepage');
+    }
+
     public function test_update()
     {
         $layout = [
@@ -84,4 +110,18 @@ class LayoutEditTest extends TestCase
             ],
         ], $storedData);
     }
+
+    public function test_reset()
+    {
+        $this->asEditor();
+
+        $settingKey = 'view-layout#books-show';
+        setting()->putForCurrentUser($settingKey, json_encode(['left' => [], 'right' => [], 'unused' => ['builtin_books-show-activity']]));
+
+        $resp = $this->asEditor()->put('/layouts/books-show/reset');
+        $resp->assertRedirect('/layouts/books-show');
+        $this->assertSessionHas('success');
+
+        $this->assertFalse(setting()->getForCurrentUser($settingKey));
+    }
 }

From e16a4b2aafc45576900132212d14155621f30b3c Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 16 Aug 2026 18:34:56 +0100
Subject: [PATCH 24/72] Layouts: Moved editor controls into dropdown

Also added user advice on two-column layouts about how they stack on
mobile.
Changed how fixed dropdowns work, so they instead remain in place to
their events and dom handling does not need special handling.
Updated keyboard navigation so ignore elements which are hidden via CSS.
---
 lang/en/preferences.php                       |  1 +
 resources/js/components/dropdown.js           | 15 ++++------
 resources/js/components/layout-editor.ts      |  6 +++-
 resources/js/services/dom.ts                  |  2 +-
 resources/js/services/keyboard-navigation.ts  |  4 ++-
 .../pages/parts/editor-toolbar.blade.php      |  4 +--
 .../views/settings/layouts/edit.blade.php     | 10 +++++--
 .../settings/layouts/parts/block.blade.php    | 29 ++++++++++---------
 8 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/lang/en/preferences.php b/lang/en/preferences.php
index 0fa7a44c9..81b50eb56 100644
--- a/lang/en/preferences.php
+++ b/lang/en/preferences.php
@@ -27,6 +27,7 @@ return [
     'layouts_desc' => 'Customize the layout of sections shown in the user interface across various views.',
     'layout_edit' => 'Edit Layout',
     'layout_edit_desc' => 'Drag and drop sections, or use the controls found on them, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, the right column sections will be stacked on top of the left column sections.',
     'layout_edit_save' => 'Save Layout',
     'layout_edit_layouts' => 'Layouts',
     'layout_edit_back_to_preferences' => 'Back to Preferences',
diff --git a/resources/js/components/dropdown.js b/resources/js/components/dropdown.js
index d2b044ee1..4da08f231 100644
--- a/resources/js/components/dropdown.js
+++ b/resources/js/components/dropdown.js
@@ -12,7 +12,7 @@ export class Dropdown extends Component {
         this.container = this.$el;
         this.menu = this.$refs.menu;
         this.toggle = this.$refs.toggle;
-        this.moveMenu = this.$opts.moveMenu;
+        this.fixedPositionMenu = this.$opts.fixedPositionMenu === 'true';
         this.bubbleEscapes = this.$opts.bubbleEscapes === 'true';
 
         this.direction = (document.dir === 'rtl') ? 'right' : 'left';
@@ -33,13 +33,13 @@ export class Dropdown extends Component {
         const menuOriginalRect = this.menu.getBoundingClientRect();
         let heightOffset = 0;
         const toggleHeight = this.toggle.getBoundingClientRect().height;
-        const containerBounds = findClosestScrollContainer(this.menu).getBoundingClientRect();
+        const containerEl = this.fixedPositionMenu ? this.body : findClosestScrollContainer(this.menu);
+        const containerBounds = containerEl.getBoundingClientRect();
         const dropUpwards = menuOriginalRect.bottom > containerBounds.bottom;
         const containerRect = this.container.getBoundingClientRect();
 
         // If enabled, Move to body to prevent being trapped within scrollable sections
-        if (this.moveMenu) {
-            this.body.appendChild(this.menu);
+        if (this.fixedPositionMenu) {
             this.menu.style.position = 'fixed';
             this.menu.style.width = `${menuOriginalRect.width}px`;
             this.menu.style.left = `${menuOriginalRect.left}px`;
@@ -99,12 +99,11 @@ export class Dropdown extends Component {
         this.menu.style.bottom = '';
         this.menu.style.maxHeight = '';
 
-        if (this.moveMenu) {
+        if (this.fixedPositionMenu) {
             this.menu.style.position = '';
             this.menu.style[this.direction] = '';
             this.menu.style.width = '';
             this.menu.style.left = '';
-            this.container.appendChild(this.menu);
         }
 
         this.showing = false;
@@ -125,10 +124,6 @@ export class Dropdown extends Component {
             this.hide();
         });
 
-        if (this.moveMenu) {
-            keyboardNavHandler.shareHandlingToEl(this.menu);
-        }
-
         // Hide menu on option click
         this.container.addEventListener('click', event => {
             const possibleChildren = Array.from(this.menu.querySelectorAll('a'));
diff --git a/resources/js/components/layout-editor.ts b/resources/js/components/layout-editor.ts
index e24e53384..babacc276 100644
--- a/resources/js/components/layout-editor.ts
+++ b/resources/js/components/layout-editor.ts
@@ -6,10 +6,12 @@ import {buildListActions, sortActionClickListener} from "../services/multi-lists
 export class LayoutEditor extends Component {
     protected input!: HTMLInputElement;
     protected columns!: HTMLElement[];
+    protected actionMenus!: HTMLElement[];
 
     setup(): void {
         this.input = this.$refs.input as HTMLInputElement;
         this.columns = this.$manyRefs.column || [];
+        this.actionMenus = this.$manyRefs.actionMenu || [];
 
         this.initSortable();
 
@@ -20,7 +22,9 @@ export class LayoutEditor extends Component {
             unusedColumn.appendChild(item);
         };
         const sortActionListener = sortActionClickListener(listActions, this.onChange.bind(this));
-        this.$el.addEventListener('click', sortActionListener);
+        for (const actionMenu of this.actionMenus) {
+            actionMenu.addEventListener('click', sortActionListener);
+        }
     }
 
     protected initSortable(): void {
diff --git a/resources/js/services/dom.ts b/resources/js/services/dom.ts
index 8696fe816..16942d503 100644
--- a/resources/js/services/dom.ts
+++ b/resources/js/services/dom.ts
@@ -259,7 +259,7 @@ export function hashElement(element: HTMLElement): string {
 }
 
 /**
- * Find the closest scroll container parent for the given element
+ * Find the closest scroll container parent for the given element,
  * otherwise will default to the body element.
  */
 export function findClosestScrollContainer(start: HTMLElement): HTMLElement {
diff --git a/resources/js/services/keyboard-navigation.ts b/resources/js/services/keyboard-navigation.ts
index 13fbdfecc..70f99330d 100644
--- a/resources/js/services/keyboard-navigation.ts
+++ b/resources/js/services/keyboard-navigation.ts
@@ -87,7 +87,9 @@ export class KeyboardNavigationHandler {
         const focusable: HTMLElement[] = [];
         const selector = '[tabindex]:not([tabindex="-1"]),[href],button:not([tabindex="-1"],[disabled]),input:not([type=hidden])';
         for (const container of this.containers) {
-            const toAdd = [...container.querySelectorAll(selector)].filter(e => isHTMLElement(e));
+            const toAdd = [...container.querySelectorAll(selector)].filter(e => {
+                return isHTMLElement(e) && e.checkVisibility();
+            }) as HTMLElement[];
             focusable.push(...toAdd);
         }
 
diff --git a/resources/views/pages/parts/editor-toolbar.blade.php b/resources/views/pages/parts/editor-toolbar.blade.php
index a3ea58374..8d39f7d5d 100644
--- a/resources/views/pages/parts/editor-toolbar.blade.php
+++ b/resources/views/pages/parts/editor-toolbar.blade.php
@@ -9,7 +9,7 @@
 
     <div class="text-center">
         <div component="dropdown"
-             option:dropdown:move-menu="true"
+             option:dropdown:fixed-position-menu="true"
              class="dropdown-container  draft-display text {{ $draftsEnabled ? '' : 'hidden' }}">
             <div class="flex-container-row items-center justify-center">
                 <button type="button"
@@ -97,7 +97,7 @@
 
     <div class="flex-container-row justify-flex-end gap-x-m items-center">
         <div component="dropdown"
-             option:dropdown:move-menu="true"
+             option:dropdown:fixed-position-menu="true"
              class="dropdown-container">
             <button refs="dropdown@toggle" type="button" aria-haspopup="true" aria-expanded="false" class="icon-list-item text-link">
                 <span>@icon('edit')</span>
diff --git a/resources/views/settings/layouts/edit.blade.php b/resources/views/settings/layouts/edit.blade.php
index 00bde0550..7864132cc 100644
--- a/resources/views/settings/layouts/edit.blade.php
+++ b/resources/views/settings/layouts/edit.blade.php
@@ -24,7 +24,13 @@
                         <h1 class="list-heading">{{ trans('preferences.layout_edit') }}</h1>
                         <span class="text-muted text-bigger">{{ $locationName }}</span>
                     </div>
+
                     <p class="small text-muted">{{ trans('preferences.layout_edit_desc') }}</p>
+                    @if(!isset($blocks['center']))
+                        <p class="small text-muted">
+                            {{ trans('preferences.layout_edit_column_hint') }}
+                        </p>
+                    @endif
 
                     <form component="layout-editor" action="{{ url('layouts/' . $location) }}" method="POST">
                         {{ method_field('PUT') }}
@@ -32,7 +38,7 @@
 
                         <input refs="layout-editor@input" type="hidden" name="layout" value="">
 
-                        <div class="flex-container-row gap-m">
+                        <div class="flex-container-row gap-m mb-m">
                             @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['left'] ?? [], 'label' => trans('preferences.layout_edit_left'), 'id' => 'left'])
                             @if(isset($blocks['center']))
                                 @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['center'] ?? [], 'label' => trans('preferences.layout_edit_center'), 'id' => 'center'])
@@ -40,7 +46,7 @@
                             @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['right'] ?? [], 'label' => trans('preferences.layout_edit_right'), 'id' => 'right'])
                         </div>
 
-                        <div>
+                        <div class="mb-l">
                             @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['unused'] ?? [], 'label' => trans('preferences.layout_edit_unused'), 'id' => 'unused'])
                         </div>
 
diff --git a/resources/views/settings/layouts/parts/block.blade.php b/resources/views/settings/layouts/parts/block.blade.php
index 9b36ee290..1885c4254 100644
--- a/resources/views/settings/layouts/parts/block.blade.php
+++ b/resources/views/settings/layouts/parts/block.blade.php
@@ -3,18 +3,21 @@
     class="scroll-box-item items-center">
     <div class="handle px-s">@icon('grip')</div>
     <div class="text-small">{{ $block::getLabel() }}</div>
-    <div class="buttons flex-container-row items-center ml-auto px-xxs py-xxs">
-        <button type="button" data-action="move_left" class="icon-button p-xxs"
-                title="{{ trans('common.move_left') }}">@icon('chevron-left')</button>
-        <button type="button" data-action="move_up" class="icon-button p-xxs"
-                title="{{ trans('entities.books_sort_move_up') }}">@icon('chevron-up')</button>
-        <button type="button" data-action="move_down" class="icon-button p-xxs"
-                title="{{ trans('entities.books_sort_move_down') }}">@icon('chevron-down')</button>
-        <button type="button" data-action="move_right" class="icon-button p-xxs"
-                title="{{ trans('common.move_right') }}">@icon('chevron-right')</button>
-        <button type="button" data-action="add" class="icon-button p-xxs"
-                title="{{ trans('common.add') }}">@icon('add-small')</button>
-        <button type="button" data-action="remove" class="icon-button p-xxs"
-                title="{{ trans('common.remove') }}">@icon('remove')</button>
+    <div component="dropdown"
+         option:dropdown:fixed-position-menu="true"
+         class="dropdown-container ml-auto">
+        <button type="button"
+                refs="dropdown@toggle"
+                aria-haspopup="menu"
+                aria-expanded="false"
+                class="icon-button p-xxs">@icon('more')</button>
+        <ul refs="dropdown@menu layout-editor@action-menu" role="menu" aria-label="{{ trans('common.actions') }}" class="dropdown-menu">
+            <li><button type="button" data-action="move_left" class="icon-item">@icon('chevron-left') {{ trans('common.move_left') }}</button></li>
+            <li><button type="button" data-action="move_up" class="icon-item">@icon('chevron-up') {{ trans('entities.books_sort_move_up') }}</button></li>
+            <li><button type="button" data-action="move_down" class="icon-item">@icon('chevron-down') {{ trans('entities.books_sort_move_down') }}</button></li>
+            <li><button type="button" data-action="move_right" class="icon-item">@icon('chevron-right') {{ trans('common.move_right') }}</button></li>
+            <li><button type="button" data-action="add" class="icon-item">@icon('add-small') {{ trans('common.add') }}</button></li>
+            <li><button type="button" data-action="remove" class="icon-item">@icon('remove') {{ trans('common.remove') }}</button></li>
+        </ul>
     </div>
 </li>
\ No newline at end of file

From 8760481fc27f41d822709caeda0ad2041135893c Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 16 Aug 2026 23:03:40 +0100
Subject: [PATCH 25/72] Layouts: Added testing for access control, and view
 impact

Added a new middlware to properly handle per-request in-memory caching
within the app.
---
 .../Providers/ViewTweaksServiceProvider.php   |  5 ++
 app/Http/Kernel.php                           |  1 +
 app/Http/Middleware/ClearPerRequestCaches.php | 30 ++++++++++++
 app/View/ViewBlockManager.php                 | 14 +++++-
 tests/View/LayoutEditTest.php                 | 49 +++++++++++++++++++
 5 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 app/Http/Middleware/ClearPerRequestCaches.php

diff --git a/app/App/Providers/ViewTweaksServiceProvider.php b/app/App/Providers/ViewTweaksServiceProvider.php
index 0c68aa1c0..3f23ad16c 100644
--- a/app/App/Providers/ViewTweaksServiceProvider.php
+++ b/app/App/Providers/ViewTweaksServiceProvider.php
@@ -5,6 +5,7 @@ namespace BookStack\App\Providers;
 use BookStack\Entities\BreadcrumbsViewComposer;
 use BookStack\Util\DateFormatter;
 use BookStack\View\ViewBlockManager;
+use BookStack\View\ViewBlockPreferences;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\View;
@@ -19,6 +20,10 @@ class ViewTweaksServiceProvider extends ServiceProvider
                 $app['config']->get('app.display_timezone'),
             );
         });
+
+        $this->app->singleton(ViewBlockManager::class, function ($app) {
+            return new ViewBlockManager(new ViewBlockPreferences());
+        });
     }
 
     /**
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 00bf8cbe1..e7497e743 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -36,6 +36,7 @@ class Kernel extends HttpKernel
             \BookStack\Http\Middleware\CheckEmailConfirmed::class,
             \BookStack\Http\Middleware\RunThemeActions::class,
             \BookStack\Http\Middleware\Localization::class,
+            \BookStack\Http\Middleware\ClearPerRequestCaches::class,
         ],
         'api' => [
             \BookStack\Http\Middleware\ThrottleApiRequests::class,
diff --git a/app/Http/Middleware/ClearPerRequestCaches.php b/app/Http/Middleware/ClearPerRequestCaches.php
new file mode 100644
index 000000000..831d1740d
--- /dev/null
+++ b/app/Http/Middleware/ClearPerRequestCaches.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace BookStack\Http\Middleware;
+
+use BookStack\View\ViewBlockManager;
+use Closure;
+use Illuminate\Http\Request;
+
+/**
+ * Custom middleware to clear any local caches in the app which are created on a
+ * per-request basis. While this can be somewhat redundant in the normal PHP request
+ * lifecycle (since in memory caches are cleared on each request), this can be useful
+ * in testing and to prepare for future long-serving PHP runtimes.
+ */
+class ClearPerRequestCaches
+{
+    public function __construct(
+        protected ViewBlockManager $viewBlockManager,
+    ) {
+    }
+
+    public function handle(Request $request, Closure $next)
+    {
+        $response = $next($request);
+
+        $this->viewBlockManager->clearLocalCache();
+
+        return $response;
+    }
+}
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
index f7b187b38..fb1fd43cc 100644
--- a/app/View/ViewBlockManager.php
+++ b/app/View/ViewBlockManager.php
@@ -17,7 +17,7 @@ class ViewBlockManager
     protected array $blocksByLocationAndPosition = [];
 
     /**
-     * @var array<string, array<string, ViewBlockInterface[]>
+     * @var array<string, array<string, class-string<ViewBlockInterface>[]>>
      */
     protected array $locationBlockCache = [];
 
@@ -46,7 +46,7 @@ class ViewBlockManager
      */
     public function getInstancesForLocationAndPositionForCurrentUser(string $location, string $position): array
     {
-        $key = user()->id . ':' . $location;
+        $key = $location;
         if (isset($this->locationBlockCache[$key])) {
             $blocks = $this->locationBlockCache[$key][$position] ?? [];
             return $this->blocksToInstances($blocks);
@@ -165,6 +165,16 @@ class ViewBlockManager
         );
     }
 
+    /**
+     * Clear the local user-specific cache of blocks.
+     * The cache only needs to exist for the current request time since its purpose is to
+     * avoid duplicate loading across views.
+     */
+    public function clearLocalCache(): void
+    {
+        $this->locationBlockCache = [];
+    }
+
     /**
      * Convert a blocksByPosition array into a map of block IDs to blocks.
      * @param array<string, class-string<ViewBlockInterface>[]> $blocksByPosition
diff --git a/tests/View/LayoutEditTest.php b/tests/View/LayoutEditTest.php
index ddc8d6bbb..6c8eb162e 100644
--- a/tests/View/LayoutEditTest.php
+++ b/tests/View/LayoutEditTest.php
@@ -2,10 +2,20 @@
 
 namespace Tests\View;
 
+use BookStack\Activity\Models\Favourite;
 use Tests\TestCase;
 
 class LayoutEditTest extends TestCase
 {
+    public function test_route_access_limited_to_logged_in_users()
+    {
+        $this->setSettings(['app-public' => 'true']);
+
+        $this->get('/layouts/books-show')->assertRedirect('/');
+        $this->put('/layouts/books-show')->assertRedirect('/');
+        $this->put('/layouts/books-show/reset')->assertRedirect('/');
+    }
+
     public function test_view()
     {
         $resp = $this->asEditor()->get('/layouts/books-index');
@@ -111,6 +121,45 @@ class LayoutEditTest extends TestCase
         ], $storedData);
     }
 
+    public function test_layout_changes_take_effect()
+    {
+        $editor = $this->users->editor();
+        $this->actingAs($editor);
+        $page = $this->entities->page();
+        $page->favourites()->save((new Favourite())->forceFill(['user_id' => $editor->id]));
+        $this->get($page->getUrl());
+
+        $html = $this->withHtml($this->get('/'));
+
+        $html->assertElementExists('.grid.third > div:nth-child(1) h3:contains("My Recently Viewed")');
+        $html->assertElementExists('.grid.third > div:nth-child(2) h3:contains("My Most Viewed Favourites")');
+        $html->assertElementExists('.grid.third > div:nth-child(2) h3:contains("Recently Updated Pages")');
+        $html->assertElementExists('.grid.third > div:nth-child(3) h3:contains("Recent Activity")');
+
+        $layout = [
+            'left' => [
+                'builtin_home-top-favourites',
+            ],
+            'center' => [
+                'builtin_home-recent-activity',
+            ],
+            'right' => [
+                'builtin_home-recently-viewed-or-recent-books',
+            ],
+            'unused' => [
+                'builtin_home-recently-updated-pages',
+            ],
+        ];
+
+        $this->put('/layouts/home-default', ['layout' => json_encode($layout)])->assertRedirect('/layouts/home-default');
+        $html = $this->withHtml($this->get('/'));
+
+        $html->assertElementExists('.grid.third > div:nth-child(3) h3:contains("My Recently Viewed")');
+        $html->assertElementExists('.grid.third > div:nth-child(1) h3:contains("My Most Viewed Favourites")');
+        $html->assertElementNotExists('h3:contains("Recently Updated Pages")');
+        $html->assertElementExists('.grid.third > div:nth-child(2) h3:contains("Recent Activity")');
+    }
+
     public function test_reset()
     {
         $this->asEditor();

From 2c300d8f156a7f1d3c41fdb4a2702ddb89ec95d3 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 17 Aug 2026 11:52:22 +0100
Subject: [PATCH 26/72] Layouts: Checked text, mobile view and dark mode use

---
 lang/en/preferences.php                                | 10 +++++-----
 resources/views/settings/layouts/edit.blade.php        |  2 +-
 .../settings/layouts/parts/block-column.blade.php      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lang/en/preferences.php b/lang/en/preferences.php
index 81b50eb56..1b874efa2 100644
--- a/lang/en/preferences.php
+++ b/lang/en/preferences.php
@@ -20,14 +20,14 @@ return [
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
     'interface' => 'Interface Preferences',
-    'interface_desc' => 'Customize various user interface elements you see across the application.',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
     'interface_display_mode' => 'Display Mode',
     'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
-    'layouts' => 'Customize UI Layout',
-    'layouts_desc' => 'Customize the layout of sections shown in the user interface across various views.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
     'layout_edit' => 'Edit Layout',
-    'layout_edit_desc' => 'Drag and drop sections, or use the controls found on them, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
-    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, the right column sections will be stacked on top of the left column sections.',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
     'layout_edit_save' => 'Save Layout',
     'layout_edit_layouts' => 'Layouts',
     'layout_edit_back_to_preferences' => 'Back to Preferences',
diff --git a/resources/views/settings/layouts/edit.blade.php b/resources/views/settings/layouts/edit.blade.php
index 7864132cc..007eca666 100644
--- a/resources/views/settings/layouts/edit.blade.php
+++ b/resources/views/settings/layouts/edit.blade.php
@@ -38,7 +38,7 @@
 
                         <input refs="layout-editor@input" type="hidden" name="layout" value="">
 
-                        <div class="flex-container-row gap-m mb-m">
+                        <div class="flex-container-row gap-m mb-m wrap">
                             @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['left'] ?? [], 'label' => trans('preferences.layout_edit_left'), 'id' => 'left'])
                             @if(isset($blocks['center']))
                                 @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['center'] ?? [], 'label' => trans('preferences.layout_edit_center'), 'id' => 'center'])
diff --git a/resources/views/settings/layouts/parts/block-column.blade.php b/resources/views/settings/layouts/parts/block-column.blade.php
index b9ad5ea8f..20da8dff7 100644
--- a/resources/views/settings/layouts/parts/block-column.blade.php
+++ b/resources/views/settings/layouts/parts/block-column.blade.php
@@ -3,7 +3,7 @@ $columnBlocks - array - Blocks to list
 $label - string - Section title
 $id - string - identifier for location/column
 --}}
-<div class="form-group flex">
+<div class="form-group flex min-width-m">
     <label id="layout-blocks-{{ $id }}">{{ $label }}</label>
     <ul refs="layout-editor@column"
         data-column="{{ $id }}"

From db50b140005f142848dde0a407d178e3aec5b2cc Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 17 Aug 2026 18:27:47 +0100
Subject: [PATCH 27/72] Layouts: Added logical theme event and guidance for
 block registration

---
 .../Providers/ViewTweaksServiceProvider.php   |   6 +-
 app/Theming/ThemeEvents.php                   |   9 ++
 app/View/ViewBlockManager.php                 |  12 +-
 dev/docs/logical-theme-system.md              | 103 +++++++++++++++++-
 tests/Theme/LogicalThemeEventsTest.php        |  43 ++++++++
 5 files changed, 167 insertions(+), 6 deletions(-)

diff --git a/app/App/Providers/ViewTweaksServiceProvider.php b/app/App/Providers/ViewTweaksServiceProvider.php
index 3f23ad16c..ae41c1d95 100644
--- a/app/App/Providers/ViewTweaksServiceProvider.php
+++ b/app/App/Providers/ViewTweaksServiceProvider.php
@@ -3,6 +3,8 @@
 namespace BookStack\App\Providers;
 
 use BookStack\Entities\BreadcrumbsViewComposer;
+use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
 use BookStack\Util\DateFormatter;
 use BookStack\View\ViewBlockManager;
 use BookStack\View\ViewBlockPreferences;
@@ -38,8 +40,10 @@ class ViewTweaksServiceProvider extends ServiceProvider
         View::composer('entities.breadcrumbs', BreadcrumbsViewComposer::class);
 
         // View Globals
+        $viewBlockManager = $this->app->make(ViewBlockManager::class);
         View::share('dates', $this->app->make(DateFormatter::class));
-        View::share('viewBlocks', $this->app->make(ViewBlockManager::class));
+        View::share('viewBlocks', $viewBlockManager);
+        Theme::dispatch(ThemeEvents::VIEW_BLOCKS_REGISTER, $viewBlockManager);
 
         // Custom blade view directives
         Blade::directive('icon', function ($expression) {
diff --git a/app/Theming/ThemeEvents.php b/app/Theming/ThemeEvents.php
index 511a9c1de..46fa7c2c0 100644
--- a/app/Theming/ThemeEvents.php
+++ b/app/Theming/ThemeEvents.php
@@ -180,6 +180,15 @@ class ThemeEvents
      */
     const THEME_REGISTER_VIEWS = 'theme_register_views';
 
+    /**
+     * View blocks register event.
+     * Runs once a ViewBlockManager instance is available so that custom blocks can be registered
+     * for use within user-configurable layouts in the system.
+     *
+     * @param \BookStack\View\ViewBlockManager $manager
+     */
+    const VIEW_BLOCKS_REGISTER = 'view_blocks_register';
+
     /**
      * Web before middleware action.
      * Runs before the request is handled but after all other middleware apart from those
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
index fb1fd43cc..94753ae83 100644
--- a/app/View/ViewBlockManager.php
+++ b/app/View/ViewBlockManager.php
@@ -25,17 +25,21 @@ class ViewBlockManager
      * Register a block type to be displayed at the given location and position.
      * @param class-string<ViewBlockInterface> $blockClass
      */
-    public function register(string $location, string $position, string $blockClass): void
+    public function register(string $location, string $defaultPosition, string $blockClass): void
     {
         if (!isset($this->blocksByLocationAndPosition[$location])) {
             $this->blocksByLocationAndPosition[$location] = [];
         }
 
-        if (!isset($this->blocksByLocationAndPosition[$location][$position])) {
-            $this->blocksByLocationAndPosition[$location][$position] = [];
+        if (!isset($this->blocksByLocationAndPosition[$location][$defaultPosition])) {
+            $this->blocksByLocationAndPosition[$location][$defaultPosition] = [];
         }
 
-        $this->blocksByLocationAndPosition[$location][$position][] = $blockClass;
+        if (!is_a($blockClass, ViewBlockInterface::class, true)) {
+            throw new \InvalidArgumentException('When registering a view block, the block class must implement ViewBlockInterface');
+        }
+
+        $this->blocksByLocationAndPosition[$location][$defaultPosition][] = $blockClass;
     }
 
     /**
diff --git a/dev/docs/logical-theme-system.md b/dev/docs/logical-theme-system.md
index b6342ce54..7093bc00b 100644
--- a/dev/docs/logical-theme-system.md
+++ b/dev/docs/logical-theme-system.md
@@ -193,4 +193,105 @@ Theme::addSocialDriver('reddit', [
     $driver->with(['prompt' => 'select_account']);
     $driver->scopes(['open_id']);
 });
-```
\ No newline at end of file
+```
+
+## Custom View Layout Block Example
+
+By listening to the `ThemeEvents::VIEW_BLOCKS_REGISTER` event, it's possible to register
+custom view blocks which can be shown in a layout in the application. View blocks are typically the sections shown in the sidebar,
+or the cards shown on the home view.
+
+As an example of using this system, we'll define a custom view block which will show on the default home view to state how many
+books there are in the system.
+To start, we'll need to create a custom class to represent our view block. This must implement `\BookStack\View\ViewBlockInterface`:
+
+```php
+use BookStack\Entities\Queries\BookQueries;
+use BookStack\View\ViewBlockInterface;
+use BookStack\View\ViewBlockManager;
+
+class BookTotalBlock implements ViewBlockInterface {
+
+    public function __construct(
+        protected BookQueries $bookQueries
+    ) {
+    }
+
+    public static function getId(): string
+    {
+        return 'custom_book_total_block';
+    }
+
+    public static function getLabel(): string
+    {
+        return 'Total books displays';
+    }
+
+    public function getView(array $viewData): string
+    {
+        return 'blocks.total-blocks';
+    }
+
+    public function withData(array $viewData): array
+    {
+        $totalBooks = $this->bookQueries->visibleForList()->count();
+        return [
+            'totalBooks' => $totalBooks,
+        ];
+    }
+}
+```
+
+The interface has a few required methods:
+
+- The `getId` method must provide a unique per-block-type string ID.
+- The `getLabel` method must provide a general string label for the block.
+- The `getView` method provides a string path to a view file (Can be one custom registered).
+  - This is provided the available view data at time of render, so it can be dynamic based on context. 
+- The `withData` method is called when block is being rendered, and it should return an array of data which will be merged with existing view data.
+  - This is also provided available view data, for use as context.
+
+In this example, we're also making use of the `BookQueries` internal BookStack class.
+You're able to inject any other dependent classes/services via the constructor like this, and BookStack will attempt to auto-resolve them.  
+
+We can then register this block class using the logical theme system like so:
+
+```php
+use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
+use BookStack\View\ViewBlockManager;
+
+Theme::listen(ThemeEvents::VIEW_BLOCKS_REGISTER, function (ViewBlockManager $manager) {
+    $manager->register(
+        'home-default',       // The location/layout where this block will be displayed
+        'right',              // The default position for the block within the location
+        BookTotalBlock::class // The block class to register
+    );
+});
+```
+
+The above registration code would typically be within your `functions.php` theme file.
+You could also define the above block class in the same file or separate it into its own file
+and include it from the `functions.php` via a `require_once()` call.
+
+Lastly, we'll need to create the view for the registered block.
+In our example we return `blocks.total-blocks` from the `getView` method, so our view needs to be located at
+`blocks/total-blocks.blade.php` from a view providing directory. 
+In a theme folder, we can just create it at `blocks/total-blocks.blade.php` within the folder path.
+If we were building in a module, we'd need to create this at `views/blocks/total-blocks.blade.php` within our module folder.
+For our example, we'll use this content to make use of the data we're passing to the view:
+
+```html
+<div class="card mb-xl">
+  <h3 class="card-title">Total Books</h3>
+  <div class="px-m pb-xs">
+    <p>
+      There are currently {{ $totalBooks }} books in the system!
+    </p>
+  </div>
+</div>
+```
+
+This will then show up on the default home grid view, in the right column.
+The exact position within that location may change depending on user preferences, but the block will be limited
+to the location provided during registration unless it has also been registered for other locations.
diff --git a/tests/Theme/LogicalThemeEventsTest.php b/tests/Theme/LogicalThemeEventsTest.php
index 2add83868..28f21f209 100644
--- a/tests/Theme/LogicalThemeEventsTest.php
+++ b/tests/Theme/LogicalThemeEventsTest.php
@@ -394,4 +394,47 @@ CONTENT;
 
         $this->artisan('view:clear');
     }
+
+    public function test_view_blocks_register_event()
+    {
+        $this->usingThemeFolder(function (string $folder) {
+            $functionsContent = <<<'CONTENT'
+<?php
+use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
+use BookStack\View\ViewBlockManager;
+class CustomViewBlock implements \BookStack\View\ViewBlockInterface {
+    public static function getId(): string
+    {
+        return 'custom_view';
+    }
+    public static function getLabel(): string
+    {
+        return 'My custom view block';
+    }
+    public function getView(array $viewData): string
+    {
+        return 'custom-block';
+    }
+    public function withData(array $viewData): array
+    {
+        return [];
+    }
+}
+Theme::listen(ThemeEvents::VIEW_BLOCKS_REGISTER, function (ViewBlockManager $manager) {
+    $manager->register('home-default', 'right', CustomViewBlock::class);
+});
+CONTENT;
+
+            $viewDir = theme_path();
+            file_put_contents($viewDir . '/functions.php', $functionsContent);
+            file_put_contents($viewDir . '/custom-block.blade.php', '<h2>Hello there from my custom home block!</h2>');
+
+            $this->refreshApplication();
+            $resp = $this->asEditor()->get('/');
+            $html = $this->withHtml($resp);
+
+            $html->assertElementContains('.grid > div:nth-child(3) h2', 'Hello there from my custom home block!');
+        });
+    }
 }

From 63082b53cc58b0a4cc96ad30bad55607d9d9a3ba Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 17 Aug 2026 19:53:58 +0100
Subject: [PATCH 28/72] Layouts: Review and testing/CI update

---
 app/Http/Middleware/ClearPerRequestCaches.php |  9 +++++---
 app/View/LayoutController.php                 |  4 +++-
 app/View/ViewBlockManager.php                 |  9 ++++----
 app/View/ViewBlockPreferences.php             |  7 +++++--
 app/View/ViewBlocks/ShelvesShowTags.php       |  2 +-
 tests/User/UserMyAccountTest.php              |  2 +-
 tests/View/LayoutEditTest.php                 | 21 +++++++++++++++++++
 7 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/app/Http/Middleware/ClearPerRequestCaches.php b/app/Http/Middleware/ClearPerRequestCaches.php
index 831d1740d..5210062e7 100644
--- a/app/Http/Middleware/ClearPerRequestCaches.php
+++ b/app/Http/Middleware/ClearPerRequestCaches.php
@@ -21,10 +21,13 @@ class ClearPerRequestCaches
 
     public function handle(Request $request, Closure $next)
     {
-        $response = $next($request);
+        $this->clearCaches();
 
+        return $next($request);
+    }
+
+    protected function clearCaches(): void
+    {
         $this->viewBlockManager->clearLocalCache();
-
-        return $response;
     }
 }
diff --git a/app/View/LayoutController.php b/app/View/LayoutController.php
index ee59389ef..ff6a6f030 100644
--- a/app/View/LayoutController.php
+++ b/app/View/LayoutController.php
@@ -47,7 +47,9 @@ class LayoutController extends Controller
         ]);
 
         $layoutData = json_decode($data['layout'], true, 5);
-        $this->viewBlocks->updatePreferencesFromIdPositionMap($location, $layoutData);
+        if (is_array($layoutData)) {
+            $this->viewBlocks->updatePreferencesFromIdPositionMap($location, $layoutData);
+        }
 
         $this->showSuccessNotification(trans('preferences.layout_update_success'));
 
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
index 94753ae83..e18b68715 100644
--- a/app/View/ViewBlockManager.php
+++ b/app/View/ViewBlockManager.php
@@ -35,6 +35,7 @@ class ViewBlockManager
             $this->blocksByLocationAndPosition[$location][$defaultPosition] = [];
         }
 
+        // @phpstan-ignore-next-line
         if (!is_a($blockClass, ViewBlockInterface::class, true)) {
             throw new \InvalidArgumentException('When registering a view block, the block class must implement ViewBlockInterface');
         }
@@ -81,7 +82,7 @@ class ViewBlockManager
      */
     protected function getForLocation(string $location): array
     {
-        $defaults = ViewBlockDefaults::getForLocation($location) ?? [];
+        $defaults = ViewBlockDefaults::getForLocation($location);
         $registered = $this->blocksByLocationAndPosition[$location] ?? [];
         return array_merge_recursive($defaults, $registered);
     }
@@ -90,7 +91,7 @@ class ViewBlockManager
      * Get all blocks registered for a given location, as sets of arrays
      * keyed by position, for the current user.
      * Same as above but with user-specific preferences applied.
-     * @return array<string, class-string<ViewBlockInterface>[]>
+     * @return array<string, list<class-string<ViewBlockInterface>>>
      * @throws BindingResolutionException
      */
     public function getForLocationForCurrentUser(string $location): array
@@ -113,7 +114,7 @@ class ViewBlockManager
             $results[$position] = [];
             foreach ($userBlockIds as $blockId) {
                 $block = $blocksById[$blockId] ?? null;
-                if ($block && isset($blocksById[$blockId])) {
+                if ($block) {
                     $results[$position][] = $block;
                     unset($blocksById[$blockId]);
                 }
@@ -182,7 +183,7 @@ class ViewBlockManager
     /**
      * Convert a blocksByPosition array into a map of block IDs to blocks.
      * @param array<string, class-string<ViewBlockInterface>[]> $blocksByPosition
-     * @return array<string, ViewBlockInterface>
+     * @return array<string, class-string<ViewBlockInterface>>
      */
     protected function blocksByPositionToIdMap(array $blocksByPosition): array
     {
diff --git a/app/View/ViewBlockPreferences.php b/app/View/ViewBlockPreferences.php
index 7b94a0d7f..247c3b16c 100644
--- a/app/View/ViewBlockPreferences.php
+++ b/app/View/ViewBlockPreferences.php
@@ -36,11 +36,14 @@ class ViewBlockPreferences
         $validatedLayoutData = [];
 
         foreach ($layoutData as $position => $blockIds) {
-            if (!in_array($position, $validPositions)) {
+            // @phpstan-ignore-next-line
+            if (!in_array($position, $validPositions) || !is_array($blockIds)) {
                 continue;
             }
 
-            $validatedLayoutData[$position] = array_intersect($blockIds, $validIds);
+            $validatedLayoutData[$position] = array_filter($blockIds, function ($id) use ($validIds) {
+                return is_string($id) && in_array($id, $validIds);
+            });
         }
 
         $settingKey = $this->getSettingKey($location);
diff --git a/app/View/ViewBlocks/ShelvesShowTags.php b/app/View/ViewBlocks/ShelvesShowTags.php
index 37bc4b471..b7af4a738 100644
--- a/app/View/ViewBlocks/ShelvesShowTags.php
+++ b/app/View/ViewBlocks/ShelvesShowTags.php
@@ -14,7 +14,7 @@ class ShelvesShowTags extends ViewBlock
     public function withData(array $viewData): array
     {
         return [
-            'book' => $viewData['book'],
+            'shelf' => $viewData['shelf'],
         ];
     }
 }
diff --git a/tests/User/UserMyAccountTest.php b/tests/User/UserMyAccountTest.php
index 1b03c84bd..3766f8b69 100644
--- a/tests/User/UserMyAccountTest.php
+++ b/tests/User/UserMyAccountTest.php
@@ -357,7 +357,7 @@ class UserMyAccountTest extends TestCase
         $resp->assertOk();
 
         $resp->assertSeeText('Preferred Language');
-        $resp->assertSeeText('Customize UI Layout');
+        $resp->assertSeeText('UI Layout Preferences');
 
         $resp = $this->put('/my-account/interface', ['language' => 'fr', 'display_mode' => 'dark']);
         $resp->assertRedirect('/my-account/interface');
diff --git a/tests/View/LayoutEditTest.php b/tests/View/LayoutEditTest.php
index 6c8eb162e..7a31e0e68 100644
--- a/tests/View/LayoutEditTest.php
+++ b/tests/View/LayoutEditTest.php
@@ -121,6 +121,27 @@ class LayoutEditTest extends TestCase
         ], $storedData);
     }
 
+    public function test_malformed_update()
+    {
+        $layout = [
+            'left' => 'a',
+            'right' => ['builtin_books-show-activity', 5],
+        ];
+
+        $resp = $this->asEditor()->put('/layouts/books-show', ['layout' => json_encode($layout)]);
+        $resp->assertRedirect('/layouts/books-show');
+
+        $userPreferenceString = setting()->getForCurrentUser('view-layout#books-show');
+        $this->assertJson($userPreferenceString);
+        $storedData = json_decode($userPreferenceString, true);
+
+        $this->assertEquals([
+            'right' => [
+                'builtin_books-show-activity',
+            ],
+        ], $storedData);
+    }
+
     public function test_layout_changes_take_effect()
     {
         $editor = $this->users->editor();

From a889c18c02312f5055f62c7caeefab1ada5446cd Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 19 Aug 2026 12:17:58 +0100
Subject: [PATCH 29/72] Attachment API: Fixed missing check on attachment page
 change

On the change of an attachment uploaded_to (page) this ensures that a
PageUpdate permission check is made against the original attachment
page, in addition to the new page.

Thanks to Wade Sparks / ByteMe.Red for reporting.
---
 .../Controllers/AttachmentApiController.php   | 17 +++++++-----
 tests/Api/AttachmentsApiTest.php              | 26 +++++++++++++++++++
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/app/Uploads/Controllers/AttachmentApiController.php b/app/Uploads/Controllers/AttachmentApiController.php
index 2448b79b5..f540833f0 100644
--- a/app/Uploads/Controllers/AttachmentApiController.php
+++ b/app/Uploads/Controllers/AttachmentApiController.php
@@ -24,7 +24,7 @@ class AttachmentApiController extends ApiController
 
     /**
      * Get a listing of attachments visible to the user.
-     * The external property indicates whether the attachment is simple a link.
+     * The external property indicates whether the attachment is simply a link.
      * A false value for the external property would indicate a file upload.
      */
     public function list()
@@ -39,7 +39,7 @@ class AttachmentApiController extends ApiController
      * An uploaded_to value must be provided containing an ID of the page
      * that this upload will be related to.
      *
-     * If you're uploading a file the POST data should be provided via
+     * If you're uploading a file, the POST data should be provided via
      * a multipart/form-data type request instead of JSON.
      *
      * @throws ValidationException
@@ -71,7 +71,7 @@ class AttachmentApiController extends ApiController
     }
 
     /**
-     * Get the details & content of a single attachment of the given ID.
+     * Get the details and content of a single attachment of the given ID.
      * The attachment link or file content is provided via a 'content' property.
      * For files the content will be base64 encoded.
      *
@@ -120,7 +120,7 @@ class AttachmentApiController extends ApiController
 
     /**
      * Update the details of a single attachment.
-     * As per the create endpoint, if a file is being provided as the attachment content
+     * As per the create endpoint, if a file is being provided as the attachment content,
      * the request should be formatted as a multipart/form-data request instead of JSON.
      *
      * @throws ValidationException
@@ -134,9 +134,12 @@ class AttachmentApiController extends ApiController
 
         $page = $attachment->page;
         if ($requestData['uploaded_to'] ?? false) {
-            $pageId = $request->input('uploaded_to');
-            $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
-            $attachment->uploaded_to = $requestData['uploaded_to'];
+            $pageId = intval($requestData['uploaded_to']);
+            if ($pageId !== $page->id) {
+                $this->checkOwnablePermission(Permission::PageUpdate, $page);
+                $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
+                $attachment->uploaded_to = $pageId;
+            }
         }
 
         $this->checkOwnablePermission(Permission::PageView, $page);
diff --git a/tests/Api/AttachmentsApiTest.php b/tests/Api/AttachmentsApiTest.php
index b23465879..3c927c22b 100644
--- a/tests/Api/AttachmentsApiTest.php
+++ b/tests/Api/AttachmentsApiTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Api;
 
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Attachment;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Testing\AssertableJsonString;
@@ -345,6 +346,31 @@ class AttachmentsApiTest extends TestCase
         $this->assertEquals('', $attachment->extension);
     }
 
+    public function test_update_uploaded_to_change_requires_edit_permission_to_old_page()
+    {
+        $editor = $this->users->editor();
+        $this->actingAsForApi($editor);
+
+        $originalPage = $this->entities->page();
+        $attachment = $this->createAttachmentForPage($originalPage);
+        $newPage = $this->entities->page();
+
+        $details = [
+            'name' => 'My updated API attachment',
+            'uploaded_to' => $newPage->id,
+        ];
+
+        $this->permissions->setEntityPermissions($originalPage, ['view'], [$editor->roles->first()]);
+        $this->permissions->grantUserRolePermissions($editor, [Permission::AttachmentUpdateAll]);
+
+        $resp = $this->putJson("{$this->baseEndpoint}/{$attachment->id}", $details);
+        $attachment->refresh();
+
+        $this->assertPermissionError($resp);
+        $this->assertNotEquals($newPage->id, $attachment->uploaded_to);
+        $this->assertEquals($originalPage->id, $attachment->uploaded_to);
+    }
+
     public function test_delete_endpoint()
     {
         $this->actingAsApiAdmin();

From fbe83a189502d12c6967fc966baf48808e367f24 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 19 Aug 2026 16:53:47 +0100
Subject: [PATCH 30/72] Drawings: Validated drawing upload content as image
 data

Specifically check the mime type of Base64 drawing data to ensure
that it reads as image data rather than anything else which could be
potentially dangerous.

Thanks to Emanuele Cervelli (https://github.com/M4nu02) for reporting.
---
 app/Exceptions/Handler.php                    | 10 ----
 app/Uploads/Base64UriMimeRule.php             | 47 +++++++++++++++++++
 .../Controllers/DrawioImageController.php     |  3 +-
 lang/en/validation.php                        |  1 +
 resources/js/services/events.ts               |  6 ++-
 resources/js/services/http.ts                 | 11 ++---
 tests/Uploads/DrawioTest.php                  | 17 +++++++
 7 files changed, 76 insertions(+), 19 deletions(-)
 create mode 100644 app/Uploads/Base64UriMimeRule.php

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index a7f23e5f4..eec50afb1 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -169,14 +169,4 @@ class Handler extends ExceptionHandler
 
         return redirect()->guest('login');
     }
-
-    /**
-     * Convert a validation exception into a JSON response.
-     *
-     * @param Request $request
-     */
-    protected function invalidJson($request, ValidationException $exception): JsonResponse
-    {
-        return response()->json($exception->errors(), $exception->status);
-    }
 }
diff --git a/app/Uploads/Base64UriMimeRule.php b/app/Uploads/Base64UriMimeRule.php
new file mode 100644
index 000000000..d49e6c1e0
--- /dev/null
+++ b/app/Uploads/Base64UriMimeRule.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace BookStack\Uploads;
+
+use BookStack\Util\WebSafeMimeSniffer;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Translation\PotentiallyTranslatedString;
+use InvalidArgumentException;
+
+class Base64UriMimeRule implements ValidationRule
+{
+    public function __construct(
+        protected string $requiredMime
+    ) {
+        if (empty($requiredMime)) {
+            throw new InvalidArgumentException('A required mime type must be provided');
+        }
+    }
+
+    /**
+     * Run the validation rule.
+     *
+     * @param  Closure(string, ?string=): PotentiallyTranslatedString  $fail
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        $imageDataEncoded = explode(',', $value, 2)[1] ?? '';
+        if (empty($imageDataEncoded)) {
+            $fail('validation.base64_uri_mime')->translate(['mime' => $this->requiredMime]);
+            return;
+        }
+
+        $imageData = base64_decode($imageDataEncoded);
+        if (empty($imageData)) {
+            $fail('validation.base64_uri_mime')->translate(['mime' => $this->requiredMime]);
+            return;
+        }
+
+        $sniffer = new WebSafeMimeSniffer();
+        $mime = $sniffer->sniff($imageData);
+
+        if ($mime !== $this->requiredMime) {
+            $fail('validation.base64_uri_mime')->translate(['mime' => $this->requiredMime]);
+        }
+    }
+}
diff --git a/app/Uploads/Controllers/DrawioImageController.php b/app/Uploads/Controllers/DrawioImageController.php
index 53ae79004..3c2d9aa58 100644
--- a/app/Uploads/Controllers/DrawioImageController.php
+++ b/app/Uploads/Controllers/DrawioImageController.php
@@ -6,6 +6,7 @@ use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
+use BookStack\Uploads\Base64UriMimeRule;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageResizer;
 use BookStack\Util\OutOfMemoryHandler;
@@ -57,7 +58,7 @@ class DrawioImageController extends Controller
     {
         $this->checkPermission(Permission::ImageCreateAll);
         $validated = $this->validate($request, [
-            'image'       => ['required', 'string'],
+            'image'       => ['required', 'string', new Base64UriMimeRule('image/png')],
             'uploaded_to' => ['required', 'integer'],
         ]);
 
diff --git a/lang/en/validation.php b/lang/en/validation.php
index ff028525d..532d861d2 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -16,6 +16,7 @@ return [
     'alpha_num'            => 'The :attribute may only contain letters and numbers.',
     'array'                => 'The :attribute must be an array.',
     'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'The :attribute must be a date before :date.',
     'between'              => [
         'numeric' => 'The :attribute must be between :min and :max.',
diff --git a/resources/js/services/events.ts b/resources/js/services/events.ts
index 6045d51f8..1b39e413f 100644
--- a/resources/js/services/events.ts
+++ b/resources/js/services/events.ts
@@ -67,8 +67,10 @@ export class EventManager {
      * Notify of standard server-provided validation errors.
      */
     showValidationErrors(responseErr: HttpError): void {
-        if (responseErr.status === 422 && responseErr.data) {
-            const message = Object.values(responseErr.data).flat().join('\n');
+        if (responseErr.status === 422 && responseErr.data instanceof Object) {
+            const data = responseErr.data;
+            const errorValues = Object.values(data.errors ?? data);
+            const message = errorValues.flat().join('\n');
             this.error(message);
         }
     }
diff --git a/resources/js/services/http.ts b/resources/js/services/http.ts
index f9eaafc39..e8787ad8d 100644
--- a/resources/js/services/http.ts
+++ b/resources/js/services/http.ts
@@ -192,9 +192,8 @@ export class HttpManager {
     }
 
     /**
-     * Parse the response text for an error response to a user
-     * presentable string. Handles a range of errors responses including
-     * validation responses & server response text.
+     * Parse the response text for an error response to a user-presentable string.
+     * Handles a range of error responses, including validation responses and server response text.
      */
     protected formatErrorResponseText(text: string): string {
         const data = text.startsWith('{') ? JSON.parse(text) : {message: text};
@@ -206,13 +205,13 @@ export class HttpManager {
             return data.message || data.error;
         }
 
-        const values = Object.values(data);
-        const isValidation = values.every(val => {
+        const errorValues = Object.values(data.errors || {});
+        const isValidation = errorValues.length > 0 && errorValues.every(val => {
             return Array.isArray(val) && val.every(x => typeof x === 'string');
         });
 
         if (isValidation) {
-            return values.flat().join(' ');
+            return errorValues.flat().join(' ');
         }
 
         return text;
diff --git a/tests/Uploads/DrawioTest.php b/tests/Uploads/DrawioTest.php
index faa2a0bfb..d455d5334 100644
--- a/tests/Uploads/DrawioTest.php
+++ b/tests/Uploads/DrawioTest.php
@@ -96,6 +96,23 @@ class DrawioTest extends TestCase
         $upload()->assertStatus(200);
     }
 
+    public function test_drawing_base64_upload_validates_data_as_image()
+    {
+        $page = $this->entities->page();
+        $editor = $this->users->editor();
+        $this->actingAs($editor);
+
+        $upload = $this->postJson('images/drawio', [
+            'uploaded_to' => $page->id,
+            'image'       => 'image/png;base64,' . base64_encode('i like turtles'),
+        ]);
+
+        $upload->assertStatus(422);
+        $upload->assertJsonValidationErrors([
+            'image' => 'The image must be a valid base64 URI containing data of image/png mime type.',
+        ]);
+    }
+
     public function test_drawio_url_can_be_configured()
     {
         config()->set('services.drawio', 'http://cats.com?dog=tree');

From ac0348a79f3ddd004ca87703948cb9c7d19a420a Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 19 Aug 2026 17:36:52 +0100
Subject: [PATCH 31/72] Images: Added content checking and app range support to
 streaming

Mainly to prevent non-image files being streamed in scenarios where the
underlying image data is somehow a non-image.

Thanks to Emanuele Cervelli (https://github.com/M4nu02) for reporting.
---
 app/Uploads/ImageService.php      | 15 ++++++++++++++-
 app/Uploads/ImageStorageDisk.php  |  8 ++++++++
 tests/Api/ImageGalleryApiTest.php | 16 ++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index ed640913e..655e47784 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -4,6 +4,8 @@ namespace BookStack\Uploads;
 
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\ImageUploadException;
+use BookStack\Exceptions\PrettyException;
+use BookStack\Http\DownloadResponseFactory;
 use Exception;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -368,7 +370,18 @@ class ImageService
     {
         $disk = $this->storage->getDisk($imageType);
 
-        return $disk->response($path);
+        $stream = $disk->stream($path);
+        $fileSize = $disk->size($path);
+        $imageName = basename($path);
+        $downloadResponseFactory = new DownloadResponseFactory(request());
+        $response = $downloadResponseFactory->streamedInline($stream, $imageName, $fileSize);
+
+        $contentType = $response->headers->get('Content-Type');
+        if (!str_starts_with($contentType, 'image/')) {
+            throw new PrettyException('Invalid non-image file type when streaming from storage', 415);
+        }
+
+        return $response;
     }
 
     /**
diff --git a/app/Uploads/ImageStorageDisk.php b/app/Uploads/ImageStorageDisk.php
index 36d6721de..ad314c5c8 100644
--- a/app/Uploads/ImageStorageDisk.php
+++ b/app/Uploads/ImageStorageDisk.php
@@ -68,6 +68,14 @@ class ImageStorageDisk
         return $this->filesystem->readStream($this->adjustPathForDisk($path));
     }
 
+    /**
+     * Get the size of the file at the given path.
+     */
+    public function size(string $path): int
+    {
+        return $this->filesystem->size($this->adjustPathForDisk($path));
+    }
+
     /**
      * Save the given image data at the given path. Can choose to set
      * the image as public which will update its visibility after saving.
diff --git a/tests/Api/ImageGalleryApiTest.php b/tests/Api/ImageGalleryApiTest.php
index 8944dcffd..624d5b9e9 100644
--- a/tests/Api/ImageGalleryApiTest.php
+++ b/tests/Api/ImageGalleryApiTest.php
@@ -333,6 +333,22 @@ class ImageGalleryApiTest extends TestCase
         $resp->assertStatus(404);
     }
 
+    public function test_read_data_endpoint_does_not_serve_non_image_files()
+    {
+        $this->actingAsApiAdmin();
+        $imagePage = $this->entities->page();
+        $data = $this->files->uploadGalleryImageToPage($this, $imagePage, 'test-image.png');
+
+        $image = Image::findOrFail($data['response']->id);
+        $storagePath = public_path($image->path);
+        file_put_contents($storagePath, '<html><body><p>This is totally not an image file!</p></body></html>');
+
+        $resp = $this->get("{$this->baseEndpoint}/{$image->id}/data");
+        $resp->assertStatus(415);
+
+        $resp->assertJson($this->errorResponse('Invalid non-image file type when streaming from storage.', 415));
+    }
+
     public function test_read_url_data_endpoint()
     {
         $this->actingAsApiAdmin();

From e3068369a29339054881a0ea1ddadd50c8a98eba Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Thu, 20 Aug 2026 09:55:50 +0100
Subject: [PATCH 32/72] Pages: Prevent update of non-draft pages via draft
 publish

To prevent the ability to use the draft publish endpoint on non-draft
pages which the user may not have the ability to update by default.

Thanks to SVO for reporting.
---
 app/Entities/Repos/PageRepo.php |  4 ++++
 tests/Entity/PageDraftTest.php  | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 375bf1d2b..4dfca90a7 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -82,6 +82,10 @@ class PageRepo
      */
     public function publishDraft(Page $draft, array $input): Page
     {
+        if (!$draft->draft || $draft->created_by !== user()->id) {
+            throw new PermissionsException('This page is already published or does not belong to you.');
+        }
+
         return (new DatabaseTransaction(function () use ($draft, $input) {
             $draft->draft = false;
             $draft->revision_count = 1;
diff --git a/tests/Entity/PageDraftTest.php b/tests/Entity/PageDraftTest.php
index 8a30a9750..ff2ba01e1 100644
--- a/tests/Entity/PageDraftTest.php
+++ b/tests/Entity/PageDraftTest.php
@@ -5,6 +5,7 @@ namespace Tests\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\PageRevision;
 use BookStack\Entities\Repos\PageRepo;
+use BookStack\Exceptions\PermissionsException;
 use Tests\TestCase;
 
 class PageDraftTest extends TestCase
@@ -243,4 +244,23 @@ class PageDraftTest extends TestCase
             'slug'  => 'my-page',
         ]);
     }
+
+    public function test_draft_published_can_only_be_used_on_draft_pages()
+    {
+        $page = $this->entities->page();
+        $this->withoutExceptionHandling();
+
+        $exception = null;
+        try {
+            $this->asEditor()->post($page->book->getUrl("/draft/{$page->id}"), ['name' => 'My published drafty']);
+        } catch (\Exception $e) {
+            $exception = $e;
+        }
+
+        $this->assertInstanceOf(PermissionsException::class, $exception);
+        $this->assertStringContainsString('This page is already published or does not belong to you', $exception->getMessage());
+
+        $page->refresh();
+        $this->assertNotEquals('My published drafty', $page->name);
+    }
 }

From b1991143b09e6c265b50ccc7d60c935ef7ae316b Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Fri, 21 Aug 2026 12:07:25 +0100
Subject: [PATCH 33/72] Search: Added draft filtering to generic entity list
 query

The lack of the filter could result in draft pages, from other users,
showing in locations like search results.

Thanks to Ahmed Ibrahim (github.com/skeletonsec) for reporting.
---
 app/Entities/Models/EntityTable.php    |  3 +++
 app/Entities/Queries/EntityQueries.php |  7 +++++++
 tests/Search/EntitySearchTest.php      | 13 +++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/app/Entities/Models/EntityTable.php b/app/Entities/Models/EntityTable.php
index 5780162d1..ed5cdf889 100644
--- a/app/Entities/Models/EntityTable.php
+++ b/app/Entities/Models/EntityTable.php
@@ -25,6 +25,9 @@ class EntityTable extends Model
 
     /**
      * Get the entities that are visible to the current user.
+     * Note: This only applies basic permission filtering which considers the core entity table.
+     * This will not filter on information from other tables such as page draft status.
+     * That should be done after applying this scope.
      */
     public function scopeVisible(Builder $query): Builder
     {
diff --git a/app/Entities/Queries/EntityQueries.php b/app/Entities/Queries/EntityQueries.php
index 3ffa0adf3..ab7f975ae 100644
--- a/app/Entities/Queries/EntityQueries.php
+++ b/app/Entities/Queries/EntityQueries.php
@@ -81,6 +81,13 @@ class EntityQueries
             })->leftJoin('entity_page_data', function (JoinClause $join) {
                 $join->on('entity_page_data.page_id', '=', 'entities.id')
                     ->where('entities.type', '=', 'page');
+            })->where(function ($query) {
+                $query->whereNull('entity_page_data.draft')
+                    ->orWhere('entity_page_data.draft', '=', 0)
+                    ->orWhere(function ($query) {
+                        $query->where('entity_page_data.draft', '=', 1)
+                            ->where('entities.owned_by', '=', user()->id);
+                    });
             });
     }
 
diff --git a/tests/Search/EntitySearchTest.php b/tests/Search/EntitySearchTest.php
index d29c44eda..7d497b51d 100644
--- a/tests/Search/EntitySearchTest.php
+++ b/tests/Search/EntitySearchTest.php
@@ -4,6 +4,7 @@ namespace Tests\Search;
 
 use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Page;
 use Tests\TestCase;
 
 class EntitySearchTest extends TestCase
@@ -498,4 +499,16 @@ class EntitySearchTest extends TestCase
         $this->withHtml($resp)->assertElementCount('a', 0);
         $resp->assertSee('No items available');
     }
+
+    public function test_draft_pages_not_visible_to_others_in_results()
+    {
+        $editor = $this->users->editor();
+        $creator = $this->users->newUser();
+        $creator->roles()->sync([$editor->roles()->first()->id]);
+        $this->actingAs($creator);
+        $page = $this->entities->newDraftPage(['name' => 'Editors draft page', 'html' => '<p>My supercool draft page</p>']);
+
+        $resp = $this->actingAs($editor)->get('/search?term=' . urlencode("{type:page} {created_by:{$creator->slug}}"));
+        $resp->assertDontSee('Editors draft page');
+    }
 }

From e210cc32e4cbb1efeae5c5c9d0fef8e3c6a752e6 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 22 Aug 2026 18:24:40 +0100
Subject: [PATCH 34/72] ZIP Imports: Prevented non-image creation via book
 cover

- Updates ZIP imports to validate that actual mime type of book cover
  images to ensure they are a supported image file.
- Updates lower level ImageStorage to validate extensions of images when
  cleaning their name pre-storage.
- Updates ZIP import Image and Book handling so book cover and image
  files have their extension forced from file mime types in the same
  way.

Added testing to cover.

Thanks to the submersion.ai security research team for reporting.
---
 .../ZipExports/Models/ZipExportBook.php       |  2 +-
 .../ZipExports/Models/ZipExportImage.php      |  3 +--
 app/Exports/ZipExports/ZipExportFiles.php     |  2 +-
 app/Exports/ZipExports/ZipImportRunner.php    | 26 ++++++++++---------
 .../ZipExports/ZipValidationHelper.php        |  6 +++++
 app/Uploads/ImageService.php                  | 13 +++++++---
 app/Uploads/ImageStorage.php                  |  6 +++++
 tests/Api/BooksApiTest.php                    |  2 +-
 tests/Api/ShelvesApiTest.php                  |  2 +-
 tests/Exports/ZipExportValidatorTest.php      | 20 ++++++++++++--
 tests/Exports/ZipImportRunnerTest.php         | 23 ++++++++++++++++
 11 files changed, 82 insertions(+), 23 deletions(-)

diff --git a/app/Exports/ZipExports/Models/ZipExportBook.php b/app/Exports/ZipExports/Models/ZipExportBook.php
index ab3fd90ec..006a6b2d2 100644
--- a/app/Exports/ZipExports/Models/ZipExportBook.php
+++ b/app/Exports/ZipExports/Models/ZipExportBook.php
@@ -87,7 +87,7 @@ final class ZipExportBook extends ZipExportModel
             'id'    => ['nullable', 'int', $context->uniqueIdRule('book')],
             'name'  => ['required', 'string', 'min:1'],
             'description_html' => ['nullable', 'string'],
-            'cover' => ['nullable', 'string', $context->fileReferenceRule()],
+            'cover' => ['nullable', 'string', $context->imageFileReferenceRule()],
             'tags' => ['array'],
             'pages' => ['array'],
             'chapters' => ['array'],
diff --git a/app/Exports/ZipExports/Models/ZipExportImage.php b/app/Exports/ZipExports/Models/ZipExportImage.php
index 4c71af0c3..1432e6cf0 100644
--- a/app/Exports/ZipExports/Models/ZipExportImage.php
+++ b/app/Exports/ZipExports/Models/ZipExportImage.php
@@ -32,11 +32,10 @@ final class ZipExportImage extends ZipExportModel
 
     public static function validate(ZipValidationHelper $context, array $data): array
     {
-        $acceptedImageTypes = ['image/png', 'image/jpeg', 'image/gif', 'image/webp'];
         $rules = [
             'id'    => ['nullable', 'int', $context->uniqueIdRule('image')],
             'name'  => ['required', 'string', 'min:1'],
-            'file'  => ['required', 'string', $context->fileReferenceRule($acceptedImageTypes)],
+            'file'  => ['required', 'string', $context->imageFileReferenceRule()],
             'type'  => ['required', 'string', Rule::in(['gallery', 'drawio'])],
         ];
 
diff --git a/app/Exports/ZipExports/ZipExportFiles.php b/app/Exports/ZipExports/ZipExportFiles.php
index 8f0a6bd40..0386d8278 100644
--- a/app/Exports/ZipExports/ZipExportFiles.php
+++ b/app/Exports/ZipExports/ZipExportFiles.php
@@ -80,7 +80,7 @@ class ZipExportFiles
     }
 
     /**
-     * Extract each of the ZIP export tracked files.
+     * Extract each of the ZIP export-tracked files.
      * Calls the given callback for each tracked file, passing a temporary
      * file reference of the file contents, and the zip-local tracked reference.
      */
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
index 9fa7dec3a..7a53e01f4 100644
--- a/app/Exports/ZipExports/ZipImportRunner.php
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -96,7 +96,7 @@ class ZipImportRunner
 
     /**
      * Revert any files which have been stored during this import process.
-     * Considers files only, and avoids the database under the
+     * Considers files only and avoids the database under the
      * assumption that the database may already have been
      * reverted as part of a transaction rollback.
      */
@@ -129,7 +129,7 @@ class ZipImportRunner
         $book = $this->bookRepo->create([
             'name' => $exportBook->name,
             'description_html' => $exportBook->description_html ?? '',
-            'image' => $exportBook->cover ? $this->zipFileToUploadedFile($exportBook->cover, $reader) : null,
+            'image' => $exportBook->cover ? $this->zipFileToUploadedFile($exportBook->cover, $reader, true) : null,
             'tags' => $this->exportTagsToInputArray($exportBook->tags),
         ]);
 
@@ -227,18 +227,11 @@ class ZipImportRunner
 
     protected function importImage(ZipExportImage $exportImage, Page $page, ZipExportReader $reader): Image
     {
-        $mime = $reader->sniffFileMime($exportImage->file);
-        $extension = explode('/', $mime)[1];
-
-        $file = $this->zipFileToUploadedFile($exportImage->file, $reader);
+        $file = $this->zipFileToUploadedFile($exportImage->file, $reader, true);
         $image = $this->imageService->saveNewFromUpload(
             $file,
             $exportImage->type,
             $page->id,
-            null,
-            null,
-            true,
-            $exportImage->name . '.' . $extension,
         );
 
         $image->name = $exportImage->name;
@@ -261,7 +254,7 @@ class ZipImportRunner
         return $tags;
     }
 
-    protected function zipFileToUploadedFile(string $fileName, ZipExportReader $reader): UploadedFile
+    protected function zipFileToUploadedFile(string $fileName, ZipExportReader $reader, bool $forceExtensionFromMime = false): UploadedFile
     {
         if (!$reader->fileWithinSizeLimit($fileName)) {
             throw new ZipImportException([
@@ -277,7 +270,16 @@ class ZipImportRunner
 
         $this->tempFilesToCleanup[] = $tempPath;
 
-        return new UploadedFile($tempPath, $fileName);
+        $intendedUploadName = $fileName;
+        if ($forceExtensionFromMime) {
+            $mime = $reader->sniffFileMime($fileName);
+            $extension = explode('/', $mime)[1];
+            if (!str_ends_with(strtolower($intendedUploadName), '.' . $extension)) {
+                $intendedUploadName .= '.' . $extension;
+            }
+        }
+
+        return new UploadedFile($tempPath, $intendedUploadName);
     }
 
     /**
diff --git a/app/Exports/ZipExports/ZipValidationHelper.php b/app/Exports/ZipExports/ZipValidationHelper.php
index fd9cd7844..2bcb5fb97 100644
--- a/app/Exports/ZipExports/ZipValidationHelper.php
+++ b/app/Exports/ZipExports/ZipValidationHelper.php
@@ -3,6 +3,7 @@
 namespace BookStack\Exports\ZipExports;
 
 use BookStack\Exports\ZipExports\Models\ZipExportModel;
+use BookStack\Uploads\ImageService;
 use Illuminate\Validation\Factory;
 
 class ZipValidationHelper
@@ -38,6 +39,11 @@ class ZipValidationHelper
         return new ZipFileReferenceRule($this, $acceptedMimes);
     }
 
+    public function imageFileReferenceRule(): ZipFileReferenceRule
+    {
+        return new ZipFileReferenceRule($this, ImageService::getSupportedMimeTypes());
+    }
+
     public function uniqueIdRule(string $type): ZipUniqueIdRule
     {
         return new ZipUniqueIdRule($this, $type);
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index 655e47784..1a66be5ff 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -36,9 +36,8 @@ class ImageService
         ?int $resizeWidth = null,
         ?int $resizeHeight = null,
         bool $keepRatio = true,
-        string $imageName = '',
     ): Image {
-        $imageName = $imageName ?: $uploadedFile->getClientOriginalName();
+        $imageName = $uploadedFile->getClientOriginalName();
         $imageData = file_get_contents($uploadedFile->getRealPath());
 
         if ($resizeWidth !== null || $resizeHeight !== null) {
@@ -391,6 +390,14 @@ class ImageService
      */
     public static function isExtensionSupported(string $extension): bool
     {
-        return in_array($extension, static::$supportedExtensions);
+        return in_array(strtolower($extension), static::$supportedExtensions);
+    }
+
+    /**
+     * Get all mime-types for images formats which BookStack supports.
+     */
+    public static function getSupportedMimeTypes(): array
+    {
+        return array_map(fn($ext) => 'image/' . $ext, static::$supportedExtensions);
     }
 }
diff --git a/app/Uploads/ImageStorage.php b/app/Uploads/ImageStorage.php
index abf2b429b..43f448ff1 100644
--- a/app/Uploads/ImageStorage.php
+++ b/app/Uploads/ImageStorage.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Uploads;
 
+use BookStack\Exceptions\ImageUploadException;
 use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Support\Str;
 
@@ -45,6 +46,7 @@ class ImageStorage
 
     /**
      * Clean up an image file name to be both URL and storage safe.
+     * @throws ImageUploadException
      */
     public function cleanImageFileName(string $name): string
     {
@@ -54,6 +56,10 @@ class ImageStorage
         $name = implode('-', $nameParts);
         $name = Str::slug($name);
 
+        if (!ImageService::isExtensionSupported($extension)) {
+            throw new ImageUploadException('Non supported image extension used when storing image: ' . $extension);
+        }
+
         if (strlen($name) === 0) {
             $name = Str::random(10);
         }
diff --git a/tests/Api/BooksApiTest.php b/tests/Api/BooksApiTest.php
index 74f558f38..97a5c954d 100644
--- a/tests/Api/BooksApiTest.php
+++ b/tests/Api/BooksApiTest.php
@@ -38,7 +38,7 @@ class BooksApiTest extends TestCase
         $book = $this->entities->book();
 
         $baseRepo = $this->app->make(BaseRepo::class);
-        $image = $this->files->uploadedImage('book_cover');
+        $image = $this->files->uploadedImage('book_cover.png');
         $baseRepo->updateCoverImage($book, $image);
 
         $resp = $this->getJson($this->baseEndpoint . '?filter[id]=' . $book->id);
diff --git a/tests/Api/ShelvesApiTest.php b/tests/Api/ShelvesApiTest.php
index 34ce0e4e5..8da81c68d 100644
--- a/tests/Api/ShelvesApiTest.php
+++ b/tests/Api/ShelvesApiTest.php
@@ -40,7 +40,7 @@ class ShelvesApiTest extends TestCase
         $shelf = $this->entities->shelf();
 
         $baseRepo = $this->app->make(BaseRepo::class);
-        $image = $this->files->uploadedImage('shelf_cover');
+        $image = $this->files->uploadedImage('shelf_cover.png');
         $baseRepo->updateCoverImage($shelf, $image);
 
         $resp = $this->getJson($this->baseEndpoint . '?filter[id]=' . $shelf->id);
diff --git a/tests/Exports/ZipExportValidatorTest.php b/tests/Exports/ZipExportValidatorTest.php
index e801705be..0d19e6f07 100644
--- a/tests/Exports/ZipExportValidatorTest.php
+++ b/tests/Exports/ZipExportValidatorTest.php
@@ -72,7 +72,7 @@ class ZipExportValidatorTest extends TestCase
         $this->assertEquals($expectedMessage, $results['book.chapters.1.id']);
     }
 
-    public function test_image_files_need_to_be_a_valid_detected_image_file()
+    public function test_page_image_files_need_to_be_a_valid_detected_image_file()
     {
         $validator = $this->getValidatorForData([
             'page' => [
@@ -88,7 +88,7 @@ class ZipExportValidatorTest extends TestCase
         $results = $validator->validate();
         $this->assertCount(1, $results);
 
-        $this->assertEquals('The file needs to reference a file of type image/png,image/jpeg,image/gif,image/webp, found text/plain.', $results['page.images.0.file']);
+        $this->assertEquals('The file needs to reference a file of type image/jpg,image/jpeg,image/png,image/gif,image/webp,image/avif, found text/plain.', $results['page.images.0.file']);
     }
 
     public function test_page_link_attachments_cant_be_data_or_js()
@@ -115,4 +115,20 @@ class ZipExportValidatorTest extends TestCase
             $this->assertCount($count, $results);
         }
     }
+
+    public function test_book_cover_image_files_need_to_be_a_valid_detected_image_file()
+    {
+        $validator = $this->getValidatorForData([
+            'book' => [
+                'id' => 5,
+                'name' => 'My book',
+                'cover' => 'cat.png',
+            ]
+        ], ['cat.png' => $this->files->testFilePath('test-file.txt')]);
+
+        $results = $validator->validate();
+        $this->assertCount(1, $results);
+
+        $this->assertEquals('The cover needs to reference a file of type image/jpg,image/jpeg,image/png,image/gif,image/webp,image/avif, found text/plain.', $results['book.cover']);
+    }
 }
diff --git a/tests/Exports/ZipImportRunnerTest.php b/tests/Exports/ZipImportRunnerTest.php
index 67c1a90e5..cdd2ab5fc 100644
--- a/tests/Exports/ZipImportRunnerTest.php
+++ b/tests/Exports/ZipImportRunnerTest.php
@@ -433,6 +433,29 @@ class ZipImportRunnerTest extends TestCase
         ZipTestHelper::deleteZipForImport($import);
     }
 
+    public function test_book_covers_are_saved_with_a_valid_image_extension()
+    {
+        $testImagePath = $this->files->testFilePath('test-image.png');
+
+        $import = ZipTestHelper::importFromData([], [
+            'book' => [
+                'name' => 'Page A',
+                'cover' => 'my-book-import-ext-test.txt',
+            ],
+        ], [
+            'my-book-import-ext-test.txt' => $testImagePath,
+        ]);
+
+        $this->asAdmin();
+
+        $this->runner->run($import);
+        ZipTestHelper::deleteZipForImport($import);
+
+        $this->assertDatabaseHas('images', [
+            'name' => 'my-book-import-ext-test.txt.png',
+        ]);
+    }
+
     public function test_error_thrown_if_zip_item_exceeds_app_file_upload_limit()
     {
         $tempFile = tempnam(sys_get_temp_dir(), 'bs-zip-test');

From 8f8a6ebf6aea55db91fbff91f1a56a9ffa52f58f Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 22 Aug 2026 22:55:08 +0100
Subject: [PATCH 35/72] Content filtering: Fixed sftp protocols being removed

For #6186
---
 app/Util/UrlFilter.php       | 6 +++---
 tests/Util/UrlFilterTest.php | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Util/UrlFilter.php b/app/Util/UrlFilter.php
index a3c65d03e..9380597c0 100644
--- a/app/Util/UrlFilter.php
+++ b/app/Util/UrlFilter.php
@@ -5,12 +5,12 @@ declare(strict_types=1);
 namespace BookStack\Util;
 
 /**
- * Helps filter URLs to prevent use of undesired schemes.
+ * Helps filter URLs to prevent the use of undesired schemes.
  * Also parses and rebuilds the URL to ensure it's valid.
  */
 class UrlFilter
 {
-    protected static array $allowedSchemes = ['http', 'https', 'mailto', 'tel', 'file', 'ftp', 'nntp', 'news'];
+    protected static array $allowedSchemes = ['http', 'https', 'mailto', 'tel', 'file', 'sftp', 'ftp', 'nntp', 'news'];
     protected string $url;
 
     public function __construct(string $url)
@@ -20,7 +20,7 @@ class UrlFilter
 
     /**
      * Check if the URL is allowed to be generally used as a link
-     * in the application. This does not assure the original URL string
+     * in the application. This does not ensure the original URL string
      * provided is safe as-is. Ensure you use the clean method to produce
      * a URL that is considered safe to use.
      */
diff --git a/tests/Util/UrlFilterTest.php b/tests/Util/UrlFilterTest.php
index 8811b46d9..84de89b3f 100644
--- a/tests/Util/UrlFilterTest.php
+++ b/tests/Util/UrlFilterTest.php
@@ -58,6 +58,7 @@ class UrlFilterTest extends TestCase
             'maiLto:a@b.c' => 'mailto:a@b.c',
             'file://a/b/c' => 'file://a/b/c',
             'ftp://a/b/c' => 'ftp://a/b/c',
+            'sftp://a/b/c' => 'sftp://a/b/c',
             'nntp://a/b/c' => 'nntp://a/b/c',
             'news:a/b/c' => 'news:a/b/c',
         ];

From 82a8cc35cfe51e5fa10b46bf6777df557c6295d1 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 23 Aug 2026 14:24:34 +0100
Subject: [PATCH 36/72] Recycle Bin: Ensure permissions are updated for deleted
 items
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed lack of permission update scope in permission builder where
trashed pages on chapter permission updates would not get permission
updates.

Also added permission rebuild on restore as an extra assurance.
Added tests to cover.

Thanks to SVO — svo.com.br for reporting.
---
 app/Entities/Tools/TrashCan.php             |  2 ++
 app/Permissions/JointPermissionBuilder.php  |  6 ++++-
 tests/Permissions/EntityPermissionsTest.php | 27 +++++++++++++++++++++
 tests/Settings/RecycleBinTest.php           | 20 +++++++++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/app/Entities/Tools/TrashCan.php b/app/Entities/Tools/TrashCan.php
index 96645aebf..26769ecbb 100644
--- a/app/Entities/Tools/TrashCan.php
+++ b/app/Entities/Tools/TrashCan.php
@@ -358,6 +358,8 @@ class TrashCan
             $entity->chapters()->withTrashed()->withCount('deletions')->get()->each($restoreAction);
         }
 
+        $entity->rebuildPermissions();
+
         return $count;
     }
 
diff --git a/app/Permissions/JointPermissionBuilder.php b/app/Permissions/JointPermissionBuilder.php
index 94f18916d..1788124cd 100644
--- a/app/Permissions/JointPermissionBuilder.php
+++ b/app/Permissions/JointPermissionBuilder.php
@@ -70,7 +70,11 @@ class JointPermissionBuilder
         }
 
         if ($entity instanceof Chapter) {
-            foreach ($entity->pages as $page) {
+            $childPages = $entity->pages()
+                ->withTrashed()
+                ->select(['id', 'owned_by', 'book_id', 'chapter_id'])
+                ->get();
+            foreach ($childPages as $page) {
                 $entities[] = $page;
             }
         }
diff --git a/tests/Permissions/EntityPermissionsTest.php b/tests/Permissions/EntityPermissionsTest.php
index d399e0c34..817ac3a89 100644
--- a/tests/Permissions/EntityPermissionsTest.php
+++ b/tests/Permissions/EntityPermissionsTest.php
@@ -711,4 +711,31 @@ class EntityPermissionsTest extends TestCase
 
         $this->assertNull($error);
     }
+
+    public function test_chapter_permissions_change_updates_permissions_for_pages_in_recycle_bin()
+    {
+        $chapter = $this->entities->chapterHasPages();
+        /** @var Page $page */
+        $page = $chapter->pages()->first();
+        $editor = $this->users->editor();
+        $editorRole = $editor->roles->first();
+
+        $this->asAdmin()->delete($page->getUrl());
+        $this->assertTrue($page->refresh()->trashed());
+
+        $this->put($chapter->getUrl('/permissions'), [
+            'permissions' => [
+                '0' => [
+                    'active' => 'true',
+                ],
+            ],
+        ]);
+
+        $this->assertDatabaseHas('joint_permissions', [
+            'entity_type' => 'page',
+            'entity_id'   => $page->id,
+            'role_id'     => $editorRole->id,
+            'status'      => 0,
+        ]);
+    }
 }
diff --git a/tests/Settings/RecycleBinTest.php b/tests/Settings/RecycleBinTest.php
index c17cfed97..9a3dc4cda 100644
--- a/tests/Settings/RecycleBinTest.php
+++ b/tests/Settings/RecycleBinTest.php
@@ -296,4 +296,24 @@ class RecycleBinTest extends TestCase
         $pageRestoreView->assertSee('The parent of this item has also been deleted.');
         $this->withHtml($pageRestoreView)->assertElementContains('a[href$="/settings/recycle-bin/' . $bookDeletion->id . '/restore"]', 'Restore Parent');
     }
+
+    public function test_restore_action_rebuilds_permissions_for_entity()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        /** @var Page $page */
+        $page = $book->pages()->first();
+
+        $this->asEditor()->delete($book->getUrl());
+        $bookDeletion = $book->deletions()->first();
+
+        DB::table('joint_permissions')->where('entity_id', '=', $book->id)
+            ->where('entity_type', '=', 'book')->delete();
+        DB::table('joint_permissions')->where('entity_id', '=', $page->id)
+            ->where('entity_type', '=', 'page')->delete();
+
+        $this->asAdmin()->post("/settings/recycle-bin/{$bookDeletion->id}/restore");
+
+        $this->assertDatabaseHas('joint_permissions', ['entity_id' => $book->id, 'entity_type' => 'book']);
+        $this->assertDatabaseHas('joint_permissions', ['entity_id' => $page->id, 'entity_type' => 'page']);
+    }
 }

From 0365dcc0b140ede18b1987bad824183d9dd3a07e Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 23 Aug 2026 18:08:46 +0100
Subject: [PATCH 37/72] Page Drafts: Applied draft owner check to more
 endpoints

As a follow-up to e3068369a29339054881a0ea1ddadd50c8a98eba, this applies
the draft ownership check to various other draft endpoints.

Thanks again to SVO for reporting.
---
 app/Entities/Controllers/PageController.php | 25 ++++++++++++++++++++-
 app/Entities/Repos/PageRepo.php             |  4 ----
 app/Uploads/Controllers/ImageController.php |  2 +-
 tests/Entity/PageDraftTest.php              | 25 ++++++++++++++++++++-
 4 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index 82edfbc27..03069f807 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -7,6 +7,7 @@ use BookStack\Activity\Tools\CommentTree;
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
@@ -95,7 +96,7 @@ class PageController extends Controller
     }
 
     /**
-     * Show form to continue editing a draft page.
+     * Show a form to continue editing a draft page.
      *
      * @throws NotFoundException
      */
@@ -103,6 +104,7 @@ class PageController extends Controller
     {
         $draft = $this->queries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission(Permission::PageCreate, $draft->getParent());
+        $this->ensureDraftAccess($draft);
 
         $editorData = new PageEditorData($draft, $this->entityQueries, $request->query('editor', ''));
         $this->setPageTitle(trans('entities.pages_edit_draft'));
@@ -124,6 +126,7 @@ class PageController extends Controller
 
         $draftPage = $this->queries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission(Permission::PageCreate, $draftPage->getParent());
+        $this->ensureDraftAccess($draftPage);
 
         $page = $this->pageRepo->publishDraft($draftPage, $request->all());
 
@@ -235,6 +238,7 @@ class PageController extends Controller
      * Save a draft update as a revision.
      *
      * @throws NotFoundException
+     * @throws PermissionsException
      */
     public function saveDraft(Request $request, int $pageId)
     {
@@ -245,6 +249,10 @@ class PageController extends Controller
             return $this->jsonError(trans('errors.guests_cannot_save_drafts'), 500);
         }
 
+        if ($page->draft) {
+            $this->ensureDraftAccess($page);
+        }
+
         $draft = $this->pageRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown']));
         $warnings = (new PageEditActivity($page))->getWarningMessagesForDraft($draft);
 
@@ -294,11 +302,14 @@ class PageController extends Controller
      * Show the deletion page for the specified page.
      *
      * @throws NotFoundException
+     * @throws PermissionsException
      */
     public function showDeleteDraft(string $bookSlug, int $pageId)
     {
         $page = $this->queries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->ensureDraftAccess($page);
+
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName' => $page->getShortName()]));
         $usedAsTemplate =
             $this->entityQueries->books->start()->where('default_template_id', '=', $page->id)->count() > 0 ||
@@ -340,7 +351,9 @@ class PageController extends Controller
         $page = $this->queries->findVisibleByIdOrFail($pageId);
         $book = $page->book;
         $chapter = $page->chapter;
+
         $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->ensureDraftAccess($page);
 
         $this->pageRepo->destroy($page);
 
@@ -470,4 +483,14 @@ class PageController extends Controller
 
         return redirect($pageCopy->getUrl());
     }
+
+    /**
+     * @throws PermissionsException
+     */
+    protected function ensureDraftAccess(Page $draft): void
+    {
+        if (!$draft->draft || $draft->created_by !== user()->id) {
+            throw new PermissionsException('This page is already published or does not belong to you.');
+        }
+    }
 }
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 4dfca90a7..375bf1d2b 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -82,10 +82,6 @@ class PageRepo
      */
     public function publishDraft(Page $draft, array $input): Page
     {
-        if (!$draft->draft || $draft->created_by !== user()->id) {
-            throw new PermissionsException('This page is already published or does not belong to you.');
-        }
-
         return (new DatabaseTransaction(function () use ($draft, $input) {
             $draft->draft = false;
             $draft->revision_count = 1;
diff --git a/app/Uploads/Controllers/ImageController.php b/app/Uploads/Controllers/ImageController.php
index da67639c1..164d10e6b 100644
--- a/app/Uploads/Controllers/ImageController.php
+++ b/app/Uploads/Controllers/ImageController.php
@@ -153,7 +153,7 @@ class ImageController extends Controller
     }
 
     /**
-     * Check related page permission and ensure type is drawio or gallery.
+     * Check related page permission and ensure the type is drawio or gallery.
      * @throws NotifyException
      */
     protected function checkImagePermission(Image $image): void
diff --git a/tests/Entity/PageDraftTest.php b/tests/Entity/PageDraftTest.php
index ff2ba01e1..3f1eff1bd 100644
--- a/tests/Entity/PageDraftTest.php
+++ b/tests/Entity/PageDraftTest.php
@@ -245,7 +245,7 @@ class PageDraftTest extends TestCase
         ]);
     }
 
-    public function test_draft_published_can_only_be_used_on_draft_pages()
+    public function test_draft_publish_can_only_be_used_on_draft_pages()
     {
         $page = $this->entities->page();
         $this->withoutExceptionHandling();
@@ -263,4 +263,27 @@ class PageDraftTest extends TestCase
         $page->refresh();
         $this->assertNotEquals('My published drafty', $page->name);
     }
+
+    public function test_destroy_draft_can_only_be_used_on_draft_pages()
+    {
+        $page = $this->entities->page();
+        $this->withoutExceptionHandling();
+
+        $exception = null;
+        try {
+            $this->asEditor()->delete($page->book->getUrl("/draft/{$page->id}"));
+        } catch (\Exception $e) {
+            $exception = $e;
+        }
+
+        $this->assertInstanceOf(PermissionsException::class, $exception);
+        $this->assertStringContainsString('This page is already published or does not belong to you', $exception->getMessage());
+
+        $page->refresh();
+        $this->assertDatabaseHas('entities', [
+            'id' => $page->id,
+            'type' => 'page',
+            'deleted_at' => null
+        ]);
+    }
 }

From e5a2832970593dc6720720e60b33f5f1fd25bb21 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 24 Aug 2026 00:03:06 +0100
Subject: [PATCH 38/72] Page filtering: Fixed allow list stripping sftp and
 fragment links

Actually registered the SFTP protocol with HTMLPurifier to allow SFTP
links.
Replaced the default MakeAbsolute URI filter for HTMLPurifier so that
fragment based links are allowed, and are not forced to have a base URL
and/or protocol.

For #6178, Related to #6186
---
 .../HtmlPurifier/ConfiguredHtmlPurifier.php   |  8 +++-
 .../HtmlPurifier/Filters/UriEnsureScheme.php  |  4 +-
 .../HtmlPurifier/Filters/UriMakeAbsolute.php  | 39 +++++++++++++++++++
 app/Util/HtmlPurifier/SftpUriScheme.php       | 10 +++++
 tests/Entity/PageContentFilteringTest.php     |  2 +
 tests/Util/UrlFilterTest.php                  |  1 +
 6 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 app/Util/HtmlPurifier/Filters/UriMakeAbsolute.php
 create mode 100644 app/Util/HtmlPurifier/SftpUriScheme.php

diff --git a/app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php b/app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php
index c4dd91778..77fa304e6 100644
--- a/app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php
+++ b/app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php
@@ -5,6 +5,7 @@ namespace BookStack\Util\HtmlPurifier;
 use BookStack\App\AppVersion;
 use BookStack\Util\HtmlPurifier\Filters\UriEnsureScheme;
 use BookStack\Util\HtmlPurifier\Filters\UriLimitFileProtocolToAnchors;
+use BookStack\Util\HtmlPurifier\Filters\UriMakeAbsolute;
 use BookStack\Util\UrlFilter;
 use HTMLPurifier;
 use HTMLPurifier_Config;
@@ -12,6 +13,7 @@ use HTMLPurifier_DefinitionCache_Serializer;
 use HTMLPurifier_HTML5Config;
 use HTMLPurifier_HTMLDefinition;
 use HTMLPurifier_URIDefinition;
+use HTMLPurifier_URISchemeRegistry;
 
 /**
  * Provides a configured HTML Purifier instance.
@@ -40,6 +42,9 @@ class ConfiguredHtmlPurifier
             $this->configureHtmlDefinition($htmlDef);
         }
 
+        $registry = HTMLPurifier_URISchemeRegistry::instance();
+        $registry->register('sftp', new SftpUriScheme());
+
         $uriDef = $config->getDefinition('URI', true, true);
         if ($uriDef instanceof HTMLPurifier_URIDefinition) {
             $this->configureUriDefinition($uriDef);
@@ -94,7 +99,7 @@ class ConfiguredHtmlPurifier
         $defaultScheme = str_starts_with(url('/'), 'http:') ? 'http' : 'https';
         $config->set('URI.SafeIframeRegexp', '%^(http://|https://|//)%');
         $config->set('URI.AllowedSchemes', $allowedSchemesSetting);
-        $config->set('URI.MakeAbsolute', true);
+        $config->set('URI.MakeAbsolute', false); // We register our own MakeAbsolute filter below
         $config->set('URI.DefaultScheme', $defaultScheme);
         $config->set('URI.Base', url('/'));
 
@@ -170,6 +175,7 @@ class ConfiguredHtmlPurifier
     {
         $definition->registerFilter(new UriLimitFileProtocolToAnchors());
         $definition->registerFilter(new UriEnsureScheme());
+        $definition->registerFilter(new UriMakeAbsolute());
     }
 
     public function purify(string $html): string
diff --git a/app/Util/HtmlPurifier/Filters/UriEnsureScheme.php b/app/Util/HtmlPurifier/Filters/UriEnsureScheme.php
index 6b4651b69..74380701a 100644
--- a/app/Util/HtmlPurifier/Filters/UriEnsureScheme.php
+++ b/app/Util/HtmlPurifier/Filters/UriEnsureScheme.php
@@ -31,7 +31,9 @@ class UriEnsureScheme extends HTMLPurifier_URIFilter
         $defaultScheme = $def->defaultScheme ?? '';
 
         if (empty($uri->scheme) && $defaultScheme) {
-            $uri->scheme = $defaultScheme;
+            if (!str_starts_with($uri->toString(), '#')) {
+                $uri->scheme = $defaultScheme;
+            }
         }
 
         return true;
diff --git a/app/Util/HtmlPurifier/Filters/UriMakeAbsolute.php b/app/Util/HtmlPurifier/Filters/UriMakeAbsolute.php
new file mode 100644
index 000000000..fc005a740
--- /dev/null
+++ b/app/Util/HtmlPurifier/Filters/UriMakeAbsolute.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace BookStack\Util\HtmlPurifier\Filters;
+
+use HTMLPurifier_Config;
+use HTMLPurifier_Context;
+use HTMLPurifier_URI;
+use HTMLPurifier_URIFilter_MakeAbsolute;
+
+/**
+ * A custom version of HTMLPurifier's MakeAbsolute filter which leaves fragment-based
+ * anchors alone without adding a base.
+ */
+class UriMakeAbsolute extends HTMLPurifier_URIFilter_MakeAbsolute
+{
+    /**
+     * @type string
+     */
+    public $name = 'CustomMakeAbsolute';
+
+    /**
+     * @type bool
+     */
+    public $always_load = true;
+
+    /**
+     * @param HTMLPurifier_URI $uri
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     */
+    public function filter(&$uri, $config, $context): bool
+    {
+        if (str_starts_with($uri->toString(), '#')) {
+            return true;
+        }
+
+        return parent::filter($uri, $config, $context);
+    }
+}
diff --git a/app/Util/HtmlPurifier/SftpUriScheme.php b/app/Util/HtmlPurifier/SftpUriScheme.php
new file mode 100644
index 000000000..889cb7f38
--- /dev/null
+++ b/app/Util/HtmlPurifier/SftpUriScheme.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace BookStack\Util\HtmlPurifier;
+
+use HTMLPurifier_URIScheme_ftp;
+
+class SftpUriScheme extends HTMLPurifier_URIScheme_ftp
+{
+    public $default_port = 22;
+}
diff --git a/tests/Entity/PageContentFilteringTest.php b/tests/Entity/PageContentFilteringTest.php
index 68b597387..d20bdf17b 100644
--- a/tests/Entity/PageContentFilteringTest.php
+++ b/tests/Entity/PageContentFilteringTest.php
@@ -523,6 +523,8 @@ HTML;
             '<p><a href="https://example.com" target="_blank">New tab linkydoodle</a></p>',
             '<p><a href="https://example.com/user/1" data-mention-user-id="5">@mentionusertext</a></p>',
             '<p><a href="file://link/to/file">Link to file</a></p>',
+            '<p><a href="sftp://example.com/a/link/to/file">Link to file</a></p>',
+            '<p><a href="#hello-section">Link to another section</a></p>',
             '<details><summary>Hello</summary><p>Mydetailshere</p></details>',
         ];
 
diff --git a/tests/Util/UrlFilterTest.php b/tests/Util/UrlFilterTest.php
index 84de89b3f..9928253d6 100644
--- a/tests/Util/UrlFilterTest.php
+++ b/tests/Util/UrlFilterTest.php
@@ -61,6 +61,7 @@ class UrlFilterTest extends TestCase
             'sftp://a/b/c' => 'sftp://a/b/c',
             'nntp://a/b/c' => 'nntp://a/b/c',
             'news:a/b/c' => 'news:a/b/c',
+            '#a-reference-to-an-id' => '#a-reference-to-an-id',
         ];
 
         foreach ($expectedOutputByInput as $input => $expected) {

From 316f52f89461ade63985ff0818b4acf1cc062aef Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Mon, 24 Aug 2026 04:30:57 +0000
Subject: [PATCH 39/72] New Crowdin translations by GitHub Action

---
 lang/bg/activities.php    |  2 +-
 lang/bg/auth.php          |  2 +-
 lang/bg/components.php    |  2 +-
 lang/bg/editor.php        |  2 +-
 lang/bg/notifications.php |  2 +-
 lang/bg/preferences.php   |  2 +-
 lang/bg/settings.php      |  2 +-
 lang/bg/validation.php    | 10 +++++-----
 lang/es/activities.php    |  4 ++--
 lang/es/auth.php          |  2 +-
 lang/es/entities.php      |  6 +++---
 lang/es/settings.php      |  6 +++---
 lang/es_AR/activities.php |  4 ++--
 lang/es_AR/auth.php       |  2 +-
 lang/es_AR/entities.php   |  6 +++---
 lang/es_AR/settings.php   |  6 +++---
 lang/et/activities.php    |  4 ++--
 lang/et/auth.php          |  2 +-
 lang/et/entities.php      |  6 +++---
 lang/et/settings.php      |  8 ++++----
 lang/fa/activities.php    |  8 ++++----
 lang/fa/auth.php          |  2 +-
 lang/fa/entities.php      |  8 ++++----
 lang/fa/errors.php        |  4 ++--
 lang/fa/notifications.php |  6 +++---
 lang/fa/preferences.php   |  6 +++---
 lang/fa/settings.php      | 20 ++++++++++----------
 lang/fa/validation.php    |  2 +-
 lang/ja/activities.php    |  4 ++--
 lang/ja/auth.php          |  2 +-
 lang/ja/entities.php      |  6 +++---
 lang/ja/settings.php      |  6 +++---
 32 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/lang/bg/activities.php b/lang/bg/activities.php
index 344423e0d..6195e0ae8 100644
--- a/lang/bg/activities.php
+++ b/lang/bg/activities.php
@@ -111,7 +111,7 @@ return [
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
-    'role_create' => 'created role',
+    'role_create' => 'създадена роля',
     'role_create_notification' => 'Успешна създадена роля',
     'role_update' => 'updated role',
     'role_update_notification' => 'Успешно обновена роля',
diff --git a/lang/bg/auth.php b/lang/bg/auth.php
index 91c7495a1..a0e171b42 100644
--- a/lang/bg/auth.php
+++ b/lang/bg/auth.php
@@ -8,7 +8,7 @@ return [
 
     'failed' => 'Въведените данни не съвпадат с информацията в системата.',
     'throttle' => 'Твърде много опити за влизане. Опитайте пак след :seconds секунди.',
-    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
+    'mfa_throttle' => 'Твърде много опити за мултифакторна верификация. Опитайте пак след :seconds секунди.',
 
     // Login & Register
     'sign_up' => 'Регистриране',
diff --git a/lang/bg/components.php b/lang/bg/components.php
index f88c69fc8..03a9ff755 100644
--- a/lang/bg/components.php
+++ b/lang/bg/components.php
@@ -6,7 +6,7 @@ return [
 
     // Image Manager
     'image_select' => 'Избор на изображение',
-    'image_list' => 'Image List',
+    'image_list' => 'Списък с изображения',
     'image_details' => 'Image Details',
     'image_upload' => 'Upload Image',
     'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
diff --git a/lang/bg/editor.php b/lang/bg/editor.php
index 16c951a71..a78d9eff9 100644
--- a/lang/bg/editor.php
+++ b/lang/bg/editor.php
@@ -48,7 +48,7 @@ return [
     'superscript' => 'Горен индекс',
     'subscript' => 'Долен индекс',
     'text_color' => 'Цвят на текста',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Цвят на подчертаване',
     'custom_color' => 'Цвят по избор',
     'remove_color' => 'Премахване на цвят',
     'background_color' => 'Фонов цвят',
diff --git a/lang/bg/notifications.php b/lang/bg/notifications.php
index 563ac24e8..ecee032d6 100644
--- a/lang/bg/notifications.php
+++ b/lang/bg/notifications.php
@@ -15,7 +15,7 @@ return [
     'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
-    'detail_page_path' => 'Page Path:',
+    'detail_page_path' => 'Път към страница:',
     'detail_commenter' => 'Commenter:',
     'detail_comment' => 'Comment:',
     'detail_created_by' => 'Created By:',
diff --git a/lang/bg/preferences.php b/lang/bg/preferences.php
index 8f5aaa07e..6bff8fcfa 100644
--- a/lang/bg/preferences.php
+++ b/lang/bg/preferences.php
@@ -37,7 +37,7 @@ return [
 
     'profile' => 'Profile Details',
     'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
+    'profile_view_public' => 'Виж публичния профил',
     'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
     'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
     'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
diff --git a/lang/bg/settings.php b/lang/bg/settings.php
index d347510ff..2b04c073a 100644
--- a/lang/bg/settings.php
+++ b/lang/bg/settings.php
@@ -51,7 +51,7 @@ return [
     'color_scheme' => 'Application Color Scheme',
     'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
     'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
-    'app_color' => 'Primary Color',
+    'app_color' => 'Основен цвят',
     'link_color' => 'Default Link Color',
     'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
     'bookshelf_color' => 'Цвят на рафта',
diff --git a/lang/bg/validation.php b/lang/bg/validation.php
index e2f9bdaa9..0c45ee28c 100644
--- a/lang/bg/validation.php
+++ b/lang/bg/validation.php
@@ -105,11 +105,11 @@ return [
     'url'                  => 'Форматът на :attribute не е валиден.',
     'uploaded'             => 'Файлът не можа да бъде качен. Сървърът може да не приема файлове с такъв размер.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute трябва да реферира към файл в ZIP архива.',
+    'zip_file_size' => 'Файла :attribute не трябва да надвишава :size MB.',
+    'zip_file_mime' => ':attribute трябва да реферира към файл от тип :validTypes, а е намерен :foundType.',
+    'zip_model_expected' => 'Очаква се обект с данни, но е открит ":type".',
+    'zip_unique' => ':attribute трябва да бъде уникален за типа на обекта в ZIP архива.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/es/activities.php b/lang/es/activities.php
index ecfffeb51..e256a88c9 100644
--- a/lang/es/activities.php
+++ b/lang/es/activities.php
@@ -99,8 +99,8 @@ return [
     'user_update_notification' => 'Usuario actualizado correctamente',
     'user_delete' => 'usuario eliminado',
     'user_delete_notification' => 'Usuario eliminado correctamente',
-    'user_mfa_reset' => 'reset MFA for user',
-    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
+    'user_mfa_reset' => 'reiniciar autenticación en dos pasos para el usuario',
+    'user_mfa_reset_notification' => 'Métodos de autenticación en dos pasos restablecidos',
 
     // API Tokens
     'api_token_create' => 'token de API creado',
diff --git a/lang/es/auth.php b/lang/es/auth.php
index 467508001..0a3cba289 100644
--- a/lang/es/auth.php
+++ b/lang/es/auth.php
@@ -8,7 +8,7 @@ return [
 
     'failed' => 'Estas credenciales no coinciden con nuestros registros.',
     'throttle' => 'Demasiados intentos de inicio de sesión. Por favor, inténtalo de nuevo en :seconds segundos.',
-    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
+    'mfa_throttle' => 'Demasiados intentos de verificación de autenticación en dos pasos. Por favor, inténtalo de nuevo en :seconds segundos.',
 
     // Login & Register
     'sign_up' => 'Registrarse',
diff --git a/lang/es/entities.php b/lang/es/entities.php
index 781416122..e5ee473a0 100644
--- a/lang/es/entities.php
+++ b/lang/es/entities.php
@@ -331,9 +331,9 @@ return [
 
     // Editor Sidebar
     'toggle_sidebar' => 'Mostrar/ocultar barra lateral',
-    'page_contents' => 'Page Contents',
-    'page_contents_none' => 'No headings were found in the page content.',
-    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
+    'page_contents' => 'Contenido de Página',
+    'page_contents_none' => 'No se encontraron encabezados en el contenido de la página.',
+    'page_contents_info' => 'El menú de los contenidos de la página se genera a partir de cualquier formato de encabezado utilizado en la página.',
     'page_tags' => 'Etiquetas de Página',
     'chapter_tags' => 'Etiquetas de Capítulo',
     'book_tags' => 'Etiquetas de Libro',
diff --git a/lang/es/settings.php b/lang/es/settings.php
index 1f1b84a31..c776cae32 100644
--- a/lang/es/settings.php
+++ b/lang/es/settings.php
@@ -264,9 +264,9 @@ return [
     'users_mfa_desc' => 'La autenticación en dos pasos añade una capa de seguridad adicional a tu cuenta.',
     'users_mfa_x_methods' => ':count método configurado|:count métodos configurados',
     'users_mfa_configure' => 'Configurar métodos',
-    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
-    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
-    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
+    'users_mfa_reset' => 'Restablecer métodos de autenticación en dos pasos',
+    'users_mfa_reset_desc' => 'Esto restablecerá y borrará todos los métodos de autenticación en dos pasos configurados para este usuario. Si la autenticación en dos pasos es requerida por cualquiera de sus roles, se les pedirá que configuren nuevos métodos en su próximo inicio de sesión.',
+    'users_mfa_reset_confirm' => '¿Estás seguro de que deseas eliminar la autenticación en dos pasos para este usuario?',
 
     // API Tokens
     'user_api_token_create' => 'Crear token API',
diff --git a/lang/es_AR/activities.php b/lang/es_AR/activities.php
index b4ba5690e..ececde5ba 100644
--- a/lang/es_AR/activities.php
+++ b/lang/es_AR/activities.php
@@ -99,8 +99,8 @@ return [
     'user_update_notification' => 'Usuario actualizado con éxito',
     'user_delete' => 'usuario eliminado',
     'user_delete_notification' => 'El usuario fue eliminado correctamente',
-    'user_mfa_reset' => 'reset MFA for user',
-    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
+    'user_mfa_reset' => 'reiniciar autenticación en dos pasos para el usuario',
+    'user_mfa_reset_notification' => 'Métodos de autenticación en dos pasos restablecidos',
 
     // API Tokens
     'api_token_create' => 'token de API creado',
diff --git a/lang/es_AR/auth.php b/lang/es_AR/auth.php
index ad69e651e..82bd1a014 100644
--- a/lang/es_AR/auth.php
+++ b/lang/es_AR/auth.php
@@ -8,7 +8,7 @@ return [
 
     'failed' => 'Estas credenciales no concuerdan con nuestros registros.',
     'throttle' => 'Demasiados intentos fallidos de inicio de sesión. Por favor intente nuevamente en :seconds segundos.',
-    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
+    'mfa_throttle' => 'Demasiados intentos de verificación de autenticación en dos pasos. Por favor, inténtalo de nuevo en :seconds segundos.',
 
     // Login & Register
     'sign_up' => 'Registrarse',
diff --git a/lang/es_AR/entities.php b/lang/es_AR/entities.php
index aac46b447..72aeb2d9e 100644
--- a/lang/es_AR/entities.php
+++ b/lang/es_AR/entities.php
@@ -331,9 +331,9 @@ return [
 
     // Editor Sidebar
     'toggle_sidebar' => 'Mostrar/ocultar barra lateral',
-    'page_contents' => 'Page Contents',
-    'page_contents_none' => 'No headings were found in the page content.',
-    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
+    'page_contents' => 'Contenido de Página',
+    'page_contents_none' => 'No se encontraron encabezados en el contenido de la página.',
+    'page_contents_info' => 'El menú de los contenidos de la página se genera a partir de cualquier formato de encabezado utilizado en la página.',
     'page_tags' => 'Etiquetas de página',
     'chapter_tags' => 'Etiquetas de capítulo',
     'book_tags' => 'Etiquetas de libro',
diff --git a/lang/es_AR/settings.php b/lang/es_AR/settings.php
index 0a97aca67..1baf726d1 100644
--- a/lang/es_AR/settings.php
+++ b/lang/es_AR/settings.php
@@ -265,9 +265,9 @@ return [
     'users_mfa_desc' => 'Configure la autenticación de múltiples factores como una capa extra de seguridad para su cuenta de usuario.',
     'users_mfa_x_methods' => ':count método configurado|:count métodos configurados',
     'users_mfa_configure' => 'Configurar Métodos',
-    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
-    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
-    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
+    'users_mfa_reset' => 'Restablecer métodos de autenticación en dos pasos',
+    'users_mfa_reset_desc' => 'Esto restablecerá y borrará todos los métodos de autenticación en dos pasos configurados para este usuario. Si la autenticación en dos pasos es requerida por cualquiera de sus roles, se les pedirá que configuren nuevos métodos en su próximo inicio de sesión.',
+    'users_mfa_reset_confirm' => '¿Estás seguro de que deseas eliminar la autenticación en dos pasos para este usuario?',
 
     // API Tokens
     'user_api_token_create' => 'Crear token API',
diff --git a/lang/et/activities.php b/lang/et/activities.php
index e42dd7fda..87d474880 100644
--- a/lang/et/activities.php
+++ b/lang/et/activities.php
@@ -99,8 +99,8 @@ return [
     'user_update_notification' => 'Kasutaja on muudetud',
     'user_delete' => 'kustutas kasutaja',
     'user_delete_notification' => 'Kasutaja on kustutatud',
-    'user_mfa_reset' => 'reset MFA for user',
-    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
+    'user_mfa_reset' => 'lähtestas kasutaja MFA',
+    'user_mfa_reset_notification' => 'Mitmeastmelise autentimise meetodite lähestamine',
 
     // API Tokens
     'api_token_create' => 'lisas API tunnuse',
diff --git a/lang/et/auth.php b/lang/et/auth.php
index afbd2870b..56458ea20 100644
--- a/lang/et/auth.php
+++ b/lang/et/auth.php
@@ -8,7 +8,7 @@ return [
 
     'failed' => 'Kasutajanimi ja parool ei klapi.',
     'throttle' => 'Liiga palju sisselogimiskatseid. Proovi uuesti :seconds sekundi pärast.',
-    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
+    'mfa_throttle' => 'Liiga palju mitmeastmelise kinnituse katseid. Proovi uuesti :seconds sekundi pärast.',
 
     // Login & Register
     'sign_up' => 'Registreeru',
diff --git a/lang/et/entities.php b/lang/et/entities.php
index 11c2f77ae..ec2fc1833 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -331,9 +331,9 @@ return [
 
     // Editor Sidebar
     'toggle_sidebar' => 'Kuva/peida külgriba',
-    'page_contents' => 'Page Contents',
-    'page_contents_none' => 'No headings were found in the page content.',
-    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
+    'page_contents' => 'Lehe sisu',
+    'page_contents_none' => 'Lehe sisus ei leitud ühtegi pealkirja.',
+    'page_contents_info' => 'Sisukord genereeritakse automaatselt lehel kasutatud pealkirjavormingutest.',
     'page_tags' => 'Lehe sildid',
     'chapter_tags' => 'Peatüki sildid',
     'book_tags' => 'Raamatu sildid',
diff --git a/lang/et/settings.php b/lang/et/settings.php
index 03b602372..58800f5e3 100644
--- a/lang/et/settings.php
+++ b/lang/et/settings.php
@@ -207,7 +207,7 @@ return [
     'role_all' => 'Kõik',
     'role_own' => 'Enda omad',
     'role_controlled_by_asset' => 'Õigused määratud seotud objekti kaudu',
-    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
+    'role_controlled_by_page_delete' => 'Määratud lehe kustutamise õiguste kaudu',
     'role_save' => 'Salvesta roll',
     'role_users' => 'Selle rolliga kasutajad',
     'role_users_none' => 'Seda rolli ei ole hetkel ühelgi kasutajal',
@@ -264,9 +264,9 @@ return [
     'users_mfa_desc' => 'Seadista mitmeastmeline autentimine, et oma kasutajakonto turvalisust tõsta.',
     'users_mfa_x_methods' => ':count meetod seadistatud|:count meetodit seadistatud',
     'users_mfa_configure' => 'Seadista meetodid',
-    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
-    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
-    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
+    'users_mfa_reset' => 'Lähtesta mitmeastmelise autentimise meetodid',
+    'users_mfa_reset_desc' => 'See lähestab kõik selle kasutaja seadistatud mitmeastmelise autentimise meetodid. Kui mõni tema rollidest nõuab mitmeastmelist autentimist, peab ta järgmisel sisselogimisel uued meetodid seadistama.',
+    'users_mfa_reset_confirm' => 'Kas oled kindel, et soovid selle kasutaja mitmeastmelise autentimise meetodid lähtestada?',
 
     // API Tokens
     'user_api_token_create' => 'Lisa API tunnus',
diff --git a/lang/fa/activities.php b/lang/fa/activities.php
index 876c545a6..85a2d72cb 100644
--- a/lang/fa/activities.php
+++ b/lang/fa/activities.php
@@ -36,8 +36,8 @@ return [
     'book_update_notification'    => 'کتاب با موفقیت به روزرسانی شد',
     'book_delete'                 => 'حذف کتاب',
     'book_delete_notification'    => 'کتاب با موفقیت حذف شد',
-    'book_sort'                   => 'مرتب سازی کتاب',
-    'book_sort_notification'      => 'کتاب با موفقیت مرتب سازی شد',
+    'book_sort'                   => 'کتاب‌های مرتب‌شده',
+    'book_sort_notification'      => 'کتاب با موفقیت مجددا مرتب شد',
 
     // Bookshelves
     'bookshelf_create'            => 'ایجاد قفسه',
@@ -99,8 +99,8 @@ return [
     'user_update_notification' => 'کاربر با موفقیت به روز شد',
     'user_delete' => 'کاربر حذف شده',
     'user_delete_notification' => 'کاربر با موفقیت حذف شد',
-    'user_mfa_reset' => 'reset MFA for user',
-    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
+    'user_mfa_reset' => 'بازنشانی احراز هویت چندمرحله ای برای کاربر',
+    'user_mfa_reset_notification' => 'بازنشانی روش‌های احراز هویت چندمرحله‌ای',
 
     // API Tokens
     'api_token_create' => 'ایجاد توکن API',
diff --git a/lang/fa/auth.php b/lang/fa/auth.php
index 189666399..2ac7ddd47 100644
--- a/lang/fa/auth.php
+++ b/lang/fa/auth.php
@@ -8,7 +8,7 @@ return [
 
     'failed' => 'مشخصات وارد شده با اطلاعات ما سازگار نیست.',
     'throttle' => 'دفعات تلاش شما برای ورود بیش از حد مجاز است. لطفا پس از :seconds ثانیه مجددا تلاش فرمایید.',
-    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
+    'mfa_throttle' => 'تلاش‌های تأیید هویت چندمرحله‌ای بیش از حد مجاز است. لطفاً پس از :seconds ثانیه دوباره تلاش کنید.',
 
     // Login & Register
     'sign_up' => 'ثبت نام',
diff --git a/lang/fa/entities.php b/lang/fa/entities.php
index afeeca0e0..7533edd43 100644
--- a/lang/fa/entities.php
+++ b/lang/fa/entities.php
@@ -173,7 +173,7 @@ return [
     'books_sort_desc' => 'برای سامان‌دهی محتوای یک کتاب، می‌توانید فصل‌ها و صفحات آن را جابه‌جا کنید. همچنین می‌توانید کتاب‌های دیگری بیفزایید تا جابه‌جایی فصل‌ها و صفحات میان کتاب‌ها آسان شود. در صورت تمایل، می‌توانید قاعده‌ای برای مرتب‌سازی خودکار تعیین کنید تا محتوای کتاب در صورت ایجاد تغییرات، به طور خودکار مرتب شود.',
     'books_sort_auto_sort' => 'گزینه مرتب‌سازی خودکار',
     'books_sort_auto_sort_active' => 'مرتب‌سازی خودکار با قاعده: :sortName فعال است',
-    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
+    'books_sort_auto_sort_creation_hint' => 'قوانین گزینه‌ی مرتب‌سازی خودکار را می‌توان توسط کاربری که دسترسی‌های لازم را دارد، در بخش تنظیمات "فهرست‌ها و مرتب‌سازی" ایجاد کرد.',
     'books_sort_named' => 'مرتب‌سازی کتاب:bookName',
     'books_sort_name' => 'مرتب‌سازی بر اساس نام',
     'books_sort_created' => 'مرتب‌سازی بر اساس تاریخ ایجاد',
@@ -331,9 +331,9 @@ return [
 
     // Editor Sidebar
     'toggle_sidebar' => 'نمایش/پنهان‌سازی نوار کناری',
-    'page_contents' => 'Page Contents',
-    'page_contents_none' => 'No headings were found in the page content.',
-    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
+    'page_contents' => 'محتوای صفحه',
+    'page_contents_none' => 'هیچ سرتیتری در محتوای صفحه یافت نشد.',
+    'page_contents_info' => 'منوی محتوا از هر سرتیتری که در صفحه استفاده شده باشد تولید می شود.',
     'page_tags' => 'برچسب‌های صفحه',
     'chapter_tags' => 'برچسب‌های فصل',
     'book_tags' => 'برچسب های کتاب',
diff --git a/lang/fa/errors.php b/lang/fa/errors.php
index 777d6e692..94c268793 100644
--- a/lang/fa/errors.php
+++ b/lang/fa/errors.php
@@ -109,7 +109,7 @@ return [
     'import_zip_cant_read' => 'امکان ایجاد کاربر وجود ندارد؛ زیرا ارسال ایمیل دعوت با خطا مواجه شد.',
     'import_zip_cant_decode_data' => 'محتوای data.json در فایل ZIP پیدا یا رمزگشایی نشد.',
     'import_zip_no_data' => 'داده‌های فایل ZIP فاقد محتوای کتاب، فصل یا صفحه مورد انتظار است.',
-    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
+    'import_zip_data_too_large' => 'محتوای فایل ZIP data.json از حداکثر حجم آپلود مجازِ تعیین‌شده در برنامه بیشتر است.',
     'import_validation_failed' => 'اعتبارسنجی فایل ZIP واردشده با خطا مواجه شد:',
     'import_zip_failed_notification' => ' فایل ZIP وارد نشد.',
     'import_perms_books' => 'شما مجوز لازم برای ایجاد کتاب را ندارید.',
@@ -125,7 +125,7 @@ return [
     'api_incorrect_token_secret' => 'راز ارائه شده برای کد API استفاده شده نادرست است',
     'api_user_no_api_permission' => 'مالک نشانه API استفاده شده اجازه برقراری تماس های API را ندارد',
     'api_user_token_expired' => 'رمز مجوز استفاده شده منقضی شده است',
-    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
+    'api_cookie_auth_only_get' => 'برای استفاده از API با احراز هویت مبتنی بر cookie فقط درخواست GET مجاز است',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'خطا در هنگام ارسال ایمیل آزمایشی:',
diff --git a/lang/fa/notifications.php b/lang/fa/notifications.php
index d216b04fe..b60209586 100644
--- a/lang/fa/notifications.php
+++ b/lang/fa/notifications.php
@@ -11,11 +11,11 @@ return [
     'updated_page_subject' => 'صفحه جدید: :pageName',
     'updated_page_intro' => 'یک صفحه جدید ایجاد شده است در :appName:',
     'updated_page_debounce' => 'برای جلوگیری از انبوه اعلان‌ها، برای مدتی اعلان‌ ویرایش‌هایی که توسط همان ویرایشگر در این صفحه انجام می‌شود، ارسال نخواهد شد.',
-    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
-    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
+    'comment_mention_subject' => 'شما در نظرات صفحه :pageName تگ شده‌اید',
+    'comment_mention_intro' => 'شما در نظری در :appName: تگ شده اید:',
 
     'detail_page_name' => 'نام صفحه:',
-    'detail_page_path' => 'نام میسر صفحه:',
+    'detail_page_path' => 'نام مسیر صفحه:',
     'detail_commenter' => 'نظر دهنده:',
     'detail_comment' => 'نظر:',
     'detail_created_by' => 'ایجاد شده توسط:',
diff --git a/lang/fa/preferences.php b/lang/fa/preferences.php
index 00d277bdf..b24225c3d 100644
--- a/lang/fa/preferences.php
+++ b/lang/fa/preferences.php
@@ -9,7 +9,7 @@ return [
 
     'shortcuts' => 'میانبرها',
     'shortcuts_interface' => 'تنظیمات کلید‌های میانبر رابط کاربری',
-    'shortcuts_toggle_desc' => 'در اینجا می توانید میانبرهای سیستم را که برای پیمایش و ... استفاده می شود، فعال یا غیرفعال کنید.',
+    'shortcuts_toggle_desc' => 'در اینجا می توانید میانبرهای سیستم را که برای پیمایش و... استفاده می شود، فعال یا غیرفعال کنید.',
     'shortcuts_customize_desc' => 'می توانید هر یک از میانبرهای زیر را سفارشی کنید. کافی است پس از انتخاب ورودی برای میانبر، کلید ترکیبی مورد نظر خود را فشار دهید.',
     'shortcuts_toggle_label' => 'میانبرهای صفحه کلید فعال شد',
     'shortcuts_section_navigation' => 'ناوبری و پیمایش',
@@ -23,7 +23,7 @@ return [
     'notifications_desc' => 'تنظیمات اطلاعیه‌های ایمیلی هنگام انجام فعالیت‌های خاص در سیستم.',
     'notifications_opt_own_page_changes' => 'در صورت تغییرات در صفحاتی که متعلق به من است، اطلاع بده',
     'notifications_opt_own_page_comments' => 'در صورت ثبت نظر در صفحاتی که متعلق به من است، اطلاع بده',
-    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
+    'notifications_opt_comment_mentions' => 'وقتی که من در یک نظر تگ شده ام اطلاع بده',
     'notifications_opt_comment_replies' => 'پس از درج پاسخ به روی نظراتی که من ثبت کرده‌ام، اطلاع بده',
     'notifications_save' => 'ذخیره تنظیمات',
     'notifications_update_success' => 'تنظیمات اعلان‌ها به روز شده است!',
@@ -36,7 +36,7 @@ return [
     'auth_change_password_success' => 'رمز عبور به روز شد!',
 
     'profile' => 'جزئیات پروفایل',
-    'profile_desc' => 'علاوه بر جزئیاتی که برای ارتباط و شخصی‌سازی سیستم استفاده می‌شود، جزییات حساب خود را که نشان دهنده شما برای سایر کاربران است، مدیریت کنید.',
+    'profile_desc' => 'علاوه بر جزئیاتی که برای ارتباط و شخصی‌سازی سیستم استفاده می‌شود، جزئیات حساب خود را که نشان دهنده شما برای سایر کاربران است، مدیریت کنید.',
     'profile_view_public' => 'مشاهده پروفایل عمومی',
     'profile_name_desc' => 'نام نمایشی خود را تنظیم کنید. این نام بسته به فعالیت شما و محتوای متعلق به شما، برای سایر کاربران سیستم قابل مشاهده است.',
     'profile_email_desc' => 'این ایمیل برای اعلان‌ها و دسترسی به سیستم استفاده خواهد شد.',
diff --git a/lang/fa/settings.php b/lang/fa/settings.php
index cf1413b96..4ba9a1fcd 100644
--- a/lang/fa/settings.php
+++ b/lang/fa/settings.php
@@ -75,8 +75,8 @@ return [
     'reg_confirm_restrict_domain_placeholder' => 'بدون محدودیت',
 
     // Sorting Settings
-    'sorting' => 'Lists & Sorting',
-    'sorting_book_default' => 'Default Book Sort Rule',
+    'sorting' => 'فهرست‌ها و مرتب‌سازی',
+    'sorting_book_default' => 'قانون پیش‌فرض مرتب‌سازی کتاب',
     'sorting_book_default_desc' => 'قانون پیش‌فرض مرتب‌سازی را برای کتاب‌های جدید انتخاب کنید. تغییر قانون بر ترتیب کتاب‌های موجود تأثیری ندارد و می‌تواند برای هر کتاب به‌صورت جداگانه تغییر یابد.',
     'sorting_rules' => 'قوانین مرتب‌سازی',
     'sorting_rules_desc' => 'این‌ها عملیات مرتب‌سازی از پیش تعریف‌شده‌ای هستند که می‌توانید آن‌ها را بر محتوای سیستم اعمال کنید.',
@@ -103,8 +103,8 @@ return [
     'sort_rule_op_updated_date' => 'تاریخ به‌روزرسانی',
     'sort_rule_op_chapters_first' => 'ابتدا فصل‌ها',
     'sort_rule_op_chapters_last' => 'فصل‌ها در آخر',
-    'sorting_page_limits' => 'Per-Page Display Limits',
-    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
+    'sorting_page_limits' => 'محدودیت نمایش در هر صفحه',
+    'sorting_page_limits_desc' => 'تعیین کنید که چه تعداد آیتم در فهرست‌های مختلف سیستم در هر صفحه نمایش داده شود. معمولاً مقدار کمتر عملکرد بهتری خواهد داشت، در حالی که مقدار بیشتر نیاز به کلیک کردن در صفحات متعدد را از بین می‌برد. استفاده از ضریبی از ۶ توصیه می‌شود.',
 
     // Maintenance settings
     'maint' => 'نگهداری',
@@ -197,17 +197,17 @@ return [
     'role_import_content' => 'وارد کردن محتوا',
     'role_editor_change' => 'تغییر ویرایشگر صفحه',
     'role_notifications' => 'دریافت و مدیریت اعلان‌ها',
-    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
+    'role_permission_note_users_and_roles' => 'این دسترسی ها از نظر فنی امکان مشاهده و جستجوی کاربران و نقش ها را در سیستم فراهم می کنند.',
     'role_asset' => 'مجوزهای دارایی',
     'roles_system_warning' => 'توجه داشته باشید که دسترسی به هر یک از سه مجوز فوق می‌تواند به کاربر اجازه دهد تا امتیازات خود یا امتیازات دیگران را در سیستم تغییر دهد. فقط نقش هایی را با این مجوزها به کاربران مورد اعتماد اختصاص دهید.',
     'role_asset_desc' => 'این مجوزها دسترسی پیش‌فرض به دارایی‌های درون سیستم را کنترل می‌کنند. مجوزهای مربوط به کتاب‌ها، فصل‌ها و صفحات این مجوزها را لغو می‌کنند.',
     'role_asset_admins' => 'به ادمین‌ها به‌طور خودکار به همه محتوا دسترسی داده می‌شود، اما این گزینه‌ها ممکن است گزینه‌های UI را نشان داده یا پنهان کنند.',
     'role_asset_image_view_note' => 'این مربوط به مرئی بودن در بخش مدیر تصاویر است. دسترسی عملی به تصاویر آپلود شده بستگی به گزینه ذخیره‌سازی تصویر سیستم دارد.',
-    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
+    'role_asset_users_note' => 'این دسترسی ها از نظر فنی امکان مشاهده و جستجوی کاربران و نقش ها را در سیستم فراهم می کنند.',
     'role_all' => 'همه',
     'role_own' => 'صاحب',
     'role_controlled_by_asset' => 'توسط دارایی که در آن آپلود می شود کنترل می شود',
-    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
+    'role_controlled_by_page_delete' => 'کنترل شده با دسترسی حذف صفحه',
     'role_save' => 'ذخیره نقش',
     'role_users' => 'کاربران در این نقش',
     'role_users_none' => 'در حال حاضر هیچ کاربری به این نقش اختصاص داده نشده است',
@@ -264,9 +264,9 @@ return [
     'users_mfa_desc' => 'تنظیم احراز هویت چند مرحله ای یک لایه امنیتی دیگر به حساب شما اضافه میکند.',
     'users_mfa_x_methods' => ':count روش پیکربندی شده است|:count روش های پیکربندی شده',
     'users_mfa_configure' => 'روش پیکربندی',
-    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
-    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
-    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
+    'users_mfa_reset' => 'بازنشانی روش های احراز هویت چندمرحله ای',
+    'users_mfa_reset_desc' => 'این کار تمام روش‌های احراز هویت چندمرحله‌ای پیکربندی‌شده برای این کاربر را بازنشانی و پاک می‌کند. اگر احراز هویت چندمرحله‌ای توسط هر یک از نقش‌های آن‌ها الزامی شده باشد، در ورود بعدی از آن‌ها خواسته می‌شود که روش‌های جدیدی را پیکربندی کنند.',
+    'users_mfa_reset_confirm' => 'آیا شما از بازنشانی احراز هویت چندمرحله ای برای این کاربر اطمینان دارید؟',
 
     // API Tokens
     'user_api_token_create' => 'ایجاد توکن API',
diff --git a/lang/fa/validation.php b/lang/fa/validation.php
index 93c7dcb66..c4ccabfca 100644
--- a/lang/fa/validation.php
+++ b/lang/fa/validation.php
@@ -106,7 +106,7 @@ return [
     'uploaded'             => 'بارگذاری فایل :attribute موفقیت آمیز نبود.',
 
     'zip_file' => 'ویژگی :attribute باید به یک فایل درون پرونده فشرده شده اشاره کند.',
-    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
+    'zip_file_size' => 'حجم فایل :attribute نباید بیشتر از :size مگابایت باشد.',
     'zip_file_mime' => 'ویژگی :attribute باید به فایلی با نوع :validTypes اشاره کند، اما نوع یافت‌شده :foundType است.',
     'zip_model_expected' => 'سیستم در این بخش انتظار دریافت یک شیء داده‌ای را داشت، اما «:type» دریافت گردید',
     'zip_unique' => 'برای هر نوع شیء در فایل ZIP، مقدار ویژگی :attribute باید یکتا و بدون تکرار باشد.',
diff --git a/lang/ja/activities.php b/lang/ja/activities.php
index 25ded1d49..93a3597f8 100644
--- a/lang/ja/activities.php
+++ b/lang/ja/activities.php
@@ -99,8 +99,8 @@ return [
     'user_update_notification' => 'ユーザーを更新しました',
     'user_delete' => 'がユーザを削除',
     'user_delete_notification' => 'ユーザーを削除しました',
-    'user_mfa_reset' => 'reset MFA for user',
-    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
+    'user_mfa_reset' => 'ユーザーの多要素認証をリセット',
+    'user_mfa_reset_notification' => '多要素認証方法をリセット',
 
     // API Tokens
     'api_token_create' => 'がAPIトークンを作成',
diff --git a/lang/ja/auth.php b/lang/ja/auth.php
index b4ee5f4ac..6a68de99c 100644
--- a/lang/ja/auth.php
+++ b/lang/ja/auth.php
@@ -8,7 +8,7 @@ return [
 
     'failed' => 'この資格情報は登録されていません。',
     'throttle' => 'ログイン試行回数が制限を超えました。:seconds秒後に再試行してください。',
-    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
+    'mfa_throttle' => '多要素認証の試行回数が制限を越えました。:seconds 秒後に再試行してください。',
 
     // Login & Register
     'sign_up' => '新規登録',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index 66019fa1a..164004451 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -332,9 +332,9 @@ return [
 
     // Editor Sidebar
     'toggle_sidebar' => 'サイドバーの切り替え',
-    'page_contents' => 'Page Contents',
-    'page_contents_none' => 'No headings were found in the page content.',
-    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
+    'page_contents' => 'ページの内容',
+    'page_contents_none' => 'ページ内に見出しが見つかりませんでした。',
+    'page_contents_info' => '目次メニューは、ページ内で使用されている見出し書式から生成されます。',
     'page_tags' => 'タグ',
     'chapter_tags' => 'チャプターのタグ',
     'book_tags' => 'ブックのタグ',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index 5dbb35c03..023ce2780 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -264,9 +264,9 @@ return [
     'users_mfa_desc' => 'アカウントのセキュリティを強化するために、多要素認証を設定してください。',
     'users_mfa_x_methods' => ':count個の手段が設定されています|:count個の手段が設定されています',
     'users_mfa_configure' => '手段を設定',
-    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
-    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
-    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
+    'users_mfa_reset' => '多要素認証方法をリセット',
+    'users_mfa_reset_desc' => 'このユーザーに設定されたすべての多要素認証方法をリセットしてクリアします。 いずれかのロールで多要素認証が必須になっている場合、次回のログイン時に新しい認証方法を設定するよう求められます。',
+    'users_mfa_reset_confirm' => 'このユーザーの多要素認証をリセットしてもよろしいですか？',
 
     // API Tokens
     'user_api_token_create' => 'APIトークンの作成',

From df5f7749fc7a63098748b193a7df233dbe61e0c5 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 24 Aug 2026 11:44:08 +0100
Subject: [PATCH 40/72] Deps: Updated php packages, updated translators and
 licenses

Pre v26.05.4 release
---
 .github/translators.txt                |   2 +
 composer.lock                          | 575 +++++++++++++------------
 dev/licensing/php-library-licenses.txt |   2 +-
 3 files changed, 300 insertions(+), 279 deletions(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index a6e01d0ed..d58538d6c 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -552,3 +552,5 @@ Tim (timakai) :: Dutch; German Informal; French; Romanian; Catalan; Czech; Danis
 dadda123 :: Swedish
 Julien Muggli (JulienMuggli) :: French
 nomoreshow :: Turkish
+Qasem Talaee (qasem_talaee) :: Persian
+ddeicide :: Bulgarian
diff --git a/composer.lock b/composer.lock
index 3576e38ca..67b265547 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.389.2",
+            "version": "3.393.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "784e0fb95e752e55c4654b5800b900c78f6d3990"
+                "reference": "a5880510e500aa0fe13a6410183cd222b3263890"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/784e0fb95e752e55c4654b5800b900c78f6d3990",
-                "reference": "784e0fb95e752e55c4654b5800b900c78f6d3990",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a5880510e500aa0fe13a6410183cd222b3263890",
+                "reference": "a5880510e500aa0fe13a6410183cd222b3263890",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.389.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.393.4"
             },
-            "time": "2026-07-28T18:10:25+00:00"
+            "time": "2026-08-21T18:24:57+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1119,24 +1119,24 @@
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.1.4",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "e01f4a821471308ba86aa202fed6698b6b695e3b"
+                "reference": "adccca3324eece92ca35463648c12b9e6293c05b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/e01f4a821471308ba86aa202fed6698b6b695e3b",
-                "reference": "e01f4a821471308ba86aa202fed6698b6b695e3b",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/adccca3324eece92ca35463648c12b9e6293c05b",
+                "reference": "adccca3324eece92ca35463648c12b9e6293c05b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.5"
+                "phpoption/phpoption": "^1.10"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.41 || ^9.6.22 || ^10.5.45 || ^11.5.7"
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34 || ^10.5.63 || ^11.5.55 || ^12.5.14"
             },
             "type": "library",
             "autoload": {
@@ -1165,7 +1165,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.4"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.2.0"
             },
             "funding": [
                 {
@@ -1177,26 +1177,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-12-27T19:43:20+00:00"
+            "time": "2026-08-24T09:06:52+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.15.2",
+            "version": "7.15.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "744101956d78b7c1384d0cbf379db13e859167bf"
+                "reference": "ee80339fd9177ba44c49cdb653ff02a4d1106b9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/744101956d78b7c1384d0cbf379db13e859167bf",
-                "reference": "744101956d78b7c1384d0cbf379db13e859167bf",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee80339fd9177ba44c49cdb653ff02a4d1106b9a",
+                "reference": "ee80339fd9177ba44c49cdb653ff02a4d1106b9a",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^2.5.1",
-                "guzzlehttp/psr7": "^2.13",
+                "guzzlehttp/promises": "^2.5.3",
+                "guzzlehttp/psr7": "^2.13.1",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.5 || ^3.0",
@@ -1289,7 +1289,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.15.2"
+                "source": "https://github.com/guzzle/guzzle/tree/7.15.5"
             },
             "funding": [
                 {
@@ -1305,20 +1305,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-26T23:23:20+00:00"
+            "time": "2026-08-24T09:21:06+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.5.1",
+            "version": "2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "9ad1e4fc607446a055b95870c7f668e93b5cff29"
+                "reference": "cde49999552d185d64715fe9c1f77a2aadd2f9f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/9ad1e4fc607446a055b95870c7f668e93b5cff29",
-                "reference": "9ad1e4fc607446a055b95870c7f668e93b5cff29",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/cde49999552d185d64715fe9c1f77a2aadd2f9f1",
+                "reference": "cde49999552d185d64715fe9c1f77a2aadd2f9f1",
                 "shasum": ""
             },
             "require": {
@@ -1373,7 +1373,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.5.1"
+                "source": "https://github.com/guzzle/promises/tree/2.5.3"
             },
             "funding": [
                 {
@@ -1389,20 +1389,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-08T15:48:39+00:00"
+            "time": "2026-08-24T09:11:28+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.13.0",
+            "version": "2.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "dad89620b7a6edb60c15858442eb2e408b45d8f4"
+                "reference": "95e7828100de18b4e269fb1703be530082d5166d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/dad89620b7a6edb60c15858442eb2e408b45d8f4",
-                "reference": "dad89620b7a6edb60c15858442eb2e408b45d8f4",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/95e7828100de18b4e269fb1703be530082d5166d",
+                "reference": "95e7828100de18b4e269fb1703be530082d5166d",
                 "shasum": ""
             },
             "require": {
@@ -1492,7 +1492,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.13.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.13.1"
             },
             "funding": [
                 {
@@ -1508,20 +1508,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-16T22:23:49+00:00"
+            "time": "2026-08-24T09:13:11+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
-            "version": "v1.0.10",
+            "version": "v1.0.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/uri-template.git",
-                "reference": "f6c24c21f42b990e9a58912b332d0874df6ba839"
+                "reference": "d0058dccf4299d70c3d9da3378b8908b32780368"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/f6c24c21f42b990e9a58912b332d0874df6ba839",
-                "reference": "f6c24c21f42b990e9a58912b332d0874df6ba839",
+                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/d0058dccf4299d70c3d9da3378b8908b32780368",
+                "reference": "d0058dccf4299d70c3d9da3378b8908b32780368",
                 "shasum": ""
             },
             "require": {
@@ -1578,7 +1578,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/uri-template/issues",
-                "source": "https://github.com/guzzle/uri-template/tree/v1.0.10"
+                "source": "https://github.com/guzzle/uri-template/tree/v1.0.11"
             },
             "funding": [
                 {
@@ -1594,7 +1594,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-17T13:53:03+00:00"
+            "time": "2026-08-24T09:15:32+00:00"
         },
         {
             "name": "intervention/gif",
@@ -1742,16 +1742,16 @@
         },
         {
             "name": "knplabs/knp-snappy",
-            "version": "v1.7.2",
+            "version": "v1.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/KnpLabs/snappy.git",
-                "reference": "1461239a8b265fcc5457b7bdeb842c75b0f066eb"
+                "reference": "f749a7d2e0f1260f4a0f96925323e34ede898f1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/1461239a8b265fcc5457b7bdeb842c75b0f066eb",
-                "reference": "1461239a8b265fcc5457b7bdeb842c75b0f066eb",
+                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/f749a7d2e0f1260f4a0f96925323e34ede898f1f",
+                "reference": "f749a7d2e0f1260f4a0f96925323e34ede898f1f",
                 "shasum": ""
             },
             "require": {
@@ -1803,22 +1803,22 @@
             ],
             "support": {
                 "issues": "https://github.com/KnpLabs/snappy/issues",
-                "source": "https://github.com/KnpLabs/snappy/tree/v1.7.2"
+                "source": "https://github.com/KnpLabs/snappy/tree/v1.7.3"
             },
-            "time": "2026-05-15T15:04:49+00:00"
+            "time": "2026-07-29T11:03:07+00:00"
         },
         {
             "name": "laravel/framework",
-            "version": "v12.64.0",
+            "version": "v12.67.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "727a8ea2949c23ca8b5316b86a00984b6017b7a0"
+                "reference": "fe2cdaba052cbb9f350761ccefc7ac221cbdf0b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/727a8ea2949c23ca8b5316b86a00984b6017b7a0",
-                "reference": "727a8ea2949c23ca8b5316b86a00984b6017b7a0",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/fe2cdaba052cbb9f350761ccefc7ac221cbdf0b5",
+                "reference": "fe2cdaba052cbb9f350761ccefc7ac221cbdf0b5",
                 "shasum": ""
             },
             "require": {
@@ -2027,20 +2027,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2026-07-14T14:25:37+00:00"
+            "time": "2026-08-18T13:37:47+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.21",
+            "version": "v0.3.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "7753c65c281c2550c7c183f14e18062073b7d821"
+                "reference": "b7b4c35e5bc47450f6b6238c6cc9c47ba19b2221"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/7753c65c281c2550c7c183f14e18062073b7d821",
-                "reference": "7753c65c281c2550c7c183f14e18062073b7d821",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/b7b4c35e5bc47450f6b6238c6cc9c47ba19b2221",
+                "reference": "b7b4c35e5bc47450f6b6238c6cc9c47ba19b2221",
                 "shasum": ""
             },
             "require": {
@@ -2084,9 +2084,9 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.21"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.23"
             },
-            "time": "2026-06-26T00:11:25+00:00"
+            "time": "2026-08-11T18:58:24+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2151,16 +2151,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.29.0",
+            "version": "v5.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "cd343a5841f02292af119ee607edc71300c9ae4f"
+                "reference": "caf714f55d51ab0d914b40033d8b0f489d6219cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/cd343a5841f02292af119ee607edc71300c9ae4f",
-                "reference": "cd343a5841f02292af119ee607edc71300c9ae4f",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/caf714f55d51ab0d914b40033d8b0f489d6219cc",
+                "reference": "caf714f55d51ab0d914b40033d8b0f489d6219cc",
                 "shasum": ""
             },
             "require": {
@@ -2219,7 +2219,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2026-07-01T13:50:23+00:00"
+            "time": "2026-08-13T23:01:33+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -2289,16 +2289,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.8.3",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "1902f60f984235023acbe03db6ad614a37b3c3e7"
+                "reference": "d2d1aa8b35e072966c89bc0c66cf926e56767dc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/1902f60f984235023acbe03db6ad614a37b3c3e7",
-                "reference": "1902f60f984235023acbe03db6ad614a37b3c3e7",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d2d1aa8b35e072966c89bc0c66cf926e56767dc4",
+                "reference": "d2d1aa8b35e072966c89bc0c66cf926e56767dc4",
                 "shasum": ""
             },
             "require": {
@@ -2335,7 +2335,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.9-dev"
+                    "dev-main": "2.11-dev"
                 }
             },
             "autoload": {
@@ -2392,7 +2392,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-12T15:29:16+00:00"
+            "time": "2026-08-11T16:06:25+00:00"
         },
         {
             "name": "league/config",
@@ -2478,16 +2478,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.35.2",
+            "version": "3.35.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "b277b5dc3d56650b68904117124e79c851e12376"
+                "reference": "5fc8404762179ae514678487b23494fd69b2309c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b277b5dc3d56650b68904117124e79c851e12376",
-                "reference": "b277b5dc3d56650b68904117124e79c851e12376",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5fc8404762179ae514678487b23494fd69b2309c",
+                "reference": "5fc8404762179ae514678487b23494fd69b2309c",
                 "shasum": ""
             },
             "require": {
@@ -2555,22 +2555,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.35.2"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.35.3"
             },
-            "time": "2026-07-06T14:42:07+00:00"
+            "time": "2026-08-22T12:55:54+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
-            "version": "3.35.2",
+            "version": "3.35.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "8475ef9adfc6498b85469e2abec6fe3118cd08c4"
+                "reference": "b03780cb97585ee7e48977f40ed599b33b751634"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/8475ef9adfc6498b85469e2abec6fe3118cd08c4",
-                "reference": "8475ef9adfc6498b85469e2abec6fe3118cd08c4",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/b03780cb97585ee7e48977f40ed599b33b751634",
+                "reference": "b03780cb97585ee7e48977f40ed599b33b751634",
                 "shasum": ""
             },
             "require": {
@@ -2610,22 +2610,22 @@
                 "storage"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.35.2"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.35.3"
             },
-            "time": "2026-07-01T23:25:49+00:00"
+            "time": "2026-08-08T16:19:23+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.31.0",
+            "version": "3.35.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "2f669db18a4c20c755c2bb7d3a7b0b2340488079"
+                "reference": "a099b24dce160f3b2239043d13d47c4a1a214ea4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/2f669db18a4c20c755c2bb7d3a7b0b2340488079",
-                "reference": "2f669db18a4c20c755c2bb7d3a7b0b2340488079",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/a099b24dce160f3b2239043d13d47c4a1a214ea4",
+                "reference": "a099b24dce160f3b2239043d13d47c4a1a214ea4",
                 "shasum": ""
             },
             "require": {
@@ -2659,9 +2659,9 @@
                 "local"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.31.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.35.3"
             },
-            "time": "2026-01-23T15:30:45+00:00"
+            "time": "2026-08-12T13:29:21+00:00"
         },
         {
             "name": "league/html-to-markdown",
@@ -3133,24 +3133,24 @@
         },
         {
             "name": "masterminds/html5",
-            "version": "2.10.1",
+            "version": "2.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "fd5018f6815fff903946d0564977b44ce8010e29"
+                "reference": "a1e7a2f88ee13635d86fc61cfbdf2306a76ddfc7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fd5018f6815fff903946d0564977b44ce8010e29",
-                "reference": "fd5018f6815fff903946d0564977b44ce8010e29",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/a1e7a2f88ee13635d86fc61cfbdf2306a76ddfc7",
+                "reference": "a1e7a2f88ee13635d86fc61cfbdf2306a76ddfc7",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
-                "php": ">=5.3.0"
+                "php": ">=7.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9 || ^10"
+                "phpunit/phpunit": "^6 || ^7 || ^8 || ^9 || ^10"
             },
             "type": "library",
             "extra": {
@@ -3194,9 +3194,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Masterminds/html5-php/issues",
-                "source": "https://github.com/Masterminds/html5-php/tree/2.10.1"
+                "source": "https://github.com/Masterminds/html5-php/tree/2.11.0"
             },
-            "time": "2026-06-23T18:43:15+00:00"
+            "time": "2026-08-18T06:18:41+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -3369,16 +3369,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.13.1",
+            "version": "3.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "2937ad3d1d2c506fd2bc97d571438a95641f44e2"
+                "reference": "a1c54919f5fff9800cd03c32bd01defd5a4061cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/2937ad3d1d2c506fd2bc97d571438a95641f44e2",
-                "reference": "2937ad3d1d2c506fd2bc97d571438a95641f44e2",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/a1c54919f5fff9800cd03c32bd01defd5a4061cb",
+                "reference": "a1c54919f5fff9800cd03c32bd01defd5a4061cb",
                 "shasum": ""
             },
             "require": {
@@ -3470,20 +3470,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-09T18:23:49+00:00"
+            "time": "2026-08-08T11:40:35+00:00"
         },
         {
             "name": "nette/schema",
-            "version": "v1.3.5",
+            "version": "v1.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "f0ab1a3cda782dbc5da270d28545236aa80c4002"
+                "reference": "c54350438cd6914616f790a49cb424605f421562"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/f0ab1a3cda782dbc5da270d28545236aa80c4002",
-                "reference": "f0ab1a3cda782dbc5da270d28545236aa80c4002",
+                "url": "https://api.github.com/repos/nette/schema/zipball/c54350438cd6914616f790a49cb424605f421562",
+                "reference": "c54350438cd6914616f790a49cb424605f421562",
                 "shasum": ""
             },
             "require": {
@@ -3535,9 +3535,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.3.5"
+                "source": "https://github.com/nette/schema/tree/v1.3.6"
             },
-            "time": "2026-02-23T03:47:12+00:00"
+            "time": "2026-08-16T21:58:41+00:00"
         },
         {
             "name": "nette/utils",
@@ -3959,16 +3959,16 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.5",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "75365b91986c2405cf5e1e012c5595cd487a98be"
+                "reference": "67b192b6a42ec03944b972d6e633ddec78ad2c6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/75365b91986c2405cf5e1e012c5595cd487a98be",
-                "reference": "75365b91986c2405cf5e1e012c5595cd487a98be",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/67b192b6a42ec03944b972d6e633ddec78ad2c6d",
+                "reference": "67b192b6a42ec03944b972d6e633ddec78ad2c6d",
                 "shasum": ""
             },
             "require": {
@@ -3976,7 +3976,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.44 || ^9.6.25 || ^10.5.53 || ^11.5.34"
+                "phpunit/phpunit": "^8.5.54 || ^9.6.36 || ^10.5.64 || ^11.5.56 || ^12.5.33"
             },
             "type": "library",
             "extra": {
@@ -4018,7 +4018,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.5"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.10.0"
             },
             "funding": [
                 {
@@ -4030,20 +4030,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-12-27T19:41:33+00:00"
+            "time": "2026-08-24T00:54:40+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.55",
+            "version": "3.0.56",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "db9744e6d47e742b1f974e965ad49bdd041105af"
+                "reference": "7adbbe38cde25e2df2116dbf2673c407e24fa305"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db9744e6d47e742b1f974e965ad49bdd041105af",
-                "reference": "db9744e6d47e742b1f974e965ad49bdd041105af",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7adbbe38cde25e2df2116dbf2673c407e24fa305",
+                "reference": "7adbbe38cde25e2df2116dbf2673c407e24fa305",
                 "shasum": ""
             },
             "require": {
@@ -4124,7 +4124,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.55"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.56"
             },
             "funding": [
                 {
@@ -4140,20 +4140,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-14T23:24:10+00:00"
+            "time": "2026-08-03T04:36:50+00:00"
         },
         {
             "name": "pragmarx/google2fa",
-            "version": "v9.0.0",
+            "version": "v9.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/antonioribeiro/google2fa.git",
-                "reference": "e6bc62dd6ae83acc475f57912e27466019a1f2cf"
+                "reference": "f00bc788c555adfb6765c437ff3538e59cd88af1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/e6bc62dd6ae83acc475f57912e27466019a1f2cf",
-                "reference": "e6bc62dd6ae83acc475f57912e27466019a1f2cf",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/f00bc788c555adfb6765c437ff3538e59cd88af1",
+                "reference": "f00bc788c555adfb6765c437ff3538e59cd88af1",
                 "shasum": ""
             },
             "require": {
@@ -4161,8 +4161,11 @@
                 "php": "^7.1|^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.9",
-                "phpunit/phpunit": "^7.5.15|^8.5|^9.0"
+                "phpstan/phpstan": "^1.0|^2.0",
+                "phpstan/phpstan-phpunit": "^1.0|^2.0",
+                "phpunit/phpunit": "~9|~10|~11|~12|~13",
+                "psalm/plugin-phpunit": "^0.19|^0.20",
+                "vimeo/psalm": "^5.26|^6.13"
             },
             "type": "library",
             "autoload": {
@@ -4185,27 +4188,36 @@
             "keywords": [
                 "2fa",
                 "Authentication",
+                "MFA",
                 "Two Factor Authentication",
-                "google2fa"
+                "google-authenticator",
+                "google2fa",
+                "hotp",
+                "otp",
+                "rfc4226",
+                "rfc6238",
+                "totp"
             ],
             "support": {
+                "docs": "https://github.com/antonioribeiro/google2fa#readme",
                 "issues": "https://github.com/antonioribeiro/google2fa/issues",
-                "source": "https://github.com/antonioribeiro/google2fa/tree/v9.0.0"
+                "security": "https://github.com/antonioribeiro/google2fa/security/policy",
+                "source": "https://github.com/antonioribeiro/google2fa"
             },
-            "time": "2025-09-19T22:51:08+00:00"
+            "time": "2026-08-15T13:22:01+00:00"
         },
         {
             "name": "predis/predis",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/predis/predis.git",
-                "reference": "5c996db191ee2d9bafe651f454b1fca16754271b"
+                "reference": "2ff20c08bb63697245ffee3f198d1673086c302d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/5c996db191ee2d9bafe651f454b1fca16754271b",
-                "reference": "5c996db191ee2d9bafe651f454b1fca16754271b",
+                "url": "https://api.github.com/repos/predis/predis/zipball/2ff20c08bb63697245ffee3f198d1673086c302d",
+                "reference": "2ff20c08bb63697245ffee3f198d1673086c302d",
                 "shasum": ""
             },
             "require": {
@@ -4247,7 +4259,7 @@
             ],
             "support": {
                 "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v3.5.1"
+                "source": "https://github.com/predis/predis/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -4255,7 +4267,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-06-11T16:56:53+00:00"
+            "time": "2026-08-14T23:07:56+00:00"
         },
         {
             "name": "psr/clock",
@@ -5235,20 +5247,19 @@
         },
         {
             "name": "socialiteproviders/microsoft-azure",
-            "version": "5.2.0",
+            "version": "5.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Microsoft-Azure.git",
-                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16"
+                "reference": "d70ea3c60b09cc113a14350761a0618815bfa11c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/453d62c9d7e3b3b76e94c913fb46e68a33347b16",
-                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16",
+                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/d70ea3c60b09cc113a14350761a0618815bfa11c",
+                "reference": "d70ea3c60b09cc113a14350761a0618815bfa11c",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
                 "php": "^8.0",
                 "socialiteproviders/manager": "^4.4"
             },
@@ -5282,7 +5293,7 @@
                 "issues": "https://github.com/socialiteproviders/providers/issues",
                 "source": "https://github.com/socialiteproviders/providers"
             },
-            "time": "2024-03-15T03:02:10+00:00"
+            "time": "2026-08-23T02:40:58+00:00"
         },
         {
             "name": "socialiteproviders/okta",
@@ -5516,16 +5527,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.4.14",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "92f58bc4bf97a92ed1b9f367f0cd44f20bde0e87"
+                "reference": "962e18f09ebe68a49039b4c82fc0ea4871824fca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/92f58bc4bf97a92ed1b9f367f0cd44f20bde0e87",
-                "reference": "92f58bc4bf97a92ed1b9f367f0cd44f20bde0e87",
+                "url": "https://api.github.com/repos/symfony/console/zipball/962e18f09ebe68a49039b4c82fc0ea4871824fca",
+                "reference": "962e18f09ebe68a49039b4c82fc0ea4871824fca",
                 "shasum": ""
             },
             "require": {
@@ -5590,7 +5601,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.4.14"
+                "source": "https://github.com/symfony/console/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -5610,20 +5621,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-16T11:50:14+00:00"
+            "time": "2026-08-21T12:09:28+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v7.4.9",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "b75663ed96cf4756e28e3105476f220f92886cc4"
+                "reference": "e3822e1cb7013a0a99b3c578130458927ec4eb89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/b75663ed96cf4756e28e3105476f220f92886cc4",
-                "reference": "b75663ed96cf4756e28e3105476f220f92886cc4",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/e3822e1cb7013a0a99b3c578130458927ec4eb89",
+                "reference": "e3822e1cb7013a0a99b3c578130458927ec4eb89",
                 "shasum": ""
             },
             "require": {
@@ -5659,7 +5670,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v7.4.9"
+                "source": "https://github.com/symfony/css-selector/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -5679,7 +5690,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-04-18T13:18:21+00:00"
+            "time": "2026-08-21T17:40:08+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -5754,16 +5765,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.4.14",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "4e1a093b481f323e6e326451f9760c3868430673"
+                "reference": "8373921e231e190a88e2ad526951bbaa791576fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/4e1a093b481f323e6e326451f9760c3868430673",
-                "reference": "4e1a093b481f323e6e326451f9760c3868430673",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/8373921e231e190a88e2ad526951bbaa791576fa",
+                "reference": "8373921e231e190a88e2ad526951bbaa791576fa",
                 "shasum": ""
             },
             "require": {
@@ -5812,7 +5823,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.4.14"
+                "source": "https://github.com/symfony/error-handler/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -5832,20 +5843,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-05T06:22:21+00:00"
+            "time": "2026-08-21T17:40:08+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.4.14",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "51fe3d170227be8d1772214b82ae506e15ed78ff"
+                "reference": "d269974ee93c61d03620ffee358355bfdb471d66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/51fe3d170227be8d1772214b82ae506e15ed78ff",
-                "reference": "51fe3d170227be8d1772214b82ae506e15ed78ff",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d269974ee93c61d03620ffee358355bfdb471d66",
+                "reference": "d269974ee93c61d03620ffee358355bfdb471d66",
                 "shasum": ""
             },
             "require": {
@@ -5897,7 +5908,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.14"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -5917,7 +5928,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-06T11:10:32+00:00"
+            "time": "2026-08-21T17:40:08+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -6001,16 +6012,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.4.11",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "d721ea61b4a5fba8c5b6e7c1feda19efea144b50"
+                "reference": "ee7bc7bca4c7079b88e57d5000aeeb20df570c8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/d721ea61b4a5fba8c5b6e7c1feda19efea144b50",
-                "reference": "d721ea61b4a5fba8c5b6e7c1feda19efea144b50",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/ee7bc7bca4c7079b88e57d5000aeeb20df570c8d",
+                "reference": "ee7bc7bca4c7079b88e57d5000aeeb20df570c8d",
                 "shasum": ""
             },
             "require": {
@@ -6047,7 +6058,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.4.11"
+                "source": "https://github.com/symfony/filesystem/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -6067,20 +6078,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-11T16:38:44+00:00"
+            "time": "2026-08-21T12:09:28+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v7.4.14",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "13b38720174286f55d1761152b575a8d1436fc25"
+                "reference": "5ce28827081f6d1f0c32eaf3882750f19cb5bbe6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/13b38720174286f55d1761152b575a8d1436fc25",
-                "reference": "13b38720174286f55d1761152b575a8d1436fc25",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/5ce28827081f6d1f0c32eaf3882750f19cb5bbe6",
+                "reference": "5ce28827081f6d1f0c32eaf3882750f19cb5bbe6",
                 "shasum": ""
             },
             "require": {
@@ -6115,7 +6126,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.4.14"
+                "source": "https://github.com/symfony/finder/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -6135,20 +6146,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-27T08:31:18+00:00"
+            "time": "2026-08-21T12:09:28+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.4.14",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "06db5ae1552177bf8572f8908839f12e3c06aed3"
+                "reference": "2ebe78c083501dfb9509b31a7aedcae4d60a391f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/06db5ae1552177bf8572f8908839f12e3c06aed3",
-                "reference": "06db5ae1552177bf8572f8908839f12e3c06aed3",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/2ebe78c083501dfb9509b31a7aedcae4d60a391f",
+                "reference": "2ebe78c083501dfb9509b31a7aedcae4d60a391f",
                 "shasum": ""
             },
             "require": {
@@ -6197,7 +6208,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.4.14"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -6217,20 +6228,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-11T07:31:44+00:00"
+            "time": "2026-08-20T09:55:18+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.4.14",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "e99af79b1e776646eda0e1c23b7b45c184ff99be"
+                "reference": "aa160388d444210e3d01bbb4c5c53af4cd763df4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e99af79b1e776646eda0e1c23b7b45c184ff99be",
-                "reference": "e99af79b1e776646eda0e1c23b7b45c184ff99be",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aa160388d444210e3d01bbb4c5c53af4cd763df4",
+                "reference": "aa160388d444210e3d01bbb4c5c53af4cd763df4",
                 "shasum": ""
             },
             "require": {
@@ -6288,7 +6299,7 @@
                 "symfony/validator": "^6.4|^7.0|^8.0",
                 "symfony/var-dumper": "^6.4|^7.0|^8.0",
                 "symfony/var-exporter": "^6.4|^7.0|^8.0",
-                "twig/twig": "^3.12"
+                "twig/twig": "^3.12|^4.0"
             },
             "type": "library",
             "autoload": {
@@ -6316,7 +6327,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.4.14"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -6336,20 +6347,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-27T09:14:35+00:00"
+            "time": "2026-08-22T13:41:33+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v7.4.14",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "f88ce03ae73e3edb5c176ce1f337709996e88495"
+                "reference": "b17c9bf3a551d5f635638a3b6c05f06c4dc87584"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/f88ce03ae73e3edb5c176ce1f337709996e88495",
-                "reference": "f88ce03ae73e3edb5c176ce1f337709996e88495",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/b17c9bf3a551d5f635638a3b6c05f06c4dc87584",
+                "reference": "b17c9bf3a551d5f635638a3b6c05f06c4dc87584",
                 "shasum": ""
             },
             "require": {
@@ -6400,7 +6411,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.4.14"
+                "source": "https://github.com/symfony/mailer/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -6420,20 +6431,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-13T08:51:35+00:00"
+            "time": "2026-08-21T17:40:08+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v7.4.13",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "a845722765c4f6b2ce88beaf4f4479975b186770"
+                "reference": "bf328d82105831db3e409195db0540ff57f27c80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/a845722765c4f6b2ce88beaf4f4479975b186770",
-                "reference": "a845722765c4f6b2ce88beaf4f4479975b186770",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/bf328d82105831db3e409195db0540ff57f27c80",
+                "reference": "bf328d82105831db3e409195db0540ff57f27c80",
                 "shasum": ""
             },
             "require": {
@@ -6457,7 +6468,7 @@
                 "symfony/process": "^6.4|^7.0|^8.0",
                 "symfony/property-access": "^6.4|^7.0|^8.0",
                 "symfony/property-info": "^6.4|^7.0|^8.0",
-                "symfony/serializer": "^6.4.3|^7.0.3|^8.0"
+                "symfony/serializer": "^6.4.44|^7.4.17|^8.1.5"
             },
             "type": "library",
             "autoload": {
@@ -6489,7 +6500,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.4.13"
+                "source": "https://github.com/symfony/mime/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -6509,7 +6520,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-23T16:22:37+00:00"
+            "time": "2026-08-22T09:04:42+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -7342,16 +7353,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.4.13",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "f5804be144caceb570f6747519999636b664f24c"
+                "reference": "058d17fc284cce14efb2385783b55014a461b176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/f5804be144caceb570f6747519999636b664f24c",
-                "reference": "f5804be144caceb570f6747519999636b664f24c",
+                "url": "https://api.github.com/repos/symfony/process/zipball/058d17fc284cce14efb2385783b55014a461b176",
+                "reference": "058d17fc284cce14efb2385783b55014a461b176",
                 "shasum": ""
             },
             "require": {
@@ -7383,7 +7394,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.4.13"
+                "source": "https://github.com/symfony/process/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -7403,20 +7414,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-23T16:05:06+00:00"
+            "time": "2026-08-21T17:40:08+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v7.4.13",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "3a162171bb008e5e0f15dce6581373a4c0e8390d"
+                "reference": "ddd558991e98f693ae6bf5063cc1b0362c6bbec3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/3a162171bb008e5e0f15dce6581373a4c0e8390d",
-                "reference": "3a162171bb008e5e0f15dce6581373a4c0e8390d",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/ddd558991e98f693ae6bf5063cc1b0362c6bbec3",
+                "reference": "ddd558991e98f693ae6bf5063cc1b0362c6bbec3",
                 "shasum": ""
             },
             "require": {
@@ -7468,7 +7479,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v7.4.13"
+                "source": "https://github.com/symfony/routing/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -7488,7 +7499,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-24T11:20:33+00:00"
+            "time": "2026-08-17T13:12:36+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7579,16 +7590,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.4.13",
+            "version": "v7.4.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "961683010db3b27ec6ebcd7308e6e1ee8fa7ffde"
+                "reference": "e394af32256bf9e7bf80849d95e589167c10097b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/961683010db3b27ec6ebcd7308e6e1ee8fa7ffde",
-                "reference": "961683010db3b27ec6ebcd7308e6e1ee8fa7ffde",
+                "url": "https://api.github.com/repos/symfony/string/zipball/e394af32256bf9e7bf80849d95e589167c10097b",
+                "reference": "e394af32256bf9e7bf80849d95e589167c10097b",
                 "shasum": ""
             },
             "require": {
@@ -7646,7 +7657,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.4.13"
+                "source": "https://github.com/symfony/string/tree/v7.4.15"
             },
             "funding": [
                 {
@@ -7666,20 +7677,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-23T15:23:29+00:00"
+            "time": "2026-07-28T07:33:02+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v7.4.14",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "a1af4dacb24eb7ef4f1ca71b94da8ddbce572281"
+                "reference": "2ee1e4a3b32a528a642babe041ff7c440b213b4b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/a1af4dacb24eb7ef4f1ca71b94da8ddbce572281",
-                "reference": "a1af4dacb24eb7ef4f1ca71b94da8ddbce572281",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/2ee1e4a3b32a528a642babe041ff7c440b213b4b",
+                "reference": "2ee1e4a3b32a528a642babe041ff7c440b213b4b",
                 "shasum": ""
             },
             "require": {
@@ -7746,7 +7757,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.4.14"
+                "source": "https://github.com/symfony/translation/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -7766,7 +7777,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-06T09:33:19+00:00"
+            "time": "2026-08-21T17:40:08+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7852,16 +7863,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v7.4.9",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "2676b524340abcfe4d6151ec698463cebafee439"
+                "reference": "69d732355a139c6f8881337d28515aa01f12b8be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/2676b524340abcfe4d6151ec698463cebafee439",
-                "reference": "2676b524340abcfe4d6151ec698463cebafee439",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/69d732355a139c6f8881337d28515aa01f12b8be",
+                "reference": "69d732355a139c6f8881337d28515aa01f12b8be",
                 "shasum": ""
             },
             "require": {
@@ -7906,7 +7917,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v7.4.9"
+                "source": "https://github.com/symfony/uid/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -7926,20 +7937,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-04-30T15:19:22+00:00"
+            "time": "2026-08-11T07:38:58+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.4.14",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "9a3a56a4a1e65a5cb4f8d13801fe8ab0a170e358"
+                "reference": "53712df8727da1744490202eeb9cb50d4b95419d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9a3a56a4a1e65a5cb4f8d13801fe8ab0a170e358",
-                "reference": "9a3a56a4a1e65a5cb4f8d13801fe8ab0a170e358",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/53712df8727da1744490202eeb9cb50d4b95419d",
+                "reference": "53712df8727da1744490202eeb9cb50d4b95419d",
                 "shasum": ""
             },
             "require": {
@@ -7955,7 +7966,7 @@
                 "symfony/http-kernel": "^6.4|^7.0|^8.0",
                 "symfony/process": "^6.4|^7.0|^8.0",
                 "symfony/uid": "^6.4|^7.0|^8.0",
-                "twig/twig": "^3.12"
+                "twig/twig": "^3.12|^4.0"
             },
             "bin": [
                 "Resources/bin/var-dump-server"
@@ -7993,7 +8004,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.4.14"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -8013,7 +8024,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-08T20:24:16+00:00"
+            "time": "2026-08-21T12:09:28+00:00"
         },
         {
             "name": "thecodingmachine/safe",
@@ -8569,19 +8580,21 @@
         },
         {
             "name": "hamcrest/hamcrest-php",
-            "version": "v2.1.1",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hamcrest/hamcrest-php.git",
-                "reference": "f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487"
+                "reference": "b61cd040da1a4925bc90a51c074f5297e7c0fa52"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487",
-                "reference": "f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/b61cd040da1a4925bc90a51c074f5297e7c0fa52",
+                "reference": "b61cd040da1a4925bc90a51c074f5297e7c0fa52",
                 "shasum": ""
             },
             "require": {
+                "ext-ctype": "*",
+                "ext-dom": "*",
                 "php": "^7.4|^8.0"
             },
             "replace": {
@@ -8590,13 +8603,15 @@
                 "kodova/hamcrest-php": "*"
             },
             "require-dev": {
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-phpunit": "^2.0",
                 "phpunit/php-file-iterator": "^1.4 || ^2.0 || ^3.0",
                 "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -8614,9 +8629,9 @@
             ],
             "support": {
                 "issues": "https://github.com/hamcrest/hamcrest-php/issues",
-                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.1.1"
+                "source": "https://github.com/hamcrest/hamcrest-php/tree/v3.0.0"
             },
-            "time": "2025-04-30T06:54:44+00:00"
+            "time": "2026-03-17T11:56:53+00:00"
         },
         {
             "name": "iamcal/sql-parser",
@@ -8827,29 +8842,28 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.12",
+            "version": "1.6.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699"
+                "reference": "967a801bd188989a5669bd280f252d51c0fdc9ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699",
-                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/967a801bd188989a5669bd280f252d51c0fdc9ee",
+                "reference": "967a801bd188989a5669bd280f252d51c0fdc9ee",
                 "shasum": ""
             },
             "require": {
-                "hamcrest/hamcrest-php": "^2.0.1",
-                "lib-pcre": ">=7.0",
+                "hamcrest/hamcrest-php": "^2.0 || ^3.0",
                 "php": ">=7.3"
             },
             "conflict": {
                 "phpunit/phpunit": "<8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5 || ^9.6.17",
-                "symplify/easy-coding-standard": "^12.1.14"
+                "phpunit/phpunit": "^9.6.36",
+                "symplify/easy-coding-standard": "^13.2.17"
             },
             "type": "library",
             "autoload": {
@@ -8906,24 +8920,24 @@
                 "security": "https://github.com/mockery/mockery/security/advisories",
                 "source": "https://github.com/mockery/mockery"
             },
-            "time": "2024-05-16T03:13:13+00:00"
+            "time": "2026-08-19T19:37:52+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.13.4",
+            "version": "1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
+                "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
-                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
+                "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^8.0"
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
@@ -8958,15 +8972,15 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.14.0"
             },
             "funding": [
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
-                    "type": "tidelift"
+                    "url": "https://github.com/mnapoli",
+                    "type": "github"
                 }
             ],
-            "time": "2025-08-01T08:46:24+00:00"
+            "time": "2026-08-11T10:17:44+00:00"
         },
         {
             "name": "nunomaduro/collision",
@@ -9184,11 +9198,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.2.6",
+            "version": "2.2.9",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a6e9b5a9420f6109c091e87d82683bd1a80b87ed",
-                "reference": "a6e9b5a9420f6109c091e87d82683bd1a80b87ed",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/13d6b4f347bad222da436580c8304fa6f83e6bd0",
+                "reference": "13d6b4f347bad222da436580c8304fa6f83e6bd0",
                 "shasum": ""
             },
             "require": {
@@ -9244,7 +9258,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-07-26T21:22:49+00:00"
+            "time": "2026-08-22T07:38:16+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10675,19 +10689,20 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "4.0.1",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "0525c73950de35ded110cffafb9892946d7771b5"
+                "reference": "bbdc3d0532623e21838b7041a4364383a8126f96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0525c73950de35ded110cffafb9892946d7771b5",
-                "reference": "0525c73950de35ded110cffafb9892946d7771b5",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/bbdc3d0532623e21838b7041a4364383a8126f96",
+                "reference": "bbdc3d0532623e21838b7041a4364383a8126f96",
                 "shasum": ""
             },
             "require": {
+                "ext-libxml": "*",
                 "ext-simplexml": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlwriter": "*",
@@ -10696,6 +10711,10 @@
             "require-dev": {
                 "phpunit/phpunit": "^8.4.0 || ^9.3.4 || ^10.5.32 || 11.3.3 - 11.5.28 || ^11.5.31"
             },
+            "suggest": {
+                "ext-iconv": "For accurate character length calculation when the checked files contain multi-byte characters.",
+                "ext-pcntl": "For parallel processing support via the --parallel CLI option."
+            },
             "bin": [
                 "bin/phpcbf",
                 "bin/phpcs"
@@ -10750,7 +10769,7 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-11-10T16:43:36+00:00"
+            "time": "2026-08-06T02:45:27+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
@@ -10851,16 +10870,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v7.4.12",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "b59b59122690976550fd142c23fab62c84738db6"
+                "reference": "6b037d62595666cf65de867073c9a1f00184be0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b59b59122690976550fd142c23fab62c84738db6",
-                "reference": "b59b59122690976550fd142c23fab62c84738db6",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/6b037d62595666cf65de867073c9a1f00184be0c",
+                "reference": "6b037d62595666cf65de867073c9a1f00184be0c",
                 "shasum": ""
             },
             "require": {
@@ -10899,7 +10918,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v7.4.12"
+                "source": "https://github.com/symfony/dom-crawler/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -10919,7 +10938,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-20T07:20:23+00:00"
+            "time": "2026-08-21T17:40:08+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index 0c30fd5bb..892842c4a 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -123,7 +123,7 @@ Link: https://github.com/fruitcake/php-cors
 graham-campbell/result-type
 License: MIT
 License File: vendor/graham-campbell/result-type/LICENSE
-Copyright: Copyright (c) 2020-2024 Graham Campbell <*****@**********.**.**>
+Copyright: Copyright (c) 2020-2026 Graham Campbell <*****@**********.**.**>
 Source: https://github.com/GrahamCampbell/Result-Type.git
 Link: https://github.com/GrahamCampbell/Result-Type.git
 -----------

From fac26126d5717aa7c5659fc6180a37085e0d1282 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 26 Aug 2026 10:30:57 +0100
Subject: [PATCH 41/72] PHPStan: Fixed found issues after merge

---
 app/Search/SearchRunner.php       | 2 +-
 app/Users/UserRepo.php            | 2 +-
 app/View/ViewBlockPreferences.php | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Search/SearchRunner.php b/app/Search/SearchRunner.php
index 60d111d08..e3c12f7e5 100644
--- a/app/Search/SearchRunner.php
+++ b/app/Search/SearchRunner.php
@@ -294,7 +294,7 @@ class SearchRunner
                 $query->where('name', '=', $tagParts['name']);
             }
 
-            if (is_numeric($tagParts['value']) && is_finite($tagParts['value']) && $tagParts['operator'] !== 'like') {
+            if (is_numeric($tagParts['value']) && is_finite(floatval($tagParts['value'])) && $tagParts['operator'] !== 'like') {
                 // We have to do a raw sql query for this since otherwise PDO will quote the value and MySQL will
                 // search the value as a string which prevents being able to do number-based operations
                 // on the tag values. We ensure it has a numeric value and then cast it just to be sure.
diff --git a/app/Users/UserRepo.php b/app/Users/UserRepo.php
index e8b3c27e0..586fecdc5 100644
--- a/app/Users/UserRepo.php
+++ b/app/Users/UserRepo.php
@@ -166,7 +166,7 @@ class UserRepo
     /**
      * Update the given user with the given data.
      *
-     * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string} $data
+     * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string, display_mode: ?string} $data
      *
      * @throws UserUpdateException
      */
diff --git a/app/View/ViewBlockPreferences.php b/app/View/ViewBlockPreferences.php
index 247c3b16c..67e530188 100644
--- a/app/View/ViewBlockPreferences.php
+++ b/app/View/ViewBlockPreferences.php
@@ -42,6 +42,7 @@ class ViewBlockPreferences
             }
 
             $validatedLayoutData[$position] = array_filter($blockIds, function ($id) use ($validIds) {
+                // @phpstan-ignore function.alreadyNarrowedType
                 return is_string($id) && in_array($id, $validIds);
             });
         }

From 35b6f57912cfbc56e4b875b9f41b568aedf5cd71 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 26 Aug 2026 15:20:36 +0100
Subject: [PATCH 42/72] API Docs: Added new endpoints to download docs as
 html/json

Had to rename underlying controller method to prevent name clashing.
---
 app/Api/ApiDocsController.php                 | 43 +++++++++++-
 .../Controllers/BookExportApiController.php   | 10 +--
 .../Controllers/BookExportController.php      | 10 +--
 .../ChapterExportApiController.php            | 10 +--
 .../Controllers/ChapterExportController.php   | 10 +--
 .../Controllers/PageExportApiController.php   | 10 +--
 .../Controllers/PageExportController.php      | 10 +--
 app/Http/Controller.php                       |  2 +-
 app/Theming/ThemeController.php               |  2 +-
 .../Controllers/AttachmentController.php      |  4 +-
 resources/sass/_blocks.scss                   |  7 +-
 resources/views/api-docs/download.blade.php   | 65 +++++++++++++++++++
 resources/views/api-docs/index.blade.php      | 20 +++---
 .../api-docs/parts/endpoint-details.blade.php | 41 ++++++++++++
 .../views/api-docs/parts/endpoint.blade.php   | 42 +-----------
 .../api-docs/parts/getting-started.blade.php  |  2 +-
 routes/web.php                                |  1 +
 17 files changed, 200 insertions(+), 89 deletions(-)
 create mode 100644 resources/views/api-docs/download.blade.php
 create mode 100644 resources/views/api-docs/parts/endpoint-details.blade.php

diff --git a/app/Api/ApiDocsController.php b/app/Api/ApiDocsController.php
index d88dba3bc..9cf4c5bc3 100644
--- a/app/Api/ApiDocsController.php
+++ b/app/Api/ApiDocsController.php
@@ -2,10 +2,22 @@
 
 namespace BookStack\Api;
 
+use BookStack\Entities\Tools\Markdown\HtmlToMarkdown;
 use BookStack\Http\ApiController;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 
 class ApiDocsController extends ApiController
 {
+    protected static array $gettingStartedSectionsById = [
+        'authentication' => 'Authentication',
+        'request-format' => 'Request Format',
+        'listing-endpoints' => 'Listing Endpoints',
+        'error-handling' => 'Error Handling',
+        'rate-limits' => 'Rate Limits',
+        'content-security' => 'Content Security',
+    ];
+
     /**
      * Load the docs page for the API.
      */
@@ -16,6 +28,7 @@ class ApiDocsController extends ApiController
 
         return view('api-docs.index', [
             'docs' => $docs,
+            'gettingStartedSections' => static::$gettingStartedSectionsById,
         ]);
     }
 
@@ -29,10 +42,36 @@ class ApiDocsController extends ApiController
         return response()->json($docs);
     }
 
+    /**
+     * Download the API docs as a cleaner HTML file or as JSON with embedded HTML guidance.
+     * Provide a ?format=json query parameter to download as JSON.
+     */
+    public function download(Request $request)
+    {
+        $format = $request->query('format') ?? 'html';
+        $docs = ApiDocsGenerator::generateConsideringCache();
+        $downloadName = Str::slug(strtolower(setting('app-name')) . '-api-docs');
+
+        if ($format === 'json') {
+            $docs->prepend(
+                view('api-docs.parts.getting-started')->render(),
+                'getting-started-guide'
+            );
+            return $this->createDownload()->directly(json_encode($docs), "{$downloadName}.json");
+        }
+
+        $responseData = view('api-docs.download', [
+            'docs' => $docs,
+            'gettingStartedSections' => static::$gettingStartedSectionsById,
+        ])->render();
+
+        return $this->createDownload()->directly($responseData, "{$downloadName}.html");
+    }
+
     /**
      * Redirect to the API docs page.
-     *  Required as a controller method, instead of the Route::redirect helper,
-     *  to ensure the URL is generated correctly.
+     * Required as a controller method, instead of the Route::redirect helper,
+     * to ensure the URL is generated correctly.
      */
     public function redirect()
     {
diff --git a/app/Exports/Controllers/BookExportApiController.php b/app/Exports/Controllers/BookExportApiController.php
index 21f276f8a..abcddfe67 100644
--- a/app/Exports/Controllers/BookExportApiController.php
+++ b/app/Exports/Controllers/BookExportApiController.php
@@ -28,7 +28,7 @@ class BookExportApiController extends ApiController
         $book = $this->queries->findVisibleByIdOrFail($id);
         $pdfContent = $this->exportFormatter->bookToPdf($book);
 
-        return $this->download()->directly($pdfContent, $book->slug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $book->slug . '.pdf');
     }
 
     /**
@@ -41,7 +41,7 @@ class BookExportApiController extends ApiController
         $book = $this->queries->findVisibleByIdOrFail($id);
         $htmlContent = $this->exportFormatter->bookToContainedHtml($book);
 
-        return $this->download()->directly($htmlContent, $book->slug . '.html');
+        return $this->createDownload()->directly($htmlContent, $book->slug . '.html');
     }
 
     /**
@@ -52,7 +52,7 @@ class BookExportApiController extends ApiController
         $book = $this->queries->findVisibleByIdOrFail($id);
         $textContent = $this->exportFormatter->bookToPlainText($book);
 
-        return $this->download()->directly($textContent, $book->slug . '.txt');
+        return $this->createDownload()->directly($textContent, $book->slug . '.txt');
     }
 
     /**
@@ -63,7 +63,7 @@ class BookExportApiController extends ApiController
         $book = $this->queries->findVisibleByIdOrFail($id);
         $markdown = $this->exportFormatter->bookToMarkdown($book);
 
-        return $this->download()->directly($markdown, $book->slug . '.md');
+        return $this->createDownload()->directly($markdown, $book->slug . '.md');
     }
 
     /**
@@ -74,6 +74,6 @@ class BookExportApiController extends ApiController
         $book = $this->queries->findVisibleByIdOrFail($id);
         $zip = $builder->buildForBook($book);
 
-        return $this->download()->streamedFileDirectly($zip, $book->slug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $book->slug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/BookExportController.php b/app/Exports/Controllers/BookExportController.php
index f6bb66666..dc79ca44c 100644
--- a/app/Exports/Controllers/BookExportController.php
+++ b/app/Exports/Controllers/BookExportController.php
@@ -30,7 +30,7 @@ class BookExportController extends Controller
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $pdfContent = $this->exportFormatter->bookToPdf($book);
 
-        return $this->download()->directly($pdfContent, $bookSlug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $bookSlug . '.pdf');
     }
 
     /**
@@ -43,7 +43,7 @@ class BookExportController extends Controller
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $htmlContent = $this->exportFormatter->bookToContainedHtml($book);
 
-        return $this->download()->directly($htmlContent, $bookSlug . '.html');
+        return $this->createDownload()->directly($htmlContent, $bookSlug . '.html');
     }
 
     /**
@@ -54,7 +54,7 @@ class BookExportController extends Controller
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $textContent = $this->exportFormatter->bookToPlainText($book);
 
-        return $this->download()->directly($textContent, $bookSlug . '.txt');
+        return $this->createDownload()->directly($textContent, $bookSlug . '.txt');
     }
 
     /**
@@ -65,7 +65,7 @@ class BookExportController extends Controller
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $textContent = $this->exportFormatter->bookToMarkdown($book);
 
-        return $this->download()->directly($textContent, $bookSlug . '.md');
+        return $this->createDownload()->directly($textContent, $bookSlug . '.md');
     }
 
     /**
@@ -77,6 +77,6 @@ class BookExportController extends Controller
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $zip = $builder->buildForBook($book);
 
-        return $this->download()->streamedFileDirectly($zip, $bookSlug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $bookSlug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/ChapterExportApiController.php b/app/Exports/Controllers/ChapterExportApiController.php
index 7e5a23c70..93c21b7c6 100644
--- a/app/Exports/Controllers/ChapterExportApiController.php
+++ b/app/Exports/Controllers/ChapterExportApiController.php
@@ -28,7 +28,7 @@ class ChapterExportApiController extends ApiController
         $chapter = $this->queries->findVisibleByIdOrFail($id);
         $pdfContent = $this->exportFormatter->chapterToPdf($chapter);
 
-        return $this->download()->directly($pdfContent, $chapter->slug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $chapter->slug . '.pdf');
     }
 
     /**
@@ -41,7 +41,7 @@ class ChapterExportApiController extends ApiController
         $chapter = $this->queries->findVisibleByIdOrFail($id);
         $htmlContent = $this->exportFormatter->chapterToContainedHtml($chapter);
 
-        return $this->download()->directly($htmlContent, $chapter->slug . '.html');
+        return $this->createDownload()->directly($htmlContent, $chapter->slug . '.html');
     }
 
     /**
@@ -52,7 +52,7 @@ class ChapterExportApiController extends ApiController
         $chapter = $this->queries->findVisibleByIdOrFail($id);
         $textContent = $this->exportFormatter->chapterToPlainText($chapter);
 
-        return $this->download()->directly($textContent, $chapter->slug . '.txt');
+        return $this->createDownload()->directly($textContent, $chapter->slug . '.txt');
     }
 
     /**
@@ -63,7 +63,7 @@ class ChapterExportApiController extends ApiController
         $chapter = $this->queries->findVisibleByIdOrFail($id);
         $markdown = $this->exportFormatter->chapterToMarkdown($chapter);
 
-        return $this->download()->directly($markdown, $chapter->slug . '.md');
+        return $this->createDownload()->directly($markdown, $chapter->slug . '.md');
     }
 
     /**
@@ -74,6 +74,6 @@ class ChapterExportApiController extends ApiController
         $chapter = $this->queries->findVisibleByIdOrFail($id);
         $zip = $builder->buildForChapter($chapter);
 
-        return $this->download()->streamedFileDirectly($zip, $chapter->slug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $chapter->slug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/ChapterExportController.php b/app/Exports/Controllers/ChapterExportController.php
index fdb2bba94..ba974bea0 100644
--- a/app/Exports/Controllers/ChapterExportController.php
+++ b/app/Exports/Controllers/ChapterExportController.php
@@ -31,7 +31,7 @@ class ChapterExportController extends Controller
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $pdfContent = $this->exportFormatter->chapterToPdf($chapter);
 
-        return $this->download()->directly($pdfContent, $chapterSlug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $chapterSlug . '.pdf');
     }
 
     /**
@@ -45,7 +45,7 @@ class ChapterExportController extends Controller
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $containedHtml = $this->exportFormatter->chapterToContainedHtml($chapter);
 
-        return $this->download()->directly($containedHtml, $chapterSlug . '.html');
+        return $this->createDownload()->directly($containedHtml, $chapterSlug . '.html');
     }
 
     /**
@@ -58,7 +58,7 @@ class ChapterExportController extends Controller
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $chapterText = $this->exportFormatter->chapterToPlainText($chapter);
 
-        return $this->download()->directly($chapterText, $chapterSlug . '.txt');
+        return $this->createDownload()->directly($chapterText, $chapterSlug . '.txt');
     }
 
     /**
@@ -71,7 +71,7 @@ class ChapterExportController extends Controller
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $chapterText = $this->exportFormatter->chapterToMarkdown($chapter);
 
-        return $this->download()->directly($chapterText, $chapterSlug . '.md');
+        return $this->createDownload()->directly($chapterText, $chapterSlug . '.md');
     }
 
     /**
@@ -83,6 +83,6 @@ class ChapterExportController extends Controller
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $zip = $builder->buildForChapter($chapter);
 
-        return $this->download()->streamedFileDirectly($zip, $chapterSlug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $chapterSlug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/PageExportApiController.php b/app/Exports/Controllers/PageExportApiController.php
index c5b186289..00a07e7a7 100644
--- a/app/Exports/Controllers/PageExportApiController.php
+++ b/app/Exports/Controllers/PageExportApiController.php
@@ -28,7 +28,7 @@ class PageExportApiController extends ApiController
         $page = $this->queries->findVisibleByIdOrFail($id);
         $pdfContent = $this->exportFormatter->pageToPdf($page);
 
-        return $this->download()->directly($pdfContent, $page->slug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $page->slug . '.pdf');
     }
 
     /**
@@ -41,7 +41,7 @@ class PageExportApiController extends ApiController
         $page = $this->queries->findVisibleByIdOrFail($id);
         $htmlContent = $this->exportFormatter->pageToContainedHtml($page);
 
-        return $this->download()->directly($htmlContent, $page->slug . '.html');
+        return $this->createDownload()->directly($htmlContent, $page->slug . '.html');
     }
 
     /**
@@ -52,7 +52,7 @@ class PageExportApiController extends ApiController
         $page = $this->queries->findVisibleByIdOrFail($id);
         $textContent = $this->exportFormatter->pageToPlainText($page);
 
-        return $this->download()->directly($textContent, $page->slug . '.txt');
+        return $this->createDownload()->directly($textContent, $page->slug . '.txt');
     }
 
     /**
@@ -63,7 +63,7 @@ class PageExportApiController extends ApiController
         $page = $this->queries->findVisibleByIdOrFail($id);
         $markdown = $this->exportFormatter->pageToMarkdown($page);
 
-        return $this->download()->directly($markdown, $page->slug . '.md');
+        return $this->createDownload()->directly($markdown, $page->slug . '.md');
     }
 
     /**
@@ -74,6 +74,6 @@ class PageExportApiController extends ApiController
         $page = $this->queries->findVisibleByIdOrFail($id);
         $zip = $builder->buildForPage($page);
 
-        return $this->download()->streamedFileDirectly($zip, $page->slug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $page->slug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.php
index 9bc79f247..ba3aabea1 100644
--- a/app/Exports/Controllers/PageExportController.php
+++ b/app/Exports/Controllers/PageExportController.php
@@ -34,7 +34,7 @@ class PageExportController extends Controller
         $page->html = (new PageContent($page))->render();
         $pdfContent = $this->exportFormatter->pageToPdf($page);
 
-        return $this->download()->directly($pdfContent, $pageSlug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $pageSlug . '.pdf');
     }
 
     /**
@@ -49,7 +49,7 @@ class PageExportController extends Controller
         $page->html = (new PageContent($page))->render();
         $containedHtml = $this->exportFormatter->pageToContainedHtml($page);
 
-        return $this->download()->directly($containedHtml, $pageSlug . '.html');
+        return $this->createDownload()->directly($containedHtml, $pageSlug . '.html');
     }
 
     /**
@@ -62,7 +62,7 @@ class PageExportController extends Controller
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $pageText = $this->exportFormatter->pageToPlainText($page);
 
-        return $this->download()->directly($pageText, $pageSlug . '.txt');
+        return $this->createDownload()->directly($pageText, $pageSlug . '.txt');
     }
 
     /**
@@ -75,7 +75,7 @@ class PageExportController extends Controller
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $pageText = $this->exportFormatter->pageToMarkdown($page);
 
-        return $this->download()->directly($pageText, $pageSlug . '.md');
+        return $this->createDownload()->directly($pageText, $pageSlug . '.md');
     }
 
     /**
@@ -87,6 +87,6 @@ class PageExportController extends Controller
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $zip = $builder->buildForPage($page);
 
-        return $this->download()->streamedFileDirectly($zip, $pageSlug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $pageSlug . '.zip', true);
     }
 }
diff --git a/app/Http/Controller.php b/app/Http/Controller.php
index 09c38ee61..97936174d 100644
--- a/app/Http/Controller.php
+++ b/app/Http/Controller.php
@@ -121,7 +121,7 @@ abstract class Controller extends BaseController
     /**
      * Create and return a new download response factory using the current request.
      */
-    protected function download(): DownloadResponseFactory
+    protected function createDownload(): DownloadResponseFactory
     {
         return new DownloadResponseFactory(request());
     }
diff --git a/app/Theming/ThemeController.php b/app/Theming/ThemeController.php
index c26767803..208c8d57a 100644
--- a/app/Theming/ThemeController.php
+++ b/app/Theming/ThemeController.php
@@ -24,7 +24,7 @@ class ThemeController extends Controller
             abort(404);
         }
 
-        $response = $this->download()->streamedFileInline($filePath);
+        $response = $this->createDownload()->streamedFileInline($filePath);
         $response->setMaxAge(86400);
 
         return $response;
diff --git a/app/Uploads/Controllers/AttachmentController.php b/app/Uploads/Controllers/AttachmentController.php
index 5e128bc34..e1da0c72d 100644
--- a/app/Uploads/Controllers/AttachmentController.php
+++ b/app/Uploads/Controllers/AttachmentController.php
@@ -232,10 +232,10 @@ class AttachmentController extends Controller
         $attachmentSize = $this->attachmentService->getAttachmentFileSize($attachment);
 
         if ($request->input('open') === 'true') {
-            return $this->download()->streamedInline($attachmentStream, $fileName, $attachmentSize);
+            return $this->createDownload()->streamedInline($attachmentStream, $fileName, $attachmentSize);
         }
 
-        return $this->download()->streamedDirectly($attachmentStream, $fileName, $attachmentSize);
+        return $this->createDownload()->streamedDirectly($attachmentStream, $fileName, $attachmentSize);
     }
 
     /**
diff --git a/resources/sass/_blocks.scss b/resources/sass/_blocks.scss
index 4857c2cee..a89cfea23 100644
--- a/resources/sass/_blocks.scss
+++ b/resources/sass/_blocks.scss
@@ -253,6 +253,9 @@
 /**
  * API Docs
  */
+.api-docs h2.list-heading {
+  font-size: 1.666rem;
+}
 .api-method {
   font-size: 0.75rem;
   background-color: #888;
@@ -282,11 +285,11 @@
     position: sticky;
     top: 0;
     background: #F2F2F2;
-    background: linear-gradient(180deg,rgba(242, 242, 242, 1) 66%, rgba(242, 242, 242, 0) 100%);
+    background: linear-gradient(180deg,rgba(242, 242, 242, 1) 80%, rgba(242, 242, 242, 0) 100%);
     z-index: 4;
   }
 }
 .dark-mode .sticky-sidebar-header {
   background: #111;
-  background: linear-gradient(180deg,rgba(17, 17, 17, 1) 66%, rgba(17, 17, 17, 0) 100%);
+  background: linear-gradient(180deg,rgba(17, 17, 17, 1) 80%, rgba(17, 17, 17, 0) 100%);
 }
diff --git a/resources/views/api-docs/download.blade.php b/resources/views/api-docs/download.blade.php
new file mode 100644
index 000000000..e7bf7457f
--- /dev/null
+++ b/resources/views/api-docs/download.blade.php
@@ -0,0 +1,65 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <title>{{ setting('app-name') }} API Docs</title>
+    <style>
+        body {
+            max-width: 800px;
+            margin: 0 auto;
+            padding-bottom: 2rem;
+            font-family: sans-serif;
+        }
+        h2 {
+            margin-top: 2rem;
+        }
+        table.table {
+            border-collapse: collapse;
+        }
+        table.table th, table.table td {
+            border: 1px solid #ccc;
+            padding: 0.2em 0.4em;
+        }
+    </style>
+</head>
+<body>
+
+<h1>{{ setting('app-name') }} API Documentation</h1>
+
+<h2>Contents</h2>
+<ul>
+@foreach($gettingStartedSections as $id => $label)
+    <li><a href="#{{ $id }}">{{ $label }}</a></li>
+@endforeach
+<li style="list-style: none">---</li>
+@foreach($docs as $model => $endpoints)
+    <li><a href="#section-{{ str_replace(' ', '-', $model) }}">{{ $model }}</a></li>
+@endforeach
+</ul>
+
+<section id="section-getting-started" component="code-highlighter" class="card content-wrap auto-height">
+    @include('api-docs.parts.getting-started')
+</section>
+
+@foreach($docs as $model => $endpoints)
+    <section id="section-{{ str_replace(' ', '-', $model) }}" class="card content-wrap auto-height">
+        <h2>{{ $model }}</h2>
+
+        @if($endpoints[0]['model_description'])
+            <p>{{ $endpoints[0]['model_description'] }}</p>
+        @endif
+
+        @foreach($endpoints as $endpoint)
+            <div>
+                <h3 id="{{ $endpoint['name'] }}">{{ $endpoint['name'] }}</h3>
+                <p>{{ $endpoint['method'] }} {{ url($endpoint['uri']) }}</p>
+            </div>
+            @include('api-docs.parts.endpoint-details')
+        @endforeach
+    </section>
+@endforeach
+
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/views/api-docs/index.blade.php b/resources/views/api-docs/index.blade.php
index c331f0707..573dbf0b3 100644
--- a/resources/views/api-docs/index.blade.php
+++ b/resources/views/api-docs/index.blade.php
@@ -2,14 +2,14 @@
 
 @section('body')
 
-    <div component="api-nav" class="container">
+    <div component="api-nav" class="container api-docs">
 
         <div class="grid right-focus reverse-collapse">
             <div>
 
                 <div refs="api-nav@sidebar" class="sticky-sidebar">
 
-                    <div class="sticky-sidebar-header py-xl">
+                    <div class="sticky-sidebar-header pt-xl pb-m">
                         <select refs="api-nav@select" name="navigation" id="navigation">
                             <option value="getting-started" selected>Jump To Section</option>
                             <option value="getting-started">Getting Started</option>
@@ -22,15 +22,17 @@
                         </select>
                     </div>
 
+                    <div class="flex-container-row wrap gap-xs mb-s">
+                        <a href="{{ url('/api/docs/download?format=html') }}" title="Download API docs as HTML" class="button outline small">@icon('download')<span>HTML</span></a>
+                        <a href="{{ url('/api/docs/download?format=json') }}" title="Download API docs as JSON" class="button outline small">@icon('download')<span>JSON</span></a>
+                    </div>
+
                     <div class="mb-xl">
                         <p id="sidebar-header-getting-started" class="text-uppercase text-muted mb-xm"><strong>Getting Started</strong></p>
                         <div class="text-mono">
-                            <div class="mb-xs"><a href="#authentication">Authentication</a></div>
-                            <div class="mb-xs"><a href="#request-format">Request Format</a></div>
-                            <div class="mb-xs"><a href="#listing-endpoints">Listing Endpoints</a></div>
-                            <div class="mb-xs"><a href="#error-handling">Error Handling</a></div>
-                            <div class="mb-xs"><a href="#rate-limits">Rate Limits</a></div>
-                            <div class="mb-xs"><a href="#content-security">Content Security</a></div>
+                            @foreach($gettingStartedSections as $id => $label)
+                                <div class="mb-xs"><a href="#{{ $id }}">{{ $label }}</a></div>
+                            @endforeach
                         </div>
                     </div>
 
@@ -61,7 +63,7 @@
 
                 @foreach($docs as $model => $endpoints)
                     <section id="section-{{ str_replace(' ', '-', $model) }}" class="card content-wrap auto-height">
-                        <h1 class="list-heading text-capitals">{{ $model }}</h1>
+                        <h2 class="list-heading text-capitals">{{ $model }}</h2>
                         @if($endpoints[0]['model_description'])
                             <p>{{ $endpoints[0]['model_description'] }}</p>
                         @endif
diff --git a/resources/views/api-docs/parts/endpoint-details.blade.php b/resources/views/api-docs/parts/endpoint-details.blade.php
new file mode 100644
index 000000000..979eeb964
--- /dev/null
+++ b/resources/views/api-docs/parts/endpoint-details.blade.php
@@ -0,0 +1,41 @@
+<div class="mb-m">
+    @foreach(explode("\n", $endpoint['description'] ?? '') as $descriptionBlock)
+        <p class="mb-xxs">{{ $descriptionBlock }}</p>
+    @endforeach
+</div>
+
+@if($endpoint['body_params'] ?? false)
+    <details class="mb-m">
+        <summary class="text-muted">{{ $endpoint['method'] === 'GET' ? 'Query' : 'Body'  }} Parameters</summary>
+        <table class="table">
+            <tr>
+                <th>Param Name</th>
+                <th>Value Rules</th>
+            </tr>
+            @foreach($endpoint['body_params'] as $paramName => $rules)
+                <tr>
+                    <td>{{ $paramName }}</td>
+                    <td>
+                        @foreach($rules as $rule)
+                            <code class="mr-xs">{{ $rule }}</code>
+                        @endforeach
+                    </td>
+                </tr>
+            @endforeach
+        </table>
+    </details>
+@endif
+
+@if($endpoint['example_request'] ?? false)
+    <details component="details-highlighter" class="mb-m">
+        <summary class="text-muted">Example Request</summary>
+        <pre><code class="language-json">{{ $endpoint['example_request'] }}</code></pre>
+    </details>
+@endif
+
+@if($endpoint['example_response'] ?? false)
+    <details component="details-highlighter" class="mb-m">
+        <summary class="text-muted">Example Response</summary>
+        <pre><code class="language-json">{{ $endpoint['example_response'] }}</code></pre>
+    </details>
+@endif
\ No newline at end of file
diff --git a/resources/views/api-docs/parts/endpoint.blade.php b/resources/views/api-docs/parts/endpoint.blade.php
index 543ef092e..b82a46d13 100644
--- a/resources/views/api-docs/parts/endpoint.blade.php
+++ b/resources/views/api-docs/parts/endpoint.blade.php
@@ -10,47 +10,7 @@
     <h6 class="text-uppercase text-muted text-mono ml-auto">{{ $endpoint['controller_method_kebab'] }}</h6>
 </div>
 
-<div class="mb-m">
-    @foreach(explode("\n", $endpoint['description'] ?? '') as $descriptionBlock)
-        <p class="mb-xxs">{{ $descriptionBlock }}</p>
-    @endforeach
-</div>
-
-@if($endpoint['body_params'] ?? false)
-    <details class="mb-m">
-        <summary class="text-muted">{{ $endpoint['method'] === 'GET' ? 'Query' : 'Body'  }} Parameters</summary>
-        <table class="table">
-            <tr>
-                <th>Param Name</th>
-                <th>Value Rules</th>
-            </tr>
-            @foreach($endpoint['body_params'] as $paramName => $rules)
-                <tr>
-                    <td>{{ $paramName }}</td>
-                    <td>
-                        @foreach($rules as $rule)
-                            <code class="mr-xs">{{ $rule }}</code>
-                        @endforeach
-                    </td>
-                </tr>
-            @endforeach
-        </table>
-    </details>
-@endif
-
-@if($endpoint['example_request'] ?? false)
-    <details component="details-highlighter" class="mb-m">
-        <summary class="text-muted">Example Request</summary>
-        <pre><code class="language-json">{{ $endpoint['example_request'] }}</code></pre>
-    </details>
-@endif
-
-@if($endpoint['example_response'] ?? false)
-    <details component="details-highlighter" class="mb-m">
-        <summary class="text-muted">Example Response</summary>
-        <pre><code class="language-json">{{ $endpoint['example_response'] }}</code></pre>
-    </details>
-@endif
+@include('api-docs.parts.endpoint-details')
 
 @if(!$loop->last)
     <hr>
diff --git a/resources/views/api-docs/parts/getting-started.blade.php b/resources/views/api-docs/parts/getting-started.blade.php
index 8a14befa5..ab8de44a0 100644
--- a/resources/views/api-docs/parts/getting-started.blade.php
+++ b/resources/views/api-docs/parts/getting-started.blade.php
@@ -1,4 +1,4 @@
-<h1 class="list-heading text-capitals mb-l">Getting Started</h1>
+<h2 class="list-heading text-capitals mb-l">Getting Started</h2>
 
 <p class="mb-none">
     This documentation covers use of the REST API. <br>
diff --git a/routes/web.php b/routes/web.php
index 74c7e6509..77c8f0f7b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -40,6 +40,7 @@ Route::middleware('auth')->group(function () {
     // API docs routes
     Route::get('/api', [ApiDocsController::class, 'redirect']);
     Route::get('/api/docs', [ApiDocsController::class, 'display']);
+    Route::get('/api/docs/download', [ApiDocsController::class, 'download']);
 
     Route::get('/pages/recently-updated', [EntityControllers\PageController::class, 'showRecentlyUpdated']);
 

From 8603266f7728203fd90eb3a21b76a2fd57e7f816 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 26 Aug 2026 22:11:40 +0100
Subject: [PATCH 43/72] API Docs: Covered download endpoints with tests

---
 app/Api/ApiDocsController.php |  1 -
 tests/Api/ApiDocsTest.php     | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app/Api/ApiDocsController.php b/app/Api/ApiDocsController.php
index 9cf4c5bc3..f09f62775 100644
--- a/app/Api/ApiDocsController.php
+++ b/app/Api/ApiDocsController.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Api;
 
-use BookStack\Entities\Tools\Markdown\HtmlToMarkdown;
 use BookStack\Http\ApiController;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
diff --git a/tests/Api/ApiDocsTest.php b/tests/Api/ApiDocsTest.php
index bdf753e87..2b218bcce 100644
--- a/tests/Api/ApiDocsTest.php
+++ b/tests/Api/ApiDocsTest.php
@@ -37,4 +37,40 @@ class ApiDocsTest extends TestCase
             ]],
         ]);
     }
+
+    public function test_download_endpoint_returns_html_by_default()
+    {
+        $resp = $this->actingAsApiEditor()->get($this->endpoint . '/download');
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Type', 'application/octet-stream');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'bookstack-api-docs.html');
+
+        $resp->assertSee('BookStack API Documentation');
+        $resp->assertSee('Getting Started');
+        $resp->assertSee('content-permissions-update');
+        $resp->assertDontSee('Jump To Section');
+    }
+
+    public function test_download_endpoint_returns_json_when_requested()
+    {
+        $resp = $this->actingAsApiEditor()->get($this->endpoint . '/download?format=json');
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Type', 'application/octet-stream');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'bookstack-api-docs.json');
+
+        $resp->assertSee('Getting Started');
+        $resp->assertSee('content-permissions-update');
+        $resp->assertDontSee('Jump To Section');
+
+        $content = $resp->json('getting-started-guide');
+        $this->assertIsString($content);
+        $this->assertGreaterThan(100, strlen($content));
+
+        $resp->assertJson([
+            'docs' => [[
+                'name' => 'docs-display',
+                'uri'  => 'api/docs',
+            ]],
+        ]);
+    }
 }

From f1fe98d1946bd8dba92e760880db85280eb71f86 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Fri, 28 Aug 2026 10:25:39 +0100
Subject: [PATCH 44/72] Pages API: Added extra test to cover type mismatch
 scenario

Related to #6136
---
 tests/Api/PagesApiTest.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/Api/PagesApiTest.php b/tests/Api/PagesApiTest.php
index d71b6c988..c7bf88772 100644
--- a/tests/Api/PagesApiTest.php
+++ b/tests/Api/PagesApiTest.php
@@ -200,6 +200,19 @@ class PagesApiTest extends TestCase
         $this->assertSame(404, $resp->json('error')['code']);
     }
 
+    public function test_read_with_invalid_id_returns_not_found()
+    {
+        $this->actingAsApiEditor();
+        $resp = $this->getJson($this->baseEndpoint . '/invalid-id');
+        $resp->assertNotFound();
+        $resp->assertJsonStructure([
+            'error' => [
+                'code',
+                'message',
+            ],
+        ]);
+    }
+
     public function test_read_endpoint_includes_page_comments_tree_structure()
     {
         $this->actingAsApiEditor();

From 4a871811e9dad41175a7ddd907ecb4ef4f5fe8b1 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Fri, 28 Aug 2026 10:42:27 +0100
Subject: [PATCH 45/72] API: Added changelog support to page create/update API

Also changed the UI based forms to submit as changelog instead of
summary to align with more sensible name used on the API.
Added testing to cover.

For #6162
---
 .../Controllers/PageApiController.php         |  6 ++-
 app/Entities/Repos/PageRepo.php               |  4 +-
 .../pages/parts/editor-toolbar.blade.php      |  2 +-
 tests/Activity/WebhookFormatTesting.php       |  2 +-
 tests/Api/PagesApiTest.php                    | 38 +++++++++++++++++++
 tests/Commands/ClearRevisionsCommandTest.php  |  4 +-
 tests/Entity/PageContentTest.php              | 26 ++++++-------
 tests/Entity/PageRevisionTest.php             |  4 +-
 tests/Entity/PageTest.php                     |  2 +-
 tests/Uploads/ImageTest.php                   |  4 +-
 10 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/app/Entities/Controllers/PageApiController.php b/app/Entities/Controllers/PageApiController.php
index ca8989f07..48782d70c 100644
--- a/app/Entities/Controllers/PageApiController.php
+++ b/app/Entities/Controllers/PageApiController.php
@@ -27,6 +27,7 @@ class PageApiController extends ApiController
             'markdown'   => ['required_without:html', 'string'],
             'tags'       => ['array'],
             'priority'   => ['integer'],
+            'changelog'  => ['string', 'min:1', 'max:180'],
         ],
         'update' => [
             'book_id'    => ['integer'],
@@ -36,6 +37,7 @@ class PageApiController extends ApiController
             'markdown'   => ['string'],
             'tags'       => ['array'],
             'priority'   => ['integer'],
+            'changelog'  => ['string', 'min:1', 'max:180'],
         ],
     ];
 
@@ -75,7 +77,7 @@ class PageApiController extends ApiController
      */
     public function create(Request $request): JsonResponse
     {
-        $this->validate($request, $this->rules['create']);
+        $validated = $this->validate($request, $this->rules['create']);
 
         if ($request->has('chapter_id')) {
             $parent = $this->entityQueries->chapters->findVisibleByIdOrFail(intval($request->input('chapter_id')));
@@ -85,7 +87,7 @@ class PageApiController extends ApiController
         $this->checkOwnablePermission(Permission::PageCreate, $parent);
 
         $draft = $this->pageRepo->getNewDraftPage($parent);
-        $this->pageRepo->publishDraft($draft, $request->only(array_keys($this->rules['create'])));
+        $this->pageRepo->publishDraft($draft, $validated);
 
         return response()->json($draft->forJsonDisplay());
     }
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 375bf1d2b..c4771b472 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -91,7 +91,7 @@ class PageRepo
             $draft = $this->baseRepo->update($draft, $input);
             $draft->rebuildPermissions();
 
-            $summary = trim($input['summary'] ?? '') ?: trans('entities.pages_initial_revision');
+            $summary = trim($input['changelog'] ?? '') ?: trans('entities.pages_initial_revision');
             $this->revisionRepo->storeNewForPage($draft, $summary);
             $draft->refresh();
 
@@ -134,7 +134,7 @@ class PageRepo
         $this->revisionRepo->deleteDraftsForCurrentUser($page);
 
         // Save a revision after updating
-        $summary = trim($input['summary'] ?? '');
+        $summary = trim($input['changelog'] ?? '');
         $htmlChanged = isset($input['html']) && $input['html'] !== $oldHtml;
         $nameChanged = isset($input['name']) && $input['name'] !== $oldName;
         $markdownChanged = isset($input['markdown']) && $input['markdown'] !== $oldMarkdown;
diff --git a/resources/views/pages/parts/editor-toolbar.blade.php b/resources/views/pages/parts/editor-toolbar.blade.php
index 8d39f7d5d..71a5fd284 100644
--- a/resources/views/pages/parts/editor-toolbar.blade.php
+++ b/resources/views/pages/parts/editor-toolbar.blade.php
@@ -108,7 +108,7 @@
                     <p class="text-muted pb-s">{{ trans('entities.pages_edit_enter_changelog_desc') }}</p>
                     <textarea
                         refs="page-editor@changelogInput"
-                        name="summary"
+                        name="changelog"
                         id="summary-input"
                         rows="2"
                         maxlength="180"
diff --git a/tests/Activity/WebhookFormatTesting.php b/tests/Activity/WebhookFormatTesting.php
index f04f95b66..876964c24 100644
--- a/tests/Activity/WebhookFormatTesting.php
+++ b/tests/Activity/WebhookFormatTesting.php
@@ -30,7 +30,7 @@ class WebhookFormatTesting extends TestCase
     public function test_page_create_and_update_events_show_revision_info()
     {
         $page = $this->entities->page();
-        $this->asEditor()->put($page->getUrl(), ['name' => 'Updated page', 'html' => 'new page html', 'summary' => 'Update a']);
+        $this->asEditor()->put($page->getUrl(), ['name' => 'Updated page', 'html' => 'new page html', 'changelog' => 'Update a']);
 
         $data = $this->getWebhookData(ActivityType::PAGE_UPDATE, $page);
         $this->assertEquals($page->currentRevision->id, Arr::get($data, 'related_item.current_revision.id'));
diff --git a/tests/Api/PagesApiTest.php b/tests/Api/PagesApiTest.php
index c7bf88772..d43c057ac 100644
--- a/tests/Api/PagesApiTest.php
+++ b/tests/Api/PagesApiTest.php
@@ -128,6 +128,27 @@ class PagesApiTest extends TestCase
         $this->assertStringContainsString('href="https://example.com"', $respHtml);
     }
 
+    public function test_create_can_accept_a_changelog_message()
+    {
+        $this->actingAsApiEditor();
+        $book = $this->entities->book();
+        $details = [
+            'name' => 'My updated API page',
+            'html' => '<p>A page updated via the API</p>',
+            'changelog' => 'This is a create changelog message via the API',
+            'book_id' => $book->id,
+        ];
+
+        $resp = $this->postJson($this->baseEndpoint, $details);
+        $resp->assertOk();
+
+        $pageId = $resp->json('id');
+        $page = Page::query()->findOrFail($pageId);
+
+        $latestRevision = $page->revisions()->orderBy('id', 'desc')->first();
+        $this->assertEquals('This is a create changelog message via the API', $latestRevision->summary);
+    }
+
     public function test_read_endpoint()
     {
         $this->actingAsApiEditor();
@@ -338,6 +359,23 @@ class PagesApiTest extends TestCase
         $this->assertGreaterThan(Carbon::now()->subDay()->unix(), $page->updated_at->unix());
     }
 
+    public function test_update_can_accept_a_changelog_message()
+    {
+        $this->actingAsApiEditor();
+        $page = $this->entities->page();
+        $details = [
+            'name' => 'My updated API page',
+            'html' => '<p>A page updated via the API</p>',
+            'changelog' => 'This is a changelog message via the API',
+        ];
+
+        $resp = $this->putJson($this->baseEndpoint . "/{$page->id}", $details);
+        $resp->assertOk();
+
+        $latestRevision = $page->revisions()->orderBy('id', 'desc')->first();
+        $this->assertEquals('This is a changelog message via the API', $latestRevision->summary);
+    }
+
     public function test_delete_endpoint()
     {
         $this->actingAsApiEditor();
diff --git a/tests/Commands/ClearRevisionsCommandTest.php b/tests/Commands/ClearRevisionsCommandTest.php
index a7aef958f..c1fde6a99 100644
--- a/tests/Commands/ClearRevisionsCommandTest.php
+++ b/tests/Commands/ClearRevisionsCommandTest.php
@@ -14,8 +14,8 @@ class ClearRevisionsCommandTest extends TestCase
         $this->asEditor();
         $pageRepo = app(PageRepo::class);
         $page = Page::first();
-        $pageRepo->update($page, ['name' => 'updated page', 'html' => '<p>new content</p>', 'summary' => 'page revision testing']);
-        $pageRepo->updatePageDraft($page, ['name' => 'updated page', 'html' => '<p>new content in draft</p>', 'summary' => 'page revision testing']);
+        $pageRepo->update($page, ['name' => 'updated page', 'html' => '<p>new content</p>', 'changelog' => 'page revision testing']);
+        $pageRepo->updatePageDraft($page, ['name' => 'updated page', 'html' => '<p>new content in draft</p>', 'changelog' => 'page revision testing']);
 
         $this->assertDatabaseHas('page_revisions', [
             'page_id' => $page->id,
diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
index 4d97e6b59..3cbb0e739 100644
--- a/tests/Entity/PageContentTest.php
+++ b/tests/Entity/PageContentTest.php
@@ -48,7 +48,7 @@ class PageContentTest extends TestCase
         $includeTag = '{{@' . $secondPage->id . '}}';
         $page->html = '<p>' . $includeTag . '</p>';
 
-        $resp = $this->put($page->getUrl(), ['name' => $page->name, 'html' => $page->html, 'summary' => '']);
+        $resp = $this->put($page->getUrl(), ['name' => $page->name, 'html' => $page->html, 'changelog' => '']);
 
         $resp->assertStatus(302);
 
@@ -127,7 +127,7 @@ class PageContentTest extends TestCase
         $pageSave = $this->put($page->getUrl(), [
             'name'    => $page->name,
             'html'    => $content,
-            'summary' => '',
+            'changelog' => '',
         ]);
         $pageSave->assertRedirect();
 
@@ -144,7 +144,7 @@ class PageContentTest extends TestCase
         $this->put($page->getUrl(), [
             'name'    => $page->name,
             'html'    => $content,
-            'summary' => '',
+            'changelog' => '',
         ]);
 
         $updatedPage = Page::query()->where('id', '=', $page->id)->first();
@@ -253,7 +253,7 @@ class PageContentTest extends TestCase
 | Paragraph   | Text        |';
         $this->put($page->getUrl(), [
             'name' => $page->name,  'markdown' => $content,
-            'html' => '', 'summary' => '',
+            'html' => '', 'changelog' => '',
         ]);
 
         $page->refresh();
@@ -272,7 +272,7 @@ class PageContentTest extends TestCase
 - [x] Item b';
         $this->put($page->getUrl(), [
             'name' => $page->name,  'markdown' => $content,
-            'html' => '', 'summary' => '',
+            'html' => '', 'changelog' => '',
         ]);
 
         $page->refresh();
@@ -292,7 +292,7 @@ class PageContentTest extends TestCase
         $content = '~~some crossed out text~~';
         $this->put($page->getUrl(), [
             'name' => $page->name,  'markdown' => $content,
-            'html' => '', 'summary' => '',
+            'html' => '', 'changelog' => '',
         ]);
 
         $page->refresh();
@@ -311,7 +311,7 @@ class PageContentTest extends TestCase
         $content = '<!-- Test Comment -->';
         $this->put($page->getUrl(), [
             'name' => $page->name,  'markdown' => $content,
-            'html' => '', 'summary' => '',
+            'html' => '', 'changelog' => '',
         ])->assertRedirect();
 
         $page->refresh();
@@ -328,7 +328,7 @@ class PageContentTest extends TestCase
         $page = $this->entities->page();
 
         $this->put($page->getUrl(), [
-            'name' => $page->name, 'summary' => '',
+            'name' => $page->name, 'changelog' => '',
             'html' => '<p>test<img src="data:image/jpeg;base64,' . $this->base64Jpeg . '"/></p>',
         ]);
 
@@ -352,7 +352,7 @@ class PageContentTest extends TestCase
         $base64PngWithWhitespace = "iVBORw0KGg\noAAAANSUhE\tUgAAAAEAAAA BCA   YAAAAfFcSJAAA\n\t ACklEQVR4nGMAAQAABQAB";
         $base64PngWithoutWhitespace = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQAB';
         $this->put($page->getUrl(), [
-            'name' => $page->name, 'summary' => '',
+            'name' => $page->name, 'changelog' => '',
             'html' => '<p>test<img src="data:image/png;base64,' . $base64PngWithWhitespace . '"/></p>',
         ]);
 
@@ -381,7 +381,7 @@ class PageContentTest extends TestCase
             $page = $this->entities->page();
 
             $this->put($page->getUrl(), [
-                'name' => $page->name, 'summary' => '',
+                'name' => $page->name, 'changelog' => '',
                 'html' => '<p>test<img src="data:image/' . $extension . ';base64,' . $this->base64Jpeg . '"/></p>',
             ]);
 
@@ -425,7 +425,7 @@ class PageContentTest extends TestCase
         $page = $this->entities->page();
 
         $this->put($page->getUrl(), [
-            'name'     => $page->name, 'summary' => '',
+            'name'     => $page->name, 'changelog' => '',
             'markdown' => 'test ![test](data:image/jpeg;base64,' . $this->base64Jpeg . ')',
         ]);
 
@@ -456,7 +456,7 @@ class PageContentTest extends TestCase
         $base64Content = base64_encode($content);
 
         $this->put($page->getUrl(), [
-            'name'     => $page->name, 'summary' => '',
+            'name'     => $page->name, 'changelog' => '',
             'markdown' => 'test ![test](data:image/jpeg;base64,' . $base64Content . ') ![test](data:image/jpeg;base64,' . $base64Content . ')',
         ]);
 
@@ -479,7 +479,7 @@ class PageContentTest extends TestCase
         $page = $this->entities->page();
 
         $this->asEditor()->put($page->getUrl(), [
-            'name'     => $page->name, 'summary' => '',
+            'name'     => $page->name, 'changelog' => '',
             'markdown' => 'test ![test](data:image/jiff;base64,' . $this->base64Jpeg . ')',
         ]);
 
diff --git a/tests/Entity/PageRevisionTest.php b/tests/Entity/PageRevisionTest.php
index 8b46e84a6..fc8243df5 100644
--- a/tests/Entity/PageRevisionTest.php
+++ b/tests/Entity/PageRevisionTest.php
@@ -119,7 +119,7 @@ class PageRevisionTest extends TestCase
     {
         $this->asEditor();
         $page = $this->entities->page();
-        $this->createRevisions($page, 1, ['name' => 'updated page abc123', 'html' => '<p>new contente def456</p>', 'summary' => 'My first update']);
+        $this->createRevisions($page, 1, ['name' => 'updated page abc123', 'html' => '<p>new contente def456</p>', 'changelog' => 'My first update']);
         $this->createRevisions($page, 1, ['html' => '<p>new content</p>']);
         $page->refresh();
 
@@ -327,7 +327,7 @@ class PageRevisionTest extends TestCase
         $user = user();
 
         for ($i = 0; $i < $times; $i++) {
-            $data = ['name' => 'Page update' . $i, 'summary' => 'Update entry' . $i];
+            $data = ['name' => 'Page update' . $i, 'changelog' => 'Update entry' . $i];
             if (!isset($attrs['markdown'])) {
                 $data['html'] = '<p>My update page</p>';
             }
diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php
index 0da76b8e9..d9e6ccf3c 100644
--- a/tests/Entity/PageTest.php
+++ b/tests/Entity/PageTest.php
@@ -98,7 +98,7 @@ class PageTest extends TestCase
         $details = [
             'html'    => '<h1>a title</h1>',
             'name'    => 'My page with summary',
-            'summary' => 'Here is my changelog message for a new page!',
+            'changelog' => 'Here is my changelog message for a new page!',
         ];
         $resp = $this->post($book->getUrl("/draft/{$draft->id}"), $details);
         $resp->assertRedirect();
diff --git a/tests/Uploads/ImageTest.php b/tests/Uploads/ImageTest.php
index ac7bf31e4..e7d435db5 100644
--- a/tests/Uploads/ImageTest.php
+++ b/tests/Uploads/ImageTest.php
@@ -819,7 +819,7 @@ class ImageTest extends TestCase
         $pageRepo->update($page, [
             'name'    => $page->name,
             'html'    => $page->html . "<img src=\"{$image->url}\">",
-            'summary' => '',
+            'changelog' => '',
         ]);
 
         // Ensure no images are reported as deletable
@@ -831,7 +831,7 @@ class ImageTest extends TestCase
         $pageRepo->update($page, [
             'name'    => $page->name,
             'html'    => '<p>Hello</p>',
-            'summary' => '',
+            'changelog' => '',
         ]);
 
         // Ensure revision images are picked up okay

From 7539933d48c824b641a744c5b22d63a48e6d8cc3 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Fri, 28 Aug 2026 11:34:43 +0100
Subject: [PATCH 46/72] User Account: Require existing password on password
 change

For #6181
Just in users' my account area for now.
To add to admin-level actions in the future once we can better trace
session life.
Updated/added tests to cover.
---
 app/Http/Middleware/TrimStrings.php           |  1 +
 .../Controllers/UserAccountController.php     |  6 +++--
 lang/en/auth.php                              |  3 +++
 lang/en/validation.php                        |  1 +
 resources/views/users/account/auth.blade.php  | 11 +++++---
 tests/User/UserMyAccountTest.php              | 25 +++++++++++++++++++
 6 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
index ec5725d67..a7596d4ac 100644
--- a/app/Http/Middleware/TrimStrings.php
+++ b/app/Http/Middleware/TrimStrings.php
@@ -15,5 +15,6 @@ class TrimStrings extends Middleware
         'password',
         'password_confirmation',
         'password-confirm',
+        'password-current',
     ];
 }
diff --git a/app/Users/Controllers/UserAccountController.php b/app/Users/Controllers/UserAccountController.php
index 71d8ca78d..e00344973 100644
--- a/app/Users/Controllers/UserAccountController.php
+++ b/app/Users/Controllers/UserAccountController.php
@@ -13,6 +13,7 @@ use BookStack\Users\UserRepo;
 use BookStack\View\ViewBlockManager;
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\Rules\Password;
 
 class UserAccountController extends Controller
@@ -220,8 +221,9 @@ class UserAccountController extends Controller
         }
 
         $validated = $this->validate($request, [
-            'password'         => ['required_with:password_confirm', Password::default()],
-            'password-confirm' => ['same:password', 'required_with:password'],
+            'password'         => ['required', Password::default()],
+            'password-confirm' => ['required', 'same:password'],
+            'password-current' => ['required', 'current_password:standard'],
         ]);
 
         $this->userRepo->update(user(), $validated, false);
diff --git a/lang/en/auth.php b/lang/en/auth.php
index 47be4ea72..13247c731 100644
--- a/lang/en/auth.php
+++ b/lang/en/auth.php
@@ -21,6 +21,9 @@ return [
     'username' => 'Username',
     'email' => 'Email',
     'password' => 'Password',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Confirm Password',
     'password_hint' => 'Must be at least 8 characters',
     'forgot_password' => 'Forgot Password?',
diff --git a/lang/en/validation.php b/lang/en/validation.php
index 532d861d2..3b76b99d1 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -26,6 +26,7 @@ return [
     ],
     'boolean'              => 'The :attribute field must be true or false.',
     'confirmed'            => 'The :attribute confirmation does not match.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'The :attribute is not a valid date.',
     'date_format'          => 'The :attribute does not match the format :format.',
     'different'            => 'The :attribute and :other must be different.',
diff --git a/resources/views/users/account/auth.blade.php b/resources/views/users/account/auth.blade.php
index 57e6c1f9c..1dadded3d 100644
--- a/resources/views/users/account/auth.blade.php
+++ b/resources/views/users/account/auth.blade.php
@@ -14,17 +14,22 @@
                     {{ trans('preferences.auth_change_password_desc') }}
                 </p>
 
-                <div class="grid half mt-m gap-xl wrap stretch-inputs mb-m">
+                <div class="grid half mt-m gap-xl wrap stretch-inputs mb-s">
                     <div>
-                        <label for="password">{{ trans('auth.password') }}</label>
+                        <label for="password">{{ trans('auth.password_new') }}</label>
                         @include('form.password', ['name' => 'password', 'autocomplete' => 'new-password'])
                     </div>
                     <div>
-                        <label for="password-confirm">{{ trans('auth.password_confirm') }}</label>
+                        <label for="password-confirm">{{ trans('auth.password_new_confirm') }}</label>
                         @include('form.password', ['name' => 'password-confirm'])
                     </div>
                 </div>
 
+                <div class="stretch-inputs mb-m">
+                    <label for="password-current">{{ trans('auth.password_current') }}</label>
+                    @include('form.password', ['name' => 'password-current'])
+                </div>
+
                 <div class="form-group text-right">
                     <button class="button">{{ trans('common.update') }}</button>
                 </div>
diff --git a/tests/User/UserMyAccountTest.php b/tests/User/UserMyAccountTest.php
index 3766f8b69..e2c054bef 100644
--- a/tests/User/UserMyAccountTest.php
+++ b/tests/User/UserMyAccountTest.php
@@ -135,6 +135,8 @@ class UserMyAccountTest extends TestCase
     public function test_auth_password_change()
     {
         $editor = $this->users->editor();
+        $editor->password = Hash::make('password');
+        $editor->save();
 
         $resp = $this->actingAs($editor)->get('/my-account/auth');
         $resp->assertSee('Change Password');
@@ -144,6 +146,7 @@ class UserMyAccountTest extends TestCase
         $resp = $this->put('/my-account/auth/password', [
             'password' => $password,
             'password-confirm' => $password,
+            'password-current' => 'password'
         ]);
         $resp->assertRedirect('/my-account/auth');
 
@@ -151,6 +154,28 @@ class UserMyAccountTest extends TestCase
         $this->assertTrue(Hash::check($password, $editor->password));
     }
 
+    public function test_auth_password_change_requires_current_password()
+    {
+        $editor = $this->users->editor();
+        $editor->password = Hash::make('password');
+        $editor->save();
+
+        $this->actingAs($editor)->get('/my-account/auth');
+
+        $password = Str::random();
+        $resp = $this->put('/my-account/auth/password', [
+            'password' => $password,
+            'password-confirm' => $password,
+            'password-current' => 'caterpillar'
+        ]);
+        $resp->assertRedirect('/my-account/auth');
+        $resp->assertSessionHasErrors(['password-current']);
+
+        $editor->refresh();
+        $this->assertFalse(Hash::check($password, $editor->password));
+        $this->assertTrue(Hash::check('password', $editor->password));
+    }
+
     public function test_auth_password_change_hides_if_not_using_email_auth()
     {
         $editor = $this->users->editor();

From 18f8469a1c72f8cc8497e9372635e6dea5028071 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 31 Aug 2026 11:49:14 +0100
Subject: [PATCH 47/72] LDAP: Fixed handling of invalid group values

Updated LDAP group handling to properly handle empty group values by
checking the explode's count property instead of performing a general
array count.
Also updated logic with DN validation/filtering before LDAP calls are
made.

For #6088
---
 app/Access/Ldap.php        |  4 +--
 app/Access/LdapService.php | 23 +++++++++++++--
 tests/Auth/LdapTest.php    | 60 +++++++++++++++++++++++++++++++-------
 3 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/app/Access/Ldap.php b/app/Access/Ldap.php
index d14f68821..54d2af72d 100644
--- a/app/Access/Ldap.php
+++ b/app/Access/Ldap.php
@@ -48,7 +48,7 @@ class Ldap
     }
 
     /**
-     * Search LDAP tree using the provided filter.
+     * Search the LDAP tree using the provided filter.
      *
      * @param resource|\LDAP\Connection   $ldapConnection
      *
@@ -95,7 +95,7 @@ class Ldap
     }
 
     /**
-     * Bind to LDAP directory.
+     * Bind to the LDAP directory.
      *
      * @param resource|\LDAP\Connection $ldapConnection
      */
diff --git a/app/Access/LdapService.php b/app/Access/LdapService.php
index 0f456efc2..648262508 100644
--- a/app/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -346,13 +346,15 @@ class LdapService
         }
 
         $userGroups = $this->extractGroupsFromSearchResponseEntry($user);
-        $allGroups = $this->getGroupsRecursive($userGroups, []);
+        $filteredGroups = $this->filterGroups($userGroups);
+        $allGroups = $this->getGroupsRecursive($filteredGroups, []);
         $formattedGroups = $this->extractGroupNamesFromLdapGroupDns($allGroups);
 
         if ($this->config['dump_user_groups']) {
             throw new JsonDebugException([
                 'details_from_ldap'            => $user,
                 'parsed_direct_user_groups'    => $userGroups,
+                'parsed_filtered_user_groups'  => $filteredGroups,
                 'parsed_recursive_user_groups' => $allGroups,
                 'parsed_resulting_group_names' => $formattedGroups,
             ]);
@@ -367,7 +369,7 @@ class LdapService
 
         foreach ($groupDNs as $groupDN) {
             $exploded = $this->ldap->explodeDn($groupDN, 1);
-            if ($exploded !== false && count($exploded) > 0) {
+            if ($exploded !== false && $exploded['count'] > 0) {
                 $names[] = $exploded[0];
             }
         }
@@ -390,7 +392,8 @@ class LdapService
             }
 
             $parentGroups = $this->getParentsOfGroup($groupDN);
-            $groupsToAdd = array_merge($groupsToAdd, $parentGroups);
+            $parentGroupsFiltered = $this->filterGroups($parentGroups);
+            $groupsToAdd = array_merge($groupsToAdd, $parentGroupsFiltered);
             $checked[] = $groupDN;
         }
 
@@ -403,6 +406,20 @@ class LdapService
         return $this->getGroupsRecursive($uniqueDNs, $checked);
     }
 
+    /**
+     * @param string[] $groupDNs
+     * @return string[]
+     */
+    protected function filterGroups(array $groupDNs): array
+    {
+        $filtered = array_filter($groupDNs, function (string $groupDN) {
+            $exploded = $this->ldap->explodeDn($groupDN, 1);
+            return $exploded !== false && $exploded['count'] > 0;
+        });
+
+        return array_values($filtered);
+    }
+
     /**
      * @throws LdapException
      */
diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index 5adbe11a1..9bf15ae2b 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -43,7 +43,7 @@ class LdapTest extends TestCase
         $this->mockUser = User::factory()->make();
     }
 
-    protected function runFailedAuthLogin()
+    protected function runFailedAuthLogin(): void
     {
         $this->commonLdapMocks(1, 1, 1, 1, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
@@ -51,14 +51,14 @@ class LdapTest extends TestCase
         $this->post('/login', ['username' => 'timmyjenkins', 'password' => 'cattreedog']);
     }
 
-    protected function mockEscapes($times = 1)
+    protected function mockEscapes($times = 1): void
     {
         $this->mockLdap->shouldReceive('escape')->times($times)->andReturnUsing(function ($val) {
             return ldap_escape($val);
         });
     }
 
-    protected function mockExplodes($times = 1)
+    protected function mockExplodes($times = 1): void
     {
         $this->mockLdap->shouldReceive('explodeDn')->times($times)->andReturnUsing(function ($dn, $withAttrib) {
             return ldap_explode_dn($dn, $withAttrib);
@@ -76,7 +76,7 @@ class LdapTest extends TestCase
     /**
      * Set LDAP method mocks for things we commonly call without altering.
      */
-    protected function commonLdapMocks(int $connects = 1, int $versions = 1, int $options = 2, int $binds = 4, int $escapes = 2, int $explodes = 0, int $groups = 0)
+    protected function commonLdapMocks(int $connects = 1, int $versions = 1, int $options = 2, int $binds = 4, int $escapes = 2, int $explodes = 0, int $groups = 0): void
     {
         $this->mockLdap->shouldReceive('connect')->times($connects)->andReturn($this->resourceId);
         $this->mockLdap->shouldReceive('setVersion')->times($versions);
@@ -364,7 +364,7 @@ class LdapTest extends TestCase
             'services.ldap.remove_from_groups' => false,
         ]);
 
-        $this->commonLdapMocks(1, 1, 4, 5, 2, 2, 2);
+        $this->commonLdapMocks(1, 1, 4, 5, 2, 4, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
@@ -409,7 +409,7 @@ class LdapTest extends TestCase
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 3, 4, 2, 1, 1);
+        $this->commonLdapMocks(1, 1, 3, 4, 2, 2, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
@@ -451,7 +451,7 @@ class LdapTest extends TestCase
             'dn'       => 'dc=test,' . config('services.ldap.base_dn'),
             'mail'     => [$this->mockUser->email],
         ]];
-        $this->commonLdapMocks(1, 1, 4, 5, 2, 2, 0);
+        $this->commonLdapMocks(1, 1, 4, 5, 2, 4, 0);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn($userResp, ['count' => 1,
@@ -523,7 +523,7 @@ class LdapTest extends TestCase
                       ],
         ];
 
-        $this->commonLdapMocks(1, 1, 3, 4, 2, 1);
+        $this->commonLdapMocks(1, 1, 3, 4, 2, 2);
 
         $escapedName = ldap_escape($this->mockUser->name);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->twice()
@@ -559,7 +559,7 @@ class LdapTest extends TestCase
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 3, 4, 2, 1, 1);
+        $this->commonLdapMocks(1, 1, 3, 4, 2, 2, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
@@ -600,7 +600,7 @@ class LdapTest extends TestCase
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 4, 5, 2, 2, 2);
+        $this->commonLdapMocks(1, 1, 4, 5, 2, 4, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
@@ -628,6 +628,44 @@ class LdapTest extends TestCase
         ]);
     }
 
+    public function test_login_group_mapping_gracefully_handles_utf8_and_invalid_group_dns()
+    {
+        $invalidRole = Role::factory()->create(['display_name' => 'LdapTester']);
+        $invalidRole2 = Role::factory()->create(['display_name' => 'beans']);
+        $roleToReceive2 = Role::factory()->create(['display_name' => 'ldapper']);
+        $this->mockUser->forceFill(['external_auth_id' => $this->mockUser->name])->save();
+
+        app('config')->set([
+            'services.ldap.user_to_groups'     => true,
+            'services.ldap.group_attribute'    => 'memberOf',
+            'services.ldap.remove_from_groups' => true,
+        ]);
+
+        $this->commonLdapMocks(1, 1, 4, 5, 2, 6, 2);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
+            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->andReturn(['count' => 1, 0 => [
+                'uid'      => [$this->mockUser->name],
+                'cn'       => [$this->mockUser->name],
+                'dn'       => 'dc=test' . config('services.ldap.base_dn'),
+                'mail'     => [$this->mockUser->email],
+                'memberof' => [
+                    'count' => 4,
+                    0       => 'cn=ldaptëstër,ou=groups,dc=ëxamplë,dc=com',
+                    1       => 'cn=ldapper,ou=groups,dc=example,dc=com',
+                    2       => 'bëans',
+                    3       => '',
+                ],
+            ]]);
+
+        $this->mockUserLogin()->assertRedirect('/');
+
+        $user = User::query()->where('email', $this->mockUser->email)->first();
+        $this->assertDatabaseMissing('role_user', ['user_id' => $user->id, 'role_id' => $invalidRole->id]);
+        $this->assertDatabaseMissing('role_user', ['user_id' => $user->id, 'role_id' => $invalidRole2->id]);
+        $this->assertDatabaseHas('role_user', ['user_id' => $user->id, 'role_id' => $roleToReceive2->id]);
+    }
+
     public function test_login_uses_specified_display_name_attribute()
     {
         app('config')->set([
@@ -867,7 +905,7 @@ class LdapTest extends TestCase
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 6, 8, 4, 2, 2);
+        $this->commonLdapMocks(1, 1, 6, 8, 4, 4, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')
             ->times(4)
             ->andReturn(['count' => 1, 0 => [

From 13a1883b6c0baad8912d4990f562c6ed9f0276be Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Thu, 3 Sep 2026 13:19:07 +0100
Subject: [PATCH 48/72] Page Filtering: Fixed table cell alignment being
 stripped

Cells could have an 'align' attribute, especially when created via
markdown. This updates the allow filtering to retain valid align values
on table cells.

For #6167
---
 app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php | 4 ++++
 tests/Entity/PageContentFilteringTest.php        | 1 +
 2 files changed, 5 insertions(+)

diff --git a/app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php b/app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php
index 77fa304e6..883b0f176 100644
--- a/app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php
+++ b/app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php
@@ -165,6 +165,10 @@ class ConfiguredHtmlPurifier
         // Allow mention-ids on links
         $definition->addAttribute('a', 'data-mention-user-id', 'Number');
 
+        // Allow 'align' attribute on table cells
+        $definition->addAttribute('td', 'align', 'Enum#left,center,right');
+        $definition->addAttribute('th', 'align', 'Enum#left,center,right');
+
         // Set up custom handler for srcset
         // To remove once added upstream: https://github.com/xemlock/htmlpurifier-html5/pull/91
         $definition->addAttribute('img', 'srcset', new SrcsetAttrDef());
diff --git a/tests/Entity/PageContentFilteringTest.php b/tests/Entity/PageContentFilteringTest.php
index d20bdf17b..f6bfa76ce 100644
--- a/tests/Entity/PageContentFilteringTest.php
+++ b/tests/Entity/PageContentFilteringTest.php
@@ -526,6 +526,7 @@ HTML;
             '<p><a href="sftp://example.com/a/link/to/file">Link to file</a></p>',
             '<p><a href="#hello-section">Link to another section</a></p>',
             '<details><summary>Hello</summary><p>Mydetailshere</p></details>',
+            '<table><tr><th align="right">Hello</th></tr><tr><td align="center">Hello</td></tr></table>',
         ];
 
         config()->set('app.content_filtering', 'a');

From 4d5e9fc8c40b57f5b2fb57b5e747d1596cb780cf Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Thu, 3 Sep 2026 18:37:16 +0100
Subject: [PATCH 49/72] Lexical: Fixed re-focus after modal in some cases

Updated code editor display so the editor area actually gains focus
again.
Updated modal handling to delegate focus handling to the editor if focus
was on the edit area before, to prevent cursor jumps to the start.
---
 .../lexical/rich-text/LexicalCodeBlockNode.ts |  6 ++--
 .../js/wysiwyg/services/keyboard-handling.ts  | 28 ++++++-------------
 resources/js/wysiwyg/ui/framework/modals.ts   |  5 +++-
 resources/js/wysiwyg/utils/actions.ts         | 21 ++++++++++++--
 resources/js/wysiwyg/utils/nodes.ts           | 17 +++++++++++
 5 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
index 49ba7754c..8f9ec7148 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
@@ -11,6 +11,7 @@ import type {EditorConfig} from "lexical/LexicalEditor";
 import {EditorDecoratorAdapter} from "../../ui/framework/decorator";
 import {CodeEditor} from "../../../components";
 import {el} from "../../utils/dom";
+import {focusEditor} from "../../utils/actions";
 
 export type SerializedCodeBlockNode = Spread<{
     language: string;
@@ -197,8 +198,9 @@ export function $openCodeEditorForNode(editor: LexicalEditor, node: CodeBlockNod
             node.setCode(newCode);
             node.setLanguage(newLang);
         });
-        // TODO - Re-focus
+
+        focusEditor(editor);
     }, () => {
-        // TODO - Re-focus
+        focusEditor(editor);
     });
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index aba0b1aa8..2330fd5a6 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -2,7 +2,6 @@ import {EditorUiContext} from "../ui/framework/core";
 import {
     $createParagraphNode,
     $getSelection,
-    $isDecoratorNode,
     COMMAND_PRIORITY_LOW, KEY_ARROW_DOWN_COMMAND, KEY_ARROW_UP_COMMAND,
     KEY_BACKSPACE_COMMAND,
     KEY_DELETE_COMMAND,
@@ -10,34 +9,25 @@ import {
     LexicalEditor,
     LexicalNode
 } from "lexical";
-import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
-import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {getLastSelection} from "../utils/selection";
-import {$getNearestNodeBlockParent, $getParentOfType, $selectOrCreateAdjacent} from "../utils/nodes";
+import {
+    $getNearestNodeBlockParent,
+    $getParentOfType,
+    $isSingleSelectableNode,
+    $selectOrCreateAdjacent
+} from "../utils/nodes";
 import {$setInsetForSelection} from "../utils/lists";
 import {$isListItemNode} from "@lexical/list";
 import {$isDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
-import {$isDiagramNode} from "../utils/diagrams";
 import {$unwrapDetailsNode} from "../utils/details";
 
-function isSingleSelectedNode(nodes: LexicalNode[]): boolean {
-    if (nodes.length === 1) {
-        const node = nodes[0];
-        if ($isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node) || $isDiagramNode(node)) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
 /**
  * Delete the current node in the selection if the selection contains a single
  * selected node (like image, media etc...).
  */
 function deleteSingleSelectedNode(editor: LexicalEditor) {
     const selectionNodes = getLastSelection(editor)?.getNodes() || [];
-    if (isSingleSelectedNode(selectionNodes)) {
+    if ($isSingleSelectableNode(selectionNodes)) {
         editor.update(() => {
             selectionNodes[0].remove();
         });
@@ -50,7 +40,7 @@ function deleteSingleSelectedNode(editor: LexicalEditor) {
  */
 function insertAdjacentToSingleSelectedNode(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
     const selectionNodes = getLastSelection(editor)?.getNodes() || [];
-    if (isSingleSelectedNode(selectionNodes)) {
+    if ($isSingleSelectableNode(selectionNodes)) {
         const node = selectionNodes[0];
         const nearestBlock = $getNearestNodeBlockParent(node) || node;
         const insertBefore = event?.shiftKey === true;
@@ -76,7 +66,7 @@ function insertAdjacentToSingleSelectedNode(editor: LexicalEditor, event: Keyboa
 
 function focusAdjacentOrInsertForSingleSelectNode(editor: LexicalEditor, event: KeyboardEvent|null, after: boolean = true): boolean {
     const selectionNodes = getLastSelection(editor)?.getNodes() || [];
-    if (!isSingleSelectedNode(selectionNodes)) {
+    if (!$isSingleSelectableNode(selectionNodes)) {
         return false;
     }
 
diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
index 3f5a5881f..669b80c59 100644
--- a/resources/js/wysiwyg/ui/framework/modals.ts
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -39,7 +39,10 @@ export class EditorFormModal extends EditorContainerUiElement {
     hide() {
         this.getContext().manager.setModalInactive(this.key);
         this.teardown();
-        if (this.originalFocus instanceof HTMLElement && this.originalFocus.isConnected) {
+
+        if (this.originalFocus === this.getContext().editorDOM) {
+            this.getContext().editor.focus();
+        } else if (this.originalFocus instanceof HTMLElement && this.originalFocus.isConnected) {
             this.originalFocus.focus();
         }
     }
diff --git a/resources/js/wysiwyg/utils/actions.ts b/resources/js/wysiwyg/utils/actions.ts
index c1d819f22..9724a9b66 100644
--- a/resources/js/wysiwyg/utils/actions.ts
+++ b/resources/js/wysiwyg/utils/actions.ts
@@ -1,6 +1,19 @@
-import {$createParagraphNode, $getRoot, $getSelection, $insertNodes, $isBlockElementNode, LexicalEditor} from "lexical";
+import {
+    $createParagraphNode,
+    $getRoot,
+    $getSelection,
+    $insertNodes,
+    $isBlockElementNode,
+    LexicalEditor,
+} from "lexical";
 import {$generateHtmlFromNodes} from "@lexical/html";
-import {$getAllNodesOfType, $getNearestNodeBlockParent, $htmlToBlockNodes, $htmlToNodes} from "./nodes";
+import {
+    $getAllNodesOfType,
+    $getNearestNodeBlockParent,
+    $htmlToBlockNodes,
+    $htmlToNodes,
+    $isSingleSelectableNode
+} from "./nodes";
 import {$isHeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 
 export function setEditorContentFromHtml(editor: LexicalEditor, html: string) {
@@ -99,6 +112,10 @@ export function focusEditor(editor: LexicalEditor): void {
         if (firstChild && !selection) {
             firstChild.selectStart();
         }
+
+        if ($isSingleSelectableNode(selection?.getNodes() || [])) {
+            editor._rootElement?.focus();
+        }
     });
     editor.commitUpdates();
     editor.focus(() => {}, {defaultSelection: "rootStart"});
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index eab8203a0..ccbe6e87c 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -14,6 +14,9 @@ import {$generateNodesFromDOM} from "@lexical/html";
 import {htmlToDom} from "./dom";
 import {NodeHasAlignment, NodeHasInset} from "lexical/nodes/common";
 import {$findMatchingParent} from "@lexical/utils";
+import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
+import {$isDiagramNode} from "./diagrams";
 
 function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
     return nodes.map(node => {
@@ -159,6 +162,20 @@ export function $selectOrCreateAdjacent(node: LexicalNode, after: boolean): Rang
     return after ? target.selectStart() : target.selectEnd();
 }
 
+/**
+ * Check if the range of nodes represents a single node which is wholly selectable.
+ */
+export function $isSingleSelectableNode(nodes: LexicalNode[]): boolean {
+    if (nodes.length === 1) {
+        const node = nodes[0];
+        if ($isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node) || $isDiagramNode(node)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 export function nodeHasAlignment(node: object): node is NodeHasAlignment {
     return '__alignment' in node;
 }

From 74e271c6398be1f4a959e999bfcfc0a54739365f Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Thu, 3 Sep 2026 19:18:07 +0100
Subject: [PATCH 50/72] Lexical: Added missing code block direction handling

Adds some base text direction handling to decorator nodes which can be
used by nodes where it makes sense, like for the code block node.
---
 .../core/nodes/LexicalDecoratorNode.ts        | 13 +++++++
 .../lexical/rich-text/LexicalCodeBlockNode.ts | 38 ++++++++++++++++---
 .../wysiwyg/ui/defaults/buttons/alignments.ts |  7 +++-
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
index 5015f593e..a259a51bd 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
@@ -25,6 +25,8 @@ export interface DecoratorNode<T> {
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class DecoratorNode<T> extends LexicalNode {
   declare ['constructor']: KlassConstructor<typeof DecoratorNode<T>>;
+  __dir: 'ltr' | 'rtl' | null = null;
+
   constructor(key?: NodeKey) {
     super(key);
   }
@@ -47,6 +49,17 @@ export class DecoratorNode<T> extends LexicalNode {
   isKeyboardSelectable(): boolean {
     return true;
   }
+
+  getDirection(): 'ltr' | 'rtl' | null {
+    const self = this.getLatest();
+    return self.__dir;
+  }
+
+  setDirection(direction: 'ltr' | 'rtl' | null): this {
+    const self = this.getWritable();
+    self.__dir = direction;
+    return self;
+  }
 }
 
 export function $isDecoratorNode<T>(
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
index 8f9ec7148..342d43fc2 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
@@ -12,11 +12,13 @@ import {EditorDecoratorAdapter} from "../../ui/framework/decorator";
 import {CodeEditor} from "../../../components";
 import {el} from "../../utils/dom";
 import {focusEditor} from "../../utils/actions";
+import {elem} from "../../../services/dom";
 
 export type SerializedCodeBlockNode = Spread<{
     language: string;
     id: string;
     code: string;
+    dir: 'ltr' | 'rtl' | null;
 }, SerializedLexicalNode>
 
 const getLanguageFromClassList = (classes: string) => {
@@ -36,6 +38,7 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
     static clone(node: CodeBlockNode): CodeBlockNode {
         const newNode = new CodeBlockNode(node.__language, node.__code, node.__key);
         newNode.__id = node.__id;
+        newNode.__dir = node.__dir;
         return newNode;
     }
 
@@ -99,32 +102,48 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
             }, [this.__code]),
         ]);
 
-        return el('div', {class: 'editor-code-block-wrap'}, [codeBlock]);
+        return el('div', {
+            class: 'editor-code-block-wrap',
+            dir: this.__dir,
+        }, [codeBlock]);
     }
 
     updateDOM(prevNode: CodeBlockNode, dom: HTMLElement) {
         const code = dom.querySelector('code');
-        if (!code) return false;
+        const pre = dom.querySelector('pre');
+        if (!code || !pre) return false;
 
         if (prevNode.__language !== this.__language) {
             code.className = this.__language ? `language-${this.__language}` : '';
         }
 
         if (prevNode.__id !== this.__id) {
-            dom.setAttribute('id', this.__id);
+            pre.setAttribute('id', this.__id);
         }
 
         if (prevNode.__code !== this.__code) {
             code.textContent = this.__code;
         }
 
+        if (prevNode.__dir !== this.__dir) {
+            if (this.__dir !== null) {
+                dom.setAttribute('dir', this.__dir)
+            } else {
+                dom.removeAttribute('dir');
+            }
+        }
+
         return false;
     }
 
     exportDOM(editor: LexicalEditor): DOMExportOutput {
         const dom = this.createDOM(editor._config, editor);
+        const pre = dom.querySelector('pre') as HTMLElement;
+        if (this.__dir !== null) {
+            pre.setAttribute('dir', this.__dir);
+        }
         return {
-            element: dom.querySelector('pre') as HTMLElement,
+            element: pre,
         };
     }
 
@@ -146,6 +165,10 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
                             node.setId(element.id);
                         }
 
+                        if (element.dir && (element.dir === 'ltr' || element.dir === 'rtl')) {
+                            node.setDirection(element.dir);
+                        }
+
                         return {
                             node,
                             after(childNodes): LexicalNode[] {
@@ -168,12 +191,14 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
             id: this.__id,
             language: this.__language,
             code: this.__code,
+            dir: this.__dir,
         };
     }
 
     static importJSON(serializedNode: SerializedCodeBlockNode): CodeBlockNode {
         const node = $createCodeBlockNode(serializedNode.language, serializedNode.code);
         node.setId(serializedNode.id || '');
+        node.setDirection(serializedNode.dir || null);
         return node;
     }
 }
@@ -189,11 +214,12 @@ export function $isCodeBlockNode(node: LexicalNode | null | undefined) {
 export function $openCodeEditorForNode(editor: LexicalEditor, node: CodeBlockNode): void {
     const code = node.getCode();
     const language = node.getLanguage();
+    const direction = node.getDirection() || 'ltr';
 
     // @ts-ignore
     const codeEditor = window.$components.first('code-editor') as CodeEditor;
-    // TODO - Handle direction
-    codeEditor.open(code, language, 'ltr', (newCode: string, newLang: string) => {
+
+    codeEditor.open(code, language, direction, (newCode: string, newLang: string) => {
         editor.update(() => {
             node.setCode(newCode);
             node.setLanguage(newLang);
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index 98edf44b3..52f2af5a2 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -8,7 +8,7 @@ import alignJustifyIcon from "@icons/editor/align-justify.svg";
 import ltrIcon from "@icons/editor/direction-ltr.svg";
 import rtlIcon from "@icons/editor/direction-rtl.svg";
 import {
-    $getBlockElementNodesInSelection,
+    $getBlockElementNodesInSelection, $getDecoratorNodesInSelection,
     $selectionContainsAlignment, $selectionContainsDirection, $selectSingleNode, getLastSelection
 } from "../../../utils/selection";
 import {CommonBlockAlignment} from "lexical/nodes/common";
@@ -47,6 +47,11 @@ function setDirectionForSelection(context: EditorUiContext, direction: 'ltr' | '
         node.setDirection(direction);
     }
 
+    const decoratorNodes = $getDecoratorNodesInSelection(selection);
+    for (const node of decoratorNodes) {
+        node.setDirection(direction);
+    }
+
     context.manager.triggerFutureStateRefresh();
 }
 

From e573d2458bc1b37e5aa6efc3ae540a5936e715d5 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Fri, 4 Sep 2026 15:16:01 +0100
Subject: [PATCH 51/72] Lexical: Added enter/shift+enter handling for images in
 list items

Added testing to cover
---
 .../lexical/core/__tests__/utils/index.ts     |  15 +++
 .../__tests__/keyboard-handling.test.ts       | 110 +++++++++++++++++-
 .../js/wysiwyg/services/keyboard-handling.ts  |  65 +++++++----
 resources/js/wysiwyg/utils/images.ts          |  30 ++++-
 4 files changed, 196 insertions(+), 24 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index c18c4b4ca..4af2e17af 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -906,4 +906,19 @@ export function patchRange() {
             },
         };
     };
+}
+
+export function waitAnimationFrames(count: number = 1): Promise<void> {
+  return new Promise((resolve) => {
+    let handled = 0;
+    let tick = () => {
+      if (++handled > count) {
+        resolve();
+      } else {
+        setTimeout(tick, 16);
+      }
+    }
+
+    tick();
+  });
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
index cd4235f2f..98166c6d1 100644
--- a/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
+++ b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
@@ -1,7 +1,7 @@
 import {
     createTestContext, destroyFromContext,
     dispatchKeydownEventForNode,
-    dispatchKeydownEventForSelectedNode, expectNodeShapeToMatch,
+    dispatchKeydownEventForSelectedNode, expectNodeShapeToMatch, waitAnimationFrames,
 } from "lexical/__tests__/utils";
 import {
     $createParagraphNode, $createTextNode,
@@ -14,6 +14,8 @@ import {registerRichText} from "@lexical/rich-text";
 import {EditorUiContext} from "../../ui/framework/core";
 import {$createListItemNode, $createListNode, ListItemNode, ListNode} from "@lexical/list";
 import {$createImageNode, ImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {$selectSingleNode} from "../../utils/selection";
+import {$createLinkNode} from "@lexical/link";
 
 describe('Keyboard-handling service tests', () => {
 
@@ -158,4 +160,110 @@ describe('Keyboard-handling service tests', () => {
             ],
         }]);
     });
+
+    test('Images in list items: Shift Enter press inserts a new text element and line break above the image', async () => {
+        editor.updateAndCommit(() => {
+            const root = $getRoot();
+            const list = $createListNode('bullet');
+            const listItem = $createListItemNode();
+            const image = $createImageNode('https://example.com/cat.png');
+            root.append(list);
+            list.append(listItem);
+            listItem.append(image);
+
+            $selectSingleNode(image);
+        });
+
+        expectNodeShapeToMatch(editor, [{
+            type: 'list',
+            children: [
+                {
+                    type: 'listitem',
+                    children: [
+                        {type: 'image'}
+                    ],
+                }
+            ],
+        }]);
+
+        dispatchKeydownEventForSelectedNode(editor, 'Enter', {shiftKey: true});
+        await waitAnimationFrames(2);
+
+        editor.updateAndCommit(() => {
+            $getSelection()?.insertText('p');
+        });
+
+        expectNodeShapeToMatch(editor, [{
+            type: 'list',
+            children: [
+                {
+                    type: 'listitem',
+                    children: [
+                        {text: 'p'},
+                        {type: 'linebreak'},
+                        {type: 'image'}
+                    ],
+                }
+            ],
+        }]);
+    });
+
+    test('Linked images in list items: Shift Enter press inserts a new text element and line break above the link', async () => {
+        editor.updateAndCommit(() => {
+            const root = $getRoot();
+            const list = $createListNode('bullet');
+            const listItem = $createListItemNode();
+            const link = $createLinkNode('https://example.com');
+            const image = $createImageNode('https://example.com/cat.png');
+            root.append(list);
+            list.append(listItem);
+            listItem.append(link);
+            link.append(image);
+
+            $selectSingleNode(image);
+        });
+
+        expectNodeShapeToMatch(editor, [{
+            type: 'list',
+            children: [
+                {
+                    type: 'listitem',
+                    children: [
+                        {
+                            type: 'link',
+                            children: [
+                                {type: 'image'}
+                            ]
+                        }
+                    ],
+                }
+            ],
+        }]);
+
+        dispatchKeydownEventForSelectedNode(editor, 'Enter', {shiftKey: true});
+        await waitAnimationFrames(2);
+
+        editor.updateAndCommit(() => {
+            $getSelection()?.insertText('p');
+        });
+
+        expectNodeShapeToMatch(editor, [{
+            type: 'list',
+            children: [
+                {
+                    type: 'listitem',
+                    children: [
+                        {text: 'p'},
+                        {type: 'linebreak'},
+                        {
+                            type: 'link',
+                            children: [
+                                {type: 'image'}
+                            ]
+                        }
+                    ],
+                }
+            ],
+        }]);
+    });
 });
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 2330fd5a6..14997d98a 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -1,6 +1,7 @@
 import {EditorUiContext} from "../ui/framework/core";
 import {
-    $createParagraphNode,
+    $createLineBreakNode,
+    $createParagraphNode, $createTextNode,
     $getSelection,
     COMMAND_PRIORITY_LOW, KEY_ARROW_DOWN_COMMAND, KEY_ARROW_UP_COMMAND,
     KEY_BACKSPACE_COMMAND,
@@ -20,6 +21,8 @@ import {$setInsetForSelection} from "../utils/lists";
 import {$isListItemNode} from "@lexical/list";
 import {$isDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 import {$unwrapDetailsNode} from "../utils/details";
+import {$isLinkNode} from "@lexical/link";
+import {$isLinkedImageNode} from "../utils/images";
 
 /**
  * Delete the current node in the selection if the selection contains a single
@@ -40,28 +43,48 @@ function deleteSingleSelectedNode(editor: LexicalEditor) {
  */
 function insertAdjacentToSingleSelectedNode(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
     const selectionNodes = getLastSelection(editor)?.getNodes() || [];
-    if ($isSingleSelectableNode(selectionNodes)) {
-        const node = selectionNodes[0];
-        const nearestBlock = $getNearestNodeBlockParent(node) || node;
-        const insertBefore = event?.shiftKey === true;
-        if (nearestBlock) {
-            requestAnimationFrame(() => {
-                editor.update(() => {
-                    const newParagraph = $createParagraphNode();
-                    if (insertBefore) {
-                        nearestBlock.insertBefore(newParagraph);
-                    } else {
-                        nearestBlock.insertAfter(newParagraph);
-                    }
-                    newParagraph.select();
-                });
-            });
-            event?.preventDefault();
-            return true;
-        }
+    if (!$isSingleSelectableNode(selectionNodes)) {
+        return false;
     }
 
-    return false;
+    const node = selectionNodes[0];
+    const nearestBlock = $getNearestNodeBlockParent(node) || node;
+    const insertBefore = event?.shiftKey === true;
+
+    let action: null|(()=>void) = null;
+
+    if ($isListItemNode(nearestBlock)) {
+        // If we're in a list item, we'd instead want to keep within the item and insert
+        // adjacent to the selected block.
+        action = () => {
+            const textNode = $createTextNode('');
+            const lineBreak = $createLineBreakNode();
+            const nodeParent = node.getParent();
+            let target = node;
+            if ($isLinkNode(nodeParent) && $isLinkedImageNode(node)) {
+                target = nodeParent;
+            }
+            const insertAction = insertBefore ? target.insertBefore : target.insertAfter;
+            insertAction.bind(target)(textNode);
+            insertAction.bind(target)(lineBreak);
+            textNode.selectStart();
+        };
+    } else if (nearestBlock) {
+        action = () => {
+            const newParagraph = $createParagraphNode();
+            const insertAction = insertBefore ? nearestBlock.insertBefore : nearestBlock.insertAfter;
+            insertAction.bind(nearestBlock)(newParagraph);
+            newParagraph.select();
+        };
+    }
+
+    if (!action) {
+        return false;
+    }
+
+    requestAnimationFrame(() => editor.update(action));
+    event?.preventDefault();
+    return true;
 }
 
 function focusAdjacentOrInsertForSingleSelectNode(editor: LexicalEditor, event: KeyboardEvent|null, after: boolean = true): boolean {
diff --git a/resources/js/wysiwyg/utils/images.ts b/resources/js/wysiwyg/utils/images.ts
index 85bae18e5..bb8b25f06 100644
--- a/resources/js/wysiwyg/utils/images.ts
+++ b/resources/js/wysiwyg/utils/images.ts
@@ -1,6 +1,7 @@
 import {ImageManager} from "../../components";
-import {$createImageNode} from "@lexical/rich-text/LexicalImageNode";
-import {$createLinkNode, LinkNode} from "@lexical/link";
+import {$createImageNode, $isImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {$createLinkNode, $isLinkNode, LinkNode} from "@lexical/link";
+import {$isElementNode, $isTextNode, LexicalNode} from "lexical";
 
 export type EditorImageData = {
     id: string;
@@ -26,6 +27,31 @@ export function $createLinkedImageNodeFromImageData(image: EditorImageData): Lin
     return linkNode;
 }
 
+/**
+ * Check if the given image node represents a simple linked image, where no other content
+ * exists within the link which wraps the image.
+ */
+export function $isLinkedImageNode(imageNode: LexicalNode): boolean {
+    if (!$isImageNode(imageNode)) {
+        return false;
+    }
+
+    const parent = imageNode.getParent();
+    if (!$isLinkNode(parent)) {
+        return false;
+    }
+
+    const linkChildren = parent.getChildren();
+    const withContent = linkChildren.filter(child => {
+        return child.getKey() !== imageNode.getKey() && (
+            $isElementNode(child)
+            || $isTextNode(child) && child.getTextContent().trim().length > 0
+        );
+    });
+
+    return withContent.length === 0;
+}
+
 /**
  * Upload an image file to the server
  */

From 9b56295dfd5615b2789f5320cf66058d86a372ad Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 5 Sep 2026 18:15:57 +0100
Subject: [PATCH 52/72] Lexical: Fixed formatting on reverse selection ranges
 in lists

Block formatting on range selection could break when made from bottom to
top, due to using the first selected for insertion position instead of
the first in the doc structure.
---
 resources/js/wysiwyg/utils/nodes.ts     | 10 +++++++---
 resources/js/wysiwyg/utils/selection.ts |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index ccbe6e87c..21e0dad69 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -122,7 +122,12 @@ export function $getNearestNodeBlockParent(node: LexicalNode): LexicalNode|null
     return $findMatchingParent(node, isBlockNode);
 }
 
-export function $sortNodes(nodes: LexicalNode[]): LexicalNode[] {
+/**
+ * Sort the given node array by their position in the document.
+ * A search point can be provided to limit the search to a specific part of the document, which can
+ * avoid having to traverse the entire document.
+ */
+export function $sortNodes(nodes: LexicalNode[], searchPoint: ElementNode|null = null): LexicalNode[] {
     const idChain: string[] = [];
     const addIds = (n: ElementNode) => {
         for (const child of n.getChildren()) {
@@ -133,8 +138,7 @@ export function $sortNodes(nodes: LexicalNode[]): LexicalNode[] {
         }
     };
 
-    const root = $getRoot();
-    addIds(root);
+    addIds(searchPoint || $getRoot());
 
     const sorted = Array.from(nodes);
     sorted.sort((a, b) => {
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 77aa902f0..5313d41ca 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -15,7 +15,7 @@ import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "../nodes";
 import {$setBlocksType} from "@lexical/selection";
 
-import {$getNearestNodeBlockParent, $getParentOfType, nodeHasAlignment} from "./nodes";
+import {$getNearestNodeBlockParent, $getParentOfType, $sortNodes, nodeHasAlignment} from "./nodes";
 import {CommonBlockAlignment} from "lexical/nodes/common";
 import {$isListItemNode} from "@lexical/list";
 import {$createCollapsedRangeSelectionForNode} from "lexical/LexicalSelection";
@@ -90,8 +90,8 @@ function createNewBlockIfSelectionIsSingleListItemText(selection: BaseSelection)
 
     if (isSingleListItemTextSelection) {
         const wrapper = $createParagraphNode();
-        const startNode = startEnd[0].getNode();
-        startNode.insertBefore(wrapper);
+        const firstNode = $sortNodes([startEnd[0].getNode(), startEnd[1].getNode()], startBlock)[0];
+        firstNode.insertBefore(wrapper);
         wrapper.append(...selection.getNodes());
     }
 }

From df40d8c08ad672ee4af22b814178eb7072036707 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 5 Sep 2026 18:52:49 +0100
Subject: [PATCH 53/72] Lexical: Made callout formatting in lists more reliable

Updates the callout toggle action to consider callouts in lists (and
other callouts) when making changes.
---
 resources/js/wysiwyg/utils/formats.ts | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/resources/js/wysiwyg/utils/formats.ts b/resources/js/wysiwyg/utils/formats.ts
index fbc11af49..6ddc3d622 100644
--- a/resources/js/wysiwyg/utils/formats.ts
+++ b/resources/js/wysiwyg/utils/formats.ts
@@ -106,10 +106,29 @@ export function cycleSelectionCalloutFormats(editor: LexicalEditor) {
 
         let created = false;
         for (const block of blocks) {
-            if (!$isCalloutNode(block)) {
-                block.replace($createCalloutNode('info'), true);
-                created = true;
+            if ($isCalloutNode(block)) {
+                continue;
             }
+
+            if ($isListItemNode(block)) {
+                const blockChildren = block.getChildren();
+                const alreadyHasCallout = blockChildren.some($isCalloutNode);
+                if (alreadyHasCallout) {
+                    continue;
+                }
+
+                const callout = $createCalloutNode('info');
+                callout.append(...blockChildren);
+                block.splice(0, 0, [callout]);
+            } else  {
+                const blockParents = block.getParents();
+                if (blockParents.some($isCalloutNode)) {
+                    continue;
+                }
+                block.replace($createCalloutNode('info'), true);
+            }
+
+            created = true;
         }
 
         if (created) {

From f8c2ada021f22d35b0d9c3dec2bcd7ee214ba7e8 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 6 Sep 2026 19:19:44 +0100
Subject: [PATCH 54/72] Lexical: Fixed difference in line break in-editor & on
 export

Aligned the linebreak exportdom behaviour to align with how the
reconciler displays line breaks in the editor, by adding an extra line
break to each series of line breaks, so they're now visually the same
across editor and export.
---
 .../lexical/core/__tests__/utils/index.ts     | 10 +++-
 .../core/nodes/LexicalLineBreakNode.ts        | 23 ++++++++-
 .../unit/LexicalLineBreakNode.test.ts         | 51 ++++++++++++++++++-
 3 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index 4af2e17af..482f6d65f 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -41,6 +41,7 @@ import {ImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {MediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";
 import {DiagramDecorator} from "../../../../ui/decorators/DiagramDecorator";
+import {$generateHtmlFromNodes} from "@lexical/html";
 
 type TestEnv = {
   readonly container: HTMLDivElement;
@@ -768,7 +769,14 @@ export function html(
 }
 
 export function expectHtmlToBeEqual(expected: string, actual: string): void {
-  expect(formatHtml(expected)).toBe(formatHtml(actual));
+  expect(formatHtml(actual)).toBe(formatHtml(expected));
+}
+
+export function expectEditorHtmlToBeEqual(editor: LexicalEditor, expected: string): void {
+  const html = editor.read(() => {
+    return $generateHtmlFromNodes(editor, null);
+  });
+  expect(formatHtml(html)).toBe(formatHtml(expected));
 }
 
 type nodeTextShape = {
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
index b1746e7f8..cef982e5f 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
@@ -6,10 +6,10 @@
  *
  */
 
-import type {KlassConstructor} from '../LexicalEditor';
+import {KlassConstructor, LexicalEditor} from '../LexicalEditor';
 import type {
   DOMConversionMap,
-  DOMConversionOutput,
+  DOMConversionOutput, DOMExportOutput,
   NodeKey,
   SerializedLexicalNode,
 } from '../LexicalNode';
@@ -43,6 +43,25 @@ export class LineBreakNode extends LexicalNode {
     return document.createElement('br');
   }
 
+  exportDOM(editor: LexicalEditor): DOMExportOutput {
+    const output = super.exportDOM(editor);
+    const parent = this.getParent();
+
+    // We insert an extra line break when the line break is the last child of a block node
+    // so that a line break is properly represented as an empty line, which mirrors the in-editor
+    // behaviour, where it's handled at the reconciliation phase
+    if (parent && !parent.isInline() && parent.getLastChild()?.getKey() === this.getKey()) {
+      output.after = (el) => {
+        if (el instanceof HTMLElement) {
+          el.before(document.createElement('br'), el);
+        }
+        return null;
+      };
+    }
+
+    return output;
+  }
+
   updateDOM(): false {
     return false;
   }
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts
index 110086ac8..8e5b04ef1 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts
@@ -6,9 +6,22 @@
  *
  */
 
-import {$createLineBreakNode, $isLineBreakNode} from 'lexical';
+import {
+  $createLineBreakNode,
+  $createParagraphNode,
+  $createTextNode,
+  $getRoot,
+  $isLineBreakNode,
+  ParagraphNode
+} from 'lexical';
 
-import {initializeUnitTest} from '../../../__tests__/utils';
+import {
+  createTestContext,
+  dispatchKeydownEventForSelectedNode, expectEditorHtmlToBeEqual,
+  expectNodeShapeToMatch,
+  initializeUnitTest
+} from '../../../__tests__/utils';
+import {registerRichText} from "@lexical/rich-text";
 
 describe('LexicalLineBreakNode tests', () => {
   initializeUnitTest((testEnv) => {
@@ -71,4 +84,38 @@ describe('LexicalLineBreakNode tests', () => {
       });
     });
   });
+
+  describe('LineBreakNode.exportDOM()', () => {
+    test('first linebreaks are represented as a double break on export', () => {
+      const {editor} = createTestContext();
+      registerRichText(editor);
+
+      let textNode;
+      let paragraph!: ParagraphNode;
+
+      editor.updateAndCommit(() => {
+        paragraph = $createParagraphNode();
+        textNode = $createTextNode('hello');
+        paragraph.append(textNode);
+
+        $getRoot().append(paragraph);
+        textNode.selectEnd();
+      });
+
+      dispatchKeydownEventForSelectedNode(editor, 'Enter', {shiftKey: true});
+
+      expectNodeShapeToMatch(editor, [
+        {type: 'paragraph', children: [
+            {text: 'hello'},
+            {type: 'linebreak'},
+          ]}
+      ]);
+      expectEditorHtmlToBeEqual(editor, `<p>hello<br><br></p>`);
+
+      dispatchKeydownEventForSelectedNode(editor, 'Enter', {shiftKey: true});
+      dispatchKeydownEventForSelectedNode(editor, 'Enter', {shiftKey: true});
+
+      expectEditorHtmlToBeEqual(editor, `<p>hello<br><br><br><br></p>`);
+    });
+  });
 });

From e08f11d6ffac082f4ce0d39fa7e01434e938a71f Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 7 Sep 2026 12:24:28 +0100
Subject: [PATCH 55/72] Lexical: Added clipboard/drag handling for single nodes

Fixes behaviour when using cut/copy/drag for items like images or code
blocks.

Also updates history handling to not ignore additions where original
content remains unchanged.
---
 .../js/wysiwyg/lexical/clipboard/clipboard.ts | 35 ++++++++++++++++++-
 resources/js/wysiwyg/lexical/history/index.ts |  7 ++--
 resources/js/wysiwyg/lexical/html/index.ts    |  9 +++++
 .../js/wysiwyg/lexical/rich-text/index.ts     |  8 ++++-
 .../wysiwyg/services/drop-paste-handling.ts   | 22 +++++++++++-
 resources/js/wysiwyg/utils/nodes.ts           | 20 +++++++++++
 resources/js/wysiwyg/utils/selection.ts       | 16 +++++++--
 7 files changed, 109 insertions(+), 8 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/clipboard/clipboard.ts b/resources/js/wysiwyg/lexical/clipboard/clipboard.ts
index 1d79c2d7b..86a814f29 100644
--- a/resources/js/wysiwyg/lexical/clipboard/clipboard.ts
+++ b/resources/js/wysiwyg/lexical/clipboard/clipboard.ts
@@ -6,7 +6,7 @@
  *
  */
 
-import {$generateHtmlFromNodes, $generateNodesFromDOM} from '@lexical/html';
+import {$generateHtmlFromNode, $generateHtmlFromNodes, $generateNodesFromDOM} from '@lexical/html';
 import {$addNodeStyle, $sliceSelectedTextNodeContent} from '@lexical/selection';
 import {objectKlassEquals} from '@lexical/utils';
 import {
@@ -31,6 +31,8 @@ import {
 } from 'lexical';
 import {CAN_USE_DOM} from 'lexical/shared/canUseDOM';
 import invariant from 'lexical/shared/invariant';
+import {$getSingleSelectableNode} from "../../utils/nodes";
+import {$createSingleNodeSelection, $selectSingleNode} from "../../utils/selection";
 
 const getDOMSelection = (targetWindow: Window | null): Selection | null =>
   CAN_USE_DOM ? (targetWindow || window).getSelection() : null;
@@ -58,6 +60,11 @@ export function $getHtmlContent(
   if (selection == null) {
     invariant(false, 'Expected valid LexicalSelection');
   }
+  // Handle single node selections
+  const singleSelectableNode = $getSingleSelectableNode(selection.getNodes());
+  if (singleSelectableNode) {
+    return $generateHtmlFromNode(editor, singleSelectableNode);
+  }
 
   // If we haven't selected anything
   if (
@@ -88,6 +95,12 @@ export function $getLexicalContent(
     invariant(false, 'Expected valid LexicalSelection');
   }
 
+  // Handle single node selections
+  const singleSelectableNode = $getSingleSelectableNode(selection.getNodes());
+  if (singleSelectableNode) {
+    return JSON.stringify($generateJSONFromNode(editor, singleSelectableNode));
+  }
+
   // If we haven't selected anything
   if (
     ($isRangeSelection(selection) && selection.isCollapsed()) ||
@@ -354,6 +367,26 @@ export function $generateJSONFromSelectedNodes<
   };
 }
 
+/**
+ * Gets the Lexical JSON of the given node.
+ */
+export function $generateJSONFromNode<
+    SerializedNode extends BaseSerializedNode,
+>(
+    editor: LexicalEditor,
+    node: LexicalNode,
+): {
+  namespace: string;
+  node: SerializedNode;
+} {
+  const serialized: Array<SerializedNode> = [];
+  $appendNodesToJSON(editor, null, node, serialized);
+  return {
+    namespace: editor._config.namespace,
+    node: serialized[0],
+  };
+}
+
 /**
  * This method takes an array of objects conforming to the BaseSeralizedNode interface and returns
  * an Array containing instances of the corresponding LexicalNode classes registered on the editor.
diff --git a/resources/js/wysiwyg/lexical/history/index.ts b/resources/js/wysiwyg/lexical/history/index.ts
index 8c731d3aa..ddb5d116c 100644
--- a/resources/js/wysiwyg/lexical/history/index.ts
+++ b/resources/js/wysiwyg/lexical/history/index.ts
@@ -294,9 +294,12 @@ function createMergeActionGetter(
         return HISTORY_MERGE;
       }
 
-      // A single node might have been marked as dirty, but not have changed
+      // A single node might have been marked as dirty but not have changed
       // due to some node transform reverting the change.
-      if (dirtyLeaves.size === 1) {
+      const hasIntentionalElementChanges = Array.from(
+          dirtyElements.values(),
+      ).some((value) => value);
+      if (!hasIntentionalElementChanges && dirtyLeaves.size === 1) {
         const dirtyLeafKey = Array.from(dirtyLeaves)[0];
         if (
           isTextNodeUnchanged(dirtyLeafKey, prevEditorState, nextEditorState)
diff --git a/resources/js/wysiwyg/lexical/html/index.ts b/resources/js/wysiwyg/lexical/html/index.ts
index de5e53bb8..baa96c3a2 100644
--- a/resources/js/wysiwyg/lexical/html/index.ts
+++ b/resources/js/wysiwyg/lexical/html/index.ts
@@ -99,6 +99,15 @@ export function $generateHtmlFromNodes(
   return nodeCode.join('\n');
 }
 
+/**
+ * Generates HTML from a single given node (and its children), regardless of selection.
+ */
+export function $generateHtmlFromNode(editor: LexicalEditor, node: LexicalNode): string {
+  const container = document.createElement('div');
+  $appendNodesToHTML(editor, node, container);
+  return container.innerHTML;
+}
+
 function $appendNodesToHTML(
   editor: LexicalEditor,
   currentNode: LexicalNode,
diff --git a/resources/js/wysiwyg/lexical/rich-text/index.ts b/resources/js/wysiwyg/lexical/rich-text/index.ts
index 477fdd781..8fb4876b8 100644
--- a/resources/js/wysiwyg/lexical/rich-text/index.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/index.ts
@@ -66,6 +66,7 @@ import {$moveCharacter, $shouldOverrideDefaultCharacterSelection,} from '@lexica
 import {$findMatchingParent, mergeRegister, objectKlassEquals,} from '@lexical/utils';
 import caretFromPoint from 'lexical/shared/caretFromPoint';
 import {CAN_USE_BEFORE_INPUT, IS_APPLE_WEBKIT, IS_IOS, IS_SAFARI,} from 'lexical/shared/environment';
+import {$getSingleSelectableNode} from "../../utils/nodes";
 
 export const DRAG_DROP_PASTE: LexicalCommand<Array<File>> = createCommand(
   'DRAG_DROP_PASTE_FILE',
@@ -107,7 +108,12 @@ async function onCutForRichText(
   editor.update(() => {
     const selection = $getSelection();
     if ($isRangeSelection(selection)) {
-      selection.removeText();
+      const singleSelectable = $getSingleSelectableNode(selection.getNodes())
+      if (singleSelectable) {
+          singleSelectable.remove();
+      } else {
+        selection.removeText();
+      }
     } else if ($isNodeSelection(selection)) {
       selection.getNodes().forEach((node) => node.remove());
     }
diff --git a/resources/js/wysiwyg/services/drop-paste-handling.ts b/resources/js/wysiwyg/services/drop-paste-handling.ts
index e11d6bd5e..fd0adfa09 100644
--- a/resources/js/wysiwyg/services/drop-paste-handling.ts
+++ b/resources/js/wysiwyg/services/drop-paste-handling.ts
@@ -7,13 +7,17 @@ import {
     LexicalNode, PASTE_COMMAND
 } from "lexical";
 import {$getBlockElementNodesInSelection, $insertNewNodesAtSelection, $selectSingleNode} from "../utils/selection";
-import {$getNodePositionFromMouseEvent, $htmlToBlockNodes, $htmlToNodes} from "../utils/nodes";
+import {
+    $getNodePositionFromMouseEvent,
+    $getSingleSelectableNode, $htmlToBlockNodes, $htmlToNodes,
+} from "../utils/nodes";
 import {Clipboard} from "../../services/clipboard";
 import {$createImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {$createLinkNode} from "@lexical/link";
 import {EditorImageData, uploadImageFile} from "../utils/images";
 import {EditorUiContext} from "../ui/framework/core";
 import {$getHtmlContent} from "@lexical/clipboard";
+import {$generateHtmlFromNode} from "@lexical/html";
 
 const internalActiveDragTracker: WeakMap<LexicalEditor, DragEvent>  = new WeakMap();
 
@@ -53,6 +57,14 @@ function insertHtmlToEditor(editor: LexicalEditor, html: string, isFromInternal:
             const selected = $getSelection();
             if ($isRangeSelection(selected)) {
                 selected.removeText();
+
+                // Handle single selected node scenarios
+                const singleSelectedNode = $getSingleSelectableNode(selected.getNodes());
+                if (singleSelectedNode) {
+                    singleSelectedNode.remove();
+                }
+
+                // Clear out empty blocks
                 const selectionBlocks = $getBlockElementNodesInSelection(selected);
                 for (const block of selectionBlocks) {
                     if (block.isEmpty()) {
@@ -194,6 +206,14 @@ function createDragStartListener(context: EditorUiContext): (event: DragEvent) =
         context.editor.update(() => {
             const selection = $getSelection();
             if ($isRangeSelection(selection)) {
+
+                const singleSelectableNode = $getSingleSelectableNode(selection.getNodes());
+                if (singleSelectableNode) {
+                    const html = $generateHtmlFromNode(context.editor, singleSelectableNode);
+                    event.dataTransfer?.setData('text/html', html);
+                    return;
+                }
+
                 selection.extract();
                 const html = $getHtmlContent(context.editor, selection);
                 event.dataTransfer?.setData('text/html', html);
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 21e0dad69..3e0c05888 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -17,6 +17,7 @@ import {$findMatchingParent} from "@lexical/utils";
 import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {$isDiagramNode} from "./diagrams";
+import {$isLinkedImageNode} from "./images";
 
 function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
     return nodes.map(node => {
@@ -180,6 +181,25 @@ export function $isSingleSelectableNode(nodes: LexicalNode[]): boolean {
     return false;
 }
 
+/**
+ * Get the single selectable node if the given range represents a single selectable node.
+ * Typically called with a selection's node ranges.
+ * Normalises the result, like for linked images, for example.
+ */
+export function $getSingleSelectableNode(nodes: LexicalNode[]): LexicalNode|null {
+    if (!$isSingleSelectableNode(nodes)) {
+        return null;
+    }
+
+    const node = nodes[0];
+
+    if ($isLinkedImageNode(node)) {
+        return node.getParent();
+    }
+
+    return node;
+}
+
 export function nodeHasAlignment(node: object): node is NodeHasAlignment {
     return '__alignment' in node;
 }
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 5313d41ca..ba97fc1a2 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -8,7 +8,7 @@ import {
     $setSelection,
     BaseSelection, DecoratorNode,
     ElementNode, LexicalEditor,
-    LexicalNode, RangeSelection,
+    LexicalNode, NodeSelection, RangeSelection,
     TextFormatType, TextNode
 } from "lexical";
 import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
@@ -164,10 +164,20 @@ export function $insertNewNodesAtSelection(nodes: LexicalNode[]) {
     }
 }
 
-export function $selectSingleNode(node: LexicalNode) {
+/**
+ * Create a selection for a single node.
+ */
+export function $createSingleNodeSelection(node: LexicalNode): NodeSelection {
     const nodeSelection = $createNodeSelection();
     nodeSelection.add(node.getKey());
-    $setSelection(nodeSelection);
+    return nodeSelection;
+}
+
+/**
+ * Create and apply a selection for a single node.
+ */
+export function $selectSingleNode(node: LexicalNode): void {
+    $setSelection($createSingleNodeSelection(node));
 }
 
 function getFirstTextNodeInNodes(nodes: LexicalNode[]): TextNode|null {

From bb76d14f8228a87b7903f4625c289cdf8a0d34e2 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 7 Sep 2026 15:56:20 +0100
Subject: [PATCH 56/72] Lexical: Updated pop up form fields to be wider

Better matches the old editor, and makes long input data like URLs more
usable.
---
 resources/sass/_editor.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 4c05de0a8..52311dba9 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -540,7 +540,7 @@ body.editor-is-fullscreen {
 /**
  * Form elements
  */
-$inputWidth: 260px;
+$inputWidth: 400px;
 
 .editor-form-field-wrapper {
   margin-bottom: .5rem;
@@ -681,6 +681,10 @@ textarea.editor-form-field-input {
   align-items: end;
   justify-content: space-between;
   gap: .1rem;
+  > div:has(input) {
+    flex: 1;
+    min-width: 100px;
+  }
   .editor-button {
     margin-bottom: 12px;
   }

From ff9755a32dfacd87a996548d9f878bd6ec5d83c8 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 7 Sep 2026 16:13:09 +0100
Subject: [PATCH 57/72] Lexical: Fixed modals closing on clicks starting from
 within modals

Specifically on chromium browsers. Firefox was fine before.
Changes tested across both.
---
 resources/js/wysiwyg/ui/framework/modals.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
index 669b80c59..4cccc7ad1 100644
--- a/resources/js/wysiwyg/ui/framework/modals.ts
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -72,12 +72,23 @@ export class EditorFormModal extends EditorContainerUiElement {
 
         const wrapper = el('div', {class: 'editor-modal-wrapper'}, [modal]);
 
+        // Handle clicks but only when not started from within the modal
+        let mouseDownInModal = false;
+        modal.addEventListener('mousedown', () => {
+            mouseDownInModal = true;
+        });
+        wrapper.addEventListener('mouseup', () => {
+            window.setTimeout(() => {
+                mouseDownInModal = false;
+            }, 10);
+        });
         wrapper.addEventListener('click', event => {
-            if (event.target && !modal.contains(event.target as HTMLElement)) {
+            if (!mouseDownInModal) {
                 this.hide();
             }
         });
 
+        // Handle escape key press
         wrapper.addEventListener('keydown', event => {
             if (event.key === 'Escape') {
                 this.hide();

From 88e774862133b578f9c3fc35fe48a80f98435951 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 7 Sep 2026 17:11:03 +0100
Subject: [PATCH 58/72] Lexical: Set details node as a shadow root

Fixes issues with list creation inside details elements.
---
 resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
index 70ae7f0f9..77f225574 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
@@ -64,6 +64,10 @@ export class DetailsNode extends ElementNode {
         return newNode;
     }
 
+    isShadowRoot(): boolean {
+        return true;
+    }
+
     createDOM(_config: EditorConfig, _editor: LexicalEditor) {
         const el = document.createElement('details');
         if (this.__id) {

From 1902a291b3dd89dc5a1e34ae93a210566a6b173c Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 7 Sep 2026 19:36:31 +0100
Subject: [PATCH 59/72] Lexical: Fixed ability to cut/copy/drag+drop details
 nodes

Required updating the selection management to ensure they are selected
upon mousedown, for when a drag operation starts.
Also added draggable management, which we have to avoid having there
when open unless a drag is started, otherwise contents are not editable
in chromium browsers.
---
 .../wysiwyg/lexical/core/LexicalSelection.ts  |  2 +-
 .../lexical/rich-text/LexicalDetailsNode.ts   | 20 ++++++++++++++++++-
 .../lexical/rich-text/LexicalImageNode.ts     |  1 -
 .../wysiwyg/services/drop-paste-handling.ts   |  4 ++--
 resources/js/wysiwyg/utils/nodes.ts           |  5 +++++
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/LexicalSelection.ts b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
index 73ce0edbb..520c001f6 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
@@ -1282,7 +1282,7 @@ export class RangeSelection implements BaseSelection {
     if (
       insertedParagraph &&
       $isElementNode(lastInsertedBlock) &&
-      (insertedParagraph.canMergeWhenEmpty() || INTERNAL_$isBlock(lastToInsert))
+      (insertedParagraph.canMergeWhenEmpty() || INTERNAL_$isBlock(lastToInsert) || ($isElementNode(lastToInsert) && lastToInsert.isShadowRoot()))
     ) {
       lastInsertedBlock.append(...insertedParagraph.getChildren());
       insertedParagraph.remove();
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
index 77f225574..e477d8b87 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
@@ -5,7 +5,7 @@ import {
     LexicalEditor,
     LexicalNode,
     SerializedElementNode, Spread,
-    EditorConfig, DOMExportOutput,
+    EditorConfig, DOMExportOutput, $getSelection,
 } from 'lexical';
 
 import {extractDirectionFromElement} from "lexical/nodes/common";
@@ -82,6 +82,7 @@ export class DetailsNode extends ElementNode {
             el.setAttribute('open', 'true');
             el.removeAttribute('contenteditable');
         } else {
+            el.setAttribute('draggable', 'true');
             el.setAttribute('contenteditable', 'false');
         }
 
@@ -94,6 +95,20 @@ export class DetailsNode extends ElementNode {
                 this.select();
             });
         });
+        summary.addEventListener('pointerdown', event => {
+            _editor.update(() => {
+                this.select();
+            });
+
+            // We juggle the draggable so that the details element can be dragged when started from the summary,
+            // but details element otherwise remains undraggable when open to allow editing of its contents
+            el.draggable = true;
+            const pointerUpCallback = () => {
+                document.removeEventListener('pointerup', pointerUpCallback);
+                el.draggable = false;
+            };
+            document.addEventListener('pointerup', pointerUpCallback);
+        });
 
         summary.addEventListener('dblclick', event => {
             event.preventDefault();
@@ -116,8 +131,10 @@ export class DetailsNode extends ElementNode {
             dom.toggleAttribute('open', this.__open);
             if (this.__open) {
                 dom.removeAttribute('contenteditable');
+                dom.removeAttribute('draggable');
             } else {
                 dom.setAttribute('contenteditable', 'false');
+                dom.setAttribute('draggable', 'true');
             }
         }
 
@@ -168,6 +185,7 @@ export class DetailsNode extends ElementNode {
 
         element.removeAttribute('open');
         element.removeAttribute('contenteditable');
+        element.removeAttribute('draggable');
 
         return {element};
     }
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
index 40f4ab711..42d96d15c 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
@@ -7,7 +7,6 @@ import {
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
 import {CommonBlockAlignment, extractAlignmentFromElement} from "lexical/nodes/common";
-import {$selectSingleNode} from "../../utils/selection";
 import {SerializedElementNode} from "lexical/nodes/LexicalElementNode";
 
 export interface ImageNodeOptions {
diff --git a/resources/js/wysiwyg/services/drop-paste-handling.ts b/resources/js/wysiwyg/services/drop-paste-handling.ts
index fd0adfa09..5f90a6bb9 100644
--- a/resources/js/wysiwyg/services/drop-paste-handling.ts
+++ b/resources/js/wysiwyg/services/drop-paste-handling.ts
@@ -56,12 +56,12 @@ function insertHtmlToEditor(editor: LexicalEditor, html: string, isFromInternal:
         if (isFromInternal) {
             const selected = $getSelection();
             if ($isRangeSelection(selected)) {
-                selected.removeText();
-
                 // Handle single selected node scenarios
                 const singleSelectedNode = $getSingleSelectableNode(selected.getNodes());
                 if (singleSelectedNode) {
                     singleSelectedNode.remove();
+                } else {
+                    selected.removeText();
                 }
 
                 // Clear out empty blocks
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 3e0c05888..4309c4711 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -18,6 +18,7 @@ import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {$isDiagramNode} from "./diagrams";
 import {$isLinkedImageNode} from "./images";
+import {$isDetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 
 function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
     return nodes.map(node => {
@@ -176,6 +177,10 @@ export function $isSingleSelectableNode(nodes: LexicalNode[]): boolean {
         if ($isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node) || $isDiagramNode(node)) {
             return true;
         }
+
+        if ($isDetailsNode(node)) {
+            return true;
+        }
     }
 
     return false;

From b869c6a78eb3921e6819827bd197a9ff8e0029c0 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 8 Sep 2026 00:28:47 +0100
Subject: [PATCH 60/72] Lexical: Prevented link entity selector overwriting
 existing link text

It now retains existing input where set.
This also updates the modal click handling with an extra click source
check to handle cases where a mousedown event is not emitted, like on
select list dismissals.
---
 resources/js/wysiwyg/ui/defaults/forms/objects.ts |  5 +++--
 resources/js/wysiwyg/ui/framework/forms.ts        | 10 ++++++++++
 resources/js/wysiwyg/ui/framework/modals.ts       |  4 +++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index cdf464cb4..a60a4033a 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -152,10 +152,11 @@ export const link: EditorFormDefinition = {
                             showLinkSelector(entity => {
                                 const modal =  context.manager.getActiveModal('link');
                                 if (modal) {
+                                    const currentValues = modal.getForm().getValues();
                                     modal.getForm().setValues({
                                         url: entity.link,
-                                        text: entity.name,
-                                        title: entity.name,
+                                        text: currentValues.text || entity.name,
+                                        title: currentValues.title || entity.name,
                                     });
                                 }
                             });
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index 3d8c53d46..29f1cada1 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -105,6 +105,16 @@ export class EditorForm extends EditorContainerUiElement {
         }
     }
 
+    getValues(): Record<string, string> {
+        const values: Record<string, string> = {};
+        const formEl = this.getDOMElement() as HTMLFormElement;
+        const formData = new FormData(formEl);
+        for (const [name, value] of formData.entries()) {
+            values[name] = value as string;
+        }
+        return values;
+    }
+
     setValues(values: Record<string, string>) {
         for (const name of Object.keys(values)) {
             const field = this.getFieldByName(name);
diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
index 4cccc7ad1..127463ccc 100644
--- a/resources/js/wysiwyg/ui/framework/modals.ts
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -83,7 +83,9 @@ export class EditorFormModal extends EditorContainerUiElement {
             }, 10);
         });
         wrapper.addEventListener('click', event => {
-            if (!mouseDownInModal) {
+            // We check our custom mouse down tracker but also have to check the event target since
+            // sometimes mousedown events are not tracked (for example, clicking outside an open select list).
+            if (!mouseDownInModal && !modal.contains(event.target as HTMLElement)) {
                 this.hide();
             }
         });

From 17f5e9bfa7b394563c8135b38aeb064d9ca4df16 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 9 Sep 2026 10:10:48 +0100
Subject: [PATCH 61/72] Lexical: Fixed node resizer not reacting to content
 size changes

---
 resources/js/wysiwyg/ui/defaults/forms/objects.ts   |  1 +
 .../js/wysiwyg/ui/framework/helpers/node-resizer.ts |  7 +++++++
 resources/js/wysiwyg/ui/framework/manager.ts        | 13 +++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index a60a4033a..b278c0941 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -48,6 +48,7 @@ export const image: EditorFormDefinition = {
 
                 selectedImage.setWidth(Number(formData.get('width')?.toString() || '0'));
                 selectedImage.setHeight(Number(formData.get('height')?.toString() || '0'));
+                context.manager.triggerLayoutUpdate();
             }
         });
         return true;
diff --git a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
index 8b0a1d2d7..addd6dedf 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
@@ -25,9 +25,11 @@ class NodeResizer {
         this.scrollContainer = context.scrollDOM;
 
         this.onSelectionChange = this.onSelectionChange.bind(this);
+        this.onLayoutUpdate = this.onLayoutUpdate.bind(this);
         this.onTargetDOMLoad = this.onTargetDOMLoad.bind(this);
 
         context.manager.onSelectionChange(this.onSelectionChange);
+        context.manager.onLayoutUpdate(this.onLayoutUpdate);
     }
 
     onSelectionChange(selection: BaseSelection|null) {
@@ -46,6 +48,10 @@ class NodeResizer {
         }
     }
 
+    onLayoutUpdate() {
+        this.updateResizerPosition();
+    }
+
     protected getTargetDOM(targetNode: LexicalNode|null): HTMLElement|null {
         if (targetNode == null) {
             return null;
@@ -64,6 +70,7 @@ class NodeResizer {
 
     teardown() {
         this.context.manager.offSelectionChange(this.onSelectionChange);
+        this.context.manager.offLayoutUpdate(this.onLayoutUpdate);
         this.hide();
     }
 
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 4dab455fe..a6b8fd0af 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -23,6 +23,7 @@ export class EditorUIManager {
     protected contextToolbarDefinitionsByKey: Record<string, EditorContextToolbarDefinition> = {};
     protected activeContextToolbars: EditorContextToolbar[] = [];
     protected selectionChangeHandlers: Set<SelectionChangeHandler> = new Set();
+    protected layoutUpdateHandlers: Set<() => void> = new Set();
     protected domEventAbortController = new AbortController();
     protected teardownCallbacks: (()=>void)[] = [];
 
@@ -165,6 +166,14 @@ export class EditorUIManager {
         this.selectionChangeHandlers.delete(handler);
     }
 
+    onLayoutUpdate(handler: () => void): void {
+        this.layoutUpdateHandlers.add(handler);
+    }
+
+    offLayoutUpdate(handler: () => void): void {
+        this.layoutUpdateHandlers.delete(handler);
+    }
+
     triggerLayoutUpdate(): void {
         window.requestAnimationFrame(() => {
             const toolbarBounds: (DOMRect|null)[] = [];
@@ -172,6 +181,10 @@ export class EditorUIManager {
                 const bounds = toolbar.updatePosition(toolbarBounds);
                 toolbarBounds.push(bounds);
             }
+
+            for (const handler of this.layoutUpdateHandlers) {
+                handler();
+            }
         });
     }
 

From 1498c2fa3542d4044302b2a02fe3ea23051d8fd4 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 9 Sep 2026 10:18:14 +0100
Subject: [PATCH 62/72] JS: Fixed failing test after lexical changes

---
 .../lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
index 828aad839..79c613949 100644
--- a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
@@ -17,7 +17,7 @@ describe('LexicalDetailsNode tests', () => {
             html = details.createDOM(editorConfig, editor).outerHTML;
         });
 
-        expect(html).toBe(`<details contenteditable="false"><summary contenteditable="false"></summary></details>`);
+        expect(html).toBe(`<details draggable="true" contenteditable="false"><summary contenteditable="false"></summary></details>`);
     });
 
     test('exportDOM()', () => {

From 2c22c3bcb8ec43ab6f9a453dbaa48e9b4007026f Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 12 Sep 2026 23:35:17 +0100
Subject: [PATCH 63/72] Sponsors: Added BookHost

---
 readme.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index e9e5d197b..297d26559 100644
--- a/readme.md
+++ b/readme.md
@@ -91,9 +91,12 @@ Big thanks to these companies for supporting the project.
 </a></td>
 </tr>
 <tr>
-<td align="center" colspan="2"><a href="https://www.admin-intelligence.de/bookstack/" target="_blank">
+<td align="center"><a href="https://www.admin-intelligence.de/bookstack/" target="_blank">
     <img width="210" src="https://www.bookstackapp.com/images/sponsors/admin-intelligence.png" alt="Admin Intelligence">
 </a></td>
+<td align="center"><a href="https://bookhost.co/" target="_blank">
+    <img width="210" src="https://www.bookstackapp.com/images/sponsors/bookhost.png" alt="BookHost">
+</a></td>
 </tr>
 </tbody></table>
 

From 0763d7df304289bca39e0bc18668dc8bca085829 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 13 Sep 2026 17:13:30 +0100
Subject: [PATCH 64/72] Social Login: Fixed queries unscoped to driver

Prevents the same IDs from different systems leading to access of other
accounts, and allows registration of same ids under different services.

Thanks to Google and Ada Logics for discovery and reporting.
---
 .forgejo/SECURITY.md             | 28 ++++++++++++----
 app/Access/SocialAuthService.php | 22 ++++++++++--
 tests/Auth/SocialAuthTest.php    | 57 ++++++++++++++++++++++++++++++++
 tests/TestCase.php               | 15 +++++++++
 4 files changed, 112 insertions(+), 10 deletions(-)

diff --git a/.forgejo/SECURITY.md b/.forgejo/SECURITY.md
index 5c044c946..8f6d111ff 100644
--- a/.forgejo/SECURITY.md
+++ b/.forgejo/SECURITY.md
@@ -8,18 +8,32 @@ since we aim to provide a fairly stable upgrade path for new versions.
 
 ## Security Notifications
 
-If you'd like to be notified of new potential security concerns you can [sign-up to the BookStack security mailing list](https://updates.bookstackapp.com/signup/bookstack-security-updates).
+If you'd like to be notified of new potential security concerns, you can [sign-up to the BookStack security mailing list](https://updates.bookstackapp.com/signup/bookstack-security-updates).
 
 ## Reporting a Vulnerability
 
-If you've found an issue that likely has no impact to existing users (For example, an issue only in the development branch)
+If you've found an issue that likely has no impact on existing users (For example, an issue only in the development branch)
 feel free to raise it via a standard Codeberg bug report issue.
 
-If the issue could have a security impact to BookStack instances, 
+If the issue could have a security impact on BookStack instances, 
 please directly contact the lead maintainer via email Dan Brown using the [details found here](https://www.bookstackapp.com/links/contact/).
 
-Please be patient while the vulnerability is being reviewed. Deploying the fix to address the vulnerability
-can often take a little time due to the amount of preparation required, to ensure the vulnerability has
-been covered, and to create the content required to adequately notify the user-base.
+When contacting us, please note any names (and optionally any profile/company/website links) that you'd like to be used in
+any attribution within our release notes and content.
 
-Thank you for keeping BookStack instances safe!
\ No newline at end of file
+Please be patient while the vulnerability is being reviewed. Deploying the fix to address the vulnerability
+can often take a little time due to the amount of preparation required to ensure the vulnerability has
+been covered and to create the content required to adequately notify the user-base.
+
+Thank you for keeping BookStack instances safe!
+
+### CVE Creation
+
+We're generally happy for (and prefer) researchers to raise CVEs for issues they've discovered.
+We ask that you first confirm with us to ensure the vulnerability is valid and that it hasn't yet been discovered
+and reported by someone else. 
+
+We can raise CVEs ourselves, but we would only go to the effort for security issues with a significant level of risk to users.
+We typically won't pursue CVEs if there's a lesser level of risk.
+
+_Note: Our reporting may change as the Cyber Resilience Act comes into effect._
\ No newline at end of file
diff --git a/app/Access/SocialAuthService.php b/app/Access/SocialAuthService.php
index bdcfb45c8..faaa99601 100644
--- a/app/Access/SocialAuthService.php
+++ b/app/Access/SocialAuthService.php
@@ -55,8 +55,10 @@ class SocialAuthService
      */
     public function handleRegistrationCallback(string $socialDriver, SocialUser $socialUser): SocialUser
     {
+        $socialDriver = trim(strtolower($socialDriver));
+
         // Check social account has not already been used
-        if (SocialAccount::query()->where('driver_id', '=', $socialUser->getId())->exists()) {
+        if ($this->getSocialAccountById($socialDriver, $socialUser->getId())) {
             throw new UserRegistrationException(trans('errors.social_account_in_use', ['socialAccount' => $socialDriver]), '/login');
         }
 
@@ -69,6 +71,19 @@ class SocialAuthService
         return $socialUser;
     }
 
+    /**
+     * Get an existing social account by its ID.
+     */
+    protected function getSocialAccountById(string $socialDriver, string $socialId): SocialAccount|null
+    {
+        $socialDriver = trim(strtolower($socialDriver));
+
+        return SocialAccount::query()
+            ->where('driver', '=', $socialDriver)
+            ->where('driver_id', '=', $socialId)
+            ->first();
+    }
+
     /**
      * Get the social user details via the social driver.
      *
@@ -93,7 +108,7 @@ class SocialAuthService
         $socialId = $socialUser->getId();
 
         // Get any attached social accounts or users
-        $socialAccount = SocialAccount::query()->where('driver_id', '=', $socialId)->first();
+        $socialAccount = $this->getSocialAccountById($socialDriver, $socialId);
         $isLoggedIn = auth()->check();
         $currentUser = user();
         $titleCaseDriver = Str::title($socialDriver);
@@ -153,7 +168,7 @@ class SocialAuthService
     public function newSocialAccount(string $socialDriver, SocialUser $socialUser): SocialAccount
     {
         return new SocialAccount([
-            'driver'    => $socialDriver,
+            'driver'    => trim(strtolower($socialDriver)),
             'driver_id' => $socialUser->getId(),
             'avatar'    => $socialUser->getAvatar(),
         ]);
@@ -164,6 +179,7 @@ class SocialAuthService
      */
     public function detachSocialAccount(string $socialDriver): void
     {
+        $socialDriver = trim(strtolower($socialDriver));
         user()->socialAccounts()->where('driver', '=', $socialDriver)->delete();
     }
 
diff --git a/tests/Auth/SocialAuthTest.php b/tests/Auth/SocialAuthTest.php
index 89b8fd167..6980962b7 100644
--- a/tests/Auth/SocialAuthTest.php
+++ b/tests/Auth/SocialAuthTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Auth;
 
 use BookStack\Access\SocialAccount;
+use BookStack\Access\SocialAuthService;
 use BookStack\Activity\ActivityType;
 use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\DB;
@@ -239,4 +240,60 @@ class SocialAuthTest extends TestCase
         $user = $user->whereEmail($user->email)->first();
         $this->assertDatabaseHas('social_accounts', ['user_id' => $user->id]);
     }
+
+    public function test_registration_allows_creation_with_id_which_already_used_by_another_user_and_service()
+    {
+        $user = $this->users->editor();
+        SocialAccount::factory()->create(['driver' => 'google', 'driver_id' => '123abc', 'user_id' => $user->id]);
+
+        $this->setSettings(['registration-enabled' => 'true']);
+        config(['GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc']);
+        session()->put('social-callback', 'register');
+
+        $socialUser = new \Laravel\Socialite\One\User();
+        $socialUser->id = '123abc';
+        $socialUser->email = 'barrygithub@example.com';
+        $socialUser->name = 'BarryGitHub';
+        $socialUser->avatar = 'avatar_placeholder';
+
+        $serviceMock = $this->partialMockService(SocialAuthService::class);
+        $serviceMock->shouldReceive('getSocialUser')->andReturn($socialUser);
+
+        $resp = $this->get('/login/service/github/callback');
+        $resp->assertRedirect('/');
+
+        $this->assertTrue(auth()->check());
+        $this->assertDatabaseHas('social_accounts', [
+            'user_id' => user()->id,
+            'driver' => 'github',
+            'driver_id' => '123abc'
+        ]);
+        $this->assertDatabaseHas('social_accounts', [
+            'user_id' => $user->id,
+            'driver' => 'google',
+            'driver_id' => '123abc'
+        ]);
+    }
+
+    public function test_login_account_link_restrained_by_service()
+    {
+        config([
+            'GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc',
+        ]);
+        $existingUser = $this->users->viewer();
+        SocialAccount::factory()->create(['driver' => 'github', 'driver_id' => 'logintest123', 'user_id' => $existingUser->id]);
+        session()->put('social-callback', 'login');
+
+        $socialUser = new \Laravel\Socialite\One\User();
+        $socialUser->id = 'logintest123';
+        $serviceMock = $this->partialMockService(SocialAuthService::class);
+        $serviceMock->shouldReceive('getSocialUser')->andReturn($socialUser);
+
+        $resp = $this->followingRedirects()->get('/login/service/google/callback');
+
+        $this->assertFalse(auth()->check());
+        $this->assertNotEquals($existingUser->id, user()->id);
+        $resp->assertSee('login-form');
+        $resp->assertSee(trans('errors.social_account_not_used', ['socialAccount' => 'Google']));
+    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index c6f811b31..12ad917d5 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -17,6 +17,8 @@ use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Testing\Assert as PHPUnit;
 use Illuminate\Testing\Constraints\HasInDatabase;
+use Mockery;
+use Mockery\MockInterface;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use Ssddanbrown\AssertHtml\TestsHtml;
@@ -106,6 +108,19 @@ abstract class TestCase extends BaseTestCase
         }
     }
 
+    /**
+     * Creates a partial mock of the given service class from a default
+     * container resolved instance. Compared to the default $this->partialMock function,
+     * this resolves mock of a service with its dependencies resolved from the container.
+     */
+    protected function partialMockService(string $service): MockInterface
+    {
+        $realService = app($service);
+        $serviceMock = Mockery::mock($realService)->makePartial();
+        $this->instance($service, $serviceMock);
+        return $serviceMock;
+    }
+
     /**
      * Mock the http client used in BookStack http calls.
      */

From ca205e3ed5fbf097b0dbd13d18daeec837bda81c Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 13 Sep 2026 22:03:30 +0100
Subject: [PATCH 65/72] Config: Remove default app key value

To avoid scenarios where an instance specific app key is not set, and
therefore avoids the potential of instances using a known key value.

For #6210
---
 app/Config/app.php        |  2 +-
 phpunit.xml               |  1 +
 tests/Unit/ConfigTest.php | 11 ++++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/Config/app.php b/app/Config/app.php
index c38cd0e1f..8424e53b0 100644
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -120,7 +120,7 @@ return [
     'auto_detect_locale' => env('APP_AUTO_LANG_PUBLIC', true),
 
     // Encryption key
-    'key' => env('APP_KEY', 'AbAZchsay4uBTU33RubBzLKw203yqSqr'),
+    'key' => env('APP_KEY'),
 
     // Encryption cipher
     'cipher' => 'AES-256-CBC',
diff --git a/phpunit.xml b/phpunit.xml
index 55d84d129..ac30d2adf 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -17,6 +17,7 @@
     <server name="APP_AUTO_LANG_PUBLIC" value="true"/>
     <server name="APP_URL" value="http://bookstack.dev"/>
     <server name="APP_TIMEZONE" value="UTC"/>
+    <server name="APP_KEY" value="base64:rt54sY5s5G9+8VmvfI0NIJs2Fzd3qsx4auLjnLE5qw0="/>
     <server name="APP_DISPLAY_TIMEZONE" value="UTC"/>
     <server name="ALLOWED_STYLE_SOURCES" value=""/>
     <server name="ALLOWED_IMAGE_SOURCES" value=""/>
diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
index 2e9190dfd..9f3e5f56f 100644
--- a/tests/Unit/ConfigTest.php
+++ b/tests/Unit/ConfigTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit;
 
+use Illuminate\Encryption\MissingAppKeyException;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
@@ -212,8 +213,16 @@ class ConfigTest extends TestCase
         });
     }
 
+    public function test_app_errors_if_no_app_key_set()
+    {
+        $this->runWithEnv(['APP_KEY' => null], function () {
+            $this->expectException(MissingAppKeyException::class);
+            $this->get('/');
+        });
+    }
+
     /**
-     * Set an environment variable of the given name and value
+     * Set an environment variable of the given name and value,
      * then check the given config key to see if it matches the given result.
      * Providing a null $envVal clears the variable.
      */

From 7523ba96c69d505ebae7bb899f589860814dbdad Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 14 Sep 2026 14:35:21 +0100
Subject: [PATCH 66/72] Deps: Updated PHP package versions

---
 composer.json |   1 -
 composer.lock | 315 +++++++++++++++++++++++++-------------------------
 2 files changed, 160 insertions(+), 156 deletions(-)

diff --git a/composer.json b/composer.json
index 604088166..ee5fd3f6d 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,6 @@
         "ext-dom": "*",
         "ext-fileinfo": "*",
         "ext-gd": "*",
-        "ext-json": "*",
         "ext-mbstring": "*",
         "ext-xml": "*",
         "ext-zip": "*",
diff --git a/composer.lock b/composer.lock
index 67b265547..d8fda2673 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8dc695e5ecb6cea01e282394da136713",
+    "content-hash": "ee8ea68a46e8278e02325152e5fabe65",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.393.4",
+            "version": "3.395.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "a5880510e500aa0fe13a6410183cd222b3263890"
+                "reference": "f5eda89b1f2ecd4aea56eb04d58874bad12ef02e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a5880510e500aa0fe13a6410183cd222b3263890",
-                "reference": "a5880510e500aa0fe13a6410183cd222b3263890",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f5eda89b1f2ecd4aea56eb04d58874bad12ef02e",
+                "reference": "f5eda89b1f2ecd4aea56eb04d58874bad12ef02e",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.393.4"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.395.1"
             },
-            "time": "2026-08-21T18:24:57+00:00"
+            "time": "2026-09-13T18:43:19+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -274,16 +274,16 @@
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
-            "version": "3.2.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
-                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d"
+                "reference": "5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
-                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc",
+                "reference": "5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc",
                 "shasum": ""
             },
             "require": {
@@ -298,6 +298,11 @@
                 "phpunit/phpunit": "^10.3"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Carbon\\Doctrine\\": "src/Carbon/Doctrine/"
@@ -323,7 +328,7 @@
             ],
             "support": {
                 "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
-                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0"
+                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.1"
             },
             "funding": [
                 {
@@ -339,7 +344,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-09T16:56:22+00:00"
+            "time": "2026-09-06T14:11:38+00:00"
         },
         {
             "name": "dasprid/enum",
@@ -1809,16 +1814,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v12.67.0",
+            "version": "v12.69.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "fe2cdaba052cbb9f350761ccefc7ac221cbdf0b5"
+                "reference": "17d034ef1e209b63a1d3a89c90ce5e89a4eb3fc5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/fe2cdaba052cbb9f350761ccefc7ac221cbdf0b5",
-                "reference": "fe2cdaba052cbb9f350761ccefc7ac221cbdf0b5",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/17d034ef1e209b63a1d3a89c90ce5e89a4eb3fc5",
+                "reference": "17d034ef1e209b63a1d3a89c90ce5e89a4eb3fc5",
                 "shasum": ""
             },
             "require": {
@@ -2027,20 +2032,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2026-08-18T13:37:47+00:00"
+            "time": "2026-09-08T14:29:09+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.23",
+            "version": "v0.3.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "b7b4c35e5bc47450f6b6238c6cc9c47ba19b2221"
+                "reference": "5d3cdef29e93ca3b62b1871359db3078cd99908b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/b7b4c35e5bc47450f6b6238c6cc9c47ba19b2221",
-                "reference": "b7b4c35e5bc47450f6b6238c6cc9c47ba19b2221",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/5d3cdef29e93ca3b62b1871359db3078cd99908b",
+                "reference": "5d3cdef29e93ca3b62b1871359db3078cd99908b",
                 "shasum": ""
             },
             "require": {
@@ -2084,22 +2089,22 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.23"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.24"
             },
-            "time": "2026-08-11T18:58:24+00:00"
+            "time": "2026-08-20T12:55:36+00:00"
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v2.0.15",
+            "version": "v2.0.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "dccd8bcb851bb03fcc005df650b708b57cc52661"
+                "reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/dccd8bcb851bb03fcc005df650b708b57cc52661",
-                "reference": "dccd8bcb851bb03fcc005df650b708b57cc52661",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",
+                "reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",
                 "shasum": ""
             },
             "require": {
@@ -2147,7 +2152,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2026-07-21T16:49:22+00:00"
+            "time": "2026-08-18T20:28:54+00:00"
         },
         {
             "name": "laravel/socialite",
@@ -2289,16 +2294,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.10.0",
+            "version": "2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "d2d1aa8b35e072966c89bc0c66cf926e56767dc4"
+                "reference": "9d489ab67a02960fd8ffe624d93f751daf95439e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d2d1aa8b35e072966c89bc0c66cf926e56767dc4",
-                "reference": "d2d1aa8b35e072966c89bc0c66cf926e56767dc4",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/9d489ab67a02960fd8ffe624d93f751daf95439e",
+                "reference": "9d489ab67a02960fd8ffe624d93f751daf95439e",
                 "shasum": ""
             },
             "require": {
@@ -2392,7 +2397,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-11T16:06:25+00:00"
+            "time": "2026-09-07T13:44:26+00:00"
         },
         {
             "name": "league/config",
@@ -2478,16 +2483,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.35.3",
+            "version": "3.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "5fc8404762179ae514678487b23494fd69b2309c"
+                "reference": "f7fb152932f30072d573510cbd4dd657d6475b25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5fc8404762179ae514678487b23494fd69b2309c",
-                "reference": "5fc8404762179ae514678487b23494fd69b2309c",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f7fb152932f30072d573510cbd4dd657d6475b25",
+                "reference": "f7fb152932f30072d573510cbd4dd657d6475b25",
                 "shasum": ""
             },
             "require": {
@@ -2555,9 +2560,9 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.35.3"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.36.0"
             },
-            "time": "2026-08-22T12:55:54+00:00"
+            "time": "2026-09-02T08:00:27+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
@@ -2665,16 +2670,16 @@
         },
         {
             "name": "league/html-to-markdown",
-            "version": "5.1.1",
+            "version": "5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/html-to-markdown.git",
-                "reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd"
+                "reference": "db234ecdb160b9d2b422c1c130db4b01eb3e9e24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/0b4066eede55c48f38bcee4fb8f0aa85654390fd",
-                "reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd",
+                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/db234ecdb160b9d2b422c1c130db4b01eb3e9e24",
+                "reference": "db234ecdb160b9d2b422c1c130db4b01eb3e9e24",
                 "shasum": ""
             },
             "require": {
@@ -2684,11 +2689,11 @@
             },
             "require-dev": {
                 "mikehaertl/php-shellcommand": "^1.1.0",
-                "phpstan/phpstan": "^1.8.8",
-                "phpunit/phpunit": "^8.5 || ^9.2",
+                "phpstan/phpstan": "^1.8.8 || ^2.0",
+                "phpunit/phpunit": "^8.5 || ^9.2 || ^10.5 || ^11.0 || ^12.0 || ^13.0",
                 "scrutinizer/ocular": "^1.6",
                 "unleashedtech/php-coding-standard": "^2.7 || ^3.0",
-                "vimeo/psalm": "^4.22 || ^5.0"
+                "vimeo/psalm": "^4.22 || ^5.0 || ^6.0"
             },
             "bin": [
                 "bin/html-to-markdown"
@@ -2730,7 +2735,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/html-to-markdown/issues",
-                "source": "https://github.com/thephpleague/html-to-markdown/tree/5.1.1"
+                "source": "https://github.com/thephpleague/html-to-markdown/tree/5.1.2"
             },
             "funding": [
                 {
@@ -2750,7 +2755,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-12T21:21:09+00:00"
+            "time": "2026-09-07T13:53:32+00:00"
         },
         {
             "name": "league/mime-type-detection",
@@ -3200,16 +3205,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.10.0",
+            "version": "3.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "b321dd6749f0bf7189444158a3ce785cc16d69b0"
+                "reference": "72c534fc0ab181ef52d92a68382318631e301608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b321dd6749f0bf7189444158a3ce785cc16d69b0",
-                "reference": "b321dd6749f0bf7189444158a3ce785cc16d69b0",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/72c534fc0ab181ef52d92a68382318631e301608",
+                "reference": "72c534fc0ab181ef52d92a68382318631e301608",
                 "shasum": ""
             },
             "require": {
@@ -3235,6 +3240,7 @@
                 "phpstan/phpstan-strict-rules": "^2",
                 "phpunit/phpunit": "^10.5.17 || ^11.0.7",
                 "predis/predis": "^1.1 || ^2",
+                "psr/clock": "^1.0",
                 "rollbar/rollbar": "^4.0",
                 "ruflin/elastica": "^7 || ^8",
                 "symfony/mailer": "^5.4 || ^6",
@@ -3253,6 +3259,7 @@
                 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
                 "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
                 "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+                "psr/clock": "Required to pass a clock to the Logger and control the timestamp of log records",
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
                 "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
             },
@@ -3287,7 +3294,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.10.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.12.0"
             },
             "funding": [
                 {
@@ -3299,7 +3306,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-02T08:56:05+00:00"
+            "time": "2026-09-09T08:34:20+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
@@ -3369,16 +3376,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.13.2",
+            "version": "3.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "a1c54919f5fff9800cd03c32bd01defd5a4061cb"
+                "reference": "0023eaa2c9110e47446dd512a263c69c40cd41f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/a1c54919f5fff9800cd03c32bd01defd5a4061cb",
-                "reference": "a1c54919f5fff9800cd03c32bd01defd5a4061cb",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/0023eaa2c9110e47446dd512a263c69c40cd41f2",
+                "reference": "0023eaa2c9110e47446dd512a263c69c40cd41f2",
                 "shasum": ""
             },
             "require": {
@@ -3470,7 +3477,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-08T11:40:35+00:00"
+            "time": "2026-09-12T20:45:19+00:00"
         },
         {
             "name": "nette/schema",
@@ -3632,16 +3639,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.8.0",
+            "version": "v5.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "044a6a392ff8ad0d61f14370a5fbbd0a0107152f"
+                "reference": "9e33da9553fe7786f0962b35f4e4ecf01be89def"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/044a6a392ff8ad0d61f14370a5fbbd0a0107152f",
-                "reference": "044a6a392ff8ad0d61f14370a5fbbd0a0107152f",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9e33da9553fe7786f0962b35f4e4ecf01be89def",
+                "reference": "9e33da9553fe7786f0962b35f4e4ecf01be89def",
                 "shasum": ""
             },
             "require": {
@@ -3683,9 +3690,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.8.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.9.0"
             },
-            "time": "2026-07-04T14:30:18+00:00"
+            "time": "2026-09-13T18:51:52+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -4034,16 +4041,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.56",
+            "version": "3.0.57",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "7adbbe38cde25e2df2116dbf2673c407e24fa305"
+                "reference": "d17e0ddaeaf6f22f7e007cbb437d78792fe2a0e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7adbbe38cde25e2df2116dbf2673c407e24fa305",
-                "reference": "7adbbe38cde25e2df2116dbf2673c407e24fa305",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d17e0ddaeaf6f22f7e007cbb437d78792fe2a0e4",
+                "reference": "d17e0ddaeaf6f22f7e007cbb437d78792fe2a0e4",
                 "shasum": ""
             },
             "require": {
@@ -4124,7 +4131,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.56"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.57"
             },
             "funding": [
                 {
@@ -4140,7 +4147,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-03T04:36:50+00:00"
+            "time": "2026-08-26T12:13:21+00:00"
         },
         {
             "name": "pragmarx/google2fa",
@@ -5527,16 +5534,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.4.17",
+            "version": "v7.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "962e18f09ebe68a49039b4c82fc0ea4871824fca"
+                "reference": "23d6f88a29f6d0eac45bd77d70307adf83ba7ab0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/962e18f09ebe68a49039b4c82fc0ea4871824fca",
-                "reference": "962e18f09ebe68a49039b4c82fc0ea4871824fca",
+                "url": "https://api.github.com/repos/symfony/console/zipball/23d6f88a29f6d0eac45bd77d70307adf83ba7ab0",
+                "reference": "23d6f88a29f6d0eac45bd77d70307adf83ba7ab0",
                 "shasum": ""
             },
             "require": {
@@ -5601,7 +5608,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.4.17"
+                "source": "https://github.com/symfony/console/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -5621,20 +5628,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-21T12:09:28+00:00"
+            "time": "2026-08-25T14:18:37+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v7.4.17",
+            "version": "v7.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "e3822e1cb7013a0a99b3c578130458927ec4eb89"
+                "reference": "fecf40067fc8d8880ea87b8ac227600b9aadd1d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/e3822e1cb7013a0a99b3c578130458927ec4eb89",
-                "reference": "e3822e1cb7013a0a99b3c578130458927ec4eb89",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/fecf40067fc8d8880ea87b8ac227600b9aadd1d0",
+                "reference": "fecf40067fc8d8880ea87b8ac227600b9aadd1d0",
                 "shasum": ""
             },
             "require": {
@@ -5670,7 +5677,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v7.4.17"
+                "source": "https://github.com/symfony/css-selector/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -5690,7 +5697,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-21T17:40:08+00:00"
+            "time": "2026-08-23T10:03:40+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -6012,16 +6019,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.4.17",
+            "version": "v7.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "ee7bc7bca4c7079b88e57d5000aeeb20df570c8d"
+                "reference": "90d412aa5277c6819db39e7605aa46b1019e3232"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/ee7bc7bca4c7079b88e57d5000aeeb20df570c8d",
-                "reference": "ee7bc7bca4c7079b88e57d5000aeeb20df570c8d",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/90d412aa5277c6819db39e7605aa46b1019e3232",
+                "reference": "90d412aa5277c6819db39e7605aa46b1019e3232",
                 "shasum": ""
             },
             "require": {
@@ -6058,7 +6065,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.4.17"
+                "source": "https://github.com/symfony/filesystem/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -6078,7 +6085,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-21T12:09:28+00:00"
+            "time": "2026-08-23T10:03:40+00:00"
         },
         {
             "name": "symfony/finder",
@@ -6150,16 +6157,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.4.17",
+            "version": "v7.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "2ebe78c083501dfb9509b31a7aedcae4d60a391f"
+                "reference": "d070b716a32fbe3bf04204db0f58ace73b86d133"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/2ebe78c083501dfb9509b31a7aedcae4d60a391f",
-                "reference": "2ebe78c083501dfb9509b31a7aedcae4d60a391f",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d070b716a32fbe3bf04204db0f58ace73b86d133",
+                "reference": "d070b716a32fbe3bf04204db0f58ace73b86d133",
                 "shasum": ""
             },
             "require": {
@@ -6208,7 +6215,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.4.17"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -6228,20 +6235,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-20T09:55:18+00:00"
+            "time": "2026-08-30T20:10:52+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.4.17",
+            "version": "v7.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "aa160388d444210e3d01bbb4c5c53af4cd763df4"
+                "reference": "275d2d2d24530f2a0eaf17704a3a93860a036351"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aa160388d444210e3d01bbb4c5c53af4cd763df4",
-                "reference": "aa160388d444210e3d01bbb4c5c53af4cd763df4",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/275d2d2d24530f2a0eaf17704a3a93860a036351",
+                "reference": "275d2d2d24530f2a0eaf17704a3a93860a036351",
                 "shasum": ""
             },
             "require": {
@@ -6327,7 +6334,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.4.17"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -6347,7 +6354,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-22T13:41:33+00:00"
+            "time": "2026-08-30T21:24:29+00:00"
         },
         {
             "name": "symfony/mailer",
@@ -6435,7 +6442,7 @@
         },
         {
             "name": "symfony/mime",
-            "version": "v7.4.17",
+            "version": "v7.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
@@ -6500,7 +6507,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.4.17"
+                "source": "https://github.com/symfony/mime/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -6689,16 +6696,16 @@
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.38.1",
+            "version": "v1.42.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "dc21118016c039a66235cf93d96b435ffb282412"
+                "reference": "51b5ff5ba85452b31ec6f55490b08148612339d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/dc21118016c039a66235cf93d96b435ffb282412",
-                "reference": "dc21118016c039a66235cf93d96b435ffb282412",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/51b5ff5ba85452b31ec6f55490b08148612339d9",
+                "reference": "51b5ff5ba85452b31ec6f55490b08148612339d9",
                 "shasum": ""
             },
             "require": {
@@ -6752,7 +6759,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.38.1"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.42.0"
             },
             "funding": [
                 {
@@ -6772,20 +6779,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-25T15:22:23+00:00"
+            "time": "2026-08-24T10:51:20+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.38.0",
+            "version": "v1.42.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b"
+                "reference": "aa20edea75bd9c48cfecc8360922e5a6e5c44502"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/2d446c214bdbe5b71bde5011b060a05fece3ae6b",
-                "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/aa20edea75bd9c48cfecc8360922e5a6e5c44502",
+                "reference": "aa20edea75bd9c48cfecc8360922e5a6e5c44502",
                 "shasum": ""
             },
             "require": {
@@ -6837,7 +6844,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.38.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.42.0"
             },
             "funding": [
                 {
@@ -6857,7 +6864,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-25T13:48:31+00:00"
+            "time": "2026-08-07T06:33:24+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -7353,7 +7360,7 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.4.17",
+            "version": "v7.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
@@ -7394,7 +7401,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.4.17"
+                "source": "https://github.com/symfony/process/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -7418,7 +7425,7 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v7.4.17",
+            "version": "v7.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
@@ -7479,7 +7486,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v7.4.17"
+                "source": "https://github.com/symfony/routing/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -7503,16 +7510,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.7.1",
+            "version": "v3.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "c0a284bab1ed8aa0417e3d69250ab437739563a0"
+                "reference": "15e6a07ec2a2c75ceb1b21dd98105ee8456d2257"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/c0a284bab1ed8aa0417e3d69250ab437739563a0",
-                "reference": "c0a284bab1ed8aa0417e3d69250ab437739563a0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/15e6a07ec2a2c75ceb1b21dd98105ee8456d2257",
+                "reference": "15e6a07ec2a2c75ceb1b21dd98105ee8456d2257",
                 "shasum": ""
             },
             "require": {
@@ -7566,7 +7573,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.7.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.7.3"
             },
             "funding": [
                 {
@@ -7586,7 +7593,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-16T09:55:08+00:00"
+            "time": "2026-07-27T15:39:01+00:00"
         },
         {
             "name": "symfony/string",
@@ -7941,16 +7948,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.4.17",
+            "version": "v7.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "53712df8727da1744490202eeb9cb50d4b95419d"
+                "reference": "e088da50b813f32473a76871616cbb8fa54653a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/53712df8727da1744490202eeb9cb50d4b95419d",
-                "reference": "53712df8727da1744490202eeb9cb50d4b95419d",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e088da50b813f32473a76871616cbb8fa54653a8",
+                "reference": "e088da50b813f32473a76871616cbb8fa54653a8",
                 "shasum": ""
             },
             "require": {
@@ -8004,7 +8011,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.4.17"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -8024,7 +8031,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-21T12:09:28+00:00"
+            "time": "2026-08-30T20:10:52+00:00"
         },
         {
             "name": "thecodingmachine/safe",
@@ -8226,23 +8233,23 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.6.4",
+            "version": "v5.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "416df702837983f8d5ff48c9c3fee4f5f57b980b"
+                "reference": "301c07936b16d88628b126b01d082ba153cf4c40"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/416df702837983f8d5ff48c9c3fee4f5f57b980b",
-                "reference": "416df702837983f8d5ff48c9c3fee4f5f57b980b",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/301c07936b16d88628b126b01d082ba153cf4c40",
+                "reference": "301c07936b16d88628b126b01d082ba153cf4c40",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.1.4",
+                "graham-campbell/result-type": "^1.2",
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.5",
+                "phpoption/phpoption": "^1.10",
                 "symfony/polyfill-ctype": "^1.26",
                 "symfony/polyfill-mbstring": "^1.26",
                 "symfony/polyfill-php80": "^1.26"
@@ -8286,7 +8293,7 @@
                     "homepage": "https://github.com/vlucas"
                 }
             ],
-            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+            "description": "Loads environment variables from `.env` to `$_ENV` and `$_SERVER` automagically, and optionally to `getenv()`.",
             "keywords": [
                 "dotenv",
                 "env",
@@ -8294,7 +8301,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.4"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.7.0"
             },
             "funding": [
                 {
@@ -8306,7 +8313,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-06T19:11:50+00:00"
+            "time": "2026-08-24T18:07:49+00:00"
         },
         {
             "name": "voku/portable-ascii",
@@ -8752,20 +8759,19 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.10.0",
+            "version": "v3.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "2970f83398154178a739609c244577267c7ee8eb"
+                "reference": "168fd3b955e723c51dbf81709849b0c3ac4ac5f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/2970f83398154178a739609c244577267c7ee8eb",
-                "reference": "2970f83398154178a739609c244577267c7ee8eb",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/168fd3b955e723c51dbf81709849b0c3ac4ac5f6",
+                "reference": "168fd3b955e723c51dbf81709849b0c3ac4ac5f6",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
                 "iamcal/sql-parser": "^0.7.0",
                 "illuminate/console": "^11.44.2 || ^12.4.1 || ^13",
                 "illuminate/container": "^11.44.2 || ^12.4.1 || ^13",
@@ -8775,7 +8781,7 @@
                 "illuminate/pipeline": "^11.44.2 || ^12.4.1 || ^13",
                 "illuminate/support": "^11.44.2 || ^12.4.1 || ^13",
                 "php": "^8.2",
-                "phpstan/phpstan": "^2.2.0"
+                "phpstan/phpstan": "^2.2.14"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^14",
@@ -8785,7 +8791,7 @@
                 "orchestra/canvas": "^v9.2.2 || ^10.0.1 || ^11",
                 "orchestra/testbench-core": "^9.12.0 || ^10.1 || ^11",
                 "phpstan/phpstan-deprecation-rules": "^2.0.1",
-                "phpunit/phpunit": "^10.5.35 || ^11.5.15 || ^12.5.8 || ^13.1.8"
+                "phpunit/phpunit": "^10.5.35 || ^11.5.15 || ^12.5.8 || ^13.3.0"
             },
             "suggest": {
                 "orchestra/testbench": "Using Larastan for analysing a package needs Testbench",
@@ -8830,7 +8836,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.10.0"
+                "source": "https://github.com/larastan/larastan/tree/v3.12.1"
             },
             "funding": [
                 {
@@ -8838,7 +8844,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-05-28T08:00:58+00:00"
+            "time": "2026-09-13T15:17:35+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -9198,11 +9204,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.2.9",
+            "version": "2.2.14",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/13d6b4f347bad222da436580c8304fa6f83e6bd0",
-                "reference": "13d6b4f347bad222da436580c8304fa6f83e6bd0",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9c672e7a8e791dfc3d30e55f683e73fc0b63a3ac",
+                "reference": "9c672e7a8e791dfc3d30e55f683e73fc0b63a3ac",
                 "shasum": ""
             },
             "require": {
@@ -9258,7 +9264,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-08-22T07:38:16+00:00"
+            "time": "2026-09-12T21:39:33+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -11002,7 +11008,6 @@
         "ext-dom": "*",
         "ext-fileinfo": "*",
         "ext-gd": "*",
-        "ext-json": "*",
         "ext-mbstring": "*",
         "ext-xml": "*",
         "ext-zip": "*"

From 56725154821af27179bf2a84a0dd0b0cacc9e0ae Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 15 Sep 2026 04:02:37 +0100
Subject: [PATCH 67/72] Maintenance: Addressed new phpstan issues

---
 app/Activity/Tools/WebhookFormatter.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Activity/Tools/WebhookFormatter.php b/app/Activity/Tools/WebhookFormatter.php
index 111efd5d4..d5eedb567 100644
--- a/app/Activity/Tools/WebhookFormatter.php
+++ b/app/Activity/Tools/WebhookFormatter.php
@@ -57,8 +57,10 @@ class WebhookFormatter
     }
 
     /**
+     * @template TModel of Model
+     *
      * @param callable(string, Model):bool $condition
-     * @param callable(Model):void         $format
+     * @param callable(TModel):void         $format
      */
     public function addModelFormatter(callable $condition, callable $format): void
     {
@@ -73,7 +75,7 @@ class WebhookFormatter
         // Load entity owner, creator, updater details
         $this->addModelFormatter(
             fn ($event, $model) => ($model instanceof Entity),
-            function ($model) {
+            function (Entity $model) {
                 $model->load(['ownedBy', 'createdBy', 'updatedBy']);
             }
         );
@@ -81,7 +83,7 @@ class WebhookFormatter
         // Load revision detail for page update and create events
         $this->addModelFormatter(
             fn ($event, $model) => ($model instanceof Page && ($event === ActivityType::PAGE_CREATE || $event === ActivityType::PAGE_UPDATE)),
-            function ($model) {
+            function (Page $model) {
                 $model->load('currentRevision');
             }
         );

From 12f1b7ac717ab6f1e34af216fc85e7d22deac4ad Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 15 Sep 2026 04:05:46 +0100
Subject: [PATCH 68/72] Deps: Updated JS package versions

---
 package-lock.json | 3221 +++++++++++++++++++++++----------------------
 1 file changed, 1645 insertions(+), 1576 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d239426ec..ad9cc4277 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -69,13 +69,13 @@
       "license": "ISC"
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
-      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
+      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/helper-validator-identifier": "^7.29.7",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -84,9 +84,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
-      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz",
+      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -94,21 +94,21 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
-      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
+      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.29.0",
-        "@babel/generator": "^7.29.0",
-        "@babel/helper-compilation-targets": "^7.28.6",
-        "@babel/helper-module-transforms": "^7.28.6",
-        "@babel/helpers": "^7.28.6",
-        "@babel/parser": "^7.29.0",
-        "@babel/template": "^7.28.6",
-        "@babel/traverse": "^7.29.0",
-        "@babel/types": "^7.29.0",
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-compilation-targets": "^7.29.7",
+        "@babel/helper-module-transforms": "^7.29.7",
+        "@babel/helpers": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7",
         "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -125,14 +125,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.29.1",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
-      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.8.tgz",
+      "integrity": "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.29.0",
-        "@babel/types": "^7.29.0",
+        "@babel/parser": "^7.29.8",
+        "@babel/types": "^7.29.8",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -142,14 +142,14 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
-      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
+      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.28.6",
-        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/compat-data": "^7.29.7",
+        "@babel/helper-validator-option": "^7.29.7",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -159,9 +159,9 @@
       }
     },
     "node_modules/@babel/helper-globals": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
-      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
+      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -169,29 +169,29 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
-      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
+      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
-      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
+      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.28.6",
-        "@babel/helper-validator-identifier": "^7.28.5",
-        "@babel/traverse": "^7.28.6"
+        "@babel/helper-module-imports": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -201,9 +201,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
-      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz",
+      "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -211,9 +211,9 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -221,9 +221,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
-      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -231,9 +231,9 @@
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
-      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
+      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -241,27 +241,27 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.29.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.2.tgz",
-      "integrity": "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz",
+      "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.28.6",
-        "@babel/types": "^7.29.0"
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.29.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz",
-      "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.8.tgz",
+      "integrity": "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.29.0"
+        "@babel/types": "^7.29.8"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -326,13 +326,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.28.6.tgz",
-      "integrity": "sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.29.7.tgz",
+      "integrity": "sha512-zGYcYfq/WmZ4V+kBIXQon9dSSc8ircGZqw9ZaNhhGj9nZkeBu1jHLBDQqYYi5WA9uawvA2sIMbry2nCFhf5Djg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -368,13 +368,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz",
-      "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.29.7.tgz",
+      "integrity": "sha512-TSu8+mHCoEaaCDEZ0I3+6mvTBYR4PCxQwf2z9/r5Tbztv6NaLR3B9thGTTxX2WGuGHJqRiAbKPeGTJ5XWXVg6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -494,13 +494,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.28.6.tgz",
-      "integrity": "sha512-+nDNmQye7nlnuuHDboPbGm00Vqg3oO8niRRL27/4LYHUsHYh0zJ1xWOz0uRwNFmM1Avzk8wZbc6rdiYhomzv/A==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.29.7.tgz",
+      "integrity": "sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -510,33 +510,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
-      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz",
+      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.28.6",
-        "@babel/parser": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/code-frame": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
-      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.8.tgz",
+      "integrity": "sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.29.0",
-        "@babel/generator": "^7.29.0",
-        "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.29.0",
-        "@babel/template": "^7.28.6",
-        "@babel/types": "^7.29.0",
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.8",
+        "@babel/helper-globals": "^7.29.7",
+        "@babel/parser": "^7.29.8",
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.8",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -544,14 +544,14 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
-      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz",
+      "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.28.5"
+        "@babel/helper-string-parser": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -564,10 +564,34 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@cacheable/memory": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@cacheable/memory/-/memory-2.2.0.tgz",
+      "integrity": "sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cacheable/utils": "^2.5.0",
+        "@keyv/bigmap": "^1.3.1",
+        "hookified": "^1.15.1",
+        "keyv": "^5.6.0"
+      }
+    },
+    "node_modules/@cacheable/utils": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@cacheable/utils/-/utils-2.5.0.tgz",
+      "integrity": "sha512-buipgOVDkkPXNR5+xBpDw7Zk2n1EvU7qBJCNUcL7rhQ//kfpOXPAvQ511Os0vpLYJ1pZnvudNytkQt2hst3wqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hashery": "^1.5.1",
+        "keyv": "^5.6.0"
+      }
+    },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.20.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.20.1.tgz",
-      "integrity": "sha512-1cvg3Vz1dSSToCNlJfRA2WSI4ht3K+WplO0UMOgmUYPivCyy2oueZY6Lx7M9wThm7SDUBViRmuT+OG/i8+ON9A==",
+      "version": "6.20.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.20.3.tgz",
+      "integrity": "sha512-tlosUqb+3BbxCxZdu4tKeRghPFC+QM7q4X5YhKV2eCmPG+1r2F3f4AaSz5sCrFqUtX4Jh20VFTKecl16MgiV9g==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
@@ -577,13 +601,13 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.10.3.tgz",
-      "integrity": "sha512-JFRiqhKu+bvSkDLI+rUhJwSxQxYb759W5GBezE8Uc8mHLqC9aV/9aTC7yJSqCtB3F00pylrLCwnyS91Ap5ej4Q==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.11.0.tgz",
+      "integrity": "sha512-/K4Rl5BN0OtTiPWmJCdqODu38XnDMsDxKY5rgrPnCkutPTJf2wVbkoixLfealF5Kwse/s8P8M5jAiURiwSwnFA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.6.0",
+        "@codemirror/state": "^6.7.0",
         "@codemirror/view": "^6.27.0",
         "@lezer/common": "^1.1.0"
       }
@@ -602,9 +626,9 @@
       }
     },
     "node_modules/@codemirror/lang-html": {
-      "version": "6.4.11",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.11.tgz",
-      "integrity": "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw==",
+      "version": "6.4.12",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.12.tgz",
+      "integrity": "sha512-pw2ReWKUqSkbvh76RAT4NYxiogRu+PWkR2ukAwO9uOgrm8uipkzjtKKtNpyeAQwHOqxEeSvAXZ6vr3AfyB9y/w==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
@@ -644,9 +668,9 @@
       }
     },
     "node_modules/@codemirror/lang-markdown": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.5.0.tgz",
-      "integrity": "sha512-0K40bZ35jpHya6FriukbgaleaqzBLZfOh7HuzqbMxBXkbYMJDxfF39c23xOgxFezR+3G+tR2/Mup+Xk865OMvw==",
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.5.2.tgz",
+      "integrity": "sha512-AwBOdkWYuA//WcM0xO5PfHPUcmz/O2i5o0Nsg1U69SII/loCJlFI1Romd9xp2HYb1kYJRGZotyqRghuHH5n8Kw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.7.1",
@@ -686,9 +710,9 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.3.tgz",
-      "integrity": "sha512-QwCZW6Tt1siP37Jet9Tb02Zs81TQt6qQrZR2H+eGMcFsL1zMrk2/b9CLC7/9ieP1fjIUMgviLWMmgiHoJrj+ZA==",
+      "version": "6.12.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.4.tgz",
+      "integrity": "sha512-1q4PaT+o6PbgpkJt4Q8Fv5XJxTy4FUZ4MWETtyiDw3J0Pyr9E2vqcKL+k9wcvjNTIsauxvE7OfmWj3FRPHQ76A==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -700,29 +724,29 @@
       }
     },
     "node_modules/@codemirror/legacy-modes": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.5.2.tgz",
-      "integrity": "sha512-/jJbwSTazlQEDOQw2FJ8LEEKVS72pU0lx6oM54kGpL8t/NJ2Jda3CZ4pcltiKTdqYSRk3ug1B3pil1gsjA6+8Q==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.5.4.tgz",
+      "integrity": "sha512-/cZr6qZyl08iYNLGsJ862CXXNI51LryRFRE40ejgoIjXZz0C1rGkD3/Ek5jM/8w1ceRjqtt4qx/KLMh4zBTgew==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0"
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.9.5",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.9.5.tgz",
-      "integrity": "sha512-GElsbU9G7QT9xXhpUg1zWGmftA/7jamh+7+ydKRuT0ORpWS3wOSP0yT1FOlIZa7mIJjpVPipErsyvVqB9cfTFA==",
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.9.7.tgz",
+      "integrity": "sha512-28/+iWLYxKxsvGYhSYL7zaCZqLz5+FFFDq9tVsvGv9kv8RY4fFAchJ5WX9M3YrrRlTIsECjsXPqeNgnSmNP2dg==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.35.0",
+        "@codemirror/view": "^6.42.0",
         "crelt": "^1.0.5"
       }
     },
     "node_modules/@codemirror/search": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.6.0.tgz",
-      "integrity": "sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.7.2.tgz",
+      "integrity": "sha512-gUYkYhT2+n/+VGZ+8EzE5WFkYZUZYm1VOKDudIsNqh42uRVQJ0a6Yss9sdKT3MeOYfuL1N6AZA57oza0Oyr0LA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -731,9 +755,9 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.6.0.tgz",
-      "integrity": "sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.7.4.tgz",
+      "integrity": "sha512-QhQIVRY+xHZDxwOSFrJ1eUMapJBUID3IdeAjf7dHO7zBUzSkyooHiodnalz5MG3iHzwixKMlAAyn7244y537EA==",
       "license": "MIT",
       "dependencies": {
         "@marijn/find-cluster-break": "^1.0.0"
@@ -752,12 +776,12 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.41.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.41.0.tgz",
-      "integrity": "sha512-6H/qadXsVuDY219Yljhohglve8xf4B8xJkVOEWfA5uiYKiTFppjqsvsfR5iPA0RbvRBoOyTZpbLIxe9+0UR8xA==",
+      "version": "6.43.11",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.11.tgz",
+      "integrity": "sha512-2+esucbQX6wB2JYi1eDvdCPFTA31BN8oSy6xCmk3G6CloV11yOvEjYk+gH7kLrP0MuHG94E8WDhjs5oMiu3+Wg==",
       "license": "MIT",
       "dependencies": {
-        "@codemirror/state": "^6.6.0",
+        "@codemirror/state": "^6.7.0",
         "crelt": "^1.0.6",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
@@ -903,9 +927,9 @@
       }
     },
     "node_modules/@emnapi/core": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.2.tgz",
-      "integrity": "sha512-UC+ZhH3XtczQYfOlu3lNEkdW/p4dsJ1r/bP7H8+rhao3TTTMO1ATq/4DdIi23XuGoFY+Cz0JmCbdVl0hz9jZcA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -915,9 +939,9 @@
       }
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.2.tgz",
-      "integrity": "sha512-3U4+MIWHImeyu1wnmVygh5WlgfYDtyf0k8AbLhMFxOipihf6nrWC4syIm/SwEeec0mNSafiiNnMJwbza/Is6Lw==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
+      "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -937,9 +961,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz",
-      "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.2.tgz",
+      "integrity": "sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==",
       "cpu": [
         "ppc64"
       ],
@@ -954,9 +978,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz",
-      "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.2.tgz",
+      "integrity": "sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==",
       "cpu": [
         "arm"
       ],
@@ -971,9 +995,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz",
-      "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.2.tgz",
+      "integrity": "sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==",
       "cpu": [
         "arm64"
       ],
@@ -988,9 +1012,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz",
-      "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.2.tgz",
+      "integrity": "sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==",
       "cpu": [
         "x64"
       ],
@@ -1005,9 +1029,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz",
-      "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.2.tgz",
+      "integrity": "sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==",
       "cpu": [
         "arm64"
       ],
@@ -1022,9 +1046,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz",
-      "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.2.tgz",
+      "integrity": "sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==",
       "cpu": [
         "x64"
       ],
@@ -1039,9 +1063,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz",
-      "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.2.tgz",
+      "integrity": "sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==",
       "cpu": [
         "arm64"
       ],
@@ -1056,9 +1080,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz",
-      "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.2.tgz",
+      "integrity": "sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==",
       "cpu": [
         "x64"
       ],
@@ -1073,9 +1097,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz",
-      "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.2.tgz",
+      "integrity": "sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==",
       "cpu": [
         "arm"
       ],
@@ -1090,9 +1114,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz",
-      "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.2.tgz",
+      "integrity": "sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==",
       "cpu": [
         "arm64"
       ],
@@ -1107,9 +1131,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz",
-      "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.2.tgz",
+      "integrity": "sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==",
       "cpu": [
         "ia32"
       ],
@@ -1124,9 +1148,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz",
-      "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.2.tgz",
+      "integrity": "sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==",
       "cpu": [
         "loong64"
       ],
@@ -1141,9 +1165,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz",
-      "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.2.tgz",
+      "integrity": "sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==",
       "cpu": [
         "mips64el"
       ],
@@ -1158,9 +1182,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz",
-      "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.2.tgz",
+      "integrity": "sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==",
       "cpu": [
         "ppc64"
       ],
@@ -1175,9 +1199,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz",
-      "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.2.tgz",
+      "integrity": "sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==",
       "cpu": [
         "riscv64"
       ],
@@ -1192,9 +1216,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz",
-      "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.2.tgz",
+      "integrity": "sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==",
       "cpu": [
         "s390x"
       ],
@@ -1209,9 +1233,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz",
-      "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.2.tgz",
+      "integrity": "sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==",
       "cpu": [
         "x64"
       ],
@@ -1226,9 +1250,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz",
-      "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.2.tgz",
+      "integrity": "sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==",
       "cpu": [
         "arm64"
       ],
@@ -1243,9 +1267,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz",
-      "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.2.tgz",
+      "integrity": "sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==",
       "cpu": [
         "x64"
       ],
@@ -1260,9 +1284,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz",
-      "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.2.tgz",
+      "integrity": "sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==",
       "cpu": [
         "arm64"
       ],
@@ -1277,9 +1301,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz",
-      "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.2.tgz",
+      "integrity": "sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==",
       "cpu": [
         "x64"
       ],
@@ -1294,9 +1318,9 @@
       }
     },
     "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz",
-      "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.2.tgz",
+      "integrity": "sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==",
       "cpu": [
         "arm64"
       ],
@@ -1311,9 +1335,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz",
-      "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.2.tgz",
+      "integrity": "sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==",
       "cpu": [
         "x64"
       ],
@@ -1328,9 +1352,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz",
-      "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.2.tgz",
+      "integrity": "sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==",
       "cpu": [
         "arm64"
       ],
@@ -1345,9 +1369,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz",
-      "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.2.tgz",
+      "integrity": "sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==",
       "cpu": [
         "ia32"
       ],
@@ -1362,9 +1386,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz",
-      "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.2.tgz",
+      "integrity": "sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==",
       "cpu": [
         "x64"
       ],
@@ -1379,9 +1403,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
-      "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz",
+      "integrity": "sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1436,9 +1460,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.5.tgz",
-      "integrity": "sha512-eIJYKTCECbP/nsKaaruF6LW967mtbQbsw4JTtSVkUQc9MneSkbrgPJAbKl9nWr0ZeowV8BfsarBmPpBzGelA2w==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.7.0.tgz",
+      "integrity": "sha512-DObd/KKUsU+FaFv4PLxSRenpXfQWmPXXP3pPZ6/K1PCrMu2vQpMDMuQe/BqYeoLcz8ro0bVDF1RxOJgfVEdhUw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1493,9 +1517,9 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.1.tgz",
-      "integrity": "sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.3.tgz",
+      "integrity": "sha512-IkO+/KEUvwbVpiURZg+P7zF74z5Jxe0UgJxVni+RtoHQ6IZieXaO02kmadomap/q+l6bc/jdPGGqTjhuZnuz1Q==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1507,29 +1531,43 @@
       }
     },
     "node_modules/@humanfs/core": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz",
+      "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==",
       "dev": true,
       "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/types": "^0.15.0"
+      },
       "engines": {
         "node": ">=18.18.0"
       }
     },
     "node_modules/@humanfs/node": {
-      "version": "0.16.7",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
-      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz",
+      "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanfs/core": "^0.19.1",
+        "@humanfs/core": "^0.19.2",
+        "@humanfs/types": "^0.15.0",
         "@humanwhocodes/retry": "^0.4.0"
       },
       "engines": {
         "node": ">=18.18.0"
       }
     },
+    "node_modules/@humanfs/types": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz",
+      "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -1576,6 +1614,91 @@
         "node": ">=12"
       }
     },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz",
+      "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -1650,9 +1773,9 @@
       }
     },
     "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.6.tgz",
+      "integrity": "sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1660,17 +1783,17 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.3.0.tgz",
-      "integrity": "sha512-PAwCvFJ4696XP2qZj+LAn1BWjZaJ6RjG6c7/lkMaUJnkyMS34ucuIsfqYvfskVNvUI27R/u4P1HMYFnlVXG/Ww==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.5.1.tgz",
+      "integrity": "sha512-u5Ncuc+gXVUwjNMFQOnphHo2Qx2DxyC8Dvpmf4HCx4y0kvSkRRNiQYRixrvOP4V7y52JcSuNxqochCt0PpdHVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.3.0",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "chalk": "^4.1.2",
-        "jest-message-util": "30.3.0",
-        "jest-util": "30.3.0",
+        "jest-message-util": "30.5.1",
+        "jest-util": "30.5.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -1678,38 +1801,39 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-30.3.0.tgz",
-      "integrity": "sha512-U5mVPsBxLSO6xYbf+tgkymLx+iAhvZX43/xI1+ej2ZOPnPdkdO1CzDmFKh2mZBn2s4XZixszHeQnzp1gm/DIxw==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-30.5.1.tgz",
+      "integrity": "sha512-BL9g6CJUUhIbdoAflz/Va658erSSXUIvU8XUYiWNTbZljJjZ5yaC9EJ9/dQ19rpbYV3ZOK4sBACqhPaTyhoUIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "30.3.0",
-        "@jest/pattern": "30.0.1",
-        "@jest/reporters": "30.3.0",
-        "@jest/test-result": "30.3.0",
-        "@jest/transform": "30.3.0",
-        "@jest/types": "30.3.0",
+        "@jest/console": "30.5.1",
+        "@jest/pattern": "30.5.0",
+        "@jest/reporters": "30.5.1",
+        "@jest/test-result": "30.5.1",
+        "@jest/transform": "30.5.1",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "ansi-escapes": "^4.3.2",
         "chalk": "^4.1.2",
         "ci-info": "^4.2.0",
         "exit-x": "^0.2.2",
+        "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.11",
-        "jest-changed-files": "30.3.0",
-        "jest-config": "30.3.0",
-        "jest-haste-map": "30.3.0",
-        "jest-message-util": "30.3.0",
-        "jest-regex-util": "30.0.1",
-        "jest-resolve": "30.3.0",
-        "jest-resolve-dependencies": "30.3.0",
-        "jest-runner": "30.3.0",
-        "jest-runtime": "30.3.0",
-        "jest-snapshot": "30.3.0",
-        "jest-util": "30.3.0",
-        "jest-validate": "30.3.0",
-        "jest-watcher": "30.3.0",
-        "pretty-format": "30.3.0",
+        "jest-changed-files": "30.5.1",
+        "jest-config": "30.5.1",
+        "jest-haste-map": "30.5.1",
+        "jest-message-util": "30.5.1",
+        "jest-regex-util": "30.5.0",
+        "jest-resolve": "30.5.1",
+        "jest-resolve-dependencies": "30.5.1",
+        "jest-runner": "30.5.1",
+        "jest-runtime": "30.5.1",
+        "jest-snapshot": "30.5.1",
+        "jest-util": "30.5.1",
+        "jest-validate": "30.5.1",
+        "jest-watcher": "30.5.1",
+        "pretty-format": "30.5.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -1725,9 +1849,9 @@
       }
     },
     "node_modules/@jest/diff-sequences": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.3.0.tgz",
-      "integrity": "sha512-cG51MVnLq1ecVUaQ3fr6YuuAOitHK1S4WUJHnsPFE/quQr33ADUx1FfrTCpMCRxvy0Yr9BThKpDjSlcTi91tMA==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.5.0.tgz",
+      "integrity": "sha512-OsqBjHXCn8cadasoAZBP6nWYvMsRhpMzGXTpxJ5aO04NlbdhIz+FVe3q49l0AwVhsz/cEmIpBes6gAFl1/dWQg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1735,40 +1859,40 @@
       }
     },
     "node_modules/@jest/environment": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.3.0.tgz",
-      "integrity": "sha512-SlLSF4Be735yQXyh2+mctBOzNDx5s5uLv88/j8Qn1wH679PDcwy67+YdADn8NJnGjzlXtN62asGH/T4vWOkfaw==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.5.1.tgz",
+      "integrity": "sha512-eYJAkOsrpwDXPcoLNEG6lN9Zo3Cy35pxnVQD74vyIfsi/Q8wB/lZFsEjU4wrecOgT4ZviQDZaX/cFIJyMdMxTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/fake-timers": "30.3.0",
-        "@jest/types": "30.3.0",
+        "@jest/fake-timers": "30.5.1",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
-        "jest-mock": "30.3.0"
+        "jest-mock": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/environment-jsdom-abstract": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment-jsdom-abstract/-/environment-jsdom-abstract-30.3.0.tgz",
-      "integrity": "sha512-0hNFs5N6We3DMCwobzI0ydhkY10sT1tZSC0AAiy+0g2Dt/qEWgrcV5BrMxPczhe41cxW4qm6X+jqZaUdpZIajA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment-jsdom-abstract/-/environment-jsdom-abstract-30.5.1.tgz",
+      "integrity": "sha512-J395vmP3Fb2Te0JmF7pe4si4jpfbXef1YsY4UpHYL6OOxS2molu9Dsie1VmIiUalXdtmz1P5QRgc+5hBD+ssBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.3.0",
-        "@jest/fake-timers": "30.3.0",
-        "@jest/types": "30.3.0",
-        "@types/jsdom": "^21.1.7",
+        "@jest/environment": "30.5.1",
+        "@jest/fake-timers": "30.5.1",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
-        "jest-mock": "30.3.0",
-        "jest-util": "30.3.0"
+        "jest-mock": "30.5.1",
+        "jest-util": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
+        "@types/jsdom": "*",
         "canvas": "^3.0.0",
         "jsdom": "*"
       },
@@ -1779,54 +1903,54 @@
       }
     },
     "node_modules/@jest/expect": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.3.0.tgz",
-      "integrity": "sha512-76Nlh4xJxk2D/9URCn3wFi98d2hb19uWE1idLsTt2ywhvdOldbw3S570hBgn25P4ICUZ/cBjybrBex2g17IDbg==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.5.1.tgz",
+      "integrity": "sha512-uOGd40P/COyUp9xHf5jeGiGJC2/ANg+2+Tk9/xN5/LxmlY/r/gxsPrx3DTEtaRZsLAX4wgNSLEDELZ5bmVs2bA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "expect": "30.3.0",
-        "jest-snapshot": "30.3.0"
+        "expect": "30.5.1",
+        "jest-snapshot": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.3.0.tgz",
-      "integrity": "sha512-j0+W5iQQ8hBh7tHZkTQv3q2Fh/M7Je72cIsYqC4OaktgtO7v1So9UTjp6uPBHIaB6beoF/RRsCgMJKvti0wADA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.5.1.tgz",
+      "integrity": "sha512-WcRWhHQdTMRDpyWKZ/6MINBmovI7zeD+bL8wFjCncRV3NQOwKy1X45IfyblfHR4k/XciIlNEdFL9QjFO+HNKOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.1.0"
+        "@jest/get-type": "30.5.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.3.0.tgz",
-      "integrity": "sha512-WUQDs8SOP9URStX1DzhD425CqbN/HxUYCTwVrT8sTVBfMvFqYt/s61EK5T05qnHu0po6RitXIvP9otZxYDzTGQ==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.5.1.tgz",
+      "integrity": "sha512-rEkV6YzpBXo/L9cnj2ibyuYZuyGiNWaPUsyCu3HYJbqCV4jnEiKmf7hId20z8eKjZ0JQ9jtIYKxRSmYB/OYSsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.3.0",
-        "@sinonjs/fake-timers": "^15.0.0",
+        "@jest/types": "30.5.1",
+        "@sinonjs/fake-timers": "^15.4.0",
         "@types/node": "*",
-        "jest-message-util": "30.3.0",
-        "jest-mock": "30.3.0",
-        "jest-util": "30.3.0"
+        "jest-message-util": "30.5.1",
+        "jest-mock": "30.5.1",
+        "jest-util": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/get-type": {
-      "version": "30.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz",
-      "integrity": "sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.5.0.tgz",
+      "integrity": "sha512-9/2VUPitAjmBzbvDvqrxmvB7BzWsBW0WmkkojX1ODuxX1NLGxx9gfaZpHB0z8DtJ9uhGNmZG/VXBhf8uO0OV8Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1834,62 +1958,78 @@
       }
     },
     "node_modules/@jest/globals": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.3.0.tgz",
-      "integrity": "sha512-+owLCBBdfpgL3HU+BD5etr1SvbXpSitJK0is1kiYjJxAAJggYMRQz5hSdd5pq1sSggfxPbw2ld71pt4x5wwViA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.5.1.tgz",
+      "integrity": "sha512-VhqvQ251XIC7pk46YymI3HCeBLOdvriDw9zibekodAHEwoVvbVVgpU5H13GvmyOAzxtZCfsm1uvzqkaqJf2I+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.3.0",
-        "@jest/expect": "30.3.0",
-        "@jest/types": "30.3.0",
-        "jest-mock": "30.3.0"
+        "@jest/environment": "30.5.1",
+        "@jest/expect": "30.5.1",
+        "@jest/types": "30.5.1",
+        "jest-mock": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/pattern": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz",
-      "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.5.0.tgz",
+      "integrity": "sha512-HdNQYSdRTEBNrginaqzQtTjG0HRMfrra/z6Ok7uL3S87vSlarIVohEsJsSj5edu3MiHoHjAkvPROz5ZjoKai+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
-        "jest-regex-util": "30.0.1"
+        "jest-regex-util": "30.5.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
+    "node_modules/@jest/react-is-18": {
+      "name": "react-is",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jest/react-is-19": {
+      "name": "react-is",
+      "version": "19.3.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.3.0.tgz",
+      "integrity": "sha512-UpMYezM4v5/18F28aC66AEsjXIgE02kyEMH6yLdgLXu/UTfa1Ntwck/nNLrbqJsEXW7gPb0coNO9FQse9WTovA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@jest/reporters": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.3.0.tgz",
-      "integrity": "sha512-a09z89S+PkQnL055bVj8+pe2Caed2PBOaczHcXCykW5ngxX9EWx/1uAwncxc/HiU0oZqfwseMjyhxgRjS49qPw==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.5.1.tgz",
+      "integrity": "sha512-RbUXIfv85KxitJn4l3MpAoMilkvXe2QCO5lXxHWftywo/VdZ5vkEoHRDgphcxP6qmoIkUaN8/UZj6NhdkIFdJg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "30.3.0",
-        "@jest/test-result": "30.3.0",
-        "@jest/transform": "30.3.0",
-        "@jest/types": "30.3.0",
-        "@jridgewell/trace-mapping": "^0.3.25",
+        "@jest/console": "30.5.1",
+        "@jest/test-result": "30.5.1",
+        "@jest/transform": "30.5.1",
+        "@jest/types": "30.5.1",
+        "@jridgewell/trace-mapping": "^0.3.31",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "collect-v8-coverage": "^1.0.2",
         "exit-x": "^0.2.2",
-        "glob": "^10.5.0",
+        "glob": "^13.0.6",
         "graceful-fs": "^4.2.11",
         "istanbul-lib-coverage": "^3.0.0",
         "istanbul-lib-instrument": "^6.0.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^5.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "30.3.0",
-        "jest-util": "30.3.0",
-        "jest-worker": "30.3.0",
+        "jest-message-util": "30.5.1",
+        "jest-util": "30.5.1",
+        "jest-worker": "30.5.1",
         "slash": "^3.0.0",
         "string-length": "^4.0.2",
         "v8-to-istanbul": "^9.0.1"
@@ -1907,9 +2047,9 @@
       }
     },
     "node_modules/@jest/schemas": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-      "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.5.0.tgz",
+      "integrity": "sha512-/hunigyNpc4RCjC0VaW3f5RCUZVM2+WQ65qP7z083Gmvac7or2LI50XVNOtE4YPgBpV0yxYiAgorAPGniCoJmg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1920,13 +2060,13 @@
       }
     },
     "node_modules/@jest/snapshot-utils": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.3.0.tgz",
-      "integrity": "sha512-ORbRN9sf5PP82v3FXNSwmO1OTDR2vzR2YTaR+E3VkSBZ8zadQE6IqYdYEeFH1NIkeB2HIGdF02dapb6K0Mj05g==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.5.1.tgz",
+      "integrity": "sha512-V3wnxNtiVmw5PPVg433Cn3VdXnsOeu/ofLw3KC04Bn2y1wIlU5kozXQn48rhrgj/02LrCVtntTEF1yBha0XSUw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.3.0",
+        "@jest/types": "30.5.1",
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
         "natural-compare": "^1.4.0"
@@ -1936,14 +2076,15 @@
       }
     },
     "node_modules/@jest/source-map": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-30.0.1.tgz",
-      "integrity": "sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-30.5.0.tgz",
+      "integrity": "sha512-xWpTJP9D0bDFGbPGT8XuWSwwha/iHADyyKzUnMx4UbdgnHugxrDaQFO4RZ8x4ZsFzRP6pNii8uvlgKCDxCIuDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
+        "@jridgewell/trace-mapping": "^0.3.31",
         "callsites": "^3.1.0",
+        "convert-source-map": "^2.0.0",
         "graceful-fs": "^4.2.11"
       },
       "engines": {
@@ -1951,14 +2092,14 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.3.0.tgz",
-      "integrity": "sha512-e/52nJGuD74AKTSe0P4y5wFRlaXP0qmrS17rqOMHeSwm278VyNyXE3gFO/4DTGF9w+65ra3lo3VKj0LBrzmgdQ==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.5.1.tgz",
+      "integrity": "sha512-A/1S6ZBdpic50E0pxLgvaB9XNPL4k7AksmG69OO2oiotxciWZwHkbOec+qbIi+uUtIIByOVlXJUl97oZUsz+Jw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "30.3.0",
-        "@jest/types": "30.3.0",
+        "@jest/console": "30.5.1",
+        "@jest/types": "30.5.1",
         "@types/istanbul-lib-coverage": "^2.0.6",
         "collect-v8-coverage": "^1.0.2"
       },
@@ -1967,15 +2108,15 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.3.0.tgz",
-      "integrity": "sha512-dgbWy9b8QDlQeRZcv7LNF+/jFiiYHTKho1xirauZ7kVwY7avjFF6uTT0RqlgudB5OuIPagFdVtfFMosjVbk1eA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.5.1.tgz",
+      "integrity": "sha512-SHcPnrjdVRYJv6y6l4JUTy4Jccu7zmO6BmiOfOA34UiVBto22s19WiDC0A/2qfM7MWB/qdcoqfSIRMitpjTT4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "30.3.0",
+        "@jest/test-result": "30.5.1",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.3.0",
+        "jest-haste-map": "30.5.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -1983,23 +2124,23 @@
       }
     },
     "node_modules/@jest/transform": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.3.0.tgz",
-      "integrity": "sha512-TLKY33fSLVd/lKB2YI1pH69ijyUblO/BQvCj566YvnwuzoTNr648iE0j22vRvVNk2HsPwByPxATg3MleS3gf5A==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.5.1.tgz",
+      "integrity": "sha512-EDnDhn0jleU9ZhpVoA4gvqw+Ev0iw/r5upNT2b79RiwiaTiYAMMhvNJP3lmocjIe5J2ZkoNr0B3K/J6O5GIm4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.27.4",
-        "@jest/types": "30.3.0",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "babel-plugin-istanbul": "^7.0.1",
+        "@jest/types": "30.5.1",
+        "@jridgewell/trace-mapping": "^0.3.31",
+        "babel-plugin-istanbul": "^8.0.0",
         "chalk": "^4.1.2",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.3.0",
-        "jest-regex-util": "30.0.1",
-        "jest-util": "30.3.0",
+        "jest-haste-map": "30.5.1",
+        "jest-regex-util": "30.5.0",
+        "jest-util": "30.5.1",
         "pirates": "^4.0.7",
         "slash": "^3.0.0",
         "write-file-atomic": "^5.0.1"
@@ -2009,14 +2150,14 @@
       }
     },
     "node_modules/@jest/types": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.3.0.tgz",
-      "integrity": "sha512-JHm87k7bA33hpBngtU8h6UBub/fqqA9uXfw+21j5Hmk7ooPHlboRNxHq0JcMtC+n8VJGP1mcfnD3Mk+XKe1oSw==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.5.1.tgz",
+      "integrity": "sha512-LvVYn83nnXPl+Rg98nvcFgjx6nRMTArhSn6RAX/w3ELn54S8A42TYZvsCMdGUqTM8S0wyXbtlQdU6Hi6dykj9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/pattern": "30.0.1",
-        "@jest/schemas": "30.0.5",
+        "@jest/pattern": "30.5.0",
+        "@jest/schemas": "30.5.0",
         "@types/istanbul-lib-coverage": "^2.0.6",
         "@types/istanbul-reports": "^3.0.4",
         "@types/node": "*",
@@ -2060,9 +2201,9 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
+      "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
       "dev": true,
       "license": "MIT"
     },
@@ -2077,6 +2218,30 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@keyv/bigmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.3.1.tgz",
+      "integrity": "sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hashery": "^1.4.0",
+        "hookified": "^1.15.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "keyv": "^5.6.0"
+      }
+    },
+    "node_modules/@keyv/serialize": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
+      "integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@lezer/common": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.2.tgz",
@@ -2084,9 +2249,9 @@
       "license": "MIT"
     },
     "node_modules/@lezer/css": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.3.tgz",
-      "integrity": "sha512-RzBo8r+/6QJeow7aPHIpGVIH59xTcJXp399820gZoMo9noQDRVpJLheIBUicYwKcsbOYoBRoLZlf2720dG/4Tg==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.6.tgz",
+      "integrity": "sha512-YJE78Wcg+zX8f10hiHWQ4Az48Qr/c13eId0VtRQYLBpxHDmDeSrXIlkbl+fJGW42rWC/uoUco9mhBZeVWP/A1g==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -2151,18 +2316,18 @@
       }
     },
     "node_modules/@lezer/lr": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.8.tgz",
-      "integrity": "sha512-bPWa0Pgx69ylNlMlPvBPryqeLYQjyJjqPx+Aupm5zydLIF3NE+6MMLT8Yi23Bd9cif9VS00aUebn+6fDIGBcDA==",
+      "version": "1.4.10",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.10.tgz",
+      "integrity": "sha512-rnCpTIBafOx4mRp43xOxDJbFipJm/c0cia/V5TiGlhmMa+wsSdoGmUN3w5Bqrks/09Q/D4tNAmWaT8p6NRi77A==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
     },
     "node_modules/@lezer/markdown": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.6.3.tgz",
-      "integrity": "sha512-jpGm5Ps+XErS+xA4urw7ogEGkeZOahVQF21Z6oECF0sj+2liwZopd2+I8uH5I/vZsRuuze3OxBREIANLf6KKUw==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.7.2.tgz",
+      "integrity": "sha512-iTkYvoVcKt3WkeL7qUDyXHONZEwLio4wj8KTNi2dnjQEXBZKMV63BpQrPqfsM+OkvuRbiSTAcycYAsQzLhRNoQ==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.5.0",
@@ -2170,9 +2335,9 @@
       }
     },
     "node_modules/@lezer/php": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.5.tgz",
-      "integrity": "sha512-W7asp9DhM6q0W6DYNwIkLSKOvxlXRrif+UXBMxzsJUuqmhE7oVU+gS3THO4S/Puh7Xzgm858UNaFi6dxTP8dJA==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.6.tgz",
+      "integrity": "sha512-QJ2xNXPmsm/Z3IpThq8fnJrEIVpxhsIoj6GZBW0JYEd/l9zxpJZW216X4fzqQY4vgpdGIumypvI4uQjd4tnYtw==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -2192,37 +2357,45 @@
       }
     },
     "node_modules/@marijn/find-cluster-break": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
-      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.4.tgz",
+      "integrity": "sha512-Wy0V7+SGUjnF9/TkiM1hKVDPj7jKXduPNboMVtHTA8dySMURWqfg/JZ9E2Sq8JgSJmkl7k7Qe9FLeMSrSraWmQ==",
       "license": "MIT"
     },
     "node_modules/@napi-rs/wasm-runtime": {
-      "version": "0.2.12",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
-      "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.4.tgz",
+      "integrity": "sha512-AJxoUD2/15ESHbvpcyjU274nsAPLuOtPHCk0vKJM5pj//Fg/B1FXNWjPnXTT9PymCYYiHo4zPj0ZomXBKhoy7g==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/core": "^1.4.3",
-        "@emnapi/runtime": "^1.4.3",
-        "@tybys/wasm-util": "^0.10.0"
+        "@tybys/wasm-util": "^0.10.3"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=23.5.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      },
+      "peerDependencies": {
+        "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4",
+        "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4"
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
-      "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.6.0.tgz",
+      "integrity": "sha512-7FNeNl8NCE7aINx7WXiKQrPYZWC/hvrTsmk6zmxbI7LTXE7hVek/n8AfVgpe2y82zl3w0HvCHN0bVKMBoJcC0w==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "detect-libc": "^2.0.3",
         "is-glob": "^4.0.3",
         "node-addon-api": "^7.0.0",
-        "picomatch": "^4.0.3"
+        "picomatch": "^4.0.4"
       },
       "engines": {
         "node": ">= 10.0.0"
@@ -2232,25 +2405,24 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.6",
-        "@parcel/watcher-darwin-arm64": "2.5.6",
-        "@parcel/watcher-darwin-x64": "2.5.6",
-        "@parcel/watcher-freebsd-x64": "2.5.6",
-        "@parcel/watcher-linux-arm-glibc": "2.5.6",
-        "@parcel/watcher-linux-arm-musl": "2.5.6",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.6",
-        "@parcel/watcher-linux-arm64-musl": "2.5.6",
-        "@parcel/watcher-linux-x64-glibc": "2.5.6",
-        "@parcel/watcher-linux-x64-musl": "2.5.6",
-        "@parcel/watcher-win32-arm64": "2.5.6",
-        "@parcel/watcher-win32-ia32": "2.5.6",
-        "@parcel/watcher-win32-x64": "2.5.6"
+        "@parcel/watcher-android-arm64": "2.6.0",
+        "@parcel/watcher-darwin-arm64": "2.6.0",
+        "@parcel/watcher-darwin-x64": "2.6.0",
+        "@parcel/watcher-freebsd-x64": "2.6.0",
+        "@parcel/watcher-linux-arm-glibc": "2.6.0",
+        "@parcel/watcher-linux-arm-musl": "2.6.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.6.0",
+        "@parcel/watcher-linux-arm64-musl": "2.6.0",
+        "@parcel/watcher-linux-x64-glibc": "2.6.0",
+        "@parcel/watcher-linux-x64-musl": "2.6.0",
+        "@parcel/watcher-win32-arm64": "2.6.0",
+        "@parcel/watcher-win32-x64": "2.6.0"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz",
-      "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.6.0.tgz",
+      "integrity": "sha512-trgpLSCKRC/huFjXX/Smh+0sWe4+YtKfktIToiMl59ghz7z+qkH6kMvNnUbLyRs9N11t8l4svSCs1+5B3rOAhA==",
       "cpu": [
         "arm64"
       ],
@@ -2269,9 +2441,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
-      "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.6.0.tgz",
+      "integrity": "sha512-Y3QV0gl7Q1zbfueunkWIERICbEojQFCgpyG7YqOGNFLsckXyI1xu9mAIUpKY9QBYzBtSkN8dBPwd3yiAO9ovMw==",
       "cpu": [
         "arm64"
       ],
@@ -2290,9 +2462,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz",
-      "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.6.0.tgz",
+      "integrity": "sha512-Ohv6OpzhUfKYD7Beb8kDvG0jbIxORCYY1JRdZnaBtnjjkJxgD7ZVL0nw2sCYd0yTMKTvz3nnTnOF3cDifK+kvw==",
       "cpu": [
         "x64"
       ],
@@ -2311,9 +2483,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz",
-      "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.6.0.tgz",
+      "integrity": "sha512-5HmXvDgs8VK+74jF9y9/2FE3/OnlcKmc56tjmSrEuZjpSZOGL+fvAu+HKJBdPs9uwoP2hE6TlSUpXZ/C5jUFmQ==",
       "cpu": [
         "x64"
       ],
@@ -2332,9 +2504,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz",
-      "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.6.0.tgz",
+      "integrity": "sha512-Ps/hui3A+vMbjdqlqAowK2ZL8+BO8dBjxeWXj6npTBs3jx4wWmbPpaLuqwrQrSqIVMCnpWo238bJ1U37GhQOYg==",
       "cpu": [
         "arm"
       ],
@@ -2356,9 +2528,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz",
-      "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.6.0.tgz",
+      "integrity": "sha512-9c6AUHgHoG+IY88MRIHupztQiQnrbqHYQjkM2btA+Bf/wQnQMuiD0Wfk1EVv3TlNT3x41uU71rn6E4xh/+zvkw==",
       "cpu": [
         "arm"
       ],
@@ -2380,9 +2552,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz",
-      "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.6.0.tgz",
+      "integrity": "sha512-yHRqS2owEXe6Hic9z6Mh1ECsCd+ODVOGvZDyciqRd21+v+o+DnXMOrw50DSpIG2sb8GPEaPPmfeCAWKPJdq46g==",
       "cpu": [
         "arm64"
       ],
@@ -2404,9 +2576,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz",
-      "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.6.0.tgz",
+      "integrity": "sha512-WhB2e/V7rqdHHWZusBSPuy5Ei8S6lSz6FE5TKKQz5h3a0O+C+mhY7vxU9b/stqvMb8beLnPY82ZrFTLKs+SrKA==",
       "cpu": [
         "arm64"
       ],
@@ -2428,9 +2600,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz",
-      "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.6.0.tgz",
+      "integrity": "sha512-ulGE6x6Oz6iAwg75T8YQSoguBWasniIbX+QWpaYPcCnDOpdWX3k+4xbEYPZVLxOuoJI+svJJPD3sEj8G7lrQ3A==",
       "cpu": [
         "x64"
       ],
@@ -2452,9 +2624,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz",
-      "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.6.0.tgz",
+      "integrity": "sha512-tkBYKt7YQrjIJWYDnto2YgO8MRkjlMTSNoRHzsXinBqbLdeOM3L32wPZJvIZxqaLMfSlS/4sUjH/6STVP/XDLw==",
       "cpu": [
         "x64"
       ],
@@ -2476,9 +2648,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz",
-      "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.6.0.tgz",
+      "integrity": "sha512-gIZAP23jaHjGWasY/TY6yL7NHFClf0Ga7FN+iINvk+KN94rhm94lYZhFsbYFNcA04/onvGD9kKmiJLJB2HbNwQ==",
       "cpu": [
         "arm64"
       ],
@@ -2496,31 +2668,10 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz",
-      "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz",
-      "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.6.0.tgz",
+      "integrity": "sha512-cA+/pXV2YkfxlIcXOQ5fSWqAzzPyD78/x5qbK/I0vUkrlYHA8TIz+MXjAbGouguKVSI4bOmkTSJ1/poVSsgt+A==",
       "cpu": [
         "x64"
       ],
@@ -2539,12 +2690,11 @@
       }
     },
     "node_modules/@parcel/watcher/node_modules/picomatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+      "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=12"
       },
@@ -2564,22 +2714,22 @@
       }
     },
     "node_modules/@pkgr/core": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
-      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.3.6.tgz",
+      "integrity": "sha512-SEeaJLb3qBNF/OaXnaR1NmmBbFYk1zC0ZH/52fATcRPLFg/p791YrcyFFy44Bo9sLaGuSuLp5Q6axbb/O+v/RA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+        "node": "^14.18.0 || >=16.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/pkgr"
       }
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.34.49",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.49.tgz",
-      "integrity": "sha512-brySQQs7Jtn0joV8Xh9ZV/hZb9Ozb0pmazDIASBkYKCjXrXU3mpcFahmK/z4YDhGkQvP9mWJbVyahdtU5wQA+A==",
+      "version": "0.34.52",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.52.tgz",
+      "integrity": "sha512-XiMQh7qqVlxZzcVD+kkGMNGMzcTrDMLWI7S4x7z1MkCkbDPrekpZXEUK0eZqZFMuHQg2a2DZOcDIh9o5v3Gonw==",
       "dev": true,
       "license": "MIT"
     },
@@ -2594,9 +2744,9 @@
       }
     },
     "node_modules/@sinonjs/fake-timers": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-15.3.0.tgz",
-      "integrity": "sha512-m2xozxSfCIxjDdvbhIWazlP2i2aha/iUmbl94alpsIbd3iLTfeXgfBVbwyWogB6l++istyGZqamgA/EcqYf+Bg==",
+      "version": "15.4.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-15.4.0.tgz",
+      "integrity": "sha512-DsG+8/LscQIQg68J6Ef3dv10u6nVyetYn923s3/sus5eaGfTo1of5WMZSLf0UJc9KDuKPilPH0UDJCjvNbDNCA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -2621,9 +2771,9 @@
       }
     },
     "node_modules/@tsconfig/node10": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.12.tgz",
-      "integrity": "sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.13.tgz",
+      "integrity": "sha512-gcLdvR9HO1ZJBypsOGqaP6TFEzb6vIta0KSTLt9NAQ6pXQO3cRgSVyCN6pzYqI9DlJgY71XKO0dpDhCf08b3pg==",
       "dev": true,
       "license": "MIT"
     },
@@ -2649,9 +2799,9 @@
       "license": "MIT"
     },
     "node_modules/@tybys/wasm-util": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
-      "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.4.tgz",
+      "integrity": "sha512-W3c4gRigFS0T/Ma4qIYF3GDAc5AQdHb1yL5znJT1Zv1YaD9Kitx656wBjvr19qbiosmZT8lWDM5BEMynUqX65A==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -2712,9 +2862,9 @@
       "license": "MIT"
     },
     "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "dev": true,
       "license": "MIT"
     },
@@ -2783,9 +2933,9 @@
       "license": "MIT"
     },
     "node_modules/@types/markdown-it": {
-      "version": "14.1.2",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
-      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.2.0.tgz",
+      "integrity": "sha512-NoQ2yGlLWj4wpxMs+TYmRKk3thDrQ97agr7sFqfLsAlvoS8SNQuTrlObhFqG9iugdTtgOE9jpJ6FNM4ZGsa5xQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2801,13 +2951,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.5.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.2.tgz",
-      "integrity": "sha512-tO4ZIRKNC+MDWV4qKVZe3Ql/woTnmHDr5JD8UI5hn2pwBrHEwOEMZK7WlNb5RKB6EoJ02gwmQS9OrjuFnZYdpg==",
+      "version": "26.5.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.5.1.tgz",
+      "integrity": "sha512-CzNm2FezW4VR/LjG6yUdiEgLE/rAQ9Slj5gCu/C2VrdcW7I0ahNZ8DRbHT7zOZ6r3ONgd/bsQIeSaoDGrd1C6g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.18.0"
+        "undici-types": "~8.9.0"
       }
     },
     "node_modules/@types/sortablejs": {
@@ -2849,16 +2999,16 @@
       "license": "MIT"
     },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
-      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.4.0.tgz",
+      "integrity": "sha512-1mEZtMKPM09vDmQt5y7YvmN2+DFTP7Tg0EWXdic8/C6VRnpb33e4ghisCIE3WZjsE2N8mf+QV1Zqh7ZFYLWInQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/@unrs/resolver-binding-android-arm-eabi": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
-      "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.12.2.tgz",
+      "integrity": "sha512-g5T90pqg1bo/7mytQx6F4iBNC0Wsh9cu+z9veDbFjc7HjpesJFWD7QMS0NGStXM075+7dJPPVvBbpZlnrdpi/w==",
       "cpu": [
         "arm"
       ],
@@ -2870,9 +3020,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-android-arm64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
-      "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.12.2.tgz",
+      "integrity": "sha512-YGCRZv/9GLhwmz6mYDeTsm/92BAyR28l6c2ReweVW5pWgfsitWLY8upvfRlGdoyD8HjeTHSYJWyZGD4KJA/nFQ==",
       "cpu": [
         "arm64"
       ],
@@ -2884,9 +3034,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-darwin-arm64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
-      "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.12.2.tgz",
+      "integrity": "sha512-u9DiNT1auQMO20A9SyTuG3wUgQWB9Z7KjAg0uFuCDR1FsAY8A0CG2S6JpHS1xwm/w1G08bjXZDcyOCjv1WAm2w==",
       "cpu": [
         "arm64"
       ],
@@ -2898,9 +3048,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-darwin-x64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
-      "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.12.2.tgz",
+      "integrity": "sha512-f7rPLi/T1HVKZu/u6t87lroib16n8vrSzcyxI7lg4BGO9UF26KhQL44sd9eOUgrTYhvRXtWOIZT5PejdPyJfUA==",
       "cpu": [
         "x64"
       ],
@@ -2912,9 +3062,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-freebsd-x64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
-      "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.12.2.tgz",
+      "integrity": "sha512-BpcOjWCJub6nRZUS2zA20pmLvjtqAtGejETaIyRLiZiQf++cbrjltLA5NN/xaXfqeOBOSlMFbemIl5/S5tljmg==",
       "cpu": [
         "x64"
       ],
@@ -2926,9 +3076,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
-      "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.12.2.tgz",
+      "integrity": "sha512-vZTDvdSISZjJx66OzJqtsOhzifbqRjbmI1Mnu49fQDwog5GtDI4QidRiEAYbZCRj9C8YZEW+3ZjqsyS9GR4k2A==",
       "cpu": [
         "arm"
       ],
@@ -2940,9 +3090,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
-      "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.12.2.tgz",
+      "integrity": "sha512-BiPI+IrIlwcW4nLLMM21+B1dFPzd55yAVgVGrdgDjNef+ch03GdxrcyaIz8X9SsQirh/kCQ7mviyWlMxdh2D7g==",
       "cpu": [
         "arm"
       ],
@@ -2954,9 +3104,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
-      "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.12.2.tgz",
+      "integrity": "sha512-zJc0H99FEPoFfSrNpa91HYfxzfAJCr502oxNK1cfdC9hlaFI43RT+JFCann9JUgZmLzzntChHyn13Sgn9ljHNg==",
       "cpu": [
         "arm64"
       ],
@@ -2971,9 +3121,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
-      "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.12.2.tgz",
+      "integrity": "sha512-KQ3Lki6l+Pz1k/eBipN41ES+YUK30beLGb9YqcB1O542cyLCNE6GaxrfcY3T6EezmGGk84wb5XyO9loTM9tkcA==",
       "cpu": [
         "arm64"
       ],
@@ -2987,10 +3137,44 @@
         "linux"
       ]
     },
+    "node_modules/@unrs/resolver-binding-linux-loong64-gnu": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-loong64-gnu/-/resolver-binding-linux-loong64-gnu-1.12.2.tgz",
+      "integrity": "sha512-3SJGEh1DborhG6pyxvhPzCT4bbSIVihsvgJc13P1bHG7KLdNDaF9T3gsTwFc7Jw/5Y5/iWOjkEx7Zy0NvCGX3Q==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-loong64-musl": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-loong64-musl/-/resolver-binding-linux-loong64-musl-1.12.2.tgz",
+      "integrity": "sha512-jiuG/Obbel7uw1PwHNFfrkiKhLAF6mnyZ6aWlOAVN9WqKm8v0OFGnciJIHu8+CMvXLQ8AD51LPzAoUfT21D5Ew==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
-      "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.12.2.tgz",
+      "integrity": "sha512-q7xRvVpmcfeL+LlZg8Pbbo6QaTZwDU5BaGZbwfhkEsXJn3Was8xYfE0RBH266xZt0rM6B7i8xAYIvjthuUIWHg==",
       "cpu": [
         "ppc64"
       ],
@@ -3005,9 +3189,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
-      "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.12.2.tgz",
+      "integrity": "sha512-0CVdx6lcnT3Q9inOH8tsMIOJ6ImndllMjqJHg8RLVdB7Vq4SfkEXl9mCSsVNuNA4MCYycRicCUxPCabVHJRr6A==",
       "cpu": [
         "riscv64"
       ],
@@ -3022,9 +3206,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
-      "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.12.2.tgz",
+      "integrity": "sha512-iOwlRo9vnp6R6ohHQS11n0NnfdXx/omhkocmIfaPRpQhKZ+3BDMkkdRVh53qjkFkpPddf+FETA28NwGN7l5l+w==",
       "cpu": [
         "riscv64"
       ],
@@ -3039,9 +3223,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
-      "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.12.2.tgz",
+      "integrity": "sha512-HYJtLfXq94q8iZNFT1lknx258wlkkWhZeUXJRqzKBBUJ00CvZ+N33zgbCqimLjsyw5Va6uUxhVa12mI+kaveEw==",
       "cpu": [
         "s390x"
       ],
@@ -3056,9 +3240,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
-      "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.12.2.tgz",
+      "integrity": "sha512-mPsUhunKKDih5O96Y6enDQyHc1SqBPlY1E/SfMWDM3EdJ95Z9CArPeCVwCCqbP45ljvivdEk8Fxn+SIb1rDAJQ==",
       "cpu": [
         "x64"
       ],
@@ -3073,9 +3257,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-x64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
-      "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.12.2.tgz",
+      "integrity": "sha512-azrt6+5ydLd8Vt210AAFis/lZevSfPw93EJRIJG+xPu4WCJ8K0kppCTpMyLPcKT7H15M4Jnt2tMp5bOvCkRC6A==",
       "cpu": [
         "x64"
       ],
@@ -3089,10 +3273,24 @@
         "linux"
       ]
     },
+    "node_modules/@unrs/resolver-binding-openharmony-arm64": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-openharmony-arm64/-/resolver-binding-openharmony-arm64-1.12.2.tgz",
+      "integrity": "sha512-YZ9hP4O0X9PQb8eO980qmLNGH4zT3I9+SZTdt0Pr0YyuGQhYKoOZkV02VzrzyOZJ5xIJ3UFIenKkUkGg8GjgWQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
     "node_modules/@unrs/resolver-binding-wasm32-wasi": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
-      "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.12.2.tgz",
+      "integrity": "sha512-tYFDIkMxSflfEc/h92ZWNsZlHSwgimbNHSO3PL2JWQHfCuC2q316jMyYU9TIWZsFK2bQwyK5VAdYgn8ygPj69A==",
       "cpu": [
         "wasm32"
       ],
@@ -3100,16 +3298,18 @@
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@napi-rs/wasm-runtime": "^0.2.11"
+        "@emnapi/core": "1.10.0",
+        "@emnapi/runtime": "1.10.0",
+        "@napi-rs/wasm-runtime": "^1.1.4"
       },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
-      "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.12.2.tgz",
+      "integrity": "sha512-qzNyg3xL0VPQmCaUh+N5jSitce6k+uCBfMDesWRnlULOZaqUkaJ0ybdT+UqlAWJoQjuqfIU/0Ptx9bteN4D82g==",
       "cpu": [
         "arm64"
       ],
@@ -3121,9 +3321,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
-      "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.12.2.tgz",
+      "integrity": "sha512-WD9sY00OfpHVGfsnHZoA8jVT+esS/Bg8z8jzxp5BnDCjjwsuKsPQrzswwpFy4J1AUJbXPRfkpcX0mXrzeXW79g==",
       "cpu": [
         "ia32"
       ],
@@ -3135,9 +3335,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
-      "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.12.2.tgz",
+      "integrity": "sha512-nAB74NfSNKknqQ1RrYj6uz8FcXEomu/MATJZxh/x+BArzN2U3JbOYC0APYzUIGhVY3m5hRxA8VPNdPBoG8txlA==",
       "cpu": [
         "x64"
       ],
@@ -3149,9 +3349,9 @@
       ]
     },
     "node_modules/acorn": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
-      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz",
+      "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -3195,9 +3395,9 @@
       }
     },
     "node_modules/ajv": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
-      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz",
+      "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3228,16 +3428,13 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+        "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
@@ -3353,16 +3550,16 @@
       }
     },
     "node_modules/babel-jest": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.3.0.tgz",
-      "integrity": "sha512-gRpauEU2KRrCox5Z296aeVHR4jQ98BCnu0IO332D/xpHNOsIH/bgSRk9k6GbKIbBw8vFeN6ctuu6tV8WOyVfYQ==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.5.1.tgz",
+      "integrity": "sha512-ge1xUVZS91ml09YRMgRGgeKJ4YJpcOiuwteAxFBYLugQyp7cRw+hHej6Ho0vPjvLrjq60bb7JPHH9LAMA1/krA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/transform": "30.3.0",
+        "@jest/transform": "30.5.1",
         "@types/babel__core": "^7.20.5",
-        "babel-plugin-istanbul": "^7.0.1",
-        "babel-preset-jest": "30.3.0",
+        "babel-plugin-istanbul": "^8.0.0",
+        "babel-preset-jest": "30.5.0",
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
         "slash": "^3.0.0"
@@ -3375,9 +3572,9 @@
       }
     },
     "node_modules/babel-plugin-istanbul": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.1.tgz",
-      "integrity": "sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-8.0.0.tgz",
+      "integrity": "sha512-18wCskrN3DgbuBmp1gr7LBGT8xdz5xhQQqFvFhVxbkl8VBCrMKQ2YtqBWtUal1Zrc1HTuX0011+Brjw78TCFkg==",
       "dev": true,
       "license": "BSD-3-Clause",
       "workspaces": [
@@ -3388,16 +3585,16 @@
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.3",
         "istanbul-lib-instrument": "^6.0.2",
-        "test-exclude": "^6.0.0"
+        "test-exclude": "^7.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.3.0.tgz",
-      "integrity": "sha512-+TRkByhsws6sfPjVaitzadk1I0F5sPvOVUH5tyTSzhePpsGIVrdeunHSw/C36QeocS95OOk8lunc4rlu5Anwsg==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.5.0.tgz",
+      "integrity": "sha512-gtGo1B+u14jrZQv6TdSWIWkTqclboo7Qn+dFAGUOIuXLFuJKAdg3U5MIWzZnW4vfUb4dX9skmAMiby86e/SF4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3435,20 +3632,20 @@
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.3.0.tgz",
-      "integrity": "sha512-6ZcUbWHC+dMz2vfzdNwi87Z1gQsLNK2uLuK1Q89R11xdvejcivlYYwDlEv0FHX3VwEXpbBQ9uufB/MUNpZGfhQ==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.5.0.tgz",
+      "integrity": "sha512-ZGPn5ClP4lBDpuOK8W1yQIOy359HmbnZv3suucAlIe+SEE9yDsxV4S2PjSbH2Vc97U+WmzYD7vw3kr8NsQ/i6w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-plugin-jest-hoist": "30.3.0",
+        "babel-plugin-jest-hoist": "30.5.0",
         "babel-preset-current-node-syntax": "^1.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.11.0 || ^8.0.0-beta.1"
+        "@babel/core": "^7.11.0 || ^8.0.0-beta.1 || ^8.0.0"
       }
     },
     "node_modules/balanced-match": {
@@ -3462,9 +3659,9 @@
       }
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.16",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.16.tgz",
-      "integrity": "sha512-Lyf3aK28zpsD1yQMiiHD4RvVb6UdMoo8xzG2XzFIfR9luPzOpcBlAsT/qfB1XWS1bxWT+UtE4WmQgsp297FYOA==",
+      "version": "2.11.23",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.23.tgz",
+      "integrity": "sha512-le521dGVfxM7yRX0EikCoSz+rOK+hHzdDt/E7mG1jOJB/6WAAUuwVroLwaB7ApaUsz5Q0kFlDXLSA9MheUIfRQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -3488,16 +3685,16 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
-      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
+      "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^4.0.2"
       },
       "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
       }
     },
     "node_modules/braces": {
@@ -3514,9 +3711,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.28.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz",
-      "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==",
+      "version": "4.28.9",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.9.tgz",
+      "integrity": "sha512-EWazOblFYUvlGZcfGhPUPmYh3nikUxBVb+y9MJun5f3hBi812X+8MSQTujLBtgK3cf51fJWbWfOjyeO954d+Eg==",
       "dev": true,
       "funding": [
         {
@@ -3534,11 +3731,11 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "baseline-browser-mapping": "^2.10.12",
-        "caniuse-lite": "^1.0.30001782",
-        "electron-to-chromium": "^1.5.328",
-        "node-releases": "^2.0.36",
-        "update-browserslist-db": "^1.2.3"
+        "baseline-browser-mapping": "^2.11.20",
+        "caniuse-lite": "^1.0.30001810",
+        "electron-to-chromium": "^1.5.420",
+        "node-releases": "^2.0.54",
+        "update-browserslist-db": "^1.3.2"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -3570,23 +3767,30 @@
         "node-int64": "^0.4.0"
       }
     },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
-      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+    "node_modules/cacheable": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-2.5.0.tgz",
+      "integrity": "sha512-60cyAOytib/OzBw1JNSoSV/boK1AtHryDIjvVBk7XbN4ugfkM3+Sry7fEjNgPMGgOjuaZPAp8ruZ0Cxafwyq9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
+        "@cacheable/memory": "^2.2.0",
+        "@cacheable/utils": "^2.5.0",
+        "hookified": "^1.15.0",
+        "keyv": "^5.6.0",
+        "qified": "^0.10.1"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.9.tgz",
+      "integrity": "sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "get-intrinsic": "^1.3.0",
         "set-function-length": "^1.2.2"
       },
       "engines": {
@@ -3648,9 +3852,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001787",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001787.tgz",
-      "integrity": "sha512-mNcrMN9KeI68u7muanUpEejSLghOKlVhRqS/Za2IeyGllJ9I9otGpR9g3nsw7n4W378TE/LyIteA0+/FOZm4Kg==",
+      "version": "1.0.30001810",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001810.tgz",
+      "integrity": "sha512-TITQPUkaz+aVk5GL6NhOdwk1aEaNTSDPsGFWrTuhKGtjTF70jL/Oht2W4c6rXUe5fu7Ie19VIahAXHIIiWWNeg==",
       "dev": true,
       "funding": [
         {
@@ -3756,9 +3960,9 @@
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz",
-      "integrity": "sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.2.1.tgz",
+      "integrity": "sha512-Ca8swihM+/4yKecYHY52kgJd300hi2lADU/a1RxNTRe+RJ9jvqQlESpbz9DnG9mowez8qwXHB8qYdIUw9e+F5Q==",
       "dev": true,
       "license": "MIT"
     },
@@ -3784,68 +3988,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/cliui/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cliui/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/cliui/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/cliui/node_modules/strip-ansi": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -3859,21 +4001,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/cliui/node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -3949,9 +4076,9 @@
       "license": "MIT"
     },
     "node_modules/crelt": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
-      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.7.tgz",
+      "integrity": "sha512-aK6BbWfhf4U/wCcLHKPJl/xa6VkVstRaPywWtMKGwuOLc/wZTyQYuoxgvZnNsBvv7Kg3YTBQYYBCggcviQczuA==",
       "license": "MIT"
     },
     "node_modules/cross-spawn": {
@@ -4160,7 +4287,6 @@
       "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
       "license": "Apache-2.0",
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -4208,9 +4334,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.334",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.334.tgz",
-      "integrity": "sha512-mgjZAz7Jyx1SRCwEpy9wefDS7GvNPazLthHg8eQMJ76wBdGQQDW33TCrUTvQ4wzpmOrv2zrFoD3oNufMdyMpog==",
+      "version": "1.5.428",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.428.tgz",
+      "integrity": "sha512-1JxbaFJj1bRKurj1uY3l4xxpU9kOUAUjcIgApj0qu1Pao5GhoIWI8iL0BeMYJ2njig1hBx0A7eKD9VGjH9wlHw==",
       "dev": true,
       "license": "ISC"
     },
@@ -4228,9 +4354,9 @@
       }
     },
     "node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true,
       "license": "MIT"
     },
@@ -4325,6 +4451,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-abstract-get": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-abstract-get/-/es-abstract-get-1.0.0.tgz",
+      "integrity": "sha512-6PMWXpdhshVvFp+FoWYs1EvG1Nj0tvk0dZM+XcK0xMEM1czRVcP6ohqPWHy6qPagSpC8j4+p89WXlT+xXJs/fg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.2",
+        "is-callable": "^1.2.7",
+        "object-inspect": "^1.13.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -4345,10 +4490,17 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-module-lexer": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.2.tgz",
+      "integrity": "sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz",
+      "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4375,15 +4527,18 @@
       }
     },
     "node_modules/es-to-primitive": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
-      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.4.tgz",
+      "integrity": "sha512-yPDz7wqpg1/mmHLmS3tcfTfbw5f1eryXvyghYBffGdERwe+mV7ZcWzTR8LR17Kvqt3qfPurjlonmnq3MKXIOXw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "es-abstract-get": "^1.0.0",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
         "is-callable": "^1.2.7",
-        "is-date-object": "^1.0.5",
-        "is-symbol": "^1.0.4"
+        "is-date-object": "^1.1.0",
+        "is-symbol": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4393,9 +4548,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz",
-      "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.2.tgz",
+      "integrity": "sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -4406,32 +4561,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.28.0",
-        "@esbuild/android-arm": "0.28.0",
-        "@esbuild/android-arm64": "0.28.0",
-        "@esbuild/android-x64": "0.28.0",
-        "@esbuild/darwin-arm64": "0.28.0",
-        "@esbuild/darwin-x64": "0.28.0",
-        "@esbuild/freebsd-arm64": "0.28.0",
-        "@esbuild/freebsd-x64": "0.28.0",
-        "@esbuild/linux-arm": "0.28.0",
-        "@esbuild/linux-arm64": "0.28.0",
-        "@esbuild/linux-ia32": "0.28.0",
-        "@esbuild/linux-loong64": "0.28.0",
-        "@esbuild/linux-mips64el": "0.28.0",
-        "@esbuild/linux-ppc64": "0.28.0",
-        "@esbuild/linux-riscv64": "0.28.0",
-        "@esbuild/linux-s390x": "0.28.0",
-        "@esbuild/linux-x64": "0.28.0",
-        "@esbuild/netbsd-arm64": "0.28.0",
-        "@esbuild/netbsd-x64": "0.28.0",
-        "@esbuild/openbsd-arm64": "0.28.0",
-        "@esbuild/openbsd-x64": "0.28.0",
-        "@esbuild/openharmony-arm64": "0.28.0",
-        "@esbuild/sunos-x64": "0.28.0",
-        "@esbuild/win32-arm64": "0.28.0",
-        "@esbuild/win32-ia32": "0.28.0",
-        "@esbuild/win32-x64": "0.28.0"
+        "@esbuild/aix-ppc64": "0.28.2",
+        "@esbuild/android-arm": "0.28.2",
+        "@esbuild/android-arm64": "0.28.2",
+        "@esbuild/android-x64": "0.28.2",
+        "@esbuild/darwin-arm64": "0.28.2",
+        "@esbuild/darwin-x64": "0.28.2",
+        "@esbuild/freebsd-arm64": "0.28.2",
+        "@esbuild/freebsd-x64": "0.28.2",
+        "@esbuild/linux-arm": "0.28.2",
+        "@esbuild/linux-arm64": "0.28.2",
+        "@esbuild/linux-ia32": "0.28.2",
+        "@esbuild/linux-loong64": "0.28.2",
+        "@esbuild/linux-mips64el": "0.28.2",
+        "@esbuild/linux-ppc64": "0.28.2",
+        "@esbuild/linux-riscv64": "0.28.2",
+        "@esbuild/linux-s390x": "0.28.2",
+        "@esbuild/linux-x64": "0.28.2",
+        "@esbuild/netbsd-arm64": "0.28.2",
+        "@esbuild/netbsd-x64": "0.28.2",
+        "@esbuild/openbsd-arm64": "0.28.2",
+        "@esbuild/openbsd-x64": "0.28.2",
+        "@esbuild/openharmony-arm64": "0.28.2",
+        "@esbuild/sunos-x64": "0.28.2",
+        "@esbuild/win32-arm64": "0.28.2",
+        "@esbuild/win32-ia32": "0.28.2",
+        "@esbuild/win32-x64": "0.28.2"
       }
     },
     "node_modules/escalade": {
@@ -4458,18 +4613,21 @@
       }
     },
     "node_modules/eslint": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.2.0.tgz",
-      "integrity": "sha512-+L0vBFYGIpSNIt/KWTpFonPrqYvgKw1eUI5Vn7mEogrQcWtWYtNQ7dNqC+px/J0idT3BAkiWrhfS7k+Tum8TUA==",
+      "version": "10.10.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.10.0.tgz",
+      "integrity": "sha512-NPXn6r5zl4uET1DAVPaOwzX3rut4c0wcmw3dWJAfOsTM5+TogXo0DDjz8pwm/hL8cyVNpHqeK4JpN0NjnyFFNw==",
       "dev": true,
       "license": "MIT",
+      "workspaces": [
+        "packages/*"
+      ],
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.2",
-        "@eslint/config-array": "^0.23.4",
-        "@eslint/config-helpers": "^0.5.4",
-        "@eslint/core": "^1.2.0",
-        "@eslint/plugin-kit": "^0.7.0",
+        "@eslint/config-array": "^0.23.5",
+        "@eslint/config-helpers": "^0.7.0",
+        "@eslint/core": "^1.2.1",
+        "@eslint/plugin-kit": "^0.7.3",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
@@ -4484,14 +4642,14 @@
         "esquery": "^1.7.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^8.0.0",
+        "file-entry-cache": "11.1.5 || >11.1.6 <12",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "minimatch": "^10.2.4",
+        "minimatch": "^10.2.5",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3"
       },
@@ -4660,13 +4818,6 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/execa/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/exit-x": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/exit-x/-/exit-x-0.2.2.tgz",
@@ -4678,18 +4829,18 @@
       }
     },
     "node_modules/expect": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-30.3.0.tgz",
-      "integrity": "sha512-1zQrciTiQfRdo7qJM1uG4navm8DayFa2TgCSRlzUyNkhcJ6XUZF3hjnpkyr3VhAqPH7i/9GkG7Tv5abz6fqz0Q==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-30.5.1.tgz",
+      "integrity": "sha512-m8YrYgvKe9+9gEnWEuKz+qCGfHqkrff7PPfyDnOFkjsfYRKqiYyOxDFMFieCGAuhtk/VNm63tvNgKZVzVy+Hvg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/expect-utils": "30.3.0",
-        "@jest/get-type": "30.1.0",
-        "jest-matcher-utils": "30.3.0",
-        "jest-message-util": "30.3.0",
-        "jest-mock": "30.3.0",
-        "jest-util": "30.3.0"
+        "@jest/expect-utils": "30.5.1",
+        "@jest/get-type": "30.5.0",
+        "jest-matcher-utils": "30.5.1",
+        "jest-message-util": "30.5.1",
+        "jest-mock": "30.5.1",
+        "jest-util": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
@@ -4727,16 +4878,13 @@
       }
     },
     "node_modules/file-entry-cache": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
-      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+      "version": "11.1.5",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-11.1.5.tgz",
+      "integrity": "sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "flat-cache": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=16.0.0"
+        "flat-cache": "^6.1.23"
       }
     },
     "node_modules/fill-range": {
@@ -4770,23 +4918,21 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
-      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+      "version": "6.1.23",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.23.tgz",
+      "integrity": "sha512-f++BY9pTk+983xK1FLzlLpmM0i0z+jHmx3QESGkURMXujQZz1k5wzwX6hjnQ8goaD0B+sYnDK1yZ6MTyZfUaqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.4"
-      },
-      "engines": {
-        "node": ">=16"
+        "cacheable": "^2.5.0",
+        "flatted": "^3.4.2",
+        "hookified": "^1.15.0"
       }
     },
     "node_modules/flatted": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
-      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.4.tgz",
+      "integrity": "sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==",
       "dev": true,
       "license": "ISC"
     },
@@ -4823,12 +4969,18 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "dev": true,
-      "license": "ISC"
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -4856,18 +5008,21 @@
       }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
-      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.2.0.tgz",
+      "integrity": "sha512-jObKIik1P2QjPHP5nz5BaOtUlfgS0fWo8IUByNXkM+o+02sJOi94em77GwJKQSJ3gfPHdgzLNrHc1uokV4P/ew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
+        "call-bind": "^1.0.9",
+        "call-bound": "^1.0.4",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
         "functions-have-names": "^1.2.3",
-        "hasown": "^2.0.2",
-        "is-callable": "^1.2.7"
+        "has-property-descriptors": "^1.0.2",
+        "hasown": "^2.0.4",
+        "is-callable": "^1.2.7",
+        "is-document.all": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4997,22 +5152,18 @@
       }
     },
     "node_modules/glob": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
-      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "version": "13.0.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
+      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "minimatch": "^10.2.2",
+        "minipass": "^7.1.3",
+        "path-scurry": "^2.0.2"
       },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
+      "engines": {
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -5031,43 +5182,10 @@
         "node": ">= 6"
       }
     },
-    "node_modules/glob/node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
-      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "9.0.9",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/globals": {
-      "version": "17.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-17.4.0.tgz",
-      "integrity": "sha512-hjrNztw/VajQwOLsMNT1cbJiH2muO3OROCHnbehc8eY5JyD2gqz4AcMHPqgaOR59DjgUjYAYLeH699g/eWi2jw==",
+      "version": "17.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.12.0.tgz",
+      "integrity": "sha512-cezEd/DTyyht9cvSSURyygXPfy04GtWO/5e6ZPvH7fCtjKz9PYOmuawphw1Ctd1f6C+5JypXfGD7ahNMXvevBA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5217,10 +5335,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/hashery": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/hashery/-/hashery-1.5.1.tgz",
+      "integrity": "sha512-iZyKG96/JwPz1N55vj2Ie2vXbhu440zfUfJvSwEqEbeLluk7NnapfGqa7LH0mOsnDxTF85Mx8/dyR6HfqcbmbQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hookified": "^1.15.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
+      "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5230,6 +5361,13 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/hookified": {
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.15.1.tgz",
+      "integrity": "sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/hosted-git-info": {
       "version": "2.8.9",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
@@ -5309,9 +5447,9 @@
       }
     },
     "node_modules/idb-keyval": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.2.tgz",
-      "integrity": "sha512-yjD9nARJ/jb1g+CvD0tlhUHOrJ9Sy0P8T9MF3YaLlHnSRpwPfpTX0XIvpmw3gAJUmEu3FiICLBDPXVwyEvrleg==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.3.0.tgz",
+      "integrity": "sha512-um+2dgAWmYsu615EXpWVwSmapJhON0G43t3Ka/EVaohzPQXSMqKEqeDK/oIW3Ow+BXaF2PvSc+oBTFp793A5Ow==",
       "license": "Apache-2.0"
     },
     "node_modules/ignore": {
@@ -5325,9 +5463,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
-      "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==",
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.9.tgz",
+      "integrity": "sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==",
       "dev": true,
       "license": "MIT"
     },
@@ -5361,25 +5499,6 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/internal-slot": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
@@ -5500,13 +5619,13 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "version": "2.16.2",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz",
+      "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.2"
+        "hasown": "^2.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5550,6 +5669,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-document.all": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-document.all/-/is-document.all-1.0.0.tgz",
+      "integrity": "sha512-+XSoyS05OdBbhFuELhgTCpFNHkpBOJqtsZfUFFpe5QTw+9Sjbh8zitxhQkYAo6wV7e1Vb8cAPvpCk9jGam/82g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -5577,13 +5712,13 @@
       }
     },
     "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/is-generator-fn": {
@@ -5889,9 +6024,9 @@
       }
     },
     "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -5962,16 +6097,16 @@
       }
     },
     "node_modules/jest": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-30.3.0.tgz",
-      "integrity": "sha512-AkXIIFcaazymvey2i/+F94XRnM6TsVLZDhBMLsd1Sf/W0wzsvvpjeyUrCZD6HGG4SDYPgDJDBKeiJTBb10WzMg==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-30.5.1.tgz",
+      "integrity": "sha512-3qrR8+ZXFnn7y0H2yjWQNkGGBLBY4zTRoTMAq9zJcgwLLtlyonfsCLviIXK9xuE2KgIyM+M36AFcoK2DgFR36w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "30.3.0",
-        "@jest/types": "30.3.0",
+        "@jest/core": "30.5.1",
+        "@jest/types": "30.5.1",
         "import-local": "^3.2.0",
-        "jest-cli": "30.3.0"
+        "jest-cli": "30.5.1"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -5989,14 +6124,14 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.3.0.tgz",
-      "integrity": "sha512-B/7Cny6cV5At6M25EWDgf9S617lHivamL8vl6KEpJqkStauzcG4e+WPfDgMMF+H4FVH4A2PLRyvgDJan4441QA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.5.1.tgz",
+      "integrity": "sha512-0+bvMM/ENhDI29Z8q1r4HxiDIi4G5tnBmSw4esfPQoj9q8Nik7KIyuxHkTVnnniJQf05SxpGaKDQ+4h28ynGPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "execa": "^5.1.1",
-        "jest-util": "30.3.0",
+        "jest-util": "30.5.1",
         "p-limit": "^3.1.0"
       },
       "engines": {
@@ -6004,29 +6139,29 @@
       }
     },
     "node_modules/jest-circus": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.3.0.tgz",
-      "integrity": "sha512-PyXq5szeSfR/4f1lYqCmmQjh0vqDkURUYi9N6whnHjlRz4IUQfMcXkGLeEoiJtxtyPqgUaUUfyQlApXWBSN1RA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.5.1.tgz",
+      "integrity": "sha512-NgliezXQ6yznqR4W5Gqw++0cZSbBZlF0NknNIAE5VmSJKWOtmWJmWnBq3TSkUOVBTPrT7FGGhVdA8DLWnxo2Sw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.3.0",
-        "@jest/expect": "30.3.0",
-        "@jest/test-result": "30.3.0",
-        "@jest/types": "30.3.0",
+        "@jest/environment": "30.5.1",
+        "@jest/expect": "30.5.1",
+        "@jest/test-result": "30.5.1",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "co": "^4.6.0",
         "dedent": "^1.6.0",
         "is-generator-fn": "^2.1.0",
-        "jest-each": "30.3.0",
-        "jest-matcher-utils": "30.3.0",
-        "jest-message-util": "30.3.0",
-        "jest-runtime": "30.3.0",
-        "jest-snapshot": "30.3.0",
-        "jest-util": "30.3.0",
+        "jest-each": "30.5.1",
+        "jest-matcher-utils": "30.5.1",
+        "jest-message-util": "30.5.1",
+        "jest-runtime": "30.5.1",
+        "jest-snapshot": "30.5.1",
+        "jest-util": "30.5.1",
         "p-limit": "^3.1.0",
-        "pretty-format": "30.3.0",
+        "pretty-format": "30.5.1",
         "pure-rand": "^7.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.6"
@@ -6036,21 +6171,21 @@
       }
     },
     "node_modules/jest-cli": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.3.0.tgz",
-      "integrity": "sha512-l6Tqx+j1fDXJEW5bqYykDQQ7mQg+9mhWXtnj+tQZrTWYHyHoi6Be8HPumDSA+UiX2/2buEgjA58iJzdj146uCw==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.5.1.tgz",
+      "integrity": "sha512-uwNYepWgaNBCplm42fCIUZTf/tIEHIy5AYvx7eL1BrwIgyjPt+2poouR23UO2yopIP+kV8oZFHfv+l4pg/8prQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "30.3.0",
-        "@jest/test-result": "30.3.0",
-        "@jest/types": "30.3.0",
+        "@jest/core": "30.5.1",
+        "@jest/test-result": "30.5.1",
+        "@jest/types": "30.5.1",
         "chalk": "^4.1.2",
         "exit-x": "^0.2.2",
         "import-local": "^3.2.0",
-        "jest-config": "30.3.0",
-        "jest-util": "30.3.0",
-        "jest-validate": "30.3.0",
+        "jest-config": "30.5.1",
+        "jest-util": "30.5.1",
+        "jest-validate": "30.5.1",
         "yargs": "^17.7.2"
       },
       "bin": {
@@ -6068,16 +6203,6 @@
         }
       }
     },
-    "node_modules/jest-cli/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-cli/node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -6100,6 +6225,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/jest-cli/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-cli/node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -6115,19 +6250,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-cli/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-cli/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -6157,9 +6279,9 @@
       }
     },
     "node_modules/jest-cli/node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "version": "17.7.3",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz",
+      "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6176,33 +6298,33 @@
       }
     },
     "node_modules/jest-config": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.3.0.tgz",
-      "integrity": "sha512-WPMAkMAtNDY9P/oKObtsRG/6KTrhtgPJoBTmk20uDn4Uy6/3EJnnaZJre/FMT1KVRx8cve1r7/FlMIOfRVWL4w==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.5.1.tgz",
+      "integrity": "sha512-L8PKM2X/ngG8PxfLMqglKGZjylPgw84bVPUlMY9W/o76TnLqPWrmQgsaT0HrheGdRtpGE5FbmREA0Kvb+Qx5gQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.27.4",
-        "@jest/get-type": "30.1.0",
-        "@jest/pattern": "30.0.1",
-        "@jest/test-sequencer": "30.3.0",
-        "@jest/types": "30.3.0",
-        "babel-jest": "30.3.0",
+        "@jest/get-type": "30.5.0",
+        "@jest/pattern": "30.5.0",
+        "@jest/test-sequencer": "30.5.1",
+        "@jest/types": "30.5.1",
+        "babel-jest": "30.5.1",
         "chalk": "^4.1.2",
         "ci-info": "^4.2.0",
         "deepmerge": "^4.3.1",
-        "glob": "^10.5.0",
+        "glob": "^13.0.6",
         "graceful-fs": "^4.2.11",
-        "jest-circus": "30.3.0",
-        "jest-docblock": "30.2.0",
-        "jest-environment-node": "30.3.0",
-        "jest-regex-util": "30.0.1",
-        "jest-resolve": "30.3.0",
-        "jest-runner": "30.3.0",
-        "jest-util": "30.3.0",
-        "jest-validate": "30.3.0",
+        "jest-circus": "30.5.1",
+        "jest-docblock": "30.5.0",
+        "jest-environment-node": "30.5.1",
+        "jest-regex-util": "30.5.0",
+        "jest-resolve": "30.5.1",
+        "jest-runner": "30.5.1",
+        "jest-util": "30.5.1",
+        "jest-validate": "30.5.1",
         "parse-json": "^5.2.0",
-        "pretty-format": "30.3.0",
+        "pretty-format": "30.5.1",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -6227,25 +6349,25 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.3.0.tgz",
-      "integrity": "sha512-n3q4PDQjS4LrKxfWB3Z5KNk1XjXtZTBwQp71OP0Jo03Z6V60x++K5L8k6ZrW8MY8pOFylZvHM0zsjS1RqlHJZQ==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.5.1.tgz",
+      "integrity": "sha512-e3cNNMpv8Kh20MjjphTXs+3Vz7DQyLM1nft7KJhnh46atFhjVJRa+0Hq0beywuwsACtMQUBihQkFl8zxb7gt1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/diff-sequences": "30.3.0",
-        "@jest/get-type": "30.1.0",
+        "@jest/diff-sequences": "30.5.0",
+        "@jest/get-type": "30.5.0",
         "chalk": "^4.1.2",
-        "pretty-format": "30.3.0"
+        "pretty-format": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-docblock": {
-      "version": "30.2.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.2.0.tgz",
-      "integrity": "sha512-tR/FFgZKS1CXluOQzZvNH3+0z9jXr3ldGSD8bhyuxvlVUwbeLOGynkunvlTMxchC5urrKndYiwCFC0DLVjpOCA==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.5.0.tgz",
+      "integrity": "sha512-NwDqcxtoZi33RhuW+zJS/RVA3rmheQ8BnwpYZuc/Eruaz6seQb7+aoCeDZu/3X7W2XmD8DbSo9Pn72DbKsBFYw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6256,31 +6378,32 @@
       }
     },
     "node_modules/jest-each": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.3.0.tgz",
-      "integrity": "sha512-V8eMndg/aZ+3LnCJgSm13IxS5XSBM22QSZc9BtPK8Dek6pm+hfUNfwBdvsB3d342bo1q7wnSkC38zjX259qZNA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.5.1.tgz",
+      "integrity": "sha512-S1af0TU4v1EZ/AUlkFs/sxf/5KGsbAT9kRgdyoMX/x72y7C8ZEgETE5o1TPnbKRnrbprc5FR/moYLfdRmqEjsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.1.0",
-        "@jest/types": "30.3.0",
+        "@jest/get-type": "30.5.0",
+        "@jest/types": "30.5.1",
         "chalk": "^4.1.2",
-        "jest-util": "30.3.0",
-        "pretty-format": "30.3.0"
+        "jest-util": "30.5.1",
+        "pretty-format": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-30.3.0.tgz",
-      "integrity": "sha512-RLEOJy6ip1lpw0yqJ8tB3i88FC7VBz7i00Zvl2qF71IdxjS98gC9/0SPWYIBVXHm5hgCYK0PAlSlnHGGy9RoMg==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-30.5.1.tgz",
+      "integrity": "sha512-8lzKbC/SRbQE24wr1OOJV+aYtDAuVNKBryN6YcFiCcaZZ3I7grcZY7w91BwNvGET0ubKDmomEHZFHMaF+6pAlA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.3.0",
-        "@jest/environment-jsdom-abstract": "30.3.0",
+        "@jest/environment": "30.5.1",
+        "@jest/environment-jsdom-abstract": "30.5.1",
+        "@types/jsdom": "^21.1.7",
         "jsdom": "^26.1.0"
       },
       "engines": {
@@ -6296,53 +6419,69 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.3.0.tgz",
-      "integrity": "sha512-4i6HItw/JSiJVsC5q0hnKIe/hbYfZLVG9YJ/0pU9Hz2n/9qZe3Rhn5s5CUZA5ORZlcdT/vmAXRMyONXJwPrmYQ==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.5.1.tgz",
+      "integrity": "sha512-LrPj3sPMjsQoOB3jrb8p/sa+XkSFNKo60TTsyc+EB2kxQJHgbwElpXnx1yX25fdFn5958FIObRtcLSHyV8VIAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.3.0",
-        "@jest/fake-timers": "30.3.0",
-        "@jest/types": "30.3.0",
+        "@jest/environment": "30.5.1",
+        "@jest/fake-timers": "30.5.1",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
-        "jest-mock": "30.3.0",
-        "jest-util": "30.3.0",
-        "jest-validate": "30.3.0"
+        "jest-mock": "30.5.1",
+        "jest-util": "30.5.1",
+        "jest-validate": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.3.0.tgz",
-      "integrity": "sha512-mMi2oqG4KRU0R9QEtscl87JzMXfUhbKaFqOxmjb2CKcbHcUGFrJCBWHmnTiUqi6JcnzoBlO4rWfpdl2k/RfLCA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.5.1.tgz",
+      "integrity": "sha512-VIFgt67jW480YDxKfEv9IYQKrFpYt7bOCMn3VsnjK7AK9qo7p6acpnA1DHwsVOULE3dTaYew/6JaTD/d0VDHoQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.3.0",
+        "@jest/types": "30.5.1",
+        "@parcel/watcher": "^2.6.0",
         "@types/node": "*",
         "anymatch": "^3.1.3",
         "fb-watchman": "^2.0.2",
+        "fdir": "^6.5.0",
         "graceful-fs": "^4.2.11",
-        "jest-regex-util": "30.0.1",
-        "jest-util": "30.3.0",
-        "jest-worker": "30.3.0",
-        "picomatch": "^4.0.3",
-        "walker": "^1.0.8"
+        "jest-regex-util": "30.5.0",
+        "jest-util": "30.5.1",
+        "jest-worker": "30.5.1",
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
       },
-      "optionalDependencies": {
-        "fsevents": "^2.3.3"
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
       }
     },
     "node_modules/jest-haste-map/node_modules/picomatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+      "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6353,49 +6492,50 @@
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.3.0.tgz",
-      "integrity": "sha512-cuKmUUGIjfXZAiGJ7TbEMx0bcqNdPPI6P1V+7aF+m/FUJqFDxkFR4JqkTu8ZOiU5AaX/x0hZ20KaaIPXQzbMGQ==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.5.1.tgz",
+      "integrity": "sha512-gt4GT2aWgEoCNTcBe4rqS74xTIUJxi+UD9SNSu9aOk5LmTEd6fS5KSTmAKAfitCCktQHNN+upUuL6EkBfFbMDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.1.0",
-        "pretty-format": "30.3.0"
+        "@jest/get-type": "30.5.0",
+        "pretty-format": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.3.0.tgz",
-      "integrity": "sha512-HEtc9uFQgaUHkC7nLSlQL3Tph4Pjxt/yiPvkIrrDCt9jhoLIgxaubo1G+CFOnmHYMxHwwdaSN7mkIFs6ZK8OhA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.5.1.tgz",
+      "integrity": "sha512-aroZVqwOz/wC2y6pC+obgFWKV9viaQWQTTSB6W5H55+egtUczIfXR/rxExTv92xD/ADYwpqaYfVWx1aqwKg7FA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.1.0",
+        "@jest/get-type": "30.5.0",
         "chalk": "^4.1.2",
-        "jest-diff": "30.3.0",
-        "pretty-format": "30.3.0"
+        "jest-diff": "30.5.1",
+        "pretty-format": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-message-util": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.3.0.tgz",
-      "integrity": "sha512-Z/j4Bo+4ySJ+JPJN3b2Qbl9hDq3VrXmnjjGEWD/x0BCXeOXPTV1iZYYzl2X8c1MaCOL+ewMyNBcm88sboE6YWw==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.5.1.tgz",
+      "integrity": "sha512-UdQlLdd9wL/Ys7xRErckqwD6wPlSZYueosSWuHc1r2ztGLwlgPvtSJq2+BPEgaEY13WLvfFbmhTj8pba0Sd1jg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
-        "@jest/types": "30.3.0",
+        "@jest/types": "30.5.1",
         "@types/stack-utils": "^2.0.3",
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
+        "jest-util": "30.5.1",
         "picomatch": "^4.0.3",
-        "pretty-format": "30.3.0",
+        "pretty-format": "30.5.1",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.6"
       },
@@ -6404,9 +6544,9 @@
       }
     },
     "node_modules/jest-message-util/node_modules/picomatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+      "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6417,42 +6557,25 @@
       }
     },
     "node_modules/jest-mock": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.3.0.tgz",
-      "integrity": "sha512-OTzICK8CpE+t4ndhKrwlIdbM6Pn8j00lvmSmq5ejiO+KxukbLjgOflKWMn3KE34EZdQm5RqTuKj+5RIEniYhog==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.5.1.tgz",
+      "integrity": "sha512-9fVjc3leUpGID2/by/LU4Dvdcp7PFh9LlxS3QRWK3ABm+KtvEVsG/AEGeLY3gKOZsjkBxyfwGltoAVlW7dygHg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.3.0",
+        "@jest/expect-utils": "30.5.1",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
-        "jest-util": "30.3.0"
+        "jest-util": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
-      },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/jest-regex-util": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-      "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.5.0.tgz",
+      "integrity": "sha512-Mg0WK7A6xRHLSA1udJ8y9f3lM0uUhFTBnLKzwPmqB9AylvpleJ6BLemR8K9dK27DY+cesDryoA7yLZCAHsPG1A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6460,100 +6583,100 @@
       }
     },
     "node_modules/jest-resolve": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.3.0.tgz",
-      "integrity": "sha512-NRtTAHQlpd15F9rUR36jqwelbrDV/dY4vzNte3S2kxCKUJRYNd5/6nTSbYiak1VX5g8IoFF23Uj5TURkUW8O5g==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.5.1.tgz",
+      "integrity": "sha512-wprhLejRtwN6h8ZgaqC0eYjGJ1uMdGPT/+b3eFncbG4NWuuP9QL+vWwRinu9waw7hkOLcpMJGVJAMgBwsPssMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.3.0",
-        "jest-pnp-resolver": "^1.2.3",
-        "jest-util": "30.3.0",
-        "jest-validate": "30.3.0",
+        "jest-haste-map": "30.5.1",
+        "jest-util": "30.5.1",
+        "jest-validate": "30.5.1",
         "slash": "^3.0.0",
-        "unrs-resolver": "^1.7.11"
+        "unrs-resolver": "^1.12.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.3.0.tgz",
-      "integrity": "sha512-9ev8s3YN6Hsyz9LV75XUwkCVFlwPbaFn6Wp75qnI0wzAINYWY8Fb3+6y59Rwd3QaS3kKXffHXsZMziMavfz/nw==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.5.1.tgz",
+      "integrity": "sha512-JKpXGONDcTaunrNVn8KCl6qAnwl06jIkvv70lhq0Ze47lsPx9sH5HoeEUiXX6iFGnliHN/qpIbQ0l38wrVmXaw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jest-regex-util": "30.0.1",
-        "jest-snapshot": "30.3.0"
+        "jest-regex-util": "30.5.0",
+        "jest-snapshot": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-runner": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.3.0.tgz",
-      "integrity": "sha512-gDv6C9LGKWDPLia9TSzZwf4h3kMQCqyTpq+95PODnTRDO0g9os48XIYYkS6D236vjpBir2fF63YmJFtqkS5Duw==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.5.1.tgz",
+      "integrity": "sha512-FPlQE4+mwnFxXmpPrSi836KV2ZzvK1g6/nPCT8o5BcoDUUNJQeHo1/Qdkoe/QeoL4M7OeJpbnGUhYKhC1VMdaQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "30.3.0",
-        "@jest/environment": "30.3.0",
-        "@jest/test-result": "30.3.0",
-        "@jest/transform": "30.3.0",
-        "@jest/types": "30.3.0",
+        "@jest/console": "30.5.1",
+        "@jest/environment": "30.5.1",
+        "@jest/source-map": "30.5.0",
+        "@jest/test-result": "30.5.1",
+        "@jest/transform": "30.5.1",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "emittery": "^0.13.1",
         "exit-x": "^0.2.2",
         "graceful-fs": "^4.2.11",
-        "jest-docblock": "30.2.0",
-        "jest-environment-node": "30.3.0",
-        "jest-haste-map": "30.3.0",
-        "jest-leak-detector": "30.3.0",
-        "jest-message-util": "30.3.0",
-        "jest-resolve": "30.3.0",
-        "jest-runtime": "30.3.0",
-        "jest-util": "30.3.0",
-        "jest-watcher": "30.3.0",
-        "jest-worker": "30.3.0",
-        "p-limit": "^3.1.0",
-        "source-map-support": "0.5.13"
+        "jest-docblock": "30.5.0",
+        "jest-environment-node": "30.5.1",
+        "jest-haste-map": "30.5.1",
+        "jest-leak-detector": "30.5.1",
+        "jest-message-util": "30.5.1",
+        "jest-resolve": "30.5.1",
+        "jest-runtime": "30.5.1",
+        "jest-util": "30.5.1",
+        "jest-watcher": "30.5.1",
+        "jest-worker": "30.5.1",
+        "p-limit": "^3.1.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-runtime": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.3.0.tgz",
-      "integrity": "sha512-CgC+hIBJbuh78HEffkhNKcbXAytQViplcl8xupqeIWyKQF50kCQA8J7GeJCkjisC6hpnC9Muf8jV5RdtdFbGng==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.5.1.tgz",
+      "integrity": "sha512-UB88+NRkK2Tw/OqV7dofYcyiUGrVZtD41k/N0xQOs9fG//57XHK7JLWG52HD1UYpUAhjK4xm6DBvFX3yWudsMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.3.0",
-        "@jest/fake-timers": "30.3.0",
-        "@jest/globals": "30.3.0",
-        "@jest/source-map": "30.0.1",
-        "@jest/test-result": "30.3.0",
-        "@jest/transform": "30.3.0",
-        "@jest/types": "30.3.0",
+        "@jest/environment": "30.5.1",
+        "@jest/fake-timers": "30.5.1",
+        "@jest/globals": "30.5.1",
+        "@jest/source-map": "30.5.0",
+        "@jest/test-result": "30.5.1",
+        "@jest/transform": "30.5.1",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "chalk": "^4.1.2",
-        "cjs-module-lexer": "^2.1.0",
+        "cjs-module-lexer": "^2.2.0",
         "collect-v8-coverage": "^1.0.2",
-        "glob": "^10.5.0",
+        "es-module-lexer": "^2.1.0",
+        "glob": "^13.0.6",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.3.0",
-        "jest-message-util": "30.3.0",
-        "jest-mock": "30.3.0",
-        "jest-regex-util": "30.0.1",
-        "jest-resolve": "30.3.0",
-        "jest-snapshot": "30.3.0",
-        "jest-util": "30.3.0",
+        "jest-haste-map": "30.5.1",
+        "jest-message-util": "30.5.1",
+        "jest-mock": "30.5.1",
+        "jest-regex-util": "30.5.0",
+        "jest-resolve": "30.5.1",
+        "jest-snapshot": "30.5.1",
+        "jest-util": "30.5.1",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -6562,9 +6685,9 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.3.0.tgz",
-      "integrity": "sha512-f14c7atpb4O2DeNhwcvS810Y63wEn8O1HqK/luJ4F6M4NjvxmAKQwBUWjbExUtMxWJQ0wVgmCKymeJK6NZMnfQ==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.5.1.tgz",
+      "integrity": "sha512-cNWFdSb5xuDGl8hKkAZJ3YtI/PzHpAPFV+HUXWIOG8rMhpDTLVbvAc2d2wRicoYw2wGsJGLaurJT6BLC97bLXQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6573,20 +6696,20 @@
         "@babel/plugin-syntax-jsx": "^7.27.1",
         "@babel/plugin-syntax-typescript": "^7.27.1",
         "@babel/types": "^7.27.3",
-        "@jest/expect-utils": "30.3.0",
-        "@jest/get-type": "30.1.0",
-        "@jest/snapshot-utils": "30.3.0",
-        "@jest/transform": "30.3.0",
-        "@jest/types": "30.3.0",
+        "@jest/expect-utils": "30.5.1",
+        "@jest/get-type": "30.5.0",
+        "@jest/snapshot-utils": "30.5.1",
+        "@jest/transform": "30.5.1",
+        "@jest/types": "30.5.1",
         "babel-preset-current-node-syntax": "^1.2.0",
         "chalk": "^4.1.2",
-        "expect": "30.3.0",
+        "expect": "30.5.1",
         "graceful-fs": "^4.2.11",
-        "jest-diff": "30.3.0",
-        "jest-matcher-utils": "30.3.0",
-        "jest-message-util": "30.3.0",
-        "jest-util": "30.3.0",
-        "pretty-format": "30.3.0",
+        "jest-diff": "30.5.1",
+        "jest-matcher-utils": "30.5.1",
+        "jest-message-util": "30.5.1",
+        "jest-util": "30.5.1",
+        "pretty-format": "30.5.1",
         "semver": "^7.7.2",
         "synckit": "^0.11.8"
       },
@@ -6595,9 +6718,9 @@
       }
     },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -6608,13 +6731,13 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.3.0.tgz",
-      "integrity": "sha512-/jZDa00a3Sz7rdyu55NLrQCIrbyIkbBxareejQI315f/i8HjYN+ZWsDLLpoQSiUIEIyZF/R8fDg3BmB8AtHttg==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.5.1.tgz",
+      "integrity": "sha512-yKuxmNy2rSbTXw+3SIPanJo+nV4/BS1p26v44IYBFMsswSQySfMMcPHErnOncda7i9HEz0q605rIhSTBVgrZTg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.3.0",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "ci-info": "^4.2.0",
@@ -6626,9 +6749,9 @@
       }
     },
     "node_modules/jest-util/node_modules/picomatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+      "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6639,18 +6762,18 @@
       }
     },
     "node_modules/jest-validate": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.3.0.tgz",
-      "integrity": "sha512-I/xzC8h5G+SHCb2P2gWkJYrNiTbeL47KvKeW5EzplkyxzBRBw1ssSHlI/jXec0ukH2q7x2zAWQm7015iusg62Q==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.5.1.tgz",
+      "integrity": "sha512-i/buJ56wTpxihE93hQYNMfdOThS87+HGvLZzZJmU4xggPcdTYQq051iwALLCHp3q+SkCGH+EFejQZz5EbBSkkg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.1.0",
-        "@jest/types": "30.3.0",
+        "@jest/get-type": "30.5.0",
+        "@jest/types": "30.5.1",
         "camelcase": "^6.3.0",
         "chalk": "^4.1.2",
         "leven": "^3.1.0",
-        "pretty-format": "30.3.0"
+        "pretty-format": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
@@ -6670,19 +6793,19 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.3.0.tgz",
-      "integrity": "sha512-PJ1d9ThtTR8aMiBWUdcownq9mDdLXsQzJayTk4kmaBRHKvwNQn+ANveuhEBUyNI2hR1TVhvQ8D5kHubbzBHR/w==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.5.1.tgz",
+      "integrity": "sha512-+FHJ7C+S7b3ySfhA1aFmoa6TztsnwZVv84ycPRn0tVN93np2EU4b8C/KadqA3l6igdjgLBTnUotab9ER0HLG8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "30.3.0",
-        "@jest/types": "30.3.0",
+        "@jest/test-result": "30.5.1",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "ansi-escapes": "^4.3.2",
         "chalk": "^4.1.2",
         "emittery": "^0.13.1",
-        "jest-util": "30.3.0",
+        "jest-util": "30.5.1",
         "string-length": "^4.0.2"
       },
       "engines": {
@@ -6690,15 +6813,15 @@
       }
     },
     "node_modules/jest-worker": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.3.0.tgz",
-      "integrity": "sha512-DrCKkaQwHexjRUFTmPzs7sHQe0TSj9nvDALKGdwmK5mW9v7j90BudWirKAJHt3QQ9Dhrg1F7DogPzhChppkJpQ==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.5.1.tgz",
+      "integrity": "sha512-Cbxh5v7AoLuFRmFJSM4/aHdQ68rjXvUWr716EE0Dh3I7T+T/3FgFKhOERGXHcU2Meftq9+9zxPM3TSNyI9D+HA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@ungap/structured-clone": "^1.3.0",
-        "jest-util": "30.3.0",
+        "jest-util": "30.5.1",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.1.1"
       },
@@ -6730,9 +6853,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
-      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "version": "3.15.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.2.tgz",
+      "integrity": "sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6796,13 +6919,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -6845,13 +6961,13 @@
       }
     },
     "node_modules/keyv": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "json-buffer": "3.0.1"
+        "@keyv/serialize": "^1.1.1"
       }
     },
     "node_modules/leven": {
@@ -6886,9 +7002,19 @@
       "license": "MIT"
     },
     "node_modules/linkify-it": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
-      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.2.tgz",
+      "integrity": "sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/markdown-it"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
         "uc.micro": "^2.0.0"
@@ -6998,9 +7124,9 @@
       }
     },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -7017,25 +7143,25 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "tmpl": "1.0.5"
-      }
-    },
     "node_modules/markdown-it": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz",
-      "integrity": "sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==",
+      "version": "14.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.3.2.tgz",
+      "integrity": "sha512-sHHjZ5fJKlgrG4qns2YwVcdNep35h5fERrfkD2YNsb9UFk0UIHarbiTaHKVMlPuWAoiilyK8Fv/jAm11slsY7Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/markdown-it"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1",
-        "entities": "^4.4.0",
-        "linkify-it": "^5.0.0",
+        "entities": "^4.5.0",
+        "linkify-it": "^5.0.2",
         "mdurl": "^2.0.0",
         "punycode.js": "^2.3.1",
         "uc.micro": "^2.1.0"
@@ -7067,9 +7193,9 @@
       }
     },
     "node_modules/mdurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
-      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.1.0.tgz",
+      "integrity": "sha512-1+HBaOx0zi/dQWht8rNv9MYf9qqpqL/kxI0hXImU6Y547zM6Sni8BQibt7ifgMcYtQg41ao3Ivd6cnSM86inpg==",
       "license": "MIT"
     },
     "node_modules/memorystream": {
@@ -7099,13 +7225,13 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "10.2.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
-      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+      "version": "10.2.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz",
+      "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^5.0.5"
+        "brace-expansion": "^5.0.8"
       },
       "engines": {
         "node": "18 || 20 || >=22"
@@ -7183,8 +7309,7 @@
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
       "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
       "dev": true,
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/node-int64": {
       "version": "0.4.0",
@@ -7194,11 +7319,14 @@
       "license": "MIT"
     },
     "node_modules/node-releases": {
-      "version": "2.0.37",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.37.tgz",
-      "integrity": "sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==",
+      "version": "2.0.55",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.55.tgz",
+      "integrity": "sha512-mIrE/Cw9y+9Au6dS5vDKDhQza9YvG6w+ZrS6X+ZzA7yFW/soAeaups4Qzn1bL6g5FVy8WtP79+0j82oPIbqRjQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
@@ -7280,9 +7408,9 @@
       "license": "MIT"
     },
     "node_modules/npm-run-all/node_modules/brace-expansion": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "version": "1.1.21",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz",
+      "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7455,9 +7583,9 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.23",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.23.tgz",
-      "integrity": "sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==",
+      "version": "2.2.27",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.27.tgz",
+      "integrity": "sha512-gQPNF78qebCQ6tvVFBYrvJdBNOrYZm90ZlXgpIFm06p6qHDHq/XC4TnJftN6OMbxVE0UTBAoRgcsDeJBBooITw==",
       "dev": true,
       "license": "MIT"
     },
@@ -7505,16 +7633,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
     "node_modules/onetime": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
@@ -7550,13 +7668,14 @@
       }
     },
     "node_modules/own-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
-      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.2.tgz",
+      "integrity": "sha512-19YVAg7T+WTrxggPukVq7DjTv6+PJ867TmhCvBsYwmbFCsZd344rq2Ld1p0wo8f8Qrrhgp82c6FJRqdXWtSEhg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.6",
+        "call-bound": "^1.0.4",
+        "get-intrinsic": "^1.3.0",
         "object-keys": "^1.1.1",
         "safe-push-apply": "^1.0.0"
       },
@@ -7671,16 +7790,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -7699,28 +7808,31 @@
       "license": "MIT"
     },
     "node_modules/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.18"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "version": "11.5.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz",
+      "integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==",
       "dev": true,
-      "license": "ISC"
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
     },
     "node_modules/path-type": {
       "version": "3.0.0",
@@ -7878,15 +7990,16 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "30.3.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz",
-      "integrity": "sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.5.1.tgz",
+      "integrity": "sha512-byhRAPguVKMQIj4kjJwJ5lAskVhfuiSdiYl/aLTWpgkGEmic2jYhJh1yE9ih8Ox44Xg9ccCT11/S6QrzSJuNrg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "30.0.5",
-        "ansi-styles": "^5.2.0",
-        "react-is": "^18.3.1"
+        "@jest/react-is-18": "npm:react-is@^18.3.1",
+        "@jest/react-is-19": "npm:react-is@^19.2.5",
+        "@jest/schemas": "30.5.0",
+        "ansi-styles": "^5.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
@@ -7941,10 +8054,23 @@
       ],
       "license": "MIT"
     },
-    "node_modules/react-is": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+    "node_modules/qified": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/qified/-/qified-0.10.1.tgz",
+      "integrity": "sha512-+Owyggi9IxT1ePKGafcI87ubSmxol6smwJ+RAHDQlx9+9cPwFWDiKFFCPuWhr9ignlGpZ9vDQLw67N4dcTVFEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hookified": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/qified/node_modules/hookified": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hookified/-/hookified-2.2.0.tgz",
+      "integrity": "sha512-p/LgFzRN5FeoD3DLS6bkUapeye6E4SI6yJs6KetENd18S+FBthqYq2amJUWpt5z0EQwwHemidjY5OqJGEKm5uA==",
       "dev": true,
       "license": "MIT"
     },
@@ -8038,12 +8164,13 @@
       "license": "ISC"
     },
     "node_modules/resolve": {
-      "version": "1.22.11",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
-      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
+      "version": "1.22.12",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
+      "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "es-errors": "^1.3.0",
         "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
@@ -8089,15 +8216,15 @@
       "license": "MIT"
     },
     "node_modules/safe-array-concat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
-      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.4.tgz",
+      "integrity": "sha512-wtZlHyOje6OZTGqAoaDKxFkgRtkF9CnHAVnCHKfuj200wAgL+bSJhdsCD2l0Qx/2ekEXjPWcyKkfGb5CPboslg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
+        "call-bind": "^1.0.9",
+        "call-bound": "^1.0.4",
+        "get-intrinsic": "^1.3.0",
         "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
@@ -8151,13 +8278,13 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.99.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.99.0.tgz",
-      "integrity": "sha512-kgW13M54DUB7IsIRM5LvJkNlpH+WhMpooUcaWGFARkF1Tc82v9mIWkCbCYf+MBvpIUBSeSOTilpZjEPr2VYE6Q==",
+      "version": "1.104.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.104.1.tgz",
+      "integrity": "sha512-yDA+1aIG3EHgN4V/BvuhCvu61FF6hEd4e+9DxikUm9U0CAGuvdIZ/UYy7qbOxjhbbWQraoyLlMuzdRGOSV5Bmw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chokidar": "^4.0.0",
+        "chokidar": "^5.0.0",
         "immutable": "^5.1.5",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
@@ -8165,36 +8292,36 @@
         "sass": "sass.js"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=20.19.0"
       },
       "optionalDependencies": {
         "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/sass/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
+      "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "readdirp": "^4.0.1"
+        "readdirp": "^5.0.0"
       },
       "engines": {
-        "node": ">= 14.16.0"
+        "node": ">= 20.19.0"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/sass/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.1.1.tgz",
+      "integrity": "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 14.18.0"
+        "node": ">= 20.19.0"
       },
       "funding": {
         "type": "individual",
@@ -8304,9 +8431,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
-      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.10.0.tgz",
+      "integrity": "sha512-w1aiOKwKuRgtwAReIIj89puqg+I7GvX4IbLrvmhXbzQsj1+Zwi4VO3+fa6ZF91TWSjIxoEkKnMeHcLEODK5ZXA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8317,15 +8444,15 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz",
+      "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3",
-        "side-channel-list": "^1.0.0",
+        "object-inspect": "^1.13.4",
+        "side-channel-list": "^1.0.1",
         "side-channel-map": "^1.0.1",
         "side-channel-weakmap": "^1.0.2"
       },
@@ -8393,17 +8520,11 @@
       }
     },
     "node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
+      "license": "ISC"
     },
     "node_modules/slash": {
       "version": "3.0.0",
@@ -8416,9 +8537,9 @@
       }
     },
     "node_modules/snabbdom": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/snabbdom/-/snabbdom-3.6.3.tgz",
-      "integrity": "sha512-W2lHLLw2qR2Vv0DcMmcxXqcfdBaIcoN+y/86SmHv8fn4DazEQSH6KN3TjZcWvwujW56OHiiirsbHWZb4vx/0fg==",
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/snabbdom/-/snabbdom-3.6.4.tgz",
+      "integrity": "sha512-VmxEfuw1/Y/eFj5VtMhYnukExpYiPkNzoo3+N3qwAOUDMl8wXgbli5ebR+j0knE3lZ/0eYskLxNcX64uy10N9w==",
       "license": "MIT",
       "engines": {
         "node": ">=12.17.0"
@@ -8450,17 +8571,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
     "node_modules/spdx-correct": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
@@ -8555,45 +8665,19 @@
         "node": ">=10"
       }
     },
-    "node_modules/string-length/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-length/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=6"
       }
     },
     "node_modules/string-width-cjs": {
@@ -8612,16 +8696,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/string-width-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string-width-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -8629,17 +8703,37 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/string-width-cjs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+    "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
     "node_modules/string.prototype.padend": {
@@ -8662,19 +8756,20 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
-      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.11.tgz",
+      "integrity": "sha512-PwvK7BU+CMTJGYQCTZb5RWXIML92lftJLhQz1tBzgKiqGxJaMlBAa48POXaNAC2s4y8jr3EFqrkF9+44neS46w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
+        "call-bind": "^1.0.9",
+        "call-bound": "^1.0.4",
         "define-data-property": "^1.1.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-object-atoms": "^1.0.0",
-        "has-property-descriptors": "^1.0.2"
+        "es-abstract": "^1.24.2",
+        "es-object-atoms": "^1.1.2",
+        "has-property-descriptors": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8684,16 +8779,16 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
-      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.10.tgz",
+      "integrity": "sha512-2+3aDAOmPTmuFwjDnmJG2ctEkQKVki7vOSqaxkv42Mowj1V6PnvuwFCRrR5lChUux1TBskPjfkeTOhqczDMxTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
+        "call-bind": "^1.0.9",
+        "call-bound": "^1.0.4",
         "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
+        "es-object-atoms": "^1.1.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8721,23 +8816,6 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
-      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.2.2"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/strip-ansi-cjs": {
-      "name": "strip-ansi",
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
@@ -8750,12 +8828,16 @@
         "node": ">=8"
       }
     },
-    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
       "engines": {
         "node": ">=8"
       }
@@ -8833,13 +8915,13 @@
       "license": "MIT"
     },
     "node_modules/synckit": {
-      "version": "0.11.12",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz",
-      "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==",
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.13.tgz",
+      "integrity": "sha512-eNRKgb3z66Yp3D2CixVujOUvXLFUTij/zVnV8KRyvFdQwpz7I5DS8UfRkTeLzb64u+dkzDSdelE24izu+zSSUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@pkgr/core": "^0.2.9"
+        "@pkgr/core": "^0.3.6"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -8849,18 +8931,18 @@
       }
     },
     "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.2.tgz",
+      "integrity": "sha512-u9E6A+ZDYdp7a4WnarkXPZOx8Ilz46+kby6p1yZ8zsGTz9gYa6FIS7lj2oezzNKmtdyyJNNmmXDppga5GB7kSw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
+        "glob": "^10.4.1",
+        "minimatch": "^10.2.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
     "node_modules/test-exclude/node_modules/balanced-match": {
@@ -8871,49 +8953,75 @@
       "license": "MIT"
     },
     "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz",
+      "integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "balanced-match": "^1.0.0"
       }
     },
     "node_modules/test-exclude/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
-      "engines": {
-        "node": "*"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/test-exclude/node_modules/minimatch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+    "node_modules/test-exclude/node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.2"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/test-exclude/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/test-exclude/node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/tldts": {
@@ -8936,13 +9044,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -8983,9 +9084,9 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.4.9",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.9.tgz",
-      "integrity": "sha512-LTb9496gYPMCqjeDLdPrKuXtncudeV1yRZnF4Wo5l3SFi0RYEnYRNgMrFIdg+FHvfzjCyQk1cLncWVqiSX+EvQ==",
+      "version": "29.4.12",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.12.tgz",
+      "integrity": "sha512-Ov6ClY53Fflh6BGAnY2DlTq1hYDrTycz2PVTXBWFW2CU+9zrEqAp9fWdGXl42EXO5RLSFAcAZ2JFKbP+zBTFfw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8995,7 +9096,7 @@
         "json5": "^2.2.3",
         "lodash.memoize": "^4.1.2",
         "make-error": "^1.3.6",
-        "semver": "^7.7.4",
+        "semver": "^7.8.5",
         "type-fest": "^4.41.0",
         "yargs-parser": "^21.1.1"
       },
@@ -9036,9 +9137,9 @@
       }
     },
     "node_modules/ts-jest/node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -9207,18 +9308,18 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
-      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.8.tgz",
+      "integrity": "sha512-phPGCwqr2+Qo0fwniCE8e4pKnGu/yFb5nD5Y8bf0EEeiI5GklnACYA9GFy/DrAeRrKHXvHn+1SUsOWgJp6RO+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0",
-        "reflect.getprototypeof": "^1.0.6"
+        "call-bind": "^1.0.9",
+        "for-each": "^0.3.5",
+        "gopd": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "possible-typed-array-names": "^1.1.0",
+        "reflect.getprototypeof": "^1.0.10"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9228,9 +9329,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz",
-      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -9281,51 +9382,54 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
-      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.9.0.tgz",
+      "integrity": "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/unrs-resolver": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
-      "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.12.2.tgz",
+      "integrity": "sha512-dmlRxBJJayXjqTwC+JtF1HhJmgf3ftQ3YejFcZrf4+KKtJv0qDsK1pjqaaVjG7wJ5NJ6UVP1OqRMQ71Z4C3rxQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "napi-postinstall": "^0.3.0"
+        "napi-postinstall": "^0.3.4"
       },
       "funding": {
         "url": "https://opencollective.com/unrs-resolver"
       },
       "optionalDependencies": {
-        "@unrs/resolver-binding-android-arm-eabi": "1.11.1",
-        "@unrs/resolver-binding-android-arm64": "1.11.1",
-        "@unrs/resolver-binding-darwin-arm64": "1.11.1",
-        "@unrs/resolver-binding-darwin-x64": "1.11.1",
-        "@unrs/resolver-binding-freebsd-x64": "1.11.1",
-        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
-        "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
-        "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
-        "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
-        "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-x64-musl": "1.11.1",
-        "@unrs/resolver-binding-wasm32-wasi": "1.11.1",
-        "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1",
-        "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1",
-        "@unrs/resolver-binding-win32-x64-msvc": "1.11.1"
+        "@unrs/resolver-binding-android-arm-eabi": "1.12.2",
+        "@unrs/resolver-binding-android-arm64": "1.12.2",
+        "@unrs/resolver-binding-darwin-arm64": "1.12.2",
+        "@unrs/resolver-binding-darwin-x64": "1.12.2",
+        "@unrs/resolver-binding-freebsd-x64": "1.12.2",
+        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.12.2",
+        "@unrs/resolver-binding-linux-arm-musleabihf": "1.12.2",
+        "@unrs/resolver-binding-linux-arm64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-arm64-musl": "1.12.2",
+        "@unrs/resolver-binding-linux-loong64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-loong64-musl": "1.12.2",
+        "@unrs/resolver-binding-linux-ppc64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-riscv64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-riscv64-musl": "1.12.2",
+        "@unrs/resolver-binding-linux-s390x-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-x64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-x64-musl": "1.12.2",
+        "@unrs/resolver-binding-openharmony-arm64": "1.12.2",
+        "@unrs/resolver-binding-wasm32-wasi": "1.12.2",
+        "@unrs/resolver-binding-win32-arm64-msvc": "1.12.2",
+        "@unrs/resolver-binding-win32-ia32-msvc": "1.12.2",
+        "@unrs/resolver-binding-win32-x64-msvc": "1.12.2"
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
-      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.3.tgz",
+      "integrity": "sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==",
       "dev": true,
       "funding": [
         {
@@ -9415,16 +9519,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/walker": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "makeerror": "1.0.12"
-      }
-    },
     "node_modules/webidl-conversions": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
@@ -9564,14 +9658,14 @@
       "license": "ISC"
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.20",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz",
-      "integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==",
+      "version": "1.1.22",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.22.tgz",
+      "integrity": "sha512-fvO4ExWMFsqyhG3AiPAObMuY1lxaqgYcxbc49CNdWDDECOJNgQyvsOWVwbZc+qf3rzRtxojBK+CMEv0Ld5CYpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
+        "call-bind": "^1.0.9",
         "call-bound": "^1.0.4",
         "for-each": "^0.3.5",
         "get-proto": "^1.0.1",
@@ -9603,21 +9697,18 @@
       "license": "MIT"
     },
     "node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+        "node": ">=6"
       }
     },
     "node_modules/wrap-ansi-cjs": {
@@ -9639,16 +9730,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -9656,6 +9737,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/wrap-ansi-cjs/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wrap-ansi-cjs/node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -9671,38 +9762,58 @@
         "node": ">=8"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "color-convert": "^1.9.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
-      "license": "ISC"
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
     },
     "node_modules/write-file-atomic": {
       "version": "5.0.1",
@@ -9718,10 +9829,23 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/write-file-atomic/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/ws": {
-      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
-      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
+      "version": "8.21.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.3.tgz",
+      "integrity": "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9800,23 +9924,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/yargs/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/yargs/node_modules/find-up": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
@@ -9830,16 +9937,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/yargs/node_modules/locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -9893,34 +9990,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/yargs/node_modules/yargs-parser": {
       "version": "13.1.2",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",

From 7782ea00dfc68d87852c07170a3a5a8e9c07fa85 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 15 Sep 2026 12:07:00 +0100
Subject: [PATCH 69/72] A11y: Improved alt tag usage for header logo

Set to blank if text is already part of the header, and the app name if
the name is not shown in the header.

For #6171
References:
https://webaim.org/techniques/alttext/
https://www.scottohara.me/blog/2018/05/05/hidden-vs-none.html
---
 .../views/layouts/parts/header-logo.blade.php |  4 ++-
 tests/View/HeaderBarTest.php                  | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 tests/View/HeaderBarTest.php

diff --git a/resources/views/layouts/parts/header-logo.blade.php b/resources/views/layouts/parts/header-logo.blade.php
index c1bbd7849..4c2dfb74e 100644
--- a/resources/views/layouts/parts/header-logo.blade.php
+++ b/resources/views/layouts/parts/header-logo.blade.php
@@ -1,6 +1,8 @@
 <a href="{{ url('/') }}" data-shortcut="home_view" class="logo">
     @if(setting('app-logo', '') !== 'none')
-        <img class="logo-image" src="{{ setting('app-logo', '') === '' ? url('/logo.png') : url(setting('app-logo', '')) }}" alt="Logo">
+        <img class="logo-image"
+             src="{{ setting('app-logo', '') === '' ? url('/logo.png') : url(setting('app-logo', '')) }}"
+             alt="{{ setting('app-name-header') ? '' : setting('app-name') }}">
     @endif
     @if (setting('app-name-header'))
         <span class="logo-text">{{ setting('app-name') }}</span>
diff --git a/tests/View/HeaderBarTest.php b/tests/View/HeaderBarTest.php
new file mode 100644
index 000000000..1c50fcdb5
--- /dev/null
+++ b/tests/View/HeaderBarTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\View;
+
+use Tests\TestCase;
+
+class HeaderBarTest extends TestCase
+{
+    public function test_header_logo_alt_tag_blank_when_used_with_app_name()
+    {
+        $this->setSettings([
+            'app-name' => 'Dino Docs',
+            'app-logo' => '',
+            'app-name-header' => true,
+        ]);
+
+        $resp = $this->get('/login');
+        $this->withHtml($resp)->assertElementExists('header img.logo-image[alt=""]');
+    }
+
+    public function test_header_logo_alt_tag_uses_app_name_when_name_not_shown_in_header()
+    {
+        $this->setSettings([
+            'app-name' => 'Dino Docs',
+            'app-logo' => '',
+            'app-name-header' => false,
+        ]);
+
+        $resp = $this->get('/login');
+        $this->withHtml($resp)->assertElementExists('header img.logo-image[alt="Dino Docs"]');
+    }
+}

From b5641aa00d9013f4bf181d62ec397ac7a1519e49 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 15 Sep 2026 12:20:37 +0100
Subject: [PATCH 70/72] Testing: Updated app key test

To be better contained prevent impacting of other tests
---
 tests/Unit/ConfigTest.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
index 9f3e5f56f..3da754cc2 100644
--- a/tests/Unit/ConfigTest.php
+++ b/tests/Unit/ConfigTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit;
 
+use Exception;
 use Illuminate\Encryption\MissingAppKeyException;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
@@ -215,9 +216,15 @@ class ConfigTest extends TestCase
 
     public function test_app_errors_if_no_app_key_set()
     {
-        $this->runWithEnv(['APP_KEY' => null], function () {
-            $this->expectException(MissingAppKeyException::class);
-            $this->get('/');
+        $this->runWithEnv(['APP_KEY' => ''], function () {
+            $error = null;
+            try {
+                $this->get('/');
+            } catch (Exception $e) {
+                $error = $e;
+            }
+
+            $this->assertInstanceOf(MissingAppKeyException::class, $error);
         });
     }
 

From 82b9472554f708faa72db2afc9a45fb01394a472 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 15 Sep 2026 19:11:36 +0100
Subject: [PATCH 71/72] A11y: Review of #6173, ensure checkboxes are labelled

This specifically alters the checkbox label implementation to use the
existing checkbox label instead of always adding an extra label to the
custom checkbox element itself, unless they diverge (like for permission
checkboxes).
---
 resources/js/components/custom-checkbox.js      |  3 +++
 resources/views/form/custom-checkbox.blade.php  | 17 +++++++++++------
 resources/views/form/toggle-switch.blade.php    |  7 ++++---
 .../settings/webhooks/parts/form.blade.php      |  4 ++--
 tests/Activity/WebhookManagementTest.php        |  2 +-
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/resources/js/components/custom-checkbox.js b/resources/js/components/custom-checkbox.js
index a5f1d5664..2cece4e43 100644
--- a/resources/js/components/custom-checkbox.js
+++ b/resources/js/components/custom-checkbox.js
@@ -20,6 +20,9 @@ export class CustomCheckbox extends Component {
     }
 
     toggle() {
+        if (this.checkbox.disabled) {
+            return;
+        }
         this.checkbox.checked = !this.checkbox.checked;
         this.checkbox.dispatchEvent(new Event('change'));
         this.stateChange();
diff --git a/resources/views/form/custom-checkbox.blade.php b/resources/views/form/custom-checkbox.blade.php
index 736baf521..645e74ce0 100644
--- a/resources/views/form/custom-checkbox.blade.php
+++ b/resources/views/form/custom-checkbox.blade.php
@@ -1,15 +1,20 @@
 {{--
-$name
-$value
-$checked
-$label
+$name - string
+$value - string
+$checked - boolean
+$disabled - boolean
+$label - string
 $ariaLabel? (optional, falls back to $label)
 --}}
-<label component="custom-checkbox" class="toggle-switch @if($errors->has($name)) text-neg @endif">
+<label component="custom-checkbox" id="custom-checkbox-label-{{ $name }}" class="toggle-switch @if($errors->has($name)) text-neg @endif">
     <input type="checkbox" name="{{$name}}" value="{{ $value }}" @if($checked) checked="checked" @endif @if($disabled ?? false) disabled="disabled" @endif>
     <span tabindex="0" role="checkbox"
           aria-checked="{{ $checked ? 'true' : 'false' }}"
-          aria-label="{{ $ariaLabel ?? $label }}"
+          @if(isset($ariaLabel))
+              aria-label="{{ $ariaLabel }}"
+          @else
+              aria-labelledby="custom-checkbox-label-{{ $name }}"
+          @endif
           class="custom-checkbox text-primary">@icon('check')</span>
     <span class="label">{{$label}}</span>
 </label>
\ No newline at end of file
diff --git a/resources/views/form/toggle-switch.blade.php b/resources/views/form/toggle-switch.blade.php
index 32ce1092c..5f2f55d96 100644
--- a/resources/views/form/toggle-switch.blade.php
+++ b/resources/views/form/toggle-switch.blade.php
@@ -1,9 +1,10 @@
-<label components="custom-checkbox toggle-switch" class="toggle-switch">
+<label components="custom-checkbox toggle-switch" id="toggle-switch-label-{{ $name }}" class="toggle-switch">
     <input type="hidden" name="{{$name}}" value="{{$value?'true':'false'}}"/>
     <input type="checkbox" @if($value) checked="checked" @endif>
-    <span tabindex="0" role="checkbox"
+    <span tabindex="0"
+          role="checkbox"
+          aria-labelledby="toggle-switch-label-{{ $name }}"
           aria-checked="{{ $value ? 'true' : 'false' }}"
-          aria-label="{{ $label }}"
           class="custom-checkbox text-primary">@icon('check')</span>
     <span class="label">{{ $label }}</span>
 </label>
\ No newline at end of file
diff --git a/resources/views/settings/webhooks/parts/form.blade.php b/resources/views/settings/webhooks/parts/form.blade.php
index 56929e3ce..227483904 100644
--- a/resources/views/settings/webhooks/parts/form.blade.php
+++ b/resources/views/settings/webhooks/parts/form.blade.php
@@ -38,7 +38,7 @@
 
         <div class="toggle-switch-list">
             @include('form.custom-checkbox', [
-                'name' => 'events[]',
+                'name' => 'events[all]',
                 'value' => 'all',
                 'label' => trans('settings.webhooks_events_all'),
                 'checked' => old('events') ? in_array('all', old('events')) : (isset($webhook) ? $webhook->tracksEvent('all') : false),
@@ -51,7 +51,7 @@
             @foreach(\BookStack\Activity\ActivityType::all() as $activityType)
                 <div>
                     @include('form.custom-checkbox', [
-                       'name' => 'events[]',
+                       'name' => 'events[' . $activityType . ']',
                        'value' => $activityType,
                        'label' => $activityType,
                        'checked' => old('events') ? in_array($activityType, old('events')) : (isset($webhook) ? $webhook->tracksEvent($activityType) : false),
diff --git a/tests/Activity/WebhookManagementTest.php b/tests/Activity/WebhookManagementTest.php
index b55b5480d..d669893f7 100644
--- a/tests/Activity/WebhookManagementTest.php
+++ b/tests/Activity/WebhookManagementTest.php
@@ -72,7 +72,7 @@ class WebhookManagementTest extends TestCase
         $resp->assertSee('Edit Webhook');
         $this->withHtml($resp)->assertElementContains('form[action="' . $webhook->getUrl() . '"] button', 'Save Webhook');
         $this->withHtml($resp)->assertElementContains('a[href="' . $webhook->getUrl('/delete') . '"]', 'Delete Webhook');
-        $this->withHtml($resp)->assertElementExists('input[type="checkbox"][value="all"][name="events[]"]');
+        $this->withHtml($resp)->assertElementExists('input[type="checkbox"][name="events[all]"][value="all"]');
     }
 
     public function test_update()

From 47313ddc8fc7c7033a1b3a024efc7cd89e8ba869 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 16 Sep 2026 17:51:54 +0100
Subject: [PATCH 72/72] Content Pointer: Change insert location based on
 selection dir

Updates the content pointer behaviour so it's inserted before/after the
target, instead of just before, depending on selection direction, so it
can stay out of the selection range.
Positioning is absolute relative to a parent content so visually should
be the same result as before.

For #6214
---
 resources/js/components/pointer.ts | 11 +++++++++--
 resources/sass/_pages.scss         |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/pointer.ts b/resources/js/components/pointer.ts
index 4b927045a..37d8cc076 100644
--- a/resources/js/components/pointer.ts
+++ b/resources/js/components/pointer.ts
@@ -105,7 +105,9 @@ export class Pointer extends Component {
      */
     showPointerAtTarget(element: HTMLElement, xPosition: number, keyboardMode: boolean) {
         this.targetElement = element;
-        this.targetSelectionRange = window.getSelection()?.getRangeAt(0) || null;
+        const selectionMade = window.getSelection();
+        const selectionDirection = selectionMade?.direction || '';
+        this.targetSelectionRange = selectionMade?.getRangeAt(0) || null;
         this.updateDomForTarget(element);
 
         this.pointer.style.display = 'block';
@@ -131,7 +133,12 @@ export class Pointer extends Component {
             window.removeEventListener('scroll', scrollListener);
         };
 
-        element.parentElement?.insertBefore(this.pointer, element);
+        if (selectionDirection === 'forward') {
+            element.after(this.pointer);
+        } else {
+            element.before(this.pointer);
+        }
+
         if (!keyboardMode) {
             window.addEventListener('scroll', scrollListener, {passive: true});
         }
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index 83aec46f0..9552b14f5 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -158,7 +158,7 @@ body.tox-fullscreen, body.markdown-fullscreen {
   border-radius: 4px;
   box-shadow: 0 0 12px 1px rgba(0, 0, 0, 0.1);
   @include mixins.lightDark(background-color, #fff, #333);
-  width: 328px;
+  width: 344px;
 
   &:before {
     position: absolute;