diff --git a/.claude/skills/changelog/SKILL.md b/.claude/skills/changelog/SKILL.md
index a471ab9a17d..25e17a08208 100644
--- a/.claude/skills/changelog/SKILL.md
+++ b/.claude/skills/changelog/SKILL.md
@@ -8,13 +8,27 @@ Generate a changelog entry for the CHANGELOG.md file by following these steps:
 
 ## 1. Get commits since last tag
 
-Run `git --no-pager log $(git describe --tags --abbrev=0)..HEAD --oneline --no-decorate --first-parent --no-merges`) to get the list of commits.
+First, fetch tags from origin — they sit off-branch (see note below) so they don't come down with a normal `git pull`/`git fetch` on the branch:
+
+```
+git fetch origin --tags
+```
+
+Then run the following to get the list of commits:
+
+```
+git --no-pager log $(git merge-base $(git tag --list 'v*' --sort=-v:refname | head -n1) HEAD)..HEAD --oneline --no-decorate --no-merges
+```
+
+Note: The release workflow tags a separate "Build assets" commit that is *not* an ancestor of the branch, so the tag itself never lands on `6.x`. That means `git describe --tags` walks back to a stale tag. Instead, take the newest tag and use its `git merge-base` with `HEAD`, which resolves to the release commit that *is* on the branch.
+
+5.x commits are merged into 6.x as-is (not squashed), so this plain `--no-merges` log already walks both the 6.x mainline and every commit brought in via a 5.x merge, in true chronological order — it only excludes the merge commits themselves (multi-parent, no real change of their own).
 
 ## 2. Process each commit
 
 For each commit:
 - Extract the PR number from the commit message (e.g., `(#13331)`)
-- Remove the commit SHA and `[6.x]` prefix from the message
+- Remove the commit SHA and `[6.x]`/`[5.x]` prefix from the message
 - Fetch the PR author from GitHub using a sequential loop — do NOT use parallel background jobs (`&`) as they interleave stdout unpredictably. Use: `for pr in <numbers>; do echo -n "PR $pr: "; gh pr view $pr --json author --jq '.author.login'; done`
 
 ## 3. Skip certain commits
@@ -22,9 +36,18 @@ For each commit:
 Skip commits that are:
 - Test fixture updates (e.g., "Update composer test fixtures")
 - CI/workflow changes (e.g., "Only run lint workflow...")
+- Test-only fixes with no user-facing effect (e.g., "Fix failing Guzzle tests" — check the PR body; if it says the bug only affected tests, skip it)
+- Internal release/workflow-only PRs (e.g., "Update Release Workflow")
+- Commits with no PR number, or whose message is itself a merge bookkeeping commit (e.g., "Merge 5.x (#NUM)", "Merge branch '5.x' into...")
 
 Do not skip dependency bumps from dependabot.
 
+For `[5.x]`-prefixed commits, also skip/dedupe:
+- Changes already superseded by a bigger PR in this release. Read the PR bodies — if a larger 6.x PR's description explicitly covers what the smaller 5.x fix addressed (e.g., a big OAuth rework that says it removes email-based matching supersedes a smaller "Fix OAuth" email-trust patch), skip the smaller one and note it in the summary (step 10).
+- Changes that no longer apply to 6.x because 6.x already handled it independently (e.g., a 5.x "Drop support for Laravel 10/11" PR when 6.x already dropped those versions).
+
+When in doubt about whether a `[5.x]`-prefixed commit is user-facing, lean toward including it — security/authorization hardening fixes (auth checks, method-resolution guarding, validation hardening) belong in the changelog even without a lot of detail in the title, matching how they're written up in the 5.x changelog (e.g. "Harden remote URL validation", "Fix token path traversal").
+
 ## 4. Categorize commits
 
 - **What's new**: Commits that add new features (title contains "Add" or introduces new functionality). An "improvement" is not to be considered new. 
@@ -37,7 +60,7 @@ Format: `- Description [#NUMBER](https://github.com/statamic/cms/issues/NUMBER)
 ## 6. Order entries
 
 - Reverse the list so earliest commits come first (git log shows newest first)
-- Within each category, maintain chronological order
+- Within each category, maintain chronological order — this already interleaves 5.x-origin commits correctly since step 1's log is in true merge order
 - Translation PRs get moved to the bottom of the list
 - Dependabot PRs get moved to the bottom, after translations
 
diff --git a/.gitattributes b/.gitattributes
index 4082132ee33..5c2beb71743 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,15 @@
 * text=auto
 *.php eol=lf
+
+/resources/dist/**/* linguist-generated=true
+/resources/dist-dev/**/* linguist-generated=true
+/resources/dist-frontend/**/* linguist-generated=true
+/resources/dist-package/**/* linguist-generated=true
+
 /.github export-ignore
+/resources/js export-ignore
+/resources/css export-ignore
+/packages export-ignore
 /tests export-ignore
 .babelrc export-ignore
 .gitattributes export-ignore
@@ -8,7 +17,8 @@
 .travis.yml export-ignore
 CONTRIBUTING.md export-ignore
 jest.config.js export-ignore
+phpstan.dist.neon export-ignore
 phpunit.bat export-ignore
-phpunit.xml.dist export-ignore
+phpunit.dist.xml export-ignore
 SECURITY.md export-ignore
 translator export-ignore
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000000..88032f84998
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,8 @@
+/composer.json @statamic/security
+/src/helpers.php @statamic/security
+/src/namespaced_helpers.php @statamic/security
+/src/View/Blade/helpers.php @statamic/security
+
+/.github/CODEOWNERS @statamic/security
+/.github/workflows/tripwire.yml @statamic/security
+/scripts/check-autoload-files.sh @statamic/security
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 541300fcf96..857aff89062 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,12 +4,14 @@ Please take 30 seconds to read the following so we can be as efficient as possib
 
 1️⃣ Is this your first PR? If so, please read our [contribution guide](https://statamic.dev/contribution-guide) first.
 
-2️⃣ Please make sure to create a new branch for your PR.
+2️⃣ Did you use AI tools to create this PR? If so, please review changes carefully to make sure they meet our code standards. We all know how AI can behave sometimes. This helps to make the review easier for us. Reviewing PRs can be a lot of work.
 
-3️⃣ Typically you should target the branch of the most current release, e.g. `6.x`, unless your PR includes a breaking change, in which case you should target the `master` branch for the next major release.
+3️⃣ Please make sure to create a new branch for your PR.
 
-4️⃣ We _really_ appreciate it if your PR includes tests. This makes it much easier for us to review, merge, and release. A PR with tests is usually reviewed and merged 5x-10x faster.
+4️⃣ Typically you should target the branch of the most current release, e.g. `6.x`, unless your PR includes a breaking change, in which case you should target the `master` branch for the next major release.
 
-5️⃣ If your PR introduce a new feature, adds to an existing one, or changes current behavior, please **open an issue for it in the [statamic/docs](https://github.com/statamic/docs/issues) repo referencing your PR**. A simple "Goes along with statamic/cms#9000" is enough. Otherwise it's really easy to forget and no will ever become aware of your ✨ sparkling ✨ invention if it's not documented.
+5️⃣ We _really_ appreciate it if your PR includes tests. This makes it much easier for us to review, merge, and release. A PR with tests is usually reviewed and merged 5x-10x faster.
 
-6️⃣ Remove this placeholder text and replace it with a description of what this PR is doing.
+6️⃣ If your PR introduce a new feature, adds to an existing one, or changes current behavior, please **open an issue for it in the [statamic/docs](https://github.com/statamic/docs/issues) repo referencing your PR**. A simple "Goes along with statamic/cms#9000" is enough. Otherwise it's really easy to forget and no will ever become aware of your ✨ sparkling ✨ invention if it's not documented.
+
+7️⃣ Remove this placeholder text and replace it with a description of what this PR is doing.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000..c20187016cc
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+    cooldown:
+      default-days: 7
diff --git a/.github/workflows/code-style-lint.yml b/.github/workflows/code-style-lint.yml
index 1b41a312789..84999a3e7dc 100644
--- a/.github/workflows/code-style-lint.yml
+++ b/.github/workflows/code-style-lint.yml
@@ -3,25 +3,38 @@ name: Lint code style issues
 on:
   pull_request:
 
+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  lint-code-styling:
+  lint-code-styling: # zizmor: ignore[anonymous-definition]
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v46
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
         with:
           files: |
             **.php
 
       - name: Check PHP code style issues
         if: steps.changed-files.outputs.any_modified == 'true'
-        uses: aglipanci/laravel-pint-action@v2
+        uses: aglipanci/laravel-pint-action@36de00d5f5a8a4e12d443e01671daa12a18f4c79 # 2.6
         with:
           testMode: true
           verboseMode: true
           pintVersion: 1.16.0
+
+      - name: Check Statamic\trans imports
+        run: bash scripts/check-trans-import.sh
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
new file mode 100644
index 00000000000..302695972da
--- /dev/null
+++ b/.github/workflows/phpstan.yml
@@ -0,0 +1,53 @@
+name: PHPStan
+
+on:
+  pull_request:
+
+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  phpstan:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
+        with:
+          files: |
+            src/**
+            composer.json
+            phpstan.dist.neon
+            .phpstan/**
+            .github/workflows/phpstan.yml
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
+        if: steps.changed-files.outputs.any_modified == 'true'
+        with:
+          php-version: 8.5
+          coverage: none
+
+      - name: Install dependencies
+        uses: nick-invision/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4.0.0
+        if: steps.changed-files.outputs.any_modified == 'true'
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --prefer-stable --prefer-dist --no-interaction
+
+      - name: Run PHPStan
+        if: steps.changed-files.outputs.any_modified == 'true'
+        run: vendor/bin/phpstan analyse --memory-limit=2G
diff --git a/.github/workflows/pr-title.yml b/.github/workflows/pr-title.yml
index a4ecda7248a..87c54a70fc8 100644
--- a/.github/workflows/pr-title.yml
+++ b/.github/workflows/pr-title.yml
@@ -4,60 +4,13 @@ on:
   pull_request:
     types: [opened, edited, synchronize, reopened]
 
-jobs:
-  pr-title:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Validate PR title matches target branch
-        env:
-          PR_TITLE: ${{ github.event.pull_request.title }}
-          BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
-        run: |
-          # Validates PR title against target branch
-          # Returns error message if invalid, empty string if valid
-          validate_pr_title() {
-            local target_branch="$1"
-            local pr_title="$2"
-            local default_branch="$3"
-
-            # Check if target branch is a version branch (e.g., 5.x, 4.x)
-            if [[ $target_branch =~ ^([0-9]+)\.x$ ]]; then
-              local version="${BASH_REMATCH[1]}"
-              if [[ ! $pr_title =~ ^\[$version\.x\][[:space:]] ]]; then
-                echo "PR targeting '$target_branch' must have title starting with '[$version.x] '"
-                return
-              fi
-
-            # Check if target branch is master (next major version)
-            elif [[ $target_branch == "master" ]]; then
-              local current_version="${default_branch//\.x/}"
-              local next_version=$((current_version + 1))
-              if [[ ! $pr_title =~ ^\[$next_version\.x\][[:space:]] ]]; then
-                echo "PR targeting 'master' must have title starting with '[$next_version.x] '"
-                return
-              fi
-
-            # For other branches, just enforce that there's a version prefix
-            else
-              if [[ ! $pr_title =~ ^\[[0-9]+\.x\][[:space:]] ]]; then
-                echo "PR title must start with a version prefix like '[5.x] '"
-                return
-              fi
-            fi
+permissions: {}
 
-            echo ""
-          }
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
-          echo "PR Title: $PR_TITLE"
-          echo "Base Branch: $BASE_BRANCH"
-          echo "Default Branch: $DEFAULT_BRANCH"
-
-          ERROR=$(validate_pr_title "$BASE_BRANCH" "$PR_TITLE" "$DEFAULT_BRANCH")
-
-          if [[ -n $ERROR ]]; then
-            echo $ERROR
-            exit 1
-          fi
-
-          echo "PR title validation passed"
+jobs:
+  pr-title:
+    uses: statamic/.github/.github/workflows/pr-title.yml@bebe92309b4276e45ebc0d0c65854fb2ecf786ba
+    permissions: {}
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
index 7dfc21ad702..708588df6f9 100644
--- a/.github/workflows/pull-requests.yml
+++ b/.github/workflows/pull-requests.yml
@@ -1,75 +1,18 @@
 name: Pull Requests
 
-# Credit: https://github.com/github/docs/blob/main/.github/workflows/notify-when-maintainers-cannot-edit.yaml
-#         https://github.com/laravel/.github/blob/main/.github/workflows/pull-requests.yml
-
 on:
-  pull_request_target:
+  pull_request_target: # zizmor: ignore[dangerous-triggers]
     types:
       - opened
 
-permissions:
-  pull-requests: write
+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
 
 jobs:
   uneditable:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v7
-        with:
-          script: |
-            const repo = context.repo.repo;
-
-            const query = `
-              query($number: Int!) {
-                repository(owner: "statamic", name: "${repo}") {
-                  pullRequest(number: $number) {
-                    headRepositoryOwner {
-                      login
-                    }
-                    maintainerCanModify
-                    state
-                  }
-                }
-              }
-            `;
-
-            const pullNumber = context.issue.number;
-            const variables = { number: pullNumber };
-
-            try {
-              console.log(`Check for maintainer edit access ...`);
-              const result = await github.graphql(query, variables);
-              console.log(JSON.stringify(result, null, 2));
-              const pullRequest = result.repository.pullRequest;
-
-              if (pullRequest.headRepositoryOwner.login === 'statamic') {
-                console.log('PR owned by statamic');
-                return;
-              }
-
-              if (pullRequest.state !== 'OPEN') {
-                 console.log('PR has already been closed or merged');
-                 return;
-              }
-
-              if (!pullRequest.maintainerCanModify) {
-                console.log('PR not owned by statamic and does not have maintainer edits enabled');
-
-                await github.rest.issues.createComment({
-                  issue_number: pullNumber,
-                  owner: 'statamic',
-                  repo,
-                  body: "Thanks for submitting a PR!\n\nIn order to review and merge PRs most efficiently, we require that all PRs grant maintainer edit access before we review them. For information on how to do this, [see the relevant GitHub documentation](https://docs.github.com/en/github/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork). Additionally, GitHub doesn't allow maintainer permissions from organization accounts. Please resubmit this PR from a personal GitHub account with maintainer permissions enabled."
-                });
-
-                await github.rest.pulls.update({
-                  pull_number: pullNumber,
-                  owner: 'statamic',
-                  repo,
-                  state: 'closed'
-                });
-              }
-            } catch(e) {
-              console.log(e);
-            }
+    uses: statamic/.github/.github/workflows/pull-requests.yml@bebe92309b4276e45ebc0d0c65854fb2ecf786ba
+    permissions:
+      pull-requests: write # post comment and close PRs that don't allow maintainer edits
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index add7710d7a1..4fa4703aedd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,21 +1,65 @@
 name: Create Release
 
-on:
-  push:
-    tags:
-      - 'v*'
+on: # zizmor: ignore[concurrency-limits]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Release version, without the v prefix (e.g. 6.2.0)'
+        required: true
+        type: string
+
+permissions: {}
 
 jobs:
-  build:
+  release:
+    name: Create Release
     runs-on: ubuntu-latest
+    environment: Releases
+    permissions: {} # all writes go through the App token; GITHUB_TOKEN needs no scopes
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Resolve and validate version
+        env:
+          INPUT_VERSION: ${{ inputs.version }}
+          BRANCH: ${{ github.ref_name }}
+        run: |
+          version="${INPUT_VERSION#v}"
+
+          if [[ ! "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z.]+)?$ ]]; then
+            echo "::error::Version must look like 6.2.0 (got: $INPUT_VERSION)"
+            exit 1
+          fi
+
+          if [ "${version%%.*}" != "${BRANCH%%.*}" ]; then
+            echo "::error::Version $version does not belong on the $BRANCH branch"
+            exit 1
+          fi
+
+          echo "TAG=v$version" >> "$GITHUB_ENV"
+
+      - name: Get release bot token
+        id: app-token
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        with:
+          client-id: ${{ secrets.RELEASE_APP_CLIENT_ID }}
+          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
+          permission-contents: write
+
+      - name: Checkout
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+          persist-credentials: true # zizmor: ignore[artipacked] App token is needed to push the tag
+
+      - name: Assert tag does not already exist
+        run: |
+          existing="$(git ls-remote --tags origin "$TAG")"
+          [ -z "$existing" ] || { echo "::error::Tag $TAG already exists on remote. Aborting."; exit 1; }
 
       - name: Use Node.js 20.19.0
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version: 20.19.0
+          package-manager-cache: false
 
       - name: Install dependencies
         run: npm ci
@@ -23,64 +67,52 @@ jobs:
       - name: Build release assets
         run: bash ./scripts/build-release.sh
 
-      - name: Get Changelog
-        id: changelog
-        uses: statamic/changelog-action@v1
-        with:
-          version: ${{ github.ref }}
-
-      - name: Create release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ steps.changelog.outputs.version }}
-          release_name: ${{ steps.changelog.outputs.version }}
-          body: ${{ steps.changelog.outputs.text }}
-          prerelease: false
-
-      - name: Upload dist zip to release
-        uses: actions/upload-release-asset@v1.0.1
+      - name: Create the build commit
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./resources/dist.tar.gz
-          asset_name: dist.tar.gz
-          asset_content_type: application/tar+gz
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          APP_SLUG: ${{ steps.app-token.outputs.app-slug }}
+        run: |
+          USER_ID="$(gh api "/users/${APP_SLUG}[bot]" --jq .id)"
+          git config user.name "${APP_SLUG}[bot]"
+          git config user.email "${USER_ID}+${APP_SLUG}[bot]@users.noreply.github.com"
+          git add --force \
+            resources/dist \
+            resources/dist-dev \
+            resources/dist-frontend \
+            resources/dist-package
+          git commit -m "Build assets for $TAG"
 
-      - name: Upload dist-dev zip to release
-        uses: actions/upload-release-asset@v1.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./resources/dist-dev.tar.gz
-          asset_name: dist-dev.tar.gz
-          asset_content_type: application/tar+gz
+      - name: Tag and push the build commit
+        run: |
+          git tag "$TAG"
+          git push origin "$TAG"
 
-      - name: Upload dist-frontend zip to release
-        uses: actions/upload-release-asset@v1.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Get Changelog
+        id: changelog
+        uses: statamic/changelog-action@5d112d0d790cdeeb5adca3e584e37edc474ab51b # v1.0.2
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./resources/dist-frontend.tar.gz
-          asset_name: dist-frontend.tar.gz
-          asset_content_type: application/tar+gz
+          version: ${{ env.TAG }}
 
-      - name: Upload dist-package zip to release
-        uses: actions/upload-release-asset@v1.0.1
+      - name: Create release
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./resources/dist-package.tar.gz
-          asset_name: dist-package.tar.gz
-          asset_content_type: application/tar+gz
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          RELEASE_NOTES: ${{ steps.changelog.outputs.text }}
+          IS_DEFAULT_BRANCH: ${{ github.ref_name == github.event.repository.default_branch }}
+        run: |
+          latest="$IS_DEFAULT_BRANCH"
+          prerelease=false
+          case "$TAG" in
+            *-*) prerelease=true; latest=false ;;
+          esac
+          gh release create "$TAG" \
+            --title "$TAG" \
+            --notes "$RELEASE_NOTES" \
+            --latest="$latest" \
+            --prerelease="$prerelease"
 
       - name: Deploy Storybook to Forge
         continue-on-error: true
+        env:
+          FORGE_STORYBOOK_WEBHOOK: ${{ secrets.FORGE_STORYBOOK_WEBHOOK }}
         run: |
-          curl -X POST "${{ secrets.FORGE_STORYBOOK_WEBHOOK }}"
+          curl -X POST "$FORGE_STORYBOOK_WEBHOOK"
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 2f068f0602d..795c524331b 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,22 +1,13 @@
 name: "Close stale issues"
-on:
+on: # zizmor: ignore[concurrency-limits]
   workflow_dispatch:
   schedule:
   - cron: "30 1 * * *"
 
+permissions: {}
+
 jobs:
   stale:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/stale@v9
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        days-before-stale: 60
-        days-before-close: 7
-        ascending: true
-        only-labels: 'needs more info'
-        stale-issue-label: stale
-        stale-issue-message: >
-          This issue has not had recent activity and has been marked as stale — by me, a robot.
-          Simply reply to keep it open and send me away. If you do nothing, I will close it in
-          a week. I have no feelings, so whatever you do is fine by me.
+    uses: statamic/.github/.github/workflows/stale.yml@bebe92309b4276e45ebc0d0c65854fb2ecf786ba
+    permissions:
+      issues: write # mark issues stale and close them
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 872070830a9..ba08937d758 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,10 +9,18 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   php-tests:
     runs-on: ${{ matrix.os }}
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    permissions:
+      contents: read
 
     strategy:
       matrix:
@@ -30,24 +38,25 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v46
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
         with:
           files: |
-            config
-            lang
-            resources/users
-            resources/views
-            routes
-            src
-            tests
+            config/**
+            lang/**
+            resources/users/**
+            resources/views/**
+            routes/**
+            src/**
+            tests/**
             composer.json
-            phpunit.xml.dist
+            phpunit.dist.xml
             .github/workflows/tests.yml
-            tests/Composer/__fixtures__
             **.php
 
       - name: Determine whether tests should run
@@ -68,7 +77,7 @@ jobs:
         run: sudo apt-get install language-pack-fr
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
         if: steps.should-run-tests.outputs.result == 'true'
         with:
           php-version: ${{ matrix.php }}
@@ -77,7 +86,7 @@ jobs:
           coverage: none
 
       - name: Install dependencies
-        uses: nick-invision/retry@v3
+        uses: nick-invision/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4.0.0
         if: steps.should-run-tests.outputs.result == 'true'
         with:
           timeout_minutes: 5
@@ -97,16 +106,20 @@ jobs:
   js-tests:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    permissions:
+      contents: read
 
     name: JavaScript tests
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v46
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
         with:
           files: |
             **/*.{js,vue,ts}
@@ -121,7 +134,7 @@ jobs:
           echo "result=true" >> $env:GITHUB_OUTPUT
 
       - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
 
       - name: Install dependencies
         if: steps.should-run-tests.outputs.result == 'true'
@@ -147,16 +160,21 @@ jobs:
     name: Slack Notification
     runs-on: ubuntu-latest
     needs: [php-tests, js-tests]
+    permissions:
+      actions: read # required by workflow-conclusion-action to determine overall workflow status
     if: always()
     steps:
-      - uses: technote-space/workflow-conclusion-action@v3
+      - uses: technote-space/workflow-conclusion-action@45ce8e0eb155657ab8ccf346ade734257fd196a5 # v3.0.3
       - name: Send Slack notification
-        uses: 8398a7/action-slack@v3
+        uses: slackapi/slack-github-action@0d95c9a7becc1e6e297d76df9bc735c44f4cbcbc # v3.0.5
         if: env.WORKFLOW_CONCLUSION == 'failure' && github.event_name == 'schedule'
         with:
-          status: failure
-          fields: repo,message,commit,author,action,eventName,ref,workflow
-          author_name: ${{ github.actor }}
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          webhook: ${{ secrets.SLACK_WEBHOOK }}
+          webhook-type: incoming-webhook
+          payload: |
+            text: ":x: *${{ github.repository }}* tests failed"
+            blocks:
+              - type: section
+                text:
+                  type: mrkdwn
+                  text: ":x: *${{ github.repository }}* tests failed\n*Ref:* ${{ github.ref }}\n*Author:* ${{ github.actor }}\n*Workflow:* <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }}>"
diff --git a/.github/workflows/tripwire.yml b/.github/workflows/tripwire.yml
new file mode 100644
index 00000000000..61d2eba044d
--- /dev/null
+++ b/.github/workflows/tripwire.yml
@@ -0,0 +1,30 @@
+name: Tripwire
+
+on:
+  push:
+    branches:
+      - master
+      - '*.x'
+  pull_request:
+
+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+  autoload-files:
+    name: Verify autoload.files is unchanged
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
+
+      - name: Verify autoload.files matches the approved allowlist
+        run: bash scripts/check-autoload-files.sh
diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
new file mode 100644
index 00000000000..1278d6787f9
--- /dev/null
+++ b/.github/workflows/zizmor.yml
@@ -0,0 +1,23 @@
+name: GitHub Actions Security Analysis
+
+on:
+  push:
+    branches:
+      - master
+      - '*.x'
+    paths:
+      - '.github/**.yml'
+  pull_request:
+    paths:
+      - '.github/**.yml'
+
+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  zizmor:
+    uses: statamic/.github/.github/workflows/zizmor.yml@7e941c239074d66da6cad3322bec3b1005c80cf7
+    permissions: {}
diff --git a/.gitignore b/.gitignore
index 4aa0b7fbd23..4026fb22467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,6 @@ composer.lock
 .env
 bundle-stats.html
 .claude/settings.local.json
+.claude/worktrees
+polyscope.json
 storybook-static
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 00000000000..f28ba9079c3
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1,2 @@
+ignore-scripts=true
+min-release-age=3
diff --git a/.phpstan/baseline.neon b/.phpstan/baseline.neon
new file mode 100644
index 00000000000..5e43a294010
--- /dev/null
+++ b/.phpstan/baseline.neon
@@ -0,0 +1,277 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Method Statamic\\Auth\\Eloquent\\User\:\:mergePreferences\(\) should return \$this\(Statamic\\Auth\\Eloquent\\User\) but return statement is missing\.$#'
+			identifier: return.missing
+			count: 1
+			path: ../src/Auth/Eloquent/User.php
+
+		-
+			message: '#^Method Statamic\\Auth\\Eloquent\\User\:\:setPreferences\(\) should return \$this\(Statamic\\Auth\\Eloquent\\User\) but return statement is missing\.$#'
+			identifier: return.missing
+			count: 1
+			path: ../src/Auth/Eloquent/User.php
+
+		-
+			message: '#^Method Statamic\\Auth\\User\:\:getAuthIdentifierName\(\) should return string but return statement is missing\.$#'
+			identifier: return.missing
+			count: 1
+			path: ../src/Auth/User.php
+
+		-
+			message: '#^Access to an undefined property Statamic\\Auth\\UserRepository\:\:\$roleRepository\.$#'
+			identifier: property.notFound
+			count: 1
+			path: ../src/Auth/UserRepository.php
+
+		-
+			message: '#^Access to an undefined property Statamic\\Auth\\UserRepository\:\:\$userGroupRepository\.$#'
+			identifier: property.notFound
+			count: 1
+			path: ../src/Auth/UserRepository.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Auth\\UserRepository\:\:query\(\)\.$#'
+			identifier: method.notFound
+			count: 2
+			path: ../src/Auth/UserRepository.php
+
+		-
+			message: '#^Unknown parameter \$editing in call to static method Statamic\\Facades\\CP\\Nav\:\:build\(\)\.$#'
+			identifier: argument.unknown
+			count: 1
+			path: ../src/CP/Navigation/NavTransformer.php
+
+		-
+			message: '#^Unknown parameter \$preferences in call to static method Statamic\\Facades\\CP\\Nav\:\:build\(\)\.$#'
+			identifier: argument.unknown
+			count: 1
+			path: ../src/CP/Navigation/NavTransformer.php
+
+		-
+			message: '#^Unsafe usage of new static\(\)\.$#'
+			identifier: new.static
+			count: 1
+			path: ../src/Events/Event.php
+
+		-
+			message: '#^Unsafe usage of new static\(\)\.$#'
+			identifier: new.static
+			count: 2
+			path: ../src/Events/Subscriber.php
+
+		-
+			message: '#^Called ''env'' outside of the config directory which returns null when the config is cached, use ''config''\.$#'
+			identifier: larastan.noEnvCallsOutsideOfConfig
+			count: 1
+			path: ../src/Facades/Endpoint/Parse.php
+
+		-
+			message: '#^Method Illuminate\\Contracts\\Validation\\DataAwareRule@anonymous/Fieldtypes/Bard\.php\:934\:\:setData\(\) should return \$this\(Illuminate\\Contracts\\Validation\\DataAwareRule@anonymous/Fieldtypes/Bard\.php\:934\) but return statement is missing\.$#'
+			identifier: return.missing
+			count: 1
+			path: ../src/Fieldtypes/Bard.php
+
+		-
+			message: '#^Access to an undefined property Statamic\\Filesystem\\AbstractAdapter\:\:\$filesystem\.$#'
+			identifier: property.notFound
+			count: 13
+			path: ../src/Filesystem/AbstractAdapter.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Filesystem\\AbstractAdapter\:\:copyDirectory\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: ../src/Filesystem/AbstractAdapter.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Filesystem\\AbstractAdapter\:\:getFiles\(\)\.$#'
+			identifier: method.notFound
+			count: 3
+			path: ../src/Filesystem/AbstractAdapter.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Filesystem\\AbstractAdapter\:\:getFolders\(\)\.$#'
+			identifier: method.notFound
+			count: 2
+			path: ../src/Filesystem/AbstractAdapter.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Filesystem\\AbstractAdapter\:\:moveDirectory\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: ../src/Filesystem/AbstractAdapter.php
+
+		-
+			message: '#^Result of method Statamic\\Forms\\Form\:\:save\(\) \(void\) is used\.$#'
+			identifier: method.void
+			count: 1
+			path: ../src/Forms/Form.php
+
+		-
+			message: '#^Result of method Statamic\\Forms\\Submission\:\:save\(\) \(void\) is used\.$#'
+			identifier: method.void
+			count: 1
+			path: ../src/Forms/Submission.php
+
+		-
+			message: '#^Access to an undefined property Statamic\\Http\\Controllers\\API\\ApiController\:\:\$params\.$#'
+			identifier: property.notFound
+			count: 1
+			path: ../src/Http/Controllers/API/ApiController.php
+
+		-
+			message: '#^Unknown parameter \$editing in call to static method Statamic\\Facades\\CP\\Nav\:\:build\(\)\.$#'
+			identifier: argument.unknown
+			count: 1
+			path: ../src/Http/Controllers/CP/Preferences/Nav/DefaultNavController.php
+
+		-
+			message: '#^Unknown parameter \$preferences in call to static method Statamic\\Facades\\CP\\Nav\:\:build\(\)\.$#'
+			identifier: argument.unknown
+			count: 1
+			path: ../src/Http/Controllers/CP/Preferences/Nav/DefaultNavController.php
+
+		-
+			message: '#^Unknown parameter \$editing in call to static method Statamic\\Facades\\CP\\Nav\:\:build\(\)\.$#'
+			identifier: argument.unknown
+			count: 1
+			path: ../src/Http/Controllers/CP/Preferences/Nav/RoleNavController.php
+
+		-
+			message: '#^Unknown parameter \$preferences in call to static method Statamic\\Facades\\CP\\Nav\:\:build\(\)\.$#'
+			identifier: argument.unknown
+			count: 1
+			path: ../src/Http/Controllers/CP/Preferences/Nav/RoleNavController.php
+
+		-
+			message: '#^Access to an undefined property Statamic\\Imaging\\GlideManager\:\:\$cachePathPrefix\.$#'
+			identifier: property.notFound
+			count: 1
+			path: ../src/Imaging/GlideManager.php
+
+		-
+			message: '#^Access to an undefined property Statamic\\Imaging\\GlideManager\:\:\$sourcePathPrefix\.$#'
+			identifier: property.notFound
+			count: 1
+			path: ../src/Imaging/GlideManager.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Imaging\\GlideManager\:\:getAllParams\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: ../src/Imaging/GlideManager.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Imaging\\GlideManager\:\:getSourcePath\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: ../src/Imaging/GlideManager.php
+
+		-
+			message: '#^Called ''env'' outside of the config directory which returns null when the config is cached, use ''config''\.$#'
+			identifier: larastan.noEnvCallsOutsideOfConfig
+			count: 1
+			path: ../src/Marketplace/Client.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Providers\\AppServiceProvider\:\:sendElevatedSessionVerificationCode\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: ../src/Providers/AppServiceProvider.php
+
+		-
+			message: '#^Access to an undefined property Statamic\\Providers\\EventServiceProvider\:\:\$listeners\.$#'
+			identifier: property.notFound
+			count: 2
+			path: ../src/Providers/EventServiceProvider.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Stache\\Indexes\\Index\:\:getItemValue\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: ../src/Stache/Indexes/Index.php
+
+		-
+			message: '#^Access to an undefined property Statamic\\Stache\\Stores\\AggregateStore\:\:\$childStore\.$#'
+			identifier: property.notFound
+			count: 1
+			path: ../src/Stache/Stores/AggregateStore.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Stache\\Stores\\Store\:\:cacheItem\(\)\.$#'
+			identifier: method.notFound
+			count: 2
+			path: ../src/Stache/Stores/Store.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Stache\\Stores\\Store\:\:forgetItem\(\)\.$#'
+			identifier: method.notFound
+			count: 2
+			path: ../src/Stache/Stores/Store.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Stache\\Stores\\Store\:\:getKeyFromPath\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: ../src/Stache/Stores/Store.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Stache\\Stores\\Store\:\:makeItemFromFile\(\)\.$#'
+			identifier: method.notFound
+			count: 2
+			path: ../src/Stache/Stores/Store.php
+
+		-
+			message: '#^Method Statamic\\StaticCaching\\Cachers\\NullCacher\:\:getCachedPage\(\) should return Statamic\\StaticCaching\\Page but return statement is missing\.$#'
+			identifier: return.missing
+			count: 1
+			path: ../src/StaticCaching/Cachers/NullCacher.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\StaticCaching\\NoCache\\Region\:\:key\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: ../src/StaticCaching/NoCache/Region.php
+
+		-
+			message: '#^Access to an undefined property Statamic\\Structures\\StructureRepository\:\:\$store\.$#'
+			identifier: property.notFound
+			count: 2
+			path: ../src/Structures/StructureRepository.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Support\\Manager\:\:createNullDriver\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: ../src/Support/Manager.php
+
+		-
+			message: '#^Access to an undefined property Statamic\\Testing\\AddonTestCase\:\:\$fakeStacheDirectory\.$#'
+			identifier: property.notFound
+			count: 1
+			path: ../src/Testing/AddonTestCase.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Testing\\AddonTestCase\:\:deleteFakeStacheDirectory\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: ../src/Testing/AddonTestCase.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\Testing\\AddonTestCase\:\:preventSavingStacheItemsToDisk\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: ../src/Testing/AddonTestCase.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\View\\Scaffolding\\Emitters\\AbstractSourceEmitter\:\:getCountedVariable\(\)\.$#'
+			identifier: method.notFound
+			count: 2
+			path: ../src/View/Scaffolding/Emitters/AbstractSourceEmitter.php
+
+		-
+			message: '#^Call to an undefined method Statamic\\View\\Scaffolding\\Emitters\\AbstractSourceEmitter\:\:releaseCountedVariable\(\)\.$#'
+			identifier: method.notFound
+			count: 2
+			path: ../src/View/Scaffolding/Emitters/AbstractSourceEmitter.php
diff --git a/.phpstan/stubs/debugbar.php b/.phpstan/stubs/debugbar.php
new file mode 100644
index 00000000000..da2420b0efe
--- /dev/null
+++ b/.phpstan/stubs/debugbar.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Minimal symbol stubs for php-debugbar/php-debugbar, an optional runtime
+ * integration (via barryvdh/laravel-debugbar) that this package never
+ * requires as a real dependency. Statamic\View\Debugbar\* classes are only
+ * instantiated behind class_exists()/isEnabled() guards.
+ *
+ * These declarations exist solely so PHPStan can resolve the
+ * extends/implements relationships in that code (see scanFiles in
+ * phpstan.dist.neon) — they are never autoloaded or executed.
+ *
+ * Signatures mirror php-debugbar/php-debugbar ^3.8 (src/DataCollector/*).
+ */
+
+namespace DebugBar\DataCollector;
+
+interface DataCollectorInterface
+{
+    public function collect(): array;
+
+    public function getName(): string;
+}
+
+interface AssetProvider
+{
+    public function getAssets(): array;
+}
+
+interface Renderable extends DataCollectorInterface
+{
+    public function getWidgets(): array;
+}
+
+interface Resettable
+{
+    public function reset(): void;
+}
+
+abstract class DataCollector implements DataCollectorInterface
+{
+    //
+}
+
+class ConfigCollector extends DataCollector implements Renderable, Resettable
+{
+    protected string $name;
+
+    protected array $data;
+
+    public function __construct(array $data = [], string $name = 'config')
+    {
+        $this->name = $name;
+    }
+
+    public function reset(): void
+    {
+        //
+    }
+
+    public function setData(array $data): void
+    {
+        //
+    }
+
+    public function collect(): array
+    {
+        return [];
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getWidgets(): array
+    {
+        return [];
+    }
+}
diff --git a/.storybook/main.ts b/.storybook/main.ts
index 484abf91948..455006eb2f2 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -25,6 +25,10 @@ const config: StorybookConfig = {
                 '@api': resolve(process.cwd(), 'resources/js/api.js'),
             };
         }
+        config.build = {
+            ...config.build,
+            reportCompressedSize: false,
+        };
         return config;
     },
 };
diff --git a/.storybook/preview.ts b/.storybook/preview.ts
index a9819150f55..72fa779fa8f 100644
--- a/.storybook/preview.ts
+++ b/.storybook/preview.ts
@@ -5,17 +5,34 @@ import {router} from '@inertiajs/vue3';
 import {action} from 'storybook/actions';
 import './storybook.css';
 import './theme.css';
-import {translate} from '@/translations/translator';
+import {translate, translateChoice} from '@/translations/translator';
 import registerUiComponents from '@/bootstrap/ui';
 import DateFormatter from '@/components/DateFormatter';
+import NumberFormatter from '@/components/NumberFormatter';
 import cleanCodeSnippet from './clean-code-snippet';
 import PortalVue from 'portal-vue';
 import FullscreenHeader from '@/components/publish/FullscreenHeader.vue';
 import Portal from '@/components/portals/Portal.vue';
 import PortalTargets from '@/components/portals/PortalTargets.vue';
-import {keys, portals, slug, stacks} from '@api';
+import {config as statamicConfig, keys, portals, slug, stacks} from '@api';
 import useGlobalEventBus from '@/composables/global-event-bus';
 
+const storybookConfig = {
+    linkToDocs: true,
+    paginationSize: 50,
+    paginationSizeOptions: [10, 25, 50, 100, 500],
+    sites: [{
+        handle: 'default',
+        lang: 'en',
+    }],
+    selectedSite: 'default',
+    lang: 'en',
+    translationLocale: 'en',
+    displayTimezone: 'UTC',
+    asciiReplaceExtraSymbols: false,
+    charmap: { currency: {}, currency_short: {} },
+};
+
 // Intercept Inertia navigation and log to Actions tab.
 router.on('before', (event) => {
   action('inertia navigate')(event.detail.visit.url);
@@ -24,25 +41,13 @@ router.on('before', (event) => {
 
 setup(async (app) => {
   window.__ = translate;
+  window.__n = translateChoice;
+  statamicConfig.initialize(storybookConfig);
 
   window.Statamic = {
       $config: {
           get(key) {
-              const config = {
-                  linkToDocs: true,
-                  paginationSize: 50,
-                  paginationSizeOptions: [10, 25, 50, 100, 500],
-                  sites: [{
-                      handle: 'default',
-                      lang: 'en',
-                  }],
-                  selectedSite: 'default',
-                  lang: 'en',
-                  asciiReplaceExtraSymbols: false,
-                  charmap: { currency: {}, currency_short: {} },
-              };
-
-              return config[key] ?? null;
+              return storybookConfig[key] ?? null;
           }
       },
       $commandPalette: {
@@ -62,7 +67,9 @@ setup(async (app) => {
   };
 
   app.config.globalProperties.__ = translate;
+  app.config.globalProperties.__n = translateChoice;
   app.config.globalProperties.$date = new DateFormatter;
+  app.config.globalProperties.$number = new NumberFormatter;
   app.config.globalProperties.cp_url = (url) => url;
   app.config.globalProperties.$portals = portals;
   app.config.globalProperties.$stacks = stacks;
diff --git a/.storybook/storybook.css b/.storybook/storybook.css
index 6cdf7c8c4c5..9a141f91e16 100644
--- a/.storybook/storybook.css
+++ b/.storybook/storybook.css
@@ -9,6 +9,8 @@
 @custom-variant dark (&:where(.dark, .dark *));
 
 :root {
+    --focus-outline-color: var(--color-blue-400);
+
     /* GROUP VARIABLES -- DECORATION -- COLOURS
     =================================================== */
     --color-code-background: hsl(287deg 80% 93.5%);
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8568b64e9a..ac67e2e7d7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,580 @@
 # Release Notes
 
+## 6.26.0 (2026-07-21)
+
+### What's new
+- Add support for custom link types [#15004](https://github.com/statamic/cms/issues/15004) by @duncanmcclean
+- Add support for public dictionaries [#15029](https://github.com/statamic/cms/issues/15029) by @duncanmcclean
+
+### What's fixed
+- Harmonize label customization config text [#15034](https://github.com/statamic/cms/issues/15034) by @duncanmcclean
+- Fix Custom Invalidator background recache [#15031](https://github.com/statamic/cms/issues/15031) by @marcorieser
+- Fix grid min_rows breaking CP navigation [#15033](https://github.com/statamic/cms/issues/15033) by @duncanmcclean
+- Do not hide the primary save button for mobile [#15041](https://github.com/statamic/cms/issues/15041) by @jaygeorge
+- Show an entry selector when filtering by an entries field [#15043](https://github.com/statamic/cms/issues/15043) by @duncanmcclean
+- Fix customized listing columns being overridden by default preferences [#15040](https://github.com/statamic/cms/issues/15040) by @mynetx
+- Fix origin() on null when fetching nav tree with origin_id field [#15042](https://github.com/statamic/cms/issues/15042) by @duncanmcclean
+- Pass field prefix to custom conditions [#15044](https://github.com/statamic/cms/issues/15044) by @duncanmcclean
+- Ensure application cache honours static_cache store [#15045](https://github.com/statamic/cms/issues/15045) by @ryanmitchell
+- German translations [#15036](https://github.com/statamic/cms/issues/15036) by @helloDanuk
+- Bump the github-actions group with 2 updates [#15032](https://github.com/statamic/cms/issues/15032) by @dependabot
+- Bump axios from 1.16.0 to 1.18.1 [#15038](https://github.com/statamic/cms/issues/15038) by @dependabot
+
+
+
+## 6.25.0 (2026-07-17)
+
+### What's new
+- Allow taxonomy create button customization [#14997](https://github.com/statamic/cms/issues/14997) by @efc
+- Make Files fieldtype temporary upload storage configurable [#14733](https://github.com/statamic/cms/issues/14733) by @duncanmcclean
+- Support Glide 4 and Intervention Image 4 [#15019](https://github.com/statamic/cms/issues/15019) by @joshuablum
+
+### What's fixed
+- Hide permissions covered by a broader permission [#14970](https://github.com/statamic/cms/issues/14970) by @jasonvarga
+- Prevent vertical focus clipping on listing pages [#14978](https://github.com/statamic/cms/issues/14978) by @jaygeorge
+- Fix Control Panel not scrolling to top on navigation [#14965](https://github.com/statamic/cms/issues/14965) by @duncanmcclean
+- Fix video thumbnail generation logging an error on success [#14971](https://github.com/statamic/cms/issues/14971) by @lazerg
+- Preserve unregistered permissions when saving a role [#14975](https://github.com/statamic/cms/issues/14975) by @jasonvarga
+- Use form handle in key [#14974](https://github.com/statamic/cms/issues/14974) by @edalzell
+- Improve recursive behavior when using route data in computed values [#11855](https://github.com/statamic/cms/issues/11855) by @JohnathonKoster
+- Fix global variables being lost when migrated alongside addon update scripts [#14963](https://github.com/statamic/cms/issues/14963) by @duncanmcclean
+- Fix filter badge showing the term title in the wrong site [#14973](https://github.com/statamic/cms/issues/14973) by @lazerg
+- Pass the configured index name to the search insert job [#14949](https://github.com/statamic/cms/issues/14949) by @ajnsn
+- Hide unauthorized sections in nav [#14990](https://github.com/statamic/cms/issues/14990) by @lazerg
+- Fix English CP locale showing fallback locale translations [#15000](https://github.com/statamic/cms/issues/15000) by @jasonvarga
+- Fix performance issue when duplicating entries in large collections [#14995](https://github.com/statamic/cms/issues/14995) by @duncanmcclean
+- Update site:clear config stubs to match current defaults [#14991](https://github.com/statamic/cms/issues/14991) by @lazerg
+- Fix error on out-of-range pagination page number [#14981](https://github.com/statamic/cms/issues/14981) by @mynetx
+- Fix malformed URLs with duplicate leading slashes resolving to home page [#14982](https://github.com/statamic/cms/issues/14982) by @lazerg
+- Throw parser error when mixing pipe and shorthand modifier syntax [#14892](https://github.com/statamic/cms/issues/14892) by @marcorieser
+- Fix link fieldtype ignoring sometimes validator [#14985](https://github.com/statamic/cms/issues/14985) by @lazerg
+- Fix range date fields ignoring the configured timezone on save [#15001](https://github.com/statamic/cms/issues/15001) by @lazerg
+- Fix stache:refresh flattening structured collection trees [#15003](https://github.com/statamic/cms/issues/15003) by @mynetx
+- Fix save crash after deleting a Bard set containing a hidden field [#15008](https://github.com/statamic/cms/issues/15008) by @werner-freytag
+- Update link to permission docs [#15012](https://github.com/statamic/cms/issues/15012) by @duncanmcclean
+- Fix nested Bard data loss when reordering sets [#15013](https://github.com/statamic/cms/issues/15013) by @mynetx
+- Fix toasts breaking when sessions are serialized as JSON [#15015](https://github.com/statamic/cms/issues/15015) by @mynetx
+- Fix runtime assignment in a partial blanking a later partial's slot [#15014](https://github.com/statamic/cms/issues/15014) by @mynetx
+- Fix Replicator field labels hidden when nested in Grid [#14987](https://github.com/statamic/cms/issues/14987) by @lazerg
+- Fix blueprint assignment of entries using custom entry class [#15017](https://github.com/statamic/cms/issues/15017) by @daun
+- Fix session-expiry modals being dismissible and silently re-extending sessions [#15020](https://github.com/statamic/cms/issues/15020) by @jasonvarga
+- Fix validation rules being lost when saving without pressing enter [#15022](https://github.com/statamic/cms/issues/15022) by @mynetx
+- Fix search:update ignoring the index argument when index names are customized [#15024](https://github.com/statamic/cms/issues/15024) by @edalzell
+- Fix errors rendering blueprints & publish components when logged out [#15027](https://github.com/statamic/cms/issues/15027) by @duncanmcclean
+- Fix control panel text direction on RTL sites [#15023](https://github.com/statamic/cms/issues/15023) by @jasonvarga
+- Bump ws from 8.20.0 to 8.21.1 [#15011](https://github.com/statamic/cms/issues/15011) by @dependabot
+
+
+
+## 6.24.2 (2026-07-08)
+
+### What's fixed
+- Convert date bindings to app timezone in raw SQL dump [#14937](https://github.com/statamic/cms/issues/14937) by @marcorieser
+- Fix errors when a structure tree contains a null item [#14941](https://github.com/statamic/cms/issues/14941) by @mynetx
+- Fix timezone handling in `whereDate` and `whereTime` [#14940](https://github.com/statamic/cms/issues/14940) by @marcorieser
+- Fix dictionary single-select showing the raw id instead of the label [#14935](https://github.com/statamic/cms/issues/14935) by @mynetx
+- Do not set the Inertia root view globally [#14942](https://github.com/statamic/cms/issues/14942) by @lazerg
+- Fix asset filters not applying the first time [#14943](https://github.com/statamic/cms/issues/14943) by @duncanmcclean
+- Prevent the focus box on filters from being clipped [#14953](https://github.com/statamic/cms/issues/14953) by @jaygeorge
+- Fix incorrect update badges in the Control Panel updater [#14890](https://github.com/statamic/cms/issues/14890) by @aaronbushnell
+- Fix global variable references not resolving through the data repository [#14938](https://github.com/statamic/cms/issues/14938) by @lazerg
+- Tighten front-end form upload validation [#14958](https://github.com/statamic/cms/issues/14958) by @jasonvarga
+- Escape submitted values in automagic email [#14959](https://github.com/statamic/cms/issues/14959) by @jasonvarga
+- Fix broken asset reference when discarding a duplicate upload [#14947](https://github.com/statamic/cms/issues/14947) by @lazerg
+- Fix relationship-based fields showing raw ids after saving [#14948](https://github.com/statamic/cms/issues/14948) by @mynetx
+- Fix Bard set disappearing after save [#14956](https://github.com/statamic/cms/issues/14956) by @eminos
+
+
+
+## 6.24.1 (2026-07-03)
+
+### What's fixed
+- Do not show a disabled cursor for start/end of pagination [#14921](https://github.com/statamic/cms/issues/14921) by @jaygeorge
+- Fix Bard link entry selector not showing pre-selected entry [#14917](https://github.com/statamic/cms/issues/14917) by @duncanmcclean
+- Fix required validation on empty code fields [#14918](https://github.com/statamic/cms/issues/14918) by @duncanmcclean
+- Fix fieldtype picker showing wrong list after switching blueprint modes [#14919](https://github.com/statamic/cms/issues/14919) by @duncanmcclean
+- Fix roles/groups select being empty for non-super users [#14889](https://github.com/statamic/cms/issues/14889) by @mynetx
+- Fix Glide route double slash for path-prefixed sites [#14908](https://github.com/statamic/cms/issues/14908) by @lwekuiper
+- Fix amber and default badge button hover background shade [#14924](https://github.com/statamic/cms/issues/14924) by @lazerg
+- Default the create user wizard super toggle to false [#14927](https://github.com/statamic/cms/issues/14927) by @stoffelio
+- Fix progress bar triggering excessive recursion [#14931](https://github.com/statamic/cms/issues/14931) by @jasonvarga
+- French translations [#14926](https://github.com/statamic/cms/issues/14926) by @ebeauchamps
+
+
+
+## 6.24.0 (2026-07-01)
+
+### What's new
+- OAuth Improvements [#14899](https://github.com/statamic/cms/issues/14899) by @jasonvarga
+- Add JSON language modes to code editor [#14904](https://github.com/statamic/cms/issues/14904) by @daun
+
+### What's fixed
+- Remove `v6.` subdomain from documentation links [#14870](https://github.com/statamic/cms/issues/14870) by @duncanmcclean
+- Define emits in `PublishActions` component [#14872](https://github.com/statamic/cms/issues/14872) by @duncanmcclean
+- Style the list of blueprints as badges instead, improving legibility [#14878](https://github.com/statamic/cms/issues/14878) by @jaygeorge
+- Prevent browser re-sort of dictionary options with integer keys [#14875](https://github.com/statamic/cms/issues/14875) by @helloiamlukas
+- Improve the customize columns button layout so it no longer clashes with overflowing filters [#14885](https://github.com/statamic/cms/issues/14885) by @jaygeorge
+- Fix kebab-cased props not binding on Blade components in Antlers [#14891](https://github.com/statamic/cms/issues/14891) by @marcorieser
+- Tolerate a folded X-Statamic-Pagination header when warming [#14882](https://github.com/statamic/cms/issues/14882) by @mynetx
+- Fix icon fieldtype error when stored icon is missing [#14881](https://github.com/statamic/cms/issues/14881) by @mynetx
+- Fix user wizard authorization check [#14905](https://github.com/statamic/cms/issues/14905) by @jasonvarga
+- Pass active query scope handles to relationship index scopes [#14883](https://github.com/statamic/cms/issues/14883) by @mynetx
+- Fix nav authorization checks [#14906](https://github.com/statamic/cms/issues/14906) by @jasonvarga
+- Fix stale Stache entry order when reordering structured collection [#14896](https://github.com/statamic/cms/issues/14896) by @joshuablum
+- Tighten up dynamic method resolution [#14911](https://github.com/statamic/cms/issues/14911) by @jasonvarga
+- Bump actions/checkout from 6.0.3 to 7.0.0 in the github-actions group [#14894](https://github.com/statamic/cms/issues/14894) by @dependabot
+
+
+
+## 6.23.0 (2026-06-23)
+
+### What's new
+- Add explicit `package` param to the `installed` tag [#14858](https://github.com/statamic/cms/issues/14858) by @daun
+
+### What's fixed
+- Prevent rare case of the container scrolling when focusing on the container [#14854](https://github.com/statamic/cms/issues/14854) by @jaygeorge
+- Handle linked field comboboxes when the text is long [#14863](https://github.com/statamic/cms/issues/14863) by @jaygeorge
+- Prevent the link field group from exceeding 50% of the container [#14864](https://github.com/statamic/cms/issues/14864) by @jaygeorge
+- Apply as-config prop to top-level container only [#14855](https://github.com/statamic/cms/issues/14855) by @daun
+- Hide "Live Preview" button while live preview is active [#14866](https://github.com/statamic/cms/issues/14866) by @duncanmcclean
+- French translations [#14856](https://github.com/statamic/cms/issues/14856) by @ebeauchamps
+
+
+
+## 6.22.0 (2026-06-19)
+
+### What's new
+- Chips [#14766](https://github.com/statamic/cms/issues/14766) by @jaygeorge
+- Crop images server-side [#14841](https://github.com/statamic/cms/issues/14841) by @jasonvarga
+
+### What's fixed
+- Give precognitive form requests a separate rate limit bucket [#14810](https://github.com/statamic/cms/issues/14810) by @jasonvarga
+- Fix nested Bard data loss when editing a set [#14808](https://github.com/statamic/cms/issues/14808) by @joshuablum
+- Always render Control Panel exceptions as JSON for XHR requests [#14812](https://github.com/statamic/cms/issues/14812) by @jasonvarga
+- Make the whole radio/checkbox item clickable [#14821](https://github.com/statamic/cms/issues/14821) by @duncanmcclean
+- Fix mobile nav button failing [#14673](https://github.com/statamic/cms/issues/14673) by @jaygeorge
+- Render asset editor video player with dimensions [#14813](https://github.com/statamic/cms/issues/14813) by @daun
+- Handle external links in empty-state component [#14814](https://github.com/statamic/cms/issues/14814) by @daun
+- Fix inconsistent dark mode text colours [#14830](https://github.com/statamic/cms/issues/14830) by @jaygeorge
+- Autopopulate email on password reset form [#14834](https://github.com/statamic/cms/issues/14834) by @jackmcdade
+- Avoid loading the revisions store when finding a working copy [#14847](https://github.com/statamic/cms/issues/14847) by @jasonvarga
+- Retain current tab hash in URL when switching localization [#14846](https://github.com/statamic/cms/issues/14846) by @duncanmcclean
+- Translate untranslated CP page titles [#14848](https://github.com/statamic/cms/issues/14848) by @jasonvarga
+- Don't show selection checkboxes when bulk actions are disabled [#14850](https://github.com/statamic/cms/issues/14850) by @jasonvarga
+- Avoid widget table overflow [#14851](https://github.com/statamic/cms/issues/14851) by @daun
+- German translations [#14818](https://github.com/statamic/cms/issues/14818) by @helloDanuk
+- Bump the github-actions group with 2 updates [#14817](https://github.com/statamic/cms/issues/14817) by @dependabot
+- Bump vite from 8.0.7 to 8.0.16 [#14824](https://github.com/statamic/cms/issues/14824) by @dependabot
+- Bump form-data from 4.0.5 to 4.0.6 [#14825](https://github.com/statamic/cms/issues/14825) by @dependabot
+- Bump markdown-it from 14.1.1 to 14.2.0 [#14827](https://github.com/statamic/cms/issues/14827) by @dependabot
+- Bump dompurify from 3.4.0 to 3.4.9 [#14826](https://github.com/statamic/cms/issues/14826) by @dependabot
+- Bump esbuild and storybook [#14828](https://github.com/statamic/cms/issues/14828) by @dependabot
+- Bump dompurify from 3.4.9 to 3.4.11 in the npm_and_yarn group across 1 directory [#14845](https://github.com/statamic/cms/issues/14845) by @dependabot
+
+
+
+## 6.21.0 (2026-06-10)
+
+### What's new
+- Add default sorting support for taxonomies [#14772](https://github.com/statamic/cms/issues/14772) by @finnjsmith
+- Add default initial option configuration option for Link fieldtype [#14698](https://github.com/statamic/cms/issues/14698) by @martyf
+- Add `exclude` param to stache commands [#14788](https://github.com/statamic/cms/issues/14788) by @edalzell
+
+### What's fixed
+- Fix Modify::__toString() throwing TypeError for non-string scalar values [#14674](https://github.com/statamic/cms/issues/14674) by @VerburgtJimmy
+- Speed up Stache warming for large structured collections [#14781](https://github.com/statamic/cms/issues/14781) by @o1y
+- Implement permissions cache on eloquent users [#14661](https://github.com/statamic/cms/issues/14661) by @ryanmitchell
+- Adjust listing skeleton to match configured features [#14796](https://github.com/statamic/cms/issues/14796) by @daun
+- Fix docs for `Listing` component [#14798](https://github.com/statamic/cms/issues/14798) by @duncanmcclean
+- Don't reserve space when a field's display label is hidden [#14803](https://github.com/statamic/cms/issues/14803) by @jasonvarga
+- Bump web-auth/webauthn-lib to ^5.3.0 [#14727](https://github.com/statamic/cms/issues/14727) by @sstraakenbroek
+- Prevent overlapping git commit jobs [#14672](https://github.com/statamic/cms/issues/14672) by @aerni
+- French translations [#14789](https://github.com/statamic/cms/issues/14789) by @ebeauchamps
+
+
+
+## 6.20.3 (2026-06-08)
+
+### What's fixed
+- Trigger the grid table mode at lower viewports because it's more useful [#14792](https://github.com/statamic/cms/issues/14792) by @jaygeorge
+- Fix permission for Live Preview [#14791](https://github.com/statamic/cms/issues/14791) by @jasonvarga
+
+
+
+## 6.20.2 (2026-06-05)
+
+### What's fixed
+- Fix GraphiQL [#14770](https://github.com/statamic/cms/issues/14770) by @joshuablum
+- Fix TypeError when elevated_session_duration is a string [#14771](https://github.com/statamic/cms/issues/14771) by @duncanmcclean
+- Fix asset selection in Markdown fieldtype [#14715](https://github.com/statamic/cms/issues/14715) by @duncanmcclean
+- Fix configure navs permission not working properly [#14775](https://github.com/statamic/cms/issues/14775) by @joshuablum
+- Resolve Entry::descendants() N+1 query [#14773](https://github.com/statamic/cms/issues/14773) by @SteveEdson
+- Fix asset editor prev/next buttons and "Edit Image" button in Bard [#14728](https://github.com/statamic/cms/issues/14728) by @joshuablum
+- Apply regenerate handle pattern for replicator sections [#14745](https://github.com/statamic/cms/issues/14745) by @jaygeorge
+- Fix static cache invalidation stripping trailing slashes [#14713](https://github.com/statamic/cms/issues/14713) by @duncanmcclean
+- Add impersonation permission description [#14776](https://github.com/statamic/cms/issues/14776) by @jasonvarga
+- Fix field filters returning all results when filtering by 0 [#14747](https://github.com/statamic/cms/issues/14747) by @joshuablum
+- Render PDF viewer pages lazily [#14764](https://github.com/statamic/cms/issues/14764) by @daun
+- Add support for Collection in last modifier [#14778](https://github.com/statamic/cms/issues/14778) by @JonKaric
+- Fix share_errors breaking nocache regions on error responses [#14780](https://github.com/statamic/cms/issues/14780) by @joshuablum
+- Fix date picker inconsistencies [#14732](https://github.com/statamic/cms/issues/14732) by @jaygeorge
+- Avoid version inertia prop [#14783](https://github.com/statamic/cms/issues/14783) by @jasonvarga
+
+
+
+## 6.20.1 (2026-06-02)
+
+### What's fixed
+- Avoid crop aspect ratios select being truncated [#14712](https://github.com/statamic/cms/issues/14712) by @duncanmcclean
+- Stop excessive logging of `ElevatedSessionAuthorizationException` [#14725](https://github.com/statamic/cms/issues/14725) by @joshuablum
+- Remove `pt-4` as the default padding for a Group fieldtype [#14708](https://github.com/statamic/cms/issues/14708) by @martyf
+- Fix `Cached Pages` count for multi-site setups [#14726](https://github.com/statamic/cms/issues/14726) by @joshuablum
+- Hash URL in static caching lock key [#14716](https://github.com/statamic/cms/issues/14716) by @duncanmcclean
+- Fix entry revision localizations to filter unauthorized sites [#14714](https://github.com/statamic/cms/issues/14714) by @duncanmcclean
+- Date scrollbar fix [#14730](https://github.com/statamic/cms/issues/14730) by @jaygeorge
+- Remove custom scrollbar from date fields [#14731](https://github.com/statamic/cms/issues/14731) by @jaygeorge
+- Fix form box-shadows being clipped by expanding/collapsing sections [#14736](https://github.com/statamic/cms/issues/14736) by @jaygeorge
+- Improve modal text formatting and dark mode background [#14740](https://github.com/statamic/cms/issues/14740) by @jaygeorge
+- Handle replicator handle overflow [#14746](https://github.com/statamic/cms/issues/14746) by @jaygeorge
+- More elegantly mask horizontal overflow for sets [#14753](https://github.com/statamic/cms/issues/14753) by @jaygeorge
+- Improve collapsible section trigger [#14758](https://github.com/statamic/cms/issues/14758) by @jaygeorge
+- Fix asset fieldtype icon [#14720](https://github.com/statamic/cms/issues/14720) by @jasonvarga
+- Escape formula characters in form submission CSV exports [#14760](https://github.com/statamic/cms/issues/14760) by @jasonvarga
+- Harden remote URL validation [#14761](https://github.com/statamic/cms/issues/14761) by @jasonvarga
+- Scope shared static cache errors to sites [#14763](https://github.com/statamic/cms/issues/14763) by @joshuablum
+- Fix `share_errors` breaking nocache regions on successful responses [#14729](https://github.com/statamic/cms/issues/14729) by @joshuablum
+- Truncate full measure static cache files before writing [#14755](https://github.com/statamic/cms/issues/14755) by @joshuablum
+- Fix `current` augmentation handling in users fieldtype [#14724](https://github.com/statamic/cms/issues/14724) by @joshuablum
+- Fix clipboard pasting of validation rules [#14754](https://github.com/statamic/cms/issues/14754) by @joshuablum
+- Fix Bard/Link Blink cache type collision [#14739](https://github.com/statamic/cms/issues/14739) by @simonerd
+- French translations [#14738](https://github.com/statamic/cms/issues/14738) by @ebeauchamps
+- Bump zizmorcore/zizmor-action from 0.5.3 to 0.5.6 in the github-actions group [#14722](https://github.com/statamic/cms/issues/14722) by @dependabot
+- Bump qs from 6.15.0 to 6.15.2 [#14721](https://github.com/statamic/cms/issues/14721) by @dependabot
+- Bump js-cookie from 3.0.5 to 3.0.7 [#14705](https://github.com/statamic/cms/issues/14705) by @dependabot
+- Bump league/csv [#14768](https://github.com/statamic/cms/issues/14768) by @jasonvarga
+
+
+
+## 6.20.0 (2026-05-22)
+
+### What's new
+- Date picker today shortcut [#14651](https://github.com/statamic/cms/issues/14651) by @jaygeorge
+- When enabling Pro, prompts for license key [#14686](https://github.com/statamic/cms/issues/14686) by @jackmcdade
+- Include `is_pdf` in augmented asset data [#14699](https://github.com/statamic/cms/issues/14699) by @jacksleight
+
+### What's fixed
+- Make active nav anchor position more accurate [#14675](https://github.com/statamic/cms/issues/14675) by @jaygeorge
+- Don't show unsaved changes warning when switching tabs [#14678](https://github.com/statamic/cms/issues/14678) by @jasonvarga
+- Better collapsible sections [#14679](https://github.com/statamic/cms/issues/14679) by @jaygeorge
+- Swap image dimensions when EXIF orientation indicates a 90° rotation [#14685](https://github.com/statamic/cms/issues/14685) by @jasonvarga
+- Hook up "Add Row" config for List fields [#14689](https://github.com/statamic/cms/issues/14689) by @jackmcdade
+- Harden `DataCollection` sort value resolution [#14693](https://github.com/statamic/cms/issues/14693) by @duncanmcclean
+- Fix token path traversal [#14700](https://github.com/statamic/cms/issues/14700) by @duncanmcclean
+- Authorize relationship fieldtype data [#14718](https://github.com/statamic/cms/issues/14718) by @jasonvarga
+- Relationship UI adjustments [#14719](https://github.com/statamic/cms/issues/14719) by @jasonvarga
+- Update Italian translations [#14683](https://github.com/statamic/cms/issues/14683) by @sbellesis
+- French translations [#14680](https://github.com/statamic/cms/issues/14680) by @ebeauchamps
+- Bump shivammathur/setup-php from 2.37.0 to 2.37.1 in the github-actions group [#14682](https://github.com/statamic/cms/issues/14682) by @dependabot
+
+
+
+## 6.19.0 (2026-05-13)
+
+### What's new
+- Show crop dimensions in the crop editor [#14654](https://github.com/statamic/cms/issues/14654) by @jasonvarga
+- Add configurable `@blueprint` template base path [#11632](https://github.com/statamic/cms/issues/11632) by @o1y
+- Add Blade field templates for `statamic-forms` publish command [#14639](https://github.com/statamic/cms/issues/14639) by @martyf
+
+### What's fixed
+- Fix layout shift in Entries Fieldtype mode switcher [#14646](https://github.com/statamic/cms/issues/14646) by @jackmcdade
+- Fix `/index.php` request poisoning `Site::absoluteUrl` [#14647](https://github.com/statamic/cms/issues/14647) by @jasonvarga
+- Remove `overscroll-behavior-x: contain` on panels [#14642](https://github.com/statamic/cms/issues/14642) by @jaygeorge
+- Fix `nav:breadcrumbs` for multi-site [#13789](https://github.com/statamic/cms/issues/13789) by @nopticon
+- Fix date time overflow [#14652](https://github.com/statamic/cms/issues/14652) by @jaygeorge
+- Fix scrollbars showing all the time on the calendar view [#14653](https://github.com/statamic/cms/issues/14653) by @jaygeorge
+- Fix grid header overlapping nav [#14640](https://github.com/statamic/cms/issues/14640) by @wiktorm12
+- Collapse equal range endpoints in NumberFormatter [#14657](https://github.com/statamic/cms/issues/14657) by @jasonvarga
+- Don't show Visit URL for terms that aren't routable [#14658](https://github.com/statamic/cms/issues/14658) by @edalzell
+- Cap CP `perPage` query parameter to configured ceiling [#14668](https://github.com/statamic/cms/issues/14668) by @jasonvarga
+
+
+
+## 6.18.1 (2026-05-11)
+
+### What's fixed
+- Tone down scheduled status badge in dark mode [#14641](https://github.com/statamic/cms/issues/14641) by @jasonvarga
+- Fix date fieldtype input disappearing with underscore locales [#14643](https://github.com/statamic/cms/issues/14643) by @jasonvarga
+- Harden remote URL validation [#14645](https://github.com/statamic/cms/issues/14645) by @jasonvarga
+
+
+
+## 6.18.0 (2026-05-08)
+
+### What's new
+- Customizable crop ratios [#14630](https://github.com/statamic/cms/issues/14630) by @jackmcdade
+- Add --preset option to `assets:generate-presets` [#14626](https://github.com/statamic/cms/issues/14626) by @ryanmitchell
+
+### What's fixed
+- Fix CP login bouncing after Inertia auto-follow [#14632](https://github.com/statamic/cms/issues/14632) by @jasonvarga
+- Fix flaky TracksLastModified file timestamp test [#14634](https://github.com/statamic/cms/issues/14634) by @jasonvarga
+- Hide redundant 'This field' timezone row in date pickers [#14635](https://github.com/statamic/cms/issues/14635) by @jasonvarga
+- Simplify crop aspect ratio config formats [#14633](https://github.com/statamic/cms/issues/14633) by @jasonvarga
+
+
+
+## 6.17.0 (2026-05-08)
+
+### What's new
+- Add configurable timezone for date fields in the Control Panel [#14554](https://github.com/statamic/cms/issues/14554) by @duncanmcclean
+- Add `disabled` and `readOnly` props to `TimePicker` component [#14620](https://github.com/statamic/cms/issues/14620) by @duncanmcclean
+- Add Timezones components [#14612](https://github.com/statamic/cms/issues/14612) by @jasonvarga
+- Allow overriding date format preset options [#14600](https://github.com/statamic/cms/issues/14600) by @jasonvarga
+
+### What's fixed
+- Dirty state fixes [#14592](https://github.com/statamic/cms/issues/14592) by @jackmcdade
+- Localize timezone tooltip in DatePicker [#14596](https://github.com/statamic/cms/issues/14596) by @jasonvarga
+- Fix asset browser actions inside selector stack [#14565](https://github.com/statamic/cms/issues/14565) by @duncanmcclean
+- Fix date-only formats shifting days due to timezone conversion [#14552](https://github.com/statamic/cms/issues/14552) by @duncanmcclean
+- Avoid rendering time for dates in listings when appropriate [#14599](https://github.com/statamic/cms/issues/14599) by @jasonvarga
+- Display timezone in DateRangePicker [#14601](https://github.com/statamic/cms/issues/14601) by @jasonvarga
+- Fix date-only index fieldtype shifting across timezones [#14602](https://github.com/statamic/cms/issues/14602) by @jasonvarga
+- Memoize preprocessed fields in Validator [#14605](https://github.com/statamic/cms/issues/14605) by @jasonvarga
+- Show date fieldtype when searching for range [#14606](https://github.com/statamic/cms/issues/14606) by @jasonvarga
+- Fix error when typing in a required date range field [#14607](https://github.com/statamic/cms/issues/14607) by @jasonvarga
+- Fix HoverCard arrow not displaying [#14611](https://github.com/statamic/cms/issues/14611) by @jasonvarga
+- Adjust translation method usage [#14610](https://github.com/statamic/cms/issues/14610) by @jasonvarga
+- Fix stale asset listings across queued jobs [#14617](https://github.com/statamic/cms/issues/14617) by @ryanmitchell
+- Fix replicator fields using wrong site context [#14616](https://github.com/statamic/cms/issues/14616) by @ryanmitchell
+- Fix read-only/disabled states in `Radio` component [#14621](https://github.com/statamic/cms/issues/14621) by @duncanmcclean
+- Lazy-load actions for collections, submissions & terms [#14097](https://github.com/statamic/cms/issues/14097) by @duncanmcclean
+- Fix dated entries not syncing with origin revisions [#14216](https://github.com/statamic/cms/issues/14216) by @duncanmcclean
+- Fix DateRangePicker crash when selecting first date in a range [#13512](https://github.com/statamic/cms/issues/13512) by @andrii-trush
+- Fix moving custom section to 1st position in CP Nav [#12993](https://github.com/statamic/cms/issues/12993) by @duncanmcclean
+- Fix read-only state in publish forms [#14623](https://github.com/statamic/cms/issues/14623) by @duncanmcclean
+- Fix perPage limit in relationship stack listings [#14629](https://github.com/statamic/cms/issues/14629) by @wiktorm12
+- Bump postcss from 8.5.9 to 8.5.13 [#14595](https://github.com/statamic/cms/issues/14595) by @dependabot
+- Bump axios from 1.15.0 to 1.16.0 [#14613](https://github.com/statamic/cms/issues/14613) by @dependabot
+
+
+
+## 6.16.0 (2026-05-01)
+
+### What's new
+- Add support for strict null coalescence (`???`) in Antlers parsing [#14545](https://github.com/statamic/cms/issues/14545) by @marcorieser
+- Add hooks to asset listings [#14566](https://github.com/statamic/cms/issues/14566) by @edalzell
+- Show license key status in about and support:details commands [#14574](https://github.com/statamic/cms/issues/14574) by @jasonvarga
+- Support icon sets in names [#14579](https://github.com/statamic/cms/issues/14579) by @jasonvarga
+
+### What's fixed
+- Fix Comb search index delete() rewriting JSON when ref absent [#14550](https://github.com/statamic/cms/issues/14550) by @SUXUMI
+- Include missing time chars in `DateFormat::containsTime` [#14555](https://github.com/statamic/cms/issues/14555) by @jasonvarga
+- Update setup-cp-vite to install Vite 8 [#14559](https://github.com/statamic/cms/issues/14559) by @jasonvarga
+- Fix cache invalidation when using custom fields in URI route [#14564](https://github.com/statamic/cms/issues/14564) by @duncanmcclean
+- Fix validation bypass via spoofed Precognition-Validate-Only header [#14557](https://github.com/statamic/cms/issues/14557) by @duncanmcclean
+- Restore selected site when resuming session [#14562](https://github.com/statamic/cms/issues/14562) by @duncanmcclean
+- Fix relationship selector footer not sticking to bottom of stack [#14569](https://github.com/statamic/cms/issues/14569) by @duncanmcclean
+- Fix asset selector drag-to-upload covering footer but not handling drops [#14551](https://github.com/statamic/cms/issues/14551) by @duncanmcclean
+- Field margin balance [#14567](https://github.com/statamic/cms/issues/14567) by @jaygeorge
+- Harden OrderBys [#14572](https://github.com/statamic/cms/issues/14572) by @jasonvarga
+- Fix Asset field set to "Read-only" clipping filename [#14575](https://github.com/statamic/cms/issues/14575) by @jackmcdade
+- Fix login redirects [#14560](https://github.com/statamic/cms/issues/14560) by @jasonvarga
+- Design a better empty, read-only state for asset fields [#14578](https://github.com/statamic/cms/issues/14578) by @jackmcdade
+- Avoid per-icon requests in the Icon storybook [#14580](https://github.com/statamic/cms/issues/14580) by @jasonvarga
+- Fix updater crash when addon has no license [#14573](https://github.com/statamic/cms/issues/14573) by @duncanmcclean
+- Lazy load Inertia page components [#14582](https://github.com/statamic/cms/issues/14582) by @jasonvarga
+- Fix LivePreview listener leak and simplify Grid row updates [#14583](https://github.com/statamic/cms/issues/14583) by @jasonvarga
+- Fix SavePipeline initial debounce delay [#14586](https://github.com/statamic/cms/issues/14586) by @jasonvarga
+- Debounce LinkFieldtype URL writes [#14584](https://github.com/statamic/cms/issues/14584) by @jasonvarga
+- Extract fieldtype update debounce to shared constant [#14587](https://github.com/statamic/cms/issues/14587) by @jasonvarga
+- Wrap FieldAction instances with markRaw [#14589](https://github.com/statamic/cms/issues/14589) by @jasonvarga
+- Color swatches get borders for contrast [#14591](https://github.com/statamic/cms/issues/14591) by @jackmcdade
+- Deduplicate RelationshipInput in-flight item-data requests [#14590](https://github.com/statamic/cms/issues/14590) by @jasonvarga
+- German translations [#14561](https://github.com/statamic/cms/issues/14561) by @helloDanuk
+- French translations [#14585](https://github.com/statamic/cms/issues/14585) by @ebeauchamps
+
+
+
+## 6.15.0 (2026-04-27)
+
+### What's new
+- Frontend Elevated Sessions [#14424](https://github.com/statamic/cms/issues/14424) by @duncanmcclean
+- Frontend Two-Factor Authentication [#14525](https://github.com/statamic/cms/issues/14525) by @duncanmcclean
+- Add config for disabling Elevated Sessions [#14464](https://github.com/statamic/cms/issues/14464) by @1stevengrant
+
+### What's fixed
+- Better Collaboration Avatars [#14511](https://github.com/statamic/cms/issues/14511) by @jackmcdade
+- Fix addon settings blueprint cache collision with field settings blueprint [#14509](https://github.com/statamic/cms/issues/14509) by @duncanmcclean
+- Show dashed border in assets fieldtype when field is read-only [#14507](https://github.com/statamic/cms/issues/14507) by @duncanmcclean
+- Fix duplicate slugs allowed with depth-conditional routes [#14508](https://github.com/statamic/cms/issues/14508) by @duncanmcclean
+- Combobox 2.0 [#13843](https://github.com/statamic/cms/issues/13843) by @duncanmcclean
+- Persist active tab in URL hash on globals publish form [#14515](https://github.com/statamic/cms/issues/14515) by @duncanmcclean
+- Always display time zone in DatePicker [#14518](https://github.com/statamic/cms/issues/14518) by @jasonvarga
+- Fix blank page when visiting CP routes with invalid items [#14517](https://github.com/statamic/cms/issues/14517) by @jasonvarga
+- Improve rate limiting [#14475](https://github.com/statamic/cms/issues/14475) by @ryanmitchell
+- Hide default Statamic logo on frontend auth pages [#14522](https://github.com/statamic/cms/issues/14522) by @jasonvarga
+- Update currencies dictionary [#14520](https://github.com/statamic/cms/issues/14520) by @tdrayson
+- Allow extending asset preset generation command [#14521](https://github.com/statamic/cms/issues/14521) by @daun
+- Fix NavBuilder crash when nav item has an unresolved children Closure [#14523](https://github.com/statamic/cms/issues/14523) by @v-Woody
+- Fix Eloquent user merge setting roles and groups as model attributes [#14526](https://github.com/statamic/cms/issues/14526) by @duncanmcclean
+- Fix `/!/nocache` and `/!/csrf` CSRF exemption on Laravel 13 [#14533](https://github.com/statamic/cms/issues/14533) by @ynamite
+- Improve Link fieldtype in listings [#14535](https://github.com/statamic/cms/issues/14535) by @duncanmcclean
+- Fix TypeError when asset last_modified meta is null [#14530](https://github.com/statamic/cms/issues/14530) by @v-Woody
+- Fix Live Preview iframe becoming unscrollable after resizing in Chromium [#14542](https://github.com/statamic/cms/issues/14542) by @duncanmcclean
+- Fix CP auth error when using multiple user providers [#14543](https://github.com/statamic/cms/issues/14543) by @andjsch
+- Fix blank term edit screen and JS error for restricted users [#14537](https://github.com/statamic/cms/issues/14537) by @joshuablum
+- Fix `durationForHumans` deprecation warning and rounding [#14541](https://github.com/statamic/cms/issues/14541) by @duncanmcclean
+- Fix elevated session redirect for POST endpoints [#14544](https://github.com/statamic/cms/issues/14544) by @jasonvarga
+- Always show success when using forgot password form [#14539](https://github.com/statamic/cms/issues/14539) by @jasonvarga
+- Publish container tweaks [#14548](https://github.com/statamic/cms/issues/14548) by @jasonvarga
+- Fix `updateChildPageUris` empty check never short-circuiting [#14547](https://github.com/statamic/cms/issues/14547) by @duncanmcclean
+- French translations [#14514](https://github.com/statamic/cms/issues/14514) by @ebeauchamps
+
+
+
+## 6.14.0 (2026-04-16)
+
+### What's new
+- Fieldset sections [#14297](https://github.com/statamic/cms/issues/14297) by @jackmcdade
+- Collaboration support [#13974](https://github.com/statamic/cms/issues/13974) by @joshuablum
+
+### What's fixed
+- Use he-tree i18n prop for tree aria instructions [#14499](https://github.com/statamic/cms/issues/14499) by @jasonvarga
+- Rename `Add Block` back to `Add Set` in replicators [#14503](https://github.com/statamic/cms/issues/14503) by @joshuablum
+- Resolve Cascade content closure before checking content [#14502](https://github.com/statamic/cms/issues/14502) by @marcorieser
+- Fix nocache database driver failing on MySQL with invalid UTF-8 [#14505](https://github.com/statamic/cms/issues/14505) by @jasonvarga
+- Fix bard undos [#14506](https://github.com/statamic/cms/issues/14506) by @jackmcdade
+- Fix collection listing search case insensitivity [#14486](https://github.com/statamic/cms/issues/14486) by @joshuablum
+- Bump follow-redirects from 1.15.11 to 1.16.0 [#14498](https://github.com/statamic/cms/issues/14498) by @dependabot
+- Bump dompurify from 3.3.3 to 3.4.0 [#14500](https://github.com/statamic/cms/issues/14500) by @dependabot
+
+
+
+## 6.13.0 (2026-04-13)
+
+### What's new
+- Frontend Passkeys [#14453](https://github.com/statamic/cms/issues/14453) by @duncanmcclean
+- Allow control over who can be impersonated in UserPolicy [#14469](https://github.com/statamic/cms/issues/14469) by @ryanmitchell
+
+### What's fixed
+- Fix Bard arrow keys/undo [#14467](https://github.com/statamic/cms/issues/14467) by @jackmcdade
+- Fix visible he-tree accessibility text in tree view [#14465](https://github.com/statamic/cms/issues/14465) by @duncanmcclean
+- Append to Bard Entry links [#11468](https://github.com/statamic/cms/issues/11468) by @edalzell
+- Disable broadcast provider when broadcasting driver is null [#14471](https://github.com/statamic/cms/issues/14471) by @jasonvarga
+- Make the collapsible section icon smaller to fit in with the rest of UI [#14478](https://github.com/statamic/cms/issues/14478) by @jaygeorge
+- Add `.npmrc` file [#14477](https://github.com/statamic/cms/issues/14477) by @duncanmcclean
+- Fix SVG sanitization tests [#14483](https://github.com/statamic/cms/issues/14483) by @duncanmcclean
+- Use `cursor: pointer` when selecting from asset grid [#14487](https://github.com/statamic/cms/issues/14487) by @joshuablum
+- Remove negative assertions from `TestCase` [#14458](https://github.com/statamic/cms/issues/14458) by @duncanmcclean
+- Harden OrderBys [#14474](https://github.com/statamic/cms/issues/14474) by @duncanmcclean
+- Harden query value resolution [#14476](https://github.com/statamic/cms/issues/14476) by @duncanmcclean
+- French translations [#14479](https://github.com/statamic/cms/issues/14479) by @ebeauchamps
+- Bump axios from 1.14.0 to 1.15.0 [#14473](https://github.com/statamic/cms/issues/14473) by @dependabot
+
+
+
+## 6.12.0 (2026-04-08)
+
+### What's new
+- Add support for filtering conditions in Assets Tag [#13936](https://github.com/statamic/cms/issues/13936) by @jackmcdade
+
+### What's fixed
+- Add padding around 2FA QR code for dark mode scanning [#14460](https://github.com/statamic/cms/issues/14460) by @duncanmcclean
+- Fix form submissions with non-UTF-8 data crashing the CP listing [#14461](https://github.com/statamic/cms/issues/14461) by @duncanmcclean
+- Remove deprecated function calls [#14457](https://github.com/statamic/cms/issues/14457) by @justindantzer
+- Upgrade to Vite 8 [#14459](https://github.com/statamic/cms/issues/14459) by @jasonvarga
+- Nested fields should respect read-only state [#14351](https://github.com/statamic/cms/issues/14351) by @duncanmcclean
+
+
+
+## 6.11.0 (2026-04-07)
+
+### What's new
+- Add support for public properties to PathDataManager [#11697](https://github.com/statamic/cms/issues/11697) by @marcorieser
+- Add ability to filter submission exports [#14432](https://github.com/statamic/cms/issues/14432) by @jasonvarga
+- Add elevated session guards to AssignGroups and AssignRoles actions [#14450](https://github.com/statamic/cms/issues/14450) by @jasonvarga
+
+### What's fixed
+- Fix Stache index re-entrancy causing null URIs on cold stache [#14181](https://github.com/statamic/cms/issues/14181) by @o1y
+- Fix form submission types [#14430](https://github.com/statamic/cms/issues/14430) by @daun
+- Support decimal values in Range fieldtype [#13096](https://github.com/statamic/cms/issues/13096) by @hastinbe
+- Add `link` tag to allowed Antlers tags [#14438](https://github.com/statamic/cms/issues/14438) by @edalzell
+- Add `@default` support to Antlers content allowlists [#14440](https://github.com/statamic/cms/issues/14440) by @jasonvarga
+- Centralize SVG sanitization and sanitize CSS in style tags [#14442](https://github.com/statamic/cms/issues/14442) by @jasonvarga
+- Fix serializable_classes issues [#14443](https://github.com/statamic/cms/issues/14443) by @jasonvarga
+- Fix addon settings always showing as migratable [#14444](https://github.com/statamic/cms/issues/14444) by @duncanmcclean
+- Fix creating passkeys with JSON session serialization [#14448](https://github.com/statamic/cms/issues/14448) by @duncanmcclean
+- Stop auto-logging in users after password reset [#14454](https://github.com/statamic/cms/issues/14454) by @jasonvarga
+- Fix sync/desync on localizable nested fields [#14335](https://github.com/statamic/cms/issues/14335) by @duncanmcclean
+- French translations [#14431](https://github.com/statamic/cms/issues/14431) by @ebeauchamps
+- Bump defu from 6.1.4 to 6.1.6 [#14434](https://github.com/statamic/cms/issues/14434) by @dependabot
+- Bump vite from 7.1.12 to 7.3.2 [#14441](https://github.com/statamic/cms/issues/14441) by @dependabot
+
+
+
+## 6.10.0 (2026-04-02)
+
+### What's new
+- Default values can be computed [#14279](https://github.com/statamic/cms/issues/14279) by @edalzell
+- Ability to add to the filename replacements list [#14316](https://github.com/statamic/cms/issues/14316) by @edalzell
+
+### What's fixed
+- Harden OrderBys [#14421](https://github.com/statamic/cms/issues/14421) by @jasonvarga
+- Serialize nocache regions before storing in cache [#14422](https://github.com/statamic/cms/issues/14422) by @jasonvarga
+- Fix invalid HTML `lang` attribute [#14427](https://github.com/statamic/cms/issues/14427) by @duncanmcclean
+- Add serializable classes to allowlist [#14416](https://github.com/statamic/cms/issues/14416) by @duncanmcclean
+- Filter invalid UTF-8 locales from dictionary [#14426](https://github.com/statamic/cms/issues/14426) by @duncanmcclean
+- Fallback to option key in listings when label is missing [#14429](https://github.com/statamic/cms/issues/14429) by @duncanmcclean
+- Ensure moved/removed entries are statically invalidated [#14386](https://github.com/statamic/cms/issues/14386) by @ryanmitchell
+- Catch axios errors in blueprint builder [#14428](https://github.com/statamic/cms/issues/14428) by @duncanmcclean
+- Improve error handling when requiring starter kits [#14411](https://github.com/statamic/cms/issues/14411) by @duncanmcclean
+- Ensure empty addon settings get default blueprint values [#14384](https://github.com/statamic/cms/issues/14384) by @ryanmitchell
+- Bump lodash-es from 4.17.23 to 4.18.1 [#14425](https://github.com/statamic/cms/issues/14425) by @dependabot
+
+
+
+## 6.9.0 (2026-04-01)
+
+### What's new
+- Add a Text component [#14247](https://github.com/statamic/cms/issues/14247) by @jaygeorge
+- Emit `asset.saved` event from asset editor [#14392](https://github.com/statamic/cms/issues/14392) by @duncanmcclean
+
+### What's fixed
+- Fix collection whereStatus logic [#14380](https://github.com/statamic/cms/issues/14380) by @jackmcdade
+- Implement whereStatus() on search query builder [#14387](https://github.com/statamic/cms/issues/14387) by @ryanmitchell
+- Blueprint button order changes [#14365](https://github.com/statamic/cms/issues/14365) by @jaygeorge
+- Fix address bar overlapping bottom of content (typically on iOS) [#14399](https://github.com/statamic/cms/issues/14399) by @jaygeorge
+- Fix nested Bard toolbar focus issues [#14396](https://github.com/statamic/cms/issues/14396) by @jaygeorge
+- Fix nav section border radius [#14409](https://github.com/statamic/cms/issues/14409) by @jaygeorge
+- Fix conditional field borders [#14407](https://github.com/statamic/cms/issues/14407) by @thomasvantuycom
+- Fix collection listing dates from wrapping [#14415](https://github.com/statamic/cms/issues/14415) by @jaygeorge
+- Fix Parameters make method [#14418](https://github.com/statamic/cms/issues/14418) by @jasonvarga
+- Prevent npm packages from executing malicious code via `postinstall` [#14417](https://github.com/statamic/cms/issues/14417) by @duncanmcclean
+- French translations [#14393](https://github.com/statamic/cms/issues/14393) by @ebeauchamps
+- Bump brace-expansion from 2.0.2 to 2.0.3 [#14383](https://github.com/statamic/cms/issues/14383) by @dependabot
+
+
+
+## 6.8.0 (2026-03-27)
+
+### What's new
+- GraphQL API Authentication [#14292](https://github.com/statamic/cms/issues/14292) by @duncanmcclean
+- Ability to disable two-factor authentication [#14263](https://github.com/statamic/cms/issues/14263) by @duncanmcclean
+- Ability to select the date formatting locale [#14372](https://github.com/statamic/cms/issues/14372) by @jasonvarga
+- Number formatter [#14373](https://github.com/statamic/cms/issues/14373) by @jasonvarga
+
+### What's fixed
+- Omit application name and URL from support:details [#14359](https://github.com/statamic/cms/issues/14359) by @jasonvarga
+- Fix CP Nav active state when trailing slashes are enforced [#14363](https://github.com/statamic/cms/issues/14363) by @duncanmcclean
+- Only change date for localizations with an explicit date set [#14362](https://github.com/statamic/cms/issues/14362) by @duncanmcclean
+- Bring back responsive button groups [#13336](https://github.com/statamic/cms/issues/13336) by @daun
+- Merge external class attrs through twMerge in UI components [#14379](https://github.com/statamic/cms/issues/14379) by @jasonvarga
+- Reduce amount of data provided in Assets fieldtype meta [#14366](https://github.com/statamic/cms/issues/14366) by @duncanmcclean
+- Filters can only be removed by clicking cross [#14220](https://github.com/statamic/cms/issues/14220) by @jaygeorge
+- Bump reka-ui [#14368](https://github.com/statamic/cms/issues/14368) by @jasonvarga
+- Bump picomatch from 2.3.1 to 2.3.2 [#14360](https://github.com/statamic/cms/issues/14360) by @dependabot
+
+
+
 ## 6.7.3 (2026-03-25)
 
 ### What's fixed
diff --git a/CLAUDE.md b/CLAUDE.md
index 7e6d3a8eef7..160b42f47f1 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,9 +1,5 @@
 # Statamic CMS - Claude AI Context
 
-## ⚠️ Always Check Before Making Changes
-
-- Are all user-facing strings localized?
-
 ## Project Overview
 
 This is the **Statamic CMS Core Package** - a Laravel-powered, flat-file (by default) CMS designed for building modern, easy-to-manage websites. This repository contains the core Composer package that gets installed into Laravel applications.
@@ -93,6 +89,19 @@ The project uses Vite for asset compilation with separate configs:
 - The node module is defined in `packages/cms` and resolves everything through the `window` object.
 - Code needs to be in the `window` object to prevent addon bundles from re-including our code, and from needing to recompile our source files.
 
+## For PR Reviews
+
+- All user-facing strings should be localized.
+  - Short strings (like "Submit" or "Click here") can use the translation strings as keys. 
+  - Longer phrases or sentences should use keys and have their translations stored in an appropriate translation file.
+  - When adding to a translation file, only English strings need to be added. Other languages will be provided by contributors.
+  - Exception messages can stay untranslated in English
+
+## Misc
+
+- Commit messages within a PR do *not* need the PR number prefix. Those are just for the PR merge commit itself.
+
+
 ## Links
 
 - [Main Documentation](https://statamic.dev/)
diff --git a/SECURITY.md b/SECURITY.md
index 9dff2981bec..c40addd44cf 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -3,7 +3,7 @@ If you discover a security vulnerability in Statamic, please review the followin
 ## Guidelines
 While working to identify potential security vulnerabilities in Statamic, we ask that you:
 
-- **Privately** share any issues that you discover with us via support@statamic.com as soon as possible.
+- **Privately** share any issues that you discover with us via [GitHub](https://github.com/statamic/cms/security/advisories) or support@statamic.com as soon as possible.
 - Give us a **reasonable amount of time** to address any reported issues before publicizing them.
 - **Only** report issues that are in scope.
 - Provide a **quality report** with precise explanations and concrete attack scenarios.
diff --git a/composer.json b/composer.json
index 7292c381cfa..d4c50ba3c00 100644
--- a/composer.json
+++ b/composer.json
@@ -15,19 +15,19 @@
         "composer/semver": "^3.4",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "inertiajs/inertia-laravel": "^2.0",
+        "intervention/image": "^3.9.1 || ^4.0",
         "james-heinrich/getid3": "^1.9.21",
         "laravel/framework": "^12.40.0 || ^13.0",
         "laravel/prompts": "^0.3.0",
         "league/commonmark": "^2.2",
-        "league/csv": "^9.0",
-        "league/glide": "^3.0",
+        "league/csv": "^9.1",
+        "league/glide": "^3.0 || ^4.0",
         "maennchen/zipstream-php": "^3.1",
         "michelf/php-smartypants": "^1.8.1",
         "nesbot/carbon": "^3.0",
-        "pixelfear/composer-dist-plugin": "^0.1.4",
         "pragmarx/google2fa": "^8.0 || ^9.0",
         "rebing/graphql-laravel": "^9.15",
-        "rhukster/dom-sanitizer": "^1.0.7",
+        "rhukster/dom-sanitizer": "^1.0.10",
         "spatie/blink": "^1.3",
         "spatie/error-solutions": "^1.0 || ^2.0",
         "statamic/stringy": "^3.1.2",
@@ -38,7 +38,7 @@
         "symfony/yaml": "^7.0.3 || ^8.0",
         "ueberdosis/tiptap-php": "^2.0",
         "voku/portable-ascii": "^2.0.2",
-        "web-auth/webauthn-lib": "~5.2.0",
+        "web-auth/webauthn-lib": "^5.3",
         "wilderborn/partyline": "^1.0"
     },
     "require-dev": {
@@ -46,10 +46,14 @@
         "doctrine/dbal": "^3.6",
         "fakerphp/faker": "~1.10",
         "google/cloud-translate": "^1.6",
+        "larastan/larastan": "^3.10",
+        "laravel/pao": "^1.1",
         "laravel/pint": "1.16.0",
+        "laravel/socialite": "^5.28",
         "mockery/mockery": "^1.6.10",
         "orchestra/testbench": "^10.8 || ^11.0",
-        "phpunit/phpunit": "^11.5.3",
+        "phpstan/phpstan": "^2.2",
+        "phpunit/phpunit": "^12.5.23",
         "spatie/laravel-ray": "^1.43.6"
     },
     "conflict": {
@@ -63,29 +67,10 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "allow-plugins": {
-            "composer/package-versions-deprecated": true,
-            "pixelfear/composer-dist-plugin": true
+            "composer/package-versions-deprecated": true
         }
     },
     "extra": {
-        "download-dist": [
-            {
-                "url": "https://github.com/statamic/cms/releases/download/{$version}/dist.tar.gz",
-                "path": "resources/dist"
-            },
-            {
-                "url": "https://github.com/statamic/cms/releases/download/{$version}/dist-dev.tar.gz",
-                "path": "resources/dist-dev"
-            },
-            {
-                "url": "https://github.com/statamic/cms/releases/download/{$version}/dist-frontend.tar.gz",
-                "path": "resources/dist-frontend"
-            },
-            {
-                "url": "https://github.com/statamic/cms/releases/download/{$version}/dist-package.tar.gz",
-                "path": "resources/dist-package"
-            }
-        ],
         "laravel": {
             "providers": [
                 "Statamic\\Providers\\StatamicServiceProvider"
diff --git a/config/antlers.php b/config/antlers.php
index 6ec813093f8..b2cdd86f7bb 100644
--- a/config/antlers.php
+++ b/config/antlers.php
@@ -57,4 +57,25 @@
 
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | User content allowlists
+    |--------------------------------------------------------------------------
+    |
+    | These control which tags and modifiers will be permitted in user-supplied
+    | Antlers (e.g. fields with `antlers: true`). Include the literal string
+    | `@default` in the array to merge Statamic's defaults with your own.
+    |
+    */
+
+    // 'allowedContentTags' => [
+    //     '@default',
+    //     'foo:*',
+    // ],
+
+    // 'allowedContentModifiers' => [
+    //     '@default',
+    //     'foo'
+    // ],
+
 ];
diff --git a/config/assets.php b/config/assets.php
index 2618b48e33b..b91ecb9104e 100644
--- a/config/assets.php
+++ b/config/assets.php
@@ -70,6 +70,19 @@
             // 'quality' => 50,
         ],
 
+        /*
+        |--------------------------------------------------------------------------
+        | Crop Quality
+        |--------------------------------------------------------------------------
+        |
+        | The quality used when saving images cropped in the control panel. The
+        | user may override this per crop. When null, the quality defined in
+        | the "defaults" above will be used, otherwise it falls back to 90.
+        |
+        */
+
+        'crop_quality' => null,
+
         /*
         |--------------------------------------------------------------------------
         | Image Manipulation Presets
@@ -182,6 +195,25 @@
 
     'focal_point_editor' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Crop Aspect Ratios
+    |--------------------------------------------------------------------------
+    |
+    | Configure the aspect ratio presets available in the Control Panel image
+    | crop editor. Each entry may be a "W:H" string (e.g. "16:9") or an array
+    | with a custom label and ratio: ['label' => 'Wide', 'ratio' => '16:9'].
+    |
+    */
+
+    'crop_aspect_ratios' => [
+        '16:9',
+        '4:3',
+        '3:2',
+        '2:1',
+        '1:1',
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Enforce Lowercase Filenames
@@ -207,6 +239,19 @@
 
     'additional_uploadable_extensions' => [],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Additional Filename Character Replacements
+    |--------------------------------------------------------------------------
+    |
+    | When uploading files, certain characters in filenames will be replaced
+    | to ensure a safe filename. You may configure additional replacements.
+    | These are in addition to the native ones. They are not overridable.
+    |
+    */
+
+    'additional_filename_replacements' => [],
+
     /*
     |--------------------------------------------------------------------------
     | SVG Sanitization
diff --git a/config/cp.php b/config/cp.php
index e024d6a0336..090e6e8b049 100644
--- a/config/cp.php
+++ b/config/cp.php
@@ -68,7 +68,7 @@
 
     'pagination_size' => 50,
 
-    'pagination_size_options' => [10, 25, 50, 100, 500],
+    'pagination_size_options' => [10, 25, 50, 100],
 
     /*
     |--------------------------------------------------------------------------
@@ -115,6 +115,19 @@
 
     'custom_css_url' => env('STATAMIC_CUSTOM_CSS_URL', null),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Default Timezone
+    |--------------------------------------------------------------------------
+    |
+    | Determines the timezone used when displaying and entering dates in the
+    | Control Panel. Can be overridden by individual date fields. Defaults to
+    | "auto" which uses the browser's local timezone.
+    |
+    */
+
+    'default_timezone' => env('STATAMIC_CP_DEFAULT_TIMEZONE', 'auto'),
+
     /*
     |--------------------------------------------------------------------------
     | Thumbnails
diff --git a/config/git.php b/config/git.php
index 7c569b0435f..6edadac32da 100644
--- a/config/git.php
+++ b/config/git.php
@@ -62,6 +62,20 @@
 
     'dispatch_delay' => env('STATAMIC_GIT_DISPATCH_DELAY', 0),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Unique Lock Expiry
+    |--------------------------------------------------------------------------
+    |
+    | When commits are queued, a unique lock prevents multiple jobs from
+    | running concurrently against the same repository. This value (in
+    | seconds) controls how long that lock is held as a crash-safety
+    | net. It should exceed your queue worker's configured timeout.
+    |
+    */
+
+    'unique_lock_expiry' => env('STATAMIC_GIT_UNIQUE_LOCK_EXPIRY', 120),
+
     /*
     |--------------------------------------------------------------------------
     | Git User
diff --git a/config/oauth.php b/config/oauth.php
index d7e3fd2488e..0f098efa253 100644
--- a/config/oauth.php
+++ b/config/oauth.php
@@ -13,6 +13,7 @@
     'routes' => [
         'login' => 'oauth/{provider}',
         'callback' => 'oauth/{provider}/callback',
+        'disconnect' => 'oauth/{provider}/disconnect',
     ],
 
     /*
diff --git a/config/system.php b/config/system.php
index f4705eb5d80..90a0c2b1615 100644
--- a/config/system.php
+++ b/config/system.php
@@ -269,4 +269,48 @@
 
     'layout' => env('STATAMIC_LAYOUT', 'layout'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Blueprint Templates
+    |--------------------------------------------------------------------------
+    |
+    | When an entry's template is set to `@blueprint`, Statamic will look for
+    | a view named `{collection}.{blueprint}`. You may override this logic
+    | on a per-collection basis here.
+    |
+    | https://statamic.dev/content-modeling/collections#templates
+    |
+    */
+
+    'blueprint_templates' => [
+        //
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | File Uploads Disk
+    |--------------------------------------------------------------------------
+    |
+    | Temporary file uploads are stored here before being moved to their
+    | final destination. You may configure this to use a shared filesystem
+    | in multiserver environments. This disk may be shared by other kinds
+    | of temporary file uploads (e.g. forms) that use their own path below.
+    |
+    */
+
+    'file_uploads_disk' => env('STATAMIC_FILE_UPLOADS_DISK', 'local'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | File Uploads Path
+    |--------------------------------------------------------------------------
+    |
+    | The path (on the file uploads disk above) where temporary file uploads
+    | from the Files fieldtype are stored before being moved to their final
+    | destination. These files are automatically cleaned up over time.
+    |
+    */
+
+    'file_uploads_path' => env('STATAMIC_FILE_UPLOADS_PATH', 'statamic/file-uploads'),
+
 ];
diff --git a/config/users.php b/config/users.php
index b0c9b2e7a0f..da2d293b3e2 100644
--- a/config/users.php
+++ b/config/users.php
@@ -176,11 +176,28 @@
     | Users may be required to reauthorize before performing certain
     | sensitive actions. This is called an elevated session. Here
     | you may configure the duration of the session in minutes.
+    | You may also disable the elevated session entirely.
     |
     */
 
+    'elevated_sessions_enabled' => env('STATAMIC_ELEVATED_SESSIONS_ENABLED', true),
+
     'elevated_session_duration' => 15,
 
+    'elevated_sessions_url' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Two-Factor Authentication
+    |--------------------------------------------------------------------------
+    |
+    | Here you may disable two-factor authentication entirely. This can be
+    | useful on local or staging environments, or when using OAuth.
+    |
+    */
+
+    'two_factor_enabled' => env('STATAMIC_TWO_FACTOR_ENABLED', true),
+
     /*
     |--------------------------------------------------------------------------
     | Enforce Two-Factor Authentication
@@ -194,6 +211,22 @@
 
     'two_factor_enforced_roles' => [],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Two-Factor Authentication URLs
+    |--------------------------------------------------------------------------
+    |
+    | When users log in to the frontend and need to verify a two-factor code
+    | or set up two-factor authentication, they will be redirected to these
+    | URLs. Leave null to use the built-in pages. Control panel flows are
+    | unaffected and always use their own pages.
+    |
+    */
+
+    'two_factor_challenge_url' => null,
+
+    'two_factor_setup_url' => null,
+
     /*
     |--------------------------------------------------------------------------
     | Default Sorting
diff --git a/lang/ar.json b/lang/ar.json
index 8509dad054d..19375e646a6 100644
--- a/lang/ar.json
+++ b/lang/ar.json
@@ -86,7 +86,6 @@
     "Always show": "عرض دائمًا",
     "Always Show Set Button": "دائمًا عرض زر المجموعة",
     "An entry will be deleted|:count entries will be deleted": "سيتم حذف إدخال واحد|:count إدخالات سيتم حذفها",
-    "An item with this ID could not be found": "لم يتم العثور على عنصر بهذا المعرف",
     "and": "و",
     "and :count more": "و :count المزيد",
     "Antlers": "Antlers",
@@ -99,6 +98,7 @@
     "Application Cache": "ذاكرة تخزين التطبيق",
     "Application cache cleared.": "تم مسح ذاكرة تخزين التطبيق.",
     "Apply": "تطبيق",
+    "Save All": "حفظ الكل",
     "Apply Link": "تطبيق الرابط",
     "Are you sure you want to delete this column?": "هل أنت متأكد أنك تريد حذف هذا العمود؟",
     "Are you sure you want to delete this entry?": "هل أنت متأكد أنك تريد حذف هذا الإدخال؟",
diff --git a/lang/ar/fieldtypes.php b/lang/ar/fieldtypes.php
index fdd375b0dbb..9758fc4f4ff 100644
--- a/lang/ar/fieldtypes.php
+++ b/lang/ar/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'عرض عدد الكلمات في أسفل الحقل.',
     'bard.title' => 'محرر',
     'button_group.title' => 'مجموعة الأزرار',
-    'checkboxes.config.inline' => 'عرض مربعات الاختيار في صف.',
     'checkboxes.config.options' => 'حدد مفاتيح المصفوفة والتسميات الاختيارية لها.',
     'checkboxes.title' => 'مربعات الاختيار',
     'code.config.indent_size' => 'حدد حجم المسافة البادئة المفضل لديك (بالفراغات).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'هذه الحقول خاصة، كل بطريقتها الخاصة.',
     'picker.category.structured.description' => 'الحقول التي تخزن البيانات المهيكلة. بعضها قد يحتوي حتى على حقول أخرى متداخلة.',
     'picker.category.text.description' => 'الحقول التي تخزن سلاسل النصوص، المحتوى الغني، أو كلاهما.',
-    'radio.config.inline' => 'عرض أزرار الراديو في صف.',
     'radio.config.options' => 'حدد مفاتيح المصفوفة والتسميات الاختيارية لها.',
     'radio.title' => 'راديو',
     'range.config.append' => 'إضافة نص إلى نهاية (الجانب الأيمن) للسلايدر.',
diff --git a/lang/ar/messages.php b/lang/ar/messages.php
index 6cd172430e7..a8f000775ed 100644
--- a/lang/ar/messages.php
+++ b/lang/ar/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'سيتم تطبيق التغييرات على النسخة الحالية وسيتم نشرها على الفور.',
     'publish_actions_schedule' => 'سيتم تطبيق التغييرات على النسخة الحالية وسيتم نشرها في التاريخ المحدد.',
     'publish_actions_unpublish' => 'ستتم إزالة النشر عن المراجعة الحالية.',
+    'relationship_item_unavailable' => 'هذا العنصر غير متاح. ربما تم حذفه، أو قد لا تملك صلاحية عرضه.',
     'reset_password_notification_body' => 'تتلقى هذا البريد الإلكتروني لأننا تلقينا طلبًا لإعادة تعيين كلمة المرور لحسابك.',
     'reset_password_notification_no_action' => 'إذا لم تطلب إعادة تعيين كلمة المرور، فلا يلزم اتخاذ أي إجراء آخر.',
     'reset_password_notification_subject' => 'إشعار إعادة تعيين كلمة المرور',
diff --git a/lang/az.json b/lang/az.json
index fe4d10475ee..c3f1513e97f 100644
--- a/lang/az.json
+++ b/lang/az.json
@@ -86,7 +86,6 @@
     "Always show": "Həmişə göstər",
     "Always Show Set Button": "Həmişə Dəst Düyməsini Göstər",
     "An entry will be deleted|:count entries will be deleted": "Bir giriş silinəcək|:count giriş silinəcək",
-    "An item with this ID could not be found": "Bu ID ilə element tapılmadı",
     "and": "və",
     "and :count more": "və :count daha",
     "Antlers": "Antlers",
@@ -99,6 +98,7 @@
     "Application Cache": "Tətbiqi Program Keşi",
     "Application cache cleared.": "Tətbiq Program keşi təmizləndi.",
     "Apply": "Tətbiq et",
+    "Save All": "Hamısını yadda saxla",
     "Apply Link": "Keçidi tətbiq et",
     "Are you sure you want to delete this column?": "Bu sütunu silmək istədiyinizə əminsinizmi?",
     "Are you sure you want to delete this entry?": "Bu girişi silmək istədiyinizə əminsinizmi?",
diff --git a/lang/az/fieldtypes.php b/lang/az/fieldtypes.php
index d96c3f76554..cfc73006ac4 100644
--- a/lang/az/fieldtypes.php
+++ b/lang/az/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Sahənin altına söz sayını göstər.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Düymə Qrupu',
-    'checkboxes.config.inline' => 'Yoxlama qutularını bir sətirdə göstər.',
     'checkboxes.config.options' => 'Dizi açarlarını və isteğe bağlı etiketlərini təyin edin.',
     'checkboxes.title' => 'Yoxlama Qutuları',
     'code.config.indent_size' => 'Tercih etdiyiniz girinti ölçüsünü (boşluq olaraq) təyin edin.',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Bu sahələr xüsusi olub, hər biri özünəməxsusdur.',
     'picker.category.structured.description' => 'Strukturlaşdırılmış məlumatları saxlayan sahələr. Bəziləri hətta digər sahələri içərilərində qura bilər.',
     'picker.category.text.description' => 'Mətn sətirlərini, zəngin məzmunu və ya hər ikisini saxlayan sahələr.',
-    'radio.config.inline' => 'Radioları bir sətirdə göstərin.',
     'radio.config.options' => 'Dizi açarlarını və isteğe bağlı etiketlərini təyin edin.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Sürgü mətninin sonuna (sağ tərəfə) mətn əlavə edin.',
diff --git a/lang/az/messages.php b/lang/az/messages.php
index d002eb8c16e..7398cd0c962 100644
--- a/lang/az/messages.php
+++ b/lang/az/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'İşləyən nüsxədəki dəyişikliklər qeydə tətbiq ediləcək və dərhal dərc ediləcək.',
     'publish_actions_schedule' => 'İşləyən nüsxədəki dəyişikliklər qeydə tətbiq ediləcək və seçilmiş tarixdə dərc ediləcək.',
     'publish_actions_unpublish' => 'Cari təkrar dərc edilməyəcək.',
+    'relationship_item_unavailable' => 'Bu element əlçatan deyil. Silinmiş ola bilər və ya onu görməyə icazəniz olmaya bilər.',
     'reset_password_notification_body' => 'Bu e-poçtu şifrə sıfırlama tələbi aldığımız üçün alırsınız.',
     'reset_password_notification_no_action' => 'Əgər şifrə sıfırlama tələbi etməmisinizsə, heç bir əlavə tədbir görülməlidir.',
     'reset_password_notification_subject' => 'Şifrə Sıfırlama Bildirişi',
diff --git a/lang/cs.json b/lang/cs.json
index e347ba5db89..825fe9debf7 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -86,7 +86,6 @@
     "Always show": "Vždy zobrazit",
     "Always Show Set Button": "Vždy zobrazit tlačítko Set",
     "An entry will be deleted|:count entries will be deleted": "Záznam bude smazán|:count záznamů bude smazáno",
-    "An item with this ID could not be found": "Položka s tímto ID nebyla nalezena",
     "and": "a",
     "and :count more": "a :count dalších",
     "Antlers": "Parohy",
@@ -99,6 +98,7 @@
     "Application Cache": "Mezipaměť aplikace",
     "Application cache cleared.": "Mezipaměť aplikace vymazána.",
     "Apply": "Použít",
+    "Save All": "Uložit vše",
     "Apply Link": "Použít odkaz",
     "Are you sure you want to delete this column?": "Opravdu chcete smazat tento sloupec?",
     "Are you sure you want to delete this entry?": "Opravdu chcete smazat tento záznam?",
diff --git a/lang/cs/fieldtypes.php b/lang/cs/fieldtypes.php
index c1d08106bd0..805ce77e64a 100644
--- a/lang/cs/fieldtypes.php
+++ b/lang/cs/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Ukažte počet slov ve spodní části pole.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Skupina tlačítek',
-    'checkboxes.config.inline' => 'Přepínač pro vložené výběry.',
     'checkboxes.config.options' => 'Nastavení klíčů pole a jejich volitelných popisků.',
     'checkboxes.title' => 'Výběry',
     'code.config.indent_size' => 'Nastavení preferované velikosti odsazení (v mezerách).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Do těchto polí se ukládají speciální typy dat.',
     'picker.category.structured.description' => 'Do těchto polí se ukládají strukturované daty.',
     'picker.category.text.description' => 'Do těchto polí se ukládají textové údaje.',
-    'radio.config.inline' => 'Zobrazení přepínačů v řadě.',
     'radio.config.options' => 'Nastavení klíčů pole a jejich volitelných popisků.',
     'radio.title' => 'Rozevírací seznam',
     'range.config.append' => 'Přidejte text na pravou stranu posuvníku.',
diff --git a/lang/cs/messages.php b/lang/cs/messages.php
index 005398cdce9..641c622fe5a 100644
--- a/lang/cs/messages.php
+++ b/lang/cs/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Publikovat',
     'publish_actions_schedule' => 'Naplánovat',
     'publish_actions_unpublish' => 'Zrušit publikaci',
+    'relationship_item_unavailable' => 'Tato položka není dostupná. Mohla být smazána nebo nemáte oprávnění ji zobrazit.',
     'reset_password_notification_body' => 'Vaše heslo bylo změněno. Pokud jste nezměnili heslo, prosím kontaktujte správce webu.',
     'reset_password_notification_no_action' => 'Toto je automatická zpráva. Prosím neodpovídejte na ni.',
     'reset_password_notification_subject' => 'Změna hesla',
diff --git a/lang/da.json b/lang/da.json
index 82050bfe8cc..d7795257b1c 100644
--- a/lang/da.json
+++ b/lang/da.json
@@ -86,7 +86,6 @@
     "Always show": "Vis altid",
     "Always Show Set Button": "Vis altid knappen Set",
     "An entry will be deleted|:count entries will be deleted": "En post slettes | :count poster slettes",
-    "An item with this ID could not be found": "Side med dette id kunne ikke findes",
     "and": "og",
     "and :count more": "og :count mere",
     "Antlers": "Gevir",
@@ -99,6 +98,7 @@
     "Application Cache": "Applikationscache",
     "Application cache cleared.": "Applikationscache ryddet.",
     "Apply": "Anvende",
+    "Save All": "Gem alle",
     "Apply Link": "Anvend link",
     "Are you sure you want to delete this column?": "Er du sikker på, at du vil slette denne kolonne?",
     "Are you sure you want to delete this entry?": "Er du sikker på, at du vil slette denne?",
diff --git a/lang/da/fieldtypes.php b/lang/da/fieldtypes.php
index c3462bff8ee..6eb700be895 100644
--- a/lang/da/fieldtypes.php
+++ b/lang/da/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Vis ordantallet nederst i feltet.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Gruppe af knapper',
-    'checkboxes.config.inline' => 'Vis afkrydsningsfelterne i samme række.',
     'checkboxes.config.options' => 'Indstil array-tasterne og deres valgfri etiketter.',
     'checkboxes.title' => 'Afkrydsningsfelter',
     'code.config.indent_size' => 'Indstil din foretrukne indrykningsstørrelse (i mellemrum).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Disse felter er specielle, hver på deres måde.',
     'picker.category.structured.description' => 'Felter, der gemmer strukturerede data. Nogle kan endda rede andre marker inde i sig selv.',
     'picker.category.text.description' => 'Felter, der gemmer tekststrenge, rigt indhold eller begge dele.',
-    'radio.config.inline' => 'Vis knapperne i samme række.',
     'radio.config.options' => 'Indstil array-nøglerne og deres valgfri etiketter.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Føj tekst til slutningen (højre side) af skyderen.',
diff --git a/lang/da/messages.php b/lang/da/messages.php
index a6524e52154..27f303dab99 100644
--- a/lang/da/messages.php
+++ b/lang/da/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Ændringer i arbejdskopien anvendes og den offentliggøres straks.',
     'publish_actions_schedule' => 'Ændringer i arbejdskopien anvendes og den vises offentliggjort på den valgte dato.',
     'publish_actions_unpublish' => 'Den aktuelle revision vil ikke blive offentliggjort.',
+    'relationship_item_unavailable' => 'Dette element er ikke tilgængeligt. Det er muligvis blevet slettet, eller du har måske ikke tilladelse til at se det.',
     'reset_password_notification_body' => 'Du modtager denne e-mail, fordi vi modtog en anmodning om nulstilling af adgangskode til din konto.',
     'reset_password_notification_no_action' => 'Hvis du ikke anmodede om nulstilling af adgangskode, er der ikke behov for yderligere handling.',
     'reset_password_notification_subject' => 'Nulstil adgangskode besked',
diff --git a/lang/de.json b/lang/de.json
index d44b6360e72..89ed4239832 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -4,13 +4,14 @@
     "404": "404",
     ":count asset selected|:count assets selected": ":count Datei ausgewählt|:count Dateien ausgewählt",
     ":count item selected|:count items selected": ":count Element ausgewählt|:count Elemente ausgewählt",
+    ":count of :max selections": ":count von :max ausgewählt",
     ":count row|:count rows": ":count Zeile|:count Zeilen",
     ":count set|:count sets": ":count Set|:count Sets",
     ":count word|:count words": ":count Wort|:count Wörter",
     ":count\/:max selected": ":count\/:max ausgewählt",
     ":count\/:total characters": ":count\/:total Zeichen",
     ":file uploaded": ":file hochgeladen",
-    ":start-:end of :total": ":start–:end von :total",
+    ":range of :total": ":range von :total",
     ":success\/:total entries were deleted": ":success\/:total Einträge wurden gelöscht",
     ":success\/:total entries were published": ":success\/:total Einträge wurden veröffentlicht",
     ":success\/:total entries were unpublished": ":success\/:total Einträge wurden in Entwürfe umgewandelt",
@@ -33,7 +34,6 @@
     "Add": "Hinzufügen",
     "Add a link label": "Linktitel hinzufügen",
     "Add Attribute": "Attribut hinzufügen",
-    "Add Block": "Block hinzufügen",
     "Add child link to entry": "Untereintrag hinzufügen",
     "Add child nav item": "Unterpunkt hinzufügen",
     "Add Color": "Farbe hinzufügen",
@@ -80,6 +80,7 @@
     "All caches cleared.": "Alle Caches wurden geleert.",
     "All of the following conditions pass": "alle folgenden Bedingungen erfüllt sind",
     "All rights reserved.": "Alle Rechte vorbehalten.",
+    "All Submissions": "Alle Antworten",
     "Allow additions": "Hinzufügen erlauben",
     "Allow Antlers": "Antlers erlauben",
     "Allow Any Color": "Beliebige Farbe erlauben",
@@ -107,7 +108,7 @@
     "Applied to users in specific roles.": "Werden auf Benutzer:innen in bestimmten Rollen angewendet.",
     "Applied to your account.": "Werden auf dein Konto angewendet.",
     "Apply": "Übernehmen",
-    "Apply & Close All": "Übernehmen & alle schließen",
+    "Apply & Close All": "Übernehmen & alles schließen",
     "Apply & Save": "Übernehmen & Speichern",
     "Apply Link": "Link übernehmen",
     "Apply Query Scopes": "Query-Scopes anwenden",
@@ -158,6 +159,7 @@
     "Augment Format": "Ausgabeformat",
     "Authentication failed.": "Authentifizierung fehlgeschlagen.",
     "Author": "Autor",
+    "Auto": "Automatisch",
     "Autocomplete": "Autovervollständigung",
     "Automatic Line Breaks": "Automatische Zeilenumbrüche",
     "Automatic Links": "Automatische Links",
@@ -165,6 +167,8 @@
     "Available Columns": "Verfügbare Spalten",
     "Back to login": "Zurück zur Anmeldung",
     "Back to Users": "Zurück zu Benutzer:innen",
+    "Background": "Hintergrund",
+    "Background colour": "Hintergrundfarbe",
     "Base": "Standard",
     "BCC Recipient(s)": "BBC-Empfänger:innen",
     "Before": "Bevor",
@@ -172,6 +176,7 @@
     "Behaviour": "Verhalten",
     "Below": "Unterhalb",
     "Between": "Zwischen",
+    "Black": "Schwarz",
     "Blockquote": "Blockzitat",
     "Blueprint": "Blueprint",
     "Blueprint deleted": "Blueprint gelöscht",
@@ -207,14 +212,17 @@
     "Characters": "Zeichen",
     "Check All": "Alle auswählen",
     "Checked": "Ausgewählt",
+    "Chips": "Chips",
     "choose a file": "auswählen",
     "Choose Blueprint": "Blueprint wählen",
     "Choose Image": "Bild auswählen",
     "Choose item...": "Element auswählen…",
     "Choose...": "Auswählen…",
     "Clear": "Leeren",
+    "Clear :filter": ":filter löschen",
     "Clear All": "Alle leeren",
     "Clear date": "Datum löschen",
+    "Clear selection": "Auswahl löschen",
     "Clearable": "Aufheben erlauben",
     "Close": "Schließen",
     "Close Editor": "Editor schließen",
@@ -267,6 +275,7 @@
     "Confirm with Passkey": "Mit Passkey bestätigen",
     "Confirm Your Identity": "Deine Identität bestätigen",
     "Confirm Your Password": "Dein Passwort bestätigen",
+    "Connect": "Verknüpfen",
     "Constrain Layout": "Layout begrenzen",
     "Container": "Container",
     "Contains": "enthält",
@@ -352,6 +361,7 @@
     "Default Icon": "Standard-Icon",
     "Default Mailer": "Standard-Mailer",
     "Default Mode": "Standardmodus",
+    "Default Option": "Standardoption",
     "Default preferences saved": "Standardeinstellungen gespeichert",
     "Default Value": "Standardwert",
     "Delete": "Löschen",
@@ -376,7 +386,6 @@
     "Deselect :count item|Deselect all :count items": ":count Element abwählen|Alle :count Elemente abwählen",
     "Deselect :title": ":title abwählen",
     "Deselect all items": "Alle Elemente abwählen",
-    "Deselect option": "Option abwählen",
     "Detach": "Trennen",
     "Details": "Details",
     "Dictionary": "Wörterbuch",
@@ -388,6 +397,7 @@
     "Disabled two factor authentication": "Zwei-Faktor-Authentifizierung deaktiviert",
     "Discard": "Verwerfen",
     "Discard Changes": "Änderungen verwerfen",
+    "Disconnect": "Trennen",
     "Disk": "Laufwerk",
     "Display": "Titel",
     "Display Label": "Bezeichnung",
@@ -487,11 +497,11 @@
     "Expanded format": "Erweitertes Format",
     "Expect a root page": "Erwartet eine Startseite",
     "Expired": "Abgelaufen",
+    "Export": "Exportieren",
     "Export Submissions": "Antworten exportieren",
     "Extend Session": "Sitzung verlängern",
     "Extension": "Dateiendung",
     "External link": "Externer Link",
-    "Failed to create cropped image": "Zugeschnittenes Bild konnte nicht erstellt werden",
     "Failed to crop image": "Bild konnte nicht zugeschnitten werden",
     "Failed to load entries": "Einträge konnten nicht geladen werden",
     "Failed to upload cropped image": "Zugeschnittenes Bild konnte nicht hochgeladen werden",
@@ -511,12 +521,14 @@
     "File": "Datei",
     "File Driver": "Dateitreiber",
     "Filename": "Dateiname",
+    "Filtered Submissions": "Gefilterte Antworten",
     "Filters": "Filter",
     "Finish": "Übernehmen",
     "Finish cropping": "Zuschnitt übernehmen",
     "First Child": "Erster Untereintrag",
     "Fix": "Beheben",
     "Fixed": "Fixiert",
+    "Flatten": "Integrieren",
     "Flip crop orientation": "Zuschneiderichtung umkehren",
     "Flip Orientation": "Ausrichtung umkehren",
     "Floating": "Schwebend",
@@ -530,6 +542,7 @@
     "Form saved": "Formular gespeichert",
     "Form Submission": "Antworten",
     "Format": "Format",
+    "Formatting Locale": "Region für Formate",
     "Forms": "Formulare",
     "Free": "Kostenlos",
     "From": "Von",
@@ -565,6 +578,7 @@
     "Group": "Gruppe",
     "Groups": "Gruppen",
     "Handle": "Handle",
+    "Has Section|Has Sections": "Enthält einen Abschnitt|Enthält Abschnitte",
     "Heading 1": "Überschrift 1",
     "Heading 2": "Überschrift 2",
     "Heading 3": "Überschrift 3",
@@ -593,9 +607,9 @@
     "Icon": "Icon",
     "Icon Set": "Icon-Set",
     "ID": "ID",
-    "ID not found": "ID nicht gefunden",
     "ID regenerated and Stache cleared": "ID neu generiert und Stache geleert",
     "If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Falls das Klicken auf den „:actionText“-Button nicht funktioniert, kopiere die folgende URL in deinen Webbrowser:",
+    "Ignoring Section|Ignoring Sections": "Abschnitt wird ignoriert|Abschnitte werden ignoriert",
     "Image": "Bild",
     "Image Cache": "Cache für Bilder",
     "Image cache cleared.": "Bild-Cache wurde geleert.",
@@ -641,6 +655,7 @@
     "Item could not be deleted": "Element konnte nicht gelöscht werden",
     "Item deleted|Items deleted": "Element gelöscht|Elemente gelöscht",
     "Items could not be deleted": "Elemente konnten nicht gelöscht werden",
+    "Keep imported sections as-is.": "Importierte Abschnitte unverändert übernehmen.",
     "Key": "Schlüssel",
     "Key Mappings": "Tastaturbefehle",
     "Keyed": "schlüsselbasiert",
@@ -716,6 +731,7 @@
     "Maximum items selected:": "Maximale Anzahl ausgewählt:",
     "Maximum Rows": "Maximale Anzahl Zeilen",
     "Media": "Medien",
+    "Merge all fields into this section.": "Alle Felder in diesen Abschnitt zusammenführen.",
     "Merge Cells": "Zellen verbinden",
     "Min": "Minimum",
     "Min Files": "Minimale Dateiauswahl",
@@ -765,8 +781,8 @@
     "No matching passkey found": "Kein passender Passkey gefunden",
     "No options available.": "Keine Optionen verfügbar.",
     "No options to choose from.": "Keine Optionen zur Auswahl.",
-    "No results": "Keine Resultate",
-    "No results found!": "Keine Resultate gefunden!",
+    "No results": "Keine Ergebnisse",
+    "No results found!": "Keine Ergebnisse gefunden!",
     "No revisions": "Keine Revisionen",
     "No sets available": "Keine Sets verfügbar",
     "No templates to choose from.": "Keine Templates zur Auswahl.",
@@ -803,10 +819,12 @@
     "Origin": "Quelle",
     "Origin Behavior": "Herkunftsverhalten",
     "Other": "Andere",
+    "Output format": "Ausgabeformat",
     "Override Alt": "Alt-Text überschreiben",
     "Pages": "Seiten",
     "Parser": "Parser",
     "Passkey": "Passkey",
+    "Passkey deleted.": "Passkey gelöscht.",
     "Passkeys": "Passkeys",
     "Password": "Passwort",
     "Password changed": "Passwort geändert",
@@ -826,6 +844,7 @@
     "Pinned Item": "Angeheftetes Element",
     "Placeholder": "Platzhalter",
     "Playground": "Playground",
+    "Please select...": "Bitte wählen…",
     "Pop in": "Zurück ins Hauptfenster",
     "Pop out": "Eigenes Fenster",
     "Port": "Port",
@@ -834,6 +853,7 @@
     "Preferences by Role": "Einstellungen nach Rolle",
     "Prefix": "Präfix",
     "Prepend": "Voranstellen",
+    "Preserve": "Beibehalten",
     "Press enter to access additional save options": "Für zusätzliche Speicheroptionen Enter drücken.",
     "Preview": "Vorschau",
     "Preview Image": "Vorschaubild",
@@ -846,12 +866,14 @@
     "Propagate": "Verbreiten",
     "Properties": "Eigenschaften",
     "Protected Page": "Geschützte Seite",
+    "Provider": "Dienst",
     "Publish": "Veröffentlichen",
     "Publish by Default": "Standardmäßig veröffentlichen",
     "Publish Date": "Erscheinungsdatum",
     "Publish Entry|Publish :count Entries": "Eintrag veröffentlichen|:count Einträge veröffentlichen",
     "Publish Now": "Jetzt veröffentlichen",
     "Published": "Veröffentlicht",
+    "Quality": "Qualität",
     "Query Scopes": "Query-Scopes",
     "Range": "Von\/Bis-Modus",
     "Raster image": "Pixelbild",
@@ -863,6 +885,7 @@
     "Records": "Aufzeichnungen",
     "Recovery Code": "Wiederherstellungscode",
     "Recovery Codes": "Wiederherstellungscodes",
+    "Recovery codes regenerated.": "Wiederherstellungscodes neu generiert.",
     "Redirect": "Weiterleiten",
     "Refresh": "Aktualisieren",
     "Refresh recovery codes": "Wiederherstellungscodes aktualisieren",
@@ -878,6 +901,7 @@
     "Released on :date": "Veröffentlicht am :date",
     "Remember me": "Angemeldet bleiben",
     "Remove": "Entfernen",
+    "Remove :label": ":label entfernen",
     "Remove All": "Alle entfernen",
     "Remove all empty nodes": "Alle leeren Nodes entfernen",
     "Remove Asset": "Datei entfernen",
@@ -917,6 +941,7 @@
     "Restrict": "Beschränken",
     "Restrict to Folder": "Auf Ordner begrenzen",
     "Resume Your Session": "Sitzung fortsetzen",
+    "Return to Control Panel": "Zurück zum Control Panel",
     "Reupload": "Neu hochladen",
     "Revision": "Revision",
     "Revision created": "Revision erstellt",
@@ -940,11 +965,12 @@
     "Rulers": "Lineale",
     "Rules": "Regeln",
     "Run action|Run action on :count items": "Aktion ausführen|Aktion bei :count Elementen ausführen",
+    "Same as language": "Gleich wie Sprache",
     "Sanitize": "Bereinigen",
     "Save": "Speichern",
-    "Save & Close All": "Speichern & alle schließen",
     "Save & Publish": "Speichern & Veröffentlichen",
     "Save & Unpublish": "Speichern & in Entwurf umwandeln",
+    "Save All": "Alles speichern",
     "Save as Copy": "Als Kopie speichern",
     "Save as HTML": "Als HTML speichern",
     "Save Changes": "Änderungen speichern",
@@ -954,7 +980,7 @@
     "Save Order": "Reihenfolge speichern",
     "Save to": "Speichern unter",
     "Saved": "Gespeichert",
-    "Scaffold Views": "Ansichten erstellen",
+    "Scaffold Views": "Ansichten generieren",
     "Schedule": "Zeitplan",
     "Scheduled": "Geplant",
     "Search": "Suchen",
@@ -968,6 +994,7 @@
     "Searchable": "Durchsuchbar",
     "Searchables": "Quellen",
     "Second": "Sekunde",
+    "Section Behavior": "Abschnittsverhalten",
     "Security": "Sicherheit",
     "Security update available": "Sicherheitsupdate verfügbar",
     "Select": "Auswählen",
@@ -1026,12 +1053,14 @@
     "Sign in with OAuth": "Mit OAuth anmelden",
     "Sign into your Statamic Control Panel": "Melde dich im Statamic Control Panel an.",
     "Sign out": "Abmelden",
+    "Sign-in Providers": "Anmeldedienste",
     "Single": "Einzel",
     "Site": "Website",
     "Site Defaults": "Standardeinstellungen der Website",
     "Site deleted": "Website gelöscht",
     "Site saved": "Website gespeichert",
     "Site selected.": "Website ausgewählt.",
+    "Site time": "Website-Zeit",
     "Sites": "Websites",
     "Size": "Größe",
     "Skip to content": "Zum Inhalt springen",
@@ -1117,6 +1146,7 @@
     "Text & Rich Content": "Text & formatierter Inhalt",
     "Text item": "Text-Element",
     "Text view": "Text-Ansicht",
+    "The asset is not an image.": "Diese Datei ist kein Bild.",
     "the Git Integration": "Git-Integration",
     "The given data was invalid.": "Die angegebenen Daten sind ungültig.",
     "The page you are looking for could not be found.": "Die gesuchte Seite wurde nicht gefunden.",
@@ -1127,12 +1157,15 @@
     "These are now your default columns.": "Dies sind jetzt deine Standardspalten.",
     "This action is unauthorized.": "Für diese Aktion hast du keine Berechtigung.",
     "This collection isn't available in this site.": "Diese Sammlung ist auf dieser Website nicht verfügbar.",
+    "This field": "Dieses Feld",
     "This form is awaiting responses": "Dieses Formular wartet auf Antworten",
     "This is the published version": "Dies ist die veröffentlichte Version",
     "This is the root page": "Dies ist die Startseite",
     "This is the working copy": "Dies ist die Arbeitskopie",
+    "This month": "Dieser Monat",
     "This will delete the collection and all of its entries.|This will delete the collections and all of their entries.": "Dies löscht die Sammlung und alle ihre Einträge.|Dies löscht die Sammlungen und alle ihre Einträge.",
     "Time Enabled": "Uhrzeit aktivieren",
+    "Timezone": "Zeitzone",
     "Title": "Titel",
     "Today": "Heute",
     "Toggle": "Schalter",
@@ -1151,6 +1184,8 @@
     "True": "Wahr",
     "Try Again": "Erneut versuchen",
     "Two-Factor Authentication": "Zwei-Faktor-Authentifizierung",
+    "Two-factor authentication disabled.": "Zwei-Faktor-Authentifizierung deaktiviert.",
+    "Two-factor authentication enabled.": "Zwei-Faktor-Authentifizierung aktiviert.",
     "Type": "Typ",
     "Type '\/' to insert a set": "Tippe \/, um ein Set einzufügen",
     "Typeahead Field": "Autovervollständigung",
@@ -1213,7 +1248,7 @@
     "Verification Code": "Authentifizierungscode",
     "Video": "Video",
     "Video URL": "Video-URL",
-    "View": "Ansehen",
+    "View": "Anzeigen",
     "View additional releases": "Weitere Versionen anzeigen",
     "View All": "Alle anzeigen",
     "View All Blueprints": "Alle Blueprints anzeigen",
@@ -1231,6 +1266,7 @@
     "Warm Specific Presets": "Bestimmte Presets vorwärmen",
     "Warning! Changing a site handle may break existing site content!": "Achtung! Das Ändern des Website-Handles kann vorhandene Inhalte der Website beschädigen!",
     "Week": "Woche",
+    "White": "Weiß",
     "Whoops!": "Ups!",
     "Widgets": "Widgets",
     "Width": "Breite",
@@ -1249,7 +1285,7 @@
     "You are not authorized to edit this collection.": "Du hast keine Berechtigung, diese Sammlung zu bearbeiten.",
     "You are not authorized to edit this taxonomy.": "Du hast keine Berechtigung, diese Taxonomie zu bearbeiten.",
     "You are not authorized to run this action.": "Du hast keine Berechtigung, diese Aktion auszuführen.",
-    "You are not authorized to scaffold resources.": "Du hast keine Berechtigung, Ressourcen anzulegen.",
+    "You are not authorized to scaffold resources.": "Du hast keine Berechtigung, Ressourcen zu generieren.",
     "You are not authorized to view collections.": "Du hast keine Berechtigung, Sammlungen anzusehen.",
     "You are not authorized to view navs.": "Du hast keine Berechtigung, Navigationen anzusehen.",
     "You are not authorized to view this collection.": "Du hast keine Berechtigung, diese Sammlung anzusehen.",
@@ -1258,5 +1294,6 @@
     "You do not have permission to access this URL": "Du hast keine Berechtigung, auf diese URL zuzugreifen.",
     "You're already editing this item.": "Du bearbeitest diesen Eintrag bereits.",
     "Your Session is Expiring": "Deine Sitzung läuft ab",
+    "Your time": "Deine Zeitzone",
     "Your working copy will be replaced by the contents of this revision.": "Deine aktuelle Arbeitskopie wird mit dem Inhalt dieser Revision ersetzt."
 }
diff --git a/lang/de/dictionary-currencies.php b/lang/de/dictionary-currencies.php
index 933865778ef..12bdf44b901 100644
--- a/lang/de/dictionary-currencies.php
+++ b/lang/de/dictionary-currencies.php
@@ -5,16 +5,22 @@
     'AFN' => 'Afghanischer Afghani',
     'ALL' => 'Albanischer Lek',
     'AMD' => 'Armenischer Dram',
+    'AOA' => 'Angolanische Kwanza',
     'ARS' => 'Argentinischer Peso',
     'AUD' => 'Australischer Dollar',
+    'AWG' => 'Arubischer Florin',
     'AZN' => 'Aserbaidschanischer Manat',
     'BAM' => 'Bosnisch-herzegowinischer konvertibler Mark',
+    'BBD' => 'Barbadischer Dollar',
     'BDT' => 'Bangladeschischer Taka',
     'BHD' => 'Bahrainer Dinar',
     'BIF' => 'Burundischer Franc',
+    'BMD' => 'Bermudischer Dollar',
     'BND' => 'Bruneischer Dollar',
     'BOB' => 'Bolivianischer Boliviano',
     'BRL' => 'Brasilianischer Real',
+    'BSD' => 'Bahamischer Dollar',
+    'BTN' => 'Bhutanischer Ngultrum',
     'BWP' => 'Botswanischer Pula',
     'BYN' => 'Belarussischer Rubel',
     'BZD' => 'Belize-Dollar',
@@ -25,6 +31,7 @@
     'CNY' => 'Chinesischer Yuan',
     'COP' => 'Kolumbianischer Peso',
     'CRC' => 'Costa-Rica-Colón',
+    'CUP' => 'Kubanischer Peso',
     'CVE' => 'Kapverdischer Escudo',
     'CZK' => 'Tschechische Krone',
     'DJF' => 'Dschibutischer Franc',
@@ -35,13 +42,19 @@
     'ERN' => 'Eritreischer Nakfa',
     'ETB' => 'Äthiopischer Birr',
     'EUR' => 'Euro',
+    'FJD' => 'Fidschianischer Dollar',
+    'FKP' => 'Falkland-Inseln-Pfund',
     'GBP' => 'Britisches Pfund Sterling',
     'GEL' => 'Georgischer Lari',
     'GHS' => 'Ghanaischer Cedi',
+    'GIP' => 'Gibraltarisches Pfund',
+    'GMD' => 'Gambischer Dalasi',
     'GNF' => 'Guineischer Franc',
     'GTQ' => 'Guatemaltekischer Quetzal',
+    'GYD' => 'Guyanischer Dollar',
     'HKD' => 'Hongkong-Dollar',
     'HNL' => 'Honduranischer Lempira',
+    'HTG' => 'Haitianische Gourde',
     'HUF' => 'Ungarischer Forint',
     'IDR' => 'Indonesische Rupiah',
     'ILS' => 'Israelischer Neuer Schekel',
@@ -53,21 +66,31 @@
     'JOD' => 'Jordanischer Dinar',
     'JPY' => 'Japanischer Yen',
     'KES' => 'Kenianischer Schilling',
+    'KGS' => 'Kirgisischer Som',
     'KHR' => 'Kambodschanischer Riel',
     'KMF' => 'Komorischer Franc',
+    'KPW' => 'Nordkoreanischer Won',
     'KRW' => 'Südkoreanischer Won',
     'KWD' => 'Kuwaitischer Dinar',
+    'KYD' => 'Kaiman-Inseln-Dollar',
     'KZT' => 'Kasachischer Tenge',
+    'LAK' => 'Laotischer Kip',
     'LBP' => 'Libanesisches Pfund',
     'LKR' => 'Sri-lankische Rupie',
+    'LRD' => 'Liberianischer Dollar',
+    'LSL' => 'Lesothischer Loti',
     'LYD' => 'Libyscher Dinar',
     'MAD' => 'Marokkanischer Dirham',
     'MDL' => 'Moldauischer Leu',
     'MGA' => 'Madagassischer Ariary',
     'MKD' => 'Mazedonischer Denar',
     'MMK' => 'Myanmar-Kyat',
+    'MNT' => 'Mongolischer Tögrög',
     'MOP' => 'Macao-Pataca',
+    'MRU' => 'Mauretanischer Ouguiya',
     'MUR' => 'Mauritische Rupie',
+    'MVR' => 'Maledivische Rufiyaa',
+    'MWK' => 'Malawischer Kwacha',
     'MXN' => 'Mexikanischer Peso',
     'MYR' => 'Malaysischer Ringgit',
     'MZN' => 'Mosambikanischer Metical',
@@ -79,7 +102,8 @@
     'NZD' => 'Neuseeland-Dollar',
     'OMR' => 'Omanischer Rial',
     'PAB' => 'Panamanischer Balboa',
-    'PEN' => 'Peruanischer Nuevo Sol',
+    'PEN' => 'Peruanischer Sol',
+    'PGK' => 'Papua-Neuguineanische Kina',
     'PHP' => 'Philippinischer Peso',
     'PKR' => 'Pakistanische Rupie',
     'PLN' => 'Polnischer Zloty',
@@ -90,12 +114,22 @@
     'RUB' => 'Russischer Rubel',
     'RWF' => 'Ruandischer Franc',
     'SAR' => 'Saudi-arabischer Riyal',
+    'SBD' => 'Salomonischer Dollar',
+    'SCR' => 'Seychellische Rupie',
     'SDG' => 'Sudanesisches Pfund',
     'SEK' => 'Schwedische Krone',
     'SGD' => 'Singapur-Dollar',
+    'SHP' => 'Sankt-Helena-Pfund',
+    'SLE' => 'Sierra-leonischer Leone',
     'SOS' => 'Somalischer Schilling',
+    'SRD' => 'Surinamischer Dollar',
+    'SSP' => 'Südsudanesisches Pfund',
+    'STN' => 'São-toméischer Dobra',
     'SYP' => 'Syrisches Pfund',
+    'SZL' => 'Swasiländischer Lilangeni',
     'THB' => 'Thailändischer Baht',
+    'TJS' => 'Tadschikischer Somoni',
+    'TMT' => 'Turkmenischer Manat',
     'TND' => 'Tunesischer Dinar',
     'TOP' => 'Tonganischer Paʻanga',
     'TRY' => 'Türkische Lira',
@@ -107,10 +141,16 @@
     'USD' => 'US-Dollar',
     'UYU' => 'Uruguayischer Peso',
     'UZS' => 'Usbekischer Som',
+    'VED' => 'Venezolanischer Digitaler Bolívar',
     'VES' => 'Venezolanischer Bolívar Soberano',
     'VND' => 'Vietnamesischer Dong',
+    'VUV' => 'Vanuatischer Vatu',
+    'WST' => 'Samoanischer Tala',
     'XAF' => 'CFA-Franc BEAC',
+    'XCD' => 'Ostkaribischer Dollar',
+    'XCG' => 'Karibischer Gulden',
     'XOF' => 'CFA-Franc BCEAO',
+    'XPF' => 'CFP-Franc',
     'YER' => 'Jemenitischer Rial',
     'ZAR' => 'Südafrikanischer Rand',
     'ZMW' => 'Sambischer Kwacha',
diff --git a/lang/de/fieldtypes.php b/lang/de/fieldtypes.php
index d23914c77e5..694d048d29d 100644
--- a/lang/de/fieldtypes.php
+++ b/lang/de/fieldtypes.php
@@ -48,7 +48,7 @@
     'bard.config.word_count' => 'Blendet die Anzahl Wörter unter dem Feld ein.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Button-Gruppe',
-    'checkboxes.config.inline' => 'Checkboxen in einer Reihe anzeigen.',
+    'checkboxes.config.appearance' => 'Lege fest, wie die Checkboxen dargestellt werden.',
     'checkboxes.config.options' => 'Array-Schlüssel und ihre optionalen Beschriftungen festlegen.',
     'checkboxes.title' => 'Checkboxen',
     'code.config.color_mode' => 'Bevorzugten Farbmodus auswählen.',
@@ -78,6 +78,7 @@
     'date.config.number_of_months' => 'Anzahl der gleichzeitig sichtbaren Monate festlegen.',
     'date.config.time_enabled' => 'Aktiviert den Timepicker.',
     'date.config.time_seconds_enabled' => 'Sekunden im Timepicker einblenden.',
+    'date.config.timezone' => 'Die Zeitzone, in der Datumsangaben angezeigt und eingegeben werden. Standardmäßig wird die lokale Zeitzone des Browsers verwendet.',
     'date.title' => 'Datum',
     'dictionary.config.dictionary' => 'Das Wörterbuch, aus dem du Optionen beziehen möchtest.',
     'dictionary.file.config.filename' => 'Der Dateiname, der deine Optionen enthält, relativ zum Verzeichnis `resources/dictionaries`.',
@@ -119,7 +120,9 @@
     'integer.title' => 'Ganzzahl',
     'link.config.collections' => 'Einträge aus diesen Sammlungen stehen zur Verfügung. Bleibt das Feld leer, können Einträge aus allen verknüpfbaren Sammlungen genutzt werden.',
     'link.config.container' => 'Datei-Container für dieses Feld auswählen.',
+    'link.config.default_option' => 'Die Standardoption für den Link-Typ, sofern diese in der Konfiguration des Feldtyps verfügbar ist.',
     'link.title' => 'Link',
+    'list.config.add_row' => 'Beschriftung des „Element hinzufügen“-Buttons anpassen.',
     'list.title' => 'Liste',
     'markdown.config.automatic_line_breaks' => 'Aktiviert automatische Zeilenumbrüche.',
     'markdown.config.automatic_links' => 'Aktiviert die automatische Verlinkung beliebiger URLs.',
@@ -140,7 +143,7 @@
     'picker.category.special.description' => 'Diese Felder sind besonders, jedes auf seine Weise.',
     'picker.category.structured.description' => 'Diese Felder speichern strukturierte Daten. Einige können sogar andere Felder in sich selbst verschachteln.',
     'picker.category.text.description' => 'Diese Felder speichern Text, formatierten Inhalt oder beides.',
-    'radio.config.inline' => 'Radio-Buttons in einer Reihe anzeigen.',
+    'radio.config.appearance' => 'Lege fest, wie die Radio-Buttons dargestellt werden.',
     'radio.config.options' => 'Array-Schlüssel und ihre optionalen Beschriftungen festlegen.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Text auf der rechten Seite des Schiebereglers hinzufügen.',
diff --git a/lang/de/messages.php b/lang/de/messages.php
index 64cfff12b6f..2109dc89a60 100644
--- a/lang/de/messages.php
+++ b/lang/de/messages.php
@@ -46,9 +46,9 @@
     'collection_next_steps_blueprints_description' => 'Verwalte die Blueprints und Felder dieser Sammlung. Strukturiere sie mit Fieldsets.',
     'collection_next_steps_configure_description' => 'Konfiguriere URLs und Routen, lege Blueprints fest, bestimme das Datumsverhalten, die Reihenfolge und weitere Optionen.',
     'collection_next_steps_create_entry_description' => 'Erstelle den ersten Eintrag oder lege einige Platzhalter-Einträge an – ganz nach deinen Bedürfnissen.',
-    'collection_next_steps_scaffold_description' => 'Erstelle mit einem Klick aus dem Namen der Sammlung Ansichten für Index- und Detailseiten.',
+    'collection_next_steps_scaffold_description' => 'Generiere mit einem Klick aus dem Namen der Sammlung Ansichten für Index- und Detailseiten.',
     'collection_revisions_instructions' => 'Revisionen für diese Sammlung aktivieren.',
-    'collection_scaffold_instructions' => 'Wähle und konfiguriere die Ansichten, die erstellt werden sollen. Bereits vorhandene Dateien bleiben erhalten.',
+    'collection_scaffold_instructions' => 'Wähle und konfiguriere die Ansichten, die generiert werden sollen. Bereits vorhandene Dateien werden nicht überschrieben.',
     'collections_blueprint_instructions' => 'Einträge in dieser Sammlung können jeden dieser Blueprints verwenden.',
     'collections_default_publish_state_instructions' => 'Beim Erstellen neuer Einträge in dieser Sammlung wird der Schalter für die Veröffentlichung standardmäßig auf *true* gesetzt anstatt auf *false* (Entwurf).',
     'collections_future_date_behavior_instructions' => 'Wie sollen sich Einträge mit einem zukünftigen Datum verhalten?',
@@ -61,6 +61,8 @@
     'collections_route_instructions' => 'Die Route steuert das URL-Muster der Einträge. Mehr dazu in der [Dokumentation](https://statamic.dev/collections#routing).',
     'collections_sort_direction_instructions' => 'Voreinstellung für die Sortierrichtung.',
     'collections_taxonomies_instructions' => 'Einträge dieser Sammlung mit Taxonomien verknüpfen. Die Felder werden automatisch den Formularen hinzugefügt.',
+    'crop_jpeg_background_help' => 'JPEG unterstützt keine Transparenz – transparente Bereiche werden mit dieser Farbe gefüllt.',
+    'crop_replace_unavailable_format' => 'Das Original kann nur ersetzt werden, wenn das Format gleich bleibt.',
     'crop_save_as_copy_confirm' => 'Das zugeschnittene Bild als neue Kopie speichern?',
     'crop_save_copy_or_replace' => 'Möchtest du dies als neue Kopie speichern oder das Originalbild ersetzen?',
     'dictionaries_countries_emojis_instructions' => 'Flaggen-Emojis in Ländernamen einbeziehen.',
@@ -86,7 +88,7 @@
     'entry_count' => ':count Eintrag|:count Einträge',
     'entry_origin_instructions' => 'Die neue Lokalisierung übernimmt die Werte vom Eintrag der ausgewählten Website.',
     'expect_root_instructions' => 'Die erste Seite im Seitenbaum als Root oder Startseite behandeln.',
-    'field_conditions_always_save_instructions' => 'Wert dieses Feldes immer speichern, auch wenn es ausgeblendet ist.',
+    'field_conditions_always_save_instructions' => 'Feldwert immer speichern, auch wenn das Feld ausgeblendet ist.',
     'field_conditions_field_instructions' => 'Du kannst jeden „Handle“ eingeben und bist nicht auf die Optionen im Dropdown beschränkt.',
     'field_conditions_instructions' => 'Wann soll dieses Feld ein- oder ausgeblendet werden?',
     'field_desynced_from_origin' => 'Weicht von der Quelle ab. Zum Zurücksetzen auf den ursprünglichen Wert klicken.',
@@ -108,6 +110,7 @@
     'fields_visibility_instructions' => 'Anzeige des Feldes in Formularen festlegen.',
     'fieldset_import_fieldset_instructions' => 'Fieldset auswählen, das importiert werden soll.',
     'fieldset_import_prefix_instructions' => 'Beim Import jedem Feld ein Präfix hinzufügen (z.B. `hero_`).',
+    'fieldset_import_section_behavior_instructions' => 'Legt fest, ob die Abschnitte aus dem importierten Fieldset beibehalten oder in diesen Abschnitt integriert werden.',
     'fieldset_intro' => 'Fieldsets sind optionale Begleiter zu Blueprints und dienen als wiederverwendbare Partials innerhalb von Blueprints.',
     'fieldset_link_fields_prefix_instructions' => 'Jedem Feld im verknüpften Fieldset diesen Wert als Präfix voranstellen. Nützlich, um dieselben Felder mehrfach zu importieren.',
     'fieldsets_handle_instructions' => 'Dient an anderer Stelle als Referenz für dieses Fieldset. Dies lässt sich später nicht ohne Weiteres ändern.',
@@ -137,6 +140,7 @@
     'form_configure_store_instructions' => 'Deaktivieren, um Antworten nicht mehr zu speichern. Ereignisse und E-Mail-Benachrichtigungen bleiben aktiv.',
     'form_configure_title_instructions' => 'Verwende einen Call to Action wie „Kontaktiere uns“.',
     'form_create_description' => 'Starte mit dem Anlegen deines ersten Formulars.',
+    'form_export_filtered_description' => 'Exportiert die Antworten mit den aktuellen Filtern und den sichtbaren Spalten.',
     'getting_started_widget_collections' => 'Sammlungen fassen die verschiedenen Inhaltstypen deiner Website zusammen und helfen dir, den Überblick zu behalten.',
     'getting_started_widget_docs' => 'Entdecke alle Funktionen von Statamic und lerne, wie du die leistungsstarken Features richtig einsetzen kannst.',
     'getting_started_widget_header' => 'Erste Schritte mit Statamic',
@@ -185,6 +189,12 @@
     'navigation_documentation_instructions' => 'Lerne, wie du Navigationen erstellst, einrichtest und darstellst.',
     'navigation_link_to_entry_instructions' => 'Füge einen Link zu einem Eintrag hinzu. Aktiviere das Verknüpfen auf weitere Sammlungen im Konfigurationsbereich.',
     'navigation_link_to_url_instructions' => 'Füge einen Link zu einer internen oder externen URL hinzu und erlaube in den Einstellungen das Verknüpfen mit Einträgen.',
+    'oauth_already_connected' => 'Dein :provider-Konto ist bereits verknüpft.',
+    'oauth_belongs_to_another_user' => 'Dieses :provider-Konto ist bereits mit einem anderen Account verknüpft.',
+    'oauth_connect_unsupported' => 'Dieser Dienst unterstützt keine Kontoverknüpfung.',
+    'oauth_connected' => 'Dein :provider-Konto wurde verknüpft.',
+    'oauth_disconnected' => 'Dein :provider-Konto wurde getrennt.',
+    'oauth_email_exists' => 'Ein Konto mit dieser E-Mail-Adresse existiert bereits. Melde dich an und verknüpfe diesen Dienst in deinen Kontoeinstellungen.',
     'outpost_error_422' => 'Fehler bei der Kommunikation mit statamic.com.',
     'outpost_error_429' => 'Zu viele Anfragen auf statamic.com.',
     'outpost_issue_try_later' => 'Es gab ein Problem bei der Kommunikation mit statamic.com. Bitte versuche es später erneut.',
@@ -199,15 +209,18 @@
     'phpinfo_utility_description' => 'Überprüfe die PHP-Konfiguration und die installierten Module.',
     'plus_count_more' => '+ :count mehr',
     'preference_confirm_dirty_navigation_instructions' => 'Warnung einblenden, wenn ungespeicherte Änderungen beim Verlassen der Seite verloren gehen.',
-    'preference_locale_instructions' => 'Die bevorzugte Sprache für das Control Panel.',
-    'preference_start_page_instructions' => 'Die Seite, die beim Anmelden ins Control Panel angezeigt wird.',
+    'preference_formatting_locale_instructions' => 'Legt die Region für Datums- und Zahlenformate im Control Panel fest.',
+    'preference_formatting_locale_invalid' => 'Bitte gib ein gültiges Sprachkürzel ein.',
+    'preference_locale_instructions' => 'Legt die bevorzugte Sprache für das Control Panel fest.',
+    'preference_start_page_instructions' => 'Legt die Seite fest, die nach der Anmeldung im Control Panel angezeigt wird.',
     'preference_strict_accessibility_instructions' => 'Wir haben das Control Panel mit Blick auf Barrierefreiheit gestaltet und uns bemüht, die WCAG 2.2-Richtlinien so weit wie möglich einzuhalten. Mit dieser Option kannst du strengere Barrierefreiheitsregeln anwenden, indem der Rahmenkontrast bei Eingabefeldern erhöht wird.',
     'preference_theme_instructions' => 'Farben und Erscheinungsbild des Control Panel anpassen.',
     'publish_actions_create_revision' => 'Aus der Arbeitskopie wird eine neue Revision erstellt. Die bestehende Revision bleibt dabei unverändert.',
     'publish_actions_current_becomes_draft_because_scheduled' => 'Die aktuelle Version ist bereits veröffentlicht und du hast ein Datum in der Zukunft ausgewählt. Deshalb wird nach dem Absenden die neue Revision bis zu diesem Datum wie ein Entwurf behandelt.',
-    'publish_actions_publish' => 'Änderungen aus der Arbeitskopie werden übernommen und der Eintrag wird sofort veröffentlicht.',
-    'publish_actions_schedule' => 'Änderungen aus der Arbeitskopie werden übernommen und der Eintrag wird am ausgewählten Datum automatisch veröffentlicht.',
+    'publish_actions_publish' => 'Die Änderungen der Arbeitskopie werden auf den Eintrag übertragen und sofort veröffentlicht.',
+    'publish_actions_schedule' => 'Die Änderungen der Arbeitskopie werden auf den Eintrag übertragen und am ausgewählten Datum veröffentlicht.',
     'publish_actions_unpublish' => 'Die aktuelle Version wird nicht mehr veröffentlicht und stattdessen als Entwurf gespeichert.',
+    'relationship_item_unavailable' => 'Dieses Element ist nicht verfügbar. Möglicherweise wurde es gelöscht oder du hast keine Berechtigung, es anzusehen.',
     'reset_password_notification_body' => 'Du erhältst diese E-Mail, weil wir für dein Konto eine Anfrage zum Zurücksetzen des Passworts erhalten haben.',
     'reset_password_notification_no_action' => 'Sollte die Anfrage zum Zurücksetzen des Passworts nicht von dir stammen, sind keine weiteren Maßnahmen erforderlich.',
     'reset_password_notification_subject' => 'Passwort zurücksetzen',
@@ -222,6 +235,8 @@
     'selections_item_unselected' => ':title ist nicht ausgewählt. Zum Auswählen klicken.',
     'selections_limit_reached' => 'Das Auswahllimit ist erreicht. :title kann nicht mehr ausgewählt werden.',
     'selections_select_all' => ':selected von :total Elemente ausgewählt. Zum Auswählen aller Elemente das Häkchen setzen.',
+    'session_expiry_dismissed_banner' => 'Deine Sitzung läuft bald ab. Klicke hier, um sie zu verlängern und angemeldet zu bleiben.',
+    'session_expiry_dismissed_login_banner' => 'Deine Sitzung ist abgelaufen. Klicke hier, um dich erneut anzumelden.',
     'session_expiry_enter_password' => 'Gib dein Passwort ein, um fortzufahren.',
     'session_expiry_enter_two_factor_code' => 'Gib deinen Authentifizierungscode ein, um fortzufahren.',
     'session_expiry_enter_two_factor_recovery_code' => 'Gib einen Wiederherstellungscode ein, um fortzufahren.',
@@ -252,6 +267,7 @@
     'taxonomy_next_steps_configure_description' => 'Konfiguriere Namen, verknüpfe Sammlungen, lege Blueprints fest und vieles mehr.',
     'taxonomy_next_steps_create_term_description' => 'Erstelle den ersten Begriff oder lege einige Platzhalterbegriffe an – ganz wie du möchtest.',
     'theme_share_instructions' => 'Veröffentliche dieses Thema über dein statamic.com-Konto, um es anderen verfügbar zu machen.',
+    'tree_aria_instructions' => 'Verwende die Pfeiltasten zum Navigieren. Zum Neuanordnen Alt + Pfeiltaste drücken.',
     'try_again_in_minutes' => 'Versuche es in einer Minute erneut.|Versuche es in :count Minuten erneut.',
     'try_again_in_seconds' => '{0,1}Versuche es jetzt erneut.|Versuche es in :count Sekunden erneut.',
     'two_factor_account_requirement' => 'Dein Konto erfordert die Zwei-Faktor-Authentifizierung. Bitte aktiviere sie, bevor du fortfährst.',
diff --git a/lang/de/permissions.php b/lang/de/permissions.php
index 871d673d5c6..3de98e5aeb9 100644
--- a/lang/de/permissions.php
+++ b/lang/de/permissions.php
@@ -78,6 +78,7 @@
     'assign_user_groups' => 'Gruppen zuweisen',
     'assign_roles' => 'Rollen zuweisen',
     'impersonate_users' => 'Als andere Benutzer:in anmelden (Impersonate)',
+    'impersonate_users_desc' => 'Erlaubt das Einloggen als beliebige Benutzer:in – einschließlich Super-Admins. Vergib diese Berechtigung nur mit großer Vorsicht.',
     'group_updates' => 'Updates',
     'view_updates' => 'Updates anzeigen',
     'group_addons' => 'Add-ons',
diff --git a/lang/de/validation.php b/lang/de/validation.php
index a3c0bc0f149..a90b8db8cc9 100644
--- a/lang/de/validation.php
+++ b/lang/de/validation.php
@@ -131,6 +131,7 @@
     'date_fieldtype_time_required' => 'Eine Zeitangabe ist erforderlich.',
     'duplicate_field_handle' => 'Ein Feld mit dem Handle „:handle“ existiert bereits.',
     'duplicate_uri' => 'Doppelte URI: :value.',
+    'elevated_session_resend_code_unavailable' => 'Die Option „Code erneut senden“ ist nur für die Methode mit Bestätigungscode verfügbar.',
     'elevated_session_verification_code' => 'Der Authentifizierungscode ist falsch.',
     'email_available' => 'Eine Benutzer:in mit dieser E-Mail-Adresse existiert bereits.',
     'fieldset_imported_recursively' => 'Fieldset :handle wird rekursiv importiert.',
diff --git a/lang/de_CH.json b/lang/de_CH.json
index 426ad8e33bf..9ce913335c3 100644
--- a/lang/de_CH.json
+++ b/lang/de_CH.json
@@ -4,13 +4,14 @@
     "404": "404",
     ":count asset selected|:count assets selected": ":count Datei ausgewählt|:count Dateien ausgewählt",
     ":count item selected|:count items selected": ":count Element ausgewählt|:count Elemente ausgewählt",
+    ":count of :max selections": ":count von :max ausgewählt",
     ":count row|:count rows": ":count Zeile|:count Zeilen",
     ":count set|:count sets": ":count Set|:count Sets",
     ":count word|:count words": ":count Wort|:count Wörter",
     ":count\/:max selected": ":count\/:max ausgewählt",
     ":count\/:total characters": ":count\/:total Zeichen",
     ":file uploaded": ":file hochgeladen",
-    ":start-:end of :total": ":start–:end von :total",
+    ":range of :total": ":range von :total",
     ":success\/:total entries were deleted": ":success\/:total Einträge wurden gelöscht",
     ":success\/:total entries were published": ":success\/:total Einträge wurden veröffentlicht",
     ":success\/:total entries were unpublished": ":success\/:total Einträge wurden in Entwürfe umgewandelt",
@@ -33,7 +34,6 @@
     "Add": "Hinzufügen",
     "Add a link label": "Linktitel hinzufügen",
     "Add Attribute": "Attribut hinzufügen",
-    "Add Block": "Block hinzufügen",
     "Add child link to entry": "Untereintrag hinzufügen",
     "Add child nav item": "Unterpunkt hinzufügen",
     "Add Color": "Farbe hinzufügen",
@@ -80,6 +80,7 @@
     "All caches cleared.": "Alle Caches wurden geleert.",
     "All of the following conditions pass": "alle folgenden Bedingungen erfüllt sind",
     "All rights reserved.": "Alle Rechte vorbehalten.",
+    "All Submissions": "Alle Antworten",
     "Allow additions": "Hinzufügen erlauben",
     "Allow Antlers": "Antlers erlauben",
     "Allow Any Color": "Beliebige Farbe erlauben",
@@ -107,7 +108,7 @@
     "Applied to users in specific roles.": "Werden auf Benutzer:innen in bestimmten Rollen angewendet.",
     "Applied to your account.": "Werden auf dein Konto angewendet.",
     "Apply": "Übernehmen",
-    "Apply & Close All": "Übernehmen & alle schliessen",
+    "Apply & Close All": "Übernehmen & alles schliessen",
     "Apply & Save": "Übernehmen & Speichern",
     "Apply Link": "Link übernehmen",
     "Apply Query Scopes": "Query-Scopes anwenden",
@@ -158,6 +159,7 @@
     "Augment Format": "Ausgabeformat",
     "Authentication failed.": "Authentifizierung fehlgeschlagen.",
     "Author": "Autor",
+    "Auto": "Automatisch",
     "Autocomplete": "Autovervollständigung",
     "Automatic Line Breaks": "Automatische Zeilenumbrüche",
     "Automatic Links": "Automatische Links",
@@ -165,6 +167,8 @@
     "Available Columns": "Verfügbare Spalten",
     "Back to login": "Zurück zur Anmeldung",
     "Back to Users": "Zurück zu Benutzer:innen",
+    "Background": "Hintergrund",
+    "Background colour": "Hintergrundfarbe",
     "Base": "Standard",
     "BCC Recipient(s)": "BBC-Empfänger:innen",
     "Before": "Bevor",
@@ -172,6 +176,7 @@
     "Behaviour": "Verhalten",
     "Below": "Unterhalb",
     "Between": "Zwischen",
+    "Black": "Schwarz",
     "Blockquote": "Blockzitat",
     "Blueprint": "Blueprint",
     "Blueprint deleted": "Blueprint gelöscht",
@@ -207,14 +212,17 @@
     "Characters": "Zeichen",
     "Check All": "Alle auswählen",
     "Checked": "Ausgewählt",
+    "Chips": "Chips",
     "choose a file": "auswählen",
     "Choose Blueprint": "Blueprint wählen",
     "Choose Image": "Bild auswählen",
     "Choose item...": "Element auswählen…",
     "Choose...": "Auswählen…",
     "Clear": "Leeren",
+    "Clear :filter": ":filter löschen",
     "Clear All": "Alle leeren",
     "Clear date": "Datum löschen",
+    "Clear selection": "Auswahl löschen",
     "Clearable": "Aufheben erlauben",
     "Close": "Schliessen",
     "Close Editor": "Editor schliessen",
@@ -267,6 +275,7 @@
     "Confirm with Passkey": "Mit Passkey bestätigen",
     "Confirm Your Identity": "Deine Identität bestätigen",
     "Confirm Your Password": "Dein Passwort bestätigen",
+    "Connect": "Verknüpfen",
     "Constrain Layout": "Layout begrenzen",
     "Container": "Container",
     "Contains": "enthält",
@@ -352,6 +361,7 @@
     "Default Icon": "Standard-Icon",
     "Default Mailer": "Standard-Mailer",
     "Default Mode": "Standardmodus",
+    "Default Option": "Standardoption",
     "Default preferences saved": "Standardeinstellungen gespeichert",
     "Default Value": "Standardwert",
     "Delete": "Löschen",
@@ -376,7 +386,6 @@
     "Deselect :count item|Deselect all :count items": ":count Element abwählen|Alle :count Elemente abwählen",
     "Deselect :title": ":title abwählen",
     "Deselect all items": "Alle Elemente abwählen",
-    "Deselect option": "Option abwählen",
     "Detach": "Trennen",
     "Details": "Details",
     "Dictionary": "Wörterbuch",
@@ -388,6 +397,7 @@
     "Disabled two factor authentication": "Zwei-Faktor-Authentifizierung deaktiviert",
     "Discard": "Verwerfen",
     "Discard Changes": "Änderungen verwerfen",
+    "Disconnect": "Trennen",
     "Disk": "Laufwerk",
     "Display": "Titel",
     "Display Label": "Bezeichnung",
@@ -487,11 +497,11 @@
     "Expanded format": "Erweitertes Format",
     "Expect a root page": "Erwartet eine Startseite",
     "Expired": "Abgelaufen",
+    "Export": "Exportieren",
     "Export Submissions": "Antworten exportieren",
     "Extend Session": "Sitzung verlängern",
     "Extension": "Dateiendung",
     "External link": "Externer Link",
-    "Failed to create cropped image": "Zugeschnittenes Bild konnte nicht erstellt werden",
     "Failed to crop image": "Bild konnte nicht zugeschnitten werden",
     "Failed to load entries": "Einträge konnten nicht geladen werden",
     "Failed to upload cropped image": "Zugeschnittenes Bild konnte nicht hochgeladen werden",
@@ -511,12 +521,14 @@
     "File": "Datei",
     "File Driver": "Dateitreiber",
     "Filename": "Dateiname",
+    "Filtered Submissions": "Gefilterte Antworten",
     "Filters": "Filter",
     "Finish": "Übernehmen",
     "Finish cropping": "Zuschnitt übernehmen",
     "First Child": "Erster Untereintrag",
     "Fix": "Beheben",
     "Fixed": "Fixiert",
+    "Flatten": "Integrieren",
     "Flip crop orientation": "Zuschneiderichtung umkehren",
     "Flip Orientation": "Ausrichtung umkehren",
     "Floating": "Schwebend",
@@ -530,6 +542,7 @@
     "Form saved": "Formular gespeichert",
     "Form Submission": "Antworten",
     "Format": "Format",
+    "Formatting Locale": "Region für Formate",
     "Forms": "Formulare",
     "Free": "Kostenlos",
     "From": "Von",
@@ -565,6 +578,7 @@
     "Group": "Gruppe",
     "Groups": "Gruppen",
     "Handle": "Handle",
+    "Has Section|Has Sections": "Enthält einen Abschnitt|Enthält Abschnitte",
     "Heading 1": "Überschrift 1",
     "Heading 2": "Überschrift 2",
     "Heading 3": "Überschrift 3",
@@ -593,9 +607,9 @@
     "Icon": "Icon",
     "Icon Set": "Icon-Set",
     "ID": "ID",
-    "ID not found": "ID nicht gefunden",
     "ID regenerated and Stache cleared": "ID neu generiert und Stache geleert",
     "If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Falls das Klicken auf den «:actionText»-Button nicht funktioniert, kopiere die folgende URL in deinen Webbrowser:",
+    "Ignoring Section|Ignoring Sections": "Abschnitt wird ignoriert|Abschnitte werden ignoriert",
     "Image": "Bild",
     "Image Cache": "Cache für Bilder",
     "Image cache cleared.": "Bild-Cache wurde geleert.",
@@ -641,6 +655,7 @@
     "Item could not be deleted": "Element konnte nicht gelöscht werden",
     "Item deleted|Items deleted": "Element gelöscht|Elemente gelöscht",
     "Items could not be deleted": "Elemente konnten nicht gelöscht werden",
+    "Keep imported sections as-is.": "Importierte Abschnitte unverändert übernehmen.",
     "Key": "Schlüssel",
     "Key Mappings": "Tastaturbefehle",
     "Keyed": "schlüsselbasiert",
@@ -716,6 +731,7 @@
     "Maximum items selected:": "Maximale Anzahl ausgewählt:",
     "Maximum Rows": "Maximale Anzahl Zeilen",
     "Media": "Medien",
+    "Merge all fields into this section.": "Alle Felder in diesen Abschnitt zusammenführen.",
     "Merge Cells": "Zellen verbinden",
     "Min": "Minimum",
     "Min Files": "Minimale Dateiauswahl",
@@ -765,8 +781,8 @@
     "No matching passkey found": "Kein passender Passkey gefunden",
     "No options available.": "Keine Optionen verfügbar.",
     "No options to choose from.": "Keine Optionen zur Auswahl.",
-    "No results": "Keine Resultate",
-    "No results found!": "Keine Resultate gefunden!",
+    "No results": "Keine Ergebnisse",
+    "No results found!": "Keine Ergebnisse gefunden!",
     "No revisions": "Keine Revisionen",
     "No sets available": "Keine Sets verfügbar",
     "No templates to choose from.": "Keine Templates zur Auswahl.",
@@ -803,10 +819,12 @@
     "Origin": "Quelle",
     "Origin Behavior": "Herkunftsverhalten",
     "Other": "Andere",
+    "Output format": "Ausgabeformat",
     "Override Alt": "Alt-Text überschreiben",
     "Pages": "Seiten",
     "Parser": "Parser",
     "Passkey": "Passkey",
+    "Passkey deleted.": "Passkey gelöscht.",
     "Passkeys": "Passkeys",
     "Password": "Passwort",
     "Password changed": "Passwort geändert",
@@ -826,6 +844,7 @@
     "Pinned Item": "Angeheftetes Element",
     "Placeholder": "Platzhalter",
     "Playground": "Playground",
+    "Please select...": "Bitte wählen…",
     "Pop in": "Zurück ins Hauptfenster",
     "Pop out": "Eigenes Fenster",
     "Port": "Port",
@@ -834,6 +853,7 @@
     "Preferences by Role": "Einstellungen nach Rolle",
     "Prefix": "Präfix",
     "Prepend": "Voranstellen",
+    "Preserve": "Beibehalten",
     "Press enter to access additional save options": "Für zusätzliche Speicheroptionen Enter drücken.",
     "Preview": "Vorschau",
     "Preview Image": "Vorschaubild",
@@ -846,12 +866,14 @@
     "Propagate": "Verbreiten",
     "Properties": "Eigenschaften",
     "Protected Page": "Geschützte Seite",
+    "Provider": "Dienst",
     "Publish": "Veröffentlichen",
     "Publish by Default": "Standardmässig veröffentlichen",
     "Publish Date": "Erscheinungsdatum",
     "Publish Entry|Publish :count Entries": "Eintrag veröffentlichen|:count Einträge veröffentlichen",
     "Publish Now": "Jetzt veröffentlichen",
     "Published": "Veröffentlicht",
+    "Quality": "Qualität",
     "Query Scopes": "Query-Scopes",
     "Range": "Von\/Bis-Modus",
     "Raster image": "Pixelbild",
@@ -863,6 +885,7 @@
     "Records": "Aufzeichnungen",
     "Recovery Code": "Wiederherstellungscode",
     "Recovery Codes": "Wiederherstellungscodes",
+    "Recovery codes regenerated.": "Wiederherstellungscodes neu generiert.",
     "Redirect": "Weiterleiten",
     "Refresh": "Aktualisieren",
     "Refresh recovery codes": "Wiederherstellungscodes aktualisieren",
@@ -878,6 +901,7 @@
     "Released on :date": "Veröffentlicht am :date",
     "Remember me": "Angemeldet bleiben",
     "Remove": "Entfernen",
+    "Remove :label": ":label entfernen",
     "Remove All": "Alle entfernen",
     "Remove all empty nodes": "Alle leeren Nodes entfernen",
     "Remove Asset": "Datei entfernen",
@@ -917,6 +941,7 @@
     "Restrict": "Beschränken",
     "Restrict to Folder": "Auf Ordner begrenzen",
     "Resume Your Session": "Sitzung fortsetzen",
+    "Return to Control Panel": "Zurück zum Control Panel",
     "Reupload": "Neu hochladen",
     "Revision": "Revision",
     "Revision created": "Revision erstellt",
@@ -940,11 +965,12 @@
     "Rulers": "Lineale",
     "Rules": "Regeln",
     "Run action|Run action on :count items": "Aktion ausführen|Aktion bei :count Elementen ausführen",
+    "Same as language": "Gleich wie Sprache",
     "Sanitize": "Bereinigen",
     "Save": "Speichern",
-    "Save & Close All": "Speichern & alle schliessen",
     "Save & Publish": "Speichern & Veröffentlichen",
     "Save & Unpublish": "Speichern & in Entwurf umwandeln",
+    "Save All": "Alles speichern",
     "Save as Copy": "Als Kopie speichern",
     "Save as HTML": "Als HTML speichern",
     "Save Changes": "Änderungen speichern",
@@ -954,7 +980,7 @@
     "Save Order": "Reihenfolge speichern",
     "Save to": "Speichern unter",
     "Saved": "Gespeichert",
-    "Scaffold Views": "Ansichten erstellen",
+    "Scaffold Views": "Ansichten generieren",
     "Schedule": "Zeitplan",
     "Scheduled": "Geplant",
     "Search": "Suchen",
@@ -968,6 +994,7 @@
     "Searchable": "Durchsuchbar",
     "Searchables": "Quellen",
     "Second": "Sekunde",
+    "Section Behavior": "Abschnittsverhalten",
     "Security": "Sicherheit",
     "Security update available": "Sicherheitsupdate verfügbar",
     "Select": "Auswählen",
@@ -1026,12 +1053,14 @@
     "Sign in with OAuth": "Mit OAuth anmelden",
     "Sign into your Statamic Control Panel": "Melde dich im Statamic Control Panel an.",
     "Sign out": "Abmelden",
+    "Sign-in Providers": "Anmeldedienste",
     "Single": "Einzel",
     "Site": "Website",
     "Site Defaults": "Standardeinstellungen der Website",
     "Site deleted": "Website gelöscht",
     "Site saved": "Website gespeichert",
     "Site selected.": "Website ausgewählt.",
+    "Site time": "Website-Zeit",
     "Sites": "Websites",
     "Size": "Grösse",
     "Skip to content": "Zum Inhalt springen",
@@ -1117,6 +1146,7 @@
     "Text & Rich Content": "Text & formatierter Inhalt",
     "Text item": "Text-Element",
     "Text view": "Text-Ansicht",
+    "The asset is not an image.": "Diese Datei ist kein Bild.",
     "the Git Integration": "Git-Integration",
     "The given data was invalid.": "Die angegebenen Daten sind ungültig.",
     "The page you are looking for could not be found.": "Die gesuchte Seite wurde nicht gefunden.",
@@ -1127,12 +1157,15 @@
     "These are now your default columns.": "Dies sind jetzt deine Standardspalten.",
     "This action is unauthorized.": "Für diese Aktion hast du keine Berechtigung.",
     "This collection isn't available in this site.": "Diese Sammlung ist auf dieser Website nicht verfügbar.",
+    "This field": "Dieses Feld",
     "This form is awaiting responses": "Dieses Formular wartet auf Antworten",
     "This is the published version": "Dies ist die veröffentlichte Version",
     "This is the root page": "Dies ist die Startseite",
     "This is the working copy": "Dies ist die Arbeitskopie",
+    "This month": "Dieser Monat",
     "This will delete the collection and all of its entries.|This will delete the collections and all of their entries.": "Dies löscht die Sammlung und alle ihre Einträge.|Dies löscht die Sammlungen und alle ihre Einträge.",
     "Time Enabled": "Uhrzeit aktivieren",
+    "Timezone": "Zeitzone",
     "Title": "Titel",
     "Today": "Heute",
     "Toggle": "Schalter",
@@ -1151,6 +1184,8 @@
     "True": "Wahr",
     "Try Again": "Erneut versuchen",
     "Two-Factor Authentication": "Zwei-Faktor-Authentifizierung",
+    "Two-factor authentication disabled.": "Zwei-Faktor-Authentifizierung deaktiviert.",
+    "Two-factor authentication enabled.": "Zwei-Faktor-Authentifizierung aktiviert.",
     "Type": "Typ",
     "Type '\/' to insert a set": "Tippe \/, um ein Set einzufügen",
     "Typeahead Field": "Autovervollständigung",
@@ -1213,7 +1248,7 @@
     "Verification Code": "Authentifizierungscode",
     "Video": "Video",
     "Video URL": "Video-URL",
-    "View": "Ansehen",
+    "View": "Anzeigen",
     "View additional releases": "Weitere Versionen anzeigen",
     "View All": "Alle anzeigen",
     "View All Blueprints": "Alle Blueprints anzeigen",
@@ -1231,6 +1266,7 @@
     "Warm Specific Presets": "Bestimmte Presets vorwärmen",
     "Warning! Changing a site handle may break existing site content!": "Achtung! Das Ändern des Website-Handles kann vorhandene Inhalte der Website beschädigen!",
     "Week": "Woche",
+    "White": "Weiss",
     "Whoops!": "Ups!",
     "Widgets": "Widgets",
     "Width": "Breite",
@@ -1249,7 +1285,7 @@
     "You are not authorized to edit this collection.": "Du hast keine Berechtigung, diese Sammlung zu bearbeiten.",
     "You are not authorized to edit this taxonomy.": "Du hast keine Berechtigung, diese Taxonomie zu bearbeiten.",
     "You are not authorized to run this action.": "Du hast keine Berechtigung, diese Aktion auszuführen.",
-    "You are not authorized to scaffold resources.": "Du hast keine Berechtigung, Ressourcen anzulegen.",
+    "You are not authorized to scaffold resources.": "Du hast keine Berechtigung, Ressourcen zu generieren.",
     "You are not authorized to view collections.": "Du hast keine Berechtigung, Sammlungen anzusehen.",
     "You are not authorized to view navs.": "Du hast keine Berechtigung, Navigationen anzusehen.",
     "You are not authorized to view this collection.": "Du hast keine Berechtigung, diese Sammlung anzusehen.",
@@ -1258,5 +1294,6 @@
     "You do not have permission to access this URL": "Du hast keine Berechtigung, auf diese URL zuzugreifen.",
     "You're already editing this item.": "Du bearbeitest diesen Eintrag bereits.",
     "Your Session is Expiring": "Deine Sitzung läuft ab",
+    "Your time": "Deine Zeitzone",
     "Your working copy will be replaced by the contents of this revision.": "Deine aktuelle Arbeitskopie wird mit dem Inhalt dieser Revision ersetzt."
 }
diff --git a/lang/de_CH/dictionary-currencies.php b/lang/de_CH/dictionary-currencies.php
index 933865778ef..12bdf44b901 100644
--- a/lang/de_CH/dictionary-currencies.php
+++ b/lang/de_CH/dictionary-currencies.php
@@ -5,16 +5,22 @@
     'AFN' => 'Afghanischer Afghani',
     'ALL' => 'Albanischer Lek',
     'AMD' => 'Armenischer Dram',
+    'AOA' => 'Angolanische Kwanza',
     'ARS' => 'Argentinischer Peso',
     'AUD' => 'Australischer Dollar',
+    'AWG' => 'Arubischer Florin',
     'AZN' => 'Aserbaidschanischer Manat',
     'BAM' => 'Bosnisch-herzegowinischer konvertibler Mark',
+    'BBD' => 'Barbadischer Dollar',
     'BDT' => 'Bangladeschischer Taka',
     'BHD' => 'Bahrainer Dinar',
     'BIF' => 'Burundischer Franc',
+    'BMD' => 'Bermudischer Dollar',
     'BND' => 'Bruneischer Dollar',
     'BOB' => 'Bolivianischer Boliviano',
     'BRL' => 'Brasilianischer Real',
+    'BSD' => 'Bahamischer Dollar',
+    'BTN' => 'Bhutanischer Ngultrum',
     'BWP' => 'Botswanischer Pula',
     'BYN' => 'Belarussischer Rubel',
     'BZD' => 'Belize-Dollar',
@@ -25,6 +31,7 @@
     'CNY' => 'Chinesischer Yuan',
     'COP' => 'Kolumbianischer Peso',
     'CRC' => 'Costa-Rica-Colón',
+    'CUP' => 'Kubanischer Peso',
     'CVE' => 'Kapverdischer Escudo',
     'CZK' => 'Tschechische Krone',
     'DJF' => 'Dschibutischer Franc',
@@ -35,13 +42,19 @@
     'ERN' => 'Eritreischer Nakfa',
     'ETB' => 'Äthiopischer Birr',
     'EUR' => 'Euro',
+    'FJD' => 'Fidschianischer Dollar',
+    'FKP' => 'Falkland-Inseln-Pfund',
     'GBP' => 'Britisches Pfund Sterling',
     'GEL' => 'Georgischer Lari',
     'GHS' => 'Ghanaischer Cedi',
+    'GIP' => 'Gibraltarisches Pfund',
+    'GMD' => 'Gambischer Dalasi',
     'GNF' => 'Guineischer Franc',
     'GTQ' => 'Guatemaltekischer Quetzal',
+    'GYD' => 'Guyanischer Dollar',
     'HKD' => 'Hongkong-Dollar',
     'HNL' => 'Honduranischer Lempira',
+    'HTG' => 'Haitianische Gourde',
     'HUF' => 'Ungarischer Forint',
     'IDR' => 'Indonesische Rupiah',
     'ILS' => 'Israelischer Neuer Schekel',
@@ -53,21 +66,31 @@
     'JOD' => 'Jordanischer Dinar',
     'JPY' => 'Japanischer Yen',
     'KES' => 'Kenianischer Schilling',
+    'KGS' => 'Kirgisischer Som',
     'KHR' => 'Kambodschanischer Riel',
     'KMF' => 'Komorischer Franc',
+    'KPW' => 'Nordkoreanischer Won',
     'KRW' => 'Südkoreanischer Won',
     'KWD' => 'Kuwaitischer Dinar',
+    'KYD' => 'Kaiman-Inseln-Dollar',
     'KZT' => 'Kasachischer Tenge',
+    'LAK' => 'Laotischer Kip',
     'LBP' => 'Libanesisches Pfund',
     'LKR' => 'Sri-lankische Rupie',
+    'LRD' => 'Liberianischer Dollar',
+    'LSL' => 'Lesothischer Loti',
     'LYD' => 'Libyscher Dinar',
     'MAD' => 'Marokkanischer Dirham',
     'MDL' => 'Moldauischer Leu',
     'MGA' => 'Madagassischer Ariary',
     'MKD' => 'Mazedonischer Denar',
     'MMK' => 'Myanmar-Kyat',
+    'MNT' => 'Mongolischer Tögrög',
     'MOP' => 'Macao-Pataca',
+    'MRU' => 'Mauretanischer Ouguiya',
     'MUR' => 'Mauritische Rupie',
+    'MVR' => 'Maledivische Rufiyaa',
+    'MWK' => 'Malawischer Kwacha',
     'MXN' => 'Mexikanischer Peso',
     'MYR' => 'Malaysischer Ringgit',
     'MZN' => 'Mosambikanischer Metical',
@@ -79,7 +102,8 @@
     'NZD' => 'Neuseeland-Dollar',
     'OMR' => 'Omanischer Rial',
     'PAB' => 'Panamanischer Balboa',
-    'PEN' => 'Peruanischer Nuevo Sol',
+    'PEN' => 'Peruanischer Sol',
+    'PGK' => 'Papua-Neuguineanische Kina',
     'PHP' => 'Philippinischer Peso',
     'PKR' => 'Pakistanische Rupie',
     'PLN' => 'Polnischer Zloty',
@@ -90,12 +114,22 @@
     'RUB' => 'Russischer Rubel',
     'RWF' => 'Ruandischer Franc',
     'SAR' => 'Saudi-arabischer Riyal',
+    'SBD' => 'Salomonischer Dollar',
+    'SCR' => 'Seychellische Rupie',
     'SDG' => 'Sudanesisches Pfund',
     'SEK' => 'Schwedische Krone',
     'SGD' => 'Singapur-Dollar',
+    'SHP' => 'Sankt-Helena-Pfund',
+    'SLE' => 'Sierra-leonischer Leone',
     'SOS' => 'Somalischer Schilling',
+    'SRD' => 'Surinamischer Dollar',
+    'SSP' => 'Südsudanesisches Pfund',
+    'STN' => 'São-toméischer Dobra',
     'SYP' => 'Syrisches Pfund',
+    'SZL' => 'Swasiländischer Lilangeni',
     'THB' => 'Thailändischer Baht',
+    'TJS' => 'Tadschikischer Somoni',
+    'TMT' => 'Turkmenischer Manat',
     'TND' => 'Tunesischer Dinar',
     'TOP' => 'Tonganischer Paʻanga',
     'TRY' => 'Türkische Lira',
@@ -107,10 +141,16 @@
     'USD' => 'US-Dollar',
     'UYU' => 'Uruguayischer Peso',
     'UZS' => 'Usbekischer Som',
+    'VED' => 'Venezolanischer Digitaler Bolívar',
     'VES' => 'Venezolanischer Bolívar Soberano',
     'VND' => 'Vietnamesischer Dong',
+    'VUV' => 'Vanuatischer Vatu',
+    'WST' => 'Samoanischer Tala',
     'XAF' => 'CFA-Franc BEAC',
+    'XCD' => 'Ostkaribischer Dollar',
+    'XCG' => 'Karibischer Gulden',
     'XOF' => 'CFA-Franc BCEAO',
+    'XPF' => 'CFP-Franc',
     'YER' => 'Jemenitischer Rial',
     'ZAR' => 'Südafrikanischer Rand',
     'ZMW' => 'Sambischer Kwacha',
diff --git a/lang/de_CH/fieldtypes.php b/lang/de_CH/fieldtypes.php
index 4d10dec51f4..2ba8684d3ba 100644
--- a/lang/de_CH/fieldtypes.php
+++ b/lang/de_CH/fieldtypes.php
@@ -48,7 +48,7 @@
     'bard.config.word_count' => 'Blendet die Anzahl Wörter unter dem Feld ein.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Button-Gruppe',
-    'checkboxes.config.inline' => 'Checkboxen in einer Reihe anzeigen.',
+    'checkboxes.config.appearance' => 'Lege fest, wie die Checkboxen dargestellt werden.',
     'checkboxes.config.options' => 'Array-Schlüssel und ihre optionalen Beschriftungen festlegen.',
     'checkboxes.title' => 'Checkboxen',
     'code.config.color_mode' => 'Bevorzugten Farbmodus auswählen.',
@@ -78,6 +78,7 @@
     'date.config.number_of_months' => 'Anzahl der gleichzeitig sichtbaren Monate festlegen.',
     'date.config.time_enabled' => 'Aktiviert den Timepicker.',
     'date.config.time_seconds_enabled' => 'Sekunden im Timepicker einblenden.',
+    'date.config.timezone' => 'Die Zeitzone, in der Datumsangaben angezeigt und eingegeben werden. Standardmässig wird die lokale Zeitzone des Browsers verwendet.',
     'date.title' => 'Datum',
     'dictionary.config.dictionary' => 'Das Wörterbuch, aus dem du Optionen beziehen möchtest.',
     'dictionary.file.config.filename' => 'Der Dateiname, der deine Optionen enthält, relativ zum Verzeichnis `resources/dictionaries`.',
@@ -119,7 +120,9 @@
     'integer.title' => 'Ganzzahl',
     'link.config.collections' => 'Einträge aus diesen Sammlungen stehen zur Verfügung. Bleibt das Feld leer, können Einträge aus allen verknüpfbaren Sammlungen genutzt werden.',
     'link.config.container' => 'Datei-Container für dieses Feld auswählen.',
+    'link.config.default_option' => 'Die Standardoption für den Link-Typ, sofern diese in der Konfiguration des Feldtyps verfügbar ist.',
     'link.title' => 'Link',
+    'list.config.add_row' => 'Beschriftung des «Element hinzufügen»-Buttons anpassen.',
     'list.title' => 'Liste',
     'markdown.config.automatic_line_breaks' => 'Aktiviert automatische Zeilenumbrüche.',
     'markdown.config.automatic_links' => 'Aktiviert die automatische Verlinkung beliebiger URLs.',
@@ -140,7 +143,7 @@
     'picker.category.special.description' => 'Diese Felder sind besonders, jedes auf seine Weise.',
     'picker.category.structured.description' => 'Diese Felder speichern strukturierte Daten. Einige können sogar andere Felder in sich selbst verschachteln.',
     'picker.category.text.description' => 'Diese Felder speichern Text, formatierten Inhalt oder beides.',
-    'radio.config.inline' => 'Radio-Buttons in einer Reihe anzeigen.',
+    'radio.config.appearance' => 'Lege fest, wie die Radio-Buttons dargestellt werden.',
     'radio.config.options' => 'Array-Schlüssel und ihre optionalen Beschriftungen festlegen.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Text auf der rechten Seite des Schiebereglers hinzufügen.',
diff --git a/lang/de_CH/messages.php b/lang/de_CH/messages.php
index c1eb0238131..210b629bbce 100644
--- a/lang/de_CH/messages.php
+++ b/lang/de_CH/messages.php
@@ -46,9 +46,9 @@
     'collection_next_steps_blueprints_description' => 'Verwalte die Blueprints und Felder dieser Sammlung. Strukturiere sie mit Fieldsets.',
     'collection_next_steps_configure_description' => 'Konfiguriere URLs und Routen, lege Blueprints fest, bestimme das Datumsverhalten, die Reihenfolge und weitere Optionen.',
     'collection_next_steps_create_entry_description' => 'Erstelle den ersten Eintrag oder lege einige Platzhalter-Einträge an – ganz nach deinen Bedürfnissen.',
-    'collection_next_steps_scaffold_description' => 'Erstelle mit einem Klick aus dem Namen der Sammlung Ansichten für Index- und Detailseiten.',
+    'collection_next_steps_scaffold_description' => 'Generiere mit einem Klick aus dem Namen der Sammlung Ansichten für Index- und Detailseiten.',
     'collection_revisions_instructions' => 'Revisionen für diese Sammlung aktivieren.',
-    'collection_scaffold_instructions' => 'Wähle und konfiguriere die Ansichten, die erstellt werden sollen. Bereits vorhandene Dateien bleiben erhalten.',
+    'collection_scaffold_instructions' => 'Wähle und konfiguriere die Ansichten, die generiert werden sollen. Bereits vorhandene Dateien werden nicht überschrieben.',
     'collections_blueprint_instructions' => 'Einträge in dieser Sammlung können jedes dieser Blueprints verwenden.',
     'collections_default_publish_state_instructions' => 'Beim Erstellen neuer Einträge in dieser Sammlung wird der Schalter für die Veröffentlichung standardmässig auf *true* gesetzt anstatt auf *false* (Entwurf).',
     'collections_future_date_behavior_instructions' => 'Wie sollen sich Einträge mit einem zukünftigen Datum verhalten?',
@@ -61,6 +61,8 @@
     'collections_route_instructions' => 'Die Route steuert das URL-Muster der Einträge. Mehr dazu in der [Dokumentation](https://statamic.dev/collections#routing).',
     'collections_sort_direction_instructions' => 'Voreinstellung für die Sortierrichtung.',
     'collections_taxonomies_instructions' => 'Einträge dieser Sammlung mit Taxonomien verknüpfen. Die Felder werden automatisch den Formularen hinzugefügt.',
+    'crop_jpeg_background_help' => 'JPEG unterstützt keine Transparenz – transparente Bereiche werden mit dieser Farbe gefüllt.',
+    'crop_replace_unavailable_format' => 'Das Original kann nur ersetzt werden, wenn das Format gleich bleibt.',
     'crop_save_as_copy_confirm' => 'Das zugeschnittene Bild als neue Kopie speichern?',
     'crop_save_copy_or_replace' => 'Möchtest du dies als neue Kopie speichern oder das Originalbild ersetzen?',
     'dictionaries_countries_emojis_instructions' => 'Flaggen-Emojis in Ländernamen einbeziehen.',
@@ -86,7 +88,7 @@
     'entry_count' => ':count Eintrag|:count Einträge',
     'entry_origin_instructions' => 'Die neue Lokalisierung übernimmt die Werte vom Eintrag der ausgewählten Website.',
     'expect_root_instructions' => 'Die erste Seite im Seitenbaum als Root oder Startseite behandeln.',
-    'field_conditions_always_save_instructions' => 'Wert dieses Feldes immer speichern, auch wenn es ausgeblendet ist.',
+    'field_conditions_always_save_instructions' => 'Feldwert immer speichern, auch wenn das Feld ausgeblendet ist.',
     'field_conditions_field_instructions' => 'Du kannst jeden «Handle» eingeben und bist nicht auf die Optionen im Dropdown beschränkt.',
     'field_conditions_instructions' => 'Wann soll dieses Feld ein- oder ausgeblendet werden?',
     'field_desynced_from_origin' => 'Weicht von der Quelle ab. Zum Zurücksetzen auf den ursprünglichen Wert klicken.',
@@ -108,6 +110,7 @@
     'fields_visibility_instructions' => 'Anzeige des Feldes in Formularen festlegen.',
     'fieldset_import_fieldset_instructions' => 'Fieldset auswählen, das importiert werden soll.',
     'fieldset_import_prefix_instructions' => 'Beim Import jedem Feld ein Präfix hinzufügen (z.B. `hero_`).',
+    'fieldset_import_section_behavior_instructions' => 'Legt fest, ob die Abschnitte aus dem importierten Fieldset beibehalten oder in diesen Abschnitt integriert werden.',
     'fieldset_intro' => 'Fieldsets sind optionale Begleiter zu Blueprints und dienen als wiederverwendbare Partials innerhalb von Blueprints.',
     'fieldset_link_fields_prefix_instructions' => 'Jedem Feld im verknüpften Fieldset diesen Wert als Präfix voranstellen. Nützlich, um dieselben Felder mehrfach zu importieren.',
     'fieldsets_handle_instructions' => 'Dient an anderer Stelle als Referenz für dieses Fieldset. Dies lässt sich später nicht ohne Weiteres ändern.',
@@ -137,6 +140,7 @@
     'form_configure_store_instructions' => 'Deaktivieren, um Antworten nicht mehr zu speichern. Ereignisse und E-Mail-Benachrichtigungen bleiben aktiv.',
     'form_configure_title_instructions' => 'Verwende einen Call to Action wie «Kontaktiere uns».',
     'form_create_description' => 'Starte mit dem Anlegen deines ersten Formulars.',
+    'form_export_filtered_description' => 'Exportiert die Antworten mit den aktuellen Filtern und den sichtbaren Spalten.',
     'getting_started_widget_collections' => 'Sammlungen fassen die verschiedenen Inhaltstypen deiner Website zusammen und helfen dir, den Überblick zu behalten.',
     'getting_started_widget_docs' => 'Entdecke alle Funktionen von Statamic und lerne, wie du die leistungsstarken Features richtig einsetzen kannst.',
     'getting_started_widget_header' => 'Erste Schritte mit Statamic',
@@ -185,6 +189,12 @@
     'navigation_documentation_instructions' => 'Lerne, wie du Navigationen erstellst, einrichtest und darstellst.',
     'navigation_link_to_entry_instructions' => 'Füge einen Link zu einem Eintrag hinzu. Aktiviere das Verknüpfen auf weitere Sammlungen im Konfigurationsbereich.',
     'navigation_link_to_url_instructions' => 'Füge einen Link zu einer internen oder externen URL hinzu und erlaube in den Einstellungen das Verknüpfen mit Einträgen.',
+    'oauth_already_connected' => 'Dein :provider-Konto ist bereits verknüpft.',
+    'oauth_belongs_to_another_user' => 'Dieses :provider-Konto ist bereits mit einem anderen Account verknüpft.',
+    'oauth_connect_unsupported' => 'Dieser Dienst unterstützt keine Kontoverknüpfung.',
+    'oauth_connected' => 'Dein :provider-Konto wurde verknüpft.',
+    'oauth_disconnected' => 'Dein :provider-Konto wurde getrennt.',
+    'oauth_email_exists' => 'Ein Konto mit dieser E-Mail-Adresse existiert bereits. Melde dich an und verknüpfe diesen Dienst in deinen Kontoeinstellungen.',
     'outpost_error_422' => 'Fehler bei der Kommunikation mit statamic.com.',
     'outpost_error_429' => 'Zu viele Anfragen auf statamic.com.',
     'outpost_issue_try_later' => 'Es gab ein Problem bei der Kommunikation mit statamic.com. Bitte versuche es später erneut.',
@@ -199,15 +209,18 @@
     'phpinfo_utility_description' => 'Überprüfe die PHP-Konfiguration und die installierten Module.',
     'plus_count_more' => '+ :count mehr',
     'preference_confirm_dirty_navigation_instructions' => 'Warnung einblenden, wenn ungespeicherte Änderungen beim Verlassen der Seite verloren gehen.',
-    'preference_locale_instructions' => 'Die bevorzugte Sprache für das Control Panel.',
-    'preference_start_page_instructions' => 'Die Seite, die beim Anmelden ins Control Panel angezeigt wird.',
+    'preference_formatting_locale_instructions' => 'Legt die Region für Datums- und Zahlenformate im Control Panel fest.',
+    'preference_formatting_locale_invalid' => 'Bitte gib ein gültiges Sprachkürzel ein.',
+    'preference_locale_instructions' => 'Legt die bevorzugte Sprache für das Control Panel fest.',
+    'preference_start_page_instructions' => 'Legt die Seite fest, die nach der Anmeldung im Control Panel angezeigt wird.',
     'preference_strict_accessibility_instructions' => 'Wir haben das Control Panel mit Blick auf Barrierefreiheit gestaltet und uns bemüht, die WCAG 2.2-Richtlinien so weit wie möglich einzuhalten. Mit dieser Option kannst du strengere Barrierefreiheitsregeln anwenden, indem der Rahmenkontrast bei Eingabefeldern erhöht wird.',
     'preference_theme_instructions' => 'Farben und Erscheinungsbild des Control Panel anpassen.',
     'publish_actions_create_revision' => 'Aus der Arbeitskopie wird eine neue Revision erstellt. Die bestehende Revision bleibt dabei unverändert.',
     'publish_actions_current_becomes_draft_because_scheduled' => 'Die aktuelle Version ist bereits veröffentlicht und du hast ein Datum in der Zukunft ausgewählt. Deshalb wird nach dem Absenden die neue Revision bis zu diesem Datum wie ein Entwurf behandelt.',
-    'publish_actions_publish' => 'Änderungen aus der Arbeitskopie werden übernommen und der Eintrag wird sofort veröffentlicht.',
-    'publish_actions_schedule' => 'Änderungen aus der Arbeitskopie werden übernommen und der Eintrag wird am ausgewählten Datum automatisch veröffentlicht.',
+    'publish_actions_publish' => 'Die Änderungen der Arbeitskopie werden auf den Eintrag übertragen und sofort veröffentlicht.',
+    'publish_actions_schedule' => 'Die Änderungen der Arbeitskopie werden auf den Eintrag übertragen und am ausgewählten Datum veröffentlicht.',
     'publish_actions_unpublish' => 'Die aktuelle Version wird nicht mehr veröffentlicht und stattdessen als Entwurf gespeichert.',
+    'relationship_item_unavailable' => 'Dieses Element ist nicht verfügbar. Möglicherweise wurde es gelöscht oder du hast keine Berechtigung, es anzusehen.',
     'reset_password_notification_body' => 'Du erhältst diese E-Mail, weil wir für dein Konto eine Anfrage zum Zurücksetzen des Passworts erhalten haben.',
     'reset_password_notification_no_action' => 'Sollte die Anfrage zum Zurücksetzen des Passworts nicht von dir stammen, sind keine weiteren Massnahmen erforderlich.',
     'reset_password_notification_subject' => 'Passwort zurücksetzen',
@@ -222,6 +235,8 @@
     'selections_item_unselected' => ':title ist nicht ausgewählt. Zum Auswählen klicken.',
     'selections_limit_reached' => 'Das Auswahllimit ist erreicht. :title kann nicht mehr ausgewählt werden.',
     'selections_select_all' => ':selected von :total Elemente ausgewählt. Zum Auswählen aller Elemente das Häkchen setzen.',
+    'session_expiry_dismissed_banner' => 'Deine Sitzung läuft bald ab. Klicke hier, um sie zu verlängern und angemeldet zu bleiben.',
+    'session_expiry_dismissed_login_banner' => 'Deine Sitzung ist abgelaufen. Klicke hier, um dich erneut anzumelden.',
     'session_expiry_enter_password' => 'Gib dein Passwort ein, um fortzufahren.',
     'session_expiry_enter_two_factor_code' => 'Gib deinen Authentifizierungscode ein, um fortzufahren.',
     'session_expiry_enter_two_factor_recovery_code' => 'Gib einen Wiederherstellungscode ein, um fortzufahren.',
@@ -252,6 +267,7 @@
     'taxonomy_next_steps_configure_description' => 'Konfiguriere Namen, verknüpfe Sammlungen, lege Blueprints fest und vieles mehr.',
     'taxonomy_next_steps_create_term_description' => 'Erstelle den ersten Begriff oder lege einige Platzhalterbegriffe an – ganz wie du möchtest.',
     'theme_share_instructions' => 'Veröffentliche dieses Thema über dein statamic.com-Konto, um es anderen verfügbar zu machen.',
+    'tree_aria_instructions' => 'Verwende die Pfeiltasten zum Navigieren. Zum Neuanordnen Alt + Pfeiltaste drücken.',
     'try_again_in_minutes' => 'Versuche es in einer Minute erneut.|Versuche es in :count Minuten erneut.',
     'try_again_in_seconds' => '{0,1}Versuche es jetzt erneut.|Versuche es in :count Sekunden erneut.',
     'two_factor_account_requirement' => 'Dein Konto erfordert die Zwei-Faktor-Authentifizierung. Bitte aktiviere sie, bevor du fortfährst.',
diff --git a/lang/de_CH/permissions.php b/lang/de_CH/permissions.php
index 76b8703472c..82b4e2a63c4 100644
--- a/lang/de_CH/permissions.php
+++ b/lang/de_CH/permissions.php
@@ -78,6 +78,7 @@
     'assign_user_groups' => 'Gruppen zuweisen',
     'assign_roles' => 'Rollen zuweisen',
     'impersonate_users' => 'Als andere Benutzer:in anmelden (Impersonate)',
+    'impersonate_users_desc' => 'Erlaubt das Einloggen als beliebige Benutzer:in – einschliesslich Super-Admins. Vergib diese Berechtigung nur mit großer Vorsicht.',
     'group_updates' => 'Updates',
     'view_updates' => 'Updates anzeigen',
     'group_addons' => 'Add-ons',
diff --git a/lang/de_CH/validation.php b/lang/de_CH/validation.php
index 8d02cca99f4..23c0ebf6463 100644
--- a/lang/de_CH/validation.php
+++ b/lang/de_CH/validation.php
@@ -131,6 +131,7 @@
     'date_fieldtype_time_required' => 'Eine Zeitangabe ist erforderlich.',
     'duplicate_field_handle' => 'Ein Feld mit dem Handle «:handle» existiert bereits.',
     'duplicate_uri' => 'Doppelte URI: :value.',
+    'elevated_session_resend_code_unavailable' => 'Die Option «Code erneut senden» ist nur für die Methode mit Bestätigungscode verfügbar.',
     'elevated_session_verification_code' => 'Der Authentifizierungscode ist falsch.',
     'email_available' => 'Eine Benutzer:in mit dieser E-Mail-Adresse existiert bereits.',
     'fieldset_imported_recursively' => 'Fieldset :handle wird rekursiv importiert.',
diff --git a/lang/en/dictionary-currencies.php b/lang/en/dictionary-currencies.php
index 18df0474db7..e37c2c2b8d9 100644
--- a/lang/en/dictionary-currencies.php
+++ b/lang/en/dictionary-currencies.php
@@ -5,16 +5,22 @@
     'AFN' => 'Afghan Afghani',
     'ALL' => 'Albanian Lek',
     'AMD' => 'Armenian Dram',
+    'AOA' => 'Angolan Kwanza',
     'ARS' => 'Argentine Peso',
     'AUD' => 'Australian Dollar',
+    'AWG' => 'Aruban Florin',
     'AZN' => 'Azerbaijani Manat',
     'BAM' => 'Bosnia-Herzegovina Convertible Mark',
+    'BBD' => 'Barbadian Dollar',
     'BDT' => 'Bangladeshi Taka',
     'BHD' => 'Bahraini Dinar',
     'BIF' => 'Burundian Franc',
+    'BMD' => 'Bermudian Dollar',
     'BND' => 'Brunei Dollar',
     'BOB' => 'Bolivian Boliviano',
     'BRL' => 'Brazilian Real',
+    'BSD' => 'Bahamian Dollar',
+    'BTN' => 'Bhutanese Ngultrum',
     'BWP' => 'Botswanan Pula',
     'BYN' => 'Belarusian Ruble',
     'BZD' => 'Belize Dollar',
@@ -25,8 +31,9 @@
     'CNY' => 'Chinese Yuan',
     'COP' => 'Colombian Peso',
     'CRC' => 'Costa Rican Colón',
+    'CUP' => 'Cuban Peso',
     'CVE' => 'Cape Verdean Escudo',
-    'CZK' => 'Czech Republic Koruna',
+    'CZK' => 'Czech Koruna',
     'DJF' => 'Djiboutian Franc',
     'DKK' => 'Danish Krone',
     'DOP' => 'Dominican Peso',
@@ -35,16 +42,22 @@
     'ERN' => 'Eritrean Nakfa',
     'ETB' => 'Ethiopian Birr',
     'EUR' => 'Euro',
+    'FJD' => 'Fijian Dollar',
+    'FKP' => 'Falkland Islands Pound',
     'GBP' => 'British Pound Sterling',
     'GEL' => 'Georgian Lari',
     'GHS' => 'Ghanaian Cedi',
+    'GIP' => 'Gibraltar Pound',
+    'GMD' => 'Gambian Dalasi',
     'GNF' => 'Guinean Franc',
     'GTQ' => 'Guatemalan Quetzal',
+    'GYD' => 'Guyanese Dollar',
     'HKD' => 'Hong Kong Dollar',
     'HNL' => 'Honduran Lempira',
+    'HTG' => 'Haitian Gourde',
     'HUF' => 'Hungarian Forint',
     'IDR' => 'Indonesian Rupiah',
-    'ILS' => 'Israeli New Sheqel',
+    'ILS' => 'Israeli New Shekel',
     'INR' => 'Indian Rupee',
     'IQD' => 'Iraqi Dinar',
     'IRR' => 'Iranian Rial',
@@ -53,21 +66,31 @@
     'JOD' => 'Jordanian Dinar',
     'JPY' => 'Japanese Yen',
     'KES' => 'Kenyan Shilling',
+    'KGS' => 'Kyrgyz Som',
     'KHR' => 'Cambodian Riel',
     'KMF' => 'Comorian Franc',
+    'KPW' => 'North Korean Won',
     'KRW' => 'South Korean Won',
     'KWD' => 'Kuwaiti Dinar',
+    'KYD' => 'Cayman Islands Dollar',
     'KZT' => 'Kazakhstani Tenge',
+    'LAK' => 'Lao Kip',
     'LBP' => 'Lebanese Pound',
     'LKR' => 'Sri Lankan Rupee',
+    'LRD' => 'Liberian Dollar',
+    'LSL' => 'Lesotho Loti',
     'LYD' => 'Libyan Dinar',
     'MAD' => 'Moroccan Dirham',
     'MDL' => 'Moldovan Leu',
     'MGA' => 'Malagasy Ariary',
     'MKD' => 'Macedonian Denar',
-    'MMK' => 'Myanma Kyat',
+    'MMK' => 'Myanmar Kyat',
+    'MNT' => 'Mongolian Tugrik',
     'MOP' => 'Macanese Pataca',
+    'MRU' => 'Mauritanian Ouguiya',
     'MUR' => 'Mauritian Rupee',
+    'MVR' => 'Maldivian Rufiyaa',
+    'MWK' => 'Malawian Kwacha',
     'MXN' => 'Mexican Peso',
     'MYR' => 'Malaysian Ringgit',
     'MZN' => 'Mozambican Metical',
@@ -79,23 +102,34 @@
     'NZD' => 'New Zealand Dollar',
     'OMR' => 'Omani Rial',
     'PAB' => 'Panamanian Balboa',
-    'PEN' => 'Peruvian Nuevo Sol',
+    'PEN' => 'Peruvian Sol',
+    'PGK' => 'Papua New Guinean Kina',
     'PHP' => 'Philippine Peso',
     'PKR' => 'Pakistani Rupee',
     'PLN' => 'Polish Zloty',
     'PYG' => 'Paraguayan Guarani',
-    'QAR' => 'Qatari Rial',
+    'QAR' => 'Qatari Riyal',
     'RON' => 'Romanian Leu',
     'RSD' => 'Serbian Dinar',
     'RUB' => 'Russian Ruble',
     'RWF' => 'Rwandan Franc',
     'SAR' => 'Saudi Riyal',
+    'SBD' => 'Solomon Islands Dollar',
+    'SCR' => 'Seychellois Rupee',
     'SDG' => 'Sudanese Pound',
     'SEK' => 'Swedish Krona',
     'SGD' => 'Singapore Dollar',
+    'SHP' => 'Saint Helena Pound',
+    'SLE' => 'Sierra Leonean Leone',
     'SOS' => 'Somali Shilling',
+    'SRD' => 'Surinamese Dollar',
+    'SSP' => 'South Sudanese Pound',
+    'STN' => 'São Tomé and Príncipe Dobra',
     'SYP' => 'Syrian Pound',
+    'SZL' => 'Swazi Lilangeni',
     'THB' => 'Thai Baht',
+    'TJS' => 'Tajikistani Somoni',
+    'TMT' => 'Turkmenistani Manat',
     'TND' => 'Tunisian Dinar',
     'TOP' => 'Tongan Paʻanga',
     'TRY' => 'Turkish Lira',
@@ -106,11 +140,17 @@
     'UGX' => 'Ugandan Shilling',
     'USD' => 'US Dollar',
     'UYU' => 'Uruguayan Peso',
-    'UZS' => 'Uzbekistan Som',
-    'VES' => 'Venezuelan Bolívar Soberano',
+    'UZS' => 'Uzbekistani Som',
+    'VED' => 'Venezuelan Digital Bolívar',
+    'VES' => 'Venezuelan Sovereign Bolívar',
     'VND' => 'Vietnamese Dong',
-    'XAF' => 'CFA Franc BEAC',
-    'XOF' => 'CFA Franc BCEAO',
+    'VUV' => 'Vanuatu Vatu',
+    'WST' => 'Samoan Tala',
+    'XAF' => 'Central African CFA Franc',
+    'XCD' => 'Eastern Caribbean Dollar',
+    'XCG' => 'Caribbean Guilder',
+    'XOF' => 'West African CFA Franc',
+    'XPF' => 'CFP Franc',
     'YER' => 'Yemeni Rial',
     'ZAR' => 'South African Rand',
     'ZMW' => 'Zambian Kwacha',
diff --git a/lang/en/fieldtypes.php b/lang/en/fieldtypes.php
index f7832118263..df2ed07b900 100644
--- a/lang/en/fieldtypes.php
+++ b/lang/en/fieldtypes.php
@@ -5,7 +5,7 @@
     'any.config.cast_booleans' => 'Options with values of true and false will be saved as booleans.',
     'any.config.mode' => 'Choose your preferred UI style.',
     'array.config.expand' => 'Whether to save the array in the expanded format. Use this if you intend to have numeric values.',
-    'array.config.keys' => 'Set the array keys (variables) and optional labels.',
+    'array.config.keys' => 'Set the array keys (variables) and their optional labels.',
     'array.config.mode' => 'The **dynamic** mode gives the user free control of the data, while **keyed** and **single** modes enforce strict keys.',
     'array.title' => 'Array',
     'assets.config.allow_uploads' => 'Allow new file uploads.',
@@ -49,7 +49,7 @@
     'bard.config.word_count' => 'Show the word count at the bottom of the field.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Button Group',
-    'checkboxes.config.inline' => 'Show the checkboxes in a row.',
+    'checkboxes.config.appearance' => 'Choose how the checkboxes are displayed.',
     'checkboxes.config.options' => 'Set the array keys and their optional labels.',
     'checkboxes.title' => 'Checkboxes',
     'code.config.color_mode' => 'Choose your preferred color mode.',
@@ -78,6 +78,7 @@
     'date.config.number_of_months' => 'Control how many months are shown at one time.',
     'date.config.time_enabled' => 'Enable the timepicker.',
     'date.config.time_seconds_enabled' => 'Show seconds in the timepicker.',
+    'date.config.timezone' => 'The timezone dates will be displayed and entered in. Defaults to the browser\'s local timezone.',
     'date.config.default' => 'You may specify a date using `YYYY-MM-DD`, or `now`.',
     'date.title' => 'Date',
     'dictionary.config.dictionary' => 'The dictionary you wish to pull options from.',
@@ -120,7 +121,9 @@
     'integer.title' => 'Integer',
     'link.config.collections' => 'Entries from these collections will be available. Leaving this empty will make entries from routable collections available.',
     'link.config.container' => 'Choose which asset container to use for this field.',
+    'link.config.default_option' => 'The default Link type option, if available for the fieldtype\'s configuration.',
     'link.title' => 'Link',
+    'list.config.add_row' => 'Customize the label of the "Add Item" button.',
     'list.title' => 'List',
     'markdown.config.automatic_line_breaks' => 'Enables automatic line breaks.',
     'markdown.config.automatic_links' => 'Enables automatic linking of any URLs.',
@@ -141,7 +144,7 @@
     'picker.category.special.description' => 'These fields are special, each in their own way.',
     'picker.category.structured.description' => 'Fields that store structured data. Some can even nest other fields inside themselves.',
     'picker.category.text.description' => 'Fields that store strings of text, rich content, or both.',
-    'radio.config.inline' => 'Show the radio buttons in a row.',
+    'radio.config.appearance' => 'Choose how the radio buttons are displayed.',
     'radio.config.options' => 'Set the array keys and their optional labels.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Add text to the end (right-side) of the slider.',
@@ -151,7 +154,7 @@
     'range.config.step' => 'The minimum size between values.',
     'range.title' => 'Range',
     'relationship.config.mode' => 'Choose your preferred UI style.',
-    'replicator.config.button_label' => 'Add a label to the add set button.',
+    'replicator.config.button_label' => 'Customize the label of the "Add Set" button.',
     'replicator.config.collapse' => 'The set collapsing behavior.',
     'replicator.config.collapse.accordion' => 'Only allow one set to be expanded at a time.',
     'replicator.config.collapse.disabled' => 'All sets expanded by default.',
@@ -161,7 +164,7 @@
     'replicator.config.previews' => 'Show a preview of the content inside a set while collapsed.',
     'replicator.config.sets' => 'Sets are configurable blocks of fields that can be created and reordered as desired.',
     'replicator.title' => 'Replicator',
-    'revealer.config.input_label' => 'Set a label to be shown in the button or beside the toggle.',
+    'revealer.config.input_label' => 'Customize the label of the "Show Fields" button, or the label beside the toggle.',
     'revealer.config.mode' => 'Choose your preferred UI style.',
     'revealer.title' => 'Revealer',
     'section.title' => 'Section',
diff --git a/lang/en/messages.php b/lang/en/messages.php
index 42d340c728b..f6339ba62df 100644
--- a/lang/en/messages.php
+++ b/lang/en/messages.php
@@ -61,6 +61,8 @@
     'collections_route_instructions' => 'The route controls the entries URL pattern. Learn more in the [documentation](https://statamic.dev/collections#routing).',
     'collections_sort_direction_instructions' => 'The default sort direction.',
     'collections_taxonomies_instructions' => 'Connect entries in this collection to taxonomies. Fields will be automatically added to publish forms.',
+    'crop_jpeg_background_help' => 'JPEG does not support transparency — transparent areas will be filled with this color.',
+    'crop_replace_unavailable_format' => 'The original can only be replaced when keeping the same format.',
     'crop_save_as_copy_confirm' => 'Save the cropped image as a new copy?',
     'crop_save_copy_or_replace' => 'Would you like to save this as a new copy or replace the original image?',
     'dictionaries_countries_emojis_instructions' => 'Include flag emojis in country labels.',
@@ -107,6 +109,7 @@
     'fields_visibility_instructions' => 'Control field visibility on publish forms.',
     'fieldset_import_fieldset_instructions' => 'The fieldset to be imported.',
     'fieldset_import_prefix_instructions' => 'Apply a prefix to each field when they are imported. e.g. hero_',
+    'fieldset_import_section_behavior_instructions' => 'Choose whether imported fieldset sections should be preserved or flattened into this section.',
     'fieldset_intro' => 'Fieldsets are an optional companion to blueprints, acting as reusable partials that can be used within blueprints.',
     'fieldset_link_fields_prefix_instructions' => 'Prefix each field in the linked fieldset with this value. Useful for importing the same fields multiple times.',
     'fieldsets_handle_instructions' => 'Used to reference this fieldset elsewhere. This cannot be easily changed later.',
@@ -136,6 +139,7 @@
     'form_configure_store_instructions' => 'Disable to stop storing submissions. Events and email notifications will still be sent.',
     'form_configure_title_instructions' => 'Use a call to action, such as \'Contact Us\'.',
     'form_create_description' => 'Get started by creating your first form.',
+    'form_export_filtered_description' => 'Exports submissions with current filters and visible columns.',
     'getting_started_widget_collections' => 'Collections hold the different content types that make up your site, helping you stay organized.',
     'getting_started_widget_docs' => 'Discover everything Statamic can do, and learn how to use its powerful features the right way.',
     'getting_started_widget_header' => 'Getting Started with Statamic',
@@ -184,6 +188,12 @@
     'navigation_documentation_instructions' => 'Learn about building, configuring, and rendering navigations',
     'navigation_link_to_entry_instructions' => 'Add a link to an entry. Enable linking to additional collections in the config area.',
     'navigation_link_to_url_instructions' => 'Add a link to any internal or external URL. Enable linking to entries in the config area.',
+    'oauth_already_connected' => 'Your :provider account is already connected.',
+    'oauth_belongs_to_another_user' => 'This :provider account is already connected to a different user.',
+    'oauth_connect_unsupported' => 'This provider does not support connecting accounts.',
+    'oauth_connected' => 'Connected your :provider account.',
+    'oauth_disconnected' => 'Disconnected your :provider account.',
+    'oauth_email_exists' => 'An account with this email address already exists. Sign in and connect this provider from your account settings.',
     'outpost_error_422' => 'Error communicating with statamic.com.',
     'outpost_error_429' => 'Too many requests to statamic.com.',
     'outpost_issue_try_later' => 'There was an issue communicating with statamic.com. Please try again later.',
@@ -198,6 +208,8 @@
     'phpinfo_utility_description' => 'Check PHP configuration settings and installed modules.',
     'plus_count_more' => '+ :count more',
     'preference_confirm_dirty_navigation_instructions' => 'Whether you should get a warning when trying to leave the page when there are unsaved changes.',
+    'preference_formatting_locale_invalid' => 'Please enter a valid locale code.',
+    'preference_formatting_locale_instructions' => 'The locale used for formatting values in the control panel, such as dates and numbers.',
     'preference_locale_instructions' => 'The preferred language for the control panel.',
     'preference_start_page_instructions' => 'The page to be shown when logging into the control panel.',
     'preference_strict_accessibility_instructions' => 'We\'ve designed the control panel with accessibility in mind, aiming to meet WCAG 2.2 guidelines where possible. Enable this option to apply stricter accessibility rules by increasing form border contrast.',
@@ -207,6 +219,7 @@
     'publish_actions_publish' => 'Changes to the working copy will be applied to the entry and it will be published immediately.',
     'publish_actions_schedule' => 'Changes to the working copy will be applied to the entry and it will appear published on the selected date.',
     'publish_actions_unpublish' => 'The current revision will be unpublished.',
+    'relationship_item_unavailable' => 'This item is unavailable. It may have been deleted, or you may not have permission to view it.',
     'reset_password_notification_body' => 'You are receiving this email because we received a password reset request for your account.',
     'reset_password_notification_no_action' => 'If you did not request a password reset, no further action is required.',
     'reset_password_notification_subject' => 'Reset Password Notification',
@@ -221,6 +234,8 @@
     'selections_item_unselected' => ':title is not selected. Click to select.',
     'selections_limit_reached' => 'Selection limit reached. Cannot select :title',
     'selections_select_all' => ':selected of :total items selected. Check to select all items.',
+    'session_expiry_dismissed_banner' => 'Your session is about to expire. Click here to extend it and stay signed in.',
+    'session_expiry_dismissed_login_banner' => 'Your session has expired. Click here to log back in.',
     'session_expiry_enter_password' => 'Enter your password to continue.',
     'session_expiry_enter_two_factor_code' => 'Enter your authenticator code to continue.',
     'session_expiry_enter_two_factor_recovery_code' => 'Enter a recovery code to continue.',
@@ -253,6 +268,7 @@
     'theme_share_instructions' => 'Publish this theme through your statamic.com account to make it available to others.',
     'try_again_in_seconds' => '{0,1}Try again now.|Try again in :count seconds.',
     'try_again_in_minutes' => 'Try again in a minute.|Try again in :count minutes.',
+    'tree_aria_instructions' => 'Use arrow keys to navigate. Alt plus arrow keys to reorder.',
     'two_factor_account_requirement' => 'Your account requires two-factor authentication. Please enable it before proceeding.',
     'two_factor_challenge_code_instructions' => 'Enter the 6-digit code from your authenticator app to confirm access to your account.',
     'two_factor_enable_introduction' => 'When enabled, you will be prompted for a secure, random token from your phone\'s authenticator app every time you log in.',
diff --git a/lang/en/permissions.php b/lang/en/permissions.php
index 0b57bfede41..dae704fcd3e 100644
--- a/lang/en/permissions.php
+++ b/lang/en/permissions.php
@@ -88,6 +88,7 @@
     'assign_user_groups' => 'Assign groups to users',
     'assign_roles' => 'Assign roles to users',
     'impersonate_users' => 'Impersonate users',
+    'impersonate_users_desc' => 'Allows logging in as any user, including super admins. Grant this permission with caution.',
 
     'group_updates' => 'Updates',
     'view_updates' => 'View updates',
diff --git a/lang/en/validation.php b/lang/en/validation.php
index b27d0cc1ea6..9e46026ccab 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -169,6 +169,7 @@
     'date_fieldtype_time_required' => 'Time is required.',
     'duplicate_field_handle' => 'A field with a handle of :handle already exists.',
     'duplicate_uri' => 'Duplicate URI :value',
+    'elevated_session_resend_code_unavailable' => 'Resend code is only available for verification code method.',
     'elevated_session_verification_code' => 'The verification code is incorrect.',
     'email_available' => 'A user with this email already exists.',
     'fieldset_imported_recursively' => 'Fieldset :handle is being imported recursively.',
diff --git a/lang/es.json b/lang/es.json
index eecfe63c42e..e922b330751 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -86,7 +86,6 @@
     "Always show": "Mostrar siempre",
     "Always Show Set Button": "Mostrar siempre el botón Establecer",
     "An entry will be deleted|:count entries will be deleted": "Una entrada será eliminada | :count entradas de :count se eliminarán",
-    "An item with this ID could not be found": "No se pudo encontrar un elemento con este ID",
     "and": "y",
     "and :count more": "y :count más",
     "Antlers": "Cornamenta",
@@ -99,6 +98,7 @@
     "Application Cache": "Caché de aplicaciones",
     "Application cache cleared.": "Caché de la aplicación borrada.",
     "Apply": "Aplicar",
+    "Save All": "Guardar todo",
     "Apply Link": "Aplicar enlace",
     "Are you sure you want to delete this column?": "¿Realmente deseas eliminar esta columna?",
     "Are you sure you want to delete this entry?": "¿Estás seguro de que deseas eliminar esta entrada?",
diff --git a/lang/es/fieldtypes.php b/lang/es/fieldtypes.php
index 1edb149ffd0..dbfab8bb60d 100644
--- a/lang/es/fieldtypes.php
+++ b/lang/es/fieldtypes.php
@@ -49,7 +49,6 @@
     'bard.config.word_count' => 'Muestra el recuento de palabras en la parte inferior del campo.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Grupo de botones',
-    'checkboxes.config.inline' => 'Mostrar los botones de checkbox en una fila.',
     'checkboxes.config.options' => 'Establece las llaves del arreglo y sus etiquetas opcionales.',
     'checkboxes.title' => 'Checkboxes',
     'code.config.indent_size' => 'Establece tu tamaño de indentado preferido (en espacios).',
@@ -130,7 +129,6 @@
     'picker.category.special.description' => 'Estos campos son especiales, cada uno a su manera.',
     'picker.category.structured.description' => 'Campos que almacenan datos estructurados. Algunos incluso pueden anidar otros campos dentro de sí mismos.',
     'picker.category.text.description' => 'Campos que almacenan cadenas de texto, contenido enriquecido o ambos.',
-    'radio.config.inline' => 'Mostrar los botones de radio en una fila.',
     'radio.config.options' => 'Establece las llaves del arreglo y sus etiquetas opcionales.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Agrega texto al final (derecha) del control deslizante.',
diff --git a/lang/es/messages.php b/lang/es/messages.php
index 1bee891e6e9..ac2d507719c 100644
--- a/lang/es/messages.php
+++ b/lang/es/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Los cambios en la copia de trabajo se aplicarán a la entrada y se publicarán de inmediato.',
     'publish_actions_schedule' => 'Los cambios en la copia de trabajo se aplicarán a la entrada y aparecerá publicada en la fecha seleccionada.',
     'publish_actions_unpublish' => 'La revisión actual se ocultará.',
+    'relationship_item_unavailable' => 'Este elemento no está disponible. Es posible que se haya eliminado o que no tengas permiso para verlo.',
     'reset_password_notification_body' => 'Te enviamos este correo electrónico porque recibimos una solicitud de restablecimiento de contraseña para tu cuenta.',
     'reset_password_notification_no_action' => 'Si no solicitaste un restablecimiento de contraseña, tienes que hacer nada más.',
     'reset_password_notification_subject' => 'Notificación de restablecimiento de contraseña',
diff --git a/lang/et.json b/lang/et.json
index d9142512a51..e4619f300b0 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -86,7 +86,6 @@
     "Always show": "Näita alati",
     "Always Show Set Button": "Kuva alati komplekti nupp",
     "An entry will be deleted|:count entries will be deleted": "Kirje kustutatakse|:count kirjet kustutatakse",
-    "An item with this ID could not be found": "Selle ID-ga üksust ei leitud",
     "and": "ja",
     "and :count more": "ja veel :count",
     "Antlers": "Antlers",
@@ -99,6 +98,7 @@
     "Application Cache": "Rakenduse vahemälu",
     "Application cache cleared.": "Rakenduse vahemälu tühjendati.",
     "Apply": "Rakenda",
+    "Save All": "Salvesta kõik",
     "Apply Link": "Rakenda link",
     "Are you sure you want to delete this column?": "Oled kindel, et soovid selle veeru kustutada?",
     "Are you sure you want to delete this entry?": "Oled kindel, et soovid selle kirje kustutada?",
diff --git a/lang/et/fieldtypes.php b/lang/et/fieldtypes.php
index 7b96182a78e..8f51757f8c7 100644
--- a/lang/et/fieldtypes.php
+++ b/lang/et/fieldtypes.php
@@ -51,7 +51,6 @@
     'bard.config.word_count' => 'Kuva sõnade arv välja allosas.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Nupugrupp',
-    'checkboxes.config.inline' => 'Kuva märkeruudud reas.',
     'checkboxes.config.options' => 'Määra massiivi võtmed ja nende valikulised sildid.',
     'checkboxes.title' => 'Märkeruudud',
     'code.config.indent_size' => 'Määra eelistatud taande suurus (tühikutes).',
@@ -132,7 +131,6 @@
     'picker.category.special.description' => 'Need väljad on erilised, igaüks omal moel.',
     'picker.category.structured.description' => 'Väljad, mis salvestavad struktureeritud andmeid. Mõned saavad isegi teisi välju enda sisse pesastada.',
     'picker.category.text.description' => 'Väljad, mis salvestavad tekstistringe, rikastatud sisu või mõlemat.',
-    'radio.config.inline' => 'Näita raadionuppe reas.',
     'radio.config.options' => 'Määra massiivi võtmed ja nende valikulised sildid.',
     'radio.title' => 'Raadio',
     'range.config.append' => 'Lisa tekst liuguri lõppu (paremale poole).',
diff --git a/lang/et/messages.php b/lang/et/messages.php
index fa3b51177b6..31fe14c1ac4 100644
--- a/lang/et/messages.php
+++ b/lang/et/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Töökoopia muudatused rakendatakse kirjele ja see avaldatakse kohe.',
     'publish_actions_schedule' => 'Töökoopia muudatused rakendatakse kirjele ja see avaldatakse valitud kuupäeval.',
     'publish_actions_unpublish' => 'Praegune redaktsioon muudetakse mustandiks.',
+    'relationship_item_unavailable' => 'See üksus pole saadaval. Võimalik, et see on kustutatud või sul pole õigust seda vaadata.',
     'reset_password_notification_body' => 'Saite selle e-kirja, kuna saime sinu konto parooli lähtestamise taotluse.',
     'reset_password_notification_no_action' => 'Kui sa parooli lähtestamist ei taotlenud, pole edasisi toiminguid vaja.',
     'reset_password_notification_subject' => 'Parooli lähtestamise teavitus',
diff --git a/lang/fa.json b/lang/fa.json
index d9f8ff63170..f1498e9ba4e 100644
--- a/lang/fa.json
+++ b/lang/fa.json
@@ -86,7 +86,6 @@
     "Always show": "همواره نمایان باشد",
     "Always Show Set Button": "همواره دکمه‌ی مجموعه نمایان باشد",
     "An entry will be deleted|:count entries will be deleted": "این مطلب حذف خواهد شد|:count مطلب حذف خواهد شد",
-    "An item with this ID could not be found": "آیتمی با این شناسه موجود نیست",
     "and": "و",
     "and :count more": "و :count عدد دیگر",
     "Antlers": "Antlers",
@@ -99,6 +98,7 @@
     "Application Cache": "کش اپلیکیشن",
     "Application cache cleared.": "کش اپلیکیشن پاک شد.",
     "Apply": "اعمال",
+    "Save All": "ذخیره همه",
     "Apply Link": "اعمال پیوند",
     "Are you sure you want to delete this column?": "آیا از حذف این ستون اطمینان دارید؟",
     "Are you sure you want to delete this entry?": "آیا از حذف این مطلب اطمینان دارید؟",
diff --git a/lang/fa/fieldtypes.php b/lang/fa/fieldtypes.php
index 71988960058..2eeb6ede472 100644
--- a/lang/fa/fieldtypes.php
+++ b/lang/fa/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'نمایش شمارنده کلمات در زیر فیلد',
     'bard.title' => 'ویرایشگر',
     'button_group.title' => 'دکمه‌های گروهی',
-    'checkboxes.config.inline' => 'نمایش چکباکس‌ها در یک سطر.',
     'checkboxes.config.options' => 'کلیدهای آرایه و عناوین آنها را مشخص کنید.',
     'checkboxes.title' => 'چک‌باکس',
     'code.config.indent_size' => 'میزان دلخواه تورفتگی را مشخص نمائید (چه تعداد فاصله).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'این الگوها کارهای خاصی را انجام می‌دهند که برای هر کدام تعریف شده است.',
     'picker.category.structured.description' => 'فیلدهایی که داده‌های ساخت یافته را ذخیره می‌کنند. برخی حتی می‌توانند دیگر الگوها را در داخل دوباره فرا بخوانند.',
     'picker.category.text.description' => 'فیلدهایی که رشته‌هایی از متن یا محتوای غنی یا هر دو را ذخیره می‌کنند.',
-    'radio.config.inline' => 'نمایش دکمه‌های رادیویی در یک سطر.',
     'radio.config.options' => 'مقادیر و عناوین آنها را مشخص سازید.',
     'radio.title' => 'دکمه‌های رادیو',
     'range.config.append' => 'افزودن متن به انتهای بازه (سمت چپ).',
diff --git a/lang/fa/messages.php b/lang/fa/messages.php
index de5b9183b1a..90d63e68981 100644
--- a/lang/fa/messages.php
+++ b/lang/fa/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'تغییرات در نسخه فعلی اعمال شده و بلافاصله منتشر می‌شود.',
     'publish_actions_schedule' => 'تغییرات در نسخه فعلی اعمال می‌شود و در تاریخ انتخاب شده منتشر می‌شود.',
     'publish_actions_unpublish' => 'نسخه‌ی فعلی منتشر نخواهد شد.',
+    'relationship_item_unavailable' => 'این مورد در دسترس نیست. ممکن است حذف شده باشد یا اجازه مشاهده آن را نداشته باشید.',
     'reset_password_notification_body' => 'شما این ایمیل را دریافت کرده‌اید زیرا یک درخواست بازنشانی گذرواژه برای حساب کاربری شما دریافت شده است.',
     'reset_password_notification_no_action' => 'درصورتی که بازنشانی گذرواژه توسط شما درخواست نشده است نیازی نیست اقدامی انجام دهید.',
     'reset_password_notification_subject' => 'ناتیفیکیشن برای بازنشانی گذرواژه',
diff --git a/lang/fr.json b/lang/fr.json
index 5f6b12e2553..8f5a3db9092 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -4,13 +4,14 @@
     "404": "404",
     ":count asset selected|:count assets selected": ":count ressource sélectionnée|:count ressources sélectionnées",
     ":count item selected|:count items selected": ":count élément sélectionné|:count éléments sélectionnés",
+    ":count of :max selections": ":count sélections sur :max",
     ":count row|:count rows": ":count rangée|:count rangées",
     ":count set|:count sets": ":count jeu|:count jeux",
     ":count word|:count words": ":count mot|:count mots",
     ":count\/:max selected": ":count sélectionnés \/:max",
     ":count\/:total characters": "count caractères :count\/:total",
     ":file uploaded": ":file téléchargé",
-    ":start-:end of :total": ":start-:end sur :total",
+    ":range of :total": ":range sur :total",
     ":success\/:total entries were deleted": ":success\/:total entrées ont été supprimées",
     ":success\/:total entries were published": ":success\/:total entrées ont été publiées",
     ":success\/:total entries were unpublished": ":success\/:total entrées ont été dépubliées",
@@ -33,7 +34,6 @@
     "Add": "Ajouter",
     "Add a link label": "Ajouter une étiquette de lien",
     "Add Attribute": "Ajouter des attributs",
-    "Add Block": "Ajouter un bloc",
     "Add child link to entry": "Ajouter un lien enfant à l'entrée",
     "Add child nav item": "Ajouter un élément de navigation enfant",
     "Add Color": "Ajouter une couleur",
@@ -53,7 +53,7 @@
     "Add Row": "Ajouter une rangée",
     "Add Row After": "Ajouter une rangée après",
     "Add Row Before": "Ajouter une rangée avant",
-    "Add Row Label": "Ajouter l'étiquette de rangée",
+    "Add Row Label": "Etiquette du bouton",
     "Add Rule": "Ajouter une règle",
     "Add Ruler": "Ajouter une règle",
     "Add Section": "Ajouter une section",
@@ -80,6 +80,7 @@
     "All caches cleared.": "Tous les caches ont été effacés.",
     "All of the following conditions pass": "Toutes les conditions suivantes sont remplies",
     "All rights reserved.": "Tous droits réservés.",
+    "All Submissions": "Toutes les soumissions",
     "Allow additions": "Autoriser les ajouts",
     "Allow Antlers": "Autoriser Antlers",
     "Allow Any Color": "Autoriser toutes les couleurs",
@@ -158,6 +159,7 @@
     "Augment Format": "Augmenter le format",
     "Authentication failed.": "L'authentification a échoué.",
     "Author": "Auteur",
+    "Auto": "Auto",
     "Autocomplete": "Saisie automatique",
     "Automatic Line Breaks": "Sauts de ligne automatiques",
     "Automatic Links": "Liens automatiques",
@@ -165,6 +167,8 @@
     "Available Columns": "Colonnes disponibles",
     "Back to login": "Retour à la connexion",
     "Back to Users": "Retour aux Utilisateurs",
+    "Background": "Arrière-plan",
+    "Background colour": "Couleur de l'arrière-plan",
     "Base": "Par défaut",
     "BCC Recipient(s)": "Destinataire(s) Cci",
     "Before": "Avant",
@@ -172,6 +176,7 @@
     "Behaviour": "Comportement",
     "Below": "En dessous",
     "Between": "entre",
+    "Black": "Noir",
     "Blockquote": "Citation",
     "Blueprint": "Blueprint",
     "Blueprint deleted": "Blueprint supprimé",
@@ -207,14 +212,17 @@
     "Characters": "Caractères",
     "Check All": "Tout cocher",
     "Checked": "Coché",
+    "Chips": "Chips",
     "choose a file": "choisir un fichier",
     "Choose Blueprint": "Choisir un Blueprint",
     "Choose Image": "Choisir une image",
     "Choose item...": "Choisir l'élément...",
     "Choose...": "Choisir...",
     "Clear": "Effacer",
+    "Clear :filter": "Effacer :filter",
     "Clear All": "Tout effacer",
     "Clear date": "Effacer la date",
+    "Clear selection": "Effacer la sélection",
     "Clearable": "Effaçable",
     "Close": "Fermer",
     "Close Editor": "Fermer l'éditeur",
@@ -267,6 +275,7 @@
     "Confirm with Passkey": "Confirmez avec la clé d'accès",
     "Confirm Your Identity": "Confirmez votre identité",
     "Confirm Your Password": "Confirmez votre mot de passe",
+    "Connect": "Connecter",
     "Constrain Layout": "Contraindre la mise en page",
     "Container": "Conteneur",
     "Contains": "Contient",
@@ -352,6 +361,7 @@
     "Default Icon": "Icône par défaut",
     "Default Mailer": "Expéditeur par défaut",
     "Default Mode": "Mode par défaut",
+    "Default Option": "Option par défaut",
     "Default preferences saved": "Préférences par défaut enregistrées",
     "Default Value": "Valeur par défaut",
     "Delete": "Supprimer",
@@ -376,7 +386,6 @@
     "Deselect :count item|Deselect all :count items": "Désélectionner :count élément|Désélectionner les :count éléments",
     "Deselect :title": "Désélectionner :title",
     "Deselect all items": "Désélectionner tous les éléments",
-    "Deselect option": "Désélectionner l'option",
     "Detach": "Détacher",
     "Details": "Détails",
     "Dictionary": "Dictionnaire",
@@ -388,6 +397,7 @@
     "Disabled two factor authentication": "Authentification à 2 facteurs désactivée",
     "Discard": "Annuler",
     "Discard Changes": "Annuler les modifications",
+    "Disconnect": "Déconnecter",
     "Disk": "Disque",
     "Display": "Affichage",
     "Display Label": "Etiquette à l'écran",
@@ -487,11 +497,11 @@
     "Expanded format": "Format étendu",
     "Expect a root page": "S'attendre à une page racine",
     "Expired": "Expirée",
+    "Export": "Exporter",
     "Export Submissions": "Exporter les soumissions",
     "Extend Session": "Prolonger la session",
     "Extension": "Extension",
     "External link": "Lien externe",
-    "Failed to create cropped image": "Impossible de créer une image recadrée",
     "Failed to crop image": "Impossible de recadrer l'image",
     "Failed to load entries": "Échec du chargement des entrées",
     "Failed to upload cropped image": "Impossible de télécharger l'image recadrée",
@@ -511,12 +521,14 @@
     "File": "Fichier",
     "File Driver": "Driver de fichier",
     "Filename": "Nom du fichier",
+    "Filtered Submissions": "Soumissions filtrées",
     "Filters": "Filtres",
     "Finish": "Terminer",
     "Finish cropping": "Finir le recadrage",
     "First Child": "Premier enfant",
     "Fix": "Réparer",
     "Fixed": "Fixe",
+    "Flatten": "Aplaties",
     "Flip crop orientation": "Inverser l'orientation du recadrage",
     "Flip Orientation": "Inverser l'orientation",
     "Floating": "Flottante",
@@ -530,6 +542,7 @@
     "Form saved": "Formulaire enregistré",
     "Form Submission": "Soumission de formulaire",
     "Format": "Format",
+    "Formatting Locale": "Paramètre régional pour le format",
     "Forms": "Formulaires",
     "Free": "Gratuit",
     "From": "A partir de",
@@ -565,6 +578,7 @@
     "Group": "Groupe",
     "Groups": "Groupes",
     "Handle": "Identifiant",
+    "Has Section|Has Sections": "A une section|A des sections",
     "Heading 1": "Titre 1",
     "Heading 2": "Titre 2",
     "Heading 3": "Titre 3",
@@ -593,9 +607,9 @@
     "Icon": "Icône",
     "Icon Set": "Jeu d'icônes",
     "ID": "ID",
-    "ID not found": "ID non trouvée",
     "ID regenerated and Stache cleared": "ID regénéré et Stache effacé",
     "If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Si vous ne parvenez pas à cliquer sur le bouton \":actionText\", copiez et collez l'URL ci-dessous dans votre navigateur Web :",
+    "Ignoring Section|Ignoring Sections": "Ignorer la section|Ignorer les sections",
     "Image": "Image",
     "Image Cache": "Cache des images",
     "Image cache cleared.": "Cache des images effacé.",
@@ -603,7 +617,7 @@
     "Image Manipulation": "Manipulation d'image",
     "Image replaced successfully": "Image remplacée avec succès",
     "Image to crop": "Image à recadrer",
-    "Impersonating": "Usurpation d'identité",
+    "Impersonating": "Personnification",
     "Imported from: :reference": "Importé depuis : :reference",
     "Included in output": "Affiché",
     "Indent Size": "Taille d'indentation",
@@ -641,6 +655,7 @@
     "Item could not be deleted": "L'élément n'a pas pu être supprimé",
     "Item deleted|Items deleted": "Elément supprimé|Eléments supprimés",
     "Items could not be deleted": "Les éléments n'ont pas pu être supprimés",
+    "Keep imported sections as-is.": "Conserver les sections importées telles quelles",
     "Key": "Clé",
     "Key Mappings": "Mappages des touches",
     "Keyed": "A clé",
@@ -716,6 +731,7 @@
     "Maximum items selected:": "Nombre maximal d'éléments sélectionnés :",
     "Maximum Rows": "Nb maxi de rangées",
     "Media": "Médias",
+    "Merge all fields into this section.": "Fusionner tous les champs dans cette section",
     "Merge Cells": "Fusionner des cellules",
     "Min": "Mini",
     "Min Files": "Nb mini de fichiers",
@@ -803,10 +819,12 @@
     "Origin": "Origine",
     "Origin Behavior": "Comportement d'origine",
     "Other": "Autre",
+    "Output format": "Format de sortie",
     "Override Alt": "Remplacement de Alt",
     "Pages": "Pages",
     "Parser": "Analyseur",
     "Passkey": "Clé d'accès",
+    "Passkey deleted.": "Clé d'accès supprimée.",
     "Passkeys": "Clés d'accès",
     "Password": "Mot de passe",
     "Password changed": "Mot de passe modifié",
@@ -826,6 +844,7 @@
     "Pinned Item": "Elément épinglé",
     "Placeholder": "Espace réservé",
     "Playground": "Bac à sable",
+    "Please select...": "Merci de sélectionner...",
     "Pop in": "Regrouper",
     "Pop out": "Détacher",
     "Port": "Port",
@@ -834,6 +853,7 @@
     "Preferences by Role": "Préférences par rôle",
     "Prefix": "Préfixe",
     "Prepend": "Ajouter au début",
+    "Preserve": "Conservées",
     "Press enter to access additional save options": "Appuyez sur Entrée pour accéder à des options de sauvegarde supplémentaires",
     "Preview": "Aperçu",
     "Preview Image": "Image d'aperçu",
@@ -846,12 +866,14 @@
     "Propagate": "Propager",
     "Properties": "Propriétés",
     "Protected Page": "Page protégée",
+    "Provider": "Fournisseur",
     "Publish": "Publier",
     "Publish by Default": "Publier par défaut",
     "Publish Date": "Date de publication",
     "Publish Entry|Publish :count Entries": "Publier une entrée|Publier :count entrées",
     "Publish Now": "Publier maintenant",
     "Published": "Publiée",
+    "Quality": "Qualité",
     "Query Scopes": "Étendues de requête",
     "Range": "Intervalle",
     "Raster image": "Image raster",
@@ -863,6 +885,7 @@
     "Records": "Enregistrements",
     "Recovery Code": "Code de récupération",
     "Recovery Codes": "Codes de récupération",
+    "Recovery codes regenerated.": "Codes de récupération régénérés.",
     "Redirect": "Rediriger",
     "Refresh": "Rafraîchir",
     "Refresh recovery codes": "Rafraîchir les codes de récupération",
@@ -878,6 +901,7 @@
     "Released on :date": "Publiée le :date",
     "Remember me": "Se souvenir de moi",
     "Remove": "Enlever",
+    "Remove :label": "Enlever :label",
     "Remove All": "Tout enlever",
     "Remove all empty nodes": "Enlever tous les noeuds vides",
     "Remove Asset": "Enlever la ressource",
@@ -917,6 +941,7 @@
     "Restrict": "Restreindre",
     "Restrict to Folder": "Restreindre au dossier",
     "Resume Your Session": "Reprendre votre session",
+    "Return to Control Panel": "Revenir au Panneau de contrôle",
     "Reupload": "Téléverser de nouveau",
     "Revision": "Révision",
     "Revision created": "Révision créée",
@@ -940,11 +965,12 @@
     "Rulers": "Règles",
     "Rules": "Règles",
     "Run action|Run action on :count items": "Exécuter l'action|Exécuter l'action sur :count éléments",
+    "Same as language": "Identique à la langue d'affichage",
     "Sanitize": "Désinfecter",
     "Save": "Enregistrer",
-    "Save & Close All": "Enregistrer & Tout Fermer",
     "Save & Publish": "Enregistrer & Publier",
     "Save & Unpublish": "Enregistrer & Dépublier",
+    "Save All": "Tout enregistrer",
     "Save as Copy": "Enregistrer en tant que copie",
     "Save as HTML": "Enregistrer en HTML",
     "Save Changes": "Enregistrer les modifications",
@@ -968,6 +994,7 @@
     "Searchable": "Consultable",
     "Searchables": "Consultables",
     "Second": "Seconde",
+    "Section Behavior": "Comportement des sections",
     "Security": "Sécurité",
     "Security update available": "Mise à jour de sécurité disponible",
     "Select": "Choisir",
@@ -1026,12 +1053,14 @@
     "Sign in with OAuth": "Connectez-vous avec OAuth",
     "Sign into your Statamic Control Panel": "Connectez-vous à votre Panneau de configuration Statamic",
     "Sign out": "Déconnexion",
+    "Sign-in Providers": "Fournisseurs de connexion",
     "Single": "Single",
     "Site": "Site",
     "Site Defaults": "Paramètres par défaut du site",
     "Site deleted": "Site supprimé",
     "Site saved": "Site enregistré",
     "Site selected.": "Site sélectionné",
+    "Site time": "Heure du site",
     "Sites": "Sites",
     "Size": "Taille",
     "Skip to content": "Passer au contenu",
@@ -1058,7 +1087,7 @@
     "Start designing your collection with these steps": "Commencez à concevoir votre collection avec ces étapes",
     "Start designing your navigation with these steps": "Commencez à concevoir votre navigation avec ces étapes",
     "Start designing your taxonomy with these steps": "Commencez à concevoir votre taxonomie avec ces étapes",
-    "Start Impersonating": "Usurper cette identité",
+    "Start Impersonating": "Démarrer la personnification",
     "Start Page": "Page de démarrage",
     "Start typing to search.": "Commencer à saisir pour rechercher.",
     "Statamic": "Statamic",
@@ -1068,7 +1097,7 @@
     "Static page cache cleared.": "Cache de page statique effacé.",
     "Status": "Statut",
     "Step": "Incrément",
-    "Stop impersonating": "Arrêter l'usurpation d'identité",
+    "Stop impersonating": "Arrêter la personnification",
     "Store Submissions": "Enregistrer les soumissions",
     "Strategy": "Stratégie",
     "Stricter WCAG 2.2 Mode": "Mode WCAG 2.2 plus strict",
@@ -1117,6 +1146,7 @@
     "Text & Rich Content": "Texte & Contenu Enrichi",
     "Text item": "Elément Texte",
     "Text view": "Vue Texte",
+    "The asset is not an image.": "La ressource n'est pas une image.",
     "the Git Integration": "Intégration GIT",
     "The given data was invalid.": "Les données fournies n'étaient pas valides.",
     "The page you are looking for could not be found.": "La page que vous recherchez n'a pas pu être trouvée.",
@@ -1127,12 +1157,15 @@
     "These are now your default columns.": "Ce sont désormais vos colonnes par défaut.",
     "This action is unauthorized.": "Cette action n'est pas autorisée.",
     "This collection isn't available in this site.": "Cette collection n'est pas disponible sur ce site.",
+    "This field": "Ce champ",
     "This form is awaiting responses": "Ce formulaire est en attente de réponses",
     "This is the published version": "Ceci est la version publiée",
     "This is the root page": "Ceci est la page racine",
     "This is the working copy": "Ceci est la copie de travail",
+    "This month": "Ce mois",
     "This will delete the collection and all of its entries.|This will delete the collections and all of their entries.": "Cette action va supprimer la collection et toutes ses entrées.|Cette action va supprimer les collections et toutes leurs entrées.",
     "Time Enabled": "Horodatage activé",
+    "Timezone": "Fuseau horaire",
     "Title": "Titre",
     "Today": "Aujourd'hui",
     "Toggle": "Commutateur",
@@ -1151,6 +1184,8 @@
     "True": "Vrai",
     "Try Again": "Essayer de nouveau",
     "Two-Factor Authentication": "Authentification à 2 facteurs",
+    "Two-factor authentication disabled.": "Authentification à 2 facteurs désactivée.",
+    "Two-factor authentication enabled.": "Authentification à 2 facteurs activée.",
     "Type": "Type",
     "Type '\/' to insert a set": "Tapez '\/' pour insérer un ensemble",
     "Typeahead Field": "Champ de saisie",
@@ -1231,6 +1266,7 @@
     "Warm Specific Presets": "Réchauffer des préréglages spécifiques",
     "Warning! Changing a site handle may break existing site content!": "Attention ! Modifier l'identifiant d'un site peut briser le contenu du site actuel !",
     "Week": "Semaine",
+    "White": "Blanc",
     "Whoops!": "Oups !",
     "Widgets": "Widgets",
     "Width": "Largeur",
@@ -1253,10 +1289,11 @@
     "You are not authorized to view collections.": "Vous n'êtes pas autorisé à visualiser les collections.",
     "You are not authorized to view navs.": "Vous n'êtes pas autorisé à visualiser les navigations.",
     "You are not authorized to view this collection.": "Vous n'êtes pas autorisé à visualiser cette collection.",
-    "You are now impersonating": "Vous usurpez dorénavant l'identité de",
+    "You are now impersonating": "Vous personnifiez dorénavant l'utilisateur",
     "You can't do this while logged in": "Vous ne pouvez pas faire cela quand vous êtes connecté.",
     "You do not have permission to access this URL": "Vous n'êtes pas autorisé à accéder à cette URL",
     "You're already editing this item.": "Vous êtes déjà en train de modifier cet élément.",
     "Your Session is Expiring": "Votre session va expirer",
+    "Your time": "Votre heure",
     "Your working copy will be replaced by the contents of this revision.": "Votre copie de travail sera remplacée par le contenu de cette révision."
 }
diff --git a/lang/fr/dictionary-currencies.php b/lang/fr/dictionary-currencies.php
index 766220b872a..7a576263979 100644
--- a/lang/fr/dictionary-currencies.php
+++ b/lang/fr/dictionary-currencies.php
@@ -5,16 +5,22 @@
     'AFN' => 'Afghani',
     'ALL' => 'Lek albanais',
     'AMD' => 'Dram arménien',
+    'AOA' => 'Kwanza angolais',
     'ARS' => 'Peso argentin',
     'AUD' => 'Dollar australien',
+    'AWG' => 'Florin arubais ',
     'AZN' => 'Manat azerbaïdjanais',
     'BAM' => 'Mark convertible de Bosnie-Herzégovine',
+    'BBD' => 'Dollar barbadien',
     'BDT' => 'Taka bangladais',
     'BHD' => 'Dinar de Bahreïn',
     'BIF' => 'Franc burundais',
+    'BMD' => 'Dollar bermudien',
     'BND' => 'Dollar de Brunei',
     'BOB' => 'Boliviano',
     'BRL' => 'Réal brésilien',
+    'BSD' => 'Dollar bahaméen',
+    'BTN' => 'Ngultrum bouthanais',
     'BWP' => 'Pula du Botswana',
     'BYN' => 'Rouble biélorusse',
     'BZD' => 'Dollar bélizien',
@@ -25,6 +31,7 @@
     'CNY' => 'Yuan renminbi (RMB) chinois',
     'COP' => 'Peso colombien',
     'CRC' => 'Colón costaricien',
+    'CUP' => 'Peso cubain',
     'CVE' => 'Escudo cap-verdien',
     'CZK' => 'Couronne tchèque',
     'DJF' => 'Franc djiboutien',
@@ -35,13 +42,19 @@
     'ERN' => 'Nakfa érythréen',
     'ETB' => 'Birr éthiopien',
     'EUR' => 'Euro',
+    'FJD' => 'Dollar des Fidji',
+    'FKP' => 'Livre des îles Malouines',
     'GBP' => 'Livre sterling',
     'GEL' => 'Lari géorgien',
     'GHS' => 'Cédi ghanéen',
+    'GIP' => 'Dalasi gambien',
+    'GMD' => 'Dalasi gambien',
     'GNF' => 'Franc guinéen',
     'GTQ' => 'Quetzal guatémaltèque',
+    'GYD' => 'Dollar de Guyane',
     'HKD' => 'Dollar de Hong Kong',
     'HNL' => 'Lempira hondurien',
+    'HTG' => 'Gourde haïtienne',
     'HUF' => 'Forint hongrois',
     'IDR' => 'Roupie indonésienne',
     'ILS' => 'Shekel israélien',
@@ -53,21 +66,31 @@
     'JOD' => 'Dinar jordanien',
     'JPY' => 'Yen',
     'KES' => 'Shilling kényan',
+    'KGS' => 'Som du Kirghizistan',
     'KHR' => 'Riel cambodgien',
     'KMF' => 'Franc comorien',
+    'KPW' => 'Won nord-coréen',
     'KRW' => 'Won sud-coréen',
     'KWD' => 'Dinar koweïtien',
+    'KYD' => 'Dollar des îles Caïmans',
     'KZT' => 'Tenge kazakh',
+    'LAK' => 'Kip laotien',
     'LBP' => 'Livre libanaise',
     'LKR' => 'Roupie srilankaise',
+    'LRD' => 'Dollar libérien',
+    'LSL' => 'Loti lesothan',
     'LYD' => 'Dinar libyen',
     'MAD' => 'Dirham marocain',
     'MDL' => 'Leu moldave',
     'MGA' => 'Ariary malgache',
     'MKD' => 'Denar macédonien',
     'MMK' => 'Kyat birman',
+    'MNT' => 'Tugrik mongol',
     'MOP' => 'Pataca de Macao',
+    'MRU' => 'Ouguiya mauritanienne',
     'MUR' => 'Roupie mauricienne',
+    'MVR' => 'Rufiyaa maldivienne',
+    'MWK' => 'Kwacha malawien',
     'MXN' => 'Peso mexicain',
     'MYR' => 'Ringgit malaisien',
     'MZN' => 'Metical mozambicain',
@@ -80,6 +103,7 @@
     'OMR' => 'Rial omanais',
     'PAB' => 'Balboa panaméen',
     'PEN' => 'Sol péruvien',
+    'PGK' => 'Kina papouasien',
     'PHP' => 'Peso philippin',
     'PKR' => 'Roupie pakistanaise',
     'PLN' => 'Zloty polonais',
@@ -90,12 +114,22 @@
     'RUB' => 'Rouble russe',
     'RWF' => 'Franc rwandais',
     'SAR' => 'Riyal saoudien',
+    'SBD' => 'Dollar des îles Salomon',
+    'SCR' => 'Roupie seychelloise',
     'SDG' => 'Livre soudanaise',
     'SEK' => 'Couronne suédoise',
     'SGD' => 'Dollar de Singapour',
+    'SHP' => 'Livre de Sainte-Hélène',
+    'SLE' => 'Leone de Sierra Leone',
     'SOS' => 'Shilling somalien',
+    'SRD' => 'Dollar du Suriname',
+    'SSP' => 'Livre sud-soudanaise',
+    'STN' => 'Dobra de Sao Tomé',
     'SYP' => 'Livre syrienne',
+    'SZL' => 'Lilangeni de l\'Eswatini (Lesotho)',
     'THB' => 'Baht thaïlandais',
+    'TJS' => 'Somoni tadjik',
+    'TMT' => 'Manat turkmène',
     'TND' => 'Dinar tunisien',
     'TOP' => 'Pa\'anga des Tonga',
     'TRY' => 'Livre turque',
@@ -107,10 +141,16 @@
     'USD' => 'Dollar US',
     'UYU' => 'Peso Uruguayen',
     'UZS' => 'Sum ouzbek',
+    'VED' => 'Bolivar numérique vénézuélien',
     'VES' => 'Bolivar vénézuélien',
     'VND' => 'Dong vietnamien',
+    'VUV' => 'Vatu vanuatais',
+    'WST' => 'Tala samoan',
     'XAF' => 'Franc CFA (CEMAC)',
+    'XCD' => 'Dollar des Caraïbes orientales',
+    'XCG' => 'Florin caribéen',
     'XOF' => 'Franc CFA (UEMOA)',
+    'XPF' => 'Franc Pacifique',
     'YER' => 'Rial yéménite',
     'ZAR' => 'Rand sud-africain',
     'ZMW' => 'Kwacha zambien',
diff --git a/lang/fr/fieldtypes.php b/lang/fr/fieldtypes.php
index 311f49ea5ff..7da2827ea43 100644
--- a/lang/fr/fieldtypes.php
+++ b/lang/fr/fieldtypes.php
@@ -48,7 +48,7 @@
     'bard.config.word_count' => 'Affichez le compteur de mots en bas du champ.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Button Group',
-    'checkboxes.config.inline' => 'Affichez les cases à cocher dans une rangée.',
+    'checkboxes.config.appearance' => 'Choisissez comment les cases à cocher seront affichées.',
     'checkboxes.config.options' => 'Définissez les clés du tableau et leurs étiquettes facultatives.',
     'checkboxes.title' => 'Checkboxes',
     'code.config.color_mode' => 'Choisissez votre mode couleur préféré.',
@@ -78,6 +78,7 @@
     'date.config.number_of_months' => 'Contrôlez le nombre de mois affichés simultanément.',
     'date.config.time_enabled' => 'Activez l’horodateur.',
     'date.config.time_seconds_enabled' => 'Affichez les secondes dans l’horodateur.',
+    'date.config.timezone' => 'Le fuseau horaire dans lequel les dates seront affichées et saisies. Le fuseau horaire par défaut (Auto) est celui du navigateur.',
     'date.title' => 'Date',
     'dictionary.config.dictionary' => 'Le dictionnaire à partir duquel vous souhaitez extraire des options.',
     'dictionary.file.config.filename' => 'Le nom du fichier contenant vos options, relatif au répertoire `resources/dictionaries`.',
@@ -119,7 +120,9 @@
     'integer.title' => 'Integer',
     'link.config.collections' => 'Les entrées de ces collections seront disponibles. Si vous laissez cette zone à blanc, les entrées des collections routables seront disponibles.',
     'link.config.container' => 'Choisissez quel conteneur de ressources à utiliser pour ce champ.',
+    'link.config.default_option' => 'L’option de type de lien par défaut, si elle est disponible pour la configuration du type de champ.',
     'link.title' => 'Link',
+    'list.config.add_row' => 'Personnalisez l’étiquette du bouton "Ajouter un élément".',
     'list.title' => 'List',
     'markdown.config.automatic_line_breaks' => 'Activez les sauts de ligne automatiques.',
     'markdown.config.automatic_links' => 'Activez la liaison automatique de toutes les URL.',
@@ -140,7 +143,7 @@
     'picker.category.special.description' => 'Ces champs sont spéciaux, chacun à leur manière.',
     'picker.category.structured.description' => 'Des champs qui stockent des données structurées. Certains peuvent même accueillir d’autres champs, nichés à l’intérieur d’eux-mêmes.',
     'picker.category.text.description' => 'Des champs qui stockent des chaînes de texte, du contenu enrichi ou les deux.',
-    'radio.config.inline' => 'Affichez les boutons radio dans une rangée.',
+    'radio.config.appearance' => 'Choisissez le mode d’affichage des boutons radio.',
     'radio.config.options' => 'Définissez les clés du tableau et leurs étiquettes facultatives.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Ajoutez du texte à la fin (côté droit) du curseur.',
diff --git a/lang/fr/messages.php b/lang/fr/messages.php
index 44731942cd0..b6177971804 100644
--- a/lang/fr/messages.php
+++ b/lang/fr/messages.php
@@ -61,6 +61,8 @@
     'collections_route_instructions' => 'La route contrôle le modèle d’URL des entrées. Apprenez-en plus dans la [documentation](https://statamic.dev/collections#routing).',
     'collections_sort_direction_instructions' => 'Le sens de tri par défaut.',
     'collections_taxonomies_instructions' => 'Reliez les entrées de cette collection à des taxonomies. Les champs seront automatiquement ajoutés aux formulaires.',
+    'crop_jpeg_background_help' => 'Le format JPEG ne prend pas en charge la transparence ; les zones transparentes seront remplies de cette couleur.',
+    'crop_replace_unavailable_format' => 'L’original ne peut être remplacé qu’en conservant le même format.',
     'crop_save_as_copy_confirm' => 'Enregistrer l’image recadrée comme une nouvelle copie ?',
     'crop_save_copy_or_replace' => 'Souhaitez-vous enregistrer ceci comme une nouvelle copie ou remplacer l’image originale ?',
     'dictionaries_countries_emojis_instructions' => 'Inclure les émojis de drapeaux dans les étiquettes ?',
@@ -108,6 +110,7 @@
     'fields_visibility_instructions' => 'Contrôle la visibilité de ce champ dans les formulaires.',
     'fieldset_import_fieldset_instructions' => 'Le jeu de champs à importer.',
     'fieldset_import_prefix_instructions' => 'Le préfixe à appliquer à chaque champ lors de leur importation. Ex. hero_',
+    'fieldset_import_section_behavior_instructions' => 'Choisissez si les sections de jeux de champs importées doivent être conservées ou aplaties dans cette section.',
     'fieldset_intro' => 'Les jeux de champs sont des compagnons optionnels des Blueprints qui vous permettent de créer des partiels réutilisables dans tous vos Blueprints.',
     'fieldset_link_fields_prefix_instructions' => 'Tous les champs du jeu de champs lié seront préfixés avec ceci. Utile quand vous voulez importer les mêmes champs plusieurs fois.',
     'fieldsets_handle_instructions' => 'Utilisé pour référencer ce jeu de champs sur le frontal. Ceci ne sera pas facile à modifier par la suite.',
@@ -137,6 +140,7 @@
     'form_configure_store_instructions' => 'Désactivez cette option pour ne plus stocker les soumissions. Les évènements et les notifications seront toujours envoyés.',
     'form_configure_title_instructions' => 'Habituellement un appel à l’action, comme "Contactez-nous".',
     'form_create_description' => 'Commencez par créer votre premier formulaire.',
+    'form_export_filtered_description' => 'Exportez les soumissions avec les filtres actuels et les colonnes visibles.',
     'getting_started_widget_collections' => 'Les collections contiennent les différents types de contenu de votre site.',
     'getting_started_widget_docs' => 'Apprenez à connaître Statamic pour bien comprendre ses capacités.',
     'getting_started_widget_header' => 'Débuter avec Statamic',
@@ -185,6 +189,12 @@
     'navigation_documentation_instructions' => 'En savoir plus sur la construction, la configuration et le rendu des navigations.',
     'navigation_link_to_entry_instructions' => 'Ajoutez un lien à une entrée. Activez les liens avec des collections supplémentaires dans l’espace de configuration.',
     'navigation_link_to_url_instructions' => 'Ajoutez un lien vers n’importe quelle URL interne ou externe. Activez les liens vers les entrées dans l’espace de configuration.',
+    'oauth_already_connected' => 'Votre compte :provider est déjà connecté.',
+    'oauth_belongs_to_another_user' => 'Ce compte :provider est déjà associé à un autre utilisateur.',
+    'oauth_connect_unsupported' => 'Ce fournisseur ne prend pas en charge la connexion de comptes.',
+    'oauth_connected' => 'Votre compte :provider a été connecté.',
+    'oauth_disconnected' => 'Votre compte :provider a été déconnecté.',
+    'oauth_email_exists' => 'Un compte associé à cette adresse e-mail existe déjà. Connectez-vous et associez ce fournisseur depuis les paramètres de votre compte.',
     'outpost_error_422' => 'Erreur de communication avec statamic.com.',
     'outpost_error_429' => 'Trop de demandes à statamic.com.',
     'outpost_issue_try_later' => 'Un problème est survenu lors de la communication avec statamic.com. Veuillez réessayer plus tard.',
@@ -199,6 +209,8 @@
     'phpinfo_utility_description' => 'Vérifiez vos paramètres de configuration PHP et les modules installés.',
     'plus_count_more' => '+ :count de plus',
     'preference_confirm_dirty_navigation_instructions' => 'Si vous devez recevoir un avertissement lorsque vous essayez de quitter la page et qu’il y a des modifications non enregistrées.',
+    'preference_formatting_locale_instructions' => 'Le paramètre de langue utilisé pour la mise en forme des valeurs de dates et de nombres dans le Panneau de configuration.',
+    'preference_formatting_locale_invalid' => 'Veuillez saisir un code de langue valide.',
     'preference_locale_instructions' => 'La langue d’affichage préférée du Panneau de configuration.',
     'preference_start_page_instructions' => 'La première page affichée après connexion au Panneau de configuration.',
     'preference_strict_accessibility_instructions' => 'Nous avons conçu le Panneau de configuration dans un souci d’accessibilité, en nous efforçant de respecter autant que possible les directives WCAG 2.2. Activez cette option pour appliquer des règles d’accessibilité plus strictes en augmentant le contraste des bordures du formulaire.',
@@ -208,6 +220,7 @@
     'publish_actions_publish' => 'Les modifications apportées à la copie de travail s’appliqueront à l’entrée et celle-ci sera publiée immédiatement.',
     'publish_actions_schedule' => 'Les modifications apportées à la copie de travail s’appliqueront à l’entrée et celle-ci paraîtra publiée à la date sélectionnée.',
     'publish_actions_unpublish' => 'La révision actuelle sera dépubliée.',
+    'relationship_item_unavailable' => 'Cet élément n\'est pas disponible. Il a peut-être été supprimé, ou vous n\'avez pas l\'autorisation de le voir.',
     'reset_password_notification_body' => 'Vous recevez cet email car nous avons reçu une demande de réinitialisation du mot de passe pour votre compte.',
     'reset_password_notification_no_action' => 'Si vous n’avez pas demandé de réinitialisation de mot de passe, aucune autre action n’est requise.',
     'reset_password_notification_subject' => 'Notification de réinitialisation du mot de passe',
@@ -252,6 +265,7 @@
     'taxonomy_next_steps_configure_description' => 'Configurez des noms, associez des collections, définissez des Blueprints et plus encore.',
     'taxonomy_next_steps_create_term_description' => 'Créez votre premier terme ou générez une poignée de termes génériques, à vous de voir.',
     'theme_share_instructions' => 'Publiez ce thème via votre compte statamic.com pour le rendre accessible aux autres utilisateurs.',
+    'tree_aria_instructions' => 'Utilisez les flèches directionnelles pour naviguer. Appuyez sur Alt/Option + flèches directionnelles pour réorganiser les touches.',
     'try_again_in_minutes' => 'Réessayez dans une minute.|Réessayez dans :count minutes.',
     'try_again_in_seconds' => '{0,1} Réessayez maintenant. | Réessayez dans :count secondes.',
     'two_factor_account_requirement' => 'Votre compte nécessite une authentification à deux facteurs. Veuillez l’activer avant de continuer.',
diff --git a/lang/fr/permissions.php b/lang/fr/permissions.php
index 88a1d6f05de..a4eaf7b186a 100644
--- a/lang/fr/permissions.php
+++ b/lang/fr/permissions.php
@@ -77,7 +77,8 @@
     'edit_roles' => 'Modifier les rôles',
     'assign_user_groups' => 'Affecter des groupes aux utilisateurs',
     'assign_roles' => 'Affecter des rôles aux utilisateurs',
-    'impersonate_users' => 'Usurper l’identité des utilisateurs',
+    'impersonate_users' => 'Personnifier des utilisateurs',
+    'impersonate_users_desc' => 'Autorise la connexion en tant que n’importe quel utilisateur, y compris les super administrateurs. Accordez cette autorisation avec prudence.',
     'group_updates' => 'Mises à jour',
     'view_updates' => 'Voir les mises à jour',
     'group_addons' => 'Addons',
diff --git a/lang/fr/validation.php b/lang/fr/validation.php
index 9d023ea51fb..6af568b85a1 100644
--- a/lang/fr/validation.php
+++ b/lang/fr/validation.php
@@ -131,6 +131,7 @@
     'date_fieldtype_time_required' => 'Horaire obligatoire.',
     'duplicate_field_handle' => 'Le champ avec l’identifiant :handle ne peut pas être utilisé plus d’une fois.',
     'duplicate_uri' => 'URI en doublon :value',
+    'elevated_session_resend_code_unavailable' => 'Le renvoi du code n’est disponible que pour la méthode de vérification par code.',
     'elevated_session_verification_code' => 'Le code de vérification est incorrect.',
     'email_available' => 'Un utilisateur possédant cet email existe déjà.',
     'fieldset_imported_recursively' => 'Le jeu de champs :handle est importé de manière récursive.',
diff --git a/lang/hu.json b/lang/hu.json
index 42c1b9f00b5..2b5c72417ec 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -86,7 +86,6 @@
     "Always show": "Mindig mutasd",
     "Always Show Set Button": "Mindig mutasd a Szett gombot",
     "An entry will be deleted|:count entries will be deleted": "Egy bejegyzés törlésre kerül|:count bejegyzés törlésre kerül",
-    "An item with this ID could not be found": "Ezzel az azonosítóval rendelkező elem nem található",
     "and": "és",
     "and :count more": "és :count további",
     "Antlers": "Agancs",
@@ -99,6 +98,7 @@
     "Application Cache": "Alkalmazás gyorsítótár",
     "Application cache cleared.": "Az alkalmazás gyorsítótára törölve.",
     "Apply": "Alkalmazni",
+    "Save All": "Összes mentése",
     "Apply Link": "Link alkalmazása",
     "Are you sure you want to delete this column?": "Biztosan törli ezt az oszlopot?",
     "Are you sure you want to delete this entry?": "Biztosan törli ezt a bejegyzést?",
diff --git a/lang/hu/fieldtypes.php b/lang/hu/fieldtypes.php
index c6db51f4505..64bd8f92655 100644
--- a/lang/hu/fieldtypes.php
+++ b/lang/hu/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Mutassa meg a szószámot a mező alján.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Gomb csoport',
-    'checkboxes.config.inline' => 'A jelölőnégyzetek megjelenítése egy sorban.',
     'checkboxes.config.options' => 'Állítsa be a tömbkulcsokat és azok opcionális címkéit.',
     'checkboxes.title' => 'Jelölőnégyzet',
     'code.config.indent_size' => 'Állítsa be a behúzás méretét (szóközökben).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Ezek a területek különlegesek, mindegyik a maga módján.',
     'picker.category.structured.description' => 'Strukturált adatokat tároló mezők. Vannak, amelyek más mezőket is be tudnak fészkelni magukba.',
     'picker.category.text.description' => 'Olyan mezők, amelyek szöveget vagy Rich tartalmat vagy mindkettőt tartalmazza.',
-    'radio.config.inline' => 'A rádiógombok megjelenítése egy sorban.',
     'radio.config.options' => 'Állítsa be a tömb kulcsait és opcionális címkéit.',
     'radio.title' => 'Rádiógomb',
     'range.config.append' => 'Szöveg hozzáadása a csúszka végéhez (jobb oldalához).',
diff --git a/lang/hu/messages.php b/lang/hu/messages.php
index 314ef200093..e4221456893 100644
--- a/lang/hu/messages.php
+++ b/lang/hu/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'A munkapéldány módosításai a bejegyzésre alkalmazódnak, és azonnal közzétételre kerülnek.',
     'publish_actions_schedule' => 'A munkapéldány módosításai a bejegyzésre alkalmazódnak, és a kiválasztott napon megjelennek.',
     'publish_actions_unpublish' => 'A jelenlegi revízió közzététele visszavonásra kerül.',
+    'relationship_item_unavailable' => 'Ez az elem nem érhető el. Lehet, hogy törölték, vagy nincs jogosultsága a megtekintéséhez.',
     'reset_password_notification_body' => 'Azért kapta ezt az e-mailt, mert jelszó-visszaállítási kérést kaptunk fiókjához.',
     'reset_password_notification_no_action' => 'Ha nem kérte a jelszó visszaállítását, nincs szükség további teendőkre.',
     'reset_password_notification_subject' => 'Jelszó-visszaállítási kérés',
diff --git a/lang/id.json b/lang/id.json
index e9ff20cf12e..17dfb9e87df 100644
--- a/lang/id.json
+++ b/lang/id.json
@@ -86,7 +86,6 @@
     "Always show": "Selalu tunjukkan",
     "Always Show Set Button": "Selalu Tunjukkan Tombol Set",
     "An entry will be deleted|:count entries will be deleted": "Entri akan dihapus|:count entri akan dihapus",
-    "An item with this ID could not be found": "Item dengan ID ini tidak dapat ditemukan",
     "and": "dan",
     "and :count more": "dan :count lainnya",
     "Antlers": "Tanduk",
@@ -99,6 +98,7 @@
     "Application Cache": "Cache Aplikasi",
     "Application cache cleared.": "Cache aplikasi dihapus.",
     "Apply": "Menerapkan",
+    "Save All": "Simpan semua",
     "Apply Link": "Terapkan Tautan",
     "Are you sure you want to delete this column?": "Anda yakin ingin menghapus kolom ini?",
     "Are you sure you want to delete this entry?": "Anda yakin ingin menghapus entri ini?",
diff --git a/lang/id/fieldtypes.php b/lang/id/fieldtypes.php
index 329895ae28e..af1aea8f9e5 100644
--- a/lang/id/fieldtypes.php
+++ b/lang/id/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Tampilkan jumlah kata di bagian bawah kolom.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Button Group',
-    'checkboxes.config.inline' => 'Tampilkan kotak centang berturut-turut.',
     'checkboxes.config.options' => 'Atur kunci array dan label opsionalnya.',
     'checkboxes.title' => 'Checkboxes',
     'code.config.indent_size' => 'Setel ukuran indentasi pilihan Anda (dalam spasi).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Bidang-bidang ini istimewa, masing-masing dengan caranya sendiri.',
     'picker.category.structured.description' => 'Kolom yang menyimpan data terstruktur. Beberapa bahkan dapat menumpuk kolom lain di dalamnya.',
     'picker.category.text.description' => 'Bidang yang menyimpan rangkaian teks, konten kaya, atau keduanya.',
-    'radio.config.inline' => 'Tampilkan tombol radio berturut-turut.',
     'radio.config.options' => 'Atur kunci array dan label opsionalnya.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Tambahkan teks ke ujung (sisi kanan) slider.',
diff --git a/lang/id/messages.php b/lang/id/messages.php
index 27d1cf5fbbb..4c9f91503a4 100644
--- a/lang/id/messages.php
+++ b/lang/id/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Perubahan pada salinan pekerjaan akan diterapkan ke entri dan akan segera diterbitkan.',
     'publish_actions_schedule' => 'Perubahan pada salinan pekerjaan akan diterapkan ke entri dan itu akan muncul diterbitkan pada tanggal yang dipilih.',
     'publish_actions_unpublish' => 'Revisi saat ini tidak akan dipublikasikan.',
+    'relationship_item_unavailable' => 'Item ini tidak tersedia. Mungkin telah dihapus, atau Anda mungkin tidak memiliki izin untuk melihatnya.',
     'reset_password_notification_body' => 'Anda menerima email ini karena kami menerima permintaan pengaturan ulang kata sandi untuk akun Anda.',
     'reset_password_notification_no_action' => 'Jika Anda tidak meminta pengaturan ulang kata sandi, tidak ada tindakan lebih lanjut yang diperlukan.',
     'reset_password_notification_subject' => 'Atur Ulang Pemberitahuan Kata Sandi',
diff --git a/lang/it.json b/lang/it.json
index 73393916faf..dd3d763efb9 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -23,6 +23,8 @@
     "A User Group with that handle already exists.": "Esiste già un gruppo utenti con questo handle.",
     "A valid blueprint is required.": "È richiesto un progetto valido.",
     "Above": "Sopra",
+    "Accent Background": "Sfondo di evidenziazione",
+    "Accent Text": "Testo decorativo",
     "Action completed": "Azione completata",
     "Action failed": "Azione fallita",
     "Activate Account": "Attiva account",
@@ -86,7 +88,6 @@
     "Always show": "Mostra sempre",
     "Always Show Set Button": "Mostra sempre il pulsante Set",
     "An entry will be deleted|:count entries will be deleted": "Una voce verrà eliminata|:count voci verranno eliminate",
-    "An item with this ID could not be found": "Impossibile trovare un elemento con questo ID",
     "and": "e",
     "and :count more": "e altre :count",
     "Antlers": "Antlers",
@@ -99,6 +100,9 @@
     "Application Cache": "Cache dell'applicazione",
     "Application cache cleared.": "Cache dell'applicazione cancellata.",
     "Apply": "Applica",
+    "Save All": "Salva tutto",
+    "Applied to all users by default.": "Applicato a tutti gli utenti per impostazione predefinita.",
+    "Applied to your account.": "Applicato al tuo account.",
     "Apply Link": "Applica collegamento",
     "Are you sure you want to delete this column?": "Sei sicuro di voler eliminare questa colonna?",
     "Are you sure you want to delete this entry?": "Sei sicuro di voler eliminare questa voce?",
@@ -150,6 +154,7 @@
     "Available Columns": "Colonne disponibili",
     "Back to Users": "Torna agli utenti",
     "BCC Recipient(s)": "Destinatario\/i in CCN",
+    "Be sure your email settings are configured to send and receive notifications when forms are submitted.": "Assicurati che le impostazioni della tua email siano configurate per inviare e ricevere notifiche quando vengono inviati i moduli.",
     "Before": "Prima",
     "Before you can delete this fieldset, you need to remove references to it in blueprints and fieldsets:": "Prima di eliminare questo fieldset, è necessario rimuovere i riferimenti ad esso nei progetti e nei fieldset:",
     "Behavior": "Comportamento",
@@ -163,6 +168,8 @@
     "Blueprint saved": "Progetto salvato",
     "Blueprints": "Progetti",
     "Blueprints successfully reordered": "Progetti riordinati con successo",
+    "Body Background": "Sfondo del body",
+    "Body Border": "Bordo del body",
     "Bold": "Grassetto",
     "Border": "Confine",
     "Boundaries": "Confini",
@@ -209,6 +216,7 @@
     "Collection tree deleted": "Albero di raccolta eliminato",
     "Collection tree saved": "Albero di raccolta salvato",
     "Collections": "Raccolte",
+    "Color": "Colore",
     "Columns": "Colonne",
     "Columns have been reset to their defaults.": "Le colonne sono state ripristinate ai valori predefiniti.",
     "Commit": "Commit",
@@ -230,15 +238,20 @@
     "Configure Taxonomy": "Configura tassonomia",
     "Configure User Group": "Configura gruppo utenti",
     "Confirm": "Conferma",
+    "Confirm Dirty Navigation": "Conferma uscita con modifiche non salvate",
     "Confirm Password": "Conferma password",
+    "Confirm Your Identity": "Conferma la tua identità",
     "Container": "Contenitore",
     "Contains": "Contiene",
     "Contains Any": "Contiene qualsiasi",
     "Content": "Contenuto",
+    "Content Background": "Sfondo del contenuto",
+    "Content Border": "Bordo del contenuto",
     "Content committed": "Contenuto committato",
     "Content Model": "Modello di contenuto",
     "Content saved": "Contenuto salvato",
     "Content Stache": "Stache dei contenuti",
+    "Continue": "Continua",
     "Continue Editing": "Continua a modificare",
     "Copied to clipboard": "Copiato negli appunti",
     "Copy": "Copia",
@@ -293,6 +306,7 @@
     "Customize Columns": "Personalizza colonne",
     "Customize Invitation": "Personalizza invito",
     "Customizing the Control Panel Nav": "Personalizzazione della navigazione del pannello di controllo",
+    "Danger": "Pericolo",
     "Dark": "Scuro",
     "Dark Mode": "Modalità scura",
     "Dashboard": "Dashboard",
@@ -328,10 +342,14 @@
     "Deleted": "Eliminato",
     "Delete|Delete :count items?": "Elimina|Eliminare :count elementi?",
     "Descending": "Discendente",
+    "Description": "Descrizione",
     "Description of the image": "Descrizione dell'immagine",
     "Deselect option": "Deseleziona opzione",
     "Detach": "Stacca",
+    "Details": "Dettagli",
+    "Developer": "Sviluppatore",
     "Dictionary": "Dizionario",
+    "Dimensions": "Dimensioni",
     "Directory": "Cartella",
     "Directory already exists.": "La cartella esiste già.",
     "Disabled": "Disabilitato",
@@ -358,6 +376,7 @@
     "Duplicate IDs": "Duplica ID",
     "Duplicate Row": "Duplica riga",
     "Duplicate Set": "Duplica set",
+    "Duration": "Durata",
     "Duplicated": "Duplicato",
     "Dynamic": "Dinamica",
     "Dynamic Folder": "Cartella dinamica",
@@ -385,6 +404,7 @@
     "Edit Taxonomy": "Modifica tassonomia",
     "Edit Term": "Modifica termine",
     "Edit User": "Modifica utente",
+    "Edit User Blueprint": "Modifica il progetto dell'utente",
     "Edit User Group": "Modifica gruppo di utenti",
     "Editable once created": "Modificabile una volta creato",
     "Editions": "Edizioni",
@@ -437,6 +457,7 @@
     "Expect a root page": "Utilizza una pagina principale",
     "Expired": "Scaduto",
     "Export Submissions": "Esporta invii",
+    "Extension": "Estensione",
     "External link": "Link esterno",
     "False": "Falso",
     "Favorite removed": "Preferito rimosso",
@@ -461,16 +482,19 @@
     "Filter preset deleted": "Preset del filtro eliminata",
     "Filter preset saved": "Preset del filtro salvata",
     "Filter preset updated": "Preset del filtro aggiornata",
+    "Filters": "Filtri",
     "Finish": "Fine",
     "First Child": "Primo Figlio",
     "Fix": "Fix",
     "Fixed": "Sistemato",
     "Floating": "Fluttuante",
+    "Focus Outline": "Focus sul contorno",
     "Focal Point": "Punto focale",
     "Focus Search": "Focus ricerca",
     "Folder": "Cartella",
     "Folder created": "Cartella creata",
     "Folder Name": "Nome della cartella",
+    "For security, please re-authenticate your account.": "Per motivi di sicurezza, si prega di accedere nuovamente al proprio account.",
     "Forgot password?": "Hai dimenticato la password?",
     "Forgot Your Password?": "Hai dimenticato la password?",
     "Form already exists": "Il form esiste già",
@@ -479,6 +503,7 @@
     "Form saved": "Form salvato",
     "Form Submission": "Invio del form",
     "Format": "Formato",
+    "Formatting Locale": "Formattazione locale",
     "Forms": "Form",
     "Free": "Gratuito",
     "From": "Da",
@@ -486,7 +511,17 @@
     "Future Date Behavior": "Comportamento data futura",
     "General": "Generale",
     "Generate": "Genera",
+    "Get started by creating your first collection.": "Inizia creando la tua prima raccolta.",
+    "Get started by creating your first fieldset.": "Inizia creando il tuo fieldset.",
+    "Get started by creating your first form.": "Inizia creando il tuo primo form.",
+    "Get started by creating your first global set.": "Inizia creando il tuo primo globale.",
+    "Get started by creating your first navigation.": "Inizia creando il tuo primo menù.",
+    "Get started by creating your first taxonomy.": "Inizia creando la tua prima tassonomia.",
+    "Get started by creating your first user group.": "Inizia creando il tuo primo gruppo utente.",
+    "Get started by creating your first role.": "Inizia creando il tuo primo ruolo.",
     "Git": "Git",
+    "Global Header Background": "Sfondo dell'intestazione globale",
+    "Global Preferences": "Preferenze globali",
     "Global Search": "Ricerca globale",
     "Global Set created": "Globale creato",
     "Global Set deleted": "Globale eliminato",
@@ -495,6 +530,7 @@
     "Global Variables": "Variabili globali",
     "Globals": "Globali",
     "Go To Listing": "Vai all'elenco",
+    "Grays": "Grigi",
     "Greater than": "Maggiore di",
     "Greater than or equals": "Maggiore o uguale",
     "Grid": "Griglia",
@@ -508,6 +544,7 @@
     "Heading 5": "Titolo 5",
     "Heading 6": "Titolo 6",
     "Heading Anchors": "Intestazione Ancore",
+    "Height": "Altezza",
     "Hello!": "Ciao!",
     "Here": "Qui",
     "Hidden": "Nascosto",
@@ -641,6 +678,7 @@
     "Move": "Sposta",
     "Move Asset|Move :count Assets": "Sposta file|Sposta :count file",
     "Move Folder|Move :count Folders": "Sposta cartella | Sposta :count cartelle",
+    "Move to folder": "Sposta nella cartella",
     "Moved Item": "Elemento spostato",
     "Multi-Site": "Multi-sito",
     "Multiple": "Multiplo",
@@ -691,9 +729,11 @@
     "or": "oppure",
     "or drag & drop here to replace.": "oppure trascina e rilascia qui per sostituire.",
     "or drag & drop here.": "oppure trascinalo qui.",
+    "Or sign in with": "Oppure accedi con",
     "Orderable": "Ordinabile",
     "Ordered List": "Lista ordinata",
     "Ordering": "Ordinamento",
+    "Orientation": "Orientamento",
     "Origin": "Origine",
     "Origin Behavior": "Origine Comportamento",
     "Other": "Altro",
@@ -729,17 +769,21 @@
     "Preview Targets": "Anteprima degli obiettivi",
     "Previous": "Precedente",
     "Price": "Prezzo",
+    "Primary": "Primario",
     "Pro": "Pro",
     "Pro Tip": "Suggerimento Pro",
     "Process Source Images": "Processa Immagini Originali",
     "Profile": "Profilo",
+    "Progress Bar": "Barra dei progressi",
     "Propagate": "Propagare",
+    "Properties": "Proprietà",
     "Protected Page": "Pagina protetta",
     "Publish": "Pubblica",
     "Publish by Default": "Pubblica per impostazione predefinita",
     "Publish Date": "Data di pubblicazione",
     "Publish Entry|Publish :count Entries": "Pubblica voce|Pubblica :count voci",
     "Publish Now": "Pubblica ora",
+    "Publish this theme through your statamic.com account to make it available to others.": "Pubblica questo tema tramite il tuo account statimic.com per renderlo disponibile agli altri.",
     "Published": "Pubblicato",
     "Push Tags": "Inserimento Tag",
     "Query Scopes": "Query Scopes",
@@ -883,8 +927,11 @@
     "Show when": "Mostra quando",
     "Show Word Count": "Mostra conteggio parole",
     "Shown by default": "Mostrato per impostazione predefinita",
+    "Sign in with email": "Accedi con l'email",
+    "Sign into your Statamic Control Panel": "Accedi al tuo pannello di controllo Statamic",
     "Single": "Singolo",
     "Site": "Sito",
+    "Site Defaults": "Impostazioni predefinite del sito",
     "Site deleted": "Sito cancellato",
     "Site saved": "Sito salvato",
     "Site selected.": "Sito selezionato.",
@@ -918,6 +965,7 @@
     "Stop Impersonating": "Smettila di impersonare",
     "Store Submissions": "Memorizza invii",
     "Strategy": "Strategia",
+    "Stricter WCAG 2.2 Mode": "Modalità WCAG 2.2 più rigorosa",
     "Strikethrough": "Barrato",
     "Structured": "Strutturato",
     "Subject": "Oggetto",
@@ -927,11 +975,13 @@
     "Submissions": "Invii",
     "Submit": "Invia",
     "Subscript": "Pedice",
+    "Success": "Successo",
     "Super Admin": "Super Admin",
     "Super User": "Super Utente",
     "Superscript": "Apice",
     "Support": "Supporto",
     "Swatches": "Campioni",
+    "Switch Background": "Sfondo dell'interruttore",
     "Sync": "Sincronizza",
     "System": "Sistema",
     "System default": "Predefinito di sistema",
@@ -961,6 +1011,7 @@
     "The given data was invalid.": "I dati forniti non sono validi.",
     "The Statamic Playground": "Statamic Playground",
     "Theme": "Tema",
+    "Themes": "Temi",
     "There are no entries in this collection": "Non ci sono voci in questa raccolta",
     "These are now your default columns.": "Queste sono ora le colonne predefinite.",
     "This action is unauthorized.": "Questa azione non è consentita.",
@@ -987,10 +1038,12 @@
     "Toggle Sidebar": "Attiva\/Disattiva barra laterale",
     "Toolbar Mode": "Modalità barra degli strumenti",
     "Tools": "Strumenti",
+    "Transparency": "Trasparenza",
     "Tree": "Albero",
     "Trial Mode": "Modalità di prova",
     "True": "Vero",
     "Try again": "Riprova",
+    "Type": "Tipo",
     "Typeahead Field": "Campo Suggerimento",
     "UI Mode": "Modalità UI",
     "Unable to change password": "Impossibile cambiare la password",
@@ -1036,6 +1089,7 @@
     "User group saved": "Gruppo utente salvato",
     "User Groups": "Gruppi utente",
     "User Information": "Informazioni utente",
+    "User Preferences": "Preferenze dell'utente",
     "User saved": "Utente salvato",
     "Username": "Username",
     "Users": "Utenti",
@@ -1043,6 +1097,7 @@
     "Validation": "Validazione",
     "Validation Rules": "Regole di validazione",
     "Value": "Valore",
+    "Version": "Versione",
     "View": "Vista",
     "View additional releases": "Visualizza versioni aggiuntive",
     "View All": "Mostra tutto",
@@ -1065,6 +1120,7 @@
     "Words": "Parole",
     "Working Copy": "Copia di lavoro",
     "Working copy has unsaved changes": "La copia di lavoro presenta modifiche non salvate",
+    "Width": "Larghezza",
     "Write": "Scrivi",
     "You are not authorized to configure navs.": "Non sei autorizzato a configurare navigazioni.",
     "You are not authorized to create collections.": "Non sei autorizzato a creare raccolte.",
diff --git a/lang/it/fieldtypes.php b/lang/it/fieldtypes.php
index 6848c396a63..abffcd16de6 100644
--- a/lang/it/fieldtypes.php
+++ b/lang/it/fieldtypes.php
@@ -49,7 +49,6 @@
     'bard.config.word_count' => 'Visualizza il conteggio delle parole nella parte inferiore del campo.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Gruppo di pulsanti',
-    'checkboxes.config.inline' => 'Visualizza le checkbox in riga.',
     'checkboxes.config.options' => 'Imposta le chiavi dell\'array e le relative etichette opzionali.',
     'checkboxes.title' => 'Checkboxes',
     'code.config.indent_size' => 'Imposta la dimensione dell\'indentazione preferita (in spazi).',
@@ -130,7 +129,6 @@
     'picker.category.special.description' => 'Questi campi sono speciali, ognuno a suo modo.',
     'picker.category.structured.description' => 'Campi che gestiscono dati strutturati. Alcuni possono anche annidare altri campi al loro interno.',
     'picker.category.text.description' => 'Campi che gestiscono stringhe di testo, "testo ricco" o entrambi.',
-    'radio.config.inline' => 'Mostra le opzioni in linea.',
     'radio.config.options' => 'Imposta le chiavi dell\'array e le relative etichette opzionali.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Aggiungi del testo a destra dello slider.',
diff --git a/lang/it/messages.php b/lang/it/messages.php
index c50ed37ca7e..cbe99080bf1 100644
--- a/lang/it/messages.php
+++ b/lang/it/messages.php
@@ -179,14 +179,19 @@
     'password_protect_token_invalid' => 'Token non valido o scaduto.',
     'password_protect_token_missing' => 'Token di sicurezza mancante. È necessario arrivare a questa schermata dall\'URL originale protetto.',
     'phpinfo_utility_description' => 'Controlla la configurazione di PHP ed i moduli installati.',
+    'preference_confirm_dirty_navigation_instructions' => 'Mostra un avviso quando tenti di abbandonare la pagina se ci sono modifiche che non hai ancora salvato.',
     'preference_favorites_instructions' => 'Le scorciatoie che verranno visualizzate all\'apertura della barra di ricerca globale. In alternativa, è possibile visitare una pagina e utilizzare l\'icona a forma di puntina in alto per aggiungerla a questo elenco.',
+    'preference_formatting_locale_instructions' => 'Le impostazioni locali utilizzate per la formattazione dei valori nel pannello di controllo, come date e numeri.',
     'preference_locale_instructions' => 'La lingua preferita per il pannello di controllo.',
     'preference_start_page_instructions' => 'La pagina da visualizzare quando si accede al pannello di controllo.',
+    'preference_strict_accessibility_instructions' => 'Abbiamo progettato il pannello di controllo pensando all\'accessibilità, cercando di rispettare, ove possibile, le linee guida WCAG 2.2. Attiva questa opzione per applicare regole di accessibilità più rigorose aumentando il contrasto dei bordi del modulo.',
+    'preference_theme_instructions' => 'Personalizza i colori e l\'aspetto del pannello di controllo',
     'publish_actions_create_revision' => 'Verrà creata una revisione basata sulla copia di lavoro. L\'attuale revisione non cambierà.',
     'publish_actions_current_becomes_draft_because_scheduled' => 'Poiché la revisione corrente viene pubblicata e hai selezionato una data futura, una volta inviata, la revisione verrà trattata come una bozza fino alla data di pubblicazione selezionata.',
     'publish_actions_publish' => 'Le modifiche alla copia di lavoro verranno applicate alla voce e sarà pubblicata immediatamente.',
     'publish_actions_schedule' => 'Le modifiche alla copia di lavoro verranno applicate alla voce ed apparirà pubblicata nella data selezionata.',
     'publish_actions_unpublish' => 'L\'attuale revisione non sarà pubblicata.',
+    'relationship_item_unavailable' => 'Questo elemento non è disponibile. Potrebbe essere stato eliminato oppure non hai i permessi per visualizzarlo.',
     'reset_password_notification_body' => 'Ricevi questa email perché abbiamo ricevuto una richiesta di reimpostazione della password per il tuo account.',
     'reset_password_notification_no_action' => 'Se non hai richiesto la reimpostazione della password, non sono necessarie ulteriori azioni.',
     'reset_password_notification_subject' => 'Reimposta la password',
diff --git a/lang/ja.json b/lang/ja.json
index 3b8c1e48cef..e6c44f10dce 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -86,7 +86,6 @@
     "Always show": "いつも見せる",
     "Always Show Set Button": "常に設定ボタンを表示",
     "An entry will be deleted|:count entries will be deleted": "エントリが削除されます| :count個のエントリが削除されます",
-    "An item with this ID could not be found": "この ID のアイテムが見つかりませんでした",
     "and": "そして",
     "and :count more": "そして:count",
     "Antlers": "アントラーズ",
@@ -99,6 +98,7 @@
     "Application Cache": "アプリケーションキャッシュ",
     "Application cache cleared.": "アプリケーションキャッシュがクリアされました。",
     "Apply": "適用する",
+    "Save All": "すべて保存",
     "Apply Link": "リンクを適用する",
     "Are you sure you want to delete this column?": "この列を削除してもよろしいですか?",
     "Are you sure you want to delete this entry?": "このエントリを削除してもよろしいですか?",
diff --git a/lang/ja/fieldtypes.php b/lang/ja/fieldtypes.php
index 9dc923fcd75..45806a9e0c3 100644
--- a/lang/ja/fieldtypes.php
+++ b/lang/ja/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'フィールドの下部に単語数を表示します。',
     'bard.title' => '吟遊詩人',
     'button_group.title' => 'ボタングループ',
-    'checkboxes.config.inline' => 'チェックボックスを連続して表示します。',
     'checkboxes.config.options' => '配列キーとそのオプションのラベルを設定します。',
     'checkboxes.title' => 'チェックボックス',
     'code.config.indent_size' => '好みのインデント サイズ (スペース単位) を設定します。',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'これらの分野はそれぞれ独自の方法で特別です。',
     'picker.category.structured.description' => '構造化データを格納するフィールド。中には他のフィールドをネストできるものもあります。',
     'picker.category.text.description' => 'テキストの文字列、リッチコンテンツ、またはその両方を保存するフィールド。',
-    'radio.config.inline' => 'ラジオボタンを連続して表示します。',
     'radio.config.options' => '配列キーとそのオプションのラベルを設定します。',
     'radio.title' => '無線',
     'range.config.append' => 'スライダーの端（右側）にテキストを追加します。',
diff --git a/lang/ja/messages.php b/lang/ja/messages.php
index 9b8035b5dd8..a252c8c92a6 100644
--- a/lang/ja/messages.php
+++ b/lang/ja/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => '作業コピーへの変更はエントリに適用され、すぐに公開されます。',
     'publish_actions_schedule' => '作業コピーへの変更がエントリに適用され、選択した日付に公開されるようになります。',
     'publish_actions_unpublish' => '現在のリビジョンは非公開になります。',
+    'relationship_item_unavailable' => 'この項目は利用できません。削除されたか、表示する権限がない可能性があります。',
     'reset_password_notification_body' => 'このメールは、アカウントのパスワード リセット リクエストを受け取ったためにお送りしています。',
     'reset_password_notification_no_action' => 'パスワードのリセットを要求していない場合は、それ以上のアクションは必要ありません。',
     'reset_password_notification_subject' => 'パスワードリセット通知',
diff --git a/lang/ms.json b/lang/ms.json
index 36f4ea8d0c8..b79e48b24ff 100644
--- a/lang/ms.json
+++ b/lang/ms.json
@@ -86,7 +86,6 @@
     "Always show": "Sentiasa tunjuk",
     "Always Show Set Button": "Sentiasa tunjuk Set Butang",
     "An entry will be deleted|:count entries will be deleted": "Entri akan dihapus|:count entri akan dihapus",
-    "An item with this ID could not be found": "Item dengan ID ini tidak dapat dicari",
     "and": "dan",
     "and :count more": "dan :count lagi",
     "Antlers": "Tanduk",
@@ -99,6 +98,7 @@
     "Application Cache": "Cache Aplikasi",
     "Application cache cleared.": "Cache aplikasi dihapus.",
     "Apply": "Mohon",
+    "Save All": "Simpan semua",
     "Apply Link": "Gunakan Pautan",
     "Are you sure you want to delete this column?": "Anda pasti ingin menghapus lajur ini?",
     "Are you sure you want to delete this entry?": "Anda pasti ingin menghapus entri ini?",
diff --git a/lang/ms/fieldtypes.php b/lang/ms/fieldtypes.php
index 19bd59c4af0..a9fcf859377 100644
--- a/lang/ms/fieldtypes.php
+++ b/lang/ms/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Tunjukkan bilangan perkataan di bahagian bawah medan.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Translation ',
-    'checkboxes.config.inline' => 'Tunjukkan kotak semak dalam satu baris.',
     'checkboxes.config.options' => 'Tetapkan kunci tatasusunan dan label pilihannya.',
     'checkboxes.title' => 'Kotak semak',
     'code.config.indent_size' => 'Tetapkan saiz lekukan pilihan anda (dalam ruang).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Bidang ini istimewa, masing-masing dengan cara mereka sendiri.',
     'picker.category.structured.description' => 'Bidang yang menyimpan data berstruktur. Malah ada yang boleh menyarangkan bidang lain di dalam diri mereka.',
     'picker.category.text.description' => 'Bidang yang menyimpan rentetan teks, kandungan kaya atau kedua-duanya.',
-    'radio.config.inline' => 'Tunjukkan butang radio dalam satu baris.',
     'radio.config.options' => 'Tetapkan kunci tatasusunan dan label pilihannya.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Tambahkan teks pada hujung (sebelah kanan) peluncur.',
diff --git a/lang/ms/messages.php b/lang/ms/messages.php
index f7dfe5e6b9f..e90b50732df 100644
--- a/lang/ms/messages.php
+++ b/lang/ms/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Perubahan pada salinan kerja akan digunakan pada penyertaan dan ia akan diterbitkan serta-merta.',
     'publish_actions_schedule' => 'Perubahan pada salinan kerja akan digunakan pada penyertaan dan ia akan dipaparkan pada tarikh yang dipilih.',
     'publish_actions_unpublish' => 'Semakan semasa akan dinyahterbitkan.',
+    'relationship_item_unavailable' => 'Item ini tidak tersedia. Ia mungkin telah dipadam, atau anda mungkin tidak mempunyai kebenaran untuk melihatnya.',
     'reset_password_notification_body' => 'Anda menerima e-mel ini kerana kami menerima permintaan tetapan semula kata laluan untuk akaun anda.',
     'reset_password_notification_no_action' => 'Jika anda tidak meminta tetapan semula kata laluan, tiada tindakan lanjut diperlukan.e menerima permintaan tetapan semula kata laluan untuk akaun anda.',
     'reset_password_notification_subject' => 'Tetapkan Semula Pemberitahuan Kata Laluan',
diff --git a/lang/nb.json b/lang/nb.json
index 95d37ec8d1b..af983e90438 100644
--- a/lang/nb.json
+++ b/lang/nb.json
@@ -87,7 +87,6 @@
     "Always show": "Vis alltid",
     "Always Show Set Button": "Vis alltid Set-knappen",
     "An entry will be deleted|:count entries will be deleted": "En oppføring slettes|:count oppføringer slettes",
-    "An item with this ID could not be found": "Fant ikke element med denne ID-en",
     "and": "og",
     "and :count more": "og :count mer",
     "Antlers": "Antlers",
@@ -102,6 +101,7 @@
     "Applied to all users by default.": "Standard preferanser for alle brukere.",
     "Applied to your account.": "Preferanser for din konto.",
     "Apply": "Bruk",
+    "Save All": "Lagre alle",
     "Apply & Save": "Bruk & lagre",
     "Apply Link": "Bruk lenke",
     "Are you sure you want to delete this column?": "Er du sikker på at du vil slette denne kolonnen?",
diff --git a/lang/nb/fieldtypes.php b/lang/nb/fieldtypes.php
index 0cc843332d4..e1955785ed5 100644
--- a/lang/nb/fieldtypes.php
+++ b/lang/nb/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Vis antall ord i bunn av feltet.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Knappegruppe',
-    'checkboxes.config.inline' => 'Vis avmerkingsboksene på en rad.',
     'checkboxes.config.options' => 'Angi matrisenøkler og tilknyttede valgfrie etiketter.',
     'checkboxes.title' => 'Avmerkingsbokser',
     'code.config.indent_size' => 'Angi ønsket innrykk (i antall mellomrom).',
@@ -131,7 +130,6 @@
     'picker.category.special.description' => 'Disse feltene er spesielle på hver sin måte.',
     'picker.category.structured.description' => 'Felt som lagrer strukturerte data. Noen felt kan til og med ha nestede felt inni seg.',
     'picker.category.text.description' => 'Felt som lagrer strenger av tekst, rikt innhold eller begge deler.',
-    'radio.config.inline' => 'Vis valgknappene på en rad.',
     'radio.config.options' => 'Angi matrisenøkler og tilknyttede valgfrie etiketter.',
     'radio.title' => 'Valgknapp',
     'range.config.append' => 'Legg til tekst på slutten (til høyre) av glidebryteren.',
diff --git a/lang/nb/messages.php b/lang/nb/messages.php
index 0999174955b..4444c276b4c 100644
--- a/lang/nb/messages.php
+++ b/lang/nb/messages.php
@@ -190,6 +190,7 @@
     'publish_actions_publish' => 'Endringer i arbeidskopien brukes, og den publiseres umiddelbart.',
     'publish_actions_schedule' => 'Endringer i arbeidskopien brukes, og den publiseres på den valgte datoen.',
     'publish_actions_unpublish' => 'Den gjeldende revisjonen vil ikke bli publisert.',
+    'relationship_item_unavailable' => 'Dette elementet er ikke tilgjengelig. Det kan ha blitt slettet, eller du har kanskje ikke tilgang til å se det.',
     'reset_password_notification_body' => 'Du får denne e-posten fordi vi har mottatt en forespørsel om tilbakestilling av passordet som er tilknyttet kontoen din.',
     'reset_password_notification_no_action' => 'Hvis du ikke har sendt inn en forespørsel om tilbakestilling av passord, trenger du ikke å foreta deg noe.',
     'reset_password_notification_subject' => 'Varsel om tilbakestilling av passord',
diff --git a/lang/nl.json b/lang/nl.json
index d669b65714e..405030b35fc 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -33,7 +33,6 @@
     "Add": "Toevoegen",
     "Add a link label": "Voeg een linklabel toe",
     "Add Attribute": "Voeg attribuut toe",
-    "Add Block": "Voeg blok toe",
     "Add child link to entry": "Voeg een child link toe aan entry",
     "Add child nav item": "Voeg een child navigatie-item toe",
     "Add Color": "Voeg een kleur toe",
@@ -109,6 +108,7 @@
     "Apply": "Toepassen",
     "Apply & Close All": "Toepassen & alles sluiten",
     "Apply & Save": "Toepassen & opslaan",
+    "Save All": "Alles opslaan",
     "Apply Link": "Link bevestigen",
     "Apply Query Scopes": "Query-scopes toepassen",
     "Are you sure you want to delete this column?": "Weet je zeker dat je deze kolom wilt verwijderen?",
@@ -585,7 +585,6 @@
     "Icon": "Icoon",
     "Icon Set": "pictogram set",
     "ID": "ID",
-    "ID not found": "ID niet gevonden",
     "ID regenerated and Stache cleared": "ID's opnieuw gegenereerd en Stache geleegd",
     "If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Als je problemen ondervindt bij het klikken op de knop \":actionText\", kopieer en plak de onderstaande URL dan in je webbrowser:",
     "Image": "Afbeelding",
diff --git a/lang/nl/fieldtypes.php b/lang/nl/fieldtypes.php
index dad2287abac..1bed61912fb 100644
--- a/lang/nl/fieldtypes.php
+++ b/lang/nl/fieldtypes.php
@@ -49,7 +49,6 @@
     'bard.config.word_count' => 'Toon het aantal woorden onderaan het veld.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Button Group',
-    'checkboxes.config.inline' => 'Toon de checkboxes in een rij.',
     'checkboxes.config.options' => 'Stel de array keys en hun optionele labels in',
     'checkboxes.title' => 'Checkboxes',
     'code.config.indent_size' => 'Stel in hoeveel indentatie je wilt (in spaties).',
@@ -141,7 +140,6 @@
     'picker.category.special.description' => 'Deze velden zijn speciaal, ieder op zijn eigen manier.',
     'picker.category.structured.description' => 'Velden die data gestructureerd opslaan. Sommige kunnen andere velden bevatten.',
     'picker.category.text.description' => 'Velden die strings met tekst, rich content of beide opslaan.',
-    'radio.config.inline' => 'Toon de radioknoppen in een rij.',
     'radio.config.options' => 'Stel de array keys en hun optionele labels in.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Voeg tekst toe aan de het einde (rechterkant) van de slider.',
diff --git a/lang/nl/messages.php b/lang/nl/messages.php
index 36de0467623..3149af8d0e7 100644
--- a/lang/nl/messages.php
+++ b/lang/nl/messages.php
@@ -208,6 +208,7 @@
     'publish_actions_publish' => 'Aanpassingen aan de werkkopie worden toegepast op de entry en onmiddelijk gepubliceerd.',
     'publish_actions_schedule' => 'Aanpassingen aan de werkkopie worden toegepast op de entry en gepubliceerd op de publicatiedatum.',
     'publish_actions_unpublish' => 'De huidige revisie wordt gedepubliceerd.',
+    'relationship_item_unavailable' => 'Dit item is niet beschikbaar. Het is mogelijk verwijderd, of je hebt geen toestemming om het te bekijken.',
     'reset_password_notification_body' => 'Je ontvangt deze e-mail, omdat we een verzoek hebben gekregen om je wachtwoord te resetten.',
     'reset_password_notification_no_action' => 'Als je geen verzoek hebt gedaan om je wachtwoord te resetten dan hoef je verder niets te doen.',
     'reset_password_notification_subject' => 'Wachtwoordresetnotificatie',
diff --git a/lang/pl.json b/lang/pl.json
index 66ec8c9f4c0..ea74c4a2118 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -86,7 +86,6 @@
     "Always show": "Zawsze pokazuj",
     "Always Show Set Button": "Zawsze pokazuj przycisk ustawiania",
     "An entry will be deleted|:count entries will be deleted": "Rekord zostanie usunięty|:count rekordów zostanie usuniętych",
-    "An item with this ID could not be found": "Nie można znaleźć przedmiotu o tym ID",
     "and": "i",
     "and :count more": "i :count więcej",
     "Antlers": "Poroże",
@@ -99,6 +98,7 @@
     "Application Cache": "Pamięć cache aplikacji",
     "Application cache cleared.": "Pamięć cache aplikacji usunięta.",
     "Apply": "Stosować",
+    "Save All": "Zapisz wszystko",
     "Apply Link": "Zastosuj link",
     "Are you sure you want to delete this column?": "Czy na pewno chcesz usunąć tę kolumnę?",
     "Are you sure you want to delete this entry?": "Czy na pewno chcesz usunąć ten rekord?",
diff --git a/lang/pl/fieldtypes.php b/lang/pl/fieldtypes.php
index 398731532dc..02154b139a8 100644
--- a/lang/pl/fieldtypes.php
+++ b/lang/pl/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Pokaż liczbę słów na dole pola.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Grupa przycisków',
-    'checkboxes.config.inline' => 'Pokaż pola wyboru w rzędzie.',
     'checkboxes.config.options' => 'Ustaw klucze tablicy i ich opcjonalne etykiety.',
     'checkboxes.title' => 'Pola wyboru',
     'code.config.indent_size' => 'Ustaw preferowany rozmiar wcięcia (w spacjach).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Te pola są specjalne, każde na swój sposób.',
     'picker.category.structured.description' => 'Pola przechowujące uporządkowane dane. Niektóre mogą nawet zawierać inne pola w sobie.',
     'picker.category.text.description' => 'Pola przechowujące ciągi tekstowe, bogatą zawartość lub oba.',
-    'radio.config.inline' => 'Pokaż przyciski radiowe w rzędzie.',
     'radio.config.options' => 'Ustaw klucze tablicy i ich opcjonalne etykiety.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Dodaj tekst na końcu (po prawej stronie) suwaka.',
diff --git a/lang/pl/messages.php b/lang/pl/messages.php
index d2024663dd6..9fc03640588 100644
--- a/lang/pl/messages.php
+++ b/lang/pl/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Zmiany w kopii roboczej zostaną zastosowane do wpisu i zostanie on natychmiast opublikowany.',
     'publish_actions_schedule' => 'Zmiany w kopii roboczej zostaną zastosowane do wpisu, który będzie wyświetlany jako opublikowany od wybranej daty.',
     'publish_actions_unpublish' => 'Bieżąca rewizja zostanie cofnięta z publikacji.',
+    'relationship_item_unavailable' => 'Ten element jest niedostępny. Mógł zostać usunięty lub nie masz uprawnień, aby go wyświetlić.',
     'reset_password_notification_body' => 'Otrzymujesz ten e-mail, ponieważ otrzymaliśmy prośbę o zresetowanie hasła dla Twojego konta.',
     'reset_password_notification_no_action' => 'Jeśli nie żądałeś zresetowania hasła, nie są wymagane żadne dalsze działania.',
     'reset_password_notification_subject' => 'Powiadomienie o Zresetowaniu Hasła',
diff --git a/lang/pt.json b/lang/pt.json
index 127ef0b7496..04d5d4463f1 100644
--- a/lang/pt.json
+++ b/lang/pt.json
@@ -86,7 +86,6 @@
     "Always show": "Mostrar sempre",
     "Always Show Set Button": "Botão Mostrar Set sempre",
     "An entry will be deleted|:count entries will be deleted": "Uma entrada será excluída | :count entradas de :count serão excluídas",
-    "An item with this ID could not be found": "Não foi possível encontrar um elemento com este ID",
     "and": "e",
     "and :count more": "e :count mais",
     "Antlers": "Chifres",
@@ -99,6 +98,7 @@
     "Application Cache": "Cache da aplicação",
     "Application cache cleared.": "Cache da aplicação limpo",
     "Apply": "Aplicar",
+    "Save All": "Guardar tudo",
     "Apply Link": "Aplicar Link",
     "Are you sure you want to delete this column?": "Tem a certeza de que deseja eliminar esta coluna?",
     "Are you sure you want to delete this entry?": "Tem certeza de que deseja eliminar esta entrada?",
diff --git a/lang/pt/fieldtypes.php b/lang/pt/fieldtypes.php
index 4e44281d368..bec6ffde8d2 100644
--- a/lang/pt/fieldtypes.php
+++ b/lang/pt/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Mostre a contagem de palavras na parte inferior do campo.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Button Group',
-    'checkboxes.config.inline' => 'Mostrar as caixas de seleção em seguida.',
     'checkboxes.config.options' => 'Defina as chaves da matriz e as suas etiquetas opcionais.',
     'checkboxes.title' => 'Checkboxes',
     'code.config.indent_size' => 'Defina o seu tamanho de indentação preferido (em espaços).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Esses campos são especiais, cada um à sua maneira.',
     'picker.category.structured.description' => 'Campos que armazenam dados estruturados. Alguns podem até aninhar outros campos dentro de si mesmos.',
     'picker.category.text.description' => 'Campos que armazenam sequências de texto, conteúdo avançado ou ambos.',
-    'radio.config.inline' => 'Mostrar os botões do rádio em fila.',
     'radio.config.options' => 'Defina as chaves da matriz e as suas etiquetas opcionais.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Adicionar texto no fim (lado direito) da barra deslizante.',
diff --git a/lang/pt/messages.php b/lang/pt/messages.php
index 26b426617fe..00767ae408b 100644
--- a/lang/pt/messages.php
+++ b/lang/pt/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'As alterações na cópia de trabalho serão aplicadas à entrada e serão publicadas imediatamente.',
     'publish_actions_schedule' => 'As alterações na cópia de trabalho serão aplicadas à entrada e aparecerão publicadas na data seleccionada.',
     'publish_actions_unpublish' => 'A revisão actual não será publicada.',
+    'relationship_item_unavailable' => 'Este item não está disponível. Pode ter sido eliminado ou poderá não ter permissão para o visualizar.',
     'reset_password_notification_body' => 'Recebeu este email porque foi feita uma solicitação de redefinição de senha para sua conta.',
     'reset_password_notification_no_action' => 'Se não solicitou uma redefinição de senha, nenhuma acção adicional será necessária.',
     'reset_password_notification_subject' => 'Redefinir notificação de senha',
diff --git a/lang/pt_BR.json b/lang/pt_BR.json
index a790b5dd4b7..9c198539c85 100644
--- a/lang/pt_BR.json
+++ b/lang/pt_BR.json
@@ -86,7 +86,6 @@
     "Always show": "Sempre mostrar",
     "Always Show Set Button": "Sempre mostrar botão de Conjunto",
     "An entry will be deleted|:count entries will be deleted": "Uma entrada será excluída|:count entradas serão excluídas",
-    "An item with this ID could not be found": "Não foi possível encontrar um item com este ID",
     "and": "e",
     "and :count more": "e :count mais",
     "Antlers": "Chifres",
@@ -99,6 +98,7 @@
     "Application Cache": "Cache da Aplicação",
     "Application cache cleared.": "Cache da aplicação limpo.",
     "Apply": "Aplicar",
+    "Save All": "Salvar tudo",
     "Apply Link": "Aplicar link",
     "Are you sure you want to delete this column?": "Tem certeza que deseja excluir esta coluna?",
     "Are you sure you want to delete this entry?": "Tem certeza que deseja excluir esta entrada?",
diff --git a/lang/pt_BR/fieldtypes.php b/lang/pt_BR/fieldtypes.php
index 435d6de4ac1..c38e46c9ec2 100644
--- a/lang/pt_BR/fieldtypes.php
+++ b/lang/pt_BR/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Mostre a contagem de palavras na parte inferior do campo.',
     'bard.title' => 'Bardo',
     'button_group.title' => 'Grupo de botões',
-    'checkboxes.config.inline' => 'Mostrar as caixas de seleção em uma linha.',
     'checkboxes.config.options' => 'Defina as chaves da matriz e seus rótulos opcionais.',
     'checkboxes.title' => 'Caixas de seleção',
     'code.config.indent_size' => 'Defina seu tamanho de recuo preferido (em espaços).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Esses campos são especiais, cada um à sua maneira.',
     'picker.category.structured.description' => 'Campos que armazenam dados estruturados. Alguns podem até aninhar outros campos dentro de si mesmos.',
     'picker.category.text.description' => 'Campos que armazenam sequências de texto, conteúdo avançado ou ambos.',
-    'radio.config.inline' => 'Mostrar os botões de opção em uma linha.',
     'radio.config.options' => 'Defina as chaves da matriz e seus rótulos opcionais.',
     'radio.title' => 'Rádio',
     'range.config.append' => 'Adicione texto ao final (lado direito) do controle deslizante.',
diff --git a/lang/pt_BR/messages.php b/lang/pt_BR/messages.php
index 818a0c9b605..8845a6ec834 100644
--- a/lang/pt_BR/messages.php
+++ b/lang/pt_BR/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'As alterações à cópia de trabalho serão aplicadas à entrada e serão publicadas imediatamente.',
     'publish_actions_schedule' => 'As alterações à cópia de trabalho serão aplicadas à entrada e aparecerá publicada na data selecionada.',
     'publish_actions_unpublish' => 'A revisão atual será despublicada.',
+    'relationship_item_unavailable' => 'Este item não está disponível. Ele pode ter sido excluído ou você pode não ter permissão para visualizá-lo.',
     'reset_password_notification_body' => 'Você está recebendo este e-mail porque recebemos uma solicitação de redefinição de senha para sua conta.',
     'reset_password_notification_no_action' => 'Se você não solicitou uma redefinição de senha, nenhuma ação adicional será necessária.',
     'reset_password_notification_subject' => 'Notificação de Redefinição de Senha',
diff --git a/lang/ru.json b/lang/ru.json
index 15b0baf0978..88c0ab02f9d 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -35,7 +35,6 @@
     "Add": "Добавить",
     "Add a link label": "Добавить название ссылки",
     "Add Attribute": "Добавить атрибут",
-    "Add Block": "Добавить блок",
     "Add child link to entry": "Добавить дочернюю ссылку на запись",
     "Add child nav item": "Добавить дочерний элемент навигации",
     "Add Color": "Добавить цвет",
@@ -116,6 +115,7 @@
     "Apply": "Применить",
     "Apply & Close All": "Применить и закрыть все",
     "Apply & Save": "Применить и сохранить",
+    "Save All": "Сохранить все",
     "Apply Link": "Применить ссылку",
     "Apply Query Scopes": "Применить области запроса",
     "Are you sure you want to delete this column?": "Хотите удалить этот столбец?",
@@ -623,7 +623,6 @@
     "Icon": "Иконка",
     "Icon Set": "Набор иконок",
     "ID": "ID",
-    "ID not found": "ID не найден",
     "ID regenerated and Stache cleared": "ID обновлён, а Stache очищен",
     "If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Если у вас возникли проблемы с нажатием кнопки \":actionText\" скопируйте и вставьте URL ниже\nв свой веб-браузер:",
     "Image": "Изображения",
diff --git a/lang/ru/fieldtypes.php b/lang/ru/fieldtypes.php
index 84dc46798f5..ab4c64113d7 100644
--- a/lang/ru/fieldtypes.php
+++ b/lang/ru/fieldtypes.php
@@ -49,7 +49,6 @@
     'bard.config.word_count' => 'Покажите количество слов в нижней части поля.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Группа кнопок',
-    'checkboxes.config.inline' => 'Показать флажки в ряд.',
     'checkboxes.config.options' => 'Установите ключи массива и их необязательные метки.',
     'checkboxes.title' => 'Флажки',
     'code.config.color_mode' => 'Выберите предпочитаемую тему.',
@@ -140,7 +139,6 @@
     'picker.category.special.description' => 'Эти поля особенные, каждое по-своему.',
     'picker.category.structured.description' => 'Поля, в которых хранятся структурированные данные. Некоторые из них даже могут вложить другие поля внутрь себя.',
     'picker.category.text.description' => 'Поля, хранящие строки текста, сложный контент или и то, и другое.',
-    'radio.config.inline' => 'Показывать радиокнопки в ряд.',
     'radio.config.options' => 'Задать ключи массива и их необязательные метки.',
     'radio.title' => 'Переключатели',
     'range.config.append' => 'Добавить текст в конец (правую сторону) слайдера.',
diff --git a/lang/ru/messages.php b/lang/ru/messages.php
index d710c55d0e8..1ee736e9cc3 100644
--- a/lang/ru/messages.php
+++ b/lang/ru/messages.php
@@ -206,6 +206,7 @@
     'publish_actions_publish' => 'Изменения в рабочей копии будут применены к записи, и она будет немедленно опубликована.',
     'publish_actions_schedule' => 'Изменения в рабочей копии будут применены к записи, и она будет опубликована в выбранную дату.',
     'publish_actions_unpublish' => 'Текущая ревизия будет неопубликована.',
+    'relationship_item_unavailable' => 'Этот элемент недоступен. Возможно, он был удалён или у вас нет прав для его просмотра.',
     'reset_password_notification_body' => 'Вы получили это письмо, потому что к нам поступил запрос на сброс пароля для вашей учётной записи.',
     'reset_password_notification_no_action' => 'Если вы не запрашивали сброс пароля, дальнейшие действия не требуются.',
     'reset_password_notification_subject' => 'Уведомление о сбросе пароля',
diff --git a/lang/sl.json b/lang/sl.json
index 74eb80e4b44..c8db70692ff 100644
--- a/lang/sl.json
+++ b/lang/sl.json
@@ -86,7 +86,6 @@
     "Always show": "Vedno pokaži",
     "Always Show Set Button": "Vedno prikaži gumb za nastavitev",
     "An entry will be deleted|:count entries will be deleted": "Vnos bo izbrisan | :count vnosov bo izbrisano",
-    "An item with this ID could not be found": "Elementa s tem ID ni bilo mogoče najti",
     "and": "in",
     "and :count more": "in še :count",
     "Antlers": "Rogovje",
@@ -99,6 +98,7 @@
     "Application Cache": "Predpomnilnik aplikacije",
     "Application cache cleared.": "Predpomnilnik aplikacije je bil očiščen.",
     "Apply": "Prijavite se",
+    "Save All": "Shrani vse",
     "Apply Link": "Uporabi povezavo",
     "Are you sure you want to delete this column?": "Ali ste prepričani, da želite izbrisati ta stolpec?",
     "Are you sure you want to delete this entry?": "Ali ste prepričani, da želite izbrisati ta vnos?",
diff --git a/lang/sl/fieldtypes.php b/lang/sl/fieldtypes.php
index e4d05b731fb..627a6865c58 100644
--- a/lang/sl/fieldtypes.php
+++ b/lang/sl/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Pokažite število besed na dnu polja.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Button Group',
-    'checkboxes.config.inline' => 'Pokažite potrditvena polja v vrstici.',
     'checkboxes.config.options' => 'Nastavite matrične tipke in njihove neobvezne nalepke.',
     'checkboxes.title' => 'Checkboxes',
     'code.config.indent_size' => 'Nastavite želeno velikost zamika (v presledkih).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Ta polja so posebna, vsaka na svoj način.',
     'picker.category.structured.description' => 'Polja, ki hranijo strukturirane podatke. Nekateri lahko celo ugnezdijo druga polja vase.',
     'picker.category.text.description' => 'Polja, ki shranjujejo nize besedila, obogateno vsebino ali oboje.',
-    'radio.config.inline' => 'Prikažite izbirne gumbe zaporedoma.',
     'radio.config.options' => 'Nastavite matrične tipke in njihove neobvezne nalepke.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Besedilo dodajte na konec (desna stran) drsnika.',
diff --git a/lang/sl/messages.php b/lang/sl/messages.php
index 7fb9def8126..5600bd65bfd 100644
--- a/lang/sl/messages.php
+++ b/lang/sl/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Spremembe delovne kopije bodo veljale za vnos in bo takoj objavljena.',
     'publish_actions_schedule' => 'Spremembe delovne kopije bodo veljale za vnos in bo objavljena na izbrani datum.',
     'publish_actions_unpublish' => 'Trenutna revizija ne bo objavljena.',
+    'relationship_item_unavailable' => 'Ta element ni na voljo. Morda je bil izbrisan ali pa nimate dovoljenja za ogled.',
     'reset_password_notification_body' => 'To e-poštno sporočilo ste prejeli, ker smo za vaš račun prejeli zahtevo za ponastavitev gesla.',
     'reset_password_notification_no_action' => 'Če niste zahtevali ponastavitve gesla, nadaljnja dejanja niso potrebna.',
     'reset_password_notification_subject' => 'Ponastavi obvestilo o geslu',
diff --git a/lang/sv.json b/lang/sv.json
index b26c3ad9841..f05ab968f94 100644
--- a/lang/sv.json
+++ b/lang/sv.json
@@ -86,7 +86,6 @@
     "Always show": "Visa alltid",
     "Always Show Set Button": "Visa alltid knappen för uppsättningar",
     "An entry will be deleted|:count entries will be deleted": "Ett inlägg kommer raderas|:count inlägg kommer raderas",
-    "An item with this ID could not be found": "Ett objekt med detta ID kunde inte hittas",
     "and": "och",
     "and :count more": "och :count till",
     "Antlers": "Horn",
@@ -99,6 +98,7 @@
     "Application Cache": "Applikationscache",
     "Application cache cleared.": "Applikationscachen rensades.",
     "Apply": "Verkställ",
+    "Save All": "Spara alla",
     "Apply Link": "Använd länk",
     "Are you sure you want to delete this column?": "Är du säker på att du vill radera den här kolumnen?",
     "Are you sure you want to delete this entry?": "Är du säker på att du vill radera det här inlägget?",
diff --git a/lang/sv/fieldtypes.php b/lang/sv/fieldtypes.php
index 677bae1328d..af00f13810b 100644
--- a/lang/sv/fieldtypes.php
+++ b/lang/sv/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Visa antalet ord längst ner i fältet.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Knappgrupp',
-    'checkboxes.config.inline' => 'Visa kryssrutorna i rad.',
     'checkboxes.config.options' => 'Ställ in array-nycklarna och deras valfria etiketter.',
     'checkboxes.title' => 'Kryssrutor',
     'code.config.indent_size' => 'Ställ in önskad indragsstorlek (i blanksteg).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Dessa områden är speciella, var och en på sitt sätt.',
     'picker.category.structured.description' => 'Fält som lagrar strukturerad data. Vissa kan till och med häcka andra fält inom sig själva.',
     'picker.category.text.description' => 'Fält som lagrar textsträngar, rikt innehåll eller båda.',
-    'radio.config.inline' => 'Visa alternativknapparna i rad.',
     'radio.config.options' => 'Ställ in array-tangenterna och deras valfria etiketter.',
     'radio.title' => 'Alternativknappar',
     'range.config.append' => 'Lägg till text i slutet (höger sida) av skjutreglaget.',
diff --git a/lang/sv/messages.php b/lang/sv/messages.php
index 5a2b50636cb..c8f48182c40 100644
--- a/lang/sv/messages.php
+++ b/lang/sv/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Ändringar av arbetsexemplaret kommer att tillämpas på inlägget och det kommer att publiceras omedelbart.',
     'publish_actions_schedule' => 'Ändringar av arbetskopian kommer att tillämpas på posten och den kommer att visas publicerad på det valda datumet.',
     'publish_actions_unpublish' => 'Den aktuella versionen kommer att avpubliceras.',
+    'relationship_item_unavailable' => 'Det här objektet är inte tillgängligt. Det kan ha tagits bort, eller så har du inte behörighet att visa det.',
     'reset_password_notification_body' => 'Du får det här e-postmeddelandet eftersom vi har fått en begäran om lösenordsåterställning för ditt konto.',
     'reset_password_notification_no_action' => 'Om du inte begärde en lösenordsåterställning krävs ingen ytterligare åtgärd.',
     'reset_password_notification_subject' => 'Återställ lösenordsmeddelande',
diff --git a/lang/tr.json b/lang/tr.json
index 336334be3ef..b03b9761206 100644
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -86,7 +86,6 @@
     "Always show": "Her zaman göster",
     "Always Show Set Button": "Daima Set Düğmesini Göster",
     "An entry will be deleted|:count entries will be deleted": "Bir girdi silinecek|:count girdi silinecek",
-    "An item with this ID could not be found": "Bu ID'ye sahip bir öğe bulunamadı",
     "and": "ve",
     "and :count more": "Ve :count daha",
     "Antlers": "Antlers",
@@ -99,6 +98,7 @@
     "Application Cache": "Uygulama Önbelleği",
     "Application cache cleared.": "Uygulama önbelleği temizlendi.",
     "Apply": "Uygula",
+    "Save All": "Tümünü kaydet",
     "Apply Link": "Bağlantı Uygula",
     "Are you sure you want to delete this column?": "Bu sütunu silmek istediğinizden emin misiniz?",
     "Are you sure you want to delete this entry?": "Bu girdiyi silmek istediğinizden emin misiniz?",
diff --git a/lang/tr/fieldtypes.php b/lang/tr/fieldtypes.php
index 8301975e557..e77152cc5b8 100644
--- a/lang/tr/fieldtypes.php
+++ b/lang/tr/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Alanın alt kısmında kelime sayısını göster.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Buton Grubu',
-    'checkboxes.config.inline' => 'Onay kutularını arka arkaya göster.',
     'checkboxes.config.options' => 'Dizi tuşlarını ve isteğe bağlı etiketlerini ayarlayın.',
     'checkboxes.title' => 'Onay kutuları',
     'code.config.indent_size' => 'Tercih ettiğiniz girinti boyutunu ayarlayın (boşluklarda).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Bu alanlar, her biri kendi yolunda özeldir.',
     'picker.category.structured.description' => 'Yapılandırılmış verileri depolayan alanlar. Hatta bazıları diğer alanları kendi içlerine yerleştirebilir.',
     'picker.category.text.description' => 'Metin dizelerini, zengin içeriği veya her ikisini depolayan alanlar.',
-    'radio.config.inline' => 'Radyo düğmelerini arka arkaya göster.',
     'radio.config.options' => 'Dizi tuşlarını ve isteğe bağlı etiketlerini ayarlayın.',
     'radio.title' => 'Radio',
     'range.config.append' => 'Kaydırıcının sonuna (sağ tarafına) metin ekleyin.',
diff --git a/lang/tr/messages.php b/lang/tr/messages.php
index 10b772c6e33..f19a6be79f3 100644
--- a/lang/tr/messages.php
+++ b/lang/tr/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Çalışma kopyasında yapılan değişiklikler girişe uygulanacak ve hemen yayınlanacaktır.',
     'publish_actions_schedule' => 'Çalışma kopyasında yapılan değişiklikler girişe uygulanacak ve seçilen tarihte yayınlanmış olarak görünecektir.',
     'publish_actions_unpublish' => 'Mevcut revizyon yayından kaldırılacaktır.',
+    'relationship_item_unavailable' => 'Bu öğe kullanılamıyor. Silinmiş olabilir veya görüntüleme izniniz olmayabilir.',
     'reset_password_notification_body' => 'Bu e-postayı, hesabınız için bir şifre sıfırlama isteği aldığımız için alıyorsunuz.',
     'reset_password_notification_no_action' => 'Parola sıfırlama talebinde bulunmadıysanız, başka bir işlem yapmanız gerekmez.',
     'reset_password_notification_subject' => 'Parola Sıfırlama Bildirimi',
diff --git a/lang/uk.json b/lang/uk.json
index 0027d44f1ec..3cf753538b7 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -86,7 +86,6 @@
     "Always show": "Завжди показувати",
     "Always Show Set Button": "Завжди показувати кнопку набору",
     "An entry will be deleted|:count entries will be deleted": "Запис буде видалено|:count записів буде видалено",
-    "An item with this ID could not be found": "Елемент з цим ID не можна було знайти",
     "and": "та",
     "and :count more": "та ще :count",
     "Antlers": "Antlers",
@@ -99,6 +98,7 @@
     "Application Cache": "Кеш додатків",
     "Application cache cleared.": "Кеш додатків очищено.",
     "Apply": "Застосувати",
+    "Save All": "Зберегти все",
     "Apply Link": "Застосувати посилання",
     "Are you sure you want to delete this column?": "Ви впевнені, що хочете видалити цей стовпець?",
     "Are you sure you want to delete this entry?": "Ви впевнені, що хочете видалити цей запис?",
diff --git a/lang/uk/fieldtypes.php b/lang/uk/fieldtypes.php
index fee48571112..bdfa64ae2b0 100644
--- a/lang/uk/fieldtypes.php
+++ b/lang/uk/fieldtypes.php
@@ -50,7 +50,6 @@
     'bard.config.word_count' => 'Показувати кількість слів внизу поля.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Група кнопок',
-    'checkboxes.config.inline' => 'Показувати поля вибору в ряд.',
     'checkboxes.config.options' => 'Встановіть ключі масиву та їх необов’язкові мітки.',
     'checkboxes.title' => 'Прапорці',
     'code.config.indent_size' => 'Встановіть бажаний розмір відступу (в пробілах).',
@@ -131,7 +130,6 @@
     'picker.category.special.description' => 'Ці поля є особливими, кожне своїм способом.',
     'picker.category.structured.description' => 'Поля, що зберігають структуровані дані. Деякі навіть можуть вкладати інші поля всередину себе.',
     'picker.category.text.description' => 'Поля, що зберігають рядки тексту, багатий контент або обидва.',
-    'radio.config.inline' => 'Показувати радіо-кнопки в ряд.',
     'radio.config.options' => 'Встановіть ключі масиву та їх необов’язкові мітки.',
     'radio.title' => 'Радіо',
     'range.config.append' => 'Додати текст до кінця (правої сторони) повзунка.',
diff --git a/lang/uk/messages.php b/lang/uk/messages.php
index 93023271dae..9589cb59b3e 100644
--- a/lang/uk/messages.php
+++ b/lang/uk/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Зміни до робочої копії будуть застосовані до запису, і він буде опублікований негайно.',
     'publish_actions_schedule' => 'Зміни до робочої копії будуть застосовані до запису, і він буде опублікований у вибрану дату.',
     'publish_actions_unpublish' => 'Поточна ревізія буде знята з публікації.',
+    'relationship_item_unavailable' => 'Цей елемент недоступний. Можливо, його було видалено або у вас немає дозволу на його перегляд.',
     'reset_password_notification_body' => 'Ви отримуєте цей лист, тому що ми отримали запит на скидання пароля для вашого акаунта.',
     'reset_password_notification_no_action' => 'Якщо ви не запитували скидання пароля, подальші дії не потрібні.',
     'reset_password_notification_subject' => 'Повідомлення про скидання пароля',
diff --git a/lang/vi.json b/lang/vi.json
index 27b935de227..94ad55dc5a6 100644
--- a/lang/vi.json
+++ b/lang/vi.json
@@ -86,7 +86,6 @@
     "Always show": "Luôn luôn hiển thị",
     "Always Show Set Button": "Luôn luôn hiển thị nút đặt",
     "An entry will be deleted|:count entries will be deleted": "Mục nhập sẽ bị xoá",
-    "An item with this ID could not be found": "Không tìm thấy mục có mã nhận diện này",
     "and": "và",
     "and :count more": "đếm thêm",
     "Antlers": "Kiến",
@@ -99,6 +98,7 @@
     "Application Cache": "Bộ nhớ tạm ứng dụng",
     "Application cache cleared.": "Bộ nhớ tạm ứng dụng đã được bật.",
     "Apply": "Áp dụng",
+    "Save All": "Lưu tất cả",
     "Apply Link": "Áp dụng liên kết",
     "Are you sure you want to delete this column?": "Bạn có chắc muốn xoá cột này không?",
     "Are you sure you want to delete this entry?": "Bạn có chắc muốn xoá mục này không?",
diff --git a/lang/vi/fieldtypes.php b/lang/vi/fieldtypes.php
index b346f37c9fb..9785e135aa0 100644
--- a/lang/vi/fieldtypes.php
+++ b/lang/vi/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => 'Hiển thị số lượng từ ở cuối trường.',
     'bard.title' => 'Bard',
     'button_group.title' => 'Nhóm nút',
-    'checkboxes.config.inline' => 'Hiển thị các hộp kiểm trên một hàng.',
     'checkboxes.config.options' => 'Đặt khóa và nhãn tùy chọn.',
     'checkboxes.title' => 'Hộp kiểm',
     'code.config.indent_size' => 'Đặt kích thước thụt lề ưa thích (tính bằng dấu cách).',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => 'Các trường này có các đặc điểm đặc biệt riêng.',
     'picker.category.structured.description' => 'Các trường lưu trữ dữ liệu có cấu trúc. Một số có thể lồng các trường khác bên trong.',
     'picker.category.text.description' => 'Các trường lưu trữ chuỗi văn bản, nội dung phong phú hoặc cả hai.',
-    'radio.config.inline' => 'Hiển thị các nút radio theo hàng ngang.',
     'radio.config.options' => 'Đặt các khóa và nhãn tùy chọn.',
     'radio.title' => 'Nút radio',
     'range.config.append' => 'Thêm văn bản vào cuối thanh trượt.',
diff --git a/lang/vi/messages.php b/lang/vi/messages.php
index 0e13a9f3a10..1bf94b0cc33 100644
--- a/lang/vi/messages.php
+++ b/lang/vi/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => 'Những thay đổi đối với bản sao làm việc sẽ được áp dụng cho mục nhập và sẽ được xuất bản ngay lập tức.',
     'publish_actions_schedule' => 'Những thay đổi đối với bản sao làm việc sẽ được áp dụng cho mục nhập và mục nhập đó sẽ được xuất bản vào ngày đã chọn.',
     'publish_actions_unpublish' => 'Bản sửa đổi hiện tại sẽ không được công bố.',
+    'relationship_item_unavailable' => 'Mục này không khả dụng. Mục có thể đã bị xóa hoặc bạn không có quyền xem.',
     'reset_password_notification_body' => 'Bạn nhận được email này vì chúng tôi đã nhận được yêu cầu đặt lại mật khẩu cho tài khoản của bạn.',
     'reset_password_notification_no_action' => 'Nếu bạn không yêu cầu đặt lại mật khẩu, bạn không cần thực hiện thêm hành động nào nữa.',
     'reset_password_notification_subject' => 'Thông báo đặt lại mật khẩu',
diff --git a/lang/zh_CN.json b/lang/zh_CN.json
index d200ba9aba9..e1a03df207f 100644
--- a/lang/zh_CN.json
+++ b/lang/zh_CN.json
@@ -86,7 +86,6 @@
     "Always show": "始终显示",
     "Always Show Set Button": "始终显示设置按钮",
     "An entry will be deleted|:count entries will be deleted": "条目将被删除|:count个条目将被删除",
-    "An item with this ID could not be found": "找不到具有该ID的项目",
     "and": "和",
     "and :count more": "以及更多的 :count 个",
     "Antlers": "鹿角",
@@ -99,6 +98,7 @@
     "Application Cache": "应用缓存",
     "Application cache cleared.": "应用程序缓存已清除。",
     "Apply": "申请",
+    "Save All": "全部保存",
     "Apply Link": "应用链接",
     "Are you sure you want to delete this column?": "您确定要删除此列吗？",
     "Are you sure you want to delete this entry?": "您确定要删除此条目吗？",
diff --git a/lang/zh_CN/fieldtypes.php b/lang/zh_CN/fieldtypes.php
index 028d2f0a2a7..4ea0fd6adf6 100644
--- a/lang/zh_CN/fieldtypes.php
+++ b/lang/zh_CN/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => '在字段底部显示字数。',
     'bard.title' => 'Bard 编辑器',
     'button_group.title' => '按钮组',
-    'checkboxes.config.inline' => '连续显示复选框。',
     'checkboxes.config.options' => '设置阵列键及其可选标签。',
     'checkboxes.title' => '复选框',
     'code.config.indent_size' => '设置首选的缩进大小 (以空格为单位)。',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => '这些字段是特殊的，每个都有自己的方式。',
     'picker.category.structured.description' => '存储结构化数据的字段。 有些甚至可以在自己内部嵌套其他字段。',
     'picker.category.text.description' => '存储文本字符串、富文本内容或两者都有的字段。',
-    'radio.config.inline' => '在行内显示单选按钮。',
     'radio.config.options' => '设置阵列键及其可选标签。',
     'radio.title' => '单选框',
     'range.config.append' => '将文本添加到幻灯片的末尾(右侧)。',
diff --git a/lang/zh_CN/messages.php b/lang/zh_CN/messages.php
index 66ea03bfc9a..5109fd554ef 100644
--- a/lang/zh_CN/messages.php
+++ b/lang/zh_CN/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => '对工作副本所做的更改将应用于该条目，并且将立即发布。',
     'publish_actions_schedule' => '对工作副本所做的更改将应用于该条目，并且将在选定的日期显示为已发布。',
     'publish_actions_unpublish' => '当前版本将不发布。',
+    'relationship_item_unavailable' => '此项目不可用。它可能已被删除，或者您可能没有查看权限。',
     'reset_password_notification_body' => '您收到此电子邮件是因为我们收到了您帐户的密码重置请求。',
     'reset_password_notification_no_action' => '如果您不要求重设密码，则无需采取进一步措施。',
     'reset_password_notification_subject' => '重置密码通知',
diff --git a/lang/zh_TW.json b/lang/zh_TW.json
index 7e0350cee21..61679f1a2da 100644
--- a/lang/zh_TW.json
+++ b/lang/zh_TW.json
@@ -86,7 +86,6 @@
     "Always show": "總是顯示",
     "Always Show Set Button": "總是顯示集合按鈕",
     "An entry will be deleted|:count entries will be deleted": "將刪除 :count 個條目",
-    "An item with this ID could not be found": "未找到此 ID 的項目",
     "and": "與",
     "and :count more": "與其他 :count 項",
     "Antlers": "鹿角",
@@ -99,6 +98,7 @@
     "Application Cache": "應用程式快取",
     "Application cache cleared.": "已清除應用程式快取。",
     "Apply": "申请",
+    "Save All": "全部儲存",
     "Apply Link": "套用連結",
     "Are you sure you want to delete this column?": "確定要刪除此一欄位？",
     "Are you sure you want to delete this entry?": "確定要刪除此一條目？",
diff --git a/lang/zh_TW/fieldtypes.php b/lang/zh_TW/fieldtypes.php
index 69fe668258c..010c473f4d2 100644
--- a/lang/zh_TW/fieldtypes.php
+++ b/lang/zh_TW/fieldtypes.php
@@ -48,7 +48,6 @@
     'bard.config.word_count' => '在字段底部显示字数。',
     'bard.title' => 'Bard 編輯器',
     'button_group.title' => '按鈕群組',
-    'checkboxes.config.inline' => '在同一行內顯示勾選框。',
     'checkboxes.config.options' => '設定陣列索引鍵與其可選的標籤。',
     'checkboxes.title' => '勾選框',
     'code.config.indent_size' => '設定偏好的縮排大小 (空格)。',
@@ -129,7 +128,6 @@
     'picker.category.special.description' => '这些领域都很特殊，各有各的特色。',
     'picker.category.structured.description' => '存储结构化数据的字段。有些甚至可以将其他字段嵌套在其内部。',
     'picker.category.text.description' => '存储文本字符串、丰富内容或两者的字段。',
-    'radio.config.inline' => '在單行中顯示單選按鈕。',
     'radio.config.options' => '設定陣列索引鍵與其可選的標籤。',
     'radio.title' => '單選按鈕',
     'range.config.append' => '新增文字至滑桿的結尾 (右邊)。',
diff --git a/lang/zh_TW/messages.php b/lang/zh_TW/messages.php
index 2e9c43a8436..d7fa89b9adc 100644
--- a/lang/zh_TW/messages.php
+++ b/lang/zh_TW/messages.php
@@ -187,6 +187,7 @@
     'publish_actions_publish' => '對該工作複本做出的更改將套用至該條目，且將立即發佈。',
     'publish_actions_schedule' => '對該工作複本做出的更改將套用至該條目，且將在所選日期顯示為已發佈。',
     'publish_actions_unpublish' => '目前的修訂版將不發佈。',
+    'relationship_item_unavailable' => '此項目無法使用。它可能已被刪除，或者您可能沒有檢視權限。',
     'reset_password_notification_body' => '你會收到此電子郵件時因為我們收到了重設密碼的請求。',
     'reset_password_notification_no_action' => '若你未要求重設密碼，則不需進一步操作。',
     'reset_password_notification_subject' => '重設密碼通知',
diff --git a/package-lock.json b/package-lock.json
index f5cde1e88f4..91aa419dcb8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "dependencies": {
         "@davidenke/marked-text-renderer": "^3.0.0",
         "@floating-ui/dom": "^1.6.0",
-        "@he-tree/vue": "^2.10.0-beta.2",
+        "@he-tree/vue": "^2.10.5",
         "@hoppscotch/vue-toasted": "^0.1.0",
         "@inertiajs/vue3": "^2.1.11",
         "@internationalized/date": "^3.7.0",
@@ -45,18 +45,18 @@
         "@tiptap/vue-3": "^3.0.0",
         "alpinejs": "^3.1.1",
         "autosize": "~6.0.1",
-        "axios": "^1.13.5",
+        "axios": "^1.18.1",
         "clsx": "^2.1.1",
         "codemirror": "5.65.12",
         "cookies-js": "^1.2.2",
         "cropperjs": "^1.6.2",
         "cva": "^1.0.0-beta.3",
-        "dompurify": "^3.3.1",
+        "dompurify": "^3.4.11",
         "floating-vue": "^5.2.2",
         "fuzzysort": "^3.1.0",
         "highlight.js": "^11.7.0",
         "laravel-echo": "^1.16.0",
-        "lodash-es": "^4.17.21",
+        "lodash-es": "^4.18.1",
         "lowlight": "^3.1.0",
         "marked": "^15.0.0",
         "motion-v": "^1.0.0-beta.0",
@@ -68,9 +68,9 @@
         "portal-vue": "^3.0.0",
         "pretty": "^2.0.0",
         "pusher-js": "^8.4.0-rc2",
-        "qs": "^6.14.2",
+        "qs": "^6.15.2",
         "read-time-estimate": "0.0.3",
-        "reka-ui": "^2.6.1",
+        "reka-ui": "^2.9.2",
         "resize-observer-polyfill": "^1.5.1",
         "semver": "^7.7.1",
         "speakingurl": "^14.0.1",
@@ -97,13 +97,12 @@
         "@vue/test-utils": "^2.4.6",
         "jsdom": "^26.0.0",
         "knip": "^5.43.6",
-        "laravel-vite-plugin": "^2.0.0",
-        "rollup-plugin-visualizer": "^5.14.0",
-        "storybook": "^10.2.10",
+        "laravel-vite-plugin": "^3.0.0",
+        "rollup-plugin-visualizer": "^7.0.0",
+        "storybook": "^10.4.6",
         "tailwindcss": "^4.1.8",
         "typescript": "^5.9.2",
-        "vite": "^7.0.4",
-        "vite-tsconfig-paths": "^5.1.4",
+        "vite": "^8.0.16",
         "vitest": "^4.0.12",
         "vitest-browser-vue": "^2.0.1",
         "vue-component-debug": "^0.1.0",
@@ -117,20 +116,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@asamuzakjp/css-color": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz",
@@ -146,14 +131,14 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
+      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -171,21 +156,21 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
-      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
+      "version": "7.29.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz",
+      "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.0"
+        "@babel/types": "^7.29.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -195,31 +180,38 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.27.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
-      "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
+      "version": "7.29.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz",
+      "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.0.tgz",
-      "integrity": "sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1"
+        "@babel/helper-validator-identifier": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@blazediff/core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@blazediff/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-ehg3jIkYKulZh+8om/O25vkvSsXXwC+skXmyA87FFx6A/45eqOkZsBltMw/TVteb0mloiGT8oGRTcjRAz66zaA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@csstools/color-helpers": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz",
-      "integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
+      "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
       "dev": true,
       "funding": [
         {
@@ -261,9 +253,9 @@
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.10.tgz",
-      "integrity": "sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
+      "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
       "dev": true,
       "funding": [
         {
@@ -277,7 +269,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/color-helpers": "^5.0.2",
+        "@csstools/color-helpers": "^5.1.0",
         "@csstools/css-calc": "^2.1.4"
       },
       "engines": {
@@ -341,21 +333,21 @@
       }
     },
     "node_modules/@emnapi/core": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz",
-      "integrity": "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==",
+      "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,
       "dependencies": {
-        "@emnapi/wasi-threads": "1.0.2",
+        "@emnapi/wasi-threads": "1.2.1",
         "tslib": "^2.4.0"
       }
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz",
-      "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==",
+      "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,
@@ -364,9 +356,9 @@
       }
     },
     "node_modules/@emnapi/wasi-threads": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz",
-      "integrity": "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz",
+      "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -375,9 +367,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
-      "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz",
+      "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==",
       "cpu": [
         "ppc64"
       ],
@@ -392,9 +384,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
-      "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz",
+      "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==",
       "cpu": [
         "arm"
       ],
@@ -409,9 +401,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
-      "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz",
+      "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==",
       "cpu": [
         "arm64"
       ],
@@ -426,9 +418,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
-      "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz",
+      "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==",
       "cpu": [
         "x64"
       ],
@@ -443,9 +435,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
-      "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz",
+      "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==",
       "cpu": [
         "arm64"
       ],
@@ -460,9 +452,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
-      "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
+      "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
       "cpu": [
         "x64"
       ],
@@ -477,9 +469,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==",
       "cpu": [
         "arm64"
       ],
@@ -494,9 +486,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
-      "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==",
       "cpu": [
         "x64"
       ],
@@ -511,9 +503,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
-      "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz",
+      "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==",
       "cpu": [
         "arm"
       ],
@@ -528,9 +520,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
-      "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz",
+      "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==",
       "cpu": [
         "arm64"
       ],
@@ -545,9 +537,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
-      "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz",
+      "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==",
       "cpu": [
         "ia32"
       ],
@@ -562,9 +554,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
-      "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz",
+      "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==",
       "cpu": [
         "loong64"
       ],
@@ -579,9 +571,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
-      "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz",
+      "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==",
       "cpu": [
         "mips64el"
       ],
@@ -596,9 +588,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
-      "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz",
+      "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==",
       "cpu": [
         "ppc64"
       ],
@@ -613,9 +605,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
-      "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz",
+      "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==",
       "cpu": [
         "riscv64"
       ],
@@ -630,9 +622,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
-      "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz",
+      "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==",
       "cpu": [
         "s390x"
       ],
@@ -647,9 +639,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
-      "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz",
+      "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==",
       "cpu": [
         "x64"
       ],
@@ -664,9 +656,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==",
       "cpu": [
         "arm64"
       ],
@@ -681,9 +673,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
-      "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==",
       "cpu": [
         "x64"
       ],
@@ -698,9 +690,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==",
       "cpu": [
         "arm64"
       ],
@@ -715,9 +707,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
-      "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==",
       "cpu": [
         "x64"
       ],
@@ -731,10 +723,27 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz",
+      "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
-      "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz",
+      "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==",
       "cpu": [
         "x64"
       ],
@@ -749,9 +758,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
-      "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz",
+      "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==",
       "cpu": [
         "arm64"
       ],
@@ -766,9 +775,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
-      "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz",
+      "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==",
       "cpu": [
         "ia32"
       ],
@@ -783,9 +792,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
-      "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz",
+      "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==",
       "cpu": [
         "x64"
       ],
@@ -800,38 +809,38 @@
       }
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.2.tgz",
-      "integrity": "sha512-wNB5ooIKHQc+Kui96jE/n69rHFWAVoxn5CAzL1Xdd8FG03cgY3MLO+GF9U3W737fYDSgPWA6MReKhBQBop6Pcw==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
+      "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.10"
+        "@floating-ui/utils": "^0.2.11"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.2.tgz",
-      "integrity": "sha512-7cfaOQuCS27HD7DX+6ib2OrnW+b4ZBwDNnCcT0uTyidcmyWb03FnQqJybDBoCnpdxwBSfA94UAYlRCt7mV+TbA==",
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
+      "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.7.2",
-        "@floating-ui/utils": "^0.2.10"
+        "@floating-ui/core": "^1.7.5",
+        "@floating-ui/utils": "^0.2.11"
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
-      "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
+      "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
       "license": "MIT"
     },
     "node_modules/@floating-ui/vue": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/@floating-ui/vue/-/vue-1.1.7.tgz",
-      "integrity": "sha512-idmAtbAIigGXN2SI5gItiXYBYtNfDTP9yIiObxgu13dgtG7ARCHlNfnR29GxP4LI4o13oiwsJ8wVgghj1lNqcw==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@floating-ui/vue/-/vue-1.1.11.tgz",
+      "integrity": "sha512-HzHKCNVxnGS35r9fCHBc3+uCnjw9IWIlCPL683cGgM9Kgj2BiAl8x1mS7vtvP6F9S/e/q4O6MApwSHj8hNLGfw==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/dom": "^1.7.2",
-        "@floating-ui/utils": "^0.2.10",
+        "@floating-ui/dom": "^1.7.6",
+        "@floating-ui/utils": "^0.2.11",
         "vue-demi": ">=0.13.0"
       }
     },
@@ -873,9 +882,9 @@
       }
     },
     "node_modules/@he-tree/tree-utils": {
-      "version": "0.1.0-alpha.6",
-      "resolved": "https://registry.npmjs.org/@he-tree/tree-utils/-/tree-utils-0.1.0-alpha.6.tgz",
-      "integrity": "sha512-TIH1iIRLpn3sjd4EuIfKQzFd6ToY8GLYk3i5bfK1njCW7lBBDHLqSyK0mlJPbCPk4PfkZBC4K+sMcYyH4hokyg==",
+      "version": "0.1.0-alpha.8",
+      "resolved": "https://registry.npmjs.org/@he-tree/tree-utils/-/tree-utils-0.1.0-alpha.8.tgz",
+      "integrity": "sha512-4M4BzXbjCg2uY/GDPUGzq1EFGgna5L7NGFF85fF2pSnCIUkWOZY18eaSqvvlOFtyD5DWkkDqxzu0GHFlp/Zb4g==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.7.7",
@@ -884,13 +893,13 @@
       }
     },
     "node_modules/@he-tree/vue": {
-      "version": "2.10.0-beta.2",
-      "resolved": "https://registry.npmjs.org/@he-tree/vue/-/vue-2.10.0-beta.2.tgz",
-      "integrity": "sha512-YiJx+6HyBW8svUGLZZ2z0QWztFv4BezAoOpkis+mrIp+uUn1YUiA/UrgrIZNPcp5Smx9BiGXedl6J60YFfSuXQ==",
+      "version": "2.10.5",
+      "resolved": "https://registry.npmjs.org/@he-tree/vue/-/vue-2.10.5.tgz",
+      "integrity": "sha512-+/C3FxoGb1WpkElQA0kASSe0W9EUXTQSzg/1c7+1ucheiX4uFc8m1mSuD74lO7FXr6PWWbVRX2lzo/hxoUOTzA==",
       "license": "MIT",
       "dependencies": {
         "@he-tree/dnd-utils": "^0.1.0-alpha.4",
-        "@he-tree/tree-utils": "^0.1.0-alpha.6",
+        "@he-tree/tree-utils": "^0.1.0-alpha.8",
         "@virtual-list/vue": "^1.2.1",
         "helper-js": "^3.1.2",
         "vue-demi": "latest"
@@ -966,44 +975,46 @@
       }
     },
     "node_modules/@inertiajs/core": {
-      "version": "2.1.11",
-      "resolved": "https://registry.npmjs.org/@inertiajs/core/-/core-2.1.11.tgz",
-      "integrity": "sha512-TF1UE1UjNRGyxJZGYe5IwDZwgyTvviE2XoJRHOS4SjS8kVzIqeBb3disIkLiJqshRNSNP8syggOro4TLtVubvA==",
+      "version": "2.3.21",
+      "resolved": "https://registry.npmjs.org/@inertiajs/core/-/core-2.3.21.tgz",
+      "integrity": "sha512-grHSCUiWDBWqpRxaobyxUJu0FV6HLkkuJwvoNLVkHwkexLvoaLhb9BmtoQydlIYL5pk2O3jcKaGtWJ83JwTB4A==",
       "license": "MIT",
       "dependencies": {
         "@types/lodash-es": "^4.17.12",
-        "axios": "^1.12.0",
-        "lodash-es": "^4.17.21",
-        "qs": "^6.9.0"
+        "axios": "^1.13.5",
+        "laravel-precognition": "^1.0.2",
+        "lodash-es": "^4.18.1",
+        "qs": "^6.15.0"
       }
     },
     "node_modules/@inertiajs/vue3": {
-      "version": "2.1.11",
-      "resolved": "https://registry.npmjs.org/@inertiajs/vue3/-/vue3-2.1.11.tgz",
-      "integrity": "sha512-9+ny7uaPwMeLMl01GOoNFmC4ssCZ/RPH8AeyAwMVdfIEnUaXVqWwf8epHeLdc/wH17hWYWlSTxAOLdSUbjvaDQ==",
+      "version": "2.3.21",
+      "resolved": "https://registry.npmjs.org/@inertiajs/vue3/-/vue3-2.3.21.tgz",
+      "integrity": "sha512-gJuOD9HrB6WXpTCUB6yLDHA2yI5YGzhYcGlHCPB6mzt6Lvm7CsQA06CNOyk8eEooz0MYJhFF2V092hU1i866qg==",
       "license": "MIT",
       "dependencies": {
-        "@inertiajs/core": "2.1.11",
+        "@inertiajs/core": "2.3.21",
         "@types/lodash-es": "^4.17.12",
-        "lodash-es": "^4.17.21"
+        "laravel-precognition": "^1.0.2",
+        "lodash-es": "^4.18.1"
       },
       "peerDependencies": {
         "vue": "^3.0.0"
       }
     },
     "node_modules/@internationalized/date": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.8.2.tgz",
-      "integrity": "sha512-/wENk7CbvLbkUvX1tu0mwq49CVkkWpkXubGel6birjRPyo6uQ4nQpnq5xZu823zRCwwn82zgHrvgF1vZyvmVgA==",
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.12.0.tgz",
+      "integrity": "sha512-/PyIMzK29jtXaGU23qTvNZxvBXRtKbNnGDFD+PY6CZw/Y8Ex8pFUzkuCJCG9aOqmShjqhS9mPqP6Dk5onQY8rQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@swc/helpers": "^0.5.0"
       }
     },
     "node_modules/@internationalized/number": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.6.3.tgz",
-      "integrity": "sha512-p+Zh1sb6EfrfVaS86jlHGQ9HA66fJhV9x5LiE5vCbZtXEHAuhcmUZUdZ4WrFpUBfNalr2OkAJI5AcKEQF+Lebw==",
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.6.5.tgz",
+      "integrity": "sha512-6hY4Kl4HPBvtfS62asS/R22JzNNy8vi/Ssev7x6EobfCp+9QIB2hKvI2EtbdJ0VSQacxVNtqhE/NmF/NZ0gm6g==",
       "license": "Apache-2.0",
       "dependencies": {
         "@swc/helpers": "^0.5.0"
@@ -1026,23 +1037,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@isaacs/fs-minipass": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
-      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.0.4"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.12",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
-      "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1078,9 +1076,9 @@
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.29",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
-      "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1107,9 +1105,9 @@
       }
     },
     "node_modules/@napi-rs/canvas": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas/-/canvas-0.1.95.tgz",
-      "integrity": "sha512-lkg23ge+rgyhgUwXmlbkPEhuhHq/hUi/gXKH+4I7vO+lJrbNfEYcQdJLIGjKyXLQzgFiiyDAwh5vAe/tITAE+w==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas/-/canvas-0.1.97.tgz",
+      "integrity": "sha512-8cFniXvrIEnVwuNSRCW9wirRZbHvrD3JVujdS2P5n5xiJZNZMOZcfOvJ1pb66c7jXMKHHglJEDVJGbm8XWFcXQ==",
       "license": "MIT",
       "optional": true,
       "workspaces": [
@@ -1123,23 +1121,23 @@
         "url": "https://github.com/sponsors/Brooooooklyn"
       },
       "optionalDependencies": {
-        "@napi-rs/canvas-android-arm64": "0.1.95",
-        "@napi-rs/canvas-darwin-arm64": "0.1.95",
-        "@napi-rs/canvas-darwin-x64": "0.1.95",
-        "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.95",
-        "@napi-rs/canvas-linux-arm64-gnu": "0.1.95",
-        "@napi-rs/canvas-linux-arm64-musl": "0.1.95",
-        "@napi-rs/canvas-linux-riscv64-gnu": "0.1.95",
-        "@napi-rs/canvas-linux-x64-gnu": "0.1.95",
-        "@napi-rs/canvas-linux-x64-musl": "0.1.95",
-        "@napi-rs/canvas-win32-arm64-msvc": "0.1.95",
-        "@napi-rs/canvas-win32-x64-msvc": "0.1.95"
+        "@napi-rs/canvas-android-arm64": "0.1.97",
+        "@napi-rs/canvas-darwin-arm64": "0.1.97",
+        "@napi-rs/canvas-darwin-x64": "0.1.97",
+        "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.97",
+        "@napi-rs/canvas-linux-arm64-gnu": "0.1.97",
+        "@napi-rs/canvas-linux-arm64-musl": "0.1.97",
+        "@napi-rs/canvas-linux-riscv64-gnu": "0.1.97",
+        "@napi-rs/canvas-linux-x64-gnu": "0.1.97",
+        "@napi-rs/canvas-linux-x64-musl": "0.1.97",
+        "@napi-rs/canvas-win32-arm64-msvc": "0.1.97",
+        "@napi-rs/canvas-win32-x64-msvc": "0.1.97"
       }
     },
     "node_modules/@napi-rs/canvas-android-arm64": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-android-arm64/-/canvas-android-arm64-0.1.95.tgz",
-      "integrity": "sha512-SqTh0wsYbetckMXEvHqmR7HKRJujVf1sYv1xdlhkifg6TlCSysz1opa49LlS3+xWuazcQcfRfmhA07HxxxGsAA==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-android-arm64/-/canvas-android-arm64-0.1.97.tgz",
+      "integrity": "sha512-V1c/WVw+NzH8vk7ZK/O8/nyBSCQimU8sfMsB/9qeSvdkGKNU7+mxy/bIF0gTgeBFmHpj30S4E9WHMSrxXGQuVQ==",
       "cpu": [
         "arm64"
       ],
@@ -1157,9 +1155,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-darwin-arm64": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-arm64/-/canvas-darwin-arm64-0.1.95.tgz",
-      "integrity": "sha512-F7jT0Syu+B9DGBUBcMk3qCRIxAWiDXmvEjamwbYfbZl7asI1pmXZUnCOoIu49Wt0RNooToYfRDxU9omD6t5Xuw==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-arm64/-/canvas-darwin-arm64-0.1.97.tgz",
+      "integrity": "sha512-ok+SCEF4YejcxuJ9Rm+WWunHHpf2HmiPxfz6z1a/NFQECGXtsY7A4B8XocK1LmT1D7P174MzwPF9Wy3AUAwEPw==",
       "cpu": [
         "arm64"
       ],
@@ -1177,9 +1175,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-darwin-x64": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-x64/-/canvas-darwin-x64-0.1.95.tgz",
-      "integrity": "sha512-54eb2Ho15RDjYGXO/harjRznBrAvu+j5nQ85Z4Qd6Qg3slR8/Ja+Yvvy9G4yo7rdX6NR9GPkZeSTf2UcKXwaXw==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-x64/-/canvas-darwin-x64-0.1.97.tgz",
+      "integrity": "sha512-PUP6e6/UGlclUvAQNnuXCcnkpdUou6VYZfQOQxExLp86epOylmiwLkqXIvpFmjoTEDmPmXrI+coL/9EFU1gKPA==",
       "cpu": [
         "x64"
       ],
@@ -1197,9 +1195,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-arm-gnueabihf": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm-gnueabihf/-/canvas-linux-arm-gnueabihf-0.1.95.tgz",
-      "integrity": "sha512-hYaLCSLx5bmbnclzQc3ado3PgZ66blJWzjXp0wJmdwpr/kH+Mwhj6vuytJIomgksyJoCdIqIa4N6aiqBGJtJ5Q==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm-gnueabihf/-/canvas-linux-arm-gnueabihf-0.1.97.tgz",
+      "integrity": "sha512-XyXH2L/cic8eTNtbrXCcvqHtMX/nEOxN18+7rMrAM2XtLYC/EB5s0wnO1FsLMWmK+04ZSLN9FBGipo7kpIkcOw==",
       "cpu": [
         "arm"
       ],
@@ -1217,9 +1215,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-arm64-gnu": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-gnu/-/canvas-linux-arm64-gnu-0.1.95.tgz",
-      "integrity": "sha512-J7VipONahKsmScPZsipHVQBqpbZx4favaD8/enWzzlGcjiwycOoymL7f4tNeqdjK0su19bDOUt6mjp9gsPWYlw==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-gnu/-/canvas-linux-arm64-gnu-0.1.97.tgz",
+      "integrity": "sha512-Kuq/M3djq0K8ktgz6nPlK7Ne5d4uWeDxPpyKWOjWDK2RIOhHVtLtyLiJw2fuldw7Vn4mhw05EZXCEr4Q76rs9w==",
       "cpu": [
         "arm64"
       ],
@@ -1237,9 +1235,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-arm64-musl": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-musl/-/canvas-linux-arm64-musl-0.1.95.tgz",
-      "integrity": "sha512-PXy0UT1J/8MPG8UAkWp6Fd51ZtIZINFzIjGH909JjQrtCuJf3X6nanHYdz1A+Wq9o4aoPAw1YEUpFS1lelsVlg==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-musl/-/canvas-linux-arm64-musl-0.1.97.tgz",
+      "integrity": "sha512-kKmSkQVnWeqg7qdsiXvYxKhAFuHz3tkBjW/zyQv5YKUPhotpaVhpBGv5LqCngzyuRV85SXoe+OFj+Tv0a0QXkQ==",
       "cpu": [
         "arm64"
       ],
@@ -1257,9 +1255,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-riscv64-gnu": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-riscv64-gnu/-/canvas-linux-riscv64-gnu-0.1.95.tgz",
-      "integrity": "sha512-2IzCkW2RHRdcgF9W5/plHvYFpc6uikyjMb5SxjqmNxfyDFz9/HB89yhi8YQo0SNqrGRI7yBVDec7Pt+uMyRWsg==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-riscv64-gnu/-/canvas-linux-riscv64-gnu-0.1.97.tgz",
+      "integrity": "sha512-Jc7I3A51jnEOIAXeLsN/M/+Z28LUeakcsXs07FLq9prXc0eYOtVwsDEv913Gr+06IRo34gJJVgT0TXvmz+N2VA==",
       "cpu": [
         "riscv64"
       ],
@@ -1277,9 +1275,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-x64-gnu": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-gnu/-/canvas-linux-x64-gnu-0.1.95.tgz",
-      "integrity": "sha512-OV/ol/OtcUr4qDhQg8G7SdViZX8XyQeKpPsVv/j3+7U178FGoU4M+yIocdVo1ih/A8GQ63+LjF4jDoEjaVU8Pw==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-gnu/-/canvas-linux-x64-gnu-0.1.97.tgz",
+      "integrity": "sha512-iDUBe7AilfuBSRbSa8/IGX38Mf+iCSBqoVKLSQ5XaY2JLOaqz1TVyPFEyIck7wT6mRQhQt5sN6ogfjIDfi74tg==",
       "cpu": [
         "x64"
       ],
@@ -1297,9 +1295,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-x64-musl": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-musl/-/canvas-linux-x64-musl-0.1.95.tgz",
-      "integrity": "sha512-Z5KzqBK/XzPz5+SFHKz7yKqClEQ8pOiEDdgk5SlphBLVNb8JFIJkxhtJKSvnJyHh2rjVgiFmvtJzMF0gNwwKyQ==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-musl/-/canvas-linux-x64-musl-0.1.97.tgz",
+      "integrity": "sha512-AKLFd/v0Z5fvgqBDqhvqtAdx+fHMJ5t9JcUNKq4FIZ5WH+iegGm8HPdj00NFlCSnm83Fp3Ln8I2f7uq1aIiWaA==",
       "cpu": [
         "x64"
       ],
@@ -1317,9 +1315,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-win32-arm64-msvc": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-arm64-msvc/-/canvas-win32-arm64-msvc-0.1.95.tgz",
-      "integrity": "sha512-aj0YbRpe8qVJ4OzMsK7NfNQePgcf9zkGFzNZ9mSuaxXzhpLHmlF2GivNdCdNOg8WzA/NxV6IU4c5XkXadUMLeA==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-arm64-msvc/-/canvas-win32-arm64-msvc-0.1.97.tgz",
+      "integrity": "sha512-u883Yr6A6fO7Vpsy9YE4FVCIxzzo5sO+7pIUjjoDLjS3vQaNMkVzx5bdIpEL+ob+gU88WDK4VcxYMZ6nmnoX9A==",
       "cpu": [
         "arm64"
       ],
@@ -1337,9 +1335,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-win32-x64-msvc": {
-      "version": "0.1.95",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-x64-msvc/-/canvas-win32-x64-msvc-0.1.95.tgz",
-      "integrity": "sha512-GA8leTTCfdjuHi8reICTIxU0081PhXvl3lzIniLUjeLACx9GubUiyzkwFb+oyeKLS5IAGZFLKnzAf4wm2epRlA==",
+      "version": "0.1.97",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-x64-msvc/-/canvas-win32-x64-msvc-0.1.97.tgz",
+      "integrity": "sha512-sWtD2EE3fV0IzN+iiQUqr/Q1SwqWhs2O1FKItFlxtdDkikpEj5g7DKQpY3x55H/MAOnL8iomnlk3mcEeGiUMoQ==",
       "cpu": [
         "x64"
       ],
@@ -1357,16 +1355,22 @@
       }
     },
     "node_modules/@napi-rs/wasm-runtime": {
-      "version": "0.2.11",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.11.tgz",
-      "integrity": "sha512-9DPkXtvHydrcOsopiYpUgPHpmj0HWZKMUnL2dZqpvC42lsratuBG06V5ipyno0fUek5VlFsNQ+AcFATSrJXgMA==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.5.tgz",
+      "integrity": "sha512-AWPoBRJ9tsnVhor4sjO7rkni+7p+2IAEFj6cx06UgP10jkQHqay/36uRV/bFkgrh18D9vb4cr8Q0Pthskgzy+Q==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/core": "^1.4.3",
-        "@emnapi/runtime": "^1.4.3",
-        "@tybys/wasm-util": "^0.9.0"
+        "@tybys/wasm-util": "^0.10.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      },
+      "peerDependencies": {
+        "@emnapi/core": "^1.7.1",
+        "@emnapi/runtime": "^1.7.1"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -1413,10 +1417,44 @@
       "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
       "license": "MIT"
     },
-    "node_modules/@oxc-resolver/binding-darwin-arm64": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.4.0.tgz",
-      "integrity": "sha512-+mlX+/yoWv/IfWad97mn/5KVYtwe/VLjwtyoY04UUL+VrHk0MpANAorM9gFf+7K6GkQEaNkTK1g4GqwPI8OiCQ==",
+    "node_modules/@oxc-parser/binding-android-arm-eabi": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm-eabi/-/binding-android-arm-eabi-0.127.0.tgz",
+      "integrity": "sha512-0LC7ye4hvqbIKxAzThzvswgHLFu2AURKzYLeSVvLdu2TBOYWQDmHnTqPLeA597BcUCxiLqLsS4CJ5uoI5WYWCQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxc-parser/binding-android-arm64": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm64/-/binding-android-arm64-0.127.0.tgz",
+      "integrity": "sha512-b5jtVTH6AU5CJXHNdj7Jj9IEiR9yVjjnwHzPJhGyHGPdcsZSzBCkS9GBbV33niRMvKthDwQRFRJfI4a+k4PvYg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxc-parser/binding-darwin-arm64": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.127.0.tgz",
+      "integrity": "sha512-obCE8B7ISKkJidjlhv9xRGJPOSDG2Yu6PRga9Ruaz35uintHxbp1Ki/Yc71wx4rj3Edrm0a1kzG1TAwit0wFpg==",
       "cpu": [
         "arm64"
       ],
@@ -1425,12 +1463,15 @@
       "optional": true,
       "os": [
         "darwin"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@oxc-resolver/binding-darwin-x64": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.4.0.tgz",
-      "integrity": "sha512-uImuGdgleCPvZFfsYM7WnDW3PZ5z/cwrOt37MFd++rtrQ9kEL32ezl85eyatX2KsvGq7E8qg1DvHLVHOW259uQ==",
+    "node_modules/@oxc-parser/binding-darwin-x64": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.127.0.tgz",
+      "integrity": "sha512-JL6Xb5IwPQT8rUzlpsX7E+AgfcdNklXNPFp8pjCQQ5MQOQo5rtEB2ui+3Hgg9Sn7Y9Egj6YOLLiHhLpdAe12Aw==",
       "cpu": [
         "x64"
       ],
@@ -1439,12 +1480,15 @@
       "optional": true,
       "os": [
         "darwin"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@oxc-resolver/binding-freebsd-x64": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.4.0.tgz",
-      "integrity": "sha512-/uFsbq+RWHiOktH1c9AysKZ++nHj76+chjQrCIvKalHYHKn6ydhMM6GwHL/pWq/gCZADbiKRQ0AOYLNf86hsZg==",
+    "node_modules/@oxc-parser/binding-freebsd-x64": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-freebsd-x64/-/binding-freebsd-x64-0.127.0.tgz",
+      "integrity": "sha512-SDQ/3MQFw58fqQz3Z1PhSKFF3JoCF4gmlNjziDm8X02tTahCw0qJbd7FGPDKw1i4VTBZene9JPyC3mHtSvi+wA==",
       "cpu": [
         "x64"
       ],
@@ -1453,12 +1497,15 @@
       "optional": true,
       "os": [
         "freebsd"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.4.0.tgz",
-      "integrity": "sha512-GPQcVSW2zgc8MtTF5ovIfmXkMCoGATzOmMOinLKjStvqq/KX9tBoVHhR/r7g7ChIJjozeXMMSYrf1q6r3zWXjA==",
+    "node_modules/@oxc-parser/binding-linux-arm-gnueabihf": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.127.0.tgz",
+      "integrity": "sha512-Av+D1MIqzV0YMGPT9we2SIZaMKD7Cxs4CvXSx/yxaWHewZjYEjScpOf5igc8IILASViw4WTnjlwUdI1KzVtDHQ==",
       "cpu": [
         "arm"
       ],
@@ -1467,227 +1514,251 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@oxc-resolver/binding-linux-arm64-gnu": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.4.0.tgz",
-      "integrity": "sha512-rrOFswgslH2i/e2HHP6ei2Z3ivWKvkU666eL1hPXkzHHzhlavIp5vOywjlNR7fZK/15PG4/GKcGsHAVunHd/+w==",
+    "node_modules/@oxc-parser/binding-linux-arm-musleabihf": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.127.0.tgz",
+      "integrity": "sha512-Cs2fdJ8cPpFdeebj6p4dag8A4+56hPvZ0AhQQzlaLswGz1tz7bXt1nETLeorrM9+AMcWFFkqxcXwDGfTVidY8g==",
       "cpu": [
-        "arm64"
+        "arm"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@oxc-resolver/binding-linux-arm64-musl": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.4.0.tgz",
-      "integrity": "sha512-+OQ0rckRSYNP3wuEw+Asf5Is0elLeHkmhzlRAjx20lkITgSaNtkk7wDaqlpJmkcPv6ja3YkOoMiyclfS/FMSGA==",
+    "node_modules/@oxc-parser/binding-linux-arm64-gnu": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.127.0.tgz",
+      "integrity": "sha512-qdOfTcT6SY8gsJrrV92uyEUyjqMGPpIB5JZUG6QN5dukYd+7/j0kX6MwK1DgQj39jtUYixxPiaRUiEN1+0CXgQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@oxc-resolver/binding-linux-riscv64-gnu": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.4.0.tgz",
-      "integrity": "sha512-hOmV2yNr4y5BVDaXPl3aCZASBsVLo4eAd7UWfItG2l1CMcZdtE35XIo0dB3xUg1DGDI5n02eo89014GN246aHA==",
+    "node_modules/@oxc-parser/binding-linux-arm64-musl": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.127.0.tgz",
+      "integrity": "sha512-EoTCZneNFU/P2qrpEM+RHmQwt+CvDkyGESG6qhr7KaegXLZwePfbrkCDfAk8/rhxbDUVGsZILX+2tqPzFtoFWA==",
       "cpu": [
-        "riscv64"
+        "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@oxc-resolver/binding-linux-s390x-gnu": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.4.0.tgz",
-      "integrity": "sha512-STBciuunyjnQAhaJQoOEON3uQWL/Ad7mL+Ap8Q9A2Zw2bxZR7iW+tMu8pJDljHGVtGxtP1uurUt68kY9bMkFhA==",
+    "node_modules/@oxc-parser/binding-linux-ppc64-gnu": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.127.0.tgz",
+      "integrity": "sha512-zALjmZYgxFLHjXeudcDF0xFGNydTAtkAeXAr2EuC17ywCyFxcmQra4w0BMde0Yi/re4Bi4iwEoEXtYN7l6eBLQ==",
       "cpu": [
-        "s390x"
+        "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@oxc-resolver/binding-linux-x64-gnu": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.4.0.tgz",
-      "integrity": "sha512-x9uFAdBZ2SfVSWcQxza3GHo/5enZWLWb8Nf6zBCu0eBee/IL/z5oJIGpF/9xFwlvT4k35ZYHxBC33NGB4SkkGw==",
+    "node_modules/@oxc-parser/binding-linux-riscv64-gnu": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.127.0.tgz",
+      "integrity": "sha512-fPP8M6zQLS7Jz7o9d5ArUSuAuSK3e+WCYVrCpdzeCOejidtZExJ9tjhDrAd3HEPqARBCPmdpqxESPFqy44vkBQ==",
       "cpu": [
-        "x64"
+        "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@oxc-resolver/binding-linux-x64-musl": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.4.0.tgz",
-      "integrity": "sha512-DrPkwPdufbka98aVvJP+qC29LP1MltUm6KPH0sJ5v9g5Tj+qcLi8i1EG5n8fnIqOI3vMtYs3DS2yMR2UGF7xyw==",
+    "node_modules/@oxc-parser/binding-linux-riscv64-musl": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.127.0.tgz",
+      "integrity": "sha512-7IcC4Ao02oGpfnjt+X/oF4U2mllo2qoSkw5xxiXNKL9MCTsTiAC6616beOuehdxGcnz1bRoPC1RQ2f1GQDdN+g==",
       "cpu": [
-        "x64"
+        "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@oxc-resolver/binding-wasm32-wasi": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.4.0.tgz",
-      "integrity": "sha512-fRBFgjhiUWTfz/7H/98r6SHsqCu3FvQPxbbDAs0wEVRvQdu7rZ2Ur2i4vKCZ6qLx6mDiBUKrkXy0btmU7eSrkQ==",
+    "node_modules/@oxc-parser/binding-linux-s390x-gnu": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.127.0.tgz",
+      "integrity": "sha512-pbXIhiNFHoqWeqDNLiJ9JkpHz1IM9k4DXa66x+1GTWMG7iLxtkXgE53iiuKSXwmk3zIYmaPVfBvgcAhS583K4Q==",
       "cpu": [
-        "wasm32"
+        "s390x"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
-      "dependencies": {
-        "@napi-rs/wasm-runtime": "^0.2.11"
-      },
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=14.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       }
     },
-    "node_modules/@oxc-resolver/binding-win32-arm64-msvc": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.4.0.tgz",
-      "integrity": "sha512-Vl32WwWT6aVk0qjfmXRH1BYwtLh8UHEanuuaNyAU4i/I9+Qx8SvNRNo39sRl1g7pHDcdeUgqFoNZkVXwIC5xVw==",
+    "node_modules/@oxc-parser/binding-linux-x64-gnu": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.127.0.tgz",
+      "integrity": "sha512-MYCguB9RvBvlSd6gbuNI7QwiLoCCAlGnlRJFPrzLI6U1/9wkC/WK6LtBAUln55H1Ctqw45PWmqrobKoMhsYQzQ==",
       "cpu": [
-        "arm64"
+        "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
-        "win32"
-      ]
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@oxc-resolver/binding-win32-x64-msvc": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.4.0.tgz",
-      "integrity": "sha512-bBvYlfLTV4uH5pXLnNlx4BZ9DAsV3yQHL3vhXE2PfQ+iZglBkSZU/f82hx8cNwewTaK08zJUz4m2vGMQiSyU8Q==",
+    "node_modules/@oxc-parser/binding-linux-x64-musl": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.127.0.tgz",
+      "integrity": "sha512-5eY0B/bxf1xIUxb4NOTvOI3KWtBQfPWYyKAzgcrCt0mDibSZygVpO1Pz8bkeiSZ5Jj9+M09dkggG3H8I5d0Uyg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@pkgjs/parseargs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-      "license": "MIT",
-      "optional": true,
+        "linux"
+      ],
       "engines": {
-        "node": ">=14"
+        "node": "^20.19.0 || >=22.12.0"
       }
     },
-    "node_modules/@polka/url": {
-      "version": "1.0.0-next.29",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
-      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@remirror/core-constants": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@remirror/core-constants/-/core-constants-3.0.0.tgz",
-      "integrity": "sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==",
-      "license": "MIT"
-    },
-    "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-beta.19",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.19.tgz",
-      "integrity": "sha512-3FL3mnMbPu0muGOCaKAhhFEYmqv9eTfPSJRJmANrCwtgK8VuxpsZDGK+m0LYAGoyO8+0j5uRe4PeyPDK1yA/hA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz",
-      "integrity": "sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==",
+    "node_modules/@oxc-parser/binding-openharmony-arm64": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-openharmony-arm64/-/binding-openharmony-arm64-0.127.0.tgz",
+      "integrity": "sha512-Gld0ajrFTUXNtdw20fVBuTQx66FA75nIVg+//pPfR3sXkuABB4mTBhl3r9JNzrJpgW//qiwxf0nWXUWGJSL3UQ==",
       "cpu": [
-        "arm"
+        "arm64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "android"
-      ]
+        "openharmony"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.59.0.tgz",
-      "integrity": "sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==",
+    "node_modules/@oxc-parser/binding-wasm32-wasi": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.127.0.tgz",
+      "integrity": "sha512-T6KVD7rhLzFlwGRXMnxUFfkCZD8FHnb968wVXW1mXzgRFc5RNXOBY2mPPDZ77x5Ln76ltLMgtPg0cOkU1NSrEQ==",
       "cpu": [
-        "arm64"
+        "wasm32"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "os": [
-        "android"
-      ]
+      "dependencies": {
+        "@emnapi/core": "1.9.2",
+        "@emnapi/runtime": "1.9.2",
+        "@napi-rs/wasm-runtime": "^1.1.4"
+      },
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.59.0.tgz",
-      "integrity": "sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@oxc-parser/binding-wasm32-wasi/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==",
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.2.1",
+        "tslib": "^2.4.0"
+      }
     },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.59.0.tgz",
-      "integrity": "sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@oxc-parser/binding-wasm32-wasi/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==",
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
     },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.59.0.tgz",
-      "integrity": "sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==",
+    "node_modules/@oxc-parser/binding-win32-arm64-msvc": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.127.0.tgz",
+      "integrity": "sha512-Ujvw4X+LD1CCGULcsQcvb4YNVoBGqt+JHgNNzGGaCImELiZLk477ifUH53gIbE7EKd933NdTi25JWEr9K2HwXw==",
       "cpu": [
         "arm64"
       ],
@@ -1695,41 +1766,60 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "freebsd"
-      ]
+        "win32"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.59.0.tgz",
-      "integrity": "sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==",
+    "node_modules/@oxc-parser/binding-win32-ia32-msvc": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.127.0.tgz",
+      "integrity": "sha512-0cwxKO7KHQQQfo4Uf4B2SQrhgm+cJaP9OvFFhx52Tkg4bezsacu83GB2/In5bC415Ueeym+kXdnge/57rbSfTw==",
       "cpu": [
-        "x64"
+        "ia32"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "freebsd"
-      ]
+        "win32"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.59.0.tgz",
-      "integrity": "sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==",
+    "node_modules/@oxc-parser/binding-win32-x64-msvc": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.127.0.tgz",
+      "integrity": "sha512-rOrnSQSCbhI2kowr9XxE7m9a8oQXnBHjnS6j95LxxAnEZ0+Fz20WlRXG4ondQb+ejjt2KOsa65sE6++L6kUd+w==",
       "cpu": [
-        "arm"
+        "x64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
-      ]
+        "win32"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.59.0.tgz",
-      "integrity": "sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==",
+    "node_modules/@oxc-project/types": {
+      "version": "0.133.0",
+      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.133.0.tgz",
+      "integrity": "sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/Boshen"
+      }
+    },
+    "node_modules/@oxc-resolver/binding-android-arm-eabi": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.19.1.tgz",
+      "integrity": "sha512-aUs47y+xyXHUKlbhqHUjBABjvycq6YSD7bpxSW7vplUmdzAlJ93yXY6ZR0c1o1x5A/QKbENCvs3+NlY8IpIVzg==",
       "cpu": [
         "arm"
       ],
@@ -1737,13 +1827,13 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "android"
       ]
     },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.59.0.tgz",
-      "integrity": "sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==",
+    "node_modules/@oxc-resolver/binding-android-arm64": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.19.1.tgz",
+      "integrity": "sha512-oolbkRX+m7Pq2LNjr/kKgYeC7bRDMVTWPgxBGMjSpZi/+UskVo4jsMU3MLheZV55jL6c3rNelPl4oD60ggYmqA==",
       "cpu": [
         "arm64"
       ],
@@ -1751,13 +1841,13 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "android"
       ]
     },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.59.0.tgz",
-      "integrity": "sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==",
+    "node_modules/@oxc-resolver/binding-darwin-arm64": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.19.1.tgz",
+      "integrity": "sha512-nUC6d2i3R5B12sUW4O646qD5cnMXf2oBGPLIIeaRfU9doJRORAbE2SGv4eW6rMqhD+G7nf2Y8TTJTLiiO3Q/dQ==",
       "cpu": [
         "arm64"
       ],
@@ -1765,15 +1855,43 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "darwin"
       ]
     },
-    "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.59.0.tgz",
-      "integrity": "sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==",
+    "node_modules/@oxc-resolver/binding-darwin-x64": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.19.1.tgz",
+      "integrity": "sha512-cV50vE5+uAgNcFa3QY1JOeKDSkM/9ReIcc/9wn4TavhW/itkDGrXhw9jaKnkQnGbjJ198Yh5nbX/Gr2mr4Z5jQ==",
       "cpu": [
-        "loong64"
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@oxc-resolver/binding-freebsd-x64": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.19.1.tgz",
+      "integrity": "sha512-xZOQiYGFxtk48PBKff+Zwoym7ScPAIVp4c14lfLxizO2LTTTJe5sx9vQNGrBymrf/vatSPNMD4FgsaaRigPkqw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.19.1.tgz",
+      "integrity": "sha512-lXZYWAC6kaGe/ky2su94e9jN9t6M0/6c+GrSlCqL//XO1cxi5lpAhnJYdyrKfm0ZEr/c7RNyAx3P7FSBcBd5+A==",
+      "cpu": [
+        "arm"
       ],
       "dev": true,
       "license": "MIT",
@@ -1782,12 +1900,12 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.59.0.tgz",
-      "integrity": "sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==",
+    "node_modules/@oxc-resolver/binding-linux-arm-musleabihf": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.19.1.tgz",
+      "integrity": "sha512-veG1kKsuK5+t2IsO9q0DErYVSw2azvCVvWHnfTOS73WE0STdLLB7Q1bB9WR+yHPQM76ASkFyRbogWo1GR1+WbQ==",
       "cpu": [
-        "loong64"
+        "arm"
       ],
       "dev": true,
       "license": "MIT",
@@ -1796,12 +1914,12 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.59.0.tgz",
-      "integrity": "sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==",
+    "node_modules/@oxc-resolver/binding-linux-arm64-gnu": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.19.1.tgz",
+      "integrity": "sha512-heV2+jmXyYnUrpUXSPugqWDRpnsQcDm2AX4wzTuvgdlZfoNYO0O3W2AVpJYaDn9AG4JdM6Kxom8+foE7/BcSig==",
       "cpu": [
-        "ppc64"
+        "arm64"
       ],
       "dev": true,
       "license": "MIT",
@@ -1810,12 +1928,12 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.59.0.tgz",
-      "integrity": "sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==",
+    "node_modules/@oxc-resolver/binding-linux-arm64-musl": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.19.1.tgz",
+      "integrity": "sha512-jvo2Pjs1c9KPxMuMPIeQsgu0mOJF9rEb3y3TdpsrqwxRM+AN6/nDDwv45n5ZrUnQMsdBy5gIabioMKnQfWo9ew==",
       "cpu": [
-        "ppc64"
+        "arm64"
       ],
       "dev": true,
       "license": "MIT",
@@ -1824,12 +1942,12 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.59.0.tgz",
-      "integrity": "sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==",
+    "node_modules/@oxc-resolver/binding-linux-ppc64-gnu": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.19.1.tgz",
+      "integrity": "sha512-vLmdNxWCdN7Uo5suays6A/+ywBby2PWBBPXctWPg5V0+eVuzsJxgAn6MMB4mPlshskYbppjpN2Zg83ArHze9gQ==",
       "cpu": [
-        "riscv64"
+        "ppc64"
       ],
       "dev": true,
       "license": "MIT",
@@ -1838,10 +1956,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.59.0.tgz",
-      "integrity": "sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==",
+    "node_modules/@oxc-resolver/binding-linux-riscv64-gnu": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.19.1.tgz",
+      "integrity": "sha512-/b+WgR+VTSBxzgOhDO7TlMXC1ufPIMR6Vj1zN+/x+MnyXGW7prTLzU9eW85Aj7Th7CCEG9ArCbTeqxCzFWdg2w==",
       "cpu": [
         "riscv64"
       ],
@@ -1852,12 +1970,12 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.59.0.tgz",
-      "integrity": "sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==",
+    "node_modules/@oxc-resolver/binding-linux-riscv64-musl": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.19.1.tgz",
+      "integrity": "sha512-YlRdeWb9j42p29ROh+h4eg/OQ3dTJlpHSa+84pUM9+p6i3djtPz1q55yLJhgW9XfDch7FN1pQ/Vd6YP+xfRIuw==",
       "cpu": [
-        "s390x"
+        "riscv64"
       ],
       "dev": true,
       "license": "MIT",
@@ -1866,12 +1984,12 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz",
-      "integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==",
+    "node_modules/@oxc-resolver/binding-linux-s390x-gnu": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.19.1.tgz",
+      "integrity": "sha512-EDpafVOQWF8/MJynsjOGFThcqhRHy417sRyLfQmeiamJ8qVhSKAn2Dn2VVKUGCjVB9C46VGjhNo7nOPUi1x6uA==",
       "cpu": [
-        "x64"
+        "s390x"
       ],
       "dev": true,
       "license": "MIT",
@@ -1880,10 +1998,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.59.0.tgz",
-      "integrity": "sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==",
+    "node_modules/@oxc-resolver/binding-linux-x64-gnu": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.19.1.tgz",
+      "integrity": "sha512-NxjZe+rqWhr+RT8/Ik+5ptA3oz7tUw361Wa5RWQXKnfqwSSHdHyrw6IdcTfYuml9dM856AlKWZIUXDmA9kkiBQ==",
       "cpu": [
         "x64"
       ],
@@ -1894,10 +2012,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.59.0.tgz",
-      "integrity": "sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==",
+    "node_modules/@oxc-resolver/binding-linux-x64-musl": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.19.1.tgz",
+      "integrity": "sha512-cM/hQwsO3ReJg5kR+SpI69DMfvNCp+A/eVR4b4YClE5bVZwz8rh2Nh05InhwI5HR/9cArbEkzMjcKgTHS6UaNw==",
       "cpu": [
         "x64"
       ],
@@ -1905,13 +2023,13 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "openbsd"
+        "linux"
       ]
     },
-    "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.59.0.tgz",
-      "integrity": "sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==",
+    "node_modules/@oxc-resolver/binding-openharmony-arm64": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-openharmony-arm64/-/binding-openharmony-arm64-11.19.1.tgz",
+      "integrity": "sha512-QF080IowFB0+9Rh6RcD19bdgh49BpQHUW5TajG1qvWHvmrQznTZZjYlgE2ltLXyKY+qs4F/v5xuX1XS7Is+3qA==",
       "cpu": [
         "arm64"
       ],
@@ -1922,10 +2040,27 @@
         "openharmony"
       ]
     },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.59.0.tgz",
-      "integrity": "sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==",
+    "node_modules/@oxc-resolver/binding-wasm32-wasi": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.19.1.tgz",
+      "integrity": "sha512-w8UCKhX826cP/ZLokXDS6+milN8y4X7zidsAttEdWlVoamTNf6lhBJldaWr3ukTDiye7s4HRcuPEPOXNC432Vg==",
+      "cpu": [
+        "wasm32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@napi-rs/wasm-runtime": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@oxc-resolver/binding-win32-arm64-msvc": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.19.1.tgz",
+      "integrity": "sha512-nJ4AsUVZrVKwnU/QRdzPCCrO0TrabBqgJ8pJhXITdZGYOV28TIYystV1VFLbQ7DtAcaBHpocT5/ZJnF78YJPtQ==",
       "cpu": [
         "arm64"
       ],
@@ -1936,10 +2071,10 @@
         "win32"
       ]
     },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.59.0.tgz",
-      "integrity": "sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==",
+    "node_modules/@oxc-resolver/binding-win32-ia32-msvc": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-11.19.1.tgz",
+      "integrity": "sha512-EW+ND5q2Tl+a3pH81l1QbfgbF3HmqgwLfDfVithRFheac8OTcnbXt/JxqD2GbDkb7xYEqy1zNaVFRr3oeG8npA==",
       "cpu": [
         "ia32"
       ],
@@ -1950,10 +2085,10 @@
         "win32"
       ]
     },
-    "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.59.0.tgz",
-      "integrity": "sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==",
+    "node_modules/@oxc-resolver/binding-win32-x64-msvc": {
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.19.1.tgz",
+      "integrity": "sha512-6hIU3RQu45B+VNTY4Ru8ppFwjVS/S5qwYyGhBotmjxfEKk41I2DlGtRfGJndZ5+6lneE2pwloqunlOyZuX/XAw==",
       "cpu": [
         "x64"
       ],
@@ -1964,43 +2099,316 @@
         "win32"
       ]
     },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.59.0.tgz",
-      "integrity": "sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==",
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@polka/url": {
+      "version": "1.0.0-next.29",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
+      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@remirror/core-constants": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@remirror/core-constants/-/core-constants-3.0.0.tgz",
+      "integrity": "sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==",
+      "license": "MIT"
+    },
+    "node_modules/@rolldown/binding-android-arm64": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.3.tgz",
+      "integrity": "sha512-454rs7jHngixp/NMxd5srYD57OnzSlZ/eFTETjORQHLwJG1lRtmNOJcBerZlfu4GjKqeq8aCCIQrMdHyhI51Hw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-darwin-arm64": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.3.tgz",
+      "integrity": "sha512-PcAhP+ynjURNyy8SKGl5DQP94aGuB/7JrXJb/t7P+hanXvQVMWzUvRRhBAcg/lNRadBhoUPqSoP4xw5tR/KBEA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-darwin-x64": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.3.tgz",
+      "integrity": "sha512-9YpfeUvSE2RS7wysJ81uOZkXJz7f7Q55H2Gvp3VEw/EsahqDtrphrZ0EwDLK5vvKOzaCrBsjF8JmnMLcUt78Gg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-freebsd-x64": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.3.tgz",
+      "integrity": "sha512-yB1IlAsSNHncV6SCTL27/MVGR5htvQsoGxIv5KMGXALp+Ll1wYsn+x98M9MW7qa+NdSbvrrY7ANI4wLJ0n1e6g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.3.tgz",
+      "integrity": "sha512-Yi30IVAAfLUCy2MseFjbB1jAMDl1VMCAas5StnYp8da9+CKvMd2H2cbEjWcw5NPaPqzvYkVIaF1nNUG+b7u/sw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-arm64-gnu": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.3.tgz",
+      "integrity": "sha512-jsO7R8To+AdlYgUmN5sHSCZbfhtMBkO0WUx8iORQnPcMMdgr7qM2DQmMwgabs3GhNztdmoKkMKQFHD6DTMCIQw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-arm64-musl": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.3.tgz",
+      "integrity": "sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-ppc64-gnu": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.3.tgz",
+      "integrity": "sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-s390x-gnu": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.3.tgz",
+      "integrity": "sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-x64-gnu": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.3.tgz",
+      "integrity": "sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-x64-musl": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.3.tgz",
+      "integrity": "sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow==",
       "cpu": [
         "x64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-openharmony-arm64": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.3.tgz",
+      "integrity": "sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-wasm32-wasi": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.3.tgz",
+      "integrity": "sha512-JTtb8BWFynicNSoPrehsCzBtOKjZ6jhMiPFEmOiuXg1Fl8dn2KHQob+GuPSGR0dryQa1PQJbzjF3dqO/whhjLg==",
+      "cpu": [
+        "wasm32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/core": "1.10.0",
+        "@emnapi/runtime": "1.10.0",
+        "@napi-rs/wasm-runtime": "^1.1.4"
+      },
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-win32-arm64-msvc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.3.tgz",
+      "integrity": "sha512-gEdFFEN70A/jxb2svrWsN3aDL7OUtmvlOy+6fa2jxG8K0wQ1ZbdeLGnidov6Yu5/733dI5ySfzFlQ/cb0bSz1g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
       "os": [
         "win32"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-win32-x64-msvc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.3.tgz",
+      "integrity": "sha512-eXB7CHuaQdqmJcc3koCNtNPmT/bj2gc999kUFgBxG8Ac0NdgXc4rkCHhqrgrhN3zddvvvrgzj1e90SuSfmyIXA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/pluginutils": {
+      "version": "1.0.0-rc.2",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.2.tgz",
+      "integrity": "sha512-izyXV/v+cHiRfozX62W9htOAvwMo4/bXKDrQ+vom1L1qRuexPock/7VZDAhnpHCLNejd3NJ6hiab+tO0D44Rgw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@shopify/draggable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@shopify/draggable/-/draggable-1.1.4.tgz",
-      "integrity": "sha512-EkXxBtQH119pGpLWhhhIPEdaeirGcVwkh6Nft1nqbMdM4N6b4r4v9wCmR1/r2gjTwu888I6qGI0VSlhoYivbYw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@shopify/draggable/-/draggable-1.2.1.tgz",
+      "integrity": "sha512-hYKhd99nl1mkO4ybA8i3rxvZgYS2A4Imcxpq7BoUu7h4LmFt997YxHLy8Mm5J7ST+G4DTQXqBsTx9mDid6piZg==",
       "license": "MIT"
     },
     "node_modules/@simplewebauthn/browser": {
-      "version": "13.2.2",
-      "resolved": "https://registry.npmjs.org/@simplewebauthn/browser/-/browser-13.2.2.tgz",
-      "integrity": "sha512-FNW1oLQpTJyqG5kkDg5ZsotvWgmBaC6jCHR7Ej0qUNep36Wl9tj2eZu7J5rP+uhXgHaLk+QQ3lqcw2vS5MX1IA==",
+      "version": "13.3.0",
+      "resolved": "https://registry.npmjs.org/@simplewebauthn/browser/-/browser-13.3.0.tgz",
+      "integrity": "sha512-BE/UWv6FOToAdVk0EokzkqQQDOWtNydYlY6+OrmiZ5SCNmb41VehttboTetUM3T/fr6EAFYVXjz4My2wg230rQ==",
       "license": "MIT"
     },
     "node_modules/@standard-schema/spec": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz",
-      "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
+      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@storybook/addon-a11y": {
-      "version": "10.2.14",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-10.2.14.tgz",
-      "integrity": "sha512-So/Pf8IHEV1XcCHjwPUWs55cB5PilqS3TEho1IXDWpQHBmxBHgX+Z2lQ/SrfqqtMWwy3YY95YO3fA2fn7To5Yg==",
+      "version": "10.3.5",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-10.3.5.tgz",
+      "integrity": "sha512-5k6lpgfIeLxvNhE8v3wEzdiu73ONKjF4gmH1AHvfqYd8kIVzQJai0KCDxgvqNncXHQhIWkaf1fg6+9hKaYJyaw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2012,20 +2420,20 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "^10.2.14"
+        "storybook": "^10.3.5"
       }
     },
     "node_modules/@storybook/addon-docs": {
-      "version": "10.2.14",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-10.2.14.tgz",
-      "integrity": "sha512-vUGw+zoodb91GIcDECZetXL8Bo0AJ/lYudcRBqtdw8taLXucss28Ev6u36dXggARYHPT8V0FhBkipzzJxssjUQ==",
+      "version": "10.3.5",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-10.3.5.tgz",
+      "integrity": "sha512-WuHbxia/o5TX4Rg/IFD0641K5qId/Nk0dxhmAUNoFs5L0+yfZUwh65XOBbzXqrkYmYmcVID4v7cgDRmzstQNkA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@mdx-js/react": "^3.0.0",
-        "@storybook/csf-plugin": "10.2.14",
+        "@storybook/csf-plugin": "10.3.5",
         "@storybook/icons": "^2.0.1",
-        "@storybook/react-dom-shim": "10.2.14",
+        "@storybook/react-dom-shim": "10.3.5",
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "ts-dedent": "^2.0.0"
@@ -2035,13 +2443,13 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "^10.2.14"
+        "storybook": "^10.3.5"
       }
     },
     "node_modules/@storybook/addon-vitest": {
-      "version": "10.2.14",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-vitest/-/addon-vitest-10.2.14.tgz",
-      "integrity": "sha512-ZbI5LfkH2S1+jSaChg0qVNvwxbudDsPf04Sprvl90a6Wlx7kDCU3ksWtyC5u15x10Gqt7eMejN5qrVwygLRONw==",
+      "version": "10.3.5",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-vitest/-/addon-vitest-10.3.5.tgz",
+      "integrity": "sha512-PQDeeMwoF55kvzlhFqVKOryBJskkVk71AbDh7F0y8PdRRxlGbTvIUkKXktHZWBdESo0dV6BkeVxGQ4ZpiFxirg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2056,7 +2464,7 @@
         "@vitest/browser": "^3.0.0 || ^4.0.0",
         "@vitest/browser-playwright": "^4.0.0",
         "@vitest/runner": "^3.0.0 || ^4.0.0",
-        "storybook": "^10.2.14",
+        "storybook": "^10.3.5",
         "vitest": "^3.0.0 || ^4.0.0"
       },
       "peerDependenciesMeta": {
@@ -2075,13 +2483,13 @@
       }
     },
     "node_modules/@storybook/builder-vite": {
-      "version": "10.2.14",
-      "resolved": "https://registry.npmjs.org/@storybook/builder-vite/-/builder-vite-10.2.14.tgz",
-      "integrity": "sha512-4b/opKbbTg+npeFXzj4GwZ7SDJdqsJbcJYxFpAznpl9FqMhP+ktH/7QSDs1DtOXpCanKcrmj6UQQgKR8OGypUQ==",
+      "version": "10.3.5",
+      "resolved": "https://registry.npmjs.org/@storybook/builder-vite/-/builder-vite-10.3.5.tgz",
+      "integrity": "sha512-i4KwCOKbhtlbQIbhm53+Kk7bMnxa0cwTn1pxmtA/x5wm1Qu7FrrBQV0V0DNjkUqzcSKo1CjspASJV/HlY0zYlw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@storybook/csf-plugin": "10.2.14",
+        "@storybook/csf-plugin": "10.3.5",
         "ts-dedent": "^2.0.0"
       },
       "funding": {
@@ -2089,14 +2497,14 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "^10.2.14",
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
+        "storybook": "^10.3.5",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/@storybook/csf-plugin": {
-      "version": "10.2.14",
-      "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-10.2.14.tgz",
-      "integrity": "sha512-N4frSzhig3pkhaWdN0kAnhgEi9IGEy6rJnpuNAocS6d70fSahGQk958TMml2JCG3LLiVamuXySyUrVtFiHrxvg==",
+      "version": "10.3.5",
+      "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-10.3.5.tgz",
+      "integrity": "sha512-qlEzNKxOjq86pvrbuMwiGD/bylnsXk1dg7ve0j77YFjEEchqtl7qTlrXvFdNaLA89GhW6D/EV6eOCu/eobPDgw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2109,7 +2517,7 @@
       "peerDependencies": {
         "esbuild": "*",
         "rollup": "*",
-        "storybook": "^10.2.14",
+        "storybook": "^10.3.5",
         "vite": "*",
         "webpack": "*"
       },
@@ -2136,9 +2544,9 @@
       "license": "MIT"
     },
     "node_modules/@storybook/icons": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@storybook/icons/-/icons-2.0.1.tgz",
-      "integrity": "sha512-/smVjw88yK3CKsiuR71vNgWQ9+NuY2L+e8X7IMrFjexjm6ZR8ULrV2DRkTA61aV6ryefslzHEGDInGpnNeIocg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/icons/-/icons-2.0.2.tgz",
+      "integrity": "sha512-KZBCpXsshAIjczYNXR/rlxEtCUX/eAbpFNwKi8bcOomrLA4t/SyPz5RF+lVPO2oZBUE4sAkt43mfJUevQDSEEw==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -2147,9 +2555,9 @@
       }
     },
     "node_modules/@storybook/react-dom-shim": {
-      "version": "10.2.14",
-      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-10.2.14.tgz",
-      "integrity": "sha512-hO/Yzhf3fX/HhB5MDc/ERM5QLA1+yLgnyt0a4NGDqeWeXQ90YSjEski1RppdAI9oNGyhNwWllZPUrozrL7ECyg==",
+      "version": "10.3.5",
+      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-10.3.5.tgz",
+      "integrity": "sha512-Gw8R7XZm0zSUH0XAuxlQJhmizsLzyD6x00KOlP6l7oW9eQHXGfxg3seNDG3WrSAcW07iP1/P422kuiriQlOv7g==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -2159,13 +2567,13 @@
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "^10.2.14"
+        "storybook": "^10.3.5"
       }
     },
     "node_modules/@storybook/vue3": {
-      "version": "10.2.14",
-      "resolved": "https://registry.npmjs.org/@storybook/vue3/-/vue3-10.2.14.tgz",
-      "integrity": "sha512-i885EDRq5qgvveWZCtCfxBinzpzDOcHBbkCwWG/47WcVirw0RQuSx7IVxiA9C8+QQkNq4+dJm7REfzyPGOQI4A==",
+      "version": "10.3.5",
+      "resolved": "https://registry.npmjs.org/@storybook/vue3/-/vue3-10.3.5.tgz",
+      "integrity": "sha512-PxgnIlem+w0iCxf+YBMPm7T/v75ax1fzqkrVA3C1c/UQ8pckmJxx7Gfs+84GnPWA6Q4G1F2mJ2FsWWneivkQ1g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2178,19 +2586,19 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "^10.2.14",
+        "storybook": "^10.3.5",
         "vue": "^3.0.0"
       }
     },
     "node_modules/@storybook/vue3-vite": {
-      "version": "10.2.14",
-      "resolved": "https://registry.npmjs.org/@storybook/vue3-vite/-/vue3-vite-10.2.14.tgz",
-      "integrity": "sha512-A2WiCftPrjvGJf/k/Xa58/l6q3b0vKYw8+2UyfYzPrfKrkvoxgxD8t5Tukt8YTbcHsJNhMfcVZpvsZYDDS9low==",
+      "version": "10.3.5",
+      "resolved": "https://registry.npmjs.org/@storybook/vue3-vite/-/vue3-vite-10.3.5.tgz",
+      "integrity": "sha512-9a0FDU9lsGDxnTQoDna9fmRx6+tUvnimb61bAcfZeigGyx127qT9rylvSC3WVKTBiQ/o4Dg76v44HIv+ew/DsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@storybook/builder-vite": "10.2.14",
-        "@storybook/vue3": "10.2.14",
+        "@storybook/builder-vite": "10.3.5",
+        "@storybook/vue3": "10.3.5",
         "magic-string": "^0.30.0",
         "typescript": "^5.9.3",
         "vue-component-meta": "^2.0.0",
@@ -2201,68 +2609,63 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "^10.2.14",
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
+        "storybook": "^10.3.5",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/@swc/helpers": {
-      "version": "0.5.17",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
-      "integrity": "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.21.tgz",
+      "integrity": "sha512-jI/VAmtdjB/RnI8GTnokyX7Ug8c+g+ffD6QRLa6XQewtnGyukKkKSk3wLTM3b5cjt1jNh9x0jfVlagdN2gDKQg==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.8.0"
       }
     },
     "node_modules/@tailwindcss/node": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.11.tgz",
-      "integrity": "sha512-yzhzuGRmv5QyU9qLNg4GTlYI6STedBWRE7NjxP45CsFYYq9taI0zJXZBMqIC/c8fViNLhmrbpSFS57EoxUmD6Q==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.2.2.tgz",
+      "integrity": "sha512-pXS+wJ2gZpVXqFaUEjojq7jzMpTGf8rU6ipJz5ovJV6PUGmlJ+jvIwGrzdHdQ80Sg+wmQxUFuoW1UAAwHNEdFA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@ampproject/remapping": "^2.3.0",
-        "enhanced-resolve": "^5.18.1",
-        "jiti": "^2.4.2",
-        "lightningcss": "1.30.1",
-        "magic-string": "^0.30.17",
+        "@jridgewell/remapping": "^2.3.5",
+        "enhanced-resolve": "^5.19.0",
+        "jiti": "^2.6.1",
+        "lightningcss": "1.32.0",
+        "magic-string": "^0.30.21",
         "source-map-js": "^1.2.1",
-        "tailwindcss": "4.1.11"
+        "tailwindcss": "4.2.2"
       }
     },
     "node_modules/@tailwindcss/oxide": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.11.tgz",
-      "integrity": "sha512-Q69XzrtAhuyfHo+5/HMgr1lAiPP/G40OMFAnws7xcFEYqcypZmdW8eGXaOUIeOl1dzPJBPENXgbjsOyhg2nkrg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.2.2.tgz",
+      "integrity": "sha512-qEUA07+E5kehxYp9BVMpq9E8vnJuBHfJEC0vPC5e7iL/hw7HR61aDKoVoKzrG+QKp56vhNZe4qwkRmMC0zDLvg==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
-      "dependencies": {
-        "detect-libc": "^2.0.4",
-        "tar": "^7.4.3"
-      },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       },
       "optionalDependencies": {
-        "@tailwindcss/oxide-android-arm64": "4.1.11",
-        "@tailwindcss/oxide-darwin-arm64": "4.1.11",
-        "@tailwindcss/oxide-darwin-x64": "4.1.11",
-        "@tailwindcss/oxide-freebsd-x64": "4.1.11",
-        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.11",
-        "@tailwindcss/oxide-linux-arm64-gnu": "4.1.11",
-        "@tailwindcss/oxide-linux-arm64-musl": "4.1.11",
-        "@tailwindcss/oxide-linux-x64-gnu": "4.1.11",
-        "@tailwindcss/oxide-linux-x64-musl": "4.1.11",
-        "@tailwindcss/oxide-wasm32-wasi": "4.1.11",
-        "@tailwindcss/oxide-win32-arm64-msvc": "4.1.11",
-        "@tailwindcss/oxide-win32-x64-msvc": "4.1.11"
+        "@tailwindcss/oxide-android-arm64": "4.2.2",
+        "@tailwindcss/oxide-darwin-arm64": "4.2.2",
+        "@tailwindcss/oxide-darwin-x64": "4.2.2",
+        "@tailwindcss/oxide-freebsd-x64": "4.2.2",
+        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.2.2",
+        "@tailwindcss/oxide-linux-arm64-gnu": "4.2.2",
+        "@tailwindcss/oxide-linux-arm64-musl": "4.2.2",
+        "@tailwindcss/oxide-linux-x64-gnu": "4.2.2",
+        "@tailwindcss/oxide-linux-x64-musl": "4.2.2",
+        "@tailwindcss/oxide-wasm32-wasi": "4.2.2",
+        "@tailwindcss/oxide-win32-arm64-msvc": "4.2.2",
+        "@tailwindcss/oxide-win32-x64-msvc": "4.2.2"
       }
     },
     "node_modules/@tailwindcss/oxide-android-arm64": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.11.tgz",
-      "integrity": "sha512-3IfFuATVRUMZZprEIx9OGDjG3Ou3jG4xQzNTvjDoKmU9JdmoCohQJ83MYd0GPnQIu89YoJqvMM0G3uqLRFtetg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.2.2.tgz",
+      "integrity": "sha512-dXGR1n+P3B6748jZO/SvHZq7qBOqqzQ+yFrXpoOWWALWndF9MoSKAT3Q0fYgAzYzGhxNYOoysRvYlpixRBBoDg==",
       "cpu": [
         "arm64"
       ],
@@ -2273,13 +2676,13 @@
         "android"
       ],
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-arm64": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.11.tgz",
-      "integrity": "sha512-ESgStEOEsyg8J5YcMb1xl8WFOXfeBmrhAwGsFxxB2CxY9evy63+AtpbDLAyRkJnxLy2WsD1qF13E97uQyP1lfQ==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.2.2.tgz",
+      "integrity": "sha512-iq9Qjr6knfMpZHj55/37ouZeykwbDqF21gPFtfnhCCKGDcPI/21FKC9XdMO/XyBM7qKORx6UIhGgg6jLl7BZlg==",
       "cpu": [
         "arm64"
       ],
@@ -2290,13 +2693,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-x64": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.11.tgz",
-      "integrity": "sha512-EgnK8kRchgmgzG6jE10UQNaH9Mwi2n+yw1jWmof9Vyg2lpKNX2ioe7CJdf9M5f8V9uaQxInenZkOxnTVL3fhAw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.2.2.tgz",
+      "integrity": "sha512-BlR+2c3nzc8f2G639LpL89YY4bdcIdUmiOOkv2GQv4/4M0vJlpXEa0JXNHhCHU7VWOKWT/CjqHdTP8aUuDJkuw==",
       "cpu": [
         "x64"
       ],
@@ -2307,13 +2710,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       }
     },
     "node_modules/@tailwindcss/oxide-freebsd-x64": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.11.tgz",
-      "integrity": "sha512-xdqKtbpHs7pQhIKmqVpxStnY1skuNh4CtbcyOHeX1YBE0hArj2romsFGb6yUmzkq/6M24nkxDqU8GYrKrz+UcA==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.2.2.tgz",
+      "integrity": "sha512-YUqUgrGMSu2CDO82hzlQ5qSb5xmx3RUrke/QgnoEx7KvmRJHQuZHZmZTLSuuHwFf0DJPybFMXMYf+WJdxHy/nQ==",
       "cpu": [
         "x64"
       ],
@@ -2324,13 +2727,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.11.tgz",
-      "integrity": "sha512-ryHQK2eyDYYMwB5wZL46uoxz2zzDZsFBwfjssgB7pzytAeCCa6glsiJGjhTEddq/4OsIjsLNMAiMlHNYnkEEeg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.2.2.tgz",
+      "integrity": "sha512-FPdhvsW6g06T9BWT0qTwiVZYE2WIFo2dY5aCSpjG/S/u1tby+wXoslXS0kl3/KXnULlLr1E3NPRRw0g7t2kgaQ==",
       "cpu": [
         "arm"
       ],
@@ -2341,13 +2744,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.11.tgz",
-      "integrity": "sha512-mYwqheq4BXF83j/w75ewkPJmPZIqqP1nhoghS9D57CLjsh3Nfq0m4ftTotRYtGnZd3eCztgbSPJ9QhfC91gDZQ==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.2.2.tgz",
+      "integrity": "sha512-4og1V+ftEPXGttOO7eCmW7VICmzzJWgMx+QXAJRAhjrSjumCwWqMfkDrNu1LXEQzNAwz28NCUpucgQPrR4S2yw==",
       "cpu": [
         "arm64"
       ],
@@ -2358,13 +2761,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.11.tgz",
-      "integrity": "sha512-m/NVRFNGlEHJrNVk3O6I9ggVuNjXHIPoD6bqay/pubtYC9QIdAMpS+cswZQPBLvVvEF6GtSNONbDkZrjWZXYNQ==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.2.2.tgz",
+      "integrity": "sha512-oCfG/mS+/+XRlwNjnsNLVwnMWYH7tn/kYPsNPh+JSOMlnt93mYNCKHYzylRhI51X+TbR+ufNhhKKzm6QkqX8ag==",
       "cpu": [
         "arm64"
       ],
@@ -2375,13 +2778,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.11.tgz",
-      "integrity": "sha512-YW6sblI7xukSD2TdbbaeQVDysIm/UPJtObHJHKxDEcW2exAtY47j52f8jZXkqE1krdnkhCMGqP3dbniu1Te2Fg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.2.2.tgz",
+      "integrity": "sha512-rTAGAkDgqbXHNp/xW0iugLVmX62wOp2PoE39BTCGKjv3Iocf6AFbRP/wZT/kuCxC9QBh9Pu8XPkv/zCZB2mcMg==",
       "cpu": [
         "x64"
       ],
@@ -2392,13 +2795,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-musl": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.11.tgz",
-      "integrity": "sha512-e3C/RRhGunWYNC3aSF7exsQkdXzQ/M+aYuZHKnw4U7KQwTJotnWsGOIVih0s2qQzmEzOFIJ3+xt7iq67K/p56Q==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.2.2.tgz",
+      "integrity": "sha512-XW3t3qwbIwiSyRCggeO2zxe3KWaEbM0/kW9e8+0XpBgyKU4ATYzcVSMKteZJ1iukJ3HgHBjbg9P5YPRCVUxlnQ==",
       "cpu": [
         "x64"
       ],
@@ -2409,13 +2812,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       }
     },
     "node_modules/@tailwindcss/oxide-wasm32-wasi": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.11.tgz",
-      "integrity": "sha512-Xo1+/GU0JEN/C/dvcammKHzeM6NqKovG+6921MR6oadee5XPBaKOumrJCXvopJ/Qb5TH7LX/UAywbqrP4lax0g==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.2.2.tgz",
+      "integrity": "sha512-eKSztKsmEsn1O5lJ4ZAfyn41NfG7vzCg496YiGtMDV86jz1q/irhms5O0VrY6ZwTUkFy/EKG3RfWgxSI3VbZ8Q==",
       "bundleDependencies": [
         "@napi-rs/wasm-runtime",
         "@emnapi/core",
@@ -2431,21 +2834,21 @@
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/core": "^1.4.3",
-        "@emnapi/runtime": "^1.4.3",
-        "@emnapi/wasi-threads": "^1.0.2",
-        "@napi-rs/wasm-runtime": "^0.2.11",
-        "@tybys/wasm-util": "^0.9.0",
-        "tslib": "^2.8.0"
+        "@emnapi/core": "^1.8.1",
+        "@emnapi/runtime": "^1.8.1",
+        "@emnapi/wasi-threads": "^1.1.0",
+        "@napi-rs/wasm-runtime": "^1.1.1",
+        "@tybys/wasm-util": "^0.10.1",
+        "tslib": "^2.8.1"
       },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.11.tgz",
-      "integrity": "sha512-UgKYx5PwEKrac3GPNPf6HVMNhUIGuUh4wlDFR2jYYdkX6pL/rn73zTq/4pzUm8fOjAn5L8zDeHp9iXmUGOXZ+w==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.2.2.tgz",
+      "integrity": "sha512-qPmaQM4iKu5mxpsrWZMOZRgZv1tOZpUm+zdhhQP0VhJfyGGO3aUKdbh3gDZc/dPLQwW4eSqWGrrcWNBZWUWaXQ==",
       "cpu": [
         "arm64"
       ],
@@ -2456,13 +2859,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       }
     },
     "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.11.tgz",
-      "integrity": "sha512-YfHoggn1j0LK7wR82TOucWc5LDCguHnoS879idHekmmiR7g9HUtMw9MI0NHatS28u/Xlkfi9w5RJWgz2Dl+5Qg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.2.2.tgz",
+      "integrity": "sha512-1T/37VvI7WyH66b+vqHj/cLwnCxt7Qt3WFu5Q8hk65aOvlwAhs7rAp1VkulBJw/N4tMirXjVnylTR72uI0HGcA==",
       "cpu": [
         "x64"
       ],
@@ -2473,28 +2876,28 @@
         "win32"
       ],
       "engines": {
-        "node": ">= 10"
+        "node": ">= 20"
       }
     },
     "node_modules/@tailwindcss/vite": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.11.tgz",
-      "integrity": "sha512-RHYhrR3hku0MJFRV+fN2gNbDNEh3dwKvY8XJvTxCSXeMOsCRSr+uKvDWQcbizrHgjML6ZmTE5OwMrl5wKcujCw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.2.2.tgz",
+      "integrity": "sha512-mEiF5HO1QqCLXoNEfXVA1Tzo+cYsrqV7w9Juj2wdUFyW07JRenqMG225MvPwr3ZD9N1bFQj46X7r33iHxLUW0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@tailwindcss/node": "4.1.11",
-        "@tailwindcss/oxide": "4.1.11",
-        "tailwindcss": "4.1.11"
+        "@tailwindcss/node": "4.2.2",
+        "@tailwindcss/oxide": "4.2.2",
+        "tailwindcss": "4.2.2"
       },
       "peerDependencies": {
-        "vite": "^5.2.0 || ^6 || ^7"
+        "vite": "^5.2.0 || ^6 || ^7 || ^8"
       }
     },
     "node_modules/@tanstack/virtual-core": {
-      "version": "3.13.12",
-      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.12.tgz",
-      "integrity": "sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==",
+      "version": "3.13.23",
+      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.23.tgz",
+      "integrity": "sha512-zSz2Z2HNyLjCplANTDyl3BcdQJc2k1+yyFoKhNRmCr7V7dY8o8q5m8uFTI1/Pg1kL+Hgrz6u3Xo6eFUB7l66cg==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -2502,12 +2905,12 @@
       }
     },
     "node_modules/@tanstack/vue-virtual": {
-      "version": "3.13.12",
-      "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.12.tgz",
-      "integrity": "sha512-vhF7kEU9EXWXh+HdAwKJ2m3xaOnTTmgcdXcF2pim8g4GvI7eRrk2YRuV5nUlZnd/NbCIX4/Ja2OZu5EjJL06Ww==",
+      "version": "3.13.23",
+      "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.23.tgz",
+      "integrity": "sha512-b5jPluAR6U3eOq6GWAYSpj3ugnAIZgGR0e6aGAgyRse0Yu6MVQQ0ZWm9SArSXWtageogn6bkVD8D//c4IjW3xQ==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/virtual-core": "3.13.12"
+        "@tanstack/virtual-core": "3.13.23"
       },
       "funding": {
         "type": "github",
@@ -2580,48 +2983,48 @@
       }
     },
     "node_modules/@tiptap/core": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.0.9.tgz",
-      "integrity": "sha512-1zdDyILerBcD3P0fu8kCtPLOFj0R5utjexCQ2CZ46pckn/Wk4V+WUBARzhG5Yz2JDkmJIUIcmLBVrL6G1rjJWg==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.22.3.tgz",
+      "integrity": "sha512-Dv9MKK5BDWCF0N2l6/Pxv3JNCce2kwuWf2cKMBc2bEetx0Pn6o7zlFmSxMvYK4UtG1Tw9Yg/ZHi6QOFWK0Zm9Q==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/pm": "^3.0.9"
+        "@tiptap/pm": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-blockquote": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.0.9.tgz",
-      "integrity": "sha512-dGhMWb6GIjgIUuLQDhSlHT6yB4YvnYqe01nHzEvcbSii75KOcLwboVnqxw4p+gsDZLvZRGv/6bZBJh7GKZa8OQ==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.22.3.tgz",
+      "integrity": "sha512-IaUx3zh7yLHXzIXKL+fw/jzFhsIImdhJyw0lMhe8FfYrefFqXJFYW/sey6+L/e8B3AWvTksPA6VBwefzbH77JA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-bold": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.0.9.tgz",
-      "integrity": "sha512-rVULIFt9ZO+fO5ty9zuC3HwY3knxUw7q9JBztpKPfQQCuIJ+iQnOfB8NtI3L8hxVSxhIR1pqr8B3S/8vlpXbVg==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.22.3.tgz",
+      "integrity": "sha512-tysipHla2zCWr8XNIWRaW9O+7i7/SoEqnRqSRUUi2ailcJjlia+RBy3RykhkgyThrQDStu5KGBS/UvrXwA+O1A==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-bubble-menu": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-bubble-menu/-/extension-bubble-menu-3.0.9.tgz",
-      "integrity": "sha512-fZQfdSbKJl3J+Yi+s8NrcLBgXHOaGVD4g+vn+orTPUlZdG9FWvEoon8DexOdK9OvYnW6QMM7kS8whOgpogVyUQ==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bubble-menu/-/extension-bubble-menu-3.22.3.tgz",
+      "integrity": "sha512-Y6zQjh0ypDg32HWgICEvmPSKjGLr39k3aDxxt/H0uQEZSfw4smT0hxUyyyjVjx68C6t6MTnwdfz0hPI5lL68vQ==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2632,97 +3035,97 @@
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9",
-        "@tiptap/pm": "^3.0.9"
+        "@tiptap/core": "^3.22.3",
+        "@tiptap/pm": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-bullet-list": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.0.9.tgz",
-      "integrity": "sha512-Aob5TVfrtoEzfTm3wl7lognmWia6EEilOxLihSGISCvI4FTndJg+mwhumduQeYCLWkF9i/DR87m2/3EbjR3R4Q==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.22.3.tgz",
+      "integrity": "sha512-xOmW/b1hgECIE6r3IeZvKn4VVlG3+dfTjCWE6lnnyLaqdNkNhKS1CwUmDZdYNLUS2ryIUtgz5ID1W/8A3PhbiA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extension-list": "^3.0.9"
+        "@tiptap/extension-list": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-character-count": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-character-count/-/extension-character-count-3.0.9.tgz",
-      "integrity": "sha512-KKtHfvMlYCNszldPvmzDzvRSV/Xukb7T/t4IMPgFp2LUDPuBK1z4TPP8HEsONTFAAKc+JgnJPPkMxfhh/tFbnQ==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-character-count/-/extension-character-count-3.22.3.tgz",
+      "integrity": "sha512-MAs446aZWyAdVVSK+jkxoxR+N3n/ucMRCoenyekqdDDwkn4l3mDVC469X8Iby80/+66cRyHFFAbOivOoB8ds/g==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extensions": "^3.0.9"
+        "@tiptap/extensions": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-code": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.0.9.tgz",
-      "integrity": "sha512-jMo7crwLIefwy13WI2FzxlyJN9AbLNsESFbJuv/KPzjpN7uzPKYsE33Uy2IZD5hPoHtA5UmAUfbz0HzWtWy5Yw==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.22.3.tgz",
+      "integrity": "sha512-wafWTDQOuMKtXpZEuk1PFQmzopabBciNLryL90MB9S03MNLaQQZYLnmYkDBlzAaLAbgF5QiC+2XZQEBQuTVjFQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-code-block": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.0.9.tgz",
-      "integrity": "sha512-H692k9sHIE3rR3S+BIknQXsLb8HSojk+7gQ5DV0hYajSzpJ02OUL4AnNlpMuSgZuaq+ljpN4sT8kCIzIE1kQxw==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.22.3.tgz",
+      "integrity": "sha512-RiQtEjDAPrHpdo6sw6b7fOw/PijqgFIsozKKkGcSeBgWHQuFg7q9OxJTj+l0e60rVwSu/5gmKEEobzM9bX+t2Q==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9",
-        "@tiptap/pm": "^3.0.9"
+        "@tiptap/core": "^3.22.3",
+        "@tiptap/pm": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-code-block-lowlight": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-3.0.9.tgz",
-      "integrity": "sha512-J5REgsah4yCaiWwy6FOygbv5FlHw28xzqxdIqm3922uq+l2LKwCAF4EwR3u19ZLGgtH2Wy27BClR97JZPLvVCQ==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-3.22.3.tgz",
+      "integrity": "sha512-NGFuD9zb1QfnCgD2zW4XaUEdQvd/ydm9FmXXh8eawx/+C8xt3p21DIKRERvxWrCvvVNzIUEpZRRYehPOJiD1eg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9",
-        "@tiptap/extension-code-block": "^3.0.9",
-        "@tiptap/pm": "^3.0.9",
+        "@tiptap/core": "^3.22.3",
+        "@tiptap/extension-code-block": "^3.22.3",
+        "@tiptap/pm": "^3.22.3",
         "highlight.js": "^11",
         "lowlight": "^2 || ^3"
       }
     },
     "node_modules/@tiptap/extension-document": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.0.9.tgz",
-      "integrity": "sha512-DB/R5e6QvuGhY8EhCkfNjR2xQfz/TOWoxfQGhDuy5U+oK3WBwCcHq9t5+nbSCMHtKfi/i49aHKDvv7TQCpuP0w==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.22.3.tgz",
+      "integrity": "sha512-MCSr1PFPtTd++lA3H1RNgqAczAE59XXJ5wUFIQf2F+/0DPY5q2SU4g5QsNJVxPPft5mrNT4C6ty8xBPrALFEdA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-floating-menu": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-floating-menu/-/extension-floating-menu-3.0.9.tgz",
-      "integrity": "sha512-WYQ3mW6G0zxoni6TegpQ46a1Qe1zj8Ev5sBH79H4Mbf0qsc7MOq07jLjipv9M0EJJPUi0cfkQlwfV41nH1ue/g==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-floating-menu/-/extension-floating-menu-3.22.3.tgz",
+      "integrity": "sha512-0f8b4KZ3XKai8GXWseIYJGdOfQr3evtFbBo3U08zy2aYzMMXWG0zEF7qe5/oiYp2aZ95edjjITnEceviTsZkIg==",
       "license": "MIT",
       "optional": true,
       "funding": {
@@ -2731,254 +3134,254 @@
       },
       "peerDependencies": {
         "@floating-ui/dom": "^1.0.0",
-        "@tiptap/core": "^3.0.9",
-        "@tiptap/pm": "^3.0.9"
+        "@tiptap/core": "^3.22.3",
+        "@tiptap/pm": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-hard-break": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.0.9.tgz",
-      "integrity": "sha512-PWNYsUwVsMWt/R5/OWjfGb+7DQT0DvH+1owBimRq0pWZepg8qkz1jdPGgsRmUFyERRsXeEpgj3VaQfrgbyUfrA==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.22.3.tgz",
+      "integrity": "sha512-J0v8I99y9tbvVmgKYKzKP/JYNsWaZYS7avn4rzLft2OhnyTfwt3OoY8DtpHmmi6apSUaCtoWHWta/TmoEfK1nQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-heading": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.0.9.tgz",
-      "integrity": "sha512-LRLCIt87fvDZ5CdkinzhkCwRz5ax6FlsjJzG32MJ3wXyvVslqeLXBvH28JFUZEyzgcd/SnYmYxnef5+yvAX61g==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.22.3.tgz",
+      "integrity": "sha512-XBHuhiEV2EEhZHpOLcplLqAmBIhJciU3I6AtwmqeEqDC0P114uMEfAO7JGlbBZdCYotNer26PKnu44TBTeNtkw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-history": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-history/-/extension-history-3.0.9.tgz",
-      "integrity": "sha512-wTSNy85Kla77y9zSUrNEGUVkqCWK9fU+Dsq8wH1A7Xrgi7vBPGkzhy8jpA8+CYtd6xI6c9IiuZrX+x44vjBlSw==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-history/-/extension-history-3.22.3.tgz",
+      "integrity": "sha512-3kev2iP84YPjwUk8BaM28EQiVHbBmE0lkcIjh/6yvgRxRwblzRwyJuFcsVOY5ouBVxl9Rg1rcFFCAs8CFNFkUg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extensions": "^3.0.9"
+        "@tiptap/extensions": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-horizontal-rule": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.0.9.tgz",
-      "integrity": "sha512-jPNCOte0y9R3Y4PiEA/CRGgRk8WoL700Mnn8NPVHa4juUjvMl1qxL8hdnW/k8cxhrBA8tV0qcq82+/Vqq6jSfA==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.22.3.tgz",
+      "integrity": "sha512-wI2bFzScs+KgWeBH/BtypcVKeYelCyqV0RG8nxsZMWtPrBhqixzNd0Oi3gEKtjSjKUqMQ/kjJAIRuESr5UzlHA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9",
-        "@tiptap/pm": "^3.0.9"
+        "@tiptap/core": "^3.22.3",
+        "@tiptap/pm": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-italic": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.0.9.tgz",
-      "integrity": "sha512-Gt4FbMtZerzKpit8+FvIjIQ3CBD559/FFC+kOT9y8JHlINeqWyh/bgHuaA/9/XtHphOQiA7NDwOiuPh4KIKpqA==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.22.3.tgz",
+      "integrity": "sha512-LteA4cb4EGCiUtrK2JHvDF/Zg0/YqV4DUyHhAAho+oGEQDupZlsS6m0ia5wQcclkiTLzsoPrwcSNu6RDGQ16wQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-list": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.0.9.tgz",
-      "integrity": "sha512-y5JQoFmVR+6FhDdEz2oFIMkURSRSDhCtsrlNWdUpSTGnTAa2WZT7nEhHcIMSGvYU3t0fkfLQ9yTMSaQZFa5GLA==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.22.3.tgz",
+      "integrity": "sha512-rqvv/dtqwbX+8KnPv0eMYp6PnBcuhPMol5cv1GlS8Nq/Cxt68EWGUHBuTFesw+hdnRQLmKwzoO1DlRn7PhxYRQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9",
-        "@tiptap/pm": "^3.0.9"
+        "@tiptap/core": "^3.22.3",
+        "@tiptap/pm": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-list-item": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.0.9.tgz",
-      "integrity": "sha512-K+ogk1BH/eYhsK9nSTXNdIXlxQcXzty6h1QFiZNr9XmaLk+q4NZFHR5FVz3EJ7QXyw+Gv/2FQn+T2Q/GpbMxZQ==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.22.3.tgz",
+      "integrity": "sha512-80CNf4oO5y8+LdckT4CyMe1t01EyhpRrQC9H45JW20P7559Nrchp5my3vvMtIAJbpTPPZtcB7LwdzWGKsG5drg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extension-list": "^3.0.9"
+        "@tiptap/extension-list": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-ordered-list": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.0.9.tgz",
-      "integrity": "sha512-ACubdGc/y/rKPEgHTO7hDSg547wRRA+Es7c/rQgjrkpI///LBJQfixyUvNg2UNNPttNsavF/CUwhshCeo9MeBA==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.22.3.tgz",
+      "integrity": "sha512-orAghtmd+K4Euu4BgI1hG+iZDXBYOyl5YTwiLBc2mQn+pqtZ9LqaH2us4ETwEwNP3/IWXGSAimUZ19nuL+eM2w==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extension-list": "^3.0.9"
+        "@tiptap/extension-list": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-paragraph": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.0.9.tgz",
-      "integrity": "sha512-K5zGg4zLxxqAG0BgtRpLvKclYSGoSSuU1Fza0M5MwUgrFA0S2q4JnLB1czQ77S4pfb3hpScIe50fwJzZmIUEQw==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.22.3.tgz",
+      "integrity": "sha512-oO7rhfyhEuwm+50s9K3GZPjYyEEEvFAvm1wXopvZnhbkBLydIWImBfrZoC5IQh4/sRDlTIjosV2C+ji5y0tUSg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-strike": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.0.9.tgz",
-      "integrity": "sha512-2TBQ9P/FGe+/34ckfwP+eCdb4vbxDVZ5qD0piDIR9Ws5QI5IdtW90pNO4roxiPeRdVFrhTbFPEIuL0tg4NQRmg==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.22.3.tgz",
+      "integrity": "sha512-jY2InoUlKkuk5KHoIDGdML1OCA2n6PRHAtxwHNkAmiYh0Khf0zaVPGFpx4dgQrN7W5Q1WE6oBZnjrvy6qb7w0g==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-subscript": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.0.9.tgz",
-      "integrity": "sha512-FJi6TH5VnAGtqD7c8TX0JJGkabVTC69lEoSel8RUbK9P+NHk0hh1PEyCjHSNhGinepoB6GIi6+skvXHIkJb5xw==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.22.3.tgz",
+      "integrity": "sha512-fcHinQMye6tPSxTB74CLW4Z/HbA9FX4epKOQ0ld0wIFsQB2bVz0NH9FfwrTEsYWLjeFWkDcL41VOReZXqKz1jQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9",
-        "@tiptap/pm": "^3.0.9"
+        "@tiptap/core": "^3.22.3",
+        "@tiptap/pm": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-superscript": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.0.9.tgz",
-      "integrity": "sha512-an3ZLXkgO9eLxRDeWelxlzCSdGlVptPMfcg/d315SnjBKRhXJbBirLxQsYfb5CF/cGJ56Qj3TvewfKPITP5POw==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.22.3.tgz",
+      "integrity": "sha512-q+yPA+vbvaqiVGTJddjBhvWgqLXu6j39knz3TgJKw4nBuvoAXWrlWtgOy44wwIIs8vILI4wENoUuoI0+vOzynA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9",
-        "@tiptap/pm": "^3.0.9"
+        "@tiptap/core": "^3.22.3",
+        "@tiptap/pm": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-table": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.0.9.tgz",
-      "integrity": "sha512-jygDvj9MIwMlzs2c+4MZwXCXI6sc7LcKgPFoJ93qiCn6CZrDwaX3XzxXi0VAg7MexsUi1nVaGZQk/gv+Pf3rKw==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.22.3.tgz",
+      "integrity": "sha512-inbQSusJad7H0T++L1APg/anfL5d15cNGp2YG3vwo6TQr71nn2c9pepvmz3xuAIt8eygZDRba+4GT/COP1f9QA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9",
-        "@tiptap/pm": "^3.0.9"
+        "@tiptap/core": "^3.22.3",
+        "@tiptap/pm": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-text": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.0.9.tgz",
-      "integrity": "sha512-yWdz4aW1nu5YGcinxfu3FXiwMnP/7jp+s7dFXhq9m/6zhDUD2+qyUwhJfIU4Tcz+BGdVHqoNgOA3QXLMA6jyFA==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.22.3.tgz",
+      "integrity": "sha512-Q9R7JsTdomP5uUjtPjNKxHT1xoh/i9OJZnmgJLe7FcgZEaPOQ3bWxmKZoLZQfDfZjyB8BtH+Hc7nUvhCMOePxw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-text-align": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.0.9.tgz",
-      "integrity": "sha512-QQBk8orIdntL3tPzGkKIqEogqArvO/x4dfvbAA2K0DqvS9uGJ3Qp4X6Twv+BIHLjeyhZl/z48vEMB+bjwvqg+w==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.22.3.tgz",
+      "integrity": "sha512-dG1NHE0yGf7fYiOdabCJuecI2IJ1uogyY/QvZqvPNaxRjZDoXYuGlMtz9jEDiIdQSaPED2MSsS7KkuNFQIEMGg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-typography": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-typography/-/extension-typography-3.0.9.tgz",
-      "integrity": "sha512-vlOdZidm05AJJ2tMJXVh9ICtlutbvs+2+A7nmsGAnAqbErcleFYimaLFaWucCPsPnUz04pa4qMtW8jF2WIJQYg==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-typography/-/extension-typography-3.22.3.tgz",
+      "integrity": "sha512-QQv1KUHsr3LTGhtPIG/ZP15Cj5VmI5ChgK4Q7UZ7JZBppBKAeMnyAnOcO2ith+qZ8qp5s+UiQ7Unp0zP1VSYkg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extension-underline": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.0.9.tgz",
-      "integrity": "sha512-xLR5NbnxlEJmvfb4Aj8wCbTmh/ycnPsSDeP8+TAsdAYxypSA6BP6G0t4d4NWreqAq+tq6QV6Eh0+YDN0G1VZxw==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.22.3.tgz",
+      "integrity": "sha512-Ch6CBWRa5w90yYSPUW6x9Py9JdrXMqk3pZ9OIlMYD8A7BqyZGfiHerX7XDMYDS09KjyK3U9XH60/zxYOzXdDLA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9"
+        "@tiptap/core": "^3.22.3"
       }
     },
     "node_modules/@tiptap/extensions": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.0.9.tgz",
-      "integrity": "sha512-IyTcPnZXUf0nxDkC+CCWh10vzn81Kq50euV/ivk8IyPr15hxPiT3Zk1LmCI10Pqf4Bwgz38XUIWtToDfIeEgpg==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.22.3.tgz",
+      "integrity": "sha512-s5eiMq0m5N6N+W7dU6rd60KgZyyCD7FvtPNNswISfPr12EQwJBfbjWwTqd0UKNzA4fNrhQEERXnzORkykttPeA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.0.9",
-        "@tiptap/pm": "^3.0.9"
+        "@tiptap/core": "^3.22.3",
+        "@tiptap/pm": "^3.22.3"
       }
     },
     "node_modules/@tiptap/pm": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.0.9.tgz",
-      "integrity": "sha512-cJdnpGyirRxwi6M4IkyapEK/jhcjFXdfX3uhJp/4uVH1dynNXalV0gE/YnH/yt55kzwvG9OUrwOQt+t1iXgNog==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.22.3.tgz",
+      "integrity": "sha512-NjfWjZuvrqmpICT+GZWNIjtOdhPyqFKDMtQy7tsQ5rErM9L2ZQdy/+T/BKSO1JdTeBhdg9OP+0yfsqoYp2aT6A==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-changeset": "^2.3.0",
@@ -3006,29 +3409,29 @@
       }
     },
     "node_modules/@tiptap/vue-3": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@tiptap/vue-3/-/vue-3-3.0.9.tgz",
-      "integrity": "sha512-IEhddTn2M0LbatFGkBPxfdbs+kL+xVC2GgYWWxvR/44ptXpKV4axtlH42nqh7sLj4DSBfP9jRlU6U0n6zdeMGg==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/vue-3/-/vue-3-3.22.3.tgz",
+      "integrity": "sha512-wOGZiBwIJYCZXts5VWWGgseGCRMc8tO46tgaOXNyMLVl2h2cO6/CNEcPO2pgtuoLIHoV4KYvfpw6n+XqR9cqbA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "optionalDependencies": {
-        "@tiptap/extension-bubble-menu": "^3.0.9",
-        "@tiptap/extension-floating-menu": "^3.0.9"
+        "@tiptap/extension-bubble-menu": "^3.22.3",
+        "@tiptap/extension-floating-menu": "^3.22.3"
       },
       "peerDependencies": {
         "@floating-ui/dom": "^1.0.0",
-        "@tiptap/core": "^3.0.9",
-        "@tiptap/pm": "^3.0.9",
+        "@tiptap/core": "^3.22.3",
+        "@tiptap/pm": "^3.22.3",
         "vue": "^3.0.0"
       }
     },
     "node_modules/@tybys/wasm-util": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz",
-      "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==",
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz",
+      "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -3085,9 +3488,9 @@
       "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+      "version": "4.17.24",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.24.tgz",
+      "integrity": "sha512-gIW7lQLZbue7lRSWEFql49QJJWThrTFFeIMJdp3eH4tKoxm1OvEPg02rm4wCCSHS0cL3/Fizimb35b7k8atwsQ==",
       "license": "MIT"
     },
     "node_modules/@types/lodash-es": {
@@ -3123,20 +3526,20 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.0.tgz",
-      "integrity": "sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw==",
+      "version": "25.5.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.2.tgz",
+      "integrity": "sha512-tO4ZIRKNC+MDWV4qKVZe3Ql/woTnmHDr5JD8UI5hn2pwBrHEwOEMZK7WlNb5RKB6EoJ02gwmQS9OrjuFnZYdpg==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "undici-types": "~7.10.0"
+        "undici-types": "~7.18.0"
       }
     },
     "node_modules/@types/react": {
-      "version": "19.2.6",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.6.tgz",
-      "integrity": "sha512-p/jUvulfgU7oKtj6Xpk8cA2Y1xKTtICGpJYeJXz2YVO2UcvjQgeRMLDGfDeqeRW2Ta+0QNFwcc8X3GH8SxZz6w==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz",
+      "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -3158,68 +3561,68 @@
       "license": "MIT"
     },
     "node_modules/@types/web-bluetooth": {
-      "version": "0.0.20",
-      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
-      "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==",
+      "version": "0.0.21",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
+      "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
       "license": "MIT"
     },
     "node_modules/@vitejs/plugin-vue": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.0.tgz",
-      "integrity": "sha512-iAliE72WsdhjzTOp2DtvKThq1VBC4REhwRcaA+zPAAph6I+OQhUXv+Xu2KS7ElxYtb7Zc/3R30Hwv1DxEo7NXQ==",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.5.tgz",
+      "integrity": "sha512-bL3AxKuQySfk1iGcBsQnoRVexTPJq0Z/ixFVM8OhVJAP6ZXXXLtM7NFKWhLl30Kg7uTBqIaPXbh+nuQCuBDedg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rolldown/pluginutils": "1.0.0-beta.19"
+        "@rolldown/pluginutils": "1.0.0-rc.2"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       },
       "peerDependencies": {
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
         "vue": "^3.2.25"
       }
     },
     "node_modules/@vitest/browser": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@vitest/browser/-/browser-4.0.12.tgz",
-      "integrity": "sha512-8zE2ksJ7V4B7Mc++L6rBRZOZHnE/f9URvj7oLYKIS5wcDaSi6EhfalN0EG6+R/OlTYZarbK6RqmhKDLYNC9KfQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/browser/-/browser-4.1.3.tgz",
+      "integrity": "sha512-CS9KjO2vijuBlbwz0JIgC0YuoI1BuqWI5ziD3Nll6jkpNYtWdjPMVgGynQ9vZovjsECeUqEeNjWrypP414d0CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/mocker": "4.0.12",
-        "@vitest/utils": "4.0.12",
+        "@blazediff/core": "1.9.1",
+        "@vitest/mocker": "4.1.3",
+        "@vitest/utils": "4.1.3",
         "magic-string": "^0.30.21",
-        "pixelmatch": "7.1.0",
         "pngjs": "^7.0.0",
         "sirv": "^3.0.2",
-        "tinyrainbow": "^3.0.3",
-        "ws": "^8.18.3"
+        "tinyrainbow": "^3.1.0",
+        "ws": "^8.19.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "4.0.12"
+        "vitest": "4.1.3"
       }
     },
     "node_modules/@vitest/browser-playwright": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@vitest/browser-playwright/-/browser-playwright-4.0.12.tgz",
-      "integrity": "sha512-TCFuvEHVLHDuK4HmKJNSuYQwefpXBnWNuf3J8pLsXF3Q2sgRZJs+L+aUF2xjtJT5OBEJsgX5jENvlGKc596XNw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/browser-playwright/-/browser-playwright-4.1.3.tgz",
+      "integrity": "sha512-D3Q+YozvSpiFaLPgd6/OMbyqEIZeucSe6AHJJ7VnNJKQhIyBE60TlBZlxzwM8bvjzQE9ZnYWQCPeCw5pnhbiNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/browser": "4.0.12",
-        "@vitest/mocker": "4.0.12",
-        "tinyrainbow": "^3.0.3"
+        "@vitest/browser": "4.1.3",
+        "@vitest/mocker": "4.1.3",
+        "tinyrainbow": "^3.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
         "playwright": "*",
-        "vitest": "4.0.12"
+        "vitest": "4.1.3"
       },
       "peerDependenciesMeta": {
         "playwright": {
@@ -3228,31 +3631,81 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.0.12.tgz",
-      "integrity": "sha512-is+g0w8V3/ZhRNrRizrJNr8PFQKwYmctWlU4qg8zy5r9aIV5w8IxXLlfbbxJCwSpsVl2PXPTm2/zruqTqz3QSg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
+      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@standard-schema/spec": "^1.0.0",
         "@types/chai": "^5.2.2",
-        "@vitest/spy": "4.0.12",
-        "@vitest/utils": "4.0.12",
-        "chai": "^6.2.1",
-        "tinyrainbow": "^3.0.3"
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
+        "chai": "^5.2.0",
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/expect/node_modules/@vitest/pretty-format": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
+      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/expect/node_modules/@vitest/spy": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
+      "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyspy": "^4.0.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
+    "node_modules/@vitest/expect/node_modules/@vitest/utils": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
+      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "3.2.4",
+        "loupe": "^3.1.4",
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/expect/node_modules/tinyrainbow": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
+      "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/@vitest/mocker": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.0.12.tgz",
-      "integrity": "sha512-GsmA/tD5Ht3RUFoz41mZsMU1AXch3lhmgbTnoSPTdH231g7S3ytNN1aU0bZDSyxWs8WA7KDyMPD5L4q6V6vj9w==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.3.tgz",
+      "integrity": "sha512-XN3TrycitDQSzGRnec/YWgoofkYRhouyVQj4YNsJ5r/STCUFqMrP4+oxEv3e7ZbLi4og5kIHrZwekDJgw6hcjw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "4.0.12",
+        "@vitest/spy": "4.1.3",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.21"
       },
@@ -3261,7 +3714,7 @@
       },
       "peerDependencies": {
         "msw": "^2.4.9",
-        "vite": "^6.0.0 || ^7.0.0-0"
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "msw": {
@@ -3272,37 +3725,27 @@
         }
       }
     },
-    "node_modules/@vitest/mocker/node_modules/estree-walker": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
-      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0"
-      }
-    },
     "node_modules/@vitest/pretty-format": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.0.12.tgz",
-      "integrity": "sha512-R7nMAcnienG17MvRN8TPMJiCG8rrZJblV9mhT7oMFdBXvS0x+QD6S1G4DxFusR2E0QIS73f7DqSR1n87rrmE+g==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.3.tgz",
+      "integrity": "sha512-hYqqwuMbpkkBodpRh4k4cQSOELxXky1NfMmQvOfKvV8zQHz8x8Dla+2wzElkMkBvSAJX5TRGHJAQvK0TcOafwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tinyrainbow": "^3.0.3"
+        "tinyrainbow": "^3.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.0.12.tgz",
-      "integrity": "sha512-hDlCIJWuwlcLumfukPsNfPDOJokTv79hnOlf11V+n7E14rHNPz0Sp/BO6h8sh9qw4/UjZiKyYpVxK2ZNi+3ceQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.3.tgz",
+      "integrity": "sha512-VwgOz5MmT0KhlUj40h02LWDpUBVpflZ/b7xZFA25F29AJzIrE+SMuwzFf0b7t4EXdwRNX61C3B6auIXQTR3ttA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "4.0.12",
+        "@vitest/utils": "4.1.3",
         "pathe": "^2.0.3"
       },
       "funding": {
@@ -3310,13 +3753,14 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.0.12.tgz",
-      "integrity": "sha512-2jz9zAuBDUSbnfyixnyOd1S2YDBrZO23rt1bicAb6MA/ya5rHdKFRikPIDpBj/Dwvh6cbImDmudegnDAkHvmRQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.3.tgz",
+      "integrity": "sha512-9l+k/J9KG5wPJDX9BcFFzhhwNjwkRb8RsnYhaT1vPY7OufxmQFc9sZzScRCPTiETzl37mrIWVY9zxzmdVeJwDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.0.12",
+        "@vitest/pretty-format": "4.1.3",
+        "@vitest/utils": "4.1.3",
         "magic-string": "^0.30.21",
         "pathe": "^2.0.3"
       },
@@ -3325,9 +3769,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.12.tgz",
-      "integrity": "sha512-GZjI9PPhiOYNX8Nsyqdw7JQB+u0BptL5fSnXiottAUBHlcMzgADV58A7SLTXXQwcN1yZ6gfd1DH+2bqjuUlCzw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.3.tgz",
+      "integrity": "sha512-ujj5Uwxagg4XUIfAUyRQxAg631BP6e9joRiN99mr48Bg9fRs+5mdUElhOoZ6rP5mBr8Bs3lmrREnkrQWkrsTCw==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -3335,71 +3779,72 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.12.tgz",
-      "integrity": "sha512-DVS/TLkLdvGvj1avRy0LSmKfrcI9MNFvNGN6ECjTUHWJdlcgPDOXhjMis5Dh7rBH62nAmSXnkPbE+DZ5YD75Rw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.3.tgz",
+      "integrity": "sha512-Pc/Oexse/khOWsGB+w3q4yzA4te7W4gpZZAvk+fr8qXfTURZUMj5i7kuxsNK5mP/dEB6ao3jfr0rs17fHhbHdw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.0.12",
-        "tinyrainbow": "^3.0.3"
+        "@vitest/pretty-format": "4.1.3",
+        "convert-source-map": "^2.0.0",
+        "tinyrainbow": "^3.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@volar/language-core": {
-      "version": "2.4.22",
-      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.22.tgz",
-      "integrity": "sha512-gp4M7Di5KgNyIyO903wTClYBavRt6UyFNpc5LWfyZr1lBsTUY+QrVZfmbNF2aCyfklBOVk9YC4p+zkwoyT7ECg==",
+      "version": "2.4.15",
+      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.15.tgz",
+      "integrity": "sha512-3VHw+QZU0ZG9IuQmzT68IyN4hZNd9GchGPhbD9+pa8CVv7rnoOZwo7T8weIbrRmihqy3ATpdfXFnqRrfPVK6CA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/source-map": "2.4.22"
+        "@volar/source-map": "2.4.15"
       }
     },
     "node_modules/@volar/source-map": {
-      "version": "2.4.22",
-      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.22.tgz",
-      "integrity": "sha512-L2nVr/1vei0xKRgO2tYVXtJYd09HTRjaZi418e85Q+QdbbqA8h7bBjfNyPPSsjnrOO4l4kaAo78c8SQUAdHvgA==",
+      "version": "2.4.15",
+      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.15.tgz",
+      "integrity": "sha512-CPbMWlUN6hVZJYGcU/GSoHu4EnCHiLaXI9n8c9la6RaI9W5JHX+NqG+GSQcB0JdC2FIBLdZJwGsfKyBB71VlTg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@volar/typescript": {
-      "version": "2.4.22",
-      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.22.tgz",
-      "integrity": "sha512-6ZczlJW1/GWTrNnkmZxJp4qyBt/SGVlcTuCWpI5zLrdPdCZsj66Aff9ZsfFaT3TyjG8zVYgBMYPuCm/eRkpcpQ==",
+      "version": "2.4.15",
+      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.15.tgz",
+      "integrity": "sha512-2aZ8i0cqPGjXb4BhkMsPYDkkuc2ZQ6yOpqwAuNwUoncELqoy5fRgOQtLR9gB0g902iS0NAkvpIzs27geVyVdPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/language-core": "2.4.22",
+        "@volar/language-core": "2.4.15",
         "path-browserify": "^1.0.1",
         "vscode-uri": "^3.0.8"
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.17.tgz",
-      "integrity": "sha512-Xe+AittLbAyV0pabcN7cP7/BenRBNcteM4aSDCtRvGw0d9OL+HG1u/XHLY/kt1q4fyMeZYXyIYrsHuPSiDPosA==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.32.tgz",
+      "integrity": "sha512-4x74Tbtqnda8s/NSD6e1Dr5p1c8HdMU5RWSjMSUzb8RTcUQqevDCxVAitcLBKT+ie3o0Dl9crc/S/opJM7qBGQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.27.5",
-        "@vue/shared": "3.5.17",
-        "entities": "^4.5.0",
+        "@babel/parser": "^7.29.2",
+        "@vue/shared": "3.5.32",
+        "entities": "^7.0.1",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-core/node_modules/@vue/shared": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
-      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
+      "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
       "license": "MIT"
     },
     "node_modules/@vue/compiler-core/node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
+      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
@@ -3408,59 +3853,71 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/@vue/compiler-core/node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "license": "MIT"
+    },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.17.tgz",
-      "integrity": "sha512-+2UgfLKoaNLhgfhV5Ihnk6wB4ljyW1/7wUIog2puUqajiC29Lp5R/IKDdkebh9jTbTogTbsgB+OY9cEWzG95JQ==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.32.tgz",
+      "integrity": "sha512-ybHAu70NtiEI1fvAUz3oXZqkUYEe5J98GjMDpTGl5iHb0T15wQYLR4wE3h9xfuTNA+Cm2f4czfe8B4s+CCH57Q==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/compiler-core": "3.5.32",
+        "@vue/shared": "3.5.32"
       }
     },
     "node_modules/@vue/compiler-dom/node_modules/@vue/shared": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
-      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
+      "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
       "license": "MIT"
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.17.tgz",
-      "integrity": "sha512-rQQxbRJMgTqwRugtjw0cnyQv9cP4/4BxWfTdRBkqsTfLOHWykLzbOc3C4GGzAmdMDxhzU/1Ija5bTjMVrddqww==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.32.tgz",
+      "integrity": "sha512-8UYUYo71cP/0YHMO814TRZlPuUUw3oifHuMR7Wp9SNoRSrxRQnhMLNlCeaODNn6kNTJsjFoQ/kqIj4qGvya4Xg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.27.5",
-        "@vue/compiler-core": "3.5.17",
-        "@vue/compiler-dom": "3.5.17",
-        "@vue/compiler-ssr": "3.5.17",
-        "@vue/shared": "3.5.17",
+        "@babel/parser": "^7.29.2",
+        "@vue/compiler-core": "3.5.32",
+        "@vue/compiler-dom": "3.5.32",
+        "@vue/compiler-ssr": "3.5.32",
+        "@vue/shared": "3.5.32",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.17",
-        "postcss": "^8.5.6",
+        "magic-string": "^0.30.21",
+        "postcss": "^8.5.8",
         "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
-      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
+      "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
+      "license": "MIT"
+    },
+    "node_modules/@vue/compiler-sfc/node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "license": "MIT"
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.17.tgz",
-      "integrity": "sha512-hkDbA0Q20ZzGgpj5uZjb9rBzQtIHLS78mMilwrlpWk2Ep37DYntUz0PonQ6kr113vfOEdM+zTBuJDaceNIW0tQ==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.32.tgz",
+      "integrity": "sha512-Gp4gTs22T3DgRotZ8aA/6m2jMR+GMztvBXUBEUOYOcST+giyGWJ4WvFd7QLHBkzTxkfOt8IELKNdpzITLbA2rw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/compiler-dom": "3.5.32",
+        "@vue/shared": "3.5.32"
       }
     },
     "node_modules/@vue/compiler-ssr/node_modules/@vue/shared": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
-      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
+      "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
       "license": "MIT"
     },
     "node_modules/@vue/compiler-vue2": {
@@ -3475,21 +3932,21 @@
       }
     },
     "node_modules/@vue/devtools-api": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.7.tgz",
-      "integrity": "sha512-lwOnNBH2e7x1fIIbVT7yF5D+YWhqELm55/4ZKf45R9T8r9dE2AIOy8HKjfqzGsoTHFbWbr337O4E0A0QADnjBg==",
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz",
+      "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-kit": "^7.7.7"
+        "@vue/devtools-kit": "^7.7.9"
       }
     },
     "node_modules/@vue/devtools-kit": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.7.tgz",
-      "integrity": "sha512-wgoZtxcTta65cnZ1Q6MbAfePVFxfM+gq0saaeytoph7nEa7yMXoi6sCPy4ufO111B9msnw0VOWjPEFCXuAKRHA==",
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz",
+      "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-shared": "^7.7.7",
+        "@vue/devtools-shared": "^7.7.9",
         "birpc": "^2.3.0",
         "hookable": "^5.5.3",
         "mitt": "^3.0.1",
@@ -3499,29 +3956,29 @@
       }
     },
     "node_modules/@vue/devtools-shared": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.7.tgz",
-      "integrity": "sha512-+udSj47aRl5aKb0memBvcUG9koarqnxNM5yjuREvqwK6T3ap4mn3Zqqc17QrBFTqSMjr3HK1cvStEZpMDpfdyw==",
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz",
+      "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==",
       "license": "MIT",
       "dependencies": {
         "rfdc": "^1.4.1"
       }
     },
     "node_modules/@vue/language-core": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.0.5.tgz",
-      "integrity": "sha512-gCEjn9Ik7I/seHVNIEipOm8W+f3/kg60e8s1IgIkMYma2wu9ZGUTMv3mSL2bX+Md2L8fslceJ4SU8j1fgSRoiw==",
+      "version": "2.2.12",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.12.tgz",
+      "integrity": "sha512-IsGljWbKGU1MZpBPN+BvPAdr55YPkj2nB/TBNGNC32Vy2qLG25DYu/NBN2vNtZqdRbTRjaoYrahLrToim2NanA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/language-core": "2.4.22",
+        "@volar/language-core": "2.4.15",
         "@vue/compiler-dom": "^3.5.0",
         "@vue/compiler-vue2": "^2.7.16",
         "@vue/shared": "^3.5.0",
-        "alien-signals": "^2.0.5",
+        "alien-signals": "^1.0.3",
+        "minimatch": "^9.0.3",
         "muggle-string": "^0.4.1",
-        "path-browserify": "^1.0.1",
-        "picomatch": "^4.0.2"
+        "path-browserify": "^1.0.1"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -3533,9 +3990,9 @@
       }
     },
     "node_modules/@vue/language-core/node_modules/@vue/shared": {
-      "version": "3.5.18",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.18.tgz",
-      "integrity": "sha512-cZy8Dq+uuIXbxCZpuLd2GJdeSO/lIzIspC2WtkqIpje5QyFbvLaI5wZtdUjLHjGZrlVX6GilejatWwVYYRc8tA==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
+      "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
       "dev": true,
       "license": "MIT"
     },
@@ -3549,74 +4006,74 @@
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.17.tgz",
-      "integrity": "sha512-QQLXa20dHg1R0ri4bjKeGFKEkJA7MMBxrKo2G+gJikmumRS7PTD4BOU9FKrDQWMKowz7frJJGqBffYMgQYS96Q==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.32.tgz",
+      "integrity": "sha512-pDrXCejn4UpFDFmMd27AcJEbHaLemaE5o4pbb7sLk79SRIhc6/t34BQA7SGNgYtbMnvbF/HHOftYBgFJtUoJUQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/reactivity": "3.5.32",
+        "@vue/shared": "3.5.32"
       }
     },
     "node_modules/@vue/runtime-core/node_modules/@vue/reactivity": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.17.tgz",
-      "integrity": "sha512-l/rmw2STIscWi7SNJp708FK4Kofs97zc/5aEPQh4bOsReD/8ICuBcEmS7KGwDj5ODQLYWVN2lNibKJL1z5b+Lw==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.32.tgz",
+      "integrity": "sha512-/ORasxSGvZ6MN5gc+uE364SxFdJ0+WqVG0CENXaGW58TOCdrAW76WWaplDtECeS1qphvtBZtR+3/o1g1zL4xPQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.17"
+        "@vue/shared": "3.5.32"
       }
     },
     "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
-      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
+      "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
       "license": "MIT"
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.17.tgz",
-      "integrity": "sha512-8El0M60TcwZ1QMz4/os2MdlQECgGoVHPuLnQBU3m9h3gdNRW9xRmI8iLS4t/22OQlOE6aJvNNlBiCzPHur4H9g==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.32.tgz",
+      "integrity": "sha512-1CDVv7tv/IV13V8Nip1k/aaObVbWqRlVCVezTwx3K07p7Vxossp5JU1dcPNhJk3w347gonIUT9jQOGutyJrSVQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.17",
-        "@vue/runtime-core": "3.5.17",
-        "@vue/shared": "3.5.17",
-        "csstype": "^3.1.3"
+        "@vue/reactivity": "3.5.32",
+        "@vue/runtime-core": "3.5.32",
+        "@vue/shared": "3.5.32",
+        "csstype": "^3.2.3"
       }
     },
     "node_modules/@vue/runtime-dom/node_modules/@vue/reactivity": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.17.tgz",
-      "integrity": "sha512-l/rmw2STIscWi7SNJp708FK4Kofs97zc/5aEPQh4bOsReD/8ICuBcEmS7KGwDj5ODQLYWVN2lNibKJL1z5b+Lw==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.32.tgz",
+      "integrity": "sha512-/ORasxSGvZ6MN5gc+uE364SxFdJ0+WqVG0CENXaGW58TOCdrAW76WWaplDtECeS1qphvtBZtR+3/o1g1zL4xPQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.17"
+        "@vue/shared": "3.5.32"
       }
     },
     "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
-      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
+      "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
       "license": "MIT"
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.17.tgz",
-      "integrity": "sha512-BOHhm8HalujY6lmC3DbqF6uXN/K00uWiEeF22LfEsm9Q93XeJ/plHTepGwf6tqFcF7GA5oGSSAAUock3VvzaCA==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.32.tgz",
+      "integrity": "sha512-IOjm2+JQwRFS7W28HNuJeXQle9KdZbODFY7hFGVtnnghF51ta20EWAZJHX+zLGtsHhaU6uC9BGPV52KVpYryMQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/compiler-ssr": "3.5.32",
+        "@vue/shared": "3.5.32"
       },
       "peerDependencies": {
-        "vue": "3.5.17"
+        "vue": "3.5.32"
       }
     },
     "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
-      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
+      "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
       "license": "MIT"
     },
     "node_modules/@vue/shared": {
@@ -3636,45 +4093,28 @@
         "vue-component-type-helpers": "^2.0.0"
       }
     },
+    "node_modules/@vue/test-utils/node_modules/vue-component-type-helpers": {
+      "version": "2.2.12",
+      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.2.12.tgz",
+      "integrity": "sha512-YbGqHZ5/eW4SnkPNR44mKVc6ZKQoRs/Rux1sxC6rdwXb4qpbOSYfDr9DsTHolOTGmIKgM9j141mZbBeg05R1pw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@vueuse/core": {
-      "version": "10.11.1",
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.11.1.tgz",
-      "integrity": "sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==",
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-14.2.1.tgz",
+      "integrity": "sha512-3vwDzV+GDUNpdegRY6kzpLm4Igptq+GA0QkJ3W61Iv27YWwW/ufSlOfgQIpN6FZRMG0mkaz4gglJRtq5SeJyIQ==",
       "license": "MIT",
       "dependencies": {
-        "@types/web-bluetooth": "^0.0.20",
-        "@vueuse/metadata": "10.11.1",
-        "@vueuse/shared": "10.11.1",
-        "vue-demi": ">=0.14.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
-    "node_modules/@vueuse/core/node_modules/vue-demi": {
-      "version": "0.14.10",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "vue-demi-fix": "bin/vue-demi-fix.js",
-        "vue-demi-switch": "bin/vue-demi-switch.js"
-      },
-      "engines": {
-        "node": ">=12"
+        "@types/web-bluetooth": "^0.0.21",
+        "@vueuse/metadata": "14.2.1",
+        "@vueuse/shared": "14.2.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       },
       "peerDependencies": {
-        "@vue/composition-api": "^1.0.0-rc.1",
-        "vue": "^3.0.0-0 || ^2.6.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        }
+        "vue": "^3.5.0"
       }
     },
     "node_modules/@vueuse/integrations": {
@@ -3743,33 +4183,28 @@
         }
       }
     },
-    "node_modules/@vueuse/integrations/node_modules/vue-demi": {
-      "version": "0.14.10",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-      "hasInstallScript": true,
+    "node_modules/@vueuse/integrations/node_modules/@types/web-bluetooth": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
+      "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==",
+      "license": "MIT"
+    },
+    "node_modules/@vueuse/integrations/node_modules/@vueuse/core": {
+      "version": "10.11.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.11.1.tgz",
+      "integrity": "sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==",
       "license": "MIT",
-      "bin": {
-        "vue-demi-fix": "bin/vue-demi-fix.js",
-        "vue-demi-switch": "bin/vue-demi-switch.js"
-      },
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.20",
+        "@vueuse/metadata": "10.11.1",
+        "@vueuse/shared": "10.11.1",
+        "vue-demi": ">=0.14.8"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.0.0-rc.1",
-        "vue": "^3.0.0-0 || ^2.6.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        }
       }
     },
-    "node_modules/@vueuse/metadata": {
+    "node_modules/@vueuse/integrations/node_modules/@vueuse/metadata": {
       "version": "10.11.1",
       "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.1.tgz",
       "integrity": "sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==",
@@ -3778,7 +4213,7 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
-    "node_modules/@vueuse/shared": {
+    "node_modules/@vueuse/integrations/node_modules/@vueuse/shared": {
       "version": "10.11.1",
       "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.11.1.tgz",
       "integrity": "sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==",
@@ -3790,7 +4225,7 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
-    "node_modules/@vueuse/shared/node_modules/vue-demi": {
+    "node_modules/@vueuse/integrations/node_modules/vue-demi": {
       "version": "0.14.10",
       "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
       "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
@@ -3816,6 +4251,34 @@
         }
       }
     },
+    "node_modules/@vueuse/metadata": {
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-14.2.1.tgz",
+      "integrity": "sha512-1ButlVtj5Sb/HDtIy1HFr1VqCP4G6Ypqt5MAo0lCgjokrk2mvQKsK2uuy0vqu/Ks+sHfuHo0B9Y9jn9xKdjZsw==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared": {
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.2.1.tgz",
+      "integrity": "sha512-shTJncjV9JTI4oVNyF1FQonetYAiTBd+Qj7cY89SWbXSkx7gyhrgtEdF2ZAVWS1S3SHlaROO6F2IesJxQEkZBw==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "vue": "^3.5.0"
+      }
+    },
+    "node_modules/@webcontainer/env": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@webcontainer/env/-/env-1.1.1.tgz",
+      "integrity": "sha512-6aN99yL695Hi9SuIk1oC88l9o0gmxL1nGWWQ/kNy81HigJ0FoaoTXpytCj6ItzgyCEwA9kF1wixsTuv5cjsgng==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/abbrev": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
@@ -3839,9 +4302,9 @@
       }
     },
     "node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3849,40 +4312,39 @@
       }
     },
     "node_modules/alien-signals": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-2.0.6.tgz",
-      "integrity": "sha512-P3TxJSe31bUHBiblg59oU1PpaWPtmxF9GhJ/cB7OkgJ0qN/ifFSKUI25/v8ZhsT+lIG6ac8DpTOplXxORX6F3Q==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-1.0.13.tgz",
+      "integrity": "sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/alpinejs": {
-      "version": "3.14.9",
-      "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.14.9.tgz",
-      "integrity": "sha512-gqSOhTEyryU9FhviNqiHBHzgjkvtukq9tevew29fTj+ofZtfsYriw4zPirHHOAy9bw8QoL3WGhyk7QqCh5AYlw==",
+      "version": "3.15.11",
+      "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.15.11.tgz",
+      "integrity": "sha512-m26gkTg/MId8O+F4jHKK3vB3SjbFxxk/JHP+qzmw1H6aQrZuPAg4CUoAefnASzzp/eNroBjrRQe7950bNeaBJw==",
       "license": "MIT",
       "dependencies": {
         "@vue/reactivity": "~3.1.1"
       }
     },
     "node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "license": "MIT",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+        "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -3966,9 +4428,9 @@
       "license": "MIT"
     },
     "node_modules/axe-core": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.0.tgz",
-      "integrity": "sha512-ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==",
+      "version": "4.11.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.2.tgz",
+      "integrity": "sha512-byD6KPdvo72y/wj2T/4zGEvvlis+PsZsn/yPS3pEO+sFpcrqRpX/TJCxvVaEsNeMrfQbCr7w163YqoD9IYwHXw==",
       "dev": true,
       "license": "MPL-2.0",
       "engines": {
@@ -3976,14 +4438,40 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.13.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
-      "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.18.1.tgz",
+      "integrity": "sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==",
       "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.11",
+        "follow-redirects": "^1.16.0",
         "form-data": "^4.0.5",
-        "proxy-from-env": "^1.1.0"
+        "https-proxy-agent": "^5.0.1",
+        "proxy-from-env": "^2.1.0"
+      }
+    },
+    "node_modules/axios/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/axios/node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
     "node_modules/babel-walk": {
@@ -4006,9 +4494,9 @@
       "license": "MIT"
     },
     "node_modules/birpc": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.4.0.tgz",
-      "integrity": "sha512-5IdNxTyhXHv2UlgnPHQ0h+5ypVmkrYHzL8QT+DwFZ//2N/oNV8Ch+BCRmTJ3x6/z9Axo/cXYBc9eprsUVK/Jsg==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.9.0.tgz",
+      "integrity": "sha512-KrayHS5pBi69Xi9JmvoqrIgYGDkD6mcSe/i6YKi3w5kekCLzrX4+nawcXqrj2tIp50Kw/mT/s3p+GVK0A0sKxw==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/antfu"
@@ -4021,9 +4509,9 @@
       "license": "ISC"
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "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==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -4088,11 +4576,18 @@
       }
     },
     "node_modules/chai": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.1.tgz",
-      "integrity": "sha512-p4Z49OGG5W/WBCPSS/dH3jQ73kD6tiMmUM+bckNK6Jr5JHMG3k9bg/BvKR8lKmtVBKmOiuVaV2ws8s9oSbwysg==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz",
+      "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
+      },
       "engines": {
         "node": ">=18"
       }
@@ -4108,114 +4603,81 @@
       }
     },
     "node_modules/check-error": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
-      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.3.tgz",
+      "integrity": "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 16"
       }
     },
-    "node_modules/chownr": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
-      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz",
+      "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
+        "string-width": "^7.2.0",
+        "strip-ansi": "^7.1.0",
+        "wrap-ansi": "^9.0.0"
       },
       "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/cliui/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": ">=20"
       }
     },
     "node_modules/cliui/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "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",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
+      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/cliui/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/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"
+        "node": ">=18"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/cliui/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
+      "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -4310,6 +4772,13 @@
         "@babel/types": "^7.6.1"
       }
     },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/cookies-js": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/cookies-js/-/cookies-js-1.2.3.tgz",
@@ -4317,15 +4786,15 @@
       "license": "Public Domain"
     },
     "node_modules/copy-anything": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
-      "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.0.5.tgz",
+      "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==",
       "license": "MIT",
       "dependencies": {
-        "is-what": "^4.1.8"
+        "is-what": "^5.2.0"
       },
       "engines": {
-        "node": ">=12.13"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/mesqueeb"
@@ -4503,7 +4972,6 @@
       "version": "4.4.3",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
       "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -4518,9 +4986,9 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
-      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==",
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
       "dev": true,
       "license": "MIT"
     },
@@ -4535,9 +5003,9 @@
       }
     },
     "node_modules/default-browser": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.4.0.tgz",
-      "integrity": "sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.5.0.tgz",
+      "integrity": "sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4565,19 +5033,22 @@
       }
     },
     "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/defu": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz",
-      "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
+      "version": "6.1.7",
+      "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.7.tgz",
+      "integrity": "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==",
       "license": "MIT"
     },
     "node_modules/delayed-stream": {
@@ -4599,9 +5070,9 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
-      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -4690,13 +5161,10 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.2.tgz",
-      "integrity": "sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==",
+      "version": "3.4.11",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.11.tgz",
+      "integrity": "sha512-zhlUV12GsaRzMsf9q5M254YhA4+VuF0fG+QFqu6aYpoGlKtz+w8//jBcGVYBgQkR5GHjUomejY84AV+/uPbWdw==",
       "license": "(MPL-2.0 OR Apache-2.0)",
-      "engines": {
-        "node": ">=20"
-      },
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
       }
@@ -4770,14 +5238,14 @@
       "license": "MIT"
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.18.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz",
-      "integrity": "sha512-6Jw4sE1maoRJo3q8MsSIn2onJFbLTOjY9hlx4DZXmOKvLRd1Ok2kXmAGXaafL2+ijsJZ1ClYbl/pmqr9+k4iUQ==",
+      "version": "5.20.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.1.tgz",
+      "integrity": "sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
+        "tapable": "^2.3.0"
       },
       "engines": {
         "node": ">=10.13.0"
@@ -4815,9 +5283,9 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
-      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz",
+      "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==",
       "dev": true,
       "license": "MIT"
     },
@@ -4849,9 +5317,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
-      "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",
+      "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -4862,31 +5330,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.5",
-        "@esbuild/android-arm": "0.25.5",
-        "@esbuild/android-arm64": "0.25.5",
-        "@esbuild/android-x64": "0.25.5",
-        "@esbuild/darwin-arm64": "0.25.5",
-        "@esbuild/darwin-x64": "0.25.5",
-        "@esbuild/freebsd-arm64": "0.25.5",
-        "@esbuild/freebsd-x64": "0.25.5",
-        "@esbuild/linux-arm": "0.25.5",
-        "@esbuild/linux-arm64": "0.25.5",
-        "@esbuild/linux-ia32": "0.25.5",
-        "@esbuild/linux-loong64": "0.25.5",
-        "@esbuild/linux-mips64el": "0.25.5",
-        "@esbuild/linux-ppc64": "0.25.5",
-        "@esbuild/linux-riscv64": "0.25.5",
-        "@esbuild/linux-s390x": "0.25.5",
-        "@esbuild/linux-x64": "0.25.5",
-        "@esbuild/netbsd-arm64": "0.25.5",
-        "@esbuild/netbsd-x64": "0.25.5",
-        "@esbuild/openbsd-arm64": "0.25.5",
-        "@esbuild/openbsd-x64": "0.25.5",
-        "@esbuild/sunos-x64": "0.25.5",
-        "@esbuild/win32-arm64": "0.25.5",
-        "@esbuild/win32-ia32": "0.25.5",
-        "@esbuild/win32-x64": "0.25.5"
+        "@esbuild/aix-ppc64": "0.28.1",
+        "@esbuild/android-arm": "0.28.1",
+        "@esbuild/android-arm64": "0.28.1",
+        "@esbuild/android-x64": "0.28.1",
+        "@esbuild/darwin-arm64": "0.28.1",
+        "@esbuild/darwin-x64": "0.28.1",
+        "@esbuild/freebsd-arm64": "0.28.1",
+        "@esbuild/freebsd-x64": "0.28.1",
+        "@esbuild/linux-arm": "0.28.1",
+        "@esbuild/linux-arm64": "0.28.1",
+        "@esbuild/linux-ia32": "0.28.1",
+        "@esbuild/linux-loong64": "0.28.1",
+        "@esbuild/linux-mips64el": "0.28.1",
+        "@esbuild/linux-ppc64": "0.28.1",
+        "@esbuild/linux-riscv64": "0.28.1",
+        "@esbuild/linux-s390x": "0.28.1",
+        "@esbuild/linux-x64": "0.28.1",
+        "@esbuild/netbsd-arm64": "0.28.1",
+        "@esbuild/netbsd-x64": "0.28.1",
+        "@esbuild/openbsd-arm64": "0.28.1",
+        "@esbuild/openbsd-x64": "0.28.1",
+        "@esbuild/openharmony-arm64": "0.28.1",
+        "@esbuild/sunos-x64": "0.28.1",
+        "@esbuild/win32-arm64": "0.28.1",
+        "@esbuild/win32-ia32": "0.28.1",
+        "@esbuild/win32-x64": "0.28.1"
       }
     },
     "node_modules/escalade": {
@@ -4933,15 +5402,19 @@
       }
     },
     "node_modules/estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "license": "MIT"
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
     },
     "node_modules/expect-type": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.2.tgz",
-      "integrity": "sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
+      "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -4978,9 +5451,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
-      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+      "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -5057,18 +5530,18 @@
       }
     },
     "node_modules/focus-trap": {
-      "version": "7.6.5",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.5.tgz",
-      "integrity": "sha512-7Ke1jyybbbPZyZXFxEftUtxFGLMpE2n6A+z//m4CRDlj0hW+o3iYSmh8nFlYMurOiJVDmJRilUQtJr08KfIxlg==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.8.0.tgz",
+      "integrity": "sha512-/yNdlIkpWbM0ptxno3ONTuf+2g318kh2ez3KSeZN5dZ8YC6AAmgeWz+GasYYiBJPFaYcSAPeu4GfhUaChzIJXA==",
       "license": "MIT",
       "dependencies": {
-        "tabbable": "^6.2.0"
+        "tabbable": "^6.4.0"
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
+      "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
       "funding": [
         {
           "type": "individual",
@@ -5102,25 +5575,25 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz",
+      "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
+        "hasown": "^2.0.4",
+        "mime-types": "^2.1.35"
       },
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/formatly": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/formatly/-/formatly-0.2.4.tgz",
-      "integrity": "sha512-lIN7GpcvX/l/i24r/L9bnJ0I8Qn01qijWpQpDDvTLL29nKqSaJJu4h20+7VJ6m2CAhQ2/En/GbxDiHCzq/0MyA==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/formatly/-/formatly-0.3.0.tgz",
+      "integrity": "sha512-9XNj/o4wrRFyhSMJOvsuyMwy8aUfBaZ1VrqHVfohyXf0Sw0e+yfKG+xZaY3arGCOMdwFsqObtzVOc1gU9KiT9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5134,13 +5607,13 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "12.22.0",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.22.0.tgz",
-      "integrity": "sha512-qG07rR8/mboCNU34nORbrIbBXbJzP4aDqBdr67TAIVlMryDEOwh7LXjylWovlnPCMg78ExoY0Gn2F1fV+3DNIw==",
+      "version": "12.38.0",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.38.0.tgz",
+      "integrity": "sha512-rFYkY/pigbcswl1XQSb7q424kSTQ8q6eAC+YUsSKooHQYuLdzdHjrt6uxUC+PRAO++q5IS7+TamgIw1AphxR+g==",
       "license": "MIT",
       "dependencies": {
-        "motion-dom": "^12.22.0",
-        "motion-utils": "^12.19.0",
+        "motion-dom": "^12.38.0",
+        "motion-utils": "^12.36.0",
         "tslib": "^2.4.0"
       },
       "peerDependencies": {
@@ -5161,9 +5634,9 @@
       }
     },
     "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -5171,6 +5644,7 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
@@ -5200,6 +5674,19 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
+    "node_modules/get-east-asian-width": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.5.0.tgz",
+      "integrity": "sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-intrinsic": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
@@ -5241,6 +5728,7 @@
       "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",
       "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -5270,13 +5758,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/globrex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -5331,9 +5812,9 @@
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -5475,16 +5956,16 @@
       }
     },
     "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -5555,36 +6036,33 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-inside-container": {
+    "node_modules/is-in-ssh": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
-      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
+      "resolved": "https://registry.npmjs.org/is-in-ssh/-/is-in-ssh-1.0.0.tgz",
+      "integrity": "sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "is-docker": "^3.0.0"
-      },
-      "bin": {
-        "is-inside-container": "cli.js"
-      },
       "engines": {
-        "node": ">=14.16"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-inside-container/node_modules/is-docker": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
+    "node_modules/is-inside-container": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
+      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "is-docker": "^3.0.0"
+      },
       "bin": {
-        "is-docker": "cli.js"
+        "is-inside-container": "cli.js"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -5634,12 +6112,12 @@
       }
     },
     "node_modules/is-what": {
-      "version": "4.1.16",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.16.tgz",
-      "integrity": "sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz",
+      "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==",
       "license": "MIT",
       "engines": {
-        "node": ">=12.13"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/mesqueeb"
@@ -5655,16 +6133,19 @@
       }
     },
     "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.1.tgz",
+      "integrity": "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-docker": "^2.0.0"
+        "is-inside-container": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/isexe": {
@@ -5689,9 +6170,9 @@
       }
     },
     "node_modules/jiti": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
-      "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
+      "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -5720,12 +6201,12 @@
       }
     },
     "node_modules/js-cookie": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
-      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.7.tgz",
+      "integrity": "sha512-z/wZZgDrkNV1eA0ULjM/F9/50Ya8fbzgKneSpoPsXSGd0KnpdtHfOZWK+GcwLk+EZbS4F9RBhU+K2RgzuDaItw==",
       "license": "MIT",
       "engines": {
-        "node": ">=14"
+        "node": ">=20"
       }
     },
     "node_modules/js-stringify": {
@@ -5743,19 +6224,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/jsdom": {
       "version": "26.1.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz",
@@ -5820,9 +6288,9 @@
       }
     },
     "node_modules/knip": {
-      "version": "5.61.3",
-      "resolved": "https://registry.npmjs.org/knip/-/knip-5.61.3.tgz",
-      "integrity": "sha512-8iSz8i8ufIjuUwUKzEwye7ROAW0RzCze7T770bUiz0PKL+SSwbs4RS32fjMztLwcOzSsNPlXdUAeqmkdzXxJ1Q==",
+      "version": "5.88.1",
+      "resolved": "https://registry.npmjs.org/knip/-/knip-5.88.1.tgz",
+      "integrity": "sha512-tpy5o7zu1MjawVkLPuahymVJekYY3kYjvzcoInhIchgePxTlo+api90tBv2KfhAIe5uXh+mez1tAfmbv8/TiZg==",
       "dev": true,
       "funding": [
         {
@@ -5832,27 +6300,23 @@
         {
           "type": "opencollective",
           "url": "https://opencollective.com/knip"
-        },
-        {
-          "type": "polar",
-          "url": "https://polar.sh/webpro-nl"
         }
       ],
       "license": "ISC",
       "dependencies": {
         "@nodelib/fs.walk": "^1.2.3",
         "fast-glob": "^3.3.3",
-        "formatly": "^0.2.4",
-        "jiti": "^2.4.2",
-        "js-yaml": "^4.1.0",
+        "formatly": "^0.3.0",
+        "jiti": "^2.6.0",
         "minimist": "^1.2.8",
-        "oxc-resolver": "^11.1.0",
+        "oxc-resolver": "^11.19.1",
         "picocolors": "^1.1.1",
         "picomatch": "^4.0.1",
-        "smol-toml": "^1.3.4",
-        "strip-json-comments": "5.0.2",
-        "zod": "^3.22.4",
-        "zod-validation-error": "^3.0.3"
+        "smol-toml": "^1.5.2",
+        "strip-json-comments": "5.0.3",
+        "unbash": "^2.2.0",
+        "yaml": "^2.8.2",
+        "zod": "^4.1.11"
       },
       "bin": {
         "knip": "bin/knip.js",
@@ -5863,7 +6327,7 @@
       },
       "peerDependencies": {
         "@types/node": ">=18",
-        "typescript": ">=5.0.4"
+        "typescript": ">=5.0.4 <7"
       }
     },
     "node_modules/laravel-echo": {
@@ -5875,14 +6339,25 @@
         "node": ">=10"
       }
     },
+    "node_modules/laravel-precognition": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/laravel-precognition/-/laravel-precognition-1.0.2.tgz",
+      "integrity": "sha512-0H08JDdMWONrL/N314fvsO3FATJwGGlFKGkMF3nNmizVFJaWs17816iM+sX7Rp8d5hUjYCx6WLfsehSKfaTxjg==",
+      "license": "MIT",
+      "dependencies": {
+        "axios": "^1.4.0",
+        "lodash-es": "^4.17.21"
+      }
+    },
     "node_modules/laravel-vite-plugin": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-2.0.0.tgz",
-      "integrity": "sha512-pnaKHInJgiWpG/g+LmaISHl7D/1s5wnOXnrGiBdt4NOs+tYZRw0v/ZANELGX2/dGgHyEzO+iZ6x4idpoK04z/Q==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-3.0.1.tgz",
+      "integrity": "sha512-Bx8sVcLIaZT1d0eisABcmjQ1GZdJpaXcV66A8RhXGp9JgR3iL8jDnvakVDXuH87Tn5S9KNx3VOhmJZW1CSexOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "picocolors": "^1.0.0",
+        "tinyglobby": "^0.2.12",
         "vite-plugin-full-reload": "^1.1.0"
       },
       "bin": {
@@ -5892,13 +6367,13 @@
         "node": "^20.19.0 || >=22.12.0"
       },
       "peerDependencies": {
-        "vite": "^7.0.0"
+        "vite": "^8.0.0"
       }
     },
     "node_modules/lightningcss": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.1.tgz",
-      "integrity": "sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
+      "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
       "dev": true,
       "license": "MPL-2.0",
       "dependencies": {
@@ -5912,22 +6387,44 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "lightningcss-darwin-arm64": "1.30.1",
-        "lightningcss-darwin-x64": "1.30.1",
-        "lightningcss-freebsd-x64": "1.30.1",
-        "lightningcss-linux-arm-gnueabihf": "1.30.1",
-        "lightningcss-linux-arm64-gnu": "1.30.1",
-        "lightningcss-linux-arm64-musl": "1.30.1",
-        "lightningcss-linux-x64-gnu": "1.30.1",
-        "lightningcss-linux-x64-musl": "1.30.1",
-        "lightningcss-win32-arm64-msvc": "1.30.1",
-        "lightningcss-win32-x64-msvc": "1.30.1"
+        "lightningcss-android-arm64": "1.32.0",
+        "lightningcss-darwin-arm64": "1.32.0",
+        "lightningcss-darwin-x64": "1.32.0",
+        "lightningcss-freebsd-x64": "1.32.0",
+        "lightningcss-linux-arm-gnueabihf": "1.32.0",
+        "lightningcss-linux-arm64-gnu": "1.32.0",
+        "lightningcss-linux-arm64-musl": "1.32.0",
+        "lightningcss-linux-x64-gnu": "1.32.0",
+        "lightningcss-linux-x64-musl": "1.32.0",
+        "lightningcss-win32-arm64-msvc": "1.32.0",
+        "lightningcss-win32-x64-msvc": "1.32.0"
+      }
+    },
+    "node_modules/lightningcss-android-arm64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
+      "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
     "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.1.tgz",
-      "integrity": "sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
+      "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
       "cpu": [
         "arm64"
       ],
@@ -5946,9 +6443,9 @@
       }
     },
     "node_modules/lightningcss-darwin-x64": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.1.tgz",
-      "integrity": "sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
+      "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
       "cpu": [
         "x64"
       ],
@@ -5967,9 +6464,9 @@
       }
     },
     "node_modules/lightningcss-freebsd-x64": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.1.tgz",
-      "integrity": "sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
+      "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
       "cpu": [
         "x64"
       ],
@@ -5988,9 +6485,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm-gnueabihf": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.1.tgz",
-      "integrity": "sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
+      "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
       "cpu": [
         "arm"
       ],
@@ -6009,9 +6506,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-gnu": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.1.tgz",
-      "integrity": "sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
+      "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
       "cpu": [
         "arm64"
       ],
@@ -6030,9 +6527,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-musl": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.1.tgz",
-      "integrity": "sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
+      "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
       "cpu": [
         "arm64"
       ],
@@ -6051,9 +6548,9 @@
       }
     },
     "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.1.tgz",
-      "integrity": "sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
+      "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
       "cpu": [
         "x64"
       ],
@@ -6072,9 +6569,9 @@
       }
     },
     "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.1.tgz",
-      "integrity": "sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
+      "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
       "cpu": [
         "x64"
       ],
@@ -6093,9 +6590,9 @@
       }
     },
     "node_modules/lightningcss-win32-arm64-msvc": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.1.tgz",
-      "integrity": "sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
+      "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
       "cpu": [
         "arm64"
       ],
@@ -6114,9 +6611,9 @@
       }
     },
     "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.1.tgz",
-      "integrity": "sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
+      "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
       "cpu": [
         "x64"
       ],
@@ -6135,18 +6632,28 @@
       }
     },
     "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.1",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.1.tgz",
+      "integrity": "sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg==",
+      "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"
       }
     },
     "node_modules/lodash-es": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz",
-      "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
+      "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
       "license": "MIT"
     },
     "node_modules/loupe": {
@@ -6198,14 +6705,24 @@
       }
     },
     "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.2.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.2.0.tgz",
+      "integrity": "sha512-1TGiQiJVRQ3NPmZH6sx5Cfnmg6GQm9jvC1ch4TK511NjSJvjzKLzn5pPfZRNZkRPZP0HqCioSndqH8v2nRaWVQ==",
+      "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",
+        "linkify-it": "^5.0.1",
         "mdurl": "^2.0.0",
         "punycode.js": "^2.3.1",
         "uc.micro": "^2.1.0"
@@ -6284,9 +6801,9 @@
       }
     },
     "node_modules/micromatch/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6353,27 +6870,14 @@
       }
     },
     "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "license": "ISC",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "license": "BlueOak-1.0.0",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/minizlib": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
-      "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^7.1.2"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
     "node_modules/mitt": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
@@ -6381,32 +6885,32 @@
       "license": "MIT"
     },
     "node_modules/motion-dom": {
-      "version": "12.22.0",
-      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.22.0.tgz",
-      "integrity": "sha512-ooH7+/BPw9gOsL9VtPhEJHE2m4ltnhMlcGMhEqA0YGNhKof7jdaszvsyThXI6LVIKshJUZ9/CP6HNqQhJfV7kw==",
+      "version": "12.38.0",
+      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.38.0.tgz",
+      "integrity": "sha512-pdkHLD8QYRp8VfiNLb8xIBJis1byQ9gPT3Jnh2jqfFtAsWUA3dEepDlsWe/xMpO8McV+VdpKVcp+E+TGJEtOoA==",
       "license": "MIT",
       "dependencies": {
-        "motion-utils": "^12.19.0"
+        "motion-utils": "^12.36.0"
       }
     },
     "node_modules/motion-utils": {
-      "version": "12.19.0",
-      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.19.0.tgz",
-      "integrity": "sha512-BuFTHINYmV07pdWs6lj6aI63vr2N4dg0vR+td0rtrdpWOhBzIkEklZyLcvKBoEtwSqx8Jg06vUB5RS0xDiUybw==",
+      "version": "12.36.0",
+      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.36.0.tgz",
+      "integrity": "sha512-eHWisygbiwVvf6PZ1vhaHCLamvkSbPIeAYxWUuL3a2PD/TROgE7FvfHWTIH4vMl798QLfMw15nRqIaRDXTlYRg==",
       "license": "MIT"
     },
     "node_modules/motion-v": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/motion-v/-/motion-v-1.4.0.tgz",
-      "integrity": "sha512-/kLBC6fJgsaL/M7/SRLVMEXU1f1ATEfLymzXFL3iT4zzCZfallVQxIuMgveb+WuBOdQfoxWZANBuK79uBQ+56g==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/motion-v/-/motion-v-1.10.3.tgz",
+      "integrity": "sha512-9Ewo/wwGv7FO3PqYJpllBF/Efc7tbeM1iinVrM73s0RUQrnXHwMZCaRX98u4lu0PQCrZghPPfCsQ14pWKIEbnQ==",
       "license": "MIT",
       "dependencies": {
-        "@vueuse/core": "^10.0.0",
-        "framer-motion": "12.22.0",
+        "framer-motion": "^12.25.0",
         "hey-listen": "^1.0.8",
-        "motion-dom": "12.22.0"
+        "motion-dom": "^12.23.23"
       },
       "peerDependencies": {
+        "@vueuse/core": ">=10.0.0",
         "vue": ">=3.0.0"
       }
     },
@@ -6430,7 +6934,6 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/muggle-string": {
@@ -6441,9 +6944,9 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.6.tgz",
-      "integrity": "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.7.tgz",
+      "integrity": "sha512-ua3NDgISf6jdwezAheMOk4mbE1LXjm1DfMUDMuJf4AqxLFK3ccGpgWizwa5YV7Yz9EpXwEaWoRXSb/BnV0t5dQ==",
       "funding": [
         {
           "type": "github",
@@ -6499,9 +7002,9 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.20",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz",
-      "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==",
+      "version": "2.2.23",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.23.tgz",
+      "integrity": "sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -6527,6 +7030,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/obug": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz",
+      "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/sxzz",
+        "https://opencollective.com/debug"
+      ],
+      "license": "MIT"
+    },
     "node_modules/ohash": {
       "version": "2.0.11",
       "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz",
@@ -6534,18 +7048,21 @@
       "license": "MIT"
     },
     "node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-11.0.0.tgz",
+      "integrity": "sha512-smsWv2LzFjP03xmvFoJ331ss6h+jixfA4UUV/Bsiyuu4YJPfN+FIQGOIiv4w9/+MoHkfkJ22UIaQWRVFRfH6Vw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
+        "default-browser": "^5.4.0",
+        "define-lazy-prop": "^3.0.0",
+        "is-in-ssh": "^1.0.0",
+        "is-inside-container": "^1.0.0",
+        "powershell-utils": "^0.1.0",
+        "wsl-utils": "^0.3.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -6557,29 +7074,84 @@
       "integrity": "sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==",
       "license": "MIT"
     },
+    "node_modules/oxc-parser": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.127.0.tgz",
+      "integrity": "sha512-bkgD4qHlN7WxLdX8bLXdaU54TtQtAIg/ZBAfm0aje/mo3MRDo3P0hZSgr4U7O3xfX+fQmR5AP04JS/TGcZLcFA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@oxc-project/types": "^0.127.0"
+      },
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/Boshen"
+      },
+      "optionalDependencies": {
+        "@oxc-parser/binding-android-arm-eabi": "0.127.0",
+        "@oxc-parser/binding-android-arm64": "0.127.0",
+        "@oxc-parser/binding-darwin-arm64": "0.127.0",
+        "@oxc-parser/binding-darwin-x64": "0.127.0",
+        "@oxc-parser/binding-freebsd-x64": "0.127.0",
+        "@oxc-parser/binding-linux-arm-gnueabihf": "0.127.0",
+        "@oxc-parser/binding-linux-arm-musleabihf": "0.127.0",
+        "@oxc-parser/binding-linux-arm64-gnu": "0.127.0",
+        "@oxc-parser/binding-linux-arm64-musl": "0.127.0",
+        "@oxc-parser/binding-linux-ppc64-gnu": "0.127.0",
+        "@oxc-parser/binding-linux-riscv64-gnu": "0.127.0",
+        "@oxc-parser/binding-linux-riscv64-musl": "0.127.0",
+        "@oxc-parser/binding-linux-s390x-gnu": "0.127.0",
+        "@oxc-parser/binding-linux-x64-gnu": "0.127.0",
+        "@oxc-parser/binding-linux-x64-musl": "0.127.0",
+        "@oxc-parser/binding-openharmony-arm64": "0.127.0",
+        "@oxc-parser/binding-wasm32-wasi": "0.127.0",
+        "@oxc-parser/binding-win32-arm64-msvc": "0.127.0",
+        "@oxc-parser/binding-win32-ia32-msvc": "0.127.0",
+        "@oxc-parser/binding-win32-x64-msvc": "0.127.0"
+      }
+    },
+    "node_modules/oxc-parser/node_modules/@oxc-project/types": {
+      "version": "0.127.0",
+      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.127.0.tgz",
+      "integrity": "sha512-aIYXQBo4lCbO4z0R3FHeucQHpF46l2LbMdxRvqvuRuW2OxdnSkcng5B8+K12spgLDj93rtN3+J2Vac/TIO+ciQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/Boshen"
+      }
+    },
     "node_modules/oxc-resolver": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.4.0.tgz",
-      "integrity": "sha512-J19ZMuUoGTsMc7TUacC5B5LQccZ6CluLmQ/RiC9mXKVvC8RCoiLjQOjEKrVolvxeU9q+TK1hrcJnmtZi/DqA6Q==",
+      "version": "11.19.1",
+      "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.19.1.tgz",
+      "integrity": "sha512-qE/CIg/spwrTBFt5aKmwe3ifeDdLfA2NESN30E42X/lII5ClF8V7Wt6WIJhcGZjp0/Q+nQ+9vgxGk//xZNX2hg==",
       "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/Boshen"
       },
       "optionalDependencies": {
-        "@oxc-resolver/binding-darwin-arm64": "11.4.0",
-        "@oxc-resolver/binding-darwin-x64": "11.4.0",
-        "@oxc-resolver/binding-freebsd-x64": "11.4.0",
-        "@oxc-resolver/binding-linux-arm-gnueabihf": "11.4.0",
-        "@oxc-resolver/binding-linux-arm64-gnu": "11.4.0",
-        "@oxc-resolver/binding-linux-arm64-musl": "11.4.0",
-        "@oxc-resolver/binding-linux-riscv64-gnu": "11.4.0",
-        "@oxc-resolver/binding-linux-s390x-gnu": "11.4.0",
-        "@oxc-resolver/binding-linux-x64-gnu": "11.4.0",
-        "@oxc-resolver/binding-linux-x64-musl": "11.4.0",
-        "@oxc-resolver/binding-wasm32-wasi": "11.4.0",
-        "@oxc-resolver/binding-win32-arm64-msvc": "11.4.0",
-        "@oxc-resolver/binding-win32-x64-msvc": "11.4.0"
+        "@oxc-resolver/binding-android-arm-eabi": "11.19.1",
+        "@oxc-resolver/binding-android-arm64": "11.19.1",
+        "@oxc-resolver/binding-darwin-arm64": "11.19.1",
+        "@oxc-resolver/binding-darwin-x64": "11.19.1",
+        "@oxc-resolver/binding-freebsd-x64": "11.19.1",
+        "@oxc-resolver/binding-linux-arm-gnueabihf": "11.19.1",
+        "@oxc-resolver/binding-linux-arm-musleabihf": "11.19.1",
+        "@oxc-resolver/binding-linux-arm64-gnu": "11.19.1",
+        "@oxc-resolver/binding-linux-arm64-musl": "11.19.1",
+        "@oxc-resolver/binding-linux-ppc64-gnu": "11.19.1",
+        "@oxc-resolver/binding-linux-riscv64-gnu": "11.19.1",
+        "@oxc-resolver/binding-linux-riscv64-musl": "11.19.1",
+        "@oxc-resolver/binding-linux-s390x-gnu": "11.19.1",
+        "@oxc-resolver/binding-linux-x64-gnu": "11.19.1",
+        "@oxc-resolver/binding-linux-x64-musl": "11.19.1",
+        "@oxc-resolver/binding-openharmony-arm64": "11.19.1",
+        "@oxc-resolver/binding-wasm32-wasi": "11.19.1",
+        "@oxc-resolver/binding-win32-arm64-msvc": "11.19.1",
+        "@oxc-resolver/binding-win32-ia32-msvc": "11.19.1",
+        "@oxc-resolver/binding-win32-x64-msvc": "11.19.1"
       }
     },
     "node_modules/package-json-from-dist": {
@@ -6658,15 +7230,15 @@
       }
     },
     "node_modules/pdfjs-dist": {
-      "version": "5.4.624",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-5.4.624.tgz",
-      "integrity": "sha512-sm6TxKTtWv1Oh6n3C6J6a8odejb5uO4A4zo/2dgkHuC0iu8ZMAXOezEODkVaoVp8nX1Xzr+0WxFJJmUr45hQzg==",
+      "version": "5.6.205",
+      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-5.6.205.tgz",
+      "integrity": "sha512-tlUj+2IDa7G1SbvBNN74UHRLJybZDWYom+k6p5KIZl7huBvsA4APi6mKL+zCxd3tLjN5hOOEE9Tv7VdzO88pfg==",
       "license": "Apache-2.0",
       "engines": {
-        "node": ">=20.16.0 || >=22.3.0"
+        "node": ">=20.19.0 || >=22.13.0 || >=24"
       },
       "optionalDependencies": {
-        "@napi-rs/canvas": "^0.1.88",
+        "@napi-rs/canvas": "^0.1.96",
         "node-readable-to-web-readable-stream": "^0.4.2"
       }
     },
@@ -6683,9 +7255,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6696,19 +7268,19 @@
       }
     },
     "node_modules/pinia": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.3.tgz",
-      "integrity": "sha512-ttXO/InUULUXkMHpTdp9Fj4hLpD/2AoJdmAbAeW2yu1iy1k+pkFekQXw5VpC0/5p51IOR/jDaDRfRWRnMMsGOA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.4.tgz",
+      "integrity": "sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-api": "^7.7.2"
+        "@vue/devtools-api": "^7.7.7"
       },
       "funding": {
         "url": "https://github.com/sponsors/posva"
       },
       "peerDependencies": {
-        "typescript": ">=4.4.4",
-        "vue": "^2.7.0 || ^3.5.11"
+        "typescript": ">=4.5.0",
+        "vue": "^3.5.11"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -6716,28 +7288,15 @@
         }
       }
     },
-    "node_modules/pixelmatch": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-7.1.0.tgz",
-      "integrity": "sha512-1wrVzJ2STrpmONHKBy228LM1b84msXDUoAzVEl0R8Mz4Ce6EPr+IVtxm8+yvrqLYMHswREkjYFaMxnyGnaY3Ng==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "pngjs": "^7.0.0"
-      },
-      "bin": {
-        "pixelmatch": "bin/pixelmatch"
-      }
-    },
     "node_modules/playwright": {
-      "version": "1.56.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz",
-      "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==",
+      "version": "1.59.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.59.1.tgz",
+      "integrity": "sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==",
       "dev": true,
       "license": "Apache-2.0",
       "peer": true,
       "dependencies": {
-        "playwright-core": "1.56.1"
+        "playwright-core": "1.59.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -6750,9 +7309,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.56.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.1.tgz",
-      "integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==",
+      "version": "1.59.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.59.1.tgz",
+      "integrity": "sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==",
       "dev": true,
       "license": "Apache-2.0",
       "peer": true,
@@ -6763,22 +7322,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/playwright/node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "peer": true,
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/pngjs": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-7.0.0.tgz",
@@ -6807,9 +7350,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
-      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "version": "8.5.15",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
+      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
       "funding": [
         {
           "type": "opencollective",
@@ -6826,7 +7369,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.11",
+        "nanoid": "^3.3.12",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -6835,9 +7378,9 @@
       }
     },
     "node_modules/postcss/node_modules/nanoid": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "version": "3.3.12",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz",
+      "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==",
       "funding": [
         {
           "type": "github",
@@ -6852,6 +7395,19 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/powershell-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/powershell-utils/-/powershell-utils-0.1.0.tgz",
+      "integrity": "sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/pretty": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz",
@@ -6882,31 +7438,6 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/pretty-format/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",
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -6918,9 +7449,9 @@
       }
     },
     "node_modules/prosemirror-changeset": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.3.1.tgz",
-      "integrity": "sha512-j0kORIBm8ayJNl3zQvD1TTPHJX3g042et6y/KQhZhnPrruO8exkTgG8X+NRpj7kIyMMEx74Xb3DyMIBtO0IKkQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.4.0.tgz",
+      "integrity": "sha512-LvqH2v7Q2SF6yxatuPP2e8vSUKS/L+xAU7dPDC4RMyHMhZoGDfBC74mYuyYF4gLqOEG758wajtyhNnsTkuhvng==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-transform": "^1.0.0"
@@ -6958,9 +7489,9 @@
       }
     },
     "node_modules/prosemirror-gapcursor": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.3.2.tgz",
-      "integrity": "sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.4.1.tgz",
+      "integrity": "sha512-pMdYaEnjNMSwl11yjEGtgTmLkR08m/Vl+Jj443167p9eB3HVQKhYCc4gmHVDsLPODfZfjr/MmirsdyZziXbQKw==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-keymap": "^1.0.0",
@@ -6970,9 +7501,9 @@
       }
     },
     "node_modules/prosemirror-history": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/prosemirror-history/-/prosemirror-history-1.4.1.tgz",
-      "integrity": "sha512-2JZD8z2JviJrboD9cPuX/Sv/1ChFng+xh2tChQ2X4bB2HeK+rra/bmJ3xGntCcjhOqIzSDG6Id7e8RJ9QPXLEQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/prosemirror-history/-/prosemirror-history-1.5.0.tgz",
+      "integrity": "sha512-zlzTiH01eKA55UAf1MEjtssJeHnGxO0j4K4Dpx+gnmX9n+SHNlDqI2oO1Kv1iPN5B1dm5fsljCfqKF9nFL6HRg==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-state": "^1.2.2",
@@ -6982,9 +7513,9 @@
       }
     },
     "node_modules/prosemirror-inputrules": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/prosemirror-inputrules/-/prosemirror-inputrules-1.5.0.tgz",
-      "integrity": "sha512-K0xJRCmt+uSw7xesnHmcn72yBGTbY45vm8gXI4LZXbx2Z0jwh5aF9xrGQgrVPu0WbyFVFF3E/o9VhJYz6SQWnA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-inputrules/-/prosemirror-inputrules-1.5.1.tgz",
+      "integrity": "sha512-7wj4uMjKaXWAQ1CDgxNzNtR9AlsuwzHfdFH1ygEHA2KHF2DOEaXl1CJfNPAKCg9qNEh4rum975QLaCiQPyY6Fw==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-state": "^1.0.0",
@@ -7002,9 +7533,9 @@
       }
     },
     "node_modules/prosemirror-markdown": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/prosemirror-markdown/-/prosemirror-markdown-1.13.2.tgz",
-      "integrity": "sha512-FPD9rHPdA9fqzNmIIDhhnYQ6WgNoSWX9StUZ8LEKapaXU9i6XgykaHKhp6XMyXlOWetmaFgGDS/nu/w9/vUc5g==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/prosemirror-markdown/-/prosemirror-markdown-1.13.4.tgz",
+      "integrity": "sha512-D98dm4cQ3Hs6EmjK500TdAOew4Z03EV71ajEFiWra3Upr7diytJsjF4mPV2dW+eK5uNectiRj0xFxYI9NLXDbw==",
       "license": "MIT",
       "dependencies": {
         "@types/markdown-it": "^14.0.0",
@@ -7013,9 +7544,9 @@
       }
     },
     "node_modules/prosemirror-menu": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/prosemirror-menu/-/prosemirror-menu-1.2.5.tgz",
-      "integrity": "sha512-qwXzynnpBIeg1D7BAtjOusR+81xCp53j7iWu/IargiRZqRjGIlQuu1f3jFi+ehrHhWMLoyOQTSRx/IWZJqOYtQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/prosemirror-menu/-/prosemirror-menu-1.3.0.tgz",
+      "integrity": "sha512-TImyPXCHPcDsSka2/lwJ6WjTASr4re/qWq1yoTTuLOqfXucwF6VcRa2LWCkM/EyTD1UO3CUwiH8qURJoWJRxwg==",
       "license": "MIT",
       "dependencies": {
         "crelt": "^1.0.0",
@@ -7025,9 +7556,9 @@
       }
     },
     "node_modules/prosemirror-model": {
-      "version": "1.25.1",
-      "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.25.1.tgz",
-      "integrity": "sha512-AUvbm7qqmpZa5d9fPKMvH1Q5bqYQvAZWOGRvxsB6iFLyycvC9MwNemNVjHVrWgjaoxAfY8XVg7DbvQ/qxvI9Eg==",
+      "version": "1.25.4",
+      "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.25.4.tgz",
+      "integrity": "sha512-PIM7E43PBxKce8OQeezAs9j4TP+5yDpZVbuurd1h5phUxEKIu+G2a+EUZzIC5nS1mJktDJWzbqS23n1tsAf5QA==",
       "license": "MIT",
       "dependencies": {
         "orderedmap": "^2.0.0"
@@ -7054,9 +7585,9 @@
       }
     },
     "node_modules/prosemirror-state": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.3.tgz",
-      "integrity": "sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.4.tgz",
+      "integrity": "sha512-6jiYHH2CIGbCfnxdHbXZ12gySFY/fz/ulZE333G6bPqIZ4F+TXo9ifiR86nAHpWnfoNjOb3o5ESi7J8Uz1jXHw==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-model": "^1.0.0",
@@ -7065,16 +7596,16 @@
       }
     },
     "node_modules/prosemirror-tables": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-1.7.1.tgz",
-      "integrity": "sha512-eRQ97Bf+i9Eby99QbyAiyov43iOKgWa7QCGly+lrDt7efZ1v8NWolhXiB43hSDGIXT1UXgbs4KJN3a06FGpr1Q==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-1.8.5.tgz",
+      "integrity": "sha512-V/0cDCsHKHe/tfWkeCmthNUcEp1IVO3p6vwN8XtwE9PZQLAZJigbw3QoraAdfJPir4NKJtNvOB8oYGKRl+t0Dw==",
       "license": "MIT",
       "dependencies": {
-        "prosemirror-keymap": "^1.2.2",
-        "prosemirror-model": "^1.25.0",
-        "prosemirror-state": "^1.4.3",
-        "prosemirror-transform": "^1.10.3",
-        "prosemirror-view": "^1.39.1"
+        "prosemirror-keymap": "^1.2.3",
+        "prosemirror-model": "^1.25.4",
+        "prosemirror-state": "^1.4.4",
+        "prosemirror-transform": "^1.10.5",
+        "prosemirror-view": "^1.41.4"
       }
     },
     "node_modules/prosemirror-trailing-node": {
@@ -7093,18 +7624,18 @@
       }
     },
     "node_modules/prosemirror-transform": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.10.4.tgz",
-      "integrity": "sha512-pwDy22nAnGqNR1feOQKHxoFkkUtepoFAd3r2hbEDsnf4wp57kKA36hXsB3njA9FtONBEwSDnDeCiJe+ItD+ykw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.12.0.tgz",
+      "integrity": "sha512-GxboyN4AMIsoHNtz5uf2r2Ru551i5hWeCMD6E2Ib4Eogqoub0NflniaBPVQ4MrGE5yZ8JV9tUHg9qcZTTrcN4w==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-model": "^1.21.0"
       }
     },
     "node_modules/prosemirror-view": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.40.0.tgz",
-      "integrity": "sha512-2G3svX0Cr1sJjkD/DYWSe3cfV5VPVTBOxI9XQEGWJDFEpsZb/gh4MV29ctv+OJx2RFX4BLt09i+6zaGM/ldkCw==",
+      "version": "1.41.8",
+      "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.41.8.tgz",
+      "integrity": "sha512-TnKDdohEatgyZNGCDWIdccOHXhYloJwbwU+phw/a23KBvJIR9lWQWW7WHHK3vBdOLDNuF7TaX98GObUZOWkOnA==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-model": "^1.20.0",
@@ -7119,19 +7650,22 @@
       "license": "ISC"
     },
     "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT"
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
+      "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/pug": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.3.tgz",
-      "integrity": "sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.4.tgz",
+      "integrity": "sha512-kFfq5mMzrS7+wrl5pLJzZEzemx34OQ0w4SARfhy/3yxTlhbstsudDwJzhf1hP02yHzbjoVMSXUj/Sz6RNfMyXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pug-code-gen": "^3.0.3",
+        "pug-code-gen": "^3.0.4",
         "pug-filters": "^4.0.0",
         "pug-lexer": "^5.0.1",
         "pug-linker": "^4.0.0",
@@ -7154,9 +7688,9 @@
       }
     },
     "node_modules/pug-code-gen": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.3.tgz",
-      "integrity": "sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.4.tgz",
+      "integrity": "sha512-6okWYIKdasTyXICyEtvobmTZAVX57JkzgzIi4iRJlin8kmhG+Xry2dsus+Mun/nGCn6F2U49haHI5mkELXB14g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7280,18 +7814,18 @@
       }
     },
     "node_modules/pusher-js": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-8.4.0.tgz",
-      "integrity": "sha512-wp3HqIIUc1GRyu1XrP6m2dgyE9MoCsXVsWNlohj0rjSkLf+a0jLvEyVubdg58oMk7bhjBWnFClgp8jfAa6Ak4Q==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-8.5.0.tgz",
+      "integrity": "sha512-V7uzGi9bqOOOyM/6IkJdpFyjGZj7llz1v0oWnYkZKcYLvbz6VcHVLmzKqkvegjuMumpfIEKGLmWHwFb39XFCpw==",
       "license": "MIT",
       "dependencies": {
         "tweetnacl": "^1.0.3"
       }
     },
     "node_modules/qs": {
-      "version": "6.14.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
-      "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
+      "version": "6.15.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz",
+      "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.1.0"
@@ -7325,9 +7859,9 @@
       "license": "MIT"
     },
     "node_modules/react": {
-      "version": "19.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
-      "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
+      "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
       "devOptional": true,
       "license": "MIT",
       "engines": {
@@ -7335,16 +7869,16 @@
       }
     },
     "node_modules/react-dom": {
-      "version": "19.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
-      "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
+      "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^19.2.0"
+        "react": "^19.2.4"
       }
     },
     "node_modules/react-is": {
@@ -7403,9 +7937,9 @@
       }
     },
     "node_modules/reka-ui": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.9.2.tgz",
-      "integrity": "sha512-/t4e6y1hcG+uDuRfpg6tbMz3uUEvRzNco6NeYTufoJeUghy5Iosxos5YL/p+ieAsid84sdMX9OrgDqpEuCJhBw==",
+      "version": "2.9.5",
+      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.9.5.tgz",
+      "integrity": "sha512-6cZGIMgEeslpFLJ7IihaCSMPp1cJgl2eDkZ2vBMdl+HPUVBaV/iDPMWu3abT2KUkj1lir+oyHq5KelOTT9OheQ==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.6.13",
@@ -7416,7 +7950,7 @@
         "@vueuse/core": "^14.1.0",
         "@vueuse/shared": "^14.1.0",
         "aria-hidden": "^1.2.4",
-        "defu": "^6.1.4",
+        "defu": "^6.1.5",
         "ohash": "^2.0.11"
       },
       "funding": {
@@ -7427,60 +7961,6 @@
         "vue": ">= 3.4.0"
       }
     },
-    "node_modules/reka-ui/node_modules/@types/web-bluetooth": {
-      "version": "0.0.21",
-      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
-      "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
-      "license": "MIT"
-    },
-    "node_modules/reka-ui/node_modules/@vueuse/core": {
-      "version": "14.2.1",
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-14.2.1.tgz",
-      "integrity": "sha512-3vwDzV+GDUNpdegRY6kzpLm4Igptq+GA0QkJ3W61Iv27YWwW/ufSlOfgQIpN6FZRMG0mkaz4gglJRtq5SeJyIQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/web-bluetooth": "^0.0.21",
-        "@vueuse/metadata": "14.2.1",
-        "@vueuse/shared": "14.2.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "vue": "^3.5.0"
-      }
-    },
-    "node_modules/reka-ui/node_modules/@vueuse/metadata": {
-      "version": "14.2.1",
-      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-14.2.1.tgz",
-      "integrity": "sha512-1ButlVtj5Sb/HDtIy1HFr1VqCP4G6Ypqt5MAo0lCgjokrk2mvQKsK2uuy0vqu/Ks+sHfuHo0B9Y9jn9xKdjZsw==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
-    "node_modules/reka-ui/node_modules/@vueuse/shared": {
-      "version": "14.2.1",
-      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.2.1.tgz",
-      "integrity": "sha512-shTJncjV9JTI4oVNyF1FQonetYAiTBd+Qj7cY89SWbXSkx7gyhrgtEdF2ZAVWS1S3SHlaROO6F2IesJxQEkZBw==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "vue": "^3.5.0"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/resize-observer-polyfill": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
@@ -7525,71 +8005,67 @@
       "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "license": "MIT"
     },
-    "node_modules/rollup": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz",
-      "integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==",
+    "node_modules/rolldown": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.3.tgz",
+      "integrity": "sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.8"
+        "@oxc-project/types": "=0.133.0",
+        "@rolldown/pluginutils": "^1.0.0"
       },
       "bin": {
-        "rollup": "dist/bin/rollup"
+        "rolldown": "bin/cli.mjs"
       },
       "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.59.0",
-        "@rollup/rollup-android-arm64": "4.59.0",
-        "@rollup/rollup-darwin-arm64": "4.59.0",
-        "@rollup/rollup-darwin-x64": "4.59.0",
-        "@rollup/rollup-freebsd-arm64": "4.59.0",
-        "@rollup/rollup-freebsd-x64": "4.59.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.59.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.59.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.59.0",
-        "@rollup/rollup-linux-arm64-musl": "4.59.0",
-        "@rollup/rollup-linux-loong64-gnu": "4.59.0",
-        "@rollup/rollup-linux-loong64-musl": "4.59.0",
-        "@rollup/rollup-linux-ppc64-gnu": "4.59.0",
-        "@rollup/rollup-linux-ppc64-musl": "4.59.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.59.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.59.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.59.0",
-        "@rollup/rollup-linux-x64-gnu": "4.59.0",
-        "@rollup/rollup-linux-x64-musl": "4.59.0",
-        "@rollup/rollup-openbsd-x64": "4.59.0",
-        "@rollup/rollup-openharmony-arm64": "4.59.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.59.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.59.0",
-        "@rollup/rollup-win32-x64-gnu": "4.59.0",
-        "@rollup/rollup-win32-x64-msvc": "4.59.0",
-        "fsevents": "~2.3.2"
-      }
+        "@rolldown/binding-android-arm64": "1.0.3",
+        "@rolldown/binding-darwin-arm64": "1.0.3",
+        "@rolldown/binding-darwin-x64": "1.0.3",
+        "@rolldown/binding-freebsd-x64": "1.0.3",
+        "@rolldown/binding-linux-arm-gnueabihf": "1.0.3",
+        "@rolldown/binding-linux-arm64-gnu": "1.0.3",
+        "@rolldown/binding-linux-arm64-musl": "1.0.3",
+        "@rolldown/binding-linux-ppc64-gnu": "1.0.3",
+        "@rolldown/binding-linux-s390x-gnu": "1.0.3",
+        "@rolldown/binding-linux-x64-gnu": "1.0.3",
+        "@rolldown/binding-linux-x64-musl": "1.0.3",
+        "@rolldown/binding-openharmony-arm64": "1.0.3",
+        "@rolldown/binding-wasm32-wasi": "1.0.3",
+        "@rolldown/binding-win32-arm64-msvc": "1.0.3",
+        "@rolldown/binding-win32-x64-msvc": "1.0.3"
+      }
+    },
+    "node_modules/rolldown/node_modules/@rolldown/pluginutils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz",
+      "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/rollup-plugin-visualizer": {
-      "version": "5.14.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.14.0.tgz",
-      "integrity": "sha512-VlDXneTDaKsHIw8yzJAFWtrzguoJ/LnQ+lMpoVfYJ3jJF4Ihe5oYLAqLklIK/35lgUY+1yEzCkHyZ1j4A5w5fA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-7.0.1.tgz",
+      "integrity": "sha512-UJUT4+1Ho4OcWmPYU3sYXgUqI8B8Ayfe06MX7y0qCJ1K8aGoKtR/NDd/2nZqM7ADkrzny+I99Ul7GgyoiVNAgg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "open": "^8.4.0",
+        "open": "^11.0.0",
         "picomatch": "^4.0.2",
         "source-map": "^0.7.4",
-        "yargs": "^17.5.1"
+        "yargs": "^18.0.0"
       },
       "bin": {
         "rollup-plugin-visualizer": "dist/bin/cli.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=22"
       },
       "peerDependencies": {
-        "rolldown": "1.x",
+        "rolldown": "1.x || ^1.0.0-beta || ^1.0.0-rc",
         "rollup": "2.x || 3.x || 4.x"
       },
       "peerDependenciesMeta": {
@@ -7659,9 +8135,9 @@
       "license": "MIT"
     },
     "node_modules/sax": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.5.0.tgz",
-      "integrity": "sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
+      "integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==",
       "license": "BlueOak-1.0.0",
       "engines": {
         "node": ">=11.0.0"
@@ -7688,9 +8164,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -7827,9 +8303,9 @@
       }
     },
     "node_modules/smol-toml": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.4.1.tgz",
-      "integrity": "sha512-CxdwHXyYTONGHThDbq5XdwbFsuY4wlClRGejfE2NtwUtiHYsP1QtNsHb/hnj31jKYSchztJsaA8pSQoVzkfCFg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.6.1.tgz",
+      "integrity": "sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -7840,13 +8316,13 @@
       }
     },
     "node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
+      "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
-        "node": ">= 8"
+        "node": ">= 12"
       }
     },
     "node_modules/source-map-js": {
@@ -7875,27 +8351,30 @@
       "license": "MIT"
     },
     "node_modules/std-env": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz",
-      "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.0.0.tgz",
+      "integrity": "sha512-zUMPtQ/HBY3/50VbpkupYHbRroTRZJPRLvreamgErJVys0ceuzMkD44J/QjqhHjOzK42GQ3QZIeFG1OYfOtKqQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/storybook": {
-      "version": "10.2.14",
-      "resolved": "https://registry.npmjs.org/storybook/-/storybook-10.2.14.tgz",
-      "integrity": "sha512-HGAgLbDAAbLOgjERsBXPpHUMxynHumYgoCRNBnAH57HfKuHL9LA3nKvKpbhFbYb/8PSG5X3hiKukki0R6Op7Aw==",
+      "version": "10.4.6",
+      "resolved": "https://registry.npmjs.org/storybook/-/storybook-10.4.6.tgz",
+      "integrity": "sha512-6wkA6LxfDSSilloITsrFOJfsnw0mDUP2h8Ls+lRt8oRsudtz2RWFhLv+Toiwg6NW7hUpdTDc2hzR7DztJid6+A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@storybook/global": "^5.0.0",
-        "@storybook/icons": "^2.0.1",
-        "@testing-library/jest-dom": "^6.6.3",
+        "@storybook/icons": "^2.0.2",
+        "@testing-library/jest-dom": "^6.9.1",
         "@testing-library/user-event": "^14.6.1",
         "@vitest/expect": "3.2.4",
         "@vitest/spy": "3.2.4",
-        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.26.0 || ^0.27.0",
+        "@webcontainer/env": "^1.1.1",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.26.0 || ^0.27.0 || ^0.28.0",
         "open": "^10.2.0",
+        "oxc-parser": "^0.127.0",
+        "oxc-resolver": "^11.19.1",
         "recast": "^0.23.5",
         "semver": "^7.7.3",
         "use-sync-external-store": "^1.5.0",
@@ -7909,44 +8388,22 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "prettier": "^2 || ^3"
+        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "prettier": "^2 || ^3",
+        "vite-plus": "^0.1.15"
       },
       "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
         "prettier": {
           "optional": true
+        },
+        "vite-plus": {
+          "optional": true
         }
       }
     },
-    "node_modules/storybook/node_modules/@vitest/expect": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
-      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/chai": "^5.2.2",
-        "@vitest/spy": "3.2.4",
-        "@vitest/utils": "3.2.4",
-        "chai": "^5.2.0",
-        "tinyrainbow": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/storybook/node_modules/@vitest/pretty-format": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
-      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tinyrainbow": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
     "node_modules/storybook/node_modules/@vitest/spy": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
@@ -7960,51 +8417,6 @@
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/storybook/node_modules/@vitest/utils": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
-      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vitest/pretty-format": "3.2.4",
-        "loupe": "^3.1.4",
-        "tinyrainbow": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/storybook/node_modules/chai": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz",
-      "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "assertion-error": "^2.0.1",
-        "check-error": "^2.1.1",
-        "deep-eql": "^5.0.1",
-        "loupe": "^3.1.0",
-        "pathval": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/storybook/node_modules/define-lazy-prop": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
-      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/storybook/node_modules/open": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz",
@@ -8024,14 +8436,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/storybook/node_modules/tinyrainbow": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
-      "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==",
+    "node_modules/storybook/node_modules/wsl-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.1.0.tgz",
+      "integrity": "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^3.1.0"
+      },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/string-width": {
@@ -8066,15 +8484,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==",
-      "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",
@@ -8094,12 +8503,12 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^6.0.1"
+        "ansi-regex": "^6.2.2"
       },
       "engines": {
         "node": ">=12"
@@ -8121,13 +8530,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/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/strip-indent": {
@@ -8144,9 +8556,9 @@
       }
     },
     "node_modules/strip-json-comments": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.2.tgz",
-      "integrity": "sha512-4X2FR3UwhNUE9G49aIsJW5hRRR3GXGTBTZRMfv568O60ojM8HcWjV/VxAxCDW3SUND33O6ZY66ZuRcdkj73q2g==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.3.tgz",
+      "integrity": "sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8163,12 +8575,12 @@
       "license": "MIT"
     },
     "node_modules/superjson": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.2.tgz",
-      "integrity": "sha512-5JRxVqC8I8NuOUjzBbvVJAKNM8qoVuH0O77h4WInc/qC2q5IreqKxYwgkga3PfA22OayK2ikceb/B26dztPl+Q==",
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.6.tgz",
+      "integrity": "sha512-H+ue8Zo4vJmV2nRjpx86P35lzwDT3nItnIsocgumgr0hHMQ+ZGq5vrERg9kJBo5AWGmxZDhzDo+WVIJqkB0cGA==",
       "license": "MIT",
       "dependencies": {
-        "copy-anything": "^3.0.2"
+        "copy-anything": "^4"
       },
       "engines": {
         "node": ">=16"
@@ -8229,15 +8641,15 @@
       "license": "MIT"
     },
     "node_modules/tabbable": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
-      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz",
+      "integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==",
       "license": "MIT"
     },
     "node_modules/tailwind-merge": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.3.1.tgz",
-      "integrity": "sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
+      "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -8245,37 +8657,24 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.11.tgz",
-      "integrity": "sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.2.tgz",
+      "integrity": "sha512-KWBIxs1Xb6NoLdMVqhbhgwZf2PGBpPEiwOqgI4pFIYbNTfBXiKYyWoTsXgBQ9WFg/OlhnvHaY+AEpW7wSmFo2Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/tapable": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
-      "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.2.tgz",
+      "integrity": "sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
-      }
-    },
-    "node_modules/tar": {
-      "version": "7.5.11",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz",
-      "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/fs-minipass": "^4.0.0",
-        "chownr": "^3.0.0",
-        "minipass": "^7.1.2",
-        "minizlib": "^3.1.0",
-        "yallist": "^5.0.0"
       },
-      "engines": {
-        "node": ">=18"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/tiny-emitter": {
@@ -8299,21 +8698,24 @@
       "license": "MIT"
     },
     "node_modules/tinyexec": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
-      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.1.1.tgz",
+      "integrity": "sha512-VKS/ZaQhhkKFMANmAOhhXVoIfBXblQxGX1myCQ2faQrfmobMftXeJPcZGp0gS07ocvGJWDLZGyOZDadDBqYIJg==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "version": "0.2.17",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
+      "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
-        "picomatch": "^4.0.3"
+        "picomatch": "^4.0.4"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -8323,9 +8725,9 @@
       }
     },
     "node_modules/tinyrainbow": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.0.3.tgz",
-      "integrity": "sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz",
+      "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8435,27 +8837,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/tsconfck": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.6.tgz",
-      "integrity": "sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "tsconfck": "bin/tsconfck.js"
-      },
-      "engines": {
-        "node": "^18 || >=20"
-      },
-      "peerDependencies": {
-        "typescript": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -8501,10 +8882,20 @@
       "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
       "license": "MIT"
     },
+    "node_modules/unbash": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unbash/-/unbash-2.2.0.tgz",
+      "integrity": "sha512-X2wH19RAPZE3+ldGicOkoj/SIA83OIxcJ6Cuaw23hf8Xc6fQpvZXY0SftE2JgS0QhYLUG4uwodSI3R53keyh7w==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/undici-types": {
-      "version": "7.10.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
-      "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
       "dev": true,
       "license": "MIT",
       "peer": true
@@ -8545,27 +8936,26 @@
       }
     },
     "node_modules/validator": {
-      "version": "13.15.23",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-13.15.23.tgz",
-      "integrity": "sha512-4yoz1kEWqUjzi5zsPbAS/903QXSYp0UOtHsPpp7p9rHAw/W+dkInskAE386Fat3oKRROwO98d9ZB0G4cObgUyw==",
+      "version": "13.15.35",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.15.35.tgz",
+      "integrity": "sha512-TQ5pAGhd5whStmqWvYF4OjQROlmv9SMFVt37qoCBdqRffuuklWYQlCNnEs2ZaIBD1kZRNnikiZOS1eqgkar0iw==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/vite": {
-      "version": "7.1.12",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.12.tgz",
-      "integrity": "sha512-ZWyE8YXEXqJrrSLvYgrRP7p62OziLW7xI5HYGWFzOvupfAlrLvURSzv/FyGyy0eidogEM3ujU+kUG1zuHgb6Ug==",
+      "version": "8.0.16",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.16.tgz",
+      "integrity": "sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "esbuild": "^0.25.0",
-        "fdir": "^6.5.0",
-        "picomatch": "^4.0.3",
-        "postcss": "^8.5.6",
-        "rollup": "^4.43.0",
-        "tinyglobby": "^0.2.15"
+        "lightningcss": "^1.32.0",
+        "picomatch": "^4.0.4",
+        "postcss": "^8.5.15",
+        "rolldown": "1.0.3",
+        "tinyglobby": "^0.2.17"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -8581,9 +8971,10 @@
       },
       "peerDependencies": {
         "@types/node": "^20.19.0 || >=22.12.0",
+        "@vitejs/devtools": "^0.1.18",
+        "esbuild": "^0.27.0 || ^0.28.0",
         "jiti": ">=1.21.0",
         "less": "^4.0.0",
-        "lightningcss": "^1.21.0",
         "sass": "^1.70.0",
         "sass-embedded": "^1.70.0",
         "stylus": ">=0.54.8",
@@ -8596,13 +8987,16 @@
         "@types/node": {
           "optional": true
         },
-        "jiti": {
+        "@vitejs/devtools": {
           "optional": true
         },
-        "less": {
+        "esbuild": {
+          "optional": true
+        },
+        "jiti": {
           "optional": true
         },
-        "lightningcss": {
+        "less": {
           "optional": true
         },
         "sass": {
@@ -8640,9 +9034,9 @@
       }
     },
     "node_modules/vite-plugin-full-reload/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8653,63 +9047,59 @@
       }
     },
     "node_modules/vite-svg-loader": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/vite-svg-loader/-/vite-svg-loader-5.1.0.tgz",
-      "integrity": "sha512-M/wqwtOEjgb956/+m5ZrYT/Iq6Hax0OakWbokj8+9PXOnB7b/4AxESHieEtnNEy7ZpjsjYW1/5nK8fATQMmRxw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/vite-svg-loader/-/vite-svg-loader-5.1.1.tgz",
+      "integrity": "sha512-RPzcXA/EpKJA0585x58DBgs7my2VfeJ+j2j1EoHY4Zh82Y7hV4cR1fElgy2aZi85+QSrcLLoTStQ5uZjD68u+Q==",
       "license": "MIT",
       "dependencies": {
-        "svgo": "^3.0.2"
+        "debug": "^4.3.4",
+        "svgo": "^3.3.3"
       },
       "peerDependencies": {
         "vue": ">=3.2.13"
       }
     },
-    "node_modules/vite-tsconfig-paths": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-5.1.4.tgz",
-      "integrity": "sha512-cYj0LRuLV2c2sMqhqhGpaO3LretdtMn/BVX4cPLanIZuwwrkVl+lK84E/miEXkCHWXuq65rhNN4rXsBcOB3S4w==",
+    "node_modules/vite/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
+      "hasInstallScript": true,
       "license": "MIT",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "globrex": "^0.1.2",
-        "tsconfck": "^3.0.3"
-      },
-      "peerDependencies": {
-        "vite": "*"
-      },
-      "peerDependenciesMeta": {
-        "vite": {
-          "optional": true
-        }
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
     "node_modules/vitest": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.0.12.tgz",
-      "integrity": "sha512-pmW4GCKQ8t5Ko1jYjC3SqOr7TUKN7uHOHB/XGsAIb69eYu6d1ionGSsb5H9chmPf+WeXt0VE7jTXsB1IvWoNbw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vitest/expect": "4.0.12",
-        "@vitest/mocker": "4.0.12",
-        "@vitest/pretty-format": "4.0.12",
-        "@vitest/runner": "4.0.12",
-        "@vitest/snapshot": "4.0.12",
-        "@vitest/spy": "4.0.12",
-        "@vitest/utils": "4.0.12",
-        "debug": "^4.4.3",
-        "es-module-lexer": "^1.7.0",
-        "expect-type": "^1.2.2",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.3.tgz",
+      "integrity": "sha512-DBc4Tx0MPNsqb9isoyOq00lHftVx/KIU44QOm2q59npZyLUkENn8TMFsuzuO+4U2FUa9rgbbPt3udrP25GcjXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/expect": "4.1.3",
+        "@vitest/mocker": "4.1.3",
+        "@vitest/pretty-format": "4.1.3",
+        "@vitest/runner": "4.1.3",
+        "@vitest/snapshot": "4.1.3",
+        "@vitest/spy": "4.1.3",
+        "@vitest/utils": "4.1.3",
+        "es-module-lexer": "^2.0.0",
+        "expect-type": "^1.3.0",
         "magic-string": "^0.30.21",
+        "obug": "^2.1.1",
         "pathe": "^2.0.3",
         "picomatch": "^4.0.3",
-        "std-env": "^3.10.0",
+        "std-env": "^4.0.0-rc.1",
         "tinybench": "^2.9.0",
-        "tinyexec": "^0.3.2",
+        "tinyexec": "^1.0.2",
         "tinyglobby": "^0.2.15",
-        "tinyrainbow": "^3.0.3",
-        "vite": "^6.0.0 || ^7.0.0",
+        "tinyrainbow": "^3.1.0",
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -8724,14 +9114,16 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@opentelemetry/api": "^1.9.0",
-        "@types/debug": "^4.1.12",
         "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
-        "@vitest/browser-playwright": "4.0.12",
-        "@vitest/browser-preview": "4.0.12",
-        "@vitest/browser-webdriverio": "4.0.12",
-        "@vitest/ui": "4.0.12",
+        "@vitest/browser-playwright": "4.1.3",
+        "@vitest/browser-preview": "4.1.3",
+        "@vitest/browser-webdriverio": "4.1.3",
+        "@vitest/coverage-istanbul": "4.1.3",
+        "@vitest/coverage-v8": "4.1.3",
+        "@vitest/ui": "4.1.3",
         "happy-dom": "*",
-        "jsdom": "*"
+        "jsdom": "*",
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "@edge-runtime/vm": {
@@ -8740,9 +9132,6 @@
         "@opentelemetry/api": {
           "optional": true
         },
-        "@types/debug": {
-          "optional": true
-        },
         "@types/node": {
           "optional": true
         },
@@ -8755,6 +9144,12 @@
         "@vitest/browser-webdriverio": {
           "optional": true
         },
+        "@vitest/coverage-istanbul": {
+          "optional": true
+        },
+        "@vitest/coverage-v8": {
+          "optional": true
+        },
         "@vitest/ui": {
           "optional": true
         },
@@ -8763,13 +9158,16 @@
         },
         "jsdom": {
           "optional": true
+        },
+        "vite": {
+          "optional": false
         }
       }
     },
     "node_modules/vitest-browser-vue": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/vitest-browser-vue/-/vitest-browser-vue-2.0.1.tgz",
-      "integrity": "sha512-IfTJY3Olr27AXCVAhOqx4g5iUgzdWLmYr40svg7rOrunjsqc9trrzi/eI3i11+UYddbKXu3HJl2bo8o8lqKm4A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/vitest-browser-vue/-/vitest-browser-vue-2.1.0.tgz",
+      "integrity": "sha512-K3H/oxIOY4EjXx2bxwrLsPg4jTMvzpRW6Jb6T8XZRoxUvmDVwGkd8mua130F8GZezE7H5QYoXd/S8hYijw7j5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8783,6 +9181,34 @@
         "vue": "^3.0.0"
       }
     },
+    "node_modules/vitest/node_modules/@vitest/expect": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.3.tgz",
+      "integrity": "sha512-CW8Q9KMtXDGHj0vCsqui0M5KqRsu0zm0GNDW7Gd3U7nZ2RFpPKSCpeCXoT+/+5zr1TNlsoQRDEz+LzZUyq6gnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@standard-schema/spec": "^1.1.0",
+        "@types/chai": "^5.2.2",
+        "@vitest/spy": "4.1.3",
+        "@vitest/utils": "4.1.3",
+        "chai": "^6.2.2",
+        "tinyrainbow": "^3.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/vitest/node_modules/chai": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
+      "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/void-elements": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
@@ -8801,47 +9227,16 @@
       "license": "MIT"
     },
     "node_modules/vue": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.17.tgz",
-      "integrity": "sha512-LbHV3xPN9BeljML+Xctq4lbz2lVHCR6DtbpTf5XIO6gugpXUN49j2QQPcMj086r9+AkJ0FfUT8xjulKKBkkr9g==",
-      "license": "MIT",
-      "dependencies": {
-        "@vue/compiler-dom": "3.5.17",
-        "@vue/compiler-sfc": "3.5.17",
-        "@vue/runtime-dom": "3.5.17",
-        "@vue/server-renderer": "3.5.17",
-        "@vue/shared": "3.5.17"
-      },
-      "peerDependencies": {
-        "typescript": "*"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vue-component-debug": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/vue-component-debug/-/vue-component-debug-0.1.1.tgz",
-      "integrity": "sha512-XhLbn5uSVnwl17Fy1aO8/c2Yxs6b6xaiMuXzr7KV/CEOqWCBEVSUQDmnBo0NjVJyrYbHwZbKIyegtzG809tJWw==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "vue": "^3.0.0"
-      }
-    },
-    "node_modules/vue-component-meta": {
-      "version": "2.2.12",
-      "resolved": "https://registry.npmjs.org/vue-component-meta/-/vue-component-meta-2.2.12.tgz",
-      "integrity": "sha512-dQU6/obNSNbennJ1xd+rhDid4g3vQro+9qUBBIg8HMZH2Zs1jTpkFNxuQ3z77bOlU+ew08Qck9sbYkdSePr0Pw==",
-      "dev": true,
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.32.tgz",
+      "integrity": "sha512-vM4z4Q9tTafVfMAK7IVzmxg34rSzTFMyIe0UUEijUCkn9+23lj0WRfA83dg7eQZIUlgOSGrkViIaCfqSAUXsMw==",
       "license": "MIT",
       "dependencies": {
-        "@volar/typescript": "2.4.15",
-        "@vue/language-core": "2.2.12",
-        "path-browserify": "^1.0.1",
-        "vue-component-type-helpers": "2.2.12"
+        "@vue/compiler-dom": "3.5.32",
+        "@vue/compiler-sfc": "3.5.32",
+        "@vue/runtime-dom": "3.5.32",
+        "@vue/server-renderer": "3.5.32",
+        "@vue/shared": "3.5.32"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -8849,53 +9244,30 @@
       "peerDependenciesMeta": {
         "typescript": {
           "optional": true
-        }
-      }
-    },
-    "node_modules/vue-component-meta/node_modules/@volar/language-core": {
-      "version": "2.4.15",
-      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.15.tgz",
-      "integrity": "sha512-3VHw+QZU0ZG9IuQmzT68IyN4hZNd9GchGPhbD9+pa8CVv7rnoOZwo7T8weIbrRmihqy3ATpdfXFnqRrfPVK6CA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@volar/source-map": "2.4.15"
+        }
       }
     },
-    "node_modules/vue-component-meta/node_modules/@volar/source-map": {
-      "version": "2.4.15",
-      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.15.tgz",
-      "integrity": "sha512-CPbMWlUN6hVZJYGcU/GSoHu4EnCHiLaXI9n8c9la6RaI9W5JHX+NqG+GSQcB0JdC2FIBLdZJwGsfKyBB71VlTg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/vue-component-meta/node_modules/@volar/typescript": {
-      "version": "2.4.15",
-      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.15.tgz",
-      "integrity": "sha512-2aZ8i0cqPGjXb4BhkMsPYDkkuc2ZQ6yOpqwAuNwUoncELqoy5fRgOQtLR9gB0g902iS0NAkvpIzs27geVyVdPg==",
+    "node_modules/vue-component-debug": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/vue-component-debug/-/vue-component-debug-0.1.1.tgz",
+      "integrity": "sha512-XhLbn5uSVnwl17Fy1aO8/c2Yxs6b6xaiMuXzr7KV/CEOqWCBEVSUQDmnBo0NjVJyrYbHwZbKIyegtzG809tJWw==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@volar/language-core": "2.4.15",
-        "path-browserify": "^1.0.1",
-        "vscode-uri": "^3.0.8"
+      "peerDependencies": {
+        "vue": "^3.0.0"
       }
     },
-    "node_modules/vue-component-meta/node_modules/@vue/language-core": {
+    "node_modules/vue-component-meta": {
       "version": "2.2.12",
-      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.12.tgz",
-      "integrity": "sha512-IsGljWbKGU1MZpBPN+BvPAdr55YPkj2nB/TBNGNC32Vy2qLG25DYu/NBN2vNtZqdRbTRjaoYrahLrToim2NanA==",
+      "resolved": "https://registry.npmjs.org/vue-component-meta/-/vue-component-meta-2.2.12.tgz",
+      "integrity": "sha512-dQU6/obNSNbennJ1xd+rhDid4g3vQro+9qUBBIg8HMZH2Zs1jTpkFNxuQ3z77bOlU+ew08Qck9sbYkdSePr0Pw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/language-core": "2.4.15",
-        "@vue/compiler-dom": "^3.5.0",
-        "@vue/compiler-vue2": "^2.7.16",
-        "@vue/shared": "^3.5.0",
-        "alien-signals": "^1.0.3",
-        "minimatch": "^9.0.3",
-        "muggle-string": "^0.4.1",
-        "path-browserify": "^1.0.1"
+        "@volar/typescript": "2.4.15",
+        "@vue/language-core": "2.2.12",
+        "path-browserify": "^1.0.1",
+        "vue-component-type-helpers": "2.2.12"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -8906,24 +9278,17 @@
         }
       }
     },
-    "node_modules/vue-component-meta/node_modules/@vue/shared": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.24.tgz",
-      "integrity": "sha512-9cwHL2EsJBdi8NY22pngYYWzkTDhld6fAD6jlaeloNGciNSJL6bLpbxVgXl96X00Jtc6YWQv96YA/0sxex/k1A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/vue-component-meta/node_modules/alien-signals": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-1.0.13.tgz",
-      "integrity": "sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg==",
+    "node_modules/vue-component-meta/node_modules/vue-component-type-helpers": {
+      "version": "2.2.12",
+      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.2.12.tgz",
+      "integrity": "sha512-YbGqHZ5/eW4SnkPNR44mKVc6ZKQoRs/Rux1sxC6rdwXb4qpbOSYfDr9DsTHolOTGmIKgM9j141mZbBeg05R1pw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/vue-component-type-helpers": {
-      "version": "2.2.12",
-      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.2.12.tgz",
-      "integrity": "sha512-YbGqHZ5/eW4SnkPNR44mKVc6ZKQoRs/Rux1sxC6rdwXb4qpbOSYfDr9DsTHolOTGmIKgM9j141mZbBeg05R1pw==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-3.2.6.tgz",
+      "integrity": "sha512-O02tnvIfOQVmnvoWwuSydwRoHjZVt8UEBR+2p4rT35p8GAy5VTlWP8o5qXfJR/GWCN0nVZoYWsVUvx2jwgdBmQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -8978,6 +9343,100 @@
         "vue": ">=3.2.0"
       }
     },
+    "node_modules/vue-final-modal/node_modules/@types/web-bluetooth": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
+      "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==",
+      "license": "MIT"
+    },
+    "node_modules/vue-final-modal/node_modules/@vueuse/core": {
+      "version": "10.11.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.11.1.tgz",
+      "integrity": "sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.20",
+        "@vueuse/metadata": "10.11.1",
+        "@vueuse/shared": "10.11.1",
+        "vue-demi": ">=0.14.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/vue-final-modal/node_modules/@vueuse/core/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vue-final-modal/node_modules/@vueuse/metadata": {
+      "version": "10.11.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.1.tgz",
+      "integrity": "sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/vue-final-modal/node_modules/@vueuse/shared": {
+      "version": "10.11.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.11.1.tgz",
+      "integrity": "sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==",
+      "license": "MIT",
+      "dependencies": {
+        "vue-demi": ">=0.14.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/vue-final-modal/node_modules/@vueuse/shared/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/vue-inbrowser-compiler-independent-utils": {
       "version": "4.71.1",
       "resolved": "https://registry.npmjs.org/vue-inbrowser-compiler-independent-utils/-/vue-inbrowser-compiler-independent-utils-4.71.1.tgz",
@@ -9007,14 +9466,14 @@
       }
     },
     "node_modules/vue-tsc": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.0.5.tgz",
-      "integrity": "sha512-PsTFN9lo1HJCrZw9NoqjYcAbYDXY0cOKyuW2E7naX5jcaVyWpqEsZOHN9Dws5890E8e5SDAD4L4Zam3dxG3/Cw==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.2.6.tgz",
+      "integrity": "sha512-gYW/kWI0XrwGzd0PKc7tVB/qpdeAkIZLNZb10/InizkQjHjnT8weZ/vBarZoj4kHKbUTZT/bAVgoOr8x4NsQ/Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/typescript": "2.4.22",
-        "@vue/language-core": "3.0.5"
+        "@volar/typescript": "2.4.28",
+        "@vue/language-core": "3.2.6"
       },
       "bin": {
         "vue-tsc": "bin/vue-tsc.js"
@@ -9023,10 +9482,69 @@
         "typescript": ">=5.0.0"
       }
     },
+    "node_modules/vue-tsc/node_modules/@volar/language-core": {
+      "version": "2.4.28",
+      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.28.tgz",
+      "integrity": "sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@volar/source-map": "2.4.28"
+      }
+    },
+    "node_modules/vue-tsc/node_modules/@volar/source-map": {
+      "version": "2.4.28",
+      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.28.tgz",
+      "integrity": "sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/vue-tsc/node_modules/@volar/typescript": {
+      "version": "2.4.28",
+      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.28.tgz",
+      "integrity": "sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@volar/language-core": "2.4.28",
+        "path-browserify": "^1.0.1",
+        "vscode-uri": "^3.0.8"
+      }
+    },
+    "node_modules/vue-tsc/node_modules/@vue/language-core": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.2.6.tgz",
+      "integrity": "sha512-xYYYX3/aVup576tP/23sEUpgiEnujrENaoNRbaozC1/MA9I6EGFQRJb4xrt/MmUCAGlxTKL2RmT8JLTPqagCkg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@volar/language-core": "2.4.28",
+        "@vue/compiler-dom": "^3.5.0",
+        "@vue/shared": "^3.5.0",
+        "alien-signals": "^3.0.0",
+        "muggle-string": "^0.4.1",
+        "path-browserify": "^1.0.1",
+        "picomatch": "^4.0.2"
+      }
+    },
+    "node_modules/vue-tsc/node_modules/@vue/shared": {
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
+      "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/vue-tsc/node_modules/alien-signals": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-3.1.2.tgz",
+      "integrity": "sha512-d9dYqZTS90WLiU0I5c6DHj/HcKkF8ZyGN3G5x8wSbslulz70KOxaqCT0hQCo9KOyhVqzqGojvNdJXoTumZOtcw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/vue/node_modules/@vue/shared": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
-      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
+      "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
       "license": "MIT"
     },
     "node_modules/vue3-click-away": {
@@ -9085,6 +9603,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
       "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
+      "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9201,15 +9720,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==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -9257,10 +9767,22 @@
         "node": ">=8"
       }
     },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/ws": {
-      "version": "8.18.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
+      "version": "8.21.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz",
+      "integrity": "sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9280,32 +9802,17 @@
       }
     },
     "node_modules/wsl-utils": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.1.0.tgz",
-      "integrity": "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-wsl": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/wsl-utils/node_modules/is-wsl": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
-      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.3.1.tgz",
+      "integrity": "sha512-g/eziiSUNBSsdDJtCLB8bdYEUMj4jR7AGeUo96p/3dTafgjHhpF4RiCFPiRILwjQoDXx5MqkBr4fwWtR3Ky4Wg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-inside-container": "^1.0.0"
+        "is-wsl": "^3.1.0",
+        "powershell-utils": "^0.1.0"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -9338,112 +9845,84 @@
         "node": ">=10"
       }
     },
-    "node_modules/yallist": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
-      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+    "node_modules/yaml": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
+      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
       "dev": true,
-      "license": "BlueOak-1.0.0",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">= 14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/eemeli"
       }
     },
     "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": "18.0.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz",
+      "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cliui": "^8.0.1",
+        "cliui": "^9.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
+        "string-width": "^7.2.0",
         "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
+        "yargs-parser": "^22.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^20.19.0 || ^22.12.0 || >=23"
       }
     },
     "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "version": "22.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz",
+      "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs/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": "^20.19.0 || ^22.12.0 || >=23"
       }
     },
     "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
+      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/yargs/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/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"
+        "node": ">=18"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/zod": {
-      "version": "3.25.71",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.71.tgz",
-      "integrity": "sha512-BsBc/NPk7h8WsUWYWYL+BajcJPY8YhjelaWu2NMLuzgraKAz4Lb4/6K11g9jpuDetjMiqhZ6YaexFLOC0Ogi3Q==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
+      "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
-    },
-    "node_modules/zod-validation-error": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.5.2.tgz",
-      "integrity": "sha512-mdi7YOLtram5dzJ5aDtm1AG9+mxRma1iaMrZdYIpFO7epdKBUwLHIxTF8CPDeCQ828zAXYtizrKlEJAtzgfgrw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "zod": "^3.25.0"
-      }
     }
   }
 }
diff --git a/package.json b/package.json
index 8f55d855c1f..ceb6142c955 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "@davidenke/marked-text-renderer": "^3.0.0",
     "@floating-ui/dom": "^1.6.0",
-    "@he-tree/vue": "^2.10.0-beta.2",
+    "@he-tree/vue": "^2.10.5",
     "@hoppscotch/vue-toasted": "^0.1.0",
     "@inertiajs/vue3": "^2.1.11",
     "@internationalized/date": "^3.7.0",
@@ -58,18 +58,18 @@
     "@tiptap/vue-3": "^3.0.0",
     "alpinejs": "^3.1.1",
     "autosize": "~6.0.1",
-    "axios": "^1.13.5",
+    "axios": "^1.18.1",
     "clsx": "^2.1.1",
     "codemirror": "5.65.12",
     "cookies-js": "^1.2.2",
     "cropperjs": "^1.6.2",
     "cva": "^1.0.0-beta.3",
-    "dompurify": "^3.3.1",
+    "dompurify": "^3.4.11",
     "floating-vue": "^5.2.2",
     "fuzzysort": "^3.1.0",
     "highlight.js": "^11.7.0",
     "laravel-echo": "^1.16.0",
-    "lodash-es": "^4.17.21",
+    "lodash-es": "^4.18.1",
     "lowlight": "^3.1.0",
     "marked": "^15.0.0",
     "motion-v": "^1.0.0-beta.0",
@@ -81,7 +81,7 @@
     "portal-vue": "^3.0.0",
     "pretty": "^2.0.0",
     "pusher-js": "^8.4.0-rc2",
-    "qs": "^6.14.2",
+    "qs": "^6.15.2",
     "read-time-estimate": "0.0.3",
     "reka-ui": "^2.9.2",
     "resize-observer-polyfill": "^1.5.1",
@@ -110,13 +110,12 @@
     "@vue/test-utils": "^2.4.6",
     "jsdom": "^26.0.0",
     "knip": "^5.43.6",
-    "laravel-vite-plugin": "^2.0.0",
-    "rollup-plugin-visualizer": "^5.14.0",
-    "storybook": "^10.2.10",
+    "laravel-vite-plugin": "^3.0.0",
+    "rollup-plugin-visualizer": "^7.0.0",
+    "storybook": "^10.4.6",
     "tailwindcss": "^4.1.8",
     "typescript": "^5.9.2",
-    "vite": "^7.0.4",
-    "vite-tsconfig-paths": "^5.1.4",
+    "vite": "^8.0.16",
     "vitest": "^4.0.12",
     "vitest-browser-vue": "^2.0.1",
     "vue-component-debug": "^0.1.0",
diff --git a/packages/cms/src/api.js b/packages/cms/src/api.js
index d0168535b77..40e8654a1ed 100644
--- a/packages/cms/src/api.js
+++ b/packages/cms/src/api.js
@@ -14,6 +14,7 @@ export const {
     hooks,
     inertia,
     keys,
+    numberFormatter,
     permissions,
     portals,
     preferences,
diff --git a/packages/cms/src/index.js b/packages/cms/src/index.js
index 843018baed9..8b30e9f288b 100644
--- a/packages/cms/src/index.js
+++ b/packages/cms/src/index.js
@@ -8,6 +8,7 @@ export const {
     IndexFieldtypeMixin,
     InlineEditForm,
     DateFormatter,
+    NumberFormatter,
     ItemActions,
     RelatedItem,
     RestoreRevision,
@@ -18,6 +19,7 @@ export const {
     requireElevatedSession,
     requireElevatedSessionIf,
     clone,
+    debounce,
     deepClone,
     resetValuesFromResponse,
 } = __STATAMIC__.core;
diff --git a/packages/cms/src/ui.js b/packages/cms/src/ui.js
index 4063a97f6d2..3f5150061c9 100644
--- a/packages/cms/src/ui.js
+++ b/packages/cms/src/ui.js
@@ -17,6 +17,9 @@ export const {
     Combobox,
     CommandPaletteItem,
     ConfirmationModal,
+    ContentDirection,
+    useContentDirection,
+    useUiDirection,
     Context,
     ContextFooter,
     ContextHeader,
@@ -114,8 +117,11 @@ export const {
     TabProvider,
     Tabs,
     TabTrigger,
+    Text,
     Textarea,
     TimePicker,
+    TimezoneHoverCard,
+    Timezones,
     ToggleGroup,
     ToggleItem,
     Widget,
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
new file mode 100644
index 00000000000..f15f7c292ef
--- /dev/null
+++ b/phpstan.dist.neon
@@ -0,0 +1,63 @@
+includes:
+  - vendor/larastan/larastan/extension.neon
+  - .phpstan/baseline.neon
+
+parameters:
+  level: 0
+  paths:
+    - src
+
+  # Symbol-only stubs for optional runtime integrations that this package
+  # never requires as real dependencies (see .phpstan/stubs/debugbar.php).
+  scanFiles:
+    - .phpstan/stubs/debugbar.php
+
+  ignoreErrors:
+    -
+      identifier: class.notFound
+      message: '#^(Class|Instantiated class) Spatie\\LaravelIgnition\\Exceptions\\(ViewException|ViewExceptionWithSolution) not found\.$#'
+      path: src/View/Antlers/Language/Runtime/RuntimeParser.php
+
+    # composer/composer is an optional runtime integration (composer update hooks), not a real dependency.
+    -
+      identifier: class.notFound
+      message: '#^Parameter \$event of method Statamic\\Console\\Composer\\Scripts::preUpdateCmd\(\) has invalid type Composer\\Script\\Event\.$#'
+      path: src/Console/Composer/Scripts.php
+
+    # barryvdh/laravel-debugbar is an optional runtime integration, guarded by class_exists()/isEnabled() checks.
+    -
+      identifier: class.notFound
+      message: '#^Caught class DebugBar\\DebugBarException not found\.$#'
+      path: src/Forms/Tags.php
+    -
+      identifier: function.notFound
+      message: '#^Function debug not found\.$#'
+      path: src/Modifiers/CoreModifiers.php
+
+    # spatie/laravel-ignition is an optional runtime integration; ddd() is one of its helpers.
+    -
+      identifier: function.notFound
+      message: '#^Function ddd not found\.$#'
+      path: src/Modifiers/CoreModifiers.php
+
+    # self::this() inside the Carbon::macro() closure resolves to Carbon\Traits\Mixin::this(),
+    # a protected static method Carbon rebinds into scope for macros registered via Mixin -
+    # see vendor/nesbot/carbon/src/Carbon/Traits/Mixin.php. PHPStan can't follow the
+    # static-closure scope rebinding, so it thinks this() is being called on this class.
+    -
+      identifier: staticMethod.notFound
+      message: '#^Call to an undefined static method Statamic\\Providers\\AppServiceProvider::this\(\)\.$#'
+      path: src/Providers/AppServiceProvider.php
+
+    # keyByWithKey() is a public Collection macro kept for third-party/addon backward
+    # compatibility even though Statamic's own code no longer calls it, so its use of
+    # Collection's protected valueRetriever()/$items internals is left as-is rather than
+    # rewritten to public equivalents.
+    -
+      identifier: method.protected
+      message: '#^Call to protected method valueRetriever\(\) of class Illuminate\\Support\\Collection(<.*>)?\.$#'
+      path: src/Providers/CollectionsServiceProvider.php
+    -
+      identifier: property.protected
+      message: '#^Access to protected property Illuminate\\Support\\Collection::\$items\.$#'
+      path: src/Providers/CollectionsServiceProvider.php
diff --git a/phpunit.xml.dist b/phpunit.dist.xml
similarity index 100%
rename from phpunit.xml.dist
rename to phpunit.dist.xml
diff --git a/resources/css/components/fieldtypes/grid.css b/resources/css/components/fieldtypes/grid.css
index 107723272eb..c1c5a1ea33d 100644
--- a/resources/css/components/fieldtypes/grid.css
+++ b/resources/css/components/fieldtypes/grid.css
@@ -7,12 +7,8 @@
         border-spacing: 0;
         table-layout: auto;
 
-        [data-ui-field-text] {
-            @apply sr-only;
-        }
-
         thead th {
-            @apply sticky -top-2 table-cell z-(--z-index-draggable) border-b bg-gray-50 p-2 text-sm font-medium text-gray-900 dark:border-gray-700 dark:bg-gray-925 dark:text-gray-100;
+            @apply sticky -top-2 table-cell z-(--z-index-above) border-b bg-gray-50 p-2 text-sm font-medium text-gray-900 dark:border-gray-700 dark:bg-gray-925 dark:text-gray-100;
             /* Prevent the sticky toolbar from hitting the very end of container, which causes it to overlap the container's border-radius */
             margin-block-end: 8px;
             /* Pull the subsequent element up to compensate for this */
@@ -55,7 +51,7 @@
                 @apply outline-hidden;
 
                 > td {
-                    @apply border-b px-2 py-3 align-top dark:border-gray-900;
+                    @apply border-b px-1 @2xl:px-2 py-3 align-top dark:border-gray-900;
         
                     &:first-child.grid-cell {
                         @apply ltr:pl-3 rtl:pr-3;
@@ -88,6 +84,15 @@
             .grid-cell :is([data-ui-field-header], [data-ui-label], [data-ui-description]) {
                 @apply hidden;
             }
+
+            .grid-cell :is(.replicator-fieldtype, .bard-fieldtype, .group-fieldtype) :is([data-ui-field-header], [data-ui-label], [data-ui-description]) {
+                @apply block;
+            }
+
+            /* ...unless that container fieldtype has its own nested Grid cell, whose direct labels should stay hidden per the rule above. */
+            .grid-cell :is(.replicator-fieldtype, .bard-fieldtype, .group-fieldtype) .grid-cell :is([data-ui-field-header], [data-ui-label], [data-ui-description]) {
+                @apply hidden;
+            }
         }
 
         tbody .grid-row-controls {
diff --git a/resources/css/components/index-fields.css b/resources/css/components/index-fields.css
index aca149f5493..4a00b2d1cae 100644
--- a/resources/css/components/index-fields.css
+++ b/resources/css/components/index-fields.css
@@ -33,7 +33,7 @@
     }
 
     &.status-scheduled {
-        @apply bg-amber-200 text-amber-900 dark:bg-amber-300 dark:text-amber-950;
+        @apply bg-amber-200 text-amber-900 dark:bg-amber-300/6 dark:text-amber-300;
     }
 }
 
diff --git a/resources/css/components/page-tree.css b/resources/css/components/page-tree.css
index 6d1f34c5970..1014a31e6f7 100644
--- a/resources/css/components/page-tree.css
+++ b/resources/css/components/page-tree.css
@@ -38,7 +38,12 @@
     .tree-node:has(.is-section) + .tree-node .page-tree-branch,
     /* 3rd level down */
     .tree-node:has(.page-tree-branch--has-children):has(.is-open) + .tree-node .page-tree-branch {
-        border-top-left-radius: 0;
+        border-start-start-radius: 0;
+    }
+
+    /* A section node followed by another section node should always have a rounded border. E.g. Tools + Settings */
+    .tree-node:has(.is-section) + .tree-node:has(.is-section) .page-tree-branch {
+        @apply rounded-xl;
     }
 }
 
diff --git a/resources/css/components/preview.css b/resources/css/components/preview.css
index 857fc52ab44..892df911cfc 100644
--- a/resources/css/components/preview.css
+++ b/resources/css/components/preview.css
@@ -40,7 +40,7 @@
 }
 
 .live-preview .publish-tabs {
-    @apply ltr:pl-4 @-4xl/live-preview:ltr:pl-6 rtl:pr-4 @-4xl/live-preview:rtl:pr-6;
+    @apply ltr:pl-4 @4xl/live-preview:ltr:pl-6 rtl:pr-4 @4xl/live-preview:rtl:pr-6;
 }
 
 .live-preview .publish-sections-section {
diff --git a/resources/css/components/publish.css b/resources/css/components/publish.css
index 9dcd0227e5a..c19246d8edc 100644
--- a/resources/css/components/publish.css
+++ b/resources/css/components/publish.css
@@ -1,6 +1,5 @@
 /* GROUP PUBLISH COMPONENT
 =================================================== */
-
 .publish-fields,
 .field-grid {
     display: grid;
@@ -144,3 +143,49 @@ Here flexbox is much better suited to create a layout that grows to fill space.
     top: 0;
     z-index: var(--z-index-portal);
 }
+
+/* GROUP COLLAPSIBLE PUBLISH SECTIONS
+=================================================== */
+.publish-section-collapsible {
+    --timing: ease;
+    /* No animation on load; enable once the user has toggled this section. */
+    --speed: 0ms;
+
+    /* Only setting the animation speed when the section is interacted with. Prevents the animation triggering on page load. */
+    &.publish-section-collapsible--interacted {
+        --speed: 250ms;
+    }
+
+    @media (prefers-reduced-motion: reduce) {
+        --speed: 0ms;
+    }
+}
+
+.publish-section-collapsible--expanded {
+    /* We can animate collapse/expand using grid rows */
+    animation: expand-rows var(--speed) var(--timing) forwards;
+
+    .publish-section-collapsible__inner {
+        animation: calc(var(--speed) * 2) var(--timing) section-fade-in both;
+        overflow: clip;
+        /* We need to increase the clip margin here vs regular collapsible sections because we have things appearing outside the section such as the logic indicator icon. */
+        overflow-clip-margin: 2.5rem;
+    }
+}
+
+.publish-section-collapsible--collapsed {
+    animation: collapse-rows var(--speed) var(--timing) forwards;
+
+    .publish-section-collapsible__inner {
+        animation:
+            clip-overflow 0ms var(--speed) forwards,
+            make-invisible 0ms var(--speed) forwards;
+        overflow: clip;
+    }
+}
+
+@keyframes section-fade-in { from { opacity: 0%; } to { opacity: 100%; } }
+@keyframes make-invisible { from { visibility: visible; } to { visibility: hidden; } }
+@keyframes collapse-rows  { from { grid-template-rows: 1fr; } to { grid-template-rows: 0fr; } }
+@keyframes expand-rows    { from { grid-template-rows: 0fr; } to { grid-template-rows: 1fr; } }
+@keyframes clip-overflow  { to { overflow: clip; } }
\ No newline at end of file
diff --git a/resources/css/core/layout.css b/resources/css/core/layout.css
index 8299d321b77..f258de42bc9 100644
--- a/resources/css/core/layout.css
+++ b/resources/css/core/layout.css
@@ -2,8 +2,8 @@
 =================================================== */
 .nav-main {
     @apply flex flex-col gap-6 py-6 px-2 sm:px-3 text-sm antialiased select-none;
-    /* Same as the main element, accounting for the header with a class of h-14, which is the same as 3.5rem */
-    @apply h-[calc(100vh-3.5rem)];
+    /* Similar to the main element, accounting for the header with a class of h-14, which is the same as 3.5rem */
+    @apply h-[calc(100dvh-3.5rem)];
     @apply overflow-y-auto fixed top-14 start-0 w-48;
     @apply [&_svg]:text-gray-500 dark:[&_svg]:text-gray-500/85;
     /* Wait for the full page to load before allowing this transition otherwise you see the Sidebar animate in/out on load in Firefox (and sometimes Safari) */
@@ -28,11 +28,11 @@
     }
 
     ul li ul {
-        @apply ml-3.5 pl-3.5 translate-x-px my-1.5 text-[0.8125rem] min-w-0 flex-col gap-1.5 border-s border-gray-300 dark:border-gray-700;
+        @apply ml-3.5 translate-x-px my-1.5 text-[0.8125rem] min-w-0 flex-col gap-1.5 border-s border-gray-300 dark:border-gray-700;
     }
 
     ul li ul li a {
-        @apply py-0 hover:bg-transparent;
+        @apply py-0 ps-5 hover:bg-transparent;
     }
 
     ul li ul li a.active {
@@ -79,12 +79,11 @@
             &::before {
                 content: '';
                 position: absolute;
-                width: anchor-size(height);
                 height: calc(anchor-size(height) + 0.5px);
                 @apply border-s border-s-black;
                 translate: -100% 0;
                 position-anchor: --active;
-                left: calc(anchor(left) + 0.25rem - 0.5px);
+                left: anchor(left);
                 top: anchor(top);
                 transition-property: top, left;
                 transition-duration: 0.2s;
@@ -115,8 +114,9 @@
 /* Mobile nav behavior */
 @media (width < theme(--breakpoint-lg)) {
     .nav-main {
-        /* Always visible but off-screen by default */
+        /* Always visible but off-screen until opened (do not rely on JS adding .nav-closed before first paint). */
         @apply flex;
+        @apply -start-50;
         @apply bg-white dark:bg-gray-800 border-r border-gray-200 dark:border-gray-700;
     }
 
diff --git a/resources/css/core/utilities.css b/resources/css/core/utilities.css
index d996abff0a6..011853708ca 100644
--- a/resources/css/core/utilities.css
+++ b/resources/css/core/utilities.css
@@ -2,8 +2,8 @@
 =================================================== */
 /* Here we extend Tailwind's classes to add additional functionality where we're sure it won't break anything. */
 
-/* If the next sibling is hidden (by a Vue conditional), remove the bottom border. For example, /cp/asset-containers/assets/edit, the Image Manipulation toggle. */
-.divide-y > *:has(+[style*="display: none"]:last-child) {
+/* If all the next siblings are hidden (by a Vue conditional), remove the bottom border. For example, /cp/seo-pro/site-defaults/edit#json-ld */
+.divide-y > *:not(:has(~ :not([style*="display: none"]))) {
     border-block-end: none;
 }
 
@@ -31,7 +31,7 @@
 }
 
 @utility st-custom-scrollbar {
-    --sb-size: 3px;
+    --sb-size: 4px;
     --sb-thumb-color: var(--color-gray-400);
     &:where(.dark, .dark *) {
         --sb-thumb-color: var(--color-gray-500);
@@ -42,6 +42,7 @@
 
     &::-webkit-scrollbar {
         width: var(--sb-size);
+        height: 2px;
     }
 
     &::-webkit-scrollbar-track {
@@ -54,6 +55,27 @@
     }
 }
 
+/* =Jay. Mask the horizontal overflow of an element, e.g. in a long Bard Set header that overflows its container. Override the default mask by changing the --mask-stop variable. */
+@utility st-mask-horizontal-overflow {
+    --mask-stop: 1rem;
+    --mask: linear-gradient(to left, transparent 0%, black var(--mask-stop));
+    mask-image: var(--mask);
+    mask-repeat: no-repeat;
+    animation: mask-overflow-horizontal linear both;
+    animation-timeline: scroll(self inline);
+    animation-range: calc(100% - var(--mask-stop)) 100%;
+}
+
+@keyframes mask-overflow-horizontal {
+    from {
+        mask-image: var(--mask);
+    }
+
+    to {
+        mask-image: unset;
+    }
+}
+
 /* UTILITIES / TEXT
 =================================================== */
 /* Avoid prefixing things with `st-text-` (st for Statamic) because `text-` is a Tailwind prefix */
diff --git a/resources/css/vendors/codemirror.css b/resources/css/vendors/codemirror.css
index 3f742a9fbcd..7c1d0799aec 100644
--- a/resources/css/vendors/codemirror.css
+++ b/resources/css/vendors/codemirror.css
@@ -3,6 +3,7 @@
 .CodeMirror {
     /* Set height, width, borders, and global font properties here */
     @apply text-gray-900 dark:text-gray-300 leading-normal min-h-20;
+    direction: ltr;
 }
 
 /* CODEMIRROR / PADDING
diff --git a/resources/js/api.js b/resources/js/api.js
index 403e49d154a..8e2ad4c0c9d 100644
--- a/resources/js/api.js
+++ b/resources/js/api.js
@@ -14,6 +14,7 @@ import Reveal from './components/Reveal.js';
 import Echo from './components/Echo.js';
 import Permission from './components/Permission.js';
 import DateFormatter from './components/DateFormatter.js';
+import NumberFormatter from './components/NumberFormatter.js';
 import CommandPalette from './components/CommandPalette.js';
 import ColorMode from './components/ColorMode.js';
 import Contrast from './components/Contrast.js';
@@ -39,6 +40,7 @@ export const reveal = new Reveal();
 export const echo = new Echo();
 export const permissions = new Permission();
 export const dateFormatter = new DateFormatter();
+export const numberFormatter = new NumberFormatter();
 export const commandPalette = new CommandPalette();
 export const colorMode = new ColorMode();
 export const contrast = new Contrast();
diff --git a/resources/js/bootstrap/App.vue b/resources/js/bootstrap/App.vue
index 8adb7a5c773..8f8a37ab9ea 100644
--- a/resources/js/bootstrap/App.vue
+++ b/resources/js/bootstrap/App.vue
@@ -57,6 +57,10 @@ export default {
         Statamic.$callbacks.add('removeFromSelections', function (ids) {
             Statamic.$events.$emit('removeFromSelections', ids);
         });
+
+        Statamic.$callbacks.add('replaceInSelections', function (replacements) {
+            Statamic.$events.$emit('replaceInSelections', replacements);
+        });
     },
 
     methods: {
diff --git a/resources/js/bootstrap/cms/core.js b/resources/js/bootstrap/cms/core.js
index ffe704b444e..05070c7d6c8 100644
--- a/resources/js/bootstrap/cms/core.js
+++ b/resources/js/bootstrap/cms/core.js
@@ -3,6 +3,7 @@ export { default as IndexFieldtype } from '../../components/fieldtypes/index-fie
 export { default as FieldtypeMixin } from '../../components/fieldtypes/Fieldtype.vue';
 export { default as IndexFieldtypeMixin } from '../../components/fieldtypes/IndexFieldtype.vue';
 export { default as DateFormatter } from '../../components/DateFormatter.js';
+export { default as NumberFormatter } from '../../components/NumberFormatter.js';
 export { default as ItemActions } from '../../components/actions/ItemActions.vue';
 export { default as InlineEditForm } from '../../components/inputs/relationship/InlineEditForm.vue';
 export { default as RelatedItem } from '../../components/inputs/relationship/Item.vue';
@@ -17,3 +18,4 @@ export { default as HasActionsMixin } from '../../components/publish/HasActions.
 export { default as resetValuesFromResponse } from '../../util/resetValuesFromResponse.js';
 export { requireElevatedSession, requireElevatedSessionIf } from '../../components/elevated-sessions';
 export { default as clone, deepClone } from '../../util/clone.js';
+export { default as debounce } from '../../util/debounce.js';
diff --git a/resources/js/bootstrap/cms/ui.js b/resources/js/bootstrap/cms/ui.js
index 28803da78b0..68653dd3746 100644
--- a/resources/js/bootstrap/cms/ui.js
+++ b/resources/js/bootstrap/cms/ui.js
@@ -17,6 +17,7 @@ export {
     Combobox,
     CommandPaletteItem,
     ConfirmationModal,
+    ContentDirection,
     Context,
     ContextFooter,
     ContextHeader,
@@ -114,11 +115,16 @@ export {
     TabProvider,
     Tabs,
     TabTrigger,
+    Text,
     Textarea,
     TimePicker,
+    TimezoneHoverCard,
+    Timezones,
     ToggleGroup,
     ToggleItem,
     Widget,
     registerIconSet,
     registerIconSetFromStrings,
+    useContentDirection,
+    useUiDirection,
 } from '../../components/ui/index';
diff --git a/resources/js/bootstrap/fieldtypes.js b/resources/js/bootstrap/fieldtypes.js
index dea6d98c382..5cb99a0c35e 100644
--- a/resources/js/bootstrap/fieldtypes.js
+++ b/resources/js/bootstrap/fieldtypes.js
@@ -13,10 +13,12 @@ import BardButtonsSettingFieldtype from '../components/fieldtypes/bard/BardButto
 import BlueprintsFieldtype from '../components/fieldtypes/BlueprintsFieldtype.vue';
 import ButtonGroupFieldtype from '../components/fieldtypes/ButtonGroupFieldtype.vue';
 import CheckboxesFieldtype from '../components/fieldtypes/CheckboxesFieldtype.vue';
+import ControlAppearanceFieldtype from '../components/fieldtypes/control-appearance/ControlAppearanceFieldtype.vue';
 import Routes from '../components/collections/Routes.vue';
 import TitleFormats from '../components/collections/TitleFormats.vue';
 import ColorFieldtype from '../components/fieldtypes/ColorFieldtype.vue';
 import DateFieldtype from '../components/fieldtypes/DateFieldtype.vue';
+import FormattingLocalesFieldtype from '../components/fieldtypes/FormattingLocalesFieldtype.vue';
 import DateIndexFieldtype from '../components/fieldtypes/DateIndexFieldtype.vue';
 import DictionaryFieldtype from '../components/fieldtypes/DictionaryFieldtype.vue';
 import DictionaryIndexFieldtype from '../components/fieldtypes/DictionaryIndexFieldtype.vue';
@@ -34,6 +36,7 @@ import HtmlFieldtype from '../components/fieldtypes/HtmlFieldtype.vue';
 import IconFieldtype from '../components/fieldtypes/IconFieldtype.vue';
 import IntegerFieldtype from '../components/fieldtypes/IntegerFieldtype.vue';
 import LinkFieldtype from '../components/fieldtypes/LinkFieldtype.vue';
+import LinkIndexFieldtype from '../components/fieldtypes/LinkIndexFieldtype.vue';
 import ListFieldtype from '../components/fieldtypes/ListFieldtype.vue';
 import ListIndexFieldtype from '../components/fieldtypes/ListIndexFieldtype.vue';
 import MarkdownButtonsSettingFieldtype from '../components/fieldtypes/markdown/MarkdownButtonsSettingFieldtype.vue';
@@ -80,6 +83,7 @@ export default function registerFieldtypes(app) {
     app.component('button_group-fieldtype', ButtonGroupFieldtype);
     app.component('blueprints-fieldtype', BlueprintsFieldtype);
     app.component('checkboxes-fieldtype', CheckboxesFieldtype);
+    app.component('control_appearance-fieldtype', ControlAppearanceFieldtype);
     app.component(
         'code-fieldtype',
         defineAsyncComponent(() => import('../components/fieldtypes/CodeFieldtype.vue')),
@@ -88,6 +92,7 @@ export default function registerFieldtypes(app) {
     app.component('collection_title_formats-fieldtype', TitleFormats);
     app.component('color-fieldtype', ColorFieldtype);
     app.component('date-fieldtype', DateFieldtype);
+    app.component('formatting_locales-fieldtype', FormattingLocalesFieldtype);
     app.component('date-fieldtype-index', DateIndexFieldtype);
     app.component('dictionary-fieldtype', DictionaryFieldtype);
     app.component('dictionary-fieldtype-index', DictionaryIndexFieldtype);
@@ -105,6 +110,7 @@ export default function registerFieldtypes(app) {
     app.component('icon-fieldtype', IconFieldtype);
     app.component('integer-fieldtype', IntegerFieldtype);
     app.component('link-fieldtype', LinkFieldtype);
+    app.component('link-fieldtype-index', LinkIndexFieldtype);
     app.component('list-fieldtype', ListFieldtype);
     app.component('list-fieldtype-index', ListIndexFieldtype);
     app.component(
diff --git a/resources/js/bootstrap/hmr.js b/resources/js/bootstrap/hmr.js
index ac561a238b4..c77f4a43072 100644
--- a/resources/js/bootstrap/hmr.js
+++ b/resources/js/bootstrap/hmr.js
@@ -9,7 +9,7 @@ function log() {
     if (logged) return;
     console.warn(
         "Vue HMR is not enabled in this Control Panel build.\n",
-        'See https://v6.statamic.dev/addons/vite-tooling for more information.'
+        'See https://statamic.dev/addons/vite-tooling for more information.'
     );
     logged = true;
 }
diff --git a/resources/js/bootstrap/statamic.js b/resources/js/bootstrap/statamic.js
index 65aec1b9b25..3a5eda975b2 100644
--- a/resources/js/bootstrap/statamic.js
+++ b/resources/js/bootstrap/statamic.js
@@ -19,6 +19,7 @@ import VueComponentDebug from 'vue-component-debug';
 import { registerIconSetFromStrings } from '@ui';
 import Layout from '@/pages/layout/Layout.vue';
 import { setTranslations, setLocale } from '@/translations/translator.js';
+import { setDefaultLocale as setFormattingLocale } from '@/components/FormattingLocale.js';
 import {
     keys,
     components,
@@ -35,6 +36,7 @@ import {
     echo,
     permissions,
     dateFormatter,
+    numberFormatter,
     commandPalette,
     colorMode,
     contrast,
@@ -123,6 +125,10 @@ export default {
         return dateFormatter;
     },
 
+    get $number() {
+        return numberFormatter;
+    },
+
     get $progress() {
         return progress;
     },
@@ -176,6 +182,13 @@ export default {
         contrast.initialize(this.initialConfig.user?.preferences?.strict_accessibility);
         preferences.initialize(this.initialConfig.user?.preferences, this.initialConfig.defaultPreferences);
 
+        const formattingLocale = this.initialConfig.user?.preferences?.formatting_locale;
+        if (formattingLocale === 'language') {
+            setFormattingLocale(this.initialConfig.translationLocale);
+        } else if (formattingLocale) {
+            setFormattingLocale(formattingLocale);
+        }
+
         bootingCallbacks.forEach((callback) => callback(this));
         bootingCallbacks = [];
 
@@ -185,9 +198,11 @@ export default {
         const bladeContent = el?.innerHTML || '';
         const _this = this;
 
+        const corePages = import.meta.glob('../pages/**/*.vue');
+
         await createInertiaApp({
             id: 'statamic',
-            resolve: name => {
+            resolve: async name => {
                 if (name === 'NonInertiaPage') {
                     return {
                         default: {
@@ -198,8 +213,8 @@ export default {
                 }
 
                 // Resolve core pages
-                const pages = import.meta.glob('../pages/**/*.vue', { eager: true });
-                let page = pages[`../pages/${name}.vue`];
+                const pageImport = corePages[`../pages/${name}.vue`];
+                let page = pageImport ? await pageImport() : null;
 
                 // Resolve addon pages
                 if (!page) {
@@ -274,6 +289,7 @@ export default {
             $echo: echo,
             $permissions: permissions,
             $date: dateFormatter,
+            $number: numberFormatter,
             $commandPalette: commandPalette,
             $colorMode: colorMode,
             $contrast: contrast,
diff --git a/resources/js/components/DateFormatter.js b/resources/js/components/DateFormatter.js
index 28dc8d91073..5cccccccb97 100644
--- a/resources/js/components/DateFormatter.js
+++ b/resources/js/components/DateFormatter.js
@@ -1,3 +1,5 @@
+import { getLocale, getDefaultLocale, setDefaultLocale } from './FormattingLocale.js';
+
 export default class DateFormatter {
     #date;
     #options;
@@ -102,8 +104,31 @@ export default class DateFormatter {
         return this.date(date).options(options).toString();
     }
 
+    static get defaultLocale() {
+        return getDefaultLocale();
+    }
+
+    static set defaultLocale(locale) {
+        setDefaultLocale(locale);
+    }
+
+    withLocale(locale, callback) {
+        const previousLocale = getDefaultLocale();
+        setDefaultLocale(locale);
+
+        try {
+            return callback(this);
+        } finally {
+            setDefaultLocale(previousLocale);
+        }
+    }
+
+    setDefaultLocale(locale) {
+        setDefaultLocale(locale);
+    }
+
     get locale() {
-        return DateFormatter.defaultLocale ?? Intl.DateTimeFormat().resolvedOptions().locale;
+        return getLocale();
     }
 
     #normalizeDate(date) {
@@ -123,6 +148,14 @@ export default class DateFormatter {
             return this.#presets[options];
         }
 
+        if (options.preset) {
+            const { preset, ...overrides } = options;
+
+            if (!this.#presets[preset]) throw new Error(`Invalid date format: ${preset}`);
+
+            return { ...this.#presets[preset], ...overrides };
+        }
+
         return options;
     }
 }
diff --git a/resources/js/components/FormattingLocale.js b/resources/js/components/FormattingLocale.js
new file mode 100644
index 00000000000..3a04401f958
--- /dev/null
+++ b/resources/js/components/FormattingLocale.js
@@ -0,0 +1,17 @@
+let defaultLocale = null;
+
+export function normalizeLocale(locale) {
+    return typeof locale === 'string' ? locale.replace('_', '-') : locale;
+}
+
+export function getLocale() {
+    return defaultLocale ?? Intl.DateTimeFormat().resolvedOptions().locale;
+}
+
+export function getDefaultLocale() {
+    return defaultLocale;
+}
+
+export function setDefaultLocale(locale) {
+    defaultLocale = normalizeLocale(locale);
+}
diff --git a/resources/js/components/NumberFormatter.js b/resources/js/components/NumberFormatter.js
new file mode 100644
index 00000000000..af166851c6d
--- /dev/null
+++ b/resources/js/components/NumberFormatter.js
@@ -0,0 +1,115 @@
+import { getLocale, getDefaultLocale, setDefaultLocale } from './FormattingLocale.js';
+
+export default class NumberFormatter {
+    #number;
+    #rangeEnd;
+    #options;
+    #presets = {
+        decimal: {
+            style: 'decimal',
+        },
+        percent: {
+            style: 'percent',
+        },
+    };
+
+    constructor(number, options) {
+        if (Array.isArray(number)) {
+            this.#number = this.#normalizeNumber(number[0]);
+            this.#rangeEnd = this.#normalizeNumber(number[1]);
+        } else {
+            this.#number = this.#normalizeNumber(number);
+        }
+
+        this.#options = this.#normalizeOptions(options);
+    }
+
+    number(value) {
+        return new NumberFormatter(value, this.#options);
+    }
+
+    options(options) {
+        const value = this.#rangeEnd !== undefined ? [this.#number, this.#rangeEnd] : this.#number;
+
+        return new NumberFormatter(value, options);
+    }
+
+    toString() {
+        try {
+            const formatter = Intl.NumberFormat(this.locale, this.#options);
+
+            if (this.#rangeEnd !== undefined && this.#rangeEnd !== this.#number) {
+                return formatter.formatRange(this.#number, this.#rangeEnd);
+            }
+
+            return formatter.format(this.#number);
+        } catch (e) {
+            return 'Invalid Number';
+        }
+    }
+
+    static format(number, options) {
+        return new NumberFormatter(number, options).toString();
+    }
+
+    format(number, options) {
+        return this.number(number).options(options).toString();
+    }
+
+    formatRange(start, end, options) {
+        return this.number([start, end]).options(options ?? this.#options).toString();
+    }
+
+    static formatRange(start, end, options) {
+        return new NumberFormatter([start, end], options).toString();
+    }
+
+    static get defaultLocale() {
+        return getDefaultLocale();
+    }
+
+    static set defaultLocale(locale) {
+        setDefaultLocale(locale);
+    }
+
+    withLocale(locale, callback) {
+        const previousLocale = getDefaultLocale();
+        setDefaultLocale(locale);
+
+        try {
+            return callback(this);
+        } finally {
+            setDefaultLocale(previousLocale);
+        }
+    }
+
+    setDefaultLocale(locale) {
+        setDefaultLocale(locale);
+    }
+
+    get locale() {
+        return getLocale();
+    }
+
+    #normalizeNumber(number) {
+        if (number === null || number === undefined) return 0;
+
+        const n = Number(number);
+
+        if (Number.isNaN(n)) throw new Error('Invalid Number');
+
+        return n;
+    }
+
+    #normalizeOptions(options) {
+        if (!options) options = 'decimal';
+
+        if (typeof options === 'string') {
+            if (!this.#presets[options]) throw new Error(`Invalid number format: ${options}`);
+
+            return this.#presets[options];
+        }
+
+        return options;
+    }
+}
diff --git a/resources/js/components/SessionExpiry.vue b/resources/js/components/SessionExpiry.vue
index ac7666fd125..553487a50dd 100644
--- a/resources/js/components/SessionExpiry.vue
+++ b/resources/js/components/SessionExpiry.vue
@@ -1,17 +1,33 @@
 <template>
     <div class="session-expiry">
         <Modal
-            v-if="isWarning && !isShowingLogin && !isShowingTwoFactorChallenge"
-            :open="isWarning && !isShowingLogin && !isShowingTwoFactorChallenge"
+            v-if="isShowingWarningModal"
+            :open="isShowingWarningModal"
             :title="__('Your Session is Expiring')"
             class="max-w-[500px]!"
             :dismissible="false"
         >
             <ui-description v-text="warningText" />
-            <Button @click="extend" variant="primary" icon="rewind" :text="__('Extend Session')" class="w-full" />
+
+            <template #footer>
+                <div class="flex items-center justify-end space-x-3 pt-3 pb-1">
+                    <Button @click="dismissWarning" variant="ghost" :text="__('Cancel')" />
+                    <Button @click="extend" variant="primary" icon="rewind" :text="__('Extend Session')" />
+                </div>
+            </template>
         </Modal>
 
-        <Modal :title="__('Resume Your Session')" :open="isShowingLogin" height="auto" class="max-w-[500px]!" :dismissable="false">
+        <button
+            v-if="banner"
+            type="button"
+            @click="banner.resume"
+            class="fixed top-0 inset-x-0 z-(--z-index-portal) flex items-center justify-center gap-2 bg-red-600 px-4 py-2 text-sm font-medium text-white shadow-md hover:bg-red-700"
+        >
+            <ui-icon name="alert-alarm-bell" class="size-4" />
+            <span v-text="banner.text" />
+        </button>
+
+        <Modal :title="__('Resume Your Session')" :open="isShowingLoginModal" height="auto" class="max-w-[500px]!" :dismissible="false">
             <div v-if="isUsingOauth" class="space-y-3">
                 <ui-description v-text="__('messages.session_expiry_new_window')" />
                 <ui-button variant="primary" class="w-full" :href="oauthProvider.loginUrl" target="_blank" :text="__('Log in with :provider', { provider: oauthProvider.label })" />
@@ -34,9 +50,15 @@
                     </div>
                 </ui-field>
             </div>
+
+            <template #footer>
+                <div class="flex items-center justify-end pt-3 pb-1">
+                    <Button @click="dismissLogin" variant="ghost" :text="__('Cancel')" />
+                </div>
+            </template>
         </Modal>
 
-        <Modal :title="__('Resume Your Session')" :open="isShowingTwoFactorChallenge" height="auto" class="max-w-[500px]!" :dismissable="false">
+        <Modal :title="__('Resume Your Session')" :open="isShowingTwoFactorChallenge" height="auto" class="max-w-[500px]!" :dismissible="false">
             <div>
                 <div v-if="twoFactorMode === 'code'" class="space-y-3">
                     <ui-description v-text="__('messages.session_expiry_enter_two_factor_code')" />
@@ -138,6 +160,8 @@ export default {
             pinging: false,
             lastCount: new Date(),
             isPageHidden: false,
+            dismissedWarning: false,
+            dismissedLogin: false,
         };
     },
 
@@ -146,6 +170,34 @@ export default {
             return this.count <= this.warnAt;
         },
 
+        isShowingWarningModal() {
+            return this.isWarning && !this.isShowingLogin && !this.isShowingTwoFactorChallenge && !this.dismissedWarning;
+        },
+
+        isShowingLoginModal() {
+            return this.isShowingLogin && !this.dismissedLogin;
+        },
+
+        // A single banner is shown whenever one of the modals has been explicitly
+        // dismissed. Clicking it resumes the flow by reopening that modal.
+        banner() {
+            if (this.isShowingLogin && this.dismissedLogin) {
+                return {
+                    text: __('messages.session_expiry_dismissed_login_banner'),
+                    resume: this.resumeLogin,
+                };
+            }
+
+            if (this.isWarning && !this.isShowingLogin && !this.isShowingTwoFactorChallenge && this.dismissedWarning) {
+                return {
+                    text: __('messages.session_expiry_dismissed_banner'),
+                    resume: this.resumeWarning,
+                };
+            }
+
+            return null;
+        },
+
         warningText() {
             return this.remaining === 0
                 ? __('messages.session_expiry_logged_out_for_inactivity')
@@ -187,6 +239,19 @@ export default {
 
         isShowingLogin(showing, wasShowing) {
             if (showing && !wasShowing) this.updateCsrfToken();
+
+            // Whenever we stop needing to log back in - whether they did so through the
+            // reopened modal, or the session was extended elsewhere before they got
+            // around to it - reset the dismissed state so that a subsequent expiry
+            // shows the modal normally rather than staying stuck on the banner.
+            if (!showing) this.dismissedLogin = false;
+        },
+
+        // When we leave the warning period (e.g. the session was extended in another
+        // tab, or a fresh countdown began), reset the dismissed state so the modal
+        // will show normally the next time the warning period is entered.
+        isWarning(isWarning) {
+            if (!isWarning) this.dismissedWarning = false;
         },
     },
 
@@ -296,10 +361,32 @@ export default {
             });
         },
 
+        dismissWarning() {
+            this.dismissedWarning = true;
+        },
+
+        resumeWarning() {
+            this.dismissedWarning = false;
+        },
+
+        dismissLogin() {
+            this.dismissedLogin = true;
+        },
+
+        resumeLogin() {
+            this.dismissedLogin = false;
+        },
+
         loginComplete() {
             this.$toast.success(__('Logged in'));
             this.restartCountdown();
             this.updateCsrfToken();
+            this.restoreSelectedSite();
+        },
+
+        restoreSelectedSite() {
+            const site = Statamic.$config.get('selectedSite');
+            if (site) this.$axios.get(cp_url(`select-site/${site}`));
         },
     },
 };
diff --git a/resources/js/components/SiteSelector.vue b/resources/js/components/SiteSelector.vue
index fc78763f689..8b7090cfb4e 100644
--- a/resources/js/components/SiteSelector.vue
+++ b/resources/js/components/SiteSelector.vue
@@ -15,6 +15,8 @@ defineEmits(['update:modelValue']);
         :options="sites"
         option-label="name"
         option-value="handle"
+        align="end"
+        :adaptive-width="true"
         :model-value="modelValue"
         @update:model-value="$emit('update:modelValue', $event)"
     />
diff --git a/resources/js/components/assets/Browser/Browser.vue b/resources/js/components/assets/Browser/Browser.vue
index deb04499e31..775094b79c3 100644
--- a/resources/js/components/assets/Browser/Browser.vue
+++ b/resources/js/components/assets/Browser/Browser.vue
@@ -1,10 +1,10 @@
 <template>
     <div ref="browser" class="h-full" @keydown.shift="shiftDown" @keyup="clearShift">
         <Uploader
-            ref="uploader"
+            ref="internalUploader"
             :container="container.id"
             :path="path"
-            :enabled="!preventDragging && canUpload"
+            :enabled="!uploader && !preventDragging && canUpload"
             @updated="uploadsUpdated"
             @upload-complete="uploadCompleted"
             @error="uploadError"
@@ -272,6 +272,10 @@ export default {
             type: Array,
             default: () => [],
         },
+        uploader: {
+            type: Object,
+            default: null,
+        },
     },
 
     setup() {
@@ -416,6 +420,7 @@ export default {
                 folder: this.folder,
                 folderActionUrl: this.folderActionUrl,
                 folders: this.folders,
+                maxFiles: this.maxFiles,
                 restrictFolderNavigation: this.restrictFolderNavigation,
                 path: this.path,
                 creatingFolder: this.creatingFolder,
@@ -475,8 +480,9 @@ export default {
             this.loadAssets();
         },
 
-        path() {
+        path(path) {
             this.loadAssets();
+            this.$emit('path-changed', path);
         },
 
         searchQuery() {
@@ -675,7 +681,7 @@ export default {
         },
 
         openFileBrowser() {
-            this.$refs.uploader.browse();
+            (this.uploader || this.$refs.internalUploader).browse();
         },
 
         selectFolder(path) {
diff --git a/resources/js/components/assets/Browser/Grid.vue b/resources/js/components/assets/Browser/Grid.vue
index 5a965fe22ee..f832956c56a 100644
--- a/resources/js/components/assets/Browser/Grid.vue
+++ b/resources/js/components/assets/Browser/Grid.vue
@@ -117,7 +117,7 @@
                                     @click.stop="selectionClicked(index, $event)"
                                     @dblclick.stop="$emit('edit-asset', asset)"
                                 >
-                                    <div class="relative flex aspect-square size-full items-center justify-center">
+                                    <div class="relative flex aspect-square size-full items-center justify-center" :class="{ 'cursor-pointer': maxFiles === 1 }">
                                         <div class="asset-thumb">
                                             <img
                                                 v-if="asset.thumbnail"
@@ -228,6 +228,7 @@ export default {
         assets: { type: Array },
         selectedAssets: { type: Array },
         thumbnailSize: { type: Number },
+        maxFiles: { type: Number },
         showCheckerboard: { type: Boolean, default: false },
         checkerboardMode: { type: String, default: 'transparent' },
     },
diff --git a/resources/js/components/assets/Editor/CropEditor.vue b/resources/js/components/assets/Editor/CropEditor.vue
index 93898f30f14..56473bda559 100644
--- a/resources/js/components/assets/Editor/CropEditor.vue
+++ b/resources/js/components/assets/Editor/CropEditor.vue
@@ -2,7 +2,7 @@
 import Cropper from 'cropperjs';
 import 'cropperjs/dist/cropper.css';
 import { computed, onBeforeUnmount, ref, useTemplateRef, watch } from 'vue';
-import { Button, Heading, Icon, Modal, Select, Stack } from '@ui';
+import { Button, Heading, Icon, Modal, Radio, RadioGroup, Select, Slider, Stack, Field, Subheading } from '@ui';
 import { keys, toast } from '@api';
 import wait from '@/util/wait';
 import axios from 'axios';
@@ -36,16 +36,65 @@ const animationFrameId = ref(null);
 const imageRef = useTemplateRef('image');
 const showConfirmation = ref(false);
 const uploading = ref(false);
-const pendingBlob = ref(null);
-const pendingMimeType = ref(null);
+const pendingCrop = ref(null);
+const cropDimensions = ref(null);
+const defaultQuality = Statamic.$config.get('cropQuality') || 90;
 
-const aspectRatios = ref([
-    { label: '16:9', value: 16 / 9 },
-    { label: '4:3', value: 4 / 3 },
-    { label: '3:2', value: 3 / 2 },
-    { label: '2:1', value: 2 / 1 },
-    { label: '1:1', value: 1 },
-]);
+function normalizeFormat(format) {
+    format = (format || '').toLowerCase();
+    return format === 'jpeg' ? 'jpg' : format;
+}
+
+// The source image's format, normalized (e.g. jpeg -> jpg).
+const sourceFormat = computed(() => normalizeFormat(props.asset.extension));
+
+// We only offer quality/conversion controls for these source types.
+const isConvertible = computed(() => ['jpg', 'png', 'webp', 'avif'].includes(sourceFormat.value));
+
+// PNG is lossless so its quality starts maxed out; lowering it implies the
+// user wants to convert to a lossy format.
+const initialQuality = () => (sourceFormat.value === 'png' ? 100 : defaultQuality);
+
+const format = ref(sourceFormat.value);
+const quality = ref(initialQuality());
+const background = ref('white');
+
+const aspectRatios = ref(Statamic.$config.get('cropAspectRatios') || []);
+
+const formatLabels = { jpg: 'JPEG', png: 'PNG', webp: 'WebP', avif: 'AVIF' };
+
+const formatOptions = computed(() => {
+    // Lossy conversion targets, plus the source format so it can be kept as-is.
+    return [...new Set([sourceFormat.value, 'jpg', 'webp'])].map((value) => ({
+        value,
+        label: formatLabels[value] ?? value.toUpperCase(),
+    }));
+});
+
+// A quality setting only applies to lossy output formats.
+const outputUsesQuality = computed(() => ['jpg', 'webp', 'avif'].includes(format.value));
+
+const showQuality = computed(() => isConvertible.value);
+
+const showFormatSelector = computed(() => isConvertible.value);
+
+// JPEG has no alpha channel, so a potentially-transparent source needs a background colour.
+const showBackground = computed(() => format.value === 'jpg' && ['png', 'webp', 'avif'].includes(sourceFormat.value));
+
+// Changing the format writes a different extension, which can't overwrite the original.
+const canReplaceOutput = computed(() => props.canReplace && format.value === sourceFormat.value);
+
+watch(format, (value) => {
+    if (value === 'png') quality.value = 100;
+});
+
+watch(quality, (value) => {
+    // Lowering a PNG's quality implies the user wants compression, so switch to
+    // WebP — it's lossy but, unlike JPEG, keeps the transparency.
+    if (sourceFormat.value === 'png' && format.value === 'png' && value < 100) {
+        format.value = 'webp';
+    }
+});
 
 watch(() => props.open, (newValue) => {
     if (newValue) {
@@ -71,8 +120,11 @@ function resetState() {
     initialCropBoxCenter.value = null;
     showConfirmation.value = false;
     uploading.value = false;
-    pendingBlob.value = null;
-    pendingMimeType.value = null;
+    pendingCrop.value = null;
+    cropDimensions.value = null;
+    quality.value = initialQuality();
+    format.value = sourceFormat.value;
+    background.value = 'white';
 }
 
 function destroyCropper() {
@@ -124,9 +176,17 @@ function createCropper(imageElement) {
         cropstart: onCropStart,
         cropmove: onCropMove,
         cropend: onCropEnd,
+        crop: onCrop,
     });
 }
 
+function onCrop(event) {
+    cropDimensions.value = {
+        width: Math.round(event.detail.width),
+        height: Math.round(event.detail.height),
+    };
+}
+
 function onCropStart() {
     const cropBoxData = cropper.value.getCropBoxData();
     initialCropBoxCenter.value = {
@@ -273,41 +333,23 @@ function expandCropBoxToFill() {
 }
 
 function crop() {
-    const cropBoxData = cropper.value.getCropBoxData();
-    const imageData = cropper.value.getImageData();
-
-    const scaleX = imageData.naturalWidth / imageData.width;
-    const scaleY = imageData.naturalHeight / imageData.height;
-
-    const canvas = cropper.value.getCroppedCanvas({
-        width: cropBoxData.width * scaleX,
-        height: cropBoxData.height * scaleY,
-    });
+    // Crop box coordinates relative to the original image's natural dimensions.
+    // The actual cropping happens server-side from the original file.
+    const data = cropper.value.getData(true);
 
-    if (!canvas) {
+    if (!data || data.width < 1 || data.height < 1) {
         toast.error(__('Failed to crop image'));
         return;
     }
 
-    const outputMimeType = props.asset.mimeType;
-    const quality = outputMimeType === 'image/jpeg' || outputMimeType === 'image/webp' ? 0.95 : undefined;
-
-    canvas.toBlob((blob) => {
-        if (!blob) {
-            toast.error(__('Failed to create cropped image'));
-            return;
-        }
+    pendingCrop.value = {
+        x: Math.max(0, data.x),
+        y: Math.max(0, data.y),
+        width: data.width,
+        height: data.height,
+    };
 
-        const extensionMap = {
-            'image/jpeg': 'jpg',
-            'image/png': 'png',
-            'image/webp': 'webp',
-        };
-        const extension = extensionMap[outputMimeType] || 'png';
-        pendingBlob.value = new File([blob], `cropped-image.${extension}`, { type: outputMimeType });
-        pendingMimeType.value = outputMimeType;
-        showConfirmation.value = true;
-    }, outputMimeType, quality);
+    showConfirmation.value = true;
 }
 
 function reset() {
@@ -372,43 +414,22 @@ function unbindKeyboardShortcuts() {
 }
 
 async function upload(replaceOriginal) {
-    if (!pendingBlob.value) return;
+    if (!pendingCrop.value) return;
 
     uploading.value = true;
 
     try {
-        const [containerHandle, assetPath] = props.asset.id.split('::');
-        const pathParts = assetPath.split('/');
-        let filename = pathParts.pop();
-        const folder = pathParts.length > 0 ? pathParts.join('/') : '/';
-
-        if (!replaceOriginal && pendingMimeType.value && pendingMimeType.value !== props.asset.mimeType) {
-            const extensionMap = { 'image/jpeg': '.jpg', 'image/png': '.png', 'image/webp': '.webp' };
-            const newExtension = extensionMap[pendingMimeType.value];
-            if (newExtension) {
-                filename = filename.replace(/\.[^/.]+$/, '') + newExtension;
-            }
-        }
-
-        const formData = new FormData();
-        const fileToUpload = filename !== pendingBlob.value.name
-            ? new File([pendingBlob.value], filename, { type: pendingBlob.value.type })
-            : pendingBlob.value;
-        formData.append('file', fileToUpload);
-        formData.append('container', containerHandle);
-        formData.append('folder', folder);
-        formData.append('_token', Statamic.$config.get('csrfToken'));
-        formData.append('option', replaceOriginal ? 'overwrite' : 'timestamp');
-
-        const url = cp_url('assets');
-        const response = await axios.post(url, formData, {
-            headers: { 'Content-Type': 'multipart/form-data' },
+        const response = await axios.post(props.asset.cropUrl, {
+            ...pendingCrop.value,
+            format: format.value,
+            quality: outputUsesQuality.value ? quality.value : null,
+            background: showBackground.value ? background.value : null,
+            replace: replaceOriginal,
         });
 
         if (response.data?.data) {
             showConfirmation.value = false;
-            pendingBlob.value = null;
-            pendingMimeType.value = null;
+            pendingCrop.value = null;
             close();
             await wait(300); // wait for this cropper stack to close.
 
@@ -429,8 +450,7 @@ async function upload(replaceOriginal) {
 
 function dismissConfirmation() {
     showConfirmation.value = false;
-    pendingBlob.value = null;
-    pendingMimeType.value = null;
+    pendingCrop.value = null;
 }
 
 function close() {
@@ -452,11 +472,18 @@ function close() {
                 <div class="h-full w-full min-h-0 flex items-center justify-center overflow-hidden">
                     <img ref="image" :src="asset.preview" :crossorigin="crossOrigin" :alt="__('Image to crop')" class="max-w-full max-h-full" @error="onImageError" />
                 </div>
+                <div
+                    v-if="cropDimensions"
+                    class="absolute top-5 end-5 z-10 rounded-md bg-gray-900/75 px-2 py-1 text-xs font-medium text-white tabular-nums pointer-events-none"
+                    :aria-label="__('Dimensions')"
+                    v-text="__('messages.width_x_height', { width: cropDimensions.width, height: cropDimensions.height })"
+                />
+
             </div>
 
             <!-- Footer -->
-            <div class="flex flex-wrap items-center justify-between gap-3 border-t dark:border-gray-700 px-4 py-3">
-                <div class="flex gap-3">
+            <div class="flex flex-wrap items-center gap-3 border-t dark:border-gray-700 px-4 py-3">
+                <div v-if="aspectRatios.length" class="flex gap-3">
                     <Select
                         clearable
                         v-model="selectedRatio"
@@ -467,6 +494,7 @@ function close() {
                         size="sm"
                         class="w-48"
                         :aria-label="__('Select aspect ratio')"
+                        adaptive-width
                         @update:modelValue="setAspectRatio"
                     />
                     <Button
@@ -480,7 +508,7 @@ function close() {
                         @click="toggleOrientation"
                     />
                 </div>
-                <div class="flex gap-3">
+                <div class="flex gap-3 ms-auto">
                     <Button variant="ghost" :text="__('Cancel')" :aria-label="__('Cancel cropping')" @click="close" />
                     <Button variant="ghost" :text="__('Reset')" :aria-label="__('Reset crop selection')" @click="reset" />
                     <Button variant="primary" :text="__('Finish')" :aria-label="__('Finish cropping')" :disabled="!cropper" @click="crop" />
@@ -499,7 +527,52 @@ function close() {
                     <Icon name="loading" />
                 </div>
 
-                <p>{{ canReplace ? __('messages.crop_save_copy_or_replace') : __('messages.crop_save_as_copy_confirm') }}</p>
+                <p>{{ canReplaceOutput ? __('messages.crop_save_copy_or_replace') : __('messages.crop_save_as_copy_confirm') }}</p>
+
+                <div v-if="showQuality" class="mt-6 space-y-4">
+                    <div class="flex justify-between gap-4">
+                        <Field
+                            id="crop-quality"
+                            :label="__('Quality')"
+                            class="w-1/2 space-y-2"
+                        >
+                            <div class="flex items-center gap-2 bg-gray-50 dark:bg-gray-800 rounded-lg p-2 @lg:px-4 @lg:py-3 with-contrast:border with-contrast:border-gray-500">
+                                <Slider id="crop-quality" v-model="quality" :min="1" :max="100" :aria-label="__('Quality')" />
+                                <Subheading :text="`${quality}%`" class="w-14 justify-center" />
+                            </div>
+                        </Field>
+
+                        <Field
+                            v-if="showFormatSelector"
+                            class="w-1/2 space-y-2"
+                            id="crop-format"
+                            :label="__('Format')"
+                        >
+                            <Select
+                                id="crop-format"
+                                v-model="format"
+                                :options="formatOptions"
+                                option-label="label"
+                                option-value="value"
+                                size="sm"
+                                :aria-label="__('Output format')"
+                            />
+                        </Field>
+                    </div>
+
+                    <div v-if="showBackground">
+                        <Field
+                            id="crop-background"
+                            :label="__('Background')"
+                            :instructions="__('messages.crop_jpeg_background_help')"
+                        >
+                            <RadioGroup v-model="background" appearance="inline" :aria-label="__('Background colour')">
+                                <Radio value="white" :label="__('White')" />
+                                <Radio value="black" :label="__('Black')" />
+                            </RadioGroup>
+                        </Field>
+                    </div>
+                </div>
 
                 <template #footer>
                     <div class="flex items-center justify-end space-x-3 pt-3 pb-1">
@@ -510,7 +583,6 @@ function close() {
                             @click="dismissConfirmation"
                         />
                         <Button
-                            :variant="canReplace ? 'default' : 'primary'"
                             :disabled="uploading"
                             :text="__('Save as Copy')"
                             @click="upload(false)"
@@ -518,8 +590,9 @@ function close() {
                         <Button
                             v-if="canReplace"
                             variant="primary"
-                            :disabled="uploading"
+                            :disabled="uploading || !canReplaceOutput"
                             :text="__('Replace Original')"
+                            v-tooltip="canReplace && !canReplaceOutput ? __('messages.crop_replace_unavailable_format') : null"
                             @click="upload(true)"
                         />
                     </div>
diff --git a/resources/js/components/assets/Editor/Editor.vue b/resources/js/components/assets/Editor/Editor.vue
index 57a3ec71038..f34e47598f6 100644
--- a/resources/js/components/assets/Editor/Editor.vue
+++ b/resources/js/components/assets/Editor/Editor.vue
@@ -104,7 +104,7 @@
                             </div>
 
                             <!-- Video -->
-                            <video :src="asset.url" class="max-w-full max-h-full object-contain" controls v-else-if="asset.isVideo" />
+                            <video :src="asset.url" :width="asset.width" :height="asset.height" class="max-w-full max-h-full object-contain" controls v-else-if="asset.isVideo" />
 
                             <!-- Other thumbnail -->
                             <img v-else-if="asset.preview" :src="asset.preview" class="asset-thumb shadow-ui-xl max-w-full max-h-full object-contain" />
@@ -157,8 +157,8 @@
                         </ui-badge>
                     </div>
                     <div class="flex items-center space-x-3 rtl:space-x-reverse">
-                        <ui-button icon="chevron-left" @click="navigateToPreviousAsset" v-tooltip="__('Previous Asset')" />
-                        <ui-button icon="chevron-right" @click="navigateToNextAsset" v-tooltip="__('Next Asset')" />
+                        <ui-button v-if="showNavigation" icon="chevron-left" @click="navigateToPreviousAsset" v-tooltip="__('Previous Asset')" />
+                        <ui-button v-if="showNavigation" icon="chevron-right" @click="navigateToNextAsset" v-tooltip="__('Next Asset')" />
                         <ui-button variant="primary" icon="save" @click="saveAndClose" v-if="!readOnly" :text="__('Save')" />
                     </div>
                 </div>
@@ -239,6 +239,10 @@ export default {
             type: Boolean,
             default: true,
         },
+        showNavigation: {
+            type: Boolean,
+            default: true,
+        },
         allowDeleting: {
             type: Boolean,
             default() {
@@ -459,6 +463,7 @@ export default {
                     this.saving = false;
                     this.clearErrors();
                     this.$nextTick(() => this.$refs.container.clearDirtyState());
+                    Statamic.$events.$emit('asset.saved', this.asset);
                 })
                 .catch((e) => {
                     this.saving = false;
diff --git a/resources/js/components/assets/Editor/PdfViewer.vue b/resources/js/components/assets/Editor/PdfViewer.vue
index 51a643457ce..c5049cbc9a0 100644
--- a/resources/js/components/assets/Editor/PdfViewer.vue
+++ b/resources/js/components/assets/Editor/PdfViewer.vue
@@ -17,7 +17,10 @@ const hasError = ref(false);
 let currentRenderId = 0;
 let loadingTask = null;
 let pdfDocument = null;
-let pageElements = [];
+let pageStates = [];
+let observer = null;
+
+const scale = Math.min(2, window.devicePixelRatio || 2);
 
 onMounted(() => renderPdf());
 
@@ -46,14 +49,16 @@ async function renderPdf() {
         if (renderId !== currentRenderId) return;
 
         pdfDocument = pdf;
-        const { linkService, AnnotationLayerBuilder } = await initViewer(pdf);
+        const viewerContext = await initViewer(pdf);
 
+        // Create page placeholders with sized canvases for scrollable layout
         for (let pageNumber = 1; pageNumber <= pdf.numPages; pageNumber++) {
             const page = await pdf.getPage(pageNumber);
 
             if (renderId !== currentRenderId) return;
 
-            const viewport = page.getViewport({ scale: 2 });
+            const viewport = page.getViewport({ scale });
+
             const pageContainer = document.createElement('div');
             pageContainer.className = 'pdf-page';
             pageContainer.dataset.pageNumber = String(pageNumber);
@@ -65,29 +70,50 @@ async function renderPdf() {
             pageContainer.appendChild(canvas);
 
             pages.value?.appendChild(pageContainer);
-            pageElements.push(pageContainer);
-
-            const canvasContext = canvas.getContext('2d');
-            if (!canvasContext) continue;
 
-            await page.render({
-                canvasContext,
+            pageStates.push({
+                pageNumber,
+                page,
                 viewport,
-            }).promise;
-
-            const annotationLayerBuilder = new AnnotationLayerBuilder({
-                pdfPage: page,
-                linkService,
-                renderForms: true,
-                onAppend: (div) => pageContainer.appendChild(div),
+                canvas,
+                container: pageContainer,
+                rendered: false,
+                rendering: false,
+                renderTask: null,
             });
+        }
 
-            await annotationLayerBuilder.render({ viewport });
+        // Observe pages for viewport proximity and render on demand
+        observer = new IntersectionObserver(
+            (entries) => {
+                for (const entry of entries) {
+                    if (!entry.isIntersecting) continue;
+
+                    const pageNumber = parseInt(entry.target.dataset.pageNumber, 10);
+                    const state = pageStates[pageNumber - 1];
+
+                    if (state && !state.rendered && !state.rendering) {
+                        renderPage(state, renderId, viewerContext);
+                    }
+                }
+            },
+            {
+                root: pages.value,
+                rootMargin: '200px 0px',
+            },
+        );
+
+        for (const state of pageStates) {
+            observer.observe(state.container);
+        }
 
-            if (pageNumber === 1 && renderId === currentRenderId) {
-                isLoading.value = false;
-            }
+        if (pageStates.length > 0) {
+            await renderPage(pageStates[0], renderId, viewerContext);
         }
+
+        if (renderId !== currentRenderId) return;
+
+        isLoading.value = false;
     } catch (error) {
         if (renderId === currentRenderId) {
             hasError.value = true;
@@ -95,12 +121,54 @@ async function renderPdf() {
         }
     } finally {
         if (renderId === currentRenderId) {
-            isLoading.value = false;
             isRendering.value = false;
         }
     }
 }
 
+async function renderPage(state, renderId, viewerContext) {
+    if (renderId !== currentRenderId) return;
+
+    state.rendering = true;
+
+    try {
+        const { canvas, page, viewport, container } = state;
+        const { linkService, AnnotationLayerBuilder } = viewerContext;
+
+        const canvasContext = canvas.getContext('2d');
+        if (!canvasContext) return;
+
+        const task = page.render({ canvasContext, viewport });
+        state.renderTask = task;
+        await task.promise;
+
+        if (renderId !== currentRenderId) return;
+
+        await new AnnotationLayerBuilder({
+            pdfPage: page,
+            linkService,
+            renderForms: true,
+            onAppend: (div) => container.appendChild(div),
+        }).render({ viewport });
+
+        state.rendered = true;
+    } catch (error) {
+        if (renderId !== currentRenderId) return;
+        if (error?.name === 'RenderingCancelledException') return;
+
+        const errorDiv = document.createElement('div');
+        errorDiv.className = 'pdf-page-error';
+        errorDiv.textContent = __('Something went wrong');
+        state.container.appendChild(errorDiv);
+
+        console.warn(`Failed to render PDF page ${state.pageNumber}`, error);
+    } finally {
+        state.page.cleanup();
+        state.rendering = false;
+        state.renderTask = null;
+    }
+}
+
 async function loadDocument() {
     const [pdfjsLib, { default: pdfjsWorkerUrl }] = await Promise.all([
         import('pdfjs-dist/build/pdf.mjs'),
@@ -130,10 +198,10 @@ async function initViewer(pdf) {
         isInPresentationMode: false,
         pageLabelToPageNumber: () => null,
         scrollPageIntoView: ({ pageNumber }) => {
-            const pageElement = pageElements[pageNumber - 1];
+            const state = pageStates[pageNumber - 1];
 
-            if (pageElement) {
-                pageElement.scrollIntoView({
+            if (state?.container) {
+                state.container.scrollIntoView({
                     behavior: 'smooth',
                     block: 'start',
                 });
@@ -152,21 +220,23 @@ function cleanup({ invalidateRender = true } = {}) {
 
     isRendering.value = false;
 
-    if (loadingTask) {
-        loadingTask.destroy();
-        loadingTask = null;
+    for (const state of pageStates) {
+        state.renderTask?.cancel();
+        state.renderTask = null;
     }
 
-    if (pdfDocument) {
-        pdfDocument.destroy();
-        pdfDocument = null;
-    }
+    observer?.disconnect();
+    observer = null;
 
-    pageElements = [];
+    loadingTask?.destroy();
+    loadingTask = null;
 
-    if (pages.value) {
-        pages.value.replaceChildren();
-    }
+    pdfDocument?.destroy();
+    pdfDocument = null;
+
+    pageStates = [];
+
+    pages.value?.replaceChildren();
 }
 </script>
 
@@ -186,6 +256,14 @@ function cleanup({ invalidateRender = true } = {}) {
 .pdf-page .annotationLayer {
     inset: 0;
 }
+
+.pdf-page-error {
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
 </style>
 
 <template>
@@ -195,6 +273,6 @@ function cleanup({ invalidateRender = true } = {}) {
             <div v-if="hasError" class="text-gray-500 flex gap-2" v-text="__('Something went wrong')" />
         </div>
 
-        <div ref="pages" class="pdf-pages h-full min-h-0 overflow-auto"></div>
+        <div ref="pages" class="pdf-pages h-full min-h-0 overflow-auto text-gray-500"></div>
     </div>
 </template>
diff --git a/resources/js/components/assets/Selector.vue b/resources/js/components/assets/Selector.vue
index baef4d97f4c..ef93aeb5b7b 100644
--- a/resources/js/components/assets/Selector.vue
+++ b/resources/js/components/assets/Selector.vue
@@ -1,75 +1,96 @@
 <template>
-    <div class="h-full">
-        <div class="flex h-full min-h-0 flex-col">
-            <div class="flex flex-1 flex-col gap-4 overflow-auto p-4">
-                <AssetBrowser
-                    :container="container"
-                    :initial-per-page="$config.get('paginationSize')"
-                    :initial-columns="columns"
-                    :selected-path="folder"
-                    :selected-assets="browserSelections"
-                    :restrict-folder-navigation="restrictFolderNavigation"
-                    :max-files="maxFiles"
-                    :query-scopes="queryScopes"
-                    :autoselect-uploads="true"
-                    allow-selecting-existing-upload
-                    :allow-bulk-actions="false"
-                    @selections-updated="selectionsUpdated"
-                    @edit-asset="toggleAssetSelection"
-                    @initialized="focusSearchInput"
-                >
-                    <template #initializing>
-                        <div class="flex flex-1">
-                            <div class="absolute inset-0 z-200 flex items-center justify-center text-center">
-                                <Icon name="loading" />
-                            </div>
-                        </div>
-                    </template>
+    <Uploader
+        ref="uploader"
+        :container="container.id"
+        :path="currentPath"
+        :enabled="container.can_upload"
+        @updated="(uploads) => $refs.browser?.uploadsUpdated(uploads)"
+        @upload-complete="(asset) => $refs.browser?.uploadCompleted(asset)"
+        @error="(upload, uploads) => $refs.browser?.uploadError(upload, uploads)"
+        v-slot="{ dragging }"
+    >
+        <div class="relative h-full">
+            <div class="drag-notification" v-show="dragging">
+                <Icon name="upload-cloud-large" class="m-4 size-13" />
+                <span>{{ __('Drop File to Upload') }}</span>
+            </div>
 
-                    <template #header="{ canUpload, openFileBrowser, canCreateFolders, startCreatingFolder, mode, modeChanged }">
-                        <div class="flex items-center gap-2 sm:gap-3 mb-4">
-                            <div class="flex flex-1 items-center gap-2 sm:gap-3">
-                                <Search ref="search" />
+            <div class="flex h-full min-h-0 flex-col">
+                <div class="flex flex-1 flex-col gap-4 overflow-auto p-4">
+                    <AssetBrowser
+                        ref="browser"
+                        :container="container"
+                        :initial-per-page="$config.get('paginationSize')"
+                        :initial-columns="columns"
+                        :selected-path="folder"
+                        :selected-assets="browserSelections"
+                        :restrict-folder-navigation="restrictFolderNavigation"
+                        :max-files="maxFiles"
+                        :query-scopes="queryScopes"
+                        :autoselect-uploads="true"
+                        :uploader="uploaderInstance"
+                        allow-selecting-existing-upload
+                        :allow-bulk-actions="false"
+                        @selections-updated="selectionsUpdated"
+                        @edit-asset="toggleAssetSelection"
+                        @initialized="focusSearchInput"
+                        @path-changed="currentPath = $event"
+                    >
+                        <template #initializing>
+                            <div class="flex flex-1">
+                                <div class="absolute inset-0 z-200 flex items-center justify-center text-center">
+                                    <Icon name="loading" />
+                                </div>
                             </div>
+                        </template>
 
-                            <Button v-if="canUpload" :text="__('Upload')" icon="upload" @click="openFileBrowser" />
-                            <Button v-if="canCreateFolders" :text="__('Create Folder')" icon="folder-add" @click="startCreatingFolder" />
+                        <template #header="{ canUpload, openFileBrowser, canCreateFolders, startCreatingFolder, mode, modeChanged }">
+                            <div class="flex items-center gap-2 sm:gap-3 mb-4">
+                                <div class="flex flex-1 items-center gap-2 sm:gap-3">
+                                    <Search ref="search" />
+                                </div>
 
-                            <ToggleGroup :model-value="mode" @update:model-value="modeChanged">
-                                <ToggleItem icon="layout-grid" value="grid" />
-                                <ToggleItem icon="layout-list" value="table" />
-                            </ToggleGroup>
-                        </div>
-                    </template>
-                </AssetBrowser>
-            </div>
+                                <Button v-if="canUpload" :text="__('Upload')" icon="upload" @click="openFileBrowser" />
+                                <Button v-if="canCreateFolders" :text="__('Create Folder')" icon="folder-add" @click="startCreatingFolder" />
+
+                                <ToggleGroup :model-value="mode" @update:model-value="modeChanged">
+                                    <ToggleItem icon="layout-grid" value="grid" />
+                                    <ToggleItem icon="layout-list" value="table" />
+                                </ToggleGroup>
+                            </div>
+                        </template>
+                    </AssetBrowser>
+                </div>
 
-            <div class="flex items-center justify-between border-t bg-gray-100 dark:bg-gray-850 dark:border-gray-700 px-4 py-2 sm:p-4">
-                <div
-                    class="dark:text-gray-200 text-sm text-gray-700"
-                    v-text="
-                        hasMaxFiles
-                            ? __n(':count/:max selected', browserSelections, { max: maxFiles })
-                            : __n(':count asset selected|:count assets selected', browserSelections)
-                    "
-                />
-
-                <div class="flex items-center space-x-3">
-                    <Button variant="ghost" @click="close">
-                        {{ __('Cancel') }}
-                    </Button>
-
-                    <Button variant="primary" @click="select">
-                        {{ __('Select') }}
-                    </Button>
+                <div class="flex items-center justify-between border-t bg-gray-100 dark:bg-gray-850 dark:border-gray-700 px-4 py-2 sm:p-4">
+                    <div
+                        class="dark:text-gray-200 text-sm text-gray-700"
+                        v-text="
+                            hasMaxFiles
+                                ? __n(':count/:max selected', browserSelections, { max: maxFiles })
+                                : __n(':count asset selected|:count assets selected', browserSelections)
+                        "
+                    />
+
+                    <div class="flex items-center space-x-3">
+                        <Button variant="ghost" @click="close">
+                            {{ __('Cancel') }}
+                        </Button>
+
+                        <Button variant="primary" @click="select">
+                            {{ __('Select') }}
+                        </Button>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
+    </Uploader>
 </template>
 
 <script>
+import { markRaw } from 'vue';
 import AssetBrowser from './Browser/Browser.vue'
+import Uploader from './Uploader.vue'
 import {
     Button,
     ToggleGroup,
@@ -92,6 +113,7 @@ export default {
 
     components: {
         Uploads,
+        Uploader,
         PanelHeader, Grid,
         Slider,
         ListingPagination, Breadcrumbs,
@@ -128,9 +150,15 @@ export default {
             // We only want selection changes to be reflected in the fieldtype once the user is ready to commit
             // them. They should be able to cancel at any time and have their updated selections discarded.
             browserSelections: this.selected,
+            currentPath: this.folder,
+            uploaderInstance: null,
         };
     },
 
+    mounted() {
+        this.uploaderInstance = markRaw(this.$refs.uploader);
+    },
+
     computed: {
         hasMaxFiles() {
             return this.maxFiles === Infinity ? false : Boolean(this.maxFiles);
diff --git a/resources/js/components/assets/Uploader.vue b/resources/js/components/assets/Uploader.vue
index e67e8b2c003..5f40b700649 100644
--- a/resources/js/components/assets/Uploader.vue
+++ b/resources/js/components/assets/Uploader.vue
@@ -14,17 +14,23 @@ export default {
             ref: 'nativeFileField',
         });
 
+        const events = this.enabled
+            ? {
+                  onDragenter: this.dragenter,
+                  onDragover: this.dragover,
+                  onDragleave: this.dragleave,
+                  onDrop: this.drop,
+              }
+            : {};
+
         return h(
             'div',
             {
                 class: 'h-full',
-                onDragenter: this.dragenter,
-                onDragover: this.dragover,
-                onDragleave: this.dragleave,
-                onDrop: this.drop,
+                ...events,
             },
             [
-                h('div', { class: { 'pointer-events-none': this.dragging } }, [
+                h('div', { class: ['h-full', { 'pointer-events-none': this.dragging }] }, [
                     fileField,
                     ...this.$slots.default({ dragging: this.enabled ? this.dragging : false }),
                 ]),
diff --git a/resources/js/components/blueprints/Fields.vue b/resources/js/components/blueprints/Fields.vue
index 8764dfc2870..6d48bf3759a 100644
--- a/resources/js/components/blueprints/Fields.vue
+++ b/resources/js/components/blueprints/Fields.vue
@@ -60,6 +60,7 @@
                 :config="pendingCreatedField.config"
                 :suggestable-condition-fields="suggestableConditionFields"
                 :is-inside-set="isInsideSet"
+                :show-save-only-at-top-level="true"
                 @committed="fieldCreated"
                 @closed="close"
             />
diff --git a/resources/js/components/blueprints/ImportField.vue b/resources/js/components/blueprints/ImportField.vue
index efeba905490..968ba053d92 100644
--- a/resources/js/components/blueprints/ImportField.vue
+++ b/resources/js/components/blueprints/ImportField.vue
@@ -11,6 +11,7 @@
                                 <a class="cursor-pointer overflow-hidden text-ellipsis text-sm text-ui-accent-text hover:text-ui-accent-text/80" :href="fieldsetEditUrl" v-text="fieldsetTitle" v-tooltip="__('Edit Fieldset')" />
                                 <ui-icon name="link" class="text-gray-400" />
                                 <span class="text-gray-500 font-mono text-2xs" v-text="__('Fieldset')" />
+                                <ui-badge v-if="sectionBadgeText" size="sm" color="gray" :text="sectionBadgeText" />
                                 <ui-badge
                                     v-if="field.prefix"
                                     size="sm"
@@ -62,10 +63,34 @@ export default {
             return title ? __(title) : this.field.fieldset;
         },
 
+        fieldsetHasSections() {
+            return this.$page?.props?.fieldsets?.[this.field.fieldset]?.has_sections === true;
+        },
+
+        fieldsetSectionsCount() {
+            return this.$page?.props?.fieldsets?.[this.field.fieldset]?.sections_count ?? 0;
+        },
+
         fieldsetEditUrl() {
             return cp_url(`fields/fieldsets/${this.field.fieldset}/edit`);
         },
 
+        sectionBehavior() {
+            return this.field.section_behavior ?? 'preserve';
+        },
+
+        sectionBadgeText() {
+            if (!this.fieldsetHasSections) {
+                return null;
+            }
+
+            if (this.sectionBehavior === 'flatten') {
+                return __n('Ignoring Section|Ignoring Sections', this.fieldsetSectionsCount);
+            }
+
+            return __n('Has Section|Has Sections', this.fieldsetSectionsCount);
+        },
+
         fieldConfig() {
             const { _id, type, ...config } = this.field;
             return config;
diff --git a/resources/js/components/blueprints/LinkFields.vue b/resources/js/components/blueprints/LinkFields.vue
index 80756ea5e28..5d6e4ff91f4 100644
--- a/resources/js/components/blueprints/LinkFields.vue
+++ b/resources/js/components/blueprints/LinkFields.vue
@@ -24,12 +24,12 @@
                             @update:modelValue="reference = $event"
                         >
                             <template #option="option">
-                                <div class="flex items-center">
+                                <div class="flex items-center text-start w-full">
                                     <span
                                         v-text="option.fieldset"
-                                        class="text-2xs text-gray-500 dark:text-gray-300 ltr:mr-2 rtl:ml-2"
+                                        class="text-2xs line-clamp-2 text-gray-500 dark:text-gray-300 ltr:mr-2 rtl:ml-2 max-w-[50%]"
                                     />
-                                    <span v-text="option.label" />
+                                    <span class="text-xs line-clamp-2" v-text="option.label" />
                                 </div>
                             </template>
                             <template #no-options>
@@ -83,6 +83,18 @@
                         <Input v-model="importPrefix" :placeholder="__('e.g. hero_')" />
                     </Field>
 
+                    <Field
+                        v-if="selectedFieldsetHasSections"
+                        :label="__('Section Behavior')"
+                        :instructions="__('messages.fieldset_import_section_behavior_instructions')"
+                        class="mt-6"
+                    >
+                        <RadioGroup v-model="sectionBehavior">
+                            <Radio :label="__('Preserve')" :description="__('Keep imported sections as-is.')" value="preserve" />
+                            <Radio :label="__('Flatten')" :description="__('Merge all fields into this section.')" value="flatten" />
+                        </RadioGroup>
+                    </Field>
+
                     <Button
                         class="w-full mt-6"
                         variant="primary"
@@ -98,11 +110,11 @@
 
 <script>
 import { nanoid as uniqid } from 'nanoid';
-import { Combobox, Button, Input, Heading, Field, Stack, StackClose } from '@/components/ui';
+import { Combobox, Button, Input, Heading, Field, Stack, StackClose, RadioGroup, Radio } from '@/components/ui';
 import { usePage } from '@inertiajs/vue3';
 
 export default {
-    components: { Heading, Combobox, Button, Input, Field, Stack, StackClose },
+    components: { Heading, Combobox, Button, Input, Field, Stack, StackClose, RadioGroup, Radio },
 
     props: {
         excludeFieldset: String,
@@ -134,6 +146,7 @@ export default {
             reference: null,
             fieldset: null,
             importPrefix: null,
+            sectionBehavior: 'preserve',
             fieldSuggestions,
             fieldsetSuggestions: fieldsets.map((fieldset) => ({
                 value: fieldset.handle,
@@ -143,6 +156,22 @@ export default {
         };
     },
 
+    computed: {
+        selectedFieldsetHasSections() {
+            if (!this.fieldset) return false;
+
+            return this.fieldsets.find((f) => f.handle === this.fieldset)?.has_sections === true;
+        },
+    },
+
+    watch: {
+        fieldset() {
+            if (!this.selectedFieldsetHasSections) {
+                this.sectionBehavior = 'preserve';
+            }
+        },
+    },
+
     mounted() {
         if (this.withCommandPalette) {
             this.addToCommandPalette();
@@ -171,12 +200,18 @@ export default {
         },
 
         linkFieldset() {
-            this.linkAndClose({
+            const field = {
                 _id: uniqid(),
                 type: 'import',
                 fieldset: this.fieldset,
                 prefix: this.importPrefix,
-            });
+            };
+
+            if (this.selectedFieldsetHasSections) {
+                field.section_behavior = this.sectionBehavior;
+            }
+
+            this.linkAndClose(field);
         },
 
         linkAndClose(field) {
@@ -185,6 +220,7 @@ export default {
             this.reference = null;
             this.fieldset = null;
             this.importPrefix = null;
+            this.sectionBehavior = 'preserve';
         },
 
         addToCommandPalette() {
diff --git a/resources/js/components/blueprints/RegularField.vue b/resources/js/components/blueprints/RegularField.vue
index 73d30abdd37..cd0de30e4e2 100644
--- a/resources/js/components/blueprints/RegularField.vue
+++ b/resources/js/components/blueprints/RegularField.vue
@@ -42,6 +42,7 @@
                             :overrides="field.config_overrides || []"
                             :suggestable-condition-fields="suggestableConditionFields"
                             :is-inside-set="isInsideSet"
+                            :show-save-only-at-top-level="true"
                             @committed="settingsUpdated"
                             @closed="editorClosed"
                         />
diff --git a/resources/js/components/blueprints/Section.vue b/resources/js/components/blueprints/Section.vue
index 1e42682265e..59f95fe09a4 100644
--- a/resources/js/components/blueprints/Section.vue
+++ b/resources/js/components/blueprints/Section.vue
@@ -18,6 +18,8 @@
                 :editing-field="editingField"
                 :suggestable-condition-fields="suggestableConditionFields"
                 :can-define-localizable="canDefineLocalizable"
+                :exclude-fieldset="excludeFieldset"
+                :with-command-palette="withCommandPalette"
                 @field-created="fieldCreated"
                 @field-updated="fieldUpdated"
                 @field-deleted="deleteField"
@@ -52,7 +54,18 @@
                             class="font-mono text-sm"
                             v-model="editingSection.handle"
                             @input="handleSyncedWithDisplay = false"
-                        />
+                        >
+                            <template #append>
+                                <ui-button
+                                    icon="sync"
+                                    size="sm"
+                                    variant="ghost"
+                                    :aria-label="__('Regenerate from: :field', { field: __('Display') })"
+                                    @click="regenerateHandle"
+                                    v-tooltip="__('Regenerate from: :field', { field: __('Display') })"
+                                />
+                            </template>
+                        </ui-input>
                     </ui-field>
                     <ui-field :label="__('Instructions')">
                         <ui-input type="text" v-model="editingSection.instructions" />
@@ -146,6 +159,8 @@ export default {
 	    showCollapsibleField: { type: Boolean, default: false },
         showHideField: { type: Boolean, default: false },
         editText: { type: String },
+        excludeFieldset: { type: String, default: null },
+        withCommandPalette: { type: Boolean, default: false },
     },
 
     data() {
@@ -215,15 +230,15 @@ export default {
         },
     },
 
-    created() {
-        // This logic isn't ideal, but it was better than passing along a 'isNew' boolean and having
-        // to deal with stripping it out and making it not new, etc. Good enough for a quick win.
-        if (!this.section.handle || this.section.handle == 'new_section' || this.section.handle == 'new_set') {
-            this.handleSyncedWithDisplay = true;
-        }
-    },
-
     methods: {
+        regenerateHandle() {
+            if (!this.editingSection) {
+                return;
+            }
+
+            this.editingSection.handle = snake_case(this.editingSection.display);
+        },
+
         fieldLinked(field) {
             this.section.fields.push(field);
             this.$toast.success(__('Field added'));
@@ -246,6 +261,7 @@ export default {
         },
 
         edit() {
+            this.handleSyncedWithDisplay = !this.section.handle || ['new_section', 'new_set'].includes(this.section.handle);
             this.editingSection = {
                 display: this.section.display,
                 handle: this.section.handle,
diff --git a/resources/js/components/blueprints/Sections.vue b/resources/js/components/blueprints/Sections.vue
index 4d8baa188e3..c139c803233 100644
--- a/resources/js/components/blueprints/Sections.vue
+++ b/resources/js/components/blueprints/Sections.vue
@@ -11,15 +11,21 @@
                 :show-handle-field="showSectionHandleField"
                 :show-collapsible-field="showSectionCollapsibleField"
                 :show-hide-field="showSectionHideField"
+                :exclude-fieldset="excludeFieldset"
+                :with-command-palette="withCommandPalette"
                 :edit-text="editSectionText"
                 @updated="updateSection(i, $event)"
                 @deleted="deleteSection(i)"
             />
 
-            <button class="w-full flex gap-2 items-center justify-center relative min-h-24 text-gray-500 hover:text-gray-700 dark:hover:text-gray-400 cursor-pointer border border-dashed border-gray-300 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-600 rounded-xl outline-hidden" @click="addAndEditSection">
-                <ui-icon name="plus" class="size-4" />
-                <div v-text="addSectionText" />
-            </button>
+            <div class="blueprint-add-section-container w-full">
+                <button class="blueprint-add-section-button" @click="addAndEditSection">
+                    <div class="flex items-center gap-2">
+                        <ui-icon name="plus" class="size-4" />
+                        <div v-text="addSectionText" />
+                    </div>
+                </button>
+            </div>
         </div>
     </div>
 </template>
@@ -76,6 +82,14 @@ export default {
             type: Boolean,
             default: false,
         },
+        excludeFieldset: {
+            type: String,
+            default: null,
+        },
+        withCommandPalette: {
+            type: Boolean,
+            default: false,
+        },
     },
 
     data() {
diff --git a/resources/js/components/blueprints/Tab.vue b/resources/js/components/blueprints/Tab.vue
index 0224caf3842..d867d7f1ffd 100644
--- a/resources/js/components/blueprints/Tab.vue
+++ b/resources/js/components/blueprints/Tab.vue
@@ -32,7 +32,18 @@
                         <Input ref="title" :model-value="display" @update:model-value="fieldUpdated('display', $event)" />
                     </Field>
                     <Field :label="__('Handle')" class="form-group field-w-100">
-                        <Input class="font-mono" :model-value="handle" @update:model-value="fieldUpdated('handle', $event)" />
+                        <Input class="font-mono" :model-value="handle" @update:model-value="fieldUpdated('handle', $event)">
+                            <template #append>
+                                <Button
+                                    icon="sync"
+                                    size="sm"
+                                    variant="ghost"
+                                    :aria-label="__('Regenerate from: :field', { field: __('Title') })"
+                                    @click="regenerateHandle"
+                                    v-tooltip="__('Regenerate from: :field', { field: __('Title') })"
+                                />
+                            </template>
+                        </Input>
                     </Field>
                     <Field v-if="showInstructions" :label="__('Instructions')" class="form-group field-w-100">
                         <Input :model-value="instructions" @update:model-value="fieldUpdated('instructions', $event)" />
@@ -103,14 +114,6 @@ export default {
         };
     },
 
-    created() {
-        // This logic isn't ideal, but it was better than passing along a 'isNew' boolean and having
-        // to deal with stripping it out and making it not new, etc. Good enough for a quick win.
-        if (!this.handle || this.handle == 'new_tab' || this.handle == 'new_set_group') {
-            this.handleSyncedWithDisplay = true;
-        }
-    },
-
     computed: {
         isActive() {
             return this.currentTab === this.tab._id;
@@ -149,7 +152,16 @@ export default {
     },
 
     methods: {
+        regenerateHandle() {
+            this.handle = snake_case(this.display);
+        },
+
         edit() {
+            this.display = this.tab.display;
+            this.handle = this.tab.handle;
+            this.instructions = this.tab.instructions;
+            this.icon = this.tab.icon;
+            this.handleSyncedWithDisplay = !this.tab.handle || ['new_tab', 'new_set_group'].includes(this.tab.handle);
             this.editing = true;
         },
 
diff --git a/resources/js/components/collections/Listing.vue b/resources/js/components/collections/Listing.vue
index 051cb9f4f3d..e5ce7038945 100644
--- a/resources/js/components/collections/Listing.vue
+++ b/resources/js/components/collections/Listing.vue
@@ -24,28 +24,43 @@
                     <aside class="flex items-center gap-2">
                         <ItemActions
                             :url="collection.actions_url"
-                            :actions="collection.actions"
                             :item="collection.id"
                             @started="actionStarted"
                             @completed="actionCompleted"
-                            v-slot="{ actions }"
+                            v-slot="{ actions, loadActions, shouldShowSkeleton }"
                         >
-                            <Dropdown placement="left-start">
+                            <Dropdown
+                                placement="left-start"
+                                @mouseover="loadActions"
+                                @focus="loadActions"
+                                @click="loadActions"
+                            >
                                 <DropdownMenu>
                                     <DropdownItem v-if="collection.available_in_selected_site" :text="__('View')" icon="eye" :href="collection.entries_url" />
                                     <DropdownItem v-if="collection.available_in_selected_site && collection.url" :text="__('Visit URL')" icon="external-link" target="_blank" :href="collection.url" />
                                     <DropdownItem v-if="collection.editable" :text="__('Configure')" icon="cog" :href="collection.edit_url" />
                                     <DropdownItem v-if="collection.blueprint_editable" :text="__('Edit Blueprints')" icon="blueprint-edit" :href="collection.blueprints_url" />
                                     <DropdownItem v-if="collection.editable" :text="__('Scaffold Views')" icon="scaffold" :href="collection.scaffold_url" />
-                                    <DropdownSeparator v-if="actions.length" />
-                                    <DropdownItem
-                                        v-for="action in actions"
-                                        :key="action.handle"
-                                        :text="__(action.title)"
-                                        :icon="action.icon"
-                                        :variant="action.dangerous ? 'destructive' : 'default'"
-                                        @click="action.run"
-                                    />
+                                    <DropdownSeparator v-if="shouldShowSkeleton || actions.length" />
+                                    <template v-if="shouldShowSkeleton">
+                                        <div v-for="index in 3" :key="index" class="contents">
+                                            <ui-skeleton class="m-1 size-5" />
+                                            <ui-skeleton
+                                                class="mx-2 my-1.5 h-5"
+                                                :class="index === 1 ? 'w-28' : index === 2 ? 'w-36' : 'w-24'"
+                                            />
+                                        </div>
+                                    </template>
+                                    <template v-else>
+                                        <DropdownItem
+                                            v-for="action in actions"
+                                            :key="action.handle"
+                                            :text="__(action.title)"
+                                            :icon="action.icon"
+                                            :variant="action.dangerous ? 'destructive' : 'default'"
+                                            @click="action.run"
+                                        />
+                                    </template>
                                 </DropdownMenu>
                             </Dropdown>
                         </ItemActions>
@@ -90,7 +105,7 @@
                                         </div>
                                     </template>
                                     <template #cell-date="{ row: entry }" v-if="collection.dated">
-                                        <div class="text-end font-mono text-xs text-gray-500 ps-6">
+                                        <div class="text-end font-mono text-xs text-gray-500 ps-6 whitespace-nowrap">
                                             <date-time :of="entry.date.date" date-only />
                                         </div>
                                     </template>
@@ -105,7 +120,7 @@
                     </div>
                 </ui-card>
 
-                <ui-panel-footer v-if="collection.available_in_selected_site" class="flex items-center gap-6 text-sm text-gray-600 dark:text-gray-400">
+                <ui-panel-footer v-if="collection.available_in_selected_site" class="flex items-center gap-6 gap-y-1.5 text-sm text-gray-600 dark:text-gray-400">
                     <div class="flex items-center gap-1.5">
                         <ui-badge :text="String(collection.published_entries_count)" pill class="bg-white! dark:bg-gray-700! [&_span]:st-text-trim-cap" />
                         <span>{{ __('Published') }}</span>
diff --git a/resources/js/components/elevated-sessions/index.js b/resources/js/components/elevated-sessions/index.js
index fcd8f155f89..47ff4eae486 100644
--- a/resources/js/components/elevated-sessions/index.js
+++ b/resources/js/components/elevated-sessions/index.js
@@ -1,6 +1,8 @@
 import axios from 'axios';
 
 export async function requireElevatedSession() {
+    if (!Statamic.$config.get('elevatedSessionsEnabled')) return;
+
     const response = await axios.get(cp_url('elevated-session'));
 
     if (response.data.elevated) return;
diff --git a/resources/js/components/entries/CollectionWidget.vue b/resources/js/components/entries/CollectionWidget.vue
index c71793eadfa..c3b65bec8e5 100644
--- a/resources/js/components/entries/CollectionWidget.vue
+++ b/resources/js/components/entries/CollectionWidget.vue
@@ -65,7 +65,7 @@ function formatDate(value) {
                 <ui-description v-if="!items.length" class="flex-1 flex items-center justify-center">
                     {{ __('There are no entries in this collection') }}
                 </ui-description>
-                <div class="px-4 py-3">
+                <div class="px-4 py-3 overflow-x-auto">
                     <table class="w-full widget-table" :class="{ 'opacity-50': loading }">
                         <TableHead :sr-only="!props.showTableHeader" />
                         <TableBody>
diff --git a/resources/js/components/entries/PublishActions.vue b/resources/js/components/entries/PublishActions.vue
index 40d3a3cdd87..a5179891ee2 100644
--- a/resources/js/components/entries/PublishActions.vue
+++ b/resources/js/components/entries/PublishActions.vue
@@ -47,6 +47,8 @@ import { Heading, Button, Select, DatePicker, Textarea, Icon, Subheading, Stack
 export default {
     components: { Heading, Button, Select, DatePicker, Textarea, Icon, Subheading, Stack },
 
+    emits: ['closed', 'saving', 'saved', 'failed'],
+
     props: {
         actions: Object,
         published: Boolean,
diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index e41c87f2709..2c888064b35 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -73,7 +73,7 @@
             v-if="fieldset"
             ref="container"
             :name="publishContainer"
-            :reference="initialReference"
+            :reference="reference"
             :blueprint="fieldset"
             v-model="values"
             :extra-values="extraValues"
@@ -82,6 +82,7 @@
             :origin-meta="originMeta"
             :errors="errors"
             :site="site"
+            :read-only="readOnly"
             v-model:modified-fields="localizedFields"
             :track-dirty-state="trackDirtyState"
             :sync-field-confirmation-text="syncFieldConfirmationText"
@@ -370,6 +371,7 @@ export default {
             originValues: this.initialOriginValues,
             originMeta: this.initialOriginMeta,
             site: this.initialSite,
+            reference: this.initialReference,
             selectingOrigin: false,
             selectedOrigin: null,
             isWorkingCopy: this.initialIsWorkingCopy,
@@ -455,7 +457,7 @@ export default {
         },
 
         showLivePreviewButton() {
-            return !this.isCreating && this.isBase && this.livePreviewUrl;
+            return !this.isPreviewing && !this.readOnly && !this.isCreating && this.isBase && this.livePreviewUrl;
         },
 
         showVisitUrlButton() {
@@ -662,7 +664,7 @@ export default {
             }
 
             if (this.isBase) {
-                window.history.replaceState({}, '', localization.url);
+                window.history.replaceState({}, '', localization.url + window.location.hash);
             }
         },
 
@@ -687,6 +689,7 @@ export default {
                 this.fieldset = data.blueprint;
                 this.permalink = data.permalink;
                 this.site = localization.handle;
+                this.reference = data.reference;
                 this.localizing = false;
                 this.initialPublished = data.values.published;
                 this.readOnly = data.readOnly;
diff --git a/resources/js/components/entries/calendar/Month.vue b/resources/js/components/entries/calendar/Month.vue
index 799047cebb4..dbcc167fc39 100644
--- a/resources/js/components/entries/calendar/Month.vue
+++ b/resources/js/components/entries/calendar/Month.vue
@@ -128,7 +128,7 @@ const selectDate = (date) => {
                                 </div>
                             </div>
 
-                            <div class="space-y-1.5 flex-1 overflow-scroll overscroll-contain h-full w-full hidden @3xl:block">
+                            <div class="space-y-1.5 flex-1 overflow-auto overscroll-contain h-full w-full hidden @3xl:block">
                                 <CalendarEntry
                                     v-for="entry in getEntriesForDate(weekDate)"
                                     :key="entry.id"
diff --git a/resources/js/components/field-actions/toFieldActions.js b/resources/js/components/field-actions/toFieldActions.js
index b9dcefb6dc9..d94c9a8677f 100644
--- a/resources/js/components/field-actions/toFieldActions.js
+++ b/resources/js/components/field-actions/toFieldActions.js
@@ -1,7 +1,8 @@
+import { markRaw } from 'vue';
 import FieldAction from './FieldAction.js';
 
 export default function toFieldActions(binding, payload, extraActions = []) {
     return [...Statamic.$fieldActions.get(binding), ...extraActions]
-        .map((action) => new FieldAction(action, payload))
+        .map((action) => markRaw(new FieldAction(action, payload)))
         .filter((action) => action.visible);
 }
diff --git a/resources/js/components/field-conditions/Condition.vue b/resources/js/components/field-conditions/Condition.vue
index 213a2f3649b..2b8590dd0ab 100644
--- a/resources/js/components/field-conditions/Condition.vue
+++ b/resources/js/components/field-conditions/Condition.vue
@@ -15,10 +15,10 @@
                 <template #no-options><div class="hidden" /></template>
                 <template #option="option">
                     <div class="flex items-center">
-                        <span v-text="option.label" />
+                        <span class="flex-shrink-0 truncate" v-text="option.label" />
                         <span
                             v-text="option.value"
-                            class="font-mono text-2xs text-gray-500 dark:text-gray-300"
+                            class="font-mono text-2xs text-gray-500 dark:text-gray-300 truncate"
                             :class="{ 'ml-2': option.label }"
                         />
                     </div>
@@ -29,7 +29,7 @@
             </Combobox>
         </div>
 
-        <div class="w-auto min-w-32">
+        <div class="w-auto min-w-40">
             <Select
                 class="w-full"
                 :model-value="condition.operator"
diff --git a/resources/js/components/field-conditions/Validator.js b/resources/js/components/field-conditions/Validator.js
index 123a60d1648..7d08b41c001 100644
--- a/resources/js/components/field-conditions/Validator.js
+++ b/resources/js/components/field-conditions/Validator.js
@@ -264,6 +264,7 @@ export default class {
             values: this.values,
             root: this.rootValues,
             fieldPath: this.currentFieldPath,
+            prefix: this.field.prefix,
             ...this.extraPayload,
         });
 
diff --git a/resources/js/components/field-validation/Builder.vue b/resources/js/components/field-validation/Builder.vue
index 2d87c454185..384f30c8f72 100644
--- a/resources/js/components/field-validation/Builder.vue
+++ b/resources/js/components/field-validation/Builder.vue
@@ -34,6 +34,7 @@
                 multiple
                 searchable
                 taggable
+                paste-delimiter="|"
                 close-on-select
                 :model-value="rules"
                 @selected="add($event)"
@@ -54,7 +55,7 @@
                 v-model="customRule"
                 ref="customRuleInput"
                 @keydown.enter.prevent="add(customRule)"
-                @blur="add(customRule)"
+                @focusout="add(customRule)"
             />
 
             <sortable-list
@@ -76,7 +77,7 @@
                             <button
                                 type="button"
                                 class="opacity-75 hover:opacity-100 cursor-pointer"
-                                :aria-label="__('Deselect option')"
+                                :aria-label="__('Remove :label', { label: rule })"
                                 @click="remove(rule)"
                             >
                                 &times;
@@ -236,6 +237,8 @@ export default {
             if (!this.rules.includes(rule)) {
                 this.rules.push(rule);
             }
+
+            this.$nextTick(() => this.$refs.rulesSelect?.focus());
         },
 
         add(rule) {
@@ -245,7 +248,7 @@ export default {
                 this.resetState();
                 this.selectedLaravelRule = rule;
                 this.customRule = rule;
-                this.$nextTick(() => this.$refs.customRuleInput.focus());
+                this.$nextTick(() => this.$refs.customRuleInput?.focus());
             } else {
                 this.ensure(rule);
             }
@@ -258,8 +261,6 @@ export default {
             if (this.searchNotFound(rulesSelect) || this.hasUnfinishedParameters(rule)) return;
 
             this.add(rule);
-
-            this.$nextTick(() => this.$refs.searchInput.blur());
         },
 
         remove(rule) {
diff --git a/resources/js/components/fields/FieldtypeSelector.vue b/resources/js/components/fields/FieldtypeSelector.vue
index 39ca0d9de64..c9ed40b8e86 100644
--- a/resources/js/components/fields/FieldtypeSelector.vue
+++ b/resources/js/components/fields/FieldtypeSelector.vue
@@ -112,11 +112,18 @@ export default {
         fieldtypes() {
             if (!this.fieldtypesLoaded) return;
 
-            return loadedFieldtypes.value;
+            return loadedFieldtypes.value.data;
+        },
+
+        isFormBlueprint() {
+            return !!this.$config.get('isFormBlueprint');
         },
 
         fieldtypesLoaded() {
-            return Array.isArray(loadedFieldtypes.value);
+            // The cache is shared across every picker instance, but form and regular blueprints
+            // request different lists. Only treat it as loaded when the cached list matches the
+            // current blueprint mode, otherwise we'll refetch the correct one.
+            return Array.isArray(loadedFieldtypes.value?.data) && loadedFieldtypes.value.forms === this.isFormBlueprint;
         },
 
         allFieldtypes() {
@@ -225,11 +232,18 @@ export default {
     created() {
         if (this.fieldtypesLoaded) return;
 
+        const forms = this.isFormBlueprint;
+
         let url = cp_url('fields/fieldtypes?selectable=true');
 
-        if (this.$config.get('isFormBlueprint')) url += '&forms=true';
+        if (forms) url += '&forms=true';
 
-        this.$axios.get(url).then((response) => (loadedFieldtypes.value = response.data));
+        this.$axios.get(url)
+            .then((response) => (loadedFieldtypes.value = { forms, data: response.data }))
+            .catch((e) => {
+                this.$toast.error(e.response?.data?.message || __('Something went wrong'));
+                this.close();
+            });
     },
 
     methods: {
diff --git a/resources/js/components/fields/ImportSettings.vue b/resources/js/components/fields/ImportSettings.vue
index 3f4dcc2f815..4549a1d314c 100644
--- a/resources/js/components/fields/ImportSettings.vue
+++ b/resources/js/components/fields/ImportSettings.vue
@@ -16,16 +16,36 @@
                 <Field :label="__('Prefix')" :instructions="__('messages.fieldset_import_prefix_instructions')" class="form-group field-w-100">
                     <Input autofocus :model-value="config.prefix" @update:model-value="updateField('prefix', $event)" />
                 </Field>
+
+                <Field
+                    v-if="fieldsetHasSections"
+                    :label="__('Section Behavior')"
+                    :instructions="sectionBehaviorInstructions"
+                    class="form-group field-w-100"
+                >
+                    <RadioGroup
+                        :model-value="sectionBehavior"
+                        @update:model-value="updateField('section_behavior', $event)"
+                    >
+                        <Radio
+                            v-for="option in sectionBehaviorOptions"
+                            :key="option.value"
+                            :label="option.label"
+                            :description="option.description"
+                            :value="option.value"
+                        />
+                    </RadioGroup>
+                </Field>
             </div>
         </CardPanel>
     </StackContent>
 </template>
 
 <script>
-import { Button, Heading, CardPanel, Field, Input, StackHeader, StackContent } from '@/components/ui';
+import { Button, Heading, CardPanel, Field, Input, StackHeader, StackContent, RadioGroup, Radio } from '@/components/ui';
 
 export default {
-    components: { StackContent, StackHeader, Heading, Button, CardPanel, Field, Input },
+    components: { StackContent, StackHeader, Heading, Button, CardPanel, Field, Input, RadioGroup, Radio },
 
     props: ['config', 'isInsideSet'],
 
@@ -46,6 +66,41 @@ export default {
         };
     },
 
+    computed: {
+        fieldsetMeta() {
+            const handle = this.values.fieldset;
+
+            return this.$page?.props?.fieldsets?.[handle] ?? null;
+        },
+
+        fieldsetHasSections() {
+            return this.fieldsetMeta?.has_sections === true;
+        },
+
+        sectionBehavior() {
+            return this.values.section_behavior ?? 'preserve';
+        },
+
+        sectionBehaviorInstructions() {
+            return __('messages.fieldset_import_section_behavior_instructions');
+        },
+
+        sectionBehaviorOptions() {
+            return [
+                {
+                    label: __('Preserve'),
+                    description: __('Keep imported sections as-is.'),
+                    value: 'preserve',
+                },
+                {
+                    label: __('Flatten'),
+                    description: __('Merge all fields into this section.'),
+                    value: 'flatten',
+                },
+            ];
+        },
+    },
+
     methods: {
         focus() {
             this.$els.display.select();
@@ -53,6 +108,10 @@ export default {
 
         updateField(handle, value) {
             this.values[handle] = value;
+
+            if (handle === 'fieldset' && ! this.fieldsetHasSections) {
+                this.values.section_behavior = 'preserve';
+            }
         },
 
         commit(shouldCommitParent = false) {
diff --git a/resources/js/components/fields/Settings.vue b/resources/js/components/fields/Settings.vue
index 3f49f00eb38..5c02914bbee 100644
--- a/resources/js/components/fields/Settings.vue
+++ b/resources/js/components/fields/Settings.vue
@@ -5,10 +5,10 @@
 
     <StackHeader v-if="!loading" :title="__(values.display) || __(config.display) || config.handle" :icon="fieldtype.icon">
         <template #actions>
-            <Button variant="default" @click.prevent="commit" :text="__('Apply')" />
-            <Button v-if="!(isNestedField)" variant="primary" @click.prevent="commitAndSave" icon="save" :text="__('Apply & Save')" />
-            <Button v-if="isNestedField" variant="default" @click.prevent="commitAndCloseAll" :text="__('Apply & Close All')" />
-            <Button v-if="isNestedField" variant="primary" @click.prevent="commitAndSaveAll" icon="save" :text="__('Save & Close All')" />
+            <Button v-if="!showSaveOnlyAtTopLevel" variant="default" @click.prevent="commit" :text="__('Apply')" />
+            <Button v-if="!(isNestedField)" variant="primary" @click.prevent="commitAndSave" icon="save" :text="showSaveOnlyAtTopLevel ? __('Save') : __('Apply & Save')" />
+            <Button v-if="isNestedField" variant="default" @click.prevent="commitAndSaveAll" :text="__('Save All')" v-tooltip="saveAllShortcutLabel" />
+            <Button v-if="isNestedField" variant="primary" @click.prevent="commitAndSaveTopStack" icon="save" :text="__('Save')" />
         </template>
     </StackHeader>
 
@@ -90,6 +90,10 @@ export default {
         fields: Array,
         suggestableConditionFields: Array,
         isInsideSet: Boolean,
+        showSaveOnlyAtTopLevel: {
+            type: Boolean,
+            default: false,
+        },
     },
 
     provide() {
@@ -106,7 +110,7 @@ export default {
             default: false
         },
         commitParentField: {
-            default: () => {}
+            default: null
         }
     },
 
@@ -192,18 +196,26 @@ export default {
         isNestedField() {
             return this.isInsideSet || this.isInsideConfigFields;
         },
+
+        saveAllShortcutLabel() {
+            const platform = typeof navigator !== 'undefined'
+                ? (navigator.userAgentData?.platform || navigator.platform || '')
+                : '';
+            const isMac = /Mac|iPhone|iPad|iPod/i.test(platform);
+            return isMac ? 'Cmd+Shift+S' : 'Ctrl+Shift+S';
+        },
     },
 
     created() {
         this.load();
 
-        // Add keyboard shortcut for Cmd+S / Ctrl+S only when this component is focused
-        this.saveBinding = this.$keys.bindGlobal(['mod+s'], (e) => {
+        // Add keyboard shortcuts only when this component is focused.
+        this.saveBinding = this.$keys.bindGlobal(['mod+s', 'mod+shift+s'], (e) => {
             // Only handle if this component is currently visible/focused
             if (this.$el && this.$el.offsetParent !== null) {
                 e.preventDefault();
                 e.stopPropagation();
-                this.handleSaveShortcut();
+                this.handleSaveShortcut(e);
             }
         });
     },
@@ -258,7 +270,7 @@ export default {
         },
 
         commit(params = {}) {
-            let { shouldCommitParent, shouldSaveRoot } = params;
+            let { shouldCommitParent, shouldSaveRoot, shouldClose = true } = params;
 
             this.clearErrors();
 
@@ -277,7 +289,7 @@ export default {
                     if (shouldCommitParent && this.commitParentField) {
 						this.$nextTick(() => {
 							this.commitParentField(params);
-							this.close();
+							if (shouldClose) this.close();
 						});
 
                         return;
@@ -287,7 +299,7 @@ export default {
                         this.saveRootForm();
                     }
 
-                    this.close();
+                    if (shouldClose) this.close();
                 })
                 .catch((e) => this.handleAxiosError(e));
         },
@@ -299,18 +311,31 @@ export default {
             });
         },
 
-        // Nested field: saves the current field and any parents.
-        commitAndCloseAll() {
+        // Nested field: saves the current field and the blueprint/fieldset.
+        commitAndSaveAll() {
             this.commit({
                 shouldCommitParent: true,
+                shouldSaveRoot: true,
             });
         },
 
-        // Nested field: saves the current field and the blueprint/fieldset.
-        commitAndSaveAll() {
+        // Nested field: saves and closes only the current stack.
+        commitAndSaveTopStack() {
             this.commit({
-                shouldCommitParent: true,
+                shouldSaveRoot: !this.isNestedField,
+            });
+        },
+
+        softSave() {
+            if (this.config.isNew) {
+                this.isNestedField ? this.commitAndSaveTopStack() : this.commitAndSave();
+                return;
+            }
+
+            this.commit({
+                shouldCommitParent: this.isNestedField,
                 shouldSaveRoot: true,
+                shouldClose: false,
             });
         },
 
@@ -319,7 +344,16 @@ export default {
             this.$events.$emit('root-form-save');
         },
 
-        handleSaveShortcut() {
+        handleSaveShortcut(event) {
+            if (event?.key?.toLowerCase() === 's' && event?.shiftKey) {
+                this.saveAllShortcut();
+                return;
+            }
+
+            this.softSave();
+        },
+
+        saveAllShortcut() {
             this.isNestedField
                 ? this.commitAndSaveAll()
                 : this.commitAndSave();
@@ -332,7 +366,7 @@ export default {
                 this.errors = errors;
                 this.$toast.error(message);
             } else {
-                this.$toast.error(__('Something went wrong'));
+                this.$toast.error(e.response?.data?.message || __('Something went wrong'));
             }
         },
 
@@ -362,6 +396,10 @@ export default {
                     this.meta = { ...response.data.meta };
                     this.originValues = response.data.originValues;
                     this.originMeta = response.data.originMeta;
+                })
+                .catch((e) => {
+                    this.loading = false;
+                    this.handleAxiosError(e);
                 });
         },
     },
diff --git a/resources/js/components/fieldtypes/ArrayFieldtype.vue b/resources/js/components/fieldtypes/ArrayFieldtype.vue
index 17cf585429a..5c4184576d1 100644
--- a/resources/js/components/fieldtypes/ArrayFieldtype.vue
+++ b/resources/js/components/fieldtypes/ArrayFieldtype.vue
@@ -24,6 +24,7 @@
                     :key="element._id"
                     :id="fieldId + '__' + element.key"
                     :readonly="isReadOnly"
+                    :input-attrs="{ dir: contentDirection }"
                 />
             </template>
         </ui-input-group>
@@ -41,6 +42,7 @@
                             :id="fieldId + '__' + element.key"
                             v-model="data[index].value"
                             :readonly="isReadOnly"
+                            :dir="contentDirection"
                         />
                     </td>
                 </tr>
@@ -71,12 +73,14 @@
                             <ui-input
                                 v-model="element.key"
                                 :readonly="isReadOnly"
+                                :input-attrs="{ dir: contentDirection }"
                             />
                         </td>
                         <td>
                             <ui-input
                                 v-model="element.value"
                                 :readonly="isReadOnly"
+                                :input-attrs="{ dir: contentDirection }"
                             />
                         </td>
                         <td class="row-controls" v-if="!isReadOnly">
@@ -107,6 +111,7 @@
 import Fieldtype from './Fieldtype.vue';
 import { SortableList, SortableHelpers } from '../sortable/Sortable';
 import { Button } from '@/components/ui';
+import { useContentDirection } from '@/composables/content-direction';
 
 export default {
     mixins: [Fieldtype, SortableHelpers],
@@ -116,6 +121,12 @@ export default {
         Button,
     },
 
+    setup() {
+        const { direction: contentDirection } = useContentDirection();
+
+        return { contentDirection };
+    },
+
     data() {
         const keys = Object.keys(this.value || {});
         const selectedKey = keys.length > 0 ? keys[0] : null;
diff --git a/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue b/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue
index 36e89887648..f3412db2232 100644
--- a/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue
+++ b/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue
@@ -1,5 +1,5 @@
 <template>
-    <ButtonGroup ref="buttonGroup">
+    <ButtonGroup overflow="stack" ref="buttonGroup">
         <Button
             v-for="(option, $index) in options"
             ref="button"
@@ -18,7 +18,6 @@
 <script>
 import Fieldtype from './Fieldtype.vue';
 import HasInputOptions from './HasInputOptions.js';
-import ResizeObserver from 'resize-observer-polyfill';
 import { Button, ButtonGroup } from '@/components/ui';
 
 export default {
@@ -28,20 +27,6 @@ export default {
         ButtonGroup
     },
 
-    data() {
-        return {
-            resizeObserver: null,
-        };
-    },
-
-    mounted() {
-        this.setupResizeObserver();
-    },
-
-    beforeUnmount() {
-        this.resizeObserver.disconnect();
-    },
-
     computed: {
         options() {
             return this.normalizeInputOptions(this.meta.options || this.config.options);
@@ -60,25 +45,6 @@ export default {
             this.update(this.value == newValue && this.config.clearable ? null : newValue);
         },
 
-        setupResizeObserver() {
-            this.resizeObserver = new ResizeObserver(() => {
-                this.handleWrappingOfNode(this.$refs.buttonGroup.$el);
-            });
-            this.resizeObserver.observe(this.$refs.buttonGroup.$el);
-        },
-
-        handleWrappingOfNode(node) {
-            const lastEl = node.lastChild;
-
-            if (!lastEl) return;
-
-            node.classList.remove('btn-vertical');
-
-            if (lastEl.offsetTop > node.clientTop) {
-                node.classList.add('btn-vertical');
-            }
-        },
-
         focus() {
             this.$refs.button[0].focus();
         },
diff --git a/resources/js/components/fieldtypes/CheckboxesFieldtype.vue b/resources/js/components/fieldtypes/CheckboxesFieldtype.vue
index 792b9f4d428..50293c191e9 100644
--- a/resources/js/components/fieldtypes/CheckboxesFieldtype.vue
+++ b/resources/js/components/fieldtypes/CheckboxesFieldtype.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <CheckboxGroup v-model="values" :inline="config.inline" ref="checkboxes">
+        <CheckboxGroup v-model="values" :appearance="appearance" ref="checkboxes">
             <Checkbox
                 v-for="(option, index) in options"
                 :disabled="config.disabled"
@@ -33,6 +33,14 @@ export default {
     },
 
     computed: {
+        appearance() {
+            if (this.config.appearance !== 'default') {
+                return this.config.appearance;
+            }
+
+            return this.config.inline ? 'inline' : 'default';
+        },
+
         options() {
             return this.normalizeInputOptions(this.meta.options || this.config.options);
         },
diff --git a/resources/js/components/fieldtypes/ColorFieldtype.vue b/resources/js/components/fieldtypes/ColorFieldtype.vue
index 61a9e74c9b0..557a55a175a 100644
--- a/resources/js/components/fieldtypes/ColorFieldtype.vue
+++ b/resources/js/components/fieldtypes/ColorFieldtype.vue
@@ -26,7 +26,7 @@
                             <button
                                 v-for="swatch in config.swatches"
                                 type="button"
-                                class="flex size-9 rounded-full cursor-pointer"
+                                class="flex size-9 rounded-full cursor-pointer border border-gray-900/15 dark:border-gray-100/20"
                                 :style="{ 'background-color': swatch }"
                                 @click="update(swatch)"
                             >
diff --git a/resources/js/components/fieldtypes/DateFieldtype.vue b/resources/js/components/fieldtypes/DateFieldtype.vue
index 575e7542921..b5d532891ff 100644
--- a/resources/js/components/fieldtypes/DateFieldtype.vue
+++ b/resources/js/components/fieldtypes/DateFieldtype.vue
@@ -23,7 +23,7 @@
 import Fieldtype from './Fieldtype.vue';
 import DateFormatter from '@/components/DateFormatter.js';
 import { DatePicker, DateRangePicker, Button } from '@/components/ui';
-import { getLocalTimeZone, parseAbsoluteToLocal, toTimeZone, toZoned } from '@internationalized/date';
+import { CalendarDate, getLocalTimeZone, now, parseAbsolute, toTimeZone, toZoned } from '@internationalized/date';
 
 export default {
     components: {
@@ -67,35 +67,67 @@ export default {
             return this.config.inline;
         },
 
+        displayTimezone() {
+            const tz = this.meta?.timezone;
+
+            return tz && tz !== 'auto' ? tz : getLocalTimeZone();
+        },
+
+        formatHasTime() {
+            return this.meta?.formatHasTime ?? true;
+        },
+
         datePickerValue() {
             if (!this.value || this.value === 'now') {
                 return null;
             }
 
+            if (!this.formatHasTime) {
+                if (this.isRange) {
+                    return {
+                        start: this.parseDateOnly(this.value.start),
+                        end: this.parseDateOnly(this.value.end),
+                    };
+                }
+
+                return this.parseDateOnly(this.value);
+            }
+
             if (this.isRange) {
                 return {
-                    start: parseAbsoluteToLocal(this.value.start),
-                    end: parseAbsoluteToLocal(this.value.end),
+                    start: parseAbsolute(this.value.start, this.displayTimezone),
+                    end: parseAbsolute(this.value.end, this.displayTimezone),
                 };
             }
 
-            return parseAbsoluteToLocal(this.value);
+            return parseAbsolute(this.value, this.displayTimezone);
         },
 
         datePickerGranularity() {
             return this.hasTime ? (this.hasSeconds ? 'second' : 'minute') : 'day';
         },
 
+        replicatorPreviewOptions() {
+            const preset = this.hasTime ? 'datetime' : 'date';
+
+            return {
+                preset,
+                timeZone: this.displayTimezone,
+                ...(this.formatHasTime && { timeZoneName: 'short' }),
+            };
+        },
+
         replicatorPreview() {
             if (!this.showFieldPreviews) return;
             if (!this.value) return;
 
+            const formatter = new DateFormatter().options(this.replicatorPreviewOptions);
+
             if (this.isRange) {
-                const formatter = new DateFormatter().options(this.hasTime ? 'datetime' : 'date');
                 return formatter.date(this.value.start) + ' – ' + formatter.date(this.value.end);
             }
 
-            return DateFormatter.format(this.value, this.hasTime && this.value ? 'datetime' : 'date');
+            return formatter.date(this.value).toString();
         },
     },
 
@@ -128,10 +160,25 @@ export default {
                 return this.update(null);
             }
 
+            if (this.isRange && (!value.start || !value.end)) {
+                return;
+            }
+
+            if (!this.formatHasTime) {
+                if (this.isRange) {
+                    return this.update({
+                        start: this.formatDateOnly(value.start),
+                        end: this.formatDateOnly(value.end),
+                    });
+                }
+
+                return this.update(this.formatDateOnly(value));
+            }
+
             // Sometimes, we'll get a CalendarDateTime object, which doesn't include timezone
             // information. In that case, we need to convert it to a ZonedDateTime object.
             if (!this.isRange && !value.offset && !value.timeZone) {
-                value = toZoned(value, getLocalTimeZone());
+                value = toZoned(value, this.displayTimezone);
             }
 
             // The date picker will give us CalendarDateTimes in the local time zone.
@@ -141,13 +188,21 @@ export default {
                 let start = value.start;
                 let end = value.end;
 
+                if (!start.offset && !start.timeZone) {
+                    start = toZoned(start, this.displayTimezone);
+                }
+
+                if (!end.offset && !end.timeZone) {
+                    end = toZoned(end, this.displayTimezone);
+                }
+
                 if (!this.hasTime) {
                     end.set({ hour: 23, minute: 59, second: 59 });
                 }
 
                 return this.update({
-                    start: toZoned(start, 'UTC').toAbsoluteString(),
-                    end: toZoned(end, 'UTC').toAbsoluteString(),
+                    start: toTimeZone(start, 'UTC').toAbsoluteString(),
+                    end: toTimeZone(end, 'UTC').toAbsoluteString(),
                 });
             }
 
@@ -155,18 +210,32 @@ export default {
         },
 
         addDate() {
-            let now = new Date();
+            let zoned = now(this.displayTimezone);
+
+            if (!this.formatHasTime) {
+                const str = this.formatDateOnly(zoned);
+                return this.update(this.isRange ? { start: str, end: str } : str);
+            }
 
-            now.setMilliseconds(0);
+            zoned = zoned.set({ millisecond: 0 });
 
             if (!this.config.time_enabled) {
-                now.setHours(0, 0, 0, 0);
+                zoned = zoned.set({ hour: 0, minute: 0, second: 0 });
             }
 
-            const str = now.toISOString();
+            const str = toTimeZone(zoned, 'UTC').toAbsoluteString();
 
             this.update(this.isRange ? { start: str, end: str } : str);
         },
+
+        parseDateOnly(value) {
+            const [year, month, day] = value.split('-').map(Number);
+            return new CalendarDate(year, month, day);
+        },
+
+        formatDateOnly(value) {
+            return `${value.year}-${String(value.month).padStart(2, '0')}-${String(value.day).padStart(2, '0')}`;
+        },
     },
 };
 </script>
diff --git a/resources/js/components/fieldtypes/DateIndexFieldtype.vue b/resources/js/components/fieldtypes/DateIndexFieldtype.vue
index b9d9bfad0f5..c966dda42f8 100644
--- a/resources/js/components/fieldtypes/DateIndexFieldtype.vue
+++ b/resources/js/components/fieldtypes/DateIndexFieldtype.vue
@@ -1,31 +1,59 @@
 <template>
-    <div v-text="formatted"></div>
+    <TimezoneHoverCard v-if="showTimezoneCard" :date="hoverCardDate" side="top" :offset="10">
+        <span v-text="formatted"></span>
+    </TimezoneHoverCard>
+    <div v-else v-text="formatted"></div>
 </template>
 
 <script setup>
 import Fieldtype from '@/components/fieldtypes/index-fieldtype.js';
 import DateFormatter from '@/components/DateFormatter.js';
+import { TimezoneHoverCard } from '@ui';
 import { computed } from 'vue';
 
 const emit = defineEmits(Fieldtype.emits);
 const props = defineProps(Fieldtype.props);
 const { expose } = Fieldtype.use(emit, props);
 
+const timezoneOption = computed(() => {
+    const tz = props.value?.timezone;
+
+    return tz && tz !== 'auto' ? { timeZone: tz } : {};
+});
+
+const showTimeInValue = computed(() => props.value?.format_has_time && props.value?.time_enabled);
+
+const showTimezoneCard = computed(() => props.value?.format_has_time);
+
+const isRange = computed(() => props.value?.mode === 'range');
+
+const formatter = computed(() => {
+    const options = { preset: showTimeInValue.value ? 'datetime' : 'date' };
+    if (!props.value?.format_has_time) {
+        options.timeZone = 'UTC';
+    } else {
+        Object.assign(options, timezoneOption.value);
+    }
+
+    return new DateFormatter().options(options);
+});
+
+const formattedStart = computed(() => formatter.value.date(new Date(props.value.start)).toString());
+
+const formattedEnd = computed(() => formatter.value.date(new Date(props.value.end)).toString());
+
+const hoverCardDate = computed(() => isRange.value ? props.value : props.value.date);
+
 const formatted = computed(() => {
     if (!props.value) {
         return null;
     }
 
-    const formatter = new DateFormatter().options(props.value.time_enabled ? 'datetime' : 'date');
-
-    if (props.value.mode === 'range') {
-        let start = new Date(props.value.start);
-        let end = new Date(props.value.end);
-
-        return formatter.date(start) + ' – ' + formatter.date(end);
+    if (isRange.value) {
+        return formattedStart.value + ' – ' + formattedEnd.value;
     }
 
-    return formatter.date(props.value.date).toString();
+    return formatter.value.date(props.value.date).toString();
 });
 
 defineExpose(expose);
diff --git a/resources/js/components/fieldtypes/DictionaryFieldtype.vue b/resources/js/components/fieldtypes/DictionaryFieldtype.vue
index da1c6ec372c..3a695d07daf 100644
--- a/resources/js/components/fieldtypes/DictionaryFieldtype.vue
+++ b/resources/js/components/fieldtypes/DictionaryFieldtype.vue
@@ -33,7 +33,7 @@
                     <div
                         v-for="option in selectedOptions"
                         :key="getOptionValue(option)"
-                        class="sortable-item cursor-grab"
+                        class="sortable-item cursor-grab active:cursor-grabbing"
                     >
                         <Badge size="lg" color="white">
                             <div v-if="labelHtml" v-html="getOptionLabel(option)"></div>
@@ -43,18 +43,14 @@
                                 v-if="!disabled && !readOnly"
                                 type="button"
                                 class="-mx-3 cursor-pointer px-3 text-gray-400 hover:text-gray-700"
-                                :aria-label="__('Deselect option')"
-                                @click="deselect(option.value)"
+                                :aria-label="__('Remove :label', { label: getOptionLabel(option) })"
+                                @click="deselect(getOptionValue(option))"
                             >
                                 <span>&times;</span>
                             </button>
-                            <button
-                                v-else
-                                type="button"
-                                class="-mx-3 cursor-pointer px-3 text-gray-400 hover:text-gray-700"
-                            >
+                            <span v-else class="-mx-3 cursor-pointer px-3 text-gray-400 hover:text-gray-700">
                                 <span>&times;</span>
-                            </button>
+                            </span>
                         </Badge>
                     </div>
                 </div>
@@ -93,7 +89,17 @@ export default {
         },
 
         normalizedOptions() {
-            return this.normalizeInputOptions(this.options);
+            const options = this.normalizeInputOptions(this.options);
+
+            // Multi-select renders its selections from the slot below, so the options can be left alone.
+            if (this.multiple) return options;
+
+            // In single mode the Combobox resolves the selected label from these options, and the fetched
+            // options may not include the stored value (API-backed dictionaries only return a page of
+            // results), so merge the selected options in or it would display the raw value instead.
+            const values = new Set(options.map((option) => option.value));
+
+            return [...options, ...this.selectedOptions.filter((option) => !values.has(option.value))];
         },
 
         selectedOptions() {
diff --git a/resources/js/components/fieldtypes/Fieldtype.vue b/resources/js/components/fieldtypes/Fieldtype.vue
index 2004e662b6e..c6ee19b8aa3 100644
--- a/resources/js/components/fieldtypes/Fieldtype.vue
+++ b/resources/js/components/fieldtypes/Fieldtype.vue
@@ -3,6 +3,7 @@ import HasFieldActions from '../field-actions/HasFieldActions';
 import debounce from '@/util/debounce.js';
 import props from './props.js';
 import emits from './emits.js';
+import { UPDATE_DEBOUNCE_MS } from './constants';
 import { publishContextKey } from '@/components/ui';
 import { isRef, markRaw } from 'vue';
 
@@ -32,7 +33,7 @@ export default {
     created() {
         this.updateDebounced = markRaw(debounce((value) => {
             this.update(value);
-        }, 150));
+        }, UPDATE_DEBOUNCE_MS));
     },
 
     computed: {
diff --git a/resources/js/components/fieldtypes/FormattingLocalesFieldtype.vue b/resources/js/components/fieldtypes/FormattingLocalesFieldtype.vue
new file mode 100644
index 00000000000..d2b77f2f279
--- /dev/null
+++ b/resources/js/components/fieldtypes/FormattingLocalesFieldtype.vue
@@ -0,0 +1,98 @@
+<template>
+    <Combobox
+        clearable
+        taggable
+        :options="options"
+        :read-only="isReadOnly"
+        :placeholder="null"
+        :model-value="value"
+        @update:modelValue="comboboxUpdated"
+    >
+        <template #selected-option="{ option: { value, label, sample } }">
+            <template v-if="value === 'language'">{{ label }}</template>
+            <div v-else class="w-full flex justify-between">
+                <div class="text-start flex-1">
+                    {{ getLabel(value) }}
+                    <span class="ms-4 text-gray-500 dark:text-gray-400" v-text="value" />
+                </div>
+                <span class="text-gray-500 dark:text-gray-400" v-text="getSample(value)" />
+            </div>
+        </template>
+        <template #option="{ value, label, sample }">
+            <template v-if="value === 'language'">{{ label }}</template>
+            <div v-else class="w-full flex justify-between">
+                <div class="text-start flex-1">
+                    {{ label }}
+                    <span class="ms-4 text-gray-500 dark:text-gray-400" v-text="value" />
+                </div>
+                <span class="text-gray-500 dark:text-gray-400" v-text="sample" />
+            </div>
+        </template>
+    </Combobox>
+</template>
+
+<script setup>
+import Fieldtype from '@/components/fieldtypes/fieldtype.js';
+import { dateFormatter, toast } from '@api';
+import { Combobox } from '@/components/ui';
+import { computed } from 'vue';
+
+const emit = defineEmits(Fieldtype.emits);
+const props = defineProps(Fieldtype.props);
+const { isReadOnly, update } = Fieldtype.use(emit, props);
+
+const candidateLocales = [
+    'ar', 'az', 'cs', 'da', 'de', 'de-CH', 'en', 'es', 'et', 'fa', 'fr',
+    'hu', 'id', 'it', 'ja', 'ms', 'nb', 'nl', 'pl', 'pt', 'pt-BR', 'ru',
+    'sl', 'sv', 'tr', 'uk', 'vi', 'zh-CN', 'zh-TW',
+];
+
+const displayNames = typeof Intl.DisplayNames !== 'undefined'
+    ? new Intl.DisplayNames([document.documentElement.lang || 'en'], { type: 'language' })
+    : null;
+
+const options = computed(() => {
+    const locales = Intl.DateTimeFormat.supportedLocalesOf(candidateLocales);
+
+    const formatted = locales.map((locale) => ({
+        value: locale,
+        label: getLabel(locale),
+        sample: getSample(locale),
+    }));
+
+    return [
+        { value: 'language', label: __('Same as language') },
+        ...formatted,
+    ];
+});
+
+function getLabel(locale) {
+    return displayNames?.of(locale.split('-')[0]);
+}
+
+function getSample(locale) {
+    return dateFormatter.withLocale(locale, (formatter) => formatter.format(new Date, 'datetime'));
+}
+
+function comboboxUpdated(value) {
+    if (value && !isValidLocale(value)) {
+        update(null);
+        toast.error(__('statamic::messages.preference_formatting_locale_invalid'));
+        return;
+    }
+
+    update(value || null);
+}
+
+function isValidLocale(value) {
+    if (value === 'language') {
+        return true;
+    }
+
+    try {
+        return Intl.DateTimeFormat.supportedLocalesOf([value]).length > 0;
+    } catch {
+        return false;
+    }
+}
+</script>
diff --git a/resources/js/components/fieldtypes/GroupFieldtype.vue b/resources/js/components/fieldtypes/GroupFieldtype.vue
index fcfcab4ceac..883fe337d04 100644
--- a/resources/js/components/fieldtypes/GroupFieldtype.vue
+++ b/resources/js/components/fieldtypes/GroupFieldtype.vue
@@ -17,10 +17,11 @@
                         <FieldsProvider
                             :fields="fields"
                             :as-config="false"
+                            :read-only="isReadOnly"
                             :field-path-prefix="fieldPathPrefix ? `${fieldPathPrefix}.${handle}` : handle"
                             :meta-path-prefix="metaPathPrefix ? `${metaPathPrefix}.${handle}` : handle"
                         >
-                            <Fields class="pt-4" :class="{ 'px-4 py-4': config.border }"/>
+                            <Fields :class="{ 'px-4 py-4': config.border, 'pt-4': !config.border && !config.hide_display }"/>
                         </FieldsProvider>
                     </div>
                 </section>
diff --git a/resources/js/components/fieldtypes/LinkFieldtype.vue b/resources/js/components/fieldtypes/LinkFieldtype.vue
index 6ac64115f14..d0797f6d472 100644
--- a/resources/js/components/fieldtypes/LinkFieldtype.vue
+++ b/resources/js/components/fieldtypes/LinkFieldtype.vue
@@ -2,36 +2,22 @@
     <div class="flex gap-2 sm:gap-3">
         <!-- Link type selector -->
         <div class="w-fit">
-            <Select :options v-model="option"  />
+            <Select :options v-model="option" :adaptive-width="true" />
         </div>
 
         <div class="flex-1 flex">
-            <!-- URL text input -->
             <Input v-if="option === 'url'" :read-only="isReadOnly" v-model="urlValue" />
 
-            <!-- Entry select -->
-            <relationship-fieldtype
-                :config="meta.entry.config"
-                :meta="meta.entry.meta"
-                :value="selectedEntries"
-                @update:meta="meta.entry.meta = $event"
-                @update:value="entriesSelected"
-                button-size="base"
-                handle="entry"
-                ref="entries"
-                v-if="option === 'entry'"
-            />
-
-            <!-- Asset select -->
-            <assets-fieldtype
-                v-if="option === 'asset'"
-                ref="assets"
-                handle="asset"
-                :value="selectedAssets"
-                :config="meta.asset.config"
-                :meta="meta.asset.meta"
-                @update:value="assetsSelected"
-                @update:meta="meta.asset.meta = $event"
+            <component
+                v-else-if="matchedType"
+                :is="matchedTypeComponent"
+                ref="typeField"
+                :config="matchedType.config"
+                :meta="matchedType.meta"
+                :value="selectedByType[option]"
+                :handle="option"
+                @update:value="typeSelected"
+                @update:meta="updateTypeMeta"
             />
         </div>
     </div>
@@ -40,9 +26,12 @@
 <script>
 import Fieldtype from './Fieldtype.vue';
 import { Input, Select } from '@/components/ui';
+import debounce from '@/util/debounce.js';
+import { markRaw } from 'vue';
+import { UPDATE_DEBOUNCE_MS } from './constants';
 
 export default {
-    components: { Input, Text, Select },
+    components: { Input, Select },
     mixins: [Fieldtype],
 
     provide: {
@@ -54,33 +43,42 @@ export default {
             option: this.meta.initialOption,
             options: this.initialOptions(),
             urlValue: this.meta.initialUrl,
-            selectedEntries: this.meta.initialSelectedEntries,
-            selectedAssets: this.meta.initialSelectedAssets,
+            selectedByType: this.initialSelectedByType(this.meta),
             metaChanging: false,
         };
     },
 
+    created() {
+        this.syncUrlDebounced = markRaw(debounce((url) => {
+            this.update(url);
+            this.updateMeta({ ...this.meta, initialUrl: url });
+        }, UPDATE_DEBOUNCE_MS));
+    },
+
     computed: {
-        entryValue() {
-            return this.selectedEntries.length ? `entry::${this.selectedEntries[0]}` : null;
+        matchedType() {
+            return this.meta.types[this.option] ?? null;
+        },
+
+        matchedTypeComponent() {
+            return `${this.matchedType.component}-fieldtype`;
         },
 
-        assetValue() {
-            return this.selectedAssets.length ? `asset::${this.selectedAssets[0]}` : null;
+        typeValue() {
+            const selected = this.selectedByType[this.option];
+            return selected && selected.length ? `${this.option}::${selected[0]}` : null;
         },
 
         replicatorPreview() {
             if (!this.showFieldPreviews) return;
 
-            switch (this.option) {
-                case 'url':
-                    return this.urlValue;
-                case 'first-child':
-                    return __('First Child');
-                case 'entry':
-                    return data_get(this.meta, 'entry.meta.data.0.title', this.entryValue);
-                case 'asset':
-                    return data_get(this.meta, 'asset.meta.data.0.basename', this.assetValue);
+            if (this.option === 'url') return this.urlValue;
+            if (this.option === 'first-child') return __('First Child');
+
+            if (this.matchedType) {
+                return data_get(this.meta, `types.${this.option}.meta.data.0.title`)
+                    ?? data_get(this.meta, `types.${this.option}.meta.data.0.basename`)
+                    ?? this.typeValue;
             }
 
             return this.value;
@@ -97,18 +95,10 @@ export default {
                 this.updateDebounced(this.urlValue);
             } else if (option === 'first-child') {
                 this.update('@child');
-            } else if (option === 'entry') {
-                if (this.entryValue) {
-                    this.update(this.entryValue);
-                } else {
-                    setTimeout(() => this.$refs.entries.linkExistingItem(), 0);
-                }
-            } else if (option === 'asset') {
-                if (this.assetValue) {
-                    this.update(this.assetValue);
-                } else {
-                    setTimeout(() => this.$refs.assets.openSelector(), 0);
-                }
+            } else if (this.matchedType) {
+                this.typeValue
+                    ? this.update(this.typeValue)
+                    : this.$nextTick(() => this.openTypeSelector());
             }
 
             this.updateMeta({ ...this.meta, initialOption: option });
@@ -116,19 +106,17 @@ export default {
 
         urlValue(url) {
             if (this.metaChanging) return;
-
-            this.update(url);
-            this.updateMeta({ ...this.meta, initialUrl: url });
+            this.syncUrlDebounced(url);
         },
 
         meta(meta, oldMeta) {
+            if (meta === oldMeta) return;
             if (JSON.stringify(meta) === JSON.stringify(oldMeta)) return;
 
             this.metaChanging = true;
             this.urlValue = meta.initialUrl;
             this.option = meta.initialOption;
-            this.selectedEntries = meta.initialSelectedEntries;
-            this.selectedAssets = meta.initialSelectedAssets;
+            this.selectedByType = this.initialSelectedByType(meta);
             this.$nextTick(() => (this.metaChanging = false));
         },
     },
@@ -142,22 +130,45 @@ export default {
 
                 this.meta.showFirstChildOption ? { label: __('First Child'), value: 'first-child' } : null,
 
-                { label: __('Entry'), value: 'entry' },
-
-                this.meta.showAssetOption ? { label: __('Asset'), value: 'asset', maxFiles: 1 } : null,
+                ...Object.entries(this.meta.types).map(([handle, type]) => ({ label: type.title, value: handle })),
             ].filter((option) => option);
         },
 
-        entriesSelected(entries) {
-            this.selectedEntries = entries;
-            this.update(this.entryValue);
-            this.updateMeta({ ...this.meta, initialSelectedEntries: entries });
+        initialSelectedByType(meta) {
+            return Object.fromEntries(
+                Object.entries(meta.types).map(([handle, type]) => [handle, type.selected])
+            );
+        },
+
+        openTypeSelector() {
+            const field = this.$refs.typeField;
+
+            if (!field) return;
+
+            if (typeof field.linkExistingItem === 'function') field.linkExistingItem();
+            else if (typeof field.openSelector === 'function') field.openSelector();
+        },
+
+        typeSelected(selected) {
+            this.selectedByType = { ...this.selectedByType, [this.option]: selected };
+            this.update(this.typeValue);
+            this.updateMeta({
+                ...this.meta,
+                types: {
+                    ...this.meta.types,
+                    [this.option]: { ...this.meta.types[this.option], selected },
+                },
+            });
         },
 
-        assetsSelected(assets) {
-            this.selectedAssets = assets;
-            this.update(this.assetValue);
-            this.updateMeta({ ...this.meta, initialSelectedAssets: assets });
+        updateTypeMeta(typeMeta) {
+            this.updateMeta({
+                ...this.meta,
+                types: {
+                    ...this.meta.types,
+                    [this.option]: { ...this.meta.types[this.option], meta: typeMeta },
+                },
+            });
         },
     },
 };
diff --git a/resources/js/components/fieldtypes/LinkIndexFieldtype.vue b/resources/js/components/fieldtypes/LinkIndexFieldtype.vue
new file mode 100644
index 00000000000..fe76aaf1d1e
--- /dev/null
+++ b/resources/js/components/fieldtypes/LinkIndexFieldtype.vue
@@ -0,0 +1,13 @@
+<script setup>
+import IndexFieldtype from '@/components/fieldtypes/index-fieldtype.js';
+import { Icon } from '@ui';
+
+const props = defineProps(IndexFieldtype.props);
+</script>
+
+<template>
+    <a v-if="value" :key="value.url" :href="value.url" target="_blank" rel="noopener noreferrer" class="flex items-center space-x-2 text-ellipsis">
+        <Icon :name="value.icon" class="size-3 flex-shrink-0" />
+        <span v-text="value.url" />
+    </a>
+</template>
diff --git a/resources/js/components/fieldtypes/ListFieldtype.vue b/resources/js/components/fieldtypes/ListFieldtype.vue
index e93fedcdd85..56c250e9f6c 100644
--- a/resources/js/components/fieldtypes/ListFieldtype.vue
+++ b/resources/js/components/fieldtypes/ListFieldtype.vue
@@ -23,6 +23,7 @@
                                 class="!inset-shadow-none focus:!inset-shadow-none"
                                 v-model="element.value"
                                 :readonly="isReadOnly"
+                                :input-attrs="{ dir: contentDirection }"
                                 @blur="focused = false"
                                 @focus="editItemWithoutFocusing(index)"
                                 @keydown.enter.prevent="nextItem"
@@ -58,6 +59,7 @@
 import Fieldtype from './Fieldtype.vue';
 import { SortableList, SortableHelpers } from '../sortable/Sortable';
 import { Button } from '@/components/ui';
+import { useContentDirection } from '@/composables/content-direction';
 
 export default {
     mixins: [Fieldtype, SortableHelpers],
@@ -67,6 +69,12 @@ export default {
         Button,
     },
 
+    setup() {
+        const { direction: contentDirection } = useContentDirection();
+
+        return { contentDirection };
+    },
+
     data() {
         return {
             data: [],
@@ -114,7 +122,7 @@ export default {
 
     computed: {
         addButton() {
-            return __(this.config.add_button || 'Add Item');
+            return __(this.config.add_row) || __(this.config.add_button) || __('Add Item');
         },
     },
 
diff --git a/resources/js/components/fieldtypes/RadioFieldtype.vue b/resources/js/components/fieldtypes/RadioFieldtype.vue
index 066aee36835..386ede7013f 100644
--- a/resources/js/components/fieldtypes/RadioFieldtype.vue
+++ b/resources/js/components/fieldtypes/RadioFieldtype.vue
@@ -1,5 +1,5 @@
 <template>
-    <RadioGroup :inline="config.inline" :model-value="value" @update:model-value="update" ref="radio">
+    <RadioGroup :appearance="appearance" :model-value="value" @update:model-value="update" ref="radio">
         <Radio
             v-for="(option, index) in options"
             :disabled="config.disabled"
@@ -25,6 +25,14 @@ export default {
     },
 
     computed: {
+        appearance() {
+            if (this.config.appearance !== 'default') {
+                return this.config.appearance;
+            }
+
+            return this.config.inline ? 'inline' : 'default';
+        },
+
         options() {
             return this.normalizeInputOptions(this.meta.options || this.config.options);
         },
diff --git a/resources/js/components/fieldtypes/SelectFieldtype.vue b/resources/js/components/fieldtypes/SelectFieldtype.vue
index 9faa8fc215e..93707a46500 100644
--- a/resources/js/components/fieldtypes/SelectFieldtype.vue
+++ b/resources/js/components/fieldtypes/SelectFieldtype.vue
@@ -1,5 +1,6 @@
 <template>
     <Combobox
+        :id="id"
         :clearable="config.clearable"
         :disabled="config.disabled"
         :label-html="config.label_html"
@@ -11,7 +12,7 @@
         :read-only="isReadOnly"
         :searchable="config.searchable || config.taggable"
         :taggable="config.taggable"
-        :id="id"
+        :close-on-select="(config.taggable && !options.length) || !config.multiple"
         @update:modelValue="comboboxUpdated"
     />
 </template>
diff --git a/resources/js/components/fieldtypes/SlugFieldtype.vue b/resources/js/components/fieldtypes/SlugFieldtype.vue
index 01f73e15e96..d9dda4158e7 100644
--- a/resources/js/components/fieldtypes/SlugFieldtype.vue
+++ b/resources/js/components/fieldtypes/SlugFieldtype.vue
@@ -19,6 +19,7 @@
             :read-only="isReadOnly"
             :name="slug"
             :disabled="config.disabled"
+            :input-attrs="{ dir: contentDirection }"
             @focus="$emit('focus')"
             @blur="$emit('blur')"
         >
@@ -40,6 +41,7 @@
 import { data_get } from '../../bootstrap/globals';
 import Fieldtype from './Fieldtype.vue';
 import { Input, Button, Icon } from '@/components/ui';
+import { useContentDirection } from '@/composables/content-direction';
 
 export default {
     mixins: [Fieldtype],
@@ -50,6 +52,12 @@ export default {
         Icon,
     },
 
+    setup() {
+        const { direction: contentDirection } = useContentDirection();
+
+        return { contentDirection };
+    },
+
     data() {
         return {
             slug: this.value,
diff --git a/resources/js/components/fieldtypes/TableFieldtype.vue b/resources/js/components/fieldtypes/TableFieldtype.vue
index 088a14631a2..beec9ba869d 100644
--- a/resources/js/components/fieldtypes/TableFieldtype.vue
+++ b/resources/js/components/fieldtypes/TableFieldtype.vue
@@ -43,6 +43,7 @@
                                     <ui-input
                                         v-model="row.value.cells[cellIndex]"
                                         :readonly="isReadOnly"
+                                        :input-attrs="{ dir: contentDirection }"
                                     />
                                 </td>
                                 <td class="row-controls" v-if="canDeleteRows">
@@ -88,6 +89,7 @@
 <script>
 import Fieldtype from './Fieldtype.vue';
 import { SortableList, SortableHelpers } from '../sortable/Sortable';
+import { useContentDirection } from '@/composables/content-direction';
 
 export default {
     mixins: [Fieldtype, SortableHelpers],
@@ -96,6 +98,12 @@ export default {
         SortableList,
     },
 
+    setup() {
+        const { direction: contentDirection } = useContentDirection();
+
+        return { contentDirection };
+    },
+
     data: function () {
         return {
             data: this.arrayToSortable(this.value || []),
diff --git a/resources/js/components/fieldtypes/TagsFieldtype.vue b/resources/js/components/fieldtypes/TagsFieldtype.vue
index 0d46744b821..6187d397d07 100644
--- a/resources/js/components/fieldtypes/TagsFieldtype.vue
+++ b/resources/js/components/fieldtypes/TagsFieldtype.vue
@@ -6,8 +6,10 @@
         :multiple="true"
         :options="options"
         :placeholder="__(config.placeholder)"
+        :paste-delimiter="config.paste_delimiter || ','"
         :read-only="isReadOnly"
         :taggable="true"
+        :should-open-dropdown="(open) => open && options.length > 0"
         @update:modelValue="update"
     />
 </template>
diff --git a/resources/js/components/fieldtypes/TextFieldtype.vue b/resources/js/components/fieldtypes/TextFieldtype.vue
index 83121ccb8cc..8b7664eb2f1 100644
--- a/resources/js/components/fieldtypes/TextFieldtype.vue
+++ b/resources/js/components/fieldtypes/TextFieldtype.vue
@@ -14,7 +14,7 @@
         :placeholder="__(config.placeholder)"
         :name="name"
         :id="id"
-        :direction="config.direction"
+        :input-attrs="{ dir: contentDirection }"
         @update:model-value="inputUpdated"
         @focus="$emit('focus')"
         @blur="$emit('blur')"
@@ -25,6 +25,7 @@
 import Fieldtype from '@/components/fieldtypes/fieldtype.js';
 import { Input } from '@/components/ui';
 import { computed } from 'vue';
+import { useContentDirection } from '@/composables/content-direction';
 
 const emit = defineEmits(Fieldtype.emits);
 const props = defineProps(Fieldtype.props);
@@ -36,6 +37,8 @@ const {
     expose
 } = Fieldtype.use(emit, props);
 
+const { direction: contentDirection } = useContentDirection();
+
 const shouldFocus = computed(() => {
     if (props.config.focus === false || props.config.focus === true) {
         return props.config.focus;
diff --git a/resources/js/components/fieldtypes/TextareaFieldtype.vue b/resources/js/components/fieldtypes/TextareaFieldtype.vue
index 91442bfbff9..f3b28678e83 100644
--- a/resources/js/components/fieldtypes/TextareaFieldtype.vue
+++ b/resources/js/components/fieldtypes/TextareaFieldtype.vue
@@ -7,6 +7,7 @@
         :limit="config.character_limit || null"
         :placeholder="__(config.placeholder)"
         :model-value="value"
+        :dir="contentDirection"
         @blur="$emit('blur')"
         @focus="$emit('focus')"
         @update:model-value="updateDebounced"
@@ -16,9 +17,16 @@
 <script>
 import Fieldtype from './Fieldtype.vue';
 import { Textarea } from '@/components/ui';
+import { useContentDirection } from '@/composables/content-direction';
 
 export default {
     mixins: [Fieldtype],
     components: { Textarea },
+
+    setup() {
+        const { direction: contentDirection } = useContentDirection();
+
+        return { contentDirection };
+    },
 };
 </script>
diff --git a/resources/js/components/fieldtypes/TimeFieldtype.vue b/resources/js/components/fieldtypes/TimeFieldtype.vue
index f1fc91ea983..5a6c28b6f84 100644
--- a/resources/js/components/fieldtypes/TimeFieldtype.vue
+++ b/resources/js/components/fieldtypes/TimeFieldtype.vue
@@ -1,11 +1,13 @@
 <template>
-	<Button :text="__('Set Time')" icon="fieldtype-time" v-if="!isReadOnly && !hasTime" @click="addTime" />
+	<Button :text="__('Set Time')" icon="fieldtype-time" v-if="!isReadOnly && !config.disabled && !hasTime" @click="addTime" />
 
     <TimePicker
 	    v-if="hasTime"
         ref="time"
         :model-value="timePickerValue"
         :granularity="useSeconds ? 'second' : 'minute'"
+        :disabled="config.disabled"
+        :read-only="isReadOnly"
         @update:model-value="timePickerUpdated"
     />
 </template>
diff --git a/resources/js/components/fieldtypes/assets/Asset.js b/resources/js/components/fieldtypes/assets/Asset.js
index 980a9c9f12c..a505a628dd9 100644
--- a/resources/js/components/fieldtypes/assets/Asset.js
+++ b/resources/js/components/fieldtypes/assets/Asset.js
@@ -16,11 +16,16 @@ export default {
             type: Boolean,
             default: true,
         },
+        siblings: {
+            type: Array,
+            default: () => [],
+        },
     },
 
     data() {
         return {
             editing: false,
+            editingId: null,
         };
     },
 
@@ -50,12 +55,18 @@ export default {
         },
 
         label() {
-            return this.asset.basename;
+            return this.asset.invalid ? this.asset.id : this.asset.basename;
         },
 
         needsAlt() {
+            if (this.asset.invalid) return false;
+
             return (this.asset.isImage || this.asset.isSvg) && !this.asset.values.alt;
         },
+
+        invalidLabel() {
+            return __('messages.relationship_item_unavailable');
+        },
     },
 
     methods: {
@@ -67,8 +78,10 @@ export default {
 
         edit() {
             if (this.readOnly) return;
+            if (this.asset?.invalid) return;
 
             this.editing = true;
+            this.editingId = this.asset?.id ?? null;
         },
 
         remove() {
@@ -91,6 +104,7 @@ export default {
 
         closeEditor() {
             this.editing = false;
+            this.editingId = null;
         },
 
         assetSaved(asset) {
@@ -101,10 +115,28 @@ export default {
         actionCompleted(successful, response) {
             if (successful === false) return;
             const id = response.ids[0] || null;
-            if (id && id !== this.asset.id) {
-                this.$emit('id-changed', id);
+            if (id && id !== this.editingId) {
+                this.$emit('id-changed', this.editingId, id);
             }
             this.closeEditor();
         },
+
+        navigateToPrevious() {
+            const index = this.siblings.findIndex((asset) => asset.id === this.editingId);
+            if (index <= 0) return;
+
+            const previousId = this.siblings[index - 1].id;
+            this.editingId = null;
+            this.$nextTick(() => (this.editingId = previousId));
+        },
+
+        navigateToNext() {
+            const index = this.siblings.findIndex((asset) => asset.id === this.editingId);
+            if (index === -1 || index >= this.siblings.length - 1) return;
+
+            const nextId = this.siblings[index + 1].id;
+            this.editingId = null;
+            this.$nextTick(() => (this.editingId = nextId));
+        },
     },
 };
diff --git a/resources/js/components/fieldtypes/assets/AssetRow.vue b/resources/js/components/fieldtypes/assets/AssetRow.vue
index fc9969c658f..74c9b7160ee 100644
--- a/resources/js/components/fieldtypes/assets/AssetRow.vue
+++ b/resources/js/components/fieldtypes/assets/AssetRow.vue
@@ -1,7 +1,7 @@
 <template>
     <!-- Safari doesn't support `position: relative` on `<tr>` elements, but these two properties can be used as an alternative. Source: https://mtsknn.fi/blog/relative-tr-in-safari/ transform: translate(0); clip-path: inset(0); -->
     <tr class="group relative bg-white hover:bg-gray-50 dark:bg-gray-900 dark:hover:bg-gray-900 border-b dark:border-gray-600 last:border-b-0" :class="{ 'cursor-grab': !readOnly }" style="transform: translate(0); clip-path: inset(0);">
-        <td class="flex gap-2 sm:gap-3 h-full items-center p-3">
+        <td class="flex h-full min-w-0 items-center gap-2 p-3 sm:gap-3">
             <div
                 v-if="canShowSvg"
                 class="img svg-img flex size-7 items-center justify-center bg-cover bg-center bg-no-repeat text-center"
@@ -9,7 +9,7 @@
             ></div>
             <button
                 v-else
-                class="flex size-7 cursor-pointer items-center justify-center whitespace-nowrap"
+                class="flex size-7 shrink-0 cursor-pointer items-center justify-center whitespace-nowrap"
                 @click="editOrOpen"
             >
                 <img
@@ -19,19 +19,24 @@
                     :alt="asset.basename"
                     v-if="thumbnail"
                 />
-                <file-icon :extension="asset.extension" v-else class="size-7" />
+                <file-icon :extension="asset.extension ?? 'generic'" v-else class="size-7" />
             </button>
             <button
                 v-if="showFilename"
                 @click="editOrOpen"
-                class="w-full truncate text-sm text-gray-600 dark:text-gray-400 text-start"
-                :title="__('Edit')"
+                class="min-w-0 flex-1 truncate text-start text-sm leading-5"
+                :class="{
+                    'text-gray-600 dark:text-gray-300': !asset.invalid,
+                    'text-gray-500 dark:text-gray-400': asset.invalid
+                }"
+                :title="asset.invalid ? invalidLabel : __('Edit')"
                 :aria-label="__('Edit Asset')"
             >
-                {{ asset.basename }}
+                {{ label }}
             </button>
+            <div v-if="readOnly" v-text="asset.size" class="asset-filesize hidden shrink-0 px-2 text-sm leading-5 text-gray-600 dark:text-gray-400 @xs:block" />
         </td>
-        <td class="absolute top-0 right-0 flex items-center bg-gradient-to-r to-20% from-transparent to-white dark:to-gray-900 p-3 ps-[2rem] align-middle text-end group-hover:to-gray-50 dark:group-hover:to-gray-900">
+        <td v-if="!readOnly" class="absolute top-0 right-0 flex items-center bg-linear-to-r to-20% from-transparent to-white p-3 ps-8 align-middle text-end group-hover:to-gray-50 dark:to-gray-900 dark:group-hover:to-gray-900">
             <ui-badge
                 v-if="showSetAlt && needsAlt"
                 as="button"
@@ -40,7 +45,7 @@
                 @click="editOrOpen"
             />
             <div v-text="asset.size" class="asset-filesize hidden px-2 text-sm text-gray-600 dark:text-gray-400 @xs:inline" />
-            <div v-if="!readOnly">
+            <div>
                 <ui-button
                     @click="remove"
                     icon="x"
@@ -52,9 +57,12 @@
                 />
 
                 <asset-editor
-                    v-if="editing"
-                    :id="asset.id"
+                    v-if="editingId"
+                    :id="editingId"
                     :allow-deleting="false"
+                    :show-navigation="siblings.length > 1"
+                    @previous="navigateToPrevious"
+                    @next="navigateToNext"
                     @closed="closeEditor"
                     @saved="assetSaved"
                     @action-completed="actionCompleted"
diff --git a/resources/js/components/fieldtypes/assets/AssetTile.vue b/resources/js/components/fieldtypes/assets/AssetTile.vue
index 08b2a888f7e..bfab7cdd54d 100644
--- a/resources/js/components/fieldtypes/assets/AssetTile.vue
+++ b/resources/js/components/fieldtypes/assets/AssetTile.vue
@@ -6,12 +6,15 @@
             'is-svg': canShowSvg,
             'is-file': !isImage && !canShowSvg,
         }"
-        :title="label"
+        :title="asset.invalid ? invalidLabel : label"
     >
         <asset-editor
-            v-if="editing"
-            :id="asset.id"
+            v-if="editingId"
+            :id="editingId"
             :allow-deleting="false"
+            :show-navigation="siblings.length > 1"
+            @previous="navigateToPrevious"
+            @next="navigateToNext"
             @closed="closeEditor"
             @saved="assetSaved"
             @action-completed="actionCompleted"
@@ -35,7 +38,7 @@
                     <template v-else>
                         <img :src="thumbnail" v-if="thumbnail" :title="label" class="rounded-md relative"  />
 
-                        <file-icon v-else :extension="asset.extension" class="h-full w-full p-4 relative" />
+                        <file-icon v-else :extension="asset.extension ?? 'generic'" class="h-full w-full p-4 relative" />
                     </template>
                 </template>
 
@@ -66,7 +69,15 @@
         </div>
 
         <div class="flex items-center justify-between w-full px-1" v-if="showFilename">
-            <div class="truncate w-18 text-xs text-gray-600 dark:text-gray-400 flex-1 px-2 py-1" v-tooltip="label" :class="{ 'text-center': !needsAlt }">
+            <div
+                class="truncate w-18 text-xs flex-1 px-2 py-1"
+                :class="{
+                    'text-center': !needsAlt,
+                    'text-gray-600 dark:text-gray-300': !asset.invalid,
+                    'text-gray-500 dark:text-gray-400': asset.invalid,
+                }"
+                v-tooltip="asset.invalid ? invalidLabel : label"
+            >
                 {{ label }}
             </div>
             <ui-badge as="button" size="sm" color="sky"  @click="editOrOpen" v-if="asset.isEditable && showSetAlt && needsAlt" :text="asset.values.alt ? '✅' : __('Set Alt')" />
diff --git a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
index 1516cec1080..d1c52c6dc5a 100644
--- a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
+++ b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
@@ -88,6 +88,10 @@
                     />
                 </div>
 
+                <div v-if="isReadOnly && !expanded" class="border border-gray-300 dark:border-gray-700 border-dashed rounded-lg p-3 text-center">
+                    <ui-icon name="assets" class="size-5 text-gray-300 dark:text-gray-700 mx-auto" />
+                </div>
+
                 <template v-if="expanded">
                     <sortable-list
                         v-if="expanded && displayMode === 'grid'"
@@ -104,7 +108,7 @@
                     >
                         <div
                             class="bg-white relative grid gap-4 2xl:gap-10 p-3 relative rounded-xl border border-gray-300 dark:bg-gray-850 dark:border-gray-700"
-                            :class="{ 'border-t-0 rounded-t-none': !isReadOnly && (showPicker || uploads.length) }"
+                            :class="{ 'border-t-0 rounded-t-none': !isReadOnly && (showPicker || uploads.length), 'border-dashed': isReadOnly }"
                             ref="assets"
                             style="grid-template-columns: repeat(auto-fill, minmax(110px, 1fr));"
                         >
@@ -112,13 +116,14 @@
                                 v-for="asset in assets"
                                 :key="asset.id"
                                 :asset="asset"
+                                :siblings="assets"
                                 :read-only="isReadOnly"
                                 :show-filename="config.show_filename"
                                 :show-set-alt="showSetAlt"
                                 :checkerboard-mode="checkerboardMode"
                                 @updated="assetUpdated"
                                 @removed="assetRemoved"
-                                @id-changed="idChanged(asset.id, $event)"
+                                @id-changed="idChanged"
                             >
                             </asset-tile>
                         </div>
@@ -126,7 +131,7 @@
 
                     <div
                         class="relative overflow-hidden rounded-xl border border-gray-300 dark:border-gray-700"
-                        :class="{ 'not-[.link-fieldtype_&]:border-t-0! not-[.link-fieldtype_&]:rounded-t-none': !isReadOnly && (showPicker || uploads.length) }"
+                        :class="{ 'not-[.link-fieldtype_&]:border-t-0! not-[.link-fieldtype_&]:rounded-t-none': !isReadOnly && (showPicker || uploads.length), 'border-dashed': isReadOnly }"
                         v-if="displayMode === 'list'"
                     >
                         <table class="table-fixed w-full">
@@ -152,12 +157,13 @@
                                         v-for="asset in assets"
                                         :key="asset.id"
                                         :asset="asset"
+                                        :siblings="assets"
                                         :read-only="isReadOnly"
                                         :show-filename="config.show_filename"
                                         :show-set-alt="showSetAlt"
                                         @updated="assetUpdated"
                                         @removed="assetRemoved"
-                                        @id-changed="idChanged(asset.id, $event)"
+                                        @id-changed="idChanged"
                                     />
                                 </tbody>
                             </sortable-list>
@@ -621,7 +627,7 @@ export default {
 
         uploadSelected(upload) {
             const path = `${this.folder}/${upload.basename}`.replace(/^\/+/, '');
-            const id = `${this.container.handle}::${path}`;
+            const id = `${this.container.id}::${path}`;
 
             this.uploads.splice(this.uploads.indexOf(upload), 1);
 
diff --git a/resources/js/components/fieldtypes/bard/BardButtonsSettingFieldtype.vue b/resources/js/components/fieldtypes/bard/BardButtonsSettingFieldtype.vue
index ce3e6f9ee44..974c3d40764 100644
--- a/resources/js/components/fieldtypes/bard/BardButtonsSettingFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardButtonsSettingFieldtype.vue
@@ -6,6 +6,7 @@
                 :key="button.name"
                 v-tooltip="button.text"
                 :class="{ active: enabled(button.name) }"
+                @mousedown.prevent
                 @click="toggleButton(button.name)"
             >
                 <ui-icon :name="button.svg" v-if="button.svg" />
diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
index 170ef3f7662..e682303b6f1 100644
--- a/resources/js/components/fieldtypes/bard/BardFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -116,7 +116,7 @@
                         </floating-menu>
 
                         <div class="bard-error" v-if="initError" v-text="initError"></div>
-                        <editor-content :editor="editor" :id="fieldId" />
+                        <editor-content :editor="editor" :id="fieldId" :dir="contentDirection" />
                     </div>
                     <div
                         class="bard-footer-toolbar"
@@ -177,6 +177,7 @@ import 'highlight.js/styles/github.css';
 import importTiptap from '@/util/tiptap.js';
 import { computed } from 'vue';
 import { data_get } from "@/bootstrap/globals.js";
+import { useContentDirection } from '@/composables/content-direction';
 
 const lowlight = createLowlight(common);
 let tiptap = null;
@@ -198,6 +199,12 @@ export default {
         isInBardField: true,
     },
 
+    setup() {
+        const { direction: contentDirection } = useContentDirection();
+
+        return { contentDirection };
+    },
+
     data() {
         return {
             events: new Emitter(),
@@ -442,11 +449,13 @@ export default {
         value(value, oldValue) {
             if (!this.editor) return;
 
+            if (this.editor.view.dom.contains(document.activeElement)) return;
+
             const oldContent = this.editor.getJSON();
             const content = this.valueToContent(value);
 
             if (JSON.stringify(content) !== JSON.stringify(oldContent)) {
-                this.editor.commands.clearContent();
+                this.editor.commands.clearContent(false);
                 this.editor.commands.setContent(content, true);
             }
         },
diff --git a/resources/js/components/fieldtypes/bard/Image.vue b/resources/js/components/fieldtypes/bard/Image.vue
index 5a51b1dedf3..0dead0b49ed 100644
--- a/resources/js/components/fieldtypes/bard/Image.vue
+++ b/resources/js/components/fieldtypes/bard/Image.vue
@@ -14,12 +14,12 @@
             <div
                 class="flex flex-wrap items-center justify-center gap-2 border-t px-2 py-2 text-center text-2xs text-white @container/toolbar dark:border-gray-900 dark:text-gray-300"
             >
-                <Button v-if="!src" size="sm" icon="folder-photos" :text="__('Choose Image')" @click="openSelector" />
+                <Button v-if="!src" size="sm" icon="folder-photos" :text="__('Choose Image')" @mousedown.prevent @click="openSelector" />
 
-                <Button v-if="src" size="sm" icon="edit" :text="__('Edit Image')" @click="edit" />
-                <Button v-if="src" size="sm" icon="rename" :text="__('Override Alt')" :class="{ active: showingAltEdit }" @click="toggleAltEditor" />
-                <Button v-if="src" size="sm" icon="replace" :text="__('Replace')" @click="openSelector" />
-                <Button v-if="src" size="sm" icon="trash" :text="__('Remove')" @click="deleteNode" />
+                <Button v-if="src" size="sm" icon="edit" :text="__('Edit Image')" @mousedown.prevent @click="edit" />
+                <Button v-if="src" size="sm" icon="rename" :text="__('Override Alt')" :class="{ active: showingAltEdit }" @mousedown.prevent @click="toggleAltEditor" />
+                <Button v-if="src" size="sm" icon="replace" :text="__('Replace')" @mousedown.prevent @click="openSelector" />
+                <Button v-if="src" size="sm" icon="trash" :text="__('Remove')" @mousedown.prevent @click="deleteNode" />
             </div>
 
             <div
@@ -55,6 +55,7 @@
                 :id="assetId"
                 :showToolbar="false"
                 :allow-deleting="false"
+                :show-navigation="false"
                 @closed="closeEditor"
                 @saved="editorAssetSaved"
                 @actionCompleted="actionCompleted"
diff --git a/resources/js/components/fieldtypes/bard/LinkToolbar.vue b/resources/js/components/fieldtypes/bard/LinkToolbar.vue
index 2753706489a..b4fd53535c6 100644
--- a/resources/js/components/fieldtypes/bard/LinkToolbar.vue
+++ b/resources/js/components/fieldtypes/bard/LinkToolbar.vue
@@ -3,13 +3,13 @@
         <section class="flex gap-3 items-center">
             <ui-select
                 v-model="linkType"
-                :options="visibleLinkTypes"
+                :options="linkTypes"
                 option-label="title"
                 option-value="type"
                 class="w-1/4 min-w-24"
             />
 
-            <div class="flex-1 min-w-0">
+            <div class="flex-1 min-w-0 link-fieldtype">
                 <!-- URL input -->
                 <ui-input
                     v-if="linkType === 'url'"
@@ -40,46 +40,32 @@
                     @keydown.enter.prevent="commit"
                 />
 
-                <!-- Data input -->
-                <div
-                    v-else
-                    :class="[
-                                'flex overflow-hidden cursor-pointer items-center justify-between',
-                                'w-full block bg-white dark:bg-gray-900 min-w-0',
-                                'border border-gray-300 with-contrast:border-gray-500 dark:border-gray-700 dark:with-contrast:border-gray-500 dark:inset-shadow-2xs dark:inset-shadow-black',
-                                'text-gray-925 dark:text-gray-300 placeholder:text-gray-500 dark:placeholder:text-gray-400/85',
-                                'appearance-none antialiased shadow-ui-sm disabled:shadow-none disabled:opacity-50 not-prose',
-                                'text-sm rounded-lg px-2.5 py-1.5 h-10 leading-[1.125rem]'
-                            ]"
-                    @click="openSelector"
-                >
-                    <Icon v-if="isLoading" name="loading" />
-
-                    <div v-else class="flex flex-1 items-center me-2 overflow-hidden min-w-0">
-                        <img
-                            v-if="linkType === 'asset' && itemData.asset && itemData.asset.isImage"
-                            :src="itemData.asset.thumbnail || itemData.asset.url"
-                            class="asset-thumbnail lazyloaded size-6 max-h-full max-w-full rounded-sm object-cover me-2 flex-shrink-0"
-                        />
-                        <div class="truncate min-w-0 flex-1">{{ displayValue || __('Choose item...') }}</div>
-                    </div>
-
-                    <button
-                        class="flex items-center cursor-pointer"
-                        v-tooltip="`${__('Browse')}...`"
-                        :aria-label="`${__('Browse')}...`"
-                        @click="openSelector"
-                    >
-                        <Icon v-show="linkType === 'asset'" name="folder-photos" class="size-4" />
-                        <Icon v-show="linkType !== 'asset'" name="folder" class="size-4" />
-                    </button>
-                </div>
+                <!-- Registered link type picker (entry, asset, or any custom type) -->
+                <component
+                    v-else-if="registeredLinkType"
+                    :is="registeredLinkTypeComponent"
+                    ref="typeField"
+                    :config="registeredLinkType.config"
+                    :meta="typeMeta"
+                    :value="selectedTypeValue"
+                    @update:value="typeSelected"
+                    @update:meta="typeMetaUpdated"
+                />
             </div>
         </section>
 
         <ui-separator :text="__('Advanced Options')" />
 
         <section class="space-y-5">
+            <!-- Append attribute -->
+            <ui-input
+                v-if="linkType === 'entry'"
+                type="text"
+                v-model="appends"
+                :prepend="__('Append')"
+                :placeholder="__('?query=params#anchor')"
+            />
+
             <!-- Title attribute -->
             <ui-input
                 type="text"
@@ -106,35 +92,6 @@
             </div>
         </section>
 
-        <relationship-input
-            class="hidden"
-            ref="relationshipInput"
-            name="link"
-            :value="[]"
-            :config="relationshipConfig"
-            :item-data-url="itemDataUrl"
-            :selections-url="selectionsUrl"
-            :filters-url="filtersUrl"
-            :columns="[{ label: __('Title'), field: 'title' }]"
-            :max-items="1"
-            :site="bard.site"
-            :search="true"
-            @loading="isLoading = $event"
-            @item-data-updated="entrySelected"
-        />
-
-        <Stack v-model:open="showAssetSelector" inset :show-close-button="false">
-            <asset-selector
-                :container="{id: config.container}"
-                :folder="config.folder || '/'"
-                :restrict-folder-navigation="config.restrict_assets"
-                :selected="[]"
-                :max-files="1"
-                :columns="bard.meta.assets.columns"
-                @selected="assetSelected"
-                @closed="showAssetSelector = false"
-            />
-        </Stack>
     </StackContent>
 
 
@@ -162,21 +119,21 @@
 </template>
 
 <script>
-import qs from 'qs';
-import AssetSelector from '../../assets/Selector.vue';
-import { Icon, Stack, StackContent, StackFooter } from '@/components/ui';
+import { Icon, StackContent, StackFooter } from '@/components/ui';
 
 export default {
     emits: ['updated', 'canceled', 'deselected'],
 
     components: {
-        AssetSelector,
         Icon,
-	    Stack,
         StackContent,
         StackFooter,
     },
 
+    provide: {
+        isInLinkField: true,
+    },
+
     props: {
         bard: {},
         config: Object,
@@ -186,47 +143,46 @@ export default {
     data() {
         return {
             linkType: 'url',
-            linkTypes: [
-                { type: 'url', title: __('URL') },
-                { type: 'entry', title: __('Entry') },
-                { type: 'asset', title: __('Asset') },
-                { type: 'mailto', title: __('Email') },
-                { type: 'tel', title: __('Phone') },
-            ],
             url: {},
             urlData: {},
             itemData: {},
+            appends: null,
             title: null,
             rel: null,
             targetBlank: false,
-            showAssetSelector: false,
-            isLoading: false,
+            typeMetaOverrides: {},
         };
     },
 
     computed: {
-        visibleLinkTypes() {
-            return this.linkTypes.filter((type) => {
-                if (type.type === 'asset' && !this.config.container) {
-                    return false;
-                }
-                return true;
-            });
+        linkTypes() {
+            return [
+                { type: 'url', title: __('URL') },
+                ...Object.entries(this.bard.meta.linkTypes ?? {}).map(([handle, type]) => ({
+                    type: handle,
+                    title: type.title,
+                })),
+                { type: 'mailto', title: __('Email') },
+                { type: 'tel', title: __('Phone') },
+            ];
+        },
+
+        registeredLinkType() {
+            return this.bard.meta.linkTypes?.[this.linkType] ?? null;
+        },
+
+        registeredLinkTypeComponent() {
+            return `${this.registeredLinkType.component}-fieldtype`;
         },
 
-        displayValue() {
-            switch (this.linkType) {
-                case 'url':
-                    return this.url.url;
-                case 'entry':
-                    return this.itemData.entry ? this.itemData.entry.title : null;
-                case 'asset':
-                    return this.itemData.asset ? this.itemData.asset.basename : null;
-                case 'mailto':
-                    return this.urlData.mailto ? this.urlData.mailto : null;
-                case 'tel':
-                    return this.urlData.tel ? this.urlData.tel : null;
+        typeMeta() {
+            if (this.typeMetaOverrides[this.linkType]) {
+                return this.typeMetaOverrides[this.linkType];
             }
+
+            const meta = this.registeredLinkType?.meta ?? {};
+
+            return this.selectedTypeData.length ? { ...meta, data: this.selectedTypeData } : meta;
         },
 
         canCommit() {
@@ -237,6 +193,13 @@ export default {
             return this.sanitizeLink(this.url[this.linkType]);
         },
 
+        normalizedAppends() {
+            const value = this.appends;
+            if (!value) return '';
+            if (value.startsWith('?') || value.startsWith('#')) return value;
+            return value.includes('=') ? `?${value}` : `#${value}`;
+        },
+
         defaultRel() {
             let rel = [];
             if (this.config.link_noopener) rel.push('noopener');
@@ -244,57 +207,18 @@ export default {
             return rel.length ? rel.join(' ') : null;
         },
 
-        relationshipConfig() {
-            return {
-                type: 'entries',
-                collections: this.collections,
-                max_items: 1,
-                select_across_sites: this.config.select_across_sites,
-            };
-        },
-
-        itemDataUrl() {
-            return (
-                cp_url('fieldtypes/relationship/data') +
-                '?' +
-                qs.stringify({
-                    config: this.configParameter,
-                })
-            );
-        },
-
-        selectionsUrl() {
-            return (
-                cp_url('fieldtypes/relationship') +
-                '?' +
-                qs.stringify({
-                    config: this.configParameter,
-                    collections: this.collections,
-                })
-            );
-        },
+        selectedTypeValue() {
+            const { type, id } = this.parseDataUrl(this.url[this.linkType]);
 
-        filtersUrl() {
-            return (
-                cp_url('fieldtypes/relationship/filters') +
-                '?' +
-                qs.stringify({
-                    config: this.configParameter,
-                    collections: this.collections,
-                })
-            );
+            return type === this.linkType && id ? [id] : [];
         },
 
-        configParameter() {
-            return utf8btoa(JSON.stringify(this.relationshipConfig));
-        },
-
-        collections() {
-            return this.bard.meta.linkCollections;
+        selectedTypeData() {
+            return this.itemData[this.linkType] ? [this.itemData[this.linkType]] : [];
         },
 
         canHaveTarget() {
-            return ['url', 'entry', 'asset'].includes(this.linkType);
+            return !['mailto', 'tel'].includes(this.linkType);
         },
 
         selectedTextIsEmail() {
@@ -307,8 +231,16 @@ export default {
     },
 
     watch: {
-        linkType() {
+        linkType(type) {
+            if (type != 'entry') {
+                this.appends = null;
+            }
+
             this.autofocus();
+
+            if (this.registeredLinkType && !this.selectedTypeValue.length) {
+                this.$nextTick(() => this.openSelector());
+            }
         },
 
         urlData: {
@@ -349,8 +281,8 @@ export default {
     methods: {
         applyAttrs(attrs) {
             this.linkType = this.getLinkTypeForUrl(attrs.href);
-
-            this.url = { [this.linkType]: attrs.href };
+            this.appends = this.getAppendsForUrl(attrs.href);
+            this.url = { [this.linkType]: this.appends ? attrs.href?.replace(this.appends, '') : attrs.href };
             this.urlData = { [this.linkType]: this.getUrlDataForUrl(attrs.href) };
             this.itemData = { [this.linkType]: this.getItemDataForUrl(attrs.href) };
 
@@ -393,7 +325,7 @@ export default {
             }
 
             this.$emit('updated', {
-                href: this.href,
+                href: this.href + this.normalizedAppends,
                 rel: this.rel,
                 target: this.canHaveTarget && this.targetBlank ? '_blank' : null,
                 title: this.title,
@@ -409,51 +341,29 @@ export default {
         },
 
         openSelector() {
-            if (this.linkType === 'entry') {
-                this.openEntrySelector();
-            } else if (this.linkType === 'asset') {
-                this.openAssetSelector();
-            }
-        },
+            const field = this.$refs.typeField;
 
-        openEntrySelector() {
-            this.$refs.relationshipInput.openSelector();
-        },
+            if (!field) return;
 
-        openAssetSelector() {
-            this.showAssetSelector = true;
+            if (typeof field.linkExistingItem === 'function') field.linkExistingItem();
+            else if (typeof field.openSelector === 'function') field.openSelector();
         },
 
-        assetSelected(data) {
-            if (data.length) {
-                this.loadAssetData(data[0]);
-            }
-        },
+        typeSelected(selected) {
+            const id = selected[0] ?? null;
 
-        loadAssetData(url) {
-            this.$axios
-                .post(cp_url('assets-fieldtype'), {
-                    assets: [url],
-                })
-                .then((response) => {
-                    this.selectItem('asset', response.data[0]);
-                    this.isLoading = false;
-                });
-        },
-
-        entrySelected(data) {
-            if (data.length) {
-                this.selectItem('entry', data[0]);
-            }
+            this.setUrl(this.linkType, id ? `statamic://${this.linkType}::${id}` : null);
         },
 
-        selectItem(type, item) {
-            const ref = `${type}::${item.id}`;
+        typeMetaUpdated(meta) {
+            this.typeMetaOverrides = { ...this.typeMetaOverrides, [this.linkType]: meta };
 
-            this.setItemData(type, item);
-            this.setUrl(type, `statamic://${ref}`);
+            const item = meta.data?.[0];
 
-            this.putItemDataIntoMeta(ref, item);
+            if (item) {
+                this.setItemData(this.linkType, item);
+                this.putItemDataIntoMeta(`${this.linkType}::${item.id}`, item);
+            }
         },
 
         putItemDataIntoMeta(ref, item) {
@@ -494,14 +404,24 @@ export default {
             return this.bard.meta.linkData[ref];
         },
 
+        getAppendsForUrl(urlString) {
+            // appends is only relevant to entry links
+            if (! urlString?.includes('statamic://entry::')) {
+                return null;
+            }
+
+            return urlString.replace(urlString.split(/[?#]/)[0], '') || null;
+        },
+
         parseDataUrl(url) {
             if (!url) {
                 return {};
             }
 
+            const appends = this.getAppendsForUrl(url);
             const regex = /^statamic:\/\/((.*?)::(.*))$/;
 
-            const matches = url.match(regex);
+            const matches = (appends ? url.replace(appends, '') : url).match(regex);
             if (!matches) {
                 return {};
             }
diff --git a/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue b/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
index 3764e835e02..6ab985a897b 100644
--- a/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
+++ b/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
@@ -14,6 +14,7 @@
                 size="sm"
                 :aria-label="button.text"
                 v-tooltip="button.text"
+                @mousedown.prevent
             >
                 <ui-icon :name="button.svg" v-if="button.svg" class="size-4" />
                 <div class="flex items-center" v-html="button.html" v-if="button.html" />
diff --git a/resources/js/components/fieldtypes/bard/Set.vue b/resources/js/components/fieldtypes/bard/Set.vue
index 50c14230375..1c99d83d775 100644
--- a/resources/js/components/fieldtypes/bard/Set.vue
+++ b/resources/js/components/fieldtypes/bard/Set.vue
@@ -3,6 +3,7 @@
         <div
             ref="container"
             class="shadow-ui-sm relative w-full rounded-lg border border-gray-300 bg-white text-base dark:border-white/10 dark:bg-gray-900 dark:inset-shadow-2xs dark:inset-shadow-black"
+            :dir="uiDirection"
             :class="{
                 // We’re styling a Set so that it shows a “selection outline” when selected with the mouse or keyboard.
                 // The extra `&:not(:has(:focus-within))` rule turns that outline off if any element inside the Set has focus (e.g. when editing inside a Bard field).
@@ -15,6 +16,7 @@
             @copy.stop
             @paste.stop
             @cut.stop
+            @dragstart="preventNodeSelectionDrag"
         >
             <div ref="content" hidden />
             <header
@@ -26,7 +28,7 @@
                 <span v-if="!isReadOnly" data-drag-handle class="flex cursor-grab" @mousedown="enableDragging">
                     <Icon name="handles" class="size-4 text-gray-400" />
                 </span>
-                <button type="button" class="show-focus-within_target flex flex-1 items-center gap-4 p-2 min-w-0 focus:outline-none cursor-pointer" @click="toggleCollapsedState">
+                <button type="button" class="show-focus-within_target flex flex-1 min-w-0 cursor-pointer items-center gap-4 overflow-x-auto p-2 pe-4 focus:outline-none st-mask-horizontal-overflow" @click="toggleCollapsedState">
                     <Badge size="lg" :pill="true" color="white" class="px-3">
                         <span v-if="isSetGroupVisible" class="flex items-center gap-2">
                             {{ __(setGroup.display) }}
@@ -51,7 +53,7 @@
 
                     <Dropdown>
                         <template #trigger>
-                            <Button icon="dots" variant="ghost" size="xs" :aria-label="__('Open dropdown menu')" />
+                            <Button icon="dots" variant="ghost" size="xs" :aria-label="__('Open dropdown menu')" @mousedown.prevent />
                         </template>
                         <DropdownMenu>
                             <DropdownItem
@@ -86,6 +88,7 @@
                 <FieldsProvider
                     :fields="fields"
                     :as-config="false"
+                    :read-only="isReadOnly"
                     :field-path-prefix="fieldPathPrefix"
                     :meta-path-prefix="metaPathPrefix"
                 >
@@ -116,10 +119,17 @@ import {
 import { containerContextKey } from '@/components/ui/Publish/Container.vue';
 import { watch } from 'vue';
 import { reveal } from '@api';
+import { useUiDirection } from '@/composables/ui-direction';
 
 export default {
     props: nodeViewProps,
 
+    setup() {
+        return {
+            uiDirection: useUiDirection().direction,
+        };
+    },
+
     components: {
         Button,
         Dropdown,
@@ -342,6 +352,19 @@ export default {
             this.$el.setAttribute('draggable', false);
             this._draggableObserver?.observe(this.$el, { attributes: true, attributeFilter: ['draggable'] });
         },
+
+        preventNodeSelectionDrag(event) {
+            // When the set is node-selected, an invisible DOM selection spans the whole set.
+            // Dragging from anywhere inside it (e.g. a grid row's drag handle) would natively
+            // drag that selection and dump a serialized copy of the set into the editor.
+            const target = event.target instanceof Element ? event.target : event.target.parentElement;
+            if (target?.closest('[draggable="true"]')) return;
+
+            const selection = window.getSelection();
+            if (selection?.rangeCount && selection.containsNode(this.$el, false)) {
+                event.preventDefault();
+            }
+        },
     },
 
     mounted() {
@@ -349,6 +372,7 @@ export default {
             () => data_get(this.publishContainer.values.value, this.fieldPathPrefix),
             (values) => {
 				if (! values) return;
+                if (JSON.stringify(values) === JSON.stringify(this.node.attrs.values)) return;
 
                 this.updateAttributes({ values });
             },
diff --git a/resources/js/components/fieldtypes/bard/ToolbarButton.vue b/resources/js/components/fieldtypes/bard/ToolbarButton.vue
index c7e2a5ec302..44bdd720898 100644
--- a/resources/js/components/fieldtypes/bard/ToolbarButton.vue
+++ b/resources/js/components/fieldtypes/bard/ToolbarButton.vue
@@ -6,6 +6,7 @@
         size="sm"
         :aria-label="button.text"
         v-tooltip="button.text"
+        @mousedown.prevent
         @click="button.command(editor, button.args)"
     >
         <ui-icon :name="button.svg" v-if="button.svg" class="size-3.5! " :class="{ 'group-hover:text-white text-yellow-300!': active && variant === 'floating' }" />
diff --git a/resources/js/components/fieldtypes/constants.js b/resources/js/components/fieldtypes/constants.js
new file mode 100644
index 00000000000..4fdae1fdbd4
--- /dev/null
+++ b/resources/js/components/fieldtypes/constants.js
@@ -0,0 +1 @@
+export const UPDATE_DEBOUNCE_MS = 150;
diff --git a/resources/js/components/fieldtypes/control-appearance/ControlAppearanceFieldtype.vue b/resources/js/components/fieldtypes/control-appearance/ControlAppearanceFieldtype.vue
new file mode 100644
index 00000000000..dfcea175cfb
--- /dev/null
+++ b/resources/js/components/fieldtypes/control-appearance/ControlAppearanceFieldtype.vue
@@ -0,0 +1,66 @@
+<script setup>
+import Fieldtype from '@/components/fieldtypes/fieldtype.js';
+import Preview from './Preview.vue';
+import { Button, ButtonGroup } from '@/components/ui';
+import { computed, ref } from 'vue';
+
+const emit = defineEmits(Fieldtype.emits);
+const props = defineProps(Fieldtype.props);
+const { name, isReadOnly, update, expose } = Fieldtype.use(emit, props);
+
+const buttons = ref([]);
+
+const control = computed(() => props.config.control || 'radio');
+
+const options = computed(() => [
+    { value: 'default', label: __('Default') },
+    { value: 'inline', label: __('Inline') },
+    { value: 'chips', label: __('Chips') },
+]);
+
+function buttonClass(optionValue) {
+    const base = 'min-w-34 h-auto items-start justify-start py-1.5';
+
+    if (props.value != optionValue) {
+        return [
+            base,
+            'from-white to-white hover:from-white hover:to-gray-50',
+            'dark:from-gray-850 dark:to-gray-850 dark:hover:from-gray-800 dark:hover:to-gray-850',
+        ];
+    }
+
+    return [
+        base,
+        'from-gray-150 to-gray-50 border-gray-300',
+        'dark:from-gray-925 dark:to-gray-900 dark:border-gray-700/80',
+    ];
+}
+
+function focus() {
+    buttons.value[0]?.focus();
+}
+
+defineExpose({ ...expose, focus });
+</script>
+
+<template>
+    <ButtonGroup overflow="gap">
+        <Button
+            v-for="option in options"
+            ref="buttons"
+            :key="option.value"
+            :disabled="config.disabled"
+            :name="name"
+            :read-only="isReadOnly"
+            :value="option.value"
+            :variant="value == option.value ? 'pressed' : 'default'"
+            :class="buttonClass(option.value)"
+            @click="update(option.value)"
+        >
+            <div class="flex w-full flex-col items-start gap-2 py-0.5 text-left">
+                <span class="text-sm font-medium">{{ option.label }}</span>
+                <Preview :appearance="option.value" :control="control" />
+            </div>
+        </Button>
+    </ButtonGroup>
+</template>
diff --git a/resources/js/components/fieldtypes/control-appearance/Preview.vue b/resources/js/components/fieldtypes/control-appearance/Preview.vue
new file mode 100644
index 00000000000..488ce732399
--- /dev/null
+++ b/resources/js/components/fieldtypes/control-appearance/Preview.vue
@@ -0,0 +1,84 @@
+<script setup>
+import { computed } from 'vue';
+
+const props = defineProps({
+    appearance: {
+        type: String,
+        required: true,
+        validator: (value) => ['default', 'inline', 'chips'].includes(value),
+    },
+    control: {
+        type: String,
+        default: 'radio',
+        validator: (value) => ['radio', 'checkbox'].includes(value),
+    },
+});
+
+const inline = computed(() => props.appearance === 'inline' || props.appearance === 'chips');
+
+const isRadio = computed(() => props.control === 'radio');
+const chipClass = computed(() => isRadio.value
+    ? 'border border-gray-300 dark:border-gray-700 shadow-ui-xs rounded-full px-1.5 pe-2 py-1 bg-white dark:bg-gray-850'
+    : 'border border-gray-300 dark:border-gray-700 shadow-ui-xs items-center rounded-sm px-1.5 pe-2 py-1 bg-white dark:bg-gray-850',
+);
+</script>
+
+<template>
+    <div
+        class="pointer-events-none select-none"
+        :class="{
+            'flex flex-col gap-1.5 pb-0.75': appearance === 'default',
+            'flex flex-wrap gap-1.5': inline,
+        }"
+        aria-hidden="true"
+    >
+        <div
+            v-for="selected in [true, false]"
+            :key="selected ? 'on' : 'off'"
+            class="flex items-center gap-1"
+            :class="appearance === 'chips' ? chipClass : null"
+        >
+            <div
+                v-if="isRadio"
+                class="relative flex size-2 shrink-0 items-center justify-center rounded-full border shadow-ui-xs"
+                :class="
+                    selected
+                        ? 'border-ui-accent-bg bg-white dark:bg-gray-300'
+                        : 'border-gray-400/75 bg-white dark:border-none dark:bg-gray-500'
+                "
+            >
+                <div v-if="selected" class="size-1 rounded-full bg-ui-accent-bg" />
+            </div>
+            <div
+                v-else
+                class="flex size-2 shrink-0 items-center justify-center rounded-[2px] border shadow-ui-xs"
+                :class="
+                    selected
+                        ? 'border-ui-accent-bg bg-ui-accent-bg dark:border-none'
+                        : 'border-gray-400/75 bg-white dark:border-none dark:bg-gray-500'
+                "
+            >
+                <svg
+                    v-if="selected"
+                    viewBox="0 0 10 8"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg"
+                    class="size-1.5 shrink-0 !text-white !opacity-100"
+                    aria-hidden="true"
+                >
+                    <path
+                        d="M9 1L3.5 6.5L1 4"
+                        stroke="currentColor"
+                        stroke-width="1.5"
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                    />
+                </svg>
+            </div>
+            <div
+                class="h-1 rounded-[2px] bg-gray-300 dark:bg-gray-600"
+                :class="[selected ? 'w-5 dark:bg-gray-500' : 'w-4 dark:bg-gray-700']"
+            />
+        </div>
+    </div>
+</template>
diff --git a/resources/js/components/fieldtypes/fieldtype.js b/resources/js/components/fieldtypes/fieldtype.js
index ce3871a709f..5422675d6dc 100644
--- a/resources/js/components/fieldtypes/fieldtype.js
+++ b/resources/js/components/fieldtypes/fieldtype.js
@@ -2,6 +2,7 @@ import debounce from '@/util/debounce.js';
 import mixin from './Fieldtype.vue';
 import emits from './emits.js';
 import props from './props.js';
+import { UPDATE_DEBOUNCE_MS } from './constants';
 import { computed, ref, watch } from 'vue';
 import FieldAction from '@/components/field-actions/FieldAction.js';
 import toFieldActions from '@/components/field-actions/toFieldActions.js';
@@ -56,7 +57,7 @@ const use = function(emit, props) {
 
     const updateDebounced = debounce(function (value) {
         update(value);
-    }, 150);
+    }, UPDATE_DEBOUNCE_MS);
 
     const updateMeta = (value) => {
         emit('update:meta', value);
diff --git a/resources/js/components/fieldtypes/grid/Grid.vue b/resources/js/components/fieldtypes/grid/Grid.vue
index ca849e63a6f..34f7ad76e67 100644
--- a/resources/js/components/fieldtypes/grid/Grid.vue
+++ b/resources/js/components/fieldtypes/grid/Grid.vue
@@ -25,6 +25,7 @@
                         :can-add-rows="canAddRows"
                         :allow-fullscreen="config.fullscreen"
                         :hide-display="config.hide_display"
+                        :read-only="isReadOnly"
                         :errors="publishContainer.errors"
                         @updated="updated"
                         @meta-updated="updateRowMeta"
@@ -85,7 +86,7 @@ export default {
 
     computed: {
         component() {
-            const isNarrow = this.fields.length > 1 && this.containerWidth < 600;
+            const isNarrow = this.fields.length > 1 && this.containerWidth < 550;
 
             return this.config.mode === 'stacked' || isNarrow ? 'GridStacked' : 'GridTable';
         },
diff --git a/resources/js/components/fieldtypes/grid/Row.vue b/resources/js/components/fieldtypes/grid/Row.vue
index ada524d98fa..b28b4f6f4c6 100644
--- a/resources/js/components/fieldtypes/grid/Row.vue
+++ b/resources/js/components/fieldtypes/grid/Row.vue
@@ -5,6 +5,7 @@
         <FieldsProvider
             :fields="fields"
             :as-config="false"
+            :read-only
             :field-path-prefix="`${fieldPathPrefix}.${index}`"
             :meta-path-prefix="`${metaPathPrefix}.existing.${values._id}`"
         >
@@ -74,6 +75,9 @@ export default {
             type: Boolean,
             default: false,
         },
+        readOnly: {
+            type: Boolean,
+        },
     },
 
     inject: ['grid', 'sortableItemClass', 'sortableHandleClass'],
@@ -94,15 +98,11 @@ export default {
 
     methods: {
         updated(handle, value) {
-            let row = JSON.parse(JSON.stringify(this.values));
-            row[handle] = value;
-            this.$emit('updated', this.index, row);
+            this.$emit('updated', this.index, { ...this.values, [handle]: value });
         },
 
         metaUpdated(handle, value) {
-            let meta = clone(this.meta);
-            meta[handle] = value;
-            this.$emit('meta-updated', meta);
+            this.$emit('meta-updated', { ...this.meta, [handle]: value });
         },
 
         fieldPath(handle) {
diff --git a/resources/js/components/fieldtypes/grid/Stacked.vue b/resources/js/components/fieldtypes/grid/Stacked.vue
index 05a972accd2..fedceb19b71 100644
--- a/resources/js/components/fieldtypes/grid/Stacked.vue
+++ b/resources/js/components/fieldtypes/grid/Stacked.vue
@@ -32,6 +32,7 @@
                     :meta-path-prefix="metaPathPrefix"
                     :can-delete="canDeleteRows"
                     :can-add-rows="canAddRows"
+                    :read-only
                     @updated="(row, value) => $emit('updated', row, value)"
                     @duplicate="(row) => $emit('duplicate', row)"
                     @meta-updated="$emit('meta-updated', row._id, $event)"
diff --git a/resources/js/components/fieldtypes/grid/StackedRow.vue b/resources/js/components/fieldtypes/grid/StackedRow.vue
index e86db59d4fe..d997efd1337 100644
--- a/resources/js/components/fieldtypes/grid/StackedRow.vue
+++ b/resources/js/components/fieldtypes/grid/StackedRow.vue
@@ -31,6 +31,7 @@
             <FieldsProvider
                 :fields="fields"
                 :as-config="false"
+                :read-only
                 :field-path-prefix="`${fieldPathPrefix}.${index}`"
                 :meta-path-prefix="`${metaPathPrefix}.existing.${values._id}`"
             >
diff --git a/resources/js/components/fieldtypes/grid/Table.vue b/resources/js/components/fieldtypes/grid/Table.vue
index f37ca65ebce..e5cfb6bb92d 100644
--- a/resources/js/components/fieldtypes/grid/Table.vue
+++ b/resources/js/components/fieldtypes/grid/Table.vue
@@ -32,6 +32,7 @@
                     :can-delete="canDeleteRows"
                     :can-add-rows="canAddRows"
                     :has-error="rowHasError(row._id)"
+                    :read-only
                     @updated="(row, value) => $emit('updated', row, value)"
                     @meta-updated="$emit('meta-updated', row._id, $event)"
                     @duplicate="(row) => $emit('duplicate', row)"
diff --git a/resources/js/components/fieldtypes/grid/View.vue b/resources/js/components/fieldtypes/grid/View.vue
index e8c4adc490e..4a2ee7303f8 100644
--- a/resources/js/components/fieldtypes/grid/View.vue
+++ b/resources/js/components/fieldtypes/grid/View.vue
@@ -1,6 +1,6 @@
 <script>
 export default {
-    props: ['fields', 'rows', 'meta', 'name', 'canDeleteRows', 'canAddRows', 'allowFullscreen', 'hideDisplay', 'errors'],
+    props: ['fields', 'rows', 'meta', 'name', 'canDeleteRows', 'canAddRows', 'allowFullscreen', 'hideDisplay', 'errors', 'readOnly'],
 
     inject: ['grid'],
 
diff --git a/resources/js/components/fieldtypes/markdown/MarkdownFieldtype.vue b/resources/js/components/fieldtypes/markdown/MarkdownFieldtype.vue
index c17ccc908cc..e2b6adb043c 100644
--- a/resources/js/components/fieldtypes/markdown/MarkdownFieldtype.vue
+++ b/resources/js/components/fieldtypes/markdown/MarkdownFieldtype.vue
@@ -127,6 +127,7 @@
                                 v-show="mode == 'preview'"
                                 v-html="markdownPreviewText"
                                 class="markdown-preview p-3 prose prose-sm @md/markdown:prose-base"
+                                :dir="contentDirection"
                             ></div>
                         </div>
                     </div>
@@ -184,6 +185,7 @@ import AssetSelector from '../../assets/Selector.vue';
 import Uploader from '../../assets/Uploader.vue';
 import Uploads from '../../assets/Uploads.vue';
 import MarkdownToolbar from './MarkdownToolbar.vue';
+import { useContentDirection } from '@/composables/content-direction';
 // Keymaps
 import 'codemirror/keymap/sublime';
 
@@ -240,6 +242,12 @@ export default {
 	    Stack,
     },
 
+    setup() {
+        const { direction: contentDirection } = useContentDirection();
+
+        return { contentDirection };
+    },
+
     data() {
         return {
             data: this.value || '',
@@ -654,7 +662,6 @@ export default {
                     mode: 'gfm',
                     dragDrop: false,
                     keyMap: 'sublime',
-                    direction: document.querySelector('html').getAttribute('dir') ?? 'ltr',
                     lineWrapping: true,
                     viewportMargin: Infinity,
                     tabindex: 0,
diff --git a/resources/js/components/fieldtypes/replicator/AddSetButton.vue b/resources/js/components/fieldtypes/replicator/AddSetButton.vue
index 2a2c2014195..4145a83a725 100644
--- a/resources/js/components/fieldtypes/replicator/AddSetButton.vue
+++ b/resources/js/components/fieldtypes/replicator/AddSetButton.vue
@@ -58,7 +58,7 @@ const props = defineProps({
     loadingSet: { type: String, default: null },
 });
 
-const label = computed(() => props.label ? __(props.label) : __('Add Block'));
+const label = computed(() => props.label ? __(props.label) : __('Add Set'));
 
 function addSet(handle) {
     emit('added', handle, props.index);
diff --git a/resources/js/components/fieldtypes/replicator/Replicator.vue b/resources/js/components/fieldtypes/replicator/Replicator.vue
index cbc33f91dd3..085eafa56f7 100644
--- a/resources/js/components/fieldtypes/replicator/Replicator.vue
+++ b/resources/js/components/fieldtypes/replicator/Replicator.vue
@@ -43,7 +43,7 @@
                                     :sortable-handle-class="sortableHandleClass"
                                     :collapsed="collapsed.includes(set._id)"
                                     :enabled="set.enabled"
-                                    :read-only
+                                    :read-only="isReadOnly"
                                     :can-add-set="canAddSet"
                                     :has-error="setHasError(set._id)"
                                     :show-field-previews="config.previews"
diff --git a/resources/js/components/fieldtypes/replicator/Set.vue b/resources/js/components/fieldtypes/replicator/Set.vue
index a906beaa8ef..3b7ef4c3a72 100644
--- a/resources/js/components/fieldtypes/replicator/Set.vue
+++ b/resources/js/components/fieldtypes/replicator/Set.vue
@@ -152,7 +152,7 @@ reveal.use(rootEl, () => emit('expanded'));
                     class="size-4 cursor-grab text-gray-400"
                     v-if="!readOnly"
                 />
-                <button type="button" class="show-focus-within_target flex flex-1 items-center gap-4 p-2 py-1.75 min-w-0 focus:outline-none cursor-pointer" @click="toggleCollapsedState">
+                <button type="button" class="show-focus-within_target flex flex-1 min-w-0 cursor-pointer items-center gap-4 overflow-x-auto p-2 py-1.75 pe-4 focus:outline-none st-mask-horizontal-overflow" @click="toggleCollapsedState">
                     <Badge size="lg" pill color="white" class="px-3">
                         <span v-if="isSetGroupVisible" class="flex items-center gap-2">
                             {{ __(setGroup.display) }}
@@ -211,6 +211,7 @@ reveal.use(rootEl, () => emit('expanded'));
                     <FieldsProvider
                         :fields="config.fields"
                         :as-config="false"
+                        :read-only
                         :field-path-prefix="fieldPathPrefix"
                         :meta-path-prefix="metaPathPrefix"
                     >
diff --git a/resources/js/components/fieldtypes/replicator/SetPicker.vue b/resources/js/components/fieldtypes/replicator/SetPicker.vue
index 3c1842ac4f0..6bc9b9044a8 100644
--- a/resources/js/components/fieldtypes/replicator/SetPicker.vue
+++ b/resources/js/components/fieldtypes/replicator/SetPicker.vue
@@ -495,5 +495,9 @@ export default {
                 .map((result) => result.obj);
         }
     },
+
+    beforeUnmount() {
+        this.unbindKeys();
+    },
 };
 </script>
diff --git a/resources/js/components/forms/FormWidget.vue b/resources/js/components/forms/FormWidget.vue
index e2f1907c53a..c8601116c15 100644
--- a/resources/js/components/forms/FormWidget.vue
+++ b/resources/js/components/forms/FormWidget.vue
@@ -61,7 +61,7 @@ function formatDate(value) {
                 <ui-description v-if="!items.length" class="flex-1 flex items-center justify-center">
                     {{ __('This form is awaiting responses') }}
                 </ui-description>
-                <div class="px-4 py-3">
+                <div class="px-4 py-3 overflow-x-auto">
                     <table class="w-full widget-table">
                         <TableHead :sr-only="!props.showTableHeader" />
                         <TableBody>
diff --git a/resources/js/components/forms/SubmissionListing.vue b/resources/js/components/forms/SubmissionListing.vue
index 27c9b1bd3b3..0ea2125cc01 100644
--- a/resources/js/components/forms/SubmissionListing.vue
+++ b/resources/js/components/forms/SubmissionListing.vue
@@ -1,5 +1,6 @@
 <template>
     <Listing
+        ref="listing"
         :url="requestUrl"
         :columns="columns"
         :action-url="actionUrl"
@@ -42,5 +43,13 @@ export default {
             requestUrl: cp_url(`forms/${this.form}/submissions`),
         };
     },
+
+    computed: {
+        parameters() {
+            return this.$refs.listing?.parameters;
+        },
+    },
+
+    expose: ['parameters'],
 };
 </script>
diff --git a/resources/js/components/global-header/Logo.vue b/resources/js/components/global-header/Logo.vue
index a4f5ac2379a..c4b39163446 100644
--- a/resources/js/components/global-header/Logo.vue
+++ b/resources/js/components/global-header/Logo.vue
@@ -5,6 +5,7 @@ import StatamicLogo from '@/../svg/statamic-mark-lime.svg';
 import ProBadge from './ProBadge.vue';
 import { Link } from '@inertiajs/vue3';
 import useStatamicPageProps from '@/composables/page-props.js';
+import { invokeCpNavToggle } from '@/components/nav/nav-toggle-channel.js';
 
 const { logos, isPro, cmsName, version } = useStatamicPageProps();
 const customLogoImage = computed(() => {
@@ -15,14 +16,21 @@ const customLogoText = computed(() => logos?.text);
 const customLogo = computed(() => customLogoImage.value || customLogoText.value);
 
 function toggleNav() {
-    Statamic.$events.$emit('nav.toggle');
+    invokeCpNavToggle();
 }
 </script>
 
 <template>
     <template v-if="customLogo">
         <div class="flex items-center gap-3 relative rounded-xs">
-            <button class="flex items-center group rounded-xs cursor-pointer" type="button" @click="toggleNav" :aria-label="__('Toggle Nav')" style="--focus-outline-offset: 0.2rem;">
+            <button
+                type="button"
+                class="flex items-center group rounded-xs cursor-pointer"
+                data-cp-global-nav-toggle
+                :aria-label="__('Toggle Nav')"
+                style="--focus-outline-offset: 0.2rem;"
+                @click.stop="toggleNav"
+            >
                 <div class="p-1 max-sm:ps-2 size-5 flex items-center justify-center lg:inset-0">
                     <Icon name="burger-menu-no-border" class="size-3.5! sm:size-3.25! opacity-75 hover:opacity-100" />
                 </div>
@@ -35,7 +43,14 @@ function toggleNav() {
     </template>
     <template v-else>
         <div class="flex items-center gap-1.5 sm:gap-2.5 relative">
-            <button class="flex items-center group rounded-xs cursor-pointer" type="button" @click="toggleNav" :aria-label="__('Toggle Nav')" style="--focus-outline-offset: 0.2rem;">
+            <button
+                type="button"
+                class="flex items-center group rounded-xs cursor-pointer"
+                data-cp-global-nav-toggle
+                :aria-label="__('Toggle Nav')"
+                style="--focus-outline-offset: 0.2rem;"
+                @click.stop="toggleNav"
+            >
                 <div class="p-1 max-sm:ps-2 size-5 flex items-center justify-center lg:inset-0">
                     <Icon name="burger-menu-no-border" class="size-3.5! sm:size-3.25! opacity-75 hover:opacity-100" />
                 </div>
diff --git a/resources/js/components/global-header/SiteSelector.vue b/resources/js/components/global-header/SiteSelector.vue
index d6a2051e937..1db9ea61fc6 100644
--- a/resources/js/components/global-header/SiteSelector.vue
+++ b/resources/js/components/global-header/SiteSelector.vue
@@ -10,6 +10,8 @@
             size="sm"
             variant="ghost"
             icon="globe-arrow"
+            align="end"
+            :adaptive-width="true"
             class="[&_[data-ui-combobox-trigger]]:text-white/85"
         />
     </div>
diff --git a/resources/js/components/global-header/UserDropdown.vue b/resources/js/components/global-header/UserDropdown.vue
index 51c975c8154..0e05c61ed51 100644
--- a/resources/js/components/global-header/UserDropdown.vue
+++ b/resources/js/components/global-header/UserDropdown.vue
@@ -4,7 +4,7 @@ import { Avatar, Button, DropdownHeader, Badge, Dropdown, DropdownMenu, Dropdown
 import useStatamicPageProps from '@/composables/page-props.js';
 
 const { supportUrl } = useStatamicPageProps();
-const logoutUrl = `${cp_url('auth/logout')}?redirect=${cp_url('/')}`;
+const logoutUrl = `${cp_url('auth/logout')}?redirect=${cp_url('auth/login')}`;
 const user = Statamic.user;
 const isImpersonating = computed((() => user.is_impersonating));
 </script>
diff --git a/resources/js/components/globals/PublishForm.vue b/resources/js/components/globals/PublishForm.vue
index 45414f7e828..60bc7788000 100644
--- a/resources/js/components/globals/PublishForm.vue
+++ b/resources/js/components/globals/PublishForm.vue
@@ -48,7 +48,7 @@
                 @update:modelValue="localizationSelected"
             />
 
-            <div class="hidden items-center gap-2 sm:gap-3 md:flex">
+            <div class="items-center gap-2 sm:gap-3 md:flex">
                 <Button
                     v-if="canEdit"
                     variant="primary"
@@ -72,7 +72,7 @@
             v-if="fieldset && !fieldset.empty"
             ref="container"
             :name="publishContainer"
-            :reference="initialReference"
+            :reference="reference"
             :blueprint="fieldset"
             v-model="values"
             :meta="meta"
@@ -80,8 +80,10 @@
             :origin-meta="originMeta"
             :errors="errors"
             :site="site"
+            :read-only="readOnly"
             v-model:modified-fields="localizedFields"
             :sync-field-confirmation-text="syncFieldConfirmationText"
+            remember-tab
         />
 
         <confirmation-modal
@@ -163,6 +165,7 @@ export default {
             originValues: this.initialOriginValues || {},
             originMeta: this.initialOriginMeta || {},
             site: this.initialSite,
+            reference: this.initialReference,
             readOnly: this.initialReadOnly,
             syncFieldConfirmationText: __('messages.sync_entry_field_confirmation_text'),
             pendingLocalization: null,
@@ -286,7 +289,7 @@ export default {
             this.localizing = localization.handle;
 
             if (this.publishContainer === 'base') {
-                window.history.replaceState({}, '', localization.url);
+                window.history.replaceState({}, '', localization.url + window.location.hash);
             }
 
             this.$axios.get(localization.url).then((response) => {
@@ -300,6 +303,7 @@ export default {
                 this.actions = data.actions;
                 this.fieldset = data.blueprint;
                 this.site = localization.handle;
+                this.reference = data.reference;
                 this.localizing = false;
                 this.afterActionSuccessfullyCompleted(data);
                 this.$nextTick(() => this.$refs.container.clearDirtyState());
diff --git a/resources/js/components/inputs/relationship/Item.vue b/resources/js/components/inputs/relationship/Item.vue
index d94bfcf690d..707a589808a 100644
--- a/resources/js/components/inputs/relationship/Item.vue
+++ b/resources/js/components/inputs/relationship/Item.vue
@@ -1,7 +1,6 @@
 <template>
     <div
         class="shadow-ui-sm relative z-(--z-index-above) flex w-full h-full items-center gap-2 rounded-lg border border-gray-300 bg-white px-3 [&:has(.cursor-grab)]:px-1.5 py-1.5 mb-1.5 last:mb-0 text-base dark:border-gray-700 dark:with-contrast:border-gray-500 dark:bg-gray-900"
-        :class="{ invalid: item.invalid }"
     >
         <ui-icon name="handles" class="item-move sortable-handle size-4 cursor-grab text-gray-300 dark:text-gray-700" v-if="sortable" />
         <div class="flex flex-1 items-center line-clamp-1 text-sm text-gray-600 dark:text-gray-300">
@@ -9,9 +8,9 @@
 
             <div
                 v-if="item.invalid"
-                v-tooltip.top="__('ID not found')"
+                v-tooltip.top="__('messages.relationship_item_unavailable')"
                 v-text="__(item.title)"
-                class="line-clamp-1 text-sm text-gray-600 dark:text-gray-300"
+                class="line-clamp-1 text-sm text-gray-500 dark:text-gray-400"
             />
 
             <a
diff --git a/resources/js/components/inputs/relationship/RelationshipInput.vue b/resources/js/components/inputs/relationship/RelationshipInput.vue
index cdcf943082f..a6bb3dd7d9c 100644
--- a/resources/js/components/inputs/relationship/RelationshipInput.vue
+++ b/resources/js/components/inputs/relationship/RelationshipInput.vue
@@ -108,6 +108,20 @@ import { Button, Icon, Stack } from '@/components/ui';
 import { router } from '@inertiajs/vue3';
 import axios from 'axios';
 
+const inFlightRequests = new Map();
+
+function detachFromInFlightRequest(component) {
+    const entry = component._activeRequest;
+    if (!entry) return;
+    component._activeRequest = null;
+    entry.subscribers--;
+    if (entry.subscribers > 0) return;
+    entry.controller.abort();
+    if (inFlightRequests.get(entry.cacheKey) === entry) {
+        inFlightRequests.delete(entry.cacheKey);
+    }
+}
+
 export default {
     props: {
         canCreate: { type: Boolean },
@@ -161,7 +175,6 @@ export default {
             loading: true,
             inline: false,
             sortable: null,
-            abortController: null,
             removeNavigationListener: null,
         };
     },
@@ -246,7 +259,7 @@ export default {
 
     created() {
         this.removeNavigationListener = router.on('before', () => {
-            if (this.abortController) this.abortController.abort();
+            detachFromInFlightRequest(this);
         });
     },
 
@@ -260,7 +273,7 @@ export default {
     },
 
     beforeUnmount() {
-        if (this.abortController) this.abortController.abort();
+        detachFromInFlightRequest(this);
         if (this.removeNavigationListener) this.removeNavigationListener();
         if (this.sortable) {
             this.sortable.destroy();
@@ -287,6 +300,16 @@ export default {
             this.$emit('item-data-updated', data);
         },
 
+        value(value) {
+            if (this.initializing || this.loading) return;
+
+            // A value set from outside (e.g. a save response normalizing a typed term) may
+            // reference an id we have no data for yet, which would render as a raw id.
+            if (value?.some((selection) => !this.data?.find((item) => item.id == selection))) {
+                this.getDataForSelections(value);
+            }
+        },
+
         items(items, oldItems) {
             if (items.length > 0 && oldItems.length === 0) {
                 if (this.canReorder) {
@@ -328,19 +351,39 @@ export default {
         getDataForSelections(selections) {
             this.loading = true;
 
-            if (this.abortController) this.abortController.abort();
-            this.abortController = new AbortController();
+            detachFromInFlightRequest(this);
+
+            const cacheKey = JSON.stringify([this.itemDataUrl, this.site, selections?.slice().sort()]);
+            let entry = inFlightRequests.get(cacheKey);
+
+            if (!entry) {
+                const controller = new AbortController();
+                entry = { cacheKey, controller, subscribers: 0 };
+                entry.promise = this.$axios
+                    .post(this.itemDataUrl, { site: this.site, selections }, { signal: controller.signal })
+                    .finally(() => {
+                        if (inFlightRequests.get(cacheKey) === entry) {
+                            inFlightRequests.delete(cacheKey);
+                        }
+                    });
+                inFlightRequests.set(cacheKey, entry);
+            }
+
+            entry.subscribers++;
+            this._activeRequest = entry;
 
-            return this.$axios
-                .post(this.itemDataUrl, { site: this.site, selections }, { signal: this.abortController.signal })
+            return entry.promise
                 .then((response) => {
+                    if (this._activeRequest !== entry) return;
                     this.$emit('item-data-updated', response.data.data);
                 })
                 .catch((e) => {
                     if (axios.isCancel(e)) return;
+                    if (this._activeRequest !== entry) return;
                     throw e;
                 })
                 .finally(() => {
+                    if (this._activeRequest !== entry) return;
                     this.loading = false;
                 });
         },
diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index 856f045a0c2..6bedba8c661 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -7,10 +7,11 @@
             :max-selections="maxSelections"
             :model-value="items.map((item) => item.id)"
             :multiple
-            :options
+            :options="comboboxOptions"
             :placeholder="__(config.placeholder) || __('Choose...')"
             :read-only="readOnly"
             :taggable="isTaggable"
+            :close-on-select="isTaggable"
             option-label="title"
             option-value="id"
             @update:modelValue="itemsSelected"
@@ -27,7 +28,7 @@
                 <div v-text="noOptionsText" />
             </template>
             <template #selected-option>
-                <span v-if="items.length === 1" v-text="items[0].title"></span>
+                <span v-if="items.length === 1" v-text="items[0].title" class="truncate"></span>
             </template>
             <template #selected-options>
                 <!-- We don't want to display the selected options here. The RelationshipInput component does that for us. -->
@@ -94,6 +95,14 @@ export default {
 			return JSON.stringify({ ...this.parameters, url: this.url });
 	    },
 
+        comboboxOptions() {
+            // Combobox resolves the selected label from this list, so a selected item missing
+            // from it (e.g. a just-created term) would otherwise display as its raw id.
+            const missing = this.items.filter((item) => !this.options.some((option) => option.id === item.id));
+
+            return [...this.options, ...missing];
+        },
+
         noOptionsText() {
             return this.typeahead && !this.requested ? __('Start typing to search.') : __('No options to choose from.');
         },
diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index efa28469d29..341ad83e3fe 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -1,106 +1,109 @@
 <template>
     <div class="h-full rounded-s-xl">
         <div class="flex h-full min-h-0 flex-col">
-            <Listing
-                v-if="filters != null && view === 'list'"
-                :url="selectionsUrl"
-                :filters="filters"
-                :max-selections="maxSelections"
-                :sort-column="sortColumn"
-                :sort-direction="sortDirection"
-                :additional-parameters="additionalParameters"
-                v-model:selections="selections"
-                @request-completed="focusSearchInput"
-            >
-                <template #initializing>
-                    <div class="flex flex-1">
-                        <div class="absolute inset-0 z-200 flex items-center justify-center text-center">
-                            <Icon name="loading" />
+            <div class="flex flex-1 min-h-0 flex-col">
+                <Listing
+                    v-if="filters != null && view === 'list'"
+                    class="flex flex-1 flex-col min-h-0"
+                    :url="selectionsUrl"
+                    :filters="filters"
+                    :max-selections="maxSelections"
+                    :sort-column="sortColumn"
+                    :sort-direction="sortDirection"
+                    :additional-parameters="additionalParameters"
+                    v-model:selections="selections"
+                    @request-completed="focusSearchInput"
+                >
+                    <template #initializing>
+                        <div class="flex flex-1">
+                            <div class="absolute inset-0 z-200 flex items-center justify-center text-center">
+                                <Icon name="loading" />
+                            </div>
                         </div>
-                    </div>
-                </template>
+                    </template>
+
+                    <div class="flex flex-1 flex-col gap-4 overflow-auto p-4">
+                        <div class="flex items-center gap-2 sm:gap-3 min-h-16">
+                            <div class="flex flex-1 items-center gap-2 sm:gap-3">
+                                <Search ref="search" />
+                                <Filters v-if="filters && filters.length" />
+                            </div>
 
-                <div class="flex flex-1 flex-col gap-4 overflow-auto p-4">
-                    <div class="flex items-center gap-2 sm:gap-3">
-                        <div class="flex flex-1 items-center gap-2 sm:gap-3">
-                            <Search ref="search" />
-                            <Filters v-if="filters && filters.length" />
+                            <ui-toggle-group v-model="view" v-if="canUseTree">
+                                <ui-toggle-item icon="hierarchy" value="tree" />
+                                <ui-toggle-item icon="layout-list" value="list" />
+                            </ui-toggle-group>
                         </div>
 
+                        <Panel class="relative mb-0! overflow-x-auto overscroll-x-contain">
+                            <Table>
+                                <template #cell-title="{ row: entry, isColumnVisible }">
+                                    <a class="title-index-field" :href="entry.edit_url" @click.prevent="toggleSelection(entry.id)">
+                                        <StatusIndicator v-if="!isColumnVisible('status')" :status="entry.status" />
+                                        <span v-text="entry.title" />
+                                    </a>
+                                </template>
+                                <template #cell-status="{ row: entry }">
+                                    <StatusIndicator :status="entry.status" show-label :show-dot="false" />
+                                </template>
+                                <template #cell-type="{ value }">
+                                    <Badge :text="value" />
+                                </template>
+                            </Table>
+                            <PanelFooter>
+                                <Pagination />
+                            </PanelFooter>
+                        </Panel>
+                    </div>
+                </Listing>
+
+                <div v-if="view === 'tree'" class="flex flex-1 min-h-0 flex-col gap-4 p-4">
+                    <div class="flex items-center justify-between gap-2 sm:gap-3 min-h-16">
+                        <Heading :text="__('Pages')" size="lg" />
                         <ui-toggle-group v-model="view" v-if="canUseTree">
                             <ui-toggle-item icon="hierarchy" value="tree" />
                             <ui-toggle-item icon="layout-list" value="list" />
                         </ui-toggle-group>
                     </div>
 
-                    <Panel class="relative mb-0! overflow-x-auto overscroll-x-contain">
-                        <Table>
-                            <template #cell-title="{ row: entry, isColumnVisible }">
-                                <a class="title-index-field" :href="entry.edit_url" @click.prevent="toggleSelection(entry.id)">
-                                    <StatusIndicator v-if="!isColumnVisible('status')" :status="entry.status" />
-                                    <span v-text="entry.title" />
-                                </a>
-                            </template>
-                            <template #cell-status="{ row: entry }">
-                                <StatusIndicator :status="entry.status" show-label :show-dot="false" />
+                    <div class="flex-1 min-h-0 overflow-auto">
+                        <page-tree
+                            ref="tree"
+                            :pages-url="tree.url"
+                            :show-slugs="tree.showSlugs"
+                            :blueprints="tree.blueprints"
+                            :expects-root="tree.expectsRoot"
+                            :site="site"
+                            :preferences-prefix="`selector-field.${name}`"
+                            :editable="false"
+                            @branch-clicked="toggleSelection($event.id)"
+                        >
+                            <template #branch-action="{ branch, index }">
+                                <div>
+                                    <Checkbox
+                                        :ref="`tree-branch-${branch.id}`"
+                                        class="mt-3 mx-3"
+                                        :value="branch.id"
+                                        :model-value="isSelected(branch.id)"
+                                        :disabled="reachedSelectionLimit && !singleSelect && !isSelected(branch.id)"
+                                        :label="getCheckboxLabel(branch)"
+                                        :description="getCheckboxDescription(branch)"
+                                        size="sm"
+                                        solo
+                                        @update:model-value="toggleSelection(branch.id)"
+                                    />
+                                </div>
                             </template>
-                            <template #cell-type="{ value }">
-                                <Badge :text="value" />
-                            </template>
-                        </Table>
-                        <PanelFooter>
-                            <Pagination />
-                        </PanelFooter>
-                    </Panel>
-                </div>
-            </Listing>
-
-            <template v-if="view === 'tree'">
-                <div class="flex justify-between p-4">
-                    <Heading :text="__('Pages')" size="lg" />
-                    <ui-toggle-group v-model="view" v-if="canUseTree">
-                        <ui-toggle-item icon="hierarchy" value="tree" />
-                        <ui-toggle-item icon="layout-list" value="list" />
-                    </ui-toggle-group>
-                </div>
 
-                <div class="mx-4 flex-1 overflow-auto">
-                    <page-tree
-                        ref="tree"
-                        :pages-url="tree.url"
-                        :show-slugs="tree.showSlugs"
-                        :blueprints="tree.blueprints"
-                        :expects-root="tree.expectsRoot"
-                        :site="site"
-                        :preferences-prefix="`selector-field.${name}`"
-                        :editable="false"
-                        @branch-clicked="toggleSelection($event.id)"
-                    >
-                        <template #branch-action="{ branch, index }">
-                            <div>
-                                <Checkbox
-                                    :ref="`tree-branch-${branch.id}`"
-                                    class="mt-3 mx-3"
-                                    :value="branch.id"
-                                    :model-value="isSelected(branch.id)"
-                                    :disabled="reachedSelectionLimit && !singleSelect && !isSelected(branch.id)"
-                                    :label="getCheckboxLabel(branch)"
-                                    :description="getCheckboxDescription(branch)"
-                                    size="sm"
-                                    solo
-                                    @update:model-value="toggleSelection(branch.id)"
-                                />
-                            </div>
-                        </template>
-
-                        <template #branch-icon="{ branch }">
-                            <ui-icon name="external-link" v-if="isRedirectBranch(branch)" v-tooltip="__('Redirect')" />
-                        </template>
-                    </page-tree>
+                            <template #branch-icon="{ branch }">
+                                <ui-icon name="external-link" v-if="isRedirectBranch(branch)" v-tooltip="__('Redirect')" />
+                            </template>
+                        </page-tree>
+                    </div>
                 </div>
-            </template>
+            </div>
 
-            <footer class="flex items-center justify-between border-t dark:border-gray-900 bg-gray-100 dark:bg-gray-800 p-4 rounded-es-xl">
+            <footer class="flex shrink-0 items-center justify-between border-t dark:border-gray-900 bg-gray-100 dark:bg-gray-800 p-4 rounded-es-xl">
                 <ui-badge
                     v-text="
                         hasMaxSelections
diff --git a/resources/js/components/nav/Nav.vue b/resources/js/components/nav/Nav.vue
index 490446b8b1f..fa210609d69 100644
--- a/resources/js/components/nav/Nav.vue
+++ b/resources/js/components/nav/Nav.vue
@@ -1,20 +1,80 @@
 <script setup>
-import { Link, usePage, router } from '@inertiajs/vue3';
+import { Link, router } from '@inertiajs/vue3';
 import { Badge, Icon } from '@ui';
 import useNavigation from './navigation.js';
-import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
+import { onMounted, onUnmounted, ref, watch } from 'vue';
 import DynamicHtmlRenderer from '@/components/DynamicHtmlRenderer.vue';
+import { setCpNavToggleHandler, clearCpNavToggleHandler } from './nav-toggle-channel.js';
 
 const { nav, setParentActive, setChildActive } = useNavigation();
 const localStorageKey = 'statamic.nav';
-const isOpen = ref(localStorage.getItem(localStorageKey) !== 'closed');
+
+function readInitialNavOpen() {
+    const stored = localStorage.getItem(localStorageKey);
+    const mobile = window.matchMedia('(width < 1024px)').matches;
+    // Desktop: preserve legacy default (open unless user chose "closed").
+    // Mobile: default to closed on load so the overlay does not cover the CP; only reopen if the user left it explicitly "open".
+    if (mobile) {
+        return stored === 'open';
+    }
+    return stored !== 'closed';
+}
+
+const isOpen = ref(readInitialNavOpen());
 const navRef = ref(null);
-const isMobile = ref(false);
+const isMobile = ref(window.matchMedia('(width < 1024px)').matches);
 const collapsedByViewport = ref(false);
 let clickListenerActive = false;
 let navigateEventListener = null;
+let clickOutsideEnableTimer = null;
+
+function toggle() {
+    isOpen.value = !isOpen.value;
+    // Reset viewport flag since user is explicitly toggling, so we should respect their preference
+    // even when viewport size changes (don't auto-expand if user manually closed it)
+    collapsedByViewport.value = false;
+    localStorage.setItem(localStorageKey, isOpen.value ? 'open' : 'closed');
+}
+
+setCpNavToggleHandler(toggle);
+
+onUnmounted(() => {
+    clearCpNavToggleHandler(toggle);
+});
+
+watch(
+    isOpen,
+    (open) => {
+        const el = document.getElementById('main');
+        el?.classList.toggle('nav-closed', !open);
+        el?.classList.toggle('nav-open', open);
+
+        if (clickOutsideEnableTimer !== null) {
+            clearTimeout(clickOutsideEnableTimer);
+            clickOutsideEnableTimer = null;
+        }
+
+        // Delay enabling the click-outside listener to avoid catching the toggle click.
+        // Clear any pending timer so a fast close cannot leave clickListenerActive stuck true.
+        if (open) {
+            clickListenerActive = false;
+            clickOutsideEnableTimer = setTimeout(() => {
+                clickOutsideEnableTimer = null;
+                clickListenerActive = true;
+            }, 100);
+        } else {
+            clickListenerActive = false;
+        }
+    },
+    { flush: 'post', immediate: true },
+);
 
 onMounted(() => {
+    const keyBinding = Statamic.$keys.bind(['command+\\', ['[']], (e) => {
+        e.preventDefault();
+        toggle();
+    });
+
     // Check if screen is less than lg breakpoint (1024px)
     const mediaQuery = window.matchMedia('(width < 1024px)');
     isMobile.value = mediaQuery.matches;
@@ -40,31 +100,15 @@ onMounted(() => {
     };
     
     mediaQuery.addEventListener('change', handleMediaChange);
-    
-    nextTick(() => {
-        watch(isOpen, (isOpen) => {
-            const el = document.getElementById('main');
-            el.classList.toggle('nav-closed', !isOpen);
-            el.classList.toggle('nav-open', isOpen);
-            
-            // Delay enabling the click-outside listener to avoid catching the toggle click
-            if (isOpen) {
-                setTimeout(() => {
-                    clickListenerActive = true;
-                }, 100);
-            } else {
-                clickListenerActive = false;
-            }
-        }, { immediate: true });
-    });
 
     // Mark page as fully loaded after all resources are loaded
-    if (document.readyState === 'complete') {
+    const onWindowLoad = () => {
         document.documentElement.classList.add('page-fully-loaded');
+    };
+    if (document.readyState === 'complete') {
+        onWindowLoad();
     } else {
-        window.addEventListener('load', () => {
-            document.documentElement.classList.add('page-fully-loaded');
-        });
+        window.addEventListener('load', onWindowLoad);
     }
 
     // Close nav when clicking outside (only on mobile)
@@ -81,29 +125,33 @@ onMounted(() => {
     onUnmounted(() => {
         document.removeEventListener('click', handleClickOutside);
         mediaQuery.removeEventListener('change', handleMediaChange);
+        if (document.readyState !== 'complete') {
+            window.removeEventListener('load', onWindowLoad);
+        }
         if (navigateEventListener) {
             navigateEventListener();
         }
+        if (clickOutsideEnableTimer !== null) {
+            clearTimeout(clickOutsideEnableTimer);
+            clickOutsideEnableTimer = null;
+        }
+        keyBinding.destroy();
     });
 });
 
 function handleClickOutside(event) {
     // Only handle click-outside on mobile (less than lg breakpoint)
     if (!isOpen.value || !clickListenerActive || !isMobile.value) return;
+    // Never treat the global header burger as an "outside" click — same gesture can race
+    // with document bubble listeners and cancel the toggle.
+    const target = event.target;
+    if (target instanceof Element && target.closest('[data-cp-global-nav-toggle]')) return;
     if (navRef.value && !navRef.value.contains(event.target)) {
         isOpen.value = false;
         localStorage.setItem(localStorageKey, 'closed');
     }
 }
 
-function toggle() {
-    isOpen.value = !isOpen.value;
-    // Reset viewport flag since user is explicitly toggling, so we should respect their preference
-    // even when viewport size changes (don't auto-expand if user manually closed it)
-    collapsedByViewport.value = false;
-    localStorage.setItem(localStorageKey, isOpen.value ? 'open' : 'closed');
-}
-
 function handleParentClick(event, item) {
 	if (event.defaultPrevented) return;
 
@@ -145,12 +193,6 @@ function shouldRenderAsInertiaLink(item) {
     return isUrlWithinControlPanel(item.url);
 }
 
-Statamic.$keys.bind(['command+\\', ['[']], (e) => {
-    e.preventDefault();
-    toggle();
-});
-
-Statamic.$events.$on('nav.toggle', toggle);
 </script>
 
 <template>
diff --git a/resources/js/components/nav/nav-toggle-channel.js b/resources/js/components/nav/nav-toggle-channel.js
new file mode 100644
index 00000000000..bea7de0e2e7
--- /dev/null
+++ b/resources/js/components/nav/nav-toggle-channel.js
@@ -0,0 +1,19 @@
+/**
+ * Direct wiring from the global header burger to Nav.toggle().
+ * Avoids Statamic.$events (tiny-emitter) and document-level click ordering races.
+ */
+let handler = null;
+
+export function setCpNavToggleHandler(fn) {
+    handler = fn;
+}
+
+export function clearCpNavToggleHandler(fn) {
+    if (handler === fn) {
+        handler = null;
+    }
+}
+
+export function invokeCpNavToggle() {
+    handler?.();
+}
diff --git a/resources/js/components/portals/Portals.js b/resources/js/components/portals/Portals.js
index 1269834ce6a..62e5cb9ca29 100644
--- a/resources/js/components/portals/Portals.js
+++ b/resources/js/components/portals/Portals.js
@@ -21,7 +21,7 @@ export default class Portals {
     destroy(id) {
         const i = this.portals.value.findIndex((portal) => portal.id === id);
 
-        this.portals.value.splice(i, 1);
+        if (i !== -1) this.portals.value.splice(i, 1);
     }
 
     stacks() {
diff --git a/resources/js/components/publish/FieldMeta.vue b/resources/js/components/publish/FieldMeta.vue
index 3c9c6cb7855..4f59f367bd3 100644
--- a/resources/js/components/publish/FieldMeta.vue
+++ b/resources/js/components/publish/FieldMeta.vue
@@ -60,12 +60,18 @@ export default {
                 value: this.value,
             };
 
-            this.$axios.post(cp_url('fields/field-meta'), params).then((response) => {
-                this.meta = response.data.meta;
-                this.value = response.data.value;
-                this.loading = false;
-                this.$emit('loaded');
-            });
+            this.$axios
+                .post(cp_url('fields/field-meta'), params)
+                .then((response) => {
+                    this.meta = response.data.meta;
+                    this.value = response.data.value;
+                    this.loading = false;
+                    this.$emit('loaded');
+                })
+                .catch((e) => {
+                    this.loading = false;
+                    this.$toast.error(e.response?.data?.message || __('Something went wrong'));
+                });
         },
 
         updateMeta(value) {
diff --git a/resources/js/components/publish/Values.js b/resources/js/components/publish/Values.js
index c258b75a44f..d25f9001d2d 100644
--- a/resources/js/components/publish/Values.js
+++ b/resources/js/components/publish/Values.js
@@ -6,11 +6,12 @@ function data_delete(obj, path) {
     var parts = path.split('.');
     while (parts.length - 1) {
         var key = parts.shift();
+        if (obj === null || typeof obj !== 'object') return;
         var shouldBeArray = parts.length ? new RegExp('^[0-9]+$').test(parts[0]) : false;
         if (!(key in obj)) obj[key] = shouldBeArray ? [] : {};
         obj = obj[key];
     }
-    delete obj[parts[0]];
+    if (obj !== null && typeof obj === 'object') delete obj[parts[0]];
 }
 
 export default class Values {
@@ -82,7 +83,7 @@ export default class Values {
 
     missingValue(dottedKey) {
         var properties = Array.isArray(dottedKey) ? dottedKey : dottedKey.split('.');
-        var value = properties.reduce((prev, curr) => prev && prev[curr], clone(this.values));
+        var value = properties.reduce((prev, curr) => (prev == null ? undefined : prev[curr]), clone(this.values));
 
         return value === undefined;
     }
diff --git a/resources/js/components/roles/PermissionTree.vue b/resources/js/components/roles/PermissionTree.vue
index a25fbe8b014..2bec1e60434 100644
--- a/resources/js/components/roles/PermissionTree.vue
+++ b/resources/js/components/roles/PermissionTree.vue
@@ -1,6 +1,6 @@
 <template>
     <div :style="`padding-inline-start: ${12 * depth - 12}px`">
-        <template v-for="permission in permissions" :key="permission.value">
+        <template v-for="permission in visiblePermissions" :key="permission.value">
             <ui-checkbox
                 :class="[
                     permission.description
@@ -18,16 +18,23 @@
                 v-if="permission.children.length"
                 :depth="depth + 1"
                 :initial-permissions="permission.children"
+                :checked-permissions="checkedPermissions"
             />
         </template>
     </div>
 </template>
 
 <script>
+import { visible } from '@/components/roles/permissions.js';
+
 export default {
     props: {
         initialPermissions: Array,
         depth: Number,
+        checkedPermissions: {
+            type: Array,
+            default: () => [],
+        },
     },
 
     data() {
@@ -36,6 +43,12 @@ export default {
         };
     },
 
+    computed: {
+        visiblePermissions() {
+            return visible(this.permissions, this.checkedPermissions);
+        },
+    },
+
     watch: {
         initialPermissions: {
             handler(newPermissions) {
diff --git a/resources/js/components/roles/PublishForm.vue b/resources/js/components/roles/PublishForm.vue
index 6b7098ed7dc..b85995bc14a 100644
--- a/resources/js/components/roles/PublishForm.vue
+++ b/resources/js/components/roles/PublishForm.vue
@@ -67,7 +67,11 @@
                     </Button>
                 </template>
                 <Card>
-                    <PermissionTree :depth="1" :initial-permissions="group.permissions" />
+                    <PermissionTree
+                        :depth="1"
+                        :initial-permissions="group.permissions"
+                        :checked-permissions="checkedPermissions"
+                    />
                 </Card>
             </Panel>
         </div>
@@ -78,6 +82,7 @@
 import { Header, Button, Panel, PanelHeader, Heading, Card, Switch, Field, Input, CommandPaletteItem } from '@/components/ui';
 import { requireElevatedSession } from '@/components/elevated-sessions';
 import PermissionTree from '@/components/roles/PermissionTree.vue';
+import { allVisibleChecked, checkVisible, uncheckAll, visible } from '@/components/roles/permissions.js';
 import { router } from '@inertiajs/vue3';
 
 const checked = function (permissions) {
@@ -159,46 +164,39 @@ export default {
 
     methods: {
         areAllChecked(group) {
-            const checkAll = (permissions) => {
-                return permissions.every(permission => {
-                    const childrenChecked = permission.children && permission.children.length
-                        ? checkAll(permission.children)
-                        : true;
-                    return permission.checked && childrenChecked;
-                });
-            };
-            return checkAll(group.permissions);
+            const checkedPermissions = this.checkedPermissions;
+            const shown = visible(group.permissions, checkedPermissions);
+
+            return shown.length > 0 && allVisibleChecked(shown, checkedPermissions);
         },
 
         areAllCheckedInAllGroups() {
             return this.permissions.every(group => this.areAllChecked(group));
         },
 
+        // Checking only affects what the user can see, but unchecking clears the group
+        // outright. Unchecking a broader permission reveals the ones it was hiding, so
+        // leaving those checked would need a second click to empty the group.
         toggleAllInGroup(group) {
-            const allChecked = this.areAllChecked(group);
-            const toggle = (permissions, checked) => {
-                permissions.forEach(permission => {
-                    permission.checked = checked;
-                    if (permission.children && permission.children.length) {
-                        toggle(permission.children, checked);
-                    }
-                });
-            };
-            toggle(group.permissions, !allChecked);
+            const checkedPermissions = this.checkedPermissions;
+
+            if (this.areAllChecked(group)) {
+                uncheckAll(group.permissions);
+            } else {
+                checkVisible(group.permissions, checkedPermissions);
+            }
         },
 
         toggleAllInAllGroups() {
+            const checkedPermissions = this.checkedPermissions;
             const allChecked = this.areAllCheckedInAllGroups();
-            this.permissions.forEach(group => {
-                const toggle = (permissions, checked) => {
-                    permissions.forEach(permission => {
-                        permission.checked = checked;
-                        if (permission.children && permission.children.length) {
-                            toggle(permission.children, checked);
-                        }
-                    });
-                };
-                toggle(group.permissions, !allChecked);
+
+            this.permissions.forEach((group) => {
+                if (allChecked) {
+                    uncheckAll(group.permissions);
+                } else {
+                    checkVisible(group.permissions, checkedPermissions);
+                }
             });
         },
 
diff --git a/resources/js/components/roles/permissions.js b/resources/js/components/roles/permissions.js
new file mode 100644
index 00000000000..a5b6e4bd47a
--- /dev/null
+++ b/resources/js/components/roles/permissions.js
@@ -0,0 +1,29 @@
+export function isVisible(permission, checkedPermissions) {
+    return !permission.hidden_by.some((value) => checkedPermissions.includes(value));
+}
+
+export function visible(permissions, checkedPermissions) {
+    return permissions.filter((permission) => isVisible(permission, checkedPermissions));
+}
+
+export function allVisibleChecked(permissions, checkedPermissions) {
+    return visible(permissions, checkedPermissions).every(
+        (permission) => permission.checked && allVisibleChecked(permission.children, checkedPermissions),
+    );
+}
+
+// The checked permissions are snapshotted by the caller. Visibility must not shift
+// as we check things, otherwise checking a permission would hide the ones after it.
+export function checkVisible(permissions, checkedPermissions) {
+    visible(permissions, checkedPermissions).forEach((permission) => {
+        permission.checked = true;
+        checkVisible(permission.children, checkedPermissions);
+    });
+}
+
+export function uncheckAll(permissions) {
+    permissions.forEach((permission) => {
+        permission.checked = false;
+        uncheckAll(permission.children);
+    });
+}
diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index 2621a977f65..bbbcdfe7c2e 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -31,6 +31,8 @@
                     :each-droppable="eachDroppable"
                     :max-level="maxDepth"
                     :stat-handler="statHandler"
+                    :i18n="treeDraggableI18n"
+                    :aria-label="__('Tree Structure')"
                     @after-drop="afterDrop"
                     @open:node="nodeOpened"
                     @close:node="nodeClosed"
@@ -142,6 +144,12 @@ export default {
         direction() {
             return this.$config.get('direction', 'ltr');
         },
+
+        treeDraggableI18n() {
+            return {
+                instructions: __('messages.tree_aria_instructions'),
+            };
+        },
     },
 
     watch: {
diff --git a/resources/js/components/terms/PublishForm.vue b/resources/js/components/terms/PublishForm.vue
index b110a7a4c72..b5a2f60a61e 100644
--- a/resources/js/components/terms/PublishForm.vue
+++ b/resources/js/components/terms/PublishForm.vue
@@ -56,7 +56,7 @@
             v-if="fieldset"
             ref="container"
             :name="publishContainer"
-            :reference="initialReference"
+            :reference="reference"
             :blueprint="fieldset"
             v-model="values"
             :meta="meta"
@@ -64,6 +64,7 @@
             :origin-meta="originMeta"
             :errors="errors"
             :site="site"
+            :read-only="readOnly"
             v-model:modified-fields="localizedFields"
             :sync-field-confirmation-text="syncFieldConfirmationText"
             :remember-tab="!isInline"
@@ -215,6 +216,7 @@ export default {
             originValues: this.initialOriginValues || {},
             originMeta: this.initialOriginMeta || {},
             site: this.initialSite,
+            reference: this.initialReference,
             isPreviewing: false,
             state: 'new',
             published: this.initialPublished,
@@ -269,7 +271,7 @@ export default {
         },
 
         showLivePreviewButton() {
-            return !this.isCreating && this.isBase && this.livePreviewUrl && this.showVisitUrlButton;
+            return !this.isPreviewing && !this.readOnly && !this.isCreating && this.isBase && this.livePreviewUrl && this.showVisitUrlButton;
         },
 
         showVisitUrlButton() {
@@ -421,7 +423,7 @@ export default {
             }
 
             if (this.publishContainer === 'base') {
-                window.history.replaceState({}, '', localization.url);
+                window.history.replaceState({}, '', localization.url + window.location.hash);
             }
         },
 
@@ -440,6 +442,7 @@ export default {
                 this.actions = data.actions;
                 this.fieldset = data.blueprint;
                 this.site = localization.handle;
+                this.reference = data.reference;
                 this.localizing = false;
                 this.$nextTick(() => this.$refs.container.clearDirtyState());
             });
diff --git a/resources/js/components/two-factor/Setup.vue b/resources/js/components/two-factor/Setup.vue
index b74fdd1f064..0526ad82559 100644
--- a/resources/js/components/two-factor/Setup.vue
+++ b/resources/js/components/two-factor/Setup.vue
@@ -25,7 +25,7 @@ onMounted(() => getSetupCode());
 function getSetupCode() {
     loading.value = true;
 
-    axios.get(props.enableUrl).then((response) => {
+    axios.post(props.enableUrl).then((response) => {
         qrCode.value = response.data.qr;
         secretKey.value = response.data.secret_key;
         confirmUrl.value = response.data.confirm_url;
@@ -67,7 +67,7 @@ watch(setupModalOpen, (open) => {
                     <ui-description class="mb-6">{{ __('statamic::messages.two_factor_setup_instructions') }}</ui-description>
 
                     <div class="flex space-x-6">
-                        <div class="bg-white" v-html="qrCode"></div>
+                        <div class="shrink-0 rounded-md border border-gray-200 dark:border-none overflow-hidden" v-html="qrCode"></div>
                         <div class="space-y-6 w-full">
                             <ui-field :label="__('Setup Key')">
                                 <ui-input copyable readonly :model-value="secretKey" />
diff --git a/resources/js/components/ui/Alert.vue b/resources/js/components/ui/Alert.vue
index 4ccc13cb423..b23a5f50fdb 100644
--- a/resources/js/components/ui/Alert.vue
+++ b/resources/js/components/ui/Alert.vue
@@ -36,41 +36,35 @@ const alertClasses = computed(() => {
             '[&_h5]:mb-1 [&_h5]:font-bold',
             '[&_h6]:mb-1 [&_h6]:font-bold',
             '[&_[data-ui-heading]]:mb-1 [&_[data-ui-heading]]:font-bold',
+            '[&_h1]:text-inherit! [&_h2]:text-inherit! [&_h3]:text-inherit! [&_h4]:text-inherit! [&_h5]:text-inherit! [&_h6]:text-inherit! [&_[data-ui-heading]]:text-inherit!',
             '[&_[data-ui-heading]]:-mt-0.5',
             '[&_[data-ui-heading].text-lg]:-mt-1',
             '[&_[data-ui-heading].text-2xl]:mt-[-0.45rem] [&_[data-ui-heading].text-2xl]:mb-2',
             '[&_p:not(:last-child)]:mb-3',
             '[&_[data-ui-description]:not(:last-child)]:mb-3',
-            '[&_code]:px-0.75 [&_code]:mx-0.5 [&_code]:py-0.5 [&_code]:rounded-sm [&_code]:text-xs',
+            '[&_[data-ui-description]]:text-inherit!',
+            '[&_code]:px-0.75 [&_code]:mx-0.5 [&_code]:py-0.5 [&_code]:rounded-sm [&_code]:text-xs [&_code]:text-inherit!',
         ].join(' '),
         variants: {
             variant: {
                 default: [
                     'bg-gray-50 dark:bg-gray-900/50 border-gray-200 dark:border-gray-700/80 text-gray-800 dark:text-gray-100',
-                    '[&_code]:bg-gray-200! [&_code]:text-gray-800! dark:[&_code]:bg-gray-800! dark:[&_code]:text-gray-200!',
-                    '[&_[data-ui-heading]]:text-gray-800! dark:[&_[data-ui-heading]]:text-gray-100!',
-                    '[&_[data-ui-description]]:text-gray-800! dark:[&_[data-ui-description]]:text-gray-300!',
+                    '[&_code]:bg-gray-200! dark:[&_code]:bg-gray-800!',
                     'dark:[&_svg]:text-gray-400',
                 ],
                 warning: [
                     'bg-amber-50 dark:bg-amber-300/6 border-amber-200 dark:border-amber-400/25 text-amber-800 dark:text-amber-200',
-                    '[&_code]:bg-amber-200/50! [&_code]:text-amber-800! dark:[&_code]:bg-amber-300/8! dark:[&_code]:text-amber-200!',
-                    '[&_[data-ui-heading]]:text-amber-800! dark:[&_[data-ui-heading]]:text-amber-300!',
-                    '[&_[data-ui-description]]:text-amber-800! dark:[&_[data-ui-description]]:text-amber-200!',
+                    '[&_code]:bg-amber-200/50! dark:[&_code]:bg-amber-300/8!',
                     'dark:[&_svg]:text-amber-300',
                 ],
                 error: [
                     'bg-red-50 dark:bg-red-300/6 border-red-200 dark:border-red-400/25 text-red-800 dark:text-red-300',
-                    '[&_code]:bg-red-200/50! [&_code]:text-red-800! dark:[&_code]:bg-red-300/8! dark:[&_code]:text-red-200!',
-                    '[&_[data-ui-heading]]:text-red-800! dark:[&_[data-ui-heading]]:text-red-300!',
-                    '[&_[data-ui-description]]:text-red-800! dark:[&_[data-ui-description]]:text-red-200!',
+                    '[&_code]:bg-red-200/50! dark:[&_code]:bg-red-300/8!',
                     'dark:[&_svg]:text-red-300',
                 ],
                 success: [
                     'bg-emerald-50 dark:bg-emerald-300/6 border-emerald-200 dark:border-emerald-400/25 text-emerald-800 dark:text-emerald-300',
-                    '[&_code]:bg-emerald-200/50! [&_code]:text-emerald-800! dark:[&_code]:bg-emerald-300/8! dark:[&_code]:text-emerald-200!',
-                    '[&_[data-ui-heading]]:text-emerald-800! dark:[&_[data-ui-heading]]:text-emerald-300!',
-                    '[&_[data-ui-description]]:text-emerald-800! dark:[&_[data-ui-description]]:text-emerald-200!',
+                    '[&_code]:bg-emerald-200/50! dark:[&_code]:bg-emerald-300/8!',
                     'dark:[&_svg]:text-emerald-300',
                 ],
             },
diff --git a/resources/js/components/ui/Badge.vue b/resources/js/components/ui/Badge.vue
index c2a8ccf40cc..554220066e3 100644
--- a/resources/js/components/ui/Badge.vue
+++ b/resources/js/components/ui/Badge.vue
@@ -1,10 +1,12 @@
 <script setup>
-import { computed, useSlots } from 'vue';
+import { computed, useAttrs, useSlots } from 'vue';
 import { cva } from 'cva';
 import { twMerge } from 'tailwind-merge';
 import Icon from './Icon/Icon.vue';
 import { Link } from '@inertiajs/vue3';
 
+defineOptions({ inheritAttrs: false });
+
 const props = defineProps({
     /** Appended text */
     append: { type: [String, Number, Boolean, null], default: null },
@@ -30,6 +32,7 @@ const props = defineProps({
     text: { type: [String, Number, Boolean, null], default: null },
 });
 
+const attrs = useAttrs();
 const slots = useSlots();
 const hasDefaultSlot = !!slots.default;
 const tag = computed(() => {
@@ -49,11 +52,11 @@ const badgeClasses = computed(() => {
                 lg: 'font-medium text-sm leading-7 px-2.5 rounded-lg [&_svg]:size-4 gap-2',
             },
             color: {
-                amber: 'bg-amber-50 dark:bg-gray-800 border-amber-400 dark:border-amber-700 text-amber-700 dark:text-amber-300 [a]:hover:bg-amber-100 dark:[a]:hover:bg-gray-700 [button]:hover:bg-amber-200 dark:[button]:hover:bg-gray-700',
+                amber: 'bg-amber-50 dark:bg-gray-800 border-amber-400 dark:border-amber-700 text-amber-700 dark:text-amber-300 [a]:hover:bg-amber-100 dark:[a]:hover:bg-gray-700 [button]:hover:bg-amber-100 dark:[button]:hover:bg-gray-700',
                 black: 'bg-gray-900 dark:bg-black border-black dark:border-gray-700 text-white dark:text-gray-300 [a]:hover:bg-gray-800 dark:[a]:hover:bg-gray-800 [button]:hover:bg-gray-800 dark:[button]:hover:bg-gray-800',
                 blue: 'bg-blue-50 dark:bg-gray-800 border-blue-300 dark:border-blue-700 text-blue-700 dark:text-blue-300 [a]:hover:bg-blue-100 dark:[a]:hover:bg-gray-700 [button]:hover:bg-blue-100 dark:[button]:hover:bg-gray-700',
                 cyan: 'bg-cyan-50 dark:bg-gray-800 border-cyan-400 dark:border-cyan-700 text-cyan-700 dark:text-cyan-300 [a]:hover:bg-cyan-100 dark:[a]:hover:bg-gray-700 [button]:hover:bg-cyan-100 dark:[button]:hover:bg-gray-700',
-                default: 'bg-gray-50 dark:bg-gray-800 border-gray-300 dark:border-gray-700 dark:text-gray-100 text-gray-700 [a]:hover:bg-gray-100 dark:[a]:hover:bg-gray-700 [button]:hover:bg-gray-200 dark:[button]:hover:bg-gray-700',
+                default: 'bg-gray-50 dark:bg-gray-800 border-gray-300 dark:border-gray-700 dark:text-gray-100 text-gray-700 [a]:hover:bg-gray-100 dark:[a]:hover:bg-gray-700 [button]:hover:bg-gray-100 dark:[button]:hover:bg-gray-700',
                 emerald: 'bg-emerald-50 border-emerald-400 dark:border-emerald-700 text-emerald-700 dark:bg-gray-800 dark:text-emerald-300 [a]:hover:bg-emerald-100 dark:[a]:hover:bg-gray-700 [button]:hover:bg-emerald-100 dark:[button]:hover:bg-gray-700',
                 fuchsia: 'bg-fuchsia-50 dark:bg-gray-800 border-fuchsia-300 dark:border-fuchsia-700 text-fuchsia-700 dark:text-fuchsia-300 [a]:hover:bg-fuchsia-100 dark:[a]:hover:bg-gray-700 [button]:hover:bg-fuchsia-100 dark:[button]:hover:bg-gray-700',
                 green: 'bg-green-50 border-green-400 dark:border-green-700 text-green-700 dark:bg-gray-800 dark:text-green-300 [a]:hover:bg-green-100 dark:[a]:hover:bg-gray-700 [button]:hover:bg-green-100 dark:[button]:hover:bg-gray-700',
@@ -78,12 +81,17 @@ const badgeClasses = computed(() => {
         asButton: props.href ?? props.as == 'button' ? true : false,
     });
 
-    return twMerge(classes);
+    return twMerge(classes, attrs.class);
+});
+
+const restAttrs = computed(() => {
+    const { class: _, ...rest } = attrs;
+    return rest;
 });
 </script>
 
 <template>
-    <component :is="tag" :class="badgeClasses" :href="props.href" :target="target" data-ui-badge>
+    <component :is="tag" v-bind="restAttrs" :class="badgeClasses" :href="props.href" :target="target" data-ui-badge>
         <span v-if="props.prepend" class="font-medium border-e border-inherit ps-0.5 pe-1.5">{{ prepend }}</span>
         <Icon v-if="icon" :name="icon" />
         <slot v-if="hasDefaultSlot" />
diff --git a/resources/js/components/ui/Button/Button.vue b/resources/js/components/ui/Button/Button.vue
index 6594a89e16d..65e17d859b6 100644
--- a/resources/js/components/ui/Button/Button.vue
+++ b/resources/js/components/ui/Button/Button.vue
@@ -1,10 +1,12 @@
 <script setup>
-import { computed, useSlots } from 'vue';
+import { computed, useAttrs, useSlots } from 'vue';
 import { cva } from 'cva';
 import { twMerge } from 'tailwind-merge';
 import Icon from '../Icon/Icon.vue';
 import { Link } from '@inertiajs/vue3';
 
+defineOptions({ inheritAttrs: false });
+
 const props = defineProps({
     /** The element or component this component should render as */
     as: { type: String, default: null },
@@ -35,6 +37,7 @@ const props = defineProps({
     variant: { type: String, default: 'default' },
 });
 
+const attrs = useAttrs();
 const slots = useSlots();
 const hasDefaultSlot = !!slots.default;
 const tag = computed(() => {
@@ -65,7 +68,7 @@ const buttonClasses = computed(() => {
                 subtle: 'bg-transparent hover:bg-gray-400/10 text-gray-500 hover:text-gray-700 dark:text-gray-300 dark:hover:bg-white/7 dark:hover:text-gray-200 [&_svg]:opacity-35',
                 pressed: [
                     'bg-linear-to-b from-gray-200 to-gray-150 text-gray-900 border border-gray-300 inset-shadow-sm/10',
-                    'dark:from-black dark:to-black dark:text-white dark:border-gray-700/80',
+                    'dark:from-gray-950 dark:to-gray-900 dark:text-white dark:border-gray-700/80',
                 ],
             },
             size: {
@@ -109,13 +112,19 @@ const buttonClasses = computed(() => {
         iconOnly: iconOnly.value,
     });
 
-    return twMerge(classes);
+    return twMerge(classes, attrs.class);
+});
+
+const restAttrs = computed(() => {
+    const { class: _, ...rest } = attrs;
+    return rest;
 });
 </script>
 
 <template>
     <component
         :is="tag"
+        v-bind="restAttrs"
         :class="buttonClasses"
         :disabled="disabled || loading"
         :data-ui-group-target="['subtle', 'ghost'].includes(props.variant) ? null : true"
diff --git a/resources/js/components/ui/Button/Group.vue b/resources/js/components/ui/Button/Group.vue
index 45679891c26..2f031fc0882 100644
--- a/resources/js/components/ui/Button/Group.vue
+++ b/resources/js/components/ui/Button/Group.vue
@@ -1,40 +1,135 @@
 <template>
-    <div
-        :class="[
-            'group/button inline-flex flex-wrap [[data-floating-toolbar]_&]:justify-center [[data-floating-toolbar]_&]:gap-1 [[data-floating-toolbar]_&]:lg:gap-x-0',
-            '[&>[data-ui-group-target]:not(:first-child):not(:last-child)]:rounded-none',
-            '[&>[data-ui-group-target]:first-child:not(:last-child)]:rounded-e-none',
-            '[&>[data-ui-group-target]:last-child:not(:first-child)]:rounded-s-none',
-            '[&>*:not(:first-child):not(:last-child):not(:only-child)_[data-ui-group-target]]:rounded-none',
-            '[&>*:first-child:not(:last-child)_[data-ui-group-target]]:rounded-e-none',
-            '[&>*:last-child:not(:first-child)_[data-ui-group-target]]:rounded-s-none',
-            'dark:[&_button]:ring-0',
-            'max-lg:[[data-floating-toolbar]_&_button]:rounded-md!',
-            'shadow-ui-sm rounded-lg'
-        ]"
-        data-ui-button-group
-    >
-        <slot />
+    <div ref="wrapper" :class="{ invisible: measuringOverflow }">
+        <div ref="group" :class="groupClasses" :data-measuring="measuringOverflow || undefined" data-ui-button-group>
+            <slot />
+        </div>
     </div>
 </template>
 
+<script setup>
+import { ref, computed, nextTick, onMounted, onBeforeUnmount } from 'vue';
+import { cva } from 'cva';
+
+import debounce from '@/util/debounce';
+
+const props = defineProps({
+    /* When 'stack', switch to vertical layout when overflowing. When 'gap', switch to normal buttons with gaps when overflowing. */
+    overflow: {
+        type: String,
+        default: null,
+        validator: (v) => [null, 'stack', 'gap'].includes(v),
+    },
+    orientation: {
+        type: String,
+        default: 'horizontal',
+    },
+    gap: {
+        type: [String, Boolean],
+        default: false,
+    },
+    justify: {
+        type: String,
+        default: 'start',
+    },
+});
+
+const hasOverflow = ref(false);
+const needsOverflowObserver = computed(() => props.overflow === 'stack' || props.overflow === 'gap');
+const measuringOverflow = ref(false);
+
+const groupClasses = computed(() => {
+    const groupShadow = 'rounded-lg shadow-ui-sm [&_[data-ui-group-target]]:shadow-none';
+
+    const collapseHorizontally = [
+        '[&>[data-ui-group-target]:not(:first-child):not(:last-child)]:rounded-none',
+        '[&>:not(:first-child):not(:last-child)_[data-ui-group-target]]:rounded-none',
+        '[&>[data-ui-group-target]:first-child:not(:last-child)]:rounded-e-none',
+        '[&>:first-child:not(:last-child)_[data-ui-group-target]]:rounded-e-none',
+        '[&>[data-ui-group-target]:last-child:not(:first-child)]:rounded-s-none',
+        '[&>:last-child:not(:first-child)_[data-ui-group-target]]:rounded-s-none',
+        '[&>[data-ui-group-target]:not(:first-child)]:border-s-0',
+        '[&>:not(:first-child)_[data-ui-group-target]]:border-s-0',
+    ];
+
+    const collapseVertically = [
+        'flex-col',
+        '[&>[data-ui-group-target]:not(:first-child):not(:last-child)]:rounded-none',
+        '[&>:not(:first-child):not(:last-child)_[data-ui-group-target]]:rounded-none',
+        '[&>[data-ui-group-target]:first-child:not(:last-child)]:rounded-b-none',
+        '[&>:first-child:not(:last-child)_[data-ui-group-target]]:rounded-b-none',
+        '[&>[data-ui-group-target]:last-child:not(:first-child)]:rounded-t-none',
+        '[&>:last-child:not(:first-child)_[data-ui-group-target]]:rounded-t-none',
+        '[&>[data-ui-group-target]:not(:last-child)]:border-b-0',
+        '[&>:not(:last-child)_[data-ui-group-target]]:border-b-0',
+    ];
+
+    return cva({
+        base: [
+            'group/button inline-flex flex-wrap relative',
+            'dark:[&_button]:ring-0',
+        ],
+        variants: {
+            orientation: {
+                vertical: collapseVertically,
+            },
+            justify: {
+                center: 'justify-center',
+            },
+        },
+        compoundVariants: [
+            { overflow: 'stack', hasOverflow: false, class: [...collapseHorizontally, groupShadow] },
+            { overflow: 'stack', hasOverflow: true, class: [...collapseVertically, groupShadow] },
+            { overflow: 'gap', hasOverflow: true, class: 'gap-1' },
+            { overflow: 'gap', hasOverflow: false, class: [...collapseHorizontally, groupShadow] },
+            { overflow: null, orientation: 'horizontal', gap: false, class: [...collapseHorizontally, groupShadow] },
+        ],
+    })({
+        gap: props.gap,
+        justify: props.justify,
+        orientation: props.orientation,
+        overflow: props.overflow,
+        hasOverflow: hasOverflow.value,
+    });
+});
+
+const wrapper = ref(null);
+const group = ref(null);
+let resizeObserver = null;
+
+async function checkOverflow() {
+    if (!group.value?.children.length) return;
+
+    // Measure in collapsed state to avoid hysteresis from gap spacing
+    hasOverflow.value = false;
+    measuringOverflow.value = true;
+    await nextTick();
+
+    // Check if any child has wrapped to a new line
+    const children = Array.from(group.value.children);
+    const firstTop = children[0].offsetTop;
+    const lastTop = children[children.length - 1].offsetTop;
+    hasOverflow.value = lastTop > firstTop;
+
+    // Exit measuring mode
+    measuringOverflow.value = false;
+}
+
+onMounted(() => {
+    if (needsOverflowObserver.value) {
+        checkOverflow();
+        resizeObserver = new ResizeObserver(debounce(checkOverflow, 50));
+        resizeObserver.observe(wrapper.value);
+    }
+});
+
+onBeforeUnmount(() => {
+    resizeObserver?.disconnect();
+});
+</script>
+
 <style>
-    /* GROUP FLOATING TOOLBAR / BUTTON GROUP BORDERS
-    =================================================== */
-    [data-ui-button-group] [data-ui-group-target] {
-        @apply shadow-none;
-
-        &:not(:first-child):not([data-floating-toolbar] &) {
-            border-inline-start: 0;
-        }
-
-        /* Account for button groups being split apart on small screens */
-        [data-floating-toolbar] & {
-            @media (width >= 1024px) {
-                &:not(:first-child) {
-                    border-inline-start: 0;
-                }
-            }
-        }
+    /* Force horizontal wrap layout during measurement to detect overflow */
+    [data-ui-button-group][data-measuring] {
+        @apply flex! flex-row!;
     }
 </style>
diff --git a/resources/js/components/ui/Calendar/Calendar.vue b/resources/js/components/ui/Calendar/Calendar.vue
index 56785b58777..9f9bb5943be 100644
--- a/resources/js/components/ui/Calendar/Calendar.vue
+++ b/resources/js/components/ui/Calendar/Calendar.vue
@@ -16,6 +16,7 @@ import {
 } from 'reka-ui';
 import { parseAbsolute } from '@internationalized/date';
 import Icon from '../Icon/Icon.vue';
+import CalendarToday from './CalendarToday.vue';
 
 defineOptions({ name: 'Calendar' });
 
@@ -39,6 +40,7 @@ const components = computed(() => ({
     CalendarHeading: props.components.Heading || CalendarHeading,
     CalendarPrev: props.components.Prev || CalendarPrev,
     CalendarNext: props.components.Next || CalendarNext,
+    CalendarToday: props.components.Today || CalendarToday,
     CalendarGrid: props.components.Grid || CalendarGrid,
     CalendarGridHead: props.components.GridHead || CalendarGridHead,
     CalendarGridBody: props.components.GridBody || CalendarGridBody,
@@ -74,6 +76,20 @@ const gridStyle = computed(() => {
         'grid-template-rows': 'auto'
     };
 });
+
+/** Popover uses slight negative inset to align with card; inline skips that inside padded layouts. */
+const calendarHeaderClass = computed(() =>
+    props.inline
+        ? 'flex items-center justify-between pb-3.5 ms-1 -me-1.5 -mt-1'
+        : 'flex items-center justify-between ps-3.5 pe-1 pb-3.5 -mt-1.5',
+);
+
+/** Month grid wrapper: popover matches narrow card; inline allows shrink in tight form layouts. */
+const calendarGridClass = computed(() =>
+    props.inline
+        ? 'w-full border-collapse space-y-1 select-none -ms-2'
+        : 'w-full border-collapse space-y-1 select-none',
+);
 </script>
 
 <template>
@@ -88,18 +104,19 @@ const gridStyle = computed(() => {
         :number-of-months="numberOfMonths"
         @update:model-value="emit('update:modelValue', $event)"
     >
-        <Component :is="components.CalendarHeader" class="flex items-center justify-between ps-3 pe-1 pb-3.5 -mt-1">
+        <Component :is="components.CalendarHeader" :class="calendarHeaderClass">
             <Component :is="components.CalendarHeading" class="text-sm font-medium text-gray-925 dark:text-white" />
-            <div>
+            <div class="inline-flex items-center">
                 <Component
                     :is="components.CalendarPrev"
-                    class="inline-flex size-8 cursor-pointer items-center justify-center rounded-md hover:bg-gray-50 active:scale-90 dark:hover:bg-gray-925"
+                    class="inline-flex size-7.5 cursor-pointer items-center justify-center rounded-md hover:bg-gray-50 active:scale-90 dark:hover:bg-gray-925"
                 >
                     <Icon name="chevron-left" class="size-4" />
                 </Component>
+                <Component :is="components.CalendarToday" />
                 <Component
                     :is="components.CalendarNext"
-                    class="inline-flex size-8 cursor-pointer items-center justify-center rounded-md hover:bg-gray-50 active:scale-90 dark:hover:bg-gray-925"
+                    class="inline-flex size-7.5 cursor-pointer items-center justify-center rounded-md hover:bg-gray-50 active:scale-90 dark:hover:bg-gray-925"
                 >
                     <Icon name="chevron-right" class="size-4" />
                 </Component>
@@ -111,7 +128,7 @@ const gridStyle = computed(() => {
                 :is="components.CalendarGrid"
                 v-for="month in grid"
                 :key="month.value.toString()"
-                class="w-full border-collapse space-y-1 select-none"
+                :class="calendarGridClass"
             >
                 <Component :is="components.CalendarGridHead">
                     <ui-badge class="mb-2" v-if="numberOfMonths > 1">
diff --git a/resources/js/components/ui/Calendar/CalendarToday.vue b/resources/js/components/ui/Calendar/CalendarToday.vue
new file mode 100644
index 00000000000..295290a5166
--- /dev/null
+++ b/resources/js/components/ui/Calendar/CalendarToday.vue
@@ -0,0 +1,53 @@
+<script setup>
+import { computed, onMounted, onUnmounted, ref, unref } from 'vue';
+import { fromDate, getLocalTimeZone, isSameMonth, startOfMonth, toCalendarDate } from '@internationalized/date';
+import { injectCalendarRootContext, injectRangeCalendarRootContext } from 'reka-ui';
+import Icon from '../Icon/Icon.vue';
+
+defineOptions({ name: 'CalendarToday' });
+
+const calendarRoot = injectCalendarRootContext(null) ?? injectRangeCalendarRootContext(null);
+
+const today = ref(new Date());
+let timer;
+
+// Re-evaluates "today" at midnight so the disabled state doesn't go stale if the calendar stays open overnight.
+function scheduleUpdate() {
+    const now = new Date();
+    const msUntilMidnight = +new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1) - +now;
+    timer = setTimeout(() => { today.value = new Date(); scheduleUpdate(); }, msUntilMidnight);
+}
+
+onMounted(scheduleUpdate);
+onUnmounted(() => clearTimeout(timer));
+
+function currentMonth() {
+    return startOfMonth(toCalendarDate(fromDate(today.value, getLocalTimeZone())));
+}
+
+const disabled = computed(() => {
+    if (!calendarRoot) return true;
+    if (unref(calendarRoot.disabled) || unref(calendarRoot.readonly)) return true;
+    const placeholder = unref(calendarRoot.placeholder);
+    if (!placeholder) return false;
+    return isSameMonth(toCalendarDate(placeholder), currentMonth());
+});
+
+function goToToday() {
+    if (!calendarRoot || disabled.value) return;
+    calendarRoot.onPlaceholderChange(currentMonth());
+}
+</script>
+
+<template>
+    <button
+        type="button"
+        class="inline-flex size-7.5 shrink-0 cursor-pointer items-center justify-center rounded-md text-gray-925 hover:bg-gray-50 active:scale-90 disabled:pointer-events-none disabled:opacity-40 dark:text-white dark:hover:bg-gray-925"
+        :disabled="disabled"
+        :aria-label="__('This month')"
+        v-tooltip="__('This month')"
+        @click="goToToday"
+    >
+        <Icon name="calendar" class="size-3.5!" />
+    </button>
+</template>
diff --git a/resources/js/components/ui/Checkbox/Group.vue b/resources/js/components/ui/Checkbox/Group.vue
index 69dfda6b733..327613e518b 100644
--- a/resources/js/components/ui/Checkbox/Group.vue
+++ b/resources/js/components/ui/Checkbox/Group.vue
@@ -1,9 +1,21 @@
+<script>
+import createContext from '@/util/createContext.js';
+
+export const [injectCheckboxContext, provideCheckboxContext] = createContext('Checkbox');
+</script>
+
 <script setup>
-import { useId } from 'vue';
+import { computed, useId } from 'vue';
 import { CheckboxGroupRoot } from 'reka-ui';
 
-defineProps({
-    /** When `true`, displays checkboxes horizontally */
+const props = defineProps({
+    /** Controls how the checkbox group is displayed. Options: `default`, `inline`, `chips` */
+    appearance: {
+        type: String,
+        default: 'default',
+        validator: (value) => ['default', 'inline', 'chips'].includes(value),
+    },
+    /** @deprecated Use `appearance="inline"` instead. */
     inline: { type: Boolean, default: false },
     /** The controlled value of the checkbox group */
     modelValue: { type: Array, default: () => [] },
@@ -12,6 +24,18 @@ defineProps({
     required: { type: Boolean, default: false },
 });
 
+const appearance = computed(() => {
+    if (props.appearance !== 'default') {
+        return props.appearance;
+    }
+
+    return props.inline ? 'inline' : 'default';
+});
+
+const inline = computed(() => appearance.value === 'inline' || appearance.value === 'chips');
+
+provideCheckboxContext({ appearance });
+
 const focus = function () {
     console.log('focusing. todo.');
 };
@@ -27,8 +51,13 @@ defineExpose({ focus });
         @update:modelValue="$emit('update:modelValue', $event)"
         :name="name"
         class="relative block w-full space-y-2"
-        :class="{ 'flex flex-wrap space-y-0 gap-x-4 gap-y-2': inline }"
+        :class="{
+            'flex flex-wrap space-y-0 gap-y-2': inline,
+            'gap-x-4': appearance === 'inline',
+            'gap-x-2.5': appearance === 'chips',
+        }"
         data-ui-input
+        data-ui-checkbox-group
     >
         <slot />
     </CheckboxGroupRoot>
diff --git a/resources/js/components/ui/Checkbox/Item.vue b/resources/js/components/ui/Checkbox/Item.vue
index 88c3e956021..bb5f8fe5f09 100644
--- a/resources/js/components/ui/Checkbox/Item.vue
+++ b/resources/js/components/ui/Checkbox/Item.vue
@@ -3,6 +3,7 @@ import { CheckboxIndicator, CheckboxRoot, useId } from 'reka-ui';
 import { computed, useAttrs } from 'vue';
 import { cva } from 'cva';
 import { twMerge } from 'tailwind-merge';
+import { injectCheckboxContext } from './Group.vue';
 
 defineOptions({ inheritAttrs: false });
 
@@ -34,6 +35,8 @@ const props = defineProps({
 
 const emit = defineEmits(['update:modelValue', 'keydown']);
 
+const { appearance } = injectCheckboxContext() ?? { appearance: computed(() => 'default') };
+
 const id = useId();
 
 const handleKeydown = (event) => {
@@ -67,7 +70,7 @@ const checkboxClasses = computed(() => {
 
 const containerClasses = computed(() => {
     const classes = cva({
-        base: 'flex gap-2',
+        base: 'relative flex gap-2',
         variants: {
             align: {
                 start: 'items-start',
@@ -76,7 +79,9 @@ const containerClasses = computed(() => {
         },
     })({ ...props });
 
-    return twMerge(classes, attrs.class);
+    const chipsClass = 'mb-0 items-center gap-1.5 rounded-xl border border-gray-300 bg-linear-to-b from-white to-white p-2 py-2 pe-4 shadow-ui-sm transition-[background] hover:bg-gray-50 hover:to-gray-50 with-contrast:border-gray-500 dark:border-gray-700/80 dark:from-gray-850 dark:to-gray-900 dark:shadow-ui-md dark:hover:bg-gray-900 dark:hover:to-gray-850 [&_button]:mt-0';
+
+    return twMerge(classes, appearance.value === 'chips' ? chipsClass : null, attrs.class);
 });
 
 const conditionalProps = computed(() => {
@@ -104,7 +109,7 @@ const conditionalProps = computed(() => {
 </script>
 
 <template>
-    <div :class="containerClasses">
+    <div :class="containerClasses" data-ui-checkbox-item>
         <CheckboxRoot
             :disabled="readOnly || disabled"
             :id
@@ -127,7 +132,7 @@ const conditionalProps = computed(() => {
             </span>
         </CheckboxRoot>
         <div class="flex flex-col" v-if="!solo">
-            <label class="text-sm font-normal antialiased dark:text-gray-200" :for="id">
+            <label class="text-sm font-normal antialiased cursor-pointer dark:text-gray-200 before:absolute before:inset-0 before:content-['']" :for="id">
                 <slot>{{ label || value }}</slot>
             </label>
             <p v-if="description" :id="`${id}-description`" class="mt-0.5 block text-xs leading-snug text-gray-500 dark:text-gray-200">{{ description }}</p>
diff --git a/resources/js/components/ui/CodeEditor.vue b/resources/js/components/ui/CodeEditor.vue
index 93659cb3cc4..93cf84c2eb4 100644
--- a/resources/js/components/ui/CodeEditor.vue
+++ b/resources/js/components/ui/CodeEditor.vue
@@ -51,7 +51,7 @@ const props = defineProps({
     lineNumbers: { type: Boolean, default: true },
     /** When `true`, long lines will wrap */
     lineWrapping: { type: Boolean, default: true },
-    /** The syntax highlighting mode. Options: `clike`, `css`, `diff`, `go`, `haml`, `handlebars`, `htmlmixed`, `less`, `markdown`, `gfm`, `nginx`, `text/x-java`, `javascript`, `jsx`, `text/x-objectivec`, `php`, `python`, `ruby`, `scss`, `shell`, `sql`, `twig`, `vue`, `xml`, `yaml-frontmatter` */
+    /** The syntax highlighting mode. Options: `clike`, `css`, `diff`, `go`, `haml`, `handlebars`, `htmlmixed`, `less`, `markdown`, `gfm`, `nginx`, `text/x-java`, `javascript`, `application/json`, `application/ld+json`, `jsx`, `text/x-objectivec`, `php`, `python`, `ruby`, `scss`, `shell`, `sql`, `twig`, `vue`, `xml`, `yaml-frontmatter` */
     mode: { type: String, default: 'javascript' },
     /** The controlled value of the code editor */
     modelValue: { type: String, default: '' },
@@ -82,6 +82,8 @@ const modes = ref([
     { value: 'nginx', label: 'Nginx' },
     { value: 'text/x-java', label: 'Java' },
     { value: 'javascript', label: 'JavaScript' },
+    { value: 'application/json', label: 'JSON' },
+    { value: 'application/ld+json', label: 'JSON-LD' },
     { value: 'jsx', label: 'JSX' },
     { value: 'text/x-objectivec', label: 'Objective-C' },
     { value: 'php', label: 'PHP' },
@@ -288,6 +290,7 @@ watch(
                     v-if="allowModeSelection"
                     :options="modes"
                     :disabled="disabled"
+                    :adaptive-width="true"
                     :model-value="mode"
                     @update:modelValue="$emit('update:mode', $event)"
                 />
@@ -305,6 +308,7 @@ watch(
                         v-if="allowModeSelection"
                         :options="modes"
                         :disabled="disabled"
+                        :adaptive-width="true"
                         :model-value="mode"
                         searchable
                         @update:modelValue="$emit('update:mode', $event)"
diff --git a/resources/js/components/ui/Combobox/Combobox.vue b/resources/js/components/ui/Combobox/Combobox.vue
index 6366f67221f..478da310f21 100644
--- a/resources/js/components/ui/Combobox/Combobox.vue
+++ b/resources/js/components/ui/Combobox/Combobox.vue
@@ -9,7 +9,6 @@ import {
     ComboboxRoot,
     ComboboxTrigger,
     ComboboxPortal,
-    ComboboxViewport,
     ComboboxVirtualizer,
     FocusScope
 } from 'reka-ui';
@@ -21,12 +20,14 @@ import Badge from '../Badge.vue';
 import fuzzysort from 'fuzzysort';
 import DOMPurify from 'dompurify';
 import { SortableList } from '@/components/sortable/Sortable.js';
-import Scrollbar from "@ui/Combobox/Scrollbar.vue";
 
 const emit = defineEmits(['update:modelValue', 'search', 'selected', 'added']);
 
 const props = defineProps({
-	id: { type: String },
+	/** When `true`, the dropdown will expand to fit longer option labels. Not recommended for large datasets. */
+	adaptiveWidth: { type: Boolean, default: false },
+	/** The preferred alignment against the trigger. May change when collisions occur. <br><br> Options: `start`, `center`, `end` */
+	align: { type: String, default: 'start' },
 	/** When `true`, the selected value will be clearable. */
 	clearable: { type: Boolean, default: false },
 	/** When `true`, the options dropdown will close after selecting an option. */
@@ -36,13 +37,15 @@ const props = defineProps({
 	discreteFocusOutline: { type: Boolean, default: false },
 	/** Icon name. [Browse available icons](/?path=/story/components-icon--all-icons) */
 	icon: { type: String, default: null },
+	/** ID attribute for the input element */
+	id: { type: String },
 	/** When `true`, the Combobox will avoid filtering options, allowing you to handle filtering yourself by listening to the `search` event and updating the `options` prop. */
 	ignoreFilter: { type: Boolean, default: false },
 	/** When `true`, the option labels will be rendered with `v-html` instead of `v-text`. */
 	labelHtml: { type: Boolean, default: false },
 	/** The maximum number of selectable options. */
 	maxSelections: { type: Number, default: null },
-	/** The controlled value of the select. */
+	/** The controlled value of the combobox. */
 	modelValue: { type: [Object, String, Number], default: null },
 	/** When `true`, multiple options are allowed. */
 	multiple: { type: Boolean, default: false },
@@ -52,15 +55,19 @@ const props = defineProps({
 	options: { type: Array, default: () => [] },
 	/** Key of the option's value in the option's object. */
 	optionValue: { type: String, default: 'value' },
+	/** The delimiter used to split pasted text into multiple tags. Only used when `taggable` is `true`. */
+	pasteDelimiter: { type: String, default: ',' },
 	placeholder: { type: String, default: () => __('Select...') },
 	readOnly: { type: Boolean, default: false },
 	/** When `true`, the options will be searchable. */
 	searchable: { type: Boolean, default: true },
-	/** Controls the size of the select. <br><br> Options: `xs`, `sm`, `base`, `lg`, `xl` */
+	/** Determines if the dropdown should open */
+	shouldOpenDropdown: { type: Function, default: () => true },
+	/** Controls the size of the combobox. <br><br> Options: `xs`, `sm`, `base`, `lg`, `xl` */
 	size: { type: String, default: 'base' },
 	/** When `true`, additional options can be added by typing in the search input and pressing enter. */
 	taggable: { type: Boolean, default: false },
-	/** Controls the appearance of the select. <br><br> Options: `default`, `filled`, `ghost`, `subtle` */
+	/** Controls the appearance of the combobox. <br><br> Options: `default`, `filled`, `ghost`, `subtle` */
 	variant: { type: String, default: 'default' },
 });
 
@@ -112,9 +119,9 @@ const triggerClasses = cva({
 
 const itemClasses = cva({
     base: [
-        'w-full flex items-center gap-2 relative select-none cursor-pointer text-sm',
+        'w-full flex items-center gap-2 relative select-none cursor-pointer text-sm overflow-hidden',
         'py-1.5 px-2 antialiased rounded-lg',
-        'data-disabled:text-gray-300 data-disabled:pointer-events-none data-highlighted:outline-hidden',
+        'data-disabled:text-gray-300 dark:data-disabled:text-gray-500 data-disabled:pointer-events-none data-highlighted:outline-hidden',
     ],
     variants: {
         size: {
@@ -123,12 +130,36 @@ const itemClasses = cva({
             xs: 'text-xs',
         },
         selected: {
-            false: 'text-gray-900 dark:text-gray-300 data-highlighted:bg-gray-100 data-highlighted:text-gray-900 dark:data-highlighted:bg-gray-700 dark:data-highlighted:text-gray-300',
+            false: 'text-gray-900 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-700',
             true: 'bg-blue-50 dark:bg-blue-600 text-blue-600! dark:text-blue-50!',
         },
     },
 });
 
+const searchQuery = ref('');
+const dropdownOpen = ref(false);
+const rootRef = useTemplateRef('root');
+const triggerRef = useTemplateRef('trigger');
+const searchInputRef = useTemplateRef('search');
+
+watch(searchQuery, (value) => emit('search', value, () => {}));
+watch(dropdownOpen, () => searchQuery.value = '');
+
+const getOptionLabel = (option) => {
+    const label = option?.[props.optionLabel];
+    if (props.labelHtml) {
+        return DOMPurify.sanitize(label ?? '', {
+            USE_PROFILES: { html: true, svg: true },
+        });
+    }
+    return label;
+};
+
+const getOptionValue = (option) => option?.[props.optionValue];
+const matchOptionByValue = (option, value) => getOptionValue(option) === value;
+const isSelected = (option) => selectedOptions.value.some((item) => getOptionValue(item) === getOptionValue(option));
+const isDisabled = (option) => !isSelected(option) && props.multiple && limitReached.value;
+
 const selectedOptions = computed(() => {
     let selections = props.modelValue === null ? [] : props.modelValue;
 
@@ -137,7 +168,8 @@ const selectedOptions = computed(() => {
     }
 
     return selections.map((value) => {
-        return props.options.find((option) => getOptionValue(option) === value) ?? { label: value, value };
+        return props.options.find((option) => getOptionValue(option) === value)
+            ?? { [props.optionLabel]: value, [props.optionValue]: value };
     });
 });
 
@@ -149,25 +181,6 @@ const selectedOption = computed(() => {
     return selectedOptions.value[0];
 });
 
-const getOptionLabel = (option) => {
-    const label = option?.[props.optionLabel];
-    if (props.labelHtml) {
-        return DOMPurify.sanitize(label ?? '', {
-            USE_PROFILES: { html: true, svg: true },
-        });
-    }
-    return label;
-};
-const getOptionValue = (option) => option?.[props.optionValue];
-const isSelected = (option) => selectedOptions.value.some((item) => getOptionValue(item) === getOptionValue(option));
-
-const isOptionDisabled = (option) => {
-    if (isSelected(option)) return false;
-    if (props.multiple && limitReached.value) return true;
-
-    return false;
-};
-
 const limitReached = computed(() => {
     if (! props.maxSelections) return false;
 
@@ -190,14 +203,28 @@ const limitIndicatorColor = computed(() => {
     return 'text-gray';
 });
 
-const triggerRef = useTemplateRef('trigger');
-const viewportRef = useTemplateRef('viewport');
-const scrollbarRef = useTemplateRef('scrollbar');
-const searchQuery = ref('');
-const searchInputRef = useTemplateRef('search');
+const canClearSelection = computed(() => props.clearable && props.modelValue);
+const shouldCloseOnSelect = computed(() => props.closeOnSelect ?? !props.multiple);
+const shouldShowOptionsChevron = computed(() => props.options.length > 0 || props.ignoreFilter);
+const shouldShowLimitIndicator = computed(() => props.multiple && props.maxSelections && props.maxSelections !== Infinity);
+
+const shouldShowInput = computed(() => {
+    if (!props.searchable) return false;
+    if (props.taggable) return true;
+
+    return dropdownOpen.value || !props.modelValue || (props.multiple && props.placeholder);
+});
+
+const placeholder = computed(() => {
+    if (props.multiple && selectedOptions.value.length > 0) {
+        return __n(':count item selected|:count items selected', selectedOptions.value.length);
+    }
+
+    if (selectedOption.value) {
+        return getOptionLabel(selectedOption.value);
+    }
 
-watch(searchQuery, (value) => {
-    emit('search', value, () => {});
+    return props.placeholder;
 });
 
 const filteredOptions = computed(() => {
@@ -205,12 +232,16 @@ const filteredOptions = computed(() => {
         return props.options;
     }
 
-    const results = fuzzysort
-        .go(searchQuery.value, props.options, {
-            all: true,
-            key: props.optionLabel,
-        })
-        .map((result) => result.obj);
+    const matches = new Set(
+        fuzzysort
+            .go(searchQuery.value, props.options, {
+                all: true,
+                key: props.optionLabel,
+            })
+            .map((result) => result.obj)
+    );
+
+    const results = props.options.filter((option) => matches.has(option));
 
     if (props.taggable && searchQuery.value && results.length === 0) {
         results.push({
@@ -222,140 +253,110 @@ const filteredOptions = computed(() => {
     return results;
 });
 
-watch(filteredOptions, () => {
-	nextTick(() => scrollbarRef.value?.update());
-});
-
 function clear() {
     searchQuery.value = '';
     emit('update:modelValue', null);
 }
 
+function select() {
+    dropdownOpen.value = !shouldCloseOnSelect.value;
+    if (shouldCloseOnSelect.value) triggerRef.value?.$el?.focus();
+}
+
 function deselect(option) {
     emit('update:modelValue', props.modelValue.filter((item) => item !== option));
 }
 
-const dropdownOpen = ref(false);
-const virtualizerReady = ref(false);
-const closeOnSelect = computed(() => props.closeOnSelect || !props.multiple);
-const optionWidth = ref(null);
+function updateModelValue(value) {
+    let originalValue = props.modelValue || [];
 
-function updateDropdownOpen(open) {
-    if (props.disabled) return;
+    searchQuery.value = '';
+    emit('update:modelValue', value);
 
-    // Prevent dropdown from opening when it's a taggable combobox with no options.
-    if (props.taggable && props.options.length === 0) {
-        return;
-    }
+    if (!Array.isArray(value)) value = [value];
+    if (!Array.isArray(originalValue)) originalValue = [originalValue];
 
-    dropdownOpen.value = open;
+    value
+        .filter((option) => !originalValue?.includes(option))
+        .forEach((option) => emit('selected', option));
+}
 
-    if (!open) {
-        virtualizerReady.value = false;
-    }
+function updateDropdownOpen(open) {
+    if (open && ! props.shouldOpenDropdown(open)) return;
+    if (props.disabled || props.readOnly) return;
+
+    dropdownOpen.value = open;
 
     if (open) {
-        nextTick(() => {
-            measureOptionWidths();
-	        scrollbarRef.value?.update();
-            virtualizerReady.value = true;
-        });
+        nextTick(() => searchInputRef?.value?.$el?.focus());
+        requestAnimationFrame(() => requestAnimationFrame(() => scrollToSelectedOption()));
     }
 }
 
-function measureOptionWidths() {
-    if (!filteredOptions.value || filteredOptions.value.length === 0) return;
-
-    // Find the options with the longest labels by character count.
-    // We only measure these candidates rather than all options for performance.
-    const candidates = [...filteredOptions.value]
-        .sort((a, b) => (getOptionLabel(b)?.length || 0) - (getOptionLabel(a)?.length || 0))
-        .slice(0, 5);
-
-    let maxWidth = 0;
-    const measurementCanvas = document.createElement('canvas');
-    const context = measurementCanvas.getContext('2d');
-
-    // Get computed font from a rendered item or use a reasonable default
-    // This matches the itemClasses styling
-    context.font = '14px -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif';
-
-    candidates.forEach(option => {
-        const label = getOptionLabel(option);
-        const metrics = context.measureText(label);
-        const textWidth = metrics.width;
-
-        // Add padding and icon space
-        // py-1.5 px-2 = 0.375rem top/bottom, 0.5rem left/right = 8px left/right = 16px total
-        // gap-2 = 0.5rem = 8px for icon/text gap
-        // icon size-4 = 1rem = 16px
-        let totalWidth = textWidth + 32; // Base padding
-
-        if (option.image) totalWidth += 20; // icon (20px) + gap (8px)
-        if (totalWidth > maxWidth) maxWidth = totalWidth;
-    });
+function openDropdown(e) {
+    if (dropdownOpen.value) return;
+    if (e.key === ' ' && e.target.tagName === 'INPUT') return;
+    if (typeof e.preventDefault === 'function') e.preventDefault();
 
-    // Add ComboboxContent padding (p-2 = 0.5rem * 2 = 16px on each side = 32px total)
-    optionWidth.value = Math.ceil(maxWidth + 32);
+    updateDropdownOpen(true);
 }
 
-function updateModelValue(value) {
-    let originalValue = props.modelValue || [];
+function onBlur(e) {
+    if (!props.taggable) return;
 
-    searchQuery.value = '';
-    emit('update:modelValue', value);
-
-    if (!Array.isArray(value)) value = [value];
-    if (!Array.isArray(originalValue)) originalValue = [originalValue];
+    let isInsideDropdown = 'rekaCollectionItem' in (e.relatedTarget?.dataset ?? {});
+    if (isInsideDropdown) return;
 
-    value
-        .filter((option) => !originalValue?.includes(option))
-        .forEach((option) => emit('selected', option));
+    pushTaggableOption(e);
 }
 
 function onPaste(e) {
-    if (!props.taggable) {
-        return;
-    }
+    if (!props.taggable) return;
+
+    e.preventDefault();
 
     const pastedValue = e.clipboardData.getData('text');
 
-    updateModelValue([...props.modelValue, ...pastedValue.split(',').map((v) => v.trim())]);
+    const tags = pastedValue
+        .split(props.pasteDelimiter)
+        .map((v) => v.trim())
+        .filter((v) => v !== '');
+
+    updateModelValue([...(props.modelValue ?? []), ...tags]);
 }
 
-// When it's a taggable combobox with no options, we need to push the value here as updateModelValue won't be called.
 function pushTaggableOption(e) {
-    if (props.taggable && props.options.length === 0) {
-        if (e.target.value === '') return;
-
-        if (props.modelValue.includes(e.target.value)) {
-            searchQuery.value = '';
-            return;
-        }
+    if (!props.taggable) return;
+    if (e.target.value === '') return;
 
-        emit('added', e.target.value);
+    e.preventDefault();
 
-        updateModelValue([...props.modelValue, e.target.value]);
+    if (props.modelValue?.includes(e.target.value)) {
+        searchQuery.value = '';
+        return;
     }
-}
 
-function openDropdown(e) {
-    if (dropdownOpen.value) return;
-    if (typeof e.preventDefault === 'function') e.preventDefault();
+    emit('added', e.target.value);
 
-    updateDropdownOpen(true);
+    updateModelValue([...props.modelValue ?? [], e.target.value]);
+}
 
-    nextTick(() => searchInputRef?.value?.$el?.focus());
+function scrollToSelectedOption() {
+    if (props.multiple || !props.modelValue) return;
+
+    rootRef.value?.highlightSelected?.();
 }
 
-function selectOption(option) {
-    dropdownOpen.value = !closeOnSelect.value;
-    if (closeOnSelect.value) triggerRef.value.$el.focus();
+function focus() {
+    shouldShowInput.value
+        ? nextTick(() => searchInputRef.value?.$el.focus())
+        : nextTick(() => triggerRef.value?.$el.focus());
 }
 
 defineExpose({
     searchQuery,
     filteredOptions,
+    focus,
 });
 </script>
 
@@ -363,166 +364,170 @@ defineExpose({
     <div :class="wrapperClasses" v-bind="wrapperAttrs">
         <div class="flex w-full min-w-0">
             <ComboboxRoot
-                :disabled="disabled || readOnly"
-                :model-value="modelValue"
+                ref="root"
+                class="cursor-pointer flex-1 min-w-0"
                 :multiple
                 :open="dropdownOpen"
+                :model-value="modelValue"
+                :by="matchOptionByValue"
+                :disabled="disabled || readOnly"
                 :reset-search-term-on-blur="false"
                 :reset-search-term-on-select="false"
-                @update:model-value="updateModelValue"
-                @update:open="updateDropdownOpen"
-                class="cursor-pointer flex-1 min-w-0"
                 data-ui-combobox
                 ignore-filter
+                @update:open="updateDropdownOpen"
+                @update:model-value="updateModelValue"
             >
                 <ComboboxAnchor class="block w-full" data-ui-combobox-anchor>
                     <ComboboxTrigger
                         as="div"
                         ref="trigger"
+                        :tabindex="disabled || readOnly ? -1 : 0"
                         :class="triggerClasses"
+                        data-ui-combobox-trigger
                         @keydown.enter="openDropdown"
                         @keydown.space="openDropdown"
-                        data-ui-combobox-trigger
                     >
                         <div class="flex-1 min-w-0">
-                            <!-- Dropdown open: search input -->
                             <ComboboxInput
-                                v-if="searchable && (dropdownOpen || !modelValue || (multiple && placeholder))"
+                                v-if="shouldShowInput"
+                                :id
+                                :placeholder
                                 ref="search"
-                                class="w-full bg-transparent text-gray-900 dark:text-gray-300 opacity-100 focus:outline-none placeholder-gray-500 dark:placeholder-gray-400 [&::-webkit-search-cancel-button]:hidden"
+                                class="w-full bg-transparent text-gray-900 dark:text-gray-300 opacity-100 focus:outline-none placeholder-gray-500 dark:placeholder-gray-400 [&::-webkit-search-cancel-button]:hidden cursor-pointer"
+                                :class="{
+                                    'placeholder-gray-900! dark:placeholder-gray-300!': selectedOption && !multiple && !dropdownOpen
+                                }"
                                 type="search"
-                                :id="id"
-                                v-model="searchQuery"
-                                :placeholder
                                 autocomplete="off"
-                                @paste.prevent="onPaste"
-                                @keydown.enter.prevent="pushTaggableOption"
-                                @blur="pushTaggableOption"
-                                @keydown.space="openDropdown"
+                                v-model="searchQuery"
+                                @blur="onBlur"
+                                @paste="onPaste"
+                                @keydown.enter="pushTaggableOption"
                             />
 
-                            <!-- Dropdown open: placeholder -->
-                            <div
-                                v-else-if="!searchable && (dropdownOpen || !modelValue)"
-                                class="w-full text-start flex items-center gap-2 bg-transparent cursor-pointer focus:outline-none"
-                                data-ui-combobox-placeholder
-                            >
-                                <Icon v-if="icon" :name="icon" class="text-gray-500 dark:text-white dark:opacity-50" />
-                                <span class="block truncate text-gray-500 dark:text-gray-400 select-none" v-text="placeholder" />
-                            </div>
-
-                            <!-- Dropdown closed: selected option -->
                             <div
                                 v-else
-                                class="w-full text-start bg-transparent flex items-center gap-2 cursor-pointer focus:outline-none"
+                                class="w-full text-start bg-transparent flex items-center gap-2 cursor-pointer focus:outline-none select-none"
                                 data-ui-combobox-selected-option
                             >
                                 <slot v-if="selectedOption" name="selected-option" v-bind="{ option: selectedOption }">
                                     <div v-if="icon" class="size-4">
-                                        <Icon :name="icon" class="text-white/85 dark:text-white dark:opacity-50" />
+                                        <Icon :name="icon" class="text-gray-900 dark:text-white dark:opacity-50" />
                                     </div>
                                     <span v-if="labelHtml" v-html="getOptionLabel(selectedOption)" class="block truncate" />
                                     <span v-else v-text="getOptionLabel(selectedOption)" class="block truncate" />
                                 </slot>
+                                <span v-else class="block truncate text-gray-500 dark:text-gray-400" v-text="placeholder" />
                             </div>
                         </div>
 
-                        <div v-if="(clearable && modelValue) || (options.length || ignoreFilter)" class="flex gap-1.5 items-center ms-1.5 -me-1">
-                            <Button v-if="clearable && modelValue" icon="x" variant="ghost" size="xs" round @click="clear" data-ui-combobox-clear-button />
-                            <Icon v-if="options.length || ignoreFilter" name="chevron-down" class="text-gray-400 dark:text-white/40 size-4" data-ui-combobox-chevron />
+                        <div v-if="canClearSelection || shouldShowOptionsChevron" class="flex gap-1.5 items-center ms-1.5 -me-1">
+                            <Button
+                                v-if="canClearSelection"
+                                icon="x"
+                                variant="ghost"
+                                size="xs"
+                                round
+                                :disabled="disabled || readOnly"
+                                :aria-label="__('Clear selection')"
+                                data-ui-combobox-clear-button
+                                @click="clear"
+                            />
+                            <Icon
+                                v-if="shouldShowOptionsChevron"
+                                name="chevron-down"
+                                class="text-gray-400 dark:text-white/40 size-4"
+                                aria-hidden="true"
+                                data-ui-combobox-chevron
+                            />
                         </div>
                     </ComboboxTrigger>
                 </ComboboxAnchor>
 
                 <ComboboxPortal>
                     <ComboboxContent
-                        :hidden="!dropdownOpen"
-                        position="popper"
+                        :align
                         :side-offset="5"
-                        align="start"
+                        position="popper"
                         :class="[
-                            'shadow-ui-sm z-(-well-z-index-above) rounded-lg border border-gray-200 bg-white p-2 dark:border-white/10 dark:bg-gray-800',
-                            'max-h-[var(--reka-combobox-content-available-height)] min-w-[var(--reka-combobox-trigger-width)]',
-                            'overflow-hidden'
+                            'shadow-ui-sm z-(--z-index-above) rounded-lg border border-gray-200 bg-white dark:border-white/10 dark:bg-gray-800',
+                            'max-h-[var(--reka-combobox-content-available-height)] min-w-[var(--reka-combobox-trigger-width)] overflow-hidden',
+                            adaptiveWidth && 'w-max max-w-md',
                         ]"
-                        :style="optionWidth ? { width: `${optionWidth}px` } : {}"
                         data-ui-combobox-content
-                        @escape-key-down="nextTick(() => $refs.trigger.$el.focus())"
+                        @escape-key-down="focus"
                     >
                         <FocusScope
                             :trapped="!searchable"
                             @mount-auto-focus.prevent
                             @unmount-auto-focus="(event) => {
                                 if (event.defaultPrevented) return;
-                                nextTick(() => $refs.trigger?.$el?.focus());
+                                focus();
                                 event.preventDefault();
                             }"
                         >
-                            <div class="relative">
-                                <ComboboxViewport
-                                    ref="viewport"
-                                    class="max-h-[calc(var(--reka-combobox-content-available-height)-2rem)] overflow-y-scroll"
-                                    :class="{
-										'min-h-[2.25px]': filteredOptions.length === 0,
-										'min-h-[2.5rem]': filteredOptions.length === 1,
-										'min-h-[5rem]': filteredOptions.length === 2,
-										'min-h-[7.5rem]': filteredOptions.length >= 3,
-                                        'pr-3': scrollbarRef?.isVisible,
-                                    }"
-                                    data-ui-combobox-viewport
-                                >
-                                    <ComboboxEmpty class="p-2 text-sm" data-ui-combobox-empty>
+                            <div class="relative max-h-[300px] overflow-y-auto py-2" data-ui-combobox-viewport>
+                                <!-- Hidden width measurer for wide dropdown mode -->
+                                <div v-if="adaptiveWidth" aria-hidden="true" class="h-0 overflow-y-clip px-2">
+                                    <div v-for="option in filteredOptions" :key="getOptionValue(option)" class="py-1.5 px-2 text-sm whitespace-nowrap">
+                                        {{ getOptionLabel(option) }}
+                                    </div>
+                                </div>
+
+                                <ComboboxEmpty class="py-1 px-4 text-sm" role="status" aria-live="polite" data-ui-combobox-empty>
                                     <slot name="no-options" v-bind="{ searchQuery }">
                                         {{ __('No options available.') }}
                                     </slot>
                                 </ComboboxEmpty>
 
                                 <ComboboxVirtualizer
-                                    v-if="virtualizerReady && filteredOptions.length"
-                                    v-slot="{ option, virtualItem }"
-                                    :options="filteredOptions"
+                                    v-if="filteredOptions.length"
                                     :estimate-size="40"
+                                    :options="filteredOptions"
                                     :text-content="(opt) => getOptionLabel(opt)"
+                                    v-slot="{ option }"
                                 >
-                                    <div class="py-1 w-full overflow-x-hidden">
+                                    <div class="py-1 px-2 w-full overflow-x-hidden">
                                         <ComboboxItem
-                                            :key="virtualItem.index + JSON.stringify(modelValue)"
+                                            as="button"
+                                            :key="`${getOptionValue(option)}-${isDisabled(option)}`"
                                             :value="getOptionValue(option)"
                                             :text-value="getOptionLabel(option)"
-                                            :disabled="isOptionDisabled(option)"
+                                            :disabled="isDisabled(option)"
                                             :class="itemClasses({ size: size, selected: isSelected(option) })"
-                                            as="button"
                                             :data-ui-combobox-item="getOptionValue(option)"
-                                            @select="selectOption(option)"
+                                            :title="getOptionLabel(option)"
+                                            @select="select"
                                         >
                                             <slot name="option" v-bind="option">
-                                                <img v-if="option.image" :src="option.image" class="size-5 rounded-full" />
-                                                <span v-if="labelHtml" v-html="getOptionLabel(option)" />
-                                                <span v-else>{{ __(getOptionLabel(option)) }}</span>
+                                                <img v-if="option.image" :src="option.image" class="size-5 rounded-full" :alt="getOptionLabel(option)">
+                                                <span v-if="labelHtml" class="truncate" v-html="getOptionLabel(option)" />
+                                                <span class="truncate" v-else>{{ __(getOptionLabel(option)) }}</span>
                                             </slot>
                                         </ComboboxItem>
                                     </div>
                                 </ComboboxVirtualizer>
-                            </ComboboxViewport>
-
-	                        <!--
-	                            Custom Scrollbar
-	                            (we can't use the browser's scrollbar here because of virtualization, so we need to create our own).
-	                        -->
-	                       <Scrollbar ref="scrollbar" :viewport="viewportRef" />
-                        </div>
+                            </div>
                         </FocusScope>
                     </ComboboxContent>
                 </ComboboxPortal>
             </ComboboxRoot>
 
-            <div v-if="maxSelections && maxSelections !== Infinity && multiple" class="ms-2 mt-3 text-xs" :class="limitIndicatorColor" data-ui-combobox-limit-indicator>
+            <div
+                v-if="shouldShowLimitIndicator"
+                class="ms-2 mt-3 text-xs"
+                :class="limitIndicatorColor"
+                :aria-label="__(':count of :max selections', { count: selectedOptions.length, max: maxSelections })"
+                aria-live="polite"
+                data-ui-combobox-limit-indicator
+            >
                 <span v-text="selectedOptions.length"></span>/<span v-text="maxSelections"></span>
             </div>
         </div>
 
         <slot name="selected-options" v-bind="{ disabled, readOnly, getOptionLabel, getOptionValue, labelHtml, deselect }">
-            <sortable-list
+            <SortableList
                 v-if="multiple"
                 data-ui-combobox-selected-options
                 item-class="sortable-item"
@@ -537,7 +542,7 @@ defineExpose({
                     <div
                         v-for="option in selectedOptions"
                         :key="getOptionValue(option)"
-                        class="sortable-item mt-2"
+                        class="sortable-item mt-2 cursor-grab active:cursor-grabbing"
                     >
                         <Badge pill size="lg" class="[&>*]:st-text-trim-ex-alphabetic">
                             <div v-if="labelHtml" v-html="getOptionLabel(option)"></div>
@@ -547,18 +552,18 @@ defineExpose({
                                 v-if="!disabled && !readOnly"
                                 type="button"
                                 class="opacity-75 hover:opacity-100 cursor-pointer"
-                                :aria-label="__('Deselect option')"
-                                @click="deselect(option.value)"
+                                :aria-label="__('Remove :label', { label: getOptionLabel(option) })"
+                                @click="deselect(getOptionValue(option))"
                             >
                                 &times;
                             </button>
-                            <button v-else type="button" class="opacity-75">
+                            <span v-else class="opacity-75" aria-hidden="true">
                                 &times;
-                            </button>
+                            </span>
                         </Badge>
                     </div>
                 </div>
-            </sortable-list>
+            </SortableList>
         </slot>
     </div>
 </template>
diff --git a/resources/js/components/ui/Combobox/Scrollbar.vue b/resources/js/components/ui/Combobox/Scrollbar.vue
deleted file mode 100644
index a568c91f69e..00000000000
--- a/resources/js/components/ui/Combobox/Scrollbar.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<script setup>
-import { ref, watch, onUnmounted, nextTick } from 'vue';
-
-const props = defineProps({
-	viewport: { type: Object, default: null },
-});
-
-const isVisible = ref(false);
-const thumbHeight = ref(0);
-const thumbTop = ref(0);
-const isDragging = ref(false);
-
-let resizeObserver = null;
-
-function update() {
-	const element = props.viewport?.$el || props.viewport;
-	if (!element) return;
-
-	const scrollHeight = element.scrollHeight;
-	const clientHeight = element.clientHeight;
-	const scrollTop = element.scrollTop;
-
-	isVisible.value = scrollHeight > clientHeight;
-
-	if (isVisible.value) {
-		// Calculate thumb height as a percentage of visible area
-		const thumbHeightPercent = (clientHeight / scrollHeight) * 100;
-		thumbHeight.value = Math.max(thumbHeightPercent, 10); // Minimum 10%
-
-		// Calculate thumb position
-		const maxScroll = scrollHeight - clientHeight;
-		const scrollPercent = maxScroll > 0 ? scrollTop / maxScroll : 0;
-		const maxThumbTop = 100 - thumbHeight.value;
-		thumbTop.value = scrollPercent * maxThumbTop;
-	}
-}
-
-function handleMouseDown(event) {
-	event.preventDefault();
-	isDragging.value = true;
-	
-	document.addEventListener('mousemove', handleMouseMove);
-	document.addEventListener('mouseup', handleMouseUp);
-}
-
-function handleMouseMove(event) {
-	if (!isDragging.value) return;
-	
-	const element = props.viewport?.$el || props.viewport;
-	if (!element) return;
-	
-	const scrollbarTrack = element.parentElement.querySelector('.absolute.top-0.right-0');
-	if (!scrollbarTrack) return;
-	
-	const trackRect = scrollbarTrack.getBoundingClientRect();
-	const mouseY = event.clientY - trackRect.top;
-	const trackHeight = trackRect.height;
-	
-	// Calculate scroll position based on mouse position
-	const scrollPercent = Math.max(0, Math.min(1, mouseY / trackHeight));
-	const maxScroll = element.scrollHeight - element.clientHeight;
-	
-	element.scrollTop = scrollPercent * maxScroll;
-}
-
-function handleMouseUp() {
-	isDragging.value = false;
-	document.removeEventListener('mousemove', handleMouseMove);
-	document.removeEventListener('mouseup', handleMouseUp);
-}
-
-watch(
-	() => props.viewport,
-	(viewport, oldViewport) => {
-		const oldElement = oldViewport?.$el || oldViewport;
-
-		if (oldElement) {
-			oldElement.removeEventListener('scroll', update);
-			resizeObserver?.disconnect();
-		}
-
-		if (viewport) {
-			const element = viewport.$el || viewport;
-			if (element) {
-				element.addEventListener('scroll', update);
-
-				resizeObserver = new ResizeObserver(() => update());
-				resizeObserver.observe(element);
-
-				nextTick(() => update());
-			}
-		}
-	},
-	{ immediate: true }
-);
-
-onUnmounted(() => {
-	const element = props.viewport?.$el || props.viewport;
-
-	if (element) {
-		element.removeEventListener('scroll', update);
-	}
-	
-	resizeObserver?.disconnect();
-	
-	document.removeEventListener('mousemove', handleMouseMove);
-	document.removeEventListener('mouseup', handleMouseUp);
-});
-
-defineExpose({
-	update,
-	isVisible,
-});
-</script>
-
-<template>
-	<div v-if="isVisible" class="absolute top-0 right-0 w-[6px] py-1 px-0.5 h-full pointer-events-none">
-		<div
-			class="absolute right-0 w-1.5 rounded-md bg-black/25 hover:bg-black/40 dark:bg-white/25 dark:hover:bg-white/40 transition-colors pointer-events-auto cursor-pointer"
-			:class="{ 'bg-black/40 dark:bg-white/40': isDragging }"
-			:style="{
-                height: `${thumbHeight}%`,
-                top: `${thumbTop}%`
-            }"
-			@mousedown="handleMouseDown"
-		/>
-	</div>
-</template>
\ No newline at end of file
diff --git a/resources/js/components/ui/DatePicker/DatePicker.vue b/resources/js/components/ui/DatePicker/DatePicker.vue
index 89743d8ece0..e5b216798ce 100644
--- a/resources/js/components/ui/DatePicker/DatePicker.vue
+++ b/resources/js/components/ui/DatePicker/DatePicker.vue
@@ -1,5 +1,7 @@
 <script setup>
+import { config } from '@api';
 import { computed } from 'vue';
+import { normalizeLocale } from '../../FormattingLocale.js';
 import {
     DatePickerAnchor,
     DatePickerContent,
@@ -24,6 +26,9 @@ import Card from '../Card/Card.vue';
 import Button from '../Button/Button.vue';
 import Calendar from '../Calendar/Calendar.vue';
 import Icon from '../Icon/Icon.vue';
+import Text from '../Text.vue';
+import TimezoneHoverCard from '../TimezoneHoverCard.vue';
+import { getAdditionalTimezones } from './util.js';
 
 const emit = defineEmits(['update:modelValue']);
 
@@ -95,11 +100,25 @@ const calendarEvents = computed(() => ({
     },
 }));
 
+const timeZoneName = computed(() => props.modelValue?.timeZone ?? null);
+
+const timeZoneLabel = computed(() => {
+    const tz = timeZoneName.value;
+    if (!tz) return null;
+
+    const parts = new Intl.DateTimeFormat(normalizeLocale(config.get('translationLocale')), { timeZone: tz, timeZoneName: 'short' }).formatToParts(props.modelValue.toDate());
+    return parts.find((p) => p.type === 'timeZoneName')?.value ?? tz;
+});
+
+const additionalTimezones = computed(() => getAdditionalTimezones(timeZoneName.value));
+
 const isInvalid = computed(() => {
     // Check if the component has invalid state from form validation
     return props.modelValue === null && props.required;
 });
 
+const hasTime = computed(() => props.granularity != null && props.granularity !== 'day');
+
 const getInputLabel = (part) => {
     switch (part) {
         case 'day':
@@ -142,9 +161,9 @@ const getInputLabel = (part) => {
                 <DatePickerAnchor as-child>
                     <div
                         :class="[
-                            'flex w-full items-center bg-white uppercase dark:bg-gray-900',
+                            'flex w-full items-center overflow-x-auto overflow-y-hidden bg-white uppercase dark:bg-gray-900',
                             'border border-gray-300 dark:border-gray-700',
-                            'text-gray-600 dark:text-gray-300',
+                            'leading-[1.375rem] text-gray-600 dark:text-gray-300',
                             'shadow-ui-sm not-prose h-10 rounded-lg px-2 disabled:shadow-none',
                             'data-invalid:border-red-500',
                             'disabled:shadow-none disabled:opacity-50',
@@ -161,12 +180,13 @@ const getInputLabel = (part) => {
                         >
                             <Icon name="calendar" class="size-4" />
                         </DatePickerTrigger>
-                        <div class="flex items-center flex-1">
+                        <div class="flex flex-1 items-center" :class="{ '@max-xs:text-xs': hasTime }">
                             <template v-for="item in segments" :key="item.part">
                                 <div v-if="item.part === 'literal'">
                                     <DatePickerInput
                                         :part="item.part"
-                                        :class="{ 'text-sm text-gray-600 dark:text-gray-400 antialiased': !item.contenteditable }"
+                                        class="whitespace-pre"
+                                        :class="{ 'text-gray-600 dark:text-gray-400': !item.contenteditable }"
                                         v-on="inputEvents"
                                     >
                                         {{ item.value }}
@@ -175,9 +195,9 @@ const getInputLabel = (part) => {
                                 <div v-else>
                                     <DatePickerInput
                                         :part="item.part"
-                                        class="rounded-sm px-0.25 py-0.5 focus:bg-blue-100 focus:outline-hidden data-placeholder:text-gray-600 dark:focus:bg-blue-900 dark:data-placeholder:text-gray-400"
+                                        class="rounded-sm py-0.5 focus:bg-blue-100 focus:outline-hidden data-placeholder:text-gray-600 dark:focus:bg-blue-900 dark:data-placeholder:text-gray-400"
                                         :class="{
-                                            'px-0.5!': item.part === 'month' || item.part === 'year' || item.part === 'day',
+                                            'px-0.25!': item.part === 'month' || item.part === 'year' || item.part === 'day',
                                         }"
                                         :aria-label="getInputLabel(item.part)"
                                         v-on="inputEvents"
@@ -187,6 +207,14 @@ const getInputLabel = (part) => {
                                 </div>
                             </template>
                         </div>
+                        <TimezoneHoverCard
+                            v-if="timeZoneLabel"
+                            :date="modelValue.toDate()"
+                            :additional-timezones="additionalTimezones"
+                            side="top"
+                        >
+                            <Text class="text-gray-600! dark:text-gray-400! ms-2" size="xs" :text="timeZoneLabel" />
+                        </TimezoneHoverCard>
                         <Button
                             v-if="clearable && !readOnly"
                             @click="emit('update:modelValue', null)"
diff --git a/resources/js/components/ui/DatePicker/util.js b/resources/js/components/ui/DatePicker/util.js
new file mode 100644
index 00000000000..c7265d9c8d0
--- /dev/null
+++ b/resources/js/components/ui/DatePicker/util.js
@@ -0,0 +1,9 @@
+import { config } from '@api';
+import { getLocalTimeZone } from '@internationalized/date';
+
+export function getAdditionalTimezones(timeZone) {
+    if (!timeZone) return [];
+    if (timeZone === (config.get('displayTimezone') ?? 'UTC')) return [];
+    if (timeZone === getLocalTimeZone()) return [];
+    return [{ timezone: timeZone, label: __('This field') }];
+}
diff --git a/resources/js/components/ui/DateRangePicker/DateRangePicker.vue b/resources/js/components/ui/DateRangePicker/DateRangePicker.vue
index 6eb2e0db61b..14e9e672665 100644
--- a/resources/js/components/ui/DateRangePicker/DateRangePicker.vue
+++ b/resources/js/components/ui/DateRangePicker/DateRangePicker.vue
@@ -1,5 +1,7 @@
 <script setup>
+import { config } from '@api';
 import { computed } from 'vue';
+import { normalizeLocale } from '../../FormattingLocale.js';
 import {
     DateRangePickerCalendar,
     DateRangePickerCell,
@@ -13,6 +15,7 @@ import {
     DateRangePickerHeading,
     DateRangePickerNext,
     DateRangePickerPrev,
+    DateRangePickerAnchor,
     DateRangePickerContent,
     DateRangePickerField,
     DateRangePickerInput,
@@ -23,7 +26,10 @@ import Card from '../Card/Card.vue';
 import Button from '../Button/Button.vue';
 import Calendar from '../Calendar/Calendar.vue';
 import Icon from '../Icon/Icon.vue';
+import Text from '../Text.vue';
+import TimezoneHoverCard from '../TimezoneHoverCard.vue';
 import { parseAbsoluteToLocal } from '@internationalized/date';
+import { getAdditionalTimezones } from '../DatePicker/util.js';
 
 const emit = defineEmits(['update:modelValue']);
 
@@ -51,6 +57,7 @@ const calendarBindings = computed(() => ({
     modelValue: props.modelValue ?? [],
     min: props.min,
     max: props.max,
+    inline: props.inline,
     components: {
         Root: DateRangePickerCalendar,
         Header: DateRangePickerHeader,
@@ -67,15 +74,21 @@ const calendarBindings = computed(() => ({
     },
 }));
 
-// The placeholder defines the month to show when there's no value. Additionally,
-// by setting it to an absolute value, it ensures that the emitted event value
-// will be the appropriate format (e.g. a full date with time with timezone,
-// rather than just a day).
-const placeholder = parseAbsoluteToLocal(new Date().toISOString());
+// Initial month when there is no value. Use defaultPlaceholder (not placeholder) so
+// the range root stays uncontrolled: month navigation can update the visible month,
+// and shared calendar UI (e.g. Today) can read that state from inject context.
+// Still an absolute local ZonedDateTime so defaults match full date/time shape.
+const defaultPlaceholder = parseAbsoluteToLocal(new Date().toISOString());
 
 const calendarEvents = computed(() => ({
     'update:model-value': (event) => {
         if (props.granularity === 'day') {
+
+            // Avoid fatal error `Cannot set properties of undefined (setting 'hour')`
+            if (event.end == null) {
+              return
+            }
+
             event.start.hour = 0;
             event.start.minute = 0;
             event.start.second = 0;
@@ -90,12 +103,29 @@ const calendarEvents = computed(() => ({
         emit('update:modelValue', event)
     },
 }));
+
+const timeZoneName = computed(() => props.modelValue?.start?.timeZone ?? null);
+
+const timeZoneLabel = computed(() => {
+    const tz = timeZoneName.value;
+    if (!tz) return null;
+
+    const parts = new Intl.DateTimeFormat(normalizeLocale(config.get('translationLocale')), { timeZone: tz, timeZoneName: 'short' }).formatToParts(props.modelValue.start.toDate());
+    return parts.find((p) => p.type === 'timeZoneName')?.value ?? tz;
+});
+
+const additionalTimezones = computed(() => getAdditionalTimezones(timeZoneName.value));
+
+const hoverCardDate = computed(() => {
+    if (!props.modelValue?.start || !props.modelValue?.end) return null;
+    return { start: props.modelValue.start.toDate(), end: props.modelValue.end.toDate() };
+});
 </script>
 
 <template>
     <div class="group/input relative block w-full" data-ui-input>
         <DateRangePickerRoot
-            :modelValue="modelValue"
+            :modelValue="modelValue ?? { start: undefined, end: undefined }"
             :granularity="granularity"
             :locale="$date.locale"
             :disabled="disabled || readOnly"
@@ -103,26 +133,31 @@ const calendarEvents = computed(() => ({
             v-bind="$attrs"
             prevent-deselect
             hide-time-zone
-            :placeholder="placeholder"
+            :default-placeholder="defaultPlaceholder"
             close-on-select
         >
             <DateRangePickerField v-slot="{ segments }" class="w-full">
+                <DateRangePickerAnchor as-child>
                 <div
                     :class="[
-                        'flex items-center w-full bg-white dark:bg-gray-900',
+                        'flex items-center w-full overflow-x-auto overflow-y-hidden bg-white dark:bg-gray-900',
                         'border border-gray-300 dark:border-gray-700',
-                        'leading-[1.375rem] text-gray-600 dark:text-gray-300',
-                        'shadow-ui-sm not-prose h-10 rounded-lg py-2 px-2.5 disabled:shadow-none',
+                        'leading-[1.375rem] text-gray-600 dark:text-gray-300 @max-xs:text-xs',
+                        'shadow-ui-sm not-prose h-10 rounded-lg px-2 disabled:shadow-none',
                         'data-invalid:border-red-500',
                         'disabled:shadow-none disabled:opacity-50',
                         readOnly ? 'border-dashed' : '',
                     ]"
                 >
-                    <DateRangePickerTrigger v-if="!inline">
-                        <Button as="div" variant="ghost" size="sm" icon="calendar" class="-ms-2" />
+                    <DateRangePickerTrigger
+                        v-if="!inline"
+                        class="flex shrink-0 items-center justify-center rounded-lg p-2 -ms-1 text-gray-500 dark:text-gray-400 outline-hidden hover:bg-gray-100 focus:bg-gray-100 dark:hover:bg-gray-900 dark:focus:bg-gray-900"
+                        :aria-label="__('Open calendar')"
+                    >
+                        <Icon name="calendar" class="size-4" />
                     </DateRangePickerTrigger>
                     <template v-for="item in segments.start" :key="item.part">
-                        <DateRangePickerInput v-if="item.part === 'literal'" :part="item.part" type="start">
+                        <DateRangePickerInput v-if="item.part === 'literal'" :part="item.part" type="start" class="whitespace-pre">
                             {{ item.value }}
                         </DateRangePickerInput>
                         <DateRangePickerInput
@@ -139,7 +174,7 @@ const calendarEvents = computed(() => ({
                     </template>
                     <span class="mx-0.75 text-gray-400 dark:text-gray-600">&ndash;</span>
                     <template v-for="item in segments.end" :key="item.part">
-                        <DateRangePickerInput v-if="item.part === 'literal'" :part="item.part" type="end">
+                        <DateRangePickerInput v-if="item.part === 'literal'" :part="item.part" type="end" class="whitespace-pre">
                             {{ item.value }}
                         </DateRangePickerInput>
                         <DateRangePickerInput
@@ -155,15 +190,23 @@ const calendarEvents = computed(() => ({
                         </DateRangePickerInput>
                     </template>
                     <div class="flex-1" />
+                    <TimezoneHoverCard
+                        v-if="timeZoneLabel && hoverCardDate"
+                        :date="hoverCardDate"
+                        :additional-timezones="additionalTimezones"
+                        side="top"
+                    >
+                        <Text class="text-gray-600! dark:text-gray-400! ms-2" size="xs" :text="timeZoneLabel" />
+                    </TimezoneHoverCard>
                     <Button v-if="!readOnly" @click="emit('update:modelValue', null)" variant="subtle" size="sm" icon="x" class="-me-2" :disabled="disabled" />
                 </div>
+                </DateRangePickerAnchor>
             </DateRangePickerField>
 
             <DateRangePickerContent
                 v-if="!inline"
                 align="start"
-                :align-offset="-12"
-                :side-offset="14"
+                :side-offset="4"
                 class="data-[state=open]:data-[side=top]:animate-slideDownAndFade data-[state=open]:data-[side=right]:animate-slideLeftAndFade data-[state=open]:data-[side=bottom]:animate-slideUpAndFade data-[state=open]:data-[side=left]:animate-slideRightAndFade will-change-[transform,opacity]"
             >
                 <Card class="w-[20rem]">
diff --git a/resources/js/components/ui/EmptyState/Item.vue b/resources/js/components/ui/EmptyState/Item.vue
index d1af7702998..e5350c30255 100644
--- a/resources/js/components/ui/EmptyState/Item.vue
+++ b/resources/js/components/ui/EmptyState/Item.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { Link } from '@inertiajs/vue3';
 import Icon from '../Icon/Icon.vue';
-import { useSlots } from 'vue';
+import { computed, useSlots } from 'vue';
 
 const props = defineProps({
     /** Optional link */
@@ -9,6 +9,11 @@ const props = defineProps({
         type: String,
         default: null,
     },
+    /** When `href` is provided, this prop controls the link's `target` attribute */
+    target: {
+        type: String,
+        default: null,
+    },
     /** Icon name. [Browse available icons](/?path=/story/components-icon--all-icons) */
     icon: {
         type: String,
@@ -28,13 +33,34 @@ const props = defineProps({
 
 const slots = useSlots();
 const hasSlot = !!slots.default;
+
+const cpBaseUrl = Statamic.$config.get('cpUrl');
+
+function isUrlWithinControlPanel(url) {
+    return url && (url === cpBaseUrl || url.startsWith(cpBaseUrl + '/'));
+}
+
+const linkComponent = computed(() => {
+    if (hasSlot) {
+        return 'div';
+    } else if (props.target === '_blank') {
+        return 'a';
+    } else if (isUrlWithinControlPanel(props.href)) {
+        return Link;
+    } else if (props.href) {
+        return 'a';
+    } else {
+        return 'button';
+    }
+});
 </script>
 
 <template>
     <li class="w-full">
         <component
-            :is="hasSlot ? 'div' : (href ? Link : 'button')"
+            :is="linkComponent"
             :href="href"
+            :target="target"
             class="w-full flex gap-2 px-3 pt-4 pb-5.5 items-start hover:bg-gray-100 dark:hover:bg-gray-800 rounded-md group cursor-pointer"
         >
             <Icon :name="icon" class="size-6 me-4 mt-1 text-gray-400" />
diff --git a/resources/js/components/ui/Field.vue b/resources/js/components/ui/Field.vue
index 554d1af4888..0b4b9b4db5c 100644
--- a/resources/js/components/ui/Field.vue
+++ b/resources/js/components/ui/Field.vue
@@ -16,6 +16,8 @@ const props = defineProps({
     inline: { type: Boolean, default: false },
     /** Badge text to display next to the label. */
     badge: { type: String, default: '' },
+    /** The reading direction of the field's label, instructions, and errors. */
+    dir: { type: String, default: null },
     disabled: { type: Boolean, default: false },
     /** Error message to display below the field. */
     error: { type: String },
@@ -52,25 +54,10 @@ const rootClasses = computed(() =>
             },
             inline: {
                 true: 'grid md:grid-cols-2 items-start px-4.5 py-4 gap-y-3 md:gap-y-0 md:gap-x-5!',
+                false: 'flex flex-col gap-2',
             },
             fullWidthSetting: {
-                true: 'md:grid-cols-1',
-            },
-        },
-    })({
-        ...props,
-    })),
-);
-
-const descriptionClasses = computed(() =>
-    twMerge(cva({
-        base: ['mb-2 -mt-0.5'],
-        variants: {
-            inline: {
-                true: 'mb-0',
-            },
-            fullWidthSetting: {
-                true: 'mb-3',
+                true: 'md:grid-cols-1 md:gap-y-3',
             },
         },
     })({
@@ -95,32 +82,31 @@ const hasErrors = computed(() => {
 </script>
 
 <template>
-    <div :class="[rootClasses, $attrs.class]" data-ui-input-group :data-ui-field-has-errors="hasErrors ? '' : null">
-        <div v-if="label || (instructions && !instructionsBelow) || $slots.label || $slots.actions">
+    <div :class="[rootClasses, $attrs.class]" :dir="dir" data-ui-input-group :data-ui-field-has-errors="hasErrors ? '' : null">
+        <div
+            v-if="label || $slots.label || $slots.actions || (instructions && !instructionsBelow)"
+            class="flex flex-col gap-1.5"
+            data-ui-field-header
+        >
             <div
                 v-if="$slots.actions"
-                :class="[
-                    'flex items-center gap-x-1 mb-0',
-                    props.label || $slots.label ? 'justify-between' : 'justify-end',
-                ]"
-                data-ui-field-header
+                class="flex items-center gap-x-1"
+                :class="label || $slots.label ? 'justify-between' : 'justify-end'"
             >
                 <slot name="label">
                     <Label v-if="label" v-bind="labelProps" class="flex-1" />
                 </slot>
                 <slot name="actions" />
             </div>
-            <div v-if="label || (instructions && !instructionsBelow) || ($slots.label && !$slots.actions)" data-ui-field-text :class="inline ? 'mb-0' : 'mb-2'">
-                <slot v-if="!$slots.actions" name="label">
-                    <Label v-if="label" v-bind="labelProps" class="flex-1" />
-                </slot>
-                <Description :text="instructions" v-if="instructions && !instructionsBelow" :class="descriptionClasses" />
-            </div>
+            <slot v-else name="label">
+                <Label v-if="label" v-bind="labelProps" />
+            </slot>
+            <Description :text="instructions" v-if="instructions && !instructionsBelow" />
         </div>
         <slot />
-        <div v-if="(instructions && instructionsBelow) || hasErrors">
-            <Description :text="instructions" v-if="instructions && instructionsBelow" class="mt-2" />
-            <ErrorMessage v-if="errors" v-for="(error, i) in errors" :key="i" :text="error" class="mt-2" />
+        <div v-if="(instructions && instructionsBelow) || hasErrors" class="flex flex-col gap-2">
+            <Description :text="instructions" v-if="instructions && instructionsBelow" />
+            <ErrorMessage v-if="errors" v-for="(error, i) in errors" :key="i" :text="error" />
         </div>
     </div>
 </template>
diff --git a/resources/js/components/ui/HoverCard.vue b/resources/js/components/ui/HoverCard.vue
index cdd3837e656..ca294cca077 100644
--- a/resources/js/components/ui/HoverCard.vue
+++ b/resources/js/components/ui/HoverCard.vue
@@ -28,7 +28,7 @@ const props = defineProps({
 
 const HoverCardContentClasses = cva({
     base: [
-        'rounded-xl bg-white dark:bg-gray-800 outline-hidden overflow-hidden',
+        'rounded-xl bg-white dark:bg-gray-800 outline-hidden',
         'border border-gray-200 dark:border-white/10 dark:border-b-0 shadow-lg',
         'duration-100 will-change-[transform,opacity]',
         'data-[state=open]:animate-in data-[state=closed]:animate-out',
@@ -84,7 +84,7 @@ function updateOpen(value) {
                 :side
             >
                 <slot v-bind="slotProps" />
-                <HoverCardArrow v-if="arrow" class="fill-white stroke-gray-300" />
+                <HoverCardArrow v-if="arrow" class="fill-white stroke-gray-300 dark:fill-gray-800 dark:stroke-white/10" />
             </HoverCardContent>
         </HoverCardPortal>
     </HoverCardRoot>
diff --git a/resources/js/components/ui/Icon/Icon.vue b/resources/js/components/ui/Icon/Icon.vue
index 827a37b13f2..eed573f1782 100644
--- a/resources/js/components/ui/Icon/Icon.vue
+++ b/resources/js/components/ui/Icon/Icon.vue
@@ -12,6 +12,21 @@ const props = defineProps({
 
 const svgContent = ref('');
 const iconComponent = computed(() => ({ template: svgContent.value }));
+const delimiter = '::';
+
+const icon = computed(() => {
+    const delimiterIndex = props.name.indexOf(delimiter);
+    const hasSetInName = delimiterIndex > 0 && delimiterIndex < props.name.length - delimiter.length;
+
+    if (! hasSetInName) {
+        return { name: props.name, set: props.set, setFromName: null };
+    }
+
+    const set = props.name.substring(0, delimiterIndex);
+    const name = props.name.substring(delimiterIndex + delimiter.length);
+
+    return { name, set, setFromName: set };
+});
 
 const loadIcon = async () => {
     if (props.name.startsWith('<svg')) {
@@ -19,10 +34,16 @@ const loadIcon = async () => {
         return;
     }
 
-    const iconSet = getIconSet(props.set);
+    const { name, set, setFromName } = icon.value;
+
+    if (setFromName && props.set !== 'default' && props.set !== setFromName) {
+        console.warn(`Icon name [${props.name}] includes set [${setFromName}], ignoring set prop [${props.set}]`);
+    }
+
+    const iconSet = getIconSet(set);
 
     if (!iconSet) {
-        console.warn(`Icon set [${props.set}] not registered`);
+        console.warn(`Icon set [${set}] not registered`);
         svgContent.value = ''
         return
     }
@@ -30,15 +51,15 @@ const loadIcon = async () => {
     let rawSvg = '';
 
     if (iconSet.type === 'strings') {
-        rawSvg = loadFromStringSet(iconSet.data, props.name);
+        rawSvg = loadFromStringSet(iconSet.data, name);
     } else if (iconSet.type === 'glob') {
-        rawSvg = await loadFromGlobSet(iconSet.data, props.name);
+        rawSvg = await loadFromGlobSet(iconSet.data, name);
     }
 
     if (!rawSvg) {
-        console.warn(props.set === 'default'
-            ? `Icon [${props.name}] not found`
-            : `Icon [${props.name}] not found in set [${props.set}]`);
+        console.warn(set === 'default'
+            ? `Icon [${name}] not found`
+            : `Icon [${name}] not found in set [${set}]`);
         svgContent.value = ''
         return
     }
diff --git a/resources/js/components/ui/Label.vue b/resources/js/components/ui/Label.vue
index 8ed3f87bc62..69c8bbedd15 100644
--- a/resources/js/components/ui/Label.vue
+++ b/resources/js/components/ui/Label.vue
@@ -18,7 +18,7 @@ const props = defineProps({
 
 <template>
     <label
-        class="flex justify-between mb-1.5 text-sm font-medium [&_button]:font-medium text-gray-925 select-none dark:text-gray-300 [&_button:has(svg)]:h-auto"
+        class="flex justify-between text-sm font-medium [&_button]:font-medium text-gray-925 select-none dark:text-gray-300 [&_button:has(svg)]:h-auto"
         data-ui-label
         :for="for"
     >
diff --git a/resources/js/components/ui/Listing/BulkActionsFloatingToolbar.vue b/resources/js/components/ui/Listing/BulkActionsFloatingToolbar.vue
index 4bee4b1195b..17e3d8f2f0a 100644
--- a/resources/js/components/ui/Listing/BulkActionsFloatingToolbar.vue
+++ b/resources/js/components/ui/Listing/BulkActionsFloatingToolbar.vue
@@ -118,7 +118,7 @@ onUnmounted(() => document.removeEventListener('keydown', onKeydown, true));
         :transition="{ duration: 0.2, ease: 'easeInOut' }"
     >
         <div class="pointer-events-auto space-y-3 rounded-xl border border-gray-300/60 dark:border-gray-700 p-1 bg-gray-200/55 shadow-[0_1px_16px_-2px_rgba(63,63,71,0.2)] dark:bg-gray-800 dark:shadow-[0_10px_15px_rgba(0,0,0,.5)] dark:inset-shadow-2xs dark:inset-shadow-white/10">
-            <ButtonGroup>
+            <ButtonGroup overflow="gap" justify="center">
                 <Button
                     class="text-blue-500!"
                     @click="clearSelections?.()"
diff --git a/resources/js/components/ui/Listing/CustomizeColumns.vue b/resources/js/components/ui/Listing/CustomizeColumns.vue
index 02cc0d53981..74a17db774f 100644
--- a/resources/js/components/ui/Listing/CustomizeColumns.vue
+++ b/resources/js/components/ui/Listing/CustomizeColumns.vue
@@ -69,7 +69,7 @@ function reset() {
 </script>
 
 <template>
-    <div data-ui-column-customizer class="absolute right-0 mask-bg mask-bg--left">
+    <div data-ui-column-customizer>
         <Button icon="sliders-vertical" :disabled="reorderable" @click="open = true" :aria-label="__('Customize Columns')" v-tooltip="__('Customize Columns')" />
         <Modal :title="__('Customize Columns')" v-model:open="open">
             <div class="border rounded-lg dark:border-gray-700">
diff --git a/resources/js/components/ui/Listing/Filters.vue b/resources/js/components/ui/Listing/Filters.vue
index 79d342a19ac..5b6a15edc2a 100644
--- a/resources/js/components/ui/Listing/Filters.vue
+++ b/resources/js/components/ui/Listing/Filters.vue
@@ -9,6 +9,7 @@ import {
 	Stack,
 } from '@ui';
 import { injectListingContext } from '../Listing/Listing.vue';
+import { dateFormatter } from '@/api';
 import { computed, ref, watch, nextTick } from 'vue';
 import FieldFilter from './FieldFilter.vue';
 import DataListFilter from './Filter.vue';
@@ -39,6 +40,27 @@ function removeFieldFilter(filterHandle, fieldHandle) {
     setFilter(filterHandle, fields);
 }
 
+function getFieldFilterBadgeLabel(handle, badge) {
+    if (handle === 'date') {
+        const df = dateFormatter.options('date');
+        const parts = [badge.field, badge.translatedOperator];
+
+        if (badge.operator === 'between') {
+            parts.push(df.date(badge.value.start), __('and'), df.date(badge.value.end));
+        } else {
+            parts.push(df.date(badge.value));
+        }
+
+        return parts.filter(Boolean).join(' ');
+    }
+
+    return badge;
+}
+
+function getClearFilterLabel(label) {
+    return __('Clear :filter', { filter: label });
+}
+
 function isActive(handle) {
     return activeFilters.value.hasOwnProperty(handle);
 }
@@ -109,9 +131,8 @@ function handleStackClosed() {
 </script>
 
 <template>
-    <div class="flex flex-1 items-center gap-2 sm:gap-3 overflow-x-auto py-3 rounded-r-4xl">
-
-        <div ref="filtersButtonWrapperRef" class="sticky left-0 ps-[1px] rounded-r-lg mask-bg mask-bg--left mask-bg--left-small">
+    <div class="flex flex-1 items-center gap-2 sm:gap-3 overflow-x-auto py-3 st-mask-horizontal-overflow">
+        <div ref="filtersButtonWrapperRef" class="sticky left-0 rounded-r-lg mask-bg mask-bg--left mask-bg--left-small">
             <Button icon="sliders-horizontal" class="[&_svg]:size-3.5" :disabled="reorderable" @click="open = true">
                 {{ __('Filters') }}
                 <Badge
@@ -172,38 +193,47 @@ function handleStackClosed() {
         </Stack>
 
         <Button
+            as="div"
+            variant="filled"
             v-for="({ filter, handle, badge }, index) in fieldFilterBadges"
             :key="`${filter}-${handle}`"
-            variant="filled"
-            :icon-append="reorderable ? null : 'x'"
-            :disabled="reorderable"
-            class="last:me-12"
-            @click="removeFieldFilter(filter, handle)"
+            class="cursor-default ps-4 gap-1 text-gray-900 dark:text-gray-200 hover:bg-gray-950/5 dark:hover:bg-white/4"
+            :class="reorderable ? 'pe-4 text-gray-400 dark:text-gray-600' : 'pe-2'"
         >
-            <template v-if="handle == 'date'">
-                {{ badge.field }}
-                {{ badge.translatedOperator }}
-                <template v-if="badge.operator === 'between'">
-                    <date-time :of="badge.value.start" options="date" />
-                    {{ __('and') }}
-                    <date-time :of="badge.value.end" options="date" />
-                </template>
-                <date-time v-else :of="badge.value" options="date" />
-            </template>
-
-            <template v-else>
-                {{ badge }}
-            </template>
+            <span class="whitespace-nowrap" v-text="getFieldFilterBadgeLabel(handle, badge)" />
+
+            <Button
+                v-if="!reorderable"
+                variant="ghost"
+                size="xs"
+                icon="x"
+                iconOnly
+                inset
+                class="opacity-100 [&_svg]:size-4"
+                :aria-label="getClearFilterLabel(getFieldFilterBadgeLabel(handle, badge))"
+                @click="removeFieldFilter(filter, handle)"
+            />
         </Button>
         <Button
+            as="div"
+            variant="filled"
             v-for="(badge, handle, index) in standardBadges"
             :key="handle"
-            variant="filled"
-            :icon-append="reorderable ? null : 'x'"
-            :text="badge"
-            :disabled="reorderable"
-            class="last:me-12"
-            @click="setFilter(handle, null)"
-        />
+            class="cursor-default ps-4 gap-1 text-gray-900 dark:text-gray-200 hover:bg-gray-950/5 dark:hover:bg-white/4"
+            :class="reorderable ? 'pe-4 text-gray-400 dark:text-gray-600' : 'pe-2'"
+        >
+            <span class="whitespace-nowrap">{{ badge }}</span>
+            <Button
+                v-if="!reorderable"
+                variant="ghost"
+                size="xs"
+                icon="x"
+                iconOnly
+                inset
+                class="opacity-100 [&_svg]:size-4"
+                :aria-label="getClearFilterLabel(badge)"
+                @click="setFilter(handle, null)"
+            />
+        </Button>
     </div>
 </template>
diff --git a/resources/js/components/ui/Listing/Listing.vue b/resources/js/components/ui/Listing/Listing.vue
index 4cc9d434dae..cdf6acae936 100644
--- a/resources/js/components/ui/Listing/Listing.vue
+++ b/resources/js/components/ui/Listing/Listing.vue
@@ -180,7 +180,7 @@ const columns = ref(initializeColumns());
 const sortColumn = ref(props.sortColumn || (columns.value.length ? columns.value[0].field : null));
 const sortDirection = ref(props.sortDirection || getDefaultSortDirectionForColumn(sortColumn.value));
 const selections = ref(props.selections || []);
-const allowsSelections = computed(() => (props.selections || hasActions.value) && !props.reorderable);
+const allowsSelections = computed(() => (props.selections || (props.allowBulkActions && hasActions.value)) && !props.reorderable);
 const allowsMultipleSelections = computed(() => props.maxSelections > 1);
 const hasReachedSelectionLimit = computed(() => selections.value.length === props.maxSelections);
 const hasActions = computed(() => !!props.actionUrl);
@@ -239,7 +239,14 @@ watch(
 
 const removeFromSelections = (ids) => selections.value = selections.value.filter(selection => !ids.includes(selection));
 Statamic.$events.$on('removeFromSelections', removeFromSelections);
-onBeforeUnmount(() => Statamic.$events.$off('removeFromSelections', removeFromSelections));
+
+const replaceInSelections = (replacements) => selections.value = selections.value.map(selection => replacements[selection] ?? selection);
+Statamic.$events.$on('replaceInSelections', replaceInSelections);
+
+onBeforeUnmount(() => {
+    Statamic.$events.$off('removeFromSelections', removeFromSelections);
+    Statamic.$events.$off('replaceInSelections', replaceInSelections);
+});
 
 const rawParameters = computed(() => ({
     page: currentPage.value,
@@ -670,6 +677,7 @@ provideListingContext({
 defineExpose({
     refresh,
     setFilter,
+    parameters,
 });
 
 watch(parameters, (newParams, oldParams) => {
@@ -678,6 +686,8 @@ watch(parameters, (newParams, oldParams) => {
     pushState();
 });
 
+watch(() => props.url, () => request());
+
 watch(loading, (loading) => Statamic.$progress.loading(id, loading));
 
 onMounted(() => {
@@ -709,12 +719,12 @@ autoApplyState();
     <div>
         <slot name="initializing" v-if="shouldShowSkeleton">
             <div class="flex flex-col gap-4 justify-between mt-3 starting-style-transition starting-style-transition--delay">
-                <ui-skeleton class="h-5 w-48" />
-                <div class="flex gap-2 sm:gap-3">
-                    <ui-skeleton class="h-9 w-96" />
-                    <ui-skeleton class="h-9 w-24" />
+                <ui-skeleton v-if="showPresets" class="h-5 w-48" />
+                <div v-if="allowSearch || hasFilters || allowCustomizingColumns" class="flex gap-2 sm:gap-3">
+                    <ui-skeleton v-if="allowSearch" class="h-9 w-96" />
+                    <ui-skeleton v-if="hasFilters" class="h-9 w-24" />
                     <div class="flex-1" />
-                    <ui-skeleton class="size-10" />
+                    <ui-skeleton v-if="allowCustomizingColumns" class="size-10" />
                 </div>
                 <ui-skeleton class="h-48 w-full" />
             </div>
@@ -722,7 +732,7 @@ autoApplyState();
         <slot v-if="!initializing" :items="items" :is-column-visible="isColumnVisible" :loading="loading">
             <Presets v-if="showPresets" />
             <div v-if="allowSearch || hasFilters || allowCustomizingColumns" class="relative overflow-clip flex items-center gap-2 sm:gap-3 min-h-16 starting-style-transition st-overflow-clip-margin">
-                <div class="flex flex-1 items-center gap-2 sm:gap-3 w-full">
+                <div class="flex flex-1 items-center gap-2 sm:gap-3 overflow-x-auto -ms-1 ps-1 py-1">
                     <Search v-if="allowSearch" />
                     <Filters v-if="hasFilters" />
                 </div>
@@ -735,7 +745,7 @@ autoApplyState();
                 v-text="__('No results')"
             />
 
-            <Panel v-else class="relative overflow-x-auto overscroll-x-contain" style="container-type: scroll-state;">
+            <Panel v-else class="relative overflow-x-auto" style="container-type: scroll-state;">
                 <Table>
                     <template v-for="(slot, slotName) in forwardedTableCellSlots" :key="slotName" #[slotName]="slotProps">
                         <component :is="slot" v-bind="slotProps" />
diff --git a/resources/js/components/ui/LivePreview/LivePreview.vue b/resources/js/components/ui/LivePreview/LivePreview.vue
index 52de68f3ef6..0b092a0fb95 100644
--- a/resources/js/components/ui/LivePreview/LivePreview.vue
+++ b/resources/js/components/ui/LivePreview/LivePreview.vue
@@ -271,6 +271,18 @@ function setEditorWidth(width) {
     localStorage.setItem(widthLocalStorageKey, width);
 }
 
+function onResizeEnd() {
+    editorResizing.value = false;
+
+    // Chromium doesn't recalculate iframe scroll state after the parent
+    // container is resized. Toggling a transform forces a reflow. #14540
+    const iframe = iframeContentContainer.value?.querySelector('iframe');
+    if (iframe) {
+        iframe.style.transform = 'translateZ(0)';
+        requestAnimationFrame(() => iframe.style.transform = '');
+    }
+}
+
 function close() {
     if (poppedOut.value) closePopout();
 
@@ -283,10 +295,14 @@ const keybinding = ref(
     }),
 );
 
-onUnmounted(() => keybinding.value.destroy());
+const refreshHandler = () => { if (props.enabled) update(); };
+const refreshEvent = `live-preview.${name.value}.refresh`;
+
+Statamic.$events.$on(refreshEvent, refreshHandler);
 
-Statamic.$events.$on(`live-preview.${name.value}.refresh`, () => {
-    if (props.enabled) update();
+onUnmounted(() => {
+    keybinding.value.destroy();
+    Statamic.$events.$off(refreshEvent, refreshHandler);
 });
 </script>
 
@@ -343,7 +359,7 @@ Statamic.$events.$on(`live-preview.${name.value}.refresh`, () => {
                             v-show="!poppedOut"
                             @resized="setEditorWidth"
                             @resize-start="editorResizing = true"
-                            @resize-end="editorResizing = false"
+                            @resize-end="onResizeEnd"
                             @collapsed="collapseEditor"
                         />
                     </div>
diff --git a/resources/js/components/ui/Modal/ConfirmationModal.vue b/resources/js/components/ui/Modal/ConfirmationModal.vue
index 043aa719bb4..64faeb0e905 100644
--- a/resources/js/components/ui/Modal/ConfirmationModal.vue
+++ b/resources/js/components/ui/Modal/ConfirmationModal.vue
@@ -93,9 +93,13 @@ const shouldCloseOnSubmit = computed(() => {
             <Icon name="loading" />
         </div>
 
-        <p v-if="bodyText" v-text="bodyText" />
+        <p
+            v-if="bodyText"
+            class="text-gray-700 dark:text-gray-200 antialiased"
+            v-text="bodyText"
+        />
         <slot v-else>
-            <p>{{ __('Are you sure?') }}</p>
+            <p class="text-gray-700 dark:text-gray-200 antialiased">{{ __('Are you sure?') }}</p>
         </slot>
 
         <template v-if="cancellable || submittable" #footer>
diff --git a/resources/js/components/ui/Modal/Modal.vue b/resources/js/components/ui/Modal/Modal.vue
index ecb453bde83..99774eddc61 100644
--- a/resources/js/components/ui/Modal/Modal.vue
+++ b/resources/js/components/ui/Modal/Modal.vue
@@ -33,7 +33,7 @@ const props = defineProps({
 });
 
 const overlayClasses = cva({
-    base: 'fixed inset-0 z-(--z-index-portal) bg-gray-800/20 dark:bg-gray-800/50',
+    base: 'fixed inset-0 z-(--z-index-portal) bg-gray-800/20 dark:bg-gray-950/60',
     variants: {
         blur: {
             true: 'backdrop-blur-[2px]',
@@ -189,7 +189,7 @@ provide('closeModal', close);
                     <div class="relative space-y-3 rounded-xl overflow-auto max-h-[60vh] border border-gray-400/60 bg-white p-4 shadow-[0_1px_16px_-2px_rgba(63,63,71,0.2)] dark:border-none dark:bg-gray-800 dark:shadow-[0_1px_16px_-2px_rgba(0,0,0,.5)] dark:inset-shadow-2xs dark:inset-shadow-white/10">
                         <div v-if="!hasModalTitleComponent && (title || icon)" data-ui-modal-title class="flex items-center gap-2">
                             <Icon :name="icon" v-if="icon" class="size-4" />
-                            <Heading :text="title" size="lg" class="font-medium" />
+                            <Heading :text="title" size="lg" class="font-semibold text-gray-950 dark:text-gray-100" />
                         </div>
                         <slot />
                     </div>
diff --git a/resources/js/components/ui/Pagination.vue b/resources/js/components/ui/Pagination.vue
index f5f1f323ac1..c8e9c68a3c1 100644
--- a/resources/js/components/ui/Pagination.vue
+++ b/resources/js/components/ui/Pagination.vue
@@ -155,7 +155,10 @@ function getRange(start, end) {
     <div class="flex">
         <div class="flex flex-1 items-center">
             <div class="text-sm text-gray-600 dark:text-gray-500" v-if="showTotals && totalItems > 0">
-                {{ __(':start-:end of :total', { start: fromItem, end: toItem, total: totalItems }) }}
+                {{ __(':range of :total', {
+                    range: $number.formatRange(fromItem, toItem),
+                    total: $number.format(totalItems)
+                }) }}
             </div>
         </div>
 
@@ -163,6 +166,7 @@ function getRange(start, end) {
             <Button
                 size="sm"
                 :variant="hasPrevious && !showPageLinks ? 'filled' : 'ghost'"
+                class="disabled:cursor-default"
                 round
                 icon="chevron-left"
                 :disabled="!hasPrevious"
@@ -174,6 +178,7 @@ function getRange(start, end) {
                 v-for="(page, i) in pages"
                 size="sm"
                 round
+                class="disabled:cursor-default"
                 :variant="page == currentPage ? 'filled' : 'ghost'"
                 :key="i"
                 @click="selectPage(page)"
@@ -184,6 +189,7 @@ function getRange(start, end) {
             <Button
                 size="sm"
                 :variant="hasNext && !showPageLinks ? 'filled' : 'ghost'"
+                class="disabled:cursor-default"
                 round
                 icon="chevron-right"
                 :disabled="!hasNext"
diff --git a/resources/js/components/ui/Panel/Footer.vue b/resources/js/components/ui/Panel/Footer.vue
index a5ae573d6ba..9994bc37953 100644
--- a/resources/js/components/ui/Panel/Footer.vue
+++ b/resources/js/components/ui/Panel/Footer.vue
@@ -1,5 +1,5 @@
 <template>
-    <footer class="px-4.5 pt-2.5 md:pt-3 pb-1.5 antialiased" data-ui-panel-footer>
+    <footer class="flex-wrap px-4.5 pt-2.5 md:pt-3 pb-1.5 antialiased" data-ui-panel-footer>
         <slot />
     </footer>
 </template>
diff --git a/resources/js/components/ui/Publish/Components.vue b/resources/js/components/ui/Publish/Components.vue
index 7a1f6554b72..6c7c548aa2b 100644
--- a/resources/js/components/ui/Publish/Components.vue
+++ b/resources/js/components/ui/Publish/Components.vue
@@ -5,5 +5,5 @@ const { components } = injectContainerContext();
 </script>
 
 <template>
-    <component v-for="component in components" :key="component.name" :is="component.name" v-bind="component.props" />
+    <component v-for="component in components" :key="component.id" :is="component.name" v-bind="component.props" v-on="component.events" />
 </template>
diff --git a/resources/js/components/ui/Publish/Container.vue b/resources/js/components/ui/Publish/Container.vue
index a7a23c75a83..0476fa6721e 100644
--- a/resources/js/components/ui/Publish/Container.vue
+++ b/resources/js/components/ui/Publish/Container.vue
@@ -1,18 +1,19 @@
 <script>
-import createContext from '@/util/createContext.js';
+import { injectContainerContext, provideContainerContext, containerContextKey } from './context.js';
 
-export const [injectContainerContext, provideContainerContext, containerContextKey] = createContext('PublishContainer');
+export { injectContainerContext, provideContainerContext, containerContextKey };
 </script>
 
 <script setup>
 import { nanoid as uniqid } from 'nanoid';
-import { watch, ref, computed, toRef, nextTick } from 'vue';
+import { onMounted, onUnmounted, watch, ref, computed, toRef, nextTick } from 'vue';
 import Component from '@/components/Component.js';
 import Tabs from './Tabs.vue';
 import Values from '@/components/publish/Values.js';
 import { data_get } from '@/bootstrap/globals.js';
+import { useUiDirection } from '@/composables/ui-direction';
 
-const emit = defineEmits(['update:modelValue', 'update:visibleValues', 'update:modifiedFields']);
+const emit = defineEmits(['update:modelValue', 'update:visibleValues', 'update:modifiedFields', 'update:meta']);
 
 const props = defineProps({
     name: {
@@ -104,7 +105,8 @@ const meta = ref(props.meta);
 const previews = ref({});
 const localizedFields = ref(props.modifiedFields || []);
 const components = ref([]);
-const direction = computed(() => Statamic.$config.get('sites').find(s => s.handle === props.site)?.direction ?? document.documentElement.dir ?? 'ltr');
+const { direction: uiDirection } = useUiDirection();
+const direction = computed(() => Statamic.$config.get('sites').find(s => s.handle === props.site)?.direction ?? uiDirection.value);
 
 const visibleValues = computed(() => {
     const omittable = Object.keys(hiddenFields.value).filter(
@@ -179,6 +181,12 @@ watch(
     { deep: true },
 );
 
+watch(
+    meta,
+    (meta) => emit('update:meta', meta),
+    { deep: true },
+);
+
 const avoidTrackingDirtyState = ref(false);
 const trackingDirtyState = computed(() => props.trackDirtyState && !avoidTrackingDirtyState.value)
 const isDirty = computed(() => Statamic.$dirty.has(props.name));
@@ -210,6 +218,10 @@ function setFieldValue(path, value) {
     data_set(values.value, path, value);
 }
 
+function setMeta(newMeta) {
+    meta.value = newMeta;
+}
+
 function setFieldMeta(path, value) {
     data_set(meta.value, path, value);
 }
@@ -236,9 +248,37 @@ function removeLocalizedField(path) {
     if (index !== -1) localizedFields.value.splice(index, 1);
 }
 
+const fieldFocus = ref({});
+
+const fieldLocks = computed(() => {
+    const locks = {};
+    for (const { handle, user } of Object.values(fieldFocus.value)) {
+        if (!locks[handle]) {
+            locks[handle] = user;
+        }
+    }
+    return locks;
+});
+
+function focusField(handle, user = Statamic.user) {
+    if (handle.includes('.')) throw new Error('focusField only supports top-level fields.');
+    if (user) fieldFocus.value[user.id] = { handle, user };
+}
+
+function blurField(handle, user = Statamic.user) {
+    if (handle.includes('.')) throw new Error('blurField only supports top-level fields.');
+    if (user && fieldFocus.value[user.id]?.handle === handle) {
+        delete fieldFocus.value[user.id];
+    }
+}
+
 function pushComponent(name, { props }) {
     const component = new Component(uniqid(), name, props);
     components.value.push(component);
+    component.destroy = () => {
+        const index = components.value.indexOf(component);
+        if (index !== -1) components.value.splice(index, 1);
+    };
     return component;
 }
 
@@ -273,11 +313,16 @@ const builtInProvides = {
     isTrackingOriginValues: computed(() => !!props.originValues),
     setValues,
     setFieldValue,
+    setMeta,
     setFieldMeta,
     setFieldPreviewValue,
     setRevealerField,
     unsetRevealerField,
     setHiddenField,
+    fieldFocus,
+    fieldLocks,
+    focusField,
+    blurField,
     isDirty,
     withoutDirtying,
 };
@@ -294,6 +339,29 @@ const provided = { ...additionalProvides, ...builtInProvides };
 
 provideContainerContext({ ...provided, container: provided });
 
+onMounted(() => {
+    Statamic.$events.$emit('publish-container-created', {
+        name: props.name,
+        reference: toRef(() => props.reference),
+        site: toRef(() => props.site),
+        values,
+        setFieldValue,
+        setValues,
+        meta,
+        setMeta,
+        setFieldMeta,
+        pushComponent,
+        fieldFocus,
+        focusField,
+        blurField,
+    });
+});
+
+onUnmounted(() => {
+    clearDirtyState();
+    Statamic.$events.$emit('publish-container-destroyed', { name: props.name });
+});
+
 defineExpose({
     name: props.name,
     values,
@@ -306,6 +374,7 @@ defineExpose({
     pushComponent,
     visibleValues,
     setValues,
+    setMeta,
     setExtraValues,
 });
 
diff --git a/resources/js/components/ui/Publish/ContentDirection.vue b/resources/js/components/ui/Publish/ContentDirection.vue
new file mode 100644
index 00000000000..86125fc6083
--- /dev/null
+++ b/resources/js/components/ui/Publish/ContentDirection.vue
@@ -0,0 +1,19 @@
+<script setup>
+import { Primitive } from 'reka-ui';
+import { useContentDirection } from '@/composables/content-direction';
+
+defineProps({
+    /** The element or component to render as */
+    as: { type: [String, Object], default: 'div' },
+    /** When `true`, merges props onto the immediate child instead of rendering a wrapper element */
+    asChild: { type: Boolean, default: false },
+});
+
+const { direction } = useContentDirection();
+</script>
+
+<template>
+    <Primitive :as="as" :as-child="asChild" :dir="direction">
+        <slot />
+    </Primitive>
+</template>
diff --git a/resources/js/components/ui/Publish/Field.vue b/resources/js/components/ui/Publish/Field.vue
index dd1a737f05f..7e46c3a8657 100644
--- a/resources/js/components/ui/Publish/Field.vue
+++ b/resources/js/components/ui/Publish/Field.vue
@@ -2,9 +2,10 @@
 import { computed, useTemplateRef, watch, ref, inject } from 'vue';
 import { injectContainerContext } from './Container.vue';
 import { injectFieldsContext } from './FieldsProvider.vue';
+import { useUiDirection } from '@/composables/ui-direction';
 import {
+    Avatar,
     Field,
-    Icon,
     Label,
 } from '@ui';
 import FieldActions from '@/components/field-actions/FieldActions.vue';
@@ -33,7 +34,7 @@ const {
     desyncField,
     isTrackingOriginValues,
     originValues: containerOriginValues,
-    asConfig,
+    asConfig: containerAsConfig,
     errors: containerErrors,
     readOnly: containerReadOnly,
     setFieldPreviewValue,
@@ -42,14 +43,22 @@ const {
     setFieldMeta,
     hiddenFields,
     setHiddenField,
+    fieldLocks,
+    focusField,
+    blurField,
     container,
-    direction,
+    direction: contentDirection,
 } = injectContainerContext();
 const {
     fieldPathPrefix: injectedFieldPathPrefix,
     metaPathPrefix: injectedMetaPathPrefix,
     readOnly: fieldsProviderReadOnly,
+    asConfig: fieldsAsConfig,
 } = injectFieldsContext();
+
+const { direction } = useUiDirection();
+
+const asConfig = computed(() => fieldsAsConfig.value ?? containerAsConfig.value ?? false);
 const fieldPathPrefix = computed(() => props.fieldPathPrefix || injectedFieldPathPrefix.value);
 const metaPathPrefix = computed(() => props.metaPathPrefix || injectedMetaPathPrefix.value);
 const handle = props.config.handle;
@@ -112,11 +121,14 @@ watch(
 );
 
 function focused() {
-    // todo
+    if (fieldPathPrefix.value) return;
+    focusField(handle);
 }
 
-function blurred() {
-    // todo
+function blurred(event) {
+    if (fieldPathPrefix.value) return;
+    if (event?.currentTarget?.contains(event.relatedTarget)) return;
+    blurField(handle);
 }
 
 const values = computed(() => {
@@ -145,10 +157,13 @@ const shouldShowField = computed(() => {
 
 const shouldShowLabelText = computed(() => !props.config.hide_display);
 
+// Whether the label renders anything visible. When it doesn't, we avoid rendering
+// the field header entirely (so it doesn't reserve space) and instead attach a
+// screen-reader-only label to the control below.
 const shouldShowLabel = computed(
     () =>
         shouldShowLabelText.value || // Need to see the text
-        props.config.hide_display || // Need label for accessibility (visually hidden)
+        isRequired.value || // Need to see the required asterisk
         isLocked.value || // Need to see the avatar
         isSyncable.value, // Need to see the icon
 );
@@ -170,7 +185,8 @@ const isReadOnly = computed(() => {
     return isLocked.value || props.config.visibility === 'read_only' || false;
 });
 
-const isLocked = computed(() => false); // todo
+const lockedBy = computed(() => fieldLocks.value[handle] ?? null);
+const isLocked = computed(() => lockedBy.value !== null && lockedBy.value.id !== Statamic.user.id);
 
 const isSyncable = computed(() => {
     // Only top-level fields can be synced.
@@ -182,13 +198,14 @@ const isSyncable = computed(() => {
 
 const isSynced = computed(() => isSyncable.value && !localizedFields.value.includes(fullPath.value));
 const isNested = computed(() => fullPath.value.includes('.'));
+const rootFieldPath = computed(() => isNested.value ? fullPath.value.split('.')[0] : fullPath.value);
 
 function sync() {
-    syncField(fullPath.value);
+    syncField(rootFieldPath.value);
 }
 
 function desync() {
-    desyncField(fullPath.value);
+    desyncField(rootFieldPath.value);
 }
 
 const fieldtypeComponentProps = computed(() => ({
@@ -224,6 +241,7 @@ const fieldtypeComponentEvents = computed(() => ({
             v-show="shouldShowField"
             :class="`${config.type}-fieldtype`"
             :id="fieldId"
+            :dir="direction"
             :instructions="config.instructions"
             :instructions-below="config.instructions_position === 'below'"
             :required="isRequired"
@@ -234,7 +252,16 @@ const fieldtypeComponentEvents = computed(() => ({
             v-bind="$attrs"
         >
             <template #label v-if="shouldShowLabel">
-                <Label :for="fieldId" :required="isRequired">
+                <Label :for="fieldId" :required="isRequired" class="relative">
+                    <Transition name="lock-avatar-pop" mode="out-in">
+                        <Avatar
+                            v-if="isLocked"
+                            :key="`lock-avatar-${handle}-${lockedBy?.id}`"
+                            :user="lockedBy"
+                            class="inline-flex mx-1 -start-8 -top-0.5 absolute rounded-full size-6 text-3xs"
+                            v-tooltip="lockedBy.name"
+                        />
+                    </Transition>
                     <template v-if="shouldShowLabelText">
                         <span v-tooltip="config.handle">
                             {{ __(config.display) }}
@@ -250,10 +277,11 @@ const fieldtypeComponentEvents = computed(() => ({
             <template #actions v-if="shouldShowFieldActions">
                 <FieldActions :actions="fieldActions" />
             </template>
+            <label v-if="!shouldShowLabel && config.hide_display" :for="fieldId" class="sr-only">{{ __(config.display) }}</label>
             <div class="text-xs text-red-600" v-if="!fieldtypeComponentExists && fieldtypeComponent !== 'spacer-fieldtype'">
                 Component <code v-text="fieldtypeComponent"></code> does not exist.
             </div>
-            <div :dir="direction" v-if="fieldtypeComponentExists">
+            <div v-if="fieldtypeComponentExists" @focusin="focused" @focusout="blurred" :class="{ 'pointer-events-none select-none': isLocked }">
                 <Component
                     ref="fieldtype"
                     :is="fieldtypeComponent"
@@ -264,3 +292,16 @@ const fieldtypeComponentEvents = computed(() => ({
         </Field>
     </slot>
 </template>
+
+<style scoped>
+.lock-avatar-pop-enter-active,
+.lock-avatar-pop-leave-active {
+    transition: opacity 120ms ease, transform 120ms ease;
+}
+
+.lock-avatar-pop-enter-from,
+.lock-avatar-pop-leave-to {
+    opacity: 0;
+    transform: translateX(-5px) scale(0.85);
+}
+</style>
diff --git a/resources/js/components/ui/Publish/SavePipeline.js b/resources/js/components/ui/Publish/SavePipeline.js
index ee6b9759fc9..9bc52c8898b 100644
--- a/resources/js/components/ui/Publish/SavePipeline.js
+++ b/resources/js/components/ui/Publish/SavePipeline.js
@@ -1,6 +1,7 @@
 import axios from 'axios';
 import resetValuesFromResponse from '@/util/resetValuesFromResponse.js';
 import { reveal } from '@api';
+import { UPDATE_DEBOUNCE_MS } from '@/components/fieldtypes/constants';
 
 let container = null;
 let errors = null;
@@ -15,6 +16,9 @@ export class Pipeline {
     }
 
     async through(steps) {
+        // Wait just past the fieldtype update debounce so any in-flight value updates are flushed first.
+        const initialPromise = new Promise((resolve) => setTimeout(resolve, UPDATE_DEBOUNCE_MS + 1));
+
         return [new Start(), ...steps, new Finish()].reduce(async (promise, step) => {
             const payload = await promise;
 
@@ -33,10 +37,6 @@ export class Pipeline {
     }
 }
 
-const initialPromise = new Promise((resolve) => {
-    setTimeout(() => resolve(), 151); // 150ms is the debounce time for fieldtype updates
-});
-
 export class PipelineStopped extends Error {
     constructor(payload) {
         super();
diff --git a/resources/js/components/ui/Publish/Sections.vue b/resources/js/components/ui/Publish/Sections.vue
index 9c74e24a1e0..0081db9693f 100644
--- a/resources/js/components/ui/Publish/Sections.vue
+++ b/resources/js/components/ui/Publish/Sections.vue
@@ -43,6 +43,7 @@ function renderInstructions(instructions) {
 
 function toggleSection(section) {
     if (section.collapsible) {
+        section.collapsibleInteracted = true;
         section.collapsed = !section.collapsed;
     }
 }
@@ -66,7 +67,7 @@ function toggleSection(section) {
                 <Button
                     @click="toggleSection(section)"
                     v-if="section.collapsible"
-                    class="static! [&_svg]:size-4.5 rounded-xl after:content-[''] after:absolute after:inset-0"
+                    class="static! [&_svg]:size-3.5 rounded-xl after:content-[''] after:absolute after:inset-0"
                     :icon="section.collapsed ? 'expand' : 'collapse'"
                     size="sm"
                     variant="ghost"
@@ -74,18 +75,68 @@ function toggleSection(section) {
                 />
             </PanelHeader>
             <div
-                style="--tw-ease: ease;"
-                class="h-auto visible transition-[height,visibility] duration-[250ms,2s]"
-                :class="{ 'h-0! invisible! overflow-clip': section.collapsed }"
+                class="publish-section-collapsible grid"
+                :class="[
+                    section.collapsed ? 'publish-section-collapsible--collapsed' : 'publish-section-collapsible--expanded',
+                    { 'publish-section-collapsible--interacted': section.collapsibleInteracted },
+                ]"
             >
-                <Card :class="{ 'p-0!': asConfig }">
-                    <FieldsProvider :fields="section.fields">
-                        <slot :section="section">
-                            <Fields />
-                        </slot>
-                    </FieldsProvider>
-                </Card>
+                <div class="publish-section-collapsible__inner min-h-0">
+                    <Card :class="{ 'p-0!': asConfig }">
+                        <FieldsProvider :fields="section.fields">
+                            <slot :section="section">
+                                <Fields />
+                            </slot>
+                        </FieldsProvider>
+                    </Card>
+                </div>
             </div>
         </Panel>
     </div>
 </template>
+
+<style scoped>
+.publish-section-collapsible {
+    --timing: ease;
+    /* No animation on load; enable once the user has toggled this section. */
+    --speed: 0ms;
+
+    /* Only setting the animation speed when the section is interacted with. Prevents the animation triggering on page load. */
+    &.publish-section-collapsible--interacted {
+        --speed: 250ms;
+    }
+
+    @media (prefers-reduced-motion: reduce) {
+        --speed: 0ms;
+    }
+}
+
+.publish-section-collapsible--expanded {
+    /* We can animate collapse/expand using grid rows */
+    animation: expand-rows var(--speed) var(--timing) forwards;
+
+    .publish-section-collapsible__inner {
+        animation: calc(var(--speed) * 2) var(--timing) section-fade-in both;
+        overflow: clip;
+        /* We need to increase the clip margin here vs regular collapsible sections because we have things appearing outside the section such as the logic indicator icon. */
+        overflow-clip-margin: 2.5rem;
+    }
+}
+
+.publish-section-collapsible--collapsed {
+    animation: collapse-rows var(--speed) var(--timing) forwards;
+
+    .publish-section-collapsible__inner {
+        animation:
+            clip-overflow 0ms var(--speed) forwards,
+            make-invisible 0ms var(--speed) forwards;
+        overflow: clip;
+    }
+}
+
+@keyframes section-fade-in { from { opacity: 0%; } to { opacity: 100%; } }
+@keyframes make-invisible { from { visibility: visible; } to { visibility: hidden; } }
+@keyframes collapse-rows  { from { grid-template-rows: 1fr; } to { grid-template-rows: 0fr; } }
+@keyframes expand-rows    { from { grid-template-rows: 0fr; } to { grid-template-rows: 1fr; } }
+@keyframes clip-overflow  { to { overflow: clip; } }
+</style>
diff --git a/resources/js/components/ui/Publish/context.js b/resources/js/components/ui/Publish/context.js
new file mode 100644
index 00000000000..8142228e29c
--- /dev/null
+++ b/resources/js/components/ui/Publish/context.js
@@ -0,0 +1,3 @@
+import createContext from '@/util/createContext.js';
+
+export const [injectContainerContext, provideContainerContext, containerContextKey] = createContext('PublishContainer');
diff --git a/resources/js/components/ui/Radio/Group.vue b/resources/js/components/ui/Radio/Group.vue
index 0fbe8a97146..0c01595d0e7 100644
--- a/resources/js/components/ui/Radio/Group.vue
+++ b/resources/js/components/ui/Radio/Group.vue
@@ -1,9 +1,21 @@
+<script>
+import createContext from '@/util/createContext.js';
+
+export const [injectRadioContext, provideRadioContext] = createContext('Radio');
+</script>
+
 <script setup>
-import { useId } from 'vue';
+import { computed, useId } from 'vue';
 import { RadioGroupRoot } from 'reka-ui';
 
-defineProps({
-    /** When `true`, displays radio buttons horizontally */
+const props = defineProps({
+    /** Controls how the radio group is displayed. Options: `default`, `inline`, `chips` */
+    appearance: {
+        type: String,
+        default: 'default',
+        validator: (value) => ['default', 'inline', 'chips'].includes(value),
+    },
+    /** @deprecated Use `appearance="inline"` instead. */
     inline: { type: Boolean, default: false },
     /** The controlled value of the radio group */
     modelValue: { type: String, default: null },
@@ -12,6 +24,18 @@ defineProps({
     required: { type: Boolean, default: false },
 });
 
+const appearance = computed(() => {
+    if (props.appearance !== 'default') {
+        return props.appearance;
+    }
+
+    return props.inline ? 'inline' : 'default';
+});
+
+const inline = computed(() => appearance.value === 'inline' || appearance.value === 'chips');
+
+provideRadioContext({ appearance });
+
 const focus = function () {
     console.log('focusing. todo.');
 };
@@ -27,7 +51,11 @@ defineExpose({ focus });
         @update:modelValue="$emit('update:modelValue', $event)"
         :name="name"
         class="relative block w-full space-y-2"
-        :class="{ 'flex flex-wrap space-y-0 gap-x-4 gap-y-2': inline }"
+        :class="{
+            'flex flex-wrap space-y-0 gap-y-2': inline,
+            'gap-x-4': appearance === 'inline',
+            'gap-x-2.5': appearance === 'chips',
+        }"
         data-ui-input
         data-ui-radio-group
     >
diff --git a/resources/js/components/ui/Radio/Item.vue b/resources/js/components/ui/Radio/Item.vue
index 5a922efb589..4c97b488145 100644
--- a/resources/js/components/ui/Radio/Item.vue
+++ b/resources/js/components/ui/Radio/Item.vue
@@ -1,5 +1,7 @@
 <script setup>
-import { RadioGroupIndicator, RadioGroupItem, useId } from 'reka-ui';
+import { computed, useId } from 'vue';
+import { RadioGroupIndicator, RadioGroupItem } from 'reka-ui';
+import { injectRadioContext } from './Group.vue';
 
 const props = defineProps({
     /** Description text to display below the label */
@@ -7,39 +9,49 @@ const props = defineProps({
     disabled: { type: Boolean, default: false },
     /** Label text to display next to the radio button */
     label: { type: String, default: null },
+    readOnly: { type: Boolean, default: false },
     /** Value of the radio button */
     value: { type: [String, Number, Boolean], required: true },
 });
 
+const { appearance } = injectRadioContext() ?? { appearance: computed(() => 'default') };
+
 const id = useId();
 </script>
 
 <template>
-    <div class="flex items-start gap-1.5" data-ui-radio-item>
+    <div
+        class="relative flex items-start gap-1.5"
+        :class="appearance === 'chips' ? 'mb-0 rounded-full border border-gray-300 bg-linear-to-b from-white to-white p-2 py-2 pe-4 shadow-ui-sm transition-[background] hover:bg-gray-50 hover:to-gray-50 with-contrast:border-gray-500 dark:border-gray-700/80 dark:from-gray-850 dark:to-gray-900 dark:shadow-ui-md dark:hover:bg-gray-900 dark:hover:to-gray-850' : null"
+        data-ui-radio-item
+    >
         <RadioGroupItem
             :id
             :value="value"
-            :disabled
+            :disabled="readOnly || disabled"
+            :aria-describedby="description ? `${id}-description` : undefined"
             class="
                 shadow-ui-xs mt-0.5 size-4 cursor-default rounded-full
-                focus:focus-outline border border-gray-400/75 dark:border-none with-contrast:border-gray-100 bg-white outline-hidden
+                focus:focus-outline border border-gray-400/75 bg-white with-contrast:border-gray-100
                 data-[state=checked]:border-ui-accent-bg data-[disabled]:opacity-50
-                dark:bg-gray-500 dark:data-[state=checked]:border-none dark:data-[state=checked]:bg-gray-300
+                dark:border-gray-700 dark:bg-gray-500
+                dark:data-[state=checked]:border-ui-accent-bg dark:data-[state=checked]:bg-ui-accent-bg
             "
         >
             <RadioGroupIndicator
                 class="
                     relative flex h-full w-full items-center justify-center rounded-[50%]
-                    border border-ui-accent-bg after:block after:h-[0.5rem] after:w-[0.5rem] after:rounded-[50%]
-                    after:bg-ui-accent-bg after:content-[''] dark:border-none
+                    border border-ui-accent-bg after:block after:h-2 after:w-2 after:rounded-[50%]
+                    after:bg-ui-accent-bg after:content-['']
+                    dark:border-none dark:after:bg-white
                 "
             />
         </RadioGroupItem>
-        <label class="flex flex-col" :class="{ 'opacity-50': disabled }" :for="id">
-            <span class="text-sm font-normal antialiased dark:text-gray-200">
+        <div class="flex flex-col" :class="{ 'opacity-50': disabled }">
+            <label class="text-sm font-normal antialiased cursor-pointer dark:text-gray-200 before:absolute before:inset-0 before:content-['']" :for="id">
                 <slot>{{ label || value }}</slot>
-            </span>
-            <span v-if="description" class="mt-0.5 block text-xs leading-snug text-gray-500">{{ description }}</span>
-        </label>
+            </label>
+            <span v-if="description" :id="`${id}-description`" class="mt-0.5 block text-xs leading-snug text-gray-500">{{ description }}</span>
+        </div>
     </div>
 </template>
diff --git a/resources/js/components/ui/Select/Select.vue b/resources/js/components/ui/Select/Select.vue
index e5c5b2c5875..78a1f0aeebe 100644
--- a/resources/js/components/ui/Select/Select.vue
+++ b/resources/js/components/ui/Select/Select.vue
@@ -5,6 +5,11 @@ import Combobox from '../Combobox/Combobox.vue';
 const emit = defineEmits(['update:modelValue']);
 
 const props = defineProps({
+    /** When `true`, the dropdown will expand to fit longer option labels. */
+    adaptiveWidth: { type: Boolean, default: false },
+    /** The preferred alignment against the trigger. May change when collisions occur. <br><br> Options: `start`, `center`, `end` */
+    align: { type: String, default: 'start' },
+    /** When `true`, the selected value will be clearable. */
     clearable: { type: Boolean, default: false },
     disabled: { type: Boolean, default: false },
     /** Icon name. [Browse available icons](/?path=/story/components-icon--all-icons) */
@@ -52,6 +57,8 @@ const usingOptionSlot = !!slots['option'];
         :searchable="false"
         :size
         :variant
+        :align
+        :adaptive-width
         @update:modelValue="emit('update:modelValue', $event)"
     >
         <template #selected-option="{ option }" v-if="usingSelectedOptionSlot">
diff --git a/resources/js/components/ui/Tabs/Tabs.vue b/resources/js/components/ui/Tabs/Tabs.vue
index 447ba1998cd..91d947726a7 100644
--- a/resources/js/components/ui/Tabs/Tabs.vue
+++ b/resources/js/components/ui/Tabs/Tabs.vue
@@ -1,18 +1,26 @@
 <script setup>
+import { computed } from 'vue';
 import { TabsRoot } from 'reka-ui';
+import { useUiDirection } from '@/composables/ui-direction';
 
 const emit = defineEmits(['update:modelValue']);
 
-defineProps({
+const props = defineProps({
     /** The controlled value of the tabs */
     modelValue: { type: String, default: null },
     /** When `true`, the element will be unmounted on closed state */
     unmountOnHide: { type: Boolean, default: true },
+    /** The reading direction of the tabs */
+    dir: { type: String, default: null },
 });
+
+const { direction } = useUiDirection();
+
+const dir = computed(() => props.dir ?? direction.value);
 </script>
 
 <template>
-    <TabsRoot :model-value="modelValue" @update:model-value="emit('update:modelValue', $event)" :unmount-on-hide>
+    <TabsRoot :model-value="modelValue" @update:model-value="emit('update:modelValue', $event)" :unmount-on-hide :dir>
         <slot />
     </TabsRoot>
 </template>
diff --git a/resources/js/components/ui/Text.vue b/resources/js/components/ui/Text.vue
new file mode 100644
index 00000000000..80efa653cfd
--- /dev/null
+++ b/resources/js/components/ui/Text.vue
@@ -0,0 +1,51 @@
+<script setup>
+import { computed, useSlots } from 'vue';
+import { cva } from 'cva';
+import { twMerge } from 'tailwind-merge';
+
+const props = defineProps({
+    /** The element this component should render as */
+    as: { type: String, default: 'span' },
+    /** Controls the size of the text. Options: `xs`, `sm`, `base`, `lg` */
+    size: { type: String, default: 'base' },
+    /** Text to display */
+    text: { type: [String, Number, Boolean, null], default: null },
+    /** Controls the appearance of the text. Options: `default`, `strong`, `subtle`, `code`, `danger`, `success`, `warning` */
+    variant: { type: String, default: 'default' },
+});
+
+const slots = useSlots();
+const hasDefaultSlot = !!slots.default;
+
+const textClasses = computed(() => {
+    const classes = cva({
+        base: 'antialiased',
+        variants: {
+            variant: {
+                default: 'text-gray-900 dark:text-gray-50',
+                strong: 'font-semibold text-gray-900 dark:text-gray-50',
+                subtle: 'text-gray-600 dark:text-gray-600/90',
+                code: 'font-mono text-[0.9em] text-gray-900 dark:text-gray-50 bg-gray-600/10 dark:bg-white/10 rounded-sm px-1 py-0.5',
+                danger: 'text-red-600 dark:text-red-400',
+                success: 'text-green-600 dark:text-green-400',
+                warning: 'text-amber-600 dark:text-amber-400',
+            },
+            size: {
+                xs: 'text-2xs',
+                sm: 'text-xs',
+                base: 'text-sm',
+                lg: 'text-base',
+            },
+        },
+    })({ ...props });
+
+    return twMerge(classes);
+});
+</script>
+
+<template>
+    <component :is="as" :class="textClasses" data-ui-text>
+        <slot v-if="hasDefaultSlot" />
+        <template v-else>{{ text }}</template>
+    </component>
+</template>
diff --git a/resources/js/components/ui/TimePicker/TimePicker.vue b/resources/js/components/ui/TimePicker/TimePicker.vue
index b6d353cfa4b..f5d8fbaa45f 100644
--- a/resources/js/components/ui/TimePicker/TimePicker.vue
+++ b/resources/js/components/ui/TimePicker/TimePicker.vue
@@ -14,6 +14,10 @@ const props = defineProps({
     granularity: { type: String, default: null },
     /** When `true`, clear and "set to now" buttons are displayed. */
     clearable: { type: Boolean, default: true },
+    /** When `true`, the time picker is disabled. */
+    disabled: { type: Boolean, default: false },
+    /** When `true`, the time picker is read-only. */
+    readOnly: { type: Boolean, default: false },
 });
 
 const setToNow = () => {
@@ -35,12 +39,15 @@ const setToNow = () => {
         v-slot="{ segments }"
         :locale="$date.locale"
         :granularity="granularity"
+        :disabled="disabled || readOnly"
         :class="[
             'flex items-center w-full bg-white dark:bg-gray-900',
             'border border-gray-300 dark:border-gray-700',
             'leading-5 text-gray-600 dark:text-gray-300',
             'shadow-ui-sm not-prose h-10 rounded-lg py-2 px-3 disabled:shadow-none',
             'data-invalid:border-red-500',
+            disabled ? 'disabled:shadow-none disabled:opacity-50' : '',
+            readOnly ? 'border-dashed' : '',
         ]"
     >
         <div class="flex-1 flex items-center">
@@ -56,8 +63,8 @@ const setToNow = () => {
             </template>
         </div>
         <div class="flex items-center gap-1">
-            <Button v-if="clearable" @click="setToNow" type="button" class="[&_svg]:opacity-80! dark:[&_svg]:opacity-70! hover:[&_svg]:opacity-100!" size="xs" v-tooltip="__('Set to now')" icon="time-now" />
-            <Button v-if="clearable" @click="emit('update:modelValue', null)" type="button" class="[&_svg]:opacity-80! dark:[&_svg]:opacity-70! hover:[&_svg]:opacity-100!" v-tooltip="__('Clear')" icon="x" size="xs" />
+            <Button v-if="clearable && !readOnly" @click="setToNow" type="button" class="[&_svg]:opacity-80! dark:[&_svg]:opacity-70! hover:[&_svg]:opacity-100!" size="xs" v-tooltip="__('Set to now')" icon="time-now" :disabled="disabled" />
+            <Button v-if="clearable && !readOnly" @click="emit('update:modelValue', null)" type="button" class="[&_svg]:opacity-80! dark:[&_svg]:opacity-70! hover:[&_svg]:opacity-100!" v-tooltip="__('Clear')" icon="x" size="xs" :disabled="disabled" />
         </div>
     </TimeFieldRoot>
 
diff --git a/resources/js/components/ui/TimezoneHoverCard.vue b/resources/js/components/ui/TimezoneHoverCard.vue
new file mode 100644
index 00000000000..0a8a2cd85ce
--- /dev/null
+++ b/resources/js/components/ui/TimezoneHoverCard.vue
@@ -0,0 +1,20 @@
+<script setup>
+import HoverCard from './HoverCard.vue';
+import Timezones from './Timezones.vue';
+
+const props = defineProps({
+    /** The date to display across timezones. Forwarded to `<Timezones>`. Accepts a `Date`, ISO string, epoch number, or a `{ start, end }` range object. */
+    date: { type: [String, Date, Number, Object], required: true },
+    /** Extra `{ timezone, label }` rows to render above the defaults. Forwarded to `<Timezones>`. */
+    additionalTimezones: { type: Array, default: () => [] },
+});
+</script>
+
+<template>
+    <HoverCard>
+        <template #trigger>
+            <slot />
+        </template>
+        <Timezones :date :additional-timezones="additionalTimezones" />
+    </HoverCard>
+</template>
diff --git a/resources/js/components/ui/Timezones.vue b/resources/js/components/ui/Timezones.vue
new file mode 100644
index 00000000000..08fc4a75883
--- /dev/null
+++ b/resources/js/components/ui/Timezones.vue
@@ -0,0 +1,73 @@
+<script setup>
+import { computed } from 'vue';
+import { dateFormatter, config } from '@api';
+import { getLocalTimeZone } from '@internationalized/date';
+import { normalizeLocale } from '../FormattingLocale.js';
+import Text from './Text.vue';
+
+const props = defineProps({
+    /** The date to display across timezones. Accepts a `Date`, ISO string, epoch number, or a `{ start, end }` range object. */
+    date: { type: [String, Date, Number, Object], required: true },
+    /** Extra `{ timezone, label }` rows to render above the defaults. */
+    additionalTimezones: { type: Array, default: () => [] },
+});
+
+const isRange = computed(() => {
+    const value = props.date;
+    return value !== null && typeof value === 'object' && !(value instanceof Date) && 'start' in value && 'end' in value;
+});
+
+const start = computed(() => new Date(isRange.value ? props.date.start : props.date));
+
+const end = computed(() => isRange.value ? new Date(props.date.end) : null);
+
+const isValid = computed(() => {
+    if (isNaN(start.value.getTime())) return false;
+    if (isRange.value && isNaN(end.value.getTime())) return false;
+    return true;
+});
+
+const displayTimezone = computed(() => config.get('displayTimezone') ?? 'UTC');
+
+const formatTimeZone = (timeZone) => {
+    const parts = new Intl.DateTimeFormat(normalizeLocale(config.get('translationLocale')), {
+        timeZone,
+        timeZoneName: 'short',
+    }).formatToParts(start.value);
+    return parts.find((p) => p.type === 'timeZoneName')?.value ?? timeZone;
+};
+
+const formatDateTime = (timeZone) => {
+    const formatter = new Intl.DateTimeFormat(dateFormatter.locale, {
+        dateStyle: isRange.value ? 'short' : 'medium',
+        timeStyle: 'medium',
+        timeZone,
+    });
+    return isRange.value ? formatter.formatRange(start.value, end.value) : formatter.format(start.value);
+};
+
+const rows = computed(() => {
+    const all = [
+        { timeZone: displayTimezone.value, sublabel: __('Site time') },
+        { timeZone: getLocalTimeZone(), sublabel: __('Your time') },
+        ...props.additionalTimezones.map((row) => ({ timeZone: row.timezone, sublabel: row.label })),
+    ];
+
+    const seen = new Set();
+    return all.map((row) => {
+        const isDuplicate = seen.has(row.timeZone);
+        seen.add(row.timeZone);
+        return { ...row, isDuplicate };
+    });
+});
+</script>
+
+<template>
+    <div v-if="isValid" class="grid grid-cols-[auto_auto_auto] gap-x-3 gap-y-1 text-sm">
+        <template v-for="(row, index) in rows" :key="index">
+            <Text :text="formatTimeZone(row.timeZone)" :variant="row.isDuplicate ? 'subtle' : 'strong'" />
+            <Text :text="row.sublabel" variant="subtle" />
+            <Text :text="formatDateTime(row.timeZone)" :variant="row.isDuplicate ? 'subtle' : 'default'" />
+        </template>
+    </div>
+</template>
diff --git a/resources/js/components/ui/Toggle/Item.vue b/resources/js/components/ui/Toggle/Item.vue
index 4bb144d4757..d7ed43ed272 100644
--- a/resources/js/components/ui/Toggle/Item.vue
+++ b/resources/js/components/ui/Toggle/Item.vue
@@ -1,10 +1,12 @@
 <script setup>
-import { computed, inject, useSlots } from 'vue';
+import { computed, inject, useAttrs, useSlots } from 'vue';
 import { cva } from 'cva';
 import { twMerge } from 'tailwind-merge';
 import { ToggleGroupItem } from 'reka-ui';
 import Icon from '../Icon/Icon.vue';
 
+defineOptions({ inheritAttrs: false });
+
 const props = defineProps({
     /** Value of the toggle item */
     value: { type: String, required: true },
@@ -18,6 +20,7 @@ const props = defineProps({
     ariaDescribedby: { type: String, default: null },
 });
 
+const attrs = useAttrs();
 const variant = inject('toggleVariant', 'default');
 const size = inject('toggleSize', 'base');
 
@@ -78,12 +81,18 @@ const toggleItemClasses = computed(() => {
         iconOnly: iconOnly.value,
     });
 
-    return twMerge(classes);
+    return twMerge(classes, attrs.class);
+});
+
+const restAttrs = computed(() => {
+    const { class: _, ...rest } = attrs;
+    return rest;
 });
 </script>
 
 <template>
     <ToggleGroupItem
+        v-bind="restAttrs"
         :value="value"
         :aria-label="accessibleLabel"
         :aria-describedby="ariaDescribedby"
diff --git a/resources/js/components/ui/index.js b/resources/js/components/ui/index.js
index 4f4909880e3..9527d5461c8 100644
--- a/resources/js/components/ui/index.js
+++ b/resources/js/components/ui/index.js
@@ -14,6 +14,9 @@ export { default as CheckboxGroup } from './Checkbox/Group.vue';
 export { default as CodeEditor } from './CodeEditor.vue';
 export { default as Combobox } from './Combobox/Combobox.vue';
 export { default as ConfirmationModal } from './Modal/ConfirmationModal.vue';
+export { default as ContentDirection } from './Publish/ContentDirection.vue';
+export { useContentDirection } from '../../composables/content-direction.js';
+export { useUiDirection } from '../../composables/ui-direction.js';
 export { default as Context } from './Context/Context.vue';
 export { default as ContextFooter } from './Context/Footer.vue';
 export { default as ContextHeader } from './Context/Header.vue';
@@ -82,8 +85,11 @@ export { default as TableRows } from './Table/Rows.vue';
 export { default as TabList } from './Tabs/List.vue';
 export { default as Tabs } from './Tabs/Tabs.vue';
 export { default as TabTrigger } from './Tabs/Trigger.vue';
+export { default as Text } from './Text.vue';
 export { default as Textarea } from './Textarea.vue';
 export { default as TimePicker } from './TimePicker/TimePicker.vue';
+export { default as TimezoneHoverCard } from './TimezoneHoverCard.vue';
+export { default as Timezones } from './Timezones.vue';
 export { default as ToggleGroup } from './Toggle/Group.vue';
 export { default as ToggleItem } from './Toggle/Item.vue';
 
diff --git a/resources/js/components/updater/Updater.vue b/resources/js/components/updater/Updater.vue
index e78019ee218..97ad89a1b9c 100644
--- a/resources/js/components/updater/Updater.vue
+++ b/resources/js/components/updater/Updater.vue
@@ -74,7 +74,8 @@ export default {
             gettingChangelog: true,
             changelog: [],
             currentVersion: null,
-            latestRelease: null,
+            onLatestVersion: false,
+            securityUpdateAvailable: false,
             showingUnlicensedReleases: false,
             page: 1,
             perPage: 10,
@@ -91,16 +92,6 @@ export default {
             return !this.gettingChangelog;
         },
 
-        onLatestVersion() {
-            return this.currentVersion && this.currentVersion == this.latestVersion;
-        },
-
-        securityUpdateAvailable() {
-            return this.currentVersion && this.changelog
-                .filter((release) => release.type === 'upgrade')
-                .some((release) => release.security);
-        },
-
         licensedReleases() {
             return this.changelog.filter((release) => release.licensed);
         },
@@ -113,10 +104,6 @@ export default {
             return this.unlicensedReleases.length > 0;
         },
 
-        latestVersion() {
-            return this.latestRelease && this.latestRelease.version;
-        },
-
         link() {
             return (
                 __('Learn more about :link', {
@@ -145,11 +132,9 @@ export default {
                     this.gettingChangelog = false;
                     this.changelog = response.data.changelog;
                     this.currentVersion = response.data.currentVersion;
+                    this.onLatestVersion = response.data.onLatestVersion;
+                    this.securityUpdateAvailable = response.data.securityUpdateAvailable;
                     this.meta = response.data.meta;
-
-                    if (this.page === 1 && response.data.changelog.length > 0) {
-                        this.latestRelease = response.data.changelog[0];
-                    }
                 });
         },
 
diff --git a/resources/js/components/users/PublishForm.vue b/resources/js/components/users/PublishForm.vue
index e0fcd99e480..3df3ed562b2 100644
--- a/resources/js/components/users/PublishForm.vue
+++ b/resources/js/components/users/PublishForm.vue
@@ -19,6 +19,7 @@
                     <DropdownMenu>
                         <DropdownItem :text="__('Edit Blueprint')" icon="blueprint-edit" v-if="canEditBlueprint" :href="actions.editBlueprint" />
                         <DropdownItem :text="__('Passkeys')" icon="key" :href="cp_url('passkeys')" />
+                        <DropdownItem v-if="oauthEnabled" :text="__('Sign-in Providers')" icon="sign-in" :href="cp_url('oauth')" />
                         <DropdownSeparator v-if="canEditBlueprint && itemActions.length" />
                         <DropdownItem
                             v-for="action in itemActions"
@@ -120,6 +121,7 @@ export default {
         method: String,
         canEditPassword: Boolean,
         canEditBlueprint: Boolean,
+        oauthEnabled: Boolean,
         requiresCurrentPassword: Boolean,
         twoFactor: Object,
     },
diff --git a/resources/js/components/users/Wizard.vue b/resources/js/components/users/Wizard.vue
index 99eacf0c778..8e8b6a05858 100644
--- a/resources/js/components/users/Wizard.vue
+++ b/resources/js/components/users/Wizard.vue
@@ -235,7 +235,7 @@ export default {
     data() {
         return {
             user: {
-                super: this.canCreateSupers,
+                super: false,
                 roles: [],
                 groups: [],
             },
diff --git a/resources/js/composables/content-direction.js b/resources/js/composables/content-direction.js
new file mode 100644
index 00000000000..e031030c842
--- /dev/null
+++ b/resources/js/composables/content-direction.js
@@ -0,0 +1,12 @@
+import { computed, unref } from 'vue';
+import { injectContainerContext } from '@/components/ui/Publish/context.js';
+import { useUiDirection } from './ui-direction';
+
+export function useContentDirection() {
+    const container = injectContainerContext();
+    const { direction: uiDirection } = useUiDirection();
+
+    return {
+        direction: computed(() => (container ? unref(container.direction) : uiDirection.value)),
+    };
+}
diff --git a/resources/js/composables/dirty-state.js b/resources/js/composables/dirty-state.js
index 308e501b9a4..f532016fbf3 100644
--- a/resources/js/composables/dirty-state.js
+++ b/resources/js/composables/dirty-state.js
@@ -3,6 +3,8 @@ import { router } from '@inertiajs/vue3';
 
 const dirty = ref([]);
 let inertiaWarningListener = null;
+let dirtyUrl = null;
+let dirtyState = null;
 
 function names() {
     return dirty.value;
@@ -18,6 +20,10 @@ function count() {
 
 function add(name) {
     if (dirty.value.indexOf(name) == -1) {
+        if (! dirty.value.length) {
+            dirtyUrl = window.location.href;
+            dirtyState = window.history.state;
+        }
         dirty.value = [...dirty.value, name];
     }
 }
@@ -26,10 +32,12 @@ function remove(name) {
     dirty.value = dirty.value.filter((n) => n !== name);
 }
 
+function isWarningEnabled() {
+    return Statamic.$preferences.get('confirm_dirty_navigation', true);
+}
+
 function enableWarning() {
-    if (! Statamic.$preferences.get('confirm_dirty_navigation', true)) {
-        return;
-    }
+    if (! isWarningEnabled()) return;
 
     // For Inertia navigation (e.g. through Link component)
     inertiaWarningListener ??= router.on('before', event => {
@@ -43,15 +51,55 @@ function enableWarning() {
         return confirmed;
     });
 
-    // For browser navigation (e.g. back button, refresh, closing tab)
+    // For real page unload (refresh, tab close, cross-origin nav).
+    // popstate (back/forward, trackpad swipe) is handled separately below.
     window.onbeforeunload = () => '';
 }
 
 function disableWarning() {
     window.onbeforeunload = null;
     inertiaWarningListener && inertiaWarningListener();
+    inertiaWarningListener = null;
 }
 
+// Intercept browser back/forward (popstate) navigation. Inertia's popstate
+// handler swaps pages without firing its `before` event, so we register at
+// module load — before `createInertiaApp()` calls `eventHandler.init()` —
+// to ensure our listener runs first and can block Inertia via
+// `stopImmediatePropagation()`. See statamic/cms#14055.
+window.addEventListener('popstate', (event) => {
+    if (! dirty.value.length) return;
+    if (! isWarningEnabled()) return;
+
+    // Hash-only navigation (e.g. tab switching) stays on the same page.
+    if (dirtyUrl) {
+        const origin = new URL(dirtyUrl);
+        if (window.location.pathname === origin.pathname && window.location.search === origin.search) return;
+    }
+
+    // Block Inertia's listener so it doesn't `setQuietly(..., { preserveState: false })`
+    // and wipe the in-memory form data before we've confirmed.
+    event.stopImmediatePropagation();
+
+    // Re-push the dirty page we were just on so the URL/Inertia state are
+    // restored while the (synchronous) confirm() is open and after a cancel.
+    if (dirtyUrl && dirtyState) {
+        window.history.pushState(dirtyState, '', dirtyUrl);
+    }
+
+    const confirmed = confirm(__('statamic::messages.dirty_navigation_warning'));
+
+    if (! confirmed) return;
+
+    clear();
+    disableWarning();
+
+    // We're now on a re-pushed entry of the dirty page. Going back fires
+    // popstate again with the user's intended target; dirty is clean so
+    // Inertia handles it normally.
+    window.history.back();
+});
+
 function state(name, state) {
     state ? add(name) : remove(name);
 }
diff --git a/resources/js/composables/progress-bar.js b/resources/js/composables/progress-bar.js
index 7d57f35ae80..acdfe44ece3 100644
--- a/resources/js/composables/progress-bar.js
+++ b/resources/js/composables/progress-bar.js
@@ -1,4 +1,4 @@
-import { ref, watch } from 'vue';
+import { ref } from 'vue';
 import progress from 'nprogress';
 
 progress.configure({ showSpinner: false });
@@ -25,6 +25,8 @@ function stop() {
 function add(name) {
     if (progressNames.value.indexOf(name) == -1) {
         progressNames.value = [...progressNames.value, name];
+
+        if (!progressing.value) start();
     }
 }
 
@@ -36,6 +38,8 @@ function remove(name) {
 
     newValues.splice(i, 1);
     progressNames.value = newValues;
+
+    if (newValues.length === 0 && progressing.value) stop();
 }
 
 function loading(name, loading) {
@@ -47,23 +51,9 @@ function count() {
 }
 
 function isComplete() {
-    return count() === 0;
+    return !progressing.value;
 }
 
-watch(
-    names,
-    (newNames) => {
-        if (newNames.length > 0 && !progressing.value) {
-            start();
-        }
-
-        if (newNames.length === 0 && progressing.value) {
-            stop();
-        }
-    },
-    { immediate: true },
-);
-
 export default function useProgressBar() {
     return {
         loading,
diff --git a/resources/js/composables/ui-direction.js b/resources/js/composables/ui-direction.js
new file mode 100644
index 00000000000..2d24f855e98
--- /dev/null
+++ b/resources/js/composables/ui-direction.js
@@ -0,0 +1,15 @@
+import { computed, ref } from 'vue';
+
+const dir = ref(typeof document !== 'undefined' ? document.documentElement.dir || 'ltr' : 'ltr');
+
+if (typeof document !== 'undefined') {
+    new MutationObserver(() => {
+        dir.value = document.documentElement.dir || 'ltr';
+    }).observe(document.documentElement, { attributes: true, attributeFilter: ['dir'] });
+}
+
+export function useUiDirection() {
+    return {
+        direction: computed(() => dir.value),
+    };
+}
diff --git a/resources/js/frontend/components/Passkeys.js b/resources/js/frontend/components/Passkeys.js
new file mode 100644
index 00000000000..4e5d6d03f1b
--- /dev/null
+++ b/resources/js/frontend/components/Passkeys.js
@@ -0,0 +1,251 @@
+import { startAuthentication, startRegistration, browserSupportsWebAuthn, WebAuthnAbortService } from '@simplewebauthn/browser';
+
+export default class Passkeys {
+    constructor() {
+        this.supported = browserSupportsWebAuthn();
+        this._waiting = false;
+        this._error = null;
+        this._defaults = {};
+    }
+
+    configure(defaults) {
+        this._defaults = defaults;
+        return this;
+    }
+
+    get waiting() {
+        return this._waiting;
+    }
+
+    get error() {
+        return this._error;
+    }
+
+    /**
+     * Authenticate with a passkey.
+     *
+     * @param {Object} options
+     * @param {string} options.optionsUrl - URL to fetch assertion options
+     * @param {string} options.verifyUrl - URL to verify the assertion
+     * @param {Function} [options.onSuccess] - Callback on success with response data
+     * @param {Function} [options.onError] - Callback on error with error object
+     * @param {boolean} [options.useBrowserAutofill=false] - Use browser autofill UI
+     * @param {string} [options.csrfToken] - Override CSRF token
+     */
+    async authenticate(options = {}) {
+        const {
+            optionsUrl,
+            verifyUrl,
+            onSuccess,
+            onError,
+            useBrowserAutofill = false,
+            csrfToken,
+        } = { ...this._defaults, ...options };
+
+        if (!useBrowserAutofill) {
+            this._waiting = true;
+        }
+        this._error = null;
+
+        try {
+            const authOptionsResponse = await fetch(optionsUrl, {
+                credentials: 'same-origin',
+            });
+
+            if (!authOptionsResponse.ok) {
+                throw new Error('Failed to fetch authentication options');
+            }
+
+            const optionsJSON = await authOptionsResponse.json();
+
+            let authResponse;
+            try {
+                authResponse = await startAuthentication({ optionsJSON, useBrowserAutofill });
+            } catch (e) {
+                if (e.name === 'AbortError' || e.name === 'NotAllowedError') {
+                    return;
+                }
+                console.error(e);
+                this._error = 'Authentication failed.';
+                if (onError) {
+                    onError({ message: this._error, originalError: e });
+                }
+                return;
+            }
+
+            const verifyResponse = await fetch(verifyUrl, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Accept': 'application/json',
+                    'X-CSRF-TOKEN': csrfToken || this._getCsrfToken(),
+                },
+                credentials: 'same-origin',
+                body: JSON.stringify(authResponse),
+            });
+
+            const data = await verifyResponse.json();
+
+            if (!verifyResponse.ok) {
+                this._error = data.message || 'Verification failed.';
+                if (onError) {
+                    onError({ message: this._error, status: verifyResponse.status });
+                }
+                return;
+            }
+
+            if (onSuccess) {
+                onSuccess(data);
+            }
+        } catch (e) {
+            this._handleError(e, onError);
+        } finally {
+            if (!useBrowserAutofill) {
+                this._waiting = false;
+            }
+        }
+    }
+
+    /**
+     * Register a new passkey.
+     *
+     * @param {Object} options
+     * @param {string} options.optionsUrl - URL to fetch attestation options
+     * @param {string} options.verifyUrl - URL to verify and store the passkey
+     * @param {string} [options.name='Passkey'] - Name for the passkey
+     * @param {Function} [options.onSuccess] - Callback on success with response data
+     * @param {Function} [options.onError] - Callback on error with error object
+     * @param {string} [options.csrfToken] - Override CSRF token
+     */
+    async register(options = {}) {
+        const {
+            optionsUrl,
+            verifyUrl,
+            name = 'Passkey',
+            onSuccess,
+            onError,
+            csrfToken,
+        } = { ...this._defaults, ...options };
+
+        this._waiting = true;
+        this._error = null;
+
+        try {
+            const createOptionsResponse = await fetch(optionsUrl, {
+                credentials: 'same-origin',
+            });
+
+            if (!createOptionsResponse.ok) {
+                throw new Error('Failed to fetch registration options');
+            }
+
+            const optionsJSON = await createOptionsResponse.json();
+
+            let registrationResponse;
+            try {
+                registrationResponse = await startRegistration({ optionsJSON });
+            } catch (e) {
+                if (e.name === 'AbortError' || e.name === 'NotAllowedError') {
+                    return;
+                }
+                console.error(e);
+                this._error = 'Registration failed.';
+                if (onError) {
+                    onError({ message: this._error, originalError: e });
+                }
+                return;
+            }
+
+            const verifyResponse = await fetch(verifyUrl, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Accept': 'application/json',
+                    'X-CSRF-TOKEN': csrfToken || this._getCsrfToken(),
+                },
+                credentials: 'same-origin',
+                body: JSON.stringify({
+                    ...registrationResponse,
+                    name,
+                }),
+            });
+
+            const data = await verifyResponse.json();
+
+            if (!verifyResponse.ok) {
+                this._error = data.message || 'Verification failed.';
+                if (onError) {
+                    onError({ message: this._error, status: verifyResponse.status });
+                }
+                return;
+            }
+
+            if (onSuccess) {
+                onSuccess(data);
+            }
+        } catch (e) {
+            this._handleError(e, onError);
+        } finally {
+            this._waiting = false;
+        }
+    }
+
+    /**
+     * Cancel any ongoing WebAuthn ceremony.
+     */
+    cancel() {
+        WebAuthnAbortService.cancelCeremony();
+    }
+
+    /**
+     * Initialize browser autofill for passkey authentication.
+     * Call this on page load to enable passkey suggestions in form fields.
+     *
+     * @param {Object} options
+     * @param {string} options.optionsUrl - URL to fetch assertion options
+     * @param {string} options.verifyUrl - URL to verify the assertion
+     * @param {Function} [options.onSuccess] - Callback on success with response data
+     * @param {Function} [options.onError] - Callback on error with error object
+     * @param {string} [options.csrfToken] - Override CSRF token
+     */
+    initAutofill(options = {}) {
+        if (!this.supported) {
+            return;
+        }
+
+        this.authenticate({
+            ...options,
+            useBrowserAutofill: true,
+        });
+    }
+
+    /**
+     * Get the CSRF token from the page.
+     * @private
+     */
+    _getCsrfToken() {
+        const metaTag = document.querySelector('meta[name="csrf-token"]');
+        if (metaTag) {
+            return metaTag.getAttribute('content');
+        }
+
+        const input = document.querySelector('input[name="_token"]');
+        if (input) {
+            return input.value;
+        }
+
+        return '';
+    }
+
+    /**
+     * Handle errors consistently.
+     * @private
+     */
+    _handleError(e, onError) {
+        this._error = e.message || 'Something went wrong';
+
+        if (onError) {
+            onError({ message: this._error, originalError: e });
+        }
+    }
+}
diff --git a/resources/js/frontend/helpers.js b/resources/js/frontend/helpers.js
index 8377adc06ff..5bb668b89af 100644
--- a/resources/js/frontend/helpers.js
+++ b/resources/js/frontend/helpers.js
@@ -1,8 +1,10 @@
 import FieldConditions from './components/FieldConditions.js';
+import Passkeys from './components/Passkeys.js';
 
 class Statamic {
     constructor() {
         this.$conditions = new FieldConditions();
+        this.$passkeys = new Passkeys();
     }
 }
 
diff --git a/resources/js/index.js b/resources/js/index.js
index 3920043d308..bde60a0eff6 100644
--- a/resources/js/index.js
+++ b/resources/js/index.js
@@ -7,7 +7,7 @@ import Cookies from 'cookies-js';
 import * as cms from './bootstrap/cms/index.js';
 import hmr from './bootstrap/hmr';
 
-import.meta.glob(['../img/**']);
+void import.meta.glob(['../img/**'], { eager: true });
 
 let global_functions = Object.keys(Globals);
 global_functions.forEach((fnName) => {
diff --git a/resources/js/pages/assets/Browse.vue b/resources/js/pages/assets/Browse.vue
index ffc5d06b6ec..07964e9663e 100644
--- a/resources/js/pages/assets/Browse.vue
+++ b/resources/js/pages/assets/Browse.vue
@@ -17,6 +17,16 @@ export default {
         };
     },
 
+    computed: {
+        headTitle() {
+            const title = __(this.container.title);
+            const section = __('Assets');
+
+            // Avoid duplicating when the container is named "Assets".
+            return title === section ? section : [title, section];
+        },
+    },
+
     mounted() {
         this.bindBrowserNavigation();
     },
@@ -91,7 +101,7 @@ export default {
 
 <template>
     <div class="h-full" v-cloak>
-        <Head :title="container.title" />
+        <Head :title="headTitle" />
 
         <asset-browser
             ref="browser"
diff --git a/resources/js/pages/auth/ConfirmPassword.vue b/resources/js/pages/auth/ConfirmPassword.vue
index 581daff9b48..064d1bb956f 100644
--- a/resources/js/pages/auth/ConfirmPassword.vue
+++ b/resources/js/pages/auth/ConfirmPassword.vue
@@ -1,3 +1,12 @@
+<script>
+import Outside from '@/pages/layout/Outside.vue';
+import Layout from '@/pages/layout/Layout.vue';
+
+export default {
+    layout: (h, page) => page.props.outside ? h(Outside, () => page) : h(Layout, () => page),
+};
+</script>
+
 <script setup>
 import Head from '@/pages/layout/Head.vue';
 import { AuthCard, Input, Field, Button, Description, ErrorMessage, Separator } from '@ui';
@@ -5,7 +14,7 @@ import { computed } from 'vue';
 import { Form, router } from '@inertiajs/vue3';
 import { usePasskey } from '@/composables/passkey';
 
-const props = defineProps(['method', 'allowPasskey', 'status', 'submitUrl', 'resendUrl', 'passkeyOptionsUrl']);
+const props = defineProps(['method', 'allowPasskey', 'status', 'submitUrl', 'resendUrl', 'passkeyOptionsUrl', 'outside']);
 const isConfirmingPassword = computed(() => props.method === 'password_confirmation');
 const isUsingVerificationCode = computed(() => props.method === 'verification_code');
 const isOnlyUsingPasskey = computed(() => props.method === 'passkey');
@@ -45,7 +54,7 @@ async function confirmWithPasskey() {
 
                 <Button
                     v-if="isUsingVerificationCode"
-                    as="href"
+                    as="a"
                     class="flex-1"
                     :href="resendUrl"
                     :text="__('Resend code')"
diff --git a/resources/js/pages/auth/Login.vue b/resources/js/pages/auth/Login.vue
index 8622d5a0f22..0a910807bd4 100644
--- a/resources/js/pages/auth/Login.vue
+++ b/resources/js/pages/auth/Login.vue
@@ -15,7 +15,6 @@ const props = defineProps([
     'passkeyVerifyUrl',
     'oauthEnabled',
     'providers',
-    'referer',
     'submitUrl',
     'forgotPasswordUrl',
 ])
@@ -41,13 +40,6 @@ const submit = () => {
             processing.value = true;
             errors.value = {};
         },
-        onSuccess: (page) => {
-			if (page.component === 'auth/two-factor/Challenge') {
-				return;
-			}
-
-	        window.location.href = props.referer;
-        },
         onError: () => processing.value = false
     });
 }
@@ -113,7 +105,7 @@ onUnmounted(() => passkey.cancel());
                     <template #actions>
                         <Link
                             :href="forgotPasswordUrl"
-                            class="text-ui-accent-text text-sm hover:text-ui-accent-text/80"
+                            class="text-ui-accent-text mb-1.5 text-sm hover:text-ui-accent-text/80"
                             tabindex="6"
                             v-text="__('Forgot password?')"
                         />
diff --git a/resources/js/pages/auth/Unauthorized.vue b/resources/js/pages/auth/Unauthorized.vue
index cf83538f7ad..8a032fbc033 100644
--- a/resources/js/pages/auth/Unauthorized.vue
+++ b/resources/js/pages/auth/Unauthorized.vue
@@ -2,7 +2,6 @@
 import Head from '@/pages/layout/Head.vue';
 import Outside from '@/pages/layout/Outside.vue';
 import { AuthCard, Button } from '@ui';
-import { Link } from '@inertiajs/vue3';
 
 defineOptions({ layout: Outside });
 
@@ -19,7 +18,7 @@ defineProps(['isLoggedIn', 'loginUrl', 'logoutUrl']);
     >
         <div class="flex justify-center">
             <Button
-                :as="Link"
+                as="a"
                 variant="primary"
                 :href="isLoggedIn ? logoutUrl : loginUrl"
                 class="w-full"
diff --git a/resources/js/pages/auth/passwords/Reset.vue b/resources/js/pages/auth/passwords/Reset.vue
index 4f1dccc8edc..f0bdebf3d43 100644
--- a/resources/js/pages/auth/passwords/Reset.vue
+++ b/resources/js/pages/auth/passwords/Reset.vue
@@ -7,7 +7,7 @@ import { computed, ref, watch } from 'vue';
 
 defineOptions({ layout: Outside });
 
-const props = defineProps(['errors', 'action', 'token', 'email', 'redirect', 'title', 'loginUrl']);
+const props = defineProps(['errors', 'action', 'token', 'email', 'emailReadonly', 'redirect', 'title', 'loginUrl']);
 
 const errors = ref(props.errors);
 watch(() => props.errors, (newErrors) => errors.value = newErrors);
@@ -30,9 +30,6 @@ const submit = () => {
             processing.value = true;
             errors.value = {};
         },
-        onSuccess: (e) => {
-            return window.location.href = e.url;
-        },
         onError: () => processing.value = false
     });
 }
@@ -50,11 +47,11 @@ const submit = () => {
             class="flex flex-col gap-6"
         >
             <Field :label="__('Email Address')" :error="errors?.email">
-                <Input v-model="email" autofocus type="email" />
+                <Input v-model="email" :read-only="emailReadonly" :focus="! emailReadonly" type="email" />
             </Field>
 
             <Field :label="__('Password')" :error="errors?.password">
-                <Input v-model="password" type="password" />
+                <Input v-model="password" :focus="emailReadonly" type="password" />
             </Field>
 
             <Field :label="__('Confirm Password')" :error="errors?.password_confirmation">
diff --git a/resources/js/pages/collections/Empty.vue b/resources/js/pages/collections/Empty.vue
index 19dc75e64ab..e2ae7c3b0c8 100644
--- a/resources/js/pages/collections/Empty.vue
+++ b/resources/js/pages/collections/Empty.vue
@@ -45,12 +45,18 @@ const props = defineProps([
                 :heading="createLabel"
                 :description="__('statamic::messages.collection_next_steps_create_entry_description')"
             >
-                <a
-                    v-for="blueprint in blueprints"
-                    :href="blueprint.createEntryUrl"
-                    class="text-blue-600 text-sm rtl:ml-2 ltr:mr-2"
-                    v-text="blueprint.title"
-                />
+                <div class="flex flex-wrap gap-2 mt-2">
+                    <ui-badge
+                        v-for="blueprint in blueprints"
+                        :key="blueprint.createEntryUrl"
+                        :href="blueprint.createEntryUrl"
+                        :text="blueprint.title"
+                        color="blue"
+                        size="sm"
+                        pill
+                        class="dark:bg-gray-925"
+                    />
+                </div>
             </ui-empty-state-item>
 
             <ui-empty-state-item
diff --git a/resources/js/pages/collections/Scaffold.vue b/resources/js/pages/collections/Scaffold.vue
index 5c584e8357d..2b44fc28f75 100644
--- a/resources/js/pages/collections/Scaffold.vue
+++ b/resources/js/pages/collections/Scaffold.vue
@@ -9,8 +9,8 @@ const props = defineProps({
     route: String,
 });
 
-const index = `${props.collection.handle}/index`;
-const show = `${props.collection.handle}/show`;
+const index = ref(`${props.collection.handle}/index`);
+const show = ref(`${props.collection.handle}/show`);
 
 const selected = ref({
     index: true,
@@ -25,11 +25,11 @@ const files = computed(() => {
     var files = {};
 
     if (selected.value.index) {
-        files.index = index;
+        files.index = index.value;
     }
 
     if (selected.value.show) {
-        files.show = show;
+        files.show = show.value;
     }
 
     return files;
diff --git a/resources/js/pages/errors/404.vue b/resources/js/pages/errors/404.vue
index 75012e5d2dc..7643c24dcc5 100644
--- a/resources/js/pages/errors/404.vue
+++ b/resources/js/pages/errors/404.vue
@@ -1,5 +1,10 @@
 <script setup>
-import { Card, Heading, Description } from '@ui';
+import { Card, Heading, Description, Button } from '@ui';
+import Blank from '@/pages/layout/Blank.vue';
+import useBodyClasses from '@/pages/layout/body-classes.js';
+
+defineOptions({ layout: Blank });
+useBodyClasses('bg-gray-50 dark:bg-gray-900');
 </script>
 
 <template>
@@ -7,6 +12,7 @@ import { Card, Heading, Description } from '@ui';
         <Card class="text-center flex flex-col items-center space-y-2">
             <Heading size="2xl" :text="__('404')" />
             <Description :text="__('The page you are looking for could not be found.')" />
+            <Button as="a" :href="cp_url('/')" size="xs" variant="filled" class="mt-4" :text="__('Return to Control Panel')" />
         </Card>
     </div>
 </template>
diff --git a/resources/js/pages/errors/Error.vue b/resources/js/pages/errors/Error.vue
index 315e91cedf4..2750500e04a 100644
--- a/resources/js/pages/errors/Error.vue
+++ b/resources/js/pages/errors/Error.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { Card, Heading, Description } from '@ui';
+import { Card, Heading, Description, Button } from '@ui';
 import Blank from '@/pages/layout/Blank.vue';
 import useBodyClasses from '@/pages/layout/body-classes.js';
 
@@ -13,6 +13,7 @@ useBodyClasses('bg-gray-50 dark:bg-gray-900');
         <Card class="text-center flex flex-col items-center space-y-2">
             <Heading size="2xl" :text="__('Whoops!')" />
             <Description :text="`${__('Something went wrong')} (${status})`" />
+            <Button as="a" :href="cp_url('/')" size="xs" variant="filled" class="mt-4" :text="__('Return to Control Panel')" />
         </Card>
     </div>
 </template>
diff --git a/resources/js/pages/fieldsets/Edit.vue b/resources/js/pages/fieldsets/Edit.vue
index cd936dd2eda..e574128a2f5 100644
--- a/resources/js/pages/fieldsets/Edit.vue
+++ b/resources/js/pages/fieldsets/Edit.vue
@@ -23,26 +23,20 @@
             </ui-card>
         </ui-panel>
 
-        <ui-panel :heading="__('Fields')">
-            <fields
-                :fields="fields"
-                :editing-field="editingField"
-                :exclude-fieldset="fieldset.handle"
-                :suggestable-condition-fields="suggestableConditionFields(this)"
-                with-command-palette
-                @field-created="fieldCreated"
-                @field-updated="fieldUpdated"
-                @field-linked="fieldLinked"
-                @field-deleted="deleteField"
-                @field-editing="editingField = $event"
-                @editor-closed="editingField = null"
-            />
-        </ui-panel>
+        <sections
+            class="mt-8"
+            tab-id="fieldset"
+            :initial-sections="sections"
+            :show-section-collapsible-field="true"
+            :exclude-fieldset="fieldset.handle"
+            with-command-palette
+            @updated="sections = $event"
+        />
     </div>
 </template>
 
 <script>
-import Fields from '@/components/blueprints/Fields.vue';
+import Sections from '@/components/blueprints/Sections.vue';
 import { Sortable, Plugins } from '@shopify/draggable';
 import SuggestsConditionalFields from '@/components/blueprints/SuggestsConditionalFields';
 import { Header, Button } from '@/components/ui';
@@ -53,7 +47,7 @@ export default {
 
     components: {
         Head,
-        Fields,
+        Sections,
         Header,
         Button,
     },
@@ -71,17 +65,17 @@ export default {
     },
 
     computed: {
-        fields: {
+        sections: {
             get() {
-                return this.fieldset.fields;
+                return this.fieldset.sections;
             },
-            set(fields) {
-                this.fieldset.fields = fields;
+            set(sections) {
+                this.fieldset.sections = sections;
             },
         },
 
         fieldsForConditionSuggestions() {
-            return this.fields;
+            return this.sections.reduce((fields, section) => fields.concat(section.fields || []), []);
         },
     },
 
@@ -96,6 +90,12 @@ export default {
                 this.$dirty.add('fieldsets');
             },
         },
+        sections: {
+            deep: true,
+            handler() {
+                this.$nextTick(() => this.makeSortable());
+            },
+        },
     },
 
     methods: {
@@ -112,35 +112,39 @@ export default {
                 });
         },
 
-        fieldCreated(field) {
-            this.fields.push(field);
-        },
-
-        fieldUpdated(i, field) {
-            this.fields.splice(i, 1, field);
-        },
-
-        deleteField(i) {
-            this.fields.splice(i, 1);
-        },
-
-        fieldLinked(field) {
-            this.fields.push(field);
-            this.$toast.success(__('Field added'));
+        makeSortable() {
+            if (this.sortableSections) {
+                this.sortableSections.destroy();
+            }
 
-            if (field.type === 'reference') {
-                this.$nextTick(() => (this.editingField = field._id));
+            if (this.sortableFields) {
+                this.sortableFields.destroy();
             }
-        },
 
-        makeSortable() {
-            new Sortable(this.$el.querySelector('.blueprint-section-draggable-zone'), {
+            this.sortableSections = new Sortable(this.$el.querySelector('.blueprint-sections'), {
+                draggable: '.blueprint-section',
+                handle: '.blueprint-section-drag-handle',
+                mirror: { constrainDimensions: true, appendTo: 'body' },
+                plugins: [Plugins.SwapAnimation],
+            }).on('sortable:stop', (e) => {
+                this.fieldset.sections.splice(e.newIndex, 0, this.fieldset.sections.splice(e.oldIndex, 1)[0]);
+            });
+
+            this.sortableFields = new Sortable(this.$el.querySelectorAll('.blueprint-section-draggable-zone'), {
                 draggable: '.blueprint-section-field',
                 handle: '.blueprint-drag-handle',
                 mirror: { constrainDimensions: true, appendTo: 'body' },
                 plugins: [Plugins.SwapAnimation],
             }).on('sortable:stop', (e) => {
-                this.fieldset.fields.splice(e.newIndex, 0, this.fieldset.fields.splice(e.oldIndex, 1)[0]);
+                const oldSection = this.fieldset.sections.find((section) => section._id === e.oldContainer.dataset.section);
+                const newSection = this.fieldset.sections.find((section) => section._id === e.newContainer.dataset.section);
+
+                if (!oldSection || !newSection) {
+                    return;
+                }
+
+                const field = oldSection.fields.splice(e.oldIndex, 1)[0];
+                newSection.fields.splice(e.newIndex, 0, field);
             });
         },
     },
@@ -160,6 +164,14 @@ export default {
 
     beforeUnmount() {
         this.$events.$off('root-form-save');
+
+        if (this.sortableSections) {
+            this.sortableSections.destroy();
+        }
+
+        if (this.sortableFields) {
+            this.sortableFields.destroy();
+        }
     },
 };
 </script>
diff --git a/resources/js/pages/forms/Show.vue b/resources/js/pages/forms/Show.vue
index 5ecdb12f782..d96bb35f47c 100644
--- a/resources/js/pages/forms/Show.vue
+++ b/resources/js/pages/forms/Show.vue
@@ -1,7 +1,7 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import Head from '@/pages/layout/Head.vue';
-import { Header, Dropdown, DropdownMenu, DropdownItem, Button, CommandPaletteItem } from '@ui';
+import { Header, Dropdown, DropdownMenu, DropdownItem, Button, Modal, RadioGroup, Radio, CommandPaletteItem } from '@ui';
 import ResourceDeleter from '@/components/ResourceDeleter.vue';
 import FormSubmissionListing from '@/components/forms/SubmissionListing.vue';
 
@@ -15,13 +15,53 @@ const props = defineProps([
 ]);
 
 const deleter = ref(null);
+const submissionListing = ref(null);
+const exportModalOpen = ref(false);
+const exportFormat = ref(null);
+const exportScope = ref('all');
+const listingParameters = ref({});
+
+const hasFilteredScope = computed(() => {
+    const params = listingParameters.value;
+    const hasSortOverride = (params.sort && params.sort !== 'datestamp') || (params.order && params.order !== 'desc');
+    return !!(params.search || params.filters || hasSortOverride);
+});
+
+function openExportModal() {
+    listingParameters.value = submissionListing.value?.parameters ?? {};
+    exportFormat.value = props.exporters[0]?.handle ?? null;
+    exportScope.value = 'all';
+    exportModalOpen.value = true;
+}
+
+function exportSubmissions() {
+    const exporter = props.exporters.find((e) => e.handle === exportFormat.value);
+    if (!exporter) return;
+
+    let url = exporter.downloadUrl;
+
+    if (exportScope.value === 'filtered') {
+        const params = listingParameters.value;
+        const query = new URLSearchParams();
+        if (params.search) query.set('search', params.search);
+        if (params.sort) query.set('sort', params.sort);
+        if (params.order) query.set('order', params.order);
+        if (params.filters) query.set('filters', params.filters);
+
+        const separator = url.includes('?') ? '&' : '?';
+        url += separator + query.toString();
+    }
+
+    window.open(url, '_blank');
+    exportModalOpen.value = false;
+}
 </script>
 
 <template>
     <div class="max-w-5xl 3xl:max-w-6xl mx-auto" data-max-width-wrapper>
-        <Head :title="[form.title, __('Forms')]" />
+        <Head :title="[__(form.title), __('Forms')]" />
 
-        <Header :title="form.title" icon="forms">
+        <Header :title="__(form.title)" icon="forms">
             <Dropdown v-if="form.canEdit || form.canDelete" placement="left-start" class="me-2">
                 <DropdownMenu>
                     <DropdownItem v-if="form.canEdit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
@@ -70,39 +110,51 @@ const deleter = ref(null);
                 :redirect="redirectUrl"
             />
 
-            <Dropdown v-if="exporters.length">
-                <template #trigger>
-                    <Button :text="__('Export Submissions')" />
-                </template>
-                <DropdownMenu>
-                    <DropdownItem
-                        v-for="exporter in exporters"
-                        :key="exporter.downloadUrl"
-                        :text="exporter.title"
-                        :href="exporter.downloadUrl"
-                        target="_blank"
-                    />
-                </DropdownMenu>
-            </Dropdown>
+            <Button v-if="exporters.length" :text="__('Export Submissions')" @click="openExportModal" />
 
             <CommandPaletteItem
-                v-for="exporter in exporters"
-                :key="exporter.downloadUrl"
+                v-if="exporters.length"
                 category="Actions"
-                :text="[__('Export Submissions'), exporter.title]"
+                :text="__('Export Submissions')"
                 icon="save"
-                :url="exporter.downloadUrl"
+                :action="openExportModal"
                 prioritize
             />
         </Header>
 
         <FormSubmissionListing
+            ref="submissionListing"
             :form="form.handle"
             :action-url="actionUrl"
             sort-column="datestamp"
             sort-direction="desc"
             :columns="columns"
-                :filters="filters"
+            :filters="filters"
         />
+
+        <Modal :open="exportModalOpen" @update:open="exportModalOpen = $event" :title="__('Export Submissions')">
+            <div class="space-y-4">
+                <div>
+                    <label class="text-sm font-medium mb-1.5 block">{{ __('Format') }}</label>
+                    <RadioGroup v-model="exportFormat" inline>
+                        <Radio v-for="format in exporters" :key="format.handle" :value="format.handle" :label="format.title" />
+                    </RadioGroup>
+                </div>
+
+                <div>
+                    <label class="text-sm font-medium mb-1.5 block">{{ __('Submissions') }}</label>
+                    <RadioGroup v-model="exportScope">
+                        <Radio value="all" :label="__('All Submissions')" />
+                        <Radio value="filtered" :label="__('Filtered Submissions')" :description="__('statamic::messages.form_export_filtered_description')" :disabled="!hasFilteredScope" />
+                    </RadioGroup>
+                </div>
+            </div>
+
+            <template #footer>
+                <div class="flex justify-end p-2">
+                    <Button variant="primary" :text="__('Export')" @click="exportSubmissions" />
+                </div>
+            </template>
+        </Modal>
     </div>
 </template>
diff --git a/resources/js/pages/forms/Submission.vue b/resources/js/pages/forms/Submission.vue
index 54b81d68e81..118df434918 100644
--- a/resources/js/pages/forms/Submission.vue
+++ b/resources/js/pages/forms/Submission.vue
@@ -21,7 +21,7 @@ provide('isFormSubmission', true);
 
 <template>
     <div class="max-w-5xl 3xl:max-w-6xl mx-auto" data-max-width-wrapper>
-        <Head :title="[title, formTitle, __('Forms')]" />
+        <Head :title="[title, __(formTitle), __('Forms')]" />
 
         <PublishForm
             icon="forms"
diff --git a/resources/js/pages/layout/Head.vue b/resources/js/pages/layout/Head.vue
index 040cc73e627..a27676938be 100644
--- a/resources/js/pages/layout/Head.vue
+++ b/resources/js/pages/layout/Head.vue
@@ -10,11 +10,11 @@ const props = defineProps<{
 const { cmsName } = useStatamicPageProps();
 
 const title = computed(() => {
-    let title = props.title;
-    if (typeof title === 'string') title = [title];
-    title.push(cmsName);
+    let parts = props.title;
+    if (typeof parts === 'string') parts = [parts];
+    parts = [...parts, cmsName];
     const divider = Statamic.$config.get('direction') === 'ltr' ? '‹' : '›';
-    return title.join(` ${divider} `);
+    return parts.join(` ${divider} `);
 });
 </script>
 
diff --git a/resources/js/pages/layout/Layout.vue b/resources/js/pages/layout/Layout.vue
index 2d08c279163..68e5c0573fd 100644
--- a/resources/js/pages/layout/Layout.vue
+++ b/resources/js/pages/layout/Layout.vue
@@ -54,7 +54,7 @@ function focusMain() {
 
                 // Otherwise, focus the content card
                 if (!autofocusInput) {
-                    document.querySelector('#content-card')?.focus();
+                    document.querySelector('#content-card')?.focus({ preventScroll: true });
                 }
             }, 100);
         });
@@ -82,10 +82,10 @@ onUnmounted(() => {
         <main id="main" class="flex bg-body-bg dark:border-t dark:border-body-border rounded-t-2xl fixed top-14 inset-x-0 bottom-0 min-h-[calc(100vh-3.5rem)]">
             <Nav />
             <!-- The data attribute allows CSS to target elements when max-width is disabled. -->
-            <div id="main-content" class="main-content sm:p-2 h-full flex-1 overflow-y-auto focus:outline-none rounded-t-2xl" :data-max-width-enabled="isMaxWidthEnabled">
+            <div id="main-content" scroll-region class="main-content sm:p-2 h-full flex-1 overflow-y-auto focus:outline-none rounded-t-2xl" :data-max-width-enabled="isMaxWidthEnabled">
                 <div id="content-card" tabindex="-1" class="focus:outline-none relative content-card grid min-h-full mx-auto">
                     <!-- Data attribute used by the CSS style tag below to override max-width when disabled.-->
-                    <div class="w-full min-w-0 mx-auto max-w-page" data-max-width-wrapper>
+                    <div class="w-full min-w-0 mx-auto max-w-page max-[1220px]:mb-18" data-max-width-wrapper>
                         <slot />
                     </div>
                 </div>
diff --git a/resources/js/pages/layout/Outside.vue b/resources/js/pages/layout/Outside.vue
index 69a4223f4ea..e3074ebad05 100644
--- a/resources/js/pages/layout/Outside.vue
+++ b/resources/js/pages/layout/Outside.vue
@@ -7,10 +7,11 @@ import { colorMode } from '@api';
 import PortalTargets from "@/components/portals/PortalTargets.vue";
 
 useBodyClasses('bg-gray-50 dark:bg-gray-900 font-sans leading-normal scheme-light p-2 outside');
-const { logos, cmsName } = useStatamicPageProps();
+const { logos, cmsName, isCpRoute } = useStatamicPageProps();
 const customLogo = logos?.light?.outside ?? logos?.dark?.outside ?? null;
 const lightCustomLogo = logos?.light?.outside ?? null;
 const darkCustomLogo = logos?.dark?.outside ?? logos?.light?.outside ?? null;
+const showLogo = customLogo || logos?.text || isCpRoute;
 
 onMounted(() => {
     let userMode = localStorage.getItem('statamic.color_mode');
@@ -21,7 +22,7 @@ onMounted(() => {
 
 <template>
     <div class="relative mx-auto max-w-[400px] items-center justify-center">
-        <div class="flex items-center justify-center py-6">
+        <div v-if="showLogo" class="flex items-center justify-center py-6">
             <div class="logo max-w-3/4 md:pt-18">
                 <template v-if="customLogo">
                     <img
@@ -39,7 +40,7 @@ onMounted(() => {
                     v-else-if="logos.text"
                     class="mx-auto mb-8 max-w-xs text-center text-lg font-medium opacity-50"
                     v-text="logos.text" />
-                <StatamicLogo v-else class="h-6" />
+                <StatamicLogo v-else-if="isCpRoute" class="h-6" />
             </div>
         </div>
         <slot />
diff --git a/resources/js/pages/navigation/Show.vue b/resources/js/pages/navigation/Show.vue
index 65e7410f855..6684cc7ee6b 100644
--- a/resources/js/pages/navigation/Show.vue
+++ b/resources/js/pages/navigation/Show.vue
@@ -359,9 +359,9 @@ export default {
 
 <template>
     <div class="max-w-5xl 3xl:max-w-6xl mx-auto" data-max-width-wrapper>
-        <Head :title="title" />
+        <Head :title="[__(title), __('Navigation')]" />
 
-        <Header v-if="mounted" :title="title" icon="navigation">
+        <Header v-if="mounted" :title="__(title)" icon="navigation">
             <ItemActions
                 v-if="hasItemActions"
                 :url="itemActionUrl"
diff --git a/resources/js/pages/preferences/nav/Edit.vue b/resources/js/pages/preferences/nav/Edit.vue
index f9faa3fcd81..9a4134a15f2 100644
--- a/resources/js/pages/preferences/nav/Edit.vue
+++ b/resources/js/pages/preferences/nav/Edit.vue
@@ -86,6 +86,8 @@
                     :indent="24"
                     :dir="direction"
                     :stat-handler="statHandler"
+                    :i18n="treeDraggableI18n"
+                    :aria-label="__('Tree Structure')"
                     keep-placeholder
                     trigger-class="page-move"
                     :each-droppable="eachDroppable"
@@ -292,6 +294,12 @@ export default {
     },
 
     computed: {
+        treeDraggableI18n() {
+            return {
+                instructions: __('messages.tree_aria_instructions'),
+            };
+        },
+
         isDirty() {
             return this.changed;
         },
diff --git a/resources/js/pages/roles/Empty.vue b/resources/js/pages/roles/Empty.vue
index a14a883f664..8ddbbb12a72 100644
--- a/resources/js/pages/roles/Empty.vue
+++ b/resources/js/pages/roles/Empty.vue
@@ -26,5 +26,5 @@ useArchitecturalBackground();
         />
     </EmptyStateMenu>
 
-    <DocsCallout :topic="__('Roles & Permissions')" url="users#permissions" />
+    <DocsCallout :topic="__('Roles & Permissions')" url="permissions" />
 </template>
diff --git a/resources/js/pages/roles/Index.vue b/resources/js/pages/roles/Index.vue
index b6217f940ab..8aa3b2f81e0 100644
--- a/resources/js/pages/roles/Index.vue
+++ b/resources/js/pages/roles/Index.vue
@@ -64,6 +64,6 @@ const reloadPage = () => router.reload();
             </template>
         </Listing>
 
-        <DocsCallout :topic="__('Roles & Permissions')" url="users#permissions" />
+        <DocsCallout :topic="__('Roles & Permissions')" url="permissions" />
     </div>
 </template>
diff --git a/resources/js/pages/taxonomies/Empty.vue b/resources/js/pages/taxonomies/Empty.vue
index 25aff4b8c75..3b25dd0060a 100644
--- a/resources/js/pages/taxonomies/Empty.vue
+++ b/resources/js/pages/taxonomies/Empty.vue
@@ -17,7 +17,7 @@ defineProps([
 </script>
 
 <template>
-    <Head :title="taxonomyTitle" />
+    <Head :title="[__(taxonomyTitle), __('Taxonomies')]" />
 
     <header class="py-8 pt-16 text-center">
         <h1 class="text-[25px] font-medium antialiased flex justify-center items-center gap-2">
diff --git a/resources/js/pages/taxonomies/Show.vue b/resources/js/pages/taxonomies/Show.vue
index fe06b007886..1754846ab16 100644
--- a/resources/js/pages/taxonomies/Show.vue
+++ b/resources/js/pages/taxonomies/Show.vue
@@ -91,7 +91,7 @@ export default {
 
 <template>
     <div>
-        <Head :title="taxonomyTitle" />
+        <Head :title="[__(taxonomyTitle), __('Taxonomies')]" />
 
         <Header :title="__(taxonomyTitle)">
             <Dropdown>
@@ -139,7 +139,7 @@ export default {
                 <span class="text-2xs font-mono">{{ term.slug }}</span>
             </template>
             <template #prepended-row-actions="{ row: term }">
-                <DropdownItem :text="__('Visit URL')" :href="term.permalink" target="_blank" icon="eye" />
+                <DropdownItem v-if="term.has_template" :text="__('Visit URL')" :href="term.permalink" target="_blank" icon="eye" />
                 <DropdownItem :text="__('Edit')" :href="term.edit_url" icon="edit" />
             </template>
         </Listing>
diff --git a/resources/js/pages/user-groups/Edit.vue b/resources/js/pages/user-groups/Edit.vue
index 8d0ed695f8c..e2474dfefb1 100644
--- a/resources/js/pages/user-groups/Edit.vue
+++ b/resources/js/pages/user-groups/Edit.vue
@@ -36,7 +36,7 @@ const props = defineProps({
 
 <template>
     <div>
-        <Head :title="`${__('Edit')} ${title}`" />
+        <Head :title="`${__('Edit')} ${__(title)}`" />
 
         <PublishForm
             publish-container="base"
diff --git a/resources/js/pages/user-groups/Show.vue b/resources/js/pages/user-groups/Show.vue
index 37f45c2f538..c84eaba4297 100644
--- a/resources/js/pages/user-groups/Show.vue
+++ b/resources/js/pages/user-groups/Show.vue
@@ -29,9 +29,9 @@ function handleDelete() {
 
 <template>
     <div class="max-w-5xl 3xl:max-w-6xl mx-auto" data-max-width-wrapper>
-        <Head :title="group.title" />
+        <Head :title="__(group.title)" />
 
-        <Header :title="group.title" icon="groups">
+        <Header :title="__(group.title)" icon="groups">
             <template #actions>
                 <Dropdown v-if="group.canEdit || group.canDelete">
                     <template #trigger>
diff --git a/resources/js/pages/users/Edit.vue b/resources/js/pages/users/Edit.vue
index 4a6f3304d04..8b550439dfb 100644
--- a/resources/js/pages/users/Edit.vue
+++ b/resources/js/pages/users/Edit.vue
@@ -11,6 +11,7 @@ defineProps([
     'meta',
     'canEditPassword',
     'canEditBlueprint',
+    'oauthEnabled',
     'requiresCurrentPassword',
     'itemActions',
     'itemActionUrl',
@@ -33,6 +34,7 @@ defineProps([
             :initial-meta="meta"
             :can-edit-password="canEditPassword"
             :can-edit-blueprint="canEditBlueprint"
+            :oauth-enabled="oauthEnabled"
             :requires-current-password="requiresCurrentPassword"
             :initial-item-actions="itemActions"
             :item-action-url="itemActionUrl"
diff --git a/resources/js/pages/users/OAuth.vue b/resources/js/pages/users/OAuth.vue
new file mode 100644
index 00000000000..620231dd469
--- /dev/null
+++ b/resources/js/pages/users/OAuth.vue
@@ -0,0 +1,73 @@
+<script setup>
+import { router } from '@inertiajs/vue3';
+import axios from 'axios';
+import Head from '@/pages/layout/Head.vue';
+import { Header, Button, Listing } from '@ui';
+import { toast } from '@api';
+import { requireElevatedSession } from '@/components/elevated-sessions';
+
+defineProps(['providers']);
+
+const columns = [
+    { label: __('Provider'), field: 'label' },
+    { label: '', field: 'actions' },
+];
+
+function connect(provider) {
+    requireElevatedSession()
+        .then(() => (window.location = provider.connectUrl))
+        .catch(() => toast.error(__('statamic::messages.elevated_session_required')));
+}
+
+function disconnect(provider) {
+    requireElevatedSession()
+        .then(() => performDisconnect(provider))
+        .catch(() => toast.error(__('statamic::messages.elevated_session_required')));
+}
+
+function performDisconnect(provider) {
+    axios.delete(provider.disconnectUrl).then(() => {
+        toast.success(__('statamic::messages.oauth_disconnected', { provider: provider.label }));
+        router.reload();
+    });
+}
+</script>
+
+<template>
+    <Head :title="__('Sign-in Providers')" />
+
+    <div class="max-w-5xl 3xl:max-w-6xl mx-auto" data-max-width-wrapper>
+        <Header :title="__('Sign-in Providers')" icon="sign-in" />
+
+        <Listing
+            :items="providers"
+            :columns
+            :allow-search="false"
+            :allow-customizing-columns="false"
+        >
+            <template #cell-label="{ row }">
+                <div class="flex items-center gap-2">
+                    <span v-if="row.icon" class="flex size-4 items-center [&_svg]:size-4" v-html="row.icon" />
+                    <span>{{ row.label }}</span>
+                </div>
+            </template>
+
+            <template #cell-actions="{ row }">
+                <div class="text-right">
+                    <Button
+                        v-if="row.connected"
+                        size="xs"
+                        :text="__('Disconnect')"
+                        @click="disconnect(row)"
+                    />
+                    <Button
+                        v-else
+                        size="xs"
+                        :text="__('Connect')"
+                        @click="connect(row)"
+                    />
+                </div>
+            </template>
+        </Listing>
+    </div>
+</template>
diff --git a/resources/js/pages/utilities/Show.vue b/resources/js/pages/utilities/Show.vue
index 9172e6263e3..7a1288b980a 100644
--- a/resources/js/pages/utilities/Show.vue
+++ b/resources/js/pages/utilities/Show.vue
@@ -6,7 +6,7 @@ defineProps(['title', 'html']);
 </script>
 
 <template>
-    <Head :title="[title, __('Utilities')]" />
+    <Head :title="[__(title), __('Utilities')]" />
 
     <DynamicHtmlRenderer :html="html" />
 </template>
\ No newline at end of file
diff --git a/resources/js/stories/Button.stories.ts b/resources/js/stories/Button.stories.ts
index 2c4e5e72da8..a5a4d33d0a4 100644
--- a/resources/js/stories/Button.stories.ts
+++ b/resources/js/stories/Button.stories.ts
@@ -300,4 +300,116 @@ export const ButtonGroups: Story = {
             </ButtonGroup>
         `,
     }),
+};
+
+export const ButtonGroupOverflowStack: Story = {
+    parameters: {
+        docs: {
+            source: {
+                code: `
+                    <ButtonGroup overflow="stack">
+                        <Button text="Option A" />
+                        <Button text="Option B" />
+                        <Button text="Option C" />
+                        <Button text="Option D" />
+                        <Button text="Option E" />
+                    </ButtonGroup>
+                `,
+            },
+        },
+    },
+    render: () => ({
+        components: { ButtonGroup, Button },
+        template: `
+            <div class="w-72">
+                <ButtonGroup overflow="stack">
+                    <Button text="Option A" />
+                    <Button text="Option B" />
+                    <Button text="Option C" />
+                    <Button text="Option D" />
+                    <Button text="Option E" />
+                </ButtonGroup>
+            </div>
+        `,
+    }),
+};
+
+export const ButtonGroupOverflowGap: Story = {
+    parameters: {
+        docs: {
+            source: {
+                code: `
+                    <ButtonGroup overflow="gap">
+                        <Button text="Option A" />
+                        <Button text="Option B" />
+                        <Button text="Option C" />
+                        <Button text="Option D" />
+                        <Button text="Option E" />
+                    </ButtonGroup>
+                `,
+            },
+        },
+    },
+    render: () => ({
+        components: { ButtonGroup, Button },
+        template: `
+            <div class="w-72">
+                <ButtonGroup overflow="gap">
+                    <Button text="Option A" />
+                    <Button text="Option B" />
+                    <Button text="Option C" />
+                    <Button text="Option D" />
+                    <Button text="Option E" />
+                </ButtonGroup>
+            </div>
+        `,
+    }),
+};
+
+export const ButtonGroupOverflowVariations: Story = {
+    render: () => ({
+        components: { ButtonGroup, Button },
+        template: `
+            <div class="space-y-8">
+                <div>
+                    <p class="text-xs font-mono text-gray-500 mb-2">overflow="stack" — fits</p>
+                    <ButtonGroup overflow="stack">
+                        <Button text="Option A" />
+                        <Button text="Option B" />
+                    </ButtonGroup>
+                </div>
+                <div>
+                    <p class="text-xs font-mono text-gray-500 mb-2">overflow="stack" — overflows</p>
+                    <div class="w-48">
+                        <ButtonGroup overflow="stack">
+                            <Button text="Option A" />
+                            <Button text="Option B" />
+                            <Button text="Option C" />
+                        </ButtonGroup>
+                    </div>
+                </div>
+                <div>
+                    <p class="text-xs font-mono text-gray-500 mb-2">overflow="gap" — fits</p>
+                    <ButtonGroup overflow="gap">
+                        <Button text="Option A" />
+                        <Button text="Option B" />
+                    </ButtonGroup>
+                </div>
+                <div>
+                    <p class="text-xs font-mono text-gray-500 mb-2">overflow="gap" — overflows</p>
+                    <div class="w-72">
+                        <ButtonGroup overflow="gap">
+                            <Button text="Option A" />
+                            <Button text="Option B" />
+                            <Button text="Option C" />
+                            <Button text="Option D" />
+                            <Button text="Option E" />
+                            <Button text="Option F" />
+                            <Button text="Option G" />
+                        </ButtonGroup>
+                    </div>
+                </div>
+            </div>
+        `,
+    }),
 };
\ No newline at end of file
diff --git a/resources/js/stories/Combobox.stories.ts b/resources/js/stories/Combobox.stories.ts
new file mode 100644
index 00000000000..ea53ab5a6cd
--- /dev/null
+++ b/resources/js/stories/Combobox.stories.ts
@@ -0,0 +1,1012 @@
+import type {Meta, StoryObj} from '@storybook/vue3';
+import {expect, fn, userEvent, waitFor, within} from 'storybook/test';
+import {Combobox} from '@ui';
+import {ref} from 'vue';
+import {icons} from "@/stories/icons";
+
+const meta = {
+    title: 'Forms/Combobox',
+    component: Combobox,
+    argTypes: {
+        icon: {
+            control: 'select',
+            options: icons,
+        },
+        size: {
+            control: 'select',
+            options: ['xs', 'sm', 'base', 'lg', 'xl'],
+        },
+        variant: {
+            control: 'select',
+            options: ['default', 'filled', 'ghost', 'subtle'],
+        },
+        align: {
+            control: 'select',
+            options: ['start', 'center', 'end'],
+        },
+        'update:modelValue': {
+            description: 'Event handler called when the selected option changes.',
+            table: {
+                category: 'events',
+                type: { summary: '(value: string | string[]) => void' },
+            },
+        },
+        search: {
+            description: 'Event handler called when the search query changes.',
+            table: {
+                category: 'events',
+                type: { summary: '(query: string) => void' },
+            },
+        },
+        selected: {
+            description: 'Event handler called when an option is selected.',
+            table: {
+                category: 'events',
+                type: { summary: '(value: string) => void' },
+            },
+        },
+        added: {
+            description: 'Event handler called when a taggable option is added.',
+            table: {
+                category: 'events',
+                type: { summary: '(value: string) => void' },
+            },
+        },
+    },
+} satisfies Meta<typeof Combobox>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            const options = [
+                { label: 'The Midnight', value: 'the_midnight' },
+                { label: 'The 1975', value: 'the_1975' },
+                { label: 'Sunglasses Kid', value: 'sunglasses_kid' },
+                { label: 'FM-84', value: 'fm_84' },
+                { label: 'Timecop1983', value: 'timecop1983' },
+            ];
+            return { value, options };
+        },
+        template: `
+            <Combobox
+                v-model="value"
+                placeholder="Select a band..."
+                :options="options"
+            />
+        `,
+    }),
+};
+
+const defaultOptions = [
+    { label: 'The Midnight', value: 'the_midnight' },
+    { label: 'The 1975', value: 'the_1975' },
+    { label: 'Sunglasses Kid', value: 'sunglasses_kid' },
+    { label: 'FM-84', value: 'fm_84' },
+    { label: 'Timecop1983', value: 'timecop1983' },
+];
+
+const defaultCode = `
+<Combobox
+    placeholder="Select a band..."
+    :options="[
+        { label: 'The Midnight', value: 'the_midnight' },
+        { label: 'The 1975', value: 'the_1975' },
+        { label: 'Sunglasses Kid', value: 'sunglasses_kid' },
+        { label: 'FM-84', value: 'fm_84' },
+        { label: 'Timecop1983', value: 'timecop1983' },
+    ]"
+/>
+`;
+
+export const _DocsIntro: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: defaultCode },
+        },
+    },
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            const options = defaultOptions;
+            return { value, options };
+        },
+        template: `
+            <Combobox
+                v-model="value"
+                placeholder="Select a band..."
+                :options="options"
+            />
+        `,
+    }),
+};
+
+const sizesCode = `
+<Combobox size="xs" placeholder="Extra Small" :options="options" />
+<Combobox size="sm" placeholder="Small" :options="options" />
+<Combobox size="base" placeholder="Base" :options="options" />
+<Combobox size="lg" placeholder="Large" :options="options" />
+<Combobox size="xl" placeholder="Extra Large" :options="options" />
+`;
+
+export const _Sizes: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: sizesCode },
+        },
+    },
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const options = defaultOptions;
+            return { options };
+        },
+        template: `<div class="flex flex-col gap-4">${sizesCode}</div>`,
+    }),
+};
+
+const variantsCode = `
+<Combobox variant="default" placeholder="Default" :options="options" />
+<Combobox variant="filled" placeholder="Filled" :options="options" />
+<Combobox variant="ghost" placeholder="Ghost" :options="options" />
+<Combobox variant="subtle" placeholder="Subtle" :options="options" />
+`;
+
+export const _Variants: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: variantsCode },
+        },
+    },
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const options = defaultOptions;
+            return { options };
+        },
+        template: `<div class="flex flex-col gap-4">${variantsCode}</div>`,
+    }),
+};
+
+const clearableCode = `
+<Combobox clearable placeholder="Select a band..." :options="options" />
+`;
+
+export const _Clearable: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: clearableCode },
+        },
+    },
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref('the_midnight');
+            const options = defaultOptions;
+            return { value, options };
+        },
+        template: `
+            <Combobox
+                v-model="value"
+                clearable
+                placeholder="Select a band..."
+                :options="options"
+            />
+        `,
+    }),
+};
+
+const multipleCode = `
+<Combobox multiple placeholder="Select bands..." :options="options" />
+`;
+
+export const _Multiple: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: multipleCode },
+        },
+    },
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(['the_midnight', 'fm_84']);
+            const options = defaultOptions;
+            return { value, options };
+        },
+        template: `
+            <Combobox
+                v-model="value"
+                :multiple="true"
+                placeholder="Select bands..."
+                :options="options"
+            />
+        `,
+    }),
+};
+
+const maxSelectionsCode = `
+<Combobox
+    multiple
+    :max-selections="3"
+    placeholder="Select up to 3 bands..."
+    :options="options"
+/>
+`;
+
+export const _MaxSelections: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: maxSelectionsCode },
+        },
+    },
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(['the_midnight', 'fm_84']);
+            const options = defaultOptions;
+            return { value, options };
+        },
+        template: `
+            <Combobox
+                v-model="value"
+                :multiple="true"
+                :max-selections="3"
+                placeholder="Select up to 3 bands..."
+                :options="options"
+            />
+        `,
+    }),
+};
+
+const taggableCode = `
+<Combobox
+    multiple
+    taggable
+    placeholder="Add tags..."
+    :options="options"
+/>
+`;
+
+export const _Taggable: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: taggableCode },
+        },
+    },
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(['the_midnight']);
+            const options = defaultOptions;
+            return { value, options };
+        },
+        template: `
+            <Combobox
+                v-model="value"
+                :multiple="true"
+                :taggable="true"
+                placeholder="Add tags..."
+                :options="options"
+            />
+        `,
+    }),
+};
+
+const searchDisabledCode = `
+<Combobox :searchable="false" placeholder="Select a band..." :options="options" />
+`;
+
+export const _SearchDisabled: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: searchDisabledCode },
+        },
+    },
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            const options = defaultOptions;
+            return { value, options };
+        },
+        template: `
+            <Combobox
+                v-model="value"
+                :searchable="false"
+                placeholder="Select a band..."
+                :options="options"
+            />
+        `,
+    }),
+};
+
+const ignoreFilterCode = `
+<Combobox
+    :ignore-filter="true"
+    placeholder="Server-side filtering..."
+    :options="filteredOptions"
+    @search="onSearch"
+/>
+`;
+
+export const _IgnoreFilter: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: ignoreFilterCode },
+            description: {
+                story: 'When `ignoreFilter` is true, the Combobox will not filter options locally. Use this when you want to handle filtering yourself via the `search` event, such as with server-side filtering.',
+            },
+        },
+    },
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            const allOptions = defaultOptions;
+            const filteredOptions = ref([...allOptions]);
+
+            const onSearch = (query: string) => {
+                if (!query) {
+                    filteredOptions.value = [...allOptions];
+                    return;
+                }
+                filteredOptions.value = allOptions.filter((opt) =>
+                    opt.label.toLowerCase().includes(query.toLowerCase())
+                );
+            };
+
+            return { value, filteredOptions, onSearch };
+        },
+        template: `
+            <Combobox
+                v-model="value"
+                :ignore-filter="true"
+                placeholder="Server-side filtering..."
+                :options="filteredOptions"
+                @search="onSearch"
+            />
+        `,
+    }),
+};
+
+const optionSlotsCode = `
+<Combobox 
+    placeholder="Select author..." 
+    :options="[
+        { label: 'Tyler Lyle', image: '/assets/tyler.jpg', value: 'tyler' },
+        { label: 'Tim McEwan', image: '/assets/tim.jpg', value: 'tim' },
+        { label: 'Nikki Flores', image: '/assets/nikki.jpg', value: 'nikki' },
+    ]"
+>
+    <template #selected-option="{ option }">
+        <img :src="option.image" class="size-5 rounded-full" />
+        <span v-text="option.label" />
+    </template>
+    <template #option="{ label, image }">
+        <img :src="image" class="size-5 rounded-full" />
+        <span v-text="label" />
+    </template>
+</Combobox>
+`;
+
+export const _OptionSlots: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: optionSlotsCode },
+        },
+    },
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref('tyler');
+            const options = [
+                { label: 'Tyler Lyle', image: 'https://i.pravatar.cc/100?u=tyler', value: 'tyler' },
+                { label: 'Tim McEwan', image: 'https://i.pravatar.cc/100?u=tim', value: 'tim' },
+                { label: 'Nikki Flores', image: 'https://i.pravatar.cc/100?u=nikki', value: 'nikki' },
+            ];
+            return { value, options };
+        },
+        template: `
+            <Combobox
+                v-model="value"
+                placeholder="Select author..."
+                :options="options"
+            >
+                <template #selected-option="{ option }">
+                    <img :src="option.image" class="size-5 rounded-full" />
+                    <span v-text="option.label" />
+                </template>
+                <template #option="{ label, image }">
+                    <img :src="image" class="size-5 rounded-full" />
+                    <span v-text="label" />
+                </template>
+            </Combobox>
+        `,
+    }),
+};
+
+const adaptiveWidthCode = `
+<Combobox
+    adaptive-width
+    placeholder="Select..."
+    :options="[
+        { label: 'Short', value: 'short' },
+        { label: 'A much longer option label', value: 'long' },
+        { label: 'An extremely long option that demonstrates adaptive width', value: 'very_long' },
+    ]"
+/>
+`;
+
+export const _AdaptiveWidth: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: adaptiveWidthCode },
+        },
+    },
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            const options = [
+                { label: 'Short', value: 'short' },
+                { label: 'A much longer option label', value: 'long' },
+                { label: 'An extremely long option that demonstrates adaptive width', value: 'very_long' },
+            ];
+            return { value, options };
+        },
+        template: `
+            <div class="w-48">
+                <Combobox
+                    v-model="value"
+                    adaptive-width
+                    placeholder="Select..."
+                    :options="options"
+                />
+            </div>
+        `,
+    }),
+};
+
+export const TestTriggerWidth: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            return { value, options: defaultOptions };
+        },
+        template: `<Combobox v-model="value" :options="options" placeholder="Select..." />`,
+    }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        await userEvent.click(trigger);
+
+        const content = document.querySelector('[data-ui-combobox-content]');
+        await expect(content).toBeTruthy();
+        expect(content?.classList.contains('w-max')).toBe(false);
+    },
+};
+
+export const TestAdaptiveWidth: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            const options = [
+                { label: 'A very long option label that should make the dropdown wider', value: 'long' },
+            ];
+            return { value, options };
+        },
+        template: `<div class="w-48"><Combobox v-model="value" :options="options" adaptive-width placeholder="Select..." /></div>`,
+    }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        await userEvent.click(trigger);
+
+        const content = document.querySelector('[data-ui-combobox-content]');
+        await expect(content).toBeTruthy();
+        expect(content?.classList.contains('w-max')).toBe(true);
+    },
+};
+
+export const TestCanSelectOption: Story = {
+    tags: ['!dev', 'test'],
+    args: {
+        'onUpdate:modelValue': fn(),
+    },
+    render: (args) => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            return { value, options: defaultOptions, onUpdate: args['onUpdate:modelValue'] };
+        },
+        template: `<Combobox v-model="value" :options="options" placeholder="Select..." @update:modelValue="onUpdate" />`,
+    }),
+    play: async ({ canvasElement, args }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        await userEvent.click(trigger);
+
+        const option = await within(document.body).findByText('The Midnight');
+        await userEvent.click(option);
+
+        expect(args['onUpdate:modelValue']).toHaveBeenCalledWith('the_midnight');
+
+        await new Promise((r) => setTimeout(r, 100));
+        const selectedOption = canvasElement.querySelector('[data-ui-combobox-selected-option]');
+        expect(selectedOption?.textContent).toContain('The Midnight');
+    },
+};
+
+export const TestCanSelectMultipleOptions: Story = {
+    tags: ['!dev', 'test'],
+    args: {
+        'onUpdate:modelValue': fn(),
+    },
+    render: (args) => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(['the_midnight']);
+            return { value, options: defaultOptions, onUpdate: args['onUpdate:modelValue'] };
+        },
+        template: `<Combobox v-model="value" :options="options" multiple placeholder="Select..." @update:modelValue="onUpdate" />`,
+    }),
+    play: async ({ canvasElement, args }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        await userEvent.click(trigger);
+
+        const option = await within(document.body).findByText('FM-84');
+        await userEvent.click(option);
+
+        await expect(args['onUpdate:modelValue']).toHaveBeenCalled();
+        const lastCall = args['onUpdate:modelValue'].mock.calls[args['onUpdate:modelValue'].mock.calls.length - 1];
+        expect(lastCall[0]).toContain('the_midnight');
+        expect(lastCall[0]).toContain('fm_84');
+
+        const selectedOptions = canvasElement.querySelector('[data-ui-combobox-selected-options]');
+        expect(selectedOptions).toBeTruthy();
+        expect(selectedOptions?.textContent).toContain('The Midnight');
+        expect(selectedOptions?.textContent).toContain('FM-84');
+    },
+};
+
+export const TestDropdownClosesOnSelection: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            return { value, options: defaultOptions };
+        },
+        template: `<Combobox v-model="value" :options="options" placeholder="Select..." />`,
+    }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        await userEvent.click(trigger);
+        await expect(document.querySelector('[data-ui-combobox-content]')).toBeTruthy();
+
+        const option = await within(document.body).findByText('The Midnight');
+        await userEvent.click(option);
+
+        await new Promise((r) => setTimeout(r, 100));
+        await expect(document.querySelector('[data-ui-combobox-content]')).toBeFalsy();
+    },
+};
+
+export const TestCanClearSelection: Story = {
+    tags: ['!dev', 'test'],
+    args: {
+        'onUpdate:modelValue': fn(),
+    },
+    render: (args) => ({
+        components: { Combobox },
+        setup() {
+            const value = ref('the_midnight');
+            return { value, options: defaultOptions, onUpdate: args['onUpdate:modelValue'] };
+        },
+        template: `<Combobox v-model="value" :options="options" clearable placeholder="Select..." @update:modelValue="onUpdate" />`,
+    }),
+    play: async ({ canvasElement, args }) => {
+        const canvas = within(canvasElement);
+        const clearButton = canvas.getByRole('button', { name: /clear/i });
+
+        await userEvent.click(clearButton);
+
+        expect(args['onUpdate:modelValue']).toHaveBeenCalledWith(null);
+    },
+};
+
+export const TestMaxSelectionsLimit: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(['the_midnight', 'the_1975']);
+            return { value, options: defaultOptions };
+        },
+        template: `<Combobox v-model="value" :options="options" multiple :max-selections="2" :close-on-select="false" placeholder="Select..." />`,
+    }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        await userEvent.click(trigger);
+
+        const disabledOption = document.querySelector('[data-ui-combobox-item="sunglasses_kid"]');
+        expect(disabledOption?.hasAttribute('data-disabled')).toBe(true);
+
+        // Deselect one option by clicking it
+        const selectedOption = document.querySelector('[data-ui-combobox-item="the_midnight"]');
+        await userEvent.click(selectedOption!);
+
+        await waitFor(() => {
+            const nowEnabledOption = document.querySelector('[data-ui-combobox-item="sunglasses_kid"]');
+            expect(nowEnabledOption).toBeTruthy();
+            expect(nowEnabledOption!.hasAttribute('data-disabled')).toBe(false);
+        });
+    },
+};
+
+export const TestCanDeselectOptions: Story = {
+    tags: ['!dev', 'test'],
+    args: {
+        'onUpdate:modelValue': fn(),
+    },
+    render: (args) => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(['the_midnight', 'fm_84']);
+            return { value, options: defaultOptions, onUpdate: args['onUpdate:modelValue'] };
+        },
+        template: `<Combobox v-model="value" :options="options" multiple placeholder="Select..." @update:modelValue="onUpdate" />`,
+    }),
+    play: async ({ canvasElement, args }) => {
+        const canvas = within(canvasElement);
+        const removeButtons = canvas.getAllByRole('button', { name: /remove/i });
+
+        await userEvent.click(removeButtons[0]);
+
+        await expect(args['onUpdate:modelValue']).toHaveBeenCalled();
+
+        const lastCall = args['onUpdate:modelValue'].mock.calls[args['onUpdate:modelValue'].mock.calls.length - 1];
+        expect(lastCall[0]).toContain('fm_84');
+        expect(lastCall[0]).not.toContain('the_midnight');
+    },
+};
+
+export const TestCanSearchOptions: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            return { value, options: defaultOptions };
+        },
+        template: `<Combobox v-model="value" :options="options" placeholder="Select..." />`,
+    }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        await userEvent.click(trigger);
+
+        const input = document.querySelector('input[type="search"]') as HTMLInputElement;
+        await userEvent.type(input, 'midnight');
+
+        await new Promise((r) => setTimeout(r, 100));
+
+        const options = document.querySelectorAll('[data-ui-combobox-item]');
+        expect(options.length).toBe(1);
+        expect(options[0].getAttribute('data-ui-combobox-item')).toBe('the_midnight');
+    },
+};
+
+export const TestSearchDisabledWhenNotSearchable: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref('the_midnight');
+            return { value, options: defaultOptions };
+        },
+        template: `<Combobox v-model="value" :options="options" :searchable="false" placeholder="Select..." />`,
+    }),
+    play: async ({ canvasElement }) => {
+        const input = canvasElement.querySelector('input[type="search"]');
+        expect(input).toBeFalsy();
+    },
+};
+
+export const TestIgnoreFilterDoesNotFilter: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            return { value, options: defaultOptions };
+        },
+        template: `<Combobox v-model="value" :options="options" ignore-filter placeholder="Select..." />`,
+    }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        await userEvent.click(trigger);
+
+        const input = document.querySelector('input[type="search"]') as HTMLInputElement;
+        await userEvent.type(input, 'xyz');
+
+        await new Promise((r) => setTimeout(r, 100));
+
+        const options = document.querySelectorAll('[data-ui-combobox-item]');
+        expect(options.length).toBe(5);
+    },
+};
+
+export const TestTaggableCanAddOptions: Story = {
+    tags: ['!dev', 'test'],
+    args: {
+        'onUpdate:modelValue': fn(),
+        onAdded: fn(),
+    },
+    render: (args) => ({
+        components: { Combobox },
+        setup() {
+            const value = ref<string[]>([]);
+            return { value, options: defaultOptions, onUpdate: args['onUpdate:modelValue'], onAdded: args.onAdded };
+        },
+        template: `<Combobox v-model="value" :options="options" multiple taggable placeholder="Add tags..." @update:modelValue="onUpdate" @added="onAdded" />`,
+    }),
+    play: async ({ canvasElement, args }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        await userEvent.click(trigger);
+
+        const input = document.querySelector('input[type="search"]') as HTMLInputElement;
+        await userEvent.click(input);
+        await userEvent.type(input, 'new-tag');
+        await userEvent.keyboard('{Enter}');
+
+        await expect(args['onUpdate:modelValue']).toHaveBeenCalled();
+        expect(args.onAdded).toHaveBeenCalledWith('new-tag');
+    },
+};
+
+export const TestDropdownOpensOnSpace: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            return { value, options: defaultOptions };
+        },
+        template: `<Combobox v-model="value" :options="options" placeholder="Select..." />`,
+    }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        trigger.focus();
+        await userEvent.keyboard(' ');
+
+        await expect(document.querySelector('[data-ui-combobox-content]')).toBeTruthy();
+    },
+};
+
+export const TestDropdownOpensOnEnter: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            return { value, options: defaultOptions };
+        },
+        template: `<Combobox v-model="value" :options="options" placeholder="Select..." />`,
+    }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        trigger.focus();
+        await userEvent.keyboard('{Enter}');
+
+        await expect(document.querySelector('[data-ui-combobox-content]')).toBeTruthy();
+    },
+};
+
+export const TestDropdownClosesOnEscape: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(null);
+            return { value, options: defaultOptions };
+        },
+        template: `<Combobox v-model="value" :options="options" placeholder="Select..." />`,
+    }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        await userEvent.click(trigger);
+        await expect(document.querySelector('[data-ui-combobox-content]')).toBeTruthy();
+
+        await userEvent.keyboard('{Escape}');
+
+        await new Promise((r) => setTimeout(r, 100));
+        await expect(document.querySelector('[data-ui-combobox-content]')).toBeFalsy();
+    },
+};
+
+const manyOptions = [
+    { label: 'Option 1', value: 'option_1' },
+    { label: 'Option 2', value: 'option_2' },
+    { label: 'Option 3', value: 'option_3' },
+    { label: 'Option 4', value: 'option_4' },
+    { label: 'Option 5', value: 'option_5' },
+    { label: 'Option 6', value: 'option_6' },
+    { label: 'Option 7', value: 'option_7' },
+    { label: 'Option 8', value: 'option_8' },
+    { label: 'Option 9', value: 'option_9' },
+    { label: 'Option 10', value: 'option_10' },
+    { label: 'Option 11', value: 'option_11' },
+    { label: 'Option 12', value: 'option_12' },
+    { label: 'Option 13', value: 'option_13' },
+    { label: 'Option 14', value: 'option_14' },
+    { label: 'Option 15', value: 'option_15' },
+];
+
+export const TestScrollsToSelectedOption: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref('option_10');
+            return { value, options: manyOptions };
+        },
+        template: `<Combobox v-model="value" :options="options" placeholder="Select..." />`,
+    }),
+    play: async ({ canvasElement }) => {
+        const trigger = canvasElement.querySelector('[data-ui-combobox-trigger]');
+        await expect(trigger).toBeTruthy();
+
+        await userEvent.click(trigger!);
+        await new Promise((r) => setTimeout(r, 150));
+
+        // The selected option (Option 10) should be highlighted
+        const highlightedOption = document.querySelector('[data-ui-combobox-item][data-highlighted]');
+        await expect(highlightedOption).toBeTruthy();
+        expect(highlightedOption?.getAttribute('data-ui-combobox-item')).toBe('option_10');
+
+        // Arrow down should go to Option 11, not Option 1
+        await userEvent.keyboard('{ArrowDown}');
+        await new Promise((r) => setTimeout(r, 50));
+
+        const newHighlightedOption = document.querySelector('[data-ui-combobox-item][data-highlighted]');
+        expect(newHighlightedOption?.getAttribute('data-ui-combobox-item')).toBe('option_11');
+
+        // Arrow up twice should go to Option 10 then Option 9
+        await userEvent.keyboard('{ArrowUp}');
+        await userEvent.keyboard('{ArrowUp}');
+        await new Promise((r) => setTimeout(r, 50));
+
+        const upHighlightedOption = document.querySelector('[data-ui-combobox-item][data-highlighted]');
+        expect(upHighlightedOption?.getAttribute('data-ui-combobox-item')).toBe('option_9');
+    },
+};
+
+export const TestDisabledStatePreventsInteraction: Story = {
+    tags: ['!dev', 'test'],
+    args: {
+        'onUpdate:modelValue': fn(),
+    },
+    render: (args) => ({
+        components: { Combobox },
+        setup() {
+            const value = ref('the_midnight');
+            return { value, options: defaultOptions, onUpdate: args['onUpdate:modelValue'] };
+        },
+        template: `<Combobox v-model="value" :options="options" disabled clearable placeholder="Select..." @update:modelValue="onUpdate" />`,
+    }),
+    play: async ({ canvasElement, args }) => {
+        const trigger = canvasElement.querySelector('[data-ui-combobox-trigger]');
+        await expect(trigger).toBeTruthy();
+
+        // Click should not open dropdown
+        await userEvent.click(trigger!);
+        await new Promise((r) => setTimeout(r, 100));
+        await expect(document.querySelector('[data-ui-combobox-content]')).toBeFalsy();
+
+        // Clear button should be rendered as disabled and clicks shouldn't trigger updates
+        const clearButton = canvasElement.querySelector('[data-ui-combobox-clear-button]');
+        await expect(clearButton).toBeTruthy();
+        expect((clearButton as HTMLButtonElement).disabled).toBe(true);
+        await userEvent.click(clearButton!);
+        await new Promise((r) => setTimeout(r, 100));
+
+        // Model value should not have changed
+        await expect(args['onUpdate:modelValue']).not.toHaveBeenCalled();
+    },
+};
+
+export const TestDisabledStateMultiplePreventsInteraction: Story = {
+    tags: ['!dev', 'test'],
+    args: {
+        'onUpdate:modelValue': fn(),
+    },
+    render: (args) => ({
+        components: { Combobox },
+        setup() {
+            const value = ref(['the_midnight', 'fm_84']);
+            return { value, options: defaultOptions, onUpdate: args['onUpdate:modelValue'] };
+        },
+        template: `<Combobox v-model="value" :options="options" disabled multiple placeholder="Select..." @update:modelValue="onUpdate" />`,
+    }),
+    play: async ({ canvasElement, args }) => {
+        const trigger = canvasElement.querySelector('[data-ui-combobox-trigger]');
+        await expect(trigger).toBeTruthy();
+
+        // Click should not open dropdown
+        await userEvent.click(trigger!);
+        await new Promise((r) => setTimeout(r, 100));
+        await expect(document.querySelector('[data-ui-combobox-content]')).toBeFalsy();
+
+        // Remove buttons should not exist on badges when disabled
+        const removeButtons = canvasElement.querySelectorAll('[data-ui-combobox-selected-options] button[aria-label*="Remove"]');
+        expect(removeButtons.length).toBe(0);
+
+        // Model value should not have changed
+        await expect(args['onUpdate:modelValue']).not.toHaveBeenCalled();
+    },
+};
+
+export const TestShouldOpenDropdownDoesNotBlockClose: Story = {
+    tags: ['!dev', 'test'],
+    render: () => ({
+        components: { Combobox },
+        setup() {
+            const value = ref<string[]>([]);
+            return { value, options: defaultOptions };
+        },
+        template: `<Combobox v-model="value" :options="options" multiple taggable :should-open-dropdown="(open) => open && options.length > 0" placeholder="Add tags..." />`,
+    }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const trigger = canvas.getByRole('combobox');
+
+        await userEvent.click(trigger);
+        await expect(document.querySelector('[data-ui-combobox-content]')).toBeTruthy();
+
+        await userEvent.keyboard('{Escape}');
+        await new Promise((r) => setTimeout(r, 100));
+
+        await expect(document.querySelector('[data-ui-combobox-content]')).toBeFalsy();
+    },
+};
diff --git a/resources/js/stories/Icon.stories.ts b/resources/js/stories/Icon.stories.ts
index d1410103556..c4377c1493a 100644
--- a/resources/js/stories/Icon.stories.ts
+++ b/resources/js/stories/Icon.stories.ts
@@ -1,8 +1,36 @@
 import type {Meta, StoryObj} from '@storybook/vue3';
-import {CardPanel, Icon, Input} from '@ui';
+import {CardPanel, Icon, Input, registerIconSetFromStrings} from '@ui';
 import {computed, ref} from 'vue';
 import {icons} from "@/stories/icons";
 
+// Inline all SVGs into the Storybook bundle so the AllIcons grid doesn't fire
+// hundreds of requests (which Cloudflare flags as abuse). The CP bundle keeps
+// the lazy glob in registry.js.
+const eagerIcons = import.meta.glob('../../svg/icons/*.svg', {
+    eager: true,
+    query: '?raw',
+    import: 'default',
+}) as Record<string, string>;
+
+registerIconSetFromStrings(
+    'default',
+    Object.fromEntries(
+        Object.entries(eagerIcons).map(([path, svg]) => [
+            path.split('/').pop()!.replace('.svg', ''),
+            svg,
+        ])
+    )
+);
+
+registerIconSetFromStrings('storybook', {
+    spark: `
+        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M12 2l1.9 6.1L20 10l-6.1 1.9L12 18l-1.9-6.1L4 10l6.1-1.9L12 2z" />
+            <path d="M19 15l.8 2.2L22 18l-2.2.8L19 21l-.8-2.2L16 18l2.2-.8L19 15z" />
+        </svg>
+    `,
+});
+
 const meta = {
     title: 'Components/Icon',
     component: Icon,
@@ -23,6 +51,19 @@ export const Default: Story = {
     },
 };
 
+export const AlternateSetInName: Story = {
+    args: {
+        name: 'storybook::spark',
+    },
+    parameters: {
+        docs: {
+            source: {
+                code: '<Icon name="storybook::spark" />',
+            },
+        },
+    },
+};
+
 export const _DocsIntro: Story = {
     tags: ['!dev'],
     args: {
diff --git a/resources/js/stories/PublishContainer.stories.ts b/resources/js/stories/PublishContainer.stories.ts
index d92dbc6f8e5..b7a8db25704 100644
--- a/resources/js/stories/PublishContainer.stories.ts
+++ b/resources/js/stories/PublishContainer.stories.ts
@@ -27,7 +27,7 @@ const meta = {
     parameters: {
         docs: {
             description: {
-                component: 'The PublishContainer component is used to create publish forms in the Control Panel. For full documentation including backend setup, visit the [Publish Forms documentation](https://v6.statamic.dev/control-panel/publish-forms).',
+                component: 'The PublishContainer component is used to create publish forms in the Control Panel. For full documentation including backend setup, visit the [Publish Forms documentation](https://statamic.dev/control-panel/publish-forms).',
             },
         },
     },
@@ -64,7 +64,7 @@ export const _DocsIntro: Story = {
     parameters: {
         docs: {
             source: {
-                code: 'For complete documentation and examples, please visit:\nhttps://v6.statamic.dev/control-panel/publish-forms',
+                code: 'For complete documentation and examples, please visit:\nhttps://statamic.dev/control-panel/publish-forms',
             },
         },
     },
@@ -75,8 +75,8 @@ export const _DocsIntro: Story = {
                 <p class="text-gray-600 dark:text-gray-400 mb-4">
                     The PublishContainer component requires backend configuration and blueprint setup.
                 </p>
-                <a 
-                    href="https://v6.statamic.dev/control-panel/publish-forms" 
+                <a
+                    href="https://statamic.dev/control-panel/publish-forms"
                     target="_blank"
                     class="inline-flex items-center gap-2 px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600"
                 >
diff --git a/resources/js/stories/Select.stories.ts b/resources/js/stories/Select.stories.ts
index 146b569b850..72178e1745a 100644
--- a/resources/js/stories/Select.stories.ts
+++ b/resources/js/stories/Select.stories.ts
@@ -1,6 +1,7 @@
 import type {Meta, StoryObj} from '@storybook/vue3';
 import {Select} from '@ui';
 import {icons} from "@/stories/icons";
+import {ref} from "vue";
 
 const meta = {
     title: 'Forms/Select',
@@ -31,13 +32,23 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;
 
+const defaultOptions = [
+    { label: 'The Midnight', value: 'the_midnight' },
+    { label: 'The 1975', value: 'the_1975' },
+    { label: 'Sunglasses Kid', value: 'sunglasses_kid' },
+    { label: 'FM-84', value: 'fm_84' },
+    { label: 'Timecop1983', value: 'timecop1983' },
+];
+
 const defaultCode = `
 <Select
-    label="Favorite band"
+    placeholder="Select a band..."
     :options="[
         { label: 'The Midnight', value: 'the_midnight' },
         { label: 'The 1975', value: 'the_1975' },
-        { label: 'Sunglasses Kid', value: 'sunglasses_kid' }
+        { label: 'Sunglasses Kid', value: 'sunglasses_kid' },
+        { label: 'FM-84', value: 'fm_84' },
+        { label: 'Timecop1983', value: 'timecop1983' },
     ]"
 />
 `;
@@ -46,147 +57,149 @@ export const _DocsIntro: Story = {
     tags: ['!dev'],
     parameters: {
         docs: {
-            source: { code: defaultCode }
-        }
+            source: { code: defaultCode },
+        },
     },
     render: () => ({
         components: { Select },
-        template: defaultCode,
+        setup() {
+            const value = ref(null);
+            const options = defaultOptions;
+            return { value, options };
+        },
+        template: `
+            <Select
+                v-model="value"
+                placeholder="Select a band..."
+                :options="options"
+            />
+        `,
     }),
 };
 
 const sizesCode = `
-<Select
-    label="Favorite band"
-    size="sm"
-    :options="[
-        { label: 'The Midnight', value: 'the_midnight' },
-        { label: 'The 1975', value: 'the_1975' },
-        { label: 'Sunglasses Kid', value: 'sunglasses_kid' }
-    ]"
-/>
+<Select size="xs" placeholder="Extra Small" :options="options" />
+<Select size="sm" placeholder="Small" :options="options" />
+<Select size="base" placeholder="Base" :options="options" />
+<Select size="lg" placeholder="Large" :options="options" />
+<Select size="xl" placeholder="Extra Large" :options="options" />
 `;
 
 export const _Sizes: Story = {
     tags: ['!dev'],
     parameters: {
         docs: {
-            source: { code: sizesCode }
-        }
+            source: { code: sizesCode },
+        },
     },
     render: () => ({
         components: { Select },
-        template: sizesCode,
+        setup() {
+            const options = defaultOptions;
+            return { options };
+        },
+        template: `<div class="flex flex-col gap-4">${sizesCode}</div>`,
     }),
 };
 
 const variantsCode = `
-<Select
-    label="Favorite band"
-    :options="[
-        { label: 'The Midnight', value: 'the_midnight' },
-        { label: 'The 1975', value: 'the_1975' },
-        { label: 'Sunglasses Kid', value: 'sunglasses_kid' }
-    ]"
-/>
-<Select
-    label="Favorite band"
-    variant="filled"
-    :options="[
-        { label: 'The Midnight', value: 'the_midnight' },
-        { label: 'The 1975', value: 'the_1975' },
-        { label: 'Sunglasses Kid', value: 'sunglasses_kid' }
-    ]"
-/>
-<Select
-    label="Favorite band"
-    variant="ghost"
-    :options="[
-        { label: 'The Midnight', value: 'the_midnight' },
-        { label: 'The 1975', value: 'the_1975' },
-        { label: 'Sunglasses Kid', value: 'sunglasses_kid' }
-    ]"
-/>
-<Select
-    label="Favorite band"
-    variant="subtle"
-    :options="[
-        { label: 'The Midnight', value: 'the_midnight' },
-        { label: 'The 1975', value: 'the_1975' },
-        { label: 'Sunglasses Kid', value: 'sunglasses_kid' }
-    ]"
-/>
+<Select variant="default" placeholder="Default" :options="options" />
+<Select variant="filled" placeholder="Filled" :options="options" />
+<Select variant="ghost" placeholder="Ghost" :options="options" />
+<Select variant="subtle" placeholder="Subtle" :options="options" />
 `;
 
 export const _Variants: Story = {
     tags: ['!dev'],
     parameters: {
         docs: {
-            source: { code: variantsCode }
-        }
+            source: { code: variantsCode },
+        },
     },
     render: () => ({
         components: { Select },
-        template: variantsCode,
+        setup() {
+            const options = defaultOptions;
+            return { options };
+        },
+        template: `<div class="flex flex-col gap-4">${variantsCode}</div>`,
     }),
 };
 
 const clearableCode = `
-<Select
-    label="Favorite band"
-    :clearable="true"
-    :options="[
-        { label: 'The Midnight', value: 'the_midnight' },
-        { label: 'The 1975', value: 'the_1975' },
-        { label: 'Sunglasses Kid', value: 'sunglasses_kid' }
-    ]"
-/>
+<Combobox clearable placeholder="Select a band..." :options="options" />
 `;
 
 export const _Clearable: Story = {
     tags: ['!dev'],
     parameters: {
         docs: {
-            source: { code: clearableCode }
-        }
+            source: { code: clearableCode },
+        },
     },
     render: () => ({
         components: { Select },
-        template: clearableCode,
+        setup() {
+            const value = ref('the_midnight');
+            const options = defaultOptions;
+            return { value, options };
+        },
+        template: `
+            <Select
+                v-model="value"
+                clearable
+                placeholder="Select a band..."
+                :options="options"
+            />
+        `,
     }),
 };
 
 const iconCode = `
-<Select
-    icon="money-bag-dollar"
-    label="Currency"
-    :options="[
-        { label: 'U.S. Dollar', value: 'usd' },
-        { label: 'Euro', value: 'euro' },
-        { label: 'Gold Doubloon', value: 'gold_doublon' }
-    ]"
-/>
+<Select icon="money-bag-dollar" placeholder="Select a currency..." :options="options" />
 `;
 
 export const _Icon: Story = {
     tags: ['!dev'],
     parameters: {
         docs: {
-            source: { code: iconCode }
-        }
+            source: { code: iconCode },
+        },
     },
     render: () => ({
         components: { Select },
-        template: iconCode,
+        setup() {
+            const value = ref('the_midnight');
+            return { value };
+        },
+        template: `
+            <Select
+                v-model="value"
+                icon="money-bag-dollar"
+                placeholder="Select a currency..."
+                :options="[
+                    { label: 'U.S. Dollar', value: 'usd' },
+                    { label: 'Euro', value: 'euro' },
+                    { label: 'Gold Doubloon', value: 'gold_doublon' }
+                ]"
+            />
+        `,
     }),
 };
 
-const customListItemsCode = `
-<Select label="Author" :options="[
-    { label: 'Tyler Lyle', image: '/assets/tyler.jpg' },
-    { label: 'Tim McEwan', image: '/assets/tim.jpg' },
-    { label: 'Nikki Flores', image: '/assets/nikki.jpg' },
-]">
+const optionSlotsCode = `
+<Select
+    placeholder="Select author..."
+    :options="[
+        { label: 'Tyler Lyle', image: '/assets/tyler.jpg', value: 'tyler' },
+        { label: 'Tim McEwan', image: '/assets/tim.jpg', value: 'tim' },
+        { label: 'Nikki Flores', image: '/assets/nikki.jpg', value: 'nikki' },
+    ]"
+>
+    <template #selected-option="{ option }">
+        <img :src="option.image" class="size-5 rounded-full" />
+        <span v-text="option.label" />
+    </template>
     <template #option="{ label, image }">
         <img :src="image" class="size-5 rounded-full" />
         <span v-text="label" />
@@ -194,15 +207,82 @@ const customListItemsCode = `
 </Select>
 `;
 
-export const _CustomListItems: Story = {
+export const _OptionSlots: Story = {
     tags: ['!dev'],
     parameters: {
         docs: {
-            source: { code: customListItemsCode }
-        }
+            source: { code: optionSlotsCode },
+        },
+    },
+    render: () => ({
+        components: { Select },
+        setup() {
+            const value = ref('tyler');
+            const options = [
+                { label: 'Tyler Lyle', image: 'https://i.pravatar.cc/100?u=tyler', value: 'tyler' },
+                { label: 'Tim McEwan', image: 'https://i.pravatar.cc/100?u=tim', value: 'tim' },
+                { label: 'Nikki Flores', image: 'https://i.pravatar.cc/100?u=nikki', value: 'nikki' },
+            ];
+            return { value, options };
+        },
+        template: `
+            <Select
+                v-model="value"
+                placeholder="Select author..."
+                :options="options"
+            >
+                <template #selected-option="{ option }">
+                    <img :src="option.image" class="size-5 rounded-full" />
+                    <span v-text="option.label" />
+                </template>
+                <template #option="{ label, image }">
+                    <img :src="image" class="size-5 rounded-full" />
+                    <span v-text="label" />
+                </template>
+            </Select>
+        `,
+    }),
+};
+
+const adaptiveWidthCode = `
+<Select
+    adaptive-width
+    placeholder="Select..."
+    :options="[
+        { label: 'Short', value: 'short' },
+        { label: 'A much longer option label', value: 'long' },
+        { label: 'An extremely long option that demonstrates adaptive width', value: 'very_long' },
+    ]"
+/>
+`;
+
+export const _AdaptiveWidth: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: adaptiveWidthCode },
+        },
     },
     render: () => ({
         components: { Select },
-        template: customListItemsCode,
+        setup() {
+            const value = ref(null);
+            const options = [
+                { label: 'Short', value: 'short' },
+                { label: 'A much longer option label', value: 'long' },
+                { label: 'An extremely long option that demonstrates adaptive width', value: 'very_long' },
+            ];
+            return { value, options };
+        },
+        template: `
+            <div class="w-48">
+                <Select
+                    v-model="value"
+                    adaptive-width
+                    placeholder="Select..."
+                    :options="options"
+                />
+            </div>
+        `,
     }),
 };
diff --git a/resources/js/stories/Text.stories.ts b/resources/js/stories/Text.stories.ts
new file mode 100644
index 00000000000..9cedee9a61f
--- /dev/null
+++ b/resources/js/stories/Text.stories.ts
@@ -0,0 +1,168 @@
+import type {Meta, StoryObj} from '@storybook/vue3';
+import {Text} from '@ui';
+import {computed} from 'vue';
+
+const meta = {
+    title: 'Components/Text',
+    component: Text,
+    argTypes: {
+        size: {
+            control: 'select',
+            options: ['xs', 'sm', 'base', 'lg'],
+        },
+        variant: {
+            control: 'select',
+            options: ['default', 'strong', 'subtle', 'code', 'danger', 'success', 'warning'],
+        },
+        as: {
+            control: 'select',
+            options: ['span', 'p', 'div'],
+        },
+    },
+} satisfies Meta<typeof Text>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+    args: {
+        text: 'The quick brown fox jumps over the lazy dog.',
+    },
+};
+
+const introCode = `
+<div class="flex flex-wrap gap-3 items-center">
+    <Text text="Default" />
+    <Text variant="strong" text="Strong" />
+    <Text variant="subtle" text="Subtle" />
+    <Text variant="code" text="code_example" />
+</div>
+`;
+
+export const _DocsIntro: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: introCode },
+        },
+    },
+    render: () => ({
+        components: { Text },
+        template: introCode,
+    }),
+};
+
+export const Variants: Story = {
+    argTypes: {
+        variant: { control: { disable: true } },
+        text: { control: { disable: true } },
+    },
+    parameters: {
+        docs: {
+            source: {
+                code: `
+                    <Text variant="default" text="Default" />
+                    <Text variant="strong" text="Strong" />
+                    <Text variant="subtle" text="Subtle" />
+                    <Text variant="code" text="code_example" />
+                    <Text variant="danger" text="Danger" />
+                    <Text variant="success" text="Success" />
+                    <Text variant="warning" text="Warning" />
+                `,
+            },
+        },
+    },
+    render: (args) => ({
+        components: { Text },
+        setup() {
+            const sharedProps = computed(() => {
+                const { variant, text, ...rest } = args;
+                return rest;
+            });
+            return { sharedProps };
+        },
+        template: `
+            <div class="flex flex-wrap gap-3 items-center">
+                <Text variant="default" text="Default" v-bind="sharedProps" />
+                <Text variant="strong" text="Strong" v-bind="sharedProps" />
+                <Text variant="subtle" text="Subtle" v-bind="sharedProps" />
+                <Text variant="code" text="code_example" v-bind="sharedProps" />
+                <Text variant="danger" text="Danger" v-bind="sharedProps" />
+                <Text variant="success" text="Success" v-bind="sharedProps" />
+                <Text variant="warning" text="Warning" v-bind="sharedProps" />
+            </div>
+        `,
+    }),
+};
+
+export const Sizes: Story = {
+    argTypes: {
+        size: { control: { disable: true } },
+        text: { control: { disable: true } },
+    },
+    parameters: {
+        docs: {
+            source: {
+                code: `
+                    <Text size="lg" text="Large" />
+                    <Text size="base" text="Base" />
+                    <Text size="sm" text="Small" />
+                `,
+            },
+        },
+    },
+    render: (args) => ({
+        components: { Text },
+        setup() {
+            const sharedProps = computed(() => {
+                const { size, text, ...rest } = args;
+                return rest;
+            });
+            return { sharedProps };
+        },
+        template: `
+            <div class="flex flex-wrap gap-3 items-center">
+                <Text size="lg" text="Large" v-bind="sharedProps" />
+                <Text size="base" text="Base" v-bind="sharedProps" />
+                <Text size="sm" text="Small" v-bind="sharedProps" />
+            </div>
+        `,
+    }),
+};
+
+const inlineCode = `
+<Text>Default with <Text variant="strong">strong</Text> and <Text variant="subtle">subtle</Text> inline</Text>
+`;
+
+export const _InlineDocs: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: inlineCode },
+        },
+    },
+    render: () => ({
+        components: { Text },
+        template: inlineCode,
+    }),
+};
+
+const paragraphCode = `
+<div class="space-y-2">
+    <Text as="p">This is a paragraph of default text that could appear inside a widget or table description.</Text>
+    <Text as="p" variant="subtle">This is a subtle paragraph, useful for secondary information or metadata.</Text>
+</div>
+`;
+
+export const _AsParagraph: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: paragraphCode },
+        },
+    },
+    render: () => ({
+        components: { Text },
+        template: paragraphCode,
+    }),
+};
diff --git a/resources/js/stories/Timezones.stories.ts b/resources/js/stories/Timezones.stories.ts
new file mode 100644
index 00000000000..b47e1adacaf
--- /dev/null
+++ b/resources/js/stories/Timezones.stories.ts
@@ -0,0 +1,136 @@
+import type {Meta, StoryObj} from '@storybook/vue3';
+import {Timezones, TimezoneHoverCard} from '@ui';
+
+const exampleDate = '2026-05-05T12:00:00.000Z';
+const exampleRange = { start: '2026-05-05T12:00:00.000Z', end: '2026-05-08T17:30:00.000Z' };
+
+const meta = {
+    title: 'Overlays/Timezones',
+    component: Timezones,
+    argTypes: {
+        date: {
+            control: 'text',
+        },
+    },
+} satisfies Meta<typeof Timezones>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+const defaultCode = `
+<Timezones :date="date" />
+`;
+
+export const _DocsIntro: Story = {
+    tags: ['!dev'],
+    args: {
+        date: exampleDate,
+    },
+    parameters: {
+        docs: {
+            source: { code: `<Timezones date="${exampleDate}" />` }
+        }
+    },
+    render: (args) => ({
+        components: { Timezones },
+        setup() {
+            return { date: args.date };
+        },
+        template: defaultCode,
+    }),
+};
+
+const hoverCardCode = `
+<TimezoneHoverCard :date="date">
+    <span class="underline decoration-dotted">Hover the underlined text</span>
+</TimezoneHoverCard>
+`;
+
+export const _HoverCard: Story = {
+    tags: ['!dev'],
+    args: {
+        date: exampleDate,
+    },
+    parameters: {
+        docs: {
+            source: { code: hoverCardCode }
+        }
+    },
+    render: (args) => ({
+        components: { TimezoneHoverCard },
+        setup() {
+            return { date: args.date };
+        },
+        template: `
+            <div class="flex justify-center p-12">
+                ${hoverCardCode}
+            </div>
+        `,
+    }),
+};
+
+const rangeCode = `
+<Timezones :date="{ start, end }" />
+`;
+
+export const _Range: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: rangeCode }
+        }
+    },
+    render: () => ({
+        components: { Timezones },
+        setup() {
+            return { range: exampleRange };
+        },
+        template: `<Timezones :date="range" />`,
+    }),
+};
+
+const customDateCode = `
+<Timezones :date="isoString" />
+<Timezones :date="dateObject" />
+`;
+
+export const _Invalid: Story = {
+    args: {
+        date: "not a date",
+    },
+    render: (args) => ({
+        components: { Timezones },
+        setup() {
+            return { date: args.date };
+        },
+        template: `
+            <div>
+                <p class="mb-2 text-sm">Nothing should render below:</p>
+                <Timezones :date="date" />
+            </div>
+        `,
+    }),
+};
+
+export const _CustomDate: Story = {
+    tags: ['!dev'],
+    parameters: {
+        docs: {
+            source: { code: customDateCode }
+        }
+    },
+    render: () => ({
+        components: { Timezones },
+        setup() {
+            return {
+                isoString: exampleDate,
+                dateObject: new Date(exampleDate),
+            };
+        },
+        template: `
+            <div class="space-y-4">
+                ${customDateCode}
+            </div>
+        `,
+    }),
+};
diff --git a/resources/js/stories/docs/Button.mdx b/resources/js/stories/docs/Button.mdx
index 23ef5910382..08169fe8a61 100644
--- a/resources/js/stories/docs/Button.mdx
+++ b/resources/js/stories/docs/Button.mdx
@@ -43,5 +43,14 @@ When using `ghost` or `subtle` button variants, you can use the `inset` prop to
 You can combine multiple buttons into a "button group".
 <Canvas of={ButtonStories.ButtonGroups} sourceState={'shown'} />
 
+### Overflow
+By default, button groups don't handle overflow. Use the `overflow` prop to opt in to responsive behavior.
+
+Use `overflow="stack"` to switch to a vertical layout when buttons don't fit on one line.
+<Canvas of={ButtonStories.ButtonGroupOverflowStack} sourceState={'shown'} />
+
+Use `overflow="gap"` to switch to separated buttons with gaps.
+<Canvas of={ButtonStories.ButtonGroupOverflowGap} sourceState={'shown'} />
+
 ## Arguments
 <ArgTypes of={ButtonStories} />
diff --git a/resources/js/stories/docs/Combobox.mdx b/resources/js/stories/docs/Combobox.mdx
new file mode 100644
index 00000000000..fba290cc178
--- /dev/null
+++ b/resources/js/stories/docs/Combobox.mdx
@@ -0,0 +1,58 @@
+import { Canvas, Meta, ArgTypes } from '@storybook/addon-docs/blocks';
+import * as ComboboxStories from '../Combobox.stories';
+
+<Meta of={ComboboxStories} />
+
+# Combobox
+A flexible selection component that combines a text input with a dropdown list. Supports single and multiple selection, search/filtering, tagging, and keyboard navigation.
+
+<Canvas of={ComboboxStories._DocsIntro} sourceState={'shown'} />
+
+You should provide an array of option objects via the `options` prop. The objects must contain `value` and `label` keys by default, but you can customize the keys using the `optionValue` and `optionLabel` props.
+
+## Sizes
+Use the `size` prop to control the input's height and type scale. Available sizes: `xs`, `sm`, `base`, `lg`, `xl`.
+<Canvas of={ComboboxStories._Sizes} sourceState={'shown'} />
+
+## Variants
+Use the `variant` prop to change the appearance of the combobox. Available variants: `default`, `filled`, `ghost`, `subtle`.
+<Canvas of={ComboboxStories._Variants} sourceState={'shown'} />
+
+## Clearable
+Add a clear button to your combobox by setting the `clearable` prop.
+<Canvas of={ComboboxStories._Clearable} sourceState={'shown'} />
+
+## Multiple Selections
+Enable multiple selection mode with the `multiple` prop. Selected items appear as badges below the input and can be reordered via drag and drop.
+<Canvas of={ComboboxStories._Multiple} sourceState={'shown'} />
+
+## Max Selections
+Limit the number of selections with the `maxSelections` prop. A counter is displayed showing the current selection count.
+<Canvas of={ComboboxStories._MaxSelections} sourceState={'shown'} />
+
+## Taggable
+Allow users to add new options by typing and pressing enter. Set `taggable` to `true` to enable this feature. Users can also paste comma-separated values to add multiple tags at once.
+<Canvas of={ComboboxStories._Taggable} sourceState={'shown'} />
+
+## Disable Search
+By default, the combobox is searchable. You may disable search by setting the `searchable` prop to `false`.
+<Canvas of={ComboboxStories._SearchDisabled} sourceState={'shown'} />
+
+## Server-side Searching
+When `ignoreFilter` is `true`, the combobox won't filter options locally. Use this with the `search` event to implement server-side searching.
+<Canvas of={ComboboxStories._IgnoreFilter} sourceState={'shown'} />
+
+## Customize Options
+You may customize how options are rendered using the `selected-option` and `option` slots.
+
+- The `selected-option` slot is used to display the currently selected option in the "trigger"
+- The `option` slot is used to display individual options in the dropdown
+
+<Canvas of={ComboboxStories._OptionSlots} sourceState={'shown'} />
+
+## Adaptive Width
+By default, the dropdown matches the trigger width. Set `adaptiveWidth` to `true` to allow the dropdown to expand to fit longer option labels.
+<Canvas of={ComboboxStories._AdaptiveWidth} sourceState={'shown'} />
+
+## Arguments
+<ArgTypes of={ComboboxStories} />
diff --git a/resources/js/stories/docs/Icon.mdx b/resources/js/stories/docs/Icon.mdx
index e23dc64e393..d74dd4eada5 100644
--- a/resources/js/stories/docs/Icon.mdx
+++ b/resources/js/stories/docs/Icon.mdx
@@ -11,6 +11,10 @@ Icons are used throughout the Control Panel to provide visual cues and improve u
 Use the `name` prop to specify which icon to display.
 <Canvas of={IconStories.Default} />
 
+## Alternate Sets
+Use the `set` prop or prefix the icon name with `set::` to render an icon from another registered set. When both are provided and they disagree, the set in the icon name wins and a warning is logged.
+<Canvas of={IconStories.AlternateSetInName} />
+
 ## Available Icons
 All icons available in the default icon set. Click to copy the icon name.
 <Canvas of={IconStories.AllIcons} />
diff --git a/resources/js/stories/docs/Listing.mdx b/resources/js/stories/docs/Listing.mdx
index 6b5f0630591..4c262c030c3 100644
--- a/resources/js/stories/docs/Listing.mdx
+++ b/resources/js/stories/docs/Listing.mdx
@@ -61,7 +61,7 @@ The `Listing` component can pull data from a JSON endpoint.
     {
         $query = TeamMember::query();
 
-        if ($search $request->input('search')) {
+        if ($search = $request->input('search')) {
             $query->where('name', 'like', "%{$search}%");
         }
 
@@ -116,8 +116,8 @@ class TeamMemberActionController extends Controller
 Next, add two routes pointing to the controller:
 
 ```php
-Route::get('team-members/actions', [TeamMemberActionController::class, 'run']);
-Route::get('team-members/actions/list', [TeamMemberActionController::class, 'bulkActions']);
+Route::post('team-members/actions', [TeamMemberActionController::class, 'run']);
+Route::post('team-members/actions/list', [TeamMemberActionController::class, 'bulkActions']);
 ```
 
 Finally, pass the URL for the first route to the `actionUrl` prop:
diff --git a/resources/js/stories/docs/Select.mdx b/resources/js/stories/docs/Select.mdx
index 09d0a2ba85a..b955af130d0 100644
--- a/resources/js/stories/docs/Select.mdx
+++ b/resources/js/stories/docs/Select.mdx
@@ -4,31 +4,39 @@ import * as SelectStories from '../Select.stories';
 <Meta of={SelectStories} />
 
 # Select
-Displays a list of options for the user to pick from - triggered by an input style button.
+Displays a list of options for the user to pick from - triggered by an input style button. Built on top of the [Combobox](/?path=/docs/forms-combobox--docs) component.
+
 <Canvas of={SelectStories._DocsIntro} sourceState={'shown'} />
 
-## Data Format
-Pass data into the select with the `options` prop as an array of objects. The objects must contain a `value` and a `label`, but can contain any other day you would like as well.
+You should provide an array of option objects via the `options` prop. The objects must contain `value` and `label` keys by default, but you can customize the keys using the `optionValue` and `optionLabel` props.
 
 ## Sizes
-Use the `size` prop to control the input's height and type scale. The scales match the button sizes to make sure everything lines up nicely.
+Use the `size` prop to control the input's height and type scale. Available sizes: `xs`, `sm`, `base`, `lg`, `xl`.
 <Canvas of={SelectStories._Sizes} sourceState={'shown'} />
 
 ## Variants
-Use the `variant` prop to change the appearance of the select.
+Use the `variant` prop to change the appearance of the combobox. Available variants: `default`, `filled`, `ghost`, `subtle`.
 <Canvas of={SelectStories._Variants} sourceState={'shown'} />
 
 ## Clearable
-Add a clear button to your select by setting the `clearable` prop.
+Add a clear button to your combobox by setting the `clearable` prop.
 <Canvas of={SelectStories._Clearable} sourceState={'shown'} />
 
 ## Icon
 Adds an icon to your select box.
 <Canvas of={SelectStories._Icon} sourceState={'shown'} />
 
-## Custom List Items
-You can customize the markup and display of the list items inside of an `#options` slot, with full access to whatever data is passed into the select.
-<Canvas of={SelectStories._CustomListItems} sourceState={'shown'} />
+## Customize Options
+You may customize how options are rendered using the `selected-option` and `option` slots.
+
+- The `selected-option` slot is used to display the currently selected option in the "trigger"
+- The `option` slot is used to display individual options in the dropdown
+
+<Canvas of={SelectStories._OptionSlots} sourceState={'shown'} />
+
+## Adaptive Width
+By default, the dropdown matches the trigger width. Set `adaptiveWidth` to `true` to allow the dropdown to expand to fit longer option labels.
+<Canvas of={SelectStories._AdaptiveWidth} sourceState={'shown'} />
 
 ## Arguments
 <ArgTypes of={SelectStories} />
diff --git a/resources/js/stories/docs/Text.mdx b/resources/js/stories/docs/Text.mdx
new file mode 100644
index 00000000000..62235424cd3
--- /dev/null
+++ b/resources/js/stories/docs/Text.mdx
@@ -0,0 +1,27 @@
+import { Canvas, Meta, ArgTypes } from '@storybook/addon-docs/blocks';
+import * as TextStories from '../Text.stories';
+
+<Meta of={TextStories} />
+
+# Text
+A utility component for styling inline and block text with consistent variants and sizes. Useful inside tables, widgets, cards, and anywhere you need to quickly apply text styles without reaching for utility classes.
+<Canvas of={TextStories._DocsIntro} sourceState={'shown'} />
+
+## Variants
+Use the `variant` prop to control the visual style of the text.
+<Canvas of={TextStories.Variants} sourceState={'shown'} />
+
+## Sizes
+Use the `size` prop to control the text size.
+<Canvas of={TextStories.Sizes} sourceState={'shown'} />
+
+## Inline Composition
+Since `Text` renders as a `span` by default, you can nest variants inline.
+<Canvas of={TextStories._InlineDocs} sourceState={'shown'} />
+
+## As Paragraph
+Use the `as` prop to render as a `p` or any other element.
+<Canvas of={TextStories._AsParagraph} sourceState={'shown'} />
+
+## Arguments
+<ArgTypes of={TextStories} />
diff --git a/resources/js/stories/docs/Timezones.mdx b/resources/js/stories/docs/Timezones.mdx
new file mode 100644
index 00000000000..5c1f60e253b
--- /dev/null
+++ b/resources/js/stories/docs/Timezones.mdx
@@ -0,0 +1,21 @@
+import { Canvas, Meta, ArgTypes } from '@storybook/addon-docs/blocks';
+import * as TimezonesStories from '../Timezones.stories';
+
+<Meta of={TimezonesStories} />
+
+# Timezones
+Displays a given instant rendered across the user's local timezone, the configured app timezone, and UTC.
+
+## Overview
+<Canvas of={TimezonesStories._DocsIntro} sourceState={'shown'} />
+
+## Range
+Pass a `{ start, end }` object to render a date range. The value column uses locale-aware formatting that collapses repeated parts (e.g. shared month or year).
+<Canvas of={TimezonesStories._Range} sourceState={'shown'} />
+
+## Hover Card
+This is a convenience wrapper component that displays the timezones in a hover card. You can provide any of [HoverCard](?path=/docs/overlays-hovercard--docs)'s props.
+<Canvas of={TimezonesStories._HoverCard} sourceState={'shown'} />
+
+## Arguments
+<ArgTypes of={TimezonesStories} />
diff --git a/resources/js/tests/FieldConditionsValidator.test.js b/resources/js/tests/FieldConditionsValidator.test.js
index 4b7e16f57ea..742c84dca0c 100644
--- a/resources/js/tests/FieldConditionsValidator.test.js
+++ b/resources/js/tests/FieldConditionsValidator.test.js
@@ -26,6 +26,9 @@ const Statamic = {
     $dirty: {
         add: () => {},
     },
+    $events: {
+        $emit: () => {},
+    },
 };
 window.Statamic = Statamic;
 window.__ = (msg) => msg;
@@ -477,6 +480,20 @@ test('it can call a custom function', () => {
     expect(Fields.showField({ unless: 'custom reallyLovesAnimals' })).toBe(true);
 });
 
+test('it can call a custom function that uses `prefix` param to evaluate prefixed fields', () => {
+    setValues({
+        first_favorite_animals: ['cats', 'dogs', 'giraffes', 'lions'],
+        second_favorite_animals: ['cats', 'dogs'],
+    });
+
+    Statamic.$conditions.add('reallyLovesAnimals', function ({ prefix, values }) {
+        return values[`${prefix}favorite_animals`].length > 3;
+    });
+
+    expect(Fields.showField({ prefix: 'first_', if: 'custom reallyLovesAnimals' })).toBe(true);
+    expect(Fields.showField({ prefix: 'second_', if: 'custom reallyLovesAnimals' })).toBe(false);
+});
+
 test('it can call a custom function that uses `fieldPath` param to evaluate nested fields', () => {
     setValues({
         nested: [{ favorite_animals: ['cats', 'dogs'] }, { favorite_animals: ['cats', 'dogs', 'giraffes', 'lions'] }],
diff --git a/resources/js/tests/Frontend/Passkeys.test.js b/resources/js/tests/Frontend/Passkeys.test.js
new file mode 100644
index 00000000000..e643167496f
--- /dev/null
+++ b/resources/js/tests/Frontend/Passkeys.test.js
@@ -0,0 +1,418 @@
+import { describe, test, expect, vi, beforeEach, afterEach } from 'vitest';
+import Passkeys from '../../frontend/components/Passkeys.js';
+
+vi.mock('@simplewebauthn/browser', () => ({
+    browserSupportsWebAuthn: vi.fn(() => true),
+    startAuthentication: vi.fn(),
+    startRegistration: vi.fn(),
+    WebAuthnAbortService: {
+        cancelCeremony: vi.fn(),
+    },
+}));
+
+import { browserSupportsWebAuthn, startAuthentication, startRegistration, WebAuthnAbortService } from '@simplewebauthn/browser';
+
+describe('Passkeys', () => {
+    let passkeys;
+
+    beforeEach(() => {
+        passkeys = new Passkeys();
+        vi.clearAllMocks();
+
+        global.fetch = vi.fn();
+
+        Object.defineProperty(document, 'querySelector', {
+            value: vi.fn(() => null),
+            writable: true,
+        });
+    });
+
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+
+    test('it checks browser support', () => {
+        expect(passkeys.supported).toBe(true);
+    });
+
+    test('it starts in non-waiting state', () => {
+        expect(passkeys.waiting).toBe(false);
+    });
+
+    test('it starts with no error', () => {
+        expect(passkeys.error).toBe(null);
+    });
+
+    describe('authenticate', () => {
+        test('it fetches options and calls startAuthentication', async () => {
+            const mockOptions = { challenge: 'test-challenge' };
+
+            global.fetch
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve(mockOptions),
+                })
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ redirect: '/dashboard' }),
+                });
+
+            startAuthentication.mockResolvedValueOnce({ id: 'credential-id' });
+
+            const onSuccess = vi.fn();
+
+            await passkeys.authenticate({
+                optionsUrl: '/passkeys/options',
+                verifyUrl: '/passkeys/login',
+                onSuccess,
+            });
+
+            expect(global.fetch).toHaveBeenCalledTimes(2);
+            expect(startAuthentication).toHaveBeenCalledWith({
+                optionsJSON: mockOptions,
+                useBrowserAutofill: false,
+            });
+            expect(onSuccess).toHaveBeenCalledWith({ redirect: '/dashboard' });
+        });
+
+        test('it handles authentication errors gracefully', async () => {
+            global.fetch.mockResolvedValueOnce({
+                ok: true,
+                json: () => Promise.resolve({ challenge: 'test' }),
+            });
+
+            const abortError = new Error('User cancelled');
+            abortError.name = 'NotAllowedError';
+            startAuthentication.mockRejectedValueOnce(abortError);
+
+            const onError = vi.fn();
+
+            await passkeys.authenticate({
+                optionsUrl: '/passkeys/options',
+                verifyUrl: '/passkeys/login',
+                onError,
+            });
+
+            // NotAllowedError should be silently ignored
+            expect(onError).not.toHaveBeenCalled();
+        });
+
+        test('it handles verification failure', async () => {
+            global.fetch
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ challenge: 'test' }),
+                })
+                .mockResolvedValueOnce({
+                    ok: false,
+                    status: 401,
+                    json: () => Promise.resolve({ message: 'Invalid passkey' }),
+                });
+
+            startAuthentication.mockResolvedValueOnce({ id: 'credential-id' });
+
+            const onError = vi.fn();
+
+            await passkeys.authenticate({
+                optionsUrl: '/passkeys/options',
+                verifyUrl: '/passkeys/login',
+                onError,
+            });
+
+            expect(onError).toHaveBeenCalledWith({
+                message: 'Invalid passkey',
+                status: 401,
+            });
+            expect(passkeys.error).toBe('Invalid passkey');
+        });
+    });
+
+    describe('register', () => {
+        test('it fetches options and calls startRegistration', async () => {
+            const mockOptions = { challenge: 'test-challenge' };
+
+            global.fetch
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve(mockOptions),
+                })
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ verified: true }),
+                });
+
+            startRegistration.mockResolvedValueOnce({ id: 'new-credential' });
+
+            const onSuccess = vi.fn();
+
+            await passkeys.register({
+                optionsUrl: '/passkeys/create',
+                verifyUrl: '/passkeys/store',
+                name: 'My Passkey',
+                onSuccess,
+            });
+
+            expect(global.fetch).toHaveBeenCalledTimes(2);
+            expect(startRegistration).toHaveBeenCalledWith({
+                optionsJSON: mockOptions,
+            });
+            expect(onSuccess).toHaveBeenCalledWith({ verified: true });
+        });
+
+        test('it uses default passkey name', async () => {
+            global.fetch
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ challenge: 'test' }),
+                })
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ verified: true }),
+                });
+
+            startRegistration.mockResolvedValueOnce({ id: 'new-credential' });
+
+            await passkeys.register({
+                optionsUrl: '/passkeys/create',
+                verifyUrl: '/passkeys/store',
+            });
+
+            const lastCall = global.fetch.mock.calls[1];
+            const body = JSON.parse(lastCall[1].body);
+            expect(body.name).toBe('Passkey');
+        });
+    });
+
+    describe('cancel', () => {
+        test('it calls WebAuthnAbortService.cancelCeremony', () => {
+            passkeys.cancel();
+            expect(WebAuthnAbortService.cancelCeremony).toHaveBeenCalled();
+        });
+    });
+
+    describe('initAutofill', () => {
+        test('it calls authenticate with useBrowserAutofill', async () => {
+            // Create a fresh instance to ensure supported is true
+            browserSupportsWebAuthn.mockReturnValue(true);
+            const freshPasskeys = new Passkeys();
+
+            global.fetch
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ challenge: 'test' }),
+                })
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ redirect: '/' }),
+                });
+
+            startAuthentication.mockResolvedValueOnce({ id: 'credential-id' });
+
+            // Note: initAutofill returns immediately if not supported, so we need to await the authenticate call
+            await freshPasskeys.initAutofill({
+                optionsUrl: '/passkeys/options',
+                verifyUrl: '/passkeys/login',
+            });
+
+            // Small delay to allow async operation to complete
+            await new Promise(resolve => setTimeout(resolve, 10));
+
+            expect(startAuthentication).toHaveBeenCalledWith({
+                optionsJSON: { challenge: 'test' },
+                useBrowserAutofill: true,
+            });
+        });
+
+        test('it does nothing if browser does not support webauthn', async () => {
+            browserSupportsWebAuthn.mockReturnValueOnce(false);
+            const noSupportPasskeys = new Passkeys();
+
+            await noSupportPasskeys.initAutofill({
+                optionsUrl: '/passkeys/options',
+                verifyUrl: '/passkeys/login',
+            });
+
+            expect(global.fetch).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('configure', () => {
+        test('it returns the instance', () => {
+            const result = passkeys.configure({ optionsUrl: '/options' });
+            expect(result).toBe(passkeys);
+        });
+
+        test('it uses configured defaults for authenticate', async () => {
+            global.fetch
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ challenge: 'test' }),
+                })
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ redirect: '/dashboard' }),
+                });
+
+            startAuthentication.mockResolvedValueOnce({ id: 'credential-id' });
+
+            const onSuccess = vi.fn();
+
+            passkeys.configure({
+                optionsUrl: '/passkeys/options',
+                verifyUrl: '/passkeys/login',
+                onSuccess,
+            });
+
+            await passkeys.authenticate();
+
+            expect(global.fetch).toHaveBeenCalledTimes(2);
+            expect(onSuccess).toHaveBeenCalledWith({ redirect: '/dashboard' });
+        });
+
+        test('it uses configured defaults for register', async () => {
+            global.fetch
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ challenge: 'test' }),
+                })
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ verified: true }),
+                });
+
+            startRegistration.mockResolvedValueOnce({ id: 'new-credential' });
+
+            const onSuccess = vi.fn();
+
+            passkeys.configure({
+                optionsUrl: '/passkeys/create',
+                verifyUrl: '/passkeys/store',
+                onSuccess,
+            });
+
+            await passkeys.register({ name: 'My Key' });
+
+            expect(onSuccess).toHaveBeenCalledWith({ verified: true });
+
+            const lastCall = global.fetch.mock.calls[1];
+            const body = JSON.parse(lastCall[1].body);
+            expect(body.name).toBe('My Key');
+        });
+
+        test('call-time options override configured defaults', async () => {
+            global.fetch
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ challenge: 'test' }),
+                })
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ redirect: '/' }),
+                });
+
+            startAuthentication.mockResolvedValueOnce({ id: 'credential-id' });
+
+            const defaultSuccess = vi.fn();
+            const overrideSuccess = vi.fn();
+
+            passkeys.configure({
+                optionsUrl: '/passkeys/options',
+                verifyUrl: '/passkeys/login',
+                onSuccess: defaultSuccess,
+            });
+
+            await passkeys.authenticate({ onSuccess: overrideSuccess });
+
+            expect(defaultSuccess).not.toHaveBeenCalled();
+            expect(overrideSuccess).toHaveBeenCalledWith({ redirect: '/' });
+        });
+
+        test('it uses configured defaults for initAutofill', async () => {
+            browserSupportsWebAuthn.mockReturnValue(true);
+            const freshPasskeys = new Passkeys();
+
+            global.fetch
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ challenge: 'test' }),
+                })
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ redirect: '/' }),
+                });
+
+            startAuthentication.mockResolvedValueOnce({ id: 'credential-id' });
+
+            const onSuccess = vi.fn();
+
+            freshPasskeys.configure({
+                optionsUrl: '/passkeys/options',
+                verifyUrl: '/passkeys/login',
+                onSuccess,
+            });
+
+            await freshPasskeys.initAutofill();
+
+            await new Promise(resolve => setTimeout(resolve, 10));
+
+            expect(startAuthentication).toHaveBeenCalledWith({
+                optionsJSON: { challenge: 'test' },
+                useBrowserAutofill: true,
+            });
+        });
+    });
+
+    describe('CSRF token', () => {
+        test('it reads CSRF token from meta tag', async () => {
+            document.querySelector = vi.fn((selector) => {
+                if (selector === 'meta[name="csrf-token"]') {
+                    return { getAttribute: () => 'meta-csrf-token' };
+                }
+                return null;
+            });
+
+            global.fetch
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ challenge: 'test' }),
+                })
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ redirect: '/' }),
+                });
+
+            startAuthentication.mockResolvedValueOnce({ id: 'credential-id' });
+
+            await passkeys.authenticate({
+                optionsUrl: '/passkeys/options',
+                verifyUrl: '/passkeys/login',
+            });
+
+            const lastCall = global.fetch.mock.calls[1];
+            expect(lastCall[1].headers['X-CSRF-TOKEN']).toBe('meta-csrf-token');
+        });
+
+        test('it allows overriding CSRF token', async () => {
+            global.fetch
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ challenge: 'test' }),
+                })
+                .mockResolvedValueOnce({
+                    ok: true,
+                    json: () => Promise.resolve({ redirect: '/' }),
+                });
+
+            startAuthentication.mockResolvedValueOnce({ id: 'credential-id' });
+
+            await passkeys.authenticate({
+                optionsUrl: '/passkeys/options',
+                verifyUrl: '/passkeys/login',
+                csrfToken: 'custom-token',
+            });
+
+            const lastCall = global.fetch.mock.calls[1];
+            expect(lastCall[1].headers['X-CSRF-TOKEN']).toBe('custom-token');
+        });
+    });
+});
diff --git a/resources/js/tests/Package.test.js b/resources/js/tests/Package.test.js
index 5d43ccfb22c..4da3ead2380 100644
--- a/resources/js/tests/Package.test.js
+++ b/resources/js/tests/Package.test.js
@@ -27,6 +27,7 @@ it('exports core', async () => {
         'IndexFieldtypeMixin',
         'InlineEditForm',
         'ItemActions',
+        'NumberFormatter',
         'RelatedItem',
         'RestoreRevision',
         'RevisionHistory',
@@ -34,6 +35,7 @@ it('exports core', async () => {
         'SaveButtonOptions',
         'SortableList',
         'clone',
+        'debounce',
         'deepClone',
         'requireElevatedSession',
         'requireElevatedSessionIf',
@@ -62,6 +64,7 @@ it('exports api', async () => {
         'hooks',
         'inertia',
         'keys',
+        'numberFormatter',
         'permissions',
         'portals',
         'preferences',
@@ -135,6 +138,9 @@ it('exports ui', async () => {
         'CodeEditor',
         'Combobox',
         'ConfirmationModal',
+        'ContentDirection',
+        'useContentDirection',
+        'useUiDirection',
         'Context',
         'ContextFooter',
         'ContextHeader',
@@ -190,6 +196,7 @@ it('exports ui', async () => {
         'TabContent',
         'TabList',
         'TabTrigger',
+        'Text',
         'Stack',
         'StackClose',
         'StackContent',
@@ -204,6 +211,8 @@ it('exports ui', async () => {
         'Tabs',
         'Textarea',
         'TimePicker',
+        'TimezoneHoverCard',
+        'Timezones',
         'ToggleGroup',
         'ToggleItem',
         'registerIconSet',
diff --git a/resources/js/tests/ProgressBar.test.js b/resources/js/tests/ProgressBar.test.js
new file mode 100644
index 00000000000..5a26ac5bdd8
--- /dev/null
+++ b/resources/js/tests/ProgressBar.test.js
@@ -0,0 +1,58 @@
+import { test, expect, beforeEach } from 'vitest';
+import { effect, nextTick } from 'vue';
+import useProgressBar from '@/composables/progress-bar.js';
+
+const progress = useProgressBar();
+
+beforeEach(() => {
+    // Reset any leftover operations between tests.
+    progress.names().slice().forEach((name) => progress.complete(name));
+});
+
+test('loading is reported while operations are in flight', () => {
+    expect(progress.isComplete()).toBe(true);
+
+    progress.loading('a', true);
+    expect(progress.isComplete()).toBe(false);
+    expect(progress.count()).toBe(1);
+
+    progress.loading('a', false);
+    expect(progress.isComplete()).toBe(true);
+    expect(progress.count()).toBe(0);
+});
+
+test('reactive consumers are only notified on start and stop transitions', async () => {
+    let runs = 0;
+    let lastComplete;
+
+    effect(() => {
+        lastComplete = progress.isComplete();
+        runs++;
+    });
+
+    expect(runs).toBe(1); // initial run
+    expect(lastComplete).toBe(true);
+
+    // Add a large batch of operations synchronously.
+    for (let i = 0; i < 200; i++) {
+        progress.loading(`op-${i}`, true);
+    }
+    await nextTick();
+
+    // Only one additional run for the idle -> loading transition.
+    expect(runs).toBe(2);
+    expect(lastComplete).toBe(false);
+
+    // Remove all but the last operation. Still loading, so no new notification.
+    for (let i = 0; i < 199; i++) {
+        progress.loading(`op-${i}`, false);
+    }
+    await nextTick();
+    expect(runs).toBe(2);
+
+    // Remove the final operation. Now one run for the loading -> idle transition.
+    progress.loading('op-199', false);
+    await nextTick();
+    expect(runs).toBe(3);
+    expect(lastComplete).toBe(true);
+});
diff --git a/resources/js/tests/PublishValues.test.js b/resources/js/tests/PublishValues.test.js
index 5570ec5d411..9a6e2a6e5c4 100644
--- a/resources/js/tests/PublishValues.test.js
+++ b/resources/js/tests/PublishValues.test.js
@@ -562,3 +562,21 @@ test('it properly sets keys that javascript considers having numeric separators'
 
     expect(newValues).toEqual(expected);
 });
+
+test('it does not throw when rejecting a value nested under a null node', () => {
+    let values = {
+        first_name: 'Han',
+        ship: {
+            crew: null,
+        },
+    };
+
+    let rejected = new Values(values).except(['ship.crew.0.name']);
+
+    expect(rejected).toEqual({
+        first_name: 'Han',
+        ship: {
+            crew: null,
+        },
+    });
+});
diff --git a/resources/js/tests/components/Container.test.js b/resources/js/tests/components/Container.test.js
new file mode 100644
index 00000000000..97902d64bbe
--- /dev/null
+++ b/resources/js/tests/components/Container.test.js
@@ -0,0 +1,65 @@
+import { mount } from '@vue/test-utils';
+import { afterEach, beforeEach, expect, test } from 'vitest';
+import { defineComponent, h } from 'vue';
+import * as Globals from '@/bootstrap/globals';
+import Container from '@/components/ui/Publish/Container.vue';
+import { useContentDirection } from '@/composables/content-direction';
+
+Object.keys(Globals).forEach((fn) => (window[fn] = Globals[fn]));
+window.__ = (key) => key;
+
+window.Statamic = {
+    $config: {
+        get: (key) => (key === 'sites' ? [{ handle: 'default', direction: 'ltr' }] : undefined),
+    },
+    $dirty: { has: () => false, add: () => {}, remove: () => {} },
+    $events: { $emit: () => {} },
+};
+
+const Probe = defineComponent({
+    setup() {
+        const { direction } = useContentDirection();
+        return { direction };
+    },
+    render() {
+        return h('div', { 'data-direction': this.direction });
+    },
+});
+
+beforeEach(async () => {
+    document.documentElement.setAttribute('dir', 'rtl');
+    // Let the ui-direction composable's MutationObserver pick up the attribute change.
+    await new Promise((resolve) => queueMicrotask(resolve));
+});
+
+afterEach(() => {
+    document.documentElement.removeAttribute('dir');
+});
+
+test('content direction is unaffected by the CP/document direction when the site has an explicit direction', () => {
+    const wrapper = mount(Container, {
+        props: {
+            blueprint: { tabs: [] },
+            site: 'default',
+        },
+        slots: {
+            default: () => h(Probe),
+        },
+    });
+
+    expect(wrapper.find('[data-direction]').attributes('data-direction')).toBe('ltr');
+});
+
+test('content direction falls back to the UI direction when the site cannot be resolved', () => {
+    const wrapper = mount(Container, {
+        props: {
+            blueprint: { tabs: [] },
+            site: 'unknown-site',
+        },
+        slots: {
+            default: () => h(Probe),
+        },
+    });
+
+    expect(wrapper.find('[data-direction]').attributes('data-direction')).toBe('rtl');
+});
diff --git a/resources/js/tests/components/ContentDirection.test.js b/resources/js/tests/components/ContentDirection.test.js
new file mode 100644
index 00000000000..b6149dba3ce
--- /dev/null
+++ b/resources/js/tests/components/ContentDirection.test.js
@@ -0,0 +1,43 @@
+import { mount } from '@vue/test-utils';
+import { afterEach, beforeEach, expect, test } from 'vitest';
+import ContentDirection from '@/components/ui/Publish/ContentDirection.vue';
+
+beforeEach(async () => {
+    document.documentElement.setAttribute('dir', 'rtl');
+    // Let the ui-direction composable's MutationObserver pick up the attribute change.
+    await new Promise((resolve) => queueMicrotask(resolve));
+});
+
+afterEach(() => {
+    document.documentElement.removeAttribute('dir');
+});
+
+test('it renders a div with the content direction by default', () => {
+    const wrapper = mount(ContentDirection, {
+        slots: { default: 'hello' },
+    });
+
+    expect(wrapper.element.tagName).toBe('DIV');
+    expect(wrapper.attributes('dir')).toBe('rtl');
+});
+
+test('it renders the given "as" element', () => {
+    const wrapper = mount(ContentDirection, {
+        props: { as: 'span' },
+        slots: { default: 'hello' },
+    });
+
+    expect(wrapper.element.tagName).toBe('SPAN');
+    expect(wrapper.attributes('dir')).toBe('rtl');
+});
+
+test('asChild merges the dir attribute onto the slot child instead of wrapping it', () => {
+    const wrapper = mount(ContentDirection, {
+        props: { asChild: true },
+        slots: { default: '<span class="child">hello</span>' },
+    });
+
+    expect(wrapper.element.tagName).toBe('SPAN');
+    expect(wrapper.classes()).toContain('child');
+    expect(wrapper.attributes('dir')).toBe('rtl');
+});
diff --git a/resources/js/tests/components/DateFormatter.test.js b/resources/js/tests/components/DateFormatter.test.js
index 341bbaba67a..514c84f03f7 100644
--- a/resources/js/tests/components/DateFormatter.test.js
+++ b/resources/js/tests/components/DateFormatter.test.js
@@ -47,6 +47,27 @@ test('it can statically format', () => {
     expect(DateFormatter.format('1995-03-13T22:45:19Z', { year: 'numeric' })).toBe('1995');
 });
 
+test('it can temporarily format with locale using callback', () => {
+    const formatter = new DateFormatter();
+    DateFormatter.defaultLocale = 'en-us';
+
+    const result = formatter.withLocale('de', (instance) => instance.format('2021-12-25T12:13:14Z', 'datetime'));
+
+    expect(result).toBe('25.12.2021, 12:13');
+    expect(DateFormatter.defaultLocale).toBe('en-us');
+});
+
+test('it resets locale after withLocale callback throws', () => {
+    const formatter = new DateFormatter();
+    DateFormatter.defaultLocale = 'en-us';
+
+    expect(() => formatter.withLocale('de', () => {
+        throw new Error('boom');
+    })).toThrow('boom');
+
+    expect(DateFormatter.defaultLocale).toBe('en-us');
+});
+
 test('it can format on the instance', () => {
     expect(new DateFormatter().format('1995-03-13T22:45:19Z')).toBe('3/13/1995, 10:45 PM');
     expect(new DateFormatter().format('1995-03-13T22:45:19Z', { year: 'numeric' })).toBe('1995');
@@ -186,6 +207,18 @@ test('it can get the locale', () => {
     expect(new DateFormatter().locale).toBe('fr');
 });
 
+test('it can set the default locale via setDefaultLocale', () => {
+    new DateFormatter().setDefaultLocale('de');
+    expect(DateFormatter.defaultLocale).toBe('de');
+    expect(new DateFormatter().locale).toBe('de');
+});
+
+test('it normalizes underscored locales to BCP 47 format', () => {
+    DateFormatter.defaultLocale = 'pt_BR';
+    expect(DateFormatter.defaultLocale).toBe('pt-BR');
+    expect(new DateFormatter().locale).toBe('pt-BR');
+});
+
 test.each([
     ['en', 'date', '12/25/2021'],
     ['en', 'time', '12:13 PM'],
@@ -202,6 +235,20 @@ test('an invalid preset throws an error', () => {
     expect(() => new DateFormatter().options('foo')).toThrow('Invalid date format: foo');
 });
 
+test('it can override preset options', () => {
+    expect(new DateFormatter().options({ preset: 'datetime', month: 'short' }).toString()).toBe(
+        'Dec 25, 2021, 12:13 PM',
+    );
+
+    expect(new DateFormatter().options({ preset: 'datetime', timeZone: 'Australia/Sydney' }).toString()).toBe(
+        '12/25/2021, 11:13 PM',
+    );
+});
+
+test('an invalid preset key throws an error when overriding', () => {
+    expect(() => new DateFormatter().options({ preset: 'foo', month: 'short' })).toThrow('Invalid date format: foo');
+});
+
 test.each([
     // All the different diffs of time. It defaults to 'year' specificity.
     ['now', 'en', { relative: true }, '2021-12-25T12:13:14Z', 'now'],
diff --git a/resources/js/tests/components/Field.test.js b/resources/js/tests/components/Field.test.js
new file mode 100644
index 00000000000..d7fd49d0e85
--- /dev/null
+++ b/resources/js/tests/components/Field.test.js
@@ -0,0 +1,24 @@
+import { mount } from '@vue/test-utils';
+import { expect, test } from 'vitest';
+import Field from '@/components/ui/Field.vue';
+
+test('it does not set a dir attribute by default', () => {
+    const wrapper = mount(Field, {
+        props: {
+            label: 'Title',
+        },
+    });
+
+    expect(wrapper.attributes('dir')).toBeUndefined();
+});
+
+test('it sets the dir attribute on the root element when provided', () => {
+    const wrapper = mount(Field, {
+        props: {
+            label: 'Title',
+            dir: 'rtl',
+        },
+    });
+
+    expect(wrapper.attributes('dir')).toBe('rtl');
+});
diff --git a/resources/js/tests/components/Icon.test.js b/resources/js/tests/components/Icon.test.js
new file mode 100644
index 00000000000..8b2b690585f
--- /dev/null
+++ b/resources/js/tests/components/Icon.test.js
@@ -0,0 +1,42 @@
+import { flushPromises, mount } from '@vue/test-utils';
+import { expect, test, vi } from 'vitest';
+import Icon from '@/components/ui/Icon/Icon.vue';
+import { registerIconSetFromStrings } from '@/components/ui/Icon/registry.js';
+
+registerIconSetFromStrings('icon-test-alternate', {
+    foo: '<svg><title>Alternate Foo</title></svg>',
+});
+
+registerIconSetFromStrings('icon-test-ignored', {
+    foo: '<svg><title>Ignored Foo</title></svg>',
+});
+
+test('it can resolve the icon set from the name', async () => {
+    const wrapper = mount(Icon, {
+        props: {
+            name: 'icon-test-alternate::foo',
+        },
+    });
+
+    await flushPromises();
+
+    expect(wrapper.find('title').text()).toBe('Alternate Foo');
+});
+
+test('the icon set from the name takes precedence over the set prop', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+
+    const wrapper = mount(Icon, {
+        props: {
+            name: 'icon-test-alternate::foo',
+            set: 'icon-test-ignored',
+        },
+    });
+
+    await flushPromises();
+
+    expect(wrapper.find('title').text()).toBe('Alternate Foo');
+    expect(warn).toHaveBeenCalledWith('Icon name [icon-test-alternate::foo] includes set [icon-test-alternate], ignoring set prop [icon-test-ignored]');
+
+    warn.mockRestore();
+});
diff --git a/resources/js/tests/components/NumberFormatter.test.js b/resources/js/tests/components/NumberFormatter.test.js
new file mode 100644
index 00000000000..e746a0f9845
--- /dev/null
+++ b/resources/js/tests/components/NumberFormatter.test.js
@@ -0,0 +1,252 @@
+import { beforeEach, describe, expect, test } from 'vitest';
+import NumberFormatter from '@/components/NumberFormatter.js';
+
+beforeEach(() => {
+    NumberFormatter.defaultLocale = 'en-us';
+});
+
+test('it can cast to string', () => {
+    const formatter = new NumberFormatter();
+    expect(`${formatter}`).toBe('0');
+});
+
+test('it can set up options before hand', () => {
+    const formatted = new NumberFormatter()
+        .options({
+            minimumFractionDigits: 2,
+            maximumFractionDigits: 2,
+        })
+        .toString();
+
+    expect(formatted).toBe('0.00');
+});
+
+test('it can pass the number separately', () => {
+    const formatter = new NumberFormatter().number(99.5);
+    expect(formatter.toString()).toBe('99.5');
+});
+
+test('it can statically format', () => {
+    expect(NumberFormatter.format(0.25, 'percent')).toBe('25%');
+    expect(NumberFormatter.format(1234.5, { minimumFractionDigits: 2 })).toBe('1,234.50');
+});
+
+test('it can temporarily format with locale using callback', () => {
+    const formatter = new NumberFormatter();
+    NumberFormatter.defaultLocale = 'en-us';
+
+    const result = formatter.withLocale('de', (instance) => instance.format(1234.567, 'decimal'));
+
+    expect(result).toBe('1.234,567');
+    expect(NumberFormatter.defaultLocale).toBe('en-us');
+});
+
+test('it resets locale after withLocale callback throws', () => {
+    const formatter = new NumberFormatter();
+    NumberFormatter.defaultLocale = 'en-us';
+
+    expect(() => formatter.withLocale('de', () => {
+        throw new Error('boom');
+    })).toThrow('boom');
+
+    expect(NumberFormatter.defaultLocale).toBe('en-us');
+});
+
+test('it can format on the instance', () => {
+    expect(new NumberFormatter().format(1234.5)).toBe('1,234.5');
+    expect(new NumberFormatter().format(1234.5, { maximumFractionDigits: 0 })).toBe('1,235');
+});
+
+describe('numbers can be provided in various ways', () => {
+    const n = 1234.5;
+    const expectedFormat = '1,234.5';
+    const expectedZero = '0';
+
+    test.each([
+        {
+            name: 'constructor with number literal',
+            value: () => new NumberFormatter(n),
+            expected: expectedFormat,
+        },
+        {
+            name: 'constructor with numeric string',
+            value: () => new NumberFormatter('1234.5'),
+            expected: expectedFormat,
+        },
+        {
+            name: 'constructor with null',
+            value: () => new NumberFormatter(null),
+            expected: expectedZero,
+        },
+        {
+            name: 'constructor with undefined',
+            value: () => new NumberFormatter(undefined),
+            expected: expectedZero,
+        },
+        {
+            name: 'number with number literal',
+            value: () => new NumberFormatter().number(n),
+            expected: expectedFormat,
+        },
+        {
+            name: 'number with numeric string',
+            value: () => new NumberFormatter().number('1234.5'),
+            expected: expectedFormat,
+        },
+        {
+            name: 'number with null',
+            value: () => new NumberFormatter().number(null),
+            expected: expectedZero,
+        },
+        {
+            name: 'format with number literal',
+            value: () => new NumberFormatter().format(n),
+            expected: expectedFormat,
+        },
+        {
+            name: 'format with numeric string',
+            value: () => new NumberFormatter().format('1234.5'),
+            expected: expectedFormat,
+        },
+        {
+            name: 'format with null',
+            value: () => new NumberFormatter().format(null),
+            expected: expectedZero,
+        },
+        {
+            name: 'static format with number literal',
+            value: () => NumberFormatter.format(n),
+            expected: expectedFormat,
+        },
+        {
+            name: 'static format with numeric string',
+            value: () => NumberFormatter.format('1234.5'),
+            expected: expectedFormat,
+        },
+        {
+            name: 'static format with null',
+            value: () => NumberFormatter.format(null),
+            expected: expectedZero,
+        },
+    ])('by $name', ({ value, expected }) => {
+        value = value();
+        expect(`${value}`).toBe(expected);
+    });
+});
+
+test.each([
+    ['constructor with NaN', () => new NumberFormatter(NaN)],
+    ['constructor with invalid string', () => new NumberFormatter('foo')],
+    ['number() with NaN', () => new NumberFormatter().number(NaN)],
+    ['number() with invalid string', () => new NumberFormatter().number('foo')],
+    ['format() with NaN', () => new NumberFormatter().format(NaN)],
+    ['format() with invalid string', () => new NumberFormatter().format('foo')],
+    ['static format with NaN', () => NumberFormatter.format(NaN)],
+    ['static format with invalid string', () => NumberFormatter.format('foo')],
+])('it throws for invalid number: %s', (label, fn) => {
+    expect(fn).toThrow('Invalid Number');
+});
+
+test('it can get the locale', () => {
+    expect(new NumberFormatter().locale).toBe('en-us');
+    NumberFormatter.defaultLocale = 'fr';
+    expect(new NumberFormatter().locale).toBe('fr');
+});
+
+test('it can set the default locale via setDefaultLocale', () => {
+    new NumberFormatter().setDefaultLocale('de');
+    expect(NumberFormatter.defaultLocale).toBe('de');
+    expect(new NumberFormatter().locale).toBe('de');
+});
+
+test.each([
+    ['en', 'decimal', 1234.567, '1,234.567'],
+    ['en', 'percent', 0.2534, '25%'],
+    ['de', 'decimal', 1234.567, '1.234,567'],
+    ['de', 'percent', 0.2534, '25\u00a0%'],
+])('it has format presets (%s %s)', (locale, preset, number, expected) => {
+    NumberFormatter.defaultLocale = locale;
+    expect(new NumberFormatter(number, preset).toString()).toBe(expected);
+});
+
+test('an invalid preset throws an error', () => {
+    expect(() => new NumberFormatter().options('foo')).toThrow('Invalid number format: foo');
+});
+
+describe('formatRange', () => {
+    test('it can format a range with default options', () => {
+        expect(new NumberFormatter().formatRange(1000, 5000)).toBe('1,000–5,000');
+    });
+
+    test('it can format a range with a preset', () => {
+        expect(new NumberFormatter().formatRange(0.1, 0.85, 'percent')).toBe('10% – 85%');
+    });
+
+    test('it can format a range with custom options', () => {
+        expect(new NumberFormatter().formatRange(100, 999.99, { style: 'currency', currency: 'USD' })).toBe('$100.00 – $999.99');
+    });
+
+    test('it uses the instance options when none are provided', () => {
+        expect(new NumberFormatter(0, 'percent').formatRange(0.1, 0.5)).toBe('10% – 50%');
+    });
+
+    test('it can format a range with a different locale', () => {
+        NumberFormatter.defaultLocale = 'de';
+        expect(new NumberFormatter().formatRange(1000, 5000)).toBe('1.000–5.000');
+    });
+
+    test('it can statically format a range', () => {
+        expect(NumberFormatter.formatRange(1000, 5000)).toBe('1,000–5,000');
+        expect(NumberFormatter.formatRange(0.1, 0.85, 'percent')).toBe('10% – 85%');
+    });
+
+    test('it normalizes string inputs', () => {
+        expect(new NumberFormatter().formatRange('1000', '5000')).toBe('1,000–5,000');
+    });
+
+    test('it formats a single number when the range endpoints are equal', () => {
+        expect(new NumberFormatter().formatRange(1, 1)).toBe('1');
+        expect(new NumberFormatter().formatRange('5', 5)).toBe('5');
+        expect(new NumberFormatter().formatRange(0.5, 0.5, 'percent')).toBe('50%');
+    });
+
+    test('it keeps the approximation when endpoints differ but format identically', () => {
+        expect(new NumberFormatter().formatRange(1, 1.3, { maximumFractionDigits: 0 })).toBe('~1');
+        expect(new NumberFormatter().formatRange(1.231, 1.234, { maximumFractionDigits: 2 })).toBe('~1.23');
+    });
+});
+
+describe('range via array syntax', () => {
+    test('it formats a range when an array is provided to the constructor', () => {
+        expect(new NumberFormatter([1, 2]).toString()).toBe('1–2');
+    });
+
+    test('it formats a range when an array is provided to number()', () => {
+        expect(new NumberFormatter().number([1, 2]).toString()).toBe('1–2');
+    });
+
+    test('it can use a preset while formatting a range', () => {
+        expect(new NumberFormatter([0.1, 0.2], 'percent').toString()).toBe('10% – 20%');
+    });
+
+    test('it preserves range when options() is chained', () => {
+        expect(new NumberFormatter([1234.5, 1234.9]).options({ minimumFractionDigits: 2, maximumFractionDigits: 2 }).toString()).toBe('1,234.50–1,234.90');
+    });
+
+    test('it resets locale after withLocale callback throws', () => {
+        const formatter = new NumberFormatter();
+        NumberFormatter.defaultLocale = 'en-us';
+
+        expect(() => formatter.withLocale('de', (instance) => {
+            expect(instance.number([1234.567, 1234.9]).toString()).toBe('1.234,567–1.234,9');
+            throw new Error('boom');
+        })).toThrow('boom');
+
+        expect(NumberFormatter.defaultLocale).toBe('en-us');
+    });
+
+    test('it throws for NaN range endpoints', () => {
+        expect(() => new NumberFormatter([NaN, 2])).toThrow('Invalid Number');
+        expect(() => new NumberFormatter([1, 'foo'])).toThrow('Invalid Number');
+    });
+});
diff --git a/resources/js/tests/components/field-validation/Builder.test.js b/resources/js/tests/components/field-validation/Builder.test.js
new file mode 100644
index 00000000000..560532b9ad5
--- /dev/null
+++ b/resources/js/tests/components/field-validation/Builder.test.js
@@ -0,0 +1,50 @@
+import { mount } from '@vue/test-utils';
+import { expect, test, vi } from 'vitest';
+import Builder from '@/components/field-validation/Builder.vue';
+
+vi.mock('@inertiajs/vue3', () => ({
+    usePage: () => ({ props: { extensionRules: [] } }),
+}));
+
+globalThis.__ = (key) => key;
+globalThis.__n = (key) => key;
+globalThis.clone = (value) => structuredClone(value);
+
+const mountBuilder = () =>
+    mount(Builder, {
+        props: { config: {} },
+        global: {
+            mocks: {
+                $config: { get: () => '12.0.0' },
+            },
+            stubs: {
+                SortableList: true,
+            },
+        },
+    });
+
+test('a typed rule parameter is committed when the input loses focus', async () => {
+    const wrapper = mountBuilder();
+
+    // Picking a parameterized rule swaps the combobox for a plain input holding "after:"
+    wrapper.vm.add('after:');
+    await wrapper.vm.$nextTick();
+
+    const input = wrapper.find('input');
+    await input.setValue('after:{this}.start_time');
+    await input.trigger('focusout');
+
+    expect(wrapper.emitted('updated').at(-1)[0]).toEqual(['after:{this}.start_time']);
+});
+
+test('an unfinished rule is not committed when the input loses focus', async () => {
+    const wrapper = mountBuilder();
+
+    wrapper.vm.add('after:');
+    await wrapper.vm.$nextTick();
+
+    const emitsBefore = wrapper.emitted('updated')?.length ?? 0;
+    await wrapper.find('input').trigger('focusout');
+
+    expect(wrapper.emitted('updated')?.length ?? 0).toBe(emitsBefore);
+});
diff --git a/resources/js/tests/components/fieldtypes/AssetsFieldtype.test.js b/resources/js/tests/components/fieldtypes/AssetsFieldtype.test.js
new file mode 100644
index 00000000000..f883a403641
--- /dev/null
+++ b/resources/js/tests/components/fieldtypes/AssetsFieldtype.test.js
@@ -0,0 +1,52 @@
+import { mount } from '@vue/test-utils';
+import { expect, test, vi } from 'vitest';
+import * as Globals from '@/bootstrap/globals';
+import { preferences } from '@api';
+import AssetsFieldtype from '@/components/fieldtypes/assets/AssetsFieldtype.vue';
+
+// Register the global helper functions (data_get, clone, etc.) onto the window
+// like the control panel bootstrap does, so the component can use them.
+Object.keys(Globals).forEach((fn) => (window[fn] = Globals[fn]));
+window.cp_url = (url) => url;
+window.__ = (key) => key;
+preferences.initialize({}, {});
+
+const makeField = ({ axiosPost = vi.fn(() => Promise.resolve({ data: [] })), props = {} } = {}) => {
+    return mount(AssetsFieldtype, {
+        shallow: true,
+        props: {
+            handle: 'image',
+            value: [],
+            config: {},
+            meta: {
+                container: { id: 'main', can_view: true, can_upload: true },
+                data: [],
+            },
+            ...props,
+        },
+        global: {
+            mocks: {
+                $axios: { post: axiosPost },
+                $progress: { loading: () => {} },
+            },
+        },
+    });
+};
+
+test('selecting the existing file references it by the container id', () => {
+    const post = vi.fn(() => Promise.resolve({ data: [] }));
+    const field = makeField({ axiosPost: post });
+
+    field.vm.uploadSelected({ basename: 'user.png' });
+
+    expect(post).toHaveBeenCalledWith('assets-fieldtype', { assets: ['main::user.png'] });
+});
+
+test('the existing file id includes the configured folder', () => {
+    const post = vi.fn(() => Promise.resolve({ data: [] }));
+    const field = makeField({ axiosPost: post, props: { config: { folder: 'sub' } } });
+
+    field.vm.uploadSelected({ basename: 'user.png' });
+
+    expect(post).toHaveBeenCalledWith('assets-fieldtype', { assets: ['main::sub/user.png'] });
+});
diff --git a/resources/js/tests/components/fieldtypes/DateFieldtype.test.js b/resources/js/tests/components/fieldtypes/DateFieldtype.test.js
index d4f8e41a4ee..b21e75972f0 100644
--- a/resources/js/tests/components/fieldtypes/DateFieldtype.test.js
+++ b/resources/js/tests/components/fieldtypes/DateFieldtype.test.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import { test, expect } from 'vitest';
+import { test, expect, vi, afterEach } from 'vitest';
 import DateFieldtype from '@/components/fieldtypes/DateFieldtype.vue';
 import DateFormatter from '@/components/DateFormatter.js';
 import { containerContextKey } from '@ui/Publish/Container.vue';
@@ -82,3 +82,198 @@ test('datePickerValue returns null when value is "now"', () => {
 
     expect(dateField.vm.datePickerValue).toBe(null);
 });
+
+test('configured timezone overrides browser timezone', () => {
+    process.env.TZ = 'America/New_York';
+
+    const dateField = makeDateField({
+        value: '2025-12-25T02:23:00Z',
+        meta: { timezone: 'Europe/London' },
+    });
+
+    expect(dateField.vm.datePickerValue.toString()).toBe('2025-12-25T02:23:00+00:00[Europe/London]');
+});
+
+test('displayTimezone falls back to browser local when timezone is auto', () => {
+    process.env.TZ = 'America/New_York';
+
+    const dateField = makeDateField({
+        value: '2025-12-25T02:23:00Z',
+        meta: { timezone: 'auto' },
+    });
+
+    expect(dateField.vm.displayTimezone).toBe('America/New_York');
+});
+
+test('range dates use configured timezone', () => {
+    process.env.TZ = 'America/New_York';
+
+    const dateField = makeDateField({
+        value: { start: '2025-12-25T02:23:00Z', end: '2025-12-26T02:23:00Z' },
+        meta: { timezone: 'Europe/London' },
+        config: {
+            mode: 'range',
+            earliest_date: { date: null, time: null },
+            latest_date: { date: null, time: null },
+        },
+    });
+
+    const value = dateField.vm.datePickerValue;
+    expect(value.start.toString()).toBe('2025-12-25T02:23:00+00:00[Europe/London]');
+    expect(value.end.toString()).toBe('2025-12-26T02:23:00+00:00[Europe/London]');
+});
+
+test('range dates with time are saved in the configured timezone', async () => {
+    process.env.TZ = 'America/New_York';
+
+    const { CalendarDateTime } = await import('@internationalized/date');
+
+    const dateField = makeDateField({
+        meta: { timezone: 'America/New_York' },
+        config: {
+            mode: 'range',
+            time_enabled: true,
+            earliest_date: { date: null, time: null },
+            latest_date: { date: null, time: null },
+        },
+    });
+
+    dateField.vm.datePickerUpdated({
+        start: new CalendarDateTime(2012, 8, 29, 5, 0, 0),
+        end: new CalendarDateTime(2013, 9, 27, 23, 59, 0),
+    });
+
+    // 05:00 in New York (EDT, -04:00) is 09:00 UTC; 23:59 becomes 03:59 the next day.
+    expect(dateField.emitted('update:value')[0][0]).toEqual({
+        start: '2012-08-29T09:00:00.000Z',
+        end: '2013-09-28T03:59:00.000Z',
+    });
+});
+
+test.each([
+    ['UTC'],
+    ['America/New_York'],
+    ['Australia/Sydney'],
+])('date-only format is not affected by timezone (%s)', async (tz) => {
+    process.env.TZ = tz;
+
+    const dateField = makeDateField({
+        value: '2025-12-25',
+        meta: { formatHasTime: false },
+    });
+
+    const value = dateField.vm.datePickerValue;
+    expect(value.year).toBe(2025);
+    expect(value.month).toBe(12);
+    expect(value.day).toBe(25);
+    expect(value.timeZone).toBeUndefined();
+});
+
+test('date-only format formats date correctly', async () => {
+    process.env.TZ = 'America/New_York';
+
+    const dateField = makeDateField({
+        value: '2025-12-25',
+        meta: { formatHasTime: false },
+    });
+
+    const { CalendarDate } = await import('@internationalized/date');
+    const formatted = dateField.vm.formatDateOnly(new CalendarDate(2025, 6, 5));
+
+    expect(formatted).toBe('2025-06-05');
+});
+
+test.each([
+    [{ start: { year: 2025, month: 12, day: 25 }, end: undefined }],
+    [{ start: undefined, end: { year: 2025, month: 12, day: 31 } }],
+])('partial range update is ignored', async (value) => {
+    const dateField = makeDateField({
+        meta: { formatHasTime: false },
+        config: {
+            mode: 'range',
+            earliest_date: { date: null, time: null },
+            latest_date: { date: null, time: null },
+        },
+    });
+
+    expect(() => dateField.vm.datePickerUpdated(value)).not.toThrow();
+    expect(dateField.emitted('update:value')).toBeUndefined();
+});
+
+afterEach(() => vi.useRealTimers());
+
+test('addDate uses displayTimezone for date-only format', () => {
+    // 11pm Dec 24 in NY is already Dec 25 in London.
+    process.env.TZ = 'America/New_York';
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2025-12-25T04:00:00Z'));
+
+    const dateField = makeDateField({
+        meta: { formatHasTime: false, timezone: 'Europe/London' },
+    });
+
+    dateField.vm.addDate();
+
+    expect(dateField.emitted('update:value')[0][0]).toBe('2025-12-25');
+});
+
+test('addDate uses midnight in displayTimezone when time is disabled', () => {
+    // Without the displayTimezone anchor we'd get NY-midnight as UTC (Dec 24 05:00Z).
+    process.env.TZ = 'America/New_York';
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2025-12-25T04:00:00Z'));
+
+    const dateField = makeDateField({
+        meta: { formatHasTime: true, timezone: 'Europe/London' },
+        config: {
+            time_enabled: false,
+            earliest_date: { date: null, time: null },
+            latest_date: { date: null, time: null },
+        },
+    });
+
+    dateField.vm.addDate();
+
+    expect(dateField.emitted('update:value')[0][0]).toBe('2025-12-25T00:00:00.000Z');
+});
+
+test('addDate preserves the current instant when time is enabled', () => {
+    process.env.TZ = 'America/New_York';
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2025-12-25T02:23:45.678Z'));
+
+    const dateField = makeDateField({
+        meta: { formatHasTime: true, timezone: 'Europe/London' },
+        config: {
+            time_enabled: true,
+            earliest_date: { date: null, time: null },
+            latest_date: { date: null, time: null },
+        },
+    });
+
+    dateField.vm.addDate();
+
+    expect(dateField.emitted('update:value')[0][0]).toBe('2025-12-25T02:23:45.000Z');
+});
+
+test('date-only range format is not affected by timezone', async () => {
+    process.env.TZ = 'America/New_York';
+
+    const dateField = makeDateField({
+        value: { start: '2025-12-25', end: '2025-12-31' },
+        meta: { formatHasTime: false },
+        config: {
+            mode: 'range',
+            earliest_date: { date: null, time: null },
+            latest_date: { date: null, time: null },
+        },
+    });
+
+    const value = dateField.vm.datePickerValue;
+    expect(value.start.year).toBe(2025);
+    expect(value.start.month).toBe(12);
+    expect(value.start.day).toBe(25);
+    expect(value.end.year).toBe(2025);
+    expect(value.end.month).toBe(12);
+    expect(value.end.day).toBe(31);
+});
diff --git a/resources/js/tests/components/fieldtypes/DateIndexFieldtype.test.js b/resources/js/tests/components/fieldtypes/DateIndexFieldtype.test.js
index ebe642ec7d7..12818d49fd2 100644
--- a/resources/js/tests/components/fieldtypes/DateIndexFieldtype.test.js
+++ b/resources/js/tests/components/fieldtypes/DateIndexFieldtype.test.js
@@ -30,10 +30,41 @@ test.each([
 ])('date is localized to the users timezone (%s)', async (tz, expected) => {
     process.env.TZ = tz;
 
+    const dateIndexField = makeDateIndexField({
+        date: '2025-12-25T02:13:00Z',
+        mode: 'single',
+        format_has_time: true,
+    });
+
+    expect(dateIndexField.vm.formatted).toBe(expected);
+});
+
+test.each([
+    ['UTC', '12/25/2025'],
+    ['America/New_York', '12/25/2025'],
+])('date-only value does not shift across timezones (%s)', async (tz, expected) => {
+    process.env.TZ = tz;
+
     const dateIndexField = makeDateIndexField({
         date: '2025-12-25',
-        time: '02:13',
         mode: 'single',
+        format_has_time: false,
+    });
+
+    expect(dateIndexField.vm.formatted).toBe(expected);
+});
+
+test.each([
+    ['UTC', '12/25/2025 – 12/28/2025'],
+    ['America/New_York', '12/25/2025 – 12/28/2025'],
+])('date-only range does not shift across timezones (%s)', async (tz, expected) => {
+    process.env.TZ = tz;
+
+    const dateIndexField = makeDateIndexField({
+        start: '2025-12-25',
+        end: '2025-12-28',
+        mode: 'range',
+        format_has_time: false,
     });
 
     expect(dateIndexField.vm.formatted).toBe(expected);
@@ -49,6 +80,7 @@ test.each([
         date: '2025-12-25T02:13:00Z',
         mode: 'single',
         time_enabled: true,
+        format_has_time: true,
     });
 
     expect(dateIndexField.vm.formatted).toBe(expected);
@@ -64,6 +96,7 @@ test.each([
         start: '2025-12-25T02:13:00Z',
         end: '2025-12-28T03:59:00Z',
         mode: 'range',
+        format_has_time: true,
     });
 
     expect(dateIndexField.vm.formatted).toBe(expected);
@@ -76,7 +109,7 @@ test.each([
 ])('date is formatted to the users browser language (%s)', async (lang, expected) => {
     DateFormatter.defaultLocale = lang;
 
-    const dateIndexField = makeDateIndexField({ date: '2025-12-25T13:29:00Z' });
+    const dateIndexField = makeDateIndexField({ date: '2025-12-25T13:29:00Z', format_has_time: true });
 
     expect(dateIndexField.vm.formatted).toBe(expected);
 });
@@ -88,7 +121,11 @@ test.each([
 ])('date and time is formatted to the users browser language (%s)', async (lang, expected) => {
     DateFormatter.defaultLocale = lang;
 
-    const dateIndexField = makeDateIndexField({ date: '2025-12-25T13:29:00Z', time_enabled: true });
+    const dateIndexField = makeDateIndexField({
+        date: '2025-12-25T13:29:00Z',
+        time_enabled: true,
+        format_has_time: true,
+    });
 
     expect(dateIndexField.vm.formatted).toBe(expected);
 });
@@ -104,7 +141,44 @@ test.each([
         start: '2025-12-25T02:13:00Z',
         end: '2025-12-28T03:59:00Z',
         mode: 'range',
+        format_has_time: true,
     });
 
     expect(dateIndexField.vm.formatted).toBe(expected);
 });
+
+test('date-only format omits time and hides the timezone hover card', async () => {
+    const dateIndexField = makeDateIndexField({
+        date: '2025-12-25',
+        mode: 'single',
+        time_enabled: false,
+        format_has_time: false,
+    });
+
+    expect(dateIndexField.vm.formatted).toBe('12/25/2025');
+    expect(dateIndexField.vm.showTimezoneCard).toBe(false);
+});
+
+test('time-disabled but time-aware format shows date in value and exposes the timezone hover card', async () => {
+    const dateIndexField = makeDateIndexField({
+        date: '2025-12-25T02:13:00Z',
+        mode: 'single',
+        time_enabled: false,
+        format_has_time: true,
+    });
+
+    expect(dateIndexField.vm.formatted).toBe('12/25/2025');
+    expect(dateIndexField.vm.showTimezoneCard).toBe(true);
+});
+
+test('time-enabled value shows time in value and exposes the timezone hover card', async () => {
+    const dateIndexField = makeDateIndexField({
+        date: '2025-12-25T02:13:00Z',
+        mode: 'single',
+        time_enabled: true,
+        format_has_time: true,
+    });
+
+    expect(dateIndexField.vm.formatted).toBe('12/25/2025, 2:13 AM');
+    expect(dateIndexField.vm.showTimezoneCard).toBe(true);
+});
diff --git a/resources/js/tests/components/fieldtypes/DictionaryFieldtype.test.js b/resources/js/tests/components/fieldtypes/DictionaryFieldtype.test.js
new file mode 100644
index 00000000000..a303c9bbaac
--- /dev/null
+++ b/resources/js/tests/components/fieldtypes/DictionaryFieldtype.test.js
@@ -0,0 +1,71 @@
+import { mount, flushPromises } from '@vue/test-utils';
+import { describe, expect, test, vi } from 'vitest';
+
+window.__ = (key) => key;
+window.__n = (key) => key;
+window.utf8btoa = (string) => btoa(string);
+
+import DictionaryFieldtype from '@/components/fieldtypes/DictionaryFieldtype.vue';
+
+function mountFieldtype({ value, maxItems, selectedOptions, fetchedOptions, shallow = false }) {
+    return mount(DictionaryFieldtype, {
+        shallow,
+        props: {
+            handle: 'country',
+            value,
+            config: { max_items: maxItems },
+            meta: { url: '/!/fieldtypes/dictionaries/partial_countries', selectedOptions },
+        },
+        global: {
+            mocks: {
+                $axios: { get: vi.fn(() => Promise.resolve({ data: { data: fetchedOptions } })) },
+            },
+        },
+    });
+}
+
+describe('DictionaryFieldtype options', () => {
+    // API-backed dictionaries only return a page of options, which may not include the stored value.
+    // The preloaded selected options must be merged into the options passed to the Combobox so it can
+    // resolve their labels — otherwise a single-select field displays the raw id instead.
+    // https://github.com/statamic/cms/issues/14835
+    test('single-select renders the label of a stored value missing from the fetched options', async () => {
+        const fieldtype = mountFieldtype({
+            value: 'de',
+            maxItems: 1,
+            selectedOptions: [{ value: 'de', label: 'Germany', invalid: false }],
+            fetchedOptions: [],
+        });
+        await flushPromises();
+
+        const selected = fieldtype.find('[data-ui-combobox-selected-option]');
+        expect(selected.text()).toContain('Germany');
+        expect(selected.text()).not.toContain('de');
+    });
+
+    test('selected options already present in the fetched options are not duplicated', async () => {
+        const fieldtype = mountFieldtype({
+            value: 'de',
+            maxItems: 1,
+            selectedOptions: [{ value: 'de', label: 'Germany', invalid: false }],
+            fetchedOptions: [{ value: 'de', label: 'Germany' }],
+            shallow: true,
+        });
+        await flushPromises();
+
+        expect(fieldtype.vm.normalizedOptions).toEqual([{ value: 'de', label: 'Germany' }]);
+    });
+
+    test('multi-select options are not polluted with selected options', async () => {
+        const fieldtype = mountFieldtype({
+            value: ['de'],
+            maxItems: null,
+            selectedOptions: [{ value: 'de', label: 'Germany', invalid: false }],
+            fetchedOptions: [{ value: 'ca', label: 'Canada' }],
+            shallow: true,
+        });
+        await flushPromises();
+
+        expect(fieldtype.vm.normalizedOptions).toEqual([{ value: 'ca', label: 'Canada' }]);
+    });
+});
diff --git a/resources/js/tests/components/fieldtypes/LinkFieldtype.test.js b/resources/js/tests/components/fieldtypes/LinkFieldtype.test.js
new file mode 100644
index 00000000000..4cf04a0c65b
--- /dev/null
+++ b/resources/js/tests/components/fieldtypes/LinkFieldtype.test.js
@@ -0,0 +1,215 @@
+import { mount } from '@vue/test-utils';
+import { expect, test, vi } from 'vitest';
+import * as Globals from '@/bootstrap/globals';
+import LinkFieldtype from '@/components/fieldtypes/LinkFieldtype.vue';
+
+Object.keys(Globals).forEach((fn) => (window[fn] = Globals[fn]));
+window.__ = (key) => key;
+
+function mountField({ value = null, config = {}, meta = {}, showFieldPreviews = false } = {}) {
+    return mount(LinkFieldtype, {
+        shallow: true,
+        props: {
+            value,
+            handle: 'link',
+            config,
+            meta: {
+                initialOption: null,
+                initialUrl: '',
+                showFirstChildOption: false,
+                types: {},
+                ...meta,
+            },
+            showFieldPreviews,
+        },
+    });
+}
+
+test('builds dropdown options from the url, first child, and registered types', () => {
+    const wrapper = mountField({
+        meta: {
+            showFirstChildOption: true,
+            types: {
+                entry: { title: 'Entries', component: 'relationship', config: {}, meta: {}, selected: [] },
+                asset: { title: 'Assets', component: 'assets', config: {}, meta: {}, selected: [] },
+            },
+        },
+    });
+
+    expect(wrapper.vm.options).toEqual([
+        { label: 'None', value: null },
+        { label: 'URL', value: 'url' },
+        { label: 'First Child', value: 'first-child' },
+        { label: 'Entries', value: 'entry' },
+        { label: 'Assets', value: 'asset' },
+    ]);
+});
+
+test('omits the none option when the field is required', () => {
+    const wrapper = mountField({ config: { required: true } });
+
+    expect(wrapper.vm.options.some((option) => option.value === null)).toBe(false);
+});
+
+test('omits the first child option unless enabled in meta', () => {
+    const wrapper = mountField({ meta: { showFirstChildOption: false } });
+
+    expect(wrapper.vm.options.some((option) => option.value === 'first-child')).toBe(false);
+});
+
+test('selecting the first child option sets the value to @child', async () => {
+    const wrapper = mountField();
+
+    wrapper.vm.option = 'first-child';
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.emitted('update:value')[0]).toEqual(['@child']);
+});
+
+test('selecting the url option emits the current url value after debouncing', async () => {
+    vi.useFakeTimers();
+
+    const wrapper = mountField({ meta: { initialUrl: 'https://example.com' } });
+
+    wrapper.vm.option = 'url';
+    await wrapper.vm.$nextTick();
+    vi.advanceTimersByTime(200);
+
+    expect(wrapper.emitted('update:value')[0]).toEqual(['https://example.com']);
+
+    vi.useRealTimers();
+});
+
+test('selecting a type with an existing selection emits the type reference immediately', async () => {
+    const wrapper = mountField({
+        meta: {
+            types: {
+                entry: { title: 'Entries', component: 'relationship', config: {}, meta: {}, selected: ['4'] },
+            },
+        },
+    });
+
+    wrapper.vm.option = 'entry';
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.emitted('update:value')[0]).toEqual(['entry::4']);
+});
+
+test('selecting a type with no existing selection does not emit a value', async () => {
+    // Instead it defers to opening the type selector (openTypeSelector), which relies on
+    // a real child fieldtype ref and isn't exercised here since children are stubbed.
+    const wrapper = mountField({
+        meta: {
+            types: {
+                entry: { title: 'Entries', component: 'relationship', config: {}, meta: {}, selected: [] },
+            },
+        },
+    });
+
+    wrapper.vm.option = 'entry';
+    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.emitted('update:value')).toBeUndefined();
+});
+
+test('typeSelected stores the selection and emits the type reference', () => {
+    const wrapper = mountField({
+        meta: {
+            initialOption: 'entry',
+            types: {
+                entry: { title: 'Entries', component: 'relationship', config: {}, meta: {}, selected: ['1'] },
+            },
+        },
+    });
+
+    wrapper.vm.typeSelected(['42']);
+
+    expect(wrapper.emitted('update:value').at(-1)).toEqual(['entry::42']);
+    expect(wrapper.emitted('update:meta').at(-1)[0].types.entry.selected).toEqual(['42']);
+});
+
+test('initial selected values are indexed by type', () => {
+    const wrapper = mountField({
+        meta: {
+            types: {
+                entry: { title: 'Entries', component: 'relationship', config: {}, meta: {}, selected: ['4'] },
+                asset: { title: 'Assets', component: 'assets', config: {}, meta: {}, selected: [] },
+            },
+        },
+    });
+
+    expect(wrapper.vm.selectedByType).toEqual({ entry: ['4'], asset: [] });
+});
+
+test('replicatorPreview reflects the url option', () => {
+    const wrapper = mountField({
+        showFieldPreviews: true,
+        meta: { initialOption: 'url', initialUrl: 'https://example.com' },
+    });
+
+    expect(wrapper.vm.replicatorPreview).toBe('https://example.com');
+});
+
+test('replicatorPreview reflects the first child option', () => {
+    const wrapper = mountField({
+        showFieldPreviews: true,
+        meta: { initialOption: 'first-child' },
+    });
+
+    expect(wrapper.vm.replicatorPreview).toBe('First Child');
+});
+
+test('replicatorPreview prefers the selected item title for a registered type', () => {
+    const wrapper = mountField({
+        showFieldPreviews: true,
+        meta: {
+            initialOption: 'entry',
+            types: {
+                entry: {
+                    title: 'Entries',
+                    component: 'relationship',
+                    config: {},
+                    meta: { data: [{ title: 'About Us' }] },
+                    selected: ['4'],
+                },
+            },
+        },
+    });
+
+    expect(wrapper.vm.replicatorPreview).toBe('About Us');
+});
+
+test('replicatorPreview falls back to the basename when there is no title', () => {
+    const wrapper = mountField({
+        showFieldPreviews: true,
+        meta: {
+            initialOption: 'asset',
+            types: {
+                asset: {
+                    title: 'Assets',
+                    component: 'assets',
+                    config: {},
+                    meta: { data: [{ basename: 'photo.jpg' }] },
+                    selected: ['4'],
+                },
+            },
+        },
+    });
+
+    expect(wrapper.vm.replicatorPreview).toBe('photo.jpg');
+});
+
+test('replicatorPreview falls back to the type reference when there is no item data', () => {
+    const wrapper = mountField({
+        showFieldPreviews: true,
+        meta: {
+            initialOption: 'entry',
+            types: {
+                entry: { title: 'Entries', component: 'relationship', config: {}, meta: {}, selected: ['4'] },
+            },
+        },
+    });
+
+    expect(wrapper.vm.replicatorPreview).toBe('entry::4');
+});
diff --git a/resources/js/tests/components/fieldtypes/MarkdownFieldtype.test.js b/resources/js/tests/components/fieldtypes/MarkdownFieldtype.test.js
new file mode 100644
index 00000000000..ffb0f6a3d2b
--- /dev/null
+++ b/resources/js/tests/components/fieldtypes/MarkdownFieldtype.test.js
@@ -0,0 +1,61 @@
+import { mount } from '@vue/test-utils';
+import { expect, test } from 'vitest';
+import { computed, ref } from 'vue';
+import * as Globals from '@/bootstrap/globals';
+import MarkdownFieldtype from '@/components/fieldtypes/markdown/MarkdownFieldtype.vue';
+import { containerContextKey } from '@/components/ui/Publish/Container.vue';
+
+Object.keys(Globals).forEach((fn) => (window[fn] = Globals[fn]));
+window.cp_url = (url) => url;
+window.__ = (key) => key;
+
+function mountField(direction) {
+    return mount(MarkdownFieldtype, {
+        props: {
+            value: 'hello world',
+            handle: 'markdown',
+            config: { buttons: [] },
+        },
+        global: {
+            stubs: {
+                'publish-field-fullscreen-header': true,
+                'ui-icon': true,
+            },
+            mocks: {
+                $events: { $on: () => {}, $off: () => {} },
+            },
+            provide: {
+                [containerContextKey]: { direction },
+            },
+        },
+    });
+}
+
+test('chrome does not get an explicit content direction', async () => {
+    document.documentElement.setAttribute('dir', 'ltr');
+
+    const wrapper = mountField(computed(() => 'rtl'));
+    await wrapper.vm.$nextTick();
+
+    const cheatsheetButton = wrapper.find('[aria-label="Show Markdown Cheatsheet"]');
+    expect(cheatsheetButton.attributes('dir')).toBeUndefined();
+});
+
+// The editor is source/code-adjacent and is intentionally always ltr,
+// regardless of content direction (see PR #10931 and its revert #10992).
+test('the CodeMirror editor stays ltr regardless of content direction', async () => {
+    const wrapper = mountField(ref('rtl'));
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.vm.codemirror.getOption('direction')).toBe('ltr');
+    expect(wrapper.vm.codemirror.getWrapperElement().getAttribute('dir')).toBeNull();
+});
+
+test('the preview pane gets the content direction', async () => {
+    const wrapper = mountField(ref('rtl'));
+    await wrapper.vm.$nextTick();
+
+    // The preview pane is always in the DOM (toggled via v-show), so its
+    // dir attribute can be asserted without switching into preview mode.
+    expect(wrapper.find('.markdown-preview').attributes('dir')).toBe('rtl');
+});
diff --git a/resources/js/tests/components/fieldtypes/TableFieldtype.test.js b/resources/js/tests/components/fieldtypes/TableFieldtype.test.js
new file mode 100644
index 00000000000..db85e9d2a9a
--- /dev/null
+++ b/resources/js/tests/components/fieldtypes/TableFieldtype.test.js
@@ -0,0 +1,37 @@
+import { mount } from '@vue/test-utils';
+import { expect, test } from 'vitest';
+import { computed } from 'vue';
+import * as Globals from '@/bootstrap/globals';
+import TableFieldtype from '@/components/fieldtypes/TableFieldtype.vue';
+import { containerContextKey } from '@/components/ui/Publish/Container.vue';
+import { Input, Button } from '@/components/ui';
+
+Object.keys(Globals).forEach((fn) => (window[fn] = Globals[fn]));
+
+test('value cells get content direction while chrome does not', () => {
+    document.documentElement.setAttribute('dir', 'ltr');
+
+    const wrapper = mount(TableFieldtype, {
+        props: {
+            value: [{ cells: ['hello', 'world'] }],
+            handle: 'table',
+        },
+        components: {
+            'ui-input': Input,
+            'ui-button': Button,
+        },
+        global: {
+            provide: {
+                [containerContextKey]: {
+                    direction: computed(() => 'rtl'),
+                },
+            },
+        },
+    });
+
+    const input = wrapper.find('input');
+    expect(input.attributes('dir')).toBe('rtl');
+
+    const deleteColumnButton = wrapper.find('[aria-label="Delete Column"]');
+    expect(deleteColumnButton.attributes('dir')).toBeUndefined();
+});
diff --git a/resources/js/tests/components/fieldtypes/bard/LinkToolbar.test.js b/resources/js/tests/components/fieldtypes/bard/LinkToolbar.test.js
new file mode 100644
index 00000000000..42d2b872ece
--- /dev/null
+++ b/resources/js/tests/components/fieldtypes/bard/LinkToolbar.test.js
@@ -0,0 +1,124 @@
+import { mount } from '@vue/test-utils';
+import { afterEach, beforeEach, expect, test, vi } from 'vitest';
+import LinkToolbar from '@/components/fieldtypes/bard/LinkToolbar.vue';
+
+window.__ = (key) => key;
+
+// The toolbar's autofocus() schedules a setTimeout that calls this.$refs.urlInput.focus().
+// Under a shallow mount that ref doesn't exist, so use fake timers to keep the leaked
+// timer from firing after the test finishes (which would throw an unhandled error).
+beforeEach(() => vi.useFakeTimers());
+afterEach(() => vi.useRealTimers());
+
+function makeBard({ linkTypes = {}, linkData = {} } = {}) {
+    return {
+        meta: { linkTypes, linkData },
+        editor: {
+            view: { state: { selection: { from: 0, to: 0 } } },
+            state: { doc: { textBetween: () => '' } },
+        },
+        events: { on: vi.fn(), off: vi.fn() },
+        updateMeta: vi.fn(),
+    };
+}
+
+function mountToolbar({ linkTypes = {}, linkAttrs = {}, config = {} } = {}) {
+    const bard = makeBard({ linkTypes });
+
+    const wrapper = mount(LinkToolbar, {
+        shallow: true,
+        props: { bard, config, linkAttrs },
+    });
+
+    return { wrapper, bard };
+}
+
+test('linkTypes orders url first, registered types in the middle, and mailto/tel last', () => {
+    const { wrapper } = mountToolbar({
+        linkTypes: {
+            entry: { title: 'Entry', component: 'relationship', config: {}, meta: {} },
+            custom: { title: 'Custom Type', component: 'custom', config: {}, meta: {} },
+        },
+    });
+
+    expect(wrapper.vm.linkTypes).toEqual([
+        { type: 'url', title: 'URL' },
+        { type: 'entry', title: 'Entry' },
+        { type: 'custom', title: 'Custom Type' },
+        { type: 'mailto', title: 'Email' },
+        { type: 'tel', title: 'Phone' },
+    ]);
+});
+
+test('registeredLinkType is null for the built-in url type', () => {
+    const { wrapper } = mountToolbar();
+
+    expect(wrapper.vm.linkType).toBe('url');
+    expect(wrapper.vm.registeredLinkType).toBeNull();
+});
+
+test('registeredLinkType resolves the matching type from bard meta, and its fieldtype component name', () => {
+    const { wrapper } = mountToolbar({
+        linkTypes: {
+            entry: { title: 'Entry', component: 'relationship', config: { foo: 'bar' }, meta: {} },
+        },
+    });
+
+    wrapper.vm.linkType = 'entry';
+
+    expect(wrapper.vm.registeredLinkType).toEqual({
+        title: 'Entry',
+        component: 'relationship',
+        config: { foo: 'bar' },
+        meta: {},
+    });
+    expect(wrapper.vm.registeredLinkTypeComponent).toBe('relationship-fieldtype');
+});
+
+test('typeSelected sets the url to a statamic:// reference for the current link type', () => {
+    const { wrapper } = mountToolbar({
+        linkTypes: {
+            entry: { title: 'Entry', component: 'relationship', config: {}, meta: {} },
+        },
+    });
+
+    wrapper.vm.linkType = 'entry';
+    wrapper.vm.typeSelected(['42']);
+
+    expect(wrapper.vm.url.entry).toBe('statamic://entry::42');
+    expect(wrapper.vm.canCommit).toBe(true);
+});
+
+test('typeSelected clears the url when nothing is selected', () => {
+    const { wrapper } = mountToolbar({
+        linkTypes: {
+            entry: { title: 'Entry', component: 'relationship', config: {}, meta: {} },
+        },
+    });
+
+    wrapper.vm.linkType = 'entry';
+    wrapper.vm.typeSelected(['42']);
+    wrapper.vm.typeSelected([]);
+
+    expect(wrapper.vm.url.entry).toBeNull();
+});
+
+test.each([
+    ['url', true],
+    ['entry', true],
+    ['custom', true],
+    ['mailto', false],
+    ['tel', false],
+])('canHaveTarget for link type "%s" is %s', async (linkType, expected) => {
+    const { wrapper } = mountToolbar({
+        linkTypes: {
+            entry: { title: 'Entry', component: 'relationship', config: {}, meta: {} },
+            custom: { title: 'Custom', component: 'custom', config: {}, meta: {} },
+        },
+    });
+
+    wrapper.vm.linkType = linkType;
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.vm.canHaveTarget).toBe(expected);
+});
diff --git a/resources/js/tests/components/fieldtypes/bard/Set.test.js b/resources/js/tests/components/fieldtypes/bard/Set.test.js
new file mode 100644
index 00000000000..4ae7d1bbfcb
--- /dev/null
+++ b/resources/js/tests/components/fieldtypes/bard/Set.test.js
@@ -0,0 +1,92 @@
+import { mount } from '@vue/test-utils';
+import { afterEach, expect, test, vi } from 'vitest';
+import * as Globals from '@/bootstrap/globals';
+import Set from '@/components/fieldtypes/bard/Set.vue';
+import { containerContextKey } from '@/components/ui/Publish/Container.vue';
+
+Object.keys(Globals).forEach((fn) => (window[fn] = Globals[fn]));
+window.Statamic = { $fieldActions: { get: () => [] } };
+
+function mountSet() {
+    return mount(Set, {
+        shallow: true,
+        props: {
+            editor: {},
+            node: { attrs: { id: 'set-1', enabled: true, values: { type: 'my_set' } } },
+            decorations: [],
+            selected: false,
+            extension: {
+                options: {
+                    bard: {
+                        meta: { existing: {} },
+                        collapsed: [],
+                        setIndexes: { 'set-1': 0 },
+                        config: { previews: false },
+                        name: 'content',
+                        handle: 'content',
+                        fieldPathPrefix: null,
+                        metaPathPrefix: null,
+                        setHasError: () => false,
+                    },
+                },
+            },
+            getPos: () => 0,
+            updateAttributes: vi.fn(),
+            deleteNode: vi.fn(),
+        },
+        global: {
+            stubs: { NodeViewWrapper: { template: '<div><slot /></div>' } },
+            provide: {
+                bard: { setConfigs: [{ handle: 'my_set', fields: [] }], isReadOnly: false, hasBeenFocused: false },
+                bardSets: [],
+                [containerContextKey]: {
+                    values: { value: {} },
+                    previews: { value: {} },
+                    setFieldValue: vi.fn(),
+                    setFieldMeta: vi.fn(),
+                },
+            },
+        },
+    });
+}
+
+function mockSelection({ containsSet }) {
+    vi.spyOn(window, 'getSelection').mockReturnValue({
+        rangeCount: 1,
+        containsNode: () => containsSet,
+    });
+}
+
+afterEach(() => vi.restoreAllMocks());
+
+test('dragging from inside the set is prevented while the selection covers the whole set', async () => {
+    const wrapper = mountSet();
+    mockSelection({ containsSet: true });
+
+    const event = new Event('dragstart', { bubbles: true, cancelable: true });
+    wrapper.find('header').element.dispatchEvent(event);
+
+    expect(event.defaultPrevented).toBe(true);
+});
+
+test('dragging from inside the set is allowed when the selection does not cover the whole set', async () => {
+    const wrapper = mountSet();
+    mockSelection({ containsSet: false });
+
+    const event = new Event('dragstart', { bubbles: true, cancelable: true });
+    wrapper.find('header').element.dispatchEvent(event);
+
+    expect(event.defaultPrevented).toBe(false);
+});
+
+test('dragging a draggable element inside the set is allowed', async () => {
+    const wrapper = mountSet();
+    mockSelection({ containsSet: true });
+
+    const header = wrapper.find('header').element;
+    header.setAttribute('draggable', 'true');
+    const event = new Event('dragstart', { bubbles: true, cancelable: true });
+    header.dispatchEvent(event);
+
+    expect(event.defaultPrevented).toBe(false);
+});
diff --git a/resources/js/tests/components/inputs/relationship/RelationshipInput.test.js b/resources/js/tests/components/inputs/relationship/RelationshipInput.test.js
new file mode 100644
index 00000000000..069793e9583
--- /dev/null
+++ b/resources/js/tests/components/inputs/relationship/RelationshipInput.test.js
@@ -0,0 +1,279 @@
+import { mount, flushPromises } from '@vue/test-utils';
+import { describe, expect, test, vi } from 'vitest';
+
+vi.mock('@inertiajs/vue3', () => ({
+    router: { on: () => () => {} },
+}));
+
+globalThis.__ = (key) => key;
+
+import RelationshipInput from '@/components/inputs/relationship/RelationshipInput.vue';
+
+const stubs = {
+    RelationshipSelectField: true,
+    ItemSelector: true,
+    CreateButton: true,
+    RelatedItem: true,
+    Button: true,
+    Icon: true,
+    Stack: true,
+};
+
+function deferred() {
+    let resolve, reject;
+    const promise = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    return { promise, resolve, reject };
+}
+
+function signalAwareDeferred() {
+    const d = deferred();
+    return {
+        promise: d.promise,
+        resolve: d.resolve,
+        reject: d.reject,
+        attach(signal) {
+            if (!signal) return;
+            signal.addEventListener('abort', () => {
+                const err = new Error('canceled');
+                err.__CANCEL__ = true;
+                d.reject(err);
+            });
+        },
+    };
+}
+
+function mountInput({ axiosPost, itemDataUrl, site = 'default' }) {
+    return mount(RelationshipInput, {
+        props: {
+            value: [],
+            data: [],
+            config: { type: 'entries' },
+            itemDataUrl,
+            site,
+            selectionsUrl: '/api/selections',
+            filtersUrl: '/api/filters',
+            mode: 'default',
+        },
+        global: {
+            mocks: {
+                $axios: { post: axiosPost },
+                $progress: { loading: () => {} },
+            },
+            stubs,
+        },
+    });
+}
+
+describe('RelationshipInput in-flight request deduplication', () => {
+    test('shares a single request across instances with the same selections', async () => {
+        const d = deferred();
+        const post = vi.fn(() => d.promise);
+
+        const a = mountInput({ axiosPost: post, itemDataUrl: '/test/dedup-same' });
+        const b = mountInput({ axiosPost: post, itemDataUrl: '/test/dedup-same' });
+
+        a.vm.getDataForSelections(['1', '2']);
+        b.vm.getDataForSelections(['1', '2']);
+
+        await flushPromises();
+        expect(post).toHaveBeenCalledTimes(1);
+
+        d.resolve({ data: { data: [{ id: '1' }, { id: '2' }] } });
+        await flushPromises();
+
+        expect(a.emitted('item-data-updated')).toBeTruthy();
+        expect(b.emitted('item-data-updated')).toBeTruthy();
+
+        a.unmount();
+        b.unmount();
+    });
+
+    test('cache key is order-insensitive across instances', async () => {
+        const d = deferred();
+        const post = vi.fn(() => d.promise);
+
+        const a = mountInput({ axiosPost: post, itemDataUrl: '/test/dedup-order' });
+        const b = mountInput({ axiosPost: post, itemDataUrl: '/test/dedup-order' });
+
+        a.vm.getDataForSelections(['1', '2']);
+        b.vm.getDataForSelections(['2', '1']);
+
+        await flushPromises();
+        expect(post).toHaveBeenCalledTimes(1);
+
+        d.resolve({ data: { data: [] } });
+        await flushPromises();
+
+        a.unmount();
+        b.unmount();
+    });
+
+    test('different selections each fire their own request', async () => {
+        const d1 = deferred();
+        const d2 = deferred();
+        const post = vi.fn().mockReturnValueOnce(d1.promise).mockReturnValueOnce(d2.promise);
+
+        const a = mountInput({ axiosPost: post, itemDataUrl: '/test/dedup-different' });
+        const b = mountInput({ axiosPost: post, itemDataUrl: '/test/dedup-different' });
+
+        a.vm.getDataForSelections(['1']);
+        b.vm.getDataForSelections(['2']);
+
+        await flushPromises();
+        expect(post).toHaveBeenCalledTimes(2);
+
+        d1.resolve({ data: { data: [] } });
+        d2.resolve({ data: { data: [] } });
+        await flushPromises();
+
+        a.unmount();
+        b.unmount();
+    });
+
+    test('different sites with the same selections each fire their own request', async () => {
+        const d1 = deferred();
+        const d2 = deferred();
+        const post = vi.fn().mockReturnValueOnce(d1.promise).mockReturnValueOnce(d2.promise);
+
+        const a = mountInput({ axiosPost: post, itemDataUrl: '/test/dedup-sites', site: 'en' });
+        const b = mountInput({ axiosPost: post, itemDataUrl: '/test/dedup-sites', site: 'fr' });
+
+        a.vm.getDataForSelections(['1']);
+        b.vm.getDataForSelections(['1']);
+
+        await flushPromises();
+        expect(post).toHaveBeenCalledTimes(2);
+
+        d1.resolve({ data: { data: [] } });
+        d2.resolve({ data: { data: [] } });
+        await flushPromises();
+
+        a.unmount();
+        b.unmount();
+    });
+
+    test('leader changing selections mid-flight does not abort the shared request for followers', async () => {
+        const d1 = signalAwareDeferred();
+        const d2 = signalAwareDeferred();
+        const post = vi.fn((url, body, config) => {
+            const next = post.mock.calls.length === 1 ? d1 : d2;
+            next.attach(config?.signal);
+            return next.promise;
+        });
+
+        const a = mountInput({ axiosPost: post, itemDataUrl: '/test/leader-changes' });
+        const b = mountInput({ axiosPost: post, itemDataUrl: '/test/leader-changes' });
+
+        a.vm.getDataForSelections(['1']);
+        b.vm.getDataForSelections(['1']);
+        await flushPromises();
+        expect(post).toHaveBeenCalledTimes(1);
+
+        a.vm.getDataForSelections(['2']);
+        await flushPromises();
+        expect(post).toHaveBeenCalledTimes(2);
+
+        d1.resolve({ data: { data: [{ id: '1' }] } });
+        await flushPromises();
+        expect(b.emitted('item-data-updated')).toBeTruthy();
+        expect(b.emitted('item-data-updated')[0]).toEqual([[{ id: '1' }]]);
+
+        d2.resolve({ data: { data: [{ id: '2' }] } });
+        await flushPromises();
+        expect(a.emitted('item-data-updated')).toBeTruthy();
+        expect(a.emitted('item-data-updated').at(-1)).toEqual([[{ id: '2' }]]);
+
+        a.unmount();
+        b.unmount();
+    });
+
+    test('aborts the shared request when the last subscriber detaches', async () => {
+        const d = signalAwareDeferred();
+        const post = vi.fn((url, body, config) => {
+            d.attach(config?.signal);
+            return d.promise;
+        });
+
+        const a = mountInput({ axiosPost: post, itemDataUrl: '/test/abort-last' });
+        const b = mountInput({ axiosPost: post, itemDataUrl: '/test/abort-last' });
+
+        a.vm.getDataForSelections(['1']);
+        b.vm.getDataForSelections(['1']);
+        await flushPromises();
+        expect(post).toHaveBeenCalledTimes(1);
+
+        a.unmount();
+        await flushPromises();
+
+        b.unmount();
+        await flushPromises();
+
+        await expect(d.promise).rejects.toMatchObject({ __CANCEL__: true });
+    });
+
+    test('cache entry clears after settle so a later identical request fires fresh', async () => {
+        const d1 = deferred();
+        const d2 = deferred();
+        const post = vi.fn().mockReturnValueOnce(d1.promise).mockReturnValueOnce(d2.promise);
+
+        const a = mountInput({ axiosPost: post, itemDataUrl: '/test/dedup-cleanup' });
+        a.vm.getDataForSelections(['1']);
+        await flushPromises();
+        expect(post).toHaveBeenCalledTimes(1);
+
+        d1.resolve({ data: { data: [] } });
+        await flushPromises();
+
+        const b = mountInput({ axiosPost: post, itemDataUrl: '/test/dedup-cleanup' });
+        b.vm.getDataForSelections(['1']);
+        await flushPromises();
+        expect(post).toHaveBeenCalledTimes(2);
+
+        d2.resolve({ data: { data: [] } });
+        await flushPromises();
+
+        a.unmount();
+        b.unmount();
+    });
+});
+
+describe('RelationshipInput refetches item data for unresolved values', () => {
+    test('fetches item data when the value prop changes to include an id with no matching data', async () => {
+        const d = deferred();
+        const post = vi.fn(() => d.promise);
+
+        const wrapper = mountInput({ axiosPost: post, itemDataUrl: '/test/stale-value' });
+        await flushPromises();
+
+        await wrapper.setProps({ value: ['taxonomy::bob'] });
+        await flushPromises();
+
+        expect(post).toHaveBeenCalledWith(
+            '/test/stale-value',
+            { site: 'default', selections: ['taxonomy::bob'] },
+            expect.anything(),
+        );
+
+        d.resolve({ data: { data: [] } });
+        await flushPromises();
+
+        wrapper.unmount();
+    });
+
+    test('does not refetch when the new value is already covered by existing data', async () => {
+        const post = vi.fn(() => Promise.resolve({ data: { data: [] } }));
+
+        const wrapper = mountInput({ axiosPost: post, itemDataUrl: '/test/stale-value-known' });
+        await flushPromises();
+
+        await wrapper.setProps({ data: [{ id: '1', title: 'One' }], value: ['1'] });
+        await flushPromises();
+
+        expect(post).not.toHaveBeenCalled();
+
+        wrapper.unmount();
+    });
+});
diff --git a/resources/js/tests/components/inputs/relationship/SelectField.test.js b/resources/js/tests/components/inputs/relationship/SelectField.test.js
new file mode 100644
index 00000000000..322f3f5216b
--- /dev/null
+++ b/resources/js/tests/components/inputs/relationship/SelectField.test.js
@@ -0,0 +1,53 @@
+import { mount } from '@vue/test-utils';
+import { describe, expect, test, vi } from 'vitest';
+
+vi.mock('@inertiajs/vue3', () => ({
+    router: { on: () => () => {} },
+}));
+
+globalThis.__ = (key) => key;
+
+import { data_get } from '@/bootstrap/globals.js';
+globalThis.data_get = data_get;
+
+import SelectField from '@/components/inputs/relationship/SelectField.vue';
+
+const stubs = {
+    Combobox: true,
+    StatusIndicator: true,
+};
+
+function mountSelectField({ items = [] } = {}) {
+    return mount(SelectField, {
+        props: {
+            items,
+            url: '/test/select-field',
+            config: {},
+        },
+        global: {
+            mocks: {
+                $axios: { get: () => Promise.resolve({ data: { data: [] } }) },
+            },
+            stubs,
+        },
+    });
+}
+
+describe('SelectField comboboxOptions', () => {
+    test('includes a selected item missing from the fetched options list', () => {
+        const wrapper = mountSelectField({ items: [{ id: 'tags::bob', title: 'Bob' }] });
+
+        expect(wrapper.vm.comboboxOptions).toContainEqual({ id: 'tags::bob', title: 'Bob' });
+
+        wrapper.unmount();
+    });
+
+    test('does not duplicate an item already present in the fetched options list', async () => {
+        const wrapper = mountSelectField({ items: [{ id: '1', title: 'One' }] });
+        await wrapper.setData({ options: [{ id: '1', title: 'One' }] });
+
+        expect(wrapper.vm.comboboxOptions).toEqual([{ id: '1', title: 'One' }]);
+
+        wrapper.unmount();
+    });
+});
diff --git a/resources/js/tests/components/roles/PermissionTree.test.js b/resources/js/tests/components/roles/PermissionTree.test.js
new file mode 100644
index 00000000000..3305fd38a29
--- /dev/null
+++ b/resources/js/tests/components/roles/PermissionTree.test.js
@@ -0,0 +1,141 @@
+import { mount } from '@vue/test-utils';
+import { expect, test } from 'vitest';
+import PermissionTree from '@/components/roles/PermissionTree.vue';
+
+const permission = (value, overrides = {}) => ({
+    value,
+    label: value,
+    description: null,
+    checked: false,
+    hidden_by: [],
+    children: [],
+    ...overrides,
+});
+
+const mountTree = (permissions, checkedPermissions = []) =>
+    mount(PermissionTree, {
+        props: { depth: 1, initialPermissions: permissions, checkedPermissions },
+        global: {
+            stubs: {
+                'ui-checkbox': {
+                    props: ['value'],
+                    template: '<div class="permission">{{ value }}</div>',
+                },
+            },
+        },
+    });
+
+const renderedPermissions = (wrapper) => wrapper.findAll('.permission').map((el) => el.text());
+
+test('it shows a permission when the permission hiding it is unchecked', () => {
+    const wrapper = mountTree([
+        permission('configure asset containers'),
+        permission('view images assets', { hidden_by: ['configure asset containers'] }),
+    ]);
+
+    expect(renderedPermissions(wrapper)).toEqual(['configure asset containers', 'view images assets']);
+});
+
+test('it hides a permission when the permission hiding it is checked', () => {
+    const wrapper = mountTree(
+        [
+            permission('configure asset containers', { checked: true }),
+            permission('view images assets', { hidden_by: ['configure asset containers'] }),
+        ],
+        ['configure asset containers'],
+    );
+
+    expect(renderedPermissions(wrapper)).toEqual(['configure asset containers']);
+});
+
+test('it hides the children of a hidden permission', () => {
+    const wrapper = mountTree(
+        [
+            permission('configure asset containers', { checked: true }),
+            permission('view images assets', {
+                hidden_by: ['configure asset containers'],
+                children: [permission('delete images assets')],
+            }),
+        ],
+        ['configure asset containers'],
+    );
+
+    expect(renderedPermissions(wrapper)).toEqual(['configure asset containers']);
+});
+
+test('it only hides permissions hidden by a checked permission', () => {
+    const wrapper = mountTree(
+        [
+            permission('configure asset containers', { checked: true }),
+            permission('view images assets', { hidden_by: ['configure asset containers'] }),
+            permission('view blog entries', { hidden_by: ['configure collections'] }),
+        ],
+        ['configure asset containers'],
+    );
+
+    expect(renderedPermissions(wrapper)).toEqual(['configure asset containers', 'view blog entries']);
+});
+
+test('it hides a nested permission when the permission hiding it is checked', () => {
+    const wrapper = mountTree(
+        [
+            permission('configure collections', { checked: true }),
+            permission('view blog entries', {
+                children: [permission('publish blog entries', { hidden_by: ['configure collections'] })],
+            }),
+        ],
+        ['configure collections'],
+    );
+
+    expect(renderedPermissions(wrapper)).toEqual(['configure collections', 'view blog entries']);
+});
+
+test('it shows everything when no checked permissions are given', () => {
+    const wrapper = mount(PermissionTree, {
+        props: {
+            depth: 1,
+            initialPermissions: [permission('view images assets', { hidden_by: ['configure asset containers'] })],
+        },
+        global: {
+            stubs: { 'ui-checkbox': { props: ['value'], template: '<div class="permission">{{ value }}</div>' } },
+        },
+    });
+
+    expect(renderedPermissions(wrapper)).toEqual(['view images assets']);
+});
+
+test('unhiding a permission brings back its checked state', async () => {
+    const permissions = [
+        permission('configure asset containers', { checked: true }),
+        permission('view images assets', { checked: true, hidden_by: ['configure asset containers'] }),
+    ];
+
+    const wrapper = mountTree(permissions, ['configure asset containers']);
+    expect(renderedPermissions(wrapper)).toEqual(['configure asset containers']);
+
+    await wrapper.setProps({ checkedPermissions: [] });
+
+    expect(renderedPermissions(wrapper)).toEqual(['configure asset containers', 'view images assets']);
+    expect(permissions[1].checked).toBe(true);
+});
+
+test('it hides a permission when any of the permissions hiding it are checked', () => {
+    const permissions = () => [
+        permission('configure forms'),
+        permission('edit forms'),
+        permission('edit contact form', { hidden_by: ['configure forms', 'edit forms'] }),
+    ];
+
+    expect(renderedPermissions(mountTree(permissions(), ['configure forms']))).toEqual([
+        'configure forms',
+        'edit forms',
+    ]);
+
+    expect(renderedPermissions(mountTree(permissions(), ['edit forms']))).toEqual(['configure forms', 'edit forms']);
+
+    expect(renderedPermissions(mountTree(permissions(), []))).toEqual([
+        'configure forms',
+        'edit forms',
+        'edit contact form',
+    ]);
+});
diff --git a/resources/js/tests/components/roles/PublishForm.test.js b/resources/js/tests/components/roles/PublishForm.test.js
new file mode 100644
index 00000000000..dc3f8c27040
--- /dev/null
+++ b/resources/js/tests/components/roles/PublishForm.test.js
@@ -0,0 +1,170 @@
+import { shallowMount } from '@vue/test-utils';
+import { describe, expect, test } from 'vitest';
+import PublishForm from '@/components/roles/PublishForm.vue';
+
+const permission = (value, overrides = {}) => ({
+    value,
+    label: value,
+    description: null,
+    checked: false,
+    hidden_by: [],
+    children: [],
+    ...overrides,
+});
+
+const group = (handle, permissions) => ({ handle, label: handle, permissions });
+
+const mountForm = (groups) =>
+    shallowMount(PublishForm, {
+        props: {
+            initialTitle: 'Test',
+            initialHandle: 'test',
+            initialPermissions: groups,
+            initialSuper: false,
+            canAssignSuper: false,
+            action: '/roles',
+            method: 'post',
+            indexUrl: '/roles',
+        },
+        global: {
+            mocks: { $keys: { bindGlobal: () => {} } },
+        },
+    });
+
+// The collections group, as core registers it: a configure permission that hides
+// the per-collection permission sitting next to it.
+const collectionsGroup = (overrides = {}) =>
+    group('collections', [
+        permission('configure collections', { checked: overrides.configure ?? false }),
+        permission('view blog entries', {
+            checked: overrides.view ?? false,
+            hidden_by: ['configure collections'],
+            children: [permission('delete blog entries', { checked: overrides.delete ?? false })],
+        }),
+    ]);
+
+describe('areAllChecked', () => {
+    test('it ignores hidden permissions', () => {
+        const wrapper = mountForm([collectionsGroup({ configure: true })]);
+
+        // "view blog entries" is unchecked, but hidden, so the group reads as fully checked.
+        expect(wrapper.vm.areAllChecked(wrapper.vm.permissions[0])).toBe(true);
+    });
+
+    test('it is false while a visible permission is unchecked', () => {
+        const wrapper = mountForm([collectionsGroup()]);
+
+        expect(wrapper.vm.areAllChecked(wrapper.vm.permissions[0])).toBe(false);
+    });
+
+    test('it is false when a group has no visible permissions', () => {
+        const wrapper = mountForm([
+            group('cp', [permission('configure collections', { checked: true })]),
+            group('collections', [permission('view blog entries', { hidden_by: ['configure collections'] })]),
+        ]);
+
+        // Nothing in the group renders, so the button must not offer to uncheck anything.
+        expect(wrapper.vm.areAllChecked(wrapper.vm.permissions[1])).toBe(false);
+    });
+});
+
+describe('toggleAllInGroup', () => {
+    test('checking only checks what is visible', () => {
+        // The hider is checked, so "view thing" is hidden. The unchecked sibling is what
+        // leaves the group with something for Check All to do.
+        const wrapper = mountForm([
+            group('test', [
+                permission('configure things', { checked: true }),
+                permission('view thing', {
+                    hidden_by: ['configure things'],
+                    children: [permission('delete thing')],
+                }),
+                permission('view other thing'),
+            ]),
+        ]);
+        const test = wrapper.vm.permissions[0];
+
+        expect(wrapper.vm.areAllChecked(test)).toBe(false);
+
+        wrapper.vm.toggleAllInGroup(test);
+
+        expect(wrapper.vm.checkedPermissions).toEqual(['configure things', 'view other thing']);
+    });
+
+    test('checking an empty group checks everything, since nothing is hidden yet', () => {
+        const wrapper = mountForm([collectionsGroup()]);
+        const collections = wrapper.vm.permissions[0];
+
+        wrapper.vm.toggleAllInGroup(collections);
+
+        expect(collections.permissions[0].checked).toBe(true);
+        expect(collections.permissions[1].checked).toBe(true);
+        expect(collections.permissions[1].children[0].checked).toBe(true);
+    });
+
+    test('unchecking clears the whole group, including hidden permissions', () => {
+        const wrapper = mountForm([collectionsGroup({ configure: true, view: true, delete: true })]);
+        const collections = wrapper.vm.permissions[0];
+
+        expect(wrapper.vm.areAllChecked(collections)).toBe(true);
+
+        wrapper.vm.toggleAllInGroup(collections);
+
+        expect(collections.permissions[0].checked).toBe(false);
+        expect(collections.permissions[1].checked).toBe(false);
+        expect(collections.permissions[1].children[0].checked).toBe(false);
+    });
+
+    test('one click always empties a fully checked group', () => {
+        // Check All, then Uncheck All. The group must end up empty, not half revealed.
+        const wrapper = mountForm([collectionsGroup()]);
+        const collections = wrapper.vm.permissions[0];
+
+        wrapper.vm.toggleAllInGroup(collections);
+        expect(wrapper.vm.areAllChecked(collections)).toBe(true);
+
+        wrapper.vm.toggleAllInGroup(collections);
+
+        expect(wrapper.vm.checkedPermissions).toEqual([]);
+        expect(wrapper.vm.areAllChecked(collections)).toBe(false);
+    });
+});
+
+describe('toggleAllInAllGroups', () => {
+    test('checking only checks what is visible in every group', () => {
+        const wrapper = mountForm([
+            collectionsGroup({ configure: true }),
+            group('users', [permission('view users')]),
+        ]);
+
+        wrapper.vm.toggleAllInAllGroups();
+
+        expect(wrapper.vm.checkedPermissions).toEqual(['configure collections', 'view users']);
+    });
+
+    test('checking a permission does not hide the ones checked after it', () => {
+        // Visibility is snapshotted before anything is checked. Reading it as we walk would
+        // let "configure things" hide "view thing" before we reach it.
+        const wrapper = mountForm([
+            group('one', [permission('configure things')]),
+            group('two', [permission('view thing', { hidden_by: ['configure things'] })]),
+        ]);
+
+        wrapper.vm.toggleAllInAllGroups();
+
+        expect(wrapper.vm.checkedPermissions).toEqual(['configure things', 'view thing']);
+    });
+
+    test('unchecking clears every group, including hidden permissions', () => {
+        const wrapper = mountForm([
+            collectionsGroup({ configure: true, view: true, delete: true }),
+            group('users', [permission('view users', { checked: true })]),
+        ]);
+
+        expect(wrapper.vm.areAllCheckedInAllGroups()).toBe(true);
+
+        wrapper.vm.toggleAllInAllGroups();
+
+        expect(wrapper.vm.checkedPermissions).toEqual([]);
+    });
+});
diff --git a/resources/js/tests/components/roles/permissions.test.js b/resources/js/tests/components/roles/permissions.test.js
new file mode 100644
index 00000000000..301d25ee450
--- /dev/null
+++ b/resources/js/tests/components/roles/permissions.test.js
@@ -0,0 +1,139 @@
+import { describe, expect, test } from 'vitest';
+import { allVisibleChecked, checkVisible, isVisible, uncheckAll, visible } from '@/components/roles/permissions.js';
+
+const permission = (value, overrides = {}) => ({
+    value,
+    checked: false,
+    hidden_by: [],
+    children: [],
+    ...overrides,
+});
+
+const values = (permissions) => permissions.map((permission) => permission.value);
+
+const flatten = (permissions) => permissions.flatMap((p) => [p, ...flatten(p.children)]);
+
+const checkedValues = (permissions) =>
+    flatten(permissions)
+        .filter((permission) => permission.checked)
+        .map((permission) => permission.value);
+
+describe('isVisible', () => {
+    test('a permission with no hiders is always visible', () => {
+        expect(isVisible(permission('one'), [])).toBe(true);
+        expect(isVisible(permission('one'), ['two'])).toBe(true);
+    });
+
+    test('a permission is hidden when any of its hiders are checked', () => {
+        const one = permission('one', { hidden_by: ['two', 'three'] });
+
+        expect(isVisible(one, [])).toBe(true);
+        expect(isVisible(one, ['four'])).toBe(true);
+        expect(isVisible(one, ['two'])).toBe(false);
+        expect(isVisible(one, ['three'])).toBe(false);
+        expect(isVisible(one, ['two', 'three'])).toBe(false);
+    });
+});
+
+describe('visible', () => {
+    test('it filters out hidden permissions', () => {
+        const permissions = [
+            permission('configure collections'),
+            permission('view blog entries', { hidden_by: ['configure collections'] }),
+            permission('view users'),
+        ];
+
+        expect(values(visible(permissions, []))).toEqual([
+            'configure collections',
+            'view blog entries',
+            'view users',
+        ]);
+
+        expect(values(visible(permissions, ['configure collections']))).toEqual([
+            'configure collections',
+            'view users',
+        ]);
+    });
+});
+
+describe('allVisibleChecked', () => {
+    test('it is true when every visible permission is checked', () => {
+        const permissions = [
+            permission('configure collections', { checked: true }),
+            permission('view blog entries', { hidden_by: ['configure collections'] }),
+        ];
+
+        expect(allVisibleChecked(permissions, ['configure collections'])).toBe(true);
+        expect(allVisibleChecked(permissions, [])).toBe(false);
+    });
+
+    test('it recurses into visible children only', () => {
+        const permissions = [
+            permission('configure collections', { checked: true }),
+            permission('view blog entries', {
+                checked: true,
+                children: [
+                    permission('publish blog entries', { hidden_by: ['configure collections'] }),
+                    permission('delete blog entries', { checked: true }),
+                ],
+            }),
+        ];
+
+        expect(allVisibleChecked(permissions, ['configure collections'])).toBe(true);
+        expect(allVisibleChecked(permissions, [])).toBe(false);
+    });
+
+    test('an unchecked visible permission makes it false', () => {
+        const permissions = [permission('one', { checked: true }), permission('two')];
+
+        expect(allVisibleChecked(permissions, [])).toBe(false);
+    });
+
+    test('an empty set is vacuously true, so callers must guard the top level', () => {
+        expect(allVisibleChecked([], [])).toBe(true);
+    });
+});
+
+describe('checkVisible', () => {
+    test('it checks visible permissions and their visible children', () => {
+        const permissions = [
+            permission('configure collections'),
+            permission('view blog entries', {
+                hidden_by: ['configure collections'],
+                children: [permission('delete blog entries')],
+            }),
+        ];
+
+        checkVisible(permissions, ['configure collections']);
+
+        expect(checkedValues(permissions)).toEqual(['configure collections']);
+    });
+
+    test('it does not let the permissions it checks hide the ones that follow', () => {
+        const permissions = [
+            permission('configure collections'),
+            permission('view blog entries', { hidden_by: ['configure collections'] }),
+        ];
+
+        checkVisible(permissions, []);
+
+        expect(checkedValues(permissions)).toEqual(['configure collections', 'view blog entries']);
+    });
+});
+
+describe('uncheckAll', () => {
+    test('it unchecks everything, including hidden permissions', () => {
+        const permissions = [
+            permission('configure collections', { checked: true }),
+            permission('view blog entries', {
+                checked: true,
+                hidden_by: ['configure collections'],
+                children: [permission('delete blog entries', { checked: true })],
+            }),
+        ];
+
+        uncheckAll(permissions);
+
+        expect(checkedValues(permissions)).toEqual([]);
+    });
+});
diff --git a/resources/js/tests/dirty-state.test.js b/resources/js/tests/dirty-state.test.js
new file mode 100644
index 00000000000..2da78f78adf
--- /dev/null
+++ b/resources/js/tests/dirty-state.test.js
@@ -0,0 +1,150 @@
+import { test, expect, beforeEach, vi } from 'vitest';
+
+// Mock @inertiajs/vue3 router before importing the composable so it captures
+// the mock instead of the real router.
+vi.mock('@inertiajs/vue3', () => {
+    const listeners = { before: [], success: [] };
+    return {
+        router: {
+            on: (event, callback) => {
+                listeners[event].push(callback);
+                return () => {
+                    listeners[event] = listeners[event].filter((cb) => cb !== callback);
+                };
+            },
+            __listeners: listeners,
+        },
+    };
+});
+
+const setupGlobals = () => {
+    global.Statamic = {
+        $preferences: {
+            get: () => true,
+        },
+    };
+    global.__ = (key) => key;
+};
+
+let useDirtyState;
+
+beforeEach(async () => {
+    vi.resetModules();
+    setupGlobals();
+    window.history.replaceState({ page: 'A', url: '/a' }, '', '/a');
+    useDirtyState = (await import('../composables/dirty-state.js')).default;
+});
+
+test('popstate is ignored when nothing is dirty', () => {
+    const { count } = useDirtyState();
+    const confirmSpy = vi.spyOn(window, 'confirm').mockReturnValue(true);
+
+    window.dispatchEvent(new PopStateEvent('popstate', { state: null }));
+
+    expect(confirmSpy).not.toHaveBeenCalled();
+    expect(count()).toBe(0);
+
+    confirmSpy.mockRestore();
+});
+
+test('popstate prompts the user when the form is dirty', () => {
+    const { add, count } = useDirtyState();
+    const confirmSpy = vi.spyOn(window, 'confirm').mockReturnValue(true);
+    const backSpy = vi.spyOn(window.history, 'back').mockImplementation(() => {});
+
+    add('entry');
+    expect(count()).toBe(1);
+
+    // Simulate the browser having already moved to the destination URL before popstate fires.
+    window.history.replaceState({ page: 'B' }, '', '/b');
+    window.dispatchEvent(new PopStateEvent('popstate', { state: { page: 'A' } }));
+
+    expect(confirmSpy).toHaveBeenCalledWith('statamic::messages.dirty_navigation_warning');
+    expect(count()).toBe(0); // dirty cleared on confirmation
+    expect(backSpy).toHaveBeenCalled();
+
+    confirmSpy.mockRestore();
+    backSpy.mockRestore();
+});
+
+test('cancelling the prompt re-pushes the dirty page state and keeps form dirty', () => {
+    const { add, remove, count } = useDirtyState();
+
+    // The dirty URL/state is captured at the moment add() is called.
+    window.history.replaceState({ page: 'B', url: '/b' }, '', '/b');
+    add('entry');
+
+    const confirmSpy = vi.spyOn(window, 'confirm').mockReturnValue(false);
+    const pushSpy = vi.spyOn(window.history, 'pushState');
+    const backSpy = vi.spyOn(window.history, 'back').mockImplementation(() => {});
+
+    // Simulate the browser having already moved to a different page before popstate fires.
+    window.history.replaceState({ page: 'A', url: '/a' }, '', '/a');
+    window.dispatchEvent(new PopStateEvent('popstate', { state: { page: 'A' } }));
+
+    expect(confirmSpy).toHaveBeenCalled();
+    expect(count()).toBe(1); // still dirty
+    expect(backSpy).not.toHaveBeenCalled();
+    expect(pushSpy).toHaveBeenCalledWith({ page: 'B', url: '/b' }, '', expect.stringContaining('/b'));
+
+    confirmSpy.mockRestore();
+    pushSpy.mockRestore();
+    backSpy.mockRestore();
+
+    remove('entry'); // prevent dirty state from leaking into subsequent tests via accumulated listeners
+});
+
+test('popstate stops propagation so Inertia\'s listener cannot wipe form data', () => {
+    const { add, remove } = useDirtyState();
+    const confirmSpy = vi.spyOn(window, 'confirm').mockReturnValue(false);
+
+    add('entry');
+
+    let inertiaListenerFired = false;
+    const inertiaListener = () => { inertiaListenerFired = true; };
+    window.addEventListener('popstate', inertiaListener);
+
+    // Simulate the browser having already moved to a different page before popstate fires.
+    window.history.replaceState({ page: 'B' }, '', '/b');
+    window.dispatchEvent(new PopStateEvent('popstate', { state: { page: 'A' } }));
+
+    expect(inertiaListenerFired).toBe(false);
+
+    window.removeEventListener('popstate', inertiaListener);
+    confirmSpy.mockRestore();
+
+    remove('entry'); // prevent dirty state from leaking into subsequent tests via accumulated listeners
+});
+
+test('popstate is ignored for hash-only changes (e.g. tab switching)', () => {
+    const { add, count } = useDirtyState();
+    const confirmSpy = vi.spyOn(window, 'confirm').mockReturnValue(true);
+
+    add('entry');
+    expect(count()).toBe(1);
+
+    // Simulate URL moving to a hash-only variant of the same page (tab switch)
+    window.history.replaceState({ page: 'A', url: '/a' }, '', '/a#tab-2');
+    window.dispatchEvent(new PopStateEvent('popstate', { state: { page: 'A' } }));
+
+    expect(confirmSpy).not.toHaveBeenCalled();
+    expect(count()).toBe(1); // still dirty
+
+    confirmSpy.mockRestore();
+});
+
+test('popstate is ignored when confirm_dirty_navigation preference is disabled', () => {
+    global.Statamic.$preferences.get = () => false;
+
+    const { add } = useDirtyState();
+    const confirmSpy = vi.spyOn(window, 'confirm').mockReturnValue(true);
+
+    add('entry');
+
+    // Simulate the browser having already moved to a different page before popstate fires.
+    window.history.replaceState({ page: 'B' }, '', '/b');
+    window.dispatchEvent(new PopStateEvent('popstate', { state: { page: 'A' } }));
+
+    expect(confirmSpy).not.toHaveBeenCalled();
+    confirmSpy.mockRestore();
+});
diff --git a/resources/js/tests/toFieldActions.test.js b/resources/js/tests/toFieldActions.test.js
new file mode 100644
index 00000000000..9a5f24894a9
--- /dev/null
+++ b/resources/js/tests/toFieldActions.test.js
@@ -0,0 +1,46 @@
+import { test, expect, beforeEach, afterEach } from 'vitest';
+import { ref, reactive } from 'vue';
+import toFieldActions from '../components/field-actions/toFieldActions.js';
+
+let originalStatamic;
+
+beforeEach(() => {
+    originalStatamic = globalThis.Statamic;
+    globalThis.Statamic = {
+        $fieldActions: {
+            get: () => [
+                { title: 'Quick', quick: true, run: () => {} },
+                { title: 'Slow', quick: false, run: () => {} },
+                { title: 'Hidden', quick: false, visible: false, run: () => {} },
+            ],
+        },
+    };
+});
+
+afterEach(() => {
+    globalThis.Statamic = originalStatamic;
+});
+
+test('returns FieldAction instances safe for reactive containers (ref)', () => {
+    const actions = toFieldActions('some-binding', {});
+    const r = ref(actions);
+
+    // Without markRaw, accessing a getter that reads a private field
+    // throws "can't access private field or method: object is not the right class".
+    expect(() => r.value[0].quick).not.toThrow();
+    expect(r.value[0].quick).toBe(true);
+    expect(r.value[1].quick).toBe(false);
+});
+
+test('returns FieldAction instances safe for reactive containers (reactive)', () => {
+    const actions = toFieldActions('some-binding', {});
+    const state = reactive({ list: actions });
+
+    expect(() => state.list[0].quick).not.toThrow();
+    expect(state.list.filter((a) => !a.quick).map((a) => a.title)).toEqual(['Slow']);
+});
+
+test('filters out non-visible actions', () => {
+    const actions = toFieldActions('some-binding', {});
+    expect(actions.map((a) => a.title)).toEqual(['Quick', 'Slow']);
+});
diff --git a/resources/js/tests/ui-direction.test.js b/resources/js/tests/ui-direction.test.js
new file mode 100644
index 00000000000..20da618acb5
--- /dev/null
+++ b/resources/js/tests/ui-direction.test.js
@@ -0,0 +1,24 @@
+import { test, expect, beforeEach, vi } from 'vitest';
+
+let useUiDirection;
+
+beforeEach(async () => {
+    vi.resetModules();
+    document.documentElement.removeAttribute('dir');
+    useUiDirection = (await import('../composables/ui-direction.js')).useUiDirection;
+});
+
+test('defaults to ltr when html dir is missing', () => {
+    const { direction } = useUiDirection();
+
+    expect(direction.value).toBe('ltr');
+});
+
+test('updates reactively when the html dir attribute changes', async () => {
+    const { direction } = useUiDirection();
+    expect(direction.value).toBe('ltr');
+
+    document.documentElement.setAttribute('dir', 'rtl');
+
+    await vi.waitFor(() => expect(direction.value).toBe('rtl'));
+});
diff --git a/resources/svg/icons/sign-in.svg b/resources/svg/icons/sign-in.svg
index 3e96a5e1f8a..a2c57216266 100644
--- a/resources/svg/icons/sign-in.svg
+++ b/resources/svg/icons/sign-in.svg
@@ -1 +1 @@
-<svg viewBox="0 0 19 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g transform="translate(1 1)" stroke="currentColor" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M16.755077,1.25932208 C16.9096439,5.13856205 16.8888966,8.92795353 16.692576,12.8314548 C16.6696243,13.2865972 16.4213059,13.6966144 16.0377414,13.9180912 L11.2362091,16.6903106 C10.4100283,17.1673673 9.38879757,16.5834624 9.34971497,15.6028962 C9.19512214,11.7236303 9.21597311,7.93423884 9.41226788,4.0307635 C9.43515467,3.57562106 9.68346016,3.16559089 10.0671413,2.9440623 L14.8686348,0.171868788 C15.6947637,-0.305134754 16.7160463,0.278726119 16.755077,1.25932208 L16.755077,1.25932208 Z"/><path d="M15.3826475,0 L6.66323347,0 C5.98215365,0 5.41632472,0.526760595 5.37647706,1.20667597 C5.32267689,2.12471513 5.2802488,3.04804484 5.24917982,3.9744218 M9.24739221,15.5693116 L6.66323347,15.5693116 C5.98215365,15.5693116 5.41632472,15.0425912 5.37647706,14.3627303 C5.35163225,13.9385791 5.3291993,13.5133904 5.30920416,13.0872941"/><line x1="0" y1="8.43236695" x2="5.79606393" y2="8.43236695"/><path d="M3.71936957,6.13527213 C4.6376162,6.59439544 5.55584987,7.51264208 6.01497318,8.43084981 C5.55584987,9.34912238 4.6376162,10.267369 3.71936957,10.7264923"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 14"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M13.08 1.665C13.2 4.523 13.18 7.315 13.04 10.19 13.02 10.53 12.84 10.83 12.55 10.99L9.016 13.03C8.407 13.39 7.655 12.96 7.626 12.23 7.512 9.375 7.528 6.583 7.672 3.707 7.689 3.372 7.872 3.069 8.155 2.906L11.69 0.8635C12.3 0.512 13.05 0.9422 13.08 1.665Z" stroke-width="1"/><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M12.07 0.7368 5.647 0.7368C5.145 0.7368 4.728 1.125 4.698 1.626 4.659 2.302 4.628 2.983 4.605 3.665M7.551 12.21 5.647 12.21C5.145 12.21 4.728 11.82 4.698 11.32 4.68 11.01 4.664 10.69 4.649 10.38" stroke-width="1"/><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M0.7368 6.95 5.008 6.95" stroke-width="1"/><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M3.477 5.258C4.154 5.596 4.831 6.272 5.169 6.949 4.831 7.626 4.154 8.302 3.477 8.641" stroke-width="1"/></svg>
diff --git a/resources/views/extend/forms/fields.antlers.html b/resources/views/extend/forms/antlers/fields.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields.antlers.html
rename to resources/views/extend/forms/antlers/fields.antlers.html
diff --git a/resources/views/extend/forms/fields/assets.antlers.html b/resources/views/extend/forms/antlers/fields/assets.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/assets.antlers.html
rename to resources/views/extend/forms/antlers/fields/assets.antlers.html
diff --git a/resources/views/extend/forms/fields/checkboxes.antlers.html b/resources/views/extend/forms/antlers/fields/checkboxes.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/checkboxes.antlers.html
rename to resources/views/extend/forms/antlers/fields/checkboxes.antlers.html
diff --git a/resources/views/extend/forms/fields/default.antlers.html b/resources/views/extend/forms/antlers/fields/default.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/default.antlers.html
rename to resources/views/extend/forms/antlers/fields/default.antlers.html
diff --git a/resources/views/extend/forms/fields/dictionary.antlers.html b/resources/views/extend/forms/antlers/fields/dictionary.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/dictionary.antlers.html
rename to resources/views/extend/forms/antlers/fields/dictionary.antlers.html
diff --git a/resources/views/extend/forms/fields/files.antlers.html b/resources/views/extend/forms/antlers/fields/files.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/files.antlers.html
rename to resources/views/extend/forms/antlers/fields/files.antlers.html
diff --git a/resources/views/extend/forms/fields/group.antlers.html b/resources/views/extend/forms/antlers/fields/group.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/group.antlers.html
rename to resources/views/extend/forms/antlers/fields/group.antlers.html
diff --git a/resources/views/extend/forms/fields/hidden.antlers.html b/resources/views/extend/forms/antlers/fields/hidden.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/hidden.antlers.html
rename to resources/views/extend/forms/antlers/fields/hidden.antlers.html
diff --git a/resources/views/extend/forms/fields/integer.antlers.html b/resources/views/extend/forms/antlers/fields/integer.antlers.html
similarity index 72%
rename from resources/views/extend/forms/fields/integer.antlers.html
rename to resources/views/extend/forms/antlers/fields/integer.antlers.html
index 988791d65d2..cc4d2b7e1e1 100644
--- a/resources/views/extend/forms/fields/integer.antlers.html
+++ b/resources/views/extend/forms/antlers/fields/integer.antlers.html
@@ -1,4 +1,5 @@
 <input
+    id="{{ id }}"
     type="number"
     name="{{ name }}"
     value="{{ value }}"
@@ -10,4 +11,9 @@
     {{ if autocomplete }}autocomplete="{{ autocomplete }}"{{ /if }}
     {{ if js_driver }}{{ js_attributes }}{{ /if }}
     {{ if validate|contains:required }}required{{ /if }}
+    {{ if error }}
+        aria-invalid="true" aria-describedby="{{ id }}-error"
+    {{ elseif instructions }}
+        aria-describedby="{{ id }}-instructions"
+    {{ /if }}
 >
diff --git a/resources/views/extend/forms/fields/radio.antlers.html b/resources/views/extend/forms/antlers/fields/radio.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/radio.antlers.html
rename to resources/views/extend/forms/antlers/fields/radio.antlers.html
diff --git a/resources/views/extend/forms/fields/select.antlers.html b/resources/views/extend/forms/antlers/fields/select.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/select.antlers.html
rename to resources/views/extend/forms/antlers/fields/select.antlers.html
diff --git a/resources/views/extend/forms/fields/spacer.antlers.html b/resources/views/extend/forms/antlers/fields/spacer.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/spacer.antlers.html
rename to resources/views/extend/forms/antlers/fields/spacer.antlers.html
diff --git a/resources/views/extend/forms/fields/text.antlers.html b/resources/views/extend/forms/antlers/fields/text.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/text.antlers.html
rename to resources/views/extend/forms/antlers/fields/text.antlers.html
diff --git a/resources/views/extend/forms/fields/textarea.antlers.html b/resources/views/extend/forms/antlers/fields/textarea.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/textarea.antlers.html
rename to resources/views/extend/forms/antlers/fields/textarea.antlers.html
diff --git a/resources/views/extend/forms/fields/toggle.antlers.html b/resources/views/extend/forms/antlers/fields/toggle.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/toggle.antlers.html
rename to resources/views/extend/forms/antlers/fields/toggle.antlers.html
diff --git a/resources/views/extend/forms/blade/fields.blade.php b/resources/views/extend/forms/blade/fields.blade.php
new file mode 100644
index 00000000000..6c457637923
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields.blade.php
@@ -0,0 +1,28 @@
+@php
+    use function Statamic\trans as __;
+@endphp
+@foreach ($fields as $field)
+    <div class="p-4">
+        <label for="{{ $field['id'] }}">
+            {{ $field['display'] }}
+
+            @if (collect($field['validate'] ?? [])->contains('required'))
+                <sup aria-label="{{ __('Required') }}">*</sup>
+            @endif
+        </label>
+
+        <div class="p-2">{!! $field['field'] !!}</div>
+
+        @if ($field['instructions'] ?? false)
+            <p class="text-gray-500" id="{{ $field['id'] }}-instructions">
+                {{ $field['instructions'] }}
+            </p>
+        @endif
+
+        @if ($field['error'] ?? false)
+            <p class="text-red-600" id="{{ $field['id'] }}-error">
+                {{ $field['error'] }}
+            </p>
+        @endif
+    </div>
+@endforeach
diff --git a/resources/views/extend/forms/blade/fields/assets.blade.php b/resources/views/extend/forms/blade/fields/assets.blade.php
new file mode 100644
index 00000000000..b42537f0860
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/assets.blade.php
@@ -0,0 +1,22 @@
+@php
+    $isMultiple = ! isset($max_files) || $max_files !== 1;
+    $fieldName = $name;
+
+    if ($isMultiple) {
+        $fieldName .= '[]';
+    }
+@endphp
+
+<input
+    id="{{ $id }}"
+    type="file"
+    name="{{ $fieldName }}"
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @if ($isMultiple) multiple @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
diff --git a/resources/views/extend/forms/blade/fields/checkboxes.blade.php b/resources/views/extend/forms/blade/fields/checkboxes.blade.php
new file mode 100644
index 00000000000..ce24cf3cd60
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/checkboxes.blade.php
@@ -0,0 +1,25 @@
+@php
+    $inline = isset($inline) && $inline === true;
+@endphp
+
+<input type="hidden" name="{{ $name }}[]">
+@foreach ($options as $option => $label)
+    <label>
+        <input
+            id="{{ $id }}-{{ \Illuminate\Support\Str::slug($option) }}-option"
+            type="checkbox"
+            name="{{ $name }}[]"
+            value="{{ $option }}"
+            @if (isset($js_driver)) {!! $js_attributes !!} @endif
+            @checked(in_array($option, $value ?? []))
+            @required(in_array('required', $validate ?? []))
+            @if ($error)
+                aria-invalid="true" aria-describedby="{{ $id }}-error"
+            @elseif ($instructions)
+                aria-describedby="{{ $id }}-instructions"
+            @endif
+        >
+        {{ $label === null ? $option : $label }}
+    </label>
+    @unless ($inline) <br> @endunless
+@endforeach
diff --git a/resources/views/extend/forms/blade/fields/default.blade.php b/resources/views/extend/forms/blade/fields/default.blade.php
new file mode 100644
index 00000000000..db78b8b94c9
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/default.blade.php
@@ -0,0 +1,15 @@
+<input
+    id="{{ $id }}"
+    type="{{ $input_type ?? 'text' }}"
+    name="{{ $name }}"
+    value="{{ $value ?? '' }}"
+    @if (isset($placeholder)) placeholder="{{ $placeholder }}" @endif
+    @if (isset($character_limit)) maxlength="{{ $character_limit }}" @endif
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
diff --git a/resources/views/extend/forms/blade/fields/dictionary.blade.php b/resources/views/extend/forms/blade/fields/dictionary.blade.php
new file mode 100644
index 00000000000..2d04fb3e826
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/dictionary.blade.php
@@ -0,0 +1,44 @@
+@php
+    use function Statamic\trans as __;
+
+    $isMultiple = isset($multiple) && $multiple == true;
+    $inline = isset($inline) && $inline === true;
+    $placeholderText = $placeholder ?? __('Please select...');
+
+    $fieldName = $name;
+
+    if ($isMultiple) {
+        $fieldName .= '[]';
+    }
+@endphp
+
+<select
+    id="{{ $id }}"
+    name="{{ $fieldName }}"
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @if ($isMultiple) multiple @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
+    @unless ($isMultiple)
+        <option value>{{ $placeholderText }}</option>
+    @endunless
+    @foreach ($options as $option => $label)
+        @php
+            $selected = false;
+            if ($isMultiple) {
+                $selected = in_array($option, $value ?? []);
+            } else {
+                $selected = $option == $value;
+            }
+        @endphp
+        <option
+            value="{{ $option }}"
+            @selected($selected)
+        >{{ $label === null ? $option : $label }}</option>
+    @endforeach
+</select>
diff --git a/resources/views/extend/forms/blade/fields/files.blade.php b/resources/views/extend/forms/blade/fields/files.blade.php
new file mode 100644
index 00000000000..68b69a3f385
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/files.blade.php
@@ -0,0 +1,23 @@
+@php
+    $isMultiple = ! isset($max_files) || $max_files !== 1;
+
+    $fieldName = $name;
+
+    if ($isMultiple) {
+        $fieldName .= '[]';
+    }
+@endphp
+
+<input
+    id="{{ $id }}"
+    type="file"
+    name="{{ $fieldName }}"
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @if ($isMultiple) multiple @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
diff --git a/resources/views/extend/forms/blade/fields/group.blade.php b/resources/views/extend/forms/blade/fields/group.blade.php
new file mode 100644
index 00000000000..e70ce5992c8
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/group.blade.php
@@ -0,0 +1,7 @@
+<div
+@if (isset($js_driver)) {!! $js_attributes !!} @endif
+>
+    @foreach ($fields as $__field)
+        {!! $slot?->addContext($__field) !!}
+    @endforeach
+</div>
diff --git a/resources/views/extend/forms/blade/fields/hidden.blade.php b/resources/views/extend/forms/blade/fields/hidden.blade.php
new file mode 100644
index 00000000000..8eac9f5fc0c
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/hidden.blade.php
@@ -0,0 +1,6 @@
+<input
+    id="{{ $id }}"
+    type="hidden"
+    name="{{ $name }}"
+    value="{{ $value }}"
+>
diff --git a/resources/views/extend/forms/blade/fields/integer.blade.php b/resources/views/extend/forms/blade/fields/integer.blade.php
new file mode 100644
index 00000000000..394a60234d3
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/integer.blade.php
@@ -0,0 +1,19 @@
+<input
+    id="{{ $id }}"
+    type="number"
+    name="{{ $name }}"
+    value="{{ $value }}"
+    @if ($placeholder ?? false) placeholder="{{ $placeholder }}" @endif
+    @if ($min ?? false) min="{{ $min }}" @endif
+    @if ($max ?? false) max="{{ $max }}" @endif
+    @if ($step ?? false) step="{{ $step }}" @endif
+    @if ($character_limit ?? false) maxlength="{{ $character_limit }}" @endif
+    @if ($autocomplete ?? false) autocomplete="{{ $autocomplete }}" @endif
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
diff --git a/resources/views/extend/forms/blade/fields/radio.blade.php b/resources/views/extend/forms/blade/fields/radio.blade.php
new file mode 100644
index 00000000000..16fa854f873
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/radio.blade.php
@@ -0,0 +1,24 @@
+@php
+    $inline = isset($inline) && $inline === true;
+@endphp
+
+@foreach ($options as $option => $label)
+    <label>
+        <input
+            id="{{ $id }}-{{ \Illuminate\Support\Str::slug($option) }}-option"
+            type="radio"
+            name="{{ $name }}"
+            value="{{ $option }}"
+            @if (isset($js_driver)) {!! $js_attributes !!} @endif
+            @checked($value == $option)
+            @required(in_array('required', $validate ?? []))
+            @if ($error)
+                aria-invalid="true" aria-describedby="{{ $id }}-error"
+            @elseif ($instructions)
+                aria-describedby="{{ $id }}-instructions"
+            @endif
+        >
+        {{ $label === null ? $option : $label }}
+    </label>
+    @unless ($inline) <br> @endunless
+@endforeach
diff --git a/resources/views/extend/forms/blade/fields/select.blade.php b/resources/views/extend/forms/blade/fields/select.blade.php
new file mode 100644
index 00000000000..2d04fb3e826
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/select.blade.php
@@ -0,0 +1,44 @@
+@php
+    use function Statamic\trans as __;
+
+    $isMultiple = isset($multiple) && $multiple == true;
+    $inline = isset($inline) && $inline === true;
+    $placeholderText = $placeholder ?? __('Please select...');
+
+    $fieldName = $name;
+
+    if ($isMultiple) {
+        $fieldName .= '[]';
+    }
+@endphp
+
+<select
+    id="{{ $id }}"
+    name="{{ $fieldName }}"
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @if ($isMultiple) multiple @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
+    @unless ($isMultiple)
+        <option value>{{ $placeholderText }}</option>
+    @endunless
+    @foreach ($options as $option => $label)
+        @php
+            $selected = false;
+            if ($isMultiple) {
+                $selected = in_array($option, $value ?? []);
+            } else {
+                $selected = $option == $value;
+            }
+        @endphp
+        <option
+            value="{{ $option }}"
+            @selected($selected)
+        >{{ $label === null ? $option : $label }}</option>
+    @endforeach
+</select>
diff --git a/resources/views/extend/forms/blade/fields/spacer.blade.php b/resources/views/extend/forms/blade/fields/spacer.blade.php
new file mode 100644
index 00000000000..9d7b871217c
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/spacer.blade.php
@@ -0,0 +1 @@
+{{-- spacer --}}
diff --git a/resources/views/extend/forms/blade/fields/text.blade.php b/resources/views/extend/forms/blade/fields/text.blade.php
new file mode 100644
index 00000000000..75567e3db18
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/text.blade.php
@@ -0,0 +1,16 @@
+<input
+    id="{{ $id }}"
+    type="{{ $input_type ?? 'text' }}"
+    name="{{ $name }}"
+    value="{{ $value ?? '' }}"
+    @if (isset($placeholder)) placeholder="{{ $placeholder }}" @endif
+    @if (isset($character_limit)) maxlength="{{ $character_limit }}" @endif
+    @if (isset($autocomplete)) autocomplete="{{ $autocomplete }}" @endif
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
diff --git a/resources/views/extend/forms/blade/fields/textarea.blade.php b/resources/views/extend/forms/blade/fields/textarea.blade.php
new file mode 100644
index 00000000000..3c848068011
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/textarea.blade.php
@@ -0,0 +1,14 @@
+<textarea
+    id="{{ $id }}"
+    name="{{ $name }}"
+    rows="5"
+    @if (isset($placeholder)) placeholder="{{ $placeholder }}" @endif
+    @if (isset($character_limit)) maxlength="{{ $character_limit }}" @endif
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>{{ $value }}</textarea>
diff --git a/resources/views/extend/forms/blade/fields/toggle.blade.php b/resources/views/extend/forms/blade/fields/toggle.blade.php
new file mode 100644
index 00000000000..fed395a24a3
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/toggle.blade.php
@@ -0,0 +1,17 @@
+<label>
+    <input type="hidden" name="{{ $name }}" value="0">
+    <input
+        type="checkbox"
+        name="{{ $name }}"
+        value="1"
+        @if (isset($js_driver)) {!! $js_attributes !!} @endif
+        @checked($value && $value !== '0')
+        @required(in_array('required', $validate ?? []))
+        @if ($error)
+            aria-invalid="true" aria-describedby="{{ $id }}-error"
+        @elseif ($instructions)
+            aria-describedby="{{ $id }}-instructions"
+        @endif
+    >
+    @if (isset($inline_label)) {{ $inline_label }} @endif
+</label>
diff --git a/resources/views/forms/automagic-email.antlers.html b/resources/views/forms/automagic-email.antlers.html
index 07d07b2877d..8211aa631f5 100644
--- a/resources/views/forms/automagic-email.antlers.html
+++ b/resources/views/forms/automagic-email.antlers.html
@@ -7,18 +7,18 @@
                 {{ if !last }},{{ /if }}
             {{ /value }}
         {{ elseif fieldtype == "select" && !config:multiple }}
-            {{ value:label ?? value }}
+            {{ (value:label ?? value) | sanitize }}
         {{ elseif fieldtype == "radio" }}
-            {{ value:label ?? value }}
+            {{ (value:label ?? value) | sanitize }}
         {{ elseif fieldtype == "select" || fieldtype == "checkboxes" || fieldtype == "dictionary" }}
             {{ value }}
-                {{ label ?? value }}
+                {{ (label ?? value) | sanitize }}
                 {{ if !last }},{{ /if }}
             {{ /value }}
         {{ elseif value|is_iterable }}
-            {{ value | json }}
+            {{ value | json | sanitize }}
         {{ else }}
-            {{ value | nl2br }}
+            {{ value | sanitize | nl2br }}
         {{ /if }}
     {{ /if }}
     <br>
diff --git a/resources/views/graphql/graphiql.blade.php b/resources/views/graphql/graphiql.blade.php
index 5ef0d5db98a..24fb7462318 100644
--- a/resources/views/graphql/graphiql.blade.php
+++ b/resources/views/graphql/graphiql.blade.php
@@ -23,11 +23,11 @@
         </style>
         <link
             rel="stylesheet"
-            href="https://esm.sh/graphiql/dist/style.css"
+            href="https://esm.sh/graphiql@5.2.2/dist/style.css"
         >
         <link
             rel="stylesheet"
-            href="https://esm.sh/@graphiql/plugin-explorer/dist/style.css"
+            href="https://esm.sh/@graphiql/plugin-explorer@5.1.1/dist/style.css"
         >
 
         @if (!$introspection)
@@ -39,19 +39,19 @@
         <script type="importmap">
             {
               "imports": {
-                "react": "https://esm.sh/react@19.1.0",
-                "react/": "https://esm.sh/react@19.1.0/",
+                "react": "https://esm.sh/react@19.2.5",
+                "react/": "https://esm.sh/react@19.2.5/",
 
-                "react-dom": "https://esm.sh/react-dom@19.1.0",
-                "react-dom/": "https://esm.sh/react-dom@19.1.0/",
+                "react-dom": "https://esm.sh/react-dom@19.2.5",
+                "react-dom/": "https://esm.sh/react-dom@19.2.5/",
 
-                "graphiql": "https://esm.sh/graphiql?standalone&external=react,react-dom,@graphiql/react,graphql",
-                "graphiql/": "https://esm.sh/graphiql/",
-                "@graphiql/plugin-explorer": "https://esm.sh/@graphiql/plugin-explorer?standalone&external=react,@graphiql/react,graphql",
-                "@graphiql/react": "https://esm.sh/@graphiql/react?standalone&external=react,react-dom,graphql,@graphiql/toolkit,@emotion/is-prop-valid",
+                "graphiql": "https://esm.sh/graphiql@5.2.2?standalone&external=react,react-dom,@graphiql/react,graphql",
+                "graphiql/": "https://esm.sh/graphiql@5.2.2/",
+                "@graphiql/plugin-explorer": "https://esm.sh/@graphiql/plugin-explorer@5.1.1?standalone&external=react,@graphiql/react,graphql",
+                "@graphiql/react": "https://esm.sh/@graphiql/react@0.37.3?standalone&external=react,react-dom,graphql,@graphiql/toolkit,@emotion/is-prop-valid",
 
-                "@graphiql/toolkit": "https://esm.sh/@graphiql/toolkit?standalone&external=graphql",
-                "graphql": "https://esm.sh/graphql@16.11.0",
+                "@graphiql/toolkit": "https://esm.sh/@graphiql/toolkit@0.11.3?standalone&external=graphql",
+                "graphql": "https://esm.sh/graphql@16.13.2",
                 "@emotion/is-prop-valid": "data:text/javascript,"
               }
             }
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
index bd1cf196895..aa2ca10365e 100644
--- a/resources/views/layout.blade.php
+++ b/resources/views/layout.blade.php
@@ -1,6 +1,10 @@
+@php
+    use function Statamic\trans as __;
+@endphp
+
 <!DOCTYPE html>
 <html
-    lang="{{ Statamic::cpLocale() }}"
+    lang="{{ str_replace('_', '-', Statamic::cpLocale()) }}"
     dir="{{ Statamic::cpDirection() }}"
 >
     <head>
diff --git a/resources/views/nav/duplicates.blade.php b/resources/views/nav/duplicates.blade.php
index 6b94ae89ba4..267562522b4 100644
--- a/resources/views/nav/duplicates.blade.php
+++ b/resources/views/nav/duplicates.blade.php
@@ -1,3 +1,7 @@
+@php
+    use function Statamic\trans as __;
+@endphp
+
 <li>
     <a href="{{ $item->url() }}" class="flex items-center gap-2 sm:gap-3 {{ $item->isActive() ? 'active' : '' }}">
         <i>{!! $item->svg() !!}</i>
diff --git a/resources/views/nav/updates.blade.php b/resources/views/nav/updates.blade.php
index 9319de23792..826b9bd4e06 100644
--- a/resources/views/nav/updates.blade.php
+++ b/resources/views/nav/updates.blade.php
@@ -1,3 +1,7 @@
+@php
+    use function Statamic\trans as __;
+@endphp
+
 <li>
     <inertia-link href="{{ $item->url() }}" class="flex items-center gap-2 sm:gap-3 {{ $item->isActive() ? 'active' : '' }}">
         @cp_svg('icons/updates', 'size-4 shrink-0')
diff --git a/routes/cp.php b/routes/cp.php
index 3dc02a2ac59..2626fc0f7f2 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -1,6 +1,8 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
+use Statamic\Facades\OAuth;
+use Statamic\Facades\TwoFactor;
 use Statamic\Facades\Utility;
 use Statamic\Http\Controllers\CP\Addons\AddonsController;
 use Statamic\Http\Controllers\CP\Addons\AddonSettingsController;
@@ -22,6 +24,7 @@
 use Statamic\Http\Controllers\CP\Auth\ForgotPasswordController;
 use Statamic\Http\Controllers\CP\Auth\ImpersonationController;
 use Statamic\Http\Controllers\CP\Auth\LoginController;
+use Statamic\Http\Controllers\CP\Auth\OAuthController;
 use Statamic\Http\Controllers\CP\Auth\PasskeyController;
 use Statamic\Http\Controllers\CP\Auth\PasskeyLoginController;
 use Statamic\Http\Controllers\CP\Auth\ResetPasswordController;
@@ -54,7 +57,6 @@
 use Statamic\Http\Controllers\CP\Fields\FieldsetController;
 use Statamic\Http\Controllers\CP\Fields\FieldtypesController;
 use Statamic\Http\Controllers\CP\Fields\MetaController;
-use Statamic\Http\Controllers\CP\Fieldtypes\DictionaryFieldtypeController;
 use Statamic\Http\Controllers\CP\Fieldtypes\FilesFieldtypeController;
 use Statamic\Http\Controllers\CP\Fieldtypes\IconFieldtypeController;
 use Statamic\Http\Controllers\CP\Fieldtypes\MarkdownFieldtypeController;
@@ -112,6 +114,7 @@
 use Statamic\Http\Controllers\CP\Users\UsersController;
 use Statamic\Http\Controllers\CP\Users\UserWizardController;
 use Statamic\Http\Controllers\CP\Utilities\UtilitiesController;
+use Statamic\Http\Controllers\OAuthController as FrontendOAuthController;
 use Statamic\Http\Controllers\User\TwoFactorRecoveryCodesController;
 use Statamic\Http\Middleware\CP\RedirectIfTwoFactorSetupIncomplete;
 use Statamic\Http\Middleware\CP\RequireElevatedSession;
@@ -121,19 +124,21 @@
 Route::group(['prefix' => 'auth'], function () {
     if (config('statamic.cp.auth.enabled', true)) {
         Route::get('login', [LoginController::class, 'showLoginForm'])->name('login');
-        Route::post('login', [LoginController::class, 'login']);
+        Route::post('login', [LoginController::class, 'login'])->middleware('throttle:statamic.cp.auth');
 
         Route::get('password/reset', [ForgotPasswordController::class, 'showLinkRequestForm'])->name('password.request');
-        Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail'])->name('password.email');
-        Route::get('password/reset/{token}', [ResetPasswordController::class, 'showResetForm'])->name('password.reset');
-        Route::post('password/reset', [ResetPasswordController::class, 'reset'])->name('password.reset.action');
-
-        Route::get('two-factor-challenge', [TwoFactorChallengeController::class, 'index'])->name('two-factor-challenge');
-        Route::post('two-factor-challenge', [TwoFactorChallengeController::class, 'store']);
-
-        Route::get('two-factor-setup', TwoFactorSetupController::class)
-            ->withoutMiddleware(RedirectIfTwoFactorSetupIncomplete::class)
-            ->name('two-factor-setup');
+        Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail'])->middleware('throttle:statamic.cp.auth')->name('password.email');
+        Route::get('password/reset/{token}', [ResetPasswordController::class, 'showResetForm'])->middleware('throttle:statamic.cp.password-reset-form')->name('password.reset');
+        Route::post('password/reset', [ResetPasswordController::class, 'reset'])->middleware('throttle:statamic.cp.auth')->name('password.reset.action');
+
+        if (TwoFactor::enabled()) {
+            Route::get('two-factor-challenge', [TwoFactorChallengeController::class, 'index'])->name('two-factor-challenge');
+            Route::post('two-factor-challenge', [TwoFactorChallengeController::class, 'store']);
+
+            Route::get('two-factor-setup', TwoFactorSetupController::class)
+                ->withoutMiddleware(RedirectIfTwoFactorSetupIncomplete::class)
+                ->name('two-factor-setup');
+        }
     }
 
     Route::get('logout', [LoginController::class, 'logout'])->name('logout');
@@ -145,7 +150,7 @@
 
     Route::get('stop-impersonating', [ImpersonationController::class, 'stop'])->name('impersonation.stop');
 
-    Route::group(['prefix' => 'passkeys'], function () {
+    Route::group(['prefix' => 'passkeys', 'middleware' => 'throttle:statamic.cp.passkeys'], function () {
         Route::post('/', [PasskeyLoginController::class, 'login'])->name('passkeys.auth');
         Route::get('options', [PasskeyLoginController::class, 'options'])->name('passkeys.auth.options');
     });
@@ -253,6 +258,7 @@
     Route::get('assets/browse/{asset_container}/{path?}', [BrowserController::class, 'show'])->where('path', '.*')->name('assets.browse.show');
     Route::post('assets-fieldtype', [FieldtypeController::class, 'index']);
     Route::resource('assets', AssetsController::class)->parameters(['assets' => 'encoded_asset'])->except('destroy');
+    Route::post('assets/{encoded_asset}/crop', [AssetsController::class, 'crop'])->name('assets.crop');
     Route::get('assets/{encoded_asset}/download', [AssetsController::class, 'download'])->name('assets.download');
     Route::get('thumbnails/{encoded_asset}/{size?}/{orientation?}', [ThumbnailController::class, 'show'])->name('assets.thumbnails.show');
     Route::get('svgs/{encoded_asset}', [SvgController::class, 'show'])->name('assets.svgs.show');
@@ -345,14 +351,16 @@
     Route::post('users/actions/list', [UserActionController::class, 'bulkActions'])->name('users.actions.bulk');
     Route::resource('users', UsersController::class)->except('destroy');
     Route::patch('users/{user}/password', [PasswordController::class, 'update'])->name('users.password.update');
-    Route::withoutMiddleware(RedirectIfTwoFactorSetupIncomplete::class)->middleware(RequireElevatedSession::class)->group(function () {
-        Route::get('two-factor/enable', [TwoFactorAuthenticationController::class, 'enable'])->name('users.two-factor.enable');
-        Route::delete('two-factor', [TwoFactorAuthenticationController::class, 'disable'])->name('users.two-factor.disable');
-        Route::post('two-factor/confirm', [TwoFactorAuthenticationController::class, 'confirm'])->name('users.two-factor.confirm');
-        Route::get('two-factor/recovery-codes', [TwoFactorRecoveryCodesController::class, 'show'])->name('users.two-factor.recovery-codes.show');
-        Route::post('two-factor/recovery-codes', [TwoFactorRecoveryCodesController::class, 'store'])->name('users.two-factor.recovery-codes.generate');
-        Route::get('two-factor/recovery-codes/download', [TwoFactorRecoveryCodesController::class, 'download'])->name('users.two-factor.recovery-codes.download');
-    });
+    if (TwoFactor::enabled()) {
+        Route::withoutMiddleware(RedirectIfTwoFactorSetupIncomplete::class)->middleware(RequireElevatedSession::class)->group(function () {
+            Route::post('two-factor/enable', [TwoFactorAuthenticationController::class, 'enable'])->name('users.two-factor.enable');
+            Route::delete('two-factor', [TwoFactorAuthenticationController::class, 'disable'])->name('users.two-factor.disable');
+            Route::post('two-factor/confirm', [TwoFactorAuthenticationController::class, 'confirm'])->name('users.two-factor.confirm');
+            Route::get('two-factor/recovery-codes', [TwoFactorRecoveryCodesController::class, 'show'])->name('users.two-factor.recovery-codes.show');
+            Route::post('two-factor/recovery-codes', [TwoFactorRecoveryCodesController::class, 'store'])->name('users.two-factor.recovery-codes.generate');
+            Route::get('two-factor/recovery-codes/download', [TwoFactorRecoveryCodesController::class, 'download'])->name('users.two-factor.recovery-codes.download');
+        });
+    }
     Route::get('account', AccountController::class)->name('account');
     Route::resource('user-groups', UserGroupsController::class);
     Route::resource('roles', RolesController::class);
@@ -376,7 +384,6 @@
         Route::get('relationship/filters', [RelationshipFieldtypeController::class, 'filters'])->name('relationship.filters');
         Route::post('markdown', [MarkdownFieldtypeController::class, 'preview'])->name('markdown.preview');
         Route::post('files/upload', [FilesFieldtypeController::class, 'upload'])->name('files.upload');
-        Route::get('dictionaries/{dictionary}', DictionaryFieldtypeController::class)->name('dictionary-fieldtype');
         Route::post('icons', IconFieldtypeController::class)->name('icon-fieldtype');
         Route::post('replicator/set', ReplicatorSetController::class)->name('replicator-fieldtype.set');
     });
@@ -430,6 +437,11 @@
         Route::delete('{id}', [PasskeyController::class, 'destroy'])->name('passkeys.destroy');
     });
 
+    if (OAuth::enabled()) {
+        Route::get('oauth', [OAuthController::class, 'index'])->name('oauth');
+        Route::delete('oauth/{provider}/disconnect', [FrontendOAuthController::class, 'disconnect'])->middleware(RequireElevatedSession::class)->name('oauth.disconnect');
+    }
+
     Route::get('themes', [ThemeController::class, 'index']);
     Route::get('themes/refresh', [ThemeController::class, 'refresh']);
     Route::post('themes/share', ShareThemeController::class);
@@ -438,11 +450,13 @@
 
     Route::get('session-timeout', SessionTimeoutController::class)->name('session.timeout');
 
-    Route::get('auth/confirm-password', [ElevatedSessionController::class, 'showForm'])->name('confirm-password');
-    Route::get('elevated-session', [ElevatedSessionController::class, 'status'])->name('elevated-session.status');
-    Route::get('elevated-session/passkey-options', [ElevatedSessionController::class, 'options'])->name('elevated-session.passkey-options');
-    Route::post('elevated-session', [ElevatedSessionController::class, 'confirm'])->name('elevated-session.confirm');
-    Route::get('elevated-session/resend-code', [ElevatedSessionController::class, 'resendCode'])->name('elevated-session.resend-code')->middleware('throttle:send-elevated-session-code');
+    if (config('statamic.users.elevated_sessions_enabled')) {
+        Route::get('auth/confirm-password', [ElevatedSessionController::class, 'showForm'])->name('confirm-password');
+        Route::get('elevated-session', [ElevatedSessionController::class, 'status'])->name('elevated-session.status');
+        Route::get('elevated-session/passkey-options', [ElevatedSessionController::class, 'options'])->name('elevated-session.passkey-options')->middleware('throttle:statamic.cp.passkeys');
+        Route::post('elevated-session', [ElevatedSessionController::class, 'confirm'])->name('elevated-session.confirm')->middleware('throttle:statamic.cp.auth');
+        Route::get('elevated-session/resend-code', [ElevatedSessionController::class, 'resendCode'])->name('elevated-session.resend-code')->middleware('throttle:send-elevated-session-code');
+    }
 
     Route::get('playground', PlaygroundController::class)->name('playground');
 
diff --git a/routes/glide.php b/routes/glide.php
index 7c27e10fe0e..d78da3caee1 100644
--- a/routes/glide.php
+++ b/routes/glide.php
@@ -7,7 +7,7 @@
 use Statamic\Http\Controllers\GlideController;
 
 Site::all()->map(function ($site) {
-    return URL::makeRelative($site->url());
+    return trim(URL::makeRelative($site->url()), '/');
 })->unique()->each(function ($sitePrefix) {
     Route::group(['prefix' => $sitePrefix.'/'.Glide::route()], function () {
         Route::get('/asset/{container}/{path?}', [GlideController::class, 'generateByAsset'])->where('path', '.*');
diff --git a/routes/web.php b/routes/web.php
index 6dc58b73132..8fc9882f3a5 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -5,7 +5,10 @@
 use Illuminate\Support\Facades\Route;
 use Statamic\Auth\Protect\Protectors\Password\Controller as PasswordProtectController;
 use Statamic\Facades\OAuth;
+use Statamic\Facades\TwoFactor;
 use Statamic\Http\Controllers\ActivateAccountController;
+use Statamic\Http\Controllers\Auth\ElevatedSessionController;
+use Statamic\Http\Controllers\DictionaryFieldtypeController;
 use Statamic\Http\Controllers\ForgotPasswordController;
 use Statamic\Http\Controllers\FormController;
 use Statamic\Http\Controllers\FrontendController;
@@ -15,6 +18,8 @@
 use Statamic\Http\Controllers\TwoFactorChallengeController;
 use Statamic\Http\Controllers\TwoFactorSetupController;
 use Statamic\Http\Controllers\User\LoginController;
+use Statamic\Http\Controllers\User\PasskeyController;
+use Statamic\Http\Controllers\User\PasskeyLoginController;
 use Statamic\Http\Controllers\User\PasswordController;
 use Statamic\Http\Controllers\User\ProfileController;
 use Statamic\Http\Controllers\User\RegisterController;
@@ -24,6 +29,7 @@
 use Statamic\Http\Middleware\CP\AuthGuard as CPAuthGuard;
 use Statamic\Http\Middleware\CP\HandleInertiaRequests;
 use Statamic\Http\Middleware\RedirectIfTwoFactorSetupIncomplete;
+use Statamic\Http\Middleware\RequireElevatedSession;
 use Statamic\Statamic;
 use Statamic\StaticCaching\NoCache\CsrfTokenController;
 use Statamic\StaticCaching\NoCache\NoCacheController;
@@ -31,50 +37,77 @@
 
 Route::name('statamic.')->group(function () {
     Route::group(['prefix' => config('statamic.routes.action')], function () {
-        Route::post('forms/{form}', [FormController::class, 'submit'])->middleware([HandlePrecognitiveRequests::class])->name('forms.submit');
+        Route::post('forms/{form}', [FormController::class, 'submit'])->middleware([HandlePrecognitiveRequests::class, 'throttle:statamic.forms'])->name('forms.submit');
 
         Route::get('protect/password', [PasswordProtectController::class, 'show'])->name('protect.password.show')->middleware([HandleInertiaRequests::class]);
         Route::post('protect/password', [PasswordProtectController::class, 'store'])->name('protect.password.store');
 
+        Route::get('fieldtypes/dictionaries/{dictionary}', DictionaryFieldtypeController::class)->middleware('throttle:statamic.dictionaries')->name('dictionary-fieldtype');
+
         Route::group(['prefix' => 'auth', 'middleware' => [AuthGuard::class]], function () {
             Route::get('logout', [LoginController::class, 'logout'])->name('logout');
 
-            Route::group(['middleware' => [HandlePrecognitiveRequests::class]], function () {
+            Route::group(['middleware' => [HandlePrecognitiveRequests::class, 'throttle:statamic.auth']], function () {
                 Route::post('login', [LoginController::class, 'login'])->name('login');
                 Route::post('register', RegisterController::class)->name('register');
                 Route::post('profile', ProfileController::class)->name('profile');
                 Route::post('password', PasswordController::class)->name('password');
             });
 
-            Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail'])->name('password.email');
-            Route::get('password/reset/{token}', [ResetPasswordController::class, 'showResetForm'])->name('password.reset');
-            Route::post('password/reset', [ResetPasswordController::class, 'reset'])->name('password.reset.action');
-
-            Route::get('two-factor-setup', TwoFactorSetupController::class)->name('two-factor-setup');
-            Route::get('two-factor-challenge', [TwoFactorChallengeController::class, 'index'])->name('two-factor-challenge');
-            Route::post('two-factor-challenge', [TwoFactorChallengeController::class, 'store']);
-
-            Route::withoutMiddleware(RedirectIfTwoFactorSetupIncomplete::class)->group(function () {
-                Route::get('two-factor/enable', [TwoFactorAuthenticationController::class, 'enable'])->name('users.two-factor.enable');
-                Route::post('two-factor/confirm', [TwoFactorAuthenticationController::class, 'confirm'])->name('users.two-factor.confirm');
-                Route::get('two-factor/recovery-codes', [TwoFactorRecoveryCodesController::class, 'show'])->name('users.two-factor.recovery-codes.show');
-                Route::post('two-factor/recovery-codes', [TwoFactorRecoveryCodesController::class, 'store'])->name('users.two-factor.recovery-codes.generate');
-                Route::get('two-factor/recovery-codes/download', [TwoFactorRecoveryCodesController::class, 'download'])->name('users.two-factor.recovery-codes.download');
+            Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail'])->middleware('throttle:statamic.auth')->name('password.email');
+            Route::get('password/reset/{token}', [ResetPasswordController::class, 'showResetForm'])->middleware('throttle:statamic.password-reset-form')->name('password.reset');
+            Route::post('password/reset', [ResetPasswordController::class, 'reset'])->middleware('throttle:statamic.auth')->name('password.reset.action');
+
+            if (config('statamic.users.elevated_sessions_enabled')) {
+                Route::middleware('auth')->group(function () {
+                    Route::get('confirm-password', [ElevatedSessionController::class, 'showForm'])->name('elevated-session')->middleware([HandleInertiaRequests::class]);
+                    Route::post('elevated-session', [ElevatedSessionController::class, 'confirm'])->name('elevated-session.confirm')->middleware('throttle:statamic.auth');
+                    Route::get('elevated-session/passkey-options', [ElevatedSessionController::class, 'options'])->name('elevated-session.passkey-options')->middleware('throttle:statamic.passkeys');
+                    Route::get('elevated-session/resend-code', [ElevatedSessionController::class, 'resendCode'])->name('elevated-session.resend-code')->middleware('throttle:send-elevated-session-code');
+                });
+            }
+
+            Route::group(['prefix' => 'passkeys'], function () {
+                Route::middleware('throttle:statamic.passkeys')->group(function () {
+                    Route::get('options', [PasskeyLoginController::class, 'options'])->name('passkeys.options');
+                    Route::post('auth', [PasskeyLoginController::class, 'login'])->name('passkeys.login');
+                });
+
+                Route::middleware('auth')->group(function () {
+                    Route::get('create', [PasskeyController::class, 'create'])->name('passkeys.create');
+                    Route::post('/', [PasskeyController::class, 'store'])->name('passkeys.store');
+                    Route::delete('{id}', [PasskeyController::class, 'destroy'])->name('passkeys.destroy');
+                });
             });
+
+            if (TwoFactor::enabled()) {
+                Route::get('two-factor-setup', TwoFactorSetupController::class)->name('two-factor-setup');
+                Route::get('two-factor-challenge', [TwoFactorChallengeController::class, 'index'])->name('two-factor-challenge');
+                Route::post('two-factor-challenge', [TwoFactorChallengeController::class, 'store']);
+
+                Route::middleware(['auth', RequireElevatedSession::class])->withoutMiddleware(RedirectIfTwoFactorSetupIncomplete::class)->group(function () {
+                    Route::post('two-factor/enable', [TwoFactorAuthenticationController::class, 'enable'])->name('users.two-factor.enable');
+                    Route::post('two-factor/confirm', [TwoFactorAuthenticationController::class, 'confirm'])->name('users.two-factor.confirm');
+                    Route::delete('two-factor/disable', [TwoFactorAuthenticationController::class, 'disable'])->name('users.two-factor.disable');
+                    Route::get('two-factor/recovery-codes', [TwoFactorRecoveryCodesController::class, 'show'])->name('users.two-factor.recovery-codes.show');
+                    Route::post('two-factor/recovery-codes', [TwoFactorRecoveryCodesController::class, 'store'])->name('users.two-factor.recovery-codes.generate');
+                    Route::get('two-factor/recovery-codes/download', [TwoFactorRecoveryCodesController::class, 'download'])->name('users.two-factor.recovery-codes.download');
+                });
+            }
         });
 
         Route::group(['prefix' => 'auth', 'middleware' => [CPAuthGuard::class]], function () {
-            Route::get('activate/{token}', [ActivateAccountController::class, 'showResetForm'])->name('account.activate');
+            Route::get('activate/{token}', [ActivateAccountController::class, 'showResetForm'])->middleware('throttle:statamic.password-reset-form')->name('account.activate');
             Route::post('activate', [ActivateAccountController::class, 'reset'])->name('account.activate.action');
         });
 
         Route::post('nocache', NoCacheController::class)
             ->middleware(NoCacheLocalize::class)
-            ->withoutMiddleware(['App\Http\Middleware\VerifyCsrfToken', 'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken'])
+            ->withoutMiddleware(['App\Http\Middleware\VerifyCsrfToken', 'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken', 'Illuminate\Foundation\Http\Middleware\PreventRequestForgery'])
             ->name('nocache');
 
         Route::post('csrf', CsrfTokenController::class)
-            ->withoutMiddleware(['App\Http\Middleware\VerifyCsrfToken', 'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken']);
+            ->withoutMiddleware(['App\Http\Middleware\VerifyCsrfToken', 'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken', 'Illuminate\Foundation\Http\Middleware\PreventRequestForgery']);
 
         Statamic::additionalActionRoutes();
     });
@@ -84,6 +117,9 @@
         Route::match(['get', 'post'], config('statamic.oauth.routes.callback'), [OAuthController::class, 'handleProviderCallback'])
             ->withoutMiddleware(['App\Http\Middleware\VerifyCsrfToken', 'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken'])
             ->name('oauth.callback');
+        Route::delete(config('statamic.oauth.routes.disconnect', 'oauth/{provider}/disconnect'), [OAuthController::class, 'disconnect'])
+            ->middleware([AuthGuard::class, 'auth', RequireElevatedSession::class])
+            ->name('oauth.disconnect');
     }
 });
 
diff --git a/scripts/build-release.sh b/scripts/build-release.sh
index dc9f6cacad8..e3af82e2c51 100644
--- a/scripts/build-release.sh
+++ b/scripts/build-release.sh
@@ -10,16 +10,7 @@ npm run build
 npm run build-dev
 npm run frontend-build
 
-# Create tarballs for the Laravel package
-cd resources
-tar -czvf dist.tar.gz dist
-tar -czvf dist-dev.tar.gz dist-dev
-tar -czvf dist-frontend.tar.gz dist-frontend
-cd ..
-
-# Create a tarball for @statamic/cms
+# Populate resources/dist-package from packages/cms
 cp resources/css/ui.css packages/cms/src/ui.css
-cd packages/cms
-tar -czvf ../../resources/dist-package.tar.gz *
-cd ../..
+rsync -a --delete packages/cms/ resources/dist-package/
 
diff --git a/scripts/check-autoload-files.sh b/scripts/check-autoload-files.sh
new file mode 100644
index 00000000000..15bf609ffe7
--- /dev/null
+++ b/scripts/check-autoload-files.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -uo pipefail
+
+EXPECTED='["src/helpers.php","src/namespaced_helpers.php","src/View/Blade/helpers.php"]'
+ACTUAL=$(jq -c '.autoload.files' composer.json)
+
+if [ "$ACTUAL" != "$EXPECTED" ]; then
+    echo "composer.json autoload.files has changed and must be reviewed."
+    echo "Expected: $EXPECTED"
+    echo "Actual:   $ACTUAL"
+    exit 1
+fi
+
+echo "autoload.files matches the approved allowlist."
diff --git a/scripts/check-trans-import.sh b/scripts/check-trans-import.sh
new file mode 100644
index 00000000000..2f63719de26
--- /dev/null
+++ b/scripts/check-trans-import.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+set -uo pipefail
+
+excluded=("src/Statamic.php" "src/namespaced_helpers.php" "src/Translator/MethodDiscovery.php")
+
+is_excluded() {
+    local file=$1
+    for ex in "${excluded[@]}"; do
+        [ "$file" = "$ex" ] && return 0
+    done
+    return 1
+}
+
+# Returns 0 if the file contains an unqualified call to the given function.
+# Skips method definitions and qualified calls (Foo::fn(), $x->fn(), $fn()).
+has_unqualified_call() {
+    local file=$1
+    local fn=$2
+
+    grep -nE "${fn}[[:space:]]*\(" "$file" 2>/dev/null \
+        | grep -vE "(function[[:space:]]+|::|->|\\\$)${fn}[[:space:]]*\(" \
+        > /dev/null
+}
+
+errors=""
+
+while IFS= read -r file; do
+    is_excluded "$file" && continue
+
+    if grep -qE '__[[:space:]]*\([^?]' "$file" && ! grep -qF 'use function Statamic\trans as __;' "$file"; then
+        errors+="$file: missing 'use function Statamic\\trans as __;'"$'\n'
+    fi
+
+    if has_unqualified_call "$file" "trans" && ! grep -qF 'use function Statamic\trans;' "$file"; then
+        errors+="$file: missing 'use function Statamic\\trans;'"$'\n'
+    fi
+
+    if has_unqualified_call "$file" "trans_choice" && ! grep -qF 'use function Statamic\trans_choice;' "$file"; then
+        errors+="$file: missing 'use function Statamic\\trans_choice;'"$'\n'
+    fi
+done < <(git ls-files 'src/**/*.php' 'resources/views/**/*.blade.php')
+
+if [ -n "$errors" ]; then
+    echo "Files with missing Statamic\\trans imports (see PR #14610):"
+    echo
+    printf '%s' "$errors"
+    exit 1
+fi
diff --git a/src/API/Cachers/DefaultCacher.php b/src/API/Cachers/DefaultCacher.php
index 05893b0acde..2679738ad83 100644
--- a/src/API/Cachers/DefaultCacher.php
+++ b/src/API/Cachers/DefaultCacher.php
@@ -15,7 +15,13 @@ class DefaultCacher extends AbstractCacher
      */
     public function get(Request $request)
     {
-        return Cache::get($this->getCacheKey($request));
+        $cached = Cache::get($this->getCacheKey($request));
+
+        if (! is_array($cached)) {
+            return null;
+        }
+
+        return new JsonResponse($cached['content'], $cached['status'], $cached['headers'], json: true);
     }
 
     /**
@@ -25,7 +31,11 @@ public function put(Request $request, JsonResponse $response)
     {
         $key = $this->trackEndpoint($request);
 
-        Cache::put($key, $response, $this->cacheExpiry());
+        Cache::put($key, [
+            'content' => $response->getContent(),
+            'status' => $response->getStatusCode(),
+            'headers' => $response->headers->all(),
+        ], $this->cacheExpiry());
     }
 
     /**
diff --git a/src/Actions/AssignGroups.php b/src/Actions/AssignGroups.php
index 36d60f4e4a5..296d739730e 100644
--- a/src/Actions/AssignGroups.php
+++ b/src/Actions/AssignGroups.php
@@ -5,6 +5,8 @@
 use Statamic\Contracts\Auth\User as UserContract;
 use Statamic\Facades\UserGroup;
 
+use function Statamic\trans as __;
+
 class AssignGroups extends Action
 {
     public $icon = 'add-group';
@@ -24,6 +26,11 @@ public function authorize($authed, $user)
         return $authed->can('assign user groups');
     }
 
+    public function requiresElevatedSession(): bool
+    {
+        return true;
+    }
+
     public function confirmationText()
     {
         /** @translation */
diff --git a/src/Actions/AssignRoles.php b/src/Actions/AssignRoles.php
index ab8adf3e3d9..c624f8ade67 100644
--- a/src/Actions/AssignRoles.php
+++ b/src/Actions/AssignRoles.php
@@ -5,6 +5,8 @@
 use Statamic\Contracts\Auth\User as UserContract;
 use Statamic\Facades\Role;
 
+use function Statamic\trans as __;
+
 class AssignRoles extends Action
 {
     public $icon = 'permissions';
@@ -24,6 +26,11 @@ public function authorize($authed, $user)
         return $authed->can('assign roles');
     }
 
+    public function requiresElevatedSession(): bool
+    {
+        return true;
+    }
+
     public function confirmationText()
     {
         /** @translation */
diff --git a/src/Actions/CopyAssetUrl.php b/src/Actions/CopyAssetUrl.php
index 655218a5134..3136399494d 100644
--- a/src/Actions/CopyAssetUrl.php
+++ b/src/Actions/CopyAssetUrl.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Assets\Asset;
 
+use function Statamic\trans as __;
+
 class CopyAssetUrl extends Action
 {
     protected $icon = 'clipboard';
diff --git a/src/Actions/CopyPasswordResetLink.php b/src/Actions/CopyPasswordResetLink.php
index 014f21a0566..c6d55fd85bd 100644
--- a/src/Actions/CopyPasswordResetLink.php
+++ b/src/Actions/CopyPasswordResetLink.php
@@ -6,6 +6,8 @@
 use Statamic\Auth\Passwords\PasswordReset;
 use Statamic\Contracts\Auth\User as UserContract;
 
+use function Statamic\trans as __;
+
 class CopyPasswordResetLink extends Action
 {
     protected $confirm = false;
diff --git a/src/Actions/Delete.php b/src/Actions/Delete.php
index 7b73ffd30a7..6c047bdc82c 100644
--- a/src/Actions/Delete.php
+++ b/src/Actions/Delete.php
@@ -4,6 +4,9 @@
 
 use Statamic\Contracts;
 
+use function Statamic\trans as __;
+use function Statamic\trans_choice;
+
 class Delete extends Action
 {
     protected $dangerous = true;
diff --git a/src/Actions/DeleteMultisiteEntry.php b/src/Actions/DeleteMultisiteEntry.php
index 4d4b70e9957..0cd39307523 100644
--- a/src/Actions/DeleteMultisiteEntry.php
+++ b/src/Actions/DeleteMultisiteEntry.php
@@ -6,6 +6,9 @@
 use Statamic\Facades\User;
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+use function Statamic\trans_choice;
+
 class DeleteMultisiteEntry extends Delete
 {
     public function visibleTo($item)
diff --git a/src/Actions/DisableTwoFactorAuthentication.php b/src/Actions/DisableTwoFactorAuthentication.php
index fd32ad04f3b..0db90d3140b 100644
--- a/src/Actions/DisableTwoFactorAuthentication.php
+++ b/src/Actions/DisableTwoFactorAuthentication.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Auth\User;
 
+use function Statamic\trans as __;
+
 class DisableTwoFactorAuthentication extends Action
 {
     protected $dangerous = true;
diff --git a/src/Actions/DownloadAsset.php b/src/Actions/DownloadAsset.php
index d8c51645bee..62b7bbb28ad 100644
--- a/src/Actions/DownloadAsset.php
+++ b/src/Actions/DownloadAsset.php
@@ -5,6 +5,8 @@
 use Statamic\Actions\Concerns\MakesZips;
 use Statamic\Contracts\Assets\Asset;
 
+use function Statamic\trans as __;
+
 class DownloadAsset extends Action
 {
     use MakesZips;
diff --git a/src/Actions/DownloadAssetFolder.php b/src/Actions/DownloadAssetFolder.php
index 8e57741dc33..1569428d83f 100644
--- a/src/Actions/DownloadAssetFolder.php
+++ b/src/Actions/DownloadAssetFolder.php
@@ -6,6 +6,8 @@
 use Statamic\Contracts\Assets\AssetFolder;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class DownloadAssetFolder extends Action
 {
     use MakesZips;
diff --git a/src/Actions/DuplicateAsset.php b/src/Actions/DuplicateAsset.php
index bdcfe6292f3..3512e9569b7 100644
--- a/src/Actions/DuplicateAsset.php
+++ b/src/Actions/DuplicateAsset.php
@@ -6,6 +6,8 @@
 use Statamic\Contracts\Assets\Asset;
 use Statamic\Facades\Asset as Assets;
 
+use function Statamic\trans as __;
+
 class DuplicateAsset extends Action
 {
     protected $icon = 'duplicate';
diff --git a/src/Actions/DuplicateEntry.php b/src/Actions/DuplicateEntry.php
index 59d8788f6f7..d5b063a5180 100644
--- a/src/Actions/DuplicateEntry.php
+++ b/src/Actions/DuplicateEntry.php
@@ -8,6 +8,8 @@
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
 
+use function Statamic\trans as __;
+
 class DuplicateEntry extends Action
 {
     protected $icon = 'duplicate';
@@ -160,7 +162,7 @@ protected function generateTitleAndSlug(Entry $entry, $attempt = 1)
         $slug .= '-'.$attempt;
 
         // If the slug we've just built already exists, we'll try again, recursively.
-        if ($entry->collection()->queryEntries()->where('locale', $entry->locale())->where('slug', $slug)->count()) {
+        if ($entry->collection()->queryEntries()->where('site', $entry->locale())->where('slug', $slug)->count()) {
             [$title, $slug] = $this->generateTitleAndSlug($entry, $attempt + 1);
         }
 
diff --git a/src/Actions/DuplicateForm.php b/src/Actions/DuplicateForm.php
index 68a38ed648a..9118daa4985 100644
--- a/src/Actions/DuplicateForm.php
+++ b/src/Actions/DuplicateForm.php
@@ -8,6 +8,8 @@
 use Statamic\Rules\UniqueFormHandle;
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 class DuplicateForm extends Action
 {
     protected $icon = 'duplicate';
diff --git a/src/Actions/DuplicateTerm.php b/src/Actions/DuplicateTerm.php
index ee94200d206..d6a3a295591 100644
--- a/src/Actions/DuplicateTerm.php
+++ b/src/Actions/DuplicateTerm.php
@@ -6,6 +6,8 @@
 use Statamic\Contracts\Taxonomies\Term;
 use Statamic\Facades\Term as Terms;
 
+use function Statamic\trans as __;
+
 class DuplicateTerm extends Action
 {
     protected $icon = 'duplicate';
diff --git a/src/Actions/Impersonate.php b/src/Actions/Impersonate.php
index 37c58f0aff8..1dfab52a323 100644
--- a/src/Actions/Impersonate.php
+++ b/src/Actions/Impersonate.php
@@ -9,6 +9,8 @@
 use Statamic\Facades\CP\Toast;
 use Statamic\Facades\User;
 
+use function Statamic\trans as __;
+
 class Impersonate extends Action
 {
     public $icon = 'mask';
@@ -24,7 +26,11 @@ public function visibleTo($item)
             return false;
         }
 
-        return $item instanceof UserContract && $item->id() != User::current()->id();
+        if (! ($item instanceof UserContract && $item->id() != User::current()->id())) {
+            return false;
+        }
+
+        return User::current()->can('impersonate', $item);
     }
 
     public function visibleToBulk($items)
@@ -34,7 +40,7 @@ public function visibleToBulk($items)
 
     public function authorize($authed, $user)
     {
-        return $authed->can('impersonate users');
+        return $authed->can('impersonate', $user);
     }
 
     public function run($users, $values)
diff --git a/src/Actions/MoveAsset.php b/src/Actions/MoveAsset.php
index 3abd2684ac3..fb9861a3a9d 100644
--- a/src/Actions/MoveAsset.php
+++ b/src/Actions/MoveAsset.php
@@ -6,6 +6,8 @@
 use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Blink;
 
+use function Statamic\trans as __;
+
 class MoveAsset extends Action
 {
     protected $icon = 'move-folder';
@@ -39,10 +41,13 @@ public function confirmationText()
 
     public function run($assets, $values)
     {
-        $ids = $assets->each->move($values['folder'])->map->id()->all();
+        $oldIds = $assets->map->id()->all();
+
+        $newIds = $assets->each->move($values['folder'])->map->id()->all();
 
         return [
-            'ids' => $ids,
+            'ids' => $newIds,
+            'callback' => ['replaceInSelections', array_combine($oldIds, $newIds)],
         ];
     }
 
diff --git a/src/Actions/MoveAssetFolder.php b/src/Actions/MoveAssetFolder.php
index f8974b78bfe..aff425f40ae 100644
--- a/src/Actions/MoveAssetFolder.php
+++ b/src/Actions/MoveAssetFolder.php
@@ -6,6 +6,8 @@
 use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Blink;
 
+use function Statamic\trans as __;
+
 class MoveAssetFolder extends Action
 {
     protected $icon = 'move-folder';
diff --git a/src/Actions/Publish.php b/src/Actions/Publish.php
index f5ba2f88e75..79aa882d58a 100644
--- a/src/Actions/Publish.php
+++ b/src/Actions/Publish.php
@@ -5,6 +5,9 @@
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Facades\User;
 
+use function Statamic\trans as __;
+use function Statamic\trans_choice;
+
 class Publish extends Action
 {
     protected $icon = 'eye';
diff --git a/src/Actions/RenameAsset.php b/src/Actions/RenameAsset.php
index 3229c55e6b5..bdec021c6c0 100644
--- a/src/Actions/RenameAsset.php
+++ b/src/Actions/RenameAsset.php
@@ -5,6 +5,8 @@
 use Statamic\Contracts\Assets\Asset;
 use Statamic\Rules\AvailableAssetFilename;
 
+use function Statamic\trans as __;
+
 class RenameAsset extends Action
 {
     protected $icon = 'rename';
@@ -43,10 +45,13 @@ public function confirmationText()
 
     public function run($assets, $values)
     {
-        $ids = $assets->each->rename($values['filename'], true)->map->id()->all();
+        $oldIds = $assets->map->id()->all();
+
+        $newIds = $assets->each->rename($values['filename'], true)->map->id()->all();
 
         return [
-            'ids' => $ids,
+            'ids' => $newIds,
+            'callback' => ['replaceInSelections', array_combine($oldIds, $newIds)],
         ];
     }
 
diff --git a/src/Actions/RenameAssetFolder.php b/src/Actions/RenameAssetFolder.php
index 31a50ecd7d3..6436c687600 100644
--- a/src/Actions/RenameAssetFolder.php
+++ b/src/Actions/RenameAssetFolder.php
@@ -5,6 +5,8 @@
 use Statamic\Contracts\Assets\AssetFolder;
 use Statamic\Rules\AlphaDashSpace;
 
+use function Statamic\trans as __;
+
 class RenameAssetFolder extends Action
 {
     protected $icon = 'folder-edit';
diff --git a/src/Actions/ReplaceAsset.php b/src/Actions/ReplaceAsset.php
index f0b5ec9e056..c11d4fb52f7 100644
--- a/src/Actions/ReplaceAsset.php
+++ b/src/Actions/ReplaceAsset.php
@@ -5,6 +5,8 @@
 use Statamic\Contracts\Assets\Asset;
 use Statamic\Facades;
 
+use function Statamic\trans as __;
+
 class ReplaceAsset extends Action
 {
     protected $icon = 'replace';
diff --git a/src/Actions/ReuploadAsset.php b/src/Actions/ReuploadAsset.php
index 28a0483f6a0..bb3f6ad3de0 100644
--- a/src/Actions/ReuploadAsset.php
+++ b/src/Actions/ReuploadAsset.php
@@ -7,6 +7,9 @@
 use Statamic\Exceptions\FileExtensionMismatch;
 use Statamic\Exceptions\ValidationException;
 
+use function Statamic\trans;
+use function Statamic\trans as __;
+
 class ReuploadAsset extends Action
 {
     protected $icon = 'upload-cloud';
@@ -53,7 +56,8 @@ public function run($assets, $values)
     {
         $asset = $assets->first();
 
-        $file = new ReplacementFile('statamic/file-uploads/'.$values['file']);
+        $basePath = config('statamic.system.file_uploads_path', 'statamic/file-uploads');
+        $file = new ReplacementFile($basePath.'/'.$values['file']);
 
         try {
             $asset->reupload($file);
diff --git a/src/Actions/SendPasswordReset.php b/src/Actions/SendPasswordReset.php
index a6cc45077d7..69df5f302b0 100644
--- a/src/Actions/SendPasswordReset.php
+++ b/src/Actions/SendPasswordReset.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Auth\User as UserContract;
 
+use function Statamic\trans as __;
+
 class SendPasswordReset extends Action
 {
     public $icon = 'mail';
diff --git a/src/Actions/Unpublish.php b/src/Actions/Unpublish.php
index 08c78e6d08d..af7e9a6ce46 100644
--- a/src/Actions/Unpublish.php
+++ b/src/Actions/Unpublish.php
@@ -5,6 +5,9 @@
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Facades\User;
 
+use function Statamic\trans as __;
+use function Statamic\trans_choice;
+
 class Unpublish extends Action
 {
     protected $icon = 'eye-slash';
diff --git a/src/Addons/Addon.php b/src/Addons/Addon.php
index dfbfbf65854..cefc03abaeb 100644
--- a/src/Addons/Addon.php
+++ b/src/Addons/Addon.php
@@ -361,7 +361,7 @@ public function settingsBlueprint()
             return null;
         }
 
-        return Blueprint::make()->setContents(app($binding));
+        return Blueprint::make("addons.{$this->slug()}")->setContents(app($binding));
     }
 
     public function setting($key, $default = null): mixed
@@ -419,7 +419,7 @@ public function isLatestVersion()
         $version = $versionParser->normalize($this->version);
         $latestVersion = $versionParser->normalize($this->latestVersion());
 
-        return version_compare($version, $latestVersion, '=');
+        return version_compare($version, $latestVersion, '>=');
     }
 
     public function license()
diff --git a/src/Addons/Settings.php b/src/Addons/Settings.php
index 2f30325d29f..8a6ed5a7a01 100644
--- a/src/Addons/Settings.php
+++ b/src/Addons/Settings.php
@@ -19,8 +19,7 @@ abstract class Settings implements Contract
     public function __construct(Addon $addon, array $settings = [])
     {
         $this->addon = $addon;
-        $this->settings = $this->resolveAntlers($settings);
-        $this->rawSettings = $settings;
+        $this->setValues($settings);
     }
 
     public function addon(): Addon
@@ -59,7 +58,7 @@ private function setValue(string $key, mixed $value): self
     private function setValues(array $values): self
     {
         $this->rawSettings = $values;
-        $this->settings = $this->resolveAntlers($values);
+        $this->settings = $this->resolveAntlers($this->applyBlueprintDefaults($values));
 
         return $this;
     }
@@ -82,6 +81,20 @@ public function delete(): bool
         return app(SettingsRepository::class)->delete($this);
     }
 
+    private function applyBlueprintDefaults(array $settings): array
+    {
+        if (! $blueprint = $this->addon->settingsBlueprint()) {
+            return $settings;
+        }
+
+        $defaults = $blueprint->fields()->all()
+            ->mapWithKeys(fn ($field) => [$field->handle() => $field->defaultValue()])
+            ->whereNotNull()
+            ->all();
+
+        return array_merge($defaults, $settings);
+    }
+
     public function resolveAntlers($config)
     {
         return collect($config)
diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index f820b780c9b..9e815ff4454 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -8,7 +8,6 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Cache;
 use League\Flysystem\PathTraversalDetected;
-use Rhukster\DomSanitizer\DOMSanitizer;
 use Statamic\Assets\AssetUploader as Uploader;
 use Statamic\Contracts\Assets\Asset as AssetContract;
 use Statamic\Contracts\Assets\AssetContainer as AssetContainerContract;
@@ -46,6 +45,7 @@
 use Statamic\Statamic;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
+use Statamic\Support\Svg;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 use Statamic\Support\Traits\Hookable;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -66,6 +66,10 @@ class Asset implements Arrayable, ArrayAccess, AssetContract, Augmentable, Conta
         resolveGqlValue as traitResolveGqlValue;
     }
 
+    const AUDIO_EXTENSIONS = ['aac', 'flac', 'm4a', 'mp3', 'ogg', 'wav'];
+    const IMAGE_EXTENSIONS = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'avif'];
+    const VIDEO_EXTENSIONS = ['h264', 'mp4', 'm4v', 'ogv', 'webm', 'mov'];
+
     protected $container;
     protected $path;
     protected $meta;
@@ -471,7 +475,7 @@ public function manipulate($params = null)
      */
     public function isAudio()
     {
-        return $this->extensionIsOneOf(['aac', 'flac', 'm4a', 'mp3', 'ogg', 'wav']);
+        return $this->extensionIsOneOf(self::AUDIO_EXTENSIONS);
     }
 
     /**
@@ -504,7 +508,7 @@ public function isPreviewable()
      */
     public function isImage()
     {
-        return $this->extensionIsOneOf(['jpg', 'jpeg', 'png', 'gif', 'webp', 'avif']);
+        return $this->extensionIsOneOf(self::IMAGE_EXTENSIONS);
     }
 
     /**
@@ -524,7 +528,7 @@ public function isSvg()
      */
     public function isVideo()
     {
-        return $this->extensionIsOneOf(['h264', 'mp4', 'm4v', 'ogv', 'webm', 'mov']);
+        return $this->extensionIsOneOf(self::VIDEO_EXTENSIONS);
     }
 
     /**
@@ -597,7 +601,7 @@ public function mimeType()
      */
     public function lastModified()
     {
-        return Carbon::createFromTimestamp($this->meta('last_modified'), config('app.timezone'));
+        return Carbon::createFromTimestamp($this->meta('last_modified') ?? 0, config('app.timezone'));
     }
 
     /**
@@ -970,9 +974,7 @@ public function reupload(ReplacementFile $file)
 
             $this->disk()->put(
                 $this->path(),
-                (new DOMSanitizer(DOMSanitizer::SVG))->sanitize($contents, [
-                    'remove-xml-tags' => ! Str::startsWith($contents, '<?xml'),
-                ])
+                Svg::sanitize($contents)
             );
         }
 
@@ -1135,7 +1137,7 @@ public function hasDuration()
 
     public function getQueryableValue(string $field)
     {
-        if (method_exists($this, $method = Str::camel($field))) {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
             return $this->{$method}();
         }
 
@@ -1148,6 +1150,17 @@ public function getQueryableValue(string $field)
         return $field->fieldtype()->toQueryableValue($value);
     }
 
+    private function queryableMethods(): array
+    {
+        return [
+            'absoluteUrl', 'apiUrl', 'basename', 'blueprint', 'containerId', 'containerHandle', 'dimensions',
+            'duration', 'editUrl', 'exists', 'extension', 'filename', 'folder', 'guessedExtension',
+            'hasDimensions', 'hasDuration', 'height', 'id', 'isAudio', 'isImage', 'isMedia', 'isPdf',
+            'isPreviewable', 'isSvg', 'isVideo', 'lastModified', 'mimeType', 'orientation', 'path', 'pdfUrl',
+            'ratio', 'reference', 'size', 'thumbnailUrl', 'title', 'url', 'width',
+        ];
+    }
+
     public function getCurrentDirtyStateAttributes(): array
     {
         return array_merge([
diff --git a/src/Assets/AssetContainer.php b/src/Assets/AssetContainer.php
index 9d94368d527..d4bbbee5db6 100644
--- a/src/Assets/AssetContainer.php
+++ b/src/Assets/AssetContainer.php
@@ -7,6 +7,7 @@
 use Statamic\Contracts\Assets\AssetContainer as AssetContainerContract;
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Data\Augmented;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedInstance;
 use Statamic\Events\AssetContainerBlueprintFound;
@@ -26,10 +27,14 @@
 use Statamic\Facades\Search;
 use Statamic\Facades\Stache;
 use Statamic\Facades\URL;
+use Statamic\Statamic;
 use Statamic\Support\Arr;
+use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
-class AssetContainer implements Arrayable, ArrayAccess, AssetContainerContract, Augmentable
+use function Statamic\trans as __;
+
+class AssetContainer implements Arrayable, ArrayAccess, AssetContainerContract, Augmentable, ContainsQueryableValues
 {
     use ExistsAsFile, FluentlyGetsAndSets, HasAugmentedInstance;
 
@@ -249,7 +254,7 @@ public function saveQuietly()
     /**
      * Save the container.
      *
-     * @return void
+     * @return $this|false
      */
     public function save()
     {
@@ -298,7 +303,7 @@ public function deleteQuietly()
     /**
      * Delete the container.
      *
-     * @return void
+     * @return bool
      */
     public function delete()
     {
@@ -340,7 +345,7 @@ public function listContents()
 
     public function contents()
     {
-        return Blink::once('asset-listing-cache-'.$this->handle(), function () {
+        return Blink::onceIf(! Statamic::isWorker(), 'asset-listing-cache-'.$this->handle(), function () {
             return app(AssetContainerContents::class)->container($this);
         });
     }
@@ -604,6 +609,24 @@ public static function __callStatic($method, $parameters)
         return Facades\AssetContainer::{$method}(...$parameters);
     }
 
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        return null;
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'absoluteUrl', 'accessible', 'allowDownloading', 'allowMoving', 'allowRenaming', 'allowUploads',
+            'blueprint', 'createFolders', 'diskHandle', 'diskPath', 'editUrl', 'handle', 'hasSearchIndex',
+            'id', 'path', 'private', 'searchIndex', 'showUrl', 'sortDirection', 'sortField', 'title', 'url',
+        ];
+    }
+
     public function __toString()
     {
         return $this->handle();
diff --git a/src/Assets/AssetFolder.php b/src/Assets/AssetFolder.php
index 794c9f72085..8b5133f4e1e 100644
--- a/src/Assets/AssetFolder.php
+++ b/src/Assets/AssetFolder.php
@@ -6,6 +6,7 @@
 use League\Flysystem\PathTraversalDetected;
 use Statamic\Assets\AssetUploader as Uploader;
 use Statamic\Contracts\Assets\AssetFolder as Contract;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Events\AssetFolderDeleted;
 use Statamic\Events\AssetFolderSaved;
 use Statamic\Facades\AssetContainer;
@@ -13,7 +14,10 @@
 use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
-class AssetFolder implements Arrayable, Contract
+/**
+ * @phpstan-consistent-constructor
+ */
+class AssetFolder implements Arrayable, ContainsQueryableValues, Contract
 {
     use FluentlyGetsAndSets;
 
@@ -237,4 +241,20 @@ public function toArray()
             'basename' => (string) $this->basename(),
         ];
     }
+
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        return null;
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'basename', 'count', 'lastModified', 'path', 'resolvedPath', 'size', 'title',
+        ];
+    }
 }
diff --git a/src/Assets/AssetUploader.php b/src/Assets/AssetUploader.php
index fa031aa4201..a2ae1576932 100644
--- a/src/Assets/AssetUploader.php
+++ b/src/Assets/AssetUploader.php
@@ -9,6 +9,9 @@
 use Statamic\Support\Str;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class AssetUploader extends Uploader
 {
     private $asset;
@@ -80,7 +83,7 @@ protected function getNewExtension()
 
     public static function getSafeFilename($string)
     {
-        $replacements = [
+        $replacements = array_merge(config('statamic.assets.additional_filename_replacements', []), [
             ' ' => '-',
             '#' => '-',
             ':' => '-',
@@ -95,7 +98,7 @@ public static function getSafeFilename($string)
             '%' => '-',
             "'" => '-',
             '--' => '-',
-        ];
+        ]);
 
         return (string) Str::of(urldecode($string))
             ->replace(array_keys($replacements), array_values($replacements))
diff --git a/src/Assets/AugmentedAsset.php b/src/Assets/AugmentedAsset.php
index a49727b431a..1117ff4158d 100644
--- a/src/Assets/AugmentedAsset.php
+++ b/src/Assets/AugmentedAsset.php
@@ -31,6 +31,7 @@ public function keys()
                 'is_image',
                 'is_svg',
                 'is_video',
+                'is_pdf',
                 'blueprint',
                 'edit_url',
                 'container',
diff --git a/src/Assets/CropAspectRatios.php b/src/Assets/CropAspectRatios.php
new file mode 100644
index 00000000000..e9905c34d0d
--- /dev/null
+++ b/src/Assets/CropAspectRatios.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Statamic\Assets;
+
+use Illuminate\Support\Facades\Log;
+
+use function Statamic\trans as __;
+
+class CropAspectRatios
+{
+    /**
+     * @return array<int, array{label: string, value: float}>
+     */
+    public static function all(): array
+    {
+        $ratios = config('statamic.assets.crop_aspect_ratios', []);
+
+        if (! is_array($ratios)) {
+            return [];
+        }
+
+        return collect($ratios)
+            ->map(fn ($entry, $key) => self::parse($entry, $key))
+            ->filter()
+            ->values()
+            ->all();
+    }
+
+    /**
+     * @return array{label: string, value: float}|null
+     */
+    private static function parse(mixed $entry, mixed $key): ?array
+    {
+        if (is_array($entry)) {
+            return self::parseArrayEntry($entry, $key);
+        }
+
+        if (! is_string($entry) && ! is_numeric($entry)) {
+            self::warn($entry, $key);
+
+            return null;
+        }
+
+        $value = self::ratioToFloat($entry);
+
+        if ($value === null) {
+            self::warn($entry, $key);
+
+            return null;
+        }
+
+        return [
+            'label' => __((string) $entry),
+            'value' => $value,
+        ];
+    }
+
+    /**
+     * @param  array<mixed>  $entry
+     * @return array{label: string, value: float}|null
+     */
+    private static function parseArrayEntry(array $entry, mixed $key): ?array
+    {
+        $label = $entry['label'] ?? null;
+        $ratio = $entry['ratio'] ?? null;
+
+        $labelIsStringable = is_string($label) || is_numeric($label) || $label instanceof \Stringable;
+
+        if (! $labelIsStringable || (! is_string($ratio) && ! is_numeric($ratio))) {
+            self::warn($entry, $key);
+
+            return null;
+        }
+
+        $value = self::ratioToFloat($ratio);
+
+        if ($value === null) {
+            self::warn($entry, $key);
+
+            return null;
+        }
+
+        return [
+            'label' => __((string) $label),
+            'value' => $value,
+        ];
+    }
+
+    private static function ratioToFloat(string|int|float $ratio): ?float
+    {
+        if (is_numeric($ratio)) {
+            $value = (float) $ratio;
+
+            return $value > 0 ? $value : null;
+        }
+
+        if (! str_contains($ratio, ':')) {
+            return null;
+        }
+
+        [$width, $height] = explode(':', $ratio, 2);
+
+        if (! is_numeric($width) || ! is_numeric($height)) {
+            return null;
+        }
+
+        $width = (float) $width;
+        $height = (float) $height;
+
+        if ($width <= 0 || $height <= 0) {
+            return null;
+        }
+
+        return $width / $height;
+    }
+
+    private static function warn(mixed $entry, mixed $key): void
+    {
+        Log::warning('Invalid crop aspect ratio config entry.', [
+            'config_key' => $key,
+            'entry' => $entry,
+        ]);
+    }
+}
diff --git a/src/Assets/FileUploader.php b/src/Assets/FileUploader.php
index 58a1e3f086b..e37cf5f2ab7 100644
--- a/src/Assets/FileUploader.php
+++ b/src/Assets/FileUploader.php
@@ -6,6 +6,9 @@
 use Statamic\Facades\AssetContainer;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class FileUploader extends Uploader
 {
     protected $container;
@@ -27,7 +30,7 @@ protected function uploadPath(UploadedFile $file)
 
     protected function uploadPathPrefix()
     {
-        return 'statamic/file-uploads/';
+        return config('statamic.system.file_uploads_path', 'statamic/file-uploads').'/';
     }
 
     protected function preset()
@@ -37,6 +40,6 @@ protected function preset()
 
     protected function disk()
     {
-        return Storage::disk('local');
+        return Storage::disk(config('statamic.system.file_uploads_disk', 'local'));
     }
 }
diff --git a/src/Assets/ReplacementFile.php b/src/Assets/ReplacementFile.php
index aa6fc3804c1..93e80e17237 100644
--- a/src/Assets/ReplacementFile.php
+++ b/src/Assets/ReplacementFile.php
@@ -31,9 +31,8 @@ public function basename()
 
     public function writeTo(Filesystem $disk, $path)
     {
-        $disk->put(
-            $path,
-            Storage::disk('local')->readStream($this->path)
-        );
+        $sourceDisk = Storage::disk(config('statamic.system.file_uploads_disk', 'local'));
+
+        $disk->put($path, $sourceDisk->readStream($this->path));
     }
 }
diff --git a/src/Assets/Uploader.php b/src/Assets/Uploader.php
index c7c1d2ac12c..dc4b0d49c69 100644
--- a/src/Assets/Uploader.php
+++ b/src/Assets/Uploader.php
@@ -3,9 +3,9 @@
 namespace Statamic\Assets;
 
 use Facades\Statamic\Imaging\ImageValidator;
-use Rhukster\DomSanitizer\DOMSanitizer;
 use Statamic\Facades\Glide;
 use Statamic\Support\Str;
+use Statamic\Support\Svg;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 abstract class Uploader
@@ -59,10 +59,7 @@ private function write($sourcePath, $destinationPath)
         $stream = fopen($sourcePath, 'r');
 
         if (config('statamic.assets.svg_sanitization_on_upload', true) && Str::endsWith($destinationPath, '.svg')) {
-            $sanitizer = new DOMSanitizer(DOMSanitizer::SVG);
-            $stream = $sanitizer->sanitize($svg = stream_get_contents($stream), [
-                'remove-xml-tags' => ! Str::startsWith($svg, '<?xml'),
-            ]);
+            $stream = Svg::sanitize(stream_get_contents($stream));
         }
 
         $this->disk()->put($this->uploadPathPrefix().$destinationPath, $stream);
diff --git a/src/Auth/CorePermissions.php b/src/Auth/CorePermissions.php
index 0fec10cb629..1d371fa080c 100644
--- a/src/Auth/CorePermissions.php
+++ b/src/Auth/CorePermissions.php
@@ -95,7 +95,7 @@ protected function registerCollections()
         $this->register('configure collections');
 
         $this->register('view {collection} entries', function ($permission) {
-            $this->permission($permission)->children([
+            $this->permission($permission)->hiddenBy('configure collections')->children([
                 $this->permission('edit {collection} entries')->children([
                     $this->permission('create {collection} entries'),
                     $this->permission('delete {collection} entries'),
@@ -119,7 +119,7 @@ protected function registerNavigation()
         $this->register('configure navs');
 
         $this->register('view {nav} nav', function ($permission) {
-            $this->permission($permission)->children([
+            $this->permission($permission)->hiddenBy('configure navs')->children([
                 $this->permission('edit {nav} nav'),
             ])->replacements('nav', function () {
                 return Nav::all()->map(function ($nav) {
@@ -134,7 +134,7 @@ protected function registerGlobals()
         $this->register('configure globals');
 
         $this->register('edit {global} globals', function ($permission) {
-            $permission->replacements('global', function () {
+            $permission->hiddenBy('configure globals')->replacements('global', function () {
                 return GlobalSet::all()->map(function ($global) {
                     return ['value' => $global->handle(), 'label' => __($global->title())];
                 });
@@ -147,7 +147,7 @@ protected function registerTaxonomies()
         $this->register('configure taxonomies');
 
         $this->register('view {taxonomy} terms', function ($permission) {
-            $this->permission($permission)->children([
+            $this->permission($permission)->hiddenBy('configure taxonomies')->children([
                 $this->permission('edit {taxonomy} terms')->children([
                     $this->permission('create {taxonomy} terms'),
                     $this->permission('delete {taxonomy} terms'),
@@ -165,7 +165,7 @@ protected function registerAssets()
         $this->register('configure asset containers');
 
         $this->register('view {container} assets', function ($permission) {
-            $this->permission($permission)->children([
+            $this->permission($permission)->hiddenBy('configure asset containers')->children([
                 $this->permission('upload {container} assets'),
                 $this->permission('edit {container} folders'),
                 $this->permission('edit {container} assets')->children([
@@ -210,7 +210,7 @@ protected function registerForms()
         $this->register('configure forms');
 
         $this->register('view {form} form submissions', function ($permission) {
-            $this->permission($permission)->children([
+            $this->permission($permission)->hiddenBy('configure forms')->children([
                 $this->permission('delete {form} form submissions'),
             ])->replacements('form', function () {
                 return Form::all()->map(function ($form) {
@@ -267,6 +267,6 @@ protected function permission($permission)
 
     protected function group($name, $callback)
     {
-        return Permission::group($name, __('statamic::permissions.group_'.$name), $callback);
+        Permission::group($name, __('statamic::permissions.group_'.$name), $callback);
     }
 }
diff --git a/src/Auth/Eloquent/Role.php b/src/Auth/Eloquent/Role.php
index 1c2672e127c..e2d3b1909d9 100644
--- a/src/Auth/Eloquent/Role.php
+++ b/src/Auth/Eloquent/Role.php
@@ -4,6 +4,9 @@
 
 use Statamic\Auth\File\Role as FileRole;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class Role extends FileRole
 {
     protected $model;
diff --git a/src/Auth/Eloquent/User.php b/src/Auth/Eloquent/User.php
index bbd09ee0b60..4eae32e6d9b 100644
--- a/src/Auth/Eloquent/User.php
+++ b/src/Auth/Eloquent/User.php
@@ -6,6 +6,7 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Hash;
+use Statamic\Auth\PermissionCache;
 use Statamic\Auth\User as BaseUser;
 use Statamic\Contracts\Auth\Passkey;
 use Statamic\Contracts\Auth\Role as RoleContract;
@@ -219,6 +220,12 @@ public function isInGroup($group)
 
     public function permissions()
     {
+        $cache = app(PermissionCache::class);
+
+        if ($cached = $cache->get($this->id())) {
+            return $cached;
+        }
+
         $permissions = $this->groups()->flatMap->roles()
             ->merge($this->roles())
             ->flatMap->permissions();
@@ -227,6 +234,10 @@ public function permissions()
             $permissions[] = 'super';
         }
 
+        $permissions = $permissions->unique()->values();
+
+        $cache->put($this->id(), $permissions);
+
         return $permissions;
     }
 
@@ -303,7 +314,11 @@ public function remove($key)
 
     public function merge($data)
     {
-        $this->data($this->data()->merge(collect($data)->filter(fn ($v) => $v !== null)->all()));
+        $merged = $this->data()
+            ->except(['roles', 'groups'])
+            ->merge(collect($data)->filter(fn ($v) => $v !== null)->all());
+
+        $this->data($merged->all());
 
         return $this;
     }
diff --git a/src/Auth/Eloquent/UserGroup.php b/src/Auth/Eloquent/UserGroup.php
index e75268b5c83..9b02ba64904 100644
--- a/src/Auth/Eloquent/UserGroup.php
+++ b/src/Auth/Eloquent/UserGroup.php
@@ -6,6 +6,9 @@
 use Statamic\Auth\File\UserGroup as FileUserGroup;
 use Statamic\Facades\User;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class UserGroup extends FileUserGroup
 {
     protected $model;
diff --git a/src/Auth/Passwords/TokenRepository.php b/src/Auth/Passwords/TokenRepository.php
index 3ba24434f5e..fd7d16dce3a 100644
--- a/src/Auth/Passwords/TokenRepository.php
+++ b/src/Auth/Passwords/TokenRepository.php
@@ -71,6 +71,21 @@ public function exists(CanResetPasswordContract $user, $token)
             && $this->hasher->check($token, $record['token']);
     }
 
+    public function findEmailByToken(#[\SensitiveParameter] string $token): ?string
+    {
+        foreach ($this->getResets() as $email => $record) {
+            if ($this->tokenExpired(Carbon::createFromTimestamp($record['created_at'], config('app.timezone')))) {
+                continue;
+            }
+
+            if ($this->hasher->check($token, $record['token'])) {
+                return $email;
+            }
+        }
+
+        return null;
+    }
+
     public function recentlyCreatedToken(CanResetPasswordContract $user)
     {
         $record = $this->getResets()->get($user->email());
diff --git a/src/Auth/Permission.php b/src/Auth/Permission.php
index 0a91de22cab..bf42271e087 100644
--- a/src/Auth/Permission.php
+++ b/src/Auth/Permission.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Auth;
 
+use Statamic\Support\Arr;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
 use function Statamic\trans as __;
@@ -19,6 +20,7 @@ class Permission
     protected $label;
     protected $description;
     protected $group;
+    protected $hiddenBy;
 
     /**
      * @return ($value is null ? string|string[] : static)
@@ -100,10 +102,12 @@ public function permissions()
             $replaced = (new self)
                 ->value($this->value)
                 ->label($this->label)
+                ->description($this->description())
                 ->placeholder($this->placeholder)
                 ->placeholderLabel($replacement['label'])
                 ->placeholderValue($replacement['value'])
-                ->group($this->group());
+                ->group($this->group())
+                ->hiddenBy($this->hiddenBy());
 
             if ($this->children()) {
                 $replaced->children($this->children()->all());
@@ -187,10 +191,12 @@ public function toTree()
                     $replaced = (new self)
                         ->value($child->originalValue())
                         ->label($child->originalLabel())
+                        ->description($child->description())
                         ->placeholder($permission->placeholder())
                         ->placeholderLabel($permission->placeholderLabel())
                         ->placeholderValue($permission->placeholderValue())
-                        ->group($permission->group());
+                        ->group($permission->group())
+                        ->hiddenBy($child->hiddenBy());
 
                     if ($children = $child->children()) {
                         $replaced->children($children->all());
@@ -205,6 +211,7 @@ public function toTree()
                 'label' => $permission->label(),
                 'description' => $permission->description(),
                 'group' => $permission->group(),
+                'hidden_by' => $permission->hiddenBy(),
                 'children' => $children->flatMap->toTree()->all(),
             ];
         })->all();
@@ -219,4 +226,13 @@ public function description()
     {
         return $this->fluentlyGetOrSet('description')->args(func_get_args());
     }
+
+    public function hiddenBy(string|array|null $permissions = null)
+    {
+        return $this
+            ->fluentlyGetOrSet('hiddenBy')
+            ->getter(fn ($permissions) => $permissions ?? [])
+            ->setter(fn ($permissions) => Arr::wrap($permissions))
+            ->args(func_get_args());
+    }
 }
diff --git a/src/Auth/Permissions.php b/src/Auth/Permissions.php
index 2d5cf5c4752..1192f7b9a6f 100644
--- a/src/Auth/Permissions.php
+++ b/src/Auth/Permissions.php
@@ -4,6 +4,8 @@
 
 use Facades\Statamic\Auth\CorePermissions;
 
+use function Statamic\trans as __;
+
 class Permissions
 {
     protected $extensions = [];
diff --git a/src/Auth/Protect/Protectors/Password/Controller.php b/src/Auth/Protect/Protectors/Password/Controller.php
index d41af2d6fcd..3e0a890f186 100644
--- a/src/Auth/Protect/Protectors/Password/Controller.php
+++ b/src/Auth/Protect/Protectors/Password/Controller.php
@@ -9,6 +9,8 @@
 use Statamic\Http\Controllers\Controller as BaseController;
 use Statamic\View\View;
 
+use function Statamic\trans as __;
+
 class Controller extends BaseController
 {
     protected $tokenData;
diff --git a/src/Auth/ResetsPasswords.php b/src/Auth/ResetsPasswords.php
index 3716aecb789..742cc9de9a1 100644
--- a/src/Auth/ResetsPasswords.php
+++ b/src/Auth/ResetsPasswords.php
@@ -14,6 +14,8 @@
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades\URL;
 
+use function Statamic\trans;
+
 /**
  * A copy of Illuminate\Auth\ResetsPasswords.
  * (but it doesn't import the RedirectsUsers trait).
@@ -130,8 +132,6 @@ protected function resetPassword($user, $password)
         $user->save();
 
         event(new PasswordReset($user));
-
-        $this->guard()->login($user);
     }
 
     /**
diff --git a/src/Auth/SendsPasswordResetEmails.php b/src/Auth/SendsPasswordResetEmails.php
index e9d3b1d604f..fedefcc5c3f 100644
--- a/src/Auth/SendsPasswordResetEmails.php
+++ b/src/Auth/SendsPasswordResetEmails.php
@@ -8,6 +8,9 @@
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades\URL;
 
+use function Statamic\trans;
+use function Statamic\trans as __;
+
 /**
  * A copy of Illuminate\Auth\SendsPasswordResetEmails.
  *
@@ -37,16 +40,12 @@ public function sendResetLinkEmail(Request $request)
     {
         $this->validateEmail($request);
 
-        // We will send the password reset link to this user. Once we have attempted
-        // to send the link, we will examine the response then see the message we
-        // need to show to the user. Finally, we'll send out a proper response.
-        $response = $this->broker()->sendResetLink(
-            $this->credentials($request)
-        );
+        // Always return the generic "reset link sent" response regardless of the broker's
+        // actual result. INVALID_USER and RESET_THROTTLED would each reveal whether the
+        // email belongs to a registered account (the broker only throttles real users).
+        $this->broker()->sendResetLink($this->credentials($request));
 
-        return $response == Password::RESET_LINK_SENT
-            ? $this->sendResetLinkResponse($request, $response)
-            : $this->sendResetLinkFailedResponse($request, $response);
+        return $this->sendResetLinkResponse($request, Password::RESET_LINK_SENT);
     }
 
     /**
@@ -97,31 +96,6 @@ protected function sendResetLinkResponse(Request $request, $response)
             : $redirect->with('status', trans($response));
     }
 
-    /**
-     * Get the response for a failed password reset link.
-     *
-     * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
-     */
-    protected function sendResetLinkFailedResponse(Request $request, $response)
-    {
-        $errorRedirect = $request->input('_error_redirect');
-
-        $redirect = $errorRedirect && ! URL::isExternalToApplication($errorRedirect)
-            ? redirect($errorRedirect)
-            : back();
-
-        if ($request->wantsJson()) {
-            throw ValidationException::withMessages([
-                'email' => [trans($response)],
-            ]);
-        }
-
-        return $redirect
-            ->withInput($request->only('email'))
-            ->withErrors(['email' => trans($response)], 'user.forgot_password');
-    }
-
     /**
      * Get the broker to be used during password reset.
      *
diff --git a/src/Auth/TwoFactor/ConfirmTwoFactorAuthentication.php b/src/Auth/TwoFactor/ConfirmTwoFactorAuthentication.php
index 5cb212c24b6..71668d3870d 100644
--- a/src/Auth/TwoFactor/ConfirmTwoFactorAuthentication.php
+++ b/src/Auth/TwoFactor/ConfirmTwoFactorAuthentication.php
@@ -5,6 +5,8 @@
 use Illuminate\Validation\ValidationException;
 use Statamic\Auth\User;
 
+use function Statamic\trans as __;
+
 class ConfirmTwoFactorAuthentication
 {
     public function __construct(private TwoFactorAuthenticationProvider $provider)
diff --git a/src/Auth/TwoFactor/TwoFactor.php b/src/Auth/TwoFactor/TwoFactor.php
new file mode 100644
index 00000000000..c71eebd8f12
--- /dev/null
+++ b/src/Auth/TwoFactor/TwoFactor.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Statamic\Auth\TwoFactor;
+
+class TwoFactor
+{
+    public function enabled(): bool
+    {
+        return config('statamic.users.two_factor_enabled', true);
+    }
+}
diff --git a/src/Auth/User.php b/src/Auth/User.php
index c16f0db698e..2468d97d724 100644
--- a/src/Auth/User.php
+++ b/src/Auth/User.php
@@ -19,6 +19,7 @@
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\Password;
 use Statamic\Auth\Passwords\PasswordReset;
+use Statamic\Auth\TwoFactor\RecoveryCode;
 use Statamic\Contracts\Auth\Role as RoleContract;
 use Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider;
 use Statamic\Contracts\Auth\User as UserContract;
@@ -40,6 +41,7 @@
 use Statamic\Events\UserSaved;
 use Statamic\Events\UserSaving;
 use Statamic\Facades;
+use Statamic\Facades\TwoFactor;
 use Statamic\GraphQL\ResolvesValues;
 use Statamic\Notifications\ActivateAccount as ActivateAccountNotification;
 use Statamic\Notifications\PasswordReset as PasswordResetNotification;
@@ -47,6 +49,8 @@
 use Statamic\Statamic;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 abstract class User implements Arrayable, ArrayAccess, Augmentable, Authenticatable, AuthorizableContract, CanResetPasswordContract, ContainsQueryableValues, HasLocalePreference, ResolvesValuesContract, SearchableContract, UserContract
 {
     use Authorizable, CanResetPassword, ContainsComputedData, HasAugmentedInstance, HasAvatar, HasDirtyState, Notifiable, ResolvesValues, Searchable, TracksQueriedColumns, TracksQueriedRelations;
@@ -365,6 +369,10 @@ public function preferredColorMode()
 
     public function isTwoFactorAuthenticationRequired(): bool
     {
+        if (! TwoFactor::enabled()) {
+            return false;
+        }
+
         $enforcedRoles = config('statamic.users.two_factor_enforced_roles', []);
 
         if (in_array('*', $enforcedRoles)) {
@@ -410,7 +418,7 @@ public function replaceTwoFactorRecoveryCode(string $code): void
     {
         $this->set('two_factor_recovery_codes', encrypt(str_replace(
             $code,
-            TwoFactor\RecoveryCode::generate(),
+            RecoveryCode::generate(),
             decrypt($this->two_factor_recovery_codes)
         )))->save();
 
@@ -424,7 +432,7 @@ public function twoFactorQrCodeSvg(): string
     {
         $svg = (new Writer(
             new ImageRenderer(
-                new RendererStyle(192, 0, null, null, Fill::uniformColor(new Rgb(255, 255, 255), new Rgb(45, 55, 72))),
+                new RendererStyle(size: 192, fill: Fill::uniformColor(new Rgb(255, 255, 255), new Rgb(45, 55, 72))),
                 new SvgImageBackEnd
             )
         ))->writeString($this->twoFactorQrCodeUrl());
@@ -470,7 +478,7 @@ protected function getComputedCallbacks()
 
     public function getQueryableValue(string $field)
     {
-        if (method_exists($this, $method = Str::camel($field))) {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
             return $this->{$method}();
         }
 
@@ -482,4 +490,13 @@ public function getQueryableValue(string $field)
 
         return $field->fieldtype()->toQueryableValue($value);
     }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'apiUrl', 'avatar', 'blueprint', 'editUrl', 'email', 'gravatarUrl', 'groups', 'hasAvatarField',
+            'id', 'initials', 'isSuper', 'isTaxonomizable', 'lastLogin', 'name', 'path', 'preferredLocale',
+            'preferredTheme', 'reference', 'roles', 'title',
+        ];
+    }
 }
diff --git a/src/Auth/UserCollection.php b/src/Auth/UserCollection.php
index 1f3cae54120..186122b0066 100644
--- a/src/Auth/UserCollection.php
+++ b/src/Auth/UserCollection.php
@@ -9,14 +9,4 @@
  */
 class UserCollection extends DataCollection
 {
-    /**
-     * Get the collection as an array.
-     *
-     * @param  bool  $supplement
-     * @return array
-     */
-    public function extract($supplement = false)
-    {
-        return UserService::transform($this->items, $supplement);
-    }
 }
diff --git a/src/Auth/UserGroupRepository.php b/src/Auth/UserGroupRepository.php
index 5bc5927de04..693231fd62d 100644
--- a/src/Auth/UserGroupRepository.php
+++ b/src/Auth/UserGroupRepository.php
@@ -7,6 +7,8 @@
 use Statamic\Events\UserGroupBlueprintFound;
 use Statamic\Facades\Blueprint;
 
+use function Statamic\trans as __;
+
 abstract class UserGroupRepository implements RepositoryContract
 {
     public function find($id): ?UserGroupContract
diff --git a/src/Auth/UserRepository.php b/src/Auth/UserRepository.php
index ced3d2a2635..beca1a57f4e 100644
--- a/src/Auth/UserRepository.php
+++ b/src/Auth/UserRepository.php
@@ -12,6 +12,8 @@
 use Statamic\Query\Scopes\AllowsScopes;
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 abstract class UserRepository implements RepositoryContract
 {
     use AllowsScopes, StoresComputedFieldCallbacks;
diff --git a/src/Auth/UserTags.php b/src/Auth/UserTags.php
index 530180f9fba..4ffe3c487c2 100644
--- a/src/Auth/UserTags.php
+++ b/src/Auth/UserTags.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Statamic\Contracts\Auth\Role;
+use Statamic\Facades\TwoFactor;
 use Statamic\Facades\URL;
 use Statamic\Facades\User;
 use Statamic\Fields\Field;
@@ -13,6 +14,8 @@
 use Statamic\Tags\Concerns;
 use Statamic\Tags\Tags;
 
+use function Statamic\trans as __;
+
 class UserTags extends Tags
 {
     use Concerns\GetsFormSession,
@@ -100,7 +103,10 @@ public function profile()
      */
     public function loginForm()
     {
-        $data = $this->getFormSession();
+        $data = array_merge($this->getFormSession(), [
+            'passkey_options_url' => route('statamic.passkeys.options'),
+            'passkey_verify_url' => route('statamic.passkeys.login'),
+        ]);
 
         $knownParams = ['redirect', 'error_redirect', 'allow_request_redirect'];
 
@@ -293,6 +299,112 @@ public function registrationForm()
         return $this->registerForm();
     }
 
+    /**
+     * Output a passkey registration form.
+     *
+     * Maps to {{ user:passkey_form }}
+     *
+     * @return string
+     */
+    public function passkeyForm()
+    {
+        $data = [
+            'passkey_options_url' => route('statamic.passkeys.create'),
+            'passkey_verify_url' => route('statamic.passkeys.store'),
+        ];
+
+        if (! $this->canParseContents()) {
+            return $data;
+        }
+
+        return $this->parse($data);
+    }
+
+    /**
+     * Output the current user's passkeys.
+     *
+     * Maps to {{ user:passkeys }}
+     *
+     * @return string
+     */
+    public function passkeys()
+    {
+        if (! $user = User::current()) {
+            return $this->canParseContents() ? $this->parseNoResults() : [];
+        }
+
+        $passkeys = $user->passkeys()->map(function ($passkey) {
+            return [
+                'id' => $passkey->id(),
+                'name' => $passkey->name(),
+                'last_login' => $passkey->lastLogin(),
+            ];
+        })->values()->all();
+
+        if (! $this->canParseContents()) {
+            return $passkeys;
+        }
+
+        if (empty($passkeys)) {
+            return $this->parseNoResults();
+        }
+
+        return $this->parseLoop($passkeys);
+    }
+
+    /**
+     * Output a delete passkey form.
+     *
+     * Maps to {{ user:delete_passkey_form }}
+     *
+     * @return string
+     */
+    public function deletePasskeyForm()
+    {
+        if (! $user = User::current()) {
+            return '';
+        }
+
+        $id = $this->params->get('id');
+
+        if (! $id || ! $user->passkeys()->get($id)) {
+            return '';
+        }
+
+        $action = route('statamic.passkeys.destroy', ['id' => $id]);
+        $method = 'POST';
+
+        $knownParams = ['id', 'redirect'];
+
+        $params = [];
+
+        if ($redirect = $this->getRedirectUrl()) {
+            $params['redirect'] = $this->parseRedirect($redirect);
+        }
+
+        if (! $this->canParseContents()) {
+            return [
+                'attrs' => $this->formAttrs($action, $method, $knownParams),
+                'params' => array_merge(
+                    $this->formMetaPrefix($this->formParams($method, $params)),
+                    ['_method' => 'DELETE']
+                ),
+            ];
+        }
+
+        $html = $this->formOpen($action, $method, $knownParams);
+
+        $html .= '<input type="hidden" name="_method" value="DELETE" />';
+
+        $html .= $this->formMetaFields($params);
+
+        $html .= $this->parse([]);
+
+        $html .= $this->formClose();
+
+        return $html;
+    }
+
     /**
      * Outputs a logout URL.
      *
@@ -629,6 +741,53 @@ public function notIn()
         return $in ? null : $this->parse();
     }
 
+    /**
+     * Output an elevated session form.
+     *
+     * Maps to {{ user:elevated_session_form }}
+     *
+     * @return string
+     */
+    public function elevatedSessionForm()
+    {
+        if (! ($user = User::current())) {
+            return;
+        }
+
+        $method = $user->getElevatedSessionMethod();
+
+        if ($method === 'verification_code') {
+            session()->sendElevatedSessionVerificationCodeIfRequired();
+        }
+
+        $data = [
+            ...$this->getFormSession('user.elevated_session'),
+            'method' => $method,
+            'allow_passkey' => $method !== 'verification_code' && $user->passkeys()->isNotEmpty(),
+            'resend_code_url' => route('statamic.elevated-session.resend-code'),
+            'passkey_options_url' => route('statamic.elevated-session.passkey-options'),
+            'submit_url' => route('statamic.elevated-session.confirm'),
+        ];
+
+        $action = route('statamic.elevated-session.confirm');
+        $method = 'POST';
+
+        if (! $this->canParseContents()) {
+            return array_merge([
+                'attrs' => $this->formAttrs($action, $method),
+                'params' => $this->formMetaPrefix($this->formParams($method)),
+            ], $data);
+        }
+
+        $html = $this->formOpen($action, $method);
+
+        $html .= $this->parse($data);
+
+        $html .= $this->formClose();
+
+        return $html;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -639,6 +798,318 @@ public function eventUrl($url, $relative = false)
         );
     }
 
+    /**
+     * Output a boolean of whether two-factor auth is enabled for the user.
+     *
+     * Maps to {{ user:two_factor_enabled }}
+     */
+    public function twoFactorEnabled(): bool
+    {
+        return (bool) User::current()?->hasEnabledTwoFactorAuthentication();
+    }
+
+    /**
+     * Output a two-factor challenge form for login verification.
+     *
+     * Maps to {{ user:two_factor_challenge_form }}
+     *
+     * @return string|array
+     */
+    public function twoFactorChallengeForm()
+    {
+        if (
+            ! TwoFactor::enabled()
+            || session()->missing('login.id')
+        ) {
+            return;
+        }
+
+        $params = [];
+
+        $data = $this->getFormSession();
+
+        $knownParams = ['redirect', 'error_redirect', 'allow_request_redirect'];
+
+        $method = 'POST';
+        $action = route('statamic.two-factor-challenge');
+
+        if ($redirect = $this->getRedirectUrl()) {
+            $params['redirect'] = $this->parseRedirect($redirect);
+        }
+
+        if ($errorRedirect = $this->getErrorRedirectUrl()) {
+            $params['error_redirect'] = $this->parseRedirect($errorRedirect);
+        }
+
+        if (! $this->canParseContents()) {
+            return array_merge([
+                'attrs' => $this->formAttrs($action, $method, $knownParams),
+                'params' => $this->formMetaPrefix($this->formParams($method, $params)),
+            ], $data);
+        }
+
+        $html = $this->formOpen($action, $method, $knownParams);
+
+        $html .= $this->formMetaFields($params);
+
+        $html .= $this->parse($data);
+
+        $html .= $this->formClose();
+
+        return $html;
+    }
+
+    /**
+     * Output a two-factor enable form.
+     *
+     * Maps to {{ user:two_factor_enable_form }}
+     *
+     * @return string|array
+     */
+    public function twoFactorEnableForm()
+    {
+        $user = User::current();
+
+        if (
+            ! TwoFactor::enabled()
+            || ! $user
+            || $user->hasEnabledTwoFactorAuthentication()
+        ) {
+            return;
+        }
+
+        $params = [];
+
+        $data = $this->getFormSession('user.two_factor_enable');
+
+        $knownParams = ['redirect', 'allow_request_redirect'];
+
+        $method = 'POST';
+        $action = route('statamic.users.two-factor.enable');
+
+        if ($redirect = $this->getRedirectUrl()) {
+            $params['redirect'] = $this->parseRedirect($redirect);
+        }
+
+        if (! $this->canParseContents()) {
+            return array_merge([
+                'attrs' => $this->formAttrs($action, $method, $knownParams),
+                'params' => $this->formMetaPrefix($this->formParams($method, $params)),
+            ], $data);
+        }
+
+        $html = $this->formOpen($action, $method, $knownParams);
+
+        $html .= $this->formMetaFields($params);
+
+        $html .= $this->parse($data);
+
+        $html .= $this->formClose();
+
+        return $html;
+    }
+
+    /**
+     * Output a two-factor setup form.
+     *
+     * Maps to {{ user:two_factor_setup_form }}
+     *
+     * @return string|array
+     */
+    public function twoFactorSetupForm()
+    {
+        $user = User::current();
+
+        if (
+            ! TwoFactor::enabled()
+            || ! $user
+            || $user->hasEnabledTwoFactorAuthentication()
+            || empty($user->two_factor_secret)
+        ) {
+            return;
+        }
+
+        $params = [];
+
+        $data = $this->getFormSession('user.two_factor_setup');
+
+        $data['qr_code'] = $user->twoFactorQrCodeSvg();
+        $data['qr_code_url'] = 'data:image/svg+xml;base64,'.base64_encode($user->twoFactorQrCodeSvg());
+        $data['secret_key'] = $user->twoFactorSecretKey();
+
+        $knownParams = ['redirect', 'error_redirect', 'allow_request_redirect'];
+
+        $method = 'POST';
+        $action = route('statamic.users.two-factor.confirm');
+
+        if ($redirect = $this->getRedirectUrl()) {
+            $params['redirect'] = $this->parseRedirect($redirect);
+        }
+
+        if ($errorRedirect = $this->getErrorRedirectUrl()) {
+            $params['error_redirect'] = $this->parseRedirect($errorRedirect);
+        }
+
+        if (! $this->canParseContents()) {
+            return array_merge([
+                'attrs' => $this->formAttrs($action, $method, $knownParams),
+                'params' => $this->formMetaPrefix($this->formParams($method, $params)),
+            ], $data);
+        }
+
+        $html = $this->formOpen($action, $method, $knownParams);
+
+        $html .= $this->formMetaFields($params);
+
+        $html .= $this->parse($data);
+
+        $html .= $this->formClose();
+
+        return $html;
+    }
+
+    /**
+     * Output the user's two-factor recovery codes.
+     *
+     * Maps to {{ user:two_factor_recovery_codes }}
+     *
+     * @return array|string
+     */
+    public function twoFactorRecoveryCodes()
+    {
+        $user = User::current();
+
+        if (
+            ! TwoFactor::enabled()
+            || ! $user?->hasEnabledTwoFactorAuthentication()
+        ) {
+            return $this->parser ? null : [];
+        }
+
+        $codes = collect($user->twoFactorRecoveryCodes())->map(fn ($code) => ['code' => $code]);
+
+        return $this->parser ? $this->parseLoop($codes) : $codes->all();
+    }
+
+    /**
+     * Outputs a URL to download two-factor recovery codes.
+     *
+     * Maps to {{ user:two_factor_recovery_codes_download_url }}
+     *
+     * @return string
+     */
+    public function twoFactorRecoveryCodesDownloadUrl()
+    {
+        $user = User::current();
+
+        if (
+            ! TwoFactor::enabled()
+            || ! $user?->hasEnabledTwoFactorAuthentication()
+        ) {
+            return;
+        }
+
+        return route('statamic.users.two-factor.recovery-codes.download');
+    }
+
+    /**
+     * Output a form to regenerate two-factor recovery codes.
+     *
+     * Maps to {{ user:reset_two_factor_recovery_codes_form }}
+     *
+     * @return string|array
+     */
+    public function resetTwoFactorRecoveryCodesForm()
+    {
+        $user = User::current();
+
+        if (
+            ! TwoFactor::enabled()
+            || ! $user?->hasEnabledTwoFactorAuthentication()
+        ) {
+            return;
+        }
+
+        $params = [];
+
+        $data = $this->getFormSession('user.two_factor_reset_recovery_codes');
+
+        $knownParams = ['redirect', 'allow_request_redirect'];
+
+        $method = 'POST';
+        $action = route('statamic.users.two-factor.recovery-codes.generate');
+
+        if ($redirect = $this->getRedirectUrl()) {
+            $params['redirect'] = $this->parseRedirect($redirect);
+        }
+
+        if (! $this->canParseContents()) {
+            return array_merge([
+                'attrs' => $this->formAttrs($action, $method, $knownParams),
+                'params' => $this->formMetaPrefix($this->formParams($method, $params)),
+            ], $data);
+        }
+
+        $html = $this->formOpen($action, $method, $knownParams);
+
+        $html .= $this->formMetaFields($params);
+
+        $html .= $this->parse($data);
+
+        $html .= $this->formClose();
+
+        return $html;
+    }
+
+    /**
+     * Output a form to disable two-factor authentication.
+     *
+     * Maps to {{ user:disable_two_factor_form }}
+     *
+     * @return string|array
+     */
+    public function disableTwoFactorForm()
+    {
+        $user = User::current();
+
+        if (
+            ! TwoFactor::enabled()
+            || ! $user?->hasEnabledTwoFactorAuthentication()
+        ) {
+            return;
+        }
+
+        $params = [];
+
+        $data = $this->getFormSession('user.two_factor_disable');
+
+        $knownParams = ['redirect', 'allow_request_redirect'];
+
+        $method = 'DELETE';
+        $action = route('statamic.users.two-factor.disable');
+
+        if ($redirect = $this->getRedirectUrl()) {
+            $params['redirect'] = $this->parseRedirect($redirect);
+        }
+
+        if (! $this->canParseContents()) {
+            return array_merge([
+                'attrs' => $this->formAttrs($action, $method, $knownParams),
+                'params' => $this->formMetaPrefix($this->formParams($method, $params)),
+            ], $data);
+        }
+
+        $html = $this->formOpen($action, $method, $knownParams);
+
+        $html .= $this->formMetaFields($params);
+
+        $html .= $this->parse($data);
+
+        $html .= $this->formClose();
+
+        return $html;
+    }
+
     /**
      * Get the redirect URL.
      *
diff --git a/src/Auth/WebAuthn/Passkey.php b/src/Auth/WebAuthn/Passkey.php
index 322b4c42aa6..a807b4dded4 100644
--- a/src/Auth/WebAuthn/Passkey.php
+++ b/src/Auth/WebAuthn/Passkey.php
@@ -7,6 +7,7 @@
 use Statamic\Contracts\Auth\Passkey as Contract;
 use Statamic\Contracts\Auth\User as UserContract;
 use Statamic\Facades\User;
+use Webauthn\CredentialRecord;
 use Webauthn\PublicKeyCredentialSource;
 
 abstract class Passkey implements Contract
@@ -50,11 +51,14 @@ public function credential(): PublicKeyCredentialSource
         return $this->credential;
     }
 
-    public function setCredential(array|PublicKeyCredentialSource $credential): Contract
+    // The interface accepts an array|PublicKeyCredentialSource, but the webauthn-lib validators
+    // hand back the parent CredentialRecord, so we accept that here and normalize it down to a
+    // PublicKeyCredentialSource. This keeps the public contract and stored format unchanged.
+    public function setCredential(array|CredentialRecord $credential): Contract
     {
-        $this->credential = $credential instanceof PublicKeyCredentialSource
-            ? $credential
-            : $this->credentialFromArray($credential);
+        $this->credential = is_array($credential)
+            ? $this->credentialFromArray($credential)
+            : PublicKeyCredentialSource::fromCredentialRecord($credential);
 
         return $this;
     }
@@ -104,6 +108,8 @@ private function credentialToArray(PublicKeyCredentialSource $credential): array
 
     private function credentialFromArray(array $array): PublicKeyCredentialSource
     {
-        return app(Serializer::class)->deserialize(json_encode($array), PublicKeyCredentialSource::class, 'json');
+        return PublicKeyCredentialSource::fromCredentialRecord(
+            app(Serializer::class)->deserialize(json_encode($array), CredentialRecord::class, 'json')
+        );
     }
 }
diff --git a/src/Auth/WebAuthn/WebAuthn.php b/src/Auth/WebAuthn/WebAuthn.php
index eb4f9ef1d6f..03571e12c74 100644
--- a/src/Auth/WebAuthn/WebAuthn.php
+++ b/src/Auth/WebAuthn/WebAuthn.php
@@ -16,6 +16,8 @@
 use Webauthn\PublicKeyCredentialRpEntity;
 use Webauthn\PublicKeyCredentialUserEntity;
 
+use function Statamic\trans as __;
+
 class WebAuthn
 {
     public function __construct(
@@ -31,7 +33,7 @@ public function prepareAssertion(): PublicKeyCredentialRequestOptions
     {
         $challenge = random_bytes(32);
 
-        session()->put('webauthn.challenge', $challenge);
+        session()->put('webauthn.challenge', base64_encode($challenge));
 
         return $this->getRequestOptions($challenge);
     }
@@ -42,7 +44,7 @@ public function validateAssertion(User $user, array $credentials): bool
 
         $passkey = $this->getPasskey($user, $publicKeyCredential);
 
-        $options = $this->getRequestOptions(session()->pull('webauthn.challenge'));
+        $options = $this->getRequestOptions(base64_decode(session()->pull('webauthn.challenge')));
 
         $publicKeyCredentialSource = $this->assertionResponseValidator->check(
             $passkey->credential(),
@@ -79,7 +81,7 @@ public function prepareAttestation(User $user): PublicKeyCredentialCreationOptio
     {
         $challenge = random_bytes(16);
 
-        session()->put('webauthn.challenge', $challenge);
+        session()->put('webauthn.challenge', base64_encode($challenge));
 
         return $this->getCreationOptions($user, $challenge);
     }
@@ -92,7 +94,7 @@ public function validateAttestation(User $user, array $credentials, string $name
             throw new Exception(__('Invalid credentials.'));
         }
 
-        $options = $this->getCreationOptions($user, session()->pull('webauthn.challenge'));
+        $options = $this->getCreationOptions($user, base64_decode(session()->pull('webauthn.challenge')));
 
         $publicKeyCredentialSource = $this->attestationResponseValidator->check(
             $publicKeyCredential->response,
diff --git a/src/CP/Assets/CropProcessor.php b/src/CP/Assets/CropProcessor.php
new file mode 100644
index 00000000000..67f3a14b8fe
--- /dev/null
+++ b/src/CP/Assets/CropProcessor.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Statamic\CP\Assets;
+
+use Statamic\Imaging\Intervention;
+
+/**
+ * @internal
+ */
+class CropProcessor
+{
+    public function crop(string $contents, string $extension, int $x, int $y, int $width, int $height, ?int $quality = null, ?string $background = null): string
+    {
+        // Bake in EXIF orientation so the crop coordinates, which come from the
+        // auto-oriented image the user saw in the browser, line up with the source.
+        $image = Intervention::decode(Intervention::manager(), $contents)->orient();
+
+        $x = max(0, min($x, $image->width() - 1));
+        $y = max(0, min($y, $image->height() - 1));
+        $width = min($width, $image->width() - $x);
+        $height = min($height, $image->height() - $y);
+
+        $image->crop($width, $height, $x, $y);
+
+        // JPEG has no alpha channel, so flatten any transparency onto a
+        // background colour rather than letting it default to black.
+        if (in_array(strtolower($extension), ['jpg', 'jpeg'])) {
+            Intervention::fillTransparentAreas($image, $background ?? 'ffffff');
+        }
+
+        return (string) Intervention::encodeByExtension($image, $extension, $quality ?? self::defaultQuality());
+    }
+
+    public static function defaultQuality(): int
+    {
+        return config('statamic.assets.image_manipulation.crop_quality')
+            ?? config('statamic.assets.image_manipulation.defaults.quality')
+            ?? 90;
+    }
+}
diff --git a/src/CP/Breadcrumbs/Breadcrumbs.php b/src/CP/Breadcrumbs/Breadcrumbs.php
index c77710d49a3..d4f6b9bb921 100644
--- a/src/CP/Breadcrumbs/Breadcrumbs.php
+++ b/src/CP/Breadcrumbs/Breadcrumbs.php
@@ -7,6 +7,8 @@
 use Statamic\Facades\CP\Nav;
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 class Breadcrumbs
 {
     public static $pushed = [];
diff --git a/src/CP/Column.php b/src/CP/Column.php
index 0bf83d59a5e..78b662623a7 100644
--- a/src/CP/Column.php
+++ b/src/CP/Column.php
@@ -5,6 +5,9 @@
 use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class Column
 {
     use FluentlyGetsAndSets;
diff --git a/src/CP/Navigation/CoreNav.php b/src/CP/Navigation/CoreNav.php
index 7aba785ce88..036e622cd1a 100644
--- a/src/CP/Navigation/CoreNav.php
+++ b/src/CP/Navigation/CoreNav.php
@@ -25,6 +25,9 @@
 use Statamic\Facades\Utility;
 use Statamic\Statamic;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class CoreNav
 {
     /**
diff --git a/src/CP/Navigation/NavBuilder.php b/src/CP/Navigation/NavBuilder.php
index 4471ea402e7..2c127de394c 100644
--- a/src/CP/Navigation/NavBuilder.php
+++ b/src/CP/Navigation/NavBuilder.php
@@ -21,6 +21,7 @@ class NavBuilder
     protected $withHidden = false;
     protected $itemsWithChildrenClosures = [];
     protected $sections = [];
+    protected $sectionsEmptiedByAuthorization = [];
     protected $sectionsOriginalItemIds = [];
     protected $sectionsManipulations = [];
     protected $sectionsOrder = [];
@@ -154,12 +155,35 @@ protected function validateViews()
      */
     protected function authorizeItems()
     {
+        $sectionsBefore = $this->sectionsWithItems($this->items);
+
         $this->items = $this->filterAuthorizedNavItems($this->items);
         $this->itemsKeyedById = null;
 
+        $this->sectionsEmptiedByAuthorization = $sectionsBefore
+            ->diff($this->sectionsWithItems($this->items))
+            ->values()
+            ->all();
+
         return $this;
     }
 
+    /**
+     * Get the sections that currently contain at least one top-level item.
+     *
+     * @param  mixed  $items
+     * @return \Illuminate\Support\Collection
+     */
+    protected function sectionsWithItems($items)
+    {
+        return collect($items)
+            ->reject(fn ($item) => $item->isChild())
+            ->map(fn ($item) => $item->section())
+            ->filter()
+            ->unique()
+            ->values();
+    }
+
     /**
      * Authorize nav children.
      *
@@ -906,7 +930,7 @@ protected function buildSections()
         // Collect and order each section's items...
         $built = collect($sections)
             ->reject(fn ($items, $section) => $this->withHidden ? false : Arr::get($manipulations, "{$section}.action") === '@hide')
-            ->filter(fn ($items) => $items || $this->withHidden)
+            ->filter(fn ($items, $section) => $items || ($this->withHidden && ! in_array($section, $this->sectionsEmptiedByAuthorization)))
             ->map(function ($items, $section) {
                 return collect($this->sectionsWithReorderedItems)->contains($section)
                     ? collect($items)->sortBy(fn ($item) => $item->order())->values()
@@ -998,7 +1022,7 @@ protected function ensureUrlCachesAreUpToDate()
         $updated = collect($this->items)
             ->filter(fn ($item) => collect($this->itemsWithChildrenClosures)->contains($item->id()))
             ->filter(fn ($item) => $item->isActive() || $this->withHidden)
-            ->mapWithKeys(fn ($item) => [$item->id() => $item->children()?->map->url()->all() ?? []])
+            ->mapWithKeys(fn ($item) => [$item->id() => $item->resolveChildren()->children()?->map->url()->all() ?? []])
             ->filter(fn ($urls, $id) => $this->urlsUnresolvedChildren->get($id) != $urls)
             ->each(fn ($urls, $id) => $this->trackChangedChildren($id, $urls))
             ->isNotEmpty();
diff --git a/src/CP/Navigation/NavItem.php b/src/CP/Navigation/NavItem.php
index 89f2742be0f..4b79fdc4250 100644
--- a/src/CP/Navigation/NavItem.php
+++ b/src/CP/Navigation/NavItem.php
@@ -3,7 +3,6 @@
 namespace Statamic\CP\Navigation;
 
 use Illuminate\Support\Collection;
-use Rhukster\DomSanitizer\DOMSanitizer;
 use Statamic\CommandPalette\Category;
 use Statamic\CommandPalette\Link;
 use Statamic\Facades\CP\Nav;
@@ -13,6 +12,8 @@
 use Statamic\Support\Svg;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
+use function Statamic\trans as __;
+
 class NavItem
 {
     use FluentlyGetsAndSets;
@@ -149,6 +150,7 @@ protected function generateActivePatternForCpUrl($url)
         $cpUrl = url(config('statamic.cp.route')).'/';
 
         $relativeUrl = str_replace($cpUrl, '', URL::removeQueryAndFragment($url));
+        $relativeUrl = rtrim($relativeUrl, '/');
 
         return $relativeUrl.'(/(.*)?|$)';
     }
@@ -216,11 +218,7 @@ public function svg()
     private function sanitizeSvg(string $svg): string
     {
         try {
-            $sanitizer = new DOMSanitizer(DOMSanitizer::SVG);
-
-            return $sanitizer->sanitize($svg, [
-                'remove-xml-tags' => ! Str::startsWith($svg, '<?xml'),
-            ]);
+            return Svg::sanitize($svg);
         } catch (\Throwable $e) {
             return '';
         }
diff --git a/src/CP/Navigation/NavPreferencesNormalizer.php b/src/CP/Navigation/NavPreferencesNormalizer.php
index 5d12eab1771..82318c342f0 100644
--- a/src/CP/Navigation/NavPreferencesNormalizer.php
+++ b/src/CP/Navigation/NavPreferencesNormalizer.php
@@ -6,6 +6,9 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class NavPreferencesNormalizer
 {
     protected $preferences;
diff --git a/src/CP/Navigation/NavTransformer.php b/src/CP/Navigation/NavTransformer.php
index 00911c75f03..9fece64d4cd 100644
--- a/src/CP/Navigation/NavTransformer.php
+++ b/src/CP/Navigation/NavTransformer.php
@@ -8,6 +8,9 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class NavTransformer
 {
     protected $coreNav;
@@ -285,6 +288,25 @@ protected function getReorderedItems($originalList, $newList): bool|array
      */
     protected function calculateMinimumItemsForReorder($originalList, $newList): int
     {
+        // When the new list contains items not in the original (e.g. custom sections),
+        // we must include enough of newList to anchor the position of any custom items
+        // that appear before original items. Custom items at the end auto-append.
+        $originalSet = collect($originalList);
+        $newListValues = collect($newList)->values();
+        $lastCustomPositionInMiddle = 0;
+
+        foreach ($newListValues as $index => $item) {
+            if (! $originalSet->contains($item)) {
+                $hasOriginalItemsAfter = $newListValues
+                    ->slice($index + 1)
+                    ->contains(fn ($futureItem) => $originalSet->contains($futureItem));
+
+                if ($hasOriginalItemsAfter) {
+                    $lastCustomPositionInMiddle = $index + 1;
+                }
+            }
+        }
+
         $continueRejecting = true;
 
         $minimumItemsCount = collect($originalList)
@@ -299,7 +321,9 @@ protected function calculateMinimumItemsForReorder($originalList, $newList): int
             })
             ->count();
 
-        return max(1, $minimumItemsCount - 1);
+        $minimumFromReordering = max(1, $minimumItemsCount - 1);
+
+        return max($minimumFromReordering, $lastCustomPositionInMiddle);
     }
 
     /**
@@ -333,7 +357,7 @@ protected function minify()
             ->values()
             ->all();
 
-        $this->config = $reorder
+        $this->config = ! empty($reorder)
             ? array_filter(compact('reorder', 'sections'))
             : $sections;
 
diff --git a/src/CP/Toasts/Toast.php b/src/CP/Toasts/Toast.php
index 57ad55a6a16..b53ad1f34f1 100644
--- a/src/CP/Toasts/Toast.php
+++ b/src/CP/Toasts/Toast.php
@@ -4,11 +4,12 @@
 
 use Exception;
 use Illuminate\Contracts\Support\Arrayable;
+use JsonSerializable;
 
 /**
  * Holds information about a toast message to show to the user.
  */
-class Toast implements Arrayable
+class Toast implements Arrayable, JsonSerializable
 {
     private const TYPES = ['error', 'success', 'info'];
     private $message;
@@ -43,6 +44,11 @@ public function toArray(): array
         ];
     }
 
+    public function jsonSerialize(): array
+    {
+        return $this->toArray();
+    }
+
     /**
      * @throws Exception
      */
diff --git a/src/CommandPalette/Palette.php b/src/CommandPalette/Palette.php
index 99751cd3cdd..571a5983305 100644
--- a/src/CommandPalette/Palette.php
+++ b/src/CommandPalette/Palette.php
@@ -11,6 +11,8 @@
 use Statamic\Fields\Fieldset;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class Palette
 {
     protected $items;
diff --git a/src/Console/Commands/AssetsGeneratePresets.php b/src/Console/Commands/AssetsGeneratePresets.php
index 6621fcc17ab..c7133f97ccd 100644
--- a/src/Console/Commands/AssetsGeneratePresets.php
+++ b/src/Console/Commands/AssetsGeneratePresets.php
@@ -3,10 +3,10 @@
 namespace Statamic\Console\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Bus\Dispatcher;
 use Illuminate\Support\Facades\Log;
 use Statamic\Console\RunsInPlease;
 use Statamic\Facades\AssetContainer;
+use Statamic\Facades\Image;
 use Statamic\Jobs\GeneratePresetImageManipulation;
 use Statamic\Support\Arr;
 
@@ -25,6 +25,7 @@ class AssetsGeneratePresets extends Command
      * @var string
      */
     protected $signature = 'statamic:assets:generate-presets
+        {--preset= : Only generate a specific preset. Use "cp_thumbnail" to generate all cp_thumbnail_small_* presets.}
         {--queue : Queue the image generation.}
         {--excluded-containers= : Comma separated list of container handles to exclude.}';
 
@@ -63,11 +64,19 @@ public function handle()
             $excludedContainers = explode(',', $excludedContainers);
         }
 
+        $filterPreset = $this->option('preset');
+
+        if ($filterPreset !== null && $filterPreset !== 'cp_thumbnail' && ! array_key_exists($filterPreset, Image::manipulationPresets())) {
+            error("The preset \"{$filterPreset}\" does not exist.");
+
+            return 1;
+        }
+
         AssetContainer::all()->filter(function ($container) use ($excludedContainers) {
             return ! in_array($container->handle(), $excludedContainers ?? []);
-        })->sortBy('title')->each(function ($container) {
+        })->sortBy('title')->each(function ($container) use ($filterPreset) {
             note('Generating presets for <comment>'.$container->title().'</comment>...');
-            $this->generatePresets($container);
+            $this->generatePresets($container, $filterPreset);
             $this->newLine();
         });
     }
@@ -78,16 +87,17 @@ public function handle()
      * @param  \Statamic\Contracts\Assets\AssetContainer  $container
      * @return void
      */
-    private function generatePresets($container)
+    protected function generatePresets($container, ?string $filterPreset = null)
     {
         $assets = $container->assets()->filter->isImage();
         $counts = [];
 
-        // The amount of extra cp presets for each asset. The amount will
-        // be consistent across assets, but just not the preset names.
-        $cpPresets = config('statamic.cp.enabled') ? 1 : 0;
-
-        $steps = (count($container->warmPresets()) + $cpPresets) * count($assets);
+        if ($filterPreset === null) {
+            $cpPresets = config('statamic.cp.enabled') ? 1 : 0;
+            $steps = (count($container->warmPresets()) + $cpPresets) * count($assets);
+        } else {
+            $steps = $assets->sum(fn ($asset) => count($this->filterPresets($asset->warmPresets(), $filterPreset)));
+        }
 
         if ($steps > 0) {
             $progress = progress(
@@ -98,13 +108,11 @@ private function generatePresets($container)
             $progress->start();
 
             foreach ($assets as $asset) {
-                foreach ($asset->warmPresets() as $preset) {
+                foreach ($this->filterPresets($asset->warmPresets(), $filterPreset) as $preset) {
                     $counts[$preset] = ($counts[$preset] ?? 0) + 1;
                     $progress->label("Generating $preset for {$asset->basename()}...");
 
-                    $dispatchMethod = $this->shouldQueue
-                        ? 'dispatch'
-                        : (method_exists(Dispatcher::class, 'dispatchSync') ? 'dispatchSync' : 'dispatchNow');
+                    $dispatchMethod = $this->shouldQueue ? 'dispatch' : 'dispatchSync';
 
                     try {
                         GeneratePresetImageManipulation::$dispatchMethod($asset, $preset);
@@ -135,4 +143,17 @@ private function generatePresets($container)
 
         $this->output->newLine();
     }
+
+    protected function filterPresets(array $presets, ?string $filterPreset): array
+    {
+        if ($filterPreset === null) {
+            return $presets;
+        }
+
+        if ($filterPreset === 'cp_thumbnail') {
+            return array_values(array_filter($presets, fn ($p) => str_starts_with($p, 'cp_thumbnail_small_')));
+        }
+
+        return in_array($filterPreset, $presets) ? [$filterPreset] : [];
+    }
 }
diff --git a/src/Console/Commands/Concerns/HasStacheExcludes.php b/src/Console/Commands/Concerns/HasStacheExcludes.php
new file mode 100644
index 00000000000..9ea7160d01f
--- /dev/null
+++ b/src/Console/Commands/Concerns/HasStacheExcludes.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Statamic\Console\Commands\Concerns;
+
+use Statamic\Facades\Stache;
+
+trait HasStacheExcludes
+{
+    protected function addExcludes(?string $excludes = null): void
+    {
+        if (empty($excludes)) {
+            return;
+        }
+
+        foreach (explode(',', $excludes) as $key) {
+            Stache::exclude(trim($key));
+        }
+    }
+}
diff --git a/src/Console/Commands/Concerns/MakesVueComponents.php b/src/Console/Commands/Concerns/MakesVueComponents.php
index b49b92971f3..8467f9a327b 100644
--- a/src/Console/Commands/Concerns/MakesVueComponents.php
+++ b/src/Console/Commands/Concerns/MakesVueComponents.php
@@ -81,7 +81,7 @@ private function wireUpAddonJs(string $addon): void
 
         $this->files->makeDirectory($addonPath.'/resources/dist', 0777, true, true);
 
-        Process::path(base_path())->run('npm install', function (string $type, string $buffer) {
+        Process::path(base_path())->run('npm install --ignore-scripts', function (string $type, string $buffer) {
             echo $buffer;
         });
 
diff --git a/src/Console/Commands/Concerns/NormalizesPaginationHeader.php b/src/Console/Commands/Concerns/NormalizesPaginationHeader.php
new file mode 100644
index 00000000000..702a87a6965
--- /dev/null
+++ b/src/Console/Commands/Concerns/NormalizesPaginationHeader.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Statamic\Console\Commands\Concerns;
+
+use Psr\Http\Message\ResponseInterface;
+
+trait NormalizesPaginationHeader
+{
+    /**
+     * @return array{0: int, 1: int, 2: string}
+     */
+    protected function paginationHeader(ResponseInterface $response): array
+    {
+        // A proxy or CDN may fold the repeated X-Statamic-Pagination header into a single
+        // comma-joined line, so we normalize both framings before destructuring. The limit
+        // keeps a page name that itself contains a comma intact.
+        [$current, $total, $name] = array_map(
+            'trim',
+            explode(',', implode(',', $response->getHeader('X-Statamic-Pagination')), 3)
+        );
+
+        return [(int) $current, (int) $total, $name];
+    }
+}
diff --git a/src/Console/Commands/FlatCamp.php b/src/Console/Commands/FlatCamp.php
index 22fee9d7fec..339cf8d570d 100644
--- a/src/Console/Commands/FlatCamp.php
+++ b/src/Console/Commands/FlatCamp.php
@@ -63,7 +63,7 @@ class FlatCamp extends Command
 
     public function handle()
     {
-        return $this->comment(collect($this->quotes)
+        $this->comment(collect($this->quotes)
             ->map(fn ($quote) => $this->formatForConsole($quote))
             ->random());
     }
diff --git a/src/Console/Commands/InstallEloquentDriver.php b/src/Console/Commands/InstallEloquentDriver.php
index 25257746285..2e26e7d8faf 100644
--- a/src/Console/Commands/InstallEloquentDriver.php
+++ b/src/Console/Commands/InstallEloquentDriver.php
@@ -153,7 +153,7 @@ protected function repositoryHasBeenMigrated(string $repository): bool
     {
         switch ($repository) {
             case 'addon_settings':
-                return config('statamic.system.addon_settings_driver') === 'database';
+                return config('statamic.eloquent-driver.addon_settings.driver') === 'eloquent';
 
             case 'asset_containers':
                 return config('statamic.eloquent-driver.asset_containers.driver') === 'eloquent';
@@ -209,6 +209,9 @@ protected function repositoryHasBeenMigrated(string $repository): bool
 
             case 'tokens':
                 return config('statamic.eloquent-driver.tokens.driver') === 'eloquent';
+
+            default:
+                throw new \LogicException("Unknown repository: {$repository}");
         }
     }
 
diff --git a/src/Console/Commands/InstallSsg.php b/src/Console/Commands/InstallSsg.php
index 404e5b1b453..1fc25ece015 100644
--- a/src/Console/Commands/InstallSsg.php
+++ b/src/Console/Commands/InstallSsg.php
@@ -39,7 +39,9 @@ class InstallSsg extends Command
     public function handle()
     {
         if (Composer::isInstalled('statamic/ssg')) {
-            return error('The Static Site Generator package is already installed.');
+            error('The Static Site Generator package is already installed.');
+
+            return;
         }
 
         spin(
diff --git a/src/Console/Commands/MakeUser.php b/src/Console/Commands/MakeUser.php
index 2bdf677ef22..81033e3a20b 100644
--- a/src/Console/Commands/MakeUser.php
+++ b/src/Console/Commands/MakeUser.php
@@ -16,6 +16,7 @@
 use function Laravel\Prompts\error;
 use function Laravel\Prompts\password;
 use function Laravel\Prompts\text;
+use function Statamic\trans as __;
 
 class MakeUser extends Command
 {
diff --git a/src/Console/Commands/MigrateDatesToUtc.php b/src/Console/Commands/MigrateDatesToUtc.php
index 9a862e5166c..5b52e8af223 100644
--- a/src/Console/Commands/MigrateDatesToUtc.php
+++ b/src/Console/Commands/MigrateDatesToUtc.php
@@ -120,6 +120,12 @@ private function updateDateFields($item, Fields $fields, ?string $dottedPrefix =
                     && empty($dottedPrefix)
                     && $field->handle() === 'date'
                 ) {
+                    // Skip localized entries that inherit their date from the origin.
+                    // The origin will be migrated separately and the inheritance will continue to work.
+                    if (! $item->hasExplicitDate()) {
+                        return;
+                    }
+
                     // When entries are constructed, the datestamp from the filename would be provided but treated as UTC.
                     // We need them to be adjusted back to the existing timezone.
                     $item->date(Carbon::createFromFormat(
diff --git a/src/Console/Commands/ProEnable.php b/src/Console/Commands/ProEnable.php
index 865cc726d16..ed111c006d6 100644
--- a/src/Console/Commands/ProEnable.php
+++ b/src/Console/Commands/ProEnable.php
@@ -40,6 +40,7 @@ public function handle()
         }
 
         $this->checkInfo('Statamic Pro successfully enabled in .env file!');
+        $this->promptToSetLicenseKey();
 
         if ($this->option('update-config') && $this->updateConfig()) {
             $this->checkInfo('Statamic editions config successfully updated to reference .env var!');
@@ -53,7 +54,7 @@ public function handle()
             $this->crossLine('Statamic editions config not currently referencing .env var!');
             $this->comment('Please re-run this command with the `--update-config` option.');
         } else {
-            $this->laravel['config']['statamic.editions.pro'] = true;
+            config()->set('statamic.editions.pro', true);
         }
     }
 
@@ -84,7 +85,7 @@ protected function setProInEnvironmentFile()
      */
     protected function proEnvVarExists()
     {
-        return preg_match('/^STATAMIC_PRO_ENABLED=/m', $this->envContents());
+        return preg_match('/^#?\s*STATAMIC_PRO_ENABLED=/m', $this->envContents());
     }
 
     /**
@@ -95,7 +96,7 @@ protected function proEnvVarExists()
     protected function ensureProInEnv()
     {
         file_put_contents($this->envPath(), preg_replace(
-            '/^STATAMIC_PRO_ENABLED=.*$/m',
+            '/^#?\s*STATAMIC_PRO_ENABLED=.*$/m',
             'STATAMIC_PRO_ENABLED=true',
             $this->envContents()
         ));
@@ -111,6 +112,98 @@ protected function appendProToEnv()
         file_put_contents($this->envPath(), $this->envContents()."\nSTATAMIC_PRO_ENABLED=true");
     }
 
+    /**
+     * Prompt to set the license key in the environment file.
+     *
+     * @return void
+     */
+    protected function promptToSetLicenseKey()
+    {
+        if (! $this->input->isInteractive()) {
+            return;
+        }
+
+        if ($this->licenseKeyAlreadySet()) {
+            return;
+        }
+
+        $licenseKey = trim((string) $this->ask('If you have a Statamic license key, paste it now (leave blank to add later)'));
+
+        if ($licenseKey === '') {
+            $this->comment('Add `STATAMIC_LICENSE_KEY=...` to your `.env` before or when your site goes live.');
+
+            return;
+        }
+
+        if ($this->licenseKeyEnvVarExists()) {
+            $this->replaceLicenseKeyInEnv($licenseKey);
+        } else {
+            $this->appendLicenseKeyToEnv($licenseKey);
+        }
+
+        $this->checkInfo('Statamic license key saved in .env file.');
+    }
+
+    /**
+     * Check whether a non-empty license key already exists.
+     *
+     * @return bool
+     */
+    protected function licenseKeyAlreadySet()
+    {
+        $licenseKey = $this->licenseKeyFromEnv();
+
+        return $licenseKey !== null && $licenseKey !== '';
+    }
+
+    /**
+     * Check whether the license key env var exists.
+     *
+     * @return bool
+     */
+    protected function licenseKeyEnvVarExists()
+    {
+        return preg_match('/^#?\s*STATAMIC_LICENSE_KEY=/m', $this->envContents());
+    }
+
+    /**
+     * Replace key in .env file.
+     *
+     * @param  string  $licenseKey
+     * @return void
+     */
+    protected function replaceLicenseKeyInEnv($licenseKey)
+    {
+        file_put_contents($this->envPath(), preg_replace_callback(
+            '/^#?\s*STATAMIC_LICENSE_KEY=.*$/m',
+            fn () => 'STATAMIC_LICENSE_KEY='.$licenseKey,
+            $this->envContents()
+        ));
+    }
+
+    /**
+     * Append key to end of .env file.
+     *
+     * @param  string  $licenseKey
+     * @return void
+     */
+    protected function appendLicenseKeyToEnv($licenseKey)
+    {
+        file_put_contents($this->envPath(), $this->envContents()."\nSTATAMIC_LICENSE_KEY={$licenseKey}");
+    }
+
+    /**
+     * Get the license key from .env.
+     *
+     * @return string|null
+     */
+    protected function licenseKeyFromEnv()
+    {
+        preg_match('/^STATAMIC_LICENSE_KEY=(.*)$/m', $this->envContents(), $matches);
+
+        return isset($matches[1]) ? trim($matches[1]) : null;
+    }
+
     /**
      * Get app .env path.
      *
@@ -118,7 +211,7 @@ protected function appendProToEnv()
      */
     protected function envPath()
     {
-        return $this->laravel->environmentFilePath();
+        return app()->environmentFilePath();
     }
 
     /**
diff --git a/src/Console/Commands/SetupCpVite.php b/src/Console/Commands/SetupCpVite.php
index 93a2718d8be..f2e77e1c6f7 100644
--- a/src/Console/Commands/SetupCpVite.php
+++ b/src/Console/Commands/SetupCpVite.php
@@ -53,24 +53,24 @@ private function installDependencies(): self
 
                 $installedDependencies = collect($contents['dependencies'] ?? [])->merge($contents['devDependencies'] ?? []);
 
-                if (! $installedDependencies->contains('vite')) {
-                    $contents['devDependencies']['vite'] = '^7.0.4';
+                if (! $installedDependencies->has('vite')) {
+                    $contents['devDependencies']['vite'] = '^8.0.0';
                 }
 
-                if (! $installedDependencies->contains('@statamic/cms')) {
+                if (! $installedDependencies->has('@statamic/cms')) {
                     $contents['dependencies']['@statamic/cms'] = 'file:./vendor/statamic/cms/resources/dist-package';
                 }
 
                 File::put($packageJsonPath, json_encode($contents, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 
-                return Process::path(base_path())->run('npm install');
+                return Process::path(base_path())->run('npm install --ignore-scripts');
             },
             message: 'Installing dependencies...'
         );
 
         if ($result->failed()) {
             $this->line($result->errorOutput() ?: $result->output());
-            $this->components->error('Failed to install dependencies. You need to run "npm install" manually.');
+            $this->components->error('Failed to install dependencies. You need to run "npm install --ignore-scripts" manually.');
 
             return $this;
         }
diff --git a/src/Console/Commands/SiteClear.php b/src/Console/Commands/SiteClear.php
index a4156378f47..28bd24035fb 100644
--- a/src/Console/Commands/SiteClear.php
+++ b/src/Console/Commands/SiteClear.php
@@ -42,7 +42,9 @@ class SiteClear extends Command
     public function handle()
     {
         if ($this->shouldAbort()) {
-            return $this->info('Aborted successfully.');
+            $this->info('Aborted successfully.');
+
+            return;
         }
 
         $this->files = app(Filesystem::class);
diff --git a/src/Console/Commands/StacheClear.php b/src/Console/Commands/StacheClear.php
index 038ba23beeb..56201fe87e8 100644
--- a/src/Console/Commands/StacheClear.php
+++ b/src/Console/Commands/StacheClear.php
@@ -3,34 +3,22 @@
 namespace Statamic\Console\Commands;
 
 use Illuminate\Console\Command;
+use Statamic\Console\Commands\Concerns\HasStacheExcludes;
 use Statamic\Console\RunsInPlease;
 use Statamic\Facades\Stache;
 
 class StacheClear extends Command
 {
-    use RunsInPlease;
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'statamic:stache:clear';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
+    use HasStacheExcludes, RunsInPlease;
+
+    protected $signature = 'statamic:stache:clear {--exclude= : Comma-separated list of store keys to exclude}';
+
     protected $description = 'Clear the "Stache" cache';
 
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
     public function handle()
     {
+        $this->addExcludes($this->option('exclude'));
+
         Stache::clear();
 
         $this->components->info('You have trimmed the Stache. It looks dashing.');
diff --git a/src/Console/Commands/StacheRefresh.php b/src/Console/Commands/StacheRefresh.php
index aaa98bebd74..d1fe60e645c 100644
--- a/src/Console/Commands/StacheRefresh.php
+++ b/src/Console/Commands/StacheRefresh.php
@@ -3,6 +3,7 @@
 namespace Statamic\Console\Commands;
 
 use Illuminate\Console\Command;
+use Statamic\Console\Commands\Concerns\HasStacheExcludes;
 use Statamic\Console\RunsInPlease;
 use Statamic\Facades\Stache;
 
@@ -10,13 +11,16 @@
 
 class StacheRefresh extends Command
 {
-    use RunsInPlease;
+    use HasStacheExcludes, RunsInPlease;
+
+    protected $signature = 'statamic:stache:refresh {--exclude= : Comma-separated list of store keys to exclude}';
 
-    protected $signature = 'statamic:stache:refresh';
     protected $description = 'Clear and rebuild the "Stache" cache';
 
     public function handle()
     {
+        $this->addExcludes($this->option('exclude'));
+
         spin(callback: fn () => Stache::clear(), message: 'Clearing the Stache...');
         spin(callback: fn () => Stache::warm(), message: 'Warming the Stache...');
 
diff --git a/src/Console/Commands/StacheWarm.php b/src/Console/Commands/StacheWarm.php
index 0a6965c744b..85919daf4d4 100644
--- a/src/Console/Commands/StacheWarm.php
+++ b/src/Console/Commands/StacheWarm.php
@@ -3,6 +3,7 @@
 namespace Statamic\Console\Commands;
 
 use Illuminate\Console\Command;
+use Statamic\Console\Commands\Concerns\HasStacheExcludes;
 use Statamic\Console\RunsInPlease;
 use Statamic\Facades\Stache;
 
@@ -10,13 +11,16 @@
 
 class StacheWarm extends Command
 {
-    use RunsInPlease;
+    use HasStacheExcludes, RunsInPlease;
+
+    protected $signature = 'statamic:stache:warm {--exclude= : Comma-separated list of store keys to exclude}';
 
-    protected $signature = 'statamic:stache:warm';
     protected $description = 'Build the "Stache" cache';
 
     public function handle()
     {
+        $this->addExcludes($this->option('exclude'));
+
         spin(callback: fn () => Stache::warm(), message: 'Warming the Stache...');
 
         $this->components->info('You have poured oil over the Stache and polished it until it shines. It is warm and ready');
diff --git a/src/Console/Commands/StaticWarm.php b/src/Console/Commands/StaticWarm.php
index 4ff482b5b74..d8b3867aa26 100644
--- a/src/Console/Commands/StaticWarm.php
+++ b/src/Console/Commands/StaticWarm.php
@@ -12,6 +12,7 @@
 use Illuminate\Http\Request as HttpRequest;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Collection;
+use Statamic\Console\Commands\Concerns\NormalizesPaginationHeader;
 use Statamic\Console\EnhancesCommands;
 use Statamic\Console\RunsInPlease;
 use Statamic\Entries\Collection as EntriesCollection;
@@ -31,6 +32,7 @@ class StaticWarm extends Command
 {
     use EnhancesCommands;
     use Hookable;
+    use NormalizesPaginationHeader;
     use RunsInPlease;
 
     protected $signature = 'statamic:static:warm
@@ -173,7 +175,7 @@ public function outputSuccessLine(Response $response, $index): void
         $this->components->twoColumnDetail($this->getRelativeUri($this->uris()->get($index)), '<info>✓ Cached</info>');
 
         if ($response->hasHeader('X-Statamic-Pagination')) {
-            [$currentPage, $totalPages, $pageName] = $response->getHeader('X-Statamic-Pagination');
+            [$currentPage, $totalPages, $pageName] = $this->paginationHeader($response);
 
             $this->warmPaginatedPages($this->uris()->get($index), $currentPage, $totalPages, $pageName);
         }
diff --git a/src/Console/Commands/StaticWarmJob.php b/src/Console/Commands/StaticWarmJob.php
index 31298d97e4a..e387ad0c5a9 100644
--- a/src/Console/Commands/StaticWarmJob.php
+++ b/src/Console/Commands/StaticWarmJob.php
@@ -10,10 +10,11 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Psr\Http\Message\ResponseInterface;
+use Statamic\Console\Commands\Concerns\NormalizesPaginationHeader;
 
 class StaticWarmJob implements ShouldBeUnique, ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable;
+    use Dispatchable, InteractsWithQueue, NormalizesPaginationHeader, Queueable;
 
     public $uniqueId;
     public $tries = 1;
@@ -28,7 +29,7 @@ public function handle()
         $response = (new Client($this->clientConfig))->send($this->request);
 
         if ($this->shouldWarmPaginatedPages($response)) {
-            [$currentPage, $totalPages, $pageName] = $response->getHeader('X-Statamic-Pagination');
+            [$currentPage, $totalPages, $pageName] = $this->paginationHeader($response);
 
             collect(range($currentPage, $totalPages))
                 ->map(function (int $page) use ($pageName): string {
@@ -53,7 +54,7 @@ private function shouldWarmPaginatedPages(ResponseInterface $response): bool
             return false;
         }
 
-        [$currentPage, $totalPages, $pageName] = $response->getHeader('X-Statamic-Pagination');
+        [$currentPage, $totalPages, $pageName] = $this->paginationHeader($response);
 
         return ! str_contains($this->request->getUri()->getQuery(), "{$pageName}=");
     }
diff --git a/src/Console/Commands/stubs/config/stache.php.stub b/src/Console/Commands/stubs/config/stache.php.stub
index 9a679742c09..9677602e6ee 100644
--- a/src/Console/Commands/stubs/config/stache.php.stub
+++ b/src/Console/Commands/stubs/config/stache.php.stub
@@ -1,7 +1,5 @@
 <?php
 
-use Statamic\Stache\Stores;
-
 return [
 
     /*
@@ -15,59 +13,32 @@ return [
     |
     */
 
-    'watcher' => env('STATAMIC_STACHE_WATCHER', true),
+    'watcher' => env('STATAMIC_STACHE_WATCHER', 'auto'),
 
     /*
     |--------------------------------------------------------------------------
-    | Stores
+    | Cache Store
     |--------------------------------------------------------------------------
     |
-    | Here you may configure which stores are used inside the Stache.
+    | Here you may configure which Cache Store the Stache uses.
     |
     */
 
-    'stores' => [
+    'cache_store' => null,
 
-        'taxonomies' => [
-            'class' => Stores\TaxonomiesStore::class,
-            'directory' => base_path('content/taxonomies'),
-        ],
-
-        'terms' => [
-            'class' => Stores\TermsStore::class,
-            'directory' => base_path('content/taxonomies'),
-        ],
-
-        'collections' => [
-            'class' => Stores\CollectionsStore::class,
-            'directory' => base_path('content/collections'),
-        ],
-
-        'entries' => [
-            'class' => Stores\EntriesStore::class,
-            'directory' => base_path('content/collections'),
-        ],
-
-        'navigation' => [
-            'class' => Stores\NavigationStore::class,
-            'directory' => base_path('content/navigation'),
-        ],
-
-        'globals' => [
-            'class' => Stores\GlobalsStore::class,
-            'directory' => base_path('content/globals'),
-        ],
-
-        'asset-containers' => [
-            'class' => Stores\AssetContainersStore::class,
-            'directory' => base_path('content/assets'),
-        ],
-
-        'users' => [
-            'class' => Stores\UsersStore::class,
-            'directory' => base_path('users'),
-        ],
+    /*
+    |--------------------------------------------------------------------------
+    | Stores
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the stores that are used inside the Stache.
+    |
+    | https://statamic.dev/stache#stores
+    |
+    */
 
+    'stores' => [
+        //
     ],
 
     /*
@@ -90,9 +61,9 @@ return [
     | Locking
     |--------------------------------------------------------------------------
     |
-    | In order to prevent concurrent requests from updating the Stache at
-    | the same and wasting resources, it will be "locked" so subsequent
-    | requests will have to wait until the first has been completed.
+    | In order to prevent concurrent requests from updating the Stache at the
+    | same time and wasting resources, it will be locked so that subsequent
+    | requests will have to wait until the first one has been completed.
     |
     | https://statamic.dev/stache#locks
     |
@@ -103,4 +74,27 @@ return [
         'timeout' => 30,
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Warming Optimization
+    |--------------------------------------------------------------------------
+    |
+    | These options control performance optimizations during Stache warming.
+    |
+    */
+
+    'warming' => [
+        // Enable parallel store processing for faster warming on multi-core systems
+        'parallel_processing' => env('STATAMIC_STACHE_PARALLEL_WARMING', false),
+
+        // Maximum number of parallel processes (0 = auto-detect CPU cores)
+        'max_processes' => env('STATAMIC_STACHE_MAX_PROCESSES', 0),
+
+        // Minimum number of stores required to enable parallel processing
+        'min_stores_for_parallel' => env('STATAMIC_STACHE_MIN_STORES_PARALLEL', 3),
+
+        // Concurrency driver: 'process', 'fork', or 'sync'
+        'concurrency_driver' => env('STATAMIC_STACHE_CONCURRENCY_DRIVER', 'process'),
+    ],
+
 ];
diff --git a/src/Console/Commands/stubs/config/users.php.stub b/src/Console/Commands/stubs/config/users.php.stub
index eaa5fb506d4..bf7f80e9625 100644
--- a/src/Console/Commands/stubs/config/users.php.stub
+++ b/src/Console/Commands/stubs/config/users.php.stub
@@ -22,7 +22,6 @@ return [
         'file' => [
             'driver' => 'file',
             'paths' => [
-                'users' => base_path('users'),
                 'roles' => resource_path('users/roles.yaml'),
                 'groups' => resource_path('users/groups.yaml'),
             ],
@@ -76,6 +75,32 @@ return [
         //
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Registration form honeypot field
+    |--------------------------------------------------------------------------
+    |
+    | When registering new users through the user:register_form tag,
+    | specify the field to act as a honeypot for bots
+    |
+    */
+
+    'registration_form_honeypot_field' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | User Wizard Invitation Email
+    |--------------------------------------------------------------------------
+    |
+    | When creating new users through the wizard in the control panel,
+    | you may choose whether to be able to send an invitation email.
+    | Setting to true will give the user the option. But setting
+    | it to false will disable the invitation option entirely.
+    |
+    */
+
+    'wizard_invitation' => true,
+
     /*
     |--------------------------------------------------------------------------
     | Password Brokers
@@ -106,7 +131,10 @@ return [
     'tables' => [
         'users' => 'users',
         'role_user' => 'role_user',
+        'roles' => false,
         'group_user' => 'group_user',
+        'groups' => false,
+        'webauthn' => 'webauthn',
     ],
 
     /*
@@ -125,4 +153,90 @@ return [
         'web' => 'web',
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Impersonation
+    |--------------------------------------------------------------------------
+    |
+    | Here you can configure if impersonation is available, and what URL to
+    | redirect to after impersonation begins.
+    |
+    */
+
+    'impersonate' => [
+        'enabled' => env('STATAMIC_IMPERSONATE_ENABLED', true),
+        'redirect' => env('STATAMIC_IMPERSONATE_REDIRECT', null),
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Elevated Sessions
+    |--------------------------------------------------------------------------
+    |
+    | Users may be required to reauthorize before performing certain
+    | sensitive actions. This is called an elevated session. Here
+    | you may configure the duration of the session in minutes.
+    | You may also disable the elevated session entirely.
+    |
+    */
+
+    'elevated_sessions_enabled' => env('STATAMIC_ELEVATED_SESSIONS_ENABLED', true),
+
+    'elevated_session_duration' => 15,
+
+    'elevated_sessions_url' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Two-Factor Authentication
+    |--------------------------------------------------------------------------
+    |
+    | Here you may disable two-factor authentication entirely. This can be
+    | useful on local or staging environments, or when using OAuth.
+    |
+    */
+
+    'two_factor_enabled' => env('STATAMIC_TWO_FACTOR_ENABLED', true),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Enforce Two-Factor Authentication
+    |--------------------------------------------------------------------------
+    |
+    | Specify which user roles should be required to enable two-factor
+    | authentication. Use "*" to enforce 2FA for all users, or "super_users"
+    | to enforce it for super users.
+    |
+    */
+
+    'two_factor_enforced_roles' => [],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Two-Factor Authentication URLs
+    |--------------------------------------------------------------------------
+    |
+    | When users log in to the frontend and need to verify a two-factor code
+    | or set up two-factor authentication, they will be redirected to these
+    | URLs. Leave null to use the built-in pages. Control panel flows are
+    | unaffected and always use their own pages.
+    |
+    */
+
+    'two_factor_challenge_url' => null,
+
+    'two_factor_setup_url' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Sorting
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the default sort behavior for user listings.
+    |
+    */
+
+    'sort_field' => 'email',
+    'sort_direction' => 'asc',
+
 ];
diff --git a/src/Console/Composer/Lock.php b/src/Console/Composer/Lock.php
index 7ba5a773191..764fef5c07e 100644
--- a/src/Console/Composer/Lock.php
+++ b/src/Console/Composer/Lock.php
@@ -9,6 +9,9 @@
 use Statamic\Facades\Path;
 use Statamic\UpdateScripts\UpdateScript;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class Lock
 {
     protected $files;
diff --git a/src/Console/Processes/Composer.php b/src/Console/Processes/Composer.php
index c0bea6e4be6..b88ffc3301b 100644
--- a/src/Console/Processes/Composer.php
+++ b/src/Console/Processes/Composer.php
@@ -64,7 +64,7 @@ public function installed()
             return collect();
         }
 
-        return collect($this->runJsonComposerCommand('show', '--direct', '--no-plugins')->installed)
+        return collect($this->runJsonComposerCommand('show', '--direct', '--no-plugins')?->installed ?? [])
             ->keyBy('name')
             ->map(function ($package) use ($lock) {
                 $package->version = $this->normalizeVersion($package->version);
@@ -99,7 +99,7 @@ public function installedVersion(string $package)
      */
     public function installedPath(string $package)
     {
-        return collect($this->runJsonComposerCommand('show', '--direct', '--path', '--no-plugins')->installed)
+        return collect($this->runJsonComposerCommand('show', '--direct', '--path', '--no-plugins')?->installed ?? [])
             ->keyBy('name')
             ->get($package)
             ->path;
diff --git a/src/Console/Processes/Ffmpeg.php b/src/Console/Processes/Ffmpeg.php
index ace1a142733..696f35b1845 100644
--- a/src/Console/Processes/Ffmpeg.php
+++ b/src/Console/Processes/Ffmpeg.php
@@ -36,12 +36,15 @@ private function buildCommand(string $ffmpegBinary, string $path, string $output
     {
         return collect([
             escapeshellarg($ffmpegBinary),
+            '-hide_banner',
+            '-loglevel error',
             '-y',
             '-ss',
             escapeshellarg($this->startTimestamp),
             '-i',
             escapeshellarg($path),
-            '-vframes 1',
+            '-frames:v 1',
+            '-update 1',
             escapeshellarg($output),
         ])->join(' ');
     }
diff --git a/src/Console/Processes/Process.php b/src/Console/Processes/Process.php
index dd302629734..b59e9c85476 100644
--- a/src/Console/Processes/Process.php
+++ b/src/Console/Processes/Process.php
@@ -12,6 +12,9 @@
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process as SymfonyProcess;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class Process
 {
     const CACHE_EXPIRY_MINUTES = 10;
diff --git a/src/Data/BulkAugmentor.php b/src/Data/BulkAugmentor.php
index 018b1b52c27..9e5ef00505d 100644
--- a/src/Data/BulkAugmentor.php
+++ b/src/Data/BulkAugmentor.php
@@ -5,6 +5,9 @@
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Data\BulkAugmentable;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class BulkAugmentor
 {
     private $isTree = false;
diff --git a/src/Data/ContainsComputedData.php b/src/Data/ContainsComputedData.php
index fbe4f321bd2..cf72d60bd2e 100644
--- a/src/Data/ContainsComputedData.php
+++ b/src/Data/ContainsComputedData.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\Data;
 
+use Statamic\Fields\Value;
+
 trait ContainsComputedData
 {
     protected $withComputedData = true;
@@ -16,14 +18,21 @@ public function computedKeys()
     }
 
     public function computedData()
+    {
+        return $this->getComputedData(false);
+    }
+
+    public function getComputedData($wrapInValue)
     {
         if (! method_exists($this, 'getComputedCallbacks')) {
             return collect();
         }
 
-        return collect($this->getComputedCallbacks())->map(function ($callback, $field) {
-            return $this->getComputed($field);
-        });
+        return collect($this->getComputedCallbacks())
+            ->map(fn ($callback, $field) => $wrapInValue ?
+                new Value(fn () => $this->getComputed($field)) :
+                $this->getComputed($field)
+            );
     }
 
     public function getComputed($key)
diff --git a/src/Data/DataCollection.php b/src/Data/DataCollection.php
index f6ce3d81311..2cbad8df46f 100644
--- a/src/Data/DataCollection.php
+++ b/src/Data/DataCollection.php
@@ -7,12 +7,14 @@
 use Illuminate\Support\Collection as IlluminateCollection;
 use Statamic\Exceptions\MethodNotFoundException;
 use Statamic\Facades\Compare;
+use Statamic\Query\ResolveValue;
 use Statamic\Search\PlainResult;
 use Statamic\Search\Result;
-use Statamic\Support\Str;
 
 /**
  * An abstract collection of data types.
+ *
+ * @phpstan-consistent-constructor
  */
 class DataCollection extends IlluminateCollection
 {
@@ -100,15 +102,7 @@ protected function getSortableValue($sort, $item)
             $item = $item->getSearchable() ?? $item;
         }
 
-        if (method_exists($item, $method = Str::camel($sort))) {
-            return $this->normalizeSortableValue(call_user_func([$item, $method]));
-        }
-
-        if (method_exists($item, 'value')) {
-            return $this->normalizeSortableValue($item->value($sort));
-        }
-
-        return $this->normalizeSortableValue($item->get($sort));
+        return $this->normalizeSortableValue((new ResolveValue)($item, $sort));
     }
 
     /**
diff --git a/src/Data/DataReferenceUpdater.php b/src/Data/DataReferenceUpdater.php
index 1eaaf2974ff..8f861c90125 100644
--- a/src/Data/DataReferenceUpdater.php
+++ b/src/Data/DataReferenceUpdater.php
@@ -7,6 +7,9 @@
 use Statamic\Git\Subscriber as GitSubscriber;
 use Statamic\Support\Arr;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 abstract class DataReferenceUpdater
 {
     /**
diff --git a/src/Data/HasOrigin.php b/src/Data/HasOrigin.php
index fe045594ee8..5d390cc4b16 100644
--- a/src/Data/HasOrigin.php
+++ b/src/Data/HasOrigin.php
@@ -32,12 +32,17 @@ public function keys()
     }
 
     public function values()
+    {
+        return $this->getValues(false);
+    }
+
+    public function getValues($wrapComputed)
     {
         $originFallbackValues = method_exists($this, 'getOriginFallbackValues') ? $this->getOriginFallbackValues() : collect();
 
         $originValues = $this->hasOrigin() ? $this->origin()->values() : collect();
 
-        $computedData = method_exists($this, 'computedData') ? $this->computedData() : [];
+        $computedData = method_exists($this, 'getComputedData') ? $this->getComputedData($wrapComputed) : [];
 
         return collect()
             ->merge($originFallbackValues)
diff --git a/src/Dictionaries/Countries.php b/src/Dictionaries/Countries.php
index 693e02408da..293c3e081bf 100644
--- a/src/Dictionaries/Countries.php
+++ b/src/Dictionaries/Countries.php
@@ -4,6 +4,8 @@
 
 use Illuminate\Support\Collection;
 
+use function Statamic\trans as __;
+
 class Countries extends BasicDictionary
 {
     protected string $valueKey = 'iso3';
@@ -341,4 +343,9 @@ protected function getItems(): array
             ['name' => __('statamic::dictionary-countries.names.ZWE'), 'iso3' => 'ZWE', 'iso2' => 'ZW', 'region' => $this->regions['africa'], 'subregion' => $this->subregions['eastern_africa'], 'emoji' => '🇿🇼'],
         ];
     }
+
+    public function allowsPublicAccess(): bool
+    {
+        return true;
+    }
 }
diff --git a/src/Dictionaries/Currencies.php b/src/Dictionaries/Currencies.php
index bfee3a26bae..56b4019685a 100644
--- a/src/Dictionaries/Currencies.php
+++ b/src/Dictionaries/Currencies.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\Dictionaries;
 
+use function Statamic\trans as __;
+
 class Currencies extends BasicDictionary
 {
     protected string $valueKey = 'code';
@@ -19,16 +21,22 @@ protected function getItems(): array
             ['code' => 'AFN', 'name' => __('statamic::dictionary-currencies.AFN'), 'symbol' => '؋', 'decimals' => 2],
             ['code' => 'ALL', 'name' => __('statamic::dictionary-currencies.ALL'), 'symbol' => 'Lek', 'decimals' => 2],
             ['code' => 'AMD', 'name' => __('statamic::dictionary-currencies.AMD'), 'symbol' => 'դր.', 'decimals' => 2],
+            ['code' => 'AOA', 'name' => __('statamic::dictionary-currencies.AOA'), 'symbol' => 'Kz', 'decimals' => 2],
             ['code' => 'ARS', 'name' => __('statamic::dictionary-currencies.ARS'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'AUD', 'name' => __('statamic::dictionary-currencies.AUD'), 'symbol' => '$', 'decimals' => 2],
+            ['code' => 'AWG', 'name' => __('statamic::dictionary-currencies.AWG'), 'symbol' => 'ƒ', 'decimals' => 2],
             ['code' => 'AZN', 'name' => __('statamic::dictionary-currencies.AZN'), 'symbol' => 'ман.', 'decimals' => 2],
             ['code' => 'BAM', 'name' => __('statamic::dictionary-currencies.BAM'), 'symbol' => 'KM', 'decimals' => 2],
+            ['code' => 'BBD', 'name' => __('statamic::dictionary-currencies.BBD'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'BDT', 'name' => __('statamic::dictionary-currencies.BDT'), 'symbol' => '৳', 'decimals' => 2],
             ['code' => 'BHD', 'name' => __('statamic::dictionary-currencies.BHD'), 'symbol' => 'د.ب.‏', 'decimals' => 3],
             ['code' => 'BIF', 'name' => __('statamic::dictionary-currencies.BIF'), 'symbol' => 'FBu', 'decimals' => 0],
+            ['code' => 'BMD', 'name' => __('statamic::dictionary-currencies.BMD'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'BND', 'name' => __('statamic::dictionary-currencies.BND'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'BOB', 'name' => __('statamic::dictionary-currencies.BOB'), 'symbol' => 'Bs', 'decimals' => 2],
             ['code' => 'BRL', 'name' => __('statamic::dictionary-currencies.BRL'), 'symbol' => 'R$', 'decimals' => 2],
+            ['code' => 'BSD', 'name' => __('statamic::dictionary-currencies.BSD'), 'symbol' => '$', 'decimals' => 2],
+            ['code' => 'BTN', 'name' => __('statamic::dictionary-currencies.BTN'), 'symbol' => 'Nu', 'decimals' => 2],
             ['code' => 'BWP', 'name' => __('statamic::dictionary-currencies.BWP'), 'symbol' => 'P', 'decimals' => 2],
             ['code' => 'BYN', 'name' => __('statamic::dictionary-currencies.BYN'), 'symbol' => 'руб.', 'decimals' => 2],
             ['code' => 'BZD', 'name' => __('statamic::dictionary-currencies.BZD'), 'symbol' => '$', 'decimals' => 2],
@@ -39,6 +47,7 @@ protected function getItems(): array
             ['code' => 'CNY', 'name' => __('statamic::dictionary-currencies.CNY'), 'symbol' => 'CN¥', 'decimals' => 2],
             ['code' => 'COP', 'name' => __('statamic::dictionary-currencies.COP'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'CRC', 'name' => __('statamic::dictionary-currencies.CRC'), 'symbol' => '₡', 'decimals' => 2],
+            ['code' => 'CUP', 'name' => __('statamic::dictionary-currencies.CUP'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'CVE', 'name' => __('statamic::dictionary-currencies.CVE'), 'symbol' => 'CV$', 'decimals' => 2],
             ['code' => 'CZK', 'name' => __('statamic::dictionary-currencies.CZK'), 'symbol' => 'Kč', 'decimals' => 2],
             ['code' => 'DJF', 'name' => __('statamic::dictionary-currencies.DJF'), 'symbol' => 'Fdj', 'decimals' => 0],
@@ -49,13 +58,19 @@ protected function getItems(): array
             ['code' => 'ERN', 'name' => __('statamic::dictionary-currencies.ERN'), 'symbol' => 'Nfk', 'decimals' => 2],
             ['code' => 'ETB', 'name' => __('statamic::dictionary-currencies.ETB'), 'symbol' => 'Br', 'decimals' => 2],
             ['code' => 'EUR', 'name' => __('statamic::dictionary-currencies.EUR'), 'symbol' => '€', 'decimals' => 2],
+            ['code' => 'FJD', 'name' => __('statamic::dictionary-currencies.FJD'), 'symbol' => '$', 'decimals' => 2],
+            ['code' => 'FKP', 'name' => __('statamic::dictionary-currencies.FKP'), 'symbol' => '£', 'decimals' => 2],
             ['code' => 'GBP', 'name' => __('statamic::dictionary-currencies.GBP'), 'symbol' => '£', 'decimals' => 2],
             ['code' => 'GEL', 'name' => __('statamic::dictionary-currencies.GEL'), 'symbol' => 'GEL', 'decimals' => 2],
             ['code' => 'GHS', 'name' => __('statamic::dictionary-currencies.GHS'), 'symbol' => 'GH₵', 'decimals' => 2],
+            ['code' => 'GIP', 'name' => __('statamic::dictionary-currencies.GIP'), 'symbol' => '£', 'decimals' => 2],
+            ['code' => 'GMD', 'name' => __('statamic::dictionary-currencies.GMD'), 'symbol' => 'D', 'decimals' => 2],
             ['code' => 'GNF', 'name' => __('statamic::dictionary-currencies.GNF'), 'symbol' => 'FG', 'decimals' => 0],
             ['code' => 'GTQ', 'name' => __('statamic::dictionary-currencies.GTQ'), 'symbol' => 'Q', 'decimals' => 2],
+            ['code' => 'GYD', 'name' => __('statamic::dictionary-currencies.GYD'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'HKD', 'name' => __('statamic::dictionary-currencies.HKD'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'HNL', 'name' => __('statamic::dictionary-currencies.HNL'), 'symbol' => 'L', 'decimals' => 2],
+            ['code' => 'HTG', 'name' => __('statamic::dictionary-currencies.HTG'), 'symbol' => 'G', 'decimals' => 2],
             ['code' => 'HUF', 'name' => __('statamic::dictionary-currencies.HUF'), 'symbol' => 'Ft', 'decimals' => 2],
             ['code' => 'IDR', 'name' => __('statamic::dictionary-currencies.IDR'), 'symbol' => 'Rp', 'decimals' => 2],
             ['code' => 'ILS', 'name' => __('statamic::dictionary-currencies.ILS'), 'symbol' => '₪', 'decimals' => 2],
@@ -67,21 +82,31 @@ protected function getItems(): array
             ['code' => 'JOD', 'name' => __('statamic::dictionary-currencies.JOD'), 'symbol' => 'د.أ.‏', 'decimals' => 3],
             ['code' => 'JPY', 'name' => __('statamic::dictionary-currencies.JPY'), 'symbol' => '￥', 'decimals' => 0],
             ['code' => 'KES', 'name' => __('statamic::dictionary-currencies.KES'), 'symbol' => 'Ksh', 'decimals' => 2],
+            ['code' => 'KGS', 'name' => __('statamic::dictionary-currencies.KGS'), 'symbol' => '⃀', 'decimals' => 2],
             ['code' => 'KHR', 'name' => __('statamic::dictionary-currencies.KHR'), 'symbol' => '៛', 'decimals' => 2],
             ['code' => 'KMF', 'name' => __('statamic::dictionary-currencies.KMF'), 'symbol' => 'FC', 'decimals' => 0],
+            ['code' => 'KPW', 'name' => __('statamic::dictionary-currencies.KPW'), 'symbol' => '₩', 'decimals' => 2],
             ['code' => 'KRW', 'name' => __('statamic::dictionary-currencies.KRW'), 'symbol' => '₩', 'decimals' => 0],
             ['code' => 'KWD', 'name' => __('statamic::dictionary-currencies.KWD'), 'symbol' => 'د.ك.‏', 'decimals' => 3],
+            ['code' => 'KYD', 'name' => __('statamic::dictionary-currencies.KYD'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'KZT', 'name' => __('statamic::dictionary-currencies.KZT'), 'symbol' => 'тңг.', 'decimals' => 2],
+            ['code' => 'LAK', 'name' => __('statamic::dictionary-currencies.LAK'), 'symbol' => '₭', 'decimals' => 2],
             ['code' => 'LBP', 'name' => __('statamic::dictionary-currencies.LBP'), 'symbol' => 'ل.ل.‏', 'decimals' => 2],
             ['code' => 'LKR', 'name' => __('statamic::dictionary-currencies.LKR'), 'symbol' => 'SL Re', 'decimals' => 2],
+            ['code' => 'LRD', 'name' => __('statamic::dictionary-currencies.LRD'), 'symbol' => '$', 'decimals' => 2],
+            ['code' => 'LSL', 'name' => __('statamic::dictionary-currencies.LSL'), 'symbol' => 'L', 'decimals' => 2],
             ['code' => 'LYD', 'name' => __('statamic::dictionary-currencies.LYD'), 'symbol' => 'د.ل.‏', 'decimals' => 3],
             ['code' => 'MAD', 'name' => __('statamic::dictionary-currencies.MAD'), 'symbol' => 'د.م.‏', 'decimals' => 2],
             ['code' => 'MDL', 'name' => __('statamic::dictionary-currencies.MDL'), 'symbol' => 'MDL', 'decimals' => 2],
             ['code' => 'MGA', 'name' => __('statamic::dictionary-currencies.MGA'), 'symbol' => 'MGA', 'decimals' => 2],
             ['code' => 'MKD', 'name' => __('statamic::dictionary-currencies.MKD'), 'symbol' => 'MKD', 'decimals' => 2],
             ['code' => 'MMK', 'name' => __('statamic::dictionary-currencies.MMK'), 'symbol' => 'K', 'decimals' => 2],
+            ['code' => 'MNT', 'name' => __('statamic::dictionary-currencies.MNT'), 'symbol' => '₮', 'decimals' => 2],
             ['code' => 'MOP', 'name' => __('statamic::dictionary-currencies.MOP'), 'symbol' => 'MOP$', 'decimals' => 2],
+            ['code' => 'MRU', 'name' => __('statamic::dictionary-currencies.MRU'), 'symbol' => 'UM', 'decimals' => 2],
             ['code' => 'MUR', 'name' => __('statamic::dictionary-currencies.MUR'), 'symbol' => 'MURs', 'decimals' => 2],
+            ['code' => 'MVR', 'name' => __('statamic::dictionary-currencies.MVR'), 'symbol' => 'Rf', 'decimals' => 2],
+            ['code' => 'MWK', 'name' => __('statamic::dictionary-currencies.MWK'), 'symbol' => 'K', 'decimals' => 2],
             ['code' => 'MXN', 'name' => __('statamic::dictionary-currencies.MXN'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'MYR', 'name' => __('statamic::dictionary-currencies.MYR'), 'symbol' => 'RM', 'decimals' => 2],
             ['code' => 'MZN', 'name' => __('statamic::dictionary-currencies.MZN'), 'symbol' => 'MTn', 'decimals' => 2],
@@ -94,6 +119,7 @@ protected function getItems(): array
             ['code' => 'OMR', 'name' => __('statamic::dictionary-currencies.OMR'), 'symbol' => 'ر.ع.‏', 'decimals' => 3],
             ['code' => 'PAB', 'name' => __('statamic::dictionary-currencies.PAB'), 'symbol' => 'B/.', 'decimals' => 2],
             ['code' => 'PEN', 'name' => __('statamic::dictionary-currencies.PEN'), 'symbol' => 'S/.', 'decimals' => 2],
+            ['code' => 'PGK', 'name' => __('statamic::dictionary-currencies.PGK'), 'symbol' => 'K', 'decimals' => 2],
             ['code' => 'PHP', 'name' => __('statamic::dictionary-currencies.PHP'), 'symbol' => '₱', 'decimals' => 2],
             ['code' => 'PKR', 'name' => __('statamic::dictionary-currencies.PKR'), 'symbol' => '₨', 'decimals' => 2],
             ['code' => 'PLN', 'name' => __('statamic::dictionary-currencies.PLN'), 'symbol' => 'zł', 'decimals' => 2],
@@ -104,12 +130,22 @@ protected function getItems(): array
             ['code' => 'RUB', 'name' => __('statamic::dictionary-currencies.RUB'), 'symbol' => '₽.', 'decimals' => 2],
             ['code' => 'RWF', 'name' => __('statamic::dictionary-currencies.RWF'), 'symbol' => 'FR', 'decimals' => 0],
             ['code' => 'SAR', 'name' => __('statamic::dictionary-currencies.SAR'), 'symbol' => 'ر.س.‏', 'decimals' => 2],
+            ['code' => 'SBD', 'name' => __('statamic::dictionary-currencies.SBD'), 'symbol' => '$', 'decimals' => 2],
+            ['code' => 'SCR', 'name' => __('statamic::dictionary-currencies.SCR'), 'symbol' => 'Re', 'decimals' => 2],
             ['code' => 'SDG', 'name' => __('statamic::dictionary-currencies.SDG'), 'symbol' => 'SDG', 'decimals' => 2],
             ['code' => 'SEK', 'name' => __('statamic::dictionary-currencies.SEK'), 'symbol' => 'kr', 'decimals' => 2],
             ['code' => 'SGD', 'name' => __('statamic::dictionary-currencies.SGD'), 'symbol' => '$', 'decimals' => 2],
+            ['code' => 'SHP', 'name' => __('statamic::dictionary-currencies.SHP'), 'symbol' => '£', 'decimals' => 2],
+            ['code' => 'SLE', 'name' => __('statamic::dictionary-currencies.SLE'), 'symbol' => 'Le', 'decimals' => 2],
             ['code' => 'SOS', 'name' => __('statamic::dictionary-currencies.SOS'), 'symbol' => 'Ssh', 'decimals' => 2],
+            ['code' => 'SRD', 'name' => __('statamic::dictionary-currencies.SRD'), 'symbol' => '$', 'decimals' => 2],
+            ['code' => 'SSP', 'name' => __('statamic::dictionary-currencies.SSP'), 'symbol' => 'SS£', 'decimals' => 2],
+            ['code' => 'STN', 'name' => __('statamic::dictionary-currencies.STN'), 'symbol' => 'Db', 'decimals' => 2],
             ['code' => 'SYP', 'name' => __('statamic::dictionary-currencies.SYP'), 'symbol' => 'ل.س.‏', 'decimals' => 2],
+            ['code' => 'SZL', 'name' => __('statamic::dictionary-currencies.SZL'), 'symbol' => 'L', 'decimals' => 2],
             ['code' => 'THB', 'name' => __('statamic::dictionary-currencies.THB'), 'symbol' => '฿', 'decimals' => 2],
+            ['code' => 'TJS', 'name' => __('statamic::dictionary-currencies.TJS'), 'symbol' => 'SM', 'decimals' => 2],
+            ['code' => 'TMT', 'name' => __('statamic::dictionary-currencies.TMT'), 'symbol' => 'm', 'decimals' => 2],
             ['code' => 'TND', 'name' => __('statamic::dictionary-currencies.TND'), 'symbol' => 'د.ت.‏', 'decimals' => 3],
             ['code' => 'TOP', 'name' => __('statamic::dictionary-currencies.TOP'), 'symbol' => 'T$', 'decimals' => 2],
             ['code' => 'TRY', 'name' => __('statamic::dictionary-currencies.TRY'), 'symbol' => 'TL', 'decimals' => 2],
@@ -121,14 +157,25 @@ protected function getItems(): array
             ['code' => 'USD', 'name' => __('statamic::dictionary-currencies.USD'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'UYU', 'name' => __('statamic::dictionary-currencies.UYU'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'UZS', 'name' => __('statamic::dictionary-currencies.UZS'), 'symbol' => 'UZS', 'decimals' => 2],
+            ['code' => 'VED', 'name' => __('statamic::dictionary-currencies.VED'), 'symbol' => 'Bs.D', 'decimals' => 2],
             ['code' => 'VES', 'name' => __('statamic::dictionary-currencies.VES'), 'symbol' => 'Bs.S.', 'decimals' => 2],
             ['code' => 'VND', 'name' => __('statamic::dictionary-currencies.VND'), 'symbol' => '₫', 'decimals' => 0],
+            ['code' => 'VUV', 'name' => __('statamic::dictionary-currencies.VUV'), 'symbol' => 'VT', 'decimals' => 0],
+            ['code' => 'WST', 'name' => __('statamic::dictionary-currencies.WST'), 'symbol' => '$', 'decimals' => 2],
             ['code' => 'XAF', 'name' => __('statamic::dictionary-currencies.XAF'), 'symbol' => 'FCFA', 'decimals' => 0],
+            ['code' => 'XCD', 'name' => __('statamic::dictionary-currencies.XCD'), 'symbol' => 'EC$', 'decimals' => 2],
+            ['code' => 'XCG', 'name' => __('statamic::dictionary-currencies.XCG'), 'symbol' => 'Cg', 'decimals' => 2],
             ['code' => 'XOF', 'name' => __('statamic::dictionary-currencies.XOF'), 'symbol' => 'CFA', 'decimals' => 0],
+            ['code' => 'XPF', 'name' => __('statamic::dictionary-currencies.XPF'), 'symbol' => '₣', 'decimals' => 0],
             ['code' => 'YER', 'name' => __('statamic::dictionary-currencies.YER'), 'symbol' => 'ر.ي.‏', 'decimals' => 2],
             ['code' => 'ZAR', 'name' => __('statamic::dictionary-currencies.ZAR'), 'symbol' => 'R', 'decimals' => 2],
             ['code' => 'ZMW', 'name' => __('statamic::dictionary-currencies.ZMW'), 'symbol' => 'ZK', 'decimals' => 2],
             ['code' => 'ZWG', 'name' => __('statamic::dictionary-currencies.ZWG'), 'symbol' => '$', 'decimals' => 2],
         ];
     }
+
+    public function allowsPublicAccess(): bool
+    {
+        return true;
+    }
 }
diff --git a/src/Dictionaries/Dictionary.php b/src/Dictionaries/Dictionary.php
index 269b00d04ff..6ffb40f064c 100644
--- a/src/Dictionaries/Dictionary.php
+++ b/src/Dictionaries/Dictionary.php
@@ -81,4 +81,9 @@ public function keywords(): array
     {
         return $this->keywords;
     }
+
+    public function allowsPublicAccess(): bool
+    {
+        return false;
+    }
 }
diff --git a/src/Dictionaries/File.php b/src/Dictionaries/File.php
index 942e46db479..2c35ba82822 100644
--- a/src/Dictionaries/File.php
+++ b/src/Dictionaries/File.php
@@ -6,6 +6,8 @@
 use Statamic\Facades\Antlers;
 use Statamic\Facades\YAML;
 
+use function Statamic\trans as __;
+
 class File extends BasicDictionary
 {
     protected array $keywords = ['files', 'file', 'json', 'csv', 'yaml', 'yml'];
diff --git a/src/Dictionaries/Languages.php b/src/Dictionaries/Languages.php
index 1a12cefcd55..6fc955bc5cf 100644
--- a/src/Dictionaries/Languages.php
+++ b/src/Dictionaries/Languages.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\Dictionaries;
 
+use function Statamic\trans as __;
+
 class Languages extends BasicDictionary
 {
     protected string $valueKey = 'code';
@@ -107,4 +109,9 @@ protected function getItems(): array
             ['code' => 'gl', 'name' => __('statamic::dictionary-languages.gl')],
         ];
     }
+
+    public function allowsPublicAccess(): bool
+    {
+        return true;
+    }
 }
diff --git a/src/Dictionaries/Locales.php b/src/Dictionaries/Locales.php
index cec5aa6febb..acec621da3e 100644
--- a/src/Dictionaries/Locales.php
+++ b/src/Dictionaries/Locales.php
@@ -3,6 +3,7 @@
 namespace Statamic\Dictionaries;
 
 use Facades\Statamic\Console\Processes\Process;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 
 class Locales extends BasicDictionary
@@ -17,16 +18,19 @@ protected function getItemLabel(array $item): string
 
     protected function getItems(): array
     {
-        $output = Process::run($this->buildLocalesCommand());
-
-        return collect(explode(PHP_EOL, $output))
-            ->map(fn ($locale) => Str::before($locale, '.'))
-            ->reject(fn ($locale) => in_array($locale, ['C', 'POSIX']))
-            ->filter()
-            ->sort()
-            ->values()
-            ->map(fn ($locale) => ['name' => $locale])
-            ->all();
+        return Cache::rememberForever('statamic.dictionaries.locales', function () {
+            $output = Process::run($this->buildLocalesCommand());
+
+            return collect(explode(PHP_EOL, $output))
+                ->filter(fn ($locale) => mb_check_encoding($locale, 'UTF-8'))
+                ->map(fn ($locale) => Str::before($locale, '.'))
+                ->reject(fn ($locale) => in_array($locale, ['C', 'POSIX']))
+                ->filter()
+                ->sort()
+                ->values()
+                ->map(fn ($locale) => ['name' => $locale])
+                ->all();
+        });
     }
 
     private function buildLocalesCommand(): array
@@ -42,4 +46,9 @@ private function buildLocalesCommand(): array
 
         return ['locale', '-a'];
     }
+
+    public function allowsPublicAccess(): bool
+    {
+        return true;
+    }
 }
diff --git a/src/Dictionaries/Timezones.php b/src/Dictionaries/Timezones.php
index d333633b546..13d50fd8faa 100644
--- a/src/Dictionaries/Timezones.php
+++ b/src/Dictionaries/Timezones.php
@@ -31,4 +31,9 @@ private function getOffset(string $tz): string
 
         return stripos($offsetInSecs, '-') === false ? "+{$hoursAndSec}" : "-{$hoursAndSec}";
     }
+
+    public function allowsPublicAccess(): bool
+    {
+        return true;
+    }
 }
diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 2f49d7bc593..5b02d69a8f8 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -7,6 +7,7 @@
 use InvalidArgumentException;
 use Statamic\Contracts\Data\Augmentable as AugmentableContract;
 use Statamic\Contracts\Entries\Collection as Contract;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Data\ContainsCascadingData;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedData;
@@ -35,7 +36,7 @@
 
 use function Statamic\trans as __;
 
-class Collection implements Arrayable, ArrayAccess, AugmentableContract, Contract
+class Collection implements Arrayable, ArrayAccess, AugmentableContract, ContainsQueryableValues, Contract
 {
     use ContainsCascadingData, ExistsAsFile, FluentlyGetsAndSets, HasAugmentedData, HasDirtyState;
 
@@ -967,6 +968,24 @@ public function augmentedArrayData()
         ];
     }
 
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        return null;
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'dated', 'defaultPublishState', 'editUrl', 'handle', 'hasStructure', 'id', 'layout', 'mount',
+            'orderable', 'path', 'requiresSlugs', 'revisionsEnabled', 'sites', 'sortDirection', 'sortField',
+            'structureHandle', 'taxonomies', 'template', 'title', 'url', 'uri',
+        ];
+    }
+
     public function getCurrentDirtyStateAttributes(): array
     {
         return $this->fileData();
diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index 9f60178e00d..1bf3e4c0f84 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -508,7 +508,9 @@ private function updateChildPageUris()
             return;
         }
 
-        if (empty($ids = $page->flattenedPages()->pluck('id'))) {
+        $ids = $page->flattenedPages()->pluck('id');
+
+        if ($ids->isEmpty()) {
             return;
         }
 
@@ -559,10 +561,7 @@ public function order()
             return $this->value('order');
         }
 
-        return $this->structure()->in($this->locale())
-            ->flattenedPages()
-            ->map->reference()
-            ->flip()->get($this->id) + 1;
+        return $this->structure()->in($this->locale())->entryOrder($this->id) + 1;
     }
 
     public function template($template = null)
@@ -581,7 +580,10 @@ public function template($template = null)
 
     protected function inferTemplateFromBlueprint()
     {
-        $template = $this->collection()->handle().'.'.$this->blueprint();
+        $handle = $this->collection()->handle();
+        $prefix = config('statamic.system.blueprint_templates.'.$handle, $handle);
+
+        $template = $prefix.'.'.$this->blueprint();
 
         $slugifiedTemplate = str_replace('_', '-', $template);
 
@@ -773,7 +775,9 @@ public function makeFromRevision($revision)
             ->slug($attrs['slug']);
 
         if ($this->collection()->dated() && ($date = Arr::get($attrs, 'date'))) {
-            $entry->date(Carbon::createFromTimestamp($date, config('app.timezone')));
+            if ($this->isRoot() || $this->blueprint()->field('date')->isLocalizable()) {
+                $entry->date(Carbon::createFromTimestamp($date, config('app.timezone')));
+            }
         }
 
         return $entry;
@@ -862,8 +866,26 @@ public function descendants()
     {
         $localizations = $this->directDescendants();
 
-        foreach ($localizations as $loc) {
-            $localizations = $localizations->merge($loc->descendants());
+        // Breadth-first: fetch each level in one batched query instead of one query per node.
+        $origins = $localizations->map->id()->values()->all();
+        $seen = array_merge($origins, [$this->id()]);
+
+        while (! empty($origins)) {
+            $children = Facades\Entry::query()
+                ->where('collection', $this->collectionHandle())
+                ->whereIn('origin', $origins)
+                ->get()
+                // Guard against cyclic or duplicate origin data, which would
+                // otherwise loop forever as the same entries reappear.
+                ->reject(fn ($entry) => in_array($entry->id(), $seen, true));
+
+            if ($children->isEmpty()) {
+                break;
+            }
+
+            $localizations = $localizations->merge($children->keyBy->locale());
+            $origins = $children->map->id()->values()->all();
+            $seen = array_merge($seen, $origins);
         }
 
         return $localizations;
@@ -877,8 +899,8 @@ public function existsIn($locale)
     public function makeLocalization($site)
     {
         $localization = Facades\Entry::make()
-            ->collection($this->collection)
             ->origin($this)
+            ->collection($this->collection)
             ->locale($site)
             ->published($this->published)
             ->slug($this->slug());
@@ -961,7 +983,12 @@ public function route()
 
     public function routeData()
     {
-        $data = $this->values()->merge([
+        // This uses the `getValues(true)` method instead of values()
+        // This is so we can wrap computed fields in Value so we
+        // can delay their execution. If the computed value
+        // triggers the routeData() method, we will end
+        // up in an infinite loop that is not fun.
+        $data = $this->getValues(true)->merge([
             'id' => $this->id(),
             'slug' => $this->slug(),
             'published' => $this->published(),
@@ -1139,7 +1166,7 @@ public function getQueryableValue(string $field)
             Blink::store('entry-uris')->forget($this->id());
         }
 
-        if (method_exists($this, $method = Str::camel($field))) {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
             return $this->{$method}();
         }
 
@@ -1152,6 +1179,16 @@ public function getQueryableValue(string $field)
         return $field->fieldtype()->toQueryableValue($value);
     }
 
+    private function queryableMethods(): array
+    {
+        return [
+            'apiUrl', 'blueprint', 'collection', 'collectionHandle', 'date', 'editUrl', 'hasDate', 'hasExplicitDate', 'hasOrigin',
+            'hasSeconds', 'hasStructure', 'hasTime', 'id', 'isRedirect', 'isRoot', 'lastModified', 'lastModifiedBy',
+            'layout', 'locale', 'order', 'path', 'private', 'published', 'redirectUrl', 'reference', 'site', 'sites', 'slug',
+            'status', 'template', 'uri', 'url', 'urlWithoutRedirect',
+        ];
+    }
+
     public function getSearchValue(string $field)
     {
         return method_exists($this, $field) ? $this->$field() : $this->value($field);
diff --git a/src/Entries/UpdateStructuredEntryOrderAndParent.php b/src/Entries/UpdateStructuredEntryOrderAndParent.php
index aacc99da586..bd7a5624518 100644
--- a/src/Entries/UpdateStructuredEntryOrderAndParent.php
+++ b/src/Entries/UpdateStructuredEntryOrderAndParent.php
@@ -3,6 +3,7 @@
 namespace Statamic\Entries;
 
 use Statamic\Events\CollectionTreeSaved;
+use Statamic\Structures\CollectionTree;
 
 class UpdateStructuredEntryOrderAndParent
 {
@@ -12,13 +13,31 @@ public function handle(CollectionTreeSaved $event)
         $collection = $tree->collection();
         $diff = $tree->diff();
 
-        $ids = array_merge($diff->moved(), $diff->added());
+        $moved = $diff->moved();
+        $ids = array_merge($moved, $diff->added());
 
         if (empty($ids)) {
             return;
         }
 
-        $collection->updateEntryOrder($ids);
         $collection->updateEntryParent($ids);
+        $collection->updateEntryOrder($this->idsWithDescendants($tree, $moved, $ids));
+    }
+
+    private function idsWithDescendants(CollectionTree $tree, array $moved, array $ids): array
+    {
+        return collect($moved)
+            ->flatMap(function ($id) use ($tree) {
+                if (! $page = $tree->find($id)) {
+                    return [];
+                }
+
+                return $page->flattenedPages()->map->reference()->all();
+            })
+            ->merge($ids)
+            ->filter()
+            ->unique()
+            ->values()
+            ->all();
     }
 }
diff --git a/src/Events/AddonSettingsSaved.php b/src/Events/AddonSettingsSaved.php
index c2e81528cdc..5153c1b6c6c 100644
--- a/src/Events/AddonSettingsSaved.php
+++ b/src/Events/AddonSettingsSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class AddonSettingsSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $settings)
diff --git a/src/Events/AddonSettingsSaving.php b/src/Events/AddonSettingsSaving.php
index 0d2b91534c3..a854555758c 100644
--- a/src/Events/AddonSettingsSaving.php
+++ b/src/Events/AddonSettingsSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class AddonSettingsSaving extends Event
 {
     public function __construct(public $settings)
diff --git a/src/Events/AssetContainerCreating.php b/src/Events/AssetContainerCreating.php
index a621cdfd638..35a7661b37f 100644
--- a/src/Events/AssetContainerCreating.php
+++ b/src/Events/AssetContainerCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class AssetContainerCreating extends Event
 {
     public function __construct(public $container)
diff --git a/src/Events/AssetContainerDeleted.php b/src/Events/AssetContainerDeleted.php
index fe14939ab60..dcff7844d91 100644
--- a/src/Events/AssetContainerDeleted.php
+++ b/src/Events/AssetContainerDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class AssetContainerDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $container)
diff --git a/src/Events/AssetContainerDeleting.php b/src/Events/AssetContainerDeleting.php
index 2f0d7908096..41eb66629c5 100644
--- a/src/Events/AssetContainerDeleting.php
+++ b/src/Events/AssetContainerDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class AssetContainerDeleting extends Event
 {
     public function __construct(public $container)
diff --git a/src/Events/AssetContainerSaved.php b/src/Events/AssetContainerSaved.php
index aacacad6921..2d425b61c7c 100644
--- a/src/Events/AssetContainerSaved.php
+++ b/src/Events/AssetContainerSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class AssetContainerSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $container)
diff --git a/src/Events/AssetContainerSaving.php b/src/Events/AssetContainerSaving.php
index f71c9240741..5793d022553 100644
--- a/src/Events/AssetContainerSaving.php
+++ b/src/Events/AssetContainerSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class AssetContainerSaving extends Event
 {
     public function __construct(public $container)
diff --git a/src/Events/AssetCreating.php b/src/Events/AssetCreating.php
index a375c80c9b0..a5cf9e264fa 100644
--- a/src/Events/AssetCreating.php
+++ b/src/Events/AssetCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class AssetCreating extends Event
 {
     public function __construct(public $asset)
diff --git a/src/Events/AssetDeleted.php b/src/Events/AssetDeleted.php
index 9b5d33e1e64..31ffc60c100 100644
--- a/src/Events/AssetDeleted.php
+++ b/src/Events/AssetDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class AssetDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $asset)
diff --git a/src/Events/AssetDeleting.php b/src/Events/AssetDeleting.php
index 2eadb47767a..a12777bd6ef 100644
--- a/src/Events/AssetDeleting.php
+++ b/src/Events/AssetDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class AssetDeleting extends Event
 {
     public function __construct(public $asset)
diff --git a/src/Events/AssetFolderDeleted.php b/src/Events/AssetFolderDeleted.php
index 2e7503f5ca9..01a4d0cace3 100644
--- a/src/Events/AssetFolderDeleted.php
+++ b/src/Events/AssetFolderDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class AssetFolderDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $folder)
diff --git a/src/Events/AssetFolderSaved.php b/src/Events/AssetFolderSaved.php
index 63ff5301e19..5bc82107e4f 100644
--- a/src/Events/AssetFolderSaved.php
+++ b/src/Events/AssetFolderSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class AssetFolderSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $folder)
diff --git a/src/Events/AssetReferencesUpdated.php b/src/Events/AssetReferencesUpdated.php
index a9a57041fab..6fbee9c439a 100644
--- a/src/Events/AssetReferencesUpdated.php
+++ b/src/Events/AssetReferencesUpdated.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class AssetReferencesUpdated extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $asset)
diff --git a/src/Events/AssetReuploaded.php b/src/Events/AssetReuploaded.php
index 43046af1608..8fec06b0e2e 100644
--- a/src/Events/AssetReuploaded.php
+++ b/src/Events/AssetReuploaded.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class AssetReuploaded extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $asset, public $originalFilename)
diff --git a/src/Events/AssetSaved.php b/src/Events/AssetSaved.php
index 8c6cd86707e..b436d0462c9 100644
--- a/src/Events/AssetSaved.php
+++ b/src/Events/AssetSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class AssetSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $asset)
diff --git a/src/Events/AssetSaving.php b/src/Events/AssetSaving.php
index 535f75b9381..b5370525d6d 100644
--- a/src/Events/AssetSaving.php
+++ b/src/Events/AssetSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class AssetSaving extends Event
 {
     public function __construct(public $asset)
diff --git a/src/Events/AssetUploaded.php b/src/Events/AssetUploaded.php
index 2337d4599f2..0b32ab55c8c 100644
--- a/src/Events/AssetUploaded.php
+++ b/src/Events/AssetUploaded.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class AssetUploaded extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $asset, public $originalFilename)
diff --git a/src/Events/BlueprintCreating.php b/src/Events/BlueprintCreating.php
index 44425253d5c..ba615a4843b 100644
--- a/src/Events/BlueprintCreating.php
+++ b/src/Events/BlueprintCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class BlueprintCreating extends Event
 {
     public function __construct(public $blueprint)
diff --git a/src/Events/BlueprintDeleted.php b/src/Events/BlueprintDeleted.php
index 81ad7727deb..523a080d201 100644
--- a/src/Events/BlueprintDeleted.php
+++ b/src/Events/BlueprintDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class BlueprintDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $blueprint)
diff --git a/src/Events/BlueprintDeleting.php b/src/Events/BlueprintDeleting.php
index 9d3b3f8330c..37568d28b3c 100644
--- a/src/Events/BlueprintDeleting.php
+++ b/src/Events/BlueprintDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class BlueprintDeleting extends Event
 {
     public function __construct(public $blueprint)
diff --git a/src/Events/BlueprintReset.php b/src/Events/BlueprintReset.php
index 1a074e801b6..0eca33824c8 100644
--- a/src/Events/BlueprintReset.php
+++ b/src/Events/BlueprintReset.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class BlueprintReset extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $blueprint)
diff --git a/src/Events/BlueprintSaved.php b/src/Events/BlueprintSaved.php
index 9aa43ae0eb6..25c67ee8079 100644
--- a/src/Events/BlueprintSaved.php
+++ b/src/Events/BlueprintSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class BlueprintSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $blueprint)
diff --git a/src/Events/BlueprintSaving.php b/src/Events/BlueprintSaving.php
index 1129baa2b97..dd82e2f04b5 100644
--- a/src/Events/BlueprintSaving.php
+++ b/src/Events/BlueprintSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class BlueprintSaving extends Event
 {
     public function __construct(public $blueprint)
diff --git a/src/Events/CollectionCreating.php b/src/Events/CollectionCreating.php
index f60b8588a26..7b350d493a4 100644
--- a/src/Events/CollectionCreating.php
+++ b/src/Events/CollectionCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class CollectionCreating extends Event
 {
     public function __construct(public $collection)
diff --git a/src/Events/CollectionDeleted.php b/src/Events/CollectionDeleted.php
index 20ac5bd0d89..25dca45a900 100644
--- a/src/Events/CollectionDeleted.php
+++ b/src/Events/CollectionDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class CollectionDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $collection)
diff --git a/src/Events/CollectionDeleting.php b/src/Events/CollectionDeleting.php
index d216bf60431..3b45121c2e1 100644
--- a/src/Events/CollectionDeleting.php
+++ b/src/Events/CollectionDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class CollectionDeleting extends Event
 {
     public function __construct(public $collection)
diff --git a/src/Events/CollectionSaved.php b/src/Events/CollectionSaved.php
index 320c81cb35a..10e33ed9dde 100644
--- a/src/Events/CollectionSaved.php
+++ b/src/Events/CollectionSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class CollectionSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $collection)
diff --git a/src/Events/CollectionSaving.php b/src/Events/CollectionSaving.php
index 4d028036832..1496be50f5f 100644
--- a/src/Events/CollectionSaving.php
+++ b/src/Events/CollectionSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class CollectionSaving extends Event
 {
     public function __construct(public $collection)
diff --git a/src/Events/CollectionTreeDeleted.php b/src/Events/CollectionTreeDeleted.php
index 0e49f041db5..6db8bd117d5 100644
--- a/src/Events/CollectionTreeDeleted.php
+++ b/src/Events/CollectionTreeDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class CollectionTreeDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $tree)
diff --git a/src/Events/CollectionTreeEntriesMovedOrRemoved.php b/src/Events/CollectionTreeEntriesMovedOrRemoved.php
new file mode 100644
index 00000000000..479521b03f3
--- /dev/null
+++ b/src/Events/CollectionTreeEntriesMovedOrRemoved.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Statamic\Events;
+
+use Statamic\Facades\Entry;
+
+class CollectionTreeEntriesMovedOrRemoved extends Event
+{
+    public array $removedUrls;
+    public array $movedUrls;
+
+    public function __construct(
+        public array $removed,
+        public array $moved,
+    ) {
+        $this->removedUrls = $this->resolveUrls($removed);
+        $this->movedUrls = $this->resolveUrls($moved);
+    }
+
+    private function resolveUrls(array $ids): array
+    {
+        return collect($ids)
+            ->flatMap(function ($id) {
+                if (! $entry = Entry::find($id)) {
+                    return [];
+                }
+
+                return $entry->descendants()
+                    ->merge([$entry])
+                    ->reject->isRedirect()
+                    ->map->absoluteUrl()
+                    ->filter()
+                    ->values()
+                    ->all();
+            })
+            ->unique()
+            ->values()
+            ->all();
+    }
+}
diff --git a/src/Events/CollectionTreeSaved.php b/src/Events/CollectionTreeSaved.php
index f8817e897e5..3a5bcc08a5b 100644
--- a/src/Events/CollectionTreeSaved.php
+++ b/src/Events/CollectionTreeSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class CollectionTreeSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $tree)
diff --git a/src/Events/CollectionTreeSaving.php b/src/Events/CollectionTreeSaving.php
index 27be32b9d31..14151a436b2 100644
--- a/src/Events/CollectionTreeSaving.php
+++ b/src/Events/CollectionTreeSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class CollectionTreeSaving extends Event
 {
     public function __construct(public $tree)
diff --git a/src/Events/DefaultPreferencesSaved.php b/src/Events/DefaultPreferencesSaved.php
index ed0f7538e3f..92f30689b77 100644
--- a/src/Events/DefaultPreferencesSaved.php
+++ b/src/Events/DefaultPreferencesSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class DefaultPreferencesSaved extends Event implements ProvidesCommitMessage
 {
     public function commitMessage()
diff --git a/src/Events/DuplicateIdRegenerated.php b/src/Events/DuplicateIdRegenerated.php
index 76530a1cdbf..c01b68d97f9 100644
--- a/src/Events/DuplicateIdRegenerated.php
+++ b/src/Events/DuplicateIdRegenerated.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class DuplicateIdRegenerated extends Event implements ProvidesCommitMessage
 {
     public function commitMessage()
diff --git a/src/Events/EntryCreating.php b/src/Events/EntryCreating.php
index 9e6c782611a..355e9a33509 100644
--- a/src/Events/EntryCreating.php
+++ b/src/Events/EntryCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class EntryCreating extends Event
 {
     public function __construct(public $entry)
diff --git a/src/Events/EntryDeleted.php b/src/Events/EntryDeleted.php
index 57a82e8985c..1bf2511c215 100644
--- a/src/Events/EntryDeleted.php
+++ b/src/Events/EntryDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class EntryDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $entry)
diff --git a/src/Events/EntryDeleting.php b/src/Events/EntryDeleting.php
index 8d62b8104cf..056a6ebd5e3 100644
--- a/src/Events/EntryDeleting.php
+++ b/src/Events/EntryDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class EntryDeleting extends Event
 {
     public function __construct(public $entry)
diff --git a/src/Events/EntrySaved.php b/src/Events/EntrySaved.php
index 50d28ca23c4..4db4380e724 100644
--- a/src/Events/EntrySaved.php
+++ b/src/Events/EntrySaved.php
@@ -5,6 +5,8 @@
 use Facades\Statamic\Entries\InitiatorStack;
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class EntrySaved extends Event implements ProvidesCommitMessage
 {
     public $initiator;
diff --git a/src/Events/EntrySaving.php b/src/Events/EntrySaving.php
index 06539c14a12..bfc6a2ca2cd 100644
--- a/src/Events/EntrySaving.php
+++ b/src/Events/EntrySaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class EntrySaving extends Event
 {
     public function __construct(public $entry)
diff --git a/src/Events/EntryScheduleReached.php b/src/Events/EntryScheduleReached.php
index 421fbf81e22..d57e6c21b99 100644
--- a/src/Events/EntryScheduleReached.php
+++ b/src/Events/EntryScheduleReached.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class EntryScheduleReached extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $entry)
diff --git a/src/Events/FieldsetCreating.php b/src/Events/FieldsetCreating.php
index a26fd6d306c..f913c41ee97 100644
--- a/src/Events/FieldsetCreating.php
+++ b/src/Events/FieldsetCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class FieldsetCreating extends Event
 {
     public function __construct(public $fieldset)
diff --git a/src/Events/FieldsetDeleted.php b/src/Events/FieldsetDeleted.php
index c09f766b646..80928339680 100644
--- a/src/Events/FieldsetDeleted.php
+++ b/src/Events/FieldsetDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class FieldsetDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $fieldset)
diff --git a/src/Events/FieldsetDeleting.php b/src/Events/FieldsetDeleting.php
index af09dcbfab0..e70d8b863b3 100644
--- a/src/Events/FieldsetDeleting.php
+++ b/src/Events/FieldsetDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class FieldsetDeleting extends Event
 {
     public function __construct(public $fieldset)
diff --git a/src/Events/FieldsetReset.php b/src/Events/FieldsetReset.php
index a6aaba54bc6..d2475f95cf4 100644
--- a/src/Events/FieldsetReset.php
+++ b/src/Events/FieldsetReset.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class FieldsetReset extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $fieldset)
diff --git a/src/Events/FieldsetSaved.php b/src/Events/FieldsetSaved.php
index 40f157ca84c..81c9bcb51a1 100644
--- a/src/Events/FieldsetSaved.php
+++ b/src/Events/FieldsetSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class FieldsetSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $fieldset)
diff --git a/src/Events/FieldsetSaving.php b/src/Events/FieldsetSaving.php
index ef7ed931132..0feea9cbf6a 100644
--- a/src/Events/FieldsetSaving.php
+++ b/src/Events/FieldsetSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class FieldsetSaving extends Event
 {
     public function __construct(public $fieldset)
diff --git a/src/Events/FormCreating.php b/src/Events/FormCreating.php
index e9a86eefdd4..3b404779f47 100644
--- a/src/Events/FormCreating.php
+++ b/src/Events/FormCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class FormCreating extends Event
 {
     public function __construct(public $form)
diff --git a/src/Events/FormDeleted.php b/src/Events/FormDeleted.php
index 88e0f2914bf..6277574c34a 100644
--- a/src/Events/FormDeleted.php
+++ b/src/Events/FormDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class FormDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $form)
diff --git a/src/Events/FormDeleting.php b/src/Events/FormDeleting.php
index 35745cfd34d..3d991e068b5 100644
--- a/src/Events/FormDeleting.php
+++ b/src/Events/FormDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class FormDeleting extends Event
 {
     public function __construct(public $form)
diff --git a/src/Events/FormSaved.php b/src/Events/FormSaved.php
index 420b5df4f24..e18bbcd9561 100644
--- a/src/Events/FormSaved.php
+++ b/src/Events/FormSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class FormSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $form)
diff --git a/src/Events/FormSaving.php b/src/Events/FormSaving.php
index 513f818485d..058c535fc08 100644
--- a/src/Events/FormSaving.php
+++ b/src/Events/FormSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class FormSaving extends Event
 {
     public function __construct(public $form)
diff --git a/src/Events/FormSubmitted.php b/src/Events/FormSubmitted.php
index cb81358b3c1..f03780d6624 100644
--- a/src/Events/FormSubmitted.php
+++ b/src/Events/FormSubmitted.php
@@ -4,6 +4,9 @@
 
 use Statamic\Contracts\Forms\Submission;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class FormSubmitted extends Event
 {
     public function __construct(public Submission $submission)
diff --git a/src/Events/GlobalSetCreating.php b/src/Events/GlobalSetCreating.php
index 5d535df8f6f..576a1d9973c 100644
--- a/src/Events/GlobalSetCreating.php
+++ b/src/Events/GlobalSetCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class GlobalSetCreating extends Event
 {
     public function __construct(public $globals)
diff --git a/src/Events/GlobalSetDeleted.php b/src/Events/GlobalSetDeleted.php
index 743ff235404..e19c93848fb 100644
--- a/src/Events/GlobalSetDeleted.php
+++ b/src/Events/GlobalSetDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class GlobalSetDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $globals)
diff --git a/src/Events/GlobalSetDeleting.php b/src/Events/GlobalSetDeleting.php
index 570098c1f9d..7db7336f5ca 100644
--- a/src/Events/GlobalSetDeleting.php
+++ b/src/Events/GlobalSetDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class GlobalSetDeleting extends Event
 {
     public function __construct(public $globals)
diff --git a/src/Events/GlobalSetSaved.php b/src/Events/GlobalSetSaved.php
index 728192644ea..53791209979 100644
--- a/src/Events/GlobalSetSaved.php
+++ b/src/Events/GlobalSetSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class GlobalSetSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $globals)
diff --git a/src/Events/GlobalSetSaving.php b/src/Events/GlobalSetSaving.php
index 1a3b3e6352f..d8797dbfda4 100644
--- a/src/Events/GlobalSetSaving.php
+++ b/src/Events/GlobalSetSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class GlobalSetSaving extends Event
 {
     public function __construct(public $globals)
diff --git a/src/Events/GlobalVariablesCreating.php b/src/Events/GlobalVariablesCreating.php
index 630a25633f9..d231c275362 100644
--- a/src/Events/GlobalVariablesCreating.php
+++ b/src/Events/GlobalVariablesCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class GlobalVariablesCreating extends Event
 {
     public function __construct(public $variables)
diff --git a/src/Events/GlobalVariablesDeleted.php b/src/Events/GlobalVariablesDeleted.php
index e5a65199741..20fd9008ab6 100644
--- a/src/Events/GlobalVariablesDeleted.php
+++ b/src/Events/GlobalVariablesDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class GlobalVariablesDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $variables)
diff --git a/src/Events/GlobalVariablesDeleting.php b/src/Events/GlobalVariablesDeleting.php
index 69c24b3f47b..3427092cf69 100644
--- a/src/Events/GlobalVariablesDeleting.php
+++ b/src/Events/GlobalVariablesDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class GlobalVariablesDeleting extends Event
 {
     public function __construct(public $variables)
diff --git a/src/Events/GlobalVariablesSaved.php b/src/Events/GlobalVariablesSaved.php
index c65c214b85d..5a239fd3e75 100644
--- a/src/Events/GlobalVariablesSaved.php
+++ b/src/Events/GlobalVariablesSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class GlobalVariablesSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $variables)
diff --git a/src/Events/GlobalVariablesSaving.php b/src/Events/GlobalVariablesSaving.php
index 594ea22bc22..7cd18bbfc9d 100644
--- a/src/Events/GlobalVariablesSaving.php
+++ b/src/Events/GlobalVariablesSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class GlobalVariablesSaving extends Event
 {
     public function __construct(public $variables)
diff --git a/src/Events/NavCreating.php b/src/Events/NavCreating.php
index ada7d791e3d..7f68d7afc39 100644
--- a/src/Events/NavCreating.php
+++ b/src/Events/NavCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class NavCreating extends Event
 {
     public function __construct(public $nav)
diff --git a/src/Events/NavDeleted.php b/src/Events/NavDeleted.php
index b3f4cb2318b..24f9277a2f6 100644
--- a/src/Events/NavDeleted.php
+++ b/src/Events/NavDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class NavDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $nav)
diff --git a/src/Events/NavDeleting.php b/src/Events/NavDeleting.php
index d64882ffc75..26cbc52fbc6 100644
--- a/src/Events/NavDeleting.php
+++ b/src/Events/NavDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class NavDeleting extends Event
 {
     public function __construct(public $nav)
diff --git a/src/Events/NavSaved.php b/src/Events/NavSaved.php
index a5f41dcefa7..9361c0cda31 100644
--- a/src/Events/NavSaved.php
+++ b/src/Events/NavSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class NavSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $nav)
diff --git a/src/Events/NavSaving.php b/src/Events/NavSaving.php
index 8ae6accbefe..a7852f248b6 100644
--- a/src/Events/NavSaving.php
+++ b/src/Events/NavSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class NavSaving extends Event
 {
     public function __construct(public $nav)
diff --git a/src/Events/NavTreeDeleted.php b/src/Events/NavTreeDeleted.php
index 0c98073d839..34e6c0eede6 100644
--- a/src/Events/NavTreeDeleted.php
+++ b/src/Events/NavTreeDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class NavTreeDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $tree)
diff --git a/src/Events/NavTreeSaved.php b/src/Events/NavTreeSaved.php
index c96c1a90580..d8c1159455e 100644
--- a/src/Events/NavTreeSaved.php
+++ b/src/Events/NavTreeSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class NavTreeSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $tree)
diff --git a/src/Events/NavTreeSaving.php b/src/Events/NavTreeSaving.php
index 58b117e7ab4..3b5b47fb06b 100644
--- a/src/Events/NavTreeSaving.php
+++ b/src/Events/NavTreeSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class NavTreeSaving extends Event
 {
     public function __construct(public $tree)
diff --git a/src/Events/RevisionDeleted.php b/src/Events/RevisionDeleted.php
index 543c7e00c4d..e034090688c 100644
--- a/src/Events/RevisionDeleted.php
+++ b/src/Events/RevisionDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class RevisionDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $revision)
diff --git a/src/Events/RevisionSaved.php b/src/Events/RevisionSaved.php
index d3f7ed361db..97fb4123098 100644
--- a/src/Events/RevisionSaved.php
+++ b/src/Events/RevisionSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class RevisionSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $revision)
diff --git a/src/Events/RevisionSaving.php b/src/Events/RevisionSaving.php
index 8d295b2f00f..2ae55ff96c0 100644
--- a/src/Events/RevisionSaving.php
+++ b/src/Events/RevisionSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class RevisionSaving extends Event
 {
     public function __construct(public $revision)
diff --git a/src/Events/RoleDeleted.php b/src/Events/RoleDeleted.php
index 16c4651616d..777ec2de803 100644
--- a/src/Events/RoleDeleted.php
+++ b/src/Events/RoleDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class RoleDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $role)
diff --git a/src/Events/RoleSaved.php b/src/Events/RoleSaved.php
index 97e669f7e2b..d08632fc900 100644
--- a/src/Events/RoleSaved.php
+++ b/src/Events/RoleSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class RoleSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $role)
diff --git a/src/Events/SiteDeleted.php b/src/Events/SiteDeleted.php
index 18cbd2c3242..4250c9b6105 100644
--- a/src/Events/SiteDeleted.php
+++ b/src/Events/SiteDeleted.php
@@ -5,6 +5,8 @@
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 use Statamic\Sites\Site;
 
+use function Statamic\trans as __;
+
 class SiteDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public Site $site)
diff --git a/src/Events/SiteSaved.php b/src/Events/SiteSaved.php
index 3032c71ee02..c21d48291af 100644
--- a/src/Events/SiteSaved.php
+++ b/src/Events/SiteSaved.php
@@ -5,6 +5,8 @@
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 use Statamic\Sites\Site;
 
+use function Statamic\trans as __;
+
 class SiteSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public Site $site)
diff --git a/src/Events/SubmissionCreating.php b/src/Events/SubmissionCreating.php
index a7ad5c930b0..cd2015d69f2 100644
--- a/src/Events/SubmissionCreating.php
+++ b/src/Events/SubmissionCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class SubmissionCreating extends Event
 {
     public function __construct(public $submission)
diff --git a/src/Events/SubmissionDeleted.php b/src/Events/SubmissionDeleted.php
index 0f45be15563..809acaeab63 100644
--- a/src/Events/SubmissionDeleted.php
+++ b/src/Events/SubmissionDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class SubmissionDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $submission)
diff --git a/src/Events/SubmissionSaved.php b/src/Events/SubmissionSaved.php
index b2c9eb9e6c3..51192494f09 100644
--- a/src/Events/SubmissionSaved.php
+++ b/src/Events/SubmissionSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class SubmissionSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $submission)
diff --git a/src/Events/SubmissionSaving.php b/src/Events/SubmissionSaving.php
index e632a22fd48..732eb80e603 100644
--- a/src/Events/SubmissionSaving.php
+++ b/src/Events/SubmissionSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class SubmissionSaving extends Event
 {
     public function __construct(public $submission)
diff --git a/src/Events/TaxonomyCreating.php b/src/Events/TaxonomyCreating.php
index 2f869eb4bed..3602fd766bb 100644
--- a/src/Events/TaxonomyCreating.php
+++ b/src/Events/TaxonomyCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class TaxonomyCreating extends Event
 {
     public function __construct(public $taxonomy)
diff --git a/src/Events/TaxonomyDeleted.php b/src/Events/TaxonomyDeleted.php
index e0b7e060a57..4237d70dcb6 100644
--- a/src/Events/TaxonomyDeleted.php
+++ b/src/Events/TaxonomyDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class TaxonomyDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $taxonomy)
diff --git a/src/Events/TaxonomyDeleting.php b/src/Events/TaxonomyDeleting.php
index b157a192e8c..81d3b0a29bd 100644
--- a/src/Events/TaxonomyDeleting.php
+++ b/src/Events/TaxonomyDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class TaxonomyDeleting extends Event
 {
     public function __construct(public $taxonomy)
diff --git a/src/Events/TaxonomySaved.php b/src/Events/TaxonomySaved.php
index 1d459785048..7b704366fc3 100644
--- a/src/Events/TaxonomySaved.php
+++ b/src/Events/TaxonomySaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class TaxonomySaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $taxonomy)
diff --git a/src/Events/TaxonomySaving.php b/src/Events/TaxonomySaving.php
index fc1ac3e6568..c95daaa05eb 100644
--- a/src/Events/TaxonomySaving.php
+++ b/src/Events/TaxonomySaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class TaxonomySaving extends Event
 {
     public function __construct(public $taxonomy)
diff --git a/src/Events/TermCreating.php b/src/Events/TermCreating.php
index d8432b528a7..56aad9a8059 100644
--- a/src/Events/TermCreating.php
+++ b/src/Events/TermCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class TermCreating extends Event
 {
     public function __construct(public $term)
diff --git a/src/Events/TermDeleted.php b/src/Events/TermDeleted.php
index 2e711b31af6..6ea20760aeb 100644
--- a/src/Events/TermDeleted.php
+++ b/src/Events/TermDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class TermDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $term)
diff --git a/src/Events/TermDeleting.php b/src/Events/TermDeleting.php
index 179a7017884..422d7b03757 100644
--- a/src/Events/TermDeleting.php
+++ b/src/Events/TermDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class TermDeleting extends Event
 {
     public function __construct(public $term)
diff --git a/src/Events/TermReferencesUpdated.php b/src/Events/TermReferencesUpdated.php
index 3bb6246298f..f72807c7314 100644
--- a/src/Events/TermReferencesUpdated.php
+++ b/src/Events/TermReferencesUpdated.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class TermReferencesUpdated extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $term)
diff --git a/src/Events/TermSaved.php b/src/Events/TermSaved.php
index d1d8e14b788..0dca43f2244 100644
--- a/src/Events/TermSaved.php
+++ b/src/Events/TermSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class TermSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $term)
diff --git a/src/Events/TermSaving.php b/src/Events/TermSaving.php
index da2d86d5a4c..1db28d7de51 100644
--- a/src/Events/TermSaving.php
+++ b/src/Events/TermSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class TermSaving extends Event
 {
     public function __construct(public $term)
diff --git a/src/Events/UserCreating.php b/src/Events/UserCreating.php
index 55989dc3e45..e6346c7a336 100644
--- a/src/Events/UserCreating.php
+++ b/src/Events/UserCreating.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class UserCreating extends Event
 {
     public function __construct(public $user)
diff --git a/src/Events/UserDeleted.php b/src/Events/UserDeleted.php
index c16d767f881..81f1969d014 100644
--- a/src/Events/UserDeleted.php
+++ b/src/Events/UserDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class UserDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $user)
diff --git a/src/Events/UserDeleting.php b/src/Events/UserDeleting.php
index 40192e48ae7..0921fba427e 100644
--- a/src/Events/UserDeleting.php
+++ b/src/Events/UserDeleting.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class UserDeleting extends Event
 {
     public function __construct(public $user)
diff --git a/src/Events/UserGroupDeleted.php b/src/Events/UserGroupDeleted.php
index 1a42af188ef..8f4ae6686f6 100644
--- a/src/Events/UserGroupDeleted.php
+++ b/src/Events/UserGroupDeleted.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class UserGroupDeleted extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $group)
diff --git a/src/Events/UserGroupSaved.php b/src/Events/UserGroupSaved.php
index 96391540a99..d670ebdd405 100644
--- a/src/Events/UserGroupSaved.php
+++ b/src/Events/UserGroupSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class UserGroupSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $group)
diff --git a/src/Events/UserRegistering.php b/src/Events/UserRegistering.php
index e9c8d513210..33be8f25695 100644
--- a/src/Events/UserRegistering.php
+++ b/src/Events/UserRegistering.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class UserRegistering extends Event
 {
     public function __construct(public $user)
diff --git a/src/Events/UserSaved.php b/src/Events/UserSaved.php
index 62d1dd971cb..199cf9832e2 100644
--- a/src/Events/UserSaved.php
+++ b/src/Events/UserSaved.php
@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Git\ProvidesCommitMessage;
 
+use function Statamic\trans as __;
+
 class UserSaved extends Event implements ProvidesCommitMessage
 {
     public function __construct(public $user)
diff --git a/src/Events/UserSaving.php b/src/Events/UserSaving.php
index b42a0631525..c52f34e8984 100644
--- a/src/Events/UserSaving.php
+++ b/src/Events/UserSaving.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Events;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class UserSaving extends Event
 {
     public function __construct(public $user)
diff --git a/src/Exceptions/AuthenticationException.php b/src/Exceptions/AuthenticationException.php
index 35f36e90806..b24b533008f 100644
--- a/src/Exceptions/AuthenticationException.php
+++ b/src/Exceptions/AuthenticationException.php
@@ -22,6 +22,6 @@ protected function handleRedirect()
                 : abort(401);
         }
 
-        return redirect()->route('statamic.cp.login');
+        return redirect()->guest(route('statamic.cp.login'));
     }
 }
diff --git a/src/Exceptions/Concerns/RendersControlPanelExceptions.php b/src/Exceptions/Concerns/RendersControlPanelExceptions.php
index 11d746622ec..683ae3fa142 100644
--- a/src/Exceptions/Concerns/RendersControlPanelExceptions.php
+++ b/src/Exceptions/Concerns/RendersControlPanelExceptions.php
@@ -7,6 +7,7 @@
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
 use Statamic\Facades\URL;
+use Statamic\Http\Middleware\CP\HandleInertiaRequests;
 use Statamic\Statamic;
 
 trait RendersControlPanelExceptions
@@ -23,6 +24,7 @@ protected function renderException($request, $e)
             Statamic::$isRenderingCpException = true;
 
             return Inertia::render('errors/Error', ['status' => $response->getStatusCode()])
+                ->rootView(HandleInertiaRequests::ROOT_VIEW)
                 ->toResponse($request)
                 ->setStatusCode($response->getStatusCode());
         }
diff --git a/src/Exceptions/Concerns/RendersHttpExceptions.php b/src/Exceptions/Concerns/RendersHttpExceptions.php
index dfab380e3fe..b983af0777d 100644
--- a/src/Exceptions/Concerns/RendersHttpExceptions.php
+++ b/src/Exceptions/Concerns/RendersHttpExceptions.php
@@ -6,7 +6,10 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Inertia\Inertia;
+use Statamic\Exceptions\AuthenticationException;
 use Statamic\Facades\Cascade;
+use Statamic\Facades\User;
+use Statamic\Http\Middleware\CP\HandleInertiaRequests;
 use Statamic\Statamic;
 use Statamic\StaticCaching\Cacher;
 use Statamic\StaticCaching\Cachers\ApplicationCacher;
@@ -23,7 +26,12 @@ public function render(Request $request)
         }
 
         if (Statamic::isCpRoute()) {
+            if (! User::current()) {
+                return (new AuthenticationException)->toResponse($request);
+            }
+
             return Inertia::render('errors/'.$this->getStatusCode())
+                ->rootView(HandleInertiaRequests::ROOT_VIEW)
                 ->toResponse(request())
                 ->setStatusCode($this->getStatusCode());
         }
diff --git a/src/Exceptions/ControlPanelExceptionHandler.php b/src/Exceptions/ControlPanelExceptionHandler.php
index 31a2a76af04..979617a58a3 100644
--- a/src/Exceptions/ControlPanelExceptionHandler.php
+++ b/src/Exceptions/ControlPanelExceptionHandler.php
@@ -19,6 +19,11 @@ public function render($request, Throwable $e)
         return $this->renderException($request, $e);
     }
 
+    protected function shouldReturnJson($request, Throwable $e)
+    {
+        return $request->expectsJson();
+    }
+
     protected function convertValidationExceptionToResponse(ValidationException $e, $request)
     {
         $e = $this->newStatamicValidationException($e);
diff --git a/src/Exceptions/ElevatedSessionAuthorizationException.php b/src/Exceptions/ElevatedSessionAuthorizationException.php
index 477fc5c7aec..baca56fc4bb 100644
--- a/src/Exceptions/ElevatedSessionAuthorizationException.php
+++ b/src/Exceptions/ElevatedSessionAuthorizationException.php
@@ -2,9 +2,14 @@
 
 namespace Statamic\Exceptions;
 
+use Illuminate\Contracts\Debug\ShouldntReport;
 use Illuminate\Http\Request;
+use Statamic\Facades\URL;
+use Statamic\Statamic;
 
-class ElevatedSessionAuthorizationException extends \Exception
+use function Statamic\trans as __;
+
+class ElevatedSessionAuthorizationException extends \Exception implements ShouldntReport
 {
     public function __construct()
     {
@@ -13,8 +18,29 @@ public function __construct()
 
     public function render(Request $request)
     {
-        return $request->wantsJson()
-            ? response()->json(['message' => $this->getMessage()], 403)
-            : redirect()->setIntendedUrl($request->fullUrl())->to(cp_route('confirm-password'));
+        if ($request->wantsJson()) {
+            return response()->json(['message' => $this->getMessage()], 403);
+        }
+
+        $redirectUrl = Statamic::isCpRoute()
+            ? cp_route('confirm-password')
+            : route('statamic.elevated-session');
+
+        $intendedUrl = $request->isMethod('GET')
+            ? $request->fullUrl()
+            : $this->refererForIntendedUrl($request);
+
+        return redirect()->setIntendedUrl($intendedUrl)->to($redirectUrl);
+    }
+
+    private function refererForIntendedUrl(Request $request)
+    {
+        $referer = $request->headers->get('referer');
+
+        if ($referer && ! URL::isExternalToApplication($referer)) {
+            return $referer;
+        }
+
+        return $request->fullUrl();
     }
 }
diff --git a/src/Exceptions/OAuthEmailExistsException.php b/src/Exceptions/OAuthEmailExistsException.php
new file mode 100644
index 00000000000..6e9b1b3275c
--- /dev/null
+++ b/src/Exceptions/OAuthEmailExistsException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+use Exception;
+
+class OAuthEmailExistsException extends Exception
+{
+    public function __construct()
+    {
+        parent::__construct('A user already exists with the OAuth email.');
+    }
+}
diff --git a/src/Facades/Endpoint/URL.php b/src/Facades/Endpoint/URL.php
index e3acb20a73c..4eb7182c91c 100644
--- a/src/Facades/Endpoint/URL.php
+++ b/src/Facades/Endpoint/URL.php
@@ -163,7 +163,10 @@ public function prependSiteUrl(?string $url, ?string $locale = null, bool $contr
      */
     public function removeSiteUrl(?string $url): string
     {
-        return self::tidy(preg_replace('#^'.Config::getSiteUrl().'#', '/', $url));
+        $url = URL::makeAbsolute($url);
+        $url = Str::removeLeft($url, Site::current()->absoluteUrl());
+
+        return self::tidy($url);
     }
 
     /**
@@ -171,6 +174,9 @@ public function removeSiteUrl(?string $url): string
      */
     public function makeRelative(?string $url): string
     {
+        // Normalize duplicate leading slashes before parsing to avoid protocol-relative URL interpretation.
+        $url = preg_replace('#^/+#', '/', (string) $url);
+
         $parsed = parse_url($url);
 
         $url = $parsed['path'] ?? '/';
@@ -469,6 +475,13 @@ private function getRequestRootUrl(): string
     {
         $rootUrl = url()->to('/');
 
+        // When the request hits the front controller directly (e.g. /index.php),
+        // Laravel's root URL ends with the script name. Strip it so the site's
+        // absolute URL stays invariant to whether the request came through it.
+        if ($script = pathinfo(request()->getScriptName())['basename'] ?? null) {
+            $rootUrl = Str::removeRight($rootUrl, '/'.$script);
+        }
+
         return self::tidy($rootUrl);
     }
 }
diff --git a/src/Facades/Field.php b/src/Facades/Field.php
new file mode 100644
index 00000000000..edea41fbcff
--- /dev/null
+++ b/src/Facades/Field.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Statamic\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Statamic\Fields\FieldRepository;
+
+/**
+ * @method static \Statamic\Fields\Field|null find(string $field)
+ * @method static void computedDefault(string $key, \Closure $callback)
+ * @method static mixed resolveComputedDefault(string $key, mixed $payload = null)
+ *
+ * @see FieldRepository
+ */
+class Field extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return FieldRepository::class;
+    }
+}
diff --git a/src/Facades/Icon.php b/src/Facades/Icon.php
index 99d00b212b5..c4d7af49882 100644
--- a/src/Facades/Icon.php
+++ b/src/Facades/Icon.php
@@ -9,7 +9,7 @@
 
 /**
  * @method static void register(string $name, string $directory)
- * @method static Collection sets(string $name)
+ * @method static Collection sets()
  * @method static IconSet get(string $name)
  * @method static IconSet default()
  *
diff --git a/src/Facades/Permission.php b/src/Facades/Permission.php
index 00a32c8250d..b12eb044e28 100644
--- a/src/Facades/Permission.php
+++ b/src/Facades/Permission.php
@@ -6,7 +6,7 @@
 use Statamic\Auth\Permissions;
 
 /**
- * @method static void boot()
+ * @method static \Statamic\Auth\Permissions boot()
  * @method static void extend(\Closure $callback)
  * @method static \Statamic\Auth\Permission make(string $value)
  * @method static \Statamic\Auth\Permission register(string $permission, \Closure $callback = null)
diff --git a/src/Facades/Taxonomy.php b/src/Facades/Taxonomy.php
index 1abd25406a8..4da8bc96f70 100644
--- a/src/Facades/Taxonomy.php
+++ b/src/Facades/Taxonomy.php
@@ -16,8 +16,8 @@
  * @method static void save(\Statamic\Contracts\Taxonomies\Taxonomy $taxonomy)
  * @method static void delete(\Statamic\Contracts\Taxonomies\Taxonomy $taxonomy)
  * @method static \Statamic\Contracts\Taxonomies\Taxonomy make(?string $handle = null)
- * @method static addPreviewTargets(string $handle, array $targets)
- * @method static additionalPreviewTargets(string $handle)
+ * @method static void addPreviewTargets(string $handle, array $targets)
+ * @method static \Illuminate\Support\Collection additionalPreviewTargets(string $handle)
  *
  * @see \Statamic\Stache\Repositories\TaxonomyRepository
  * @link \Statamic\Taxonomies\Taxonomy
diff --git a/src/Facades/Term.php b/src/Facades/Term.php
index 499e7089994..4616d57d607 100644
--- a/src/Facades/Term.php
+++ b/src/Facades/Term.php
@@ -18,8 +18,8 @@
  * @method static TermContract findOrMake($id)
  * @method static TermContract findOr($id, \Closure $callback)
  * @method static TermContract make(string $slug = null)
- * @method static save($term)
- * @method static delete($term)
+ * @method static void save($term)
+ * @method static void delete($term)
  * @method static TermQueryBuilder query()
  * @method static int entriesCount(Term $term)
  * @method static void substitute($item)
diff --git a/src/Facades/TwoFactor.php b/src/Facades/TwoFactor.php
new file mode 100644
index 00000000000..021ef99d149
--- /dev/null
+++ b/src/Facades/TwoFactor.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * @method static bool enabled()
+ *
+ * @see \Statamic\Auth\TwoFactor\TwoFactor
+ */
+class TwoFactor extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return \Statamic\Auth\TwoFactor\TwoFactor::class;
+    }
+}
diff --git a/src/Facades/User.php b/src/Facades/User.php
index 2baae604780..b3fbeb261b1 100644
--- a/src/Facades/User.php
+++ b/src/Facades/User.php
@@ -13,7 +13,7 @@
  * @method static null|\Statamic\Contracts\Auth\User findByEmail(string $email)
  * @method static null|\Statamic\Contracts\Auth\User findByOAuthId(Provider $provider, string $id)
  * @method static \Statamic\Contracts\Auth\User findOrFail($id)
- * @method static query()
+ * @method static \Statamic\Contracts\Query\Builder query()
  * @method static int count()
  * @method static null|\Statamic\Contracts\Auth\User current()
  * @method static null|\Statamic\Contracts\Auth\User fromUser($user)
diff --git a/src/Fields/Blueprint.php b/src/Fields/Blueprint.php
index ce272da386c..2503a80c277 100644
--- a/src/Fields/Blueprint.php
+++ b/src/Fields/Blueprint.php
@@ -10,6 +10,7 @@
 use Statamic\CommandPalette\Category;
 use Statamic\CommandPalette\Link;
 use Statamic\Contracts\Data\Augmentable;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Contracts\Query\QueryableValue;
 use Statamic\CP\Column;
 use Statamic\CP\Columns;
@@ -33,7 +34,7 @@
 
 use function Statamic\trans as __;
 
-class Blueprint implements Arrayable, ArrayAccess, Augmentable, QueryableValue
+class Blueprint implements Arrayable, ArrayAccess, Augmentable, ContainsQueryableValues, QueryableValue
 {
     use ExistsAsFile, HasAugmentedData;
 
@@ -456,7 +457,7 @@ public function toPublishArray()
             'fqh' => $this->fullyQualifiedHandle(),
             'token' => encrypt([
                 'fqh' => $this->fullyQualifiedHandle(),
-                'user_id' => User::current()->id(),
+                'user_id' => User::current()?->id(),
             ]),
         ];
     }
@@ -821,4 +822,21 @@ public function commandPaletteLink(string|array $type, string $url): Link
             ->url($url)
             ->icon('blueprints');
     }
+
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        return null;
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'columns', 'fields', 'handle', 'hidden', 'isEmpty', 'isDeletable', 'isResettable',
+            'namespace', 'order', 'path', 'tabs', 'title',
+        ];
+    }
 }
diff --git a/src/Fields/Field.php b/src/Fields/Field.php
index 634f03adff9..9c72f715fd6 100644
--- a/src/Fields/Field.php
+++ b/src/Fields/Field.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\Lang;
 use Rebing\GraphQL\Support\Field as GqlField;
 use Statamic\Contracts\Forms\Form;
+use Statamic\Facades\Field as FieldFacade;
 use Statamic\Facades\GraphQL;
 use Statamic\Rules\Handle;
 use Statamic\Support\Arr;
@@ -15,6 +16,9 @@
 
 use function Statamic\trans as __;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class Field implements Arrayable
 {
     protected $handle;
@@ -177,7 +181,7 @@ public function isRequired()
         return collect($this->rules()[$this->handle])->contains('required');
     }
 
-    private function hasSometimesRule()
+    public function hasSometimesRule()
     {
         return collect($this->rules()[$this->handle])->contains('sometimes');
     }
@@ -297,9 +301,26 @@ public function value()
 
     public function defaultValue()
     {
+        if ($this->hasComputedDefault()) {
+            return FieldFacade::resolveComputedDefault(Str::chopStart($this->config['default'], 'computed:'));
+        }
+
         return $this->config['default'] ?? $this->fieldtype()->defaultValue();
     }
 
+    public function hasComputedDefault(): bool
+    {
+        if (! isset($this->config['default'])) {
+            return false;
+        }
+
+        if (! is_string($this->config['default'])) {
+            return false;
+        }
+
+        return Str::startsWith($this->config['default'], 'computed:');
+    }
+
     public function validationValue()
     {
         return $this->fieldtype()->validationValue($this->value);
diff --git a/src/Fields/FieldRepository.php b/src/Fields/FieldRepository.php
index c3ac472d021..12f738adf0f 100644
--- a/src/Fields/FieldRepository.php
+++ b/src/Fields/FieldRepository.php
@@ -2,11 +2,13 @@
 
 namespace Statamic\Fields;
 
+use Closure;
 use Statamic\Support\Str;
 
 class FieldRepository
 {
     protected $fieldsets;
+    protected $computedDefaultCallbacks = [];
 
     public function __construct(FieldsetRepository $fieldsets)
     {
@@ -28,4 +30,18 @@ public function find(string $field): ?Field
 
         return $fieldset->field($handle);
     }
+
+    public function computedDefault(string $key, Closure $callback): void
+    {
+        $this->computedDefaultCallbacks[$key] = $callback;
+    }
+
+    public function resolveComputedDefault(string $key, mixed $payload = null): mixed
+    {
+        if (! array_key_exists($key, $this->computedDefaultCallbacks)) {
+            throw new \RuntimeException("No computed default registered for key [{$key}].");
+        }
+
+        return $this->computedDefaultCallbacks[$key]();
+    }
 }
diff --git a/src/Fields/FieldTransformer.php b/src/Fields/FieldTransformer.php
index 156e5441a65..ab992143676 100644
--- a/src/Fields/FieldTransformer.php
+++ b/src/Fields/FieldTransformer.php
@@ -21,6 +21,9 @@ private static function importTabField(array $submitted)
         return array_filter([
             'import' => $submitted['fieldset'],
             'prefix' => $submitted['prefix'] ?? null,
+            'section_behavior' => ($submitted['section_behavior'] ?? 'preserve') === 'flatten'
+                ? 'flatten'
+                : null,
         ]);
     }
 
@@ -179,11 +182,17 @@ private static function inlineFieldToVue($field): array
 
     private static function importFieldToVue($field): array
     {
-        return [
+        $import = [
             'type' => 'import',
             'fieldset' => $field['import'],
             'prefix' => $field['prefix'] ?? null,
         ];
+
+        if (isset($field['section_behavior'])) {
+            $import['section_behavior'] = $field['section_behavior'];
+        }
+
+        return $import;
     }
 
     public static function fieldsetFields()
diff --git a/src/Fields/Fields.php b/src/Fields/Fields.php
index 054c14361de..f6707b50866 100644
--- a/src/Fields/Fields.php
+++ b/src/Fields/Fields.php
@@ -10,6 +10,9 @@
 use Statamic\Facades\Fieldset as FieldsetRepository;
 use Statamic\Support\Arr;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class Fields
 {
     protected $items;
diff --git a/src/Fields/Fieldset.php b/src/Fields/Fieldset.php
index cf01cabb96a..e78e9fe8354 100644
--- a/src/Fields/Fieldset.php
+++ b/src/Fields/Fieldset.php
@@ -2,8 +2,10 @@
 
 namespace Statamic\Fields;
 
+use Illuminate\Support\Collection as IlluminateCollection;
 use Statamic\CommandPalette\Category;
 use Statamic\CommandPalette\Link;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Events\FieldsetCreated;
 use Statamic\Events\FieldsetCreating;
 use Statamic\Events\FieldsetDeleted;
@@ -23,7 +25,9 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
-class Fieldset
+use function Statamic\trans as __;
+
+class Fieldset implements ContainsQueryableValues
 {
     protected $handle;
     protected $contents = [];
@@ -62,18 +66,24 @@ public function initialPath($path = null)
         return $this;
     }
 
+    /**
+     * Canonical storage: either top-level `fields` (flat) or non-empty `sections`, never both.
+     * Hand-edited YAML or mixed input is normalized on save.
+     */
     public function setContents(array $contents)
     {
-        $fields = Arr::get($contents, 'fields', []);
-
-        // Support legacy syntax
-        if (! empty($fields) && array_keys($fields)[0] !== 0) {
-            $fields = collect($fields)->map(function ($field, $handle) {
-                return compact('handle', 'field');
-            })->values()->all();
+        if (array_key_exists('sections', $contents)) {
+            $contents['sections'] = $this->normalizeSections(Arr::get($contents, 'sections', []));
         }
 
-        $contents['fields'] = $fields;
+        $usesSections = array_key_exists('sections', $contents) && ! empty($contents['sections']);
+
+        if ($usesSections) {
+            unset($contents['fields']);
+        } else {
+            unset($contents['sections']);
+            $contents['fields'] = $this->normalizeFields(Arr::get($contents, 'fields', []));
+        }
 
         $this->contents = $contents;
 
@@ -100,11 +110,23 @@ public function validateRecursion()
 
     public function fields(): Fields
     {
-        $fields = Arr::get($this->contents, 'fields', []);
+        $fields = $this->hasSections()
+            ? $this->sections()->flatMap(fn ($section) => Arr::get($section, 'fields', []))->values()->all()
+            : Arr::get($this->contents, 'fields', []);
 
         return new Fields($fields);
     }
 
+    public function sections(): IlluminateCollection
+    {
+        return collect(Arr::get($this->contents, 'sections', []));
+    }
+
+    public function hasSections(): bool
+    {
+        return $this->sections()->isNotEmpty();
+    }
+
     public function field(string $handle): ?Field
     {
         return $this->fields()->get($handle);
@@ -159,9 +181,12 @@ public function importedBy(): array
         })->values();
 
         $fieldsets = \Statamic\Facades\Fieldset::all()
-            ->filter(fn (Fieldset $fieldset) => isset($fieldset->contents()['fields']))
             ->filter(function (Fieldset $fieldset) {
-                return collect($fieldset->contents()['fields'])
+                $fields = $fieldset->hasSections()
+                    ? $fieldset->sections()->flatMap(fn ($section) => Arr::get($section, 'fields', []))->all()
+                    : Arr::get($fieldset->contents(), 'fields', []);
+
+                return collect($fields)
                     ->filter(fn ($field) => $this->fieldImportsFieldset($field))
                     ->isNotEmpty();
             })
@@ -307,8 +332,46 @@ public function commandPaletteLink(): Link
             ->icon('fieldsets');
     }
 
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        return null;
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'editUrl', 'fields', 'handle', 'isDeletable', 'isResettable',
+            'namespace', 'path', 'title',
+        ];
+    }
+
     public static function __callStatic($method, $parameters)
     {
         return Facades\Fieldset::{$method}(...$parameters);
     }
+
+    private function normalizeFields(array $fields): array
+    {
+        // Support legacy syntax where handles are array keys.
+        if (! empty($fields) && array_keys($fields)[0] !== 0) {
+            $fields = collect($fields)->map(function ($field, $handle) {
+                return compact('handle', 'field');
+            })->values()->all();
+        }
+
+        return $fields;
+    }
+
+    private function normalizeSections(array $sections): array
+    {
+        return collect($sections)->map(function ($section) {
+            $section['fields'] = $this->normalizeFields(Arr::get($section, 'fields', []));
+
+            return $section;
+        })->all();
+    }
 }
diff --git a/src/Fields/Fieldtype.php b/src/Fields/Fieldtype.php
index 836cb4a6bc7..2b8a67c5a5c 100644
--- a/src/Fields/Fieldtype.php
+++ b/src/Fields/Fieldtype.php
@@ -22,6 +22,7 @@ abstract class Fieldtype implements Arrayable
 
     protected static $title;
     protected static $binding = 'fieldtypes';
+    protected static $preloadable = null;
 
     protected $field;
     protected $localizable = true;
@@ -330,6 +331,11 @@ public function preProcessConfig($data)
         return $this->preProcess($data);
     }
 
+    public function migrateConfig(array $values): array
+    {
+        return $values;
+    }
+
     public function preProcessIndex($data)
     {
         return $data;
@@ -337,11 +343,17 @@ public function preProcessIndex($data)
 
     public function view()
     {
-        $default = 'statamic::forms.fields.'.$this->handle();
+        $language = config('statamic.templates.language', 'antlers');
+        $handle = $this->handle();
+
+        $views = [
+            "statamic::forms.fields.{$handle}",
+            "statamic::forms.{$language}.fields.{$handle}",
+            'statamic::forms.fields.default',
+            "statamic::forms.{$language}.fields.default",
+        ];
 
-        return view()->exists($default)
-            ? $default
-            : 'statamic::forms.fields.default';
+        return collect($views)->first(fn ($view) => view()->exists($view));
     }
 
     public function config(?string $key = null, $fallback = null)
diff --git a/src/Fields/Tab.php b/src/Fields/Tab.php
index bbc50f2a2bc..0d2280ca517 100644
--- a/src/Fields/Tab.php
+++ b/src/Fields/Tab.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Fields;
 
+use Statamic\Facades\Fieldset as FieldsetRepository;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
@@ -81,7 +82,7 @@ public function toPublishArray()
             'display' => $this->display(),
             'instructions' => $this->instructions(),
             'handle' => $this->handle,
-            'sections' => $this->sections()->map->toPublishArray()->all(),
+            'sections' => $this->expandedSections(),
         ];
     }
 
@@ -94,4 +95,89 @@ public function instructions()
     {
         return Arr::get($this->contents, 'instructions');
     }
+
+    private function expandedSections(): array
+    {
+        return $this->sections()->reduce(function ($carry, Section $section) {
+            $fields = Arr::get($section->contents(), 'fields', []);
+
+            if (empty($fields)) {
+                return $carry->push($section->toPublishArray());
+            }
+
+            $sectionContents = $section->contents();
+            $sectionMeta = Arr::except($sectionContents, ['fields']);
+            $bufferedFields = [];
+
+            foreach ($fields as $field) {
+                $importedFieldset = $this->sectionedFieldsetImport($field);
+
+                if (! $importedFieldset) {
+                    $bufferedFields[] = $field;
+
+                    continue;
+                }
+
+                if (! empty($bufferedFields)) {
+                    $carry->push((new Section($sectionMeta + ['fields' => $bufferedFields]))->toPublishArray());
+                    $bufferedFields = [];
+                }
+
+                foreach ($importedFieldset->sections() as $importedSection) {
+                    $carry->push($this->toImportedPublishSection($importedSection, $field));
+                }
+            }
+
+            if (! empty($bufferedFields)) {
+                $carry->push((new Section($sectionMeta + ['fields' => $bufferedFields]))->toPublishArray());
+            }
+
+            return $carry;
+        }, collect())->all();
+    }
+
+    private function sectionedFieldsetImport(array $field): ?Fieldset
+    {
+        if (! isset($field['import'])) {
+            return null;
+        }
+
+        if (($field['section_behavior'] ?? 'preserve') === 'flatten') {
+            return null;
+        }
+
+        $fieldset = FieldsetRepository::find($field['import']);
+
+        return $fieldset && $fieldset->hasSections() ? $fieldset : null;
+    }
+
+    private function toImportedPublishSection(array $section, array $import): array
+    {
+        $fields = (new Fields(Arr::get($section, 'fields', [])))->all();
+
+        if ($overrides = $import['config'] ?? null) {
+            $fields = $fields->map(function ($field, $handle) use ($overrides) {
+                return $field->setConfig(array_merge($field->config(), $overrides[$handle] ?? []));
+            });
+        }
+
+        if ($prefix = Arr::get($import, 'prefix')) {
+            $fields = $fields->mapWithKeys(function ($field) use ($prefix) {
+                $field = clone $field;
+                $handle = $prefix.$field->handle();
+                $fieldPrefix = $prefix.$field->prefix();
+
+                return [$handle => $field->setHandle($handle)->setPrefix($fieldPrefix)];
+            });
+        }
+
+        return Arr::removeNullValues([
+            'display' => Arr::get($section, 'display'),
+            'instructions' => Arr::get($section, 'instructions'),
+            'collapsible' => ($collapsible = Arr::get($section, 'collapsible')) ?: null,
+            'collapsed' => ($collapsible && Arr::get($section, 'collapsed')) ?: null,
+        ]) + [
+            'fields' => $fields->map->toPublishArray()->values()->all(),
+        ];
+    }
 }
diff --git a/src/Fields/Validator.php b/src/Fields/Validator.php
index f4dec57d112..394d7593795 100644
--- a/src/Fields/Validator.php
+++ b/src/Fields/Validator.php
@@ -2,14 +2,17 @@
 
 namespace Statamic\Fields;
 
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Validator as LaravelValidator;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class Validator
 {
     protected $fields;
+    protected $preProcessedFields;
     protected $replacements = [];
     protected $extraRules = [];
     protected $customMessages = [];
@@ -23,10 +26,16 @@ public function make()
     public function fields($fields)
     {
         $this->fields = $fields;
+        $this->preProcessedFields = null;
 
         return $this;
     }
 
+    protected function preProcessedFields()
+    {
+        return $this->preProcessedFields ??= $this->fields->preProcessValidatables();
+    }
+
     public function withRules($rules)
     {
         $this->extraRules = $rules;
@@ -67,7 +76,7 @@ private function fieldRules()
             return collect();
         }
 
-        return $this->fields->preProcessValidatables()->all()->reduce(function ($carry, $field) {
+        return $this->preProcessedFields()->all()->reduce(function ($carry, $field) {
             if (request()->isPrecognitive() && $field->type() == 'assets') {
                 return $carry;
             }
@@ -103,7 +112,7 @@ public function withReplacements($replacements)
     public function validator()
     {
         return LaravelValidator::make(
-            $this->fields->preProcessValidatables()->values()->all(),
+            $this->preProcessedFields()->values()->all(),
             $this->rules(),
             $this->customMessages,
             $this->attributes()
@@ -117,7 +126,7 @@ public function validate()
 
     public function attributes()
     {
-        return $this->fields->preProcessValidatables()->all()->reduce(function ($carry, $field) {
+        return $this->preProcessedFields()->all()->reduce(function ($carry, $field) {
             return $carry->merge($field->validationAttributes());
         }, collect())->all();
     }
@@ -186,12 +195,10 @@ public function filterPrecognitiveRules($rules)
     {
         $request = request();
 
-        if (! $request->headers->has('Precognition-Validate-Only')) {
+        if (! $request->isPrecognitive()) {
             return $rules;
         }
 
-        return Collection::make($rules)
-            ->only(explode(',', $request->header('Precognition-Validate-Only')))
-            ->all();
+        return $request->filterPrecognitiveRules($rules);
     }
 }
diff --git a/src/Fields/Value.php b/src/Fields/Value.php
index 5ac457691ef..6a93a8b3cb5 100644
--- a/src/Fields/Value.php
+++ b/src/Fields/Value.php
@@ -15,6 +15,9 @@
 use Statamic\View\Cascade;
 use Traversable;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class Value implements ArrayAccess, IteratorAggregate, JsonSerializable
 {
     private $resolver;
diff --git a/src/Fieldtypes/Arr.php b/src/Fieldtypes/Arr.php
index cad1f0544e5..0720ada66d5 100644
--- a/src/Fieldtypes/Arr.php
+++ b/src/Fieldtypes/Arr.php
@@ -8,6 +8,8 @@
 use Statamic\GraphQL\Types\ArrayType;
 use Statamic\Support\Arr as SupportArr;
 
+use function Statamic\trans as __;
+
 class Arr extends Fieldtype
 {
     protected $categories = ['structured'];
diff --git a/src/Fieldtypes/AssetContainer.php b/src/Fieldtypes/AssetContainer.php
index b8ebddaaa10..f7ca991e24b 100644
--- a/src/Fieldtypes/AssetContainer.php
+++ b/src/Fieldtypes/AssetContainer.php
@@ -3,6 +3,7 @@
 namespace Statamic\Fieldtypes;
 
 use Statamic\Facades;
+use Statamic\Facades\User;
 
 class AssetContainer extends Relationship
 {
@@ -11,6 +12,11 @@ class AssetContainer extends Relationship
     protected $canEdit = false;
     protected $canCreate = false;
 
+    protected function authorizeItemData($id): bool
+    {
+        return $this->authorizeViewable(Facades\AssetContainer::find($id));
+    }
+
     protected function toItemArray($id, $site = null)
     {
         if ($container = Facades\AssetContainer::find($id)) {
@@ -25,12 +31,14 @@ protected function toItemArray($id, $site = null)
 
     public function getIndexItems($request)
     {
-        return Facades\AssetContainer::all()->map(function ($container) {
-            return [
-                'id' => $container->handle(),
-                'title' => $container->title(),
-            ];
-        })->values();
+        return Facades\AssetContainer::all()
+            ->filter(fn ($container) => User::current()->can('view', $container))
+            ->map(function ($container) {
+                return [
+                    'id' => $container->handle(),
+                    'title' => $container->title(),
+                ];
+            })->values();
     }
 
     public function augmentValue($value)
diff --git a/src/Fieldtypes/AssetFolder.php b/src/Fieldtypes/AssetFolder.php
index 2b408d27be7..639f4ea6cee 100644
--- a/src/Fieldtypes/AssetFolder.php
+++ b/src/Fieldtypes/AssetFolder.php
@@ -3,8 +3,11 @@
 namespace Statamic\Fieldtypes;
 
 use Statamic\Facades\AssetContainer;
+use Statamic\Facades\User;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class AssetFolder extends Relationship
 {
     protected $component = 'asset_folder';
@@ -57,6 +60,18 @@ protected function configFieldItems(): array
         ];
     }
 
+    protected function authorizeItemData($id): bool
+    {
+        // No static container configured (dynamic/sibling-container mode); the by-id value
+        // only echoes the submitted folder path back, so there is nothing to authorize.
+        // Folder enumeration is gated separately, on the runtime container, in getIndexItems().
+        if (! $container = $this->config('container')) {
+            return true;
+        }
+
+        return $this->authorizeViewable(AssetContainer::find($container));
+    }
+
     protected function toItemArray($id, $site = null)
     {
         return ['title' => $id, 'id' => $id];
@@ -64,7 +79,14 @@ protected function toItemArray($id, $site = null)
 
     public function getIndexItems($request)
     {
-        return AssetContainer::find($request->container)
+        $container = AssetContainer::find($request->container);
+
+        // No/unviewable container: return an empty folder list rather than throwing.
+        if (! $container || ! User::current()->can('view', $container)) {
+            return collect();
+        }
+
+        return $container
             ->folders()
             ->map(function ($folder) {
                 return ['id' => $folder, 'title' => $folder];
diff --git a/src/Fieldtypes/Assets/Assets.php b/src/Fieldtypes/Assets/Assets.php
index 0004b67739c..7a0352b669e 100644
--- a/src/Fieldtypes/Assets/Assets.php
+++ b/src/Fieldtypes/Assets/Assets.php
@@ -18,11 +18,13 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Fieldtypes\UpdatesReferences;
 use Statamic\GraphQL\Types\AssetInterface;
-use Statamic\Http\Resources\CP\Assets\Asset as AssetResource;
+use Statamic\Http\Resources\CP\Assets\AssetsFieldtypeAsset as AssetResource;
 use Statamic\Query\Scopes\Filter;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Assets extends Fieldtype
 {
     use UpdatesReferences;
@@ -343,11 +345,17 @@ private function renameFolderAction($dynamicFolder)
 
     public function getItemData($items)
     {
-        return collect($items)->map(function ($url) {
-            return ($asset = Asset::find($url))
-                ? (new AssetResource($asset))->resolve()['data']
-                : null;
-        })->filter()->values();
+        $user = User::current();
+
+        return collect($items)->map(function ($url) use ($user) {
+            $asset = Asset::find($url);
+
+            if (! $asset || ! $user->can('view', $asset)) {
+                return ['id' => $url, 'url' => $url, 'invalid' => true];
+            }
+
+            return (new AssetResource($asset))->resolve()['data'];
+        })->values();
     }
 
     public function augment($values)
diff --git a/src/Fieldtypes/Assets/DimensionsRule.php b/src/Fieldtypes/Assets/DimensionsRule.php
index 6232ee23abb..e6d9512c5d6 100644
--- a/src/Fieldtypes/Assets/DimensionsRule.php
+++ b/src/Fieldtypes/Assets/DimensionsRule.php
@@ -8,6 +8,8 @@
 use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
+use function Statamic\trans as __;
+
 class DimensionsRule implements CastableToValidationString, Rule
 {
     protected $parameters;
diff --git a/src/Fieldtypes/Assets/ImageRule.php b/src/Fieldtypes/Assets/ImageRule.php
index 8044190761b..3cfe2eeb892 100644
--- a/src/Fieldtypes/Assets/ImageRule.php
+++ b/src/Fieldtypes/Assets/ImageRule.php
@@ -8,6 +8,8 @@
 use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
+use function Statamic\trans as __;
+
 class ImageRule implements CastableToValidationString, Rule
 {
     protected $parameters;
diff --git a/src/Fieldtypes/Assets/MaxRule.php b/src/Fieldtypes/Assets/MaxRule.php
index 8a5f04e86f2..801d335ac55 100644
--- a/src/Fieldtypes/Assets/MaxRule.php
+++ b/src/Fieldtypes/Assets/MaxRule.php
@@ -4,6 +4,8 @@
 
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 class MaxRule extends SizeBasedRule
 {
     /**
diff --git a/src/Fieldtypes/Assets/MimesRule.php b/src/Fieldtypes/Assets/MimesRule.php
index c184a34d578..5d74c342774 100644
--- a/src/Fieldtypes/Assets/MimesRule.php
+++ b/src/Fieldtypes/Assets/MimesRule.php
@@ -8,6 +8,8 @@
 use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
+use function Statamic\trans as __;
+
 class MimesRule implements CastableToValidationString, Rule
 {
     protected $parameters;
diff --git a/src/Fieldtypes/Assets/MimetypesRule.php b/src/Fieldtypes/Assets/MimetypesRule.php
index 65e3e0400bd..6f815686fde 100644
--- a/src/Fieldtypes/Assets/MimetypesRule.php
+++ b/src/Fieldtypes/Assets/MimetypesRule.php
@@ -8,6 +8,8 @@
 use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
+use function Statamic\trans as __;
+
 class MimetypesRule implements CastableToValidationString, Rule
 {
     protected $parameters;
diff --git a/src/Fieldtypes/Assets/MinRule.php b/src/Fieldtypes/Assets/MinRule.php
index b37bfaa5874..071d87d3df3 100644
--- a/src/Fieldtypes/Assets/MinRule.php
+++ b/src/Fieldtypes/Assets/MinRule.php
@@ -4,6 +4,8 @@
 
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 class MinRule extends SizeBasedRule
 {
     /**
diff --git a/src/Fieldtypes/Bard.php b/src/Fieldtypes/Bard.php
index e0e6b41b658..4292a933050 100644
--- a/src/Fieldtypes/Bard.php
+++ b/src/Fieldtypes/Bard.php
@@ -7,17 +7,17 @@
 use Illuminate\Contracts\Validation\DataAwareRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Statamic\Data\NestedFieldUpdater;
-use Statamic\Facades\Asset;
+use Statamic\Exceptions\CollectionNotFoundException;
 use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Collection;
-use Statamic\Facades\Entry;
 use Statamic\Facades\GraphQL;
 use Statamic\Facades\Site;
 use Statamic\Fields\Field;
 use Statamic\Fields\Fields;
 use Statamic\Fields\Value;
 use Statamic\Fieldtypes\Bard\Augmentor;
+use Statamic\Fieldtypes\Link\LinkType;
 use Statamic\GraphQL\Types\BardSetsType;
 use Statamic\GraphQL\Types\BardTextType;
 use Statamic\GraphQL\Types\ReplicatorSetType;
@@ -26,6 +26,8 @@
 use Statamic\Support\Str;
 use Statamic\Support\Traits\Hookable;
 
+use function Statamic\trans as __;
+
 class Bard extends Replicator
 {
     use Concerns\ResolvesStatamicUrls, Hookable;
@@ -645,7 +647,7 @@ public function preload()
             $linkCollections = Blink::once('routable-collection-handles-'.$site, function () use ($site) {
                 return Collection::all()->reject(function ($collection) use ($site) {
                     return is_null($collection->route($site));
-                })->map->handle()->values();
+                })->map->handle()->values()->all();
             });
         }
 
@@ -658,6 +660,7 @@ public function preload()
             '__collaboration' => ['existing'],
             'linkCollections' => $linkCollections,
             'linkData' => (object) $this->getLinkData($value),
+            'linkTypes' => $this->linkTypesForToolbar(),
         ];
 
         if (
@@ -788,31 +791,66 @@ private function extractLinkDataFromNode($node)
 
     private function getLinkDataForUrl($url)
     {
-        $ref = Str::after($url, 'statamic://');
-        [$type, $id] = explode('::', $ref, 2);
+        $ref = str($url)->after('statamic://')->before('?')->before('#')->toString();
+        [$handle, $id] = explode('::', $ref, 2);
+
+        return [$ref => $this->linkDataForType($handle, $id)];
+    }
+
+    private function linkDataForType(string $handle, string $id): ?array
+    {
+        if (! $linkType = Link::types()[$handle] ?? null) {
+            return null;
+        }
+
+        if (! $config = $linkType->fieldtype($this->linkTypeField())) {
+            return null;
+        }
+
+        $nestedField = new Field($handle, $config);
+        $nestedField->setValue([$id]);
+
+        return $nestedField->fieldtype()->preload()['data'][0] ?? null;
+    }
+
+    private function linkTypeField(): Field
+    {
+        return new Field('link', [
+            'collections' => $this->config('link_collections'),
+            'container' => $this->config('container'),
+            'select_across_sites' => $this->config('select_across_sites'),
+        ]);
+    }
 
-        $data = null;
+    private function linkTypesForToolbar(): array
+    {
+        $field = $this->linkTypeField();
 
-        switch ($type) {
-            case 'entry':
-                if ($entry = Entry::find($id)) {
-                    $data = [
-                        'title' => $entry->get('title'),
-                        'permalink' => $entry->absoluteUrl(),
-                    ];
+        return collect(Link::types())
+            ->filter(fn (LinkType $type): bool => $type->visible($field))
+            ->map(function (LinkType $type, string $handle) use ($field): ?array {
+                if (! $config = $type->fieldtype($field)) {
+                    return null;
                 }
-                break;
-            case 'asset':
-                if ($asset = Asset::find($id)) {
-                    $data = [
-                        'basename' => $asset->basename(),
-                        'thumbnail' => $asset->thumbnailUrl(),
-                    ];
+
+                $nestedField = new Field($handle, $config);
+                $nestedFieldtype = $nestedField->fieldtype();
+
+                try {
+                    $meta = $nestedFieldtype->preload();
+                } catch (CollectionNotFoundException) {
+                    $meta = [];
                 }
-                break;
-        }
 
-        return [$ref => $data];
+                return [
+                    'title' => $type->title(),
+                    'component' => $nestedFieldtype->component(),
+                    'config' => $nestedFieldtype->config(),
+                    'meta' => $meta,
+                ];
+            })
+            ->filter()
+            ->all();
     }
 
     private function wrapInlineValue($value)
diff --git a/src/Fieldtypes/Bard/LinkMark.php b/src/Fieldtypes/Bard/LinkMark.php
index 955011d86f8..5f837669427 100644
--- a/src/Fieldtypes/Bard/LinkMark.php
+++ b/src/Fieldtypes/Bard/LinkMark.php
@@ -2,9 +2,7 @@
 
 namespace Statamic\Fieldtypes\Bard;
 
-use Statamic\Contracts\Entries\Entry;
-use Statamic\Facades\Data;
-use Statamic\Facades\Site;
+use Statamic\Fieldtypes\Link as LinkFieldtype;
 use Statamic\Support\Str;
 use Tiptap\Marks\Link;
 
@@ -62,19 +60,31 @@ protected function convertHref($href)
             return $href;
         }
 
-        $ref = Str::after($href, 'statamic://');
+        $ref = str($href)->after('statamic://')->before('?')->before('#')->toString();
 
-        if (! $item = Data::find($ref)) {
+        $selectAcrossSites = Augmentor::$currentBardConfig['select_across_sites'] ?? false;
+        $localize = ! $selectAcrossSites && ! $this->isApi();
+
+        $item = null;
+
+        foreach (LinkFieldtype::types() as $type) {
+            if (Str::startsWith($ref, "{$type->handle()}::")) {
+                $item = $type->resolve(Str::after($ref, "{$type->handle()}::"), null, $localize);
+                break;
+            }
+        }
+
+        if (! $item) {
             return '';
         }
 
-        $selectAcrossSites = Augmentor::$currentBardConfig['select_across_sites'] ?? false;
+        $extras = Str::after($href, $ref);
 
-        if (! $selectAcrossSites && ! $this->isApi() && $item instanceof Entry) {
-            return ($item->in(Site::current()->handle()) ?? $item)->url();
+        if (! is_object($item)) {
+            return $item.$extras;
         }
 
-        return $selectAcrossSites ? $item->absoluteUrl() : $item->url();
+        return $selectAcrossSites ? $item->absoluteUrl().$extras : $item->url().$extras;
     }
 
     private function isApi()
diff --git a/src/Fieldtypes/ButtonGroup.php b/src/Fieldtypes/ButtonGroup.php
index 61eb49c2f12..6804ec1b95e 100644
--- a/src/Fieldtypes/ButtonGroup.php
+++ b/src/Fieldtypes/ButtonGroup.php
@@ -4,6 +4,8 @@
 
 use Statamic\Fields\Fieldtype;
 
+use function Statamic\trans as __;
+
 class ButtonGroup extends Fieldtype
 {
     use HasSelectOptions;
diff --git a/src/Fieldtypes/Checkboxes.php b/src/Fieldtypes/Checkboxes.php
index 10e8d60ab7c..9a48a58fb1a 100644
--- a/src/Fieldtypes/Checkboxes.php
+++ b/src/Fieldtypes/Checkboxes.php
@@ -3,12 +3,16 @@
 namespace Statamic\Fieldtypes;
 
 use Statamic\Fields\Fieldtype;
+use Statamic\Fieldtypes\Concerns\MigratesLegacyInlineConfig;
+
+use function Statamic\trans as __;
 
 class Checkboxes extends Fieldtype
 {
     use HasSelectOptions {
         process as traitProcess;
     }
+    use MigratesLegacyInlineConfig;
 
     protected $categories = ['controls'];
     protected $selectableInForms = true;
@@ -35,10 +39,12 @@ protected function configFieldItems(): array
             [
                 'display' => __('Appearance'),
                 'fields' => [
-                    'inline' => [
-                        'display' => __('Inline'),
-                        'instructions' => __('statamic::fieldtypes.checkboxes.config.inline'),
-                        'type' => 'toggle',
+                    'appearance' => [
+                        'display' => __('Appearance'),
+                        'instructions' => __('statamic::fieldtypes.checkboxes.config.appearance'),
+                        'type' => 'control_appearance',
+                        'default' => 'default',
+                        'control' => 'checkbox',
                     ],
                 ],
             ],
diff --git a/src/Fieldtypes/Code.php b/src/Fieldtypes/Code.php
index 2367a307bbc..ff4f5bab9b0 100644
--- a/src/Fieldtypes/Code.php
+++ b/src/Fieldtypes/Code.php
@@ -7,6 +7,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\GraphQL\Types\CodeType;
 
+use function Statamic\trans as __;
+
 class Code extends Fieldtype
 {
     protected $categories = ['text'];
@@ -104,6 +106,8 @@ protected function configFieldItems(): array
                             'nginx' => 'Nginx',
                             'text/x-java' => 'Java',
                             'javascript' => 'JavaScript',
+                            'application/json' => 'JSON',
+                            'application/ld+json' => 'JSON-LD',
                             'jsx' => 'JSX',
                             'text/x-objectivec' => 'Objective-C',
                             'php' => 'PHP',
@@ -164,6 +168,15 @@ public function preProcessConfig($value)
         return $value;
     }
 
+    public function preProcessValidatable($value)
+    {
+        if (is_array($value)) {
+            return $value['code'] ?? null;
+        }
+
+        return $value;
+    }
+
     public function process($value)
     {
         if (! $value) {
diff --git a/src/Fieldtypes/Collections.php b/src/Fieldtypes/Collections.php
index 8f8754b634a..0c591a6c78a 100644
--- a/src/Fieldtypes/Collections.php
+++ b/src/Fieldtypes/Collections.php
@@ -5,6 +5,7 @@
 use Statamic\CP\Column;
 use Statamic\Facades\Collection;
 use Statamic\Facades\GraphQL;
+use Statamic\Facades\User;
 use Statamic\GraphQL\Types\CollectionType;
 
 class Collections extends Relationship
@@ -16,6 +17,11 @@ class Collections extends Relationship
     protected $canSearch = false;
     protected $statusIcons = false;
 
+    protected function authorizeItemData($id): bool
+    {
+        return $this->authorizeViewable(Collection::findByHandle($id));
+    }
+
     protected function toItemArray($id, $site = null)
     {
         if ($collection = Collection::findByHandle($id)) {
@@ -30,13 +36,16 @@ protected function toItemArray($id, $site = null)
 
     public function getIndexItems($request)
     {
-        return Collection::all()->sortBy('title')->map(function ($collection) {
-            return [
-                'id' => $collection->handle(),
-                'title' => $collection->title(),
-                'entries' => $collection->queryEntries()->count(),
-            ];
-        })->values();
+        return Collection::all()
+            ->filter(fn ($collection) => User::current()->can('view', $collection))
+            ->sortBy('title')
+            ->map(function ($collection) {
+                return [
+                    'id' => $collection->handle(),
+                    'title' => $collection->title(),
+                    'entries' => $collection->queryEntries()->count(),
+                ];
+            })->values();
     }
 
     protected function getColumns()
diff --git a/src/Fieldtypes/Color.php b/src/Fieldtypes/Color.php
index 718bd35291b..dbc6b76bc53 100644
--- a/src/Fieldtypes/Color.php
+++ b/src/Fieldtypes/Color.php
@@ -4,6 +4,8 @@
 
 use Statamic\Fields\Fieldtype;
 
+use function Statamic\trans as __;
+
 class Color extends Fieldtype
 {
     protected $categories = ['special'];
diff --git a/src/Fieldtypes/Concerns/MigratesLegacyInlineConfig.php b/src/Fieldtypes/Concerns/MigratesLegacyInlineConfig.php
new file mode 100644
index 00000000000..3df1d81b74e
--- /dev/null
+++ b/src/Fieldtypes/Concerns/MigratesLegacyInlineConfig.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Statamic\Fieldtypes\Concerns;
+
+trait MigratesLegacyInlineConfig
+{
+    public function migrateConfig(array $values): array
+    {
+        if (($values['inline'] ?? false) && ! array_key_exists('appearance', $values)) {
+            $values['appearance'] = 'inline';
+        }
+
+        unset($values['inline']);
+
+        return $values;
+    }
+}
diff --git a/src/Fieldtypes/ControlAppearance.php b/src/Fieldtypes/ControlAppearance.php
new file mode 100644
index 00000000000..e82fe384745
--- /dev/null
+++ b/src/Fieldtypes/ControlAppearance.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Statamic\Fieldtypes;
+
+use Statamic\Fields\Fieldtype;
+
+class ControlAppearance extends Fieldtype
+{
+    protected $selectable = false;
+}
diff --git a/src/Fieldtypes/Date.php b/src/Fieldtypes/Date.php
index c4dc409b1e2..3d27b639196 100644
--- a/src/Fieldtypes/Date.php
+++ b/src/Fieldtypes/Date.php
@@ -15,10 +15,12 @@
 use Statamic\Rules\DateFieldtype as ValidationRule;
 use Statamic\Support\DateFormat;
 
+use function Statamic\trans as __;
+
 class Date extends Fieldtype
 {
     protected $categories = ['special'];
-    protected $keywords = ['datetime', 'time'];
+    protected $keywords = ['datetime', 'time', 'range'];
 
     const DEFAULT_DATE_FORMAT = 'Y-m-d';
     const DEFAULT_DATETIME_FORMAT = 'Y-m-d H:i';
@@ -88,6 +90,16 @@ protected function configFieldItems(): array
                         'default' => false,
                         'width' => 50,
                     ],
+                    'timezone' => [
+                        'display' => __('Timezone'),
+                        'instructions' => __('statamic::fieldtypes.date.config.timezone'),
+                        'type' => 'dictionary',
+                        'dictionary' => 'timezones',
+                        'placeholder' => $this->timezonePlaceholder(),
+                        'clearable' => true,
+                        'width' => 50,
+                        'max_items' => 1,
+                    ],
                 ],
             ],
             [
@@ -150,6 +162,10 @@ private function preProcessSingle($value)
             $value = $value['start'];
         }
 
+        if (! $this->formatHasTime()) {
+            return $this->parseSavedToCarbon($value)->format('Y-m-d');
+        }
+
         return $this->parseSaved($value)->toIso8601ZuluString('millisecond');
     }
 
@@ -165,6 +181,13 @@ private function preProcessRange($value)
         if (! is_array($value)) {
             $carbon = $this->parseSavedToCarbon($value);
 
+            if (! $this->formatHasTime()) {
+                return [
+                    'start' => $carbon->copy()->format('Y-m-d'),
+                    'end' => $carbon->copy()->format('Y-m-d'),
+                ];
+            }
+
             return [
                 'start' => $carbon->copy()->startOfDay()->utc()->toIso8601ZuluString('millisecond'),
                 'end' => $carbon->copy()->endOfDay()->utc()->toIso8601ZuluString('millisecond'),
@@ -222,6 +245,12 @@ private function processRange($data)
 
     private function processDateTime($value)
     {
+        if (! $this->formatHasTime()) {
+            $date = Carbon::parse($value, config('app.timezone'));
+
+            return $this->formatAndCast($date, $this->saveFormat());
+        }
+
         $date = Carbon::parse($value, 'UTC');
 
         return $this->formatAndCast($date, $this->saveFormat());
@@ -236,6 +265,8 @@ public function preProcessIndex($value)
         $common = [
             'mode' => $this->config('mode', 'single'),
             'time_enabled' => $this->config('time_enabled'),
+            'timezone' => $this->resolvedTimezone(),
+            'format_has_time' => $this->formatHasTime(),
         ];
 
         if ($this->config('mode') === 'range') {
@@ -246,8 +277,8 @@ public function preProcessIndex($value)
             }
 
             return [
-                'start' => $this->parseSaved($value['start'])->toIso8601ZuluString('millisecond'),
-                'end' => $this->parseSaved($value['end'])->toIso8601ZuluString('millisecond'),
+                'start' => $this->preProcessIndexDate($value['start']),
+                'end' => $this->preProcessIndexDate($value['end']),
                 ...$common,
             ];
         }
@@ -258,11 +289,20 @@ public function preProcessIndex($value)
         }
 
         return [
-            'date' => $this->parseSaved($value)->toIso8601ZuluString('millisecond'),
+            'date' => $this->preProcessIndexDate($value),
             ...$common,
         ];
     }
 
+    private function preProcessIndexDate($value)
+    {
+        if (! $this->formatHasTime()) {
+            return $this->parseSavedToCarbon($value)->format('Y-m-d');
+        }
+
+        return $this->parseSaved($value)->toIso8601ZuluString('millisecond');
+    }
+
     private function saveFormat()
     {
         return $this->config('format', $this->defaultFormat());
@@ -362,6 +402,31 @@ private function parseSavedToCarbon($value): Carbon
         }
     }
 
+    public function formatHasTime(): bool
+    {
+        return DateFormat::containsTime($this->saveFormat());
+    }
+
+    public function preload()
+    {
+        return [
+            'formatHasTime' => $this->formatHasTime(),
+            'timezone' => $this->resolvedTimezone(),
+        ];
+    }
+
+    private function timezonePlaceholder(): string
+    {
+        $default = config('statamic.cp.default_timezone', 'auto');
+
+        return $default !== 'auto' ? $default : __('Auto');
+    }
+
+    private function resolvedTimezone(): string
+    {
+        return $this->config('timezone', config('statamic.cp.default_timezone', 'auto'));
+    }
+
     public function timeEnabled()
     {
         return $this->config('time_enabled');
diff --git a/src/Fieldtypes/Dictionary.php b/src/Fieldtypes/Dictionary.php
index 79c8aefc818..fd1358d015f 100644
--- a/src/Fieldtypes/Dictionary.php
+++ b/src/Fieldtypes/Dictionary.php
@@ -11,6 +11,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class Dictionary extends Fieldtype
 {
     protected $categories = ['controls', 'relationship'];
@@ -74,7 +76,7 @@ protected function configFieldItems(): array
     public function preload(): array
     {
         return [
-            'url' => cp_route('dictionary-fieldtype', $this->dictionary()->handle()),
+            'url' => route('statamic.dictionary-fieldtype', $this->dictionary()->handle()),
             'selectedOptions' => $this->getItemData($this->field->value()),
         ];
     }
diff --git a/src/Fieldtypes/DictionaryFields.php b/src/Fieldtypes/DictionaryFields.php
index 0e5302d4cc0..9aeec5ec790 100644
--- a/src/Fieldtypes/DictionaryFields.php
+++ b/src/Fieldtypes/DictionaryFields.php
@@ -7,6 +7,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class DictionaryFields extends Fieldtype
 {
     protected $selectable = false;
diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 4d05006f015..60cc7cd31b4 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -2,12 +2,12 @@
 
 namespace Statamic\Fieldtypes;
 
+use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection as SupportCollection;
 use Statamic\Contracts\Data\Localization;
 use Statamic\Contracts\Entries\Entry as EntryContract;
 use Statamic\CP\Column;
 use Statamic\CP\Columns;
-use Statamic\Exceptions\AuthorizationException;
 use Statamic\Exceptions\CollectionNotFoundException;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Collection;
@@ -19,6 +19,7 @@
 use Statamic\Facades\User;
 use Statamic\Http\Resources\CP\Entries\EntriesFieldtypeEntries;
 use Statamic\Http\Resources\CP\Entries\EntriesFieldtypeEntry as EntryResource;
+use Statamic\Query\OrderBy;
 use Statamic\Query\OrderedQueryBuilder;
 use Statamic\Query\Scopes\Filter;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
@@ -26,6 +27,7 @@
 use Statamic\Query\StatusQueryBuilder;
 use Statamic\Search\Index;
 use Statamic\Search\Result;
+use Statamic\Statamic;
 use Statamic\Support\Arr;
 
 use function Statamic\trans as __;
@@ -151,22 +153,21 @@ protected function configFieldItems(): array
     public function getIndexItems($request)
     {
         $configuredCollections = $this->getConfiguredCollections();
-        $this->authorizeCollectionAccess($configuredCollections);
+
+        // When the user can't view any of the configured collections, return an empty result
+        // set instead of throwing. The picker treats this like the filter-to-viewable case.
+        if ($this->getViewableCollections($configuredCollections)->isEmpty()) {
+            return collect();
+        }
 
         $query = $this->getIndexQuery($request);
 
         $filters = $request->filters;
 
         if (! isset($filters['collection'])) {
-            $user = User::current();
-
             $query->whereIn(
                 'collection',
-                collect($configuredCollections)
-                    ->map(fn (string $collectionHandle) => Collection::findByHandle($collectionHandle))
-                    ->filter(fn ($collection) => $collection && $user->can('view', $collection))
-                    ->map->handle()
-                    ->all()
+                $this->getViewableCollections($configuredCollections)->map->handle()->all()
             );
         }
 
@@ -180,29 +181,33 @@ public function getIndexItems($request)
             $query->orderBy($sort, $this->getSortDirection($request));
         }
 
-        $results = ($paginate = $request->boolean('paginate', true)) ? $query->paginate() : $query->get();
+        $results = ($paginate = $request->boolean('paginate', true)) ? $query->paginate($request->filled('perPage') ? Statamic::cpPerPage($request->integer('perPage')) : 15) : $query->get();
 
         $items = $results->map(fn ($item) => $item instanceof Result ? $item->getSearchable() : $item);
 
         return $paginate ? $results->setCollection($items) : $items;
     }
 
-    private function authorizeCollectionAccess(array $collections): void
+    private function getViewableCollections(array $collections): SupportCollection
     {
         $user = User::current();
 
-        $authorizedCollections = collect($collections)
+        return collect($collections)
             ->map(fn (string $collectionHandle) => Collection::findByHandle($collectionHandle))
             ->filter(fn ($collection) => $collection && $user->can('view', $collection));
-
-        throw_if($authorizedCollections->isEmpty(), new AuthorizationException);
     }
 
     public function getResourceCollection($request, $items)
     {
+        // Derive columns only from a collection the user can view. With none viewable, return
+        // empty data and no columns rather than leaking the structure of an unviewable blueprint.
+        if (! $collection = $this->getColumnCollection($request)) {
+            return JsonResource::collection($items)->additional(['meta' => ['columns' => []]]);
+        }
+
         return (new EntriesFieldtypeEntries($items, $this))
-            ->blueprint($this->getBlueprint($request))
-            ->columnPreferenceKey("collections.{$this->getFirstCollectionFromRequest($request)->handle()}.columns")
+            ->blueprint($collection->entryBlueprint())
+            ->columnPreferenceKey("collections.{$collection->handle()}.columns")
             ->additional(['meta' => [
                 'activeFilterBadges' => $this->activeFilterBadges,
             ]]);
@@ -210,7 +215,19 @@ public function getResourceCollection($request, $items)
 
     protected function getBlueprint($request = null)
     {
-        return $this->getFirstCollectionFromRequest($request)->entryBlueprint();
+        return $this->getColumnCollection($request)?->entryBlueprint();
+    }
+
+    protected function getColumnCollection($request = null)
+    {
+        $collection = $this->getFirstCollectionFromRequest($request);
+
+        // Only derive columns from a collection the user can view. If the first requested or
+        // configured collection isn't viewable, fall back to the first viewable configured
+        // collection, or none at all when the user can view none of them.
+        return User::current()->can('view', $collection)
+            ? $collection
+            : $this->getViewableCollections($this->getConfiguredCollections())->first();
     }
 
     protected function getFirstCollectionFromRequest($request)
@@ -232,7 +249,7 @@ protected function getFirstCollectionFromRequest($request)
 
     public function getSortColumn($request)
     {
-        $column = $request->sort ?? 'title';
+        $column = OrderBy::column($request->sort, 'title');
 
         if (! $request->sort && ! $request->search && count($this->getConfiguredCollections()) < 2) {
             $column = $this->getFirstCollectionFromRequest($request)->sortField();
@@ -360,6 +377,11 @@ protected function getCreatables()
         })->all();
     }
 
+    protected function authorizeItemData($id): bool
+    {
+        return $this->authorizeViewable(Entry::find($id));
+    }
+
     protected function toItemArray($id)
     {
         if (! $entry = Entry::find($id)) {
@@ -464,18 +486,22 @@ public function toGqlType()
 
     public function getColumns()
     {
-        if (count($this->getConfiguredCollections()) === 1) {
-            $columns = $this->getBlueprint()->columns();
+        // Don't derive columns from a blueprint the user can't view; fall back to the
+        // default columns when none of the configured collections are viewable.
+        if (! $collection = $this->getColumnCollection()) {
+            return parent::getColumns();
+        }
+
+        $columns = $collection->entryBlueprint()->columns();
 
+        if (count($this->getConfiguredCollections()) === 1) {
             $this->addColumn($columns, 'status');
 
-            $columns->setPreferred("collections.{$this->getConfiguredCollections()[0]}.columns");
+            $columns->setPreferred("collections.{$collection->handle()}.columns");
 
             return $columns->rejectUnlisted()->values();
         }
 
-        $columns = $this->getBlueprint()->columns();
-
         if ($this->canSelectAcrossSites()) {
             $this->addColumn($columns, 'site');
         }
diff --git a/src/Fieldtypes/Files.php b/src/Fieldtypes/Files.php
index f0325afdc02..726ccc17af4 100644
--- a/src/Fieldtypes/Files.php
+++ b/src/Fieldtypes/Files.php
@@ -12,6 +12,8 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Files extends Fieldtype
 {
     protected $selectable = false;
diff --git a/src/Fieldtypes/Floatval.php b/src/Fieldtypes/Floatval.php
index 1b0b1ce0c94..dc3d5702171 100644
--- a/src/Fieldtypes/Floatval.php
+++ b/src/Fieldtypes/Floatval.php
@@ -6,6 +6,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Query\Scopes\Filters\Fields\Floatval as FloatFilter;
 
+use function Statamic\trans as __;
+
 class Floatval extends Fieldtype
 {
     protected $categories = ['number'];
diff --git a/src/Fieldtypes/FormattingLocales.php b/src/Fieldtypes/FormattingLocales.php
new file mode 100644
index 00000000000..1773bac203a
--- /dev/null
+++ b/src/Fieldtypes/FormattingLocales.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Statamic\Fieldtypes;
+
+use Statamic\Fields\Fieldtype;
+
+class FormattingLocales extends Fieldtype
+{
+    protected $selectable = false;
+}
diff --git a/src/Fieldtypes/GlobalSetSites.php b/src/Fieldtypes/GlobalSetSites.php
index bc6cbf180a1..dca0f165c1e 100644
--- a/src/Fieldtypes/GlobalSetSites.php
+++ b/src/Fieldtypes/GlobalSetSites.php
@@ -5,6 +5,8 @@
 use Illuminate\Contracts\Validation\Rule as ValidationRule;
 use Statamic\Fields\Fieldtype;
 
+use function Statamic\trans as __;
+
 class GlobalSetSites extends Fieldtype
 {
     protected $selectable = false;
diff --git a/src/Fieldtypes/Grid.php b/src/Fieldtypes/Grid.php
index c36478a9ed3..cd4926c0b39 100644
--- a/src/Fieldtypes/Grid.php
+++ b/src/Fieldtypes/Grid.php
@@ -13,6 +13,8 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Grid extends Fieldtype
 {
     use AddsEntryValidationReplacements;
@@ -53,6 +55,7 @@ protected function configFieldItems(): array
                         'display' => __('Add Row Label'),
                         'instructions' => __('statamic::fieldtypes.grid.config.add_row'),
                         'type' => 'text',
+                        'placeholder' => __('Add Row'),
                         'width' => 50,
                     ],
                     'reorderable' => [
@@ -204,9 +207,11 @@ public function extraValidationAttributes(): array
 
     public function preload()
     {
+        $defaults = $this->defaultRowData()->all();
+
         return [
-            'defaults' => $this->defaultRowData()->all(),
-            'new' => $this->fields()->meta()->all(),
+            'defaults' => $defaults,
+            'new' => $this->fields()->addValues($defaults)->meta()->all(),
             'existing' => collect($this->field->value())->mapWithKeys(function ($row, $index) {
                 return [$row['_id'] => $this->fields($index)->addValues($row)->meta()];
             })->toArray(),
diff --git a/src/Fieldtypes/Group.php b/src/Fieldtypes/Group.php
index c8a7bed26f1..a1d8705bf9a 100644
--- a/src/Fieldtypes/Group.php
+++ b/src/Fieldtypes/Group.php
@@ -11,6 +11,8 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Group extends Fieldtype
 {
     use UpdatesReferences;
diff --git a/src/Fieldtypes/HasSelectOptions.php b/src/Fieldtypes/HasSelectOptions.php
index bd6e6886ce3..219a664e0c8 100644
--- a/src/Fieldtypes/HasSelectOptions.php
+++ b/src/Fieldtypes/HasSelectOptions.php
@@ -138,7 +138,7 @@ private function getLabel($actualValue)
 
         $option = collect($this->getOptions())->filter(fn ($option) => $option['value'] === $value)->first();
 
-        return $option ? $option['label'] : $actualValue;
+        return $option ? ($option['label'] ?? $option['value']) : $actualValue;
     }
 
     private function castToBoolean($value)
diff --git a/src/Fieldtypes/Hidden.php b/src/Fieldtypes/Hidden.php
index eafa68ad872..4026dd556f3 100644
--- a/src/Fieldtypes/Hidden.php
+++ b/src/Fieldtypes/Hidden.php
@@ -4,6 +4,8 @@
 
 use Statamic\Fields\Fieldtype;
 
+use function Statamic\trans as __;
+
 class Hidden extends Fieldtype
 {
     protected $categories = ['special'];
diff --git a/src/Fieldtypes/Html.php b/src/Fieldtypes/Html.php
index b49c18bef89..e3de355a24d 100644
--- a/src/Fieldtypes/Html.php
+++ b/src/Fieldtypes/Html.php
@@ -4,6 +4,8 @@
 
 use Statamic\Fields\Fieldtype;
 
+use function Statamic\trans as __;
+
 class Html extends Fieldtype
 {
     protected $categories = ['special'];
diff --git a/src/Fieldtypes/Icon.php b/src/Fieldtypes/Icon.php
index 0a1ca4654e3..8283ea1cbda 100644
--- a/src/Fieldtypes/Icon.php
+++ b/src/Fieldtypes/Icon.php
@@ -6,6 +6,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Icons\IconSet;
 
+use function Statamic\trans as __;
+
 class Icon extends Fieldtype
 {
     protected $categories = ['media'];
diff --git a/src/Fieldtypes/Integer.php b/src/Fieldtypes/Integer.php
index 0bc6ce3d7fd..c729ea11178 100644
--- a/src/Fieldtypes/Integer.php
+++ b/src/Fieldtypes/Integer.php
@@ -6,6 +6,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Query\Scopes\Filters\Fields\Integer as IntegerFilter;
 
+use function Statamic\trans as __;
+
 class Integer extends Fieldtype
 {
     protected $categories = ['number'];
diff --git a/src/Fieldtypes/Link.php b/src/Fieldtypes/Link.php
index c9c63d7967f..ed09a8a2076 100644
--- a/src/Fieldtypes/Link.php
+++ b/src/Fieldtypes/Link.php
@@ -5,47 +5,72 @@
 use Facades\Statamic\Routing\ResolveRedirect;
 use Statamic\Contracts\Entries\Collection;
 use Statamic\Contracts\Entries\Entry;
-use Statamic\Facades;
-use Statamic\Facades\Blink;
 use Statamic\Facades\GraphQL;
-use Statamic\Facades\Site;
 use Statamic\Fields\Field;
 use Statamic\Fields\Fieldtype;
 use Statamic\Fieldtypes\Link\ArrayableLink;
+use Statamic\Fieldtypes\Link\LinkType;
 use Statamic\GraphQL\Types\LinkValueType;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Link extends Fieldtype
 {
     use UpdatesReferences;
     protected $categories = ['relationship'];
 
+    protected static array $types = [];
+
+    protected static array $resolvedTypes = [];
+
+    protected static ?string $resolvedTypesSignature = null;
+
+    public static function extend(string $handle, string $type): void
+    {
+        static::$types[$handle] = $type;
+
+        if ($fields = static::resolveType($handle)->configFieldItems()) {
+            static::appendConfigFields($fields);
+        }
+    }
+
+    public static function resolveType(string $handle): LinkType
+    {
+        return app(static::$types[$handle])->setHandle($handle);
+    }
+
+    public static function types(): array
+    {
+        $signature = serialize(static::$types);
+
+        if ($signature === static::$resolvedTypesSignature) {
+            return static::$resolvedTypes;
+        }
+
+        static::$resolvedTypesSignature = $signature;
+
+        return static::$resolvedTypes = collect(static::$types)
+            ->keys()
+            ->mapWithKeys(fn (string $handle): array => [$handle => static::resolveType($handle)])
+            ->all();
+    }
+
     protected function configFieldItems(): array
     {
         return [
             [
                 'display' => __('Input Behavior'),
                 'fields' => [
-                    'collections' => [
-                        'display' => __('Collections'),
-                        'instructions' => __('statamic::fieldtypes.link.config.collections'),
-                        'type' => 'collections',
-                        'mode' => 'select',
-                        'width' => '50',
-                    ],
-                    'container' => [
-                        'display' => __('Container'),
-                        'instructions' => __('statamic::fieldtypes.link.config.container'),
-                        'type' => 'asset_container',
-                        'mode' => 'select',
+                    'default_option' => [
+                        'display' => __('Default Option'),
+                        'instructions' => __('statamic::fieldtypes.link.config.default_option'),
+                        'type' => 'select',
                         'max_items' => 1,
                         'width' => '50',
-                    ],
-                    'select_across_sites' => [
-                        'display' => __('Select Across Sites'),
-                        'instructions' => __('statamic::fieldtypes.entries.config.select_across_sites'),
-                        'type' => 'toggle',
-                        'width' => '50',
+                        'clearable' => true,
+                        'placeholder' => __('Default'),
+                        'options' => $this->defaultOptionOptions(),
                     ],
                 ],
             ],
@@ -64,109 +89,137 @@ public function augment($value)
         );
     }
 
+    public function preProcessIndex($data)
+    {
+        if (! $data) {
+            return null;
+        }
+
+        if ($data === '@child' && ! $this->field->parent() instanceof Entry) {
+            return null;
+        }
+
+        if (! $item = ResolveRedirect::item($data, $this->field->parent())) {
+            return null;
+        }
+
+        if (! ($url = is_object($item) ? $item->url() : $item)) {
+            return null;
+        }
+
+        $linkType = $this->linkTypeFor($data);
+
+        return [
+            'type' => $data === '@child' ? 'child' : ($linkType ?? 'url'),
+            'url' => $url,
+            'icon' => match (true) {
+                $data === '@child' => 'page',
+                $linkType !== null => static::resolveType($linkType)->icon(),
+                default => 'external-link',
+            },
+        ];
+    }
+
     public function preload()
     {
         $value = $this->field->value();
 
-        $showAssetOption = $this->showAssetOption();
+        $linkType = $this->linkTypeFor($value);
+
+        $url = ($value !== '@child' && ! $linkType) ? $value : null;
 
-        $selectedEntry = $value && Str::startsWith($value, 'entry::') ? Str::after($value, 'entry::') : null;
+        $types = [];
 
-        $selectedAsset = $value && Str::startsWith($value, 'asset::') ? Str::after($value, 'asset::') : null;
+        foreach (static::types() as $handle => $type) {
+            if (! $type->visible($this->field)) {
+                continue;
+            }
 
-        $url = ($value !== '@child' && ! $selectedEntry && ! $selectedAsset) ? $value : null;
+            if (! $config = $type->fieldtype($this->field)) {
+                continue;
+            }
 
-        $entryFieldtype = $this->nestedEntriesFieldtype($selectedEntry);
+            $selected = $linkType === $handle ? Str::after($value, "{$handle}::") : null;
 
-        $assetFieldtype = $showAssetOption ? $this->nestedAssetsFieldtype($selectedAsset) : null;
+            $nestedField = new Field($handle, $config);
+            $nestedField->setValue($selected);
+            $nestedFieldtype = $nestedField->fieldtype();
+
+            $types[$handle] = [
+                'title' => $type->title(),
+                'component' => $nestedFieldtype->component(),
+                'config' => $nestedFieldtype->config(),
+                'meta' => $nestedFieldtype->preload(),
+                'selected' => $selected ? [$selected] : [],
+            ];
+        }
 
         return [
             'initialUrl' => $url,
-            'initialSelectedEntries' => $selectedEntry ? [$selectedEntry] : [],
-            'initialSelectedAssets' => $selectedAsset ? [$selectedAsset] : [],
-            'initialOption' => $this->initialOption($value, $selectedEntry, $selectedAsset),
+            'initialOption' => $this->initialOption($value, $linkType),
             'showFirstChildOption' => $this->showFirstChildOption(),
-            'showAssetOption' => $showAssetOption,
-            'entry' => [
-                'config' => $entryFieldtype->config(),
-                'meta' => $entryFieldtype->preload(),
-            ],
-            'asset' => $showAssetOption ? [
-                'config' => $assetFieldtype->config(),
-                'meta' => $assetFieldtype->preload(),
-            ] : null,
+            'types' => $types,
         ];
     }
 
-    private function initialOption($value, $entry, $asset)
+    private function linkTypeFor($value): ?string
     {
         if (! $value) {
-            return $this->field->isRequired() ? 'url' : null;
+            return null;
         }
 
-        if ($value === '@child') {
-            return 'first-child';
-        } elseif ($entry) {
-            return 'entry';
-        } elseif ($asset) {
-            return 'asset';
+        foreach (static::types() as $type) {
+            if (Str::startsWith($value, "{$type->handle()}::")) {
+                return $type->handle();
+            }
         }
 
-        return 'url';
+        return null;
     }
 
-    private function nestedEntriesFieldtype($value): Fieldtype
+    private function initialOption($value, ?string $matchedHandle)
     {
-        $entryField = (new Field('entry', [
-            'type' => 'entries',
-            'max_items' => 1,
-            'create' => false,
-            'select_across_sites' => $this->canSelectAcrossSites(),
-        ]));
+        if (! $value) {
+            $fallback = $this->field->isRequired() && ! $this->field->hasSometimesRule() ? 'url' : null;
+            $option = $this->field->get('default_option', $fallback);
 
-        $entryField->setValue($value);
+            if ($option === 'first-child' && ! $this->showFirstChildOption()) {
+                return $fallback;
+            }
 
-        $entryField->setConfig(array_merge(
-            $entryField->config(),
-            ['collections' => $this->collections()]
-        ));
+            if ($option && $option !== 'first-child' && $option !== 'url' && ! $this->isLinkTypeVisible($option)) {
+                return $fallback;
+            }
 
-        return $entryField->fieldtype();
-    }
+            return $option;
+        }
 
-    private function nestedAssetsFieldtype($value): Fieldtype
-    {
-        $assetField = (new Field('entry', [
-            'type' => 'assets',
-            'max_files' => 1,
-            'mode' => 'list',
-        ]));
+        if ($value === '@child') {
+            return 'first-child';
+        }
 
-        $assetField->setValue($value);
+        return $matchedHandle ?? 'url';
+    }
 
-        $assetField->setConfig(array_merge(
-            $assetField->config(),
-            ['container' => $this->config('container')]
-        ));
+    private function isLinkTypeVisible(string $handle): bool
+    {
+        $linkType = static::types()[$handle] ?? null;
 
-        return $assetField->fieldtype();
+        return $linkType?->visible($this->field) ?? false;
     }
 
-    private function collections()
+    private function defaultOptionOptions(): array
     {
-        $collections = $this->config('collections');
-
-        if (empty($collections)) {
-            $site = Site::current()->handle();
+        $options = [];
 
-            $collections = Blink::once('routable-collection-handles-'.$site, function () use ($site) {
-                return Facades\Collection::all()->reject(function ($collection) use ($site) {
-                    return is_null($collection->route($site));
-                })->map->handle()->values()->all();
-            });
+        foreach (static::types() as $handle => $type) {
+            $options[$handle] = $type->title();
         }
 
-        return $collections;
+        $options['first-child'] = __('First Child');
+        $options['url'] = __('URL');
+
+        return $options;
     }
 
     private function showFirstChildOption()
@@ -184,43 +237,16 @@ private function showFirstChildOption()
         return $collection->hasStructure() && $collection->structure()->maxDepth() !== 1;
     }
 
-    private function showAssetOption()
-    {
-        return $this->config('container') !== null;
-    }
-
     public function toGqlType()
     {
         return GraphQL::type(LinkValueType::NAME);
     }
 
-    protected function getConfiguredCollections()
-    {
-        return empty($collections = $this->config('collections'))
-            ? \Statamic\Facades\Collection::handles()->all()
-            : $collections;
-    }
-
     private function canSelectAcrossSites(): bool
     {
         return $this->config('select_across_sites', false);
     }
 
-    private function availableSites()
-    {
-        if (! Site::hasMultiple()) {
-            return [];
-        }
-
-        $configuredSites = collect($this->getConfiguredCollections())->flatMap(fn ($collection) => \Statamic\Facades\Collection::find($collection)->sites());
-
-        return Site::authorized()
-            ->when(isset($configuredSites), fn ($sites) => $sites->filter(fn ($site) => $configuredSites->contains($site->handle())))
-            ->map->handle()
-            ->values()
-            ->all();
-    }
-
     public function replaceAssetReferences($data, ?string $newValue, string $oldValue, string $container)
     {
         if ($this->config('container') !== $container) {
diff --git a/src/Fieldtypes/Link/AssetLinkType.php b/src/Fieldtypes/Link/AssetLinkType.php
new file mode 100644
index 00000000000..ec9423916e7
--- /dev/null
+++ b/src/Fieldtypes/Link/AssetLinkType.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Statamic\Fieldtypes\Link;
+
+use Statamic\Facades;
+use Statamic\Fields\Field;
+
+use function Statamic\trans as __;
+
+class AssetLinkType extends LinkType
+{
+    protected ?string $icon = 'assets';
+
+    public function title(): string
+    {
+        return __('Asset');
+    }
+
+    public function configFieldItems(): array
+    {
+        return [
+            'container' => [
+                'display' => __('Container'),
+                'instructions' => __('statamic::fieldtypes.link.config.container'),
+                'type' => 'asset_container',
+                'mode' => 'select',
+                'max_items' => 1,
+                'width' => '50',
+            ],
+        ];
+    }
+
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        return Facades\Asset::find($id);
+    }
+
+    public function fieldtype(Field $field): array
+    {
+        return [
+            'type' => 'assets',
+            'max_files' => 1,
+            'mode' => 'list',
+            'container' => $field->get('container'),
+        ];
+    }
+
+    public function visible(Field $field): bool
+    {
+        return $field->get('container') !== null;
+    }
+}
diff --git a/src/Fieldtypes/Link/EntryLinkType.php b/src/Fieldtypes/Link/EntryLinkType.php
new file mode 100644
index 00000000000..29c2b4a3399
--- /dev/null
+++ b/src/Fieldtypes/Link/EntryLinkType.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Statamic\Fieldtypes\Link;
+
+use Statamic\Contracts\Data\Localization;
+use Statamic\Facades;
+use Statamic\Facades\Blink;
+use Statamic\Facades\Site;
+use Statamic\Fields\Field;
+
+use function Statamic\trans as __;
+
+class EntryLinkType extends LinkType
+{
+    protected ?string $icon = 'collections';
+
+    public function title(): string
+    {
+        return __('Entry');
+    }
+
+    public function configFieldItems(): array
+    {
+        return [
+            'collections' => [
+                'display' => __('Collections'),
+                'instructions' => __('statamic::fieldtypes.link.config.collections'),
+                'type' => 'collections',
+                'mode' => 'select',
+                'width' => '50',
+            ],
+            'select_across_sites' => [
+                'display' => __('Select Across Sites'),
+                'instructions' => __('statamic::fieldtypes.entries.config.select_across_sites'),
+                'type' => 'toggle',
+                'width' => '50',
+            ],
+        ];
+    }
+
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        if (! $entry = Facades\Entry::find($id)) {
+            return null;
+        }
+
+        if (! $localize) {
+            return $entry;
+        }
+
+        $site = $parent instanceof Localization
+            ? $parent->locale()
+            : Site::current()->handle();
+
+        return $entry->in($site) ?? $entry;
+    }
+
+    public function fieldtype(Field $field): array
+    {
+        return [
+            'type' => 'entries',
+            'max_items' => 1,
+            'create' => false,
+            'select_across_sites' => $field->get('select_across_sites', false),
+            'collections' => $this->collections($field),
+        ];
+    }
+
+    private function collections(Field $field): array
+    {
+        $collections = $field->get('collections');
+
+        if (empty($collections)) {
+            $site = Site::current()->handle();
+
+            $collections = Blink::once('routable-collection-handles-'.$site, function () use ($site) {
+                return Facades\Collection::all()->reject(function ($collection) use ($site) {
+                    return is_null($collection->route($site));
+                })->map->handle()->values()->all();
+            });
+        }
+
+        return $collections;
+    }
+}
diff --git a/src/Fieldtypes/Link/LinkType.php b/src/Fieldtypes/Link/LinkType.php
new file mode 100644
index 00000000000..fa17baf0910
--- /dev/null
+++ b/src/Fieldtypes/Link/LinkType.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Statamic\Fieldtypes\Link;
+
+use Statamic\Fields\Field;
+use Statamic\Support\Str;
+
+use function Statamic\trans as __;
+
+abstract class LinkType
+{
+    protected static ?string $title = null;
+
+    protected string $handle;
+    protected ?string $icon = null;
+
+    public function handle(): string
+    {
+        return $this->handle;
+    }
+
+    public function setHandle(string $handle): static
+    {
+        $this->handle = $handle;
+
+        return $this;
+    }
+
+    public function title(): string
+    {
+        if (static::$title) {
+            return __(static::$title);
+        }
+
+        return __(Str::title(Str::humanize(static::handle())));
+    }
+
+    public function icon(): string
+    {
+        return $this->icon ?? 'link';
+    }
+
+    public function configFieldItems(): array
+    {
+        return [];
+    }
+
+    abstract public function resolve(string $id, $parent = null, bool $localize = false): mixed;
+
+    abstract public function fieldtype(Field $field): ?array;
+
+    public function visible(Field $field): bool
+    {
+        return true;
+    }
+}
diff --git a/src/Fieldtypes/Lists.php b/src/Fieldtypes/Lists.php
index 9fac3224547..8c42cb374ad 100644
--- a/src/Fieldtypes/Lists.php
+++ b/src/Fieldtypes/Lists.php
@@ -5,6 +5,8 @@
 use Statamic\Facades\GraphQL;
 use Statamic\Fields\Fieldtype;
 
+use function Statamic\trans as __;
+
 class Lists extends Fieldtype
 {
     protected $categories = ['structured'];
@@ -18,6 +20,12 @@ protected function configFieldItems(): array
                 'instructions' => __('statamic::messages.fields_default_instructions'),
                 'type' => 'list',
             ],
+            'add_row' => [
+                'display' => __('Add Item Label'),
+                'instructions' => __('statamic::fieldtypes.list.config.add_row'),
+                'type' => 'text',
+                'placeholder' => __('Add Item'),
+            ],
         ];
     }
 
diff --git a/src/Fieldtypes/Markdown.php b/src/Fieldtypes/Markdown.php
index 9c54b0efb5e..4b82a98c41a 100644
--- a/src/Fieldtypes/Markdown.php
+++ b/src/Fieldtypes/Markdown.php
@@ -8,6 +8,8 @@
 use Statamic\Query\Scopes\Filters\Fields\Markdown as MarkdownFilter;
 use Statamic\Support\Html;
 
+use function Statamic\trans as __;
+
 class Markdown extends Fieldtype
 {
     use Concerns\ResolvesStatamicUrls, UpdatesReferences;
diff --git a/src/Fieldtypes/Navs.php b/src/Fieldtypes/Navs.php
index 5ee6447ef62..ed543d1663b 100644
--- a/src/Fieldtypes/Navs.php
+++ b/src/Fieldtypes/Navs.php
@@ -5,6 +5,7 @@
 use Statamic\CP\Column;
 use Statamic\Facades\GraphQL;
 use Statamic\Facades\Nav;
+use Statamic\Facades\User;
 use Statamic\GraphQL\Types\NavType;
 
 class Navs extends Relationship
@@ -16,6 +17,11 @@ class Navs extends Relationship
     protected $statusIcons = false;
     protected $icon = 'fieldtype-structures';
 
+    protected function authorizeItemData($id): bool
+    {
+        return $this->authorizeViewable(Nav::findByHandle($id));
+    }
+
     protected function toItemArray($id, $site = null)
     {
         if ($nav = Nav::findByHandle($id)) {
@@ -30,12 +36,15 @@ protected function toItemArray($id, $site = null)
 
     public function getIndexItems($request)
     {
-        return Nav::all()->sortBy('title')->map(function ($nav) {
-            return [
-                'id' => $nav->handle(),
-                'title' => $nav->title(),
-            ];
-        })->values();
+        return Nav::all()
+            ->filter(fn ($nav) => User::current()->can('view', $nav))
+            ->sortBy('title')
+            ->map(function ($nav) {
+                return [
+                    'id' => $nav->handle(),
+                    'title' => $nav->title(),
+                ];
+            })->values();
     }
 
     protected function getColumns()
diff --git a/src/Fieldtypes/Radio.php b/src/Fieldtypes/Radio.php
index 7a6526158be..213d4d872d9 100644
--- a/src/Fieldtypes/Radio.php
+++ b/src/Fieldtypes/Radio.php
@@ -3,10 +3,14 @@
 namespace Statamic\Fieldtypes;
 
 use Statamic\Fields\Fieldtype;
+use Statamic\Fieldtypes\Concerns\MigratesLegacyInlineConfig;
+
+use function Statamic\trans as __;
 
 class Radio extends Fieldtype
 {
     use HasSelectOptions;
+    use MigratesLegacyInlineConfig;
 
     protected $categories = ['controls'];
     protected $selectableInForms = true;
@@ -32,10 +36,12 @@ protected function configFieldItems(): array
             [
                 'display' => __('Appearance'),
                 'fields' => [
-                    'inline' => [
-                        'display' => __('Inline'),
-                        'instructions' => __('statamic::fieldtypes.radio.config.inline'),
-                        'type' => 'toggle',
+                    'appearance' => [
+                        'display' => __('Appearance'),
+                        'instructions' => __('statamic::fieldtypes.radio.config.appearance'),
+                        'type' => 'control_appearance',
+                        'default' => 'default',
+                        'control' => 'radio',
                     ],
                 ],
             ],
diff --git a/src/Fieldtypes/Range.php b/src/Fieldtypes/Range.php
index 72e1284c763..a7bbd249988 100644
--- a/src/Fieldtypes/Range.php
+++ b/src/Fieldtypes/Range.php
@@ -5,6 +5,8 @@
 use Statamic\Facades\GraphQL;
 use Statamic\Fields\Fieldtype;
 
+use function Statamic\trans as __;
+
 class Range extends Fieldtype
 {
     protected $categories = ['controls'];
@@ -18,21 +20,27 @@ protected function configFieldItems(): array
                     'min' => [
                         'display' => __('Min'),
                         'instructions' => __('statamic::fieldtypes.range.config.min'),
-                        'type' => 'integer',
+                        'type' => 'text',
+                        'input_type' => 'number',
+                        'validate' => ['numeric'],
                         'default' => 0,
                         'width' => 50,
                     ],
                     'max' => [
                         'display' => __('Max'),
                         'instructions' => __('statamic::fieldtypes.range.config.max'),
-                        'type' => 'integer',
+                        'type' => 'text',
+                        'input_type' => 'number',
+                        'validate' => ['numeric'],
                         'default' => 100,
                         'width' => 50,
                     ],
                     'step' => [
                         'display' => __('Step'),
                         'instructions' => __('statamic::fieldtypes.range.config.step'),
-                        'type' => 'integer',
+                        'type' => 'text',
+                        'input_type' => 'number',
+                        'validate' => ['numeric'],
                         'default' => 1,
                         'width' => 50,
                     ],
@@ -72,11 +80,33 @@ protected function configFieldItems(): array
 
     public function process($data)
     {
+        if ($this->usesDecimals()) {
+            return (float) $data;
+        }
+
         return (int) $data;
     }
 
+    protected function usesDecimals(): bool
+    {
+        $step = $this->config('step', 1);
+        $min = $this->config('min', 0);
+        $max = $this->config('max', 100);
+
+        return $this->isDecimal($step) || $this->isDecimal($min) || $this->isDecimal($max);
+    }
+
+    protected function isDecimal($value): bool
+    {
+        if (! is_numeric($value)) {
+            return false;
+        }
+
+        return floor((float) $value) != (float) $value;
+    }
+
     public function toGqlType()
     {
-        return GraphQL::int();
+        return $this->usesDecimals() ? GraphQL::float() : GraphQL::int();
     }
 }
diff --git a/src/Fieldtypes/Relationship.php b/src/Fieldtypes/Relationship.php
index ef713c57618..d7cf287998c 100644
--- a/src/Fieldtypes/Relationship.php
+++ b/src/Fieldtypes/Relationship.php
@@ -7,7 +7,11 @@
 use Illuminate\Support\Collection;
 use Statamic\CP\Column;
 use Statamic\Facades\Scope;
+use Statamic\Facades\User;
 use Statamic\Fields\Fieldtype;
+use Statamic\Query\OrderBy;
+
+use function Statamic\trans as __;
 
 abstract class Relationship extends Fieldtype
 {
@@ -239,10 +243,24 @@ protected function getCreateItemUrl()
     public function getItemData($values)
     {
         return collect($values)->map(function ($id) {
-            return $this->toItemArray($id);
+            return $this->authorizeItemData($id)
+                ? $this->toItemArray($id)
+                : $this->invalidItemArray($id);
         })->values();
     }
 
+    protected function authorizeItemData($id): bool
+    {
+        // Fail-open so that we don't introduce a breaking change.
+        // Will change in an upcoming release.
+        return true;
+    }
+
+    protected function authorizeViewable($item): bool
+    {
+        return $item && User::current()->can('view', $item);
+    }
+
     public function getItemHint($item): ?string
     {
         return null;
@@ -312,7 +330,7 @@ public function filterExcludedItems($items, $exclusions)
 
     public function getSortColumn($request)
     {
-        return $request->get('sort');
+        return OrderBy::column($request->get('sort'));
     }
 
     public function getSortDirection($request)
@@ -348,7 +366,12 @@ public function toQueryableValue($value)
 
     protected function applyIndexQueryScopes($query, $params)
     {
-        collect(Arr::wrap($this->config('query_scopes')))
+        $handles = Arr::wrap($this->config('query_scopes'));
+
+        // Pass the active handles along so an aliased scope knows which is in effect.
+        $params = array_merge($params, ['queryScopes' => $handles]);
+
+        collect($handles)
             ->map(fn ($handle) => Scope::find($handle))
             ->filter()
             ->each(fn ($scope) => $scope->apply($query, $params));
diff --git a/src/Fieldtypes/Replicator.php b/src/Fieldtypes/Replicator.php
index 1692394433d..816098c086f 100644
--- a/src/Fieldtypes/Replicator.php
+++ b/src/Fieldtypes/Replicator.php
@@ -3,6 +3,7 @@
 namespace Statamic\Fieldtypes;
 
 use Facades\Statamic\Fieldtypes\RowId;
+use Statamic\Contracts\Data\Localization;
 use Statamic\Data\NestedFieldUpdater;
 use Statamic\Facades\Blink;
 use Statamic\Facades\GraphQL;
@@ -15,6 +16,8 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Replicator extends Fieldtype
 {
     use AddsEntryValidationReplacements, UpdatesReferences;
@@ -72,6 +75,7 @@ protected function configFieldItems(): array
                         'display' => __('Add Set Label'),
                         'instructions' => __('statamic::fieldtypes.replicator.config.button_label'),
                         'type' => 'text',
+                        'placeholder' => __('Add Set'),
                         'default' => '',
                         'width' => 50,
                     ],
@@ -133,7 +137,9 @@ protected function preProcessRow($row, $index)
     public function fields($set, $index = -1)
     {
         $config = Arr::get($this->flattenedSetsConfig(), "$set.fields");
-        $hash = md5($this->field->fieldPathPrefix().$index.json_encode($config));
+        $parent = $this->field->parent();
+        $locale = $parent instanceof Localization ? $parent->locale() : null;
+        $hash = md5($this->field->fieldPathPrefix().$index.json_encode($config).$locale);
 
         return Blink::once($hash, function () use ($config, $index) {
             return new Fields(
diff --git a/src/Fieldtypes/Revealer.php b/src/Fieldtypes/Revealer.php
index fdf0377c61a..41a69387439 100644
--- a/src/Fieldtypes/Revealer.php
+++ b/src/Fieldtypes/Revealer.php
@@ -4,6 +4,8 @@
 
 use Statamic\Fields\Fieldtype;
 
+use function Statamic\trans as __;
+
 class Revealer extends Fieldtype
 {
     protected $categories = ['controls', 'special'];
diff --git a/src/Fieldtypes/Select.php b/src/Fieldtypes/Select.php
index 35e273c04c2..28557ee7b98 100644
--- a/src/Fieldtypes/Select.php
+++ b/src/Fieldtypes/Select.php
@@ -4,6 +4,8 @@
 
 use Statamic\Fields\Fieldtype;
 
+use function Statamic\trans as __;
+
 class Select extends Fieldtype
 {
     use HasSelectOptions;
diff --git a/src/Fieldtypes/Sets.php b/src/Fieldtypes/Sets.php
index 466c05f238e..4448d8ebebe 100644
--- a/src/Fieldtypes/Sets.php
+++ b/src/Fieldtypes/Sets.php
@@ -12,6 +12,8 @@
 use Statamic\Statamic;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class Sets extends Fieldtype
 {
     protected $selectable = false;
diff --git a/src/Fieldtypes/Sites.php b/src/Fieldtypes/Sites.php
index 02c0c3a4291..86ff934cab7 100644
--- a/src/Fieldtypes/Sites.php
+++ b/src/Fieldtypes/Sites.php
@@ -3,11 +3,17 @@
 namespace Statamic\Fieldtypes;
 
 use Statamic\Facades\Site;
+use Statamic\Facades\User;
 
 class Sites extends Relationship
 {
     protected $indexComponent = 'text';
 
+    protected function authorizeItemData($id): bool
+    {
+        return $this->authorizeViewable(Site::get($id));
+    }
+
     public function toItemArray($id)
     {
         if ($site = Site::get($id)) {
@@ -22,12 +28,15 @@ public function toItemArray($id)
 
     public function getIndexItems($request)
     {
-        return Site::all()->sortBy('name')->map(function ($site) {
-            return [
-                'id' => $site->handle(),
-                'title' => $site->name(),
-            ];
-        })->values();
+        return Site::all()
+            ->filter(fn ($site) => User::current()->can('view', $site))
+            ->sortBy('name')
+            ->map(function ($site) {
+                return [
+                    'id' => $site->handle(),
+                    'title' => $site->name(),
+                ];
+            })->values();
     }
 
     public function augmentValue($value)
diff --git a/src/Fieldtypes/Slug.php b/src/Fieldtypes/Slug.php
index 6470f2f0242..7b2780c7cec 100644
--- a/src/Fieldtypes/Slug.php
+++ b/src/Fieldtypes/Slug.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\Fieldtypes;
 
+use function Statamic\trans as __;
+
 class Slug extends Text
 {
     protected $categories = ['special'];
diff --git a/src/Fieldtypes/Structures.php b/src/Fieldtypes/Structures.php
index 7577dd5df16..6b97dee1b18 100644
--- a/src/Fieldtypes/Structures.php
+++ b/src/Fieldtypes/Structures.php
@@ -4,6 +4,7 @@
 
 use Statamic\CP\Column;
 use Statamic\Facades\Structure;
+use Statamic\Facades\User;
 use Statamic\Structures\CollectionStructure;
 
 class Structures extends Relationship
@@ -12,6 +13,24 @@ class Structures extends Relationship
     protected $canCreate = false;
     protected $statusIcons = false;
 
+    protected function authorizeItemData($id): bool
+    {
+        return $this->authorizeStructure(Structure::find($id));
+    }
+
+    private function authorizeStructure($structure): bool
+    {
+        if (! $structure) {
+            return false;
+        }
+
+        if ($structure instanceof CollectionStructure) {
+            return User::current()->can('view', $structure->collection());
+        }
+
+        return User::current()->can('view', $structure);
+    }
+
     protected function toItemArray($id)
     {
         if ($structure = Structure::find($id)) {
@@ -26,12 +45,14 @@ protected function toItemArray($id)
 
     public function getIndexItems($request)
     {
-        return Structure::all()->map(function ($structure) {
-            return [
-                'id' => $this->getStructureId($structure),
-                'title' => $structure->title(),
-            ];
-        })->values();
+        return Structure::all()
+            ->filter(fn ($structure) => $this->authorizeStructure($structure))
+            ->map(function ($structure) {
+                return [
+                    'id' => $this->getStructureId($structure),
+                    'title' => $structure->title(),
+                ];
+            })->values();
     }
 
     public function augmentValue($value)
diff --git a/src/Fieldtypes/Table.php b/src/Fieldtypes/Table.php
index 1f1f87e3686..afe53bdf659 100644
--- a/src/Fieldtypes/Table.php
+++ b/src/Fieldtypes/Table.php
@@ -6,6 +6,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\GraphQL\Types\TableRowType;
 
+use function Statamic\trans as __;
+
 class Table extends Fieldtype
 {
     protected $categories = ['structured'];
diff --git a/src/Fieldtypes/Taggable.php b/src/Fieldtypes/Taggable.php
index e8144a6101a..5d87b4fffea 100644
--- a/src/Fieldtypes/Taggable.php
+++ b/src/Fieldtypes/Taggable.php
@@ -6,6 +6,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class Taggable extends Fieldtype
 {
     protected $categories = ['structured'];
diff --git a/src/Fieldtypes/Taxonomies.php b/src/Fieldtypes/Taxonomies.php
index fea2fc9eb44..acab397b6ca 100644
--- a/src/Fieldtypes/Taxonomies.php
+++ b/src/Fieldtypes/Taxonomies.php
@@ -5,6 +5,7 @@
 use Statamic\CP\Column;
 use Statamic\Facades\GraphQL;
 use Statamic\Facades\Taxonomy;
+use Statamic\Facades\User;
 use Statamic\GraphQL\Types\TaxonomyType;
 
 class Taxonomies extends Relationship
@@ -15,6 +16,11 @@ class Taxonomies extends Relationship
     protected $statusIcons = false;
     protected $icon = 'fieldtype-taxonomy';
 
+    protected function authorizeItemData($id): bool
+    {
+        return $this->authorizeViewable(Taxonomy::findByHandle($id));
+    }
+
     protected function toItemArray($id, $site = null)
     {
         if ($taxonomy = Taxonomy::findByHandle($id)) {
@@ -29,13 +35,16 @@ protected function toItemArray($id, $site = null)
 
     public function getIndexItems($request)
     {
-        return Taxonomy::all()->sortBy('title')->map(function ($taxonomy) {
-            return [
-                'id' => $taxonomy->handle(),
-                'title' => $taxonomy->title(),
-                'terms' => $taxonomy->queryTerms()->count(),
-            ];
-        })->values();
+        return Taxonomy::all()
+            ->filter(fn ($taxonomy) => User::current()->can('view', $taxonomy))
+            ->sortBy('title')
+            ->map(function ($taxonomy) {
+                return [
+                    'id' => $taxonomy->handle(),
+                    'title' => $taxonomy->title(),
+                    'terms' => $taxonomy->queryTerms()->count(),
+                ];
+            })->values();
     }
 
     protected function getColumns()
diff --git a/src/Fieldtypes/Template.php b/src/Fieldtypes/Template.php
index 338779fa8bb..8d00a1f0113 100644
--- a/src/Fieldtypes/Template.php
+++ b/src/Fieldtypes/Template.php
@@ -5,6 +5,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Query\Scopes\Filters\Fields\Template as TemplateFilter;
 
+use function Statamic\trans as __;
+
 class Template extends Fieldtype
 {
     protected $categories = ['special'];
diff --git a/src/Fieldtypes/TemplateFolder.php b/src/Fieldtypes/TemplateFolder.php
index d7002c87668..e59144ec559 100644
--- a/src/Fieldtypes/TemplateFolder.php
+++ b/src/Fieldtypes/TemplateFolder.php
@@ -13,6 +13,13 @@ class TemplateFolder extends Relationship
     protected $component = 'template_folder';
     protected $selectable = false;
 
+    // Intentionally ungated. Both funnels expose only relative template-folder
+    // names, and there is no permission concept for templates to authorize against.
+    protected function authorizeItemData($id): bool
+    {
+        return true;
+    }
+
     protected function toItemArray($id, $site = null)
     {
         return ['title' => $id, 'id' => $id];
@@ -20,6 +27,7 @@ protected function toItemArray($id, $site = null)
 
     public function getIndexItems($request)
     {
+        // Intentionally ungated. See authorizeItemData().
         return collect(config('view.paths'))->flatMap(function ($path) {
             return collect(new RecursiveIteratorIterator(
                 new RecursiveCallbackFilterIterator(
diff --git a/src/Fieldtypes/Terms.php b/src/Fieldtypes/Terms.php
index 07d1cd9cc28..1501d4c29c2 100644
--- a/src/Fieldtypes/Terms.php
+++ b/src/Fieldtypes/Terms.php
@@ -2,12 +2,12 @@
 
 namespace Statamic\Fieldtypes;
 
+use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
 use Statamic\Contracts\Data\Localization;
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Contracts\Taxonomies\Term as TermContract;
 use Statamic\CP\Column;
-use Statamic\Exceptions\AuthorizationException;
 use Statamic\Exceptions\TaxonomyNotFoundException;
 use Statamic\Exceptions\TermsFieldtypeBothOptionsUsedException;
 use Statamic\Exceptions\TermsFieldtypeTaxonomyOptionUsed;
@@ -21,9 +21,11 @@
 use Statamic\Facades\User;
 use Statamic\GraphQL\Types\TermInterface;
 use Statamic\Http\Resources\CP\Taxonomies\TermsFieldtypeTerms as TermsResource;
+use Statamic\Query\OrderBy;
 use Statamic\Query\OrderedQueryBuilder;
 use Statamic\Query\Scopes\Filter;
 use Statamic\Query\Scopes\Filters\Fields\Terms as TermsFilter;
+use Statamic\Statamic;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
@@ -288,7 +290,11 @@ public function getIndexItems($request)
             return collect();
         }
 
-        $this->authorizeTaxonomyAccess($this->getConfiguredTaxonomies());
+        // When the user can't view any of the configured taxonomies, return an empty result
+        // set instead of throwing. The picker treats this like the filter-to-viewable case.
+        if ($this->getViewableTaxonomies($this->getConfiguredTaxonomies())->isEmpty()) {
+            return collect();
+        }
 
         $query = $this->getIndexQuery($request);
 
@@ -296,31 +302,47 @@ public function getIndexItems($request)
             $query->orderBy($sort, $this->getSortDirection($request));
         }
 
-        return $request->boolean('paginate', true) ? $query->paginate() : $query->get();
+        return $request->boolean('paginate', true) ? $query->paginate($request->filled('perPage') ? Statamic::cpPerPage($request->integer('perPage')) : 15) : $query->get();
     }
 
-    private function authorizeTaxonomyAccess(array $taxonomies): void
+    private function getViewableTaxonomies(array $taxonomies): Collection
     {
         $user = User::current();
 
-        $authorizedTaxonomies = collect($taxonomies)
+        return collect($taxonomies)
             ->map(fn (string $taxonomyHandle) => Taxonomy::findByHandle($taxonomyHandle))
             ->filter()
             ->filter(fn ($taxonomy) => $user->can('view', $taxonomy));
-
-        throw_if($authorizedTaxonomies->isEmpty(), new AuthorizationException);
     }
 
     public function getResourceCollection($request, $items)
     {
+        // Derive columns only from a taxonomy the user can view. With none viewable, return
+        // empty data and no columns rather than leaking the structure of an unviewable blueprint.
+        if (! $taxonomy = $this->getColumnTaxonomy($request)) {
+            return JsonResource::collection($items)->additional(['meta' => ['columns' => []]]);
+        }
+
         return (new TermsResource($items, $this))
-            ->blueprint($this->getBlueprint($request))
-            ->columnPreferenceKey("taxonomies.{$this->getFirstTaxonomyFromRequest($request)->handle()}.columns");
+            ->blueprint($taxonomy->termBlueprint())
+            ->columnPreferenceKey("taxonomies.{$taxonomy->handle()}.columns");
     }
 
-    protected function getBlueprint($request)
+    protected function getBlueprint($request = null)
     {
-        return $this->getFirstTaxonomyFromRequest($request)->termBlueprint();
+        return $this->getColumnTaxonomy($request)?->termBlueprint();
+    }
+
+    protected function getColumnTaxonomy($request = null)
+    {
+        $taxonomy = $this->getFirstTaxonomyFromRequest($request);
+
+        // Only derive columns from a taxonomy the user can view. If the first configured
+        // taxonomy isn't viewable, fall back to the first viewable configured taxonomy,
+        // or none at all when the user can view none of them.
+        return User::current()->can('view', $taxonomy)
+            ? $taxonomy
+            : $this->getViewableTaxonomies($this->getConfiguredTaxonomies())->first();
     }
 
     protected function getFirstTaxonomyFromRequest($request)
@@ -336,7 +358,7 @@ protected function getFirstTaxonomyFromRequest($request)
 
     public function getSortColumn($request)
     {
-        $column = $request->get('sort');
+        $column = OrderBy::column($request->get('sort'));
 
         if (! $column && ! $request->search) {
             $column = 'title'; // todo: get from taxonomy or config
@@ -394,6 +416,15 @@ protected function getCreatables()
         })->all();
     }
 
+    protected function authorizeItemData($id): bool
+    {
+        if ($this->usingSingleTaxonomy() && ! Str::contains($id, '::')) {
+            $id = "{$this->taxonomies()[0]}::{$id}";
+        }
+
+        return $this->authorizeViewable(Term::find($id));
+    }
+
     protected function toItemArray($id)
     {
         if ($this->usingSingleTaxonomy() && ! Str::contains($id, '::')) {
@@ -440,11 +471,8 @@ protected function getColumns()
     protected function getIndexQuery($request)
     {
         $query = Term::query();
-        $user = User::current();
 
-        $taxonomies = collect($this->getConfiguredTaxonomies())
-            ->map(fn (string $taxonomyHandle) => Taxonomy::findByHandle($taxonomyHandle))
-            ->filter(fn ($taxonomy) => $taxonomy && $user->can('view', $taxonomy))
+        $taxonomies = $this->getViewableTaxonomies($this->getConfiguredTaxonomies())
             ->map->handle()
             ->all();
 
diff --git a/src/Fieldtypes/Text.php b/src/Fieldtypes/Text.php
index e4146b3403a..20783ce8110 100644
--- a/src/Fieldtypes/Text.php
+++ b/src/Fieldtypes/Text.php
@@ -5,6 +5,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Text extends Fieldtype
 {
     protected $categories = ['text'];
diff --git a/src/Fieldtypes/Textarea.php b/src/Fieldtypes/Textarea.php
index 5fb2794ce83..c6abfeb5704 100644
--- a/src/Fieldtypes/Textarea.php
+++ b/src/Fieldtypes/Textarea.php
@@ -5,6 +5,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Query\Scopes\Filters\Fields\Textarea as TextareaFilter;
 
+use function Statamic\trans as __;
+
 class Textarea extends Fieldtype
 {
     protected $categories = ['text'];
diff --git a/src/Fieldtypes/Time.php b/src/Fieldtypes/Time.php
index 028cf69e56b..1ccaab78be7 100644
--- a/src/Fieldtypes/Time.php
+++ b/src/Fieldtypes/Time.php
@@ -6,6 +6,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Rules\TimeFieldtype as ValidationRule;
 
+use function Statamic\trans as __;
+
 class Time extends Fieldtype
 {
     protected $categories = ['special'];
diff --git a/src/Fieldtypes/Toggle.php b/src/Fieldtypes/Toggle.php
index b497de84762..010e634b686 100644
--- a/src/Fieldtypes/Toggle.php
+++ b/src/Fieldtypes/Toggle.php
@@ -6,6 +6,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Query\Scopes\Filters\Fields\Toggle as ToggleFilter;
 
+use function Statamic\trans as __;
+
 class Toggle extends Fieldtype
 {
     protected $categories = ['controls'];
diff --git a/src/Fieldtypes/UserGroups.php b/src/Fieldtypes/UserGroups.php
index fe295dc4f1b..5d31cd631f7 100644
--- a/src/Fieldtypes/UserGroups.php
+++ b/src/Fieldtypes/UserGroups.php
@@ -4,6 +4,7 @@
 
 use Statamic\Facades\GraphQL;
 use Statamic\Facades\Scope;
+use Statamic\Facades\User;
 use Statamic\Facades\UserGroup;
 use Statamic\GraphQL\Types\UserGroupType;
 
@@ -15,6 +16,11 @@ class UserGroups extends Relationship
     protected $canCreate = false;
     protected $statusIcons = false;
 
+    protected function authorizeItemData($id): bool
+    {
+        return User::current()->can('assign user groups');
+    }
+
     protected function toItemArray($id, $site = null)
     {
         if ($group = UserGroup::find($id)) {
@@ -29,6 +35,10 @@ protected function toItemArray($id, $site = null)
 
     public function getIndexItems($request)
     {
+        if (! User::current()->can('assign user groups')) {
+            return collect();
+        }
+
         return UserGroup::all()->sortBy('title')->map(function ($group) {
             return [
                 'id' => $group->handle(),
diff --git a/src/Fieldtypes/UserRoles.php b/src/Fieldtypes/UserRoles.php
index 2dd0be07708..c7e8c88bf8f 100644
--- a/src/Fieldtypes/UserRoles.php
+++ b/src/Fieldtypes/UserRoles.php
@@ -5,6 +5,7 @@
 use Statamic\Facades\GraphQL;
 use Statamic\Facades\Role;
 use Statamic\Facades\Scope;
+use Statamic\Facades\User;
 use Statamic\GraphQL\Types\RoleType;
 
 use function Statamic\trans as __;
@@ -15,6 +16,11 @@ class UserRoles extends Relationship
     protected $canCreate = false;
     protected $statusIcons = false;
 
+    protected function authorizeItemData($id): bool
+    {
+        return User::current()->can('assign roles');
+    }
+
     protected function toItemArray($id, $site = null)
     {
         if ($role = Role::find($id)) {
@@ -41,6 +47,10 @@ public function preProcessIndex($data)
 
     public function getIndexItems($request)
     {
+        if (! User::current()->can('assign roles')) {
+            return collect();
+        }
+
         return Role::all()->sortBy('title')->map(function ($role) {
             return [
                 'id' => $role->handle(),
diff --git a/src/Fieldtypes/Users.php b/src/Fieldtypes/Users.php
index 6623d27e369..298771dc765 100644
--- a/src/Fieldtypes/Users.php
+++ b/src/Fieldtypes/Users.php
@@ -14,8 +14,11 @@
 use Statamic\Query\Scopes\Filter;
 use Statamic\Query\Scopes\Filters\Fields\User as UserFilter;
 use Statamic\Search\Result;
+use Statamic\Statamic;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class Users extends Relationship
 {
     protected $statusIcons = false;
@@ -99,6 +102,11 @@ public function preProcess($data)
         return parent::preProcess($data);
     }
 
+    protected function authorizeItemData($id): bool
+    {
+        return $this->authorizeViewable(User::find($id));
+    }
+
     protected function toItemArray($id, $site = null)
     {
         if ($user = User::find($id)) {
@@ -117,6 +125,12 @@ protected function toItemArray($id, $site = null)
 
     public function getIndexItems($request)
     {
+        // Don't reveal existence to a user who can't view the listing; return an empty
+        // result set instead of throwing, matching the picker's filter-to-viewable behavior.
+        if (! User::current()->can('index', UserContract::class)) {
+            return collect();
+        }
+
         $query = User::query();
 
         if ($search = $request->search) {
@@ -167,7 +181,7 @@ public function getIndexItems($request)
         };
 
         if ($request->boolean('paginate', true)) {
-            $users = $query->paginate();
+            $users = $query->paginate($request->filled('perPage') ? Statamic::cpPerPage($request->integer('perPage')) : 15);
 
             $users->getCollection()->transform($userFields);
 
@@ -240,7 +254,11 @@ public function augment($values)
     {
         $single = $this->config('max_items') === 1;
 
-        $ids = Arr::wrap($values);
+        $ids = collect(Arr::wrap($values))
+            ->map(fn ($id) => $id === 'current' ? User::current()?->id() : $id)
+            ->filter()
+            ->values()
+            ->all();
 
         $query = (new OrderedQueryBuilder(User::query(), $ids))->whereIn('id', $ids);
 
diff --git a/src/Fieldtypes/Video.php b/src/Fieldtypes/Video.php
index 0b2661aab32..5e12dbf48bf 100644
--- a/src/Fieldtypes/Video.php
+++ b/src/Fieldtypes/Video.php
@@ -4,6 +4,8 @@
 
 use Statamic\Fields\Fieldtype;
 
+use function Statamic\trans as __;
+
 class Video extends Fieldtype
 {
     protected $categories = ['media'];
diff --git a/src/Fieldtypes/Width.php b/src/Fieldtypes/Width.php
index f8e12f482c3..38793042f4a 100644
--- a/src/Fieldtypes/Width.php
+++ b/src/Fieldtypes/Width.php
@@ -4,6 +4,8 @@
 
 use Statamic\Fields\Fieldtype;
 
+use function Statamic\trans as __;
+
 class Width extends Fieldtype
 {
     use HasSelectOptions;
diff --git a/src/Fieldtypes/Yaml.php b/src/Fieldtypes/Yaml.php
index facbb4e866e..a13230bb6d6 100644
--- a/src/Fieldtypes/Yaml.php
+++ b/src/Fieldtypes/Yaml.php
@@ -6,6 +6,8 @@
 use Statamic\Fields\Fieldtype;
 use Statamic\Yaml\ParseException;
 
+use function Statamic\trans as __;
+
 class Yaml extends Fieldtype
 {
     protected $categories = ['special'];
diff --git a/src/Forms/DeleteTemporaryAttachments.php b/src/Forms/DeleteTemporaryAttachments.php
index 2905f270cd0..5d53ee938bb 100644
--- a/src/Forms/DeleteTemporaryAttachments.php
+++ b/src/Forms/DeleteTemporaryAttachments.php
@@ -22,11 +22,14 @@ public function __construct(public Submission $submission)
 
     public function handle()
     {
+        $disk = Storage::disk(config('statamic.system.file_uploads_disk', 'local'));
+        $basePath = config('statamic.system.file_uploads_path', 'statamic/file-uploads');
+
         $this->submission->form()->blueprint()->fields()->all()
             ->filter(fn (Field $field) => $field->type() === 'files')
-            ->each(function (Field $field) {
+            ->each(function (Field $field) use ($disk, $basePath) {
                 Collection::wrap($this->submission->get($field->handle(), []))
-                    ->each(fn ($path) => Storage::disk('local')->delete('statamic/file-uploads/'.$path));
+                    ->each(fn ($path) => $disk->delete($basePath.'/'.$path));
 
                 $this->submission->remove($field->handle());
             });
diff --git a/src/Forms/Email.php b/src/Forms/Email.php
index 013266d1d52..41adbc0566e 100644
--- a/src/Forms/Email.php
+++ b/src/Forms/Email.php
@@ -150,8 +150,11 @@ private function attachFiles($field)
             return;
         }
 
+        $disk = config('statamic.system.file_uploads_disk', 'local');
+        $basePath = config('statamic.system.file_uploads_path', 'statamic/file-uploads');
+
         foreach ($value as $file) {
-            $this->attachFromStorageDisk('local', 'statamic/file-uploads/'.$file);
+            $this->attachFromStorageDisk($disk, $basePath.'/'.$file);
         }
     }
 
diff --git a/src/Forms/Exceptions/BlueprintUndefinedException.php b/src/Forms/Exceptions/BlueprintUndefinedException.php
index 15a687e99ba..bd9bd407dab 100644
--- a/src/Forms/Exceptions/BlueprintUndefinedException.php
+++ b/src/Forms/Exceptions/BlueprintUndefinedException.php
@@ -9,6 +9,9 @@
 use Statamic\Forms\Form;
 use Statamic\Statamic;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class BlueprintUndefinedException extends LogicException implements ProvidesSolution
 {
     protected $form;
diff --git a/src/Forms/Exporters/CsvExporter.php b/src/Forms/Exporters/CsvExporter.php
index 202139874ce..9b8cc54b12e 100644
--- a/src/Forms/Exporters/CsvExporter.php
+++ b/src/Forms/Exporters/CsvExporter.php
@@ -2,10 +2,13 @@
 
 namespace Statamic\Forms\Exporters;
 
+use League\Csv\EscapeFormula;
 use League\Csv\Writer;
 use SplTempFileObject;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class CsvExporter extends Exporter
 {
     private Writer $writer;
@@ -15,6 +18,7 @@ public function export(): string
     {
         $this->writer = Writer::createFromFileObject(new SplTempFileObject);
         $this->writer->setDelimiter(Arr::get($this->config, 'delimiter', config('statamic.forms.csv_delimiter', ',')));
+        $this->writer->addFormatter(new EscapeFormula("'"));
 
         $this->insertHeaders();
 
@@ -37,7 +41,7 @@ private function insertHeaders()
 
     private function insertData()
     {
-        $data = $this->form->submissions()->map(function ($submission) {
+        $data = $this->submissions()->map(function ($submission) {
             $submission = $submission->toArray();
 
             $submission['date'] = (string) $submission['date'];
diff --git a/src/Forms/Exporters/Exporter.php b/src/Forms/Exporters/Exporter.php
index 518cafca6d3..1675bc4bd27 100644
--- a/src/Forms/Exporters/Exporter.php
+++ b/src/Forms/Exporters/Exporter.php
@@ -3,6 +3,7 @@
 namespace Statamic\Forms\Exporters;
 
 use Illuminate\Http\Response;
+use Illuminate\Support\Collection;
 use Statamic\Contracts\Forms\Form;
 use Statamic\Facades\File;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -15,6 +16,7 @@ abstract class Exporter
     protected array $config;
     protected string $handle;
     protected Form $form;
+    protected ?Collection $submissions = null;
 
     abstract public function export(): string;
 
@@ -25,6 +27,11 @@ public function setHandle(string $handle)
         return $this;
     }
 
+    public function handle(): string
+    {
+        return $this->handle;
+    }
+
     public function setConfig(array $config)
     {
         $this->config = $config;
@@ -39,6 +46,18 @@ public function setForm(Form $form)
         return $this;
     }
 
+    public function setSubmissions(Collection $submissions)
+    {
+        $this->submissions = $submissions;
+
+        return $this;
+    }
+
+    protected function submissions(): Collection
+    {
+        return $this->submissions ?? $this->form->submissions();
+    }
+
     public function contentType(): string
     {
         return 'text/plain';
diff --git a/src/Forms/Exporters/JsonExporter.php b/src/Forms/Exporters/JsonExporter.php
index b91ef490fc1..c9fc34b8ea3 100644
--- a/src/Forms/Exporters/JsonExporter.php
+++ b/src/Forms/Exporters/JsonExporter.php
@@ -8,7 +8,7 @@ class JsonExporter extends Exporter
 
     public function export(): string
     {
-        $submissions = $this->form->submissions()->toArray();
+        $submissions = $this->submissions()->toArray();
 
         return json_encode($submissions);
     }
diff --git a/src/Forms/Fieldtype.php b/src/Forms/Fieldtype.php
index ca931b84896..dd12b54e860 100644
--- a/src/Forms/Fieldtype.php
+++ b/src/Forms/Fieldtype.php
@@ -7,6 +7,7 @@
 use Statamic\Facades;
 use Statamic\Facades\GraphQL;
 use Statamic\Facades\Scope;
+use Statamic\Facades\User;
 use Statamic\Fieldtypes\Relationship;
 use Statamic\GraphQL\Types\FormType;
 use Statamic\Query\ItemQueryBuilder;
@@ -89,6 +90,11 @@ protected function getColumns()
         ];
     }
 
+    protected function authorizeItemData($id): bool
+    {
+        return $this->authorizeViewable(Facades\Form::find($id));
+    }
+
     protected function toItemArray($id, $site = null)
     {
         if ($form = Facades\Form::find($id)) {
@@ -104,7 +110,9 @@ protected function toItemArray($id, $site = null)
     public function getIndexItems($request)
     {
         $query = (new ItemQueryBuilder())
-            ->withItems(new DataCollection(Facades\Form::all()));
+            ->withItems(new DataCollection(
+                Facades\Form::all()->filter(fn ($form) => User::current()->can('view', $form))
+            ));
 
         if ($search = $request->search) {
             $query->where('title', 'like', '%'.$search.'%');
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index 4639858fb6d..f55244d94cb 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -8,6 +8,7 @@
 use Statamic\Contracts\Forms\Form as FormContract;
 use Statamic\Contracts\Forms\Submission;
 use Statamic\Contracts\Forms\SubmissionQueryBuilder;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Data\ContainsData;
 use Statamic\Data\HasAugmentedInstance;
 use Statamic\Events\FormBlueprintFound;
@@ -26,9 +27,10 @@
 use Statamic\Forms\Exporters\Exporter;
 use Statamic\Statamic;
 use Statamic\Support\Arr;
+use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
-class Form implements Arrayable, Augmentable, FormContract
+class Form implements Arrayable, Augmentable, ContainsQueryableValues, FormContract
 {
     use ContainsData, FluentlyGetsAndSets, HasAugmentedInstance;
 
@@ -447,4 +449,27 @@ public function exporter(string $handle): ?Exporter
     {
         return $this->exporters()->get($handle);
     }
+
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        $value = $this->get($field);
+
+        if (! $field = $this->blueprint()->field($field)) {
+            return $value;
+        }
+
+        return $field->fieldtype()->toQueryableValue($value);
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'actionUrl', 'apiUrl', 'blueprint', 'dateFormat', 'editUrl', 'fields',
+            'handle', 'honeypot', 'path', 'submissions', 'title',
+        ];
+    }
 }
diff --git a/src/Forms/Submission.php b/src/Forms/Submission.php
index 9d4be895880..1ce97715656 100644
--- a/src/Forms/Submission.php
+++ b/src/Forms/Submission.php
@@ -5,6 +5,7 @@
 use Carbon\Carbon;
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Forms\Submission as SubmissionContract;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Data\ContainsData;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedData;
@@ -21,9 +22,10 @@
 use Statamic\Facades\Stache;
 use Statamic\Forms\Uploaders\AssetsUploader;
 use Statamic\Forms\Uploaders\FilesUploader;
+use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
-class Submission implements Augmentable, SubmissionContract
+class Submission implements Augmentable, ContainsQueryableValues, SubmissionContract
 {
     use ContainsData, ExistsAsFile, FluentlyGetsAndSets, HasAugmentedData, TracksQueriedColumns, TracksQueriedRelations;
 
@@ -85,7 +87,7 @@ public function form($form = null)
     /**
      * Get the form fields.
      *
-     * @return array
+     * @return \Illuminate\Support\Collection<string, array>
      */
     public function fields()
     {
@@ -93,9 +95,9 @@ public function fields()
     }
 
     /**
-     * Get or set the columns.
+     * Get the columns.
      *
-     * @return array
+     * @return \Statamic\CP\Columns
      */
     public function columns()
     {
@@ -264,6 +266,28 @@ public function fileData()
         return $this->data()->all();
     }
 
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        $value = $this->get($field);
+
+        if (! $field = $this->blueprint()->field($field)) {
+            return $value;
+        }
+
+        return $field->fieldtype()->toQueryableValue($value);
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'blueprint', 'date', 'form', 'formattedDate', 'id', 'path',
+        ];
+    }
+
     public function __get($key)
     {
         return $this->get($key);
diff --git a/src/Forms/Uploaders/AssetsUploader.php b/src/Forms/Uploaders/AssetsUploader.php
index 1c4341ebf3e..c583604ad70 100644
--- a/src/Forms/Uploaders/AssetsUploader.php
+++ b/src/Forms/Uploaders/AssetsUploader.php
@@ -9,6 +9,9 @@
 use Statamic\Fieldtypes\Assets\UndefinedContainerException;
 use Statamic\Support\Arr;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class AssetsUploader
 {
     protected $config;
diff --git a/src/Forms/Uploaders/FilesUploader.php b/src/Forms/Uploaders/FilesUploader.php
index 5a575b39e00..619580c36d1 100644
--- a/src/Forms/Uploaders/FilesUploader.php
+++ b/src/Forms/Uploaders/FilesUploader.php
@@ -5,6 +5,9 @@
 use Statamic\Assets\FileUploader;
 use Statamic\Support\Arr;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class FilesUploader
 {
     protected $config;
diff --git a/src/Git/CommitCommand.php b/src/Git/CommitCommand.php
index cefcadd9fe2..ed944300e3d 100644
--- a/src/Git/CommitCommand.php
+++ b/src/Git/CommitCommand.php
@@ -34,15 +34,19 @@ class CommitCommand extends Command
     public function handle()
     {
         if (! config('statamic.git.enabled')) {
-            return $this->info(__('statamic::messages.git_disabled'));
+            $this->info(__('statamic::messages.git_disabled'));
+
+            return;
         }
 
         if (! Git::statuses()) {
-            return $this->info(__('statamic::messages.git_nothing_to_commit'));
+            $this->info(__('statamic::messages.git_nothing_to_commit'));
+
+            return;
         }
 
         Git::commit();
 
-        return $this->info(__('Content committed'));
+        $this->info(__('Content committed'));
     }
 }
diff --git a/src/Git/CommitJob.php b/src/Git/CommitJob.php
index 726443d76b4..31941328387 100644
--- a/src/Git/CommitJob.php
+++ b/src/Git/CommitJob.php
@@ -3,20 +3,27 @@
 namespace Statamic\Git;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Cache;
 use Statamic\Facades\Git;
 
-class CommitJob implements ShouldQueue
+use function Statamic\trans as __;
+
+class CommitJob implements ShouldBeUnique, ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;
 
+    public int $uniqueFor;
+
     /**
      * Create a new job instance.
      */
     public function __construct(public $message = null, public $committer = null)
     {
+        $this->uniqueFor = config('statamic.git.unique_lock_expiry', 120);
     }
 
     /**
@@ -24,6 +31,17 @@ public function __construct(public $message = null, public $committer = null)
      */
     public function handle()
     {
-        Git::as($this->committer)->commit($this->message);
+        $saves = Cache::pull('statamic-git-pending-saves', []);
+        $users = collect($saves)->unique('email')->values();
+        $coalesced = $users->count() > 1;
+
+        $message = $this->message;
+
+        if ($coalesced) {
+            $trailers = $users->map(fn ($u) => "Co-Authored-By: {$u['name']} <{$u['email']}>")->implode("\n");
+            $message = ($message ?? __('Content saved'))."\n\n".$trailers;
+        }
+
+        Git::as($coalesced ? null : $this->committer)->commit($message);
     }
 }
diff --git a/src/Git/Git.php b/src/Git/Git.php
index ad735447c58..994c0124a98 100644
--- a/src/Git/Git.php
+++ b/src/Git/Git.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
 use Statamic\Console\Processes\Git as GitProcess;
 use Statamic\Contracts\Auth\User as UserContract;
 use Statamic\Facades\Antlers;
@@ -12,6 +13,8 @@
 use Statamic\Facades\User;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Git
 {
     private ?UserContract $authenticatedUser;
@@ -91,6 +94,10 @@ public function dispatchCommit($message = null)
             $message = null;
         }
 
+        $saves = Cache::get('statamic-git-pending-saves', []);
+        $saves[] = ['name' => $this->gitUserName(), 'email' => $this->gitUserEmail()];
+        Cache::put('statamic-git-pending-saves', $saves);
+
         CommitJob::dispatch($message, $this->authenticatedUser())
             ->onConnection(config('statamic.git.queue_connection'))
             ->delay($delayInMinutes ?? null);
@@ -281,8 +288,11 @@ protected function shellEscape(string $string)
     {
         $string = str_replace('"', '', $string);
         $string = str_replace("'", '', $string);
+        $string = str_replace('\\', '\\\\', $string);
+        $string = str_replace('$', '\\$', $string);
+        $string = str_replace('`', '\\`', $string);
 
-        return escapeshellcmd($string);
+        return $string;
     }
 
     /**
diff --git a/src/Globals/GlobalSet.php b/src/Globals/GlobalSet.php
index 61de1318c66..285ea303db1 100644
--- a/src/Globals/GlobalSet.php
+++ b/src/Globals/GlobalSet.php
@@ -4,6 +4,7 @@
 
 use Statamic\Contracts\Globals\GlobalSet as Contract;
 use Statamic\Contracts\Globals\Variables;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Events\GlobalSetCreated;
 use Statamic\Events\GlobalSetCreating;
@@ -18,9 +19,10 @@
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Support\Arr;
+use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
-class GlobalSet implements Contract
+class GlobalSet implements ContainsQueryableValues, Contract
 {
     use ExistsAsFile, FluentlyGetsAndSets;
 
@@ -281,6 +283,22 @@ public function editBlueprintUrl()
         return cp_route('blueprints.globals.edit', $this->handle());
     }
 
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        return null;
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'blueprint', 'editUrl', 'handle', 'id', 'localizations', 'path', 'sites', 'title',
+        ];
+    }
+
     public static function __callStatic($method, $parameters)
     {
         return Facades\GlobalSet::{$method}(...$parameters);
diff --git a/src/Globals/Variables.php b/src/Globals/Variables.php
index 6a37138536c..ae0512188a9 100644
--- a/src/Globals/Variables.php
+++ b/src/Globals/Variables.php
@@ -10,6 +10,7 @@
 use Statamic\Contracts\Globals\GlobalSet;
 use Statamic\Contracts\Globals\Variables as Contract;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Data\ContainsData;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedInstance;
@@ -27,9 +28,10 @@
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\GraphQL\ResolvesValues;
+use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
-class Variables implements Arrayable, ArrayAccess, Augmentable, Contract, Localization, ResolvesValuesContract
+class Variables implements Arrayable, ArrayAccess, Augmentable, ContainsQueryableValues, Contract, Localization, ResolvesValuesContract
 {
     use ContainsData, ExistsAsFile, FluentlyGetsAndSets, HasAugmentedInstance, HasOrigin, ResolvesValues, TracksQueriedRelations;
 
@@ -289,4 +291,26 @@ public function fresh()
     {
         return Facades\GlobalSet::find($this->handle())->in($this->locale);
     }
+
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        $value = $this->value($field);
+
+        if (! $field = $this->blueprint()->field($field)) {
+            return $value;
+        }
+
+        return $field->fieldtype()->toQueryableValue($value);
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'blueprint', 'editUrl', 'handle', 'id', 'locale', 'path', 'reference', 'site', 'sites', 'title',
+        ];
+    }
 }
diff --git a/src/GraphQL/Manager.php b/src/GraphQL/Manager.php
index abf10241dbe..83e6be58934 100644
--- a/src/GraphQL/Manager.php
+++ b/src/GraphQL/Manager.php
@@ -23,12 +23,12 @@ public function getExtraTypeFields($type)
 
     public function addType($type)
     {
-        return GraphQL::addType($type);
+        GraphQL::addType($type);
     }
 
     public function addTypes($type)
     {
-        return GraphQL::addTypes($type);
+        GraphQL::addTypes($type);
     }
 
     public function type($type)
diff --git a/src/GraphQL/Queries/AssetsQuery.php b/src/GraphQL/Queries/AssetsQuery.php
index ff393d2bdd1..9b616ea3f37 100644
--- a/src/GraphQL/Queries/AssetsQuery.php
+++ b/src/GraphQL/Queries/AssetsQuery.php
@@ -13,6 +13,7 @@
 use Statamic\GraphQL\Queries\Concerns\FiltersQuery;
 use Statamic\GraphQL\Types\AssetInterface;
 use Statamic\GraphQL\Types\JsonArgument;
+use Statamic\Query\OrderBy;
 use Statamic\Support\Str;
 
 class AssetsQuery extends Query
@@ -69,7 +70,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }
 
diff --git a/src/GraphQL/Queries/EntriesQuery.php b/src/GraphQL/Queries/EntriesQuery.php
index 434ec3cf22f..b4c6b8e70ba 100644
--- a/src/GraphQL/Queries/EntriesQuery.php
+++ b/src/GraphQL/Queries/EntriesQuery.php
@@ -16,6 +16,7 @@
 use Statamic\GraphQL\Queries\Concerns\ScopesQuery;
 use Statamic\GraphQL\Types\EntryInterface;
 use Statamic\GraphQL\Types\JsonArgument;
+use Statamic\Query\OrderBy;
 use Statamic\Support\Str;
 
 class EntriesQuery extends Query
@@ -96,7 +97,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }
 
diff --git a/src/GraphQL/Queries/TermsQuery.php b/src/GraphQL/Queries/TermsQuery.php
index 7fb3ae0f705..90b8b39726f 100644
--- a/src/GraphQL/Queries/TermsQuery.php
+++ b/src/GraphQL/Queries/TermsQuery.php
@@ -13,6 +13,7 @@
 use Statamic\GraphQL\Queries\Concerns\FiltersQuery;
 use Statamic\GraphQL\Types\JsonArgument;
 use Statamic\GraphQL\Types\TermInterface;
+use Statamic\Query\OrderBy;
 use Statamic\Support\Str;
 
 class TermsQuery extends Query
@@ -76,7 +77,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }
 
diff --git a/src/GraphQL/Queries/UsersQuery.php b/src/GraphQL/Queries/UsersQuery.php
index 9cebad31950..21b1385c39b 100644
--- a/src/GraphQL/Queries/UsersQuery.php
+++ b/src/GraphQL/Queries/UsersQuery.php
@@ -11,6 +11,7 @@
 use Statamic\GraphQL\Queries\Concerns\FiltersQuery;
 use Statamic\GraphQL\Types\JsonArgument;
 use Statamic\GraphQL\Types\UserType;
+use Statamic\Query\OrderBy;
 use Statamic\Support\Str;
 
 class UsersQuery extends Query
@@ -65,7 +66,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }
 
diff --git a/src/GraphQL/ResponseCache/DefaultCache.php b/src/GraphQL/ResponseCache/DefaultCache.php
index d49014bce31..14a99190933 100644
--- a/src/GraphQL/ResponseCache/DefaultCache.php
+++ b/src/GraphQL/ResponseCache/DefaultCache.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\GraphQL\ResponseCache;
 
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Cache;
@@ -12,7 +13,13 @@ class DefaultCache implements ResponseCache
 {
     public function get(Request $request)
     {
-        return Cache::get($this->getCacheKey($request));
+        $cached = Cache::get($this->getCacheKey($request));
+
+        if (! is_array($cached)) {
+            return null;
+        }
+
+        return new JsonResponse($cached['content'], $cached['status'], $cached['headers'], json: true);
     }
 
     public function put(Request $request, $response)
@@ -21,7 +28,11 @@ public function put(Request $request, $response)
 
         $ttl = Carbon::now()->addMinutes((int) config('statamic.graphql.cache.expiry', 60));
 
-        Cache::put($key, $response, $ttl);
+        Cache::put($key, [
+            'content' => $response->getContent(),
+            'status' => $response->getStatusCode(),
+            'headers' => $response->headers->all(),
+        ], $ttl);
     }
 
     protected function track($request)
diff --git a/src/GraphQL/Types/ArrayType.php b/src/GraphQL/Types/ArrayType.php
index cdf8a13d3a5..325712cabd8 100644
--- a/src/GraphQL/Types/ArrayType.php
+++ b/src/GraphQL/Types/ArrayType.php
@@ -7,6 +7,9 @@
 use GraphQL\Type\Definition\Type;
 use Rebing\GraphQL\Support\Contracts\TypeConvertible;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class ArrayType extends ScalarType implements TypeConvertible
 {
     const NAME = 'Array';
diff --git a/src/GraphQL/Types/TreeBranchType.php b/src/GraphQL/Types/TreeBranchType.php
index 2a077c7502d..e1f48a80de9 100644
--- a/src/GraphQL/Types/TreeBranchType.php
+++ b/src/GraphQL/Types/TreeBranchType.php
@@ -6,6 +6,8 @@
 
 abstract class TreeBranchType extends \Rebing\GraphQL\Support\Type
 {
+    const NAME = '';
+
     public function __construct()
     {
         $this->attributes['name'] = static::NAME;
diff --git a/src/Hooks/CP/AssetsIndexQuery.php b/src/Hooks/CP/AssetsIndexQuery.php
new file mode 100644
index 00000000000..c68f84ae64c
--- /dev/null
+++ b/src/Hooks/CP/AssetsIndexQuery.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Statamic\Hooks\CP;
+
+use Statamic\Contracts\Assets\AssetContainer;
+use Statamic\Support\Traits\Hookable;
+
+class AssetsIndexQuery
+{
+    use Hookable;
+
+    public function __construct(private $query, private AssetContainer $container)
+    {
+        //
+    }
+
+    public function query()
+    {
+        $payload = $this->runHooksWith('query', [
+            'query' => $this->query,
+            'container' => $this->container,
+        ]);
+
+        return $payload->query;
+    }
+}
diff --git a/src/Http/Controllers/API/ApiController.php b/src/Http/Controllers/API/ApiController.php
index 3bbbc23dec5..66b1fbbf21d 100644
--- a/src/Http/Controllers/API/ApiController.php
+++ b/src/Http/Controllers/API/ApiController.php
@@ -8,6 +8,7 @@
 use Statamic\Facades\Scope;
 use Statamic\Facades\Site;
 use Statamic\Http\Controllers\Controller;
+use Statamic\Query\OrderBy;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 use Statamic\Tags\Concerns\QueriesConditions;
@@ -246,7 +247,9 @@ protected function sort($query)
                     $order = 'desc';
                 }
 
-                $query->orderBy($sort, $order);
+                if ($sort = OrderBy::column($sort)) {
+                    $query->orderBy($sort, $order);
+                }
             });
 
         return $this;
diff --git a/src/Http/Controllers/ActivateAccountController.php b/src/Http/Controllers/ActivateAccountController.php
index 5d3969b35d6..c0669429b32 100644
--- a/src/Http/Controllers/ActivateAccountController.php
+++ b/src/Http/Controllers/ActivateAccountController.php
@@ -7,6 +7,8 @@
 use Statamic\Http\Middleware\CP\HandleInertiaRequests;
 use Statamic\Http\Middleware\CP\RedirectIfAuthorized;
 
+use function Statamic\trans as __;
+
 class ActivateAccountController extends ResetPasswordController
 {
     public function __construct()
diff --git a/src/Http/Controllers/Auth/ElevatedSessionController.php b/src/Http/Controllers/Auth/ElevatedSessionController.php
new file mode 100644
index 00000000000..2f29548bf08
--- /dev/null
+++ b/src/Http/Controllers/Auth/ElevatedSessionController.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace Statamic\Http\Controllers\Auth;
+
+use Illuminate\Http\Exceptions\HttpResponseException;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\ValidationException;
+use Inertia\Inertia;
+use Statamic\Auth\WebAuthn\Serializer;
+use Statamic\Facades\User;
+use Statamic\Facades\WebAuthn;
+use Statamic\Http\Controllers\Controller;
+use Statamic\Http\Requests\Auth\ElevatedSessionConfirmationRequest;
+
+use function Statamic\trans as __;
+
+class ElevatedSessionController extends Controller
+{
+    public function showForm(Request $request)
+    {
+        if ($customUrl = config('statamic.users.elevated_sessions_url')) {
+            return redirect()->to($customUrl);
+        }
+
+        $user = User::current();
+        $method = $user->getElevatedSessionMethod();
+
+        if ($method === 'verification_code') {
+            session()->sendElevatedSessionVerificationCodeIfRequired();
+        }
+
+        return Inertia::render('auth/ConfirmPassword', [
+            'outside' => true,
+            'method' => $method,
+            'allowPasskey' => $method !== 'verification_code' && $user->passkeys()->isNotEmpty(),
+            'status' => session('status'),
+            'submitUrl' => route('statamic.elevated-session.confirm'),
+            'resendUrl' => route('statamic.elevated-session.resend-code'),
+            'passkeyOptionsUrl' => route('statamic.elevated-session.passkey-options'),
+        ]);
+    }
+
+    public function confirm(ElevatedSessionConfirmationRequest $request)
+    {
+        $user = User::current();
+
+        $this->validatePasswordConfirmation($request, $user);
+        $this->validateVerificationCodeConfirmation($request);
+        $this->validatePasskeyConfirmation($request, $user);
+
+        session()->elevate();
+
+        return $this->buildConfirmResponse($request, $user);
+    }
+
+    protected function buildConfirmResponse(Request $request, $user)
+    {
+        $message = $user->getElevatedSessionMethod() === 'password_confirmation'
+            ? __('Password confirmed')
+            : __('Code verified');
+
+        $redirect = redirect()->intended(route('statamic.site'));
+
+        if ($request->wantsJson()) {
+            return response()->json([
+                'elevated' => true,
+                'expiry' => $request->getElevatedSessionExpiry(),
+                'redirect' => $redirect->getTargetUrl(),
+            ]);
+        }
+
+        return $request->inertia()
+            ? Inertia::location($redirect->getTargetUrl())
+            : $redirect->with('success', $message);
+    }
+
+    public function options()
+    {
+        $options = WebAuthn::prepareAssertion();
+
+        return app(Serializer::class)->normalize($options);
+    }
+
+    public function resendCode()
+    {
+        if (User::current()->getElevatedSessionMethod() !== 'verification_code') {
+            throw ValidationException::withMessages([
+                'method' => __('statamic::validation.elevated_session_resend_code_unavailable'),
+            ]);
+        }
+
+        session()->sendElevatedSessionVerificationCode();
+
+        return back()->with('status', __('statamic::messages.elevated_session_verification_code_sent'));
+    }
+
+    private function validatePasswordConfirmation(Request $request, $user): void
+    {
+        if (! $request->filled('password')) {
+            return;
+        }
+
+        if (Hash::check($request->password, $user->password())) {
+            return;
+        }
+
+        $this->throwValidationException($request, [
+            'password' => [__('statamic::validation.current_password')],
+        ]);
+    }
+
+    private function validateVerificationCodeConfirmation(Request $request): void
+    {
+        if (! $request->filled('verification_code')) {
+            return;
+        }
+
+        $verificationCode = $request->verification_code;
+        $storedVerificationCode = $request->getElevatedSessionVerificationCode();
+
+        if (
+            is_string($verificationCode)
+            && is_string($storedVerificationCode)
+            && hash_equals($storedVerificationCode, $verificationCode)
+        ) {
+            return;
+        }
+
+        $this->throwValidationException($request, [
+            'verification_code' => [__('statamic::validation.elevated_session_verification_code')],
+        ]);
+    }
+
+    protected function throwValidationException(Request $request, array $errors): never
+    {
+        if ($request->wantsJson() || $request->inertia()) {
+            throw ValidationException::withMessages($errors);
+        }
+
+        throw new HttpResponseException(
+            back()->withInput()->withErrors($errors, 'user.elevated_session')
+        );
+    }
+
+    private function validatePasskeyConfirmation(Request $request, $user): void
+    {
+        if (! $request->filled('id')) {
+            return;
+        }
+
+        $credentials = $request->only(['id', 'rawId', 'response', 'type']);
+        WebAuthn::validateAssertion($user, $credentials);
+    }
+}
diff --git a/src/Http/Controllers/CP/ActionController.php b/src/Http/Controllers/CP/ActionController.php
index 205dcc7de3d..de55b5d2abf 100644
--- a/src/Http/Controllers/CP/ActionController.php
+++ b/src/Http/Controllers/CP/ActionController.php
@@ -9,6 +9,8 @@
 use Statamic\Support\Arr;
 use Symfony\Component\HttpFoundation\Response;
 
+use function Statamic\trans as __;
+
 abstract class ActionController extends CpController
 {
     public function run(Request $request)
diff --git a/src/Http/Controllers/CP/Assets/AssetContainersController.php b/src/Http/Controllers/CP/Assets/AssetContainersController.php
index 7d360d2fb77..42e08525a99 100644
--- a/src/Http/Controllers/CP/Assets/AssetContainersController.php
+++ b/src/Http/Controllers/CP/Assets/AssetContainersController.php
@@ -10,6 +10,8 @@
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Rules\Handle;
 
+use function Statamic\trans as __;
+
 class AssetContainersController extends CpController
 {
     public function show($container)
@@ -186,6 +188,7 @@ protected function formBlueprint($container = null)
                         'type' => 'taggable',
                         'display' => __('Validation Rules'),
                         'instructions' => __('statamic::messages.asset_container_validation_rules_instructions'),
+                        'paste_delimiter' => '|',
                     ],
                 ],
             ],
diff --git a/src/Http/Controllers/CP/Assets/AssetsController.php b/src/Http/Controllers/CP/Assets/AssetsController.php
index a4bb8b4ffa0..8aeb7585c95 100644
--- a/src/Http/Controllers/CP/Assets/AssetsController.php
+++ b/src/Http/Controllers/CP/Assets/AssetsController.php
@@ -4,6 +4,7 @@
 
 use Facades\Statamic\Fields\Validator as FieldValidator;
 use Illuminate\Http\Request;
+use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use Inertia\Inertia;
@@ -12,6 +13,7 @@
 use Statamic\Contracts\Assets\Asset as AssetContract;
 use Statamic\Contracts\Assets\AssetContainer as AssetContainerContract;
 use Statamic\Contracts\Assets\AssetFolder;
+use Statamic\CP\Assets\CropProcessor;
 use Statamic\Exceptions\AuthorizationException;
 use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Facades\Asset;
@@ -22,6 +24,8 @@
 use Statamic\Rules\AllowedFile;
 use Statamic\Rules\UploadableAssetPath;
 
+use function Statamic\trans as __;
+
 class AssetsController extends CpController
 {
     use RedirectsToFirstAssetContainer;
@@ -133,6 +137,96 @@ public function store(Request $request)
         return new AssetResource($asset);
     }
 
+    public function crop(Request $request, $encodedAsset)
+    {
+        $asset = Asset::find(base64_decode($encodedAsset));
+
+        abort_if(! $asset, 404);
+
+        $this->authorize('view', $asset);
+
+        abort_unless($asset->isImage(), 422, __('The asset is not an image.'));
+
+        $request->validate([
+            'x' => 'required|integer|min:0',
+            'y' => 'required|integer|min:0',
+            'width' => 'required|integer|min:1',
+            'height' => 'required|integer|min:1',
+            'quality' => 'nullable|integer|min:1|max:100',
+            'format' => 'nullable|in:jpg,jpeg,png,webp,gif,avif',
+            'background' => 'nullable|in:black,white',
+            'replace' => 'boolean',
+        ]);
+
+        $replace = $request->boolean('replace');
+        $extension = strtolower($request->input('format') ?: $asset->extension());
+
+        // Changing the format produces a different file extension, which can't
+        // overwrite the original. It can only be saved as a new copy.
+        abort_if($replace && $this->normalizeExtension($extension) !== $this->normalizeExtension($asset->extension()), 422, __('statamic::messages.crop_replace_unavailable_format'));
+
+        $replace
+            ? $this->authorize('reupload', $asset)
+            : $this->authorize('store', [AssetContract::class, $asset->container()]);
+
+        $contents = app(CropProcessor::class)->crop(
+            $asset->contents(),
+            $extension,
+            $request->integer('x'),
+            $request->integer('y'),
+            $request->integer('width'),
+            $request->integer('height'),
+            $request->filled('quality') ? $request->integer('quality') : null,
+            $request->input('background') === 'black' ? '000000' : 'ffffff',
+        );
+
+        // When replacing, reuse the original basename verbatim so the extension
+        // matches exactly (Asset::extension() isn't lowercased, and ".jpeg" stays
+        // ".jpeg"), otherwise reupload() throws a FileExtensionMismatch.
+        $basename = $replace
+            ? $asset->basename()
+            : pathinfo($asset->basename(), PATHINFO_FILENAME).'.'.$extension;
+
+        $tempPath = tempnam(sys_get_temp_dir(), 'statamic-crop');
+        file_put_contents($tempPath, $contents);
+
+        $file = new UploadedFile($tempPath, $basename, test: true);
+
+        try {
+            $this->validateCroppedFile($file, $asset->container());
+
+            if ($replace) {
+                $asset->reupload(new UploadedReplacementFile($file));
+            } else {
+                $path = ltrim($asset->folder().'/'.$basename, '/');
+                $asset = $asset->container()->makeAsset($path)->upload($file);
+            }
+        } finally {
+            @unlink($tempPath);
+        }
+
+        return new AssetResource($asset);
+    }
+
+    private function validateCroppedFile(UploadedFile $file, AssetContainerContract $container): void
+    {
+        $rules = collect($container->validationRules())
+            ->map(fn ($rule) => FieldValidator::parse($rule))
+            ->all();
+
+        Validator::make(
+            ['file' => $file],
+            ['file' => array_merge(['file', new AllowedFile], $rules)]
+        )->validate();
+    }
+
+    private function normalizeExtension($extension)
+    {
+        $extension = strtolower($extension);
+
+        return $extension === 'jpeg' ? 'jpg' : $extension;
+    }
+
     public function download($asset)
     {
         $asset = Asset::find(base64_decode($asset));
diff --git a/src/Http/Controllers/CP/Assets/BrowserController.php b/src/Http/Controllers/CP/Assets/BrowserController.php
index be0cb9b9945..0a48fc9674f 100644
--- a/src/Http/Controllers/CP/Assets/BrowserController.php
+++ b/src/Http/Controllers/CP/Assets/BrowserController.php
@@ -13,15 +13,20 @@
 use Statamic\Facades\Asset;
 use Statamic\Facades\Scope;
 use Statamic\Facades\User;
+use Statamic\Hooks\CP\AssetsIndexQuery;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Http\Requests\FilteredRequest;
 use Statamic\Http\Resources\CP\Assets\Folder;
 use Statamic\Http\Resources\CP\Assets\FolderAsset;
 use Statamic\Http\Resources\CP\Assets\SearchedAssetsCollection;
 use Statamic\Http\Resources\CP\Concerns\HasRequestedColumns;
+use Statamic\Query\OrderBy;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
+use Statamic\Statamic;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class BrowserController extends CpController
 {
     use HasRequestedColumns, QueriesFilters, RedirectsToFirstAssetContainer;
@@ -98,18 +103,18 @@ public function folder(Request $request, $container, $path = '/')
         $this->authorize('view', $container);
 
         $folder = $container->assetFolder($path);
-        $perPage = $request->perPage ?? config('statamic.cp.pagination_size');
+        $perPage = Statamic::cpPerPage($request->perPage) ?? config('statamic.cp.pagination_size');
         $page = Paginator::resolveCurrentPage();
 
         $folders = $folder->assetFolders();
         $totalFolders = $folders->count();
         $lastFolderPage = (int) ceil($totalFolders / $perPage) ?: 1;
 
-        $totalAssets = $folder->queryAssets()->count();
+        $query = (new AssetsIndexQuery($folder->queryAssets(), $container))->query();
+        $totalAssets = $query->count();
         $totalItems = $totalAssets + $totalFolders;
 
-        if ($request->sort) {
-            $sort = $request->sort;
+        if ($sort = OrderBy::column($request->sort)) {
             $order = $request->order ?? 'asc';
         } else {
             $sort = $container->sortField();
@@ -119,13 +124,12 @@ public function folder(Request $request, $container, $path = '/')
         $sortByMethod = $order === 'desc' ? 'sortByDesc' : 'sortBy';
 
         $folders = $folders->$sortByMethod(
-            fn (AssetFolder $folder) => method_exists($folder, $sort) ? $folder->$sort() : $folder->basename()
+            fn (AssetFolder $folder) => in_array($sort, ['basename', 'title', 'lastModified', 'size', 'count', 'path']) ? $folder->$sort() : $folder->basename()
         );
 
         $folders = $folders->slice(($page - 1) * $perPage, $perPage);
 
         if ($page >= $lastFolderPage) {
-            $query = $folder->queryAssets();
             $query->orderBy($sort, $order);
             $this->applyQueryScopes($query, $request->all());
 
@@ -190,8 +194,10 @@ public function search(FilteredRequest $request, $container, $path = null)
             $query->where('folder', $path);
         }
 
-        if ($request->sort) {
-            $query->orderBy($request->sort, $request->order ?? 'asc');
+        $query = (new AssetsIndexQuery($query, $container))->query();
+
+        if ($sort = OrderBy::column($request->sort)) {
+            $query->orderBy($sort, $request->order ?? 'asc');
         }
 
         $this->applyQueryScopes($query, $request->all());
@@ -201,7 +207,7 @@ public function search(FilteredRequest $request, $container, $path = null)
             'folder' => $path,
         ]);
 
-        $assets = $query->paginate(request('perPage'));
+        $assets = $query->paginate(Statamic::cpPerPage(request('perPage')));
 
         if ($request->search && $container->hasSearchIndex()) {
             $assets->setCollection($assets->getCollection()->map->getSearchable());
diff --git a/src/Http/Controllers/CP/Assets/FoldersController.php b/src/Http/Controllers/CP/Assets/FoldersController.php
index cb4d7af9540..b0df4e32b85 100644
--- a/src/Http/Controllers/CP/Assets/FoldersController.php
+++ b/src/Http/Controllers/CP/Assets/FoldersController.php
@@ -11,6 +11,8 @@
 use Statamic\Http\Resources\CP\Assets\Folder;
 use Statamic\Rules\AlphaDashSpace;
 
+use function Statamic\trans as __;
+
 class FoldersController extends CpController
 {
     public function store(Request $request, $container)
diff --git a/src/Http/Controllers/CP/Auth/ElevatedSessionController.php b/src/Http/Controllers/CP/Auth/ElevatedSessionController.php
index 44e0705028c..0b46401020a 100644
--- a/src/Http/Controllers/CP/Auth/ElevatedSessionController.php
+++ b/src/Http/Controllers/CP/Auth/ElevatedSessionController.php
@@ -3,15 +3,14 @@
 namespace Statamic\Http\Controllers\CP\Auth;
 
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\ValidationException;
 use Inertia\Inertia;
-use Statamic\Auth\WebAuthn\Serializer;
 use Statamic\Facades\User;
-use Statamic\Facades\WebAuthn;
-use Statamic\Http\Requests\CP\Auth\ElevatedSessionConfirmationRequest;
+use Statamic\Http\Controllers\Auth\ElevatedSessionController as BaseController;
 
-class ElevatedSessionController
+use function Statamic\trans as __;
+
+class ElevatedSessionController extends BaseController
 {
     public function status(Request $request)
     {
@@ -30,14 +29,7 @@ public function status(Request $request)
         return $response;
     }
 
-    public function options()
-    {
-        $options = WebAuthn::prepareAssertion();
-
-        return app(Serializer::class)->normalize($options);
-    }
-
-    public function showForm()
+    public function showForm(Request $request)
     {
         $user = User::current();
 
@@ -46,6 +38,7 @@ public function showForm()
         }
 
         return Inertia::render('auth/ConfirmPassword', [
+            'outside' => false,
             'method' => $method,
             'status' => session('status'),
             'allowPasskey' => $method !== 'verification_code' && $user->passkeys()->isNotEmpty(),
@@ -55,78 +48,27 @@ public function showForm()
         ]);
     }
 
-    public function confirm(ElevatedSessionConfirmationRequest $request)
+    protected function buildConfirmResponse(Request $request, $user)
     {
-        $user = User::current();
-
-        $this->validatePasswordConfirmation($request, $user);
-        $this->validateVerificationCodeConfirmation($request);
-        $this->validatePasskeyConfirmation($request, $user);
-
-        session()->elevate();
-
         $redirect = redirect()->intended(cp_route('index'));
 
-        return $request->wantsJson()
-            ? array_merge($this->status($request), ['redirect' => $redirect->getTargetUrl()])
-            : $redirect->with('success', $user->getElevatedSessionMethod() === 'password_confirmation' ? __('Password confirmed') : __('Code verified'));
-    }
-
-    private function validatePasswordConfirmation(Request $request, $user): void
-    {
-        if (! $request->filled('password')) {
-            return;
-        }
-
-        if (Hash::check($request->password, $user->password())) {
-            return;
-        }
-
-        throw ValidationException::withMessages([
-            'password' => [__('statamic::validation.current_password')],
-        ]);
-    }
-
-    private function validateVerificationCodeConfirmation(Request $request): void
-    {
-        if (! $request->filled('verification_code')) {
-            return;
-        }
-
-        $verificationCode = $request->verification_code;
-        $storedVerificationCode = $request->getElevatedSessionVerificationCode();
-
-        if (
-            is_string($verificationCode)
-            && is_string($storedVerificationCode)
-            && hash_equals($storedVerificationCode, $verificationCode)
-        ) {
-            return;
-        }
-
-        throw ValidationException::withMessages([
-            'verification_code' => [__('statamic::validation.elevated_session_verification_code')],
-        ]);
-    }
-
-    private function validatePasskeyConfirmation(Request $request, $user): void
-    {
-        if (! $request->filled('id')) {
-            return;
+        if ($request->wantsJson()) {
+            return array_merge(
+                $this->status($request),
+                ['redirect' => $redirect->getTargetUrl()]
+            );
         }
 
-        $credentials = $request->only(['id', 'rawId', 'response', 'type']);
-        WebAuthn::validateAssertion($user, $credentials);
+        return $redirect->with(
+            'success',
+            $user->getElevatedSessionMethod() === 'password_confirmation'
+                ? __('Password confirmed')
+                : __('Code verified')
+        );
     }
 
-    public function resendCode()
+    protected function throwValidationException(Request $request, array $errors): never
     {
-        if (User::current()->getElevatedSessionMethod() !== 'verification_code') {
-            throw ValidationException::withMessages(['method' => 'Resend code is only available for verification code method']);
-        }
-
-        session()->sendElevatedSessionVerificationCode();
-
-        return back()->with('success', __('statamic::messages.elevated_session_verification_code_sent'));
+        throw ValidationException::withMessages($errors);
     }
 }
diff --git a/src/Http/Controllers/CP/Auth/LoginController.php b/src/Http/Controllers/CP/Auth/LoginController.php
index 40bf97362ea..736077df7cd 100644
--- a/src/Http/Controllers/CP/Auth/LoginController.php
+++ b/src/Http/Controllers/CP/Auth/LoginController.php
@@ -7,6 +7,7 @@
 use Illuminate\Validation\ValidationException;
 use Inertia\Inertia;
 use Statamic\Facades\OAuth;
+use Statamic\Facades\TwoFactor;
 use Statamic\Facades\URL;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\Concerns\HandlesLogins;
@@ -14,8 +15,8 @@
 use Statamic\Http\Middleware\CP\RedirectIfAuthorized;
 use Statamic\OAuth\Provider;
 use Statamic\Statamic;
-use Statamic\Support\Str;
 
+use function Statamic\trans;
 use function Statamic\trans as __;
 
 class LoginController extends CpController
@@ -42,7 +43,6 @@ public function showLoginForm(Request $request)
             'oauthEnabled' => $oauthEnabled,
             'emailLoginEnabled' => $emailLoginEnabled,
             'providers' => $oauthEnabled ? $this->oauthProviders() : [],
-            'referer' => $this->getReferrer($request),
             'forgotPasswordUrl' => cp_route('password.request'),
             'submitUrl' => cp_route('login'),
             'passkeyOptionsUrl' => cp_route('passkeys.auth.options'),
@@ -69,13 +69,13 @@ public function login(Request $request)
             'password' => 'required|string',
         ]);
 
-        $this->checkPasskeyEnforcement($request);
-
         $this->handleTooManyLoginAttempts($request);
 
+        $this->checkPasskeyEnforcement($request);
+
         $user = User::fromUser($this->validateCredentials($request));
 
-        if ($user->hasEnabledTwoFactorAuthentication()) {
+        if (TwoFactor::enabled() && $user->hasEnabledTwoFactorAuthentication()) {
             return $this->twoFactorChallengeResponse($request, $user);
         }
 
@@ -106,18 +106,18 @@ protected function fireFailedEvent($request, $user = null)
 
     public function redirectPath()
     {
-        $cp = cp_route('index');
-        $referer = request('referer');
-        $referredFromCp = Str::startsWith($referer, $cp) && ! Str::startsWith($referer, $cp.'/auth/');
-
-        return $referredFromCp ? $referer : $cp;
+        return cp_route('index');
     }
 
     protected function authenticated(Request $request, $user)
     {
-        return $request->expectsJson()
-            ? response('Authenticated')
-            : redirect()->intended($this->redirectPath());
+        if ($request->expectsJson()) {
+            return response('Authenticated');
+        }
+
+        $url = redirect()->intended($this->redirectPath())->getTargetUrl();
+
+        return $request->inertia() ? Inertia::location($url) : redirect($url);
     }
 
     protected function credentials(Request $request)
@@ -143,13 +143,6 @@ public function logout(Request $request)
         return redirect(URL::isExternalToApplication($redirect) ? '/' : $redirect);
     }
 
-    protected function getReferrer()
-    {
-        $referrer = url()->previous();
-
-        return $referrer === cp_route('unauthorized') ? cp_route('index') : $referrer;
-    }
-
     public function username()
     {
         return 'email';
@@ -157,14 +150,20 @@ public function username()
 
     private function checkPasskeyEnforcement(Request $request)
     {
-        if (! config('statamic.webauthn.allow_password_login_with_passkey', true)) {
-            if ($user = User::findByEmail($request->get($this->username()))) {
-                if ($user->passkeys()->isNotEmpty()) {
-                    throw ValidationException::withMessages([
-                        $this->username() => [trans('statamic::messages.password_passkeys_only')],
-                    ]);
-                }
-            }
+        if (config('statamic.webauthn.allow_password_login_with_passkey', true)) {
+            return;
+        }
+
+        if (! $user = User::findByEmail($request->get($this->username()))) {
+            return;
         }
+
+        if ($user->passkeys()->isEmpty()) {
+            return;
+        }
+
+        throw ValidationException::withMessages([
+            $this->username() => [trans('statamic::messages.password_passkeys_only')],
+        ]);
     }
 }
diff --git a/src/Http/Controllers/CP/Auth/OAuthController.php b/src/Http/Controllers/CP/Auth/OAuthController.php
new file mode 100644
index 00000000000..4a4bbce44f0
--- /dev/null
+++ b/src/Http/Controllers/CP/Auth/OAuthController.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Auth;
+
+use Inertia\Inertia;
+use Statamic\Facades\OAuth;
+use Statamic\Facades\User;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\OAuth\Provider;
+use Statamic\Statamic;
+
+class OAuthController extends CpController
+{
+    public function index()
+    {
+        abort_unless(OAuth::enabled(), 404);
+
+        $user = User::current();
+        $redirect = parse_url(cp_route('oauth'))['path'];
+
+        return Inertia::render('users/OAuth', [
+            'providers' => OAuth::providers()
+                ->reject(fn (Provider $provider) => $provider->isStateless())
+                ->map(fn (Provider $provider) => [
+                    'name' => $provider->name(),
+                    'label' => $provider->label(),
+                    'icon' => Statamic::svg('oauth/'.$provider->name()),
+                    'connected' => $provider->isConnectedTo($user),
+                    'connectUrl' => $provider->loginUrl().'?redirect='.$redirect,
+                    'disconnectUrl' => cp_route('oauth.disconnect', $provider->name()),
+                ])->values(),
+        ]);
+    }
+}
diff --git a/src/Http/Controllers/CP/Auth/PasskeyController.php b/src/Http/Controllers/CP/Auth/PasskeyController.php
index 85c4ab9b355..7f6181d3f31 100644
--- a/src/Http/Controllers/CP/Auth/PasskeyController.php
+++ b/src/Http/Controllers/CP/Auth/PasskeyController.php
@@ -2,15 +2,12 @@
 
 namespace Statamic\Http\Controllers\CP\Auth;
 
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Inertia\Inertia;
-use Statamic\Auth\WebAuthn\Serializer;
 use Statamic\Contracts\Auth\Passkey;
 use Statamic\Facades\User;
-use Statamic\Facades\WebAuthn;
+use Statamic\Http\Controllers\User\PasskeyController as Controller;
 
-class PasskeyController
+class PasskeyController extends Controller
 {
     public function index()
     {
@@ -26,31 +23,4 @@ public function index()
             'storeUrl' => cp_route('passkeys.store'),
         ]);
     }
-
-    public function create()
-    {
-        $options = WebAuthn::prepareAttestation(User::current());
-
-        return app(Serializer::class)->normalize($options);
-    }
-
-    public function store(Request $request)
-    {
-        $credentials = $request->only(['id', 'rawId', 'response', 'type']);
-
-        WebAuthn::validateAttestation(User::current(), $credentials, $request->name);
-
-        return ['verified' => true];
-    }
-
-    public function destroy($id)
-    {
-        if (! $passkey = User::current()->passkeys()->get($id)) {
-            abort(403);
-        }
-
-        $passkey->delete();
-
-        return new JsonResponse([], 201);
-    }
 }
diff --git a/src/Http/Controllers/CP/Auth/PasskeyLoginController.php b/src/Http/Controllers/CP/Auth/PasskeyLoginController.php
index bf4ca0350b2..b69452033f9 100644
--- a/src/Http/Controllers/CP/Auth/PasskeyLoginController.php
+++ b/src/Http/Controllers/CP/Auth/PasskeyLoginController.php
@@ -2,50 +2,12 @@
 
 namespace Statamic\Http\Controllers\CP\Auth;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Statamic\Auth\WebAuthn\Serializer;
-use Statamic\Contracts\Auth\User as UserContract;
-use Statamic\Facades\URL;
-use Statamic\Facades\WebAuthn;
-use Statamic\Support\Str;
+use Statamic\Http\Controllers\User\PasskeyLoginController as Controller;
 
-class PasskeyLoginController
+class PasskeyLoginController extends Controller
 {
-    public function options()
+    protected function defaultRedirectUrl(): string
     {
-        $options = WebAuthn::prepareAssertion();
-
-        return app(Serializer::class)->normalize($options);
-    }
-
-    public function login(Request $request)
-    {
-        $credentials = $request->only(['id', 'rawId', 'response', 'type']);
-
-        $user = WebAuthn::getUserFromCredentials($credentials);
-
-        WebAuthn::validateAssertion($user, $credentials);
-
-        $this->authenticate($user);
-
-        return ['redirect' => $this->successRedirectUrl()];
-    }
-
-    private function authenticate(UserContract $user): void
-    {
-        Auth::login($user, config('statamic.webauthn.remember_me', true));
-
-        session()->elevate();
-        session()->regenerate();
-    }
-
-    private function successRedirectUrl()
-    {
-        $referer = request('referer');
-
-        return Str::contains($referer, '/'.config('statamic.cp.route')) && ! URL::isExternalToApplication($referer)
-            ? $referer
-            : cp_route('index');
+        return cp_route('index');
     }
 }
diff --git a/src/Http/Controllers/CP/Auth/ResetPasswordController.php b/src/Http/Controllers/CP/Auth/ResetPasswordController.php
index 338a5e501d7..db0bfb92cfa 100644
--- a/src/Http/Controllers/CP/Auth/ResetPasswordController.php
+++ b/src/Http/Controllers/CP/Auth/ResetPasswordController.php
@@ -25,6 +25,11 @@ public function broker()
         return Password::broker($broker);
     }
 
+    public function redirectPath()
+    {
+        return cp_route('login');
+    }
+
     protected function resetFormAction()
     {
         return route('statamic.cp.password.reset.action');
diff --git a/src/Http/Controllers/CP/Auth/TwoFactorChallengeController.php b/src/Http/Controllers/CP/Auth/TwoFactorChallengeController.php
index b5b71aee92d..7f4e7191c2c 100644
--- a/src/Http/Controllers/CP/Auth/TwoFactorChallengeController.php
+++ b/src/Http/Controllers/CP/Auth/TwoFactorChallengeController.php
@@ -3,14 +3,15 @@
 namespace Statamic\Http\Controllers\CP\Auth;
 
 use Statamic\Http\Controllers\TwoFactorChallengeController as Controller;
+use Statamic\Http\Middleware\CP\HandleInertiaRequests;
 use Statamic\Http\Middleware\CP\RedirectIfAuthorized;
-use Statamic\Support\Str;
 
 class TwoFactorChallengeController extends Controller
 {
     public function __construct()
     {
         $this->middleware('throttle:two-factor');
+        $this->middleware(HandleInertiaRequests::class)->except('store');
         $this->middleware(RedirectIfAuthorized::class);
     }
 
@@ -19,12 +20,13 @@ protected function formAction()
         return cp_route('two-factor-challenge');
     }
 
-    protected function redirectPath()
+    protected function defaultRedirectPath(): string
     {
-        $cp = cp_route('index');
-        $referer = request('referer');
-        $referredFromCp = Str::startsWith($referer, $cp) && ! Str::startsWith($referer, $cp.'/auth/');
+        return cp_route('index');
+    }
 
-        return $referredFromCp ? $referer : $cp;
+    protected function failedRedirectPath()
+    {
+        return cp_route('two-factor-challenge');
     }
 }
diff --git a/src/Http/Controllers/CP/Auth/TwoFactorSetupController.php b/src/Http/Controllers/CP/Auth/TwoFactorSetupController.php
index f0c1b9e2ef2..78d7f7070fc 100644
--- a/src/Http/Controllers/CP/Auth/TwoFactorSetupController.php
+++ b/src/Http/Controllers/CP/Auth/TwoFactorSetupController.php
@@ -16,10 +16,10 @@ public function __construct(Request $request)
     protected function redirectPath()
     {
         $cp = cp_route('index');
-        $referer = request('referer');
-        $referredFromCp = Str::startsWith($referer, $cp) && ! Str::startsWith($referer, $cp.'/auth/');
+        $intended = redirect()->getIntendedUrl();
+        $isCpUrl = $intended && Str::startsWith($intended, $cp) && ! Str::startsWith($intended, $cp.'/auth/');
 
-        return $referredFromCp ? $referer : $cp;
+        return $isCpUrl ? $intended : $cp;
     }
 
     protected function routes($user): array
diff --git a/src/Http/Controllers/CP/Collections/CollectionTreeController.php b/src/Http/Controllers/CP/Collections/CollectionTreeController.php
index fb8acc556cc..5b9b722f31a 100644
--- a/src/Http/Controllers/CP/Collections/CollectionTreeController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionTreeController.php
@@ -12,6 +12,8 @@
 use Statamic\Structures\TreeBuilder;
 use Statamic\Support\Arr;
 
+use function Statamic\trans;
+
 class CollectionTreeController extends CpController
 {
     public function index(Request $request, Collection $collection)
diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index aab2c39d3fe..aca8ca0ce81 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -94,7 +94,6 @@ private function collections()
                 'editable' => User::current()->can('edit', $collection),
                 'blueprint_editable' => User::current()->can('configure fields'),
                 'available_in_selected_site' => $collection->sites()->contains(Site::selected()->handle()),
-                'actions' => Action::for($collection),
                 'actions_url' => cp_route('collections.actions.run'),
                 'icon' => $collection->icon(),
                 'create_label' => $collection->createLabel(),
diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index 7ed16624119..acd8b573d60 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -18,11 +18,15 @@
 use Statamic\Http\Requests\FilteredRequest;
 use Statamic\Http\Resources\CP\Entries\Entries;
 use Statamic\Http\Resources\CP\Entries\Entry as EntryResource;
+use Statamic\Query\OrderBy;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
+use Statamic\Statamic;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 use Statamic\Support\Traits\Hookable;
 
+use function Statamic\trans as __;
+
 class EntriesController extends CpController
 {
     use ExtractsFromEntryFields,
@@ -40,7 +44,7 @@ public function index(FilteredRequest $request, $collection)
             'blueprints' => $collection->entryBlueprints()->map->handle(),
         ]);
 
-        $sortField = request('sort');
+        $sortField = OrderBy::column(request('sort'));
         $sortDirection = request('order', 'asc');
 
         if (! $sortField && ! request('search')) {
@@ -52,7 +56,7 @@ public function index(FilteredRequest $request, $collection)
             $query->orderBy($sortField, $sortDirection);
         }
 
-        $entries = (new EntriesIndexQuery($query, $collection))->paginate(request('perPage'));
+        $entries = (new EntriesIndexQuery($query, $collection))->paginate(Statamic::cpPerPage(request('perPage')));
 
         if (request('search') && $collection->hasSearchIndex()) {
             $entries->setCollection($entries->getCollection()->map->getSearchable());
@@ -343,7 +347,7 @@ public function create(Request $request, $collection, $site)
                 ];
             })->values()->all(),
             'revisionsEnabled' => $collection->revisionsEnabled(),
-            'canManagePublishState' => User::current()->can('publish '.$collection->handle().' entries'),
+            'canManagePublishState' => User::current()->can('publish', [EntryContract::class, $collection]),
             'previewTargets' => $collection->previewTargets()->all(),
             'autosaveInterval' => $collection->autosaveInterval(),
             'parent' => $collection->hasStructure() ? $request->parent : null,
@@ -485,12 +489,16 @@ private function entryUri($entry, $tree, $parent)
 
         $parent = $parent ? $tree->find($parent) : null;
 
+        if ($parent && $parent->isRoot()) {
+            $parent = null;
+        }
+
         return app(\Statamic\Contracts\Routing\UrlBuilder::class)
             ->content($entry)
             ->merge([
                 'parent_uri' => $parent ? $parent->uri() : null,
                 'slug' => $entry->slug(),
-                // 'depth' => '', // todo
+                'depth' => $parent ? $parent->depth() + 1 : 1,
                 'is_root' => false,
             ])
             ->build($entry->route());
diff --git a/src/Http/Controllers/CP/Collections/EntryRevisionsController.php b/src/Http/Controllers/CP/Collections/EntryRevisionsController.php
index 4d907b158bb..f0e7e359b14 100644
--- a/src/Http/Controllers/CP/Collections/EntryRevisionsController.php
+++ b/src/Http/Controllers/CP/Collections/EntryRevisionsController.php
@@ -83,7 +83,7 @@ public function show(Request $request, $collection, $entry, $revision)
             'readOnly' => true,
             'published' => $entry->published(),
             'locale' => $entry->locale(),
-            'localizations' => $entry->collection()->sites()->map(function ($handle) use ($entry) {
+            'localizations' => $this->getAuthorizedSitesForCollection($entry->collection())->map(function ($handle) use ($entry) {
                 $localized = $entry->in($handle);
                 $exists = $localized !== null;
 
@@ -120,4 +120,11 @@ protected function collectionToArray($collection)
             'url' => cp_route('collections.show', $collection->handle()),
         ];
     }
+
+    private function getAuthorizedSitesForCollection($collection)
+    {
+        return $collection
+            ->sites()
+            ->filter(fn ($handle) => User::current()->can('view', Site::get($handle)));
+    }
 }
diff --git a/src/Http/Controllers/CP/Collections/RestoreEntryRevisionController.php b/src/Http/Controllers/CP/Collections/RestoreEntryRevisionController.php
index 027bc0ee7f3..e7a66415909 100644
--- a/src/Http/Controllers/CP/Collections/RestoreEntryRevisionController.php
+++ b/src/Http/Controllers/CP/Collections/RestoreEntryRevisionController.php
@@ -7,6 +7,8 @@
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Revisions\Revision;
 
+use function Statamic\trans as __;
+
 class RestoreEntryRevisionController extends CpController
 {
     public function __invoke(Request $request, $collection, $entry)
diff --git a/src/Http/Controllers/CP/Collections/ScaffoldCollectionController.php b/src/Http/Controllers/CP/Collections/ScaffoldCollectionController.php
index a742feefbbf..d550a9c9008 100644
--- a/src/Http/Controllers/CP/Collections/ScaffoldCollectionController.php
+++ b/src/Http/Controllers/CP/Collections/ScaffoldCollectionController.php
@@ -8,6 +8,8 @@
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\View\Scaffolding\TemplateGenerator;
 
+use function Statamic\trans as __;
+
 class ScaffoldCollectionController extends CpController
 {
     public function index($collection)
diff --git a/src/Http/Controllers/CP/CpController.php b/src/Http/Controllers/CP/CpController.php
index b7a65ed5f88..64e9f539073 100644
--- a/src/Http/Controllers/CP/CpController.php
+++ b/src/Http/Controllers/CP/CpController.php
@@ -10,6 +10,8 @@
 use Statamic\Http\Controllers\Controller;
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 /**
  * The base control panel controller.
  */
@@ -72,7 +74,7 @@ public function authorizeProIf($condition)
 
     public function requireElevatedSession(): void
     {
-        if (! request()->hasElevatedSession()) {
+        if (config('statamic.users.elevated_sessions_enabled') && ! request()->hasElevatedSession()) {
             throw new ElevatedSessionAuthorizationException;
         }
     }
diff --git a/src/Http/Controllers/CP/DuplicatesController.php b/src/Http/Controllers/CP/DuplicatesController.php
index f7f23b73946..1902f0bd12d 100644
--- a/src/Http/Controllers/CP/DuplicatesController.php
+++ b/src/Http/Controllers/CP/DuplicatesController.php
@@ -9,6 +9,8 @@
 use Statamic\Facades\Stache;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class DuplicatesController extends CpController
 {
     public function index()
diff --git a/src/Http/Controllers/CP/Fields/FieldsController.php b/src/Http/Controllers/CP/Fields/FieldsController.php
index abfa04d799c..f5b41aaa994 100644
--- a/src/Http/Controllers/CP/Fields/FieldsController.php
+++ b/src/Http/Controllers/CP/Fields/FieldsController.php
@@ -38,15 +38,17 @@ public function edit(Request $request)
 
         $blueprint = $this->blueprint($fieldtype->configBlueprint());
 
+        $values = $fieldtype->migrateConfig($request->values);
+
         $fields = $blueprint
             ->fields()
-            ->addValues($request->values)
+            ->addValues($values)
             ->preProcess();
 
         if ($request->reference) {
             $originFields = $blueprint
                 ->fields()
-                ->addValues(FieldRepository::find($request->reference)->config())
+                ->addValues($fieldtype->migrateConfig(FieldRepository::find($request->reference)->config()))
                 ->preProcess();
 
             $originValues = Arr::except($originFields->values()->all(), 'handle');
@@ -56,7 +58,7 @@ public function edit(Request $request)
         return [
             'fieldtype' => $fieldtype->toArray(),
             'blueprint' => $blueprint->toPublishArray(),
-            'values' => array_merge($request->values, $fields->values()->all()),
+            'values' => array_merge($values, $fields->values()->all()),
             'meta' => $fields->meta(),
             'originValues' => $originValues ?? null,
             'originMeta' => $originMeta ?? null,
@@ -130,6 +132,8 @@ function ($attribute, $value, $fail) use ($request) {
 
         $values = array_merge($request->values, $fields->process()->values()->all());
 
+        $values = $fieldtype->migrateConfig($values);
+
         return $values;
     }
 
diff --git a/src/Http/Controllers/CP/Fields/FieldsetController.php b/src/Http/Controllers/CP/Fields/FieldsetController.php
index 0254a72f06f..7027ff80e42 100644
--- a/src/Http/Controllers/CP/Fields/FieldsetController.php
+++ b/src/Http/Controllers/CP/Fields/FieldsetController.php
@@ -112,9 +112,7 @@ public function edit($fieldset)
         $vue = [
             'title' => $fieldset->title(),
             'handle' => $fieldset->handle(),
-            'fields' => collect(Arr::get($fieldset->contents(), 'fields'))->map(function ($field, $i) {
-                return array_merge(FieldTransformer::toVue($field), ['_id' => $i]);
-            })->all(),
+            'sections' => $this->sectionsToVue($fieldset),
         ];
 
         return Inertia::render('fieldsets/Edit', [
@@ -130,15 +128,30 @@ public function update(Request $request, $fieldset)
 
         $request->validate([
             'title' => 'required',
+            'sections' => 'array',
             'fields' => 'array',
         ]);
 
-        $fieldset->setContents(array_merge($fieldset->contents(), [
-            'title' => $request->title,
-            'fields' => collect($request->fields)->map(function ($field) {
-                return FieldTransformer::fromVue($field);
-            })->all(),
-        ]));
+        $base = array_merge(
+            Arr::except($fieldset->contents(), ['fields', 'sections']),
+            ['title' => $request->title],
+        );
+
+        if ($request->has('sections')) {
+            $sections = $this->sectionsFromVueRequest($request->sections);
+
+            $fieldset->setContents(
+                $this->shouldStoreAsFlatFields($sections)
+                    ? $base + ['fields' => Arr::get($sections, '0.fields', [])]
+                    : $base + ['sections' => $sections]
+            );
+        } else {
+            $fieldset->setContents($base + [
+                'fields' => collect($request->fields)
+                    ->map(fn ($field) => FieldTransformer::fromVue($field))
+                    ->all(),
+            ]);
+        }
 
         $fieldset->validateRecursion();
 
@@ -217,4 +230,58 @@ private function groupKey(Fieldset $fieldset): string
 
         return __('My Fieldsets');
     }
+
+    private function sectionsFromVueRequest(array $sections): array
+    {
+        return collect($sections)->map(function ($section) {
+            return Arr::removeNullValues([
+                'display' => Arr::get($section, 'display'),
+                'instructions' => Arr::get($section, 'instructions'),
+                'collapsible' => ($collapsible = Arr::get($section, 'collapsible')) ?: null,
+                'collapsed' => ($collapsible && Arr::get($section, 'collapsed')) ?: null,
+                'fields' => collect(Arr::get($section, 'fields', []))
+                    ->map(fn ($field) => FieldTransformer::fromVue($field))
+                    ->all(),
+            ]);
+        })->all();
+    }
+
+    private function sectionsToVue(Fieldset $fieldset): array
+    {
+        $sections = $fieldset->hasSections()
+            ? Arr::get($fieldset->contents(), 'sections', [])
+            : [[
+                'display' => __('Fields'),
+                'fields' => Arr::get($fieldset->contents(), 'fields', []),
+            ]];
+
+        return collect($sections)->map(function ($section, $sectionIndex) {
+            return Arr::removeNullValues([
+                '_id' => "section-{$sectionIndex}",
+                'display' => Arr::get($section, 'display'),
+                'instructions' => Arr::get($section, 'instructions'),
+                'collapsible' => Arr::get($section, 'collapsible'),
+                'collapsed' => Arr::get($section, 'collapsed'),
+            ]) + [
+                'fields' => collect(Arr::get($section, 'fields', []))->map(function ($field, $fieldIndex) use ($sectionIndex) {
+                    return array_merge(FieldTransformer::toVue($field), ['_id' => "section-{$sectionIndex}-{$fieldIndex}"]);
+                })->all(),
+            ];
+        })->all();
+    }
+
+    private function shouldStoreAsFlatFields(array $sections): bool
+    {
+        if (count($sections) !== 1) {
+            return false;
+        }
+
+        $section = $sections[0];
+        $display = Arr::get($section, 'display');
+
+        return in_array($display, [null, '', __('Fields')], true)
+            && Arr::get($section, 'instructions') === null
+            && Arr::get($section, 'collapsible') !== true
+            && Arr::get($section, 'collapsed') !== true;
+    }
 }
diff --git a/src/Http/Controllers/CP/Fields/ManagesBlueprints.php b/src/Http/Controllers/CP/Fields/ManagesBlueprints.php
index ae808562321..0e718e49a01 100644
--- a/src/Http/Controllers/CP/Fields/ManagesBlueprints.php
+++ b/src/Http/Controllers/CP/Fields/ManagesBlueprints.php
@@ -14,6 +14,8 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 trait ManagesBlueprints
 {
     use ManagesFields;
diff --git a/src/Http/Controllers/CP/Fields/ManagesFields.php b/src/Http/Controllers/CP/Fields/ManagesFields.php
index 7df69f95c9f..98394fb9ff6 100644
--- a/src/Http/Controllers/CP/Fields/ManagesFields.php
+++ b/src/Http/Controllers/CP/Fields/ManagesFields.php
@@ -21,10 +21,16 @@ private function fieldProps()
     private function fieldsets()
     {
         return Fieldset::all()->mapWithKeys(function ($fieldset) {
+            $fields = $fieldset->hasSections()
+                ? $fieldset->sections()->flatMap(fn ($section) => Arr::get($section, 'fields', []))
+                : collect(Arr::get($fieldset->contents(), 'fields', []));
+
             return [$fieldset->handle() => [
                 'handle' => $fieldset->handle(),
                 'title' => $fieldset->title(),
-                'fields' => collect(Arr::get($fieldset->contents(), 'fields'))->map(function ($field) {
+                'has_sections' => $fieldset->hasSections(),
+                'sections_count' => $fieldset->hasSections() ? $fieldset->sections()->count() : 0,
+                'fields' => $fields->map(function ($field) {
                     return FieldTransformer::toVue($field);
                 })->sortBy('config.display')->values()->all(),
             ]];
diff --git a/src/Http/Controllers/CP/Fields/MetaController.php b/src/Http/Controllers/CP/Fields/MetaController.php
index b054fb55aab..001ca4a89a5 100644
--- a/src/Http/Controllers/CP/Fields/MetaController.php
+++ b/src/Http/Controllers/CP/Fields/MetaController.php
@@ -14,13 +14,13 @@ public function show(Request $request)
 
         $field = (new Field($config['handle'], $config))->setValue($request->value);
 
-        $fieldtype = $field->fieldtype();
+        $value = $field->fieldtype()->preProcess($request->value);
 
-        $value = $fieldtype->preProcess($request->value);
+        $field->setValue($value);
 
         return [
             'value' => $value,
-            'meta' => $fieldtype->preload(),
+            'meta' => $field->fieldtype()->preload(),
         ];
     }
 }
diff --git a/src/Http/Controllers/CP/Fieldtypes/DictionaryFieldtypeController.php b/src/Http/Controllers/CP/Fieldtypes/DictionaryFieldtypeController.php
deleted file mode 100644
index 5d442c916fe..00000000000
--- a/src/Http/Controllers/CP/Fieldtypes/DictionaryFieldtypeController.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Statamic\Http\Controllers\CP\Fieldtypes;
-
-use Facades\Statamic\Fields\FieldtypeRepository as Fieldtype;
-use Illuminate\Http\Request;
-use Statamic\Fields\Field;
-use Statamic\Http\Controllers\CP\CpController;
-
-class DictionaryFieldtypeController extends CpController
-{
-    public function __invoke(Request $request, string $dictionary)
-    {
-        $fieldtype = $this->fieldtype($request);
-
-        return [
-            'data' => $fieldtype->dictionary()->options($request->search),
-        ];
-    }
-
-    protected function fieldtype($request)
-    {
-        $config = $this->getConfig($request);
-
-        return Fieldtype::find($config['type'])->setField(
-            new Field('relationship', $config)
-        );
-    }
-
-    private function getConfig($request)
-    {
-        // The fieldtype base64-encodes the config.
-        $json = base64_decode($request->config);
-
-        // The json may include unicode characters, so we'll try to convert it to UTF-8.
-        // See https://github.com/statamic/cms/issues/566
-        $utf8 = mb_convert_encoding($json, 'UTF-8', mb_list_encodings());
-
-        // In PHP 8.1 there's a bug where encoding will return null. It's fixed in 8.1.2.
-        // In this case, we'll fall back to the original JSON, but without the encoding.
-        // Issue #566 may still occur, but it's better than failing completely.
-        $json = empty($utf8) ? $json : $utf8;
-
-        return json_decode($json, true);
-    }
-}
diff --git a/src/Http/Controllers/CP/Forms/Concerns/QueriesFormSubmissionSearch.php b/src/Http/Controllers/CP/Forms/Concerns/QueriesFormSubmissionSearch.php
new file mode 100644
index 00000000000..0ef739a66ac
--- /dev/null
+++ b/src/Http/Controllers/CP/Forms/Concerns/QueriesFormSubmissionSearch.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Forms\Concerns;
+
+use Statamic\Contracts\Forms\Form;
+use Statamic\Fields\Field;
+
+trait QueriesFormSubmissionSearch
+{
+    protected function applySubmissionSearch($query, Form $form, ?string $search)
+    {
+        if (! $search) {
+            return $query;
+        }
+
+        $query->where(function ($query) use ($form, $search) {
+            $query->where('date', 'like', '%'.$search.'%');
+
+            $form->blueprint()->fields()->all()
+                ->filter(function (Field $field): bool {
+                    return in_array($field->type(), ['text', 'textarea', 'integer']);
+                })
+                ->each(function (Field $field) use ($query, $search): void {
+                    $query->orWhere($field->handle(), 'like', '%'.$search.'%');
+                });
+        });
+
+        return $query;
+    }
+}
diff --git a/src/Http/Controllers/CP/Forms/FormExportController.php b/src/Http/Controllers/CP/Forms/FormExportController.php
index 116968d603a..fc398bfb8db 100644
--- a/src/Http/Controllers/CP/Forms/FormExportController.php
+++ b/src/Http/Controllers/CP/Forms/FormExportController.php
@@ -4,10 +4,16 @@
 
 use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Forms\Concerns\QueriesFormSubmissionSearch;
+use Statamic\Http\Requests\FilteredRequest;
+use Statamic\Query\OrderBy;
+use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
 
 class FormExportController extends CpController
 {
-    public function export($form, $type)
+    use QueriesFilters, QueriesFormSubmissionSearch;
+
+    public function export(FilteredRequest $request, $form, $type)
     {
         $this->authorize('view', $form);
 
@@ -15,6 +21,32 @@ public function export($form, $type)
             throw new NotFoundHttpException;
         }
 
-        return $this->request->has('download') ? $exporter->download() : $exporter->response();
+        if ($this->shouldApplyFilteredScope($request)) {
+            $exporter->setSubmissions($this->getScopedSubmissions($request, $form));
+        }
+
+        return $request->has('download') ? $exporter->download() : $exporter->response();
+    }
+
+    protected function shouldApplyFilteredScope(FilteredRequest $request)
+    {
+        return $request->has('filters') || $request->has('search') || $request->has('sort') || $request->has('order');
+    }
+
+    protected function getScopedSubmissions(FilteredRequest $request, $form)
+    {
+        $query = $form->querySubmissions();
+
+        $this->queryFilters($query, $request->filters, [
+            'form' => $form->handle(),
+        ]);
+
+        $this->applySubmissionSearch($query, $form, $request->input('search'));
+
+        if ($sort = OrderBy::column($request->input('sort'))) {
+            $query->orderBy($sort, $request->input('order', $sort === 'date' ? 'desc' : 'asc'));
+        }
+
+        return $query->get();
     }
 }
diff --git a/src/Http/Controllers/CP/Forms/FormSubmissionsController.php b/src/Http/Controllers/CP/Forms/FormSubmissionsController.php
index 9d0610a686e..d11dc23ca64 100644
--- a/src/Http/Controllers/CP/Forms/FormSubmissionsController.php
+++ b/src/Http/Controllers/CP/Forms/FormSubmissionsController.php
@@ -3,15 +3,17 @@
 namespace Statamic\Http\Controllers\CP\Forms;
 
 use Inertia\Inertia;
-use Statamic\Fields\Field;
 use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Forms\Concerns\QueriesFormSubmissionSearch;
 use Statamic\Http\Requests\FilteredRequest;
 use Statamic\Http\Resources\CP\Submissions\Submissions;
+use Statamic\Query\OrderBy;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
+use Statamic\Statamic;
 
 class FormSubmissionsController extends CpController
 {
-    use QueriesFilters;
+    use QueriesFilters, QueriesFormSubmissionSearch;
 
     public function index(FilteredRequest $request, $form)
     {
@@ -27,14 +29,14 @@ public function index(FilteredRequest $request, $form)
             'form' => $form->handle(),
         ]);
 
-        $sortField = request('sort', 'date');
+        $sortField = OrderBy::column(request('sort'), 'date');
         $sortDirection = request('order', $sortField === 'date' ? 'desc' : 'asc');
 
         if ($sortField) {
             $query->orderBy($sortField, $sortDirection);
         }
 
-        $submissions = $query->paginate(request('perPage'));
+        $submissions = $query->paginate(Statamic::cpPerPage(request('perPage')));
 
         return (new Submissions($submissions))
             ->blueprint($form->blueprint())
@@ -48,19 +50,7 @@ protected function indexQuery($form)
     {
         $query = $form->querySubmissions();
 
-        if ($search = request('search')) {
-            $query->where(function ($query) use ($form, $search) {
-                $query->where('date', 'like', '%'.$search.'%');
-
-                $form->blueprint()->fields()->all()
-                    ->filter(function (Field $field): bool {
-                        return in_array($field->type(), ['text', 'textarea', 'integer']);
-                    })
-                    ->each(function (Field $field) use ($query, $search): void {
-                        $query->orWhere($field->handle(), 'like', '%'.$search.'%');
-                    });
-            });
-        }
+        $this->applySubmissionSearch($query, $form, request('search'));
 
         return $query;
     }
diff --git a/src/Http/Controllers/CP/Forms/FormsController.php b/src/Http/Controllers/CP/Forms/FormsController.php
index 42a5fd0b454..0b3457afc7a 100644
--- a/src/Http/Controllers/CP/Forms/FormsController.php
+++ b/src/Http/Controllers/CP/Forms/FormsController.php
@@ -85,6 +85,7 @@ public function show($form)
             ]),
             'actionUrl' => cp_route('forms.submissions.actions.run', $form->handle()),
             'exporters' => $form->exporters()->map(fn ($exporter) => [
+                'handle' => $exporter->handle(),
                 'title' => $exporter->title(),
                 'downloadUrl' => $exporter->downloadUrl(),
             ])->values(),
diff --git a/src/Http/Controllers/CP/Globals/GlobalVariablesController.php b/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
index 8996c23f024..6f4d9ce7200 100644
--- a/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
+++ b/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
@@ -10,6 +10,8 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 
+use function Statamic\trans as __;
+
 class GlobalVariablesController extends CpController
 {
     public function edit(Request $request, $id)
diff --git a/src/Http/Controllers/CP/Globals/GlobalsController.php b/src/Http/Controllers/CP/Globals/GlobalsController.php
index 330d4da7111..751c5bff509 100644
--- a/src/Http/Controllers/CP/Globals/GlobalsController.php
+++ b/src/Http/Controllers/CP/Globals/GlobalsController.php
@@ -15,6 +15,8 @@
 use Statamic\Rules\Handle;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class GlobalsController extends CpController
 {
     public function index()
diff --git a/src/Http/Controllers/CP/LicensingController.php b/src/Http/Controllers/CP/LicensingController.php
index f71af86417d..4de7c2f5d40 100644
--- a/src/Http/Controllers/CP/LicensingController.php
+++ b/src/Http/Controllers/CP/LicensingController.php
@@ -5,6 +5,8 @@
 use Inertia\Inertia;
 use Statamic\Licensing\LicenseManager as Licenses;
 
+use function Statamic\trans as __;
+
 class LicensingController extends CpController
 {
     public function show(Licenses $licenses)
diff --git a/src/Http/Controllers/CP/Navigation/NavigationController.php b/src/Http/Controllers/CP/Navigation/NavigationController.php
index 1afebf60090..7e1411c14ba 100644
--- a/src/Http/Controllers/CP/Navigation/NavigationController.php
+++ b/src/Http/Controllers/CP/Navigation/NavigationController.php
@@ -19,6 +19,8 @@
 use Statamic\Rules\Handle;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class NavigationController extends CpController
 {
     public function index()
diff --git a/src/Http/Controllers/CP/Navigation/NavigationPagesController.php b/src/Http/Controllers/CP/Navigation/NavigationPagesController.php
index ddf3f71e16d..0c5e7199ff8 100644
--- a/src/Http/Controllers/CP/Navigation/NavigationPagesController.php
+++ b/src/Http/Controllers/CP/Navigation/NavigationPagesController.php
@@ -8,6 +8,8 @@
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Structures\Page;
 
+use function Statamic\trans as __;
+
 class NavigationPagesController extends CpController
 {
     /**
@@ -18,6 +20,8 @@ public function create(Request $request, $nav)
     {
         $nav = Nav::find($nav);
 
+        $this->authorize('view', $nav->in($request->site));
+
         $blueprint = $nav->blueprint();
 
         $page = (new Page)
@@ -27,6 +31,8 @@ public function create(Request $request, $nav)
         [$values, $meta] = $this->extractValuesAndMeta($page, $blueprint);
 
         if ($entry = $page->entry()) {
+            $this->authorize('view', $entry);
+
             [$originValues, $originMeta] = $this->extractValuesAndMeta($entry, $entry->blueprint());
             $values = collect($originValues)->merge($values)->all();
         }
@@ -48,6 +54,8 @@ public function edit(Request $request, $nav, $page)
     {
         $nav = Nav::find($nav);
 
+        $this->authorize('view', $nav->in($request->site));
+
         $blueprint = $nav->blueprint();
 
         $page = $nav->in($request->site)->find($page);
@@ -55,6 +63,8 @@ public function edit(Request $request, $nav, $page)
         [$values, $meta, $extraValues] = $this->extractValuesAndMeta($page, $blueprint);
 
         if ($entry = $page->entry()) {
+            $this->authorize('view', $entry);
+
             [$originValues, $originMeta] = $this->extractValuesAndMeta($entry, $entry->blueprint());
             $values = collect($originValues)->merge($values)->all();
         }
@@ -145,6 +155,8 @@ public function update(Request $request, $nav)
 
         $nav = Nav::find($nav);
 
+        $this->authorize('view', $nav);
+
         $blueprint = $this->ensureFields($nav->blueprint(), $request);
 
         $blueprint->fields()
diff --git a/src/Http/Controllers/CP/Preferences/DefaultPreferenceController.php b/src/Http/Controllers/CP/Preferences/DefaultPreferenceController.php
index e91f855b6d0..467b5442298 100644
--- a/src/Http/Controllers/CP/Preferences/DefaultPreferenceController.php
+++ b/src/Http/Controllers/CP/Preferences/DefaultPreferenceController.php
@@ -6,6 +6,8 @@
 use Statamic\Facades\Preference;
 use Statamic\Http\Controllers\CP\CpController;
 
+use function Statamic\trans as __;
+
 class DefaultPreferenceController extends CpController
 {
     use ManagesPreferences;
diff --git a/src/Http/Controllers/CP/Preferences/ManagesPreferences.php b/src/Http/Controllers/CP/Preferences/ManagesPreferences.php
index 11e93543ab3..15195e6ce98 100644
--- a/src/Http/Controllers/CP/Preferences/ManagesPreferences.php
+++ b/src/Http/Controllers/CP/Preferences/ManagesPreferences.php
@@ -12,6 +12,8 @@
 use Statamic\Jobs\ReportThemeUsage;
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 trait ManagesPreferences
 {
     protected function view(string $title, string $actionUrl, array $preferences)
diff --git a/src/Http/Controllers/CP/Preferences/Nav/Concerns/HasNavBuilder.php b/src/Http/Controllers/CP/Preferences/Nav/Concerns/HasNavBuilder.php
index 4c7dc440c5f..510c44bac2c 100644
--- a/src/Http/Controllers/CP/Preferences/Nav/Concerns/HasNavBuilder.php
+++ b/src/Http/Controllers/CP/Preferences/Nav/Concerns/HasNavBuilder.php
@@ -11,6 +11,8 @@
 use Statamic\Http\Resources\CP\Nav\Nav as NavResource;
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 trait HasNavBuilder
 {
     protected function navBuilder($nav = null, $props = [])
diff --git a/src/Http/Controllers/CP/Preferences/Nav/DefaultNavController.php b/src/Http/Controllers/CP/Preferences/Nav/DefaultNavController.php
index 672dda1f624..b8465631ba3 100644
--- a/src/Http/Controllers/CP/Preferences/Nav/DefaultNavController.php
+++ b/src/Http/Controllers/CP/Preferences/Nav/DefaultNavController.php
@@ -7,6 +7,8 @@
 use Statamic\Facades\Preference;
 use Statamic\Http\Controllers\Controller;
 
+use function Statamic\trans as __;
+
 class DefaultNavController extends Controller
 {
     use Concerns\HasNavBuilder;
diff --git a/src/Http/Controllers/CP/Preferences/Nav/NavController.php b/src/Http/Controllers/CP/Preferences/Nav/NavController.php
index 2285918adbd..40048b0c24e 100644
--- a/src/Http/Controllers/CP/Preferences/Nav/NavController.php
+++ b/src/Http/Controllers/CP/Preferences/Nav/NavController.php
@@ -9,6 +9,8 @@
 use Statamic\Http\Controllers\Controller;
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 class NavController extends Controller
 {
     public function index()
diff --git a/src/Http/Controllers/CP/Preferences/Nav/UserNavController.php b/src/Http/Controllers/CP/Preferences/Nav/UserNavController.php
index 6adbee28480..e7fddf31939 100644
--- a/src/Http/Controllers/CP/Preferences/Nav/UserNavController.php
+++ b/src/Http/Controllers/CP/Preferences/Nav/UserNavController.php
@@ -7,6 +7,8 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\Controller;
 
+use function Statamic\trans as __;
+
 class UserNavController extends Controller
 {
     use Concerns\HasNavBuilder;
diff --git a/src/Http/Controllers/CP/Preferences/PreferenceController.php b/src/Http/Controllers/CP/Preferences/PreferenceController.php
index 26f17d345ff..fc3c4336a93 100644
--- a/src/Http/Controllers/CP/Preferences/PreferenceController.php
+++ b/src/Http/Controllers/CP/Preferences/PreferenceController.php
@@ -10,6 +10,8 @@
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 class PreferenceController extends CpController
 {
     public function index()
diff --git a/src/Http/Controllers/CP/Preferences/UserPreferenceController.php b/src/Http/Controllers/CP/Preferences/UserPreferenceController.php
index 7d07b312a7d..845d7483dd8 100644
--- a/src/Http/Controllers/CP/Preferences/UserPreferenceController.php
+++ b/src/Http/Controllers/CP/Preferences/UserPreferenceController.php
@@ -6,6 +6,8 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 
+use function Statamic\trans as __;
+
 class UserPreferenceController extends CpController
 {
     use ManagesPreferences;
diff --git a/src/Http/Controllers/CP/PreviewController.php b/src/Http/Controllers/CP/PreviewController.php
index c7d8b1dc3c5..6cc5569107a 100644
--- a/src/Http/Controllers/CP/PreviewController.php
+++ b/src/Http/Controllers/CP/PreviewController.php
@@ -18,7 +18,7 @@ public function show()
 
     public function edit(Request $request, $_, $data)
     {
-        $this->authorize('view', $data);
+        $this->authorize('update', $data);
 
         $fields = $data->blueprint()
             ->fields()
diff --git a/src/Http/Controllers/CP/SelectSiteController.php b/src/Http/Controllers/CP/SelectSiteController.php
index 59b3277dd73..6b8d710e9a7 100644
--- a/src/Http/Controllers/CP/SelectSiteController.php
+++ b/src/Http/Controllers/CP/SelectSiteController.php
@@ -4,6 +4,8 @@
 
 use Statamic\Facades\Site;
 
+use function Statamic\trans as __;
+
 class SelectSiteController extends CpController
 {
     public function select($handle)
diff --git a/src/Http/Controllers/CP/Taxonomies/TermsController.php b/src/Http/Controllers/CP/Taxonomies/TermsController.php
index 1e417616f4e..4479ef43b04 100644
--- a/src/Http/Controllers/CP/Taxonomies/TermsController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TermsController.php
@@ -13,9 +13,13 @@
 use Statamic\Http\Requests\FilteredRequest;
 use Statamic\Http\Resources\CP\Taxonomies\Term as TermResource;
 use Statamic\Http\Resources\CP\Taxonomies\Terms;
+use Statamic\Query\OrderBy;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
 use Statamic\Rules\Slug;
 use Statamic\Rules\UniqueTermValue;
+use Statamic\Statamic;
+
+use function Statamic\trans as __;
 
 class TermsController extends CpController
 {
@@ -33,7 +37,7 @@ public function index(FilteredRequest $request, $taxonomy)
             'blueprints' => $taxonomy->termBlueprints()->map->handle(),
         ]);
 
-        $sortField = request('sort');
+        $sortField = OrderBy::column(request('sort'));
         $sortDirection = request('order', 'asc');
 
         if (! $sortField && ! request('search')) {
@@ -45,7 +49,7 @@ public function index(FilteredRequest $request, $taxonomy)
             $query->orderBy($sortField, $sortDirection);
         }
 
-        $paginator = $query->paginate(request('perPage'));
+        $paginator = $query->paginate(Statamic::cpPerPage(request('perPage')));
 
         $terms = $paginator->getCollection();
 
@@ -130,7 +134,7 @@ public function edit(Request $request, $taxonomy, $term)
                     'url' => $localized->editUrl(),
                     'livePreviewUrl' => $localized->livePreviewUrl(),
                 ];
-            })->all(),
+            })->values()->all(),
             'previewTargets' => $taxonomy->previewTargets()->all(),
             'itemActions' => Action::for($term, ['taxonomy' => $taxonomy->handle(), 'view' => 'form']),
             'hasTemplate' => view()->exists($term->template()),
diff --git a/src/Http/Controllers/CP/Updater/UpdateProductController.php b/src/Http/Controllers/CP/Updater/UpdateProductController.php
index f96b62a4689..8b8fca135fc 100644
--- a/src/Http/Controllers/CP/Updater/UpdateProductController.php
+++ b/src/Http/Controllers/CP/Updater/UpdateProductController.php
@@ -85,6 +85,8 @@ public function changelog(Request $request, $marketplaceProductSlug)
         return [
             'changelog' => $paginated['data'],
             'currentVersion' => $changelog->currentVersion(),
+            'onLatestVersion' => $changelog->availableUpdatesCount() === 0,
+            'securityUpdateAvailable' => $changelog->hasSecurityUpdate(),
             'meta' => $paginated['meta'],
         ];
     }
diff --git a/src/Http/Controllers/CP/Users/RolesController.php b/src/Http/Controllers/CP/Users/RolesController.php
index 80fa2da285d..25ba6eddccb 100644
--- a/src/Http/Controllers/CP/Users/RolesController.php
+++ b/src/Http/Controllers/CP/Users/RolesController.php
@@ -155,8 +155,8 @@ public function update(Request $request, $role)
 
         if ($request->super && User::current()->isSuper()) {
             $role->permissions(['super']);
-        } elseif (! in_array('super', $request->permissions ?? [])) {
-            $role->permissions($request->permissions);
+        } elseif ($request->has('permissions') && ! in_array('super', $request->permissions)) {
+            $role->permissions($this->preserveUnregisteredPermissions($role, $request->permissions));
         }
 
         $role->save();
@@ -179,6 +179,17 @@ public function destroy($role)
         return response('', 204);
     }
 
+    private function preserveUnregisteredPermissions($role, $permissions)
+    {
+        $registered = Permission::boot()->flattened()->map->value();
+
+        $unregistered = $role->permissions()
+            ->diff($registered)
+            ->reject(fn ($permission) => $permission === 'super');
+
+        return collect($permissions)->merge($unregistered)->unique()->values()->all();
+    }
+
     protected function updateTree($tree, $role = null)
     {
         return $tree->map(function ($group) use ($role) {
diff --git a/src/Http/Controllers/CP/Users/UserGroupsController.php b/src/Http/Controllers/CP/Users/UserGroupsController.php
index 45ba8c5dcf5..04cb9e0ecbd 100644
--- a/src/Http/Controllers/CP/Users/UserGroupsController.php
+++ b/src/Http/Controllers/CP/Users/UserGroupsController.php
@@ -11,6 +11,8 @@
 use Statamic\Http\Middleware\RequireStatamicPro;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class UserGroupsController extends CpController
 {
     public function __construct()
diff --git a/src/Http/Controllers/CP/Users/UserWizardController.php b/src/Http/Controllers/CP/Users/UserWizardController.php
index 1de27cc080f..25fac7bc22e 100644
--- a/src/Http/Controllers/CP/Users/UserWizardController.php
+++ b/src/Http/Controllers/CP/Users/UserWizardController.php
@@ -3,6 +3,7 @@
 namespace Statamic\Http\Controllers\CP\Users;
 
 use Illuminate\Http\Request;
+use Statamic\Contracts\Auth\User as UserContract;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 
@@ -10,6 +11,8 @@ class UserWizardController extends CpController
 {
     public function __invoke(Request $request)
     {
+        $this->authorize('index', UserContract::class);
+
         $user = User::findByEmail($request->email);
 
         return ['exists' => (bool) $user];
diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index d83f2108770..5b9fddd7e42 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -9,19 +9,25 @@
 use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Facades\Action;
 use Statamic\Facades\CP\Toast;
+use Statamic\Facades\OAuth;
 use Statamic\Facades\Scope;
 use Statamic\Facades\Search;
+use Statamic\Facades\TwoFactor;
 use Statamic\Facades\User;
 use Statamic\Facades\UserGroup;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Http\Requests\FilteredRequest;
 use Statamic\Http\Resources\CP\Users\Users;
 use Statamic\Notifications\ActivateAccount;
+use Statamic\Query\OrderBy;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
 use Statamic\Rules\UniqueUserValue;
 use Statamic\Search\Result;
+use Statamic\Statamic;
 use Symfony\Component\Mailer\Exception\TransportException;
 
+use function Statamic\trans as __;
+
 class UsersController extends CpController
 {
     use ExtractsFromUserFields,
@@ -79,7 +85,7 @@ protected function json($request)
             'blueprints' => ['user'],
         ]);
 
-        $sortField = request('sort');
+        $sortField = OrderBy::column(request('sort'));
         $sortDirection = request('order', 'asc');
 
         if (! $sortField && ! request('search')) {
@@ -91,7 +97,7 @@ protected function json($request)
             $query->orderBy($sortField, $sortDirection);
         }
 
-        $users = $query->paginate(request('perPage'));
+        $users = $query->paginate(Statamic::cpPerPage(request('perPage')));
 
         if ($users->getCollection()->first() instanceof Result) {
             $users->setCollection($users->getCollection()->map->getSearchable());
@@ -274,10 +280,11 @@ public function edit(Request $request, $user)
                 'editBlueprint' => cp_route('blueprints.users.edit'),
             ],
             'canEditBlueprint' => User::current()->can('configure fields'),
+            'oauthEnabled' => OAuth::enabled(),
             'canEditPassword' => User::fromUser($request->user())->can('editPassword', $user),
             'requiresCurrentPassword' => $isCurrentUser = $request->user()->id === $user->id(),
             'itemActions' => Action::for($user, ['view' => 'form']),
-            'twoFactor' => $isCurrentUser ? [
+            'twoFactor' => $isCurrentUser && TwoFactor::enabled() ? [
                 'isEnforced' => $user->isTwoFactorAuthenticationRequired(),
                 'wasSetup' => $user->hasEnabledTwoFactorAuthentication(),
                 'routes' => [
diff --git a/src/Http/Controllers/CP/Utilities/CacheController.php b/src/Http/Controllers/CP/Utilities/CacheController.php
index 623f057355d..e9a42d0df09 100644
--- a/src/Http/Controllers/CP/Utilities/CacheController.php
+++ b/src/Http/Controllers/CP/Utilities/CacheController.php
@@ -12,8 +12,11 @@
 use Statamic\Facades\URL;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\StaticCaching\Cacher;
+use Statamic\StaticCaching\Cachers\AbstractCacher;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class CacheController extends CpController
 {
     public function index()
@@ -73,11 +76,16 @@ protected function getImageCacheStats()
     protected function getStaticCacheStats()
     {
         $strategy = config('statamic.static_caching.strategy');
+        $cacher = StaticCache::driver();
+
+        $count = $cacher instanceof AbstractCacher
+            ? $cacher->getDomains()->sum(fn ($domain) => $cacher->getUrls($domain)->count())
+            : $cacher->getUrls()->count();
 
         return [
             'enabled' => (bool) $strategy,
             'strategy' => $strategy ?? __('Disabled'),
-            'count' => StaticCache::driver()->getUrls()->count(),
+            'count' => $count,
         ];
     }
 
diff --git a/src/Http/Controllers/CP/Utilities/EmailController.php b/src/Http/Controllers/CP/Utilities/EmailController.php
index e41324aaa82..cdf3c060216 100644
--- a/src/Http/Controllers/CP/Utilities/EmailController.php
+++ b/src/Http/Controllers/CP/Utilities/EmailController.php
@@ -6,6 +6,8 @@
 use Illuminate\Support\Facades\Mail;
 use Statamic\Mail\Test;
 
+use function Statamic\trans as __;
+
 class EmailController
 {
     public function send(Request $request)
diff --git a/src/Http/Controllers/CP/Utilities/GitController.php b/src/Http/Controllers/CP/Utilities/GitController.php
index 04ad4767b02..8ef60c9f2ce 100644
--- a/src/Http/Controllers/CP/Utilities/GitController.php
+++ b/src/Http/Controllers/CP/Utilities/GitController.php
@@ -6,6 +6,8 @@
 use Statamic\Facades\Git;
 use Statamic\Http\Controllers\CP\CpController;
 
+use function Statamic\trans as __;
+
 class GitController extends CpController
 {
     public function index()
diff --git a/src/Http/Controllers/CP/Utilities/UpdateSearchController.php b/src/Http/Controllers/CP/Utilities/UpdateSearchController.php
index e009be0070d..46f1d423acd 100644
--- a/src/Http/Controllers/CP/Utilities/UpdateSearchController.php
+++ b/src/Http/Controllers/CP/Utilities/UpdateSearchController.php
@@ -8,6 +8,8 @@
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class UpdateSearchController extends CpController
 {
     public function update(Request $request)
diff --git a/src/Http/Controllers/Concerns/HandlesLogins.php b/src/Http/Controllers/Concerns/HandlesLogins.php
index 9132393e051..e460d1afdac 100644
--- a/src/Http/Controllers/Concerns/HandlesLogins.php
+++ b/src/Http/Controllers/Concerns/HandlesLogins.php
@@ -9,6 +9,9 @@
 use Statamic\Auth\ThrottlesLogins;
 use Statamic\Contracts\Auth\User;
 use Statamic\Events\TwoFactorAuthenticationChallenged;
+use Statamic\Facades\URL;
+
+use function Statamic\trans;
 
 trait HandlesLogins
 {
@@ -19,7 +22,7 @@ protected function handleTooManyLoginAttempts(Request $request)
         if ($this->hasTooManyLoginAttempts($request)) {
             $this->fireLockoutEvent($request);
 
-            return $this->sendLockoutResponse($request);
+            $this->sendLockoutResponse($request);
         }
     }
 
@@ -64,6 +67,10 @@ protected function twoFactorChallengeResponse(Request $request, User $user)
             'login.remember' => $request->boolean('remember'),
         ]);
 
+        if (($redirect = $request->input('_redirect')) && ! URL::isExternalToApplication($redirect)) {
+            redirect()->setIntendedUrl($redirect);
+        }
+
         TwoFactorAuthenticationChallenged::dispatch($user);
 
         return $request->wantsJson()
diff --git a/src/Http/Controllers/DictionaryFieldtypeController.php b/src/Http/Controllers/DictionaryFieldtypeController.php
new file mode 100644
index 00000000000..a54ee4ade84
--- /dev/null
+++ b/src/Http/Controllers/DictionaryFieldtypeController.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Statamic\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+use Statamic\Exceptions\DictionaryNotFoundException;
+use Statamic\Exceptions\ForbiddenHttpException;
+use Statamic\Exceptions\NotFoundHttpException;
+use Statamic\Exceptions\UndefinedDictionaryException;
+use Statamic\Fields\Field;
+use Statamic\Fieldtypes\Dictionary;
+
+class DictionaryFieldtypeController extends Controller
+{
+    public function __invoke(Request $request, string $dictionary)
+    {
+        try {
+            $dictionary = $this->fieldtype($request)->dictionary();
+        } catch (UndefinedDictionaryException|DictionaryNotFoundException $e) {
+            throw new NotFoundHttpException;
+        }
+
+        if (Gate::denies('access cp') && ! $dictionary->allowsPublicAccess()) {
+            throw new ForbiddenHttpException;
+        }
+
+        $options = $dictionary->options($request->search);
+
+        // Return an ordered list of key/value pairs rather than a value-keyed object.
+        // When the values are integers, the browser would re-sort the object's keys ascending,
+        // discarding the dictionary's own order.
+        return [
+            'data' => collect($options)
+                ->map(fn ($label, $key) => ['key' => (string) $key, 'value' => $label])
+                ->values()
+                ->all(),
+        ];
+    }
+
+    protected function fieldtype($request)
+    {
+        $config = $this->getConfig($request);
+
+        if (! is_array($config)) {
+            throw new NotFoundHttpException;
+        }
+
+        return (new Dictionary)->setField(
+            new Field('relationship', $config)
+        );
+    }
+
+    private function getConfig($request)
+    {
+        // The fieldtype base64-encodes the config.
+        $json = base64_decode($request->config);
+
+        // The json may include unicode characters, so we'll try to convert it to UTF-8.
+        // See https://github.com/statamic/cms/issues/566
+        $utf8 = mb_convert_encoding($json, 'UTF-8', mb_list_encodings());
+
+        // In PHP 8.1 there's a bug where encoding will return null. It's fixed in 8.1.2.
+        // In this case, we'll fall back to the original JSON, but without the encoding.
+        // Issue #566 may still occur, but it's better than failing completely.
+        $json = empty($utf8) ? $json : $utf8;
+
+        return json_decode($json, true);
+    }
+}
diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index 6f60ddd54f7..1b151be7c80 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -19,6 +19,8 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class FormController extends Controller
 {
     /**
diff --git a/src/Http/Controllers/OAuthController.php b/src/Http/Controllers/OAuthController.php
index 6215f8e6f7b..dbc25bec9a6 100644
--- a/src/Http/Controllers/OAuthController.php
+++ b/src/Http/Controllers/OAuthController.php
@@ -2,16 +2,21 @@
 
 namespace Statamic\Http\Controllers;
 
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Laravel\Socialite\Facades\Socialite;
 use Laravel\Socialite\Two\InvalidStateException;
+use Statamic\Events\TwoFactorAuthenticationChallenged;
 use Statamic\Exceptions\NotFoundHttpException;
+use Statamic\Exceptions\OAuthEmailExistsException;
 use Statamic\Facades\OAuth;
+use Statamic\Facades\TwoFactor;
 use Statamic\Facades\URL;
-use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class OAuthController
 {
     public function redirectToProvider(Request $request, string $provider)
@@ -23,15 +28,37 @@ public function redirectToProvider(Request $request, string $provider)
             throw new NotFoundHttpException();
         }
 
-        if (Str::startsWith(parse_url($referer)['path'], Str::ensureLeft(config('statamic.cp.route'), '/'))) {
+        $isCp = Str::startsWith(parse_url($referer)['path'], Str::ensureLeft(config('statamic.cp.route'), '/'));
+
+        if ($isCp) {
             $guard = config('statamic.users.guards.cp', 'web');
         }
 
+        if (Auth::guard($guard)->check() && $response = $this->requireElevatedSession($request, $isCp)) {
+            return $response;
+        }
+
         $request->session()->put('statamic.oauth.guard', $guard);
+        $request->session()->put('statamic.oauth.redirect', $request->query('redirect'));
 
         return Socialite::driver($provider)->redirect();
     }
 
+    private function requireElevatedSession(Request $request, bool $isCp)
+    {
+        if (! config('statamic.users.elevated_sessions_enabled') || $request->hasElevatedSession()) {
+            return null;
+        }
+
+        if ($request->wantsJson()) {
+            return response()->json(['message' => __('Requires an elevated session.')], 403);
+        }
+
+        $challenge = $isCp ? cp_route('confirm-password') : route('statamic.elevated-session');
+
+        return redirect()->setIntendedUrl($request->fullUrl())->to($challenge);
+    }
+
     public function handleProviderCallback(Request $request, string $provider)
     {
         $oauth = OAuth::provider($provider);
@@ -40,25 +67,49 @@ public function handleProviderCallback(Request $request, string $provider)
             throw new NotFoundHttpException();
         }
 
+        $guard = $request->session()->get('statamic.oauth.guard');
+
+        // When already authenticated, the callback is a request to connect a provider to the current
+        // account rather than to sign in. We'll enforce an elevated session *before* the session
+        // state gets consumed so the connection can succeed after they complete re-elevation.
+        if (Auth::guard($guard)->check() && $response = $this->requireElevatedSession($request, $this->isCpRequest())) {
+            return $response;
+        }
+
         try {
             $providerUser = $oauth->getSocialiteUser();
         } catch (InvalidStateException $e) {
             return $this->redirectToProvider($request, $provider);
         }
 
+        if (Auth::guard($guard)->check()) {
+            return $this->connectProvider($oauth, $providerUser, Auth::guard($guard)->user());
+        }
+
         if ($user = $oauth->findUser($providerUser)) {
             if (config('statamic.oauth.merge_user_data', true)) {
                 $user = $oauth->mergeUser($user, $providerUser);
             }
         } elseif (config('statamic.oauth.create_user', true)) {
-            $user = $oauth->createUser($providerUser);
+            try {
+                $user = $oauth->createUser($providerUser);
+            } catch (OAuthEmailExistsException $e) {
+                return redirect()
+                    ->to($this->unauthorizedRedirectUrl())
+                    ->with('error', __('statamic::messages.oauth_email_exists'));
+            }
         }
 
         if ($user) {
             session()->put('oauth-provider', $provider);
 
-            Auth::guard($request->session()->get('statamic.oauth.guard'))
-                ->login($user, config('statamic.oauth.remember_me', true));
+            // OAuth must not bypass two-factor. When the user has it enabled,
+            // defer the login and send them through the challenge instead.
+            if (TwoFactor::enabled() && $user->hasEnabledTwoFactorAuthentication()) {
+                return $this->twoFactorChallenge($user);
+            }
+
+            Auth::guard($guard)->login($user, config('statamic.oauth.remember_me', true));
 
             session()->elevate();
 
@@ -68,21 +119,63 @@ public function handleProviderCallback(Request $request, string $provider)
         return redirect()->to($this->unauthorizedRedirectUrl());
     }
 
-    protected function successRedirectUrl()
+    public function disconnect(Request $request, string $provider)
     {
-        $default = '/';
+        $oauth = OAuth::provider($provider);
+
+        if (! $oauth) {
+            throw new NotFoundHttpException();
+        }
 
-        $previous = session('_previous.url');
+        $oauth->forgetUser($request->user());
 
-        if (! $query = Arr::get(parse_url($previous), 'query')) {
-            return $default;
+        if ($request->wantsJson()) {
+            return new JsonResponse([], 204);
         }
 
-        parse_str($query, $query);
+        return back()->with('success', __('statamic::messages.oauth_disconnected', ['provider' => $oauth->label()]));
+    }
 
-        $redirect = Arr::get($query, 'redirect', $default);
+    protected function connectProvider($oauth, $providerUser, $user)
+    {
+        // Connecting relies on the stateful "state" parameter to protect against
+        // forced-connection CSRF, so it cannot be done with a stateless provider.
+        if ($oauth->isStateless()) {
+            return redirect()
+                ->to($this->successRedirectUrl())
+                ->with('error', __('statamic::messages.oauth_connect_unsupported'));
+        }
+
+        $existingUserId = $oauth->getUserId($providerUser->getId());
+
+        if ($existingUserId === $user->id()) {
+            return redirect()
+                ->to($this->successRedirectUrl())
+                ->with('success', __('statamic::messages.oauth_already_connected', ['provider' => $oauth->label()]));
+        }
+
+        if ($existingUserId) {
+            return redirect()
+                ->to($this->successRedirectUrl())
+                ->with('error', __('statamic::messages.oauth_belongs_to_another_user', ['provider' => $oauth->label()]));
+        }
+
+        $oauth->setUserProviderId($user, $providerUser->getId());
+
+        return redirect()
+            ->to($this->successRedirectUrl())
+            ->with('success', __('statamic::messages.oauth_connected', ['provider' => $oauth->label()]));
+    }
+
+    protected function successRedirectUrl()
+    {
+        $redirect = session('statamic.oauth.redirect');
 
-        return URL::isExternalToApplication($redirect) ? $default : $redirect;
+        if (! $redirect || URL::isExternalToApplication($redirect)) {
+            return '/';
+        }
+
+        return $redirect;
     }
 
     protected function unauthorizedRedirectUrl()
@@ -96,19 +189,37 @@ protected function unauthorizedRedirectUrl()
         // accessing the CP. If they were, we'll redirect them to
         // the unauthorized page in the CP. Otherwise, to home.
 
-        $default = '/';
-        $previous = session('_previous.url');
+        return $this->isCpRequest() ? cp_route('unauthorized') : '/';
+    }
 
-        if (! $query = Arr::get(parse_url($previous), 'query')) {
-            return $default;
-        }
+    protected function twoFactorChallenge($user)
+    {
+        session()->put([
+            'login.id' => $user->getKey(),
+            'login.remember' => config('statamic.oauth.remember_me', true),
+        ]);
 
-        parse_str($query, $query);
+        // Preserve the OAuth destination so the challenge sends the user
+        // there once they've passed two-factor.
+        redirect()->setIntendedUrl($this->successRedirectUrl());
 
-        if (! $redirect = Arr::get($query, 'redirect')) {
-            return $default;
-        }
+        TwoFactorAuthenticationChallenged::dispatch($user);
+
+        return redirect($this->twoFactorChallengeUrl());
+    }
+
+    protected function twoFactorChallengeUrl()
+    {
+        return $this->isCpRequest()
+            ? cp_route('two-factor-challenge')
+            : config('statamic.users.two_factor_challenge_url') ?? route('statamic.two-factor-challenge');
+    }
+
+    protected function isCpRequest()
+    {
+        $redirect = (string) session('statamic.oauth.redirect');
+        $cp = '/'.config('statamic.cp.route');
 
-        return $redirect === '/'.config('statamic.cp.route') ? cp_route('unauthorized') : $default;
+        return $redirect === $cp || Str::startsWith($redirect, $cp.'/');
     }
 }
diff --git a/src/Http/Controllers/ResetPasswordController.php b/src/Http/Controllers/ResetPasswordController.php
index 9d0064725c8..acf3b908368 100644
--- a/src/Http/Controllers/ResetPasswordController.php
+++ b/src/Http/Controllers/ResetPasswordController.php
@@ -7,12 +7,15 @@
 use Illuminate\Support\Facades\Password;
 use Inertia\Inertia;
 use Statamic\Auth\Passwords\PasswordReset;
+use Statamic\Auth\Passwords\TokenRepository;
 use Statamic\Auth\ResetsPasswords;
 use Statamic\Contracts\Auth\User;
 use Statamic\Facades\URL;
 use Statamic\Http\Middleware\CP\HandleInertiaRequests;
 use Statamic\Http\Middleware\CP\RedirectIfAuthorized;
 
+use function Statamic\trans as __;
+
 class ResetPasswordController extends Controller
 {
     use ResetsPasswords;
@@ -25,16 +28,35 @@ public function __construct()
 
     public function showResetForm(Request $request, $token = null)
     {
+        $emailFromRequest = $request->email;
+        $email = $emailFromRequest ?: $this->emailForToken($token);
+
         return Inertia::render('auth/passwords/Reset', [
             'loginUrl' => cp_route('login'),
             'token' => $token,
-            'email' => $request->email,
+            'email' => $email,
+            'emailReadonly' => $email && ! $emailFromRequest,
             'action' => $this->resetFormAction(),
             'redirect' => $request->redirect,
             'title' => $this->resetFormTitle(),
         ]);
     }
 
+    protected function emailForToken(?string $token): ?string
+    {
+        if (! $token) {
+            return null;
+        }
+
+        $repository = $this->broker()->getRepository();
+
+        if (! $repository instanceof TokenRepository) {
+            return null;
+        }
+
+        return $repository->findEmailByToken($token);
+    }
+
     protected function resetFormAction()
     {
         return route('statamic.password.reset.action');
diff --git a/src/Http/Controllers/TwoFactorChallengeController.php b/src/Http/Controllers/TwoFactorChallengeController.php
index 37487189f69..f6845b63f97 100644
--- a/src/Http/Controllers/TwoFactorChallengeController.php
+++ b/src/Http/Controllers/TwoFactorChallengeController.php
@@ -18,7 +18,7 @@ class TwoFactorChallengeController extends Controller
     public function __construct(Request $request)
     {
         $this->middleware('throttle:two-factor');
-        $this->middleware(HandleInertiaRequests::class);
+        $this->middleware(HandleInertiaRequests::class)->except('store');
         $this->middleware(RedirectIfAuthenticated::class);
     }
 
@@ -45,20 +45,39 @@ public function store(TwoFactorChallengeRequest $request)
         } elseif (! $request->hasValidCode()) {
             TwoFactorAuthenticationFailed::dispatch($user);
 
-            return $request->sendFailedTwoFactorChallengeResponse();
+            return $this->sendFailedResponse($request);
         }
 
         ValidTwoFactorAuthenticationCodeProvided::dispatch($user);
 
         Auth::guard()->login($user, $request->remember());
 
+        $request->session()->forget(['login.id', 'login.remember']);
+
         $request->session()->elevate();
 
         $request->session()->regenerate();
 
-        return $request->expectsJson()
-            ? response('Authenticated')
-            : redirect()->intended($this->redirectPath());
+        $redirect = $this->redirectPath($request);
+
+        if ($request->inertia() || $request->expectsJson()) {
+            return $request->inertia()
+                ? Inertia::location($redirect)
+                : response('Authenticated');
+        }
+
+        return redirect($redirect);
+    }
+
+    protected function sendFailedResponse(TwoFactorChallengeRequest $request)
+    {
+        if ($errorRedirect = $request->input('_error_redirect')) {
+            if (! URL::isExternalToApplication($errorRedirect)) {
+                return $request->sendFailedTwoFactorChallengeResponse($errorRedirect);
+            }
+        }
+
+        return $request->sendFailedTwoFactorChallengeResponse($this->failedRedirectPath());
     }
 
     protected function formAction()
@@ -66,12 +85,24 @@ protected function formAction()
         return route('statamic.two-factor-challenge');
     }
 
-    protected function redirectPath()
+    protected function redirectPath(Request $request)
     {
-        $redirect = request('redirect');
+        $intended = $request->session()->pull('url.intended', $this->defaultRedirectPath());
 
-        return $redirect && ! URL::isExternalToApplication($redirect)
-            ? $redirect
-            : route('statamic.site');
+        if (($redirect = $request->input('_redirect')) && ! URL::isExternalToApplication($redirect)) {
+            return $redirect;
+        }
+
+        return $intended;
+    }
+
+    protected function defaultRedirectPath(): string
+    {
+        return route('statamic.site');
+    }
+
+    protected function failedRedirectPath()
+    {
+        return config('statamic.users.two_factor_challenge_url') ?? route('statamic.two-factor-challenge');
     }
 }
diff --git a/src/Http/Controllers/TwoFactorSetupController.php b/src/Http/Controllers/TwoFactorSetupController.php
index 6e26410457d..103e0017ee4 100644
--- a/src/Http/Controllers/TwoFactorSetupController.php
+++ b/src/Http/Controllers/TwoFactorSetupController.php
@@ -19,24 +19,25 @@ public function __construct(Request $request)
     public function __invoke(Request $request)
     {
         $user = User::fromUser($request->user());
+        $redirect = $this->redirectPath();
 
         if ($user->hasEnabledTwoFactorAuthentication()) {
-            return redirect($this->redirectPath());
+            return redirect($redirect);
         }
 
         return Inertia::render('auth/two-factor/Setup', [
             'routes' => $this->routes($user),
-            'redirect' => $this->redirectPath(),
+            'redirect' => $redirect,
         ]);
     }
 
     protected function redirectPath()
     {
-        $redirect = request('redirect');
+        if (($redirect = request('redirect')) && ! URL::isExternalToApplication($redirect)) {
+            return $redirect;
+        }
 
-        return $redirect && ! URL::isExternalToApplication($redirect)
-            ? $redirect
-            : route('statamic.site');
+        return redirect()->getIntendedUrl() ?? route('statamic.site');
     }
 
     protected function routes($user): array
diff --git a/src/Http/Controllers/User/LoginController.php b/src/Http/Controllers/User/LoginController.php
index 509bfe94d63..2bf3212df27 100644
--- a/src/Http/Controllers/User/LoginController.php
+++ b/src/Http/Controllers/User/LoginController.php
@@ -6,12 +6,15 @@
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Statamic\Facades\TwoFactor;
 use Statamic\Facades\URL;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\Concerns\HandlesLogins;
 use Statamic\Http\Controllers\Controller;
 use Statamic\Http\Requests\UserLoginRequest;
 
+use function Statamic\trans as __;
+
 class LoginController extends Controller
 {
     use HandlesLogins;
@@ -20,22 +23,58 @@ public function login(UserLoginRequest $request)
     {
         $this->handleTooManyLoginAttempts($request);
 
+        $this->checkPasskeyEnforcement($request);
+
         $user = User::fromUser($this->validateCredentials($request));
 
-        if ($user->hasEnabledTwoFactorAuthentication()) {
+        if (TwoFactor::enabled() && $user->hasEnabledTwoFactorAuthentication()) {
             return $this->twoFactorChallengeResponse($request, $user);
         }
 
+        // An explicit form redirect overrides any URL stashed by the auth middleware.
+        if (($redirect = $request->input('_redirect')) && ! URL::isExternalToApplication($redirect)) {
+            redirect()->setIntendedUrl($redirect);
+        }
+
         $this->authenticate($request, $user);
 
-        $redirect = $request->input('_redirect', '/');
+        // Preserve the intended URL for the setup flow to consume after the user completes setup.
+        if (TwoFactor::enabled() && $user->isTwoFactorAuthenticationRequired() && ! $user->hasEnabledTwoFactorAuthentication()) {
+            return redirect(redirect()->getIntendedUrl() ?? route('statamic.site'))
+                ->withSuccess(__('Login successful.'));
+        }
 
-        return redirect(URL::isExternalToApplication($redirect) ? '/' : $redirect)->withSuccess(__('Login successful.'));
+        return redirect()->intended(route('statamic.site'))->withSuccess(__('Login successful.'));
+    }
+
+    private function checkPasskeyEnforcement(Request $request)
+    {
+        if (config('statamic.webauthn.allow_password_login_with_passkey', true)) {
+            return;
+        }
+
+        if (! $user = User::findByEmail($request->get($this->username()))) {
+            return;
+        }
+
+        if ($user->passkeys()->isEmpty()) {
+            return;
+        }
+
+        $errorRedirect = $request->input('_error_redirect');
+
+        $errorResponse = $errorRedirect && ! URL::isExternalToApplication($errorRedirect)
+            ? redirect($errorRedirect)
+            : back();
+
+        throw new HttpResponseException(
+            $errorResponse->withInput()->withErrors(__('statamic::messages.password_passkeys_only'))
+        );
     }
 
     protected function twoFactorChallengeRedirect(): string
     {
-        return route('statamic.two-factor-challenge');
+        return config('statamic.users.two_factor_challenge_url') ?? route('statamic.two-factor-challenge');
     }
 
     /**
@@ -75,9 +114,13 @@ public function logout()
     {
         Auth::logout();
 
-        $redirect = request()->get('redirect', '/');
+        $redirect = request()->get('redirect');
+
+        $url = $redirect && ! URL::isExternalToApplication($redirect)
+            ? $redirect
+            : route('statamic.site');
 
-        return redirect(URL::isExternalToApplication($redirect) ? '/' : $redirect);
+        return redirect($url);
     }
 
     protected function username()
diff --git a/src/Http/Controllers/User/PasskeyController.php b/src/Http/Controllers/User/PasskeyController.php
new file mode 100644
index 00000000000..466e7be9f2e
--- /dev/null
+++ b/src/Http/Controllers/User/PasskeyController.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Statamic\Http\Controllers\User;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Statamic\Auth\WebAuthn\Serializer;
+use Statamic\Facades\User;
+use Statamic\Facades\WebAuthn;
+use Statamic\Http\Controllers\Controller;
+
+use function Statamic\trans as __;
+
+class PasskeyController extends Controller
+{
+    public function create()
+    {
+        $options = WebAuthn::prepareAttestation(User::current());
+
+        return app(Serializer::class)->normalize($options);
+    }
+
+    public function store(Request $request)
+    {
+        $credentials = $request->only(['id', 'rawId', 'response', 'type']);
+
+        WebAuthn::validateAttestation(User::current(), $credentials, $request->name ?? 'Passkey');
+
+        return ['verified' => true];
+    }
+
+    public function destroy($id, Request $request)
+    {
+        if (! $passkey = User::current()->passkeys()->get($id)) {
+            abort(403);
+        }
+
+        $passkey->delete();
+
+        if ($request->wantsJson()) {
+            return new JsonResponse([], 204);
+        }
+
+        return back()->with('success', __('Passkey deleted.'));
+    }
+}
diff --git a/src/Http/Controllers/User/PasskeyLoginController.php b/src/Http/Controllers/User/PasskeyLoginController.php
new file mode 100644
index 00000000000..924689b2113
--- /dev/null
+++ b/src/Http/Controllers/User/PasskeyLoginController.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Statamic\Http\Controllers\User;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Statamic\Auth\WebAuthn\Serializer;
+use Statamic\Contracts\Auth\User as UserContract;
+use Statamic\Facades\URL;
+use Statamic\Facades\WebAuthn;
+use Statamic\Http\Controllers\Controller;
+
+class PasskeyLoginController extends Controller
+{
+    public function options()
+    {
+        $options = WebAuthn::prepareAssertion();
+
+        return app(Serializer::class)->normalize($options);
+    }
+
+    public function login(Request $request)
+    {
+        $credentials = $request->only(['id', 'rawId', 'response', 'type']);
+
+        $user = WebAuthn::getUserFromCredentials($credentials);
+
+        WebAuthn::validateAssertion($user, $credentials);
+
+        $this->authenticate($user);
+
+        return ['redirect' => $this->successRedirectUrl($request)];
+    }
+
+    protected function authenticate(UserContract $user): void
+    {
+        Auth::login($user, config('statamic.webauthn.remember_me', true));
+
+        session()->elevate();
+        session()->regenerate();
+    }
+
+    protected function successRedirectUrl(Request $request): string
+    {
+        if (($redirect = $request->input('redirect')) && ! URL::isExternalToApplication($redirect)) {
+            return $redirect;
+        }
+
+        return $request->session()->pull('url.intended', $this->defaultRedirectUrl());
+    }
+
+    protected function defaultRedirectUrl(): string
+    {
+        return '/';
+    }
+}
diff --git a/src/Http/Controllers/User/PasswordController.php b/src/Http/Controllers/User/PasswordController.php
index 56093999e45..98c131b959f 100644
--- a/src/Http/Controllers/User/PasswordController.php
+++ b/src/Http/Controllers/User/PasswordController.php
@@ -7,6 +7,8 @@
 use Statamic\Facades\User;
 use Statamic\Http\Requests\UserPasswordRequest;
 
+use function Statamic\trans as __;
+
 class PasswordController
 {
     public function __invoke(UserPasswordRequest $request)
diff --git a/src/Http/Controllers/User/ProfileController.php b/src/Http/Controllers/User/ProfileController.php
index f1043f62a4c..d10ed9af41d 100644
--- a/src/Http/Controllers/User/ProfileController.php
+++ b/src/Http/Controllers/User/ProfileController.php
@@ -6,6 +6,8 @@
 use Statamic\Facades\User;
 use Statamic\Http\Requests\UserProfileRequest;
 
+use function Statamic\trans as __;
+
 class ProfileController
 {
     public function __invoke(UserProfileRequest $request)
diff --git a/src/Http/Controllers/User/RegisterController.php b/src/Http/Controllers/User/RegisterController.php
index 651fc50c522..83604cbff73 100644
--- a/src/Http/Controllers/User/RegisterController.php
+++ b/src/Http/Controllers/User/RegisterController.php
@@ -13,6 +13,8 @@
 use Statamic\Http\Requests\UserRegisterRequest;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class RegisterController
 {
     public function __invoke(UserRegisterRequest $request)
diff --git a/src/Http/Controllers/User/TwoFactorAuthenticationController.php b/src/Http/Controllers/User/TwoFactorAuthenticationController.php
index 25a69b8ab8a..1173b4595cc 100644
--- a/src/Http/Controllers/User/TwoFactorAuthenticationController.php
+++ b/src/Http/Controllers/User/TwoFactorAuthenticationController.php
@@ -3,12 +3,16 @@
 namespace Statamic\Http\Controllers\User;
 
 use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
 use Statamic\Auth\TwoFactor\ConfirmTwoFactorAuthentication;
 use Statamic\Auth\TwoFactor\DisableTwoFactorAuthentication;
 use Statamic\Auth\TwoFactor\EnableTwoFactorAuthentication;
+use Statamic\Facades\URL;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 
+use function Statamic\trans as __;
+
 class TwoFactorAuthenticationController extends CpController
 {
     public function enable(Request $request, EnableTwoFactorAuthentication $enable)
@@ -19,25 +23,48 @@ public function enable(Request $request, EnableTwoFactorAuthentication $enable)
             abort(403);
         }
 
-        // We don't want to regenerate the QR code when there's an error in the session.
-        if (! session()->get('errors')?->has('code')) {
+        if (empty($user->two_factor_secret)) {
             $enable($user);
         }
 
-        return [
-            'qr' => $user->twoFactorQrCodeSvg(),
-            'secret_key' => $user->twoFactorSecretKey(),
-            'confirm_url' => $this->confirmUrl(),
-        ];
+        if ($request->expectsJson()) {
+            return [
+                'qr' => $user->twoFactorQrCodeSvg(),
+                'secret_key' => $user->twoFactorSecretKey(),
+                'confirm_url' => $this->confirmUrl(),
+            ];
+        }
+
+        if (($redirect = $request->input('_redirect')) && ! URL::isExternalToApplication($redirect)) {
+            return redirect($redirect);
+        }
+
+        if ($setupUrl = config('statamic.users.two_factor_setup_url')) {
+            return redirect($setupUrl);
+        }
+
+        return back();
     }
 
     public function confirm(Request $request, ConfirmTwoFactorAuthentication $confirm)
     {
         $user = User::current();
 
-        $confirm($user, $request->input('code'));
+        try {
+            $confirm($user, $request->input('code'));
+        } catch (ValidationException $e) {
+            if ($request->expectsJson()) {
+                throw $e;
+            }
 
-        return [];
+            return $this->handleFormValidationError($request, $e, 'user.two_factor_setup');
+        }
+
+        if ($request->expectsJson()) {
+            return [];
+        }
+
+        return $this->formSuccessRedirect($request, __('Two-factor authentication enabled.'), 'user.two_factor_setup');
     }
 
     public function disable(Request $request, DisableTwoFactorAuthentication $disable)
@@ -46,11 +73,42 @@ public function disable(Request $request, DisableTwoFactorAuthentication $disabl
 
         $disable($user);
 
+        if ($request->expectsJson()) {
+            if ($user->isTwoFactorAuthenticationRequired()) {
+                return ['redirect' => $this->setupUrlRedirect()];
+            }
+
+            return ['redirect' => null];
+        }
+
         if ($user->isTwoFactorAuthenticationRequired()) {
-            return ['redirect' => $this->setupUrlRedirect()];
+            return redirect($this->setupUrlRedirect())
+                ->with('user.two_factor_disable.success', __('Two-factor authentication disabled.'));
+        }
+
+        return $this->formSuccessRedirect($request, __('Two-factor authentication disabled.'), 'user.two_factor_disable');
+    }
+
+    private function handleFormValidationError(Request $request, ValidationException $e, string $formName)
+    {
+        $errorRedirect = $request->input('_error_redirect');
+
+        $redirect = $errorRedirect && ! URL::isExternalToApplication($errorRedirect)
+            ? redirect($errorRedirect)
+            : back();
+
+        return $redirect->withInput()->withErrors($e->errors(), $formName);
+    }
+
+    private function formSuccessRedirect(Request $request, string $message, string $formName)
+    {
+        $successKey = "{$formName}.success";
+
+        if (($redirect = $request->input('_redirect')) && ! URL::isExternalToApplication($redirect)) {
+            return redirect($redirect)->with($successKey, $message);
         }
 
-        return ['redirect' => null];
+        return redirect()->intended(back()->getTargetUrl())->with($successKey, $message);
     }
 
     protected function confirmUrl()
@@ -60,6 +118,6 @@ protected function confirmUrl()
 
     protected function setupUrlRedirect()
     {
-        return route('statamic.two-factor-setup');
+        return config('statamic.users.two_factor_setup_url') ?? route('statamic.two-factor-setup');
     }
 }
diff --git a/src/Http/Controllers/User/TwoFactorRecoveryCodesController.php b/src/Http/Controllers/User/TwoFactorRecoveryCodesController.php
index 359c093abf1..8e8c6102336 100644
--- a/src/Http/Controllers/User/TwoFactorRecoveryCodesController.php
+++ b/src/Http/Controllers/User/TwoFactorRecoveryCodesController.php
@@ -5,9 +5,12 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Statamic\Auth\TwoFactor\GenerateNewRecoveryCodes;
+use Statamic\Facades\URL;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 
+use function Statamic\trans as __;
+
 class TwoFactorRecoveryCodesController extends CpController
 {
     public function show(Request $request)
@@ -21,7 +24,11 @@ public function store(Request $request, GenerateNewRecoveryCodes $generateRecove
 
         $generateRecoveryCodes($user);
 
-        return ['recovery_codes' => $user->twoFactorRecoveryCodes()];
+        if ($request->expectsJson()) {
+            return ['recovery_codes' => $user->twoFactorRecoveryCodes()];
+        }
+
+        return $this->formSuccessRedirect($request, __('Recovery codes regenerated.'), 'user.two_factor_reset_recovery_codes');
     }
 
     public function download(Request $request)
@@ -37,4 +44,15 @@ public function download(Request $request)
             'Content-Disposition' => 'attachment; filename="'.$filename.'"',
         ]);
     }
+
+    private function formSuccessRedirect(Request $request, string $message, string $formName)
+    {
+        $redirect = $request->input('_redirect');
+
+        $url = $redirect && ! URL::isExternalToApplication($redirect)
+            ? $redirect
+            : back()->getTargetUrl();
+
+        return redirect($url)->with("{$formName}.success", $message);
+    }
 }
diff --git a/src/Http/Middleware/CP/HandleAuthenticatedInertiaRequests.php b/src/Http/Middleware/CP/HandleAuthenticatedInertiaRequests.php
index ba832c8b8f4..1fc91378565 100644
--- a/src/Http/Middleware/CP/HandleAuthenticatedInertiaRequests.php
+++ b/src/Http/Middleware/CP/HandleAuthenticatedInertiaRequests.php
@@ -15,6 +15,8 @@
 use Statamic\Licensing\LicenseManager;
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 class HandleAuthenticatedInertiaRequests
 {
     public function handle(Request $request, Closure $next)
@@ -45,6 +47,7 @@ private function authedStatamicProps($request)
     private function alwaysProps()
     {
         return [
+            'version' => Statamic::version(),
             'isPro' => Statamic::pro(),
             'nav' => $this->nav(),
             'cmsName' => __(Statamic::pro() ? config('statamic.cp.custom_cms_name', 'Statamic') : 'Statamic'),
diff --git a/src/Http/Middleware/CP/HandleInertiaRequests.php b/src/Http/Middleware/CP/HandleInertiaRequests.php
index 5d6f0f3ce44..19a75c61777 100644
--- a/src/Http/Middleware/CP/HandleInertiaRequests.php
+++ b/src/Http/Middleware/CP/HandleInertiaRequests.php
@@ -3,13 +3,21 @@
 namespace Statamic\Http\Middleware\CP;
 
 use Illuminate\Http\Request;
+use Inertia\Inertia;
 use Inertia\Middleware;
 use Statamic\CP\Toasts\Manager;
 use Statamic\Statamic;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+use function Statamic\trans as __;
 
 class HandleInertiaRequests extends Middleware
 {
-    protected $rootView = 'statamic::layout';
+    public const ROOT_VIEW = 'statamic::layout';
+
+    protected $rootView = self::ROOT_VIEW;
 
     public function version(Request $request): ?string
     {
@@ -26,14 +34,23 @@ public function share(Request $request): array
         return array_filter([
             ...parent::share($request),
             '_statamic' => [
-                'version' => Statamic::version(),
                 'cmsName' => __(Statamic::pro() ? config('statamic.cp.custom_cms_name', 'Statamic') : 'Statamic'),
                 'logos' => $this->logos(),
+                'isCpRoute' => Statamic::isCpRoute(),
             ],
             '_toasts' => $this->toasts($request),
         ]);
     }
 
+    public function onEmptyResponse(Request $request, Response $response): Response
+    {
+        if ($response instanceof StreamedResponse || $response instanceof BinaryFileResponse) {
+            return Inertia::location($request->fullUrl());
+        }
+
+        return parent::onEmptyResponse($request, $response);
+    }
+
     private function logos()
     {
         if (! Statamic::pro()) {
@@ -75,6 +92,11 @@ private function toasts(Request $request)
             $this->toasts->success($message);
         }
 
+        // Laravel's built-in auth flows (password reset, etc.) flash to 'status'.
+        if ($message = $session->get('status')) {
+            $this->toasts->success($message);
+        }
+
         if ($message = $session->get('error')) {
             $this->toasts->error($message);
         }
diff --git a/src/Http/Middleware/CP/RedirectIfAuthorized.php b/src/Http/Middleware/CP/RedirectIfAuthorized.php
index 3058ec7791c..76b14a89d76 100644
--- a/src/Http/Middleware/CP/RedirectIfAuthorized.php
+++ b/src/Http/Middleware/CP/RedirectIfAuthorized.php
@@ -6,6 +6,8 @@
 use Illuminate\Support\Facades\Auth;
 use Statamic\Facades\User;
 
+use function Statamic\trans as __;
+
 class RedirectIfAuthorized
 {
     /**
diff --git a/src/Http/Middleware/CP/RedirectIfTwoFactorSetupIncomplete.php b/src/Http/Middleware/CP/RedirectIfTwoFactorSetupIncomplete.php
index c1cd853fa54..dfc7c0e6518 100644
--- a/src/Http/Middleware/CP/RedirectIfTwoFactorSetupIncomplete.php
+++ b/src/Http/Middleware/CP/RedirectIfTwoFactorSetupIncomplete.php
@@ -10,4 +10,9 @@ protected function redirectRoute(): string
     {
         return 'statamic.cp.two-factor-setup';
     }
+
+    protected function redirectUrl(): string
+    {
+        return route($this->redirectRoute());
+    }
 }
diff --git a/src/Http/Middleware/CP/RequireElevatedSession.php b/src/Http/Middleware/CP/RequireElevatedSession.php
index cf493393a8a..1b76436705c 100644
--- a/src/Http/Middleware/CP/RequireElevatedSession.php
+++ b/src/Http/Middleware/CP/RequireElevatedSession.php
@@ -2,17 +2,9 @@
 
 namespace Statamic\Http\Middleware\CP;
 
-use Closure;
-use Statamic\Exceptions\ElevatedSessionAuthorizationException;
+use Statamic\Http\Middleware\RequireElevatedSession as Middleware;
 
-class RequireElevatedSession
+class RequireElevatedSession extends Middleware
 {
-    public function handle($request, Closure $next)
-    {
-        if (! $request->hasElevatedSession()) {
-            throw new ElevatedSessionAuthorizationException;
-        }
-
-        return $next($request);
-    }
+    //
 }
diff --git a/src/Http/Middleware/CP/StartSession.php b/src/Http/Middleware/CP/StartSession.php
index ce0378b6ce1..7069a91c889 100644
--- a/src/Http/Middleware/CP/StartSession.php
+++ b/src/Http/Middleware/CP/StartSession.php
@@ -6,10 +6,15 @@
 
 class StartSession extends Middleware
 {
+    protected $routesExcludedFromExtendingSession = [
+        'statamic.cp.session.timeout',
+        'statamic.cp.token',
+    ];
+
     protected function saveSession($request)
     {
         if (
-            $request->route()->named('statamic.cp.session.timeout')
+            $request->route()->named($this->routesExcludedFromExtendingSession)
             && $request->session()->has('last_activity')
         ) {
             return;
diff --git a/src/Http/Middleware/DeleteTemporaryFileUploads.php b/src/Http/Middleware/DeleteTemporaryFileUploads.php
index 50e18b07347..ef13ab19634 100644
--- a/src/Http/Middleware/DeleteTemporaryFileUploads.php
+++ b/src/Http/Middleware/DeleteTemporaryFileUploads.php
@@ -20,10 +20,11 @@ public function handle($request, Closure $next)
 
     private function deleteFilesOverAnHourOld()
     {
-        $disk = File::disk('local');
+        $disk = File::disk(config('statamic.system.file_uploads_disk', 'local'));
+        $directory = config('statamic.system.file_uploads_path', 'statamic/file-uploads');
 
         $disk
-            ->getFilesRecursively($dir = 'statamic/file-uploads')
+            ->getFilesRecursively($directory)
             ->filter(function ($path) {
                 $bits = explode('/', $path);
                 $timestamp = $bits[count($bits) - 2];
@@ -32,6 +33,6 @@ private function deleteFilesOverAnHourOld()
             })
             ->each(fn ($path) => $disk->delete($path));
 
-        $disk->deleteEmptySubfolders($dir);
+        $disk->deleteEmptySubfolders($directory);
     }
 }
diff --git a/src/Http/Middleware/RedirectIfTwoFactorSetupIncomplete.php b/src/Http/Middleware/RedirectIfTwoFactorSetupIncomplete.php
index 26923972888..bb223a7e0b5 100644
--- a/src/Http/Middleware/RedirectIfTwoFactorSetupIncomplete.php
+++ b/src/Http/Middleware/RedirectIfTwoFactorSetupIncomplete.php
@@ -4,6 +4,8 @@
 
 use Closure;
 use Illuminate\Http\Request;
+use Statamic\Auth\TwoFactor\EnableTwoFactorAuthentication;
+use Statamic\Facades\TwoFactor;
 use Statamic\Facades\User;
 
 class RedirectIfTwoFactorSetupIncomplete
@@ -11,18 +13,41 @@ class RedirectIfTwoFactorSetupIncomplete
     public function handle(Request $request, Closure $next)
     {
         if (
-            ($user = User::fromUser($request->user()))
+            TwoFactor::enabled()
+            && ($user = User::fromUser($request->user()))
             && $user->isTwoFactorAuthenticationRequired()
             && ! $user->hasEnabledTwoFactorAuthentication()
+            && ! $this->isSetupUrl($request)
         ) {
-            return redirect()->route($this->redirectRoute(), [
-                'referer' => $request->fullUrl(),
-            ]);
+            if (empty($user->two_factor_secret)) {
+                app(EnableTwoFactorAuthentication::class)($user);
+            }
+
+            redirect()->setIntendedUrl($request->fullUrl());
+
+            return redirect($this->redirectUrl());
         }
 
         return $next($request);
     }
 
+    protected function isSetupUrl(Request $request): bool
+    {
+        if (! $customUrl = config('statamic.users.two_factor_setup_url')) {
+            return false;
+        }
+
+        $currentPath = '/'.ltrim($request->path(), '/');
+        $customPath = '/'.ltrim(parse_url($customUrl, PHP_URL_PATH) ?? '', '/');
+
+        return $currentPath === $customPath;
+    }
+
+    protected function redirectUrl(): string
+    {
+        return config('statamic.users.two_factor_setup_url') ?? route($this->redirectRoute());
+    }
+
     protected function redirectRoute(): string
     {
         return 'statamic.two-factor-setup';
diff --git a/src/Http/Middleware/RequireElevatedSession.php b/src/Http/Middleware/RequireElevatedSession.php
new file mode 100644
index 00000000000..f990cb75dd3
--- /dev/null
+++ b/src/Http/Middleware/RequireElevatedSession.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Http\Middleware;
+
+use Closure;
+use Statamic\Exceptions\ElevatedSessionAuthorizationException;
+
+class RequireElevatedSession
+{
+    public function handle($request, Closure $next)
+    {
+        if (config('statamic.users.elevated_sessions_enabled') && ! $request->hasElevatedSession()) {
+            throw new ElevatedSessionAuthorizationException;
+        }
+
+        return $next($request);
+    }
+}
diff --git a/src/Http/Middleware/RequireStatamicPro.php b/src/Http/Middleware/RequireStatamicPro.php
index b9cdc14c489..e442e8623a5 100644
--- a/src/Http/Middleware/RequireStatamicPro.php
+++ b/src/Http/Middleware/RequireStatamicPro.php
@@ -6,6 +6,8 @@
 use Statamic\Exceptions\StatamicProAuthorizationException;
 use Statamic\Statamic;
 
+use function Statamic\trans as __;
+
 class RequireStatamicPro
 {
     public function handle($request, Closure $next)
diff --git a/src/Http/Middleware/StacheLock.php b/src/Http/Middleware/StacheLock.php
index 4408f576fc2..ea48ddb5db1 100644
--- a/src/Http/Middleware/StacheLock.php
+++ b/src/Http/Middleware/StacheLock.php
@@ -5,6 +5,8 @@
 use Closure;
 use Statamic\Facades\Stache;
 
+use function Statamic\trans as __;
+
 class StacheLock
 {
     public function handle($request, Closure $next)
diff --git a/src/Http/Requests/CP/Auth/ElevatedSessionConfirmationRequest.php b/src/Http/Requests/Auth/ElevatedSessionConfirmationRequest.php
similarity index 91%
rename from src/Http/Requests/CP/Auth/ElevatedSessionConfirmationRequest.php
rename to src/Http/Requests/Auth/ElevatedSessionConfirmationRequest.php
index dd217a9bdc7..ea044a2c493 100644
--- a/src/Http/Requests/CP/Auth/ElevatedSessionConfirmationRequest.php
+++ b/src/Http/Requests/Auth/ElevatedSessionConfirmationRequest.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace Statamic\Http\Requests\CP\Auth;
+namespace Statamic\Http\Requests\Auth;
 
 use Illuminate\Foundation\Http\FormRequest;
 
+use function Statamic\trans as __;
+
 class ElevatedSessionConfirmationRequest extends FormRequest
 {
     public function authorize(): bool
diff --git a/src/Http/Requests/FrontendFormRequest.php b/src/Http/Requests/FrontendFormRequest.php
index 795e042044c..3e696a163a6 100644
--- a/src/Http/Requests/FrontendFormRequest.php
+++ b/src/Http/Requests/FrontendFormRequest.php
@@ -2,10 +2,12 @@
 
 namespace Statamic\Http\Requests;
 
+use Facades\Statamic\Fields\Validator as FieldValidator;
 use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Traits\Localizable;
 use Illuminate\Validation\ValidationException;
+use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Site;
 use Statamic\Facades\URL;
 use Statamic\Rules\AllowedFile;
@@ -74,19 +76,36 @@ protected function failedValidation(Validator $validator)
             throw (new ValidationException($validator, $response));
         }
 
-        return parent::failedValidation($validator);
+        parent::failedValidation($validator);
     }
 
     private function extraRules($fields)
     {
         return $fields->all()
-            ->filter(fn ($field) => $field->fieldtype()->handle() === 'assets')
+            ->filter(fn ($field) => in_array($field->fieldtype()->handle(), ['assets', 'files']))
             ->mapWithKeys(function ($field) {
-                return [$field->handle().'.*' => ['file', new AllowedFile]];
+                $rules = $field->fieldtype()->handle() === 'assets'
+                    ? array_merge(['file', new AllowedFile], $this->assetContainerRules($field))
+                    : ['file', new AllowedFile($field->fieldtype()->config('allowed_extensions'))];
+
+                return [$field->handle().'.*' => $rules];
             })
             ->all();
     }
 
+    private function assetContainerRules($field)
+    {
+        $configured = $field->fieldtype()->config('container');
+
+        $container = $configured
+            ? AssetContainer::find($configured)
+            : (($containers = AssetContainer::all())->count() === 1 ? $containers->first() : null);
+
+        return collect($container?->validationRules())
+            ->map(fn ($rule) => FieldValidator::parse($rule))
+            ->all();
+    }
+
     private function getFormFields()
     {
         if ($this->cachedFields) {
@@ -122,7 +141,7 @@ public function validateResolved()
         // directly in a headless format. In that case, we'll just use the default lang.
         $site = ($previousUrl = $this->previousUrl()) ? Site::findByUrl($previousUrl) : null;
 
-        return $this->withLocale($site?->lang(), fn () => parent::validateResolved());
+        $this->withLocale($site?->lang(), fn () => parent::validateResolved());
     }
 
     private function previousUrl()
diff --git a/src/Http/Requests/TwoFactorChallengeRequest.php b/src/Http/Requests/TwoFactorChallengeRequest.php
index ebb5d74c7b9..6b733bd0320 100644
--- a/src/Http/Requests/TwoFactorChallengeRequest.php
+++ b/src/Http/Requests/TwoFactorChallengeRequest.php
@@ -8,6 +8,8 @@
 use Illuminate\Validation\ValidationException;
 use Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider;
 
+use function Statamic\trans as __;
+
 class TwoFactorChallengeRequest extends FormRequest
 {
     /**
@@ -135,7 +137,7 @@ public function remember()
         return $this->remember;
     }
 
-    public function sendFailedTwoFactorChallengeResponse()
+    public function sendFailedTwoFactorChallengeResponse(?string $redirectUrl = null)
     {
         [$key, $message] = $this->filled('recovery_code')
             ? ['recovery_code', __('statamic::validation.invalid_two_factor_recovery_code')]
@@ -147,6 +149,8 @@ public function sendFailedTwoFactorChallengeResponse()
             ]);
         }
 
-        return redirect()->route('statamic.cp.two-factor-challenge')->withErrors([$key => $message]);
+        $redirect = $redirectUrl ?? route('statamic.cp.two-factor-challenge');
+
+        return redirect($redirect)->withErrors([$key => $message]);
     }
 }
diff --git a/src/Http/Requests/UserLoginRequest.php b/src/Http/Requests/UserLoginRequest.php
index d132e0ffbd3..558625bb485 100644
--- a/src/Http/Requests/UserLoginRequest.php
+++ b/src/Http/Requests/UserLoginRequest.php
@@ -10,6 +10,8 @@
 use Statamic\Facades\Site;
 use Statamic\Facades\URL;
 
+use function Statamic\trans as __;
+
 class UserLoginRequest extends FormRequest
 {
     use Localizable;
@@ -30,7 +32,7 @@ public function rules(): array
     protected function failedValidation(Validator $validator)
     {
         if ($this->isPrecognitive() || $this->wantsJson()) {
-            return parent::failedValidation($validator);
+            parent::failedValidation($validator);
         }
 
         if ($this->ajax()) {
@@ -56,6 +58,6 @@ public function validateResolved()
     {
         $site = Site::findByUrl(LaravelURL::previous()) ?? Site::default();
 
-        return $this->withLocale($site->lang(), fn () => parent::validateResolved());
+        $this->withLocale($site->lang(), fn () => parent::validateResolved());
     }
 }
diff --git a/src/Http/Requests/UserPasswordRequest.php b/src/Http/Requests/UserPasswordRequest.php
index d7cb084a507..bf7910ec3ae 100644
--- a/src/Http/Requests/UserPasswordRequest.php
+++ b/src/Http/Requests/UserPasswordRequest.php
@@ -32,7 +32,7 @@ public function rules(): array
     protected function failedValidation(Validator $validator)
     {
         if ($this->isPrecognitive() || $this->wantsJson()) {
-            return parent::failedValidation($validator);
+            parent::failedValidation($validator);
         }
 
         if ($this->ajax()) {
@@ -58,6 +58,6 @@ public function validateResolved()
     {
         $site = Site::findByUrl(LaravelURL::previous()) ?? Site::default();
 
-        return $this->withLocale($site->lang(), fn () => parent::validateResolved());
+        $this->withLocale($site->lang(), fn () => parent::validateResolved());
     }
 }
diff --git a/src/Http/Requests/UserProfileRequest.php b/src/Http/Requests/UserProfileRequest.php
index e025e29f3b1..22ab78d45d6 100644
--- a/src/Http/Requests/UserProfileRequest.php
+++ b/src/Http/Requests/UserProfileRequest.php
@@ -27,7 +27,7 @@ public function authorize(): bool
     protected function failedValidation(Validator $validator)
     {
         if ($this->isPrecognitive() || $this->wantsJson()) {
-            return parent::failedValidation($validator);
+            parent::failedValidation($validator);
         }
 
         if ($this->ajax()) {
@@ -77,7 +77,7 @@ public function validateResolved()
     {
         $site = Site::findByUrl(LaravelURL::previous()) ?? Site::default();
 
-        return $this->withLocale($site->lang(), fn () => parent::validateResolved());
+        $this->withLocale($site->lang(), fn () => parent::validateResolved());
     }
 
     private function valuesWithoutAssetFields($fields)
diff --git a/src/Http/Requests/UserRegisterRequest.php b/src/Http/Requests/UserRegisterRequest.php
index 44395413057..a2c4e4ee900 100644
--- a/src/Http/Requests/UserRegisterRequest.php
+++ b/src/Http/Requests/UserRegisterRequest.php
@@ -13,6 +13,8 @@
 use Statamic\Facades\User;
 use Statamic\Rules\UniqueUserValue;
 
+use function Statamic\trans as __;
+
 class UserRegisterRequest extends FormRequest
 {
     use Localizable;
@@ -28,7 +30,7 @@ public function authorize(): bool
     protected function failedValidation(Validator $validator)
     {
         if ($this->isPrecognitive() || $this->wantsJson()) {
-            return parent::failedValidation($validator);
+            parent::failedValidation($validator);
         }
 
         if ($this->ajax()) {
@@ -80,7 +82,7 @@ public function validateResolved()
     {
         $site = Site::findByUrl(LaravelURL::previous()) ?? Site::default();
 
-        return $this->withLocale($site->lang(), fn () => parent::validateResolved());
+        $this->withLocale($site->lang(), fn () => parent::validateResolved());
     }
 
     private function valuesWithoutAssetFields($fields)
diff --git a/src/Http/Resources/CP/Assets/Asset.php b/src/Http/Resources/CP/Assets/Asset.php
index 72f29e47d4f..9516d1756a2 100644
--- a/src/Http/Resources/CP/Assets/Asset.php
+++ b/src/Http/Resources/CP/Assets/Asset.php
@@ -24,6 +24,7 @@ public function toArray($request)
             'permalink' => $this->absoluteUrl(),
             'extension' => $this->extension(),
             'downloadUrl' => $this->cpDownloadUrl(),
+            'cropUrl' => cp_route('assets.crop', ['encoded_asset' => base64_encode($this->id())]),
             'size' => Str::fileSizeForHumans($this->size()),
             'lastModified' => $this->lastModified()->toIso8601String(),
             'lastModifiedRelative' => $this->lastModified()->diffForHumans(),
diff --git a/src/Http/Resources/CP/Assets/AssetsFieldtypeAsset.php b/src/Http/Resources/CP/Assets/AssetsFieldtypeAsset.php
new file mode 100644
index 00000000000..5aed31b682c
--- /dev/null
+++ b/src/Http/Resources/CP/Assets/AssetsFieldtypeAsset.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Statamic\Http\Resources\CP\Assets;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+use Statamic\Facades\User;
+use Statamic\Support\Str;
+
+class AssetsFieldtypeAsset extends JsonResource
+{
+    use HasThumbnails;
+
+    public function toArray($request)
+    {
+        $data = [
+            'id' => $this->id(),
+            'basename' => $this->basename(),
+            'reference' => $this->reference(),
+            'extension' => $this->extension(),
+            'size' => Str::fileSizeForHumans($this->size()),
+            'isImage' => $this->isImage(),
+            'url' => $this->url(),
+            'downloadUrl' => $this->cpDownloadUrl(),
+            'isSvg' => $this->isSvg(),
+            'isMedia' => $this->isMedia(),
+            'isEditable' => User::current()->can('edit', $this->resource),
+            'isViewable' => User::current()->can('view', $this->resource),
+            ...$this->thumbnails(),
+            ...$this->publishFormData(),
+        ];
+
+        return ['data' => $data];
+    }
+
+    protected function publishFormData()
+    {
+        $fields = $this->blueprint()->fields()
+            ->addValues($this->data()->all())
+            ->preProcess();
+
+        return [
+            'values' => $this->data()->merge($fields->values()),
+            'meta' => $fields->meta(),
+        ];
+    }
+}
diff --git a/src/Http/Resources/CP/Assets/SearchedAssetsCollection.php b/src/Http/Resources/CP/Assets/SearchedAssetsCollection.php
index 7451400862f..1871180563e 100644
--- a/src/Http/Resources/CP/Assets/SearchedAssetsCollection.php
+++ b/src/Http/Resources/CP/Assets/SearchedAssetsCollection.php
@@ -6,6 +6,8 @@
 use Statamic\CP\Column;
 use Statamic\Http\Resources\CP\Concerns\HasRequestedColumns;
 
+use function Statamic\trans as __;
+
 class SearchedAssetsCollection extends ResourceCollection
 {
     use HasRequestedColumns;
diff --git a/src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php
index 23fcdb1e9ce..d6a15223706 100644
--- a/src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php
+++ b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php
@@ -6,6 +6,8 @@
 use Statamic\CP\Column;
 use Statamic\Fieldtypes\Entries as EntriesFieldtype;
 
+use function Statamic\trans as __;
+
 class EntriesFieldtypeEntries extends Entries
 {
     private EntriesFieldtype $fieldtype;
diff --git a/src/Http/Resources/CP/Submissions/ListedSubmission.php b/src/Http/Resources/CP/Submissions/ListedSubmission.php
index 4e7e64a3aa9..2f81734d40e 100644
--- a/src/Http/Resources/CP/Submissions/ListedSubmission.php
+++ b/src/Http/Resources/CP/Submissions/ListedSubmission.php
@@ -3,7 +3,6 @@
 namespace Statamic\Http\Resources\CP\Submissions;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use Statamic\Facades\Action;
 use Statamic\Facades\User;
 
 class ListedSubmission extends JsonResource
@@ -36,7 +35,6 @@ public function toArray($request)
             ])),
             'url' => cp_route('forms.submissions.show', [$form->handle(), $this->resource->id()]),
             'deleteable' => User::current()->can('delete', $this->resource),
-            'actions' => Action::for($this->resource),
         ];
     }
 
diff --git a/src/Http/Resources/CP/Taxonomies/ListedTerm.php b/src/Http/Resources/CP/Taxonomies/ListedTerm.php
index a6852f834e7..9065299626a 100644
--- a/src/Http/Resources/CP/Taxonomies/ListedTerm.php
+++ b/src/Http/Resources/CP/Taxonomies/ListedTerm.php
@@ -3,7 +3,6 @@
 namespace Statamic\Http\Resources\CP\Taxonomies;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use Statamic\Facades\Action;
 use Statamic\Facades\User;
 
 class ListedTerm extends JsonResource
@@ -28,7 +27,6 @@ public function columns($columns)
     public function toArray($request)
     {
         $term = $this->resource;
-        $taxonomy = $term->taxonomy();
 
         return [
             'id' => $term->id(),
@@ -42,10 +40,10 @@ public function toArray($request)
 
             'permalink' => $term->absoluteUrl(),
             'edit_url' => $term->editUrl(),
+            'has_template' => view()->exists($term->template()),
             'taxonomy' => $term->taxonomy()->toArray(),
             'viewable' => User::current()->can('view', $term),
             'editable' => User::current()->can('edit', $term),
-            'actions' => Action::for($term, ['taxonomy' => $taxonomy->handle()]),
         ];
     }
 
diff --git a/src/Http/Resources/CP/Taxonomies/TermsFieldtypeTerms.php b/src/Http/Resources/CP/Taxonomies/TermsFieldtypeTerms.php
index ee2d038b0eb..b941933a820 100644
--- a/src/Http/Resources/CP/Taxonomies/TermsFieldtypeTerms.php
+++ b/src/Http/Resources/CP/Taxonomies/TermsFieldtypeTerms.php
@@ -6,6 +6,8 @@
 use Statamic\CP\Column;
 use Statamic\Fieldtypes\Terms as TermsFieldtype;
 
+use function Statamic\trans as __;
+
 class TermsFieldtypeTerms extends Terms
 {
     private TermsFieldtype $fieldtype;
diff --git a/src/Http/Resources/CP/Users/ListedUser.php b/src/Http/Resources/CP/Users/ListedUser.php
index 79ee558e0d3..286866c7324 100644
--- a/src/Http/Resources/CP/Users/ListedUser.php
+++ b/src/Http/Resources/CP/Users/ListedUser.php
@@ -5,6 +5,8 @@
 use Illuminate\Http\Resources\Json\JsonResource;
 use Statamic\Facades\User;
 
+use function Statamic\trans as __;
+
 class ListedUser extends JsonResource
 {
     protected $blueprint;
diff --git a/src/Http/Resources/CP/Users/Users.php b/src/Http/Resources/CP/Users/Users.php
index 3e0358835f5..5629604ab13 100644
--- a/src/Http/Resources/CP/Users/Users.php
+++ b/src/Http/Resources/CP/Users/Users.php
@@ -9,6 +9,8 @@
 use Statamic\Statamic;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class Users extends ResourceCollection
 {
     use HasRequestedColumns;
diff --git a/src/Http/View/Composers/JavascriptComposer.php b/src/Http/View/Composers/JavascriptComposer.php
index eede2567d4f..57758b35269 100644
--- a/src/Http/View/Composers/JavascriptComposer.php
+++ b/src/Http/View/Composers/JavascriptComposer.php
@@ -5,7 +5,9 @@
 use Facades\Statamic\Fields\FieldtypeRepository;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\View\View;
+use Statamic\Assets\CropAspectRatios;
 use Statamic\CommandPalette\Category;
+use Statamic\CP\Assets\CropProcessor;
 use Statamic\CP\Color;
 use Statamic\Facades\CommandPalette;
 use Statamic\Facades\CP\Toast;
@@ -64,6 +66,9 @@ private function protectedVariables()
             'ajaxTimeout' => config('statamic.system.ajax_timeout'),
             'googleDocsViewer' => config('statamic.assets.google_docs_viewer'),
             'focalPointEditorEnabled' => config('statamic.assets.focal_point_editor'),
+            'cropAspectRatios' => CropAspectRatios::all(),
+            'cropQuality' => CropProcessor::defaultQuality(),
+            'elevatedSessionsEnabled' => config('statamic.users.elevated_sessions_enabled'),
             'user' => $this->user($user),
             'defaultPreferences' => Preference::default()->all(),
             'paginationSize' => config('statamic.cp.pagination_size'),
@@ -81,6 +86,7 @@ private function protectedVariables()
             'setPreviewImages' => Sets::previewImageConfig(),
             'linkToDocs' => config('statamic.cp.link_to_docs'),
             'defaultTheme' => $this->defaultTheme(),
+            'displayTimezone' => Statamic::displayTimezone(),
         ];
     }
 
@@ -120,6 +126,11 @@ protected function user($user)
     protected function translations(): array
     {
         $translations = app('translator')->toJson();
+
+        if (app('translator')->locale() === 'en') {
+            return $translations;
+        }
+
         $fallbackTranslations = tap(app('translator'))->setLocale(app('translator')->getFallback())->toJson();
 
         return array_merge($fallbackTranslations, $translations);
diff --git a/src/Icons/IconSet.php b/src/Icons/IconSet.php
index d10e3a05cc6..dc9004c5eb4 100644
--- a/src/Icons/IconSet.php
+++ b/src/Icons/IconSet.php
@@ -38,9 +38,13 @@ public function contents()
         return $this->files()->map->getContents()->all();
     }
 
-    public function get(string $name): string
+    public function get(string $name): ?string
     {
-        return $this->filesystem->get($this->directory.'/'.$name.'.svg');
+        $path = $this->directory.'/'.$name.'.svg';
+
+        return $this->filesystem->exists($path)
+            ? $this->filesystem->get($path)
+            : null;
     }
 
     private function files(): Collection
diff --git a/src/Imaging/Attributes.php b/src/Imaging/Attributes.php
index 8b053f57e4e..983b0ecdbfe 100644
--- a/src/Imaging/Attributes.php
+++ b/src/Imaging/Attributes.php
@@ -55,6 +55,15 @@ private function imageAttributes(string $path)
 
         [$width, $height] = $size;
 
+        if (function_exists('exif_read_data')) {
+            $exif = @exif_read_data($fullPath);
+            $orientation = $exif['Orientation'] ?? 1;
+
+            if (in_array($orientation, [5, 6, 7, 8])) {
+                [$width, $height] = [$height, $width];
+            }
+        }
+
         return compact('width', 'height');
     }
 
diff --git a/src/Imaging/GuzzleAdapter.php b/src/Imaging/GuzzleAdapter.php
index 13064f9ec55..a7901dc1118 100644
--- a/src/Imaging/GuzzleAdapter.php
+++ b/src/Imaging/GuzzleAdapter.php
@@ -6,14 +6,25 @@
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\BadResponseException;
 use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Psr7\Uri;
+use GuzzleHttp\Psr7\UriResolver;
 use League\Flysystem\Config;
 use League\Flysystem\FileAttributes;
 use League\Flysystem\FilesystemAdapter;
+use League\Flysystem\UnableToListContents;
 use League\Flysystem\UnableToReadFile;
+use League\Flysystem\UnableToRetrieveMetadata;
 use Statamic\Exceptions\InvalidRemoteUrlException;
 
 class GuzzleAdapter implements FilesystemAdapter
 {
+    /**
+     * The maximum number of redirects to follow.
+     *
+     * @var int
+     */
+    const MAX_REDIRECTS = 5;
+
     /**
      * Whether this endpoint supports head requests.
      *
@@ -92,22 +103,22 @@ public function writeStream(string $path, $contents, Config $config): void
 
     public function mimeType(string $path): FileAttributes
     {
-        //
+        throw UnableToRetrieveMetadata::mimeType($path, 'Not supported by '.static::class);
     }
 
     public function lastModified(string $path): FileAttributes
     {
-        //
+        throw UnableToRetrieveMetadata::lastModified($path, 'Not supported by '.static::class);
     }
 
     public function fileSize(string $path): FileAttributes
     {
-        //
+        throw UnableToRetrieveMetadata::fileSize($path, 'Not supported by '.static::class);
     }
 
     public function listContents(string $path, bool $deep): iterable
     {
-        //
+        throw UnableToListContents::atLocation($path, $deep, new \RuntimeException('Not supported by '.static::class));
     }
 
     public function move(string $source, string $destination, Config $config): void
@@ -137,7 +148,7 @@ public function deleteDirectory(string $prefix): void
 
     public function visibility(string $path): FileAttributes
     {
-        //
+        throw UnableToRetrieveMetadata::visibility($path, 'Not supported by '.static::class);
     }
 
     /*
@@ -149,18 +160,12 @@ public function visibility(string $path): FileAttributes
     protected function get($path)
     {
         try {
-            $response = $this->client->get($this->base.$path, $this->requestOptions());
-        } catch (InvalidRemoteUrlException $e) {
-            throw $e;
+            $response = $this->send('GET', $this->base.$path);
         } catch (BadResponseException $e) {
             return false;
         }
 
-        if ($response->getStatusCode() !== 200) {
-            return false;
-        }
-
-        return $response;
+        return $response->getStatusCode() === 200 ? $response : false;
     }
 
     /**
@@ -176,7 +181,7 @@ protected function head($path)
         }
 
         try {
-            $response = $this->client->head($this->base.$path, $this->requestOptions());
+            $response = $this->send('HEAD', $this->base.$path);
         } catch (ClientException $e) {
             if ($e->getResponse()->getStatusCode() === 405) {
                 $this->supportsHead = false;
@@ -185,27 +190,54 @@ protected function head($path)
             }
 
             return false;
-        } catch (InvalidRemoteUrlException $e) {
-            throw $e;
         } catch (BadResponseException $e) {
             return false;
         }
 
-        if ($response->getStatusCode() !== 200) {
-            return false;
+        return $response->getStatusCode() === 200 ? $response : false;
+    }
+
+    /**
+     * Send a request, pinning the connection to the validated IP so the host
+     * cannot be rebound to an internal address between validation and the
+     * actual fetch. Redirects are followed manually so each hop is validated
+     * and pinned too.
+     */
+    protected function send(string $method, string $url, int $redirects = 0)
+    {
+        // The connection is pinned to the validated IP via curl's CURLOPT_RESOLVE,
+        // which the stream handler has no equivalent for. Rather than silently fall
+        // back to an unpinned (rebindable) request, refuse to fetch without curl.
+        if (! $this->supportsConnectionPinning()) {
+            throw new \RuntimeException('The curl PHP extension is required to fetch remote images.');
+        }
+
+        $resolved = app(RemoteUrlValidator::class)->resolve($url);
+
+        $response = $this->client->request($method, $url, [
+            'allow_redirects' => false,
+            'curl' => [
+                CURLOPT_RESOLVE => [sprintf('%s:%d:%s', $resolved['host'], $resolved['port'], implode(',', $resolved['ips']))],
+            ],
+        ]);
+
+        $status = $response->getStatusCode();
+
+        if ($status >= 300 && $status < 400 && $response->hasHeader('Location')) {
+            if ($redirects >= self::MAX_REDIRECTS) {
+                throw new InvalidRemoteUrlException('Too many redirects.');
+            }
+
+            $location = UriResolver::resolve(new Uri($url), new Uri($response->getHeaderLine('Location')));
+
+            return $this->send($method, (string) $location, $redirects + 1);
         }
 
         return $response;
     }
 
-    protected function requestOptions()
+    protected function supportsConnectionPinning(): bool
     {
-        return [
-            'allow_redirects' => [
-                'on_redirect' => function ($request, $response, $uri) {
-                    app(RemoteUrlValidator::class)->validate((string) $uri);
-                },
-            ],
-        ];
+        return extension_loaded('curl');
     }
 }
diff --git a/src/Imaging/Intervention.php b/src/Imaging/Intervention.php
new file mode 100644
index 00000000000..fc2a6f622fb
--- /dev/null
+++ b/src/Imaging/Intervention.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Statamic\Imaging;
+
+use Intervention\Image\Drivers\Gd\Driver as GdDriver;
+use Intervention\Image\Drivers\Imagick\Driver as ImagickDriver;
+use Intervention\Image\ImageManager;
+use Intervention\Image\Interfaces\ColorInterface;
+use Intervention\Image\Interfaces\DriverInterface;
+use Intervention\Image\Interfaces\EncodedImageInterface;
+use Intervention\Image\Interfaces\ImageInterface;
+
+/**
+ * Smooths over the differences between Intervention Image v3 and v4.
+ *
+ * Glide 3 requires Intervention v3 and Glide 4 requires v4, and we support both. Most of the
+ * API is identical across the two, but v4 renamed a handful of the methods we rely on.
+ *
+ * @internal
+ */
+class Intervention
+{
+    public static function isV4(): bool
+    {
+        // v4 dropped the driver-specific named constructors in favour of usingDriver().
+        return ! method_exists(ImageManager::class, 'withDriver');
+    }
+
+    public static function driver(?string $driver = null): DriverInterface
+    {
+        $driver ??= config('statamic.assets.image_manipulation.driver', 'gd');
+
+        $class = match ($driver) {
+            'gd' => GdDriver::class,
+            'imagick' => ImagickDriver::class,
+            default => $driver,
+        };
+
+        return new $class;
+    }
+
+    public static function manager(?string $driver = null): ImageManager
+    {
+        return new ImageManager(static::driver($driver));
+    }
+
+    public static function decode(ImageManager $manager, string $contents): ImageInterface
+    {
+        return static::isV4()
+            ? $manager->decodeBinary($contents)
+            : $manager->read($contents);
+    }
+
+    public static function create(ImageManager $manager, int $width, int $height): ImageInterface
+    {
+        return static::isV4()
+            ? $manager->createImage($width, $height)
+            : $manager->create($width, $height);
+    }
+
+    public static function colorAt(ImageInterface $image, int $x, int $y): ColorInterface
+    {
+        return static::isV4()
+            ? $image->colorAt($x, $y)
+            : $image->pickColor($x, $y);
+    }
+
+    public static function fillTransparentAreas(ImageInterface $image, string $color): ImageInterface
+    {
+        return static::isV4()
+            ? $image->fillTransparentAreas($color)
+            : $image->blendTransparency($color);
+    }
+
+    public static function encodeByExtension(ImageInterface $image, string $extension, ?int $quality = null): EncodedImageInterface
+    {
+        // v4's encoders type the quality as an int, so leave it out entirely rather
+        // than passing null through and letting the format's default apply.
+        $options = $quality === null ? [] : ['quality' => $quality];
+
+        return static::isV4()
+            ? $image->encodeUsingFileExtension($extension, ...$options)
+            : $image->encodeByExtension($extension, ...$options);
+    }
+}
diff --git a/src/Imaging/RemoteUrlValidator.php b/src/Imaging/RemoteUrlValidator.php
index 150b7fab6bc..73e8681a16e 100644
--- a/src/Imaging/RemoteUrlValidator.php
+++ b/src/Imaging/RemoteUrlValidator.php
@@ -15,6 +15,39 @@ public function __construct(?callable $resolver = null)
     }
 
     public function parse($url)
+    {
+        $components = $this->validatedComponents($url);
+
+        return [
+            'path' => Str::after($components['path'], '/'),
+            'base' => $components['scheme'].'://'.$components['host'].$components['port_suffix'],
+            'query' => $components['query'],
+        ];
+    }
+
+    public function validate($url)
+    {
+        $this->parse($url);
+    }
+
+    /**
+     * Resolve and validate the URL host, returning the host, port, and the
+     * validated public IPs it resolves to. These IPs are intended to be pinned
+     * to the actual connection so the host cannot be rebound to an internal
+     * address between this check and the request being made.
+     */
+    public function resolve($url)
+    {
+        $components = $this->validatedComponents($url);
+
+        return [
+            'host' => $components['host'],
+            'port' => $components['port'],
+            'ips' => $components['ips'],
+        ];
+    }
+
+    protected function validatedComponents($url)
     {
         $parsed = parse_url($url);
 
@@ -48,22 +81,19 @@ public function parse($url)
             throw new InvalidRemoteUrlException('Invalid URL host.');
         }
 
-        $this->ensureHostResolvesToPublicIps($host);
-
-        $port = isset($parsed['port']) ? ':'.$parsed['port'] : '';
+        $ips = $this->ensureHostResolvesToPublicIps($host);
 
         return [
-            'path' => Str::after($parsed['path'] ?? '/', '/'),
-            'base' => $scheme.'://'.$host.$port,
+            'scheme' => $scheme,
+            'host' => $host,
+            'port' => $parsed['port'] ?? ($scheme === 'https' ? 443 : 80),
+            'port_suffix' => isset($parsed['port']) ? ':'.$parsed['port'] : '',
+            'path' => $parsed['path'] ?? '/',
             'query' => $parsed['query'] ?? null,
+            'ips' => $ips,
         ];
     }
 
-    public function validate($url)
-    {
-        $this->parse($url);
-    }
-
     protected function isValidHost($host)
     {
         return filter_var($host, FILTER_VALIDATE_IP)
@@ -75,7 +105,7 @@ protected function ensureHostResolvesToPublicIps($host)
         if (filter_var($host, FILTER_VALIDATE_IP)) {
             $this->assertPublicIp($host);
 
-            return;
+            return [$host];
         }
 
         $records = call_user_func($this->resolver, $host);
@@ -90,10 +120,19 @@ protected function ensureHostResolvesToPublicIps($host)
         foreach ($ips as $ip) {
             $this->assertPublicIp($ip);
         }
+
+        return $ips;
     }
 
     protected function assertPublicIp($ip)
     {
+        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+            $packed = inet_pton($ip);
+            if ($packed !== false && substr($packed, 0, 12) === "\0\0\0\0\0\0\0\0\0\0\xff\xff") {
+                $ip = inet_ntop(substr($packed, 12));
+            }
+        }
+
         $result = filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE);
 
         if (! $result) {
diff --git a/src/Licensing/AddonLicense.php b/src/Licensing/AddonLicense.php
index c4ad9a0cd1e..f7733405abe 100644
--- a/src/Licensing/AddonLicense.php
+++ b/src/Licensing/AddonLicense.php
@@ -5,6 +5,8 @@
 use Statamic\Facades\Addon;
 use Statamic\Support\Arr;
 
+use function Statamic\trans;
+
 class AddonLicense extends License
 {
     protected $package;
diff --git a/src/Licensing/License.php b/src/Licensing/License.php
index f8008e2f702..17a56c11f5b 100644
--- a/src/Licensing/License.php
+++ b/src/Licensing/License.php
@@ -4,6 +4,8 @@
 
 use Statamic\Support\Arr;
 
+use function Statamic\trans;
+
 abstract class License
 {
     protected $response;
diff --git a/src/Licensing/LicenseManager.php b/src/Licensing/LicenseManager.php
index 7c419da48ee..6246233f858 100644
--- a/src/Licensing/LicenseManager.php
+++ b/src/Licensing/LicenseManager.php
@@ -7,6 +7,9 @@
 use Statamic\Events\LicensesRefreshed;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+use function Statamic\trans_choice;
+
 class LicenseManager
 {
     protected $outpost;
diff --git a/src/Licensing/StatamicLicense.php b/src/Licensing/StatamicLicense.php
index 484404695c6..12248e6629d 100644
--- a/src/Licensing/StatamicLicense.php
+++ b/src/Licensing/StatamicLicense.php
@@ -5,6 +5,8 @@
 use Statamic\Statamic;
 use Statamic\Support\Arr;
 
+use function Statamic\trans;
+
 class StatamicLicense extends License
 {
     public function pro()
diff --git a/src/Markdown/Parser.php b/src/Markdown/Parser.php
index 9c4a9aa7605..a36640c900c 100644
--- a/src/Markdown/Parser.php
+++ b/src/Markdown/Parser.php
@@ -9,6 +9,9 @@
 use League\CommonMark\Extension\SmartPunct\SmartPunctExtension;
 use Statamic\Support\Arr;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class Parser
 {
     use Macroable;
diff --git a/src/Mixins/Router.php b/src/Mixins/Router.php
index 593af05d1f6..7f359e26581 100644
--- a/src/Mixins/Router.php
+++ b/src/Mixins/Router.php
@@ -4,6 +4,9 @@
 
 use Statamic\Http\Controllers\FrontendController;
 
+/**
+ * @mixin \Illuminate\Routing\Router
+ */
 class Router
 {
     public function statamic()
diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
index f81f199701e..55df4b3e17a 100644
--- a/src/Modifiers/CoreModifiers.php
+++ b/src/Modifiers/CoreModifiers.php
@@ -32,11 +32,16 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Dumper;
 use Statamic\Support\Html;
+use Statamic\Support\MethodDenylist;
 use Statamic\Support\Str;
 use Statamic\Support\Traits\ChecksDumpability;
 use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
 use Stringy\StaticStringy as Stringy;
 
+use function Statamic\trans;
+use function Statamic\trans as __;
+use function Statamic\trans_choice;
+
 class CoreModifiers extends Modifier
 {
     use ChecksDumpability {
@@ -895,13 +900,13 @@ public function get($value, $params)
         // available data. Then grab the requested variable from there.
         $array = $item instanceof Augmentable ? $item->toDeferredAugmentedArray() : $item->toArray();
 
-        if ($arrayValue = Arr::get($array, $var)) {
-            return $arrayValue;
+        if (Arr::has($array, $var)) {
+            return Arr::get($array, $var);
         }
 
         // Finally, try to call a method on the object
         $method = Str::slug($var);
-        if (method_exists($item, $method)) {
+        if (method_exists($item, $method) && ! MethodDenylist::blocks($method)) {
             return $item->$method();
         }
 
@@ -1522,9 +1527,9 @@ public function keys($value)
     }
 
     /**
-     * Returns the last $params[0] characters of a string, or the last element of an array.
+     * Returns the last $params[0] characters of a string, or the last element of an array or Collection.
      *
-     * @return string
+     * @return mixed
      */
     public function last($value, $params)
     {
@@ -1532,6 +1537,10 @@ public function last($value, $params)
             return Arr::last($value);
         }
 
+        if ($value instanceof Collection) {
+            return $value->last();
+        }
+
         return Stringy::last($value, Arr::get($params, 0));
     }
 
diff --git a/src/Modifiers/Modify.php b/src/Modifiers/Modify.php
index 417ec755fdd..d1a254a71cf 100644
--- a/src/Modifiers/Modify.php
+++ b/src/Modifiers/Modify.php
@@ -90,13 +90,19 @@ public function fetch()
      */
     public function __toString()
     {
-        if (! is_string($this->value) && ! method_exists($this->value, '__toString')) {
-            throw new ModifierException(
-                'Attempted to access modified value as a string, but encountered ['.get_class($this->value).']'
-            );
+        $value = $this->value;
+
+        if ($value === null || is_scalar($value)) {
+            return (string) $value;
+        }
+
+        if (is_object($value) && method_exists($value, '__toString')) {
+            return (string) $value;
         }
 
-        return (string) $this->value;
+        throw new ModifierException(
+            'Attempted to access modified value as a string, but encountered ['.get_debug_type($value).']'
+        );
     }
 
     /**
@@ -112,7 +118,7 @@ public function getIterator()
         if (! is_array($this->value)) {
             throw new ModifierException(sprintf(
                 'Attempted to access modified value as an array, but encountered [%s]',
-                is_string($this->value) ? 'string' : get_class($this->value)
+                get_debug_type($this->value)
             ));
         }
 
diff --git a/src/Notifications/ActivateAccount.php b/src/Notifications/ActivateAccount.php
index 20ca5e3d8c1..e9f1ce1908f 100644
--- a/src/Notifications/ActivateAccount.php
+++ b/src/Notifications/ActivateAccount.php
@@ -5,6 +5,8 @@
 use Illuminate\Notifications\Messages\MailMessage;
 use Statamic\Auth\Passwords\PasswordReset as PasswordResetManager;
 
+use function Statamic\trans as __;
+
 class ActivateAccount extends PasswordReset
 {
     public static $subject;
diff --git a/src/Notifications/ElevatedSessionVerificationCode.php b/src/Notifications/ElevatedSessionVerificationCode.php
index 09f857d16af..f45539252af 100644
--- a/src/Notifications/ElevatedSessionVerificationCode.php
+++ b/src/Notifications/ElevatedSessionVerificationCode.php
@@ -5,6 +5,8 @@
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
+use function Statamic\trans as __;
+
 class ElevatedSessionVerificationCode extends Notification
 {
     public function __construct(public string $verificationCode)
diff --git a/src/Notifications/PasswordReset.php b/src/Notifications/PasswordReset.php
index 63b0cfd7129..eafc207da98 100644
--- a/src/Notifications/PasswordReset.php
+++ b/src/Notifications/PasswordReset.php
@@ -7,6 +7,8 @@
 use Illuminate\Notifications\Notification;
 use Statamic\Auth\Passwords\PasswordReset as PasswordResetManager;
 
+use function Statamic\trans as __;
+
 class PasswordReset extends Notification
 {
     use Queueable;
diff --git a/src/OAuth/Provider.php b/src/OAuth/Provider.php
index ae2be009b7a..a345c491648 100644
--- a/src/OAuth/Provider.php
+++ b/src/OAuth/Provider.php
@@ -7,6 +7,7 @@
 use Laravel\Socialite\Contracts\User as SocialiteUser;
 use Laravel\Socialite\Facades\Socialite;
 use Statamic\Contracts\Auth\User as StatamicUser;
+use Statamic\Exceptions\OAuthEmailExistsException;
 use Statamic\Facades\File;
 use Statamic\Facades\User;
 use Statamic\Support\Str;
@@ -26,7 +27,7 @@ public function getSocialiteUser()
     {
         $driver = Socialite::driver($this->name);
 
-        if (Arr::get($this->config, 'stateless', false)) {
+        if ($this->isStateless()) {
             $driver->stateless();
         }
 
@@ -44,6 +45,9 @@ public function getUserId(string $id): ?string
         return array_flip($this->getIds())[$id] ?? null;
     }
 
+    /**
+     * @deprecated Use findUser() and createUser() directly.
+     */
     public function findOrCreateUser($socialite): StatamicUser
     {
         if ($user = $this->findUser($socialite)) {
@@ -62,14 +66,7 @@ public function findOrCreateUser($socialite): StatamicUser
      */
     public function findUser($socialite): ?StatamicUser
     {
-        if (
-            ($user = User::findByOAuthId($this, $socialite->getId())) ||
-            ($user = User::findByEmail($socialite->getEmail()))
-        ) {
-            return $user;
-        }
-
-        return null;
+        return User::findByOAuthId($this, $socialite->getId());
     }
 
     /**
@@ -81,6 +78,10 @@ public function createUser($socialite): StatamicUser
     {
         $user = $this->makeUser($socialite);
 
+        if (User::findByEmail($user->email())) {
+            throw new OAuthEmailExistsException;
+        }
+
         $user->save();
 
         $this->setUserProviderId($user, $socialite->getId());
@@ -105,8 +106,6 @@ public function mergeUser($user, $socialite): StatamicUser
 
         $user->save();
 
-        $this->setUserProviderId($user, $socialite->getId());
-
         return $user;
     }
 
@@ -167,9 +166,16 @@ protected function setIds($ids)
         $contents = '<?php return '.var_export($ids, true).';';
 
         File::put($this->storagePath(), $contents);
+
+        // Bust the opcache immediately, otherwise it may take a few moments
+        // for PHP to pick up the changes to the file. Connecting a provider
+        // will show disconnected momentarily and vice versa.
+        if (function_exists('opcache_invalidate')) {
+            opcache_invalidate($this->storagePath(), true);
+        }
     }
 
-    protected function setUserProviderId($user, $id)
+    public function setUserProviderId($user, $id)
     {
         $ids = $this->getIds();
 
@@ -178,6 +184,25 @@ protected function setUserProviderId($user, $id)
         $this->setIds($ids);
     }
 
+    public function forgetUser($user)
+    {
+        $ids = $this->getIds();
+
+        unset($ids[$user->id()]);
+
+        $this->setIds($ids);
+    }
+
+    public function isConnectedTo($user): bool
+    {
+        return array_key_exists($user->id(), $this->getIds());
+    }
+
+    public function isStateless(): bool
+    {
+        return (bool) Arr::get($this->config, 'stateless', false);
+    }
+
     protected function storagePath()
     {
         return storage_path("statamic/oauth/{$this->name}.php");
diff --git a/src/OAuth/Tags.php b/src/OAuth/Tags.php
index 9d0394d3d29..540b76de35c 100644
--- a/src/OAuth/Tags.php
+++ b/src/OAuth/Tags.php
@@ -3,12 +3,44 @@
 namespace Statamic\OAuth;
 
 use Statamic\Facades\OAuth;
+use Statamic\Facades\User;
+use Statamic\Tags\Concerns;
 use Statamic\Tags\Tags as BaseTags;
 
 class Tags extends BaseTags
 {
+    use Concerns\RendersForms;
+
     public static $handle = 'oauth';
 
+    /**
+     * Loop over the available providers.
+     *
+     * Maps to {{ oauth }} ... {{ /oauth }}
+     */
+    public function index()
+    {
+        $user = User::current();
+
+        $providers = OAuth::providers()
+            ->reject(fn (Provider $provider) => $provider->isStateless())
+            ->map(fn (Provider $provider) => [
+                'name' => $provider->name(),
+                'label' => $provider->label(),
+                'connected' => $user ? $provider->isConnectedTo($user) : false,
+                'url' => $this->generateLoginUrl($provider->name()),
+            ])
+            ->values();
+
+        if (! $this->canParseContents()) {
+            return $providers->all();
+        }
+
+        return $providers->isEmpty()
+            ? $this->parseNoResults()
+            : $this->parseLoop($providers->all());
+    }
+
     /**
      * Shorthand for generating an OAuth login URL.
      *
@@ -31,6 +63,47 @@ public function loginUrl()
         return $this->generateLoginUrl($this->params->get(['provider', 'for']));
     }
 
+    /**
+     * Output a form to disconnect a provider from the current user.
+     *
+     * Maps to {{ oauth:disconnect_form }}
+     *
+     * @return string
+     */
+    public function disconnectForm()
+    {
+        $provider = $this->params->get(['provider', 'for']);
+
+        if (! $provider || ! User::current()) {
+            return '';
+        }
+
+        $action = route('statamic.oauth.disconnect', $provider);
+        $method = 'POST';
+
+        $knownParams = ['provider', 'for'];
+
+        if (! $this->canParseContents()) {
+            return [
+                'attrs' => $this->formAttrs($action, $method, $knownParams),
+                'params' => array_merge(
+                    $this->formMetaPrefix($this->formParams($method, [])),
+                    ['_method' => 'DELETE']
+                ),
+            ];
+        }
+
+        $html = $this->formOpen($action, $method, $knownParams);
+
+        $html .= '<input type="hidden" name="_method" value="DELETE" />';
+
+        $html .= $this->parse([]);
+
+        $html .= $this->formClose();
+
+        return $html;
+    }
+
     /**
      * Generate the login URL.
      *
diff --git a/src/Policies/NavTreePolicy.php b/src/Policies/NavTreePolicy.php
index 1fbdfc8dcef..037cbe44491 100644
--- a/src/Policies/NavTreePolicy.php
+++ b/src/Policies/NavTreePolicy.php
@@ -10,7 +10,9 @@ class NavTreePolicy extends NavPolicy
 
     public function before($user)
     {
-        if (User::fromUser($user)->isSuper()) {
+        $user = User::fromUser($user);
+
+        if ($user->isSuper() || $user->hasPermission('configure navs')) {
             return true;
         }
     }
diff --git a/src/Policies/UserPolicy.php b/src/Policies/UserPolicy.php
index c691d2256ba..5c62d60a642 100644
--- a/src/Policies/UserPolicy.php
+++ b/src/Policies/UserPolicy.php
@@ -67,4 +67,11 @@ public function sendPasswordReset($authed, $user)
     {
         return $this->edit($authed, $user);
     }
+
+    public function impersonate($authed, $user)
+    {
+        $authed = User::fromUser($authed);
+
+        return $authed->hasPermission('impersonate users');
+    }
 }
diff --git a/src/Preferences/CorePreferences.php b/src/Preferences/CorePreferences.php
index 6c44072d39c..3a60918453c 100644
--- a/src/Preferences/CorePreferences.php
+++ b/src/Preferences/CorePreferences.php
@@ -14,13 +14,19 @@ public function boot()
     {
         Preference::register('locale', [
             'type' => 'select',
-            'display' => __('Locale'),
+            'display' => __('Language'),
             'instructions' => __('statamic::messages.preference_locale_instructions'),
             'clearable' => true,
             'label_html' => true,
             'options' => $this->localeOptions(),
         ]);
 
+        Preference::register('formatting_locale', [
+            'type' => 'formatting_locales',
+            'display' => __('Formatting Locale'),
+            'instructions' => __('statamic::messages.preference_formatting_locale_instructions'),
+        ]);
+
         Preference::register('start_page', [
             'type' => 'text',
             'display' => __('Start Page'),
diff --git a/src/Preferences/Preferences.php b/src/Preferences/Preferences.php
index 9037f8f24b0..6c65cf425ad 100644
--- a/src/Preferences/Preferences.php
+++ b/src/Preferences/Preferences.php
@@ -7,6 +7,8 @@
 use Illuminate\Support\Arr;
 use Statamic\Facades\User;
 
+use function Statamic\trans as __;
+
 class Preferences
 {
     protected $dotted = [];
@@ -45,7 +47,7 @@ public function all()
     {
         $this->resetState();
 
-        if (auth()->check()) {
+        if (User::current()) {
             $this
                 ->mergeDottedUserPreferences()
                 ->mergeDottedRolePreferences();
@@ -138,7 +140,30 @@ protected function arrayDotPreferences($array)
             }
         }
 
-        return array_merge(Arr::dot($array), $preserve);
+        return array_merge($this->dotPreferences($array), $preserve);
+    }
+
+    /**
+     * Flatten preferences into dotted keys, like `Arr::dot()`, but treating list values
+     * as leaves so they get replaced by higher precedence levels instead of merged.
+     *
+     * @param  array  $array
+     * @param  string  $prepend
+     * @return array
+     */
+    protected function dotPreferences($array, $prepend = '')
+    {
+        $results = [];
+
+        foreach ($array as $key => $value) {
+            if (is_array($value) && ! empty($value) && ! array_is_list($value)) {
+                $results = array_merge($results, $this->dotPreferences($value, $prepend.$key.'.'));
+            } else {
+                $results[$prepend.$key] = $value;
+            }
+        }
+
+        return $results;
     }
 
     /**
diff --git a/src/Providers/AddonServiceProvider.php b/src/Providers/AddonServiceProvider.php
index 1aec1b6dba9..aa827598bd0 100644
--- a/src/Providers/AddonServiceProvider.php
+++ b/src/Providers/AddonServiceProvider.php
@@ -717,6 +717,17 @@ public function registerExternalStylesheet(string $url)
         Statamic::externalStyle($url);
     }
 
+    protected function registerSerializableClasses(array $classes)
+    {
+        $existing = $this->app['config']->get('cache.serializable_classes');
+
+        if ($existing === null || $existing === true) {
+            return;
+        }
+
+        $this->app['config']->set('cache.serializable_classes', array_merge(is_array($existing) ? $existing : [], $classes));
+    }
+
     protected function schedule(Schedule $schedule)
     {
         //
diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index a58cfbdf1cc..4cdd2a79997 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -8,21 +8,28 @@
 use Illuminate\Foundation\Http\Middleware\TrimStrings;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
+use Illuminate\Support\Facades\Session;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Str;
 use Statamic\CP\CarbonAsVueComponent;
 use Statamic\Facades;
 use Statamic\Facades\Addon;
+use Statamic\Facades\Config;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Facades\Token;
+use Statamic\Facades\User;
 use Statamic\Fields\FieldsetRecursionStack;
 use Statamic\Jobs\HandleEntrySchedule;
+use Statamic\Notifications\ElevatedSessionVerificationCode;
 use Statamic\Sites\Sites;
 use Statamic\Stache\Query\RevisionQueryBuilder;
 use Statamic\Statamic;
 use Statamic\Tokens\Handlers\LivePreview;
 use Statamic\View\Scaffolding\TemplateGenerator;
 
+use function Statamic\trans as __;
+
 class AppServiceProvider extends ServiceProvider
 {
     protected $root = __DIR__.'/../..';
@@ -77,8 +84,12 @@ public function boot()
 
         $this->loadViewsFrom("{$this->root}/resources/views/extend", 'statamic');
 
+        $formsSource = config('statamic.templates.language', 'antlers') === 'blade'
+            ? "{$this->root}/resources/views/extend/forms/blade"
+            : "{$this->root}/resources/views/extend/forms/antlers";
+
         $this->publishes([
-            "{$this->root}/resources/views/extend/forms" => resource_path('views/vendor/statamic/forms'),
+            $formsSource => resource_path('views/vendor/statamic/forms'),
         ], 'statamic-forms');
 
         $this->publishes([
@@ -86,6 +97,7 @@ public function boot()
         ], 'statamic-scaffolding');
 
         $this->app['redirect']->macro('cpRoute', function ($route, $parameters = []) {
+            /** @var \Illuminate\Routing\Redirector $this */
             return $this->to(cp_route($route, $parameters));
         });
 
@@ -123,6 +135,8 @@ public function boot()
 
         $this->addAboutCommandInfo();
 
+        $this->registerElevatedSessionMacros();
+
         $this->app->make(Schedule::class)->job(HandleEntrySchedule::class)->everyMinute();
     }
 
@@ -165,6 +179,7 @@ public function register()
                 ->setRepository('collection', \Statamic\Contracts\Entries\CollectionRepository::class)
                 ->setRepository('taxonomy', \Statamic\Contracts\Taxonomies\TaxonomyRepository::class)
                 ->setRepository('global', \Statamic\Contracts\Globals\GlobalRepository::class)
+                ->setRepository('globals', \Statamic\Contracts\Globals\GlobalVariablesRepository::class)
                 ->setRepository('asset', \Statamic\Contracts\Assets\AssetRepository::class)
                 ->setRepository('user', \Statamic\Contracts\Auth\UserRepository::class);
         });
@@ -193,6 +208,8 @@ public function register()
                 });
         });
 
+        $this->app->singleton(\Statamic\Fields\FieldRepository::class);
+
         $this->app->singleton(\Statamic\Fields\FieldsetRepository::class, function () {
             return (new \Statamic\Fields\FieldsetRepository)
                 ->setDirectory(config('statamic.system.fieldsets_path'));
@@ -229,6 +246,42 @@ public function register()
                 ->finalNewline(config('statamic.templates.style.final_newline', false))
                 ->preferComponentSyntax(config('statamic.templates.antlers.use_components', false));
         });
+
+        $this->registerSerializableClasses();
+    }
+
+    private function registerSerializableClasses()
+    {
+        $existing = $this->app['config']->get('cache.serializable_classes');
+
+        if ($existing === null || $existing === true) {
+            return;
+        }
+
+        $this->app['config']->set('cache.serializable_classes', array_merge(is_array($existing) ? $existing : [], [
+            \Statamic\Auth\File\User::class,
+            \Statamic\Auth\File\Passkey::class,
+            \Statamic\Auth\Eloquent\Passkey::class,
+            \Statamic\Assets\Asset::class,
+            \Statamic\Assets\AssetContainer::class,
+            \Statamic\Entries\Collection::class,
+            \Statamic\Entries\Entry::class,
+            \Statamic\Forms\Form::class,
+            \Statamic\Forms\Submission::class,
+            \Statamic\Globals\GlobalSet::class,
+            \Statamic\Globals\Variables::class,
+            \Statamic\Revisions\Revision::class,
+            \Statamic\Structures\Nav::class,
+            \Statamic\Structures\NavTree::class,
+            \Statamic\Structures\CollectionTree::class,
+            \Statamic\Structures\CollectionStructure::class,
+            \Statamic\Taxonomies\Taxonomy::class,
+            \Statamic\Taxonomies\LocalizedTerm::class,
+            \Statamic\Taxonomies\Term::class,
+            \Carbon\Carbon::class,
+            \Illuminate\Support\Carbon::class,
+            \Illuminate\Support\Collection::class,
+        ]));
     }
 
     protected function registerMiddlewareGroup()
@@ -257,6 +310,7 @@ protected function addAboutCommandInfo()
         AboutCommand::add('Statamic', [
             'Version' => fn () => Statamic::version().' '.(Statamic::pro() ? '<fg=yellow;options=bold>PRO</>' : 'Solo'),
             'Addons' => $addons->count(),
+            'License Key' => fn () => Config::getLicenseKey() ? 'Set' : 'Not set',
             'Stache Watcher' => fn () => $this->stacheWatcher(),
             'Static Caching' => config('statamic.static_caching.strategy') ?: 'Disabled',
             'Sites' => fn () => $this->sitesAboutCommandInfo(),
@@ -292,4 +346,50 @@ private function sitesAboutCommandInfo()
 
         return $sites->count().' ('.$summary.')';
     }
+
+    private function registerElevatedSessionMacros()
+    {
+        Request::macro('hasElevatedSession', function () {
+            return $this->getElevatedSessionExpiry() > now()->timestamp;
+        });
+
+        Request::macro('getElevatedSessionExpiry', function () {
+            if (! $lastElevated = session()->get('statamic_elevated_session')) {
+                return null;
+            }
+
+            return Carbon::createFromTimestamp($lastElevated)
+                ->addMinutes((float) config('statamic.users.elevated_session_duration', 15))
+                ->timestamp;
+        });
+
+        Request::macro('getElevatedSessionVerificationCode', function () {
+            return session()->get('statamic_elevated_session_verification_code')['code'] ?? null;
+        });
+
+        Session::macro('elevate', function () {
+            /** @var \Illuminate\Session\Store $this */
+            $this->put('statamic_elevated_session', now()->timestamp);
+            $this->forget('statamic_elevated_session_verification_code');
+        });
+
+        Session::macro('sendElevatedSessionVerificationCodeIfRequired', function () {
+            if ($timestamp = session()->get('statamic_elevated_session_verification_code')['generated_at'] ?? null) {
+                if ($timestamp > now()->subMinutes(5)->timestamp) {
+                    return;
+                }
+            }
+
+            $this->sendElevatedSessionVerificationCode();
+        });
+
+        Session::macro('sendElevatedSessionVerificationCode', function () {
+            session()->put(
+                key: 'statamic_elevated_session_verification_code',
+                value: ['code' => $verificationCode = Str::random(20), 'generated_at' => now()->timestamp],
+            );
+
+            User::current()->notify(new ElevatedSessionVerificationCode($verificationCode));
+        });
+    }
 }
diff --git a/src/Providers/AuthServiceProvider.php b/src/Providers/AuthServiceProvider.php
index 4f76511911e..0b14ccd176d 100755
--- a/src/Providers/AuthServiceProvider.php
+++ b/src/Providers/AuthServiceProvider.php
@@ -31,6 +31,8 @@
 use Webauthn\Denormalizer\WebauthnSerializerFactory;
 use Webauthn\PublicKeyCredentialRpEntity;
 
+use function Statamic\trans_choice;
+
 class AuthServiceProvider extends ServiceProvider
 {
     protected $policies = [
@@ -171,6 +173,40 @@ public function boot()
                 : $broker;
         });
 
+        RateLimiter::for('statamic.auth', function (Request $request) {
+            return Limit::perMinute(4)->by($request->ip());
+        });
+
+        RateLimiter::for('statamic.cp.auth', function (Request $request) {
+            return RateLimiter::limiter('statamic.auth')($request);
+        });
+
+        RateLimiter::for('statamic.password-reset-form', function (Request $request) {
+            return Limit::perMinute(15)->by($request->ip());
+        });
+
+        RateLimiter::for('statamic.cp.password-reset-form', function (Request $request) {
+            return RateLimiter::limiter('statamic.password-reset-form')($request);
+        });
+
+        RateLimiter::for('statamic.passkeys', function (Request $request) {
+            return Limit::perMinute(30)->by($request->ip());
+        });
+
+        RateLimiter::for('statamic.cp.passkeys', function (Request $request) {
+            return RateLimiter::limiter('statamic.passkeys')($request);
+        });
+
+        RateLimiter::for('statamic.forms', function (Request $request) {
+            return $request->isPrecognitive()
+                ? Limit::perMinute(30)->by('precognition:'.$request->ip())
+                : Limit::perMinute(10)->by('submission:'.$request->ip());
+        });
+
+        RateLimiter::for('statamic.dictionaries', function (Request $request) {
+            return Limit::perMinute(60)->by($request->ip());
+        });
+
         RateLimiter::for('two-factor', function (Request $request) {
             return Limit::perMinute(5)->by($request->session()->get('login.id'));
         });
diff --git a/src/Providers/BroadcastServiceProvider.php b/src/Providers/BroadcastServiceProvider.php
index ec3d487b809..a70564ec943 100755
--- a/src/Providers/BroadcastServiceProvider.php
+++ b/src/Providers/BroadcastServiceProvider.php
@@ -50,6 +50,10 @@ protected function variables()
 
     protected function enabled()
     {
+        if (config('broadcasting.default') === 'null') {
+            return false;
+        }
+
         return in_array(
             \Illuminate\Broadcasting\BroadcastServiceProvider::class,
             array_keys($this->app->getLoadedProviders())
diff --git a/src/Providers/CacheServiceProvider.php b/src/Providers/CacheServiceProvider.php
index 8acd405e999..72ec6f282f5 100644
--- a/src/Providers/CacheServiceProvider.php
+++ b/src/Providers/CacheServiceProvider.php
@@ -45,7 +45,12 @@ private function extendFileStore()
 
             Cache::extend('file', function ($app, $config) {
                 return Cache::repository(
-                    (new FileStore($app['files'], $config['path'], $config['permission'] ?? null))
+                    (new FileStore(
+                        $app['files'],
+                        $config['path'],
+                        $config['permission'] ?? null,
+                        $app['config']['cache.serializable_classes'] ?? null
+                    ))
                         ->setLockDirectory($config['lock_path'] ?? null),
                     $config
                 );
diff --git a/src/Providers/CollectionsServiceProvider.php b/src/Providers/CollectionsServiceProvider.php
index 14cc476b5c8..a46f4a10446 100644
--- a/src/Providers/CollectionsServiceProvider.php
+++ b/src/Providers/CollectionsServiceProvider.php
@@ -7,6 +7,9 @@
 use Illuminate\Support\ServiceProvider;
 use Statamic\Contracts\Data\Augmentable;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class CollectionsServiceProvider extends ServiceProvider
 {
     /**
@@ -16,33 +19,12 @@ class CollectionsServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->getOrPut();
         $this->keyByWithKey();
         $this->l10n();
-        $this->pipe();
         $this->transpose();
         $this->toAugmentedArray();
     }
 
-    /**
-     * Get a key from a collection if it exists,
-     * otherwise put a value in there and return it.
-     *
-     * @return void
-     */
-    private function getOrPut()
-    {
-        Collection::macro('getOrPut', function ($key, $put) {
-            if ($this->has($key)) {
-                return $this->get($key);
-            }
-
-            $this->put($key, $put);
-
-            return $put;
-        });
-    }
-
     /**
      * The Laravel 5.3 way of doing keyBy.
      *
@@ -81,7 +63,7 @@ private function l10n()
          * @param  string  $prefix  This is for prefixing the keys for our addons.
          */
         Collection::macro('localize', function ($prefix = null) {
-            return collect($this->items)
+            return collect($this->all())
                 ->filter(function ($item) {
                     return pathinfo($item, PATHINFO_EXTENSION) == 'php';
                 })
@@ -94,18 +76,6 @@ private function l10n()
         });
     }
 
-    /**
-     * Backport of the pipe method from 5.2.
-     *
-     * @return void
-     */
-    private function pipe()
-    {
-        Collection::macro('pipe', function (callable $callback) {
-            return $callback($this);
-        });
-    }
-
     /**
      * "Transpose" a multidimensional array.
      *
@@ -160,7 +130,7 @@ protected function toAugmentedArray()
                 }
 
                 return $value instanceof Arrayable ? $value->toArray() : $value;
-            }, $this->items);
+            }, $this->all());
         });
 
         Collection::macro('toDeferredAugmentedArray', function ($keys = null) {
@@ -170,7 +140,7 @@ protected function toAugmentedArray()
                 }
 
                 return $value instanceof Arrayable ? $value->toArray() : $value;
-            }, $this->items);
+            }, $this->all());
         });
 
         Collection::macro('toAugmentedCollection', function ($keys = null) {
@@ -180,7 +150,7 @@ protected function toAugmentedArray()
                 }
 
                 return $value instanceof Arrayable ? $value->toArray() : $value;
-            }, $this->items);
+            }, $this->all());
         });
 
         Collection::macro('toEvaluatedAugmentedArray', function ($keys = null) {
@@ -190,7 +160,7 @@ protected function toAugmentedArray()
                 }
 
                 return $value instanceof Arrayable ? $value->toArray() : $value;
-            }, $this->items);
+            }, $this->all());
         });
     }
 }
diff --git a/src/Providers/CpServiceProvider.php b/src/Providers/CpServiceProvider.php
index f9956faddef..b640613b146 100644
--- a/src/Providers/CpServiceProvider.php
+++ b/src/Providers/CpServiceProvider.php
@@ -2,15 +2,10 @@
 
 namespace Statamic\Providers;
 
-use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Str;
-use Inertia\Inertia;
 use Statamic\CP\Utilities\UtilityRepository;
 use Statamic\Extensions\Translation\Loader;
 use Statamic\Extensions\Translation\Translator;
@@ -19,15 +14,12 @@
 use Statamic\Http\View\Composers\JavascriptComposer;
 use Statamic\Licensing\LicenseManager;
 use Statamic\Licensing\Outpost;
-use Statamic\Notifications\ElevatedSessionVerificationCode;
 use Statamic\View\Components\OutsideLogo;
 
 class CpServiceProvider extends ServiceProvider
 {
     public function boot()
     {
-        Inertia::setRootView('statamic::layout');
-
         View::composer('statamic::*', function ($view) {
             $view->with('user', User::current());
         });
@@ -46,8 +38,6 @@ public function boot()
 
         $this->registerMiddlewareGroups();
 
-        $this->registerElevatedSessionMacros();
-
         $this->bootSelfClosingUiTags();
     }
 
@@ -113,50 +103,6 @@ protected function registerMiddlewareGroups()
         ]);
     }
 
-    private function registerElevatedSessionMacros()
-    {
-        Request::macro('hasElevatedSession', function () {
-            return $this->getElevatedSessionExpiry() > now()->timestamp;
-        });
-
-        Request::macro('getElevatedSessionExpiry', function () {
-            if (! $lastElevated = session()->get('statamic_elevated_session')) {
-                return null;
-            }
-
-            return Carbon::createFromTimestamp($lastElevated)
-                ->addMinutes(config('statamic.users.elevated_session_duration', 15))
-                ->timestamp;
-        });
-
-        Request::macro('getElevatedSessionVerificationCode', function () {
-            return session()->get('statamic_elevated_session_verification_code')['code'] ?? null;
-        });
-
-        Session::macro('elevate', function () {
-            $this->put('statamic_elevated_session', now()->timestamp);
-        });
-
-        Session::macro('sendElevatedSessionVerificationCodeIfRequired', function () {
-            if ($timestamp = session()->get('statamic_elevated_session_verification_code')['generated_at'] ?? null) {
-                if ($timestamp > now()->subMinutes(5)->timestamp) {
-                    return;
-                }
-            }
-
-            $this->sendElevatedSessionVerificationCode();
-        });
-
-        Session::macro('sendElevatedSessionVerificationCode', function () {
-            session()->put(
-                key: 'statamic_elevated_session_verification_code',
-                value: ['code' => $verificationCode = Str::random(20), 'generated_at' => now()->timestamp],
-            );
-
-            User::current()->notify(new ElevatedSessionVerificationCode($verificationCode));
-        });
-    }
-
     private function bootSelfClosingUiTags()
     {
         // Converts <ui-component /> to <ui-component></ui-component>
diff --git a/src/Providers/ExtensionServiceProvider.php b/src/Providers/ExtensionServiceProvider.php
index 64136db7780..5371de78bcf 100644
--- a/src/Providers/ExtensionServiceProvider.php
+++ b/src/Providers/ExtensionServiceProvider.php
@@ -76,6 +76,7 @@ class ExtensionServiceProvider extends ServiceProvider
         Fieldtypes\CollectionTitleFormats::class,
         Fieldtypes\Collections::class,
         Fieldtypes\Color::class,
+        Fieldtypes\ControlAppearance::class,
         Fieldtypes\Date::class,
         Fieldtypes\Dictionary::class,
         Fieldtypes\DictionaryFields::class,
@@ -83,6 +84,7 @@ class ExtensionServiceProvider extends ServiceProvider
         Fieldtypes\FieldDisplay::class,
         Fieldtypes\Files::class,
         Fieldtypes\Floatval::class,
+        Fieldtypes\FormattingLocales::class,
         Fieldtypes\GlobalSetSites::class,
         Fieldtypes\Grid::class,
         Fieldtypes\Group::class,
@@ -268,6 +270,12 @@ public function register()
         $this->app->instance('statamic.hooks', collect());
     }
 
+    public function boot()
+    {
+        Fieldtypes\Link::extend('entry', Fieldtypes\Link\EntryLinkType::class);
+        Fieldtypes\Link::extend('asset', Fieldtypes\Link\AssetLinkType::class);
+    }
+
     protected function registerAddonManifest()
     {
         $cachePath = $this->app->bootstrapPath().'/cache/addons.php';
diff --git a/src/Providers/GlideServiceProvider.php b/src/Providers/GlideServiceProvider.php
index 87be5dab6f3..e7d341aca63 100644
--- a/src/Providers/GlideServiceProvider.php
+++ b/src/Providers/GlideServiceProvider.php
@@ -3,7 +3,6 @@
 namespace Statamic\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use Intervention\Image\ImageManager;
 use League\Glide\Server;
 use Statamic\Contracts\Imaging\ImageManipulator;
 use Statamic\Contracts\Imaging\UrlBuilder;
@@ -13,6 +12,7 @@
 use Statamic\Imaging\GlideUrlBuilder;
 use Statamic\Imaging\ImageGenerator;
 use Statamic\Imaging\ImageValidator;
+use Statamic\Imaging\Intervention;
 use Statamic\Imaging\PresetGenerator;
 use Statamic\Imaging\StaticUrlBuilder;
 
@@ -42,16 +42,8 @@ public function register()
             );
         });
 
-        $this->app->bind(ImageValidator::class, function ($app) {
-            $driver = config('statamic.assets.image_manipulation.driver', 'gd');
-
-            $imageManager = match ($driver) {
-                'gd' => ImageManager::gd(),
-                'imagick' => ImageManager::imagick(),
-                default => ImageManager::withDriver($driver),
-            };
-
-            return new ImageValidator($imageManager->driver());
+        $this->app->bind(ImageValidator::class, function () {
+            return new ImageValidator(Intervention::driver());
         });
     }
 
diff --git a/src/Providers/ViewServiceProvider.php b/src/Providers/ViewServiceProvider.php
index a1f87f50b12..a5661315580 100644
--- a/src/Providers/ViewServiceProvider.php
+++ b/src/Providers/ViewServiceProvider.php
@@ -26,7 +26,6 @@
 use Statamic\View\Debugbar\AntlersProfiler\PerformanceCollector;
 use Statamic\View\Debugbar\AntlersProfiler\PerformanceTracer;
 use Statamic\View\Interop\Stacks;
-use Statamic\View\Store;
 
 class ViewServiceProvider extends ServiceProvider
 {
@@ -37,8 +36,6 @@ class ViewServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton(Store::class);
-
         $this->app->singleton(Cascade::class, function ($app) {
             return new Cascade($app['request'], Site::current());
         });
@@ -103,183 +100,15 @@ private function registerAntlers()
             $runtimeConfig->guardedContentVariablePatterns = config('statamic.antlers.guardedContentVariables', []);
             $runtimeConfig->guardedContentTagPatterns = config('statamic.antlers.guardedContentTags', []);
             $runtimeConfig->guardedContentModifiers = config('statamic.antlers.guardedContentModifiers', []);
-            $runtimeConfig->allowedContentTagPatterns = config('statamic.antlers.allowedContentTags', [
-                'obfuscate:*',
-                'trans:*',
-                'trans_choice:*',
-                'widont:*',
-                ...$this->getAppTagPatternsForContentAllowlist($app),
-            ]);
+            $runtimeConfig->allowedContentTagPatterns = $this->mergeContentAllowlist(
+                config('statamic.antlers.allowedContentTags'),
+                $this->defaultAllowedContentTagPatterns($app)
+            );
 
-            $runtimeConfig->allowedContentModifiers = config('statamic.antlers.allowedContentModifiers', [
-                'add_query_param',
-                'add_slashes',
-                'alias',
-                'ampersand_list',
-                'ascii',
-                'at',
-                'backspace',
-                'background_position',
-                'bool_string',
-                'camelize',
-                'cdata',
-                'ceil',
-                'chunk',
-                'classes',
-                'collapse',
-                'collapse_whitespace',
-                'contains_any',
-                'count',
-                'count_substring',
-                'dashify',
-                'days_ago',
-                'decode',
-                'deslugify',
-                'diff_for_humans',
-                'divide',
-                'dl',
-                'embed_url',
-                'ends_with',
-                'ensure_left',
-                'ensure_right',
-                'entities',
-                'excerpt',
-                'explode',
-                'extension',
-                'favicon',
-                'filter_empty',
-                'first',
-                'flatten',
-                'flip',
-                'floor',
-                'format',
-                'format_number',
-                'format_translated',
-                'full_urls',
-                'has_lower_case',
-                'has_upper_case',
-                'headline',
-                'hex_to_rgb',
-                'hours_ago',
-                'insert',
-                'is_alpha',
-                'is_alphanumeric',
-                'is_array',
-                'is_blank',
-                'is_email',
-                'is_embeddable',
-                'is_empty',
-                'is_external_url',
-                'is_future',
-                'is_iterable',
-                'is_json',
-                'is_leap_year',
-                'is_lowercase',
-                'is_numeric',
-                'is_past',
-                'is_today',
-                'is_tomorrow',
-                'is_uppercase',
-                'is_url',
-                'is_weekday',
-                'is_weekend',
-                'is_yesterday',
-                'iso_format',
-                'join',
-                'key_by',
-                'keys',
-                'kebab',
-                'last',
-                'lcfirst',
-                'length',
-                'limit',
-                'localize',
-                'lower',
-                'markdown',
-                'md5',
-                'minutes_ago',
-                'mod',
-                'modify_date',
-                'months_ago',
-                'multiply',
-                'nl2br',
-                'obfuscate',
-                'obfuscate_email',
-                'offset',
-                'ol',
-                'option_list',
-                'parse_url',
-                'pathinfo',
-                'pluck',
-                'random',
-                'rawurlencode',
-                'read_time',
-                'relative',
-                'remove_left',
-                'remove_query_param',
-                'remove_right',
-                'replace',
-                'resolve',
-                'reverse',
-                'round',
-                'safe_truncate',
-                'sanitize',
-                'scope',
-                'seconds_ago',
-                'select',
-                'sentence_list',
-                'set_query_param',
-                'shuffle',
-                'singular',
-                'slugify',
-                'smartypants',
-                'snake',
-                'sort',
-                'spaceless',
-                'split',
-                'starts_with',
-                'str_pad',
-                'str_pad_both',
-                'str_pad_left',
-                'str_pad_right',
-                'strip_tags',
-                'studly',
-                'subtract',
-                'substr',
-                'sum',
-                'surround',
-                'swap_case',
-                'table',
-                'tidy',
-                'timestamp',
-                'timezone',
-                'title',
-                'to_bool',
-                'to_qs',
-                'to_spaces',
-                'to_tabs',
-                'to_string',
-                'trans',
-                'trans_choice',
-                'trackable_embed_url',
-                'trim',
-                'truncate',
-                'type_of',
-                'ucfirst',
-                'underscored',
-                'unique',
-                'upper',
-                'urldecode',
-                'urlencode',
-                'values',
-                'weeks_ago',
-                'where',
-                'where_in',
-                'widont',
-                'word_count',
-                'years_ago',
-                ...$this->getAppModifierHandlesForContentAllowlist($app),
-            ]);
+            $runtimeConfig->allowedContentModifiers = $this->mergeContentAllowlist(
+                config('statamic.antlers.allowedContentModifiers'),
+                $this->defaultAllowedContentModifiers($app)
+            );
             $runtimeConfig->allowPhpInUserContent = config('statamic.antlers.allowPhpInContent', false);
             $runtimeConfig->allowMethodsInUserContent = config('statamic.antlers.allowMethodsInContent', false);
 
@@ -358,6 +187,204 @@ private function getAppModifierHandlesForContentAllowlist(Application $app): arr
             ->all();
     }
 
+    private function defaultAllowedContentTagPatterns(Application $app): array
+    {
+        return [
+            'link:*',
+            'obfuscate:*',
+            'trans:*',
+            'trans_choice:*',
+            'widont:*',
+            ...$this->getAppTagPatternsForContentAllowlist($app),
+        ];
+    }
+
+    private function defaultAllowedContentModifiers(Application $app): array
+    {
+        return [
+            'add_query_param',
+            'add_slashes',
+            'alias',
+            'ampersand_list',
+            'ascii',
+            'at',
+            'backspace',
+            'background_position',
+            'bool_string',
+            'camelize',
+            'cdata',
+            'ceil',
+            'chunk',
+            'classes',
+            'collapse',
+            'collapse_whitespace',
+            'contains_any',
+            'count',
+            'count_substring',
+            'dashify',
+            'days_ago',
+            'decode',
+            'deslugify',
+            'diff_for_humans',
+            'divide',
+            'dl',
+            'embed_url',
+            'ends_with',
+            'ensure_left',
+            'ensure_right',
+            'entities',
+            'excerpt',
+            'explode',
+            'extension',
+            'favicon',
+            'filter_empty',
+            'first',
+            'flatten',
+            'flip',
+            'floor',
+            'format',
+            'format_number',
+            'format_translated',
+            'full_urls',
+            'has_lower_case',
+            'has_upper_case',
+            'headline',
+            'hex_to_rgb',
+            'hours_ago',
+            'insert',
+            'is_alpha',
+            'is_alphanumeric',
+            'is_array',
+            'is_blank',
+            'is_email',
+            'is_embeddable',
+            'is_empty',
+            'is_external_url',
+            'is_future',
+            'is_iterable',
+            'is_json',
+            'is_leap_year',
+            'is_lowercase',
+            'is_numeric',
+            'is_past',
+            'is_today',
+            'is_tomorrow',
+            'is_uppercase',
+            'is_url',
+            'is_weekday',
+            'is_weekend',
+            'is_yesterday',
+            'iso_format',
+            'join',
+            'key_by',
+            'keys',
+            'kebab',
+            'last',
+            'lcfirst',
+            'length',
+            'limit',
+            'localize',
+            'lower',
+            'markdown',
+            'md5',
+            'minutes_ago',
+            'mod',
+            'modify_date',
+            'months_ago',
+            'multiply',
+            'nl2br',
+            'obfuscate',
+            'obfuscate_email',
+            'offset',
+            'ol',
+            'option_list',
+            'parse_url',
+            'pathinfo',
+            'pluck',
+            'random',
+            'rawurlencode',
+            'read_time',
+            'relative',
+            'remove_left',
+            'remove_query_param',
+            'remove_right',
+            'replace',
+            'resolve',
+            'reverse',
+            'round',
+            'safe_truncate',
+            'sanitize',
+            'scope',
+            'seconds_ago',
+            'select',
+            'sentence_list',
+            'set_query_param',
+            'shuffle',
+            'singular',
+            'slugify',
+            'smartypants',
+            'snake',
+            'sort',
+            'spaceless',
+            'split',
+            'starts_with',
+            'str_pad',
+            'str_pad_both',
+            'str_pad_left',
+            'str_pad_right',
+            'strip_tags',
+            'studly',
+            'subtract',
+            'substr',
+            'sum',
+            'surround',
+            'swap_case',
+            'table',
+            'tidy',
+            'timestamp',
+            'timezone',
+            'title',
+            'to_bool',
+            'to_qs',
+            'to_spaces',
+            'to_tabs',
+            'to_string',
+            'trans',
+            'trans_choice',
+            'trackable_embed_url',
+            'trim',
+            'truncate',
+            'type_of',
+            'ucfirst',
+            'underscored',
+            'unique',
+            'upper',
+            'urldecode',
+            'urlencode',
+            'values',
+            'weeks_ago',
+            'where',
+            'where_in',
+            'widont',
+            'word_count',
+            'years_ago',
+            ...$this->getAppModifierHandlesForContentAllowlist($app),
+        ];
+    }
+
+    private function mergeContentAllowlist(mixed $configured, array $defaults): array
+    {
+        if ($configured === null) {
+            return $defaults;
+        }
+
+        return collect((array) $configured)
+            ->flatMap(fn ($item) => $item === '@default' ? $defaults : [$item])
+            ->unique()
+            ->values()
+            ->all();
+    }
+
     public function registerBladeDirectives()
     {
         Blade::directive('tags', function ($expression) {
@@ -409,8 +436,8 @@ public function boot()
         });
 
         View::macro('withoutExtractions', function () {
-            if ($this->engine instanceof Engine) {
-                $this->engine->withoutExtractions();
+            if ($this->getEngine() instanceof Engine) {
+                $this->getEngine()->withoutExtractions();
             }
 
             return $this;
diff --git a/src/Query/Builder.php b/src/Query/Builder.php
index da081638833..41794417e77 100644
--- a/src/Query/Builder.php
+++ b/src/Query/Builder.php
@@ -72,7 +72,16 @@ public function limit($value)
 
     public function offset($value)
     {
-        $this->offset = max(0, $value);
+        $value = max(0, $value);
+
+        // A large page number can overflow the offset arithmetic in forPage()/chunk() into a
+        // float, which array_slice() rejects. Clamp an out-of-range offset to PHP_INT_MAX so it
+        // yields an empty page instead of throwing.
+        if (is_float($value)) {
+            $value = $value >= PHP_INT_MAX ? PHP_INT_MAX : (int) $value;
+        }
+
+        $this->offset = $value;
 
         return $this;
     }
@@ -432,7 +441,7 @@ public function whereDate($column, $operator, $value = null, $boolean = 'and')
             $value = Carbon::parse($value);
         }
 
-        $value = Carbon::parse($value->format('Y-m-d')); // we only care about the date part
+        $value = Carbon::instance($value)->setTimezone(config('app.timezone'))->startOfDay(); // we only care about the date part
 
         $this->wheres[] = [
             'type' => 'Date',
@@ -558,7 +567,7 @@ public function whereTime($column, $operator, $value = null, $boolean = 'and')
             $value = Carbon::parse($value);
         }
 
-        $value = $value->format('H:i:s'); // we only care about the time part
+        $value = Carbon::instance($value)->setTimezone(config('app.timezone'))->format('H:i:s'); // we only care about the time part
 
         $this->wheres[] = [
             'type' => 'Time',
@@ -805,7 +814,7 @@ protected function filterTestLike($item, $like)
 
         $pattern = Pattern::sqlLikeToRegex($like);
 
-        return preg_match('/'.$pattern.'/im', (string) $item);
+        return preg_match('/'.$pattern.'/imu', (string) $item);
     }
 
     protected function filterTestNotLike($item, $like)
@@ -815,7 +824,7 @@ protected function filterTestNotLike($item, $like)
 
     protected function filterTestLikeRegex($item, $pattern)
     {
-        return preg_match("/{$pattern}/im", (string) $item);
+        return preg_match("/{$pattern}/imu", (string) $item);
     }
 
     protected function filterTestNotLikeRegex($item, $pattern)
diff --git a/src/Query/Dumper/Concerns/DumpsQueryValues.php b/src/Query/Dumper/Concerns/DumpsQueryValues.php
index 1371bbfc6a5..33ee299997c 100644
--- a/src/Query/Dumper/Concerns/DumpsQueryValues.php
+++ b/src/Query/Dumper/Concerns/DumpsQueryValues.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Query\Dumper\Concerns;
 
+use DateTimeInterface;
+use Illuminate\Support\Carbon;
+
 trait DumpsQueryValues
 {
     protected function dumpQueryArrayValues($array): string
@@ -17,6 +20,10 @@ protected function dumpQueryArrayValues($array): string
 
     protected function dumpQueryValue($value): string
     {
+        if ($value instanceof DateTimeInterface) {
+            $value = Carbon::instance($value)->setTimezone(config('app.timezone'));
+        }
+
         $this->bindings[] = $value;
 
         return '?';
diff --git a/src/Query/EloquentQueryBuilder.php b/src/Query/EloquentQueryBuilder.php
index 617d74b452d..a4bc452a232 100644
--- a/src/Query/EloquentQueryBuilder.php
+++ b/src/Query/EloquentQueryBuilder.php
@@ -175,7 +175,7 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
 
         if ($operator !== null && strtolower($operator) == 'like') {
             $grammar = $this->builder->getConnection()->getQueryGrammar();
-            $this->builder->whereRaw('LOWER('.$grammar->wrap($this->column($column)).') LIKE ?', strtolower($value), $boolean);
+            $this->builder->whereRaw('LOWER('.$grammar->wrap($this->column($column)).') LIKE ?', mb_strtolower($value), $boolean);
 
             return $this;
         }
diff --git a/src/Query/OrderBy.php b/src/Query/OrderBy.php
index 10bacaab599..d0e94b23392 100644
--- a/src/Query/OrderBy.php
+++ b/src/Query/OrderBy.php
@@ -2,6 +2,9 @@
 
 namespace Statamic\Query;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class OrderBy
 {
     public $sort;
@@ -22,6 +25,15 @@ public function __construct(string $sort, string $direction)
         $this->direction = $direction;
     }
 
+    public static function column(?string $value, ?string $default = null): ?string
+    {
+        if ($value && preg_match('/^[\w]+((\->|[.])[\w]+)*$/', $value)) {
+            return $value;
+        }
+
+        return $default;
+    }
+
     /**
      * Instantiate order by object.
      *
diff --git a/src/Query/OrderedQueryBuilder.php b/src/Query/OrderedQueryBuilder.php
index 0beb43d6679..10d622114aa 100644
--- a/src/Query/OrderedQueryBuilder.php
+++ b/src/Query/OrderedQueryBuilder.php
@@ -87,7 +87,15 @@ public function limit($value)
 
     public function offset($value)
     {
-        $this->offset = max(0, $value);
+        $value = max(0, $value);
+
+        // Mirrors the overflow guard in Query\Builder::offset() - an out-of-range offset
+        // shouldn't reach Collection::skip() as a float.
+        if (is_float($value)) {
+            $value = $value >= PHP_INT_MAX ? PHP_INT_MAX : (int) $value;
+        }
+
+        $this->offset = $value;
 
         return $this;
     }
diff --git a/src/Query/ResolveValue.php b/src/Query/ResolveValue.php
index 09a10392a26..f588ce6e6dd 100644
--- a/src/Query/ResolveValue.php
+++ b/src/Query/ResolveValue.php
@@ -5,6 +5,7 @@
 use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Contracts\Query\QueryableValue;
 use Statamic\Support\Arr;
+use Statamic\Support\MethodDenylist;
 use Statamic\Support\Str;
 
 class ResolveValue
@@ -52,7 +53,7 @@ private function getItemPartValue($item, $name)
             return $item->getQueryableValue($name);
         }
 
-        if (method_exists($item, $method = Str::camel($name))) {
+        if (method_exists($item, $method = Str::camel($name)) && ! MethodDenylist::blocks($method)) {
             return $item->{$method}();
         }
 
diff --git a/src/Query/Scopes/Filters/AssetProperties.php b/src/Query/Scopes/Filters/AssetProperties.php
index a8e3aac5132..502d1a5c65b 100644
--- a/src/Query/Scopes/Filters/AssetProperties.php
+++ b/src/Query/Scopes/Filters/AssetProperties.php
@@ -9,6 +9,8 @@
 use Statamic\Query\Scopes\Filters\Fields\FileType;
 use Statamic\Query\Scopes\Filters\Fields\Orientation;
 
+use function Statamic\trans as __;
+
 class AssetProperties extends Fields
 {
     public static function title()
diff --git a/src/Query/Scopes/Filters/Blueprint.php b/src/Query/Scopes/Filters/Blueprint.php
index c049530cfce..34594877fca 100644
--- a/src/Query/Scopes/Filters/Blueprint.php
+++ b/src/Query/Scopes/Filters/Blueprint.php
@@ -7,6 +7,8 @@
 use Statamic\Query\Scopes\Filter;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class Blueprint extends Filter
 {
     protected $pinned = true;
diff --git a/src/Query/Scopes/Filters/Collection.php b/src/Query/Scopes/Filters/Collection.php
index 169b1a58c75..f40a7ca8799 100644
--- a/src/Query/Scopes/Filters/Collection.php
+++ b/src/Query/Scopes/Filters/Collection.php
@@ -7,6 +7,8 @@
 use Statamic\Facades\User;
 use Statamic\Query\Scopes\Filter;
 
+use function Statamic\trans as __;
+
 class Collection extends Filter
 {
     protected $pinned = true;
diff --git a/src/Query/Scopes/Filters/Fields/Bard.php b/src/Query/Scopes/Filters/Fields/Bard.php
index 5af40ca4044..5788ebd65c1 100644
--- a/src/Query/Scopes/Filters/Fields/Bard.php
+++ b/src/Query/Scopes/Filters/Fields/Bard.php
@@ -5,6 +5,8 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Bard extends FieldtypeFilter
 {
     public function fieldItems()
diff --git a/src/Query/Scopes/Filters/Fields/Date.php b/src/Query/Scopes/Filters/Fields/Date.php
index baece485b80..42b0da2d7a8 100644
--- a/src/Query/Scopes/Filters/Fields/Date.php
+++ b/src/Query/Scopes/Filters/Fields/Date.php
@@ -5,6 +5,8 @@
 use Illuminate\Support\Carbon;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class Date extends FieldtypeFilter
 {
     public function fieldItems()
@@ -79,7 +81,7 @@ public function badge($values)
 
     public function isComplete($values): bool
     {
-        $values = array_filter($values);
+        $values = Arr::removeNullValues($values);
 
         if (! $operator = Arr::get($values, 'operator')) {
             return false;
diff --git a/src/Query/Scopes/Filters/Fields/Dimensions.php b/src/Query/Scopes/Filters/Fields/Dimensions.php
index d6ae756ed78..991667322f2 100644
--- a/src/Query/Scopes/Filters/Fields/Dimensions.php
+++ b/src/Query/Scopes/Filters/Fields/Dimensions.php
@@ -2,7 +2,9 @@
 
 namespace Statamic\Query\Scopes\Filters\Fields;
 
-use Illuminate\Support\Arr;
+use Statamic\Support\Arr;
+
+use function Statamic\trans as __;
 
 /**
  * Handle width, height, shortest side, longest side queries.
@@ -76,7 +78,7 @@ public function badge($values)
 
     public function isComplete($values): bool
     {
-        $values = array_filter($values);
+        $values = Arr::removeNullValues($values);
 
         return Arr::hasAll($values, ['dimension', 'operator', 'value']);
     }
diff --git a/src/Query/Scopes/Filters/Fields/Duration.php b/src/Query/Scopes/Filters/Fields/Duration.php
index 46786f7ef76..4dffac2cc31 100644
--- a/src/Query/Scopes/Filters/Fields/Duration.php
+++ b/src/Query/Scopes/Filters/Fields/Duration.php
@@ -5,6 +5,8 @@
 use Illuminate\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 /**
  * Integer filter but with a "seconds" appended to the input for clarity
  */
diff --git a/src/Query/Scopes/Filters/Fields/Entries.php b/src/Query/Scopes/Filters/Fields/Entries.php
index 3d9fba7f8bb..f70c4a786df 100644
--- a/src/Query/Scopes/Filters/Fields/Entries.php
+++ b/src/Query/Scopes/Filters/Fields/Entries.php
@@ -4,37 +4,36 @@
 
 use Statamic\Facades;
 use Statamic\Support\Arr;
-use Statamic\Support\Str;
+
+use function Statamic\trans as __;
 
 class Entries extends FieldtypeFilter
 {
     public function fieldItems()
     {
         return [
-            'field' => [
-                'type' => 'select',
-                'options' => [
-                    'id' => __('ID'),
-                    'title' => __('Title'),
-                ],
-                'default' => 'title',
-            ],
             'operator' => [
                 'type' => 'select',
                 'options' => [
-                    'like' => __('Contains'),
                     '=' => __('Is'),
                     '!=' => __('Isn\'t'),
                     'null' => __('Empty'),
                     'not-null' => __('Not empty'),
                 ],
-                'default' => 'like',
+                'default' => '=',
             ],
             'value' => [
-                'type' => 'text',
-                'placeholder' => __('Value'),
-                'if' => [
-                    'operator' => 'contains_any like, =, !=',
+                'type' => 'entries',
+                'max_items' => 1,
+                'mode' => 'typeahead',
+                'create' => false,
+                'collections' => $this->fieldtype->config('collections'),
+                'search_index' => $this->fieldtype->config('search_index'),
+                'select_across_sites' => $this->fieldtype->config('select_across_sites'),
+                'blueprints' => $this->fieldtype->config('blueprints'),
+                'query_scopes' => $this->fieldtype->config('query_scopes'),
+                'unless' => [
+                    'operator' => 'contains_any null, not-null',
                 ],
                 'required' => false,
             ],
@@ -43,10 +42,7 @@ public function fieldItems()
 
     public function apply($query, $handle, $values)
     {
-        $config = $this->fieldtype->field()->config();
-        $maxItems = $config['max_items'] ?? 0;
         $operator = $values['operator'];
-        $value = $values['value'];
 
         if (in_array($operator, ['null', 'not-null'])) {
             match ($operator) {
@@ -57,56 +53,41 @@ public function apply($query, $handle, $values)
             return;
         }
 
-        if ($operator === 'like') {
-            $value = Str::ensureLeft($value, '%');
-            $value = Str::ensureRight($value, '%');
-        }
-
-        if ($values['field'] == 'id') {
-            $maxItems === 1
-                ? $query->where($handle, $operator, $value)
-                : $query->whereJsonContains($handle, $value);
-
+        if (! $id = $values['value']) {
             return;
         }
 
-        $ids = Facades\Entry::query()
-            ->when($config['collections'] ?? null, fn ($query) => $query->whereIn('collection', $config['collections']))
-            ->where($values['field'], $operator, $value)
-            ->get(['id'])
-            ->map(fn ($entry) => $entry->id())
-            ->all();
-
-        if (empty($ids)) {
-            $maxItems === 1
-                ? $query->where($handle, -1)
-                : $query->whereJsonContains($handle, [-1]);
+        $single = $this->fieldtype->config('max_items') === 1;
 
-            return;
-        }
-
-        if ($maxItems === 1) {
-            $query->whereIn($handle, $ids);
+        if ($operator === '=') {
+            $single
+                ? $query->where($handle, $id)
+                : $query->whereJsonContains($handle, [$id]);
 
             return;
         }
 
-        $query->where(function ($subquery) use ($handle, $ids) {
-            foreach ($ids as $count => $id) {
-                $subquery->{$count == 0 ? 'whereJsonContains' : 'orWhereJsonContains'}($handle, [$id]);
-            }
-        });
+        $single
+            ? $query->where($handle, '!=', $id)
+            : $query->whereJsonDoesntContain($handle, [$id]);
     }
 
     public function badge($values)
     {
         $field = $this->fieldtype->field()->display();
-        $selectedField = $values['field'];
         $operator = $values['operator'];
-        $translatedField = Arr::get($this->fieldItems(), "field.options.{$selectedField}");
         $translatedOperator = Arr::get($this->fieldItems(), "operator.options.{$operator}");
-        $value = $values['value'];
 
-        return $field.' '.$translatedField.' '.strtolower($translatedOperator).' '.$value;
+        if (in_array($operator, ['null', 'not-null'])) {
+            return $field.' '.strtolower($translatedOperator);
+        }
+
+        if (! $id = $values['value']) {
+            return null;
+        }
+
+        $title = Facades\Entry::find($id)?->value('title') ?? $id;
+
+        return $field.' '.strtolower($translatedOperator).' '.$title;
     }
 }
diff --git a/src/Query/Scopes/Filters/Fields/FieldtypeFilter.php b/src/Query/Scopes/Filters/Fields/FieldtypeFilter.php
index 24011abf93a..e48689d2d34 100644
--- a/src/Query/Scopes/Filters/Fields/FieldtypeFilter.php
+++ b/src/Query/Scopes/Filters/Fields/FieldtypeFilter.php
@@ -6,6 +6,8 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class FieldtypeFilter
 {
     use HasFields;
@@ -82,7 +84,7 @@ public function badge($values)
 
     public function isComplete($values): bool
     {
-        $values = array_filter($values);
+        $values = Arr::removeNullValues($values);
 
         if (! $operator = Arr::get($values, 'operator')) {
             return false;
diff --git a/src/Query/Scopes/Filters/Fields/FileSize.php b/src/Query/Scopes/Filters/Fields/FileSize.php
index 6a21bf4c5a2..c3cfbf5e85c 100644
--- a/src/Query/Scopes/Filters/Fields/FileSize.php
+++ b/src/Query/Scopes/Filters/Fields/FileSize.php
@@ -5,6 +5,8 @@
 use Illuminate\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 /**
  * Special integer field that takes input in KB, queries in bytes, and displays a human-readable badge.
  */
diff --git a/src/Query/Scopes/Filters/Fields/FileType.php b/src/Query/Scopes/Filters/Fields/FileType.php
index 69ec7b202f9..f1a41b578bf 100644
--- a/src/Query/Scopes/Filters/Fields/FileType.php
+++ b/src/Query/Scopes/Filters/Fields/FileType.php
@@ -5,6 +5,8 @@
 use Illuminate\Support\Arr;
 use Statamic\Support\FileTypes;
 
+use function Statamic\trans as __;
+
 class FileType extends FieldtypeFilter
 {
     public function fieldItems()
diff --git a/src/Query/Scopes/Filters/Fields/Grid.php b/src/Query/Scopes/Filters/Fields/Grid.php
index 6446ba9fe9f..2f6f4b43e7d 100644
--- a/src/Query/Scopes/Filters/Fields/Grid.php
+++ b/src/Query/Scopes/Filters/Fields/Grid.php
@@ -5,6 +5,8 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Grid extends FieldtypeFilter
 {
     public function fieldItems()
diff --git a/src/Query/Scopes/Filters/Fields/Number.php b/src/Query/Scopes/Filters/Fields/Number.php
index 2ed26c44824..0edaef7f934 100644
--- a/src/Query/Scopes/Filters/Fields/Number.php
+++ b/src/Query/Scopes/Filters/Fields/Number.php
@@ -4,6 +4,8 @@
 
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 abstract class Number extends FieldtypeFilter
 {
     abstract protected function valueFieldtype();
diff --git a/src/Query/Scopes/Filters/Fields/Orientation.php b/src/Query/Scopes/Filters/Fields/Orientation.php
index 8767037f34c..d90d2ca290a 100644
--- a/src/Query/Scopes/Filters/Fields/Orientation.php
+++ b/src/Query/Scopes/Filters/Fields/Orientation.php
@@ -4,6 +4,8 @@
 
 use Illuminate\Support\Arr;
 
+use function Statamic\trans as __;
+
 /**
  * Landscape, portrait, square orientation queries.
  */
diff --git a/src/Query/Scopes/Filters/Fields/Replicator.php b/src/Query/Scopes/Filters/Fields/Replicator.php
index 1614b5f1ef0..e3bc1e71f62 100644
--- a/src/Query/Scopes/Filters/Fields/Replicator.php
+++ b/src/Query/Scopes/Filters/Fields/Replicator.php
@@ -5,6 +5,8 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Replicator extends FieldtypeFilter
 {
     public function fieldItems()
diff --git a/src/Query/Scopes/Filters/Fields/Template.php b/src/Query/Scopes/Filters/Fields/Template.php
index 80e4358389c..06bf85859fb 100644
--- a/src/Query/Scopes/Filters/Fields/Template.php
+++ b/src/Query/Scopes/Filters/Fields/Template.php
@@ -4,6 +4,8 @@
 
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class Template extends FieldtypeFilter
 {
     public function fieldItems()
diff --git a/src/Query/Scopes/Filters/Fields/Terms.php b/src/Query/Scopes/Filters/Fields/Terms.php
index aa693f77406..a7de49b6718 100644
--- a/src/Query/Scopes/Filters/Fields/Terms.php
+++ b/src/Query/Scopes/Filters/Fields/Terms.php
@@ -5,6 +5,8 @@
 use Statamic\Facades;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class Terms extends FieldtypeFilter
 {
     public function fieldItems()
@@ -61,14 +63,14 @@ public function badge($values)
             ? $this->fieldtype->taxonomies()[0].'::'.$values['term']
             : $values['term'];
 
-        $term = Facades\Term::find($id)->title();
+        $term = Facades\Term::find($id)->in(Facades\Site::selected()->handle())->title();
 
         return $field.': '.$term;
     }
 
     public function isComplete($values): bool
     {
-        $values = array_filter($values);
+        $values = Arr::removeNullValues($values);
 
         if (! $operator = Arr::get($values, 'operator')) {
             return false;
diff --git a/src/Query/Scopes/Filters/Fields/Textarea.php b/src/Query/Scopes/Filters/Fields/Textarea.php
index 6fb13d5a7ab..652a115beab 100644
--- a/src/Query/Scopes/Filters/Fields/Textarea.php
+++ b/src/Query/Scopes/Filters/Fields/Textarea.php
@@ -5,6 +5,8 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Textarea extends FieldtypeFilter
 {
     public function fieldItems()
diff --git a/src/Query/Scopes/Filters/Fields/Toggle.php b/src/Query/Scopes/Filters/Fields/Toggle.php
index 3f438c15503..a5ebad8dc6b 100644
--- a/src/Query/Scopes/Filters/Fields/Toggle.php
+++ b/src/Query/Scopes/Filters/Fields/Toggle.php
@@ -2,7 +2,9 @@
 
 namespace Statamic\Query\Scopes\Filters\Fields;
 
-use Illuminate\Support\Arr;
+use Statamic\Support\Arr;
+
+use function Statamic\trans as __;
 
 class Toggle extends FieldtypeFilter
 {
@@ -38,7 +40,7 @@ public function badge($values)
 
     public function isComplete($values): bool
     {
-        $values = array_filter($values);
+        $values = Arr::removeNullValues($values);
 
         return Arr::has($values, 'value');
     }
diff --git a/src/Query/Scopes/Filters/Fields/User.php b/src/Query/Scopes/Filters/Fields/User.php
index 3762bb9f9c9..13982a11c66 100644
--- a/src/Query/Scopes/Filters/Fields/User.php
+++ b/src/Query/Scopes/Filters/Fields/User.php
@@ -5,6 +5,8 @@
 use Statamic\Facades\User as Users;
 use Statamic\Support\Arr;
 
+use function Statamic\trans as __;
+
 class User extends FieldtypeFilter
 {
     public function fieldItems()
diff --git a/src/Query/Scopes/Filters/Status.php b/src/Query/Scopes/Filters/Status.php
index 733e9bde76a..4491940da6e 100644
--- a/src/Query/Scopes/Filters/Status.php
+++ b/src/Query/Scopes/Filters/Status.php
@@ -5,6 +5,8 @@
 use Statamic\Facades\Collection;
 use Statamic\Query\Scopes\Filter;
 
+use function Statamic\trans as __;
+
 class Status extends Filter
 {
     public $pinned = true;
diff --git a/src/Query/Scopes/Filters/UserGroup.php b/src/Query/Scopes/Filters/UserGroup.php
index eae56449d94..1d2a02edb7c 100644
--- a/src/Query/Scopes/Filters/UserGroup.php
+++ b/src/Query/Scopes/Filters/UserGroup.php
@@ -5,6 +5,8 @@
 use Statamic\Facades;
 use Statamic\Query\Scopes\Filter;
 
+use function Statamic\trans as __;
+
 class UserGroup extends Filter
 {
     protected $pinned = true;
diff --git a/src/Query/Scopes/Filters/UserRole.php b/src/Query/Scopes/Filters/UserRole.php
index 51a5a6635f5..a814410ce43 100644
--- a/src/Query/Scopes/Filters/UserRole.php
+++ b/src/Query/Scopes/Filters/UserRole.php
@@ -5,6 +5,8 @@
 use Statamic\Facades\Role;
 use Statamic\Query\Scopes\Filter;
 
+use function Statamic\trans as __;
+
 class UserRole extends Filter
 {
     protected $pinned = true;
diff --git a/src/Query/Scopes/Scope.php b/src/Query/Scopes/Scope.php
index 96db9cc1cb3..9ba9f9447cd 100644
--- a/src/Query/Scopes/Scope.php
+++ b/src/Query/Scopes/Scope.php
@@ -14,7 +14,7 @@ abstract class Scope
     /**
      * Apply the scope to a given query builder.
      *
-     * @param  \Statamic\Query\Builder  $builder
+     * @param  \Statamic\Query\Builder  $query
      * @param  array  $values
      * @return void
      */
diff --git a/src/Revisions/Revision.php b/src/Revisions/Revision.php
index a804799ebd4..94b660815d4 100644
--- a/src/Revisions/Revision.php
+++ b/src/Revisions/Revision.php
@@ -16,6 +16,9 @@
 use Statamic\Facades\Revision as Revisions;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class Revision implements Arrayable, ContainsQueryableValues, Contract
 {
     use ExistsAsFile, FluentlyGetsAndSets, TracksQueriedColumns, TracksQueriedRelations;
diff --git a/src/Revisions/RevisionRepository.php b/src/Revisions/RevisionRepository.php
index 1c4d6f93c5c..295417e112f 100644
--- a/src/Revisions/RevisionRepository.php
+++ b/src/Revisions/RevisionRepository.php
@@ -5,6 +5,7 @@
 use Statamic\Contracts\Revisions\Revision as RevisionContract;
 use Statamic\Contracts\Revisions\RevisionQueryBuilder;
 use Statamic\Contracts\Revisions\RevisionRepository as Contract;
+use Statamic\Facades\File;
 use Statamic\Stache\Stache;
 use Statamic\Support\Str;
 
@@ -40,11 +41,13 @@ public function whereKey($key)
 
     public function findWorkingCopyByKey($key)
     {
-        return $this
-            ->query()
-            ->where('key', $key)
-            ->where('action', 'working')
-            ->first();
+        $path = $this->directory().'/'.$key.'/working.yaml';
+
+        if (! File::exists($path)) {
+            return null;
+        }
+
+        return $this->store->makeItemFromFile($path, File::get($path));
     }
 
     public function save(RevisionContract $revision)
diff --git a/src/Routing/ResolveRedirect.php b/src/Routing/ResolveRedirect.php
index 7ac738ae24b..4f2e02f215a 100644
--- a/src/Routing/ResolveRedirect.php
+++ b/src/Routing/ResolveRedirect.php
@@ -2,11 +2,9 @@
 
 namespace Statamic\Routing;
 
-use Statamic\Contracts\Data\Localization;
 use Statamic\Contracts\Entries\Entry;
-use Statamic\Facades;
-use Statamic\Facades\Site;
 use Statamic\Fields\Values;
+use Statamic\Fieldtypes\Link;
 use Statamic\Fieldtypes\Link\ArrayableLink;
 use Statamic\Structures\Page;
 use Statamic\Support\Str;
@@ -54,38 +52,19 @@ public function item($redirect, $parent = null, $localize = false)
             return $redirect->url->value();
         }
 
-        if (Str::startsWith($redirect, 'entry::')) {
-            $id = Str::after($redirect, 'entry::');
-
-            return $this->findEntry($id, $parent, $localize);
-        }
-
-        if (Str::startsWith($redirect, 'asset::')) {
-            $id = Str::after($redirect, 'asset::');
-
-            return Facades\Asset::find($id);
+        foreach (Link::types() as $linkType) {
+            if (Str::startsWith($redirect, "{$linkType->handle()}::")) {
+                return $linkType->resolve(
+                    id: Str::after($redirect, "{$linkType->handle()}::"),
+                    parent: $parent,
+                    localize: $localize
+                );
+            }
         }
 
         return is_numeric($redirect) ? (int) $redirect : $redirect;
     }
 
-    private function findEntry($id, $parent, $localize)
-    {
-        if (! ($entry = Facades\Entry::find($id))) {
-            return null;
-        }
-
-        if (! $localize) {
-            return $entry;
-        }
-
-        $site = $parent instanceof Localization
-            ? $parent->locale()
-            : Site::current()->handle();
-
-        return $entry->in($site) ?? $entry;
-    }
-
     private function firstChild($parent)
     {
         if (! $parent || ! $parent instanceof Entry) {
diff --git a/src/Rules/DateFieldtype.php b/src/Rules/DateFieldtype.php
index 16a5af4545f..436df34a22a 100644
--- a/src/Rules/DateFieldtype.php
+++ b/src/Rules/DateFieldtype.php
@@ -88,7 +88,9 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
 
     private function validDateFormat($value)
     {
-        $format = 'Y-m-d\TH:i:s.v\Z';
+        $format = $this->fieldtype->formatHasTime()
+            ? 'Y-m-d\TH:i:s.v\Z'
+            : 'Y-m-d';
 
         $date = DateTime::createFromFormat('!'.$format, $value);
 
diff --git a/src/Search/Comb/Index.php b/src/Search/Comb/Index.php
index d3003d93c65..9126b35fccb 100644
--- a/src/Search/Comb/Index.php
+++ b/src/Search/Comb/Index.php
@@ -94,7 +94,13 @@ public function delete($document)
             return;
         }
 
-        $data->forget($document->getSearchReference());
+        $ref = $document->getSearchReference();
+
+        if (! $data->has($ref)) {
+            return;
+        }
+
+        $data->forget($ref);
 
         $this->save($data);
     }
diff --git a/src/Search/Commands/Update.php b/src/Search/Commands/Update.php
index 3e6ba18611a..349d0066040 100644
--- a/src/Search/Commands/Update.php
+++ b/src/Search/Commands/Update.php
@@ -6,7 +6,6 @@
 use Statamic\Console\RunsInPlease;
 use Statamic\Events\SearchIndexUpdated;
 use Statamic\Facades\Search;
-use Statamic\Support\Str;
 
 use function Laravel\Prompts\select;
 
@@ -35,7 +34,7 @@ public function handle()
 
     private function getIndexes()
     {
-        if ($requestedIndex = $this->getRequestedIndex()) {
+        if (! is_null($requestedIndex = $this->getRequestedIndex())) {
             return $requestedIndex;
         }
 
@@ -71,10 +70,10 @@ private function getRequestedIndex()
             return [$this->indexes()->get($arg)];
         }
 
-        // They might have entered a name as it appears in the config, but if it
+        // They might have entered a handle as it appears in the config, but if it
         // should be localized we'll get all of the localized versions.
-        if (collect(config('statamic.search.indexes'))->put('cp', [])->has($arg)) {
-            return $this->indexes()->filter(fn ($index) => Str::startsWith($index->name(), $arg))->all();
+        if ($indexes = $this->indexes()->filter(fn ($index) => $index->handle() === $arg)->all()) {
+            return $indexes;
         }
 
         throw new \InvalidArgumentException("Index [$arg] does not exist.");
diff --git a/src/Search/Index.php b/src/Search/Index.php
index fa9ebb8779f..c4422dbb7f5 100644
--- a/src/Search/Index.php
+++ b/src/Search/Index.php
@@ -9,6 +9,7 @@
 abstract class Index
 {
     protected $name;
+    protected $handle;
     protected $locale;
     protected $config;
     protected static ?Closure $nameCallback = null;
@@ -25,6 +26,8 @@ abstract protected function deleteIndex();
 
     public function __construct($name, array $config, ?string $locale = null)
     {
+        $this->handle = $name;
+
         $this->name = static::$nameCallback
             ? call_user_func(static::$nameCallback, $name, $locale)
             : ($locale ? $name.'_'.$locale : $name);
@@ -38,6 +41,11 @@ public function name()
         return $this->name;
     }
 
+    public function handle()
+    {
+        return $this->handle;
+    }
+
     public static function resolveNameUsing(?Closure $callback)
     {
         static::$nameCallback = $callback;
@@ -91,7 +99,7 @@ public function insertMultiple($documents)
         $documents
             ->chunk(config('statamic.search.chunk_size'))
             ->each(fn ($documents) => InsertMultipleJob::dispatch(
-                name: $this->locale ? Str::before($this->name, "_{$this->locale}") : $this->name,
+                name: $this->handle,
                 locale: $this->locale,
                 documents: $documents
             ));
diff --git a/src/Search/Null/NullIndex.php b/src/Search/Null/NullIndex.php
index 10ebc808ade..7f0c2b2e1ee 100644
--- a/src/Search/Null/NullIndex.php
+++ b/src/Search/Null/NullIndex.php
@@ -34,6 +34,6 @@ protected function deleteIndex()
 
     public function searchables()
     {
-        return new NullSearchables($this);
+        return new NullSearchables();
     }
 }
diff --git a/src/Search/QueryBuilder.php b/src/Search/QueryBuilder.php
index fc01ad19f68..5173bad6282 100644
--- a/src/Search/QueryBuilder.php
+++ b/src/Search/QueryBuilder.php
@@ -87,6 +87,11 @@ protected function collect($items = [])
         return new DataCollection($items);
     }
 
+    public function whereStatus(string $status)
+    {
+        return $this->where('status', $status);
+    }
+
     public function getTableNameForFakeQuery()
     {
         return 'search_'.$this->index->name();
diff --git a/src/Sites/Sites.php b/src/Sites/Sites.php
index 05c9054205e..aaec4b29c24 100644
--- a/src/Sites/Sites.php
+++ b/src/Sites/Sites.php
@@ -14,6 +14,8 @@
 use Statamic\Facades\YAML;
 use Statamic\Support\Str;
 
+use function Statamic\trans as __;
+
 class Sites
 {
     protected $sites;
diff --git a/src/Stache/Indexes/Index.php b/src/Stache/Indexes/Index.php
index b4a6f3df6d0..61182a2e005 100644
--- a/src/Stache/Indexes/Index.php
+++ b/src/Stache/Indexes/Index.php
@@ -11,7 +11,7 @@ abstract class Index
     protected $name;
     protected $items = [];
     protected $loaded = false;
-    private static ?string $currentlyLoading = null;
+    private static array $loadingStack = [];
 
     public function __construct($store, $name)
     {
@@ -66,27 +66,29 @@ public function load()
         }
 
         $loadingKey = $this->store->key().'/'.$this->name;
-        $currentlyLoadingThis = static::$currentlyLoading === $loadingKey;
+        $currentlyLoadingThis = in_array($loadingKey, static::$loadingStack);
 
-        static::$currentlyLoading = $loadingKey;
+        static::$loadingStack[] = $loadingKey;
 
-        $this->loaded = true;
+        try {
+            $this->loaded = true;
 
-        if (Statamic::isWorker() && ! $currentlyLoadingThis) {
-            $this->loaded = false;
-        }
-
-        debugbar()->addMessage("Loading index: {$loadingKey}", 'stache');
+            if (Statamic::isWorker() && ! $currentlyLoadingThis) {
+                $this->loaded = false;
+            }
 
-        $this->items = Stache::cacheStore()->get($this->cacheKey());
+            debugbar()->addMessage("Loading index: {$loadingKey}", 'stache');
 
-        if ($this->items === null) {
-            $this->update();
-        }
+            $this->items = Stache::cacheStore()->get($this->cacheKey());
 
-        $this->store->cacheIndexUsage($this);
+            if ($this->items === null) {
+                $this->update();
+            }
 
-        static::$currentlyLoading = null;
+            $this->store->cacheIndexUsage($this);
+        } finally {
+            array_pop(static::$loadingStack);
+        }
 
         return $this;
     }
@@ -161,8 +163,14 @@ public function clear()
         Stache::cacheStore()->forget($this->cacheKey());
     }
 
+    /** @deprecated */
     public static function currentlyLoading()
     {
-        return static::$currentlyLoading;
+        return end(static::$loadingStack) ?: null;
+    }
+
+    public static function isLoading(): bool
+    {
+        return ! empty(static::$loadingStack);
     }
 }
diff --git a/src/Stache/Query/Builder.php b/src/Stache/Query/Builder.php
index 0f3a7fba9f3..58dfd01bade 100644
--- a/src/Stache/Query/Builder.php
+++ b/src/Stache/Query/Builder.php
@@ -143,7 +143,7 @@ protected function getCountForPagination()
 
     protected function getItems($keys)
     {
-        return $this->store->getItems($keys);
+        return $this->store->getItems($keys)->filter()->values();
     }
 
     protected function filterWhereBasic($values, $where)
diff --git a/src/Stache/Query/QueriesEntryStatus.php b/src/Stache/Query/QueriesEntryStatus.php
index 05885635219..ee02ce52cb4 100644
--- a/src/Stache/Query/QueriesEntryStatus.php
+++ b/src/Stache/Query/QueriesEntryStatus.php
@@ -45,6 +45,18 @@ private function addCollectionStatusLogicToQuery($query, $status, $collection):
             return;
         }
 
+        if ($status === 'scheduled' && $collection->futureDateBehavior() !== 'private') {
+            $query->where('date', 'invalid'); // intentionally trigger no results.
+
+            return;
+        }
+
+        if ($status === 'expired' && $collection->pastDateBehavior() !== 'private') {
+            $query->where('date', 'invalid'); // intentionally trigger no results.
+
+            return;
+        }
+
         if ($collection->futureDateBehavior() === 'private') {
             $status === 'scheduled'
                 ? $query->where('date', '>', now())
diff --git a/src/Stache/Stache.php b/src/Stache/Stache.php
index 406980b04c7..6b0dc622a77 100644
--- a/src/Stache/Stache.php
+++ b/src/Stache/Stache.php
@@ -9,6 +9,7 @@
 use Statamic\Events\StacheCleared;
 use Statamic\Events\StacheWarmed;
 use Statamic\Extensions\FileStore;
+use Statamic\Facades\Blink;
 use Statamic\Facades\File;
 use Statamic\Stache\Stores\Store;
 use Statamic\Support\Str;
@@ -111,6 +112,9 @@ public function clear()
 
         $this->cacheStore()->forget('stache::timing');
 
+        Blink::forget('collection-structure-tree*');
+        Blink::forget('structure-*');
+
         StacheCleared::dispatch();
 
         return $this;
diff --git a/src/Stache/Stores/CollectionEntriesStore.php b/src/Stache/Stores/CollectionEntriesStore.php
index f0bbcac96bc..a56433f377f 100644
--- a/src/Stache/Stores/CollectionEntriesStore.php
+++ b/src/Stache/Stores/CollectionEntriesStore.php
@@ -215,9 +215,11 @@ protected function writeItemToDisk($item)
                 break;
             }
 
-            $itemFromDisk = $this->makeItemFromFile($path, $contents);
+            // Only parse the ID from the file rather than using makeItemFromFile,
+            // which would put a stale entry into the structure-entries blink store.
+            $id = Arr::get(YAML::file($path)->parse($contents), 'id');
 
-            if ($item->id() == $itemFromDisk->id()) {
+            if ($item->id() == $id) {
                 break;
             }
 
@@ -235,9 +237,7 @@ protected function getCachedItem($key)
             return null;
         }
 
-        $isLoadingIds = Index::currentlyLoading() === $this->key().'/id';
-
-        if (! $isLoadingIds && $this->shouldBlinkEntryUris && ($uri = $this->resolveIndex('uri')->load()->get($entry->id()))) {
+        if (! Index::isLoading() && $this->shouldBlinkEntryUris && ($uri = $this->resolveIndex('uri')->load()->get($entry->id()))) {
             Blink::store('entry-uris')->put($entry->id(), $uri);
         }
 
@@ -271,7 +271,7 @@ public function updateParents($ids = null)
 
     private function updateEntriesWithinIndex($index, $ids)
     {
-        if (empty($ids)) {
+        if (collect($ids)->isEmpty()) {
             return $index->update();
         }
 
@@ -283,7 +283,7 @@ private function updateEntriesWithinIndex($index, $ids)
 
     private function updateEntriesWithinStore($ids)
     {
-        if (empty($ids)) {
+        if (collect($ids)->isEmpty()) {
             $ids = $this->paths()->keys();
         }
 
diff --git a/src/Stache/Stores/FormSubmissionsStore.php b/src/Stache/Stores/FormSubmissionsStore.php
index 41b82471bcf..4660f869168 100644
--- a/src/Stache/Stores/FormSubmissionsStore.php
+++ b/src/Stache/Stores/FormSubmissionsStore.php
@@ -22,7 +22,7 @@ class FormSubmissionsStore extends ChildStore
 
     public function getItemKey($item)
     {
-        return $item->id();
+        return $item->form()->handle().'::'.$item->id();
     }
 
     public function getItemFilter(SplFileInfo $file)
@@ -44,6 +44,8 @@ public function makeItemFromFile($path, $contents)
             Log::warning('Could not parse form submission file: '.$path);
         }
 
+        $data = $this->sanitizeData($data);
+
         $form = pathinfo($path, PATHINFO_DIRNAME);
         $form = Str::after($form, $this->parent->directory());
 
@@ -56,4 +58,19 @@ public function makeItemFromFile($path, $contents)
 
         return $submission;
     }
+
+    private function sanitizeData(array $data): array
+    {
+        return collect($data)->map(function ($value) {
+            if (is_array($value)) {
+                return $this->sanitizeData($value);
+            }
+
+            if (is_string($value) && ! mb_check_encoding($value, 'UTF-8')) {
+                return mb_convert_encoding($value, 'UTF-8', 'UTF-8');
+            }
+
+            return $value;
+        })->all();
+    }
 }
diff --git a/src/Stache/Stores/Store.php b/src/Stache/Stores/Store.php
index 9a20e58c73b..c220b679e1b 100644
--- a/src/Stache/Stores/Store.php
+++ b/src/Stache/Stores/Store.php
@@ -328,6 +328,8 @@ public function paths()
             return $isDuplicate ?? false;
         });
 
+        $items->each(fn ($item) => $this->cacheItem($item['item']));
+
         $paths = $items->pluck('path', 'key');
 
         $this->cachePaths($paths);
diff --git a/src/Stache/Stores/TaxonomiesStore.php b/src/Stache/Stores/TaxonomiesStore.php
index 365f7438be9..b8e9ca58420 100644
--- a/src/Stache/Stores/TaxonomiesStore.php
+++ b/src/Stache/Stores/TaxonomiesStore.php
@@ -44,6 +44,8 @@ public function makeItemFromFile($path, $contents)
             ->title(Arr::get($data, 'title'))
             ->cascade(Arr::get($data, 'inject', []))
             ->searchIndex(Arr::get($data, 'search_index'))
+            ->setSortField(Arr::get($data, 'sort_by'))
+            ->setSortDirection(Arr::get($data, 'sort_dir'))
             ->defaultPublishState($this->getDefaultPublishState($data))
             ->sites($sites)
             ->previewTargets($this->normalizePreviewTargets(Arr::get($data, 'preview_targets', [])))
diff --git a/src/StarterKits/Installer.php b/src/StarterKits/Installer.php
index 242ede21e93..a8d2e6154c4 100644
--- a/src/StarterKits/Installer.php
+++ b/src/StarterKits/Installer.php
@@ -244,8 +244,10 @@ protected function prepareRepository(): self
      */
     protected function requireStarterKit(): self
     {
+        $error = null;
+
         spin(
-            function () {
+            function () use (&$error) {
                 $version = $this->branch;
 
                 // Allow dev stability when installing from VCS repo without tagged releases
@@ -265,12 +267,16 @@ function () {
                 try {
                     Composer::withoutQueue()->throwOnFailure()->require($package);
                 } catch (ProcessException $exception) {
-                    $this->rollbackWithError("Error installing starter kit [{$this->package}].", $exception->getMessage());
+                    $error = $exception;
                 }
             },
             "Preparing starter kit [{$this->package}]..."
         );
 
+        if ($error) {
+            $this->rollbackWithError("Error installing starter kit [{$this->package}].", $error->getMessage());
+        }
+
         return $this;
     }
 
diff --git a/src/Statamic.php b/src/Statamic.php
index ccb4212434d..abb4e4d839e 100644
--- a/src/Statamic.php
+++ b/src/Statamic.php
@@ -20,6 +20,9 @@
 use Statamic\Support\TextDirection;
 use Statamic\Tags\FluentTag;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class Statamic
 {
     const CORE_SLUG = 'statamic';
@@ -424,6 +427,15 @@ public static function trans($key, $replace = [], $locale = null)
         return $line;
     }
 
+    public static function transChoice($key, $number, $replace = [], $locale = null)
+    {
+        if (is_array(\__($key, $replace, $locale))) {
+            return $key;
+        }
+
+        return \trans_choice($key, $number, $replace, $locale);
+    }
+
     public static function isWorker()
     {
         if (! App::runningInConsole()) {
@@ -468,6 +480,20 @@ public static function cpDirection()
         return TextDirection::of(static::cpLocale());
     }
 
+    public static function cpPerPage($perPage)
+    {
+        if ($perPage === null || $perPage === '') {
+            return null;
+        }
+
+        $perPage = (int) $perPage;
+
+        $options = config('statamic.cp.pagination_size_options') ?: [config('statamic.cp.pagination_size')];
+        $ceiling = max($options);
+
+        return max(1, min($perPage, $ceiling));
+    }
+
     public static function nonInertiaPageData()
     {
         $props = Inertia::getShared();
diff --git a/src/StaticCaching/Cachers/Writer.php b/src/StaticCaching/Cachers/Writer.php
index 82ac7558228..2696a120cbb 100644
--- a/src/StaticCaching/Cachers/Writer.php
+++ b/src/StaticCaching/Cachers/Writer.php
@@ -43,6 +43,15 @@ public function write($path, $content, $lockFor = 0)
             return false;
         }
 
+        // Truncate the file before writing. Since the "c" mode doesn't truncate and leaves
+        // the pointer at the start, writing content shorter than what's already on disk
+        // would otherwise leave stale bytes behind, producing an invalid document.
+        if (! ftruncate($handle, 0)) {
+            fclose($handle);
+
+            return false;
+        }
+
         fwrite($handle, $content);
         chmod($path, $this->permissions['file']);
 
diff --git a/src/StaticCaching/DefaultInvalidator.php b/src/StaticCaching/DefaultInvalidator.php
index 9ee4d46e419..6a77d450597 100644
--- a/src/StaticCaching/DefaultInvalidator.php
+++ b/src/StaticCaching/DefaultInvalidator.php
@@ -22,6 +22,7 @@ class DefaultInvalidator implements Invalidator
 {
     protected $cacher;
     protected $rules;
+    protected $refreshing = false;
 
     public function __construct(Cacher $cacher, $rules = [])
     {
@@ -32,14 +33,18 @@ public function __construct(Cacher $cacher, $rules = [])
     public function invalidate($item)
     {
         if ($this->rules === 'all') {
-            $this->cacher->flush();
+            $this->refreshing
+                ? $this->cacher->refreshUrls($this->cacher->getUrls()->all())
+                : $this->cacher->flush();
 
             return;
         }
 
         $urls = $this->getItemUrls($item);
 
-        $this->cacher->invalidateUrls($urls);
+        $this->refreshing
+            ? $this->cacher->refreshUrls($urls)
+            : $this->cacher->invalidateUrls($urls);
     }
 
     public function refresh($item)
@@ -50,15 +55,14 @@ public function refresh($item)
             return;
         }
 
-        if ($this->rules === 'all') {
-            $this->cacher->refreshUrls($this->cacher->getUrls()->all());
+        $previous = $this->refreshing;
+        $this->refreshing = true;
 
-            return;
+        try {
+            $this->invalidate($item);
+        } finally {
+            $this->refreshing = $previous;
         }
-
-        $urls = $this->getItemUrls($item);
-
-        $this->cacher->refreshUrls($urls);
     }
 
     protected function getItemUrls($item)
@@ -97,7 +101,7 @@ protected function getFormUrls($form)
         $prefixedRelativeUrls = Site::all()->map(function ($site) use ($rules) {
             return $rules
                 ->reject(fn (string $rule) => URL::isAbsolute($rule))
-                ->map(fn (string $rule) => URL::tidy($site->url().'/'.$rule, withTrailingSlash: false));
+                ->map(fn (string $rule) => URL::tidy($site->url().'/'.$rule));
         })->flatten()->all();
 
         return [
@@ -115,7 +119,7 @@ protected function getAssetUrls($asset)
         $prefixedRelativeUrls = Site::all()->map(function ($site) use ($rules) {
             return $rules
                 ->reject(fn (string $rule) => URL::isAbsolute($rule))
-                ->map(fn (string $rule) => URL::tidy($site->url().'/'.$rule, withTrailingSlash: false));
+                ->map(fn (string $rule) => URL::tidy($site->url().'/'.$rule));
         })->flatten()->all();
 
         return [
@@ -141,7 +145,7 @@ protected function getEntryUrls($entry)
 
         $prefixedRelativeUrls = $rules
             ->reject(fn (string $rule) => URL::isAbsolute($rule))
-            ->map(fn (string $rule) => URL::tidy($entry->site()->url().'/'.$rule, withTrailingSlash: false))
+            ->map(fn (string $rule) => URL::tidy($entry->site()->url().'/'.$rule))
             ->all();
 
         return [
@@ -170,7 +174,7 @@ protected function getTermUrls($term)
 
         $prefixedRelativeUrls = $rules
             ->reject(fn (string $rule) => URL::isAbsolute($rule))
-            ->map(fn (string $rule) => URL::tidy($term->site()->url().'/'.$rule, withTrailingSlash: false))
+            ->map(fn (string $rule) => URL::tidy($term->site()->url().'/'.$rule))
             ->all();
 
         return [
@@ -192,7 +196,7 @@ protected function getNavUrls($nav)
         $prefixedRelativeUrls = $nav->sites()->map(function ($site) use ($rules) {
             return $rules
                 ->reject(fn (string $rule) => URL::isAbsolute($rule))
-                ->map(fn (string $rule) => URL::tidy(Site::get($site)->url().'/'.$rule, withTrailingSlash: false));
+                ->map(fn (string $rule) => URL::tidy(Site::get($site)->url().'/'.$rule));
         })->flatten()->all();
 
         return [
@@ -212,7 +216,7 @@ protected function getNavTreeUrls($tree)
 
         $prefixedRelativeUrls = $rules
             ->reject(fn (string $rule) => URL::isAbsolute($rule))
-            ->map(fn (string $rule) => URL::tidy($tree->site()->url().'/'.$rule, withTrailingSlash: false))
+            ->map(fn (string $rule) => URL::tidy($tree->site()->url().'/'.$rule))
             ->all();
 
         return [
@@ -232,7 +236,7 @@ protected function getGlobalUrls($variables)
 
         $prefixedRelativeUrls = $rules
             ->reject(fn (string $rule) => URL::isAbsolute($rule))
-            ->map(fn (string $rule) => URL::tidy($variables->site()->url().'/'.$rule, withTrailingSlash: false))
+            ->map(fn (string $rule) => URL::tidy($variables->site()->url().'/'.$rule))
             ->all();
 
         return [
@@ -252,7 +256,7 @@ protected function getCollectionUrls($collection)
         $prefixedRelativeUrls = $collection->sites()->map(function ($site) use ($rules) {
             return $rules
                 ->reject(fn (string $rule) => URL::isAbsolute($rule))
-                ->map(fn (string $rule) => URL::tidy(Site::get($site)->url().'/'.$rule, withTrailingSlash: false));
+                ->map(fn (string $rule) => URL::tidy(Site::get($site)->url().'/'.$rule));
         })->flatten()->all();
 
         return [
@@ -270,7 +274,7 @@ protected function getCollectionTreeUrls($tree)
 
         $prefixedRelativeUrls = $rules
             ->reject(fn (string $rule) => URL::isAbsolute($rule))
-            ->map(fn (string $rule) => URL::tidy($tree->site()->url().'/'.$rule, withTrailingSlash: false))
+            ->map(fn (string $rule) => URL::tidy($tree->site()->url().'/'.$rule))
             ->all();
 
         return [
diff --git a/src/StaticCaching/Invalidate.php b/src/StaticCaching/Invalidate.php
index 2bec6b433bf..488b3a3f0f0 100644
--- a/src/StaticCaching/Invalidate.php
+++ b/src/StaticCaching/Invalidate.php
@@ -8,6 +8,7 @@
 use Statamic\Events\BlueprintDeleted;
 use Statamic\Events\BlueprintSaved;
 use Statamic\Events\CollectionTreeDeleted;
+use Statamic\Events\CollectionTreeEntriesMovedOrRemoved;
 use Statamic\Events\CollectionTreeSaved;
 use Statamic\Events\EntryDeleting;
 use Statamic\Events\EntrySaved;
@@ -27,6 +28,7 @@
 class Invalidate implements ShouldQueue
 {
     protected $invalidator;
+    protected $cacher;
 
     protected $events = [
         AssetSaved::class => 'refreshAsset',
@@ -42,6 +44,7 @@ class Invalidate implements ShouldQueue
         NavDeleted::class => 'invalidateNav',
         FormSaved::class => 'refreshForm',
         FormDeleted::class => 'invalidateForm',
+        CollectionTreeEntriesMovedOrRemoved::class => 'invalidateMovedOrRemovedEntries',
         CollectionTreeSaved::class => 'invalidateCollectionByTree',
         CollectionTreeDeleted::class => 'invalidateCollectionByTree',
         NavTreeSaved::class => 'refreshNavByTree',
@@ -50,9 +53,10 @@ class Invalidate implements ShouldQueue
         BlueprintDeleted::class => 'invalidateByBlueprint',
     ];
 
-    public function __construct(Invalidator $invalidator)
+    public function __construct(Invalidator $invalidator, Cacher $cacher)
     {
         $this->invalidator = $invalidator;
+        $this->cacher = $cacher;
     }
 
     public function subscribe($dispatcher)
@@ -122,6 +126,13 @@ public function refreshForm($event)
         $this->invalidator->refresh($event->form);
     }
 
+    public function invalidateMovedOrRemovedEntries($event)
+    {
+        if ($urls = array_merge($event->removedUrls, $event->movedUrls)) {
+            $this->cacher->invalidateUrls($urls);
+        }
+    }
+
     public function invalidateCollectionByTree($event)
     {
         $this->invalidator->invalidate($event->tree);
diff --git a/src/StaticCaching/Middleware/Cache.php b/src/StaticCaching/Middleware/Cache.php
index bd1e753a688..9ed77fff1cb 100644
--- a/src/StaticCaching/Middleware/Cache.php
+++ b/src/StaticCaching/Middleware/Cache.php
@@ -23,6 +23,8 @@
 use Statamic\StaticCaching\Replacer;
 use Statamic\StaticCaching\ResponseStatus;
 
+use function Statamic\trans as __;
+
 class Cache
 {
     /**
@@ -77,6 +79,12 @@ private function handleRequest($request, Closure $next)
             return $response;
         }
 
+        // Capture the real nocache session URL before rendering. While handling an
+        // error, the shared-error flow (RendersHttpExceptions::getCachedError and
+        // copyError) repoints the singleton session at /__shared-errors/... so its
+        // regions can be restored when the same error is served for other URLs.
+        $nocacheUrl = $this->nocache->url();
+
         $response = $next($request);
 
         if ($this->shouldBeCached($request, $response)) {
@@ -86,6 +94,14 @@ private function handleRequest($request, Closure $next)
 
             $this->nocache->write();
 
+            // The page is also cached under its real URL, and a repeat request to
+            // that same URL restores the session by its real URL. If the shared-error
+            // flow repointed the session, persist it under the real URL too so that
+            // repeat request doesn't fall through to an uncached render.
+            if ($this->nocache->url() !== $nocacheUrl) {
+                $this->nocache->setUrl($nocacheUrl)->write();
+            }
+
             if ($paginator = Blink::get('tag-paginator')) {
                 if ($paginator->hasMorePages()) {
                     $response->headers->set('X-Statamic-Pagination', [
@@ -104,13 +120,15 @@ private function handleRequest($request, Closure $next)
 
     private function copyError($request, $response)
     {
-        $status = $response->getStatusCode();
+        if ($response->isSuccessful()) {
+            return;
+        }
 
         if (! config('statamic.static_caching.share_errors')) {
             return;
         }
 
-        $request = Request::createFrom($request)->fakeStaticCacheStatus($status);
+        $request = Request::createFrom($request)->fakeStaticCacheStatus($response->getStatusCode());
 
         if (! $this->cacher->hasCachedPage($request)) {
             $this->cacher->cachePage($request, $response);
@@ -239,7 +257,7 @@ private function createLock($request): Lock
             $store = AppCache::store('null');
         } else {
             $store = StaticCache::cacheStore();
-            $key .= '-'.$this->cacher->getUrl($request);
+            $key .= '-'.md5($this->cacher->getUrl($request));
         }
 
         return $store->lock($key, $this->lockFor);
diff --git a/src/StaticCaching/NoCache/DatabaseSession.php b/src/StaticCaching/NoCache/DatabaseSession.php
index c5b14b76851..b71189c9328 100644
--- a/src/StaticCaching/NoCache/DatabaseSession.php
+++ b/src/StaticCaching/NoCache/DatabaseSession.php
@@ -30,7 +30,17 @@ public function region(string $key): Region
             throw new RegionNotFound($key);
         }
 
-        return unserialize($region->region);
+        // Fall back to treating the value as a raw serialized string for rows
+        // written before base64 encoding was introduced. Strict base64_decode
+        // reliably detects legacy rows because any serialized PHP value always
+        // contains ":" or ";", neither of which are in the base64 alphabet.
+        $decoded = base64_decode($region->region, true);
+
+        if ($decoded === false) {
+            $decoded = $region->region;
+        }
+
+        return unserialize($decoded, ['allowed_classes' => true]);
     }
 
     protected function cacheRegion(Region $region)
@@ -39,7 +49,7 @@ protected function cacheRegion(Region $region)
             'key' => $region->key(),
         ], [
             'url' => md5($this->url),
-            'region' => serialize($region),
+            'region' => base64_encode(serialize($region)),
         ]);
     }
 }
diff --git a/src/StaticCaching/NoCache/Session.php b/src/StaticCaching/NoCache/Session.php
index 1b6bce0f3e0..2935e163d37 100644
--- a/src/StaticCaching/NoCache/Session.php
+++ b/src/StaticCaching/NoCache/Session.php
@@ -51,7 +51,13 @@ public function regions(): Collection
     public function region(string $key): Region
     {
         if ($this->regions->contains($key) && ($region = StaticCache::cacheStore()->get('nocache::region.'.$key))) {
-            return $region;
+            if ($region instanceof Region) {
+                return $region;
+            }
+
+            if (is_string($region)) {
+                return unserialize($region, ['allowed_classes' => true]);
+            }
         }
 
         throw new RegionNotFound($key);
@@ -150,6 +156,6 @@ protected function resolvePageAndPathForPagination(): void
 
     protected function cacheRegion(Region $region)
     {
-        StaticCache::cacheStore()->forever('nocache::region.'.$region->key(), $region);
+        StaticCache::cacheStore()->forever('nocache::region.'.$region->key(), serialize($region));
     }
 }
diff --git a/src/StaticCaching/ServiceProvider.php b/src/StaticCaching/ServiceProvider.php
index 3cb2726cc17..960a14ffec8 100644
--- a/src/StaticCaching/ServiceProvider.php
+++ b/src/StaticCaching/ServiceProvider.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
 use Illuminate\Support\Str;
 use Statamic\Facades\Cascade;
+use Statamic\Facades\Site;
 use Statamic\StaticCaching\NoCache\DatabaseSession;
 use Statamic\StaticCaching\NoCache\Session;
 
@@ -97,7 +98,10 @@ public function boot()
         });
 
         Request::macro('fakeStaticCacheStatus', function (int $status) {
-            $url = '/__shared-errors/'.$status;
+            // Namespace the shared error by the current site so that multisite
+            // installs serve a correctly localized error page per site, rather
+            // than whichever site happened to render the error first.
+            $url = '/__shared-errors/'.Site::current()->handle().'/'.$status;
             $this->pathInfo = $url;
             $this->requestUri = $url;
             app(Session::class)->setUrl($url);
diff --git a/src/StaticCaching/StaticCacheManager.php b/src/StaticCaching/StaticCacheManager.php
index 3d2879f79b7..1e2156c10d9 100644
--- a/src/StaticCaching/StaticCacheManager.php
+++ b/src/StaticCaching/StaticCacheManager.php
@@ -2,7 +2,6 @@
 
 namespace Statamic\StaticCaching;
 
-use Illuminate\Cache\Repository;
 use Illuminate\Support\Facades\Cache;
 use Statamic\Events\StaticCacheCleared;
 use Statamic\Facades\Site;
@@ -37,7 +36,7 @@ public function createFileDriver(array $config)
 
     public function createApplicationDriver(array $config)
     {
-        return new ApplicationCacher($this->app[Repository::class], $config);
+        return new ApplicationCacher($this->cacheStore(), $config);
     }
 
     public function cacheStore()
diff --git a/src/Structures/CollectionStructure.php b/src/Structures/CollectionStructure.php
index 1cc03b7adb5..acbeda44345 100644
--- a/src/Structures/CollectionStructure.php
+++ b/src/Structures/CollectionStructure.php
@@ -27,22 +27,15 @@ public function collection()
         });
     }
 
-    private function flattenedPages($entry)
-    {
-        return Blink::once('collection-structure-flattened-pages-collection'.$this->handle().'-'.$entry->locale(), function () use ($entry) {
-            return $this->in($entry->locale())->flattenedPages();
-        });
-    }
-
     public function entryUri($entry)
     {
         if (! $this->route($entry->locale())) {
             return null;
         }
 
-        $page = $this->flattenedPages($entry)
-            ->keyBy->reference()
-            ->get($entry->id());
+        $page = $this->in($entry->locale())->findByEntry($entry->id());
+
+        $page?->setEntry($entry);
 
         return optional($page)->uri();
     }
diff --git a/src/Structures/CollectionTree.php b/src/Structures/CollectionTree.php
index 6213dd3c5bb..4f5714d13cb 100644
--- a/src/Structures/CollectionTree.php
+++ b/src/Structures/CollectionTree.php
@@ -6,6 +6,7 @@
 use Statamic\Contracts\Structures\CollectionTree as TreeContract;
 use Statamic\Contracts\Structures\CollectionTreeRepository;
 use Statamic\Events\CollectionTreeDeleted;
+use Statamic\Events\CollectionTreeEntriesMovedOrRemoved;
 use Statamic\Events\CollectionTreeSaved;
 use Statamic\Events\CollectionTreeSaving;
 use Statamic\Facades\Blink;
@@ -48,7 +49,17 @@ protected function dispatchSavedEvent()
 
     protected function dispatchSavingEvent()
     {
-        return CollectionTreeSaving::dispatch($this);
+        if (CollectionTreeSaving::dispatch($this) === false) {
+            return false;
+        }
+
+        $diff = $this->diff();
+        $removed = $diff->removed();
+        $moved = $diff->ancestryChanged();
+
+        if ($removed || $moved) {
+            CollectionTreeEntriesMovedOrRemoved::dispatch($removed, $moved);
+        }
     }
 
     protected function dispatchDeletedEvent()
diff --git a/src/Structures/Nav.php b/src/Structures/Nav.php
index 03af6d5b315..ce901447c03 100644
--- a/src/Structures/Nav.php
+++ b/src/Structures/Nav.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Structures;
 
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Contracts\Structures\Nav as Contract;
 use Statamic\Contracts\Structures\NavTree;
 use Statamic\Contracts\Structures\NavTreeRepository;
@@ -21,7 +22,7 @@
 use Statamic\Facades\Stache;
 use Statamic\Support\Str;
 
-class Nav extends Structure implements Contract
+class Nav extends Structure implements ContainsQueryableValues, Contract
 {
     use ExistsAsFile;
 
@@ -200,4 +201,21 @@ public function collectionsQueryScopes($scopes = null)
             })
             ->args(func_get_args());
     }
+
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        return null;
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'blueprint', 'collections', 'editUrl', 'expectsRoot', 'handle', 'id',
+            'maxDepth', 'path', 'showUrl', 'sites', 'title', 'trees',
+        ];
+    }
 }
diff --git a/src/Structures/Page.php b/src/Structures/Page.php
index 20653ce0a61..207d3eeeead 100644
--- a/src/Structures/Page.php
+++ b/src/Structures/Page.php
@@ -13,6 +13,7 @@
 use Statamic\Contracts\Data\BulkAugmentable;
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Contracts\Routing\UrlBuilder;
 use Statamic\Contracts\Structures\Nav;
 use Statamic\Data\ContainsSupplementalData;
@@ -25,7 +26,7 @@
 use Statamic\GraphQL\ResolvesValues;
 use Statamic\Support\Str;
 
-class Page implements Arrayable, ArrayAccess, Augmentable, BulkAugmentable, Entry, JsonSerializable, Protectable, ResolvesValuesContract, Responsable
+class Page implements Arrayable, ArrayAccess, Augmentable, BulkAugmentable, ContainsQueryableValues, Entry, JsonSerializable, Protectable, ResolvesValuesContract, Responsable
 {
     use ContainsSupplementalData, ForwardsCalls, HasAugmentedInstance, ResolvesValues, TracksQueriedColumns;
 
@@ -138,10 +139,12 @@ public function setEntry($reference): self
         if (is_object($reference)) {
             throw_unless($id = $reference->id(), new \Exception('Cannot set an entry without an ID'));
             Blink::store('structure-entries')->put($id, $reference);
+            Blink::store('structure-uris')->forget($id);
             $reference = $id;
         }
 
         $this->reference = $reference;
+        $this->routeData = null;
 
         return $this;
     }
@@ -198,6 +201,11 @@ public function slug()
         return optional($this->entry())->slug();
     }
 
+    public function origin()
+    {
+        return optional($this->entry())->origin();
+    }
+
     public function uri()
     {
         if ($this->url) {
@@ -493,6 +501,24 @@ public function __call($method, $args)
         return $this->forwardCallTo($this->entry(), $method, $args);
     }
 
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        return $this->value($field);
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'absoluteUrl', 'blueprint', 'collection', 'depth', 'editUrl', 'id', 'isRedirect', 'isRoot',
+            'private', 'published', 'reference', 'route', 'site', 'slug', 'status', 'structure',
+            'title', 'uri', 'url', 'urlWithoutRedirect',
+        ];
+    }
+
     #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
diff --git a/src/Structures/Pages.php b/src/Structures/Pages.php
index f8528adce19..65c8bf96aea 100644
--- a/src/Structures/Pages.php
+++ b/src/Structures/Pages.php
@@ -92,7 +92,10 @@ public function flattenedPages()
 
         foreach ($this->all() as $page) {
             $flattened->push($page);
-            $flattened = $flattened->merge($page->flattenedPages());
+
+            foreach ($page->flattenedPages() as $descendant) {
+                $flattened->push($descendant);
+            }
         }
 
         return $flattened;
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 1cbd7e1270e..dc99bf279dd 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -3,6 +3,7 @@
 namespace Statamic\Structures;
 
 use Statamic\Contracts\Data\Localization;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Contracts\Structures\Tree as Contract;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasDirtyState;
@@ -10,9 +11,10 @@
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
 use Statamic\Support\Arr;
+use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
-abstract class Tree implements Contract, Localization
+abstract class Tree implements ContainsQueryableValues, Contract, Localization
 {
     use ExistsAsFile, FluentlyGetsAndSets, HasDirtyState;
 
@@ -20,6 +22,9 @@ abstract class Tree implements Contract, Localization
     protected $locale;
     protected $tree = [];
     protected $cachedFlattenedPages;
+    protected $cachedFlattenedPagesById;
+    protected $cachedFlattenedPagesByReference;
+    protected $cachedFlattenedPageOrder;
     protected $withEntries = false;
     protected $uriCacheEnabled = true;
 
@@ -50,9 +55,27 @@ public function tree($tree = null)
                     return $this->structure()->validateTree($tree, $this->locale());
                 });
             })
+            ->setter(function ($tree) {
+                return $this->removeNullItems($tree);
+            })
             ->args(func_get_args());
     }
 
+    protected function removeNullItems($tree)
+    {
+        return collect($tree)
+            ->reject(fn ($item) => is_null($item))
+            ->map(function ($item) {
+                if (isset($item['children'])) {
+                    $item['children'] = $this->removeNullItems($item['children']);
+                }
+
+                return $item;
+            })
+            ->values()
+            ->all();
+    }
+
     public function root()
     {
         if (! $this->structure()->expectsRoot()) {
@@ -141,17 +164,17 @@ public function uriCacheEnabled()
 
     public function find($id): ?Page
     {
-        return $this->flattenedPages()
-            ->keyBy->id()
-            ->get($id);
+        return ($this->cachedFlattenedPagesById ??= $this->flattenedPages()->keyBy->id())->get($id);
     }
 
     public function findByEntry($id)
     {
-        return $this->flattenedPages()
-            ->filter->reference()
-            ->keyBy->reference()
-            ->get($id);
+        return ($this->cachedFlattenedPagesByReference ??= $this->flattenedPages()->filter->reference()->keyBy->reference())->get($id);
+    }
+
+    public function entryOrder($reference)
+    {
+        return ($this->cachedFlattenedPageOrder ??= $this->flattenedPages()->map->reference()->flip())->get($reference);
     }
 
     public function save()
@@ -161,8 +184,10 @@ public function save()
         }
 
         $this->cachedFlattenedPages = null;
+        $this->cachedFlattenedPagesById = null;
+        $this->cachedFlattenedPagesByReference = null;
+        $this->cachedFlattenedPageOrder = null;
 
-        Blink::forget('collection-structure-flattened-pages-collection*');
         Blink::forget('collection-structure-tree*');
 
         $this->repository()->save($this);
@@ -388,6 +413,22 @@ public function withEntries()
         return $this;
     }
 
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        return null;
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'editUrl', 'handle', 'locale', 'path', 'route', 'showUrl', 'site',
+        ];
+    }
+
     public function getCurrentDirtyStateAttributes(): array
     {
         return [
diff --git a/src/Support/Arr.php b/src/Support/Arr.php
index e522ee19639..664a4a39868 100644
--- a/src/Support/Arr.php
+++ b/src/Support/Arr.php
@@ -308,7 +308,7 @@ public static function pull(&$array, $key, $default = null)
      */
     public static function forget(&$array, $keys)
     {
-        return IlluminateArr::forget($array, $keys);
+        IlluminateArr::forget($array, $keys);
     }
 
     /**
diff --git a/src/Support/DateFormat.php b/src/Support/DateFormat.php
index fe2b047e869..feb74020be7 100644
--- a/src/Support/DateFormat.php
+++ b/src/Support/DateFormat.php
@@ -6,6 +6,6 @@ class DateFormat
 {
     public static function containsTime($format)
     {
-        return Str::contains($format, ['G', 'g', 'H', 'h', 'U', 'c', 'r']);
+        return Str::contains($format, ['a', 'A', 'B', 'g', 'G', 'h', 'H', 'i', 's', 'u', 'v', 'U', 'c', 'r']);
     }
 }
diff --git a/src/Support/FileCollection.php b/src/Support/FileCollection.php
index 5c6378b4036..389ce194253 100644
--- a/src/Support/FileCollection.php
+++ b/src/Support/FileCollection.php
@@ -10,6 +10,9 @@
 use Symfony\Component\Finder\Comparator\DateComparator;
 use Symfony\Component\Finder\Comparator\NumberComparator;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class FileCollection extends Collection
 {
     /**
diff --git a/src/Support/MethodDenylist.php b/src/Support/MethodDenylist.php
new file mode 100644
index 00000000000..7eab3d39f5b
--- /dev/null
+++ b/src/Support/MethodDenylist.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Statamic\Support;
+
+class MethodDenylist
+{
+    private const METHODS = [
+        'delete', 'deleteFile', 'deleteQuietly',
+        'destroy', 'forceDelete', 'save', 'saveQuietly',
+        'truncate', 'update', 'updateQuietly', 'write', 'writeFile',
+    ];
+
+    public static function blocks(string $method): bool
+    {
+        return in_array(strtolower($method), array_map('strtolower', self::METHODS), true);
+    }
+}
diff --git a/src/Support/Str.php b/src/Support/Str.php
index f67b59e010b..41cada193cf 100644
--- a/src/Support/Str.php
+++ b/src/Support/Str.php
@@ -8,6 +8,8 @@
 use Stringy\StaticStringy;
 use voku\helper\ASCII;
 
+use function Statamic\trans;
+
 /** @mixin \Illuminate\Support\Str */
 class Str
 {
@@ -151,6 +153,7 @@ public static function fileSizeForHumans($bytes, $decimals = 2)
 
     public static function durationForHumans($s)
     {
+        $s = (int) round($s);
         $hours = floor($s / 3600);
         $mins = floor(($s % 3600) / 60);
         $secs = $s % 60;
diff --git a/src/Support/Svg.php b/src/Support/Svg.php
index 5c22285ae51..56e1d334ba9 100644
--- a/src/Support/Svg.php
+++ b/src/Support/Svg.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Support;
 
+use Rhukster\DomSanitizer\DOMSanitizer;
 use Stringy\StaticStringy;
 
 class Svg
@@ -14,4 +15,47 @@ public static function withClasses(string $svg, ?string $classes = null): string
 
         return str_replace('<svg', sprintf('<svg%s', $attrs), $svg);
     }
+
+    public static function sanitize(string $svg, ?DOMSanitizer $sanitizer = null): string
+    {
+        $sanitizer = $sanitizer ?? new DOMSanitizer(DOMSanitizer::SVG);
+
+        $svg = static::sanitizeStyleTags($svg);
+
+        return $sanitizer->sanitize($svg, [
+            'remove-xml-tags' => ! Str::startsWith($svg, '<?xml'),
+        ]);
+    }
+
+    public static function sanitizeCss(string $css): string
+    {
+        // Decode all CSS escape sequences in a single pass to prevent bypass.
+        // Hex escapes: \69mport -> import. Non-hex escapes: \i -> i, \@ -> @.
+        $css = preg_replace_callback(
+            '/\\\\(?:([0-9a-fA-F]{1,6})\s?|(.))/s',
+            fn ($m) => ($m[1] !== '') ? mb_chr(hexdec($m[1]), 'UTF-8') : $m[2],
+            $css
+        );
+
+        // Normalize Unicode whitespace and invisible characters to ASCII spaces
+        // so they can't be used to sneak past the regex patterns below
+        $css = preg_replace('/[\p{Z}\x{200B}\x{FEFF}]+/u', ' ', $css);
+
+        // Remove @import rules entirely
+        $css = preg_replace('/@import\s+[^;]+;?/i', '', $css);
+
+        // Neutralize url() references to external resources (http, https, protocol-relative)
+        $css = preg_replace('/url\s*\(\s*["\']?\s*(?:https?:|\/\/)[^)]*\)/i', 'url()', $css);
+
+        return $css;
+    }
+
+    private static function sanitizeStyleTags(string $svg): string
+    {
+        return preg_replace_callback(
+            '/<style([^>]*)>(.*?)<\/style>/si',
+            fn ($matches) => '<style'.$matches[1].'>'.static::sanitizeCss($matches[2]).'</style>',
+            $svg
+        );
+    }
 }
diff --git a/src/Tags/Assets.php b/src/Tags/Assets.php
index 5789415d394..e3c1d818f07 100644
--- a/src/Tags/Assets.php
+++ b/src/Tags/Assets.php
@@ -2,16 +2,22 @@
 
 namespace Statamic\Tags;
 
+use Statamic\Assets\Asset as AssetModel;
 use Statamic\Assets\AssetCollection;
 use Statamic\Contracts\Query\Builder;
 use Statamic\Facades\Asset;
 use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Entry;
+use Statamic\Facades\Pattern;
 use Statamic\Fields\Value;
 use Statamic\Support\Arr;
 
 class Assets extends Tags
 {
+    use Concerns\QueriesConditions,
+        Concerns\QueriesOrderBys,
+        Concerns\QueriesScopes;
+
     /**
      * @var AssetCollection
      */
@@ -40,7 +46,7 @@ public function wildcard($method)
 
             $this->assets = (new AssetCollection([$value]))->flatten();
 
-            return $this->output();
+            return $this->outputCollection($this->assets);
         }
 
         if ($value instanceof Value) {
@@ -66,15 +72,17 @@ public function index()
         $path = $this->params->get('path');
         $collection = $this->params->get('collection');
 
-        $this->assets = $collection
-            ? $this->assetsFromCollection($collection)
-            : $this->assetsFromContainer($id, $path);
+        if ($collection) {
+            return $this->outputCollection($this->assetsFromCollection($collection));
+        }
+
+        $this->assets = $this->assetsFromContainer($id, $path);
 
         if ($this->assets->isEmpty()) {
             return $this->parseNoResults();
         }
 
-        return $this->output();
+        return $this->assets;
     }
 
     protected function assetsFromContainer($id, $path)
@@ -95,9 +103,29 @@ protected function assetsFromContainer($id, $path)
             return collect();
         }
 
-        $assets = $container->assets($this->params->get('folder'), $this->params->get('recursive', false));
+        $query = $container->queryAssets();
+
+        $this->queryFolder($query);
+        $this->queryType($query);
+        $this->queryConditions($query);
+        $this->queryScopes($query);
+        $this->queryOrderBys($query);
+
+        if ($this->params->get('not_in')) {
+            $assets = $this->filterNotIn($query->get());
+
+            return $this->limitCollection($assets);
+        }
+
+        if ($limit = $this->params->int('limit')) {
+            $query->limit($limit);
+        }
 
-        return $this->filterByType($assets);
+        if ($offset = $this->params->int('offset')) {
+            $query->offset($offset);
+        }
+
+        return $query->get();
     }
 
     protected function assetsFromCollection($collection)
@@ -143,6 +171,10 @@ protected function filterByType($value)
         }
 
         return $value->filter(function ($value) use ($type) {
+            if ($type === 'audio') {
+                return $value->isAudio();
+            }
+
             if ($type === 'image') {
                 return $value->isImage();
             }
@@ -161,18 +193,17 @@ protected function filterByType($value)
 
     /**
      * Filter out assets from a requested folder.
-     *
-     * @return void
      */
-    private function filterNotIn()
+    private function filterNotIn($assets)
     {
-        if ($not_in = $this->params->get('not_in')) {
-            $regex = '#^('.$not_in.')#';
-
-            $this->assets = $this->assets->reject(function ($path) use ($regex) {
-                return preg_match($regex, $path);
-            });
+        if (! $not_in = $this->params->get('not_in')) {
+            return $assets;
         }
+
+        $regex = '#^('.$not_in.')#';
+
+        // Checking against path for backwards compatibility. Technically folder would be more correct.
+        return $assets->reject(fn ($asset) => preg_match($regex, $asset->path()));
     }
 
     /**
@@ -204,36 +235,74 @@ protected function assets($urls)
             ];
         });
 
-        return $this->output();
+        return $this->outputCollection($this->assets);
     }
 
-    private function output()
+    private function outputCollection($assets)
     {
-        $this->filterNotIn();
+        $this->assets = $this->filterNotIn($assets);
 
-        $this->sort();
-        $this->limit();
+        if ($sort = $this->params->get('sort')) {
+            $this->assets = $this->assets->multisort($sort);
+        }
+
+        $this->assets = $this->limitCollection($this->assets);
+
+        if ($this->assets->isEmpty()) {
+            return $this->parseNoResults();
+        }
 
         return $this->assets;
     }
 
-    private function sort()
+    private function limitCollection($assets)
     {
-        if ($sort = $this->params->get('sort')) {
-            $this->assets = $this->assets->multisort($sort);
+        $limit = $this->params->int('limit');
+        $limit = ($limit == 0) ? $assets->count() : $limit;
+        $offset = $this->params->int('offset');
+
+        return $assets->splice($offset, $limit);
+    }
+
+    protected function queryType($query)
+    {
+        $type = $this->params->get('type');
+
+        if (! $type) {
+            return;
         }
+
+        $extensions = match ($type) {
+            'audio' => AssetModel::AUDIO_EXTENSIONS,
+            'image' => AssetModel::IMAGE_EXTENSIONS,
+            'svg' => ['svg'],
+            'video' => AssetModel::VIDEO_EXTENSIONS,
+            default => [],
+        };
+
+        $query->whereIn('extension', $extensions);
     }
 
-    /**
-     * Limit and offset the asset collection.
-     */
-    private function limit()
+    protected function queryFolder($query)
     {
-        $limit = $this->params->int('limit');
-        $limit = ($limit == 0) ? $this->assets->count() : $limit;
-        $offset = $this->params->int('offset');
+        $folder = $this->params->get('folder');
+        $recursive = $this->params->get('recursive', false);
+
+        if ($folder === '/' && $recursive) {
+            $folder = null;
+        }
+
+        if ($folder === null) {
+            return;
+        }
+
+        if ($recursive) {
+            $query->where('path', 'like', Pattern::sqlLikeQuote($folder).'/%');
+
+            return;
+        }
 
-        $this->assets = $this->assets->splice($offset, $limit);
+        $query->where('folder', $folder);
     }
 
     private function isAssetsFieldValue($value)
diff --git a/src/Tags/ComponentProxy.php b/src/Tags/ComponentProxy.php
index 4152a4b735b..5a18593cc87 100644
--- a/src/Tags/ComponentProxy.php
+++ b/src/Tags/ComponentProxy.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Tags;
 
+use Illuminate\Support\Str;
 use Illuminate\View\AnonymousComponent;
 use Illuminate\View\Compilers\BladeCompiler;
 use Illuminate\View\Compilers\ComponentTagCompiler;
@@ -51,12 +52,22 @@ public function index()
             }
 
             if ($constructor = (new ReflectionClass($className))->getConstructor()) {
-                $constructorParameters = collect($constructor->getParameters())->map->getName()->all();
-                $attributes = $attributes->except($constructorParameters);
-                $constructorParameters = collect($scopeData)->only($constructorParameters)->all();
+                $parameterNames = collect($constructor->getParameters())->map->getName()->all();
+
+                // Kebab-cased attributes (e.g. :some-prop) should bind to camelCase
+                // constructor parameters ($someProp), mirroring Laravel's native behavior.
+                $attributes = $attributes->filter(fn ($value, $key) => ! in_array(Str::camel($key), $parameterNames));
+
+                $constructorParameters = collect($scopeData)
+                    ->mapWithKeys(fn ($value, $key) => [Str::camel($key) => $value])
+                    ->only($parameterNames)
+                    ->all();
             }
 
             if ($isAnonymous) {
+                // Camel-case data keys so kebab-cased attributes resolve to the
+                // component's @props (e.g. :some-prop -> $someProp), as Laravel does.
+                $data = collect($data)->mapWithKeys(fn ($value, $key) => [Str::camel($key) => $value])->all();
                 $constructorParameters = array_merge($constructorParameters, $data, ['view' => $anonymousViewName, 'data' => $data]);
             }
 
diff --git a/src/Tags/Concerns/QueriesOrderBys.php b/src/Tags/Concerns/QueriesOrderBys.php
index 62cf8dd9f6c..96ca552d6be 100644
--- a/src/Tags/Concerns/QueriesOrderBys.php
+++ b/src/Tags/Concerns/QueriesOrderBys.php
@@ -32,7 +32,7 @@ protected function parseOrderBys()
 
         return collect(explode('|', $piped ?? ''))->filter()->map(function ($orderBy) {
             return OrderBy::parse($orderBy);
-        });
+        })->filter(fn ($orderBy) => OrderBy::column($orderBy->sort));
     }
 
     protected function preParsedOrderBys()
diff --git a/src/Tags/Installed.php b/src/Tags/Installed.php
index 242898c1b3f..8c403214a4d 100644
--- a/src/Tags/Installed.php
+++ b/src/Tags/Installed.php
@@ -6,6 +6,20 @@
 
 class Installed extends Tags
 {
+    /**
+     * Check if composer package is installed via {{ installed package="vendor/package" }}.
+     *
+     * @return string|void
+     */
+    public function index()
+    {
+        if (! $package = $this->params->get('package')) {
+            return;
+        }
+
+        return $this->installed($package);
+    }
+
     /**
      * Check if composer package is installed via {{ installed:* }}.
      *
@@ -13,6 +27,11 @@ class Installed extends Tags
      * @return string|void
      */
     public function wildcard($package)
+    {
+        return $this->installed($package);
+    }
+
+    protected function installed($package)
     {
         $installed = Composer::isInstalled($package);
 
diff --git a/src/Tags/Parameters.php b/src/Tags/Parameters.php
index 6509db0b3d3..3efc7ea7345 100644
--- a/src/Tags/Parameters.php
+++ b/src/Tags/Parameters.php
@@ -8,8 +8,10 @@
 
 class Parameters extends ArrayAccessor
 {
-    public static function make($items = [], $context = null)
+    public static function make($items = [], ...$args)
     {
+        $context = $args[0] ?? null;
+
         if (! $context) {
             throw new \InvalidArgumentException('A Context object is expected.');
         }
diff --git a/src/Tags/Svg.php b/src/Tags/Svg.php
index 5bf511455ec..78300c4e70d 100644
--- a/src/Tags/Svg.php
+++ b/src/Tags/Svg.php
@@ -6,6 +6,7 @@
 use Statamic\Facades\File;
 use Statamic\Facades\Path;
 use Statamic\Support\Str;
+use Statamic\Support\Svg as SvgSupport;
 use Stringy\StaticStringy;
 
 class Svg extends Tags
@@ -105,9 +106,7 @@ private function sanitize($svg)
         $this->setAllowedAttrs($sanitizer);
         $this->setAllowedTags($sanitizer);
 
-        return $sanitizer->sanitize($svg, [
-            'remove-xml-tags' => ! Str::startsWith($svg, '<?xml'),
-        ]);
+        return SvgSupport::sanitize($svg, $sanitizer);
     }
 
     private function setAllowedAttrs(DOMSanitizer $sanitizer)
diff --git a/src/Tags/Tags.php b/src/Tags/Tags.php
index 0dc2303da29..de71784ea4a 100644
--- a/src/Tags/Tags.php
+++ b/src/Tags/Tags.php
@@ -23,7 +23,7 @@ abstract class Tags
     /**
      * The content written between the tags (when a tag pair).
      *
-     * @public string
+     * @var string
      */
     public $content;
 
@@ -32,14 +32,14 @@ abstract class Tags
     /**
      * The variable context around which this tag is positioned.
      *
-     * @public array
+     * @var Context
      */
     public $context;
 
     /**
      * The parameters used on this tag.
      *
-     * @public array
+     * @var Parameters
      */
     public $params;
 
@@ -73,7 +73,7 @@ abstract class Tags
     /**
      * The parser instance that executed this tag.
      *
-     * @var \Statamic\View\Antlers\Parser
+     * @var \Statamic\Contracts\View\Antlers\Parser
      */
     public $parser;
 
diff --git a/src/Tags/Trans.php b/src/Tags/Trans.php
index 0738e7b2063..32e94bceb86 100644
--- a/src/Tags/Trans.php
+++ b/src/Tags/Trans.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\Tags;
 
+use function Statamic\trans as __;
+
 class Trans extends Tags
 {
     /**
diff --git a/src/Tags/TransChoice.php b/src/Tags/TransChoice.php
index 8655bb70944..04f54fad098 100644
--- a/src/Tags/TransChoice.php
+++ b/src/Tags/TransChoice.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\Tags;
 
+use function Statamic\trans_choice;
+
 class TransChoice extends Tags
 {
     /**
diff --git a/src/Taxonomies/LocalizedTerm.php b/src/Taxonomies/LocalizedTerm.php
index e545547495b..ccc033ae6d6 100644
--- a/src/Taxonomies/LocalizedTerm.php
+++ b/src/Taxonomies/LocalizedTerm.php
@@ -485,7 +485,7 @@ public function repository()
 
     public function getQueryableValue(string $field)
     {
-        if (method_exists($this, $method = Str::camel($field))) {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
             return $this->{$method}();
         }
 
@@ -498,6 +498,16 @@ public function getQueryableValue(string $field)
         return $field->fieldtype()->toQueryableValue($value);
     }
 
+    private function queryableMethods(): array
+    {
+        return [
+            'absoluteUrl', 'apiUrl', 'blueprint', 'editUrl', 'entriesCount', 'hasOrigin', 'id', 'isRedirect',
+            'isRoot', 'lastModified', 'lastModifiedBy', 'layout', 'locale', 'path', 'private', 'published',
+            'redirectUrl', 'reference', 'site', 'slug', 'status', 'taxonomy', 'taxonomyHandle', 'template', 'title',
+            'uri', 'url', 'urlWithoutRedirect', 'values',
+        ];
+    }
+
     public function getCpSearchResultBadge()
     {
         return $this->taxonomy()->title();
diff --git a/src/Taxonomies/Taxonomy.php b/src/Taxonomies/Taxonomy.php
index 05ce3b2a8aa..40957d48c73 100644
--- a/src/Taxonomies/Taxonomy.php
+++ b/src/Taxonomies/Taxonomy.php
@@ -6,6 +6,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Responsable;
 use Statamic\Contracts\Data\Augmentable as AugmentableContract;
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Contracts\Taxonomies\Taxonomy as Contract;
 use Statamic\Data\ContainsCascadingData;
 use Statamic\Data\ContainsSupplementalData;
@@ -27,12 +28,13 @@
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Facades\URL;
+use Statamic\Support\Arr;
 use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
 use function Statamic\trans as __;
 
-class Taxonomy implements Arrayable, ArrayAccess, AugmentableContract, Contract, Responsable
+class Taxonomy implements Arrayable, ArrayAccess, AugmentableContract, ContainsQueryableValues, Contract, Responsable
 {
     use ContainsCascadingData, ContainsSupplementalData, ExistsAsFile, FluentlyGetsAndSets, HasAugmentedData;
 
@@ -43,6 +45,8 @@ class Taxonomy implements Arrayable, ArrayAccess, AugmentableContract, Contract,
     protected $collection;
     protected $defaultPublishState = true;
     protected $searchIndex;
+    protected $sortField;
+    protected $sortDirection;
     protected $previewTargets = [];
     protected $template;
     protected $termTemplate;
@@ -178,12 +182,26 @@ public function hasVisibleTermBlueprint()
 
     public function sortField()
     {
-        return 'title'; // todo
+        return $this->sortField ?? 'title';
+    }
+
+    public function setSortField($field)
+    {
+        $this->sortField = $field;
+
+        return $this;
     }
 
     public function sortDirection()
     {
-        return 'asc'; // todo
+        return $this->sortDirection ?? 'asc';
+    }
+
+    public function setSortDirection($dir)
+    {
+        $this->sortDirection = $dir;
+
+        return $this;
     }
 
     public function queryTerms()
@@ -289,6 +307,11 @@ public function fileData()
             'layout' => $this->layout,
         ];
 
+        $data = Arr::removeNullValues(array_merge($data, [
+            'sort_by' => $this->sortField,
+            'sort_dir' => $this->sortDirection,
+        ]));
+
         if (Site::multiEnabled()) {
             $data['sites'] = $this->sites;
         }
@@ -442,7 +465,7 @@ public function layout($layout = null)
 
     public function createLabel()
     {
-        $key = "statamic::messages.{$this->handle()}_taxonomy_create_term";
+        $key = "messages.{$this->handle()}_taxonomy_create_term";
 
         $translation = __($key);
 
@@ -577,4 +600,22 @@ public function termBlueprintCommandPaletteLinks()
                 url: $this->editBlueprintUrl($blueprint),
             ));
     }
+
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        return $this->get($field);
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'absoluteUrl', 'collection', 'collections', 'defaultPublishState', 'editUrl', 'handle',
+            'hasSearchIndex', 'id', 'layout', 'path', 'revisionsEnabled', 'searchIndex', 'sites',
+            'sortDirection', 'sortField', 'template', 'termTemplate', 'title', 'uri', 'url',
+        ];
+    }
 }
diff --git a/src/Taxonomies/Term.php b/src/Taxonomies/Term.php
index 800261b1477..61a265f151e 100644
--- a/src/Taxonomies/Term.php
+++ b/src/Taxonomies/Term.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Taxonomies;
 
+use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Contracts\Taxonomies\Term as TermContract;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasDirtyState;
@@ -20,7 +21,7 @@
 use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
-class Term implements TermContract
+class Term implements ContainsQueryableValues, TermContract
 {
     use ExistsAsFile, FluentlyGetsAndSets, HasDirtyState;
 
@@ -302,6 +303,23 @@ public function set($key, $value)
         return $this;
     }
 
+    public function getQueryableValue(string $field)
+    {
+        if (in_array($method = Str::camel($field), $this->queryableMethods())) {
+            return $this->{$method}();
+        }
+
+        return $this->inDefaultLocale()->getQueryableValue($field);
+    }
+
+    private function queryableMethods(): array
+    {
+        return [
+            'blueprint', 'collection', 'entriesCount', 'id', 'path', 'reference',
+            'slug', 'taxonomy', 'taxonomyHandle', 'title',
+        ];
+    }
+
     public function getCurrentDirtyStateAttributes(): array
     {
         return array_merge([
diff --git a/src/Taxonomies/TermTracker.php b/src/Taxonomies/TermTracker.php
deleted file mode 100644
index dda688c1771..00000000000
--- a/src/Taxonomies/TermTracker.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Statamic\Taxonomies;
-
-use Statamic\Contracts\Taxonomies\Taxonomy as TaxonomyContract;
-use Statamic\Events\Stache\RepositoryItemInserted;
-use Statamic\Events\Stache\RepositoryItemRemoved;
-use Statamic\Facades\Taxonomy;
-use Statamic\Stache\Stache;
-use Statamic\Stache\Staches\TaxonomyStache;
-
-class TermTracker
-{
-    /**
-     * @var Stache
-     */
-    private $stache;
-    /**
-     * @var TaxonomyStache
-     */
-    private $taxonomyStache;
-
-    public function __construct(Stache $stache)
-    {
-        $this->stache = $stache;
-        $this->taxonomyStache = $stache->taxonomies;
-    }
-
-    /**
-     * Register the listeners for the subscriber.
-     *
-     * @param  \Illuminate\Events\Dispatcher  $events
-     */
-    public function subscribe($events)
-    {
-        $events->listen(RepositoryItemInserted::class, self::class.'@insert');
-        $events->listen(RepositoryItemRemoved::class, self::class.'@remove');
-    }
-
-    public function insert(RepositoryItemInserted $event)
-    {
-        if ($event->item instanceof TaxonomyContract) {
-            $this->updateLocalizedTermUris($event->item);
-
-            return;
-        }
-
-        if (! method_exists($event->item, 'isTaxonomizable') || ! $event->item->isTaxonomizable()) {
-            return;
-        }
-
-        Taxonomy::all()->each(function ($taxonomy, $handle) use ($event) {
-            if ($event->item->has($handle)) {
-                try {
-                    $this->addTerms($handle, $event->item);
-                } catch (\Exception $e) {
-                    \Log::debug('There was a problem adding taxonomy terms to data with ID '.$event->item->id());
-                    \Log::debug($e->getMessage().PHP_EOL.$e->getTraceAsString());
-                }
-            }
-        });
-    }
-
-    private function addTerms($taxonomy, $item)
-    {
-        // Don't do anything if there aren't any terms.
-        if (! $values = $item->get($taxonomy)) {
-            return;
-        }
-
-        $this->taxonomyStache->syncAssociations(
-            $item->id(),
-            $taxonomy,
-            (array) $item->get($taxonomy)
-        );
-    }
-
-    private function updateLocalizedTermUris($taxonomy)
-    {
-        $terms = [];
-
-        $this->taxonomyStache->clearLocalizedUris();
-
-        // Collect all the terms that have had their slugs localized.
-        foreach ($taxonomy->get('slugs', []) as $locale => $slugs) {
-            foreach ((array) $slugs as $slug => $localizedSlug) {
-                $terms[] = $slug;
-            }
-        }
-
-        // Now that we have the terms (not concerned with the locales
-        // now) we can let the Stache sort out the respective URIs.
-        foreach (collect($terms)->unique() as $term) {
-            $this->taxonomyStache->addUris($taxonomy->basename(), $term);
-        }
-    }
-
-    public function remove(RepositoryItemRemoved $event)
-    {
-        $this->taxonomyStache->removeData($event->id);
-    }
-}
diff --git a/src/Tokens/FileTokenRepository.php b/src/Tokens/FileTokenRepository.php
index 044112fba8f..7b19622d931 100644
--- a/src/Tokens/FileTokenRepository.php
+++ b/src/Tokens/FileTokenRepository.php
@@ -11,11 +11,19 @@ class FileTokenRepository extends TokenRepository
 {
     public function make(?string $token, string $handler, array $data = []): TokenContract
     {
+        if ($token && ! $this->isValidTokenName($token)) {
+            throw new \InvalidArgumentException("Invalid token name [{$token}].");
+        }
+
         return app()->makeWith(TokenContract::class, compact('token', 'handler', 'data'));
     }
 
     public function find(string $token): ?TokenContract
     {
+        if (! $this->isValidTokenName($token)) {
+            return null;
+        }
+
         $path = storage_path('statamic/tokens/'.$token.'.yaml');
 
         if (! File::exists($path)) {
@@ -55,6 +63,11 @@ public function collectGarbage(): void
             ->each->delete();
     }
 
+    private function isValidTokenName(string $token): bool
+    {
+        return (bool) preg_match('/^[A-Za-z0-9_-]+\z/', $token);
+    }
+
     private function makeFromPath(string $path): FileToken
     {
         $yaml = YAML::file($path)->parse();
diff --git a/src/UpdateScripts/UpdateGlobalVariables.php b/src/UpdateScripts/UpdateGlobalVariables.php
index 414261c2bc5..8fe0755f904 100644
--- a/src/UpdateScripts/UpdateGlobalVariables.php
+++ b/src/UpdateScripts/UpdateGlobalVariables.php
@@ -76,7 +76,7 @@ private function migrateFileStructure(): void
 
             $globalSet->save();
 
-            File::put($variablesPath, YAML::dump($data));
+            $globalSet->inDefaultSite()->data($data)->saveQuietly();
         });
     }
 }
diff --git a/src/Updater/AddonChangelog.php b/src/Updater/AddonChangelog.php
index c5578c7a870..e522b82d755 100644
--- a/src/Updater/AddonChangelog.php
+++ b/src/Updater/AddonChangelog.php
@@ -23,6 +23,6 @@ public function currentVersion()
 
     protected function isLicensed($version)
     {
-        return version_compare($version, $this->addon->license()->versionLimit() ?? 999999, '<');
+        return version_compare($version, $this->addon->license()?->versionLimit() ?? 999999, '<');
     }
 }
diff --git a/src/View/Antlers/Language/Errors/AntlersErrorCodes.php b/src/View/Antlers/Language/Errors/AntlersErrorCodes.php
index 77b41a6b8c0..ea92b3e33e0 100644
--- a/src/View/Antlers/Language/Errors/AntlersErrorCodes.php
+++ b/src/View/Antlers/Language/Errors/AntlersErrorCodes.php
@@ -133,4 +133,5 @@ class AntlersErrorCodes
     const TYPE_UNEXPECTED_EOI_PARSING_SHORTHAND_PARAMETER = 'ANTLR_133';
     const TYPE_DIRECTIVE_MISSING_ARGUMENTS = 'ANTLR_134';
     const RUNTIME_METHOD_CALL_USER_CONTENT = 'ANTLR_135';
+    const TYPE_MIXED_MODIFIER_STYLES = 'ANTLR_136';
 }
diff --git a/src/View/Antlers/Language/Lexer/AntlersLexer.php b/src/View/Antlers/Language/Lexer/AntlersLexer.php
index e45b2b84231..167092cba0a 100644
--- a/src/View/Antlers/Language/Lexer/AntlersLexer.php
+++ b/src/View/Antlers/Language/Lexer/AntlersLexer.php
@@ -1084,6 +1084,26 @@ public function tokenize(AntlersNode $node, $input)
                     continue;
                 }
 
+                // Must come before the ?? and ? checks below so ??? isn't
+                // misread as ?? followed by ?.
+                if ($this->cur == DocumentParser::Punctuation_Question
+                    && $this->next == DocumentParser::Punctuation_Question
+                    && ($this->currentIndex + 2) < $this->inputLen
+                    && $this->chars[$this->currentIndex + 2] == DocumentParser::Punctuation_Question) {
+                    // ???
+                    $strictNullCoalesceOperator = new NullCoalesceOperator();
+                    $strictNullCoalesceOperator->content = '???';
+                    $strictNullCoalesceOperator->strict = true;
+                    $strictNullCoalesceOperator->startPosition = $node->lexerRelativeOffset($this->currentIndex);
+                    $strictNullCoalesceOperator->endPosition = $node->lexerRelativeOffset($this->currentIndex + 3);
+
+                    $this->runtimeNodes[] = $strictNullCoalesceOperator;
+                    $this->lastNode = $strictNullCoalesceOperator;
+                    $this->currentIndex += 2;
+
+                    continue;
+                }
+
                 if ($this->cur == DocumentParser::Punctuation_Question && $this->next == DocumentParser::Punctuation_Question) {
                     // ??
                     $nullCoalesceOperator = new NullCoalesceOperator();
diff --git a/src/View/Antlers/Language/Nodes/Operators/NullCoalesceOperator.php b/src/View/Antlers/Language/Nodes/Operators/NullCoalesceOperator.php
index dd5de57c57b..d786b45e684 100644
--- a/src/View/Antlers/Language/Nodes/Operators/NullCoalesceOperator.php
+++ b/src/View/Antlers/Language/Nodes/Operators/NullCoalesceOperator.php
@@ -7,4 +7,5 @@
 
 class NullCoalesceOperator extends AbstractNode implements OperatorNodeContract
 {
+    public bool $strict = false;
 }
diff --git a/src/View/Antlers/Language/Nodes/Structures/NullCoalescenceGroup.php b/src/View/Antlers/Language/Nodes/Structures/NullCoalescenceGroup.php
index b55f128a7c8..9de9215e7fa 100644
--- a/src/View/Antlers/Language/Nodes/Structures/NullCoalescenceGroup.php
+++ b/src/View/Antlers/Language/Nodes/Structures/NullCoalescenceGroup.php
@@ -15,4 +15,6 @@ class NullCoalescenceGroup extends AbstractNode
      * @var AbstractNode|null
      */
     public $right = null;
+
+    public bool $strict = false;
 }
diff --git a/src/View/Antlers/Language/Parser/AntlersNodeParser.php b/src/View/Antlers/Language/Parser/AntlersNodeParser.php
index 3addbb5cdf4..85f63c695e7 100644
--- a/src/View/Antlers/Language/Parser/AntlersNodeParser.php
+++ b/src/View/Antlers/Language/Parser/AntlersNodeParser.php
@@ -15,6 +15,7 @@
 use Statamic\View\Antlers\Language\Nodes\DirectiveNode;
 use Statamic\View\Antlers\Language\Nodes\Parameters\ParameterNode;
 use Statamic\View\Antlers\Language\Nodes\RecursiveNode;
+use Statamic\View\Antlers\Language\Nodes\Structures\ModifierSeparator;
 use Statamic\View\Antlers\Language\Nodes\TagIdentifier;
 use Statamic\View\Antlers\Language\Runtime\Sandbox\TypeCoercion;
 use Statamic\View\Antlers\Language\Utilities\StringUtilities;
@@ -272,6 +273,18 @@ public function parseNode(AntlersNode $node)
 
         $node->runtimeNodes = $runtimeNodes;
 
+        if ($node->hasParameters) {
+            foreach ($runtimeNodes as $runtimeNode) {
+                if ($runtimeNode instanceof ModifierSeparator) {
+                    throw ErrorFactory::makeSyntaxError(
+                        AntlersErrorCodes::TYPE_MIXED_MODIFIER_STYLES,
+                        $node,
+                        'Cannot mix pipe and shorthand parameter modifier styles on the same expression. Use either "| modifier(\'value\')" or "modifier=\'value\'", but not both.'
+                    );
+                }
+            }
+        }
+
         $trimmedInner = trim($node->content);
 
         if (ConditionPairAnalyzer::isConditionalStructure($node) && $node->name->name != 'else' && count($runtimeNodes) == 0
diff --git a/src/View/Antlers/Language/Parser/LanguageParser.php b/src/View/Antlers/Language/Parser/LanguageParser.php
index 63676535b15..9648a41a6c3 100644
--- a/src/View/Antlers/Language/Parser/LanguageParser.php
+++ b/src/View/Antlers/Language/Parser/LanguageParser.php
@@ -2545,6 +2545,7 @@ private function createNullCoalescenceGroups($tokens)
                 $nullCoalescenceGroup = new NullCoalescenceGroup();
                 $nullCoalescenceGroup->left = $left;
                 $nullCoalescenceGroup->right = $right;
+                $nullCoalescenceGroup->strict = $node->strict;
                 $newTokens[] = $nullCoalescenceGroup;
 
                 $i += 1;
diff --git a/src/View/Antlers/Language/Runtime/NodeProcessor.php b/src/View/Antlers/Language/Runtime/NodeProcessor.php
index 2d4a117668f..1d7bf42b81a 100644
--- a/src/View/Antlers/Language/Runtime/NodeProcessor.php
+++ b/src/View/Antlers/Language/Runtime/NodeProcessor.php
@@ -2589,7 +2589,7 @@ private function evaluatePhpBuffer(string $___phpBuffer, bool $___processAssignm
                 foreach ($___antlersVarAfter as $___varKey => $___varValue) {
                     if (
                         str_starts_with($___varKey, '___') ||
-                        (isset($___antlersVarBefore[$___varKey]) && $___antlersVarBefore[$___varKey] === $___varValue)
+                        (array_key_exists($___varKey, $___antlersVarBefore) && $___antlersVarBefore[$___varKey] === $___varValue)
                     ) {
                         continue;
                     }
diff --git a/src/View/Antlers/Language/Runtime/PathDataManager.php b/src/View/Antlers/Language/Runtime/PathDataManager.php
index 17adfc03db4..031eb04631d 100644
--- a/src/View/Antlers/Language/Runtime/PathDataManager.php
+++ b/src/View/Antlers/Language/Runtime/PathDataManager.php
@@ -17,6 +17,7 @@
 use Statamic\Fields\ArrayableString;
 use Statamic\Fields\Value;
 use Statamic\Fields\Values;
+use Statamic\Support\MethodDenylist;
 use Statamic\View\Antlers\AntlersString;
 use Statamic\View\Antlers\Language\Errors\AntlersErrorCodes;
 use Statamic\View\Antlers\Language\Errors\ErrorFactory;
@@ -700,7 +701,7 @@ public function getData(VariableReference $path, $data, $isForArrayIndex = false
 
                 if ($this->reducedVar instanceof Model) {
                     $this->reducedVar = $this->reducedVar->{$pathItem->name};
-                } elseif (is_object($this->reducedVar) && property_exists($this->reducedVar, $pathItem->name)) {
+                } elseif (is_object($this->reducedVar) && property_exists($this->reducedVar, $pathItem->name) && (new \ReflectionProperty($this->reducedVar, $pathItem->name))->isPublic()) {
                     $this->reducedVar = $this->reducedVar->{$pathItem->name};
                 } else {
                     $this->reduceVar($pathItem, $data);
@@ -861,9 +862,32 @@ private function reduceVar($path, $processorData = [])
             $this->unlockData();
         }
 
-        if (is_object($this->reducedVar) && method_exists($this->reducedVar, Str::camel($varPath))) {
-            $this->reducedVar = call_user_func_array([$this->reducedVar, Str::camel($varPath)], []);
-            $this->resolvedPath[] = '{method:'.$varPath.'}';
+        if (is_object($this->reducedVar) && method_exists($this->reducedVar, $method = Str::camel($varPath)) && (new \ReflectionMethod($this->reducedVar, $method))->isPublic()) {
+            if (MethodDenylist::blocks($method)) {
+                // The method name derives from user-influenceable data, so never
+                // dispatch to methods that mutate or destroy data. Resolve to null.
+                $this->reducedVar = null;
+                $this->didFind = false;
+                $this->doBreak = true;
+            } else {
+                $this->reducedVar = call_user_func_array([$this->reducedVar, $method], []);
+                $this->resolvedPath[] = '{method:'.$varPath.'}';
+
+                if ($doCompact) {
+                    $this->compact($path->isFinal);
+                }
+            }
+        } elseif (is_object($this->reducedVar) && property_exists($this->reducedVar, $camelVar = Str::camel($varPath)) && (new \ReflectionProperty($this->reducedVar, $camelVar))->isPublic()) {
+            $this->reducedVar = $this->reducedVar->{$camelVar};
+            $this->resolvedPath[] = '{property:'.$varPath.'}';
+
+            if ($doCompact) {
+                $this->compact($path->isFinal);
+            }
+        } elseif (is_object($this->reducedVar)) {
+            $this->reducedVar = null;
+            $this->didFind = false;
+            $this->doBreak = true;
 
             if ($doCompact) {
                 $this->compact($path->isFinal);
diff --git a/src/View/Antlers/Language/Runtime/RuntimeParser.php b/src/View/Antlers/Language/Runtime/RuntimeParser.php
index 5baa33d0901..e8883b58a49 100644
--- a/src/View/Antlers/Language/Runtime/RuntimeParser.php
+++ b/src/View/Antlers/Language/Runtime/RuntimeParser.php
@@ -510,7 +510,6 @@ private function addAntlersErrorDetails($exception, $text, $data)
         $rebuiltTrace = array_merge($rebuiltTrace, $exception->getTrace());
 
         $traceProperty = new ReflectionProperty('Exception', 'trace');
-        $traceProperty->setAccessible(true);
         $traceProperty->setValue($newException, $rebuiltTrace);
 
         $this->cleanUpTempFiles();
@@ -606,7 +605,6 @@ private function buildAntlersExceptionError(AntlersException $antlersException,
 
         $ignitionException = new $exceptionClass($newMessage, 0, 1, $exceptionView, $exceptionLine, $antlersException);
         $traceProperty = new ReflectionProperty('Exception', 'trace');
-        $traceProperty->setAccessible(true);
         $traceProperty->setValue($ignitionException, $rebuiltTrace);
 
         $ignitionException->setViewData($data);
diff --git a/src/View/Antlers/Language/Runtime/Sandbox/Environment.php b/src/View/Antlers/Language/Runtime/Sandbox/Environment.php
index c74407a1168..76163a5585d 100644
--- a/src/View/Antlers/Language/Runtime/Sandbox/Environment.php
+++ b/src/View/Antlers/Language/Runtime/Sandbox/Environment.php
@@ -1194,8 +1194,14 @@ private function evaluateNullCoalescence(NullCoalescenceGroup $group)
             $leftVal = $leftVal->value();
         }
 
-        if ($leftVal != null) {
-            return $leftVal;
+        if ($group->strict) {
+            if ($leftVal !== null) {
+                return $leftVal;
+            }
+        } else {
+            if ($leftVal != null) {
+                return $leftVal;
+            }
         }
 
         return $this->getValue($group->right);
diff --git a/src/View/Cascade.php b/src/View/Cascade.php
index 914c687c9b1..36149fe4777 100644
--- a/src/View/Cascade.php
+++ b/src/View/Cascade.php
@@ -154,14 +154,14 @@ protected function hydrateGlobals()
 
     protected function hydrateContent()
     {
-        if (! $this->content) {
-            return $this;
-        }
-
         if ($this->content instanceof \Closure) {
             $this->content = call_user_func($this->content);
         }
 
+        if (! $this->content) {
+            return $this;
+        }
+
         $variables = $this->content instanceof Augmentable
             ? $this->content->toDeferredAugmentedArray()
             : $this->content->toArray();
diff --git a/src/View/Debugbar/AddRequestMessage.php b/src/View/Debugbar/AddRequestMessage.php
index f3726721e8a..7dcda1dab17 100644
--- a/src/View/Debugbar/AddRequestMessage.php
+++ b/src/View/Debugbar/AddRequestMessage.php
@@ -3,7 +3,6 @@
 namespace Statamic\View\Debugbar;
 
 use Illuminate\Database\Eloquent\Model;
-use Statamic\Routing\Route;
 use Statamic\View\Events\ViewRendered;
 
 class AddRequestMessage
@@ -30,10 +29,6 @@ public function handle(ViewRendered $event)
 
     protected function label($item)
     {
-        if ($item instanceof Route) {
-            return 'Route '.$item->url();
-        }
-
         if ($item instanceof Model) {
             return class_basename($item).' '.$item->getKey();
         }
diff --git a/src/View/Scaffolding/Emitters/AbstractSourceEmitter.php b/src/View/Scaffolding/Emitters/AbstractSourceEmitter.php
index e0cda8d4768..903b5d7c23c 100644
--- a/src/View/Scaffolding/Emitters/AbstractSourceEmitter.php
+++ b/src/View/Scaffolding/Emitters/AbstractSourceEmitter.php
@@ -10,9 +10,14 @@
 use Statamic\View\Scaffolding\TemplateGenerator;
 use Stringable;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 abstract class AbstractSourceEmitter implements Stringable
 {
     protected static array $blueprintStack = [];
+    protected static array $variableStack = [];
+    protected static ?string $currentIterationVar = null;
     protected array $specialLoopVariables = [
         'key',
         'value',
diff --git a/src/Widgets/VueComponent.php b/src/Widgets/VueComponent.php
index 9e6601a981f..cdaa544b726 100644
--- a/src/Widgets/VueComponent.php
+++ b/src/Widgets/VueComponent.php
@@ -4,6 +4,9 @@
 
 use Illuminate\Contracts\Support\Arrayable;
 
+/**
+ * @phpstan-consistent-constructor
+ */
 class VueComponent implements Arrayable
 {
     public function __construct(private string $name, private array $props = [])
diff --git a/src/Yaml/Yaml.php b/src/Yaml/Yaml.php
index 560f56646c8..a1f8091a8f4 100644
--- a/src/Yaml/Yaml.php
+++ b/src/Yaml/Yaml.php
@@ -136,7 +136,6 @@ protected function viewException($e, $str, $line = null)
             'args' => $args,
         ]);
         $traceProperty = new ReflectionProperty('Exception', 'trace');
-        $traceProperty->setAccessible(true);
         $traceProperty->setValue($exception, $trace);
 
         return $exception;
diff --git a/src/namespaced_helpers.php b/src/namespaced_helpers.php
index 8e1f7afee9a..f29f7dfac83 100644
--- a/src/namespaced_helpers.php
+++ b/src/namespaced_helpers.php
@@ -6,3 +6,8 @@ function trans($key, $replace = [], $locale = null)
 {
     return Statamic::trans($key, $replace, $locale);
 }
+
+function trans_choice($key, $number, $replace = [], $locale = null)
+{
+    return Statamic::transChoice($key, $number, $replace, $locale);
+}
diff --git a/tests/API/APITest.php b/tests/API/APITest.php
index 64737f01e4a..a9d7b1e7ae7 100644
--- a/tests/API/APITest.php
+++ b/tests/API/APITest.php
@@ -250,6 +250,29 @@ public function it_filters_published_entries_in_nav_route_by_default()
         $this->assertEndpointDataCount('/api/navs/footer/tree', 2);
     }
 
+    #[Test]
+    public function it_gets_origin_id_in_nav_route_when_an_item_is_not_linked_to_an_entry()
+    {
+        Facades\Config::set('statamic.api.resources.navs', true);
+
+        Facades\Collection::make('pages')->save();
+
+        $nav = Facades\Nav::make('footer');
+        $nav->makeTree('en', [
+            ['entry' => 'one'],
+            ['title' => 'Balki Bartokomous', 'url' => 'https://balki.com'],
+        ])->save();
+        $nav->save();
+
+        Facades\Entry::make()->collection('pages')->id('one')->slug('one')->published(true)->save();
+
+        $this
+            ->get('/api/navs/footer/tree?fields=title,origin_id')
+            ->assertSuccessful()
+            ->assertJsonPath('data.1.page.title', 'Balki Bartokomous')
+            ->assertJsonPath('data.1.page.origin_id', null);
+    }
+
     #[Test]
     public function it_filters_by_taxonomy_terms()
     {
diff --git a/tests/API/CacherTest.php b/tests/API/CacherTest.php
index 7e8e227d59a..40fe3bfe7fd 100644
--- a/tests/API/CacherTest.php
+++ b/tests/API/CacherTest.php
@@ -57,7 +57,11 @@ public function it_caches_endpoint_using_default_cacher()
         $this->assertEquals([$cacheKey], Cache::get('api-cache:tracked-responses'));
 
         // manually manipulate whats in the cache so we can be sure it uses it.
-        Cache::put($cacheKey, response()->json(['foo' => 'bar']), 10);
+        Cache::put($cacheKey, [
+            'content' => json_encode(['foo' => 'bar']),
+            'status' => 200,
+            'headers' => ['content-type' => ['application/json']],
+        ], 10);
 
         $this->get($endpoint)
             ->assertOk()
diff --git a/tests/Actions/DisableTwoFactorTest.php b/tests/Actions/DisableTwoFactorTest.php
index f4e9331b614..b92a046dcba 100644
--- a/tests/Actions/DisableTwoFactorTest.php
+++ b/tests/Actions/DisableTwoFactorTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Actions;
 
 use Mockery;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Actions\DisableTwoFactorAuthentication as Action;
 use Statamic\Auth\TwoFactor\DisableTwoFactorAuthentication;
@@ -11,6 +12,7 @@
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
+#[Group('2fa')]
 class DisableTwoFactorTest extends TestCase
 {
     use FakesRoles;
diff --git a/tests/Actions/ImpersonateTest.php b/tests/Actions/ImpersonateTest.php
index 658f6ec6c95..84fa8ddae6c 100644
--- a/tests/Actions/ImpersonateTest.php
+++ b/tests/Actions/ImpersonateTest.php
@@ -2,10 +2,14 @@
 
 namespace Tests\Actions;
 
+use Illuminate\Support\Facades\Gate;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Actions\Impersonate as Action;
 use Statamic\Facades\User;
+use Statamic\Policies\UserPolicy;
 use Tests\ElevatesSessions;
+use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
@@ -13,6 +17,7 @@
 class ImpersonateTest extends TestCase
 {
     use ElevatesSessions;
+    use FakesRoles;
     use PreventSavingStacheItemsToDisk;
 
     private function impersonate($user)
@@ -41,4 +46,87 @@ public function it_authenticates_as_another_user_and_clears_elevated_session()
         $this->assertEquals($impersonated->id(), auth()->id());
         $this->assertFalse(request()->hasElevatedSession());
     }
+
+    #[Test]
+    public function it_is_visible_to_a_valid_target_user()
+    {
+        $impersonator = tap(User::make()->email('admin@example.com')->makeSuper())->save();
+        $impersonated = tap(User::make()->email('user@example.com'))->save();
+
+        $this->actingAs($impersonator);
+
+        $this->assertTrue((new Action)->visibleTo($impersonated));
+    }
+
+    #[Test]
+    public function it_is_not_visible_when_policy_denies_impersonation()
+    {
+        $this->setTestRoles(['impersonator' => ['impersonate users']]);
+
+        $impersonator = tap(User::make()->email('admin@example.com')->assignRole('impersonator'))->save();
+        $impersonated = tap(User::make()->email('user@example.com'))->save();
+
+        Gate::policy(get_class($impersonated), DenyImpersonationPolicy::class);
+
+        $this->actingAs($impersonator);
+
+        $this->assertFalse((new Action)->visibleTo($impersonated));
+    }
+
+    #[Test]
+    public function it_is_authorized_with_the_default_policy()
+    {
+        $this->setTestRoles(['impersonator' => ['impersonate users']]);
+
+        $impersonator = tap(User::make()->email('admin@example.com')->assignRole('impersonator'))->save();
+        $impersonated = tap(User::make()->email('user@example.com'))->save();
+
+        $this->assertTrue((new Action)->authorize($impersonator, $impersonated));
+    }
+
+    #[Test]
+    public function it_is_not_authorized_when_policy_denies_impersonation()
+    {
+        $this->setTestRoles(['impersonator' => ['impersonate users']]);
+
+        $impersonator = tap(User::make()->email('admin@example.com')->assignRole('impersonator'))->save();
+        $impersonated = tap(User::make()->email('user@example.com'))->save();
+
+        Gate::policy(get_class($impersonated), DenyImpersonationPolicy::class);
+
+        $this->assertFalse((new Action)->authorize($impersonator, $impersonated));
+    }
+
+    #[Test]
+    public function it_is_not_authorized_without_permission()
+    {
+        $this->setTestRoles(['editor' => ['edit users']]);
+
+        $impersonator = tap(User::make()->email('admin@example.com')->assignRole('editor'))->save();
+        $impersonated = tap(User::make()->email('user@example.com'))->save();
+
+        $this->assertFalse((new Action)->authorize($impersonator, $impersonated));
+    }
+
+    #[Test]
+    public function super_users_bypass_the_policy_check()
+    {
+        $impersonator = tap(User::make()->email('admin@example.com')->makeSuper())->save();
+        $impersonated = tap(User::make()->email('user@example.com'))->save();
+
+        Gate::policy(get_class($impersonated), DenyImpersonationPolicy::class);
+
+        $this->actingAs($impersonator);
+
+        $this->assertTrue((new Action)->visibleTo($impersonated));
+        $this->assertTrue((new Action)->authorize($impersonator, $impersonated));
+    }
+}
+
+class DenyImpersonationPolicy extends UserPolicy
+{
+    public function impersonate($authed, $user)
+    {
+        return false;
+    }
 }
diff --git a/tests/Addons/AddonTest.php b/tests/Addons/AddonTest.php
index 5ef50a9be99..795b5a3fb7d 100644
--- a/tests/Addons/AddonTest.php
+++ b/tests/Addons/AddonTest.php
@@ -342,6 +342,11 @@ public static function isLatestVersionProvider()
             ['2.0.0', '2.0.0', true],
             ['1.0', '1.0.0', true],
             ['1.0', '1.0.1', false],
+
+            // Installed version is newer than the marketplace's indexed latest version
+            ['1.0.2', '1.0.1', true],
+            ['2.0.0', '1.0.0', true],
+            ['7.12.1', '7.12.0', true],
         ];
     }
 
diff --git a/tests/Addons/SettingsTest.php b/tests/Addons/SettingsTest.php
index 2621db2d521..0cbc242ed37 100644
--- a/tests/Addons/SettingsTest.php
+++ b/tests/Addons/SettingsTest.php
@@ -146,6 +146,22 @@ public function it_sets_all_values()
             'test' => ['a' => 'A', 'b' => 'B'],
             'statamic.system.view_config_allowlist' => ['@default', 'test.a', 'test.b'],
         ]);
+
+        $this->app->bind('statamic.addons.test-addon.settings_blueprint', fn () => [
+            'tabs' => [
+                'main' => [
+                    'sections' => [
+                        [
+                            'fields' => [
+                                ['handle' => 'api_key', 'field' => ['type' => 'text', 'default' => 'my-default-key']],
+                                ['handle' => 'another_field', 'field' => ['type' => 'text', 'default' => 'default-value']],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+
         $addon = $this->makeFromPackage();
         $settings = new Settings($addon, ['foo' => 'bar']);
 
@@ -158,6 +174,8 @@ public function it_sets_all_values()
         ]);
 
         $this->assertEquals([
+            'api_key' => 'my-default-key',
+            'another_field' => 'default-value',
             'alfa' => 'bravo',
             'charlie' => 'A',
             'delta' => ['echo' => 'B'],
@@ -165,6 +183,81 @@ public function it_sets_all_values()
         $this->assertEquals($raw, $settings->raw());
     }
 
+    #[Test]
+    public function it_applies_blueprint_defaults_to_resolved_settings()
+    {
+        $this->app->bind('statamic.addons.test-addon.settings_blueprint', fn () => [
+            'tabs' => [
+                'main' => [
+                    'sections' => [
+                        [
+                            'fields' => [
+                                ['handle' => 'api_key', 'field' => ['type' => 'text', 'default' => 'my-default-key']],
+                                ['handle' => 'no_default_field', 'field' => ['type' => 'text']],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+
+        $addon = $this->makeFromPackage();
+        $settings = new Settings($addon, []);
+
+        $this->assertEquals('my-default-key', $settings->get('api_key'));
+        $this->assertNull($settings->get('no_default_field'));
+    }
+
+    #[Test]
+    public function it_does_not_include_blueprint_defaults_in_raw_settings()
+    {
+        $this->app->bind('statamic.addons.test-addon.settings_blueprint', fn () => [
+            'tabs' => [
+                'main' => [
+                    'sections' => [
+                        [
+                            'fields' => [
+                                ['handle' => 'api_key', 'field' => ['type' => 'text', 'default' => 'my-default-key']],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+
+        $addon = $this->makeFromPackage();
+        $settings = new Settings($addon, []);
+
+        $this->assertArrayNotHasKey('api_key', $settings->raw());
+        $this->assertSame([], $settings->raw());
+    }
+
+    #[Test]
+    public function saved_settings_take_precedence_over_blueprint_defaults()
+    {
+        $this->app->bind('statamic.addons.test-addon.settings_blueprint', fn () => [
+            'tabs' => [
+                'main' => [
+                    'sections' => [
+                        [
+                            'fields' => [
+                                ['handle' => 'api_key', 'field' => ['type' => 'text', 'default' => 'my-default-key']],
+                                ['handle' => 'another_field', 'field' => ['type' => 'text', 'default' => 'default-value']],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+
+        $addon = $this->makeFromPackage();
+        $settings = new Settings($addon, ['api_key' => 'saved-key']);
+
+        $this->assertEquals('saved-key', $settings->get('api_key'));
+        $this->assertEquals('default-value', $settings->get('another_field'));
+        $this->assertSame(['api_key' => 'saved-key'], $settings->raw());
+    }
+
     #[Test]
     public function it_saves_settings()
     {
diff --git a/tests/Antlers/Components/BladeComponentsTest.php b/tests/Antlers/Components/BladeComponentsTest.php
index 1cf233752f0..d376dcb40d8 100644
--- a/tests/Antlers/Components/BladeComponentsTest.php
+++ b/tests/Antlers/Components/BladeComponentsTest.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\Blade;
 use Statamic\View\Antlers\Language\Utilities\StringUtilities;
 use Tests\Antlers\Fixtures\Components\Card;
+use Tests\Antlers\Fixtures\Components\KebabProp;
 use Tests\Antlers\ParserTestCase;
 
 class BladeComponentsTest extends ParserTestCase
@@ -126,6 +127,58 @@ public function test_components_blade_compatibility()
         );
     }
 
+    public function test_kebab_cased_attributes_bind_props_on_anonymous_blade_components()
+    {
+        $template = <<<'EOT'
+{{ foo = 'Test' }}<x-kebab_prop :some-prop="foo" />
+EOT;
+
+        $this->assertSame(
+            '<div data-test="Test"></div>',
+            trim($this->renderString($template))
+        );
+    }
+
+    public function test_kebab_cased_attributes_bind_props_on_class_blade_components()
+    {
+        Blade::component(KebabProp::class);
+
+        $template = <<<'EOT'
+{{ foo = 'Test' }}<x-kebab_prop_class :some-prop="foo" />
+EOT;
+
+        $this->assertSame(
+            'Test',
+            trim($this->renderString($template))
+        );
+    }
+
+    public function test_camel_cased_attributes_still_bind_props_on_anonymous_blade_components()
+    {
+        $template = <<<'EOT'
+{{ foo = 'Test' }}<x-kebab_prop :someProp="foo" />
+EOT;
+
+        $this->assertSame(
+            '<div data-test="Test"></div>',
+            trim($this->renderString($template))
+        );
+    }
+
+    public function test_camel_cased_attributes_still_bind_props_on_class_blade_components()
+    {
+        Blade::component(KebabProp::class);
+
+        $template = <<<'EOT'
+{{ foo = 'Test' }}<x-kebab_prop_class :someProp="foo" />
+EOT;
+
+        $this->assertSame(
+            'Test',
+            trim($this->renderString($template))
+        );
+    }
+
     public function test_method_calls_across_lines_with_attributes()
     {
         $template = <<<'EOT'
diff --git a/tests/Antlers/ContentAllowlistConfigTest.php b/tests/Antlers/ContentAllowlistConfigTest.php
new file mode 100644
index 00000000000..20292776189
--- /dev/null
+++ b/tests/Antlers/ContentAllowlistConfigTest.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace Tests\Antlers;
+
+use Statamic\Contracts\View\Antlers\Parser as ParserContract;
+use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
+
+class ContentAllowlistConfigTest extends ParserTestCase
+{
+    public function test_shipped_antlers_config_yields_default_allowlists()
+    {
+        app(ParserContract::class);
+
+        $this->assertContains('trans:*', GlobalRuntimeState::$allowedContentTagPaths);
+        $this->assertContains('lower', GlobalRuntimeState::$allowedContentModifierPaths);
+    }
+
+    public function test_null_allowed_content_config_uses_statamic_defaults()
+    {
+        config([
+            'statamic.antlers.allowedContentTags' => null,
+            'statamic.antlers.allowedContentModifiers' => null,
+        ]);
+
+        app(ParserContract::class);
+
+        $tags = GlobalRuntimeState::$allowedContentTagPaths;
+        $modifiers = GlobalRuntimeState::$allowedContentModifierPaths;
+
+        $this->assertContains('trans:*', $tags);
+        $this->assertGreaterThanOrEqual(4, count($tags));
+        $this->assertContains('lower', $modifiers);
+        $this->assertGreaterThanOrEqual(150, count($modifiers));
+    }
+
+    public function test_empty_array_allows_no_content_tags_or_modifiers()
+    {
+        config([
+            'statamic.antlers.allowedContentTags' => [],
+            'statamic.antlers.allowedContentModifiers' => [],
+        ]);
+
+        app(ParserContract::class);
+
+        $this->assertSame([], GlobalRuntimeState::$allowedContentTagPaths);
+        $this->assertSame([], GlobalRuntimeState::$allowedContentModifierPaths);
+    }
+
+    public function test_at_default_expands_core_tags_and_keeps_custom_patterns()
+    {
+        config(['statamic.antlers.allowedContentTags' => ['@default', 'custom_allowlist_tag:*']]);
+
+        app(ParserContract::class);
+
+        $allowed = GlobalRuntimeState::$allowedContentTagPaths;
+
+        $this->assertContains('trans:*', $allowed);
+        $this->assertContains('custom_allowlist_tag:*', $allowed);
+    }
+
+    public function test_at_default_expands_core_modifiers_and_keeps_custom_handles()
+    {
+        config(['statamic.antlers.allowedContentModifiers' => ['@default', 'custom_allowlist_modifier']]);
+
+        app(ParserContract::class);
+
+        $allowed = GlobalRuntimeState::$allowedContentModifierPaths;
+
+        $this->assertContains('lower', $allowed);
+        $this->assertContains('custom_allowlist_modifier', $allowed);
+    }
+
+    public function test_config_without_at_default_replaces_tag_allowlist()
+    {
+        config(['statamic.antlers.allowedContentTags' => ['only_custom:*']]);
+
+        app(ParserContract::class);
+
+        $allowed = GlobalRuntimeState::$allowedContentTagPaths;
+
+        $this->assertSame(['only_custom:*'], $allowed);
+        $this->assertNotContains('trans:*', $allowed);
+    }
+
+    public function test_config_without_at_default_replaces_modifier_allowlist()
+    {
+        config(['statamic.antlers.allowedContentModifiers' => ['only_custom_modifier']]);
+
+        app(ParserContract::class);
+
+        $allowed = GlobalRuntimeState::$allowedContentModifierPaths;
+
+        $this->assertSame(['only_custom_modifier'], $allowed);
+        $this->assertNotContains('lower', $allowed);
+    }
+
+    public function test_at_default_deduplicates_expanded_lists()
+    {
+        config(['statamic.antlers.allowedContentTags' => ['@default', '@default', 'dedupe_me:*']]);
+
+        app(ParserContract::class);
+
+        $allowed = GlobalRuntimeState::$allowedContentTagPaths;
+        $counts = array_count_values($allowed);
+
+        $this->assertSame(1, $counts['dedupe_me:*'] ?? 0);
+        $this->assertSame(1, $counts['trans:*'] ?? 0);
+    }
+}
diff --git a/tests/Antlers/Fixtures/Components/KebabProp.php b/tests/Antlers/Fixtures/Components/KebabProp.php
new file mode 100644
index 00000000000..e86e1ebaa1a
--- /dev/null
+++ b/tests/Antlers/Fixtures/Components/KebabProp.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Antlers\Fixtures\Components;
+
+use Illuminate\View\Component;
+
+class KebabProp extends Component
+{
+    public function __construct(
+        public ?string $someProp = null,
+    ) {
+
+    }
+
+    public function render()
+    {
+        return view('components.kebab_prop_class');
+    }
+}
diff --git a/tests/Antlers/Parser/ParserErrorsTest.php b/tests/Antlers/Parser/ParserErrorsTest.php
index ff79c841007..cbbe6624190 100644
--- a/tests/Antlers/Parser/ParserErrorsTest.php
+++ b/tests/Antlers/Parser/ParserErrorsTest.php
@@ -214,4 +214,26 @@ public function test_incomplete_shorthand_parameters_throws_error_two()
     {
         $this->assertThrowsParserError('{{ tag_name :$}}');
     }
+
+    public function test_mixed_pipe_and_shorthand_modifier_throws_exception()
+    {
+        $this->assertThrowsParserError('{{ active_platforms | sort="value" }}');
+    }
+
+    public function test_mixed_pipe_and_shorthand_modifier_paired_throws_exception()
+    {
+        $this->assertThrowsParserError('{{ active_platforms | sort="value" }}items{{ /active_platforms }}');
+    }
+
+    public function test_mixed_pipe_and_shorthand_with_registered_modifier_throws_exception()
+    {
+        $this->assertThrowsParserError('{{ thing | upper="value" }}');
+    }
+
+    public function test_pipe_function_modifier_still_renders()
+    {
+        $data = ['items' => [['value' => 'Zebra'], ['value' => 'Apple'], ['value' => 'Mango']]];
+        $result = $this->renderString('{{ items | sort("value") }}{{ value }}{{ /items }}', $data, true);
+        $this->assertSame('applemangozebra', strtolower($result));
+    }
 }
diff --git a/tests/Antlers/Runtime/DataRetrieverTest.php b/tests/Antlers/Runtime/DataRetrieverTest.php
index 851048b52d8..52970f10a05 100644
--- a/tests/Antlers/Runtime/DataRetrieverTest.php
+++ b/tests/Antlers/Runtime/DataRetrieverTest.php
@@ -2,6 +2,8 @@
 
 namespace Tests\Antlers\Runtime;
 
+use Statamic\Facades\Antlers;
+use Statamic\Facades\Cascade;
 use Statamic\View\Antlers\Language\Runtime\PathDataManager;
 use Tests\Antlers\ParserTestCase;
 
@@ -14,6 +16,13 @@ private function getPathValue($path, $data)
         return $dataRetriever->getData($this->parsePath($path), $data);
     }
 
+    private function getPathValueWithExistence($path, $data)
+    {
+        $dataRetriever = new PathDataManager();
+
+        return $dataRetriever->getDataWithExistence($this->parsePath($path), $data);
+    }
+
     public function test_simple_data_is_retrieved()
     {
         $data = [
@@ -76,4 +85,218 @@ public function test_dynamic_keys_are_correctly_set()
         $value = $this->getPathValue('page[view:nested:nested1:nested2]', $data);
         $this->assertSame(12345, $value);
     }
+
+    public function test_object_properties_are_retrieved()
+    {
+        $data = [
+            'view' => [
+                'object' => new class
+                {
+                    public string $publicProperty = 'Hello Public World!';
+
+                    protected string $protectedProperty = 'Hello Protected World!';
+
+                    private string $privateProperty = 'Hello Private World!';
+                },
+            ],
+        ];
+
+        $value = $this->getPathValue('view.object.public_property', $data);
+        $this->assertSame('Hello Public World!', $value);
+
+        $value = $this->getPathValue('view.object.protected_property', $data);
+        $this->assertNull($value);
+
+        $value = $this->getPathValue('view.object.private_property', $data);
+        $this->assertNull($value);
+    }
+
+    public function test_object_properties_are_usable_in_antlers_conditions()
+    {
+        $object = new class
+        {
+            public string $truthyStringProperty = 'Hello Public World!';
+
+            public bool $truthyBoolProperty = true;
+
+            public string $falsyStringProperty = '';
+
+            public bool $falsyBoolProperty = false;
+
+            protected string $protectedProperty = 'Hello Protected World!';
+
+            private string $privateProperty = 'Hello Private World!';
+        };
+
+        Cascade::set('object', $object);
+
+        $value = (string) Antlers::parse('{{ if object:truthy_string_property }}yes{{ else }}no{{ /if }}');
+        $this->assertSame('yes', $value);
+
+        $value = (string) Antlers::parse('{{ if object:truthy_bool_property }}yes{{ else }}no{{ /if }}');
+        $this->assertSame('yes', $value);
+
+        $value = (string) Antlers::parse('{{ if object:falsy_string_property }}yes{{ else }}no{{ /if }}');
+        $this->assertSame('no', $value);
+
+        $value = (string) Antlers::parse('{{ if object:falsy_bool_property }}yes{{ else }}no{{ /if }}');
+        $this->assertSame('no', $value);
+
+        $value = (string) Antlers::parse('{{ if object:protected_property }}yes{{ else }}no{{ /if }}');
+        $this->assertSame('no', $value);
+
+        $value = (string) Antlers::parse('{{ if object:private_property }}yes{{ else }}no{{ /if }}');
+        $this->assertSame('no', $value);
+    }
+
+    public function test_non_public_methods_are_not_called()
+    {
+        $data = [
+            'object' => new class
+            {
+                protected function protectedMethod()
+                {
+                    return 'Protected Method';
+                }
+
+                private function privateMethod()
+                {
+                    return 'Private Method';
+                }
+            },
+        ];
+
+        $value = $this->getPathValue('object.protected_method', $data);
+        $this->assertNull($value);
+
+        $value = $this->getPathValue('object.private_method', $data);
+        $this->assertNull($value);
+    }
+
+    public function test_public_property_is_used_when_non_public_method_shares_name()
+    {
+        $data = [
+            'object' => new class
+            {
+                public string $label = 'My Widget';
+
+                protected function label()
+                {
+                    return strtoupper($this->label);
+                }
+            },
+        ];
+
+        $value = $this->getPathValue('object.label', $data);
+        $this->assertSame('My Widget', $value);
+    }
+
+    public function test_objects_with_no_matching_property_or_method_are_returned_as_null()
+    {
+        $data = [
+            'object' => new class
+            {
+            },
+        ];
+
+        $value = $this->getPathValue('object.no_existent', $data);
+        $this->assertNull($value);
+
+        Cascade::set('object', $data['object']);
+
+        $value = (string) Antlers::parse('{{ if object:no_existent }}yes{{ else }}no{{ /if }}');
+        $this->assertSame('no', $value);
+    }
+
+    public function test_non_public_properties_report_not_found()
+    {
+        $data = [
+            'view' => [
+                'object' => new class
+                {
+                    protected string $protectedProperty = 'Hello Protected World!';
+
+                    private string $privateProperty = 'Hello Private World!';
+                },
+            ],
+        ];
+
+        [$found, $value] = $this->getPathValueWithExistence('view.object.protected_property', $data);
+        $this->assertFalse($found);
+        $this->assertNull($value);
+
+        [$found, $value] = $this->getPathValueWithExistence('view.object.private_property', $data);
+        $this->assertFalse($found);
+        $this->assertNull($value);
+    }
+
+    public function test_non_public_properties_short_circuit_deeper_paths()
+    {
+        $data = [
+            'object' => new class
+            {
+                protected string $protectedProperty = 'Hello Protected World!';
+            },
+        ];
+
+        $value = $this->getPathValue('object.protected_property.deeper.path', $data);
+        $this->assertNull($value);
+
+        [$found, $value] = $this->getPathValueWithExistence('object.protected_property.deeper.path', $data);
+        $this->assertFalse($found);
+        $this->assertNull($value);
+    }
+
+    public function test_objects_with_no_matching_property_or_method_report_not_found()
+    {
+        $data = [
+            'object' => new class
+            {
+            },
+        ];
+
+        [$found, $value] = $this->getPathValueWithExistence('object.no_existent', $data);
+        $this->assertFalse($found);
+        $this->assertNull($value);
+    }
+
+    public function test_objects_with_no_matching_property_short_circuit_deeper_paths()
+    {
+        $data = [
+            'object' => new class
+            {
+                public string $name = 'Hello';
+            },
+        ];
+
+        $value = $this->getPathValue('object.no_existent.deeper.path', $data);
+        $this->assertNull($value);
+
+        [$found, $value] = $this->getPathValueWithExistence('object.no_existent.deeper.path', $data);
+        $this->assertFalse($found);
+        $this->assertNull($value);
+    }
+
+    public function test_exact_name_non_public_properties_are_not_accessed()
+    {
+        $data = [
+            'object' => new class
+            {
+                public string $name = 'Public';
+
+                protected string $secret = 'Protected';
+
+                private string $hidden = 'Private';
+            },
+        ];
+
+        $value = $this->getPathValue('object.name', $data);
+        $this->assertSame('Public', $value);
+
+        $value = $this->getPathValue('object.secret', $data);
+        $this->assertNull($value);
+
+        $value = $this->getPathValue('object.hidden', $data);
+        $this->assertNull($value);
+    }
 }
diff --git a/tests/Antlers/Runtime/PartialsTest.php b/tests/Antlers/Runtime/PartialsTest.php
index 99b5de565a7..223a3f2c555 100644
--- a/tests/Antlers/Runtime/PartialsTest.php
+++ b/tests/Antlers/Runtime/PartialsTest.php
@@ -82,4 +82,17 @@ public function test_double_colons_may_be_used_in_tag_method_part()
 
         $this->renderString($template, [], true);
     }
+
+    public function test_assignments_in_earlier_partials_do_not_blank_a_later_partials_slot()
+    {
+        $template = <<<'EOT'
+{{? $foo = 'bar' ?}}{{ partial:filter /}}{{ partial:card }}KEEPME{{ /partial:card }}
+EOT;
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('filter', "{{? \$values = 'v' ?}}FILTER");
+        $this->viewShouldReturnRaw('card', "{{ trans key='hi' }}<slot>{{ slot }}</slot>");
+
+        $this->assertSame('FILTERhi<slot>KEEPME</slot>', $this->renderString($template, [], true));
+    }
 }
diff --git a/tests/Antlers/Runtime/StrictNullCoalescenceTest.php b/tests/Antlers/Runtime/StrictNullCoalescenceTest.php
new file mode 100644
index 00000000000..c04a4940f6a
--- /dev/null
+++ b/tests/Antlers/Runtime/StrictNullCoalescenceTest.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace Tests\Antlers\Runtime;
+
+use Statamic\View\Cascade;
+use Tests\Antlers\ParserTestCase;
+
+class StrictNullCoalescenceTest extends ParserTestCase
+{
+    public function test_strict_null_falls_through()
+    {
+        $template = <<<'EOT'
+{{ a ??? b }}
+EOT;
+
+        $this->assertSame('fallback', $this->renderString($template, [
+            'a' => null,
+            'b' => 'fallback',
+        ]));
+    }
+
+    public function test_empty_string_is_preserved()
+    {
+        $template = <<<'EOT'
+{{ a ??? b }}
+EOT;
+
+        $this->assertSame('', $this->renderString($template, [
+            'a' => '',
+            'b' => 'fallback',
+        ]));
+    }
+
+    public function test_zero_is_preserved()
+    {
+        $template = <<<'EOT'
+{{ a ??? b }}
+EOT;
+
+        $this->assertSame('0', $this->renderString($template, [
+            'a' => 0,
+            'b' => 'fallback',
+        ]));
+
+        $this->assertSame('0', $this->renderString($template, [
+            'a' => '0',
+            'b' => 'fallback',
+        ]));
+    }
+
+    public function test_false_is_preserved()
+    {
+        $template = <<<'EOT'
+{{ a ??? b }}
+EOT;
+
+        $this->assertSame('', $this->renderString($template, [
+            'a' => false,
+            'b' => 'fallback',
+        ]));
+    }
+
+    public function test_undefined_variable_falls_through()
+    {
+        $template = <<<'EOT'
+{{ missing ??? 'fallback' }}
+EOT;
+
+        $this->assertSame('fallback', $this->renderString($template));
+    }
+
+    public function test_chaining_with_all_null_returns_last()
+    {
+        $template = <<<'EOT'
+{{ a ??? b ??? 'final' }}
+EOT;
+
+        $this->assertSame('final', $this->renderString($template, [
+            'a' => null,
+            'b' => null,
+        ]));
+    }
+
+    public function test_chaining_returns_first_non_null()
+    {
+        $template = <<<'EOT'
+{{ a ??? b ??? 'final' }}
+EOT;
+
+        $this->assertSame('', $this->renderString($template, [
+            'a' => null,
+            'b' => '',
+        ]));
+
+        $this->assertSame('0', $this->renderString($template, [
+            'a' => null,
+            'b' => 0,
+        ]));
+    }
+
+    public function test_mixing_with_loose_null_coalescence()
+    {
+        $template = <<<'EOT'
+{{ a ?? b ??? 'final' }}
+EOT;
+
+        $this->assertSame('final', $this->renderString($template, [
+            'a' => '',
+            'b' => null,
+        ]));
+
+        $this->assertSame('B', $this->renderString($template, [
+            'a' => null,
+            'b' => 'B',
+        ]));
+    }
+
+    public function test_chaining_is_left_associative_with_mixed_operators()
+    {
+        // Grouping is (a ??? b) ?? c. The strict inner group preserves 0,
+        // but the outer loose ?? then treats 0 as null-like and falls through to c.
+        $template = <<<'EOT'
+{{ a ??? b ?? c }}
+EOT;
+
+        $this->assertSame('C', $this->renderString($template, [
+            'a' => 0,
+            'b' => 'B',
+            'c' => 'C',
+        ]));
+
+        // When the strict inner group returns a truthy value, the outer ?? keeps it.
+        $this->assertSame('B', $this->renderString($template, [
+            'a' => null,
+            'b' => 'B',
+            'c' => 'C',
+        ]));
+    }
+
+    public function test_modifiers_can_be_called_on_strict_group()
+    {
+        $template = <<<'EOT'
+{{ (seo_title ??? title) | upper }}
+EOT;
+
+        $this->assertSame('I AM THE TITLE', $this->renderString($template, [
+            'seo_title' => null,
+            'title' => 'i am the title',
+        ], true));
+
+        $this->assertSame('I AM THE SEO TITLE', $this->renderString($template, [
+            'seo_title' => 'i am the seo title',
+            'title' => 'i am the title',
+        ], true));
+    }
+
+    public function test_strict_null_coalescence_with_multi_path_parts()
+    {
+        $data = [
+            'config' => [
+                'app' => [
+                    'name' => 'Statamic',
+                ],
+            ],
+        ];
+
+        $template = <<<'EOT'
+{{ settings:copyright_name ??? config:app:name }}
+EOT;
+
+        $this->assertSame('Statamic', $this->renderString($template, $data));
+
+        $cascade = $this->mock(Cascade::class, function ($m) {
+            $m->shouldReceive('get')->with('settings')->andReturn(null);
+        });
+
+        $this->assertSame('Statamic', (string) $this->parser()->cascade($cascade)->render($template, $data));
+    }
+
+    public function test_strict_null_coalescence_short_circuits_right_side()
+    {
+        $template = <<<'EOT'
+{{ hello = "Hello" }}{{ world = "World" }}{{ hello ??? (world = "Earth") }} {{ world }}
+EOT;
+
+        $this->assertSame('Hello World', $this->renderString($template, [], true));
+    }
+
+    public function test_strict_vs_loose_divergence()
+    {
+        $loose = <<<'EOT'
+{{ a ?? 'fallback' }}
+EOT;
+
+        $strict = <<<'EOT'
+{{ a ??? 'fallback' }}
+EOT;
+
+        $falsyValues = [
+            ['a' => 0],
+            ['a' => false],
+        ];
+
+        foreach ($falsyValues as $data) {
+            $this->assertSame('fallback', $this->renderString($loose, $data));
+            $this->assertNotSame('fallback', $this->renderString($strict, $data));
+        }
+
+        $nullData = ['a' => null];
+        $this->assertSame('fallback', $this->renderString($loose, $nullData));
+        $this->assertSame('fallback', $this->renderString($strict, $nullData));
+    }
+}
diff --git a/tests/Antlers/Runtime/TemplateTest.php b/tests/Antlers/Runtime/TemplateTest.php
index bcc54ad609f..ca493056e8f 100644
--- a/tests/Antlers/Runtime/TemplateTest.php
+++ b/tests/Antlers/Runtime/TemplateTest.php
@@ -130,6 +130,50 @@ public function array_variables()
         $this->assertEquals('Very deep', $this->renderString('{{ associative:three[second_key] }}', $this->variables));
     }
 
+    #[Test]
+    public function dynamic_key_access_on_an_object_does_not_dispatch_destructive_methods()
+    {
+        $object = new MethodDispatchObject;
+
+        // A benign accessor method still dispatches.
+        $this->assertEquals('the title', $this->renderString('{{ object:title }}', [
+            'object' => $object,
+        ]));
+
+        // Destructive methods must not be dispatched; the expression resolves to empty.
+        $this->assertEquals('', $this->renderString('{{ object[key] }}', [
+            'object' => $object,
+            'key' => 'delete',
+        ]));
+        $this->assertFalse($object->deleted);
+
+        // Str::camel() reaches camelCase mutators too (e.g. "force-delete" => "forceDelete"),
+        // and method_exists() is case-insensitive, so these must be blocked regardless of casing.
+        $this->assertEquals('', $this->renderString('{{ object[key] }}', [
+            'object' => $object,
+            'key' => 'force-delete',
+        ]));
+        $this->assertFalse($object->forceDeleted);
+
+        $this->assertEquals('', $this->renderString('{{ object[key] }}', [
+            'object' => $object,
+            'key' => 'saveQuietly',
+        ]));
+        $this->assertFalse($object->savedQuietly);
+
+        // The same guard covers literal colon path syntax, which flows through
+        // the same dispatch branch.
+        $this->assertEquals('', $this->renderString('{{ object:delete }}', [
+            'object' => $object,
+        ]));
+        $this->assertFalse($object->deleted);
+
+        $this->assertEquals('', $this->renderString('{{ object:forceDelete }}', [
+            'object' => $object,
+        ]));
+        $this->assertFalse($object->forceDeleted);
+    }
+
     #[Test]
     public function complex_array_variable()
     {
@@ -2716,3 +2760,30 @@ public function augment($data)
         ]]);
     }
 }
+
+class MethodDispatchObject
+{
+    public $deleted = false;
+    public $forceDeleted = false;
+    public $savedQuietly = false;
+
+    public function title()
+    {
+        return 'the title';
+    }
+
+    public function delete()
+    {
+        $this->deleted = true;
+    }
+
+    public function forceDelete()
+    {
+        $this->forceDeleted = true;
+    }
+
+    public function saveQuietly()
+    {
+        $this->savedQuietly = true;
+    }
+}
diff --git a/tests/Assets/AssetContainerTest.php b/tests/Assets/AssetContainerTest.php
index 91452b506e6..955c04bdb04 100644
--- a/tests/Assets/AssetContainerTest.php
+++ b/tests/Assets/AssetContainerTest.php
@@ -742,6 +742,42 @@ public function it_gets_the_folders_from_the_cache_and_blink_every_time_if_runni
         $this->assertEquals(3, $cacheHits);
     }
 
+    #[Test]
+    public function it_does_not_leak_stale_contents_state_across_calls_when_running_in_a_queue_worker()
+    {
+        $cacheKey = 'asset-list-contents-test';
+
+        Cache::put($cacheKey, collect([
+            'a.txt' => ['type' => 'file', 'path' => 'a.txt', 'dirname' => ''],
+            '.meta/a.txt.yaml' => ['type' => 'file', 'path' => '.meta/a.txt.yaml', 'dirname' => '.meta'],
+        ]));
+
+        $container = (new AssetContainer)->handle('test')->disk('test');
+
+        Request::swap(new FakeArtisanRequest('queue:work'));
+
+        // First job populates the instance's $metaFiles cache. metaFilesIn() has no
+        // isWorker() guard, so if contents() reused the same instance across jobs
+        // the filtered result would stick around and bleed into the next job.
+        $this->assertEquals(
+            ['.meta/a.txt.yaml'],
+            $container->contents()->metaFilesIn('/', true)->keys()->all()
+        );
+
+        // Simulate the next job seeing a different state on disk.
+        Cache::put($cacheKey, collect([
+            'a.txt' => ['type' => 'file', 'path' => 'a.txt', 'dirname' => ''],
+            '.meta/a.txt.yaml' => ['type' => 'file', 'path' => '.meta/a.txt.yaml', 'dirname' => '.meta'],
+            'b.txt' => ['type' => 'file', 'path' => 'b.txt', 'dirname' => ''],
+            '.meta/b.txt.yaml' => ['type' => 'file', 'path' => '.meta/b.txt.yaml', 'dirname' => '.meta'],
+        ]));
+
+        $this->assertEquals(
+            ['.meta/a.txt.yaml', '.meta/b.txt.yaml'],
+            $container->contents()->metaFilesIn('/', true)->keys()->sort()->values()->all()
+        );
+    }
+
     #[Test]
     public function it_gets_an_asset()
     {
diff --git a/tests/Assets/AssetRepositoryTest.php b/tests/Assets/AssetRepositoryTest.php
index 6d9d4c755f8..be2ea47f8a3 100644
--- a/tests/Assets/AssetRepositoryTest.php
+++ b/tests/Assets/AssetRepositoryTest.php
@@ -36,7 +36,7 @@ public function it_saves_the_meta_file_to_disk()
 
         $disk->assertExists($path = 'foo/.meta/image.jpg.yaml');
         $contents = <<<EOT
-data: {  }
+data: {}
 size: 723
 last_modified: $timestamp
 width: 30
@@ -45,7 +45,7 @@ public function it_saves_the_meta_file_to_disk()
 duration: null
 
 EOT;
-        $this->assertEquals($contents, $disk->get($path));
+        $this->assertEquals($contents, $this->normalizeYaml($disk->get($path)));
     }
 
     #[Test]
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index 29c1cc60645..516df9febdf 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -663,6 +663,22 @@ public function it_gets_last_modified_time()
         $this->assertEquals(Carbon::parse('2017-01-02 14:35:00')->timestamp, $lastModified->timestamp);
     }
 
+    #[Test]
+    public function it_does_not_throw_when_getting_last_modified_and_file_doesnt_exist()
+    {
+        // This is really a workaround for an underlying bug.
+        // It's odd for an asset to not have a corresponding file.
+        // Once resolved, this test could be removed, although it doesn't hurt by being here.
+
+        Storage::fake('test');
+        // Intentionally do no not create the actual file.
+
+        $asset = (new Asset)->container($this->container)->path('foo/test.txt');
+
+        $lastModified = $asset->lastModified();
+        $this->assertInstanceOf(Carbon::class, $lastModified);
+    }
+
     #[Test]
     public function it_generates_and_clears_meta_caches()
     {
@@ -953,7 +969,6 @@ public function when_saving_quietly_the_cached_assets_withEvents_flag_will_be_se
 
         $reflection = new ReflectionClass($asset);
         $property = $reflection->getProperty('withEvents');
-        $property->setAccessible(true);
         $withEvents = $property->getValue($asset);
         $this->assertTrue($withEvents);
     }
diff --git a/tests/Assets/AssetUploaderTest.php b/tests/Assets/AssetUploaderTest.php
index 3e2ec8ec5da..773e2e46258 100644
--- a/tests/Assets/AssetUploaderTest.php
+++ b/tests/Assets/AssetUploaderTest.php
@@ -11,8 +11,9 @@ class AssetUploaderTest extends TestCase
 {
     #[Test]
     #[DataProvider('filenameReplacementsProvider')]
-    public function it_gets_safe_filename($originalFilename, $expectedFilename)
+    public function it_gets_safe_filename($originalFilename, $expectedFilename, $config = [])
     {
+        config(['statamic.assets.additional_filename_replacements' => $config]);
         $this->assertEquals($expectedFilename, AssetUploader::getSafeFilename($originalFilename));
     }
 
@@ -34,6 +35,25 @@ public static function filenameReplacementsProvider()
             'single quote' => ["one'two'three.jpg", 'one-two-three.jpg'],
             'double dash' => ['one--two--three.jpg', 'one-two-three.jpg'],
             'ascii' => ['fòô-bàř', 'foo-bar'],
+            'additional config' => [
+                'one,two(6)',
+                'onetwo6',
+                [
+                    ',' => '',
+                    '(' => '',
+                    ')' => '',
+                ],
+            ],
+            'additional config does not override native replacements' => [
+                'one,two%three-(6)',
+                'onetwo-three-6',
+                [
+                    ',' => '',
+                    '(' => '',
+                    ')' => '',
+                    '%' => '_',
+                ],
+            ],
         ];
     }
 }
diff --git a/tests/Assets/AttributesTest.php b/tests/Assets/AttributesTest.php
index 87fc3d02cab..b829722335c 100644
--- a/tests/Assets/AttributesTest.php
+++ b/tests/Assets/AttributesTest.php
@@ -152,6 +152,61 @@ public function it_uses_default_attributes_if_the_svg_has_no_viewbox_and_is_miss
         $this->assertEquals(['width' => 300, 'height' => 150], $this->attributes->asset($this->svgAsset('<svg height="100"></svg>'))->get());
     }
 
+    #[Test]
+    #[DataProvider('exifOrientationProvider')]
+    public function it_respects_exif_orientation_when_getting_image_dimensions($orientation, $expectedWidth, $expectedHeight)
+    {
+        $asset = (new Asset)
+            ->container(AssetContainer::make('test-container')->disk('test'))
+            ->path('path/to/asset.jpg');
+
+        $jpeg = $this->createJpegWithOrientation(4032, 3024, $orientation);
+        Storage::disk('test')->put('path/to/asset.jpg', $jpeg);
+
+        $attributes = $this->attributes->asset($asset)->get();
+
+        $this->assertEquals($expectedWidth, $attributes['width']);
+        $this->assertEquals($expectedHeight, $attributes['height']);
+    }
+
+    public static function exifOrientationProvider()
+    {
+        return [
+            'orientation 1 (normal)' => [1, 4032, 3024],
+            'orientation 2 (flip horizontal)' => [2, 4032, 3024],
+            'orientation 3 (rotate 180)' => [3, 4032, 3024],
+            'orientation 4 (flip vertical)' => [4, 4032, 3024],
+            'orientation 5 (transpose)' => [5, 3024, 4032],
+            'orientation 6 (rotate 90 CW)' => [6, 3024, 4032],
+            'orientation 7 (transverse)' => [7, 3024, 4032],
+            'orientation 8 (rotate 90 CCW)' => [8, 3024, 4032],
+        ];
+    }
+
+    private function createJpegWithOrientation(int $width, int $height, int $orientation): string
+    {
+        $img = imagecreatetruecolor($width, $height);
+        ob_start();
+        imagejpeg($img);
+        $jpeg = ob_get_clean();
+        imagedestroy($img);
+
+        $tiff = pack('A2', 'II')
+            .pack('v', 42)
+            .pack('V', 8)
+            .pack('v', 1)
+            .pack('v', 0x0112)
+            .pack('v', 3)
+            .pack('V', 1)
+            .pack('v', $orientation)."\x00\x00"
+            .pack('V', 0);
+
+        $app1 = "Exif\x00\x00".$tiff;
+        $app1Segment = "\xFF\xE1".pack('n', strlen($app1) + 2).$app1;
+
+        return substr($jpeg, 0, 2).$app1Segment.substr($jpeg, 2);
+    }
+
     private function svgAsset($svg)
     {
         $asset = (new Asset)
diff --git a/tests/Assets/CropAspectRatiosTest.php b/tests/Assets/CropAspectRatiosTest.php
new file mode 100644
index 00000000000..fcf41c4022b
--- /dev/null
+++ b/tests/Assets/CropAspectRatiosTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Tests\Assets;
+
+use Illuminate\Support\Str;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Assets\CropAspectRatios;
+use Tests\TestCase;
+
+class CropAspectRatiosTest extends TestCase
+{
+    #[Test]
+    public function it_returns_default_ratios_from_config()
+    {
+        config()->set('statamic.assets.crop_aspect_ratios', [
+            '16:9',
+            '4:3',
+        ]);
+
+        $this->assertSame([
+            ['label' => '16:9', 'value' => 16 / 9],
+            ['label' => '4:3', 'value' => 4 / 3],
+        ], CropAspectRatios::all());
+    }
+
+    #[Test]
+    public function it_supports_custom_labels_and_fractional_ratio_strings()
+    {
+        config()->set('statamic.assets.crop_aspect_ratios', [
+            ['label' => 'US Letter', 'ratio' => '8.5:11'],
+            ['label' => 'Golden', 'ratio' => 1.618],
+        ]);
+
+        $this->assertSame([
+            ['label' => 'US Letter', 'value' => 8.5 / 11],
+            ['label' => 'Golden', 'value' => 1.618],
+        ], CropAspectRatios::all());
+    }
+
+    #[Test]
+    public function it_translates_labels()
+    {
+        app('translator')->addLines([
+            'crop.wide' => 'Wide Screen',
+        ], 'en');
+
+        config()->set('statamic.assets.crop_aspect_ratios', [
+            ['label' => 'crop.wide', 'ratio' => '16:9'],
+            ['label' => 'Square', 'ratio' => '1:1'],
+        ]);
+
+        $this->assertSame([
+            ['label' => 'Wide Screen', 'value' => 16 / 9],
+            ['label' => 'Square', 'value' => 1.0],
+        ], CropAspectRatios::all());
+    }
+
+    #[Test]
+    public function it_accepts_numeric_and_stringable_labels()
+    {
+        config()->set('statamic.assets.crop_aspect_ratios', [
+            ['label' => 123, 'ratio' => '16:9'],
+            ['label' => Str::of('Stringable'), 'ratio' => '4:3'],
+        ]);
+
+        $this->assertSame([
+            ['label' => '123', 'value' => 16 / 9],
+            ['label' => 'Stringable', 'value' => 4 / 3],
+        ], CropAspectRatios::all());
+    }
+
+    #[Test]
+    public function it_skips_invalid_entries()
+    {
+        config()->set('statamic.assets.crop_aspect_ratios', [
+            '16:9',
+            'bad-value',
+            ['label' => 'Zero height', 'ratio' => '4:0'],
+            ['label' => 'Missing ratio'],
+            ['ratio' => '4:3'],
+            ['label' => 'Valid custom', 'ratio' => '5:4'],
+        ]);
+
+        $this->assertSame([
+            ['label' => '16:9', 'value' => 16 / 9],
+            ['label' => 'Valid custom', 'value' => 5 / 4],
+        ], CropAspectRatios::all());
+    }
+
+    #[Test]
+    public function it_returns_an_empty_array_when_config_is_empty()
+    {
+        config()->set('statamic.assets.crop_aspect_ratios', []);
+
+        $this->assertSame([], CropAspectRatios::all());
+    }
+}
diff --git a/tests/Assets/ReplacementFileTest.php b/tests/Assets/ReplacementFileTest.php
index 3db4a5b00b6..477ed7058b1 100644
--- a/tests/Assets/ReplacementFileTest.php
+++ b/tests/Assets/ReplacementFileTest.php
@@ -30,4 +30,19 @@ public function it_writes_the_file_to_another_disk()
 
         $targetDisk->assertExists('the/new/path.jpg');
     }
+
+    #[Test]
+    public function it_reads_from_configured_disk()
+    {
+        config(['statamic.system.file_uploads_disk' => 'uploads']);
+
+        $originDisk = Storage::fake('uploads');
+        $targetDisk = Storage::fake('target');
+        $originDisk->write('foo/bar/baz.jpg', 'contents');
+
+        (new ReplacementFile('foo/bar/baz.jpg'))->writeTo($targetDisk, 'the/new/path.jpg');
+
+        $targetDisk->assertExists('the/new/path.jpg');
+        $this->assertEquals('contents', $targetDisk->get('the/new/path.jpg'));
+    }
 }
diff --git a/tests/Auth/CpForgotPasswordTest.php b/tests/Auth/CpForgotPasswordTest.php
new file mode 100644
index 00000000000..0e48544b5e9
--- /dev/null
+++ b/tests/Auth/CpForgotPasswordTest.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Tests\Auth;
+
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Facades\Password;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Auth\Passwords\PasswordReset;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class CpForgotPasswordTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    public function tearDown(): void
+    {
+        // Prevent leaking into other tests
+        PasswordReset::resetFormUrl(null);
+        PasswordReset::resetFormRoute(null);
+        PasswordReset::redirectAfterReset(null);
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function it_returns_generic_success_for_non_existent_user_to_prevent_enumeration()
+    {
+        Notification::fake();
+
+        $this
+            ->post(cp_route('password.email'), [
+                'email' => 'nobody@example.com',
+            ])
+            ->assertSessionHasNoErrors()
+            ->assertSessionHas('user.forgot_password.success', __(Password::RESET_LINK_SENT))
+            ->assertSessionHas('status', __(Password::RESET_LINK_SENT));
+
+        Notification::assertNothingSent();
+    }
+
+    #[Test]
+    public function it_returns_generic_success_for_throttled_user_to_prevent_enumeration()
+    {
+        Notification::fake();
+
+        $throttled = new class
+        {
+            public function sendResetLink()
+            {
+                return Password::RESET_THROTTLED;
+            }
+        };
+
+        Password::shouldReceive('broker')->andReturn($throttled);
+
+        User::make()
+            ->email('san@holo.com')
+            ->password('chewy')
+            ->save();
+
+        $this
+            ->post(cp_route('password.email'), [
+                'email' => 'san@holo.com',
+            ])
+            ->assertSessionHasNoErrors()
+            ->assertSessionHas('user.forgot_password.success', __(Password::RESET_LINK_SENT))
+            ->assertSessionHas('status', __(Password::RESET_LINK_SENT));
+
+        Notification::assertNothingSent();
+    }
+
+    #[Test]
+    public function it_still_errors_on_invalid_email_format()
+    {
+        $this
+            ->post(cp_route('password.email'), [
+                'email' => 'not-an-email',
+            ])
+            ->assertSessionHasErrors('email', null, 'user.forgot_password');
+    }
+}
diff --git a/tests/Auth/ElevatedSessionDisabledTest.php b/tests/Auth/ElevatedSessionDisabledTest.php
new file mode 100644
index 00000000000..0ddccfe06ee
--- /dev/null
+++ b/tests/Auth/ElevatedSessionDisabledTest.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Tests\Auth;
+
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('elevated-session')]
+class ElevatedSessionDisabledTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private $user;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->user = User::make()->email('foo@bar.com')->makeSuper()->password('secret');
+        $this->user->save();
+    }
+
+    protected function getEnvironmentSetUp($app)
+    {
+        parent::getEnvironmentSetUp($app);
+
+        $app['config']->set('statamic.users.elevated_sessions_enabled', false);
+    }
+
+    #[Test]
+    public function cp_elevated_session_routes_are_not_registered()
+    {
+        $this->actingAs($this->user);
+
+        $this->get('/cp/elevated-session')->assertNotFound();
+        $this->get('/cp/elevated-session/passkey-options')->assertNotFound();
+        $this->post('/cp/elevated-session')->assertNotFound();
+        $this->get('/cp/elevated-session/resend-code')->assertNotFound();
+        $this->get('/cp/auth/confirm-password')->assertNotFound();
+    }
+
+    #[Test]
+    public function frontend_elevated_session_routes_are_not_registered()
+    {
+        $this->actingAs($this->user);
+
+        $this->get('/!/auth/confirm-password')->assertNotFound();
+        $this->post('/!/auth/elevated-session')->assertNotFound();
+        $this->get('/!/auth/elevated-session/passkey-options')->assertNotFound();
+        $this->get('/!/auth/elevated-session/resend-code')->assertNotFound();
+    }
+}
diff --git a/tests/Auth/ElevatedSessionTest.php b/tests/Auth/ElevatedSessionTest.php
index 242670a63df..ae83c518ccf 100644
--- a/tests/Auth/ElevatedSessionTest.php
+++ b/tests/Auth/ElevatedSessionTest.php
@@ -12,7 +12,7 @@
 use Statamic\Contracts\Auth\Passkey;
 use Statamic\Facades\User;
 use Statamic\Facades\WebAuthn;
-use Statamic\Http\Middleware\CP\RequireElevatedSession;
+use Statamic\Http\Middleware;
 use Statamic\Notifications\ElevatedSessionVerificationCode;
 use Tests\ElevatesSessions;
 use Tests\PreventSavingStacheItemsToDisk;
@@ -43,7 +43,19 @@ protected function resolveApplicationConfiguration($app)
         $app->booted(function () {
             Route::get('/requires-elevated-session', function () {
                 return 'ok';
-            })->middleware(RequireElevatedSession::class);
+            })->middleware(Middleware\RequireElevatedSession::class);
+
+            Route::post('/requires-elevated-session', function () {
+                return 'ok';
+            })->middleware(Middleware\RequireElevatedSession::class);
+
+            Route::get('/cp/requires-elevated-session', function () {
+                return 'ok';
+            })->middleware(Middleware\CP\RequireElevatedSession::class);
+
+            Route::post('/cp/requires-elevated-session', function () {
+                return 'ok';
+            })->middleware(Middleware\CP\RequireElevatedSession::class);
         });
     }
 
@@ -64,6 +76,26 @@ public function it_can_get_status_of_elevated_session()
             ]);
     }
 
+    /**
+     * @see https://github.com/statamic/cms/pull/14771
+     **/
+    #[Test]
+    public function it_handles_string_config_value_for_elevated_session_duration()
+    {
+        config(['statamic.users.elevated_session_duration' => '15.5']);
+
+        $this
+            ->withElevatedSession(now()->subMinutes(5))
+            ->actingAs($this->user)
+            ->get('/cp/elevated-session')
+            ->assertOk()
+            ->assertJson([
+                'elevated' => true,
+                'expiry' => now()->addMinutes(10.5)->timestamp,
+                'method' => 'password_confirmation',
+            ]);
+    }
+
     #[Test]
     public function it_can_get_status_of_elevated_session_when_session_key_does_not_exist()
     {
@@ -171,6 +203,23 @@ public function it_can_start_elevated_session_via_json()
             ->assertSessionHas('statamic_elevated_session', now()->timestamp);
     }
 
+    #[Test]
+    public function starting_elevated_session_clears_stored_verification_code()
+    {
+        $user = tap(User::make()->email('foo@bar.com')->makeSuper())->save();
+
+        session()->put('statamic_elevated_session_verification_code', [
+            'code' => 'abc',
+            'generated_at' => now()->timestamp,
+        ]);
+
+        $this
+            ->actingAs($user)
+            ->post('/cp/elevated-session', ['verification_code' => 'abc'])
+            ->assertSessionHas('statamic_elevated_session', now()->timestamp)
+            ->assertSessionMissing('statamic_elevated_session_verification_code');
+    }
+
     #[Test]
     public function it_cannot_start_elevated_session_with_incorrect_password()
     {
@@ -272,7 +321,7 @@ public function middleware_allows_request()
 
         $this
             ->withElevatedSession()
-            ->get('/requires-elevated-session')
+            ->get('/cp/requires-elevated-session')
             ->assertOk()
             ->assertSee('ok');
     }
@@ -284,10 +333,58 @@ public function middleware_denies_request_when_elevated_session_has_expired()
 
         $this
             ->withElevatedSession(now()->subMinutes(16))
-            ->get('/requires-elevated-session')
+            ->get('/cp/requires-elevated-session')
             ->assertRedirect('/cp/auth/confirm-password');
     }
 
+    #[Test]
+    public function middleware_uses_referer_as_intended_url_for_post_requests()
+    {
+        $this->actingAs($this->user);
+
+        $this
+            ->withElevatedSession(now()->subMinutes(16))
+            ->post('/cp/requires-elevated-session', [], ['referer' => 'http://localhost/cp/some-form'])
+            ->assertRedirect('/cp/auth/confirm-password')
+            ->assertSessionHas('url.intended', 'http://localhost/cp/some-form');
+    }
+
+    #[Test]
+    public function middleware_falls_back_to_full_url_when_referer_is_external_for_post_requests()
+    {
+        $this->actingAs($this->user);
+
+        $this
+            ->withElevatedSession(now()->subMinutes(16))
+            ->post('/cp/requires-elevated-session', [], ['referer' => 'https://evil.example.com/form'])
+            ->assertRedirect('/cp/auth/confirm-password')
+            ->assertSessionHas('url.intended', 'http://localhost/cp/requires-elevated-session');
+    }
+
+    #[Test]
+    public function middleware_falls_back_to_full_url_when_referer_is_missing_for_post_requests()
+    {
+        $this->actingAs($this->user);
+
+        $this
+            ->withElevatedSession(now()->subMinutes(16))
+            ->post('/cp/requires-elevated-session')
+            ->assertRedirect('/cp/auth/confirm-password')
+            ->assertSessionHas('url.intended', 'http://localhost/cp/requires-elevated-session');
+    }
+
+    #[Test]
+    public function middleware_uses_full_url_as_intended_url_for_get_requests()
+    {
+        $this->actingAs($this->user);
+
+        $this
+            ->withElevatedSession(now()->subMinutes(16))
+            ->get('/cp/requires-elevated-session', ['referer' => 'http://localhost/cp/some-form'])
+            ->assertRedirect('/cp/auth/confirm-password')
+            ->assertSessionHas('url.intended', 'http://localhost/cp/requires-elevated-session');
+    }
+
     #[Test]
     public function middleware_denies_request_when_elevated_session_has_expired_via_json()
     {
@@ -295,11 +392,52 @@ public function middleware_denies_request_when_elevated_session_has_expired_via_
 
         $this
             ->withElevatedSession(now()->subMinutes(16))
-            ->getJson('/requires-elevated-session')
+            ->getJson('/cp/requires-elevated-session')
             ->assertStatus(403)
             ->assertJson(['message' => __('Requires an elevated session.')]);
     }
 
+    #[Test]
+    public function middleware_does_not_require_elevated_session_when_elevated_session_is_disabled()
+    {
+        config(['statamic.users.elevated_sessions_enabled' => false]);
+
+        $this->actingAs($this->user);
+
+        $this
+            ->get('/requires-elevated-session')
+            ->assertOk()
+            ->assertSee('ok');
+    }
+
+    #[Test]
+    public function middleware_does_not_require_elevated_session_when_elevated_session_is_disabled_even_if_session_expired()
+    {
+        config(['statamic.users.elevated_sessions_enabled' => false]);
+
+        $this->actingAs($this->user);
+
+        $this
+            ->withElevatedSession(now()->subMinutes(16))
+            ->get('/requires-elevated-session')
+            ->assertOk()
+            ->assertSee('ok');
+    }
+
+    #[Test]
+    public function middleware_does_not_require_elevated_session_when_elevated_session_is_disabled_via_json()
+    {
+        config(['statamic.users.elevated_sessions_enabled' => false]);
+
+        $this->actingAs($this->user);
+
+        $this
+            ->withElevatedSession(now()->subMinutes(16))
+            ->getJson('/requires-elevated-session')
+            ->assertOk()
+            ->assertSee('ok');
+    }
+
     #[Test]
     public function the_session_is_elevated_upon_login()
     {
@@ -311,7 +449,7 @@ public function the_session_is_elevated_upon_login()
             ->assertRedirectToRoute('statamic.cp.index');
 
         $this
-            ->get('/requires-elevated-session')
+            ->get('/cp/requires-elevated-session')
             ->assertOk();
     }
 
@@ -374,7 +512,7 @@ public function the_verification_code_can_be_resent()
             ->from('/original')
             ->get(cp_route('elevated-session.resend-code'))
             ->assertRedirect('/original')
-            ->assertSessionHas('success')
+            ->assertSessionHas('status')
             ->assertSessionHas('statamic_elevated_session_verification_code', [
                 'code' => 'abc',
                 'generated_at' => now()->timestamp,
@@ -398,12 +536,35 @@ public function resending_code_is_rate_limited()
                 ->get(cp_route('elevated-session.resend-code'));
         };
 
-        $request()->assertRedirect('/original')->assertSessionHas('success');
+        $request()->assertRedirect('/original')->assertSessionHas('status');
         $request()->assertRedirect('/original')->assertSessionHas('error', 'Try again in a minute.');
         $this->travel(30)->seconds();
         $request()->assertRedirect('/original')->assertSessionHas('error', 'Try again in a minute.');
         $this->travel(1)->minute();
-        $request()->assertRedirect('/original')->assertSessionHas('success');
+        $request()->assertRedirect('/original')->assertSessionHas('status');
+
+        Notification::assertCount(2);
+    }
+
+    #[Test]
+    public function frontend_resending_code_is_rate_limited()
+    {
+        Notification::fake();
+        $user = User::make()->email('foo@bar.com')->makeSuper();
+
+        $request = function () use ($user) {
+            return $this
+                ->actingAs($user)
+                ->from('/original')
+                ->get(route('statamic.elevated-session.resend-code'));
+        };
+
+        $request()->assertRedirect('/original')->assertSessionHas('status');
+        $request()->assertRedirect('/original')->assertSessionHas('error', 'Try again in a minute.');
+        $this->travel(30)->seconds();
+        $request()->assertRedirect('/original')->assertSessionHas('error', 'Try again in a minute.');
+        $this->travel(1)->minute();
+        $request()->assertRedirect('/original')->assertSessionHas('status');
 
         Notification::assertCount(2);
     }
@@ -418,7 +579,7 @@ public function the_verification_code_will_not_be_sent_if_the_user_has_a_passwor
             ->actingAs($this->user)
             ->from('/original')
             ->get(cp_route('elevated-session.resend-code'))
-            ->assertSessionHasErrors(['method' => 'Resend code is only available for verification code method'])
+            ->assertSessionHasErrors(['method' => 'Resend code is only available for verification code method.'])
             ->assertSessionMissing('statamic_elevated_session_verification_code');
 
         Notification::assertNothingSent();
@@ -437,7 +598,6 @@ public function it_returns_passkey_method_when_config_is_false_and_user_has_pass
         // Use reflection to set the passkeys property
         $reflection = new \ReflectionClass($user);
         $property = $reflection->getProperty('passkeys');
-        $property->setAccessible(true);
         $property->setValue($user, $mockCollection);
 
         $this->assertEquals('passkey', $user->getElevatedSessionMethod());
@@ -456,7 +616,6 @@ public function it_returns_password_confirmation_method_when_config_is_true_even
         // Use reflection to set the passkeys property
         $reflection = new \ReflectionClass($user);
         $property = $reflection->getProperty('passkeys');
-        $property->setAccessible(true);
         $property->setValue($user, $mockCollection);
 
         $this->assertEquals('password_confirmation', $user->getElevatedSessionMethod());
@@ -493,7 +652,6 @@ public function it_can_get_passkey_options_for_elevated_session()
         // Use reflection to set the passkeys property
         $reflection = new \ReflectionClass($user);
         $property = $reflection->getProperty('passkeys');
-        $property->setAccessible(true);
         $property->setValue($user, $mockCollection);
 
         $response = $this
@@ -520,7 +678,6 @@ public function it_can_start_elevated_session_with_passkey()
         // Use reflection to set the passkeys property
         $reflection = new \ReflectionClass($user);
         $property = $reflection->getProperty('passkeys');
-        $property->setAccessible(true);
         $property->setValue($user, $mockCollection);
 
         $credentials = [
@@ -556,7 +713,6 @@ public function status_endpoint_returns_passkey_method()
         // Use reflection to set the passkeys property
         $reflection = new \ReflectionClass($user);
         $property = $reflection->getProperty('passkeys');
-        $property->setAccessible(true);
         $property->setValue($user, $mockCollection);
 
         $this
@@ -569,4 +725,182 @@ public function status_endpoint_returns_passkey_method()
                 'method' => 'passkey',
             ]);
     }
+
+    #[Test]
+    public function frontend_middleware_allows_request()
+    {
+        $this->actingAs($this->user);
+
+        $this
+            ->withElevatedSession()
+            ->get('/requires-elevated-session')
+            ->assertOk()
+            ->assertSee('ok');
+    }
+
+    #[Test]
+    public function frontend_middleware_denies_request_when_elevated_session_has_expired()
+    {
+        $this->actingAs($this->user);
+
+        $this
+            ->withElevatedSession(now()->subMinutes(16))
+            ->get('/requires-elevated-session')
+            ->assertRedirect('/!/auth/confirm-password');
+    }
+
+    #[Test]
+    public function frontend_middleware_denies_request_when_elevated_session_has_expired_via_json()
+    {
+        $this->actingAs($this->user);
+
+        $this
+            ->withElevatedSession(now()->subMinutes(16))
+            ->getJson('/requires-elevated-session')
+            ->assertStatus(403)
+            ->assertJson(['message' => __('Requires an elevated session.')]);
+    }
+
+    #[Test]
+    public function frontend_elevated_session_redirects_to_custom_url_when_configured()
+    {
+        config(['statamic.users.elevated_sessions_url' => '/custom-elevated-session']);
+
+        $this
+            ->actingAs($this->user)
+            ->get('/!/auth/confirm-password')
+            ->assertRedirect('/custom-elevated-session');
+    }
+
+    #[Test]
+    public function frontend_elevated_session_shows_inertia_page_when_no_custom_url()
+    {
+        config(['statamic.users.elevated_sessions_url' => null]);
+
+        $this
+            ->actingAs($this->user)
+            ->get('/!/auth/confirm-password')
+            ->assertInertia(fn ($page) => $page
+                ->component('auth/ConfirmPassword')
+                ->where('outside', true)
+                ->has('method')
+                ->has('allowPasskey')
+                ->has('submitUrl')
+                ->has('resendUrl')
+                ->has('passkeyOptionsUrl')
+            );
+    }
+
+    #[Test]
+    public function frontend_can_confirm_elevated_session_with_password()
+    {
+        redirect()->setIntendedUrl('/target-url');
+
+        $this
+            ->actingAs($this->user)
+            ->post('/!/auth/elevated-session', ['password' => 'secret'])
+            ->assertRedirect('/target-url')
+            ->assertSessionHas('statamic_elevated_session', now()->timestamp);
+    }
+
+    #[Test]
+    public function frontend_can_confirm_elevated_session_via_json()
+    {
+        $this
+            ->actingAs($this->user)
+            ->postJson('/!/auth/elevated-session', ['password' => 'secret'])
+            ->assertOk()
+            ->assertJsonStructure(['elevated', 'expiry', 'redirect'])
+            ->assertSessionHas('statamic_elevated_session', now()->timestamp);
+    }
+
+    #[Test]
+    public function frontend_can_confirm_elevated_session_via_inertia()
+    {
+        redirect()->setIntendedUrl('/target-url');
+
+        $this
+            ->actingAs($this->user)
+            ->post('/!/auth/elevated-session', ['password' => 'secret'], ['X-Inertia' => 'true'])
+            ->assertStatus(409)
+            ->assertHeader('X-Inertia-Location', 'http://localhost/target-url')
+            ->assertSessionHas('statamic_elevated_session', now()->timestamp);
+    }
+
+    #[Test]
+    public function frontend_cannot_confirm_elevated_session_with_incorrect_password()
+    {
+        $this
+            ->actingAs($this->user)
+            ->post('/!/auth/elevated-session', ['password' => 'wrong'])
+            ->assertSessionHasErrors(['password'], null, 'user.elevated_session')
+            ->assertSessionMissing('statamic_elevated_session');
+    }
+
+    #[Test]
+    public function frontend_inertia_request_puts_errors_in_default_bag()
+    {
+        $this
+            ->actingAs($this->user)
+            ->post('/!/auth/elevated-session', ['password' => 'wrong'], ['X-Inertia' => 'true'])
+            ->assertSessionHasErrors(['password'])
+            ->assertSessionMissing('statamic_elevated_session');
+    }
+
+    #[Test]
+    public function frontend_verification_code_will_be_sent_for_passwordless_user_when_loading_the_form()
+    {
+        Notification::fake();
+        Str::createRandomStringsUsing(fn () => 'abc');
+        config(['statamic.users.elevated_sessions_url' => null]);
+
+        $this
+            ->actingAs($user = tap(User::make()->email('foo@bar.com')->makeSuper())->save())
+            ->get('/!/auth/confirm-password')
+            ->assertSessionHas('statamic_elevated_session_verification_code', [
+                'code' => 'abc',
+                'generated_at' => now()->timestamp,
+            ]);
+
+        Notification::assertSentTo($user, ElevatedSessionVerificationCode::class, function ($notification) {
+            return $notification->verificationCode === 'abc';
+        });
+    }
+
+    #[Test]
+    public function frontend_verification_code_can_be_resent()
+    {
+        Notification::fake();
+        Str::createRandomStringsUsing(fn () => 'abc');
+
+        $this
+            ->actingAs($user = User::make()->email('foo@bar.com')->makeSuper())
+            ->from('/original')
+            ->get('/!/auth/elevated-session/resend-code')
+            ->assertRedirect('/original')
+            ->assertSessionHas('status')
+            ->assertSessionHas('statamic_elevated_session_verification_code', [
+                'code' => 'abc',
+                'generated_at' => now()->timestamp,
+            ]);
+
+        Notification::assertSentTo($user, ElevatedSessionVerificationCode::class, function ($notification) {
+            return $notification->verificationCode === 'abc';
+        });
+    }
+
+    #[Test]
+    public function the_session_is_elevated_upon_frontend_login()
+    {
+        $this
+            ->post('/!/auth/login', [
+                'email' => 'foo@bar.com',
+                'password' => 'secret',
+            ])
+            ->assertRedirect('/');
+
+        $this
+            ->get('/requires-elevated-session')
+            ->assertOk();
+    }
 }
diff --git a/tests/Auth/Eloquent/EloquentUserTest.php b/tests/Auth/Eloquent/EloquentUserTest.php
index 205c4fa1636..e00dcf3c57b 100644
--- a/tests/Auth/Eloquent/EloquentUserTest.php
+++ b/tests/Auth/Eloquent/EloquentUserTest.php
@@ -14,6 +14,7 @@
 use Statamic\Auth\Eloquent\WebAuthnModel;
 use Statamic\Auth\File\Role;
 use Statamic\Auth\File\UserGroup;
+use Statamic\Auth\PermissionCache;
 use Statamic\Auth\WebAuthn\Serializer;
 use Statamic\Contracts\Auth\Role as RoleContract;
 use Statamic\Contracts\Auth\UserGroup as UserGroupContract;
@@ -335,6 +336,20 @@ public function it_does_not_save_null_values_on_the_model()
         $this->assertFalse($attributes['not_null_field']);
     }
 
+    #[Test]
+    public function merge_does_not_set_roles_and_groups_as_model_attributes()
+    {
+        $user = $this->user();
+
+        $user->merge(['name' => 'Updated Name']);
+
+        $attributes = $user->model()->getAttributes();
+
+        $this->assertArrayNotHasKey('roles', $attributes);
+        $this->assertArrayNotHasKey('groups', $attributes);
+        $this->assertEquals('Updated Name', $attributes['name']);
+    }
+
     #[Test]
     #[Group('passkeys')]
     public function it_gets_passkeys()
@@ -397,4 +412,63 @@ public function deserialize($data)
             ->all()
         );
     }
+
+    #[Test]
+    public function permissions_are_cached_after_first_call()
+    {
+        $role = Facades\Role::make('editor')->addPermission('access cp');
+        Facades\Role::shouldReceive('find')->with('editor')->andReturn($role);
+
+        $user = $this->createPermissible()->assignRole($role);
+        $user->save();
+
+        $cache = app(PermissionCache::class);
+
+        $this->assertNull($cache->get($user->id()));
+
+        $user->permissions();
+
+        $this->assertNotNull($cache->get($user->id()));
+        $this->assertTrue($cache->get($user->id())->contains('access cp'));
+    }
+
+    #[Test]
+    public function permissions_are_read_from_cache_on_subsequent_calls()
+    {
+        $role = Facades\Role::make('editor')->addPermission('access cp');
+        Facades\Role::shouldReceive('find')->with('editor')->andReturn($role);
+
+        $user = $this->createPermissible()->assignRole($role);
+        $user->save();
+
+        $cache = app(PermissionCache::class);
+
+        // Seed the cache with different data to prove subsequent calls use it
+        $cache->put($user->id(), collect(['cached-permission']));
+
+        $this->assertEquals(['cached-permission'], $user->permissions()->all());
+        $this->assertTrue($user->hasPermission('cached-permission'));
+        $this->assertFalse($user->hasPermission('access cp'));
+    }
+
+    #[Test]
+    public function permissions_cache_is_invalidated_when_cleared()
+    {
+        $role = Facades\Role::make('editor')->addPermission('access cp');
+        Facades\Role::shouldReceive('find')->with('editor')->andReturn($role);
+
+        $user = $this->createPermissible()->assignRole($role);
+        $user->save();
+
+        $cache = app(PermissionCache::class);
+
+        $user->permissions();
+        $this->assertNotNull($cache->get($user->id()));
+
+        $cache->clear();
+        $this->assertNull($cache->get($user->id()));
+
+        // Recomputes correctly after cache is cleared
+        $this->assertTrue($user->permissions()->contains('access cp'));
+    }
 }
diff --git a/tests/Auth/LoginTest.php b/tests/Auth/LoginTest.php
index 250494e32ac..8f4bd741145 100644
--- a/tests/Auth/LoginTest.php
+++ b/tests/Auth/LoginTest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Event;
+use Orchestra\Testbench\Attributes\DefineEnvironment;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Auth\TwoFactor\RecoveryCode;
@@ -94,20 +95,26 @@ public function it_redirects_to_the_two_factor_challenge_page()
     }
 
     #[Test]
-    public function it_redirects_to_referer_url()
+    #[DefineEnvironment('disableTwoFactor')]
+    public function it_skips_two_factor_challenge_when_two_factor_is_disabled()
     {
-        $user = $this->user();
+        Event::fake();
+
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this->withoutExceptionHandling();
 
         $this
             ->assertGuest()
             ->post(cp_route('login'), [
                 'email' => $user->email(),
                 'password' => 'secret',
-                'referer' => 'http://localhost/cp/cp/collections',
             ])
-            ->assertRedirect('http://localhost/cp/cp/collections');
+            ->assertRedirect(cp_route('index'));
 
         $this->assertAuthenticatedAs($user);
+
+        Event::assertNotDispatched(TwoFactorAuthenticationChallenged::class);
     }
 
     #[Test]
@@ -127,6 +134,52 @@ public function it_redirects_to_intended_url()
         $this->assertAuthenticatedAs($user);
     }
 
+    #[Test]
+    public function inertia_login_returns_a_full_page_redirect()
+    {
+        // Inertia would otherwise auto-follow a 302 with X-Inertia headers and swap to
+        // the dashboard component without the protected props it needs to render.
+        // Returning 409 + X-Inertia-Location forces a full browser navigation instead.
+        $user = $this->user();
+
+        $this
+            ->assertGuest()
+            ->post(cp_route('login'), [
+                'email' => $user->email(),
+                'password' => 'secret',
+            ], ['X-Inertia' => 'true'])
+            ->assertStatus(409)
+            ->assertHeader('X-Inertia-Location', cp_route('index'));
+
+        $this->assertAuthenticatedAs($user);
+    }
+
+    #[Test]
+    public function inertia_login_redirects_to_intended_url_via_full_page_redirect()
+    {
+        $user = $this->user();
+
+        $this
+            ->assertGuest()
+            ->session(['url.intended' => 'http://localhost/cp/cp/collections'])
+            ->post(cp_route('login'), [
+                'email' => $user->email(),
+                'password' => 'secret',
+            ], ['X-Inertia' => 'true'])
+            ->assertStatus(409)
+            ->assertHeader('X-Inertia-Location', 'http://localhost/cp/cp/collections');
+
+        $this->assertAuthenticatedAs($user);
+    }
+
+    #[Test]
+    public function it_stores_the_intended_url_when_redirected_to_login()
+    {
+        $this
+            ->get(cp_route('collections.index'))
+            ->assertSessionHas('url.intended', 'http://localhost/cp/collections');
+    }
+
     #[Test]
     public function it_can_logout()
     {
@@ -170,6 +223,11 @@ public function it_cant_logout_when_unauthenticated()
         $this->assertGuest();
     }
 
+    protected function disableTwoFactor($app)
+    {
+        $app['config']->set('statamic.users.two_factor_enabled', false);
+    }
+
     private function user()
     {
         return tap(User::make()->makeSuper()->email('david@hasselhoff.com')->password('secret'))->save();
diff --git a/tests/Auth/ResetPasswordTest.php b/tests/Auth/ResetPasswordTest.php
new file mode 100644
index 00000000000..daf5bcf4afa
--- /dev/null
+++ b/tests/Auth/ResetPasswordTest.php
@@ -0,0 +1,246 @@
+<?php
+
+namespace Tests\Auth;
+
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Password;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Auth\File\Passkey;
+use Statamic\Auth\Passwords\PasswordReset;
+use Statamic\Auth\TwoFactor\RecoveryCode;
+use Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider;
+use Statamic\Facades\User;
+use Symfony\Component\Uid\Uuid;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+use Webauthn\CredentialRecord;
+use Webauthn\TrustPath\EmptyTrustPath;
+
+class ResetPasswordTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    public static function resetPasswordProvider()
+    {
+        return [
+            'cp' => ['cp'],
+            'web' => ['web'],
+        ];
+    }
+
+    private function resetUrl($type)
+    {
+        return match ($type) {
+            'cp' => cp_route('password.reset.action'),
+            'web' => route('statamic.password.reset.action'),
+        };
+    }
+
+    private function defaultRedirectUrl($type)
+    {
+        return match ($type) {
+            'cp' => cp_route('login'),
+            'web' => route('statamic.site'),
+        };
+    }
+
+    private function createUser()
+    {
+        return tap(User::make()->makeSuper()->email('san@holo.com')->password('secret'))->save();
+    }
+
+    private function enableTwoFactor($user)
+    {
+        $user->merge([
+            'two_factor_confirmed_at' => now()->timestamp,
+            'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+            'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, function () {
+                return RecoveryCode::generate();
+            })->all())),
+        ]);
+
+        $user->save();
+
+        return $user;
+    }
+
+    private function addPasskey($user)
+    {
+        $credential = CredentialRecord::create(
+            publicKeyCredentialId: 'test-credential-id',
+            type: 'public-key',
+            transports: ['usb'],
+            attestationType: 'none',
+            trustPath: new EmptyTrustPath(),
+            aaguid: Uuid::fromString('00000000-0000-0000-0000-000000000000'),
+            credentialPublicKey: 'test-public-key',
+            userHandle: $user->id(),
+            counter: 0,
+        );
+
+        $passkey = (new Passkey)->setUser($user)->setName('Test Key')->setCredential($credential);
+        $passkey->save();
+
+        return $user->fresh();
+    }
+
+    private function createToken($user, $type)
+    {
+        $broker = config('statamic.users.passwords.'.PasswordReset::BROKER_RESETS);
+
+        if (is_array($broker)) {
+            $broker = $broker[$type];
+        }
+
+        return Password::broker($broker)->createToken($user);
+    }
+
+    #[Test]
+    #[DataProvider('resetPasswordProvider')]
+    public function it_resets_the_password_and_user_is_not_authenticated($type)
+    {
+        $user = $this->createUser();
+        $token = $this->createToken($user, $type);
+
+        $this
+            ->assertGuest()
+            ->post($this->resetUrl($type), [
+                'token' => $token,
+                'email' => 'san@holo.com',
+                'password' => 'newpassword',
+                'password_confirmation' => 'newpassword',
+            ])
+            ->assertSessionHas('status')
+            ->assertRedirect($this->defaultRedirectUrl($type));
+
+        $this->assertGuest();
+        $this->assertTrue(Hash::check('newpassword', $user->fresh()->password()));
+    }
+
+    #[Test]
+    #[DataProvider('resetPasswordProvider')]
+    public function it_resets_password_for_two_factor_user_and_user_is_not_authenticated($type)
+    {
+        $user = $this->enableTwoFactor($this->createUser());
+        $token = $this->createToken($user, $type);
+
+        $this
+            ->assertGuest()
+            ->post($this->resetUrl($type), [
+                'token' => $token,
+                'email' => 'san@holo.com',
+                'password' => 'newpassword',
+                'password_confirmation' => 'newpassword',
+            ])
+            ->assertSessionHas('status')
+            ->assertRedirect($this->defaultRedirectUrl($type));
+
+        $this->assertGuest();
+        $this->assertTrue(Hash::check('newpassword', $user->fresh()->password()));
+    }
+
+    #[Test]
+    #[DataProvider('resetPasswordProvider')]
+    public function it_resets_password_for_passkey_user_and_user_is_not_authenticated($type)
+    {
+        config(['statamic.webauthn.allow_password_login_with_passkey' => false]);
+
+        $user = $this->addPasskey($this->createUser());
+        $token = $this->createToken($user, $type);
+
+        $this
+            ->assertGuest()
+            ->post($this->resetUrl($type), [
+                'token' => $token,
+                'email' => 'san@holo.com',
+                'password' => 'newpassword',
+                'password_confirmation' => 'newpassword',
+            ])
+            ->assertSessionHas('status')
+            ->assertRedirect($this->defaultRedirectUrl($type));
+
+        $this->assertGuest();
+        $this->assertTrue(Hash::check('newpassword', $user->fresh()->password()));
+    }
+
+    #[Test]
+    #[DataProvider('resetPasswordProvider')]
+    public function it_prefills_email_on_the_reset_form_from_the_token($type)
+    {
+        $user = $this->createUser();
+        $token = $this->createToken($user, $type);
+
+        $url = match ($type) {
+            'cp' => cp_route('password.reset', $token),
+            'web' => route('statamic.password.reset', $token),
+        };
+
+        $this
+            ->get($url)
+            ->assertOk()
+            ->assertInertia(fn ($page) => $page
+                ->component('auth/passwords/Reset')
+                ->where('email', 'san@holo.com')
+                ->where('emailReadonly', true)
+            );
+    }
+
+    #[Test]
+    #[DataProvider('resetPasswordProvider')]
+    public function it_allows_email_to_be_provided_in_the_query_string($type)
+    {
+        $user = $this->createUser();
+        $token = $this->createToken($user, $type);
+
+        $url = match ($type) {
+            'cp' => cp_route('password.reset', $token),
+            'web' => route('statamic.password.reset', $token),
+        };
+
+        $this
+            ->get($url.'?email=other@example.com')
+            ->assertOk()
+            ->assertInertia(fn ($page) => $page
+                ->component('auth/passwords/Reset')
+                ->where('email', 'other@example.com')
+                ->where('emailReadonly', false)
+            );
+    }
+
+    #[Test]
+    public function it_prefills_email_on_the_account_activation_form_from_the_token()
+    {
+        $user = tap(User::make()->email('san@holo.com'))->save();
+        $token = $user->generateActivateAccountToken();
+
+        $this
+            ->get(route('statamic.account.activate', $token))
+            ->assertOk()
+            ->assertInertia(fn ($page) => $page
+                ->component('auth/passwords/Reset')
+                ->where('email', 'san@holo.com')
+                ->where('emailReadonly', true)
+            );
+    }
+
+    #[Test]
+    #[DataProvider('resetPasswordProvider')]
+    public function it_throttles_requests_to_the_reset_form($type)
+    {
+        $user = $this->createUser();
+        $token = $this->createToken($user, $type);
+
+        $url = match ($type) {
+            'cp' => cp_route('password.reset', $token),
+            'web' => route('statamic.password.reset', $token),
+        };
+
+        foreach (range(1, 15) as $i) {
+            $this->get($url)->assertOk();
+        }
+
+        $this->get($url)->assertStatus(429);
+    }
+}
diff --git a/tests/Auth/TokenRepositoryTest.php b/tests/Auth/TokenRepositoryTest.php
new file mode 100644
index 00000000000..baa0db55ce6
--- /dev/null
+++ b/tests/Auth/TokenRepositoryTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Tests\Auth;
+
+use Illuminate\Support\Facades\Password;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Auth\Passwords\PasswordReset;
+use Statamic\Auth\Passwords\TokenRepository;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class TokenRepositoryTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function repository(string $broker): TokenRepository
+    {
+        $broker = config('statamic.users.passwords.'.$broker);
+
+        if (is_array($broker)) {
+            $broker = $broker['cp'];
+        }
+
+        return Password::broker($broker)->getRepository();
+    }
+
+    #[Test]
+    public function it_finds_email_by_token()
+    {
+        $user = tap(User::make()->email('san@holo.com')->password('secret'))->save();
+
+        $token = Password::broker(config('statamic.users.passwords.'.PasswordReset::BROKER_RESETS))->createToken($user);
+
+        $this->assertSame('san@holo.com', $this->repository(PasswordReset::BROKER_RESETS)->findEmailByToken($token));
+    }
+
+    #[Test]
+    public function it_returns_null_for_invalid_token()
+    {
+        $this->assertNull($this->repository(PasswordReset::BROKER_RESETS)->findEmailByToken('invalid-token'));
+    }
+
+    #[Test]
+    public function it_returns_null_for_expired_token()
+    {
+        $user = tap(User::make()->email('san@holo.com')->password('secret'))->save();
+
+        $repository = $this->repository(PasswordReset::BROKER_RESETS);
+        $token = Password::broker(config('statamic.users.passwords.'.PasswordReset::BROKER_RESETS))->createToken($user);
+
+        $this->travel(2)->hours();
+
+        $this->assertNull($repository->findEmailByToken($token));
+    }
+}
diff --git a/tests/Auth/UserContractTests.php b/tests/Auth/UserContractTests.php
index 724af5aa1ae..7f6d9b2cd6d 100644
--- a/tests/Auth/UserContractTests.php
+++ b/tests/Auth/UserContractTests.php
@@ -669,6 +669,23 @@ public function it_determines_if_the_user_has_enabled_two_factor_authentication(
         $this->assertTrue($user->hasEnabledTwoFactorAuthentication());
     }
 
+    #[Test]
+    public function it_does_not_require_two_factor_when_globally_disabled_even_if_user_has_setup()
+    {
+        config()->set('statamic.users.two_factor_enabled', false);
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
+
+        $user = $this->makeUser()
+            ->makeSuper()
+            ->set('two_factor_secret', 'secret')
+            ->set('two_factor_confirmed_at', now()->timestamp);
+
+        $user->save();
+
+        $this->assertTrue($user->hasEnabledTwoFactorAuthentication());
+        $this->assertFalse($user->isTwoFactorAuthenticationRequired());
+    }
+
     #[Test]
     public function it_gets_recovery_codes()
     {
diff --git a/tests/Auth/WebAuthn/EloquentPasskeyTest.php b/tests/Auth/WebAuthn/EloquentPasskeyTest.php
index 7626423d139..9bf27c38b5f 100644
--- a/tests/Auth/WebAuthn/EloquentPasskeyTest.php
+++ b/tests/Auth/WebAuthn/EloquentPasskeyTest.php
@@ -13,7 +13,7 @@
 use Statamic\Facades\User;
 use Symfony\Component\Uid\Uuid;
 use Tests\TestCase;
-use Webauthn\PublicKeyCredentialSource;
+use Webauthn\CredentialRecord;
 use Webauthn\TrustPath\EmptyTrustPath;
 
 #[Group('passkeys')]
@@ -71,9 +71,9 @@ protected function newPasskey(): \Statamic\Contracts\Auth\Passkey
         return new Passkey;
     }
 
-    protected function createTestCredential(string $id = 'test-credential-id-123'): PublicKeyCredentialSource
+    protected function createTestCredential(string $id = 'test-credential-id-123'): CredentialRecord
     {
-        return PublicKeyCredentialSource::create(
+        return CredentialRecord::create(
             publicKeyCredentialId: $id,
             type: 'public-key',
             transports: ['usb', 'nfc'],
diff --git a/tests/Auth/WebAuthn/FilePasskeyTest.php b/tests/Auth/WebAuthn/FilePasskeyTest.php
index 3691a8eabbd..bdfbb0eaa44 100644
--- a/tests/Auth/WebAuthn/FilePasskeyTest.php
+++ b/tests/Auth/WebAuthn/FilePasskeyTest.php
@@ -11,7 +11,7 @@
 use Symfony\Component\Uid\Uuid;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
-use Webauthn\PublicKeyCredentialSource;
+use Webauthn\CredentialRecord;
 use Webauthn\TrustPath\EmptyTrustPath;
 
 #[Group('passkeys')]
@@ -31,9 +31,9 @@ protected function newPasskey(): \Statamic\Contracts\Auth\Passkey
         return new Passkey;
     }
 
-    protected function createTestCredential(string $id = 'test-credential-id-123'): PublicKeyCredentialSource
+    protected function createTestCredential(string $id = 'test-credential-id-123'): CredentialRecord
     {
-        return PublicKeyCredentialSource::create(
+        return CredentialRecord::create(
             publicKeyCredentialId: $id,
             type: 'public-key',
             transports: ['usb', 'nfc'],
diff --git a/tests/Auth/WebAuthn/PasskeyTest.php b/tests/Auth/WebAuthn/PasskeyTest.php
index f4f07083de1..16610bf27d3 100644
--- a/tests/Auth/WebAuthn/PasskeyTest.php
+++ b/tests/Auth/WebAuthn/PasskeyTest.php
@@ -11,6 +11,7 @@
 use Symfony\Component\Uid\Uuid;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
+use Webauthn\CredentialRecord;
 use Webauthn\PublicKeyCredentialSource;
 use Webauthn\TrustPath\EmptyTrustPath;
 
@@ -19,9 +20,9 @@ class PasskeyTest extends TestCase
 {
     use PreventSavingStacheItemsToDisk;
 
-    private function createTestCredential(): PublicKeyCredentialSource
+    private function createTestCredential(): CredentialRecord
     {
-        return PublicKeyCredentialSource::create(
+        return CredentialRecord::create(
             publicKeyCredentialId: 'test-credential-id-123',
             type: 'public-key',
             transports: ['usb', 'nfc'],
@@ -34,6 +35,42 @@ private function createTestCredential(): PublicKeyCredentialSource
         );
     }
 
+    #[Test]
+    public function it_reads_a_credential_stored_by_an_older_webauthn_lib_version()
+    {
+        // A credential in the exact JSON shape stored by web-auth/webauthn-lib 5.2 (where it was a
+        // PublicKeyCredentialSource). The 5.3 CredentialRecord format is field-identical, so passkeys
+        // saved before the upgrade must still deserialize.
+        $stored = [
+            'publicKeyCredentialId' => 'dGVzdC1jcmVkZW50aWFsLWlkLTEyMw',
+            'type' => 'public-key',
+            'transports' => ['usb', 'nfc'],
+            'attestationType' => 'none',
+            'trustPath' => [],
+            'aaguid' => '00000000-0000-0000-0000-000000000000',
+            'credentialPublicKey' => 'dGVzdC1wdWJsaWMta2V5LWRhdGE',
+            'userHandle' => 'dGVzdC11c2VyLWlk',
+            'counter' => 0,
+        ];
+
+        $user = User::make()->id('test-user')->email('test@example.com');
+
+        $passkey = (new Passkey)
+            ->setName('My Passkey')
+            ->setUser($user)
+            ->setCredential($stored);
+
+        $credential = $passkey->credential();
+
+        $this->assertInstanceOf(PublicKeyCredentialSource::class, $credential);
+        $this->assertEquals('test-credential-id-123', $credential->publicKeyCredentialId);
+        $this->assertEquals('public-key', $credential->type);
+        $this->assertEquals(['usb', 'nfc'], $credential->transports);
+        $this->assertEquals('test-public-key-data', $credential->credentialPublicKey);
+        $this->assertEquals('test-user-id', $credential->userHandle);
+        $this->assertEquals(Base64UrlSafe::encodeUnpadded('test-credential-id-123'), $passkey->id());
+    }
+
     #[Test]
     public function it_gets_credential()
     {
diff --git a/tests/Auth/WebAuthn/PasskeyTests.php b/tests/Auth/WebAuthn/PasskeyTests.php
index 7bfdd2ef1f3..afa97c20f18 100644
--- a/tests/Auth/WebAuthn/PasskeyTests.php
+++ b/tests/Auth/WebAuthn/PasskeyTests.php
@@ -6,13 +6,13 @@
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Contracts\Auth\Passkey;
 use Statamic\Facades\User;
-use Webauthn\PublicKeyCredentialSource;
+use Webauthn\CredentialRecord;
 
 trait PasskeyTests
 {
     abstract protected function newPasskey(): Passkey;
 
-    abstract protected function createTestCredential(string $id = 'test-credential-id-123'): PublicKeyCredentialSource;
+    abstract protected function createTestCredential(string $id = 'test-credential-id-123'): CredentialRecord;
 
     #[Test]
     public function it_gets_last_login()
diff --git a/tests/Auth/WebAuthn/WebAuthnTest.php b/tests/Auth/WebAuthn/WebAuthnTest.php
index d163fe5813d..3bbf962ce56 100644
--- a/tests/Auth/WebAuthn/WebAuthnTest.php
+++ b/tests/Auth/WebAuthn/WebAuthnTest.php
@@ -56,7 +56,7 @@ public function it_prepares_assertion_with_challenge()
 
         $this->assertInstanceOf(PublicKeyCredentialRequestOptions::class, $options);
         $this->assertNotNull(session('webauthn.challenge'));
-        $this->assertEquals(32, strlen(session('webauthn.challenge')));
+        $this->assertEquals(32, strlen(base64_decode(session('webauthn.challenge'))));
         $this->assertEquals(PublicKeyCredentialRequestOptions::USER_VERIFICATION_REQUIREMENT_REQUIRED, $options->userVerification);
     }
 
@@ -84,11 +84,11 @@ public function it_stores_challenge_in_session()
         // Challenge should be stored in session for later verification
         $storedChallenge = session('webauthn.challenge');
         $this->assertNotNull($storedChallenge);
-        $this->assertEquals(32, strlen($storedChallenge));
+        $this->assertEquals(32, strlen(base64_decode($storedChallenge)));
 
         // The challenge in the options should be the same binary value
         // (base64url encoding happens during serialization, not in the object)
-        $this->assertEquals($storedChallenge, $options->challenge);
+        $this->assertEquals(base64_decode($storedChallenge), $options->challenge);
     }
 
     #[Test]
@@ -180,7 +180,7 @@ public function it_validates_assertion_successfully()
 
         $credentials = ['id' => 'credential-id', 'rawId' => 'raw-id', 'response' => [], 'type' => 'public-key'];
         $challenge = random_bytes(32);
-        session()->put('webauthn.challenge', $challenge);
+        session()->put('webauthn.challenge', base64_encode($challenge));
 
         // Create real objects
         $publicKeyCredential = new PublicKeyCredential(
@@ -219,6 +219,7 @@ public function it_validates_assertion_successfully()
         $this->mockAssertionValidator
             ->shouldReceive('check')
             ->once()
+            ->withArgs(fn ($credential, $response, $options) => $options->challenge === $challenge)
             ->andReturn($updatedCredentialSource);
 
         $result = $this->webauthn->validateAssertion($mockUser, $credentials);
@@ -234,7 +235,6 @@ public function it_throws_exception_when_no_matching_passkey()
         $user->save();
 
         $credentials = ['id' => 'credential-id', 'rawId' => 'raw-id', 'response' => [], 'type' => 'public-key'];
-        session()->put('webauthn.challenge', random_bytes(32));
 
         $publicKeyCredential = new PublicKeyCredential(
             'public-key',
diff --git a/tests/CP/AuthRedirectTest.php b/tests/CP/AuthRedirectTest.php
index 3a4c40642e7..6cccbdf455d 100644
--- a/tests/CP/AuthRedirectTest.php
+++ b/tests/CP/AuthRedirectTest.php
@@ -7,6 +7,7 @@
 use Statamic\Exceptions\AuthorizationException;
 use Statamic\Facades\User;
 use Statamic\Statamic;
+use Tests\Auth\Eloquent\User as EloquentUser;
 use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -94,4 +95,15 @@ public function it_redirects_to_unauthorized_view_if_there_would_be_a_redirect_l
             ->assertRedirect(cp_route('unauthorized'))
             ->assertSessionHas(['error' => 'Unauthorized.']);
     }
+
+    #[Test]
+    public function it_redirects_to_login_when_authenticated_user_is_not_a_statamic_user()
+    {
+        $nonStatamicUser = EloquentUser::make();
+
+        $this
+            ->actingAs($nonStatamicUser)
+            ->get('/cp')
+            ->assertRedirect(cp_route('login'));
+    }
 }
diff --git a/tests/CP/Navigation/ActiveNavItemTest.php b/tests/CP/Navigation/ActiveNavItemTest.php
index 4dc1c30fc50..16ddce80159 100644
--- a/tests/CP/Navigation/ActiveNavItemTest.php
+++ b/tests/CP/Navigation/ActiveNavItemTest.php
@@ -12,6 +12,7 @@
 use Statamic\Facades;
 use Statamic\Facades\Blink;
 use Statamic\Facades\CP\Nav;
+use Statamic\Facades\URL;
 use Statamic\Facades\User;
 use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
@@ -35,6 +36,13 @@ public function setUp(): void
         Facades\Form::shouldReceive('all')->andReturn(collect());
     }
 
+    public function tearDown(): void
+    {
+        URL::enforceTrailingSlashes(false);
+
+        parent::tearDown();
+    }
+
     protected function resolveApplicationConfiguration($app)
     {
         parent::resolveApplicationConfiguration($app);
@@ -408,6 +416,34 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
         $this->assertTrue($this->getItemByDisplay($seoPro->children(), 'Section Defaults')->isActive());
     }
 
+    #[Test]
+    public function it_properly_handles_is_active_checks_when_trailing_slashes_are_enforced()
+    {
+        URL::enforceTrailingSlashes();
+
+        Nav::clearCachedUrls();
+
+        $parent = Nav::create('parent')
+            ->section('test')
+            ->url('http://localhost/cp/parent')
+            ->children([
+                $hello = Nav::create('hello')->url('http://localhost/cp/hello'),
+                $world = Nav::create('world')->url('http://localhost/cp/world'),
+            ]);
+
+        // Test active status with trailing slash in request URL
+        Request::swap(Request::create('http://localhost/cp/hello/'));
+        $this->assertTrue($parent->isActive());
+        $this->assertTrue($hello->isActive());
+        $this->assertFalse($world->isActive());
+
+        // Test active status on descendant with trailing slash
+        Request::swap(Request::create('http://localhost/cp/hello/nested/path/'));
+        $this->assertTrue($parent->isActive());
+        $this->assertTrue($hello->isActive());
+        $this->assertFalse($world->isActive());
+    }
+
     #[Test]
     public function it_properly_handles_various_edge_cases_when_checking_is_active_on_descendants_of_nav_children()
     {
diff --git a/tests/CP/Navigation/NavTest.php b/tests/CP/Navigation/NavTest.php
index eae4dd867d7..29ce26e9720 100644
--- a/tests/CP/Navigation/NavTest.php
+++ b/tests/CP/Navigation/NavTest.php
@@ -187,6 +187,21 @@ public function it_doesnt_build_items_that_the_user_is_not_authorized_to_see()
         $this->assertNull($this->build()->get('The Empire'));
     }
 
+    #[Test]
+    public function it_doesnt_build_unauthorized_sections_when_building_with_hidden()
+    {
+        $this->setTestRoles(['limited' => ['access cp']]);
+        $this->actingAs(tap(User::make()->assignRole('limited'))->save());
+
+        Nav::fields('Fields Management')->can('manage fields');
+        Nav::users('Users Management')->can('manage users');
+
+        $nav = Nav::build(true, true)->pluck('items', 'display');
+
+        $this->assertFalse($nav->has('Fields'));
+        $this->assertFalse($nav->has('Users'));
+    }
+
     #[Test]
     public function it_can_create_a_nav_item_with_children()
     {
diff --git a/tests/CP/Navigation/NavTransformerTest.php b/tests/CP/Navigation/NavTransformerTest.php
index fa867884bbc..ed82fe9f67c 100644
--- a/tests/CP/Navigation/NavTransformerTest.php
+++ b/tests/CP/Navigation/NavTransformerTest.php
@@ -1315,6 +1315,181 @@ public function it_can_transform_complex_json_payload_copied_from_actual_vue_sub
 
         $this->assertEquals($expected, $transformed);
     }
+
+    #[Test]
+    public function it_preserves_reorder_array_when_moving_custom_section_to_first_position()
+    {
+        $transformed = $this->transform([
+            ['display_original' => 'Top Level'],
+            [
+                'display' => '⭐ Favorites',
+                'action' => '@create',
+                'items' => [
+                    [
+                        'id' => 'favorites::edit_homepage',
+                        'manipulations' => [
+                            'action' => '@create',
+                            'display' => 'Edit homepage',
+                            'url' => '/cp',
+                            'icon' => 'edit',
+                        ],
+                    ],
+                ],
+            ],
+            ['display_original' => 'Content'],
+            ['display_original' => 'Fields'],
+            ['display_original' => 'Tools'],
+            ['display_original' => 'Settings'],
+            ['display_original' => 'Users'],
+        ]);
+
+        $expected = [
+            'reorder' => [
+                'favorites',
+            ],
+            'sections' => [
+                'favorites' => [
+                    'display' => '⭐ Favorites',
+                    'action' => '@create',
+                    'items' => [
+                        'favorites::edit_homepage' => [
+                            'action' => '@create',
+                            'display' => 'Edit homepage',
+                            'url' => '/cp',
+                            'icon' => 'edit',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $this->assertEquals($expected, $transformed);
+    }
+
+    #[Test]
+    public function it_preserves_reorder_array_when_inserting_custom_section_into_middle_of_list()
+    {
+        $transformed = $this->transform([
+            ['display_original' => 'Top Level'],
+            ['display_original' => 'Content'],
+            ['display_original' => 'Fields'],
+            [
+                'display' => '⭐ Favorites',
+                'action' => '@create',
+                'items' => [
+                    [
+                        'id' => 'favorites::edit_homepage',
+                        'manipulations' => [
+                            'action' => '@create',
+                            'display' => 'Edit homepage',
+                            'url' => '/cp',
+                        ],
+                    ],
+                ],
+            ],
+            ['display_original' => 'Tools'],
+            ['display_original' => 'Settings'],
+            ['display_original' => 'Users'],
+        ]);
+
+        $expected = [
+            'reorder' => [
+                'content',
+                'fields',
+                'favorites',
+            ],
+            'sections' => [
+                'favorites' => [
+                    'display' => '⭐ Favorites',
+                    'action' => '@create',
+                    'items' => [
+                        'favorites::edit_homepage' => [
+                            'action' => '@create',
+                            'display' => 'Edit homepage',
+                            'url' => '/cp',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $this->assertEquals($expected, $transformed);
+    }
+
+    #[Test]
+    public function it_preserves_reorder_array_with_multiple_custom_sections_in_the_middle()
+    {
+        $transformed = $this->transform([
+            ['display_original' => 'Top Level'],
+            [
+                'display' => '⭐ Favorites',
+                'action' => '@create',
+                'items' => [
+                    [
+                        'id' => 'favorites::edit_homepage',
+                        'manipulations' => [
+                            'action' => '@create',
+                            'display' => 'Edit homepage',
+                            'url' => '/cp',
+                        ],
+                    ],
+                ],
+            ],
+            ['display_original' => 'Content'],
+            [
+                'display' => '🔖 Bookmarks',
+                'action' => '@create',
+                'items' => [
+                    [
+                        'id' => 'bookmarks::edit_about',
+                        'manipulations' => [
+                            'action' => '@create',
+                            'display' => 'Edit about',
+                            'url' => '/about',
+                        ],
+                    ],
+                ],
+            ],
+            ['display_original' => 'Fields'],
+            ['display_original' => 'Tools'],
+            ['display_original' => 'Settings'],
+            ['display_original' => 'Users'],
+        ]);
+
+        $expected = [
+            'reorder' => [
+                'favorites',
+                'content',
+                'bookmarks',
+            ],
+            'sections' => [
+                'favorites' => [
+                    'display' => '⭐ Favorites',
+                    'action' => '@create',
+                    'items' => [
+                        'favorites::edit_homepage' => [
+                            'action' => '@create',
+                            'display' => 'Edit homepage',
+                            'url' => '/cp',
+                        ],
+                    ],
+                ],
+                'bookmarks' => [
+                    'display' => '🔖 Bookmarks',
+                    'action' => '@create',
+                    'items' => [
+                        'bookmarks::edit_about' => [
+                            'action' => '@create',
+                            'display' => 'Edit about',
+                            'url' => '/about',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $this->assertEquals($expected, $transformed);
+    }
 }
 
 class IncrementalIdHasher
diff --git a/tests/CP/Toasts/ManagerTest.php b/tests/CP/Toasts/ManagerTest.php
new file mode 100644
index 00000000000..4adb36713a4
--- /dev/null
+++ b/tests/CP/Toasts/ManagerTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Tests\CP\Toasts;
+
+use Illuminate\Session\ArraySessionHandler;
+use Illuminate\Session\Store;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\CP\Toasts\Manager;
+use Tests\TestCase;
+
+class ManagerTest extends TestCase
+{
+    #[Test]
+    public function toasts_survive_json_session_serialization()
+    {
+        $handler = new ArraySessionHandler(120);
+        $sessionId = str_repeat('a', 40);
+
+        // Flash a toast, then persist the session using json serialization,
+        // like a request ending with a redirect would.
+        $session = new Store('test', $handler, $sessionId, 'json');
+        $session->start();
+        (new Manager($session))->success('Saved!');
+        $session->save();
+
+        // Read it back on the "next request".
+        $session = new Store('test', $handler, $sessionId, 'json');
+        $session->start();
+
+        $this->assertSame(
+            [['message' => 'Saved!', 'type' => 'success', 'duration' => null]],
+            (new Manager($session))->toArray()
+        );
+    }
+}
diff --git a/tests/Composer/ComposerTest.php b/tests/Composer/ComposerTest.php
index a88b2edac63..aac9fa06ee8 100644
--- a/tests/Composer/ComposerTest.php
+++ b/tests/Composer/ComposerTest.php
@@ -93,11 +93,6 @@ public function it_can_get_installed_path_of_a_package()
             __DIR__.'/__fixtures__/vendor/statamic/composer-test-example-dependency',
             Composer::installedPath('statamic/composer-test-example-dependency')
         );
-
-        $this->assertEquals(
-            __DIR__.'/__fixtures__/vendor/composer/composer',
-            Composer::installedPath('composer/composer')
-        );
     }
 
     #[Group('integration')]
@@ -224,9 +219,6 @@ public function it_can_require_and_remove_multiple_packages_in_one_shot()
         PackToTheFuture::generateComposerJson('test/two', '2.0.0', [], $this->basePath('tmp/two/composer.json'));
 
         $repositories = [
-            'require' => [
-                'composer/composer' => '^2.0.0',
-            ],
             'repositories' => [
                 ['type' => 'path', 'url' => $this->basePath('tmp/one'), 'options' => ['symlink' => false]],
                 ['type' => 'path', 'url' => $this->basePath('tmp/two'), 'options' => ['symlink' => false]],
diff --git a/tests/Composer/__fixtures__/composer.json b/tests/Composer/__fixtures__/composer.json
index c209a78c315..f50c6f2a797 100644
--- a/tests/Composer/__fixtures__/composer.json
+++ b/tests/Composer/__fixtures__/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "statamic/composer-test",
     "require": {
-        "composer/composer": "^2.2.12",
         "statamic/composer-test-example-dependency": "1.2.3"
     },
     "require-dev": {
diff --git a/tests/Composer/__fixtures__/composer.lock b/tests/Composer/__fixtures__/composer.lock
index 680981145ba..b0db33ae206 100644
--- a/tests/Composer/__fixtures__/composer.lock
+++ b/tests/Composer/__fixtures__/composer.lock
@@ -4,1130 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a4a697b30df784967538f4dde8bb65c1",
+    "content-hash": "a4ed0bb4604b27724281f4780add9b5c",
     "packages": [
-        {
-            "name": "composer/ca-bundle",
-            "version": "1.5.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "961a5e4056dd2e4a2eedcac7576075947c28bf63"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/961a5e4056dd2e4a2eedcac7576075947c28bf63",
-                "reference": "961a5e4056dd2e4a2eedcac7576075947c28bf63",
-                "shasum": ""
-            },
-            "require": {
-                "ext-openssl": "*",
-                "ext-pcre": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^8 || ^9",
-                "psr/log": "^1.0 || ^2.0 || ^3.0",
-                "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\CaBundle\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
-            "keywords": [
-                "cabundle",
-                "cacert",
-                "certificate",
-                "ssl",
-                "tls"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.org/composer",
-                "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.5.10"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                }
-            ],
-            "time": "2025-12-08T15:06:51+00:00"
-        },
-        {
-            "name": "composer/class-map-generator",
-            "version": "1.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/class-map-generator.git",
-                "reference": "8f5fa3cc214230e71f54924bd0197a3bcc705eb1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/8f5fa3cc214230e71f54924bd0197a3bcc705eb1",
-                "reference": "8f5fa3cc214230e71f54924bd0197a3bcc705eb1",
-                "shasum": ""
-            },
-            "require": {
-                "composer/pcre": "^2.1 || ^3.1",
-                "php": "^7.2 || ^8.0",
-                "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7 || ^8"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.12 || ^2",
-                "phpstan/phpstan-deprecation-rules": "^1 || ^2",
-                "phpstan/phpstan-phpunit": "^1 || ^2",
-                "phpstan/phpstan-strict-rules": "^1.1 || ^2",
-                "phpunit/phpunit": "^8",
-                "symfony/filesystem": "^5.4 || ^6 || ^7 || ^8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\ClassMapGenerator\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "https://seld.be"
-                }
-            ],
-            "description": "Utilities to scan PHP code and generate class maps.",
-            "keywords": [
-                "classmap"
-            ],
-            "support": {
-                "issues": "https://github.com/composer/class-map-generator/issues",
-                "source": "https://github.com/composer/class-map-generator/tree/1.7.1"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                }
-            ],
-            "time": "2025-12-29T13:15:25+00:00"
-        },
-        {
-            "name": "composer/composer",
-            "version": "2.9.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/composer.git",
-                "reference": "72a8f8e653710e18d83e5dd531eb5a71fc3223e6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/72a8f8e653710e18d83e5dd531eb5a71fc3223e6",
-                "reference": "72a8f8e653710e18d83e5dd531eb5a71fc3223e6",
-                "shasum": ""
-            },
-            "require": {
-                "composer/ca-bundle": "^1.5",
-                "composer/class-map-generator": "^1.4.0",
-                "composer/metadata-minifier": "^1.0",
-                "composer/pcre": "^2.3 || ^3.3",
-                "composer/semver": "^3.3",
-                "composer/spdx-licenses": "^1.5.7",
-                "composer/xdebug-handler": "^2.0.2 || ^3.0.3",
-                "ext-json": "*",
-                "justinrainbow/json-schema": "^6.5.1",
-                "php": "^7.2.5 || ^8.0",
-                "psr/log": "^1.0 || ^2.0 || ^3.0",
-                "react/promise": "^3.3",
-                "seld/jsonlint": "^1.4",
-                "seld/phar-utils": "^1.2",
-                "seld/signal-handler": "^2.0",
-                "symfony/console": "^5.4.47 || ^6.4.25 || ^7.1.10 || ^8.0",
-                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.1.10 || ^8.0",
-                "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.1.10 || ^8.0",
-                "symfony/polyfill-php73": "^1.24",
-                "symfony/polyfill-php80": "^1.24",
-                "symfony/polyfill-php81": "^1.24",
-                "symfony/polyfill-php84": "^1.30",
-                "symfony/process": "^5.4.47 || ^6.4.25 || ^7.1.10 || ^8.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.11.8",
-                "phpstan/phpstan-deprecation-rules": "^1.2.0",
-                "phpstan/phpstan-phpunit": "^1.4.0",
-                "phpstan/phpstan-strict-rules": "^1.6.0",
-                "phpstan/phpstan-symfony": "^1.4.0",
-                "symfony/phpunit-bridge": "^6.4.25 || ^7.3.3 || ^8.0"
-            },
-            "suggest": {
-                "ext-curl": "Provides HTTP support (will fallback to PHP streams if missing)",
-                "ext-openssl": "Enables access to repositories and packages over HTTPS",
-                "ext-zip": "Allows direct extraction of ZIP archives (unzip/7z binaries will be used instead if available)",
-                "ext-zlib": "Enables gzip for HTTP requests"
-            },
-            "bin": [
-                "bin/composer"
-            ],
-            "type": "library",
-            "extra": {
-                "phpstan": {
-                    "includes": [
-                        "phpstan/rules.neon"
-                    ]
-                },
-                "branch-alias": {
-                    "dev-main": "2.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\": "src/Composer/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "https://www.naderman.de"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "https://seld.be"
-                }
-            ],
-            "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.",
-            "homepage": "https://getcomposer.org/",
-            "keywords": [
-                "autoload",
-                "dependency",
-                "package"
-            ],
-            "support": {
-                "irc": "ircs://irc.libera.chat:6697/composer",
-                "issues": "https://github.com/composer/composer/issues",
-                "security": "https://github.com/composer/composer/security/policy",
-                "source": "https://github.com/composer/composer/tree/2.9.5"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                }
-            ],
-            "time": "2026-01-29T10:40:53+00:00"
-        },
-        {
-            "name": "composer/metadata-minifier",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/metadata-minifier.git",
-                "reference": "c549d23829536f0d0e984aaabbf02af91f443207"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/metadata-minifier/zipball/c549d23829536f0d0e984aaabbf02af91f443207",
-                "reference": "c549d23829536f0d0e984aaabbf02af91f443207",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "composer/composer": "^2",
-                "phpstan/phpstan": "^0.12.55",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\MetadataMinifier\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "Small utility library that handles metadata minification and expansion.",
-            "keywords": [
-                "composer",
-                "compression"
-            ],
-            "support": {
-                "issues": "https://github.com/composer/metadata-minifier/issues",
-                "source": "https://github.com/composer/metadata-minifier/tree/1.0.0"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-04-07T13:37:33+00:00"
-        },
-        {
-            "name": "composer/pcre",
-            "version": "3.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/pcre.git",
-                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
-                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.4 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<1.11.10"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.12 || ^2",
-                "phpstan/phpstan-strict-rules": "^1 || ^2",
-                "phpunit/phpunit": "^8 || ^9"
-            },
-            "type": "library",
-            "extra": {
-                "phpstan": {
-                    "includes": [
-                        "extension.neon"
-                    ]
-                },
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Pcre\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
-            "keywords": [
-                "PCRE",
-                "preg",
-                "regex",
-                "regular expression"
-            ],
-            "support": {
-                "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.3.2"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-11-12T16:29:46+00:00"
-        },
-        {
-            "name": "composer/semver",
-            "version": "3.4.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/semver.git",
-                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95",
-                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.11",
-                "symfony/phpunit-bridge": "^3 || ^7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Semver\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                },
-                {
-                    "name": "Rob Bast",
-                    "email": "rob.bast@gmail.com",
-                    "homepage": "http://robbast.nl"
-                }
-            ],
-            "description": "Semver library that offers utilities, version constraint parsing and validation.",
-            "keywords": [
-                "semantic",
-                "semver",
-                "validation",
-                "versioning"
-            ],
-            "support": {
-                "irc": "ircs://irc.libera.chat:6697/composer",
-                "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.4"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                }
-            ],
-            "time": "2025-08-20T19:15:30+00:00"
-        },
-        {
-            "name": "composer/spdx-licenses",
-            "version": "1.5.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "edf364cefe8c43501e21e88110aac10b284c3c9f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/edf364cefe8c43501e21e88110aac10b284c3c9f",
-                "reference": "edf364cefe8c43501e21e88110aac10b284c3c9f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.11",
-                "symfony/phpunit-bridge": "^3 || ^7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Spdx\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                },
-                {
-                    "name": "Rob Bast",
-                    "email": "rob.bast@gmail.com",
-                    "homepage": "http://robbast.nl"
-                }
-            ],
-            "description": "SPDX licenses list and validation library.",
-            "keywords": [
-                "license",
-                "spdx",
-                "validator"
-            ],
-            "support": {
-                "irc": "ircs://irc.libera.chat:6697/composer",
-                "issues": "https://github.com/composer/spdx-licenses/issues",
-                "source": "https://github.com/composer/spdx-licenses/tree/1.5.9"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-05-12T21:07:07+00:00"
-        },
-        {
-            "name": "composer/xdebug-handler",
-            "version": "3.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
-                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
-                "shasum": ""
-            },
-            "require": {
-                "composer/pcre": "^1 || ^2 || ^3",
-                "php": "^7.2.5 || ^8.0",
-                "psr/log": "^1 || ^2 || ^3"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Composer\\XdebugHandler\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "John Stevenson",
-                    "email": "john-stevenson@blueyonder.co.uk"
-                }
-            ],
-            "description": "Restarts a process without Xdebug.",
-            "keywords": [
-                "Xdebug",
-                "performance"
-            ],
-            "support": {
-                "irc": "ircs://irc.libera.chat:6697/composer",
-                "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-05-06T16:37:16+00:00"
-        },
-        {
-            "name": "justinrainbow/json-schema",
-            "version": "6.6.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/jsonrainbow/json-schema.git",
-                "reference": "2eeb75d21cf73211335888e7f5e6fd7440723ec7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/2eeb75d21cf73211335888e7f5e6fd7440723ec7",
-                "reference": "2eeb75d21cf73211335888e7f5e6fd7440723ec7",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "marc-mabe/php-enum": "^4.4",
-                "php": "^7.2 || ^8.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "3.3.0",
-                "json-schema/json-schema-test-suite": "^23.2",
-                "marc-mabe/php-enum-phpstan": "^2.0",
-                "phpspec/prophecy": "^1.19",
-                "phpstan/phpstan": "^1.12",
-                "phpunit/phpunit": "^8.5"
-            },
-            "bin": [
-                "bin/validate-json"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "JsonSchema\\": "src/JsonSchema/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bruno Prieto Reis",
-                    "email": "bruno.p.reis@gmail.com"
-                },
-                {
-                    "name": "Justin Rainbow",
-                    "email": "justin.rainbow@gmail.com"
-                },
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch"
-                },
-                {
-                    "name": "Robert Schönthal",
-                    "email": "seroscho@googlemail.com"
-                }
-            ],
-            "description": "A library to validate a json schema.",
-            "homepage": "https://github.com/jsonrainbow/json-schema",
-            "keywords": [
-                "json",
-                "schema"
-            ],
-            "support": {
-                "issues": "https://github.com/jsonrainbow/json-schema/issues",
-                "source": "https://github.com/jsonrainbow/json-schema/tree/6.6.4"
-            },
-            "time": "2025-12-19T15:01:32+00:00"
-        },
-        {
-            "name": "marc-mabe/php-enum",
-            "version": "v4.7.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/marc-mabe/php-enum.git",
-                "reference": "bb426fcdd65c60fb3638ef741e8782508fda7eef"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/marc-mabe/php-enum/zipball/bb426fcdd65c60fb3638ef741e8782508fda7eef",
-                "reference": "bb426fcdd65c60fb3638ef741e8782508fda7eef",
-                "shasum": ""
-            },
-            "require": {
-                "ext-reflection": "*",
-                "php": "^7.1 | ^8.0"
-            },
-            "require-dev": {
-                "phpbench/phpbench": "^0.16.10 || ^1.0.4",
-                "phpstan/phpstan": "^1.3.1",
-                "phpunit/phpunit": "^7.5.20 | ^8.5.22 | ^9.5.11",
-                "vimeo/psalm": "^4.17.0 | ^5.26.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-3.x": "3.2-dev",
-                    "dev-master": "4.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "MabeEnum\\": "src/"
-                },
-                "classmap": [
-                    "stubs/Stringable.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Marc Bennewitz",
-                    "email": "dev@mabe.berlin",
-                    "homepage": "https://mabe.berlin/",
-                    "role": "Lead"
-                }
-            ],
-            "description": "Simple and fast implementation of enumerations with native PHP",
-            "homepage": "https://github.com/marc-mabe/php-enum",
-            "keywords": [
-                "enum",
-                "enum-map",
-                "enum-set",
-                "enumeration",
-                "enumerator",
-                "enummap",
-                "enumset",
-                "map",
-                "set",
-                "type",
-                "type-hint",
-                "typehint"
-            ],
-            "support": {
-                "issues": "https://github.com/marc-mabe/php-enum/issues",
-                "source": "https://github.com/marc-mabe/php-enum/tree/v4.7.2"
-            },
-            "time": "2025-09-14T11:18:39+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "support": {
-                "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/2.0.2"
-            },
-            "time": "2021-11-05T16:47:00+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "3.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
-                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.2"
-            },
-            "time": "2024-09-11T13:17:53+00:00"
-        },
-        {
-            "name": "react/promise",
-            "version": "v3.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/reactphp/promise.git",
-                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/23444f53a813a3296c1368bb104793ce8d88f04a",
-                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "1.12.28 || 1.4.10",
-                "phpunit/phpunit": "^9.6 || ^7.5"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "React\\Promise\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jan Sorgalla",
-                    "email": "jsorgalla@gmail.com",
-                    "homepage": "https://sorgalla.com/"
-                },
-                {
-                    "name": "Christian Lück",
-                    "email": "christian@clue.engineering",
-                    "homepage": "https://clue.engineering/"
-                },
-                {
-                    "name": "Cees-Jan Kiewiet",
-                    "email": "reactphp@ceesjankiewiet.nl",
-                    "homepage": "https://wyrihaximus.net/"
-                },
-                {
-                    "name": "Chris Boden",
-                    "email": "cboden@gmail.com",
-                    "homepage": "https://cboden.dev/"
-                }
-            ],
-            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-            "keywords": [
-                "promise",
-                "promises"
-            ],
-            "support": {
-                "issues": "https://github.com/reactphp/promise/issues",
-                "source": "https://github.com/reactphp/promise/tree/v3.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/reactphp",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2025-08-19T18:57:03+00:00"
-        },
-        {
-            "name": "seld/jsonlint",
-            "version": "1.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/1748aaf847fc731cfad7725aec413ee46f0cc3a2",
-                "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.11",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13"
-            },
-            "bin": [
-                "bin/jsonlint"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "https://seld.be"
-                }
-            ],
-            "description": "JSON Linter",
-            "keywords": [
-                "json",
-                "linter",
-                "parser",
-                "validator"
-            ],
-            "support": {
-                "issues": "https://github.com/Seldaek/jsonlint/issues",
-                "source": "https://github.com/Seldaek/jsonlint/tree/1.11.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/Seldaek",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-07-11T14:55:45+00:00"
-        },
-        {
-            "name": "seld/phar-utils",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/phar-utils.git",
-                "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/ea2f4014f163c1be4c601b9b7bd6af81ba8d701c",
-                "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Seld\\PharUtils\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be"
-                }
-            ],
-            "description": "PHAR file format utilities, for when PHP phars you up",
-            "keywords": [
-                "phar"
-            ],
-            "support": {
-                "issues": "https://github.com/Seldaek/phar-utils/issues",
-                "source": "https://github.com/Seldaek/phar-utils/tree/1.2.1"
-            },
-            "time": "2022-08-31T10:31:18+00:00"
-        },
-        {
-            "name": "seld/signal-handler",
-            "version": "2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/signal-handler.git",
-                "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/signal-handler/zipball/04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98",
-                "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpstan/phpstan-strict-rules": "^1.3",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.23",
-                "psr/log": "^1 || ^2 || ^3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Seld\\Signal\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "Simple unix signal handler that silently fails where signals are not supported for easy cross-platform development",
-            "keywords": [
-                "posix",
-                "sigint",
-                "signal",
-                "sigterm",
-                "unix"
-            ],
-            "support": {
-                "issues": "https://github.com/Seldaek/signal-handler/issues",
-                "source": "https://github.com/Seldaek/signal-handler/tree/2.0.2"
-            },
-            "time": "2023-09-03T09:24:00+00:00"
-        },
         {
             "name": "statamic/composer-test-example-dependency",
             "version": "1.2.3",
@@ -1141,1211 +19,6 @@
                 "symlink": false,
                 "relative": true
             }
-        },
-        {
-            "name": "symfony/console",
-            "version": "v7.4.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "41e38717ac1dd7a46b6bda7d6a82af2d98a78894"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/41e38717ac1dd7a46b6bda7d6a82af2d98a78894",
-                "reference": "41e38717ac1dd7a46b6bda7d6a82af2d98a78894",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.2",
-                "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^7.2|^8.0"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<6.4",
-                "symfony/dotenv": "<6.4",
-                "symfony/event-dispatcher": "<6.4",
-                "symfony/lock": "<6.4",
-                "symfony/process": "<6.4"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0|2.0|3.0"
-            },
-            "require-dev": {
-                "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.4|^7.0|^8.0",
-                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
-                "symfony/event-dispatcher": "^6.4|^7.0|^8.0",
-                "symfony/http-foundation": "^6.4|^7.0|^8.0",
-                "symfony/http-kernel": "^6.4|^7.0|^8.0",
-                "symfony/lock": "^6.4|^7.0|^8.0",
-                "symfony/messenger": "^6.4|^7.0|^8.0",
-                "symfony/process": "^6.4|^7.0|^8.0",
-                "symfony/stopwatch": "^6.4|^7.0|^8.0",
-                "symfony/var-dumper": "^6.4|^7.0|^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Eases the creation of beautiful and testable command line interfaces",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "cli",
-                "command-line",
-                "console",
-                "terminal"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.4.4"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2026-01-13T11:36:38+00:00"
-        },
-        {
-            "name": "symfony/deprecation-contracts",
-            "version": "v3.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
-                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/contracts",
-                    "name": "symfony/contracts"
-                },
-                "branch-alias": {
-                    "dev-main": "3.6-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "function.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "A generic function and convention to trigger deprecation notices",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-25T14:21:43+00:00"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v7.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "d551b38811096d0be9c4691d406991b47c0c630a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/d551b38811096d0be9c4691d406991b47c0c630a",
-                "reference": "d551b38811096d0be9c4691d406991b47c0c630a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.2",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.8"
-            },
-            "require-dev": {
-                "symfony/process": "^6.4|^7.0|^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides basic utilities for the filesystem",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-11-27T13:27:24+00:00"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v7.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "ad4daa7c38668dcb031e63bc99ea9bd42196a2cb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ad4daa7c38668dcb031e63bc99ea9bd42196a2cb",
-                "reference": "ad4daa7c38668dcb031e63bc99ea9bd42196a2cb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.2"
-            },
-            "require-dev": {
-                "symfony/filesystem": "^6.4|^7.0|^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Finds files and directories via an intuitive fluent interface",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.4.5"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2026-01-26T15:07:59+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.33.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-09T11:45:10+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.33.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
-                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's grapheme_* functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "grapheme",
-                "intl",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-06-27T09:58:17+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.33.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
-                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's Normalizer class and related functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "intl",
-                "normalizer",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-09T11:45:10+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.33.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
-                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
-                "shasum": ""
-            },
-            "require": {
-                "ext-iconv": "*",
-                "php": ">=7.2"
-            },
-            "provide": {
-                "ext-mbstring": "*"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-12-23T08:48:59+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php73",
-            "version": "v1.33.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
-                "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.33.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-09T11:45:10+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.33.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
-                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-01-02T08:10:11+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php81",
-            "version": "v1.33.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
-                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-09T11:45:10+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php84",
-            "version": "v1.33.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php84.git",
-                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191",
-                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php84\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-06-24T13:30:11+00:00"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v7.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "608476f4604102976d687c483ac63a79ba18cc97"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/608476f4604102976d687c483ac63a79ba18cc97",
-                "reference": "608476f4604102976d687c483ac63a79ba18cc97",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Executes commands in sub-processes",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/process/tree/v7.4.5"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2026-01-26T15:07:59+00:00"
-        },
-        {
-            "name": "symfony/service-contracts",
-            "version": "v3.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43",
-                "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "psr/container": "^1.1|^2.0",
-                "symfony/deprecation-contracts": "^2.5|^3"
-            },
-            "conflict": {
-                "ext-psr": "<1.1|>=2"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/contracts",
-                    "name": "symfony/contracts"
-                },
-                "branch-alias": {
-                    "dev-main": "3.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\Service\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Test/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to writing services",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.6.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-07-15T11:30:57+00:00"
-        },
-        {
-            "name": "symfony/string",
-            "version": "v7.4.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/string.git",
-                "reference": "1c4b10461bf2ec27537b5f36105337262f5f5d6f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/1c4b10461bf2ec27537b5f36105337262f5f5d6f",
-                "reference": "1c4b10461bf2ec27537b5f36105337262f5f5d6f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.2",
-                "symfony/deprecation-contracts": "^2.5|^3.0",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.33",
-                "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/translation-contracts": "<2.5"
-            },
-            "require-dev": {
-                "symfony/emoji": "^7.1|^8.0",
-                "symfony/http-client": "^6.4|^7.0|^8.0",
-                "symfony/intl": "^6.4|^7.0|^8.0",
-                "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^6.4|^7.0|^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "Resources/functions.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "grapheme",
-                "i18n",
-                "string",
-                "unicode",
-                "utf-8",
-                "utf8"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.4.4"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2026-01-12T10:54:30+00:00"
         }
     ],
     "packages-dev": [
diff --git a/tests/Composer/__fixtures__/vendor.tar.gz b/tests/Composer/__fixtures__/vendor.tar.gz
index 319e1bc475c..36462aa1541 100644
Binary files a/tests/Composer/__fixtures__/vendor.tar.gz and b/tests/Composer/__fixtures__/vendor.tar.gz differ
diff --git a/tests/Console/Commands/AssetsGeneratePresetsTest.php b/tests/Console/Commands/AssetsGeneratePresetsTest.php
new file mode 100644
index 00000000000..5d999d5cdb3
--- /dev/null
+++ b/tests/Console/Commands/AssetsGeneratePresetsTest.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace Tests\Console\Commands;
+
+use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\AssetContainer;
+use Statamic\Facades\YAML;
+use Statamic\Jobs\GeneratePresetImageManipulation;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class AssetsGeneratePresetsTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        Storage::fake('test');
+        Bus::fake();
+
+        config(['statamic.assets.image_manipulation.presets' => [
+            'preset_one' => ['w' => 100],
+            'preset_two' => ['w' => 200],
+        ]]);
+    }
+
+    private function makeContainer(string $handle = 'test', array $warmPresets = ['preset_one', 'preset_two'])
+    {
+        $container = AssetContainer::make($handle)->disk('test');
+        $container->warmPresets($warmPresets);
+        $container->save();
+
+        return $container;
+    }
+
+    private function putLandscapeImage(string $path = 'image.jpg')
+    {
+        Storage::disk('test')->put($path, '');
+        Storage::disk('test')->put(
+            dirname($path).'/.meta/'.basename($path).'.yaml',
+            YAML::dump(['width' => 20, 'height' => 10])
+        );
+    }
+
+    #[Test]
+    public function it_generates_all_presets_when_no_filter_is_given()
+    {
+        $this->makeContainer();
+        $this->putLandscapeImage();
+
+        $this->artisan('statamic:assets:generate-presets');
+
+        Bus::assertDispatchedSync(GeneratePresetImageManipulation::class, fn ($job) => $job->preset === 'preset_one');
+        Bus::assertDispatchedSync(GeneratePresetImageManipulation::class, fn ($job) => $job->preset === 'preset_two');
+        Bus::assertDispatchedSync(GeneratePresetImageManipulation::class, fn ($job) => $job->preset === 'cp_thumbnail_small_landscape');
+    }
+
+    #[Test]
+    public function it_only_generates_cp_thumbnail_presets_when_cp_thumbnail_filter_is_given()
+    {
+        $this->makeContainer();
+        $this->putLandscapeImage();
+
+        $this->artisan('statamic:assets:generate-presets --preset=cp_thumbnail');
+
+        Bus::assertDispatchedSync(GeneratePresetImageManipulation::class, fn ($job) => $job->preset === 'cp_thumbnail_small_landscape');
+        Bus::assertNotDispatchedSync(GeneratePresetImageManipulation::class, fn ($job) => $job->preset === 'preset_one');
+        Bus::assertNotDispatchedSync(GeneratePresetImageManipulation::class, fn ($job) => $job->preset === 'preset_two');
+    }
+
+    #[Test]
+    public function it_generates_nothing_when_cp_thumbnail_filter_is_used_but_cp_is_disabled()
+    {
+        config(['statamic.cp.enabled' => false]);
+
+        $this->makeContainer();
+        $this->putLandscapeImage();
+
+        $this->artisan('statamic:assets:generate-presets --preset=cp_thumbnail');
+
+        Bus::assertNotDispatchedSync(GeneratePresetImageManipulation::class);
+    }
+
+    #[Test]
+    public function it_generates_only_the_specified_preset()
+    {
+        $this->makeContainer();
+        $this->putLandscapeImage();
+
+        $this->artisan('statamic:assets:generate-presets --preset=preset_one');
+
+        Bus::assertDispatchedSync(GeneratePresetImageManipulation::class, fn ($job) => $job->preset === 'preset_one');
+        Bus::assertNotDispatchedSync(GeneratePresetImageManipulation::class, fn ($job) => $job->preset === 'preset_two');
+        Bus::assertNotDispatchedSync(GeneratePresetImageManipulation::class, fn ($job) => $job->preset === 'cp_thumbnail_small_landscape');
+    }
+
+    #[Test]
+    public function it_errors_when_the_preset_does_not_exist()
+    {
+        $this->makeContainer();
+        $this->putLandscapeImage();
+
+        $this->artisan('statamic:assets:generate-presets --preset=nonexistent')
+            ->expectsOutputToContain('The preset "nonexistent" does not exist.')
+            ->assertExitCode(1);
+
+        Bus::assertNotDispatchedSync(GeneratePresetImageManipulation::class);
+    }
+
+    #[Test]
+    public function it_skips_non_image_assets()
+    {
+        $this->makeContainer();
+        Storage::disk('test')->put('document.txt', 'hello');
+
+        $this->artisan('statamic:assets:generate-presets');
+
+        Bus::assertNotDispatchedSync(GeneratePresetImageManipulation::class);
+    }
+
+    #[Test]
+    public function it_queues_jobs_when_queue_option_is_used()
+    {
+        config(['queue.default' => 'redis']);
+
+        $this->makeContainer('test', ['preset_one']);
+        $this->putLandscapeImage();
+
+        $this->artisan('statamic:assets:generate-presets --queue');
+
+        Bus::assertDispatched(GeneratePresetImageManipulation::class, fn ($job) => $job->preset === 'preset_one');
+        Bus::assertNotDispatchedSync(GeneratePresetImageManipulation::class);
+    }
+
+    #[Test]
+    public function it_excludes_specified_containers()
+    {
+        Storage::fake('other');
+
+        $this->makeContainer('test', ['preset_one']);
+        AssetContainer::make('excluded')->disk('other')->warmPresets(['preset_one'])->save();
+
+        $this->putLandscapeImage();
+        Storage::disk('other')->put('image.jpg', '');
+        Storage::disk('other')->put('.meta/image.jpg.yaml', YAML::dump(['width' => 20, 'height' => 10]));
+
+        $this->artisan('statamic:assets:generate-presets --excluded-containers=excluded');
+
+        Bus::assertDispatchedSync(GeneratePresetImageManipulation::class, fn ($job) => $job->asset->container()->handle() === 'test');
+        Bus::assertNotDispatchedSync(GeneratePresetImageManipulation::class, fn ($job) => $job->asset->container()->handle() === 'excluded');
+    }
+}
diff --git a/tests/Console/Commands/MakeFieldtypeTest.php b/tests/Console/Commands/MakeFieldtypeTest.php
index 1d2c05c1131..266150289b0 100644
--- a/tests/Console/Commands/MakeFieldtypeTest.php
+++ b/tests/Console/Commands/MakeFieldtypeTest.php
@@ -102,7 +102,7 @@ public function boot(): void
             ->artisan('statamic:make:fieldtype', ['name' => 'KnightRider'])
             ->expectsQuestion("It doesn't look like Vite is setup for the Control Panel. Would you like to run `php please setup-cp-vite`?", true);
 
-        Process::assertRan('npm install');
+        Process::assertRan('npm install --ignore-scripts');
 
         $this->assertFileExists($fieldtype = base_path('app/Fieldtypes/KnightRider.php'));
         $this->assertStringContainsString('namespace App\Fieldtypes;', $this->files->get($fieldtype));
@@ -167,7 +167,7 @@ public function it_can_make_a_fieldtype_into_an_addon()
 
         $this->artisan('statamic:make:fieldtype', ['name' => 'Yoda', 'addon' => 'yoda/bag-odah']);
 
-        Process::assertRan('npm install');
+        Process::assertRan('npm install --ignore-scripts');
 
         $this->assertFileExists($fieldtype);
         $this->assertStringContainsString('namespace Yoda\BagOdah\Fieldtypes;', $this->files->get($fieldtype));
diff --git a/tests/Console/Commands/MakeWidgetTest.php b/tests/Console/Commands/MakeWidgetTest.php
index 00b8d34043b..1ad0d03eb3b 100644
--- a/tests/Console/Commands/MakeWidgetTest.php
+++ b/tests/Console/Commands/MakeWidgetTest.php
@@ -111,7 +111,7 @@ public function boot(): void
             ->artisan('statamic:make:widget', ['name' => 'Sloth'])
             ->expectsQuestion("It doesn't look like Vite is setup for the Control Panel. Would you like to run `php please setup-cp-vite`?", true);
 
-        Process::assertRan('npm install');
+        Process::assertRan('npm install --ignore-scripts');
 
         $this->assertFileExists($widget);
         $this->assertStringContainsString('namespace App\Widgets;', $this->files->get($widget));
diff --git a/tests/Console/Commands/MigrateDatesToUtcTest.php b/tests/Console/Commands/MigrateDatesToUtcTest.php
index 98a459fe50b..89d31988c98 100644
--- a/tests/Console/Commands/MigrateDatesToUtcTest.php
+++ b/tests/Console/Commands/MigrateDatesToUtcTest.php
@@ -91,6 +91,88 @@ public function it_converts_entry_date_field_in_entries_when_app_timezone_is_utc
         $this->it_converts_entry_date_field_in_entries();
     }
 
+    #[Test]
+    public function it_skips_localized_entries_that_inherit_date_from_origin()
+    {
+        $this->setSites([
+            'en' => ['url' => '/', 'locale' => 'en_US', 'name' => 'English'],
+            'fr' => ['url' => '/fr/', 'locale' => 'fr_FR', 'name' => 'French'],
+            'it' => ['url' => '/it/', 'locale' => 'it_IT', 'name' => 'Italian'],
+        ]);
+
+        $collection = tap(Collection::make('articles')->dated(true)->sites(['en', 'fr', 'it']))->save();
+
+        $collection->entryBlueprint()->setContents([
+            'fields' => [
+                ['handle' => 'date', 'field' => ['type' => 'date', 'time_enabled' => true]],
+            ],
+        ])->save();
+
+        $origin = Entry::make()->id('origin')->locale('en')->collection('articles')->date('2025-01-01-1200');
+        $origin->save();
+
+        $french = Entry::make()->id('fr-entry')->locale('fr')->collection('articles')->origin($origin);
+        $french->save();
+
+        $italian = Entry::make()->id('it-entry')->locale('it')->collection('articles')->origin($origin);
+        $italian->save();
+
+        // All entries should have the same date before migration
+        $this->assertEquals('2025-01-01T12:00:00+00:00', $origin->date()->toIso8601String());
+        $this->assertEquals('2025-01-01T12:00:00+00:00', $french->date()->toIso8601String());
+        $this->assertEquals('2025-01-01T12:00:00+00:00', $italian->date()->toIso8601String());
+
+        $this->migrateDatesToUtc();
+
+        $origin = Entry::find('origin');
+        $french = Entry::find('fr-entry');
+        $italian = Entry::find('it-entry');
+
+        // Origin should be migrated
+        $this->assertEquals('2025-01-01T17:00:00+00:00', $origin->date()->toIso8601String());
+
+        // Localized entries should still have the same date as origin (inherited)
+        $this->assertEquals('2025-01-01T17:00:00+00:00', $french->date()->toIso8601String());
+        $this->assertEquals('2025-01-01T17:00:00+00:00', $italian->date()->toIso8601String());
+
+        $this->assertFalse($french->hasExplicitDate());
+        $this->assertFalse($italian->hasExplicitDate());
+    }
+
+    #[Test]
+    public function it_migrates_localized_entries_that_have_their_own_date()
+    {
+        $this->setSites([
+            'en' => ['url' => '/', 'locale' => 'en_US', 'name' => 'English'],
+            'fr' => ['url' => '/fr/', 'locale' => 'fr_FR', 'name' => 'French'],
+        ]);
+
+        $collection = tap(Collection::make('articles')->dated(true)->sites(['en', 'fr']))->save();
+
+        $collection->entryBlueprint()->setContents([
+            'fields' => [
+                ['handle' => 'date', 'field' => ['type' => 'date', 'time_enabled' => true]],
+            ],
+        ])->save();
+
+        $origin = Entry::make()->id('origin')->locale('en')->collection('articles')->date('2025-01-01-1200');
+        $origin->save();
+
+        $french = Entry::make()->id('fr-entry')->locale('fr')->collection('articles')->origin($origin)->date('2025-01-02-1400');
+        $french->save();
+
+        $this->assertTrue($french->hasExplicitDate());
+
+        $this->migrateDatesToUtc();
+
+        $origin = Entry::find('origin');
+        $french = Entry::find('fr-entry');
+
+        // Both should be migrated
+        $this->assertEquals('2025-01-01T17:00:00+00:00', $origin->date()->toIso8601String());
+        $this->assertEquals('2025-01-02T19:00:00+00:00', $french->date()->toIso8601String());
+    }
+
     #[Test]
     #[DataProvider('dateFieldsProvider')]
     public function it_converts_date_fields_in_terms(string $fieldHandle, array $field, $original, $expected)
diff --git a/tests/Console/Commands/ProEnableTest.php b/tests/Console/Commands/ProEnableTest.php
index 80c4045aa0b..1679acf9216 100644
--- a/tests/Console/Commands/ProEnableTest.php
+++ b/tests/Console/Commands/ProEnableTest.php
@@ -61,7 +61,9 @@ public function it_can_enable_pro_by_updating_existing_var_in_env()
         $this->assertEquals($this->defaultEditionsContents, $this->files->get($this->editionsPath));
         $this->assertEquals($this->defaultEnvContents, $this->files->get($this->envPath));
 
-        $this->artisan('statamic:pro:enable');
+        $this
+            ->artisan('statamic:pro:enable')
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', '');
 
         $this->assertTrue(Statamic::pro());
         $this->assertEquals($this->defaultEditionsContents, $this->files->get($this->editionsPath));
@@ -83,7 +85,9 @@ public function it_can_enable_pro_by_appending_to_env()
         $this->assertFalse(Statamic::pro());
         $this->assertEquals($this->defaultEditionsContents, $this->files->get($this->editionsPath));
 
-        $this->artisan('statamic:pro:enable');
+        $this
+            ->artisan('statamic:pro:enable')
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', '');
 
         $this->assertTrue(Statamic::pro());
         $this->assertEquals($this->defaultEditionsContents, $this->files->get($this->editionsPath));
@@ -94,6 +98,26 @@ public function it_can_enable_pro_by_appending_to_env()
 ENV, $this->files->get($this->envPath));
     }
 
+    #[Test]
+    public function it_replaces_commented_pro_enabled_var_in_env_instead_of_appending()
+    {
+        $this->files->put($this->envPath, <<<'ENV'
+APP_NAME=Statamic
+# STATAMIC_PRO_ENABLED=false
+STATAMIC_LICENSE_KEY=
+ENV);
+
+        $this
+            ->artisan('statamic:pro:enable')
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', '');
+
+        $this->assertEquals(<<<'ENV'
+APP_NAME=Statamic
+STATAMIC_PRO_ENABLED=true
+STATAMIC_LICENSE_KEY=
+ENV, $this->files->get($this->envPath));
+    }
+
     #[Test]
     public function if_config_is_not_referencing_env_var_it_should_prompt_user_to_run_with_update_config_option()
     {
@@ -116,6 +140,7 @@ public function if_config_is_not_referencing_env_var_it_should_prompt_user_to_ru
 
         $this
             ->artisan('statamic:pro:enable')
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', '')
             ->expectsOutput('Please re-run this command with the `--update-config` option.');
 
         // Though it should still update .env
@@ -159,7 +184,9 @@ public function it_can_update_editions_config_to_reference_env_var($boolean)
         $this->assertFalse(Statamic::pro());
         $this->assertEquals($this->defaultEnvContents, $this->files->get($this->envPath));
 
-        $this->artisan('statamic:pro:enable', ['--update-config' => true]);
+        $this
+            ->artisan('statamic:pro:enable', ['--update-config' => true])
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', '');
 
         $this->assertTrue(Statamic::pro());
         $this->assertEquals($this->defaultEditionsContents, $this->files->get($this->editionsPath));
@@ -192,6 +219,7 @@ public function if_it_has_trouble_updating_editions_config_it_should_instruct_us
 
         $this
             ->artisan('statamic:pro:enable', ['--update-config' => true])
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', '')
             ->expectsOutput(PHP_EOL.'For this setting to take effect, please modify your [config/statamic/editions.php] as follows:')
             ->expectsOutput("'pro' => env('STATAMIC_PRO_ENABLED', false)");
 
@@ -205,4 +233,79 @@ public function if_it_has_trouble_updating_editions_config_it_should_instruct_us
         // Pro should not be enabled in the in-memory config, because config is not properly referencing .env var yet
         $this->assertFalse(Statamic::pro());
     }
+
+    #[Test]
+    public function it_can_set_license_key_while_enabling_pro()
+    {
+        $this
+            ->artisan('statamic:pro:enable')
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'test-license-key');
+
+        $this->assertEquals(<<<'ENV'
+APP_NAME=Statamic
+STATAMIC_PRO_ENABLED=true
+STATAMIC_LICENSE_KEY=test-license-key
+ENV, $this->files->get($this->envPath));
+    }
+
+    #[Test]
+    public function it_replaces_commented_license_key_line_instead_of_appending()
+    {
+        $this->files->put($this->envPath, <<<'ENV'
+APP_NAME=Statamic
+STATAMIC_PRO_ENABLED=false
+# STATAMIC_LICENSE_KEY=
+ENV);
+
+        $this
+            ->artisan('statamic:pro:enable')
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'test-license-key');
+
+        $this->assertEquals(<<<'ENV'
+APP_NAME=Statamic
+STATAMIC_PRO_ENABLED=true
+STATAMIC_LICENSE_KEY=test-license-key
+ENV, $this->files->get($this->envPath));
+    }
+
+    #[Test]
+    public function commented_non_empty_license_key_still_prompts_and_gets_replaced()
+    {
+        $this->files->put($this->envPath, <<<'ENV'
+APP_NAME=Statamic
+STATAMIC_PRO_ENABLED=false
+# STATAMIC_LICENSE_KEY=overlord_698g7f6sd89gs
+ENV);
+
+        $this
+            ->artisan('statamic:pro:enable')
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'test-license-key');
+
+        $this->assertEquals(<<<'ENV'
+APP_NAME=Statamic
+STATAMIC_PRO_ENABLED=true
+STATAMIC_LICENSE_KEY=test-license-key
+ENV, $this->files->get($this->envPath));
+    }
+
+    #[Test]
+    public function it_mentions_setting_license_key_later_when_left_blank()
+    {
+        $this
+            ->artisan('statamic:pro:enable')
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', '')
+            ->expectsOutput('Add `STATAMIC_LICENSE_KEY=...` to your `.env` before or when your site goes live.');
+    }
+
+    #[Test]
+    public function it_skips_license_key_prompt_in_non_interactive_mode()
+    {
+        $this->artisan('statamic:pro:enable', ['--no-interaction' => true]);
+
+        $this->assertEquals(<<<'ENV'
+APP_NAME=Statamic
+STATAMIC_PRO_ENABLED=true
+STATAMIC_LICENSE_KEY=
+ENV, $this->files->get($this->envPath));
+    }
 }
diff --git a/tests/Console/Commands/SetupCpViteTest.php b/tests/Console/Commands/SetupCpViteTest.php
index 56f2b667952..db2885d615d 100644
--- a/tests/Console/Commands/SetupCpViteTest.php
+++ b/tests/Console/Commands/SetupCpViteTest.php
@@ -50,7 +50,7 @@ public function it_installs_dependencies()
             ->artisan('statamic:setup-cp-vite')
             ->expectsOutputToContain('Installed dependencies');
 
-        Process::assertRan('npm install');
+        Process::assertRan('npm install --ignore-scripts');
 
         $this->assertStringContainsString(<<<'JSON'
     "dependencies": {
@@ -60,7 +60,35 @@ public function it_installs_dependencies()
     },
     "devDependencies": {
         "postcss": "^8.4.24",
-        "vite": "^7.0.4"
+        "vite": "^8.0.0"
+    }
+JSON, $this->files->get(base_path('package.json')));
+    }
+
+    #[Test]
+    public function it_does_not_override_existing_vite_or_statamic_cms_dependencies()
+    {
+        $this->files->put(base_path('package.json'), <<<'JSON'
+{
+    "dependencies": {
+        "@statamic/cms": "file:./some/other/path"
+    },
+    "devDependencies": {
+        "vite": "^9.0.0"
+    }
+}
+JSON);
+
+        $this
+            ->artisan('statamic:setup-cp-vite')
+            ->expectsOutputToContain('Installed dependencies');
+
+        $this->assertStringContainsString(<<<'JSON'
+    "dependencies": {
+        "@statamic/cms": "file:./some/other/path"
+    },
+    "devDependencies": {
+        "vite": "^9.0.0"
     }
 JSON, $this->files->get(base_path('package.json')));
     }
diff --git a/tests/Console/Commands/SiteClearTest.php b/tests/Console/Commands/SiteClearTest.php
new file mode 100644
index 00000000000..0c1cc7f0639
--- /dev/null
+++ b/tests/Console/Commands/SiteClearTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Tests\Console\Commands;
+
+use Illuminate\Support\Arr;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\TestCase;
+
+class SiteClearTest extends TestCase
+{
+    #[Test]
+    public function it_has_up_to_date_config_stubs()
+    {
+        // site:clear overwrites the published stache.php and users.php with these
+        // stubs (see SiteClear::resetStatamicConfigs), copying them verbatim, so
+        // they need to stay in sync with the package's own config defaults, aside
+        // from the values a fresh Statamic site intentionally overrides.
+        $stubs = statamic_path('src/Console/Commands/stubs/config');
+
+        $stache = require $stubs.'/stache.php.stub';
+        $stacheDefaults = require statamic_path('config/stache.php');
+
+        // A fresh Statamic install leaves 'stores' empty and relies on the
+        // native defaults being merged in by Stache\ServiceProvider, rather
+        // than duplicating every store definition in the published config.
+        $this->assertSame([], $stache['stores']);
+
+        $this->assertEquals(
+            Arr::except($stacheDefaults, 'stores'),
+            Arr::except($stache, 'stores')
+        );
+
+        $users = require $stubs.'/users.php.stub';
+        $usersDefaults = require statamic_path('config/users.php');
+
+        // Fresh Statamic sites intentionally use the file repository, not
+        // eloquent, which is only the default when installing into an
+        // existing Laravel app.
+        $this->assertSame('file', $users['repository']);
+
+        $this->assertEquals(
+            Arr::except($usersDefaults, 'repository'),
+            Arr::except($users, 'repository')
+        );
+    }
+}
diff --git a/tests/Console/Commands/StacheClearTest.php b/tests/Console/Commands/StacheClearTest.php
new file mode 100644
index 00000000000..7ea3988369b
--- /dev/null
+++ b/tests/Console/Commands/StacheClearTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Tests\Console\Commands;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Console\Commands\StacheClear;
+use Statamic\Facades\Stache;
+use Tests\TestCase;
+
+class StacheClearTest extends TestCase
+{
+    #[Test]
+    public function it_doesnt_add_any_exclusion_if_no_parameter()
+    {
+        Stache::shouldReceive('exclude')->never()
+            ->shouldReceive('clear')->once();
+
+        $this->artisan(StacheClear::class);
+    }
+
+    #[Test]
+    public function it_adds_exclude()
+    {
+        Stache::shouldReceive('exclude')->once()->with('foo')->andReturn()
+            ->shouldReceive('clear')->once()->andReturn();
+
+        $this->artisan(StacheClear::class, ['--exclude' => 'foo']);
+    }
+
+    #[Test]
+    public function it_adds_multiple_excludes()
+    {
+        Stache::shouldReceive('exclude')->once()->with('foo')->andReturn()
+            ->shouldReceive('exclude')->once()->with('bar')->andReturn()
+            ->shouldReceive('clear')->once()->andReturn();
+
+        $this->artisan(StacheClear::class, ['--exclude' => 'foo,bar']);
+    }
+
+    #[Test]
+    public function it_trims_whitespace_from_excludes()
+    {
+        Stache::shouldReceive('exclude')->once()->with('foo')->andReturn()
+            ->shouldReceive('exclude')->once()->with('bar')->andReturn()
+            ->shouldReceive('clear')->once()->andReturn();
+
+        $this->artisan(StacheClear::class, ['--exclude' => 'foo, bar']);
+    }
+}
diff --git a/tests/Console/Commands/StacheRefreshTest.php b/tests/Console/Commands/StacheRefreshTest.php
new file mode 100644
index 00000000000..3d70439a76f
--- /dev/null
+++ b/tests/Console/Commands/StacheRefreshTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Tests\Console\Commands;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Console\Commands\StacheRefresh;
+use Statamic\Facades\Stache;
+use Tests\TestCase;
+
+class StacheRefreshTest extends TestCase
+{
+    #[Test]
+    public function it_doesnt_add_any_exclusion_if_no_parameter()
+    {
+        Stache::shouldReceive('exclude')->never()
+            ->shouldReceive('clear')->once()
+            ->shouldReceive('warm')->once();
+
+        $this->artisan(StacheRefresh::class);
+    }
+
+    #[Test]
+    public function it_adds_exclude()
+    {
+        Stache::shouldReceive('exclude')->once()->with('foo')->andReturn()
+            ->shouldReceive('clear')->once()->andReturn()
+            ->shouldReceive('warm')->once()->andReturn();
+
+        $this->artisan(StacheRefresh::class, ['--exclude' => 'foo']);
+    }
+
+    #[Test]
+    public function it_adds_multiple_excludes()
+    {
+        Stache::shouldReceive('exclude')->once()->with('foo')->andReturn()
+            ->shouldReceive('exclude')->once()->with('bar')->andReturn()
+            ->shouldReceive('clear')->once()->andReturn()
+            ->shouldReceive('warm')->once()->andReturn();
+
+        $this->artisan(StacheRefresh::class, ['--exclude' => 'foo,bar']);
+    }
+}
diff --git a/tests/Console/Commands/StacheWarmTest.php b/tests/Console/Commands/StacheWarmTest.php
new file mode 100644
index 00000000000..d74ce4bbe04
--- /dev/null
+++ b/tests/Console/Commands/StacheWarmTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Tests\Console\Commands;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Console\Commands\StacheWarm;
+use Statamic\Facades\Stache;
+use Tests\TestCase;
+
+class StacheWarmTest extends TestCase
+{
+    #[Test]
+    public function it_doesnt_add_any_exclusion_if_no_parameter()
+    {
+        Stache::shouldReceive('exclude')->never()
+            ->shouldReceive('warm')->once();
+
+        $this->artisan(StacheWarm::class);
+    }
+
+    #[Test]
+    public function it_adds_exclude()
+    {
+        Stache::shouldReceive('exclude')->once()->with('foo')->andReturn()
+            ->shouldReceive('warm')->once()->andReturn();
+
+        $this->artisan(StacheWarm::class, ['--exclude' => 'foo']);
+    }
+
+    #[Test]
+    public function it_adds_multiple_excludes()
+    {
+        Stache::shouldReceive('exclude')->once()->with('foo')->andReturn()
+            ->shouldReceive('exclude')->once()->with('bar')->andReturn()
+            ->shouldReceive('warm')->once()->andReturn();
+
+        $this->artisan(StacheWarm::class, ['--exclude' => 'foo,bar']);
+    }
+}
diff --git a/tests/Console/Commands/StaticWarmJobTest.php b/tests/Console/Commands/StaticWarmJobTest.php
index ab2695e61a8..166ac6ff6d9 100644
--- a/tests/Console/Commands/StaticWarmJobTest.php
+++ b/tests/Console/Commands/StaticWarmJobTest.php
@@ -8,6 +8,7 @@
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Support\Facades\Queue;
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Console\Commands\Concerns\NormalizesPaginationHeader;
 use Statamic\Console\Commands\StaticWarmJob;
 use Tests\TestCase;
 
@@ -22,7 +23,7 @@ public function it_sends_a_get_request()
 
         $handlerStack = HandlerStack::create($mock);
 
-        $job = new StaticWarmJob(new Request('GET', '/about'), ['handler' => $handlerStack]);
+        $job = new StaticWarmJob(new Request('GET', 'http://localhost/about'), ['handler' => $handlerStack]);
 
         $job->handle();
 
@@ -44,7 +45,7 @@ public function it_sends_a_get_request_and_dispatches_static_warm_job_for_page_w
 
         $handlerStack = HandlerStack::create($mock);
 
-        $job = new StaticWarmJob(new Request('GET', '/blog'), ['handler' => $handlerStack]);
+        $job = new StaticWarmJob(new Request('GET', 'http://localhost/blog'), ['handler' => $handlerStack]);
 
         $job->handle();
 
@@ -81,7 +82,7 @@ public function subsequent_paginated_pages_dont_dispatch_static_warm_jobs()
 
         $handlerStack = HandlerStack::create($mock);
 
-        $job = new StaticWarmJob(new Request('GET', '/blog?page=2'), ['handler' => $handlerStack]);
+        $job = new StaticWarmJob(new Request('GET', 'http://localhost/blog?page=2'), ['handler' => $handlerStack]);
 
         $job->handle();
 
@@ -90,4 +91,55 @@ public function subsequent_paginated_pages_dont_dispatch_static_warm_jobs()
         // The first page is responsible for dispatchin jobs. Not subsequent pages.
         Queue::assertNothingPushed();
     }
+
+    #[Test]
+    public function it_dispatches_paginated_jobs_when_the_pagination_header_is_folded_into_one_line()
+    {
+        Queue::fake();
+
+        // A proxy or CDN may coalesce the repeated header into a single comma-joined line.
+        $mock = new MockHandler([
+            (new Response(200))->withHeader('X-Statamic-Pagination', '1, 3, page'),
+        ]);
+
+        $handlerStack = HandlerStack::create($mock);
+
+        $job = new StaticWarmJob(new Request('GET', 'http://localhost/blog'), ['handler' => $handlerStack]);
+
+        $job->handle();
+
+        Queue::assertPushed(StaticWarmJob::class, function (StaticWarmJob $job) {
+            return $job->request->getUri()->getQuery() === 'page=1';
+        });
+
+        Queue::assertPushed(StaticWarmJob::class, function (StaticWarmJob $job) {
+            return $job->request->getUri()->getQuery() === 'page=2';
+        });
+
+        Queue::assertPushed(StaticWarmJob::class, function (StaticWarmJob $job) {
+            return $job->request->getUri()->getQuery() === 'page=3';
+        });
+    }
+
+    #[Test]
+    public function it_keeps_a_page_name_that_contains_a_comma()
+    {
+        $parser = new class
+        {
+            use NormalizesPaginationHeader;
+
+            public function parse($response)
+            {
+                return $this->paginationHeader($response);
+            }
+        };
+
+        // Three separate header values, as set by the static caching middleware.
+        $separate = (new Response(200))->withHeader('X-Statamic-Pagination', ['current' => 1, 'total' => 3, 'name' => 'pa,ge']);
+        $this->assertSame([1, 3, 'pa,ge'], $parser->parse($separate));
+
+        // The same header folded into one comma-joined line by a proxy.
+        $folded = (new Response(200))->withHeader('X-Statamic-Pagination', '1, 3, pa,ge');
+        $this->assertSame([1, 3, 'pa,ge'], $parser->parse($folded));
+    }
 }
diff --git a/tests/Console/Commands/StaticWarmUncachedJobTest.php b/tests/Console/Commands/StaticWarmUncachedJobTest.php
index 5b5459a53bb..60073221d97 100644
--- a/tests/Console/Commands/StaticWarmUncachedJobTest.php
+++ b/tests/Console/Commands/StaticWarmUncachedJobTest.php
@@ -23,7 +23,7 @@ public function it_sends_a_get_request()
 
         $handlerStack = HandlerStack::create($mock);
 
-        $job = new StaticWarmUncachedJob(new Request('GET', '/about'), ['handler' => $handlerStack]);
+        $job = new StaticWarmUncachedJob(new Request('GET', 'http://localhost/about'), ['handler' => $handlerStack]);
 
         $job->handle();
 
@@ -44,7 +44,7 @@ public function it_does_not_send_a_request_if_the_page_is_cached()
 
         $handlerStack = HandlerStack::create($mock);
 
-        $job = new StaticWarmUncachedJob(new Request('GET', '/about'), ['handler' => $handlerStack]);
+        $job = new StaticWarmUncachedJob(new Request('GET', 'http://localhost/about'), ['handler' => $handlerStack]);
 
         $job->handle();
 
diff --git a/tests/Console/FfmpegTest.php b/tests/Console/FfmpegTest.php
new file mode 100644
index 00000000000..46bddcf5668
--- /dev/null
+++ b/tests/Console/FfmpegTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Tests\Console;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Console\Processes\Ffmpeg;
+use Tests\TestCase;
+
+class FfmpegTest extends TestCase
+{
+    #[Test]
+    public function it_builds_a_thumbnail_command_that_only_writes_errors_to_stderr()
+    {
+        $command = $this->buildCommand('/usr/bin/ffmpeg', '/path/to/video.mov', '/path/to/thumb.jpg');
+
+        $this->assertStringContainsString('-hide_banner', $command);
+        $this->assertStringContainsString('-loglevel error', $command);
+        $this->assertStringContainsString('-frames:v 1', $command);
+        $this->assertStringContainsString('-update 1', $command);
+        $this->assertStringNotContainsString('-vframes', $command);
+    }
+
+    private function buildCommand(...$arguments)
+    {
+        $method = (new \ReflectionClass(Ffmpeg::class))->getMethod('buildCommand');
+
+        return $method->invoke(new Ffmpeg, ...$arguments);
+    }
+}
diff --git a/tests/Data/Assets/AssetQueryBuilderTest.php b/tests/Data/Assets/AssetQueryBuilderTest.php
index 3b57451c55d..cf5a146f974 100644
--- a/tests/Data/Assets/AssetQueryBuilderTest.php
+++ b/tests/Data/Assets/AssetQueryBuilderTest.php
@@ -783,6 +783,17 @@ public function can_get_average_value()
         // Assert returns null when there's no results.
         $this->assertNull($this->container->queryAssets()->where('type', 'c')->average('quantity'));
     }
+
+    #[Test]
+    public function sorting_by_unsafe_method_does_not_invoke_it()
+    {
+        $count = $this->container->assets()->count();
+        $this->assertGreaterThan(0, $count);
+
+        $this->container->queryAssets()->orderBy('delete', 'asc')->get();
+
+        $this->assertCount($count, $this->container->assets());
+    }
 }
 
 class CustomScope extends Scope
diff --git a/tests/Data/DataCollectionTest.php b/tests/Data/DataCollectionTest.php
index 1ee5795f7ba..de697a8882a 100644
--- a/tests/Data/DataCollectionTest.php
+++ b/tests/Data/DataCollectionTest.php
@@ -3,7 +3,9 @@
 namespace Tests\Data;
 
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Contracts\Search\Searchable;
 use Statamic\Data\DataCollection;
+use Statamic\Search\Result;
 use Tests\TestCase;
 
 class DataCollectionTest extends TestCase
@@ -31,4 +33,69 @@ public function it_sorts_by_first_item_in_arrays()
 
         $this->assertEquals([1, 3, 2], $collection->multisort('foos')->pluck('id')->all());
     }
+
+    #[Test]
+    public function sorting_by_unsafe_method_does_not_invoke_it()
+    {
+        $a = new DataCollectionTestObject('alfa');
+        $b = new DataCollectionTestObject('bravo');
+
+        $collection = new DataCollection([$a, $b]);
+
+        $collection->multisort('delete');
+
+        $this->assertFalse($a->deleted);
+        $this->assertFalse($b->deleted);
+    }
+
+    #[Test]
+    public function sorting_search_results_by_unsafe_method_does_not_invoke_it()
+    {
+        $a = new DataCollectionTestObject('alfa');
+        $b = new DataCollectionTestObject('bravo');
+
+        $collection = new DataCollection([
+            new Result($a, 'test'),
+            new Result($b, 'test'),
+        ]);
+
+        $collection->multisort('delete');
+
+        $this->assertFalse($a->deleted);
+        $this->assertFalse($b->deleted);
+    }
+}
+
+class DataCollectionTestObject implements Searchable
+{
+    public bool $deleted = false;
+
+    public function __construct(public string $title)
+    {
+    }
+
+    public function delete()
+    {
+        $this->deleted = true;
+    }
+
+    public function get($key)
+    {
+        return $this->{$key} ?? null;
+    }
+
+    public function getSearchValue(string $field)
+    {
+        return $this->{$field} ?? null;
+    }
+
+    public function getSearchReference(): string
+    {
+        return 'test::'.$this->title;
+    }
+
+    public function toSearchResult(): Result
+    {
+        return new Result($this, 'test');
+    }
 }
diff --git a/tests/Data/Entries/EntryQueryBuilderTest.php b/tests/Data/Entries/EntryQueryBuilderTest.php
index 599f2550c85..35e34b3a915 100644
--- a/tests/Data/Entries/EntryQueryBuilderTest.php
+++ b/tests/Data/Entries/EntryQueryBuilderTest.php
@@ -173,6 +173,21 @@ public function entries_are_found_using_where_date()
         $this->assertEquals(['Post 1', 'Post 3'], $entries->map->title->all());
     }
 
+    #[Test]
+    public function entries_are_found_using_where_date_with_a_carbon_instance_in_a_different_timezone()
+    {
+        $this->createWhereDateTestEntries();
+
+        // 2021-11-15 02:00 in Moscow (+03:00) is 2021-11-14 23:00 in the app's (UTC) timezone,
+        // so it should match Post 2 (stored as 2021-11-14) and not Post 1 or Post 3 (2021-11-15).
+        $value = Carbon::create(2021, 11, 15, 2, 0, 0, 'Europe/Moscow');
+
+        $entries = Entry::query()->whereDate('test_date', $value)->get();
+
+        $this->assertCount(1, $entries);
+        $this->assertEquals(['Post 2'], $entries->map->title->all());
+    }
+
     #[Test]
     public function entries_are_found_using_where_month()
     {
@@ -251,6 +266,21 @@ public function entries_are_found_using_where_time()
         $this->assertEquals(['Post 2'], $entries->map->title->all());
     }
 
+    #[Test]
+    public function entries_are_found_using_where_time_with_a_carbon_instance_in_a_different_timezone()
+    {
+        $this->createWhereDateTestEntries();
+
+        // 2021-11-13 12:00 in Moscow (+03:00) is 09:00 in the app's (UTC) timezone,
+        // matching Post 2's stored time.
+        $value = Carbon::create(2021, 11, 13, 12, 0, 0, 'Europe/Moscow');
+
+        $entries = Entry::query()->whereTime('test_date', $value)->get();
+
+        $this->assertCount(1, $entries);
+        $this->assertEquals(['Post 2'], $entries->map->title->all());
+    }
+
     private function createWhereDateTestEntries()
     {
         $blueprint = Blueprint::makeFromFields(['test_date' => ['type' => 'date', 'time_enabled' => true]]);
@@ -829,6 +859,18 @@ public function entries_are_found_using_offset()
         $this->assertEquals(['Post 2', 'Post 3'], $entries->map->title->all());
     }
 
+    #[Test]
+    public function it_returns_an_empty_page_when_the_offset_overflows()
+    {
+        $this->createDummyCollectionAndEntries();
+
+        // A page number large enough to overflow the offset arithmetic used to crash
+        // array_slice() with a float; it should just yield an empty page.
+        $entries = Entry::query()->forPage(PHP_INT_MAX, 6)->get();
+
+        $this->assertCount(0, $entries);
+    }
+
     #[Test]
     public function entries_are_found_using_where_has_when_max_items_1()
     {
@@ -967,6 +1009,9 @@ public function entries_are_found_using_like($like, $expected)
             '/ test',
             'test /',
             'test / test',
+            'Über dem Meer',
+            'über dem meer',
+            'Ärger',
         ])->each(function ($val, $i) {
             EntryFactory::id($i)
                 ->slug('post-'.$i)
@@ -999,6 +1044,10 @@ public static function likeProvider()
             '%/' => ['/', 'test /'],
             '/%' => ['/', '/ test'],
             '%/%' => ['/', '/ test', 'test /', 'test / test'],
+            '%über%' => ['Über dem Meer', 'über dem meer'],
+            '%Über%' => ['Über dem Meer', 'über dem meer'],
+            '%ärger%' => ['Ärger'],
+            '%Ärger%' => ['Ärger'],
         ])->mapWithKeys(function ($expected, $like) {
             return [$like => [$like, $expected]];
         });
@@ -1215,6 +1264,18 @@ public function it_filters_by_status($status, $expected)
         EntryFactory::collection('calendar')->id('calendar-past')->published(true)->date(now()->subDay())->create();
         EntryFactory::collection('calendar')->id('calendar-past-draft')->published(false)->date(now()->subDay())->create();
 
+        Collection::make('news')->dated(true)->futureDateBehavior('unlisted')->pastDateBehavior('public')->save();
+        EntryFactory::collection('news')->id('news-future')->published(true)->date(now()->addDay())->create();
+        EntryFactory::collection('news')->id('news-future-draft')->published(false)->date(now()->addDay())->create();
+        EntryFactory::collection('news')->id('news-past')->published(true)->date(now()->subDay())->create();
+        EntryFactory::collection('news')->id('news-past-draft')->published(false)->date(now()->subDay())->create();
+
+        Collection::make('alerts')->dated(true)->futureDateBehavior('public')->pastDateBehavior('unlisted')->save();
+        EntryFactory::collection('alerts')->id('alerts-future')->published(true)->date(now()->addDay())->create();
+        EntryFactory::collection('alerts')->id('alerts-future-draft')->published(false)->date(now()->addDay())->create();
+        EntryFactory::collection('alerts')->id('alerts-past')->published(true)->date(now()->subDay())->create();
+        EntryFactory::collection('alerts')->id('alerts-past-draft')->published(false)->date(now()->subDay())->create();
+
         // Undated, but with customized date behavior. Nonsensical situation, but it can happen.
         // See https://github.com/statamic/eloquent-driver/issues/288
         Collection::make('undated')->dated(false)->futureDateBehavior('private')->pastDateBehavior('private')->save();
@@ -1235,6 +1296,10 @@ public static function filterByStatusProvider()
                 'event-past-draft',
                 'calendar-future-draft',
                 'calendar-past-draft',
+                'news-future-draft',
+                'news-past-draft',
+                'alerts-future-draft',
+                'alerts-past-draft',
                 'undated-draft',
             ]],
             'published' => ['published', [
@@ -1243,6 +1308,10 @@ public static function filterByStatusProvider()
                 'event-future',
                 'calendar-future',
                 'calendar-past',
+                'news-future',
+                'news-past',
+                'alerts-future',
+                'alerts-past',
                 'undated',
             ]],
             'scheduled' => ['scheduled', [
@@ -1469,6 +1538,19 @@ public function exists_returns_false_when_no_results_are_found()
     {
         $this->assertFalse(Entry::query()->exists());
     }
+
+    #[Test]
+    public function sorting_by_unsafe_method_does_not_invoke_it()
+    {
+        $this->createDummyCollectionAndEntries();
+
+        $count = Entry::all()->count();
+        $this->assertGreaterThan(0, $count);
+
+        Entry::query()->orderBy('delete', 'asc')->get();
+
+        $this->assertCount($count, Entry::all());
+    }
 }
 
 class CustomScope extends Scope
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index a4b4f178926..2f800df2f60 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -702,6 +702,31 @@ public static function firstChildRedirectProvider()
         ];
     }
 
+    #[Test]
+    public function structured_entry_uri_updates_when_custom_field_in_route_changes()
+    {
+        $this->setSites([
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en_US'],
+        ]);
+
+        $collection = tap((new Collection)->handle('pages')->routes('{slug}/{test}'))->save();
+
+        $entry = tap((new Entry)->id('1')->locale('en')->collection($collection)->slug('page')->set('test', 'foo'))->save();
+
+        $collection->structureContents(['expects_root' => false])->save();
+        $collection->structure()->in('en')->tree([['entry' => '1']])->save();
+
+        // Warm the structure caches like they would be in production.
+        Blink::store('entry-uris')->flush();
+        $this->assertEquals('/page/foo', $entry->uri());
+
+        $entry->set('test', 'bar');
+        $entry->save();
+
+        Blink::store('entry-uris')->flush();
+        $this->assertEquals('/page/bar', $entry->uri());
+    }
+
     #[Test]
     public function it_gets_and_sets_supplemental_data()
     {
@@ -1160,6 +1185,32 @@ public function it_gets_the_order_from_the_collections_structure()
         $this->assertEquals(3, $four->order());
     }
 
+    #[Test]
+    public function it_gets_the_order_from_the_collections_structure_when_the_tree_contains_a_null_item()
+    {
+        $collection = tap(Collection::make('ordered'))->save();
+
+        $one = tap((new Entry)->locale('en')->id('one')->collection($collection))->save();
+        $two = tap((new Entry)->locale('en')->id('two')->collection($collection))->save();
+        $three = tap((new Entry)->locale('en')->id('three')->collection($collection))->save();
+
+        $collection->structureContents([
+            'max_depth' => 3,
+        ])->save();
+        $collection->structure()->in('en')->tree(
+            [
+                ['entry' => 'three'],
+                null,
+                ['entry' => 'one'],
+                ['entry' => 'two'],
+            ]
+        )->save();
+
+        $this->assertEquals(2, $one->order());
+        $this->assertEquals(3, $two->order());
+        $this->assertEquals(1, $three->order());
+    }
+
     #[Test]
     public function it_gets_the_order_from_the_data_if_not_structured()
     {
@@ -1430,7 +1481,6 @@ public function when_saving_quietly_the_cached_entrys_withEvents_flag_will_be_se
         $cached = Cache::get('stache::items::entries::blog::1');
         $reflection = new ReflectionClass($cached);
         $property = $reflection->getProperty('withEvents');
-        $property->setAccessible(true);
         $withEvents = $property->getValue($cached);
         $this->assertTrue($withEvents);
     }
@@ -1553,6 +1603,74 @@ public function it_propagates_entry_if_configured()
         });
     }
 
+    #[Test]
+    public function it_resolves_descendants_with_one_query_per_level_rather_than_one_per_localization()
+    {
+        $collection = (new Collection)->handle('pages')->save();
+
+        $entry = (new Entry)->id('a')->locale('en')->collection($collection);
+
+        // Three direct localizations, all leaves (no further descendants).
+        $fr = (new Entry)->id('b')->locale('fr')->origin('a')->collection($collection);
+        $de = (new Entry)->id('c')->locale('de')->origin('a')->collection($collection);
+        $es = (new Entry)->id('d')->locale('es')->origin('a')->collection($collection);
+
+        // A flat tree is one level deep, so it should take exactly two queries
+        // (the direct descendants, then a single batched lookup for the next
+        // level which comes back empty) regardless of how many localizations
+        // exist. The previous recursive implementation issued one query per
+        // node, i.e. O(number of localizations).
+        Facades\Entry::shouldReceive('query')->times(2)->andReturn(
+            $this->fakeDescendantsQuery(collect([$fr, $de, $es])),       // direct descendants of 'a'
+            $this->fakeDescendantsQuery(collect(), ['b', 'c', 'd']),     // batched lookup for the next level
+        );
+
+        $descendants = $entry->descendants();
+
+        $this->assertEquals(['de', 'es', 'fr'], $descendants->keys()->sort()->values()->all());
+    }
+
+    #[Test]
+    public function it_includes_descendants_nested_via_an_origin_chain()
+    {
+        $collection = (new Collection)->handle('pages')->save();
+
+        $entry = (new Entry)->id('a')->locale('en')->collection($collection);
+
+        // de's origin is fr, whose origin is en: a grandchild only reachable by
+        // walking past the first level. The flattened result must include it.
+        $fr = (new Entry)->id('b')->locale('fr')->origin('a')->collection($collection);
+        $de = (new Entry)->id('c')->locale('de')->origin('b')->collection($collection);
+
+        Facades\Entry::shouldReceive('query')->times(3)->andReturn(
+            $this->fakeDescendantsQuery(collect([$fr])),         // direct descendants of en
+            $this->fakeDescendantsQuery(collect([$de]), ['b']),  // batched descendants of fr
+            $this->fakeDescendantsQuery(collect(), ['c']),       // batched descendants of de
+        );
+
+        $descendants = $entry->descendants();
+
+        $this->assertEquals(['de', 'fr'], $descendants->keys()->sort()->values()->all());
+        $this->assertSame($fr, $descendants->get('fr'));
+        $this->assertSame($de, $descendants->get('de'));
+    }
+
+    private function fakeDescendantsQuery($results, ?array $whereInOrigins = null): QueryBuilder
+    {
+        $query = Mockery::mock(QueryBuilder::class);
+        $query->shouldReceive('where')->with('collection', 'pages')->andReturnSelf();
+
+        if ($whereInOrigins === null) {
+            // directDescendants() uses where('origin', string); batched levels use whereIn.
+            $query->shouldReceive('where')->with('origin', Mockery::type('string'))->andReturnSelf();
+        }
+
+        $query->shouldReceive('whereIn')->with('origin', $whereInOrigins ?? Mockery::type('array'))->andReturnSelf();
+        $query->shouldReceive('get')->andReturn($results);
+
+        return $query;
+    }
+
     #[Test]
     public function it_doesnt_fire_events_when_propagating_entry_and_saved_quietly()
     {
@@ -2024,6 +2142,35 @@ public function it_gets_and_sets_an_inferred_template_from_blueprint()
         $this->assertEquals('articles.custom', $entry->template());
     }
 
+    #[Test]
+    public function it_respects_custom_blueprint_template_path_per_collection()
+    {
+        config(['statamic.system.blueprint_templates' => [
+            'articles' => 'custom.path',
+        ]]);
+
+        $articles = tap(Collection::make('articles')->template('@blueprint'))->save();
+        $pages = tap(Collection::make('pages')->template('@blueprint'))->save();
+        $blueprint = tap(Blueprint::make('standard_article')->setNamespace('collections.articles'))->save();
+
+        $articleEntry = Entry::make('test')->collection($articles)->blueprint($blueprint->handle());
+        $pageEntry = Entry::make('test')->collection($pages)->blueprint($blueprint->handle());
+
+        // mapped collection uses the mapped prefix instead of the collection handle
+        $this->assertEquals('custom.path.standard_article', $articleEntry->template());
+
+        // unmapped collection still uses its handle as the prefix
+        $this->assertEquals('pages.standard_article', $pageEntry->template());
+
+        // mapped collection uses slugified prefix when that template exists
+        View::shouldReceive('exists')->with('custom.path.standard-article')->andReturn(true);
+        $this->assertEquals('custom.path.standard-article', $articleEntry->template());
+
+        // entry level template still overrides @blueprint
+        $articleEntry->template('articles.custom');
+        $this->assertEquals('articles.custom', $articleEntry->template());
+    }
+
     #[Test]
     public function it_gets_and_sets_the_layout()
     {
@@ -2719,6 +2866,36 @@ public function creates_custom_entry_class()
         $this->assertInstanceOf(CustomEntry::class, $two);
     }
 
+    #[Test]
+    public function localization_of_custom_entry_class_uses_the_origins_blueprint()
+    {
+        $this->setSites([
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+        ]);
+
+        BlueprintRepository::shouldReceive('in')->with('collections/custom')->andReturn(collect([
+            'default' => (new Blueprint)->setHandle('default'),
+            'another' => (new Blueprint)->setHandle('another'),
+        ]));
+
+        $collection = tap(Collection::make('custom')->sites(['en', 'fr'])->entryClass(CustomEntry::class))->save();
+
+        $origin = EntryFactory::id('origin-id')
+            ->locale('en')
+            ->collection($collection)
+            ->slug('alfa')
+            ->blueprint('another')
+            ->create();
+
+        $this->assertEquals('another', $origin->blueprint()->handle());
+
+        $localization = $origin->makeLocalization('fr');
+
+        $this->assertInstanceOf(CustomEntry::class, $localization);
+        $this->assertEquals('another', $localization->blueprint()->handle());
+    }
+
     #[Test]
     public function it_clones_internal_collections()
     {
@@ -2737,6 +2914,30 @@ public function it_clones_internal_collections()
         $this->assertEquals('B', $clone->getSupplement('bar'));
     }
 
+    #[Test]
+    public function using_route_data_in_computed_props_does_not_cause_infinite_loops()
+    {
+        $collection =
+            \Statamic\Facades\Collection::make('pages')
+                ->routes('{slug}')
+                ->structureContents(['root' => true])  // We need to be in a structure to create the infinite loop condition.
+                ->save();
+
+        \Statamic\Facades\Collection::computed('pages', 'custom', function ($entry) {
+            return 'Custom: '.$entry->uri();
+        });
+
+        EntryFactory::id('entry-id')
+            ->slug('entry-slug')
+            ->collection('pages')
+            ->create();
+
+        Blink::store('entry-uris')->flush();
+
+        $entry = Facades\Entry::find('entry-id');
+        $this->assertSame('Custom: /', $entry->custom);
+    }
+
     #[Test]
     public function entries_can_be_serialized_after_resolving_values()
     {
diff --git a/tests/Data/Globals/VariablesTest.php b/tests/Data/Globals/VariablesTest.php
index 9bcfbb65ad4..2078e6bbf8b 100644
--- a/tests/Data/Globals/VariablesTest.php
+++ b/tests/Data/Globals/VariablesTest.php
@@ -10,6 +10,7 @@
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades;
 use Statamic\Facades\Blueprint;
+use Statamic\Facades\Data;
 use Statamic\Facades\GlobalSet;
 use Statamic\Fields\Fieldtype;
 use Statamic\Fields\Value;
@@ -96,10 +97,10 @@ public function it_gets_file_contents_for_saving_a_localized_set()
   - 'second one'
 string: 'The string'
 'null': null
-empty: {  }
+empty: {}
 
 EOT;
-        $this->assertEquals($expected, $b->fileContents());
+        $this->assertEquals($expected, $this->normalizeYaml($b->fileContents()));
 
         $expected = <<<'EOT'
 array:
@@ -407,4 +408,17 @@ public function it_clones_internal_collections()
         $this->assertEquals('A', $variables->getSupplement('bar'));
         $this->assertEquals('B', $clone->getSupplement('bar'));
     }
+
+    #[Test]
+    public function it_can_be_found_via_the_data_repository_using_its_reference()
+    {
+        $global = tap(GlobalSet::make('test'))->save();
+        $variables = tap($global->inDefaultSite()->data(['foo' => 'bar']))->save();
+
+        $found = Data::find($variables->reference());
+
+        $this->assertInstanceOf(Variables::class, $found);
+        $this->assertEquals($variables->id(), $found->id());
+        $this->assertEquals('bar', $found->get('foo'));
+    }
 }
diff --git a/tests/Data/Structures/CollectionStructureTest.php b/tests/Data/Structures/CollectionStructureTest.php
index c67f784bd91..afc02ef3980 100644
--- a/tests/Data/Structures/CollectionStructureTest.php
+++ b/tests/Data/Structures/CollectionStructureTest.php
@@ -174,13 +174,13 @@ public function it_gets_an_entry_uri()
         $this->collection->shouldReceive('route')->with('en')->once()->andReturn('{slug}');
 
         $page = $this->mock(Page::class);
-        $page->shouldReceive('reference')->andReturn('the-entry-id');
+        $page->shouldReceive('setEntry')->once()->andReturnSelf();
         $page->shouldReceive('uri')->andReturn('/the-uri-from-the-page');
 
         $tree = $this->mock(Tree::class);
         $tree->shouldReceive('structure')->andReturn($structure);
         $tree->shouldReceive('locale')->andReturn('en');
-        $tree->shouldReceive('flattenedPages')->andReturn(collect([$page]));
+        $tree->shouldReceive('findByEntry')->with('the-entry-id')->andReturn($page);
 
         CollectionTreeRepository::shouldReceive('find')->with('test', 'en')->andReturn($tree);
 
diff --git a/tests/Data/Structures/CollectionTreeTest.php b/tests/Data/Structures/CollectionTreeTest.php
index e5c848e0a18..6f38045da87 100644
--- a/tests/Data/Structures/CollectionTreeTest.php
+++ b/tests/Data/Structures/CollectionTreeTest.php
@@ -2,11 +2,15 @@
 
 namespace Tests\Data\Structures;
 
+use Facades\Tests\Factories\EntryFactory;
 use Illuminate\Support\Facades\Event;
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Events\CollectionTreeEntriesMovedOrRemoved;
 use Statamic\Events\CollectionTreeSaving;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
+use Statamic\Facades\Stache;
 use Statamic\Structures\CollectionTree;
 use Statamic\Structures\CollectionTreeDiff;
 use Tests\PreventSavingStacheItemsToDisk;
@@ -142,4 +146,166 @@ public function returning_false_in_collection_tree_saving_stops_saving()
 
         $this->assertFileDoesNotExist($tree->path());
     }
+
+    #[Test]
+    public function it_fires_entries_moved_or_removed_event_when_entries_are_removed()
+    {
+        Event::fake();
+        Entry::shouldReceive('find')->andReturn(null);
+
+        $collection = Collection::make('test')->structureContents(['root' => true]);
+        Collection::shouldReceive('findByHandle')->with('test')->andReturn($collection);
+
+        $tree = $collection->structure()->makeTree('en', [
+            ['entry' => '1.0'],
+            ['entry' => '2.0'],
+        ]);
+
+        $tree->tree([
+            ['entry' => '1.0'],
+        ]);
+
+        $tree->save();
+
+        Event::assertDispatched(CollectionTreeEntriesMovedOrRemoved::class, function ($event) {
+            return $event->removed === ['2.0'] && $event->moved === [];
+        });
+    }
+
+    #[Test]
+    public function it_fires_entries_moved_or_removed_event_when_entries_change_ancestry()
+    {
+        Event::fake();
+        Entry::shouldReceive('find')->andReturn(null);
+
+        $collection = Collection::make('test')->structureContents(['root' => true]);
+        Collection::shouldReceive('findByHandle')->with('test')->andReturn($collection);
+
+        $tree = $collection->structure()->makeTree('en', [
+            ['entry' => '1.0', 'children' => [
+                ['entry' => '1.1'],
+            ]],
+            ['entry' => '2.0'],
+        ]);
+
+        $tree->tree([
+            ['entry' => '1.0'],
+            ['entry' => '2.0', 'children' => [
+                ['entry' => '1.1'],
+            ]],
+        ]);
+
+        $tree->save();
+
+        Event::assertDispatched(CollectionTreeEntriesMovedOrRemoved::class, function ($event) {
+            return $event->removed === [] && $event->moved === ['1.1'];
+        });
+    }
+
+    #[Test]
+    public function it_does_not_fire_entries_moved_or_removed_event_when_entries_are_only_reordered()
+    {
+        Event::fake();
+
+        $collection = Collection::make('test')->structureContents(['root' => true]);
+        Collection::shouldReceive('findByHandle')->with('test')->andReturn($collection);
+
+        $tree = $collection->structure()->makeTree('en', [
+            ['entry' => '1.0', 'children' => [
+                ['entry' => '1.1'],
+                ['entry' => '1.2'],
+            ]],
+        ]);
+
+        $tree->tree([
+            ['entry' => '1.0', 'children' => [
+                ['entry' => '1.2'],
+                ['entry' => '1.1'],
+            ]],
+        ]);
+
+        $tree->save();
+
+        Event::assertNotDispatched(CollectionTreeEntriesMovedOrRemoved::class);
+    }
+
+    #[Test]
+    public function it_does_not_fire_entries_moved_or_removed_event_when_saving_is_halted()
+    {
+        Event::fake([CollectionTreeEntriesMovedOrRemoved::class]);
+
+        Event::listen(CollectionTreeSaving::class, function () {
+            return false;
+        });
+
+        $collection = Collection::make('test')->structureContents(['root' => true]);
+        Collection::shouldReceive('findByHandle')->with('test')->andReturn($collection);
+
+        $tree = $collection->structure()->makeTree('en', [
+            ['entry' => '1.0'],
+            ['entry' => '2.0'],
+        ]);
+
+        $tree->tree([
+            ['entry' => '1.0'],
+        ]);
+
+        $tree->save();
+
+        Event::assertNotDispatched(CollectionTreeEntriesMovedOrRemoved::class);
+    }
+
+    #[Test]
+    public function reordering_a_parent_keeps_the_order_index_of_its_descendants_in_sync()
+    {
+        $collection = tap(Collection::make('pages')->routes('{slug}')->structureContents(['root' => false]))->save();
+
+        foreach (['alfa', 'a1', 'a2', 'a3', 'bravo', 'charlie'] as $id) {
+            EntryFactory::collection('pages')->id($id)->slug($id)->data(['title' => $id])->create();
+        }
+
+        $collection->structure()->in('en')->tree([
+            ['entry' => 'alfa', 'children' => [
+                ['entry' => 'a1'],
+                ['entry' => 'a2'],
+                ['entry' => 'a3'],
+            ]],
+            ['entry' => 'bravo'],
+            ['entry' => 'charlie'],
+        ])->save();
+
+        $this->assertEquals([
+            'alfa' => 1,
+            'a1' => 2,
+            'a2' => 3,
+            'a3' => 4,
+            'bravo' => 5,
+            'charlie' => 6,
+        ], $this->cachedOrderIndex('pages'));
+
+        // Move "alfa" (and its three children) to the bottom.
+        $collection->structure()->in('en')->tree([
+            ['entry' => 'bravo'],
+            ['entry' => 'charlie'],
+            ['entry' => 'alfa', 'children' => [
+                ['entry' => 'a1'],
+                ['entry' => 'a2'],
+                ['entry' => 'a3'],
+            ]],
+        ])->save();
+
+        $this->assertEquals([
+            'alfa' => 3,
+            'a1' => 4,
+            'a2' => 5,
+            'a3' => 6,
+            'bravo' => 1,
+            'charlie' => 2,
+        ], $this->cachedOrderIndex('pages'));
+    }
+
+    private function cachedOrderIndex(string $collection): array
+    {
+        return Stache::store('entries')->store($collection)->index('order')->items()->all();
+    }
 }
diff --git a/tests/Data/Structures/TreeTest.php b/tests/Data/Structures/TreeTest.php
index bf51e5025a9..625338b9c06 100644
--- a/tests/Data/Structures/TreeTest.php
+++ b/tests/Data/Structures/TreeTest.php
@@ -426,8 +426,8 @@ public function the_structure_validates_the_tree_when_getting_it_the_first_time(
         $structure = $this->mock(Structure::class);
         $structure->shouldReceive('handle')->andReturn('test');
 
-        $firstContents = ['first' => 'time'];
-        $secondContents = ['second' => 'time'];
+        $firstContents = [['entry' => 'first']];
+        $secondContents = [['entry' => 'second']];
 
         $structure->shouldReceive('validateTree')->with($firstContents, 'the-locale')->once()->andReturn($firstContents);
         $structure->shouldReceive('validateTree')->with($secondContents, 'the-locale')->once()->andReturn($secondContents);
@@ -451,6 +451,40 @@ public function the_structure_validates_the_tree_when_getting_it_the_first_time(
         $tree->tree();
     }
 
+    #[Test]
+    public function it_removes_null_items_when_setting_the_tree()
+    {
+        $tree = $this->tree([
+            [
+                'id' => 'pages-home',
+            ],
+            null,
+            [
+                'id' => 'pages-about',
+                'children' => [
+                    [
+                        'id' => 'pages-board',
+                    ],
+                    null,
+                ],
+            ],
+        ]);
+
+        $this->assertEquals([
+            [
+                'id' => 'pages-home',
+            ],
+            [
+                'id' => 'pages-about',
+                'children' => [
+                    [
+                        'id' => 'pages-board',
+                    ],
+                ],
+            ],
+        ], $tree->tree());
+    }
+
     #[Test]
     public function it_cannot_move_into_root_if_structure_expects_root()
     {
diff --git a/tests/Data/Taxonomies/TaxonomyTest.php b/tests/Data/Taxonomies/TaxonomyTest.php
index 05d685bb34f..3f78a3c1c75 100644
--- a/tests/Data/Taxonomies/TaxonomyTest.php
+++ b/tests/Data/Taxonomies/TaxonomyTest.php
@@ -182,6 +182,21 @@ public function it_gets_the_url_with_a_collection()
         $this->assertEquals('http://localhost/blog/tags', $taxonomy->absoluteUrl());
     }
 
+    #[Test]
+    public function it_gets_sort_field_and_direction()
+    {
+        $taxonomy = new Taxonomy;
+        $this->assertEquals('title', $taxonomy->sortField());
+        $this->assertEquals('asc', $taxonomy->sortDirection());
+
+        $taxonomy->setSortField('foo');
+        $this->assertEquals('foo', $taxonomy->sortField());
+        $this->assertEquals('asc', $taxonomy->sortDirection());
+
+        $taxonomy->setSortDirection('desc');
+        $this->assertEquals('desc', $taxonomy->sortDirection());
+    }
+
     #[Test]
     public function it_gets_evaluated_augmented_value_using_magic_property()
     {
@@ -308,6 +323,30 @@ public function it_get_terms_count_from_multi_sites()
         $this->assertEquals(3, $taxonomy->queryTerms()->pluck('slug')->unique()->count());
     }
 
+    #[Test]
+    public function it_has_file_data()
+    {
+        $taxonomy = (new Taxonomy)
+            ->handle('tags')
+            ->title('Tags');
+
+        $this->assertEquals([
+            'title' => 'Tags',
+            'inject' => [],
+        ], $taxonomy->fileData());
+
+        $taxonomy
+            ->setSortField('foo')
+            ->setSortDirection('desc');
+
+        $this->assertEquals([
+            'title' => 'Tags',
+            'sort_by' => 'foo',
+            'sort_dir' => 'desc',
+            'inject' => [],
+        ], $taxonomy->fileData());
+    }
+
     #[Test]
     public function it_saves_through_the_api()
     {
diff --git a/tests/Data/Taxonomies/TermQueryBuilderTest.php b/tests/Data/Taxonomies/TermQueryBuilderTest.php
index 0fcbf38c76f..fff3e17a467 100644
--- a/tests/Data/Taxonomies/TermQueryBuilderTest.php
+++ b/tests/Data/Taxonomies/TermQueryBuilderTest.php
@@ -6,7 +6,6 @@
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
-use Statamic\Facades\Site;
 use Statamic\Facades\Taxonomy;
 use Statamic\Facades\Term;
 use Statamic\Query\Scopes\Scope;
@@ -847,6 +846,21 @@ public function can_get_average_value()
         // Assert returns null when there's no results.
         $this->assertNull(Term::query()->where('type', 'c')->average('quantity'));
     }
+
+    #[Test]
+    public function sorting_by_unsafe_method_does_not_invoke_it()
+    {
+        Taxonomy::make('tags')->save();
+        Term::make('a')->taxonomy('tags')->data(['title' => 'Alpha'])->save();
+        Term::make('b')->taxonomy('tags')->data(['title' => 'Bravo'])->save();
+
+        $count = Term::all()->count();
+        $this->assertGreaterThan(0, $count);
+
+        Term::query()->orderBy('delete', 'asc')->get();
+
+        $this->assertCount($count, Term::all());
+    }
 }
 
 class CustomScope extends Scope
diff --git a/tests/Data/TracksLastModifiedTest.php b/tests/Data/TracksLastModifiedTest.php
index 59cf18d2163..1df74c8c185 100644
--- a/tests/Data/TracksLastModifiedTest.php
+++ b/tests/Data/TracksLastModifiedTest.php
@@ -38,6 +38,8 @@ public function tearDown(): void
     #[Test]
     public function it_gets_last_updated_at_from_file()
     {
+        $this->freezeTime();
+
         $this->assertFalse($this->entry->has('updated_at'));
         $this->assertEquals($this->entry->fileLastModified()->timestamp, $this->entry->lastModified()->timestamp);
     }
diff --git a/tests/Data/Users/UserQueryBuilderTest.php b/tests/Data/Users/UserQueryBuilderTest.php
index af10bd211fc..0ce1a31f1c7 100644
--- a/tests/Data/Users/UserQueryBuilderTest.php
+++ b/tests/Data/Users/UserQueryBuilderTest.php
@@ -560,6 +560,20 @@ public function users_are_found_using_scopes()
         $this->assertCount(1, User::query()->customScope(['email' => 'gandalf@precious.com'])->get());
         $this->assertCount(1, User::query()->whereCustom(['email' => 'gandalf@precious.com'])->get());
     }
+
+    #[Test]
+    public function sorting_by_unsafe_method_does_not_invoke_it()
+    {
+        User::make()->email('a@example.com')->data(['name' => 'Alpha'])->save();
+        User::make()->email('b@example.com')->data(['name' => 'Bravo'])->save();
+
+        $count = User::all()->count();
+        $this->assertGreaterThan(0, $count);
+
+        User::query()->orderBy('delete', 'asc')->get();
+
+        $this->assertCount($count, User::all());
+    }
 }
 
 class CustomScope extends Scope
diff --git a/tests/Dictionaries/CurrenciesTest.php b/tests/Dictionaries/CurrenciesTest.php
index f8b7f57c6fc..62e68adae62 100644
--- a/tests/Dictionaries/CurrenciesTest.php
+++ b/tests/Dictionaries/CurrenciesTest.php
@@ -15,7 +15,7 @@ public function it_gets_options()
     {
         $options = (new Currencies)->options();
 
-        $this->assertCount(114, $options);
+        $this->assertCount(154, $options);
         $option = $options['USD'];
         $this->assertEquals('US Dollar (USD)', $option);
     }
@@ -51,6 +51,16 @@ public static function searchProvider()
                     'USD' => 'US Dollar (USD)',
                     'BND' => 'Brunei Dollar (BND)',
                     'TWD' => 'New Taiwan Dollar (TWD)',
+                    'BBD' => 'Barbadian Dollar (BBD)',
+                    'BMD' => 'Bermudian Dollar (BMD)',
+                    'BSD' => 'Bahamian Dollar (BSD)',
+                    'FJD' => 'Fijian Dollar (FJD)',
+                    'GYD' => 'Guyanese Dollar (GYD)',
+                    'KYD' => 'Cayman Islands Dollar (KYD)',
+                    'LRD' => 'Liberian Dollar (LRD)',
+                    'SBD' => 'Solomon Islands Dollar (SBD)',
+                    'SRD' => 'Surinamese Dollar (SRD)',
+                    'XCD' => 'Eastern Caribbean Dollar (XCD)',
                 ],
             ],
             'dollar symbol' => [
@@ -80,12 +90,28 @@ public static function searchProvider()
                     'USD' => 'US Dollar (USD)',
                     'UYU' => 'Uruguayan Peso (UYU)',
                     'ZWG' => 'Zimbabwe Gold (ZWG)',
+                    'BBD' => 'Barbadian Dollar (BBD)',
+                    'BMD' => 'Bermudian Dollar (BMD)',
+                    'BSD' => 'Bahamian Dollar (BSD)',
+                    'CUP' => 'Cuban Peso (CUP)',
+                    'FJD' => 'Fijian Dollar (FJD)',
+                    'GYD' => 'Guyanese Dollar (GYD)',
+                    'KYD' => 'Cayman Islands Dollar (KYD)',
+                    'LRD' => 'Liberian Dollar (LRD)',
+                    'SBD' => 'Solomon Islands Dollar (SBD)',
+                    'SRD' => 'Surinamese Dollar (SRD)',
+                    'WST' => 'Samoan Tala (WST)',
+                    'XCD' => 'Eastern Caribbean Dollar (XCD)',
                 ],
             ],
             'pound symbol' => [
                 '£',
                 [
                     'GBP' => 'British Pound Sterling (GBP)',
+                    'FKP' => 'Falkland Islands Pound (FKP)',
+                    'GIP' => 'Gibraltar Pound (GIP)',
+                    'SHP' => 'Saint Helena Pound (SHP)',
+                    'SSP' => 'South Sudanese Pound (SSP)',
                 ],
             ],
         ];
diff --git a/tests/Dictionaries/LocalesTest.php b/tests/Dictionaries/LocalesTest.php
new file mode 100644
index 00000000000..3facd384a6a
--- /dev/null
+++ b/tests/Dictionaries/LocalesTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\Dictionaries;
+
+use Facades\Statamic\Console\Processes\Process;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Dictionaries\Locales;
+use Tests\TestCase;
+
+class LocalesTest extends TestCase
+{
+    #[Test]
+    public function it_only_runs_the_locale_process_once_and_caches_the_result()
+    {
+        Process::shouldReceive('run')->once()->andReturn(implode(PHP_EOL, ['en_US.UTF-8', 'fr_FR.UTF-8', 'C', 'POSIX']));
+
+        $expected = ['en_US' => 'en_US', 'fr_FR' => 'fr_FR'];
+
+        $this->assertEquals($expected, (new Locales)->options());
+        $this->assertEquals($expected, (new Locales)->options());
+    }
+
+    #[Test]
+    public function cached_items_can_still_be_searched()
+    {
+        Process::shouldReceive('run')->once()->andReturn(implode(PHP_EOL, ['en_US.UTF-8', 'fr_FR.UTF-8']));
+
+        (new Locales)->options();
+
+        $this->assertEquals(['fr_FR' => 'fr_FR'], (new Locales)->options('fr'));
+    }
+}
diff --git a/tests/Exceptions/ControlPanelExceptionHandlerTest.php b/tests/Exceptions/ControlPanelExceptionHandlerTest.php
new file mode 100644
index 00000000000..b97d5715814
--- /dev/null
+++ b/tests/Exceptions/ControlPanelExceptionHandlerTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Tests\Exceptions;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Exceptions\ControlPanelExceptionHandler;
+use Tests\TestCase;
+
+class ControlPanelExceptionHandlerTest extends TestCase
+{
+    #[Test]
+    public function it_renders_validation_errors_as_json_even_when_the_app_restricts_json_rendering()
+    {
+        $handler = app(ControlPanelExceptionHandler::class);
+
+        $handler->shouldRenderJsonWhen(fn (Request $request) => $request->is('api/*'));
+
+        $request = Request::create('/cp/collections/pages/entries/123', 'PATCH');
+        $request->headers->set('Accept', 'application/json');
+        $request->headers->set('X-Requested-With', 'XMLHttpRequest');
+
+        $exception = ValidationException::withMessages(['title' => 'The title field is required.']);
+
+        $response = $handler->render($request, $exception);
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals(422, $response->getStatusCode());
+        $this->assertArrayHasKey('title', $response->getData(true)['errors']);
+    }
+}
diff --git a/tests/Facades/UrlTest.php b/tests/Facades/UrlTest.php
index 64cb4cf993e..8986f593271 100644
--- a/tests/Facades/UrlTest.php
+++ b/tests/Facades/UrlTest.php
@@ -175,6 +175,38 @@ public function it_removes_site_url()
         $this->assertEquals('http://external-site.com/foo', URL::removeSiteUrl('http://external-site.com/foo'));
     }
 
+    #[Test]
+    public function it_removes_site_url_when_site_is_configured_with_a_subpath()
+    {
+        $this->setSiteValue('en', 'url', 'http://absolute-url-resolved-from-request.com/path/');
+
+        $this->assertEquals('/', URL::removeSiteUrl('http://absolute-url-resolved-from-request.com/path'));
+        $this->assertEquals('/', URL::removeSiteUrl('http://absolute-url-resolved-from-request.com/path/'));
+        $this->assertEquals('/foo', URL::removeSiteUrl('http://absolute-url-resolved-from-request.com/path/foo'));
+        $this->assertEquals('/foo/bar', URL::removeSiteUrl('http://absolute-url-resolved-from-request.com/path/foo/bar'));
+
+        $this->assertEquals('/', URL::removeSiteUrl('/path'));
+        $this->assertEquals('/', URL::removeSiteUrl('/path/'));
+        $this->assertEquals('/foo', URL::removeSiteUrl('/path/foo'));
+        $this->assertEquals('/foo/bar', URL::removeSiteUrl('/path/foo/bar'));
+
+        $this->assertEquals('http://external-site.com/foo/', URL::removeSiteUrl('http://external-site.com/foo/'));
+
+        URL::enforceTrailingSlashes();
+
+        $this->assertEquals('/', URL::removeSiteUrl('http://absolute-url-resolved-from-request.com/path'));
+        $this->assertEquals('/', URL::removeSiteUrl('http://absolute-url-resolved-from-request.com/path/'));
+        $this->assertEquals('/foo/', URL::removeSiteUrl('http://absolute-url-resolved-from-request.com/path/foo'));
+        $this->assertEquals('/foo/bar/', URL::removeSiteUrl('http://absolute-url-resolved-from-request.com/path/foo/bar'));
+
+        $this->assertEquals('/', URL::removeSiteUrl('/path'));
+        $this->assertEquals('/', URL::removeSiteUrl('/path/'));
+        $this->assertEquals('/foo/', URL::removeSiteUrl('/path/foo'));
+        $this->assertEquals('/foo/bar/', URL::removeSiteUrl('/path/foo/bar'));
+
+        $this->assertEquals('http://external-site.com/foo', URL::removeSiteUrl('http://external-site.com/foo'));
+    }
+
     #[Test]
     public function it_determines_absolute_url()
     {
@@ -559,6 +591,26 @@ public static function absoluteProvider()
         ];
     }
 
+    #[Test]
+    public function making_urls_absolute_ignores_front_controller_in_request_root()
+    {
+        $this->setSiteValue('en', 'url', '/');
+
+        $request = \Illuminate\Http\Request::create(
+            'http://absolute-url-resolved-from-request.com/index.php',
+            'GET',
+            [],
+            [],
+            [],
+            ['SCRIPT_NAME' => '/index.php', 'SCRIPT_FILENAME' => 'index.php', 'PHP_SELF' => '/index.php']
+        );
+        $this->app->instance('request', $request);
+        \Illuminate\Support\Facades\URL::setRequest($request);
+
+        $this->assertSame('http://absolute-url-resolved-from-request.com', URL::makeAbsolute('/'));
+        $this->assertSame('http://absolute-url-resolved-from-request.com/foo', URL::makeAbsolute('/foo'));
+    }
+
     #[Test]
     #[DataProvider('relativeProvider')]
     public function it_makes_urls_relative($url, $expected)
@@ -590,6 +642,8 @@ public static function relativeProvider()
             'already relative nested route without trailing slash' => ['/foo/page', '/foo/page'],
             'already relative nested route with trailing slash' => ['/foo/page/', '/foo/page'],
             'already relative nested route without leading slash' => ['foo/page', '/foo/page'],
+            'duplicate leading slashes' => ['//page', '/page'],
+            'multiple duplicate leading slashes' => ['////page', '/page'],
 
             'homepage without trailing slash and query param' => ['http://example.com?bar=baz', '/?bar=baz'],
             'homepage with trailing slash and query param' => ['http://example.com/?bar=baz', '/?bar=baz'],
diff --git a/tests/Feature/Assets/CropAssetTest.php b/tests/Feature/Assets/CropAssetTest.php
new file mode 100644
index 00000000000..fc9e526b8bd
--- /dev/null
+++ b/tests/Feature/Assets/CropAssetTest.php
@@ -0,0 +1,385 @@
+<?php
+
+namespace Tests\Feature\Assets;
+
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Assets\AssetContainer;
+use Statamic\CP\Assets\CropProcessor;
+use Statamic\Events\AssetUploaded;
+use Statamic\Facades;
+use Statamic\Imaging\Intervention;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class CropAssetTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    private $container;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        config(['filesystems.disks.test' => [
+            'driver' => 'local',
+            'root' => __DIR__.'/tmp',
+        ]]);
+
+        $this->container = (new AssetContainer)
+            ->handle('test_container')
+            ->disk('test')
+            ->save();
+
+        Storage::fake('test');
+
+        Storage::disk('test')->put('path/to/test.jpg', $this->makeImage(200, 100));
+        $this->container->makeAsset('path/to/test.jpg')->set('alt', 'A test image')->save();
+    }
+
+    #[Test]
+    public function it_crops_and_saves_a_copy()
+    {
+        Carbon::setTestNow(Carbon::createFromTimestamp(1697379288, config('app.timezone')));
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->crop(['x' => 50, 'y' => 20, 'width' => 80, 'height' => 40])
+            ->assertOk()
+            ->assertJson(['data' => ['path' => 'path/to/test-1697379288.jpg']]);
+
+        $this->assertCount(2, Storage::disk('test')->files('path/to'));
+        $this->assertImageDimensions('path/to/test.jpg', 200, 100, 'Original should be untouched.');
+        $this->assertImageDimensions('path/to/test-1697379288.jpg', 80, 40);
+    }
+
+    #[Test]
+    public function it_saves_a_copy_of_a_root_folder_asset()
+    {
+        Storage::disk('test')->put('root.jpg', $this->makeImage(200, 100));
+        $this->container->makeAsset('root.jpg')->save();
+
+        Carbon::setTestNow(Carbon::createFromTimestamp(1697379288, config('app.timezone')));
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->postJson($this->cropRoute('root.jpg'), ['x' => 0, 'y' => 0, 'width' => 100, 'height' => 100])
+            ->assertOk()
+            ->assertJson(['data' => ['path' => 'root-1697379288.jpg']]);
+
+        Storage::disk('test')->assertExists('root-1697379288.jpg');
+    }
+
+    #[Test]
+    public function it_crops_and_replaces_the_original()
+    {
+        $this
+            ->actingAs($this->userWithReuploadPermission())
+            ->crop(['x' => 50, 'y' => 20, 'width' => 80, 'height' => 40, 'replace' => true])
+            ->assertOk()
+            ->assertJson(['data' => ['path' => 'path/to/test.jpg']]);
+
+        $this->assertCount(1, Storage::disk('test')->files('path/to'));
+        $this->assertImageDimensions('path/to/test.jpg', 80, 40);
+        $this->assertEquals('A test image', $this->container->asset('path/to/test.jpg')->get('alt'), 'Metadata should be preserved.');
+    }
+
+    #[Test]
+    public function it_can_replace_a_jpeg_original()
+    {
+        Storage::disk('test')->put('path/to/photo.jpeg', $this->makeImage(200, 100));
+        $this->container->makeAsset('path/to/photo.jpeg')->save();
+
+        $this
+            ->actingAs($this->userWithReuploadPermission())
+            // The UI normalizes the source's "jpeg" to "jpg" and sends it as the format.
+            ->postJson($this->cropRoute('path/to/photo.jpeg'), ['x' => 50, 'y' => 20, 'width' => 80, 'height' => 40, 'format' => 'jpg', 'replace' => true])
+            ->assertOk()
+            ->assertJson(['data' => ['path' => 'path/to/photo.jpeg']]);
+
+        $this->assertImageDimensions('path/to/photo.jpeg', 80, 40);
+    }
+
+    #[Test]
+    public function it_can_replace_an_original_with_an_uppercase_extension()
+    {
+        Storage::disk('test')->put('path/to/PHOTO.JPG', $this->makeImage(200, 100));
+        $this->container->makeAsset('path/to/PHOTO.JPG')->save();
+
+        $this
+            ->actingAs($this->userWithReuploadPermission())
+            ->postJson($this->cropRoute('path/to/PHOTO.JPG'), ['x' => 50, 'y' => 20, 'width' => 80, 'height' => 40, 'format' => 'jpg', 'replace' => true])
+            ->assertOk()
+            ->assertJson(['data' => ['path' => 'path/to/PHOTO.JPG']]);
+
+        $this->assertImageDimensions('path/to/PHOTO.JPG', 80, 40);
+    }
+
+    #[Test]
+    public function it_denies_saving_a_copy_without_permission()
+    {
+        $this
+            ->actingAs($this->userWithoutPermission())
+            ->crop(['x' => 0, 'y' => 0, 'width' => 80, 'height' => 40])
+            ->assertStatus(403);
+    }
+
+    #[Test]
+    public function it_denies_cropping_an_asset_the_user_cannot_view()
+    {
+        $this
+            ->actingAs($this->userWithoutViewPermission())
+            ->crop(['x' => 0, 'y' => 0, 'width' => 80, 'height' => 40])
+            ->assertStatus(403);
+    }
+
+    #[Test]
+    public function it_denies_replacing_without_reupload_permission()
+    {
+        $this
+            ->actingAs($this->userWithPermission())
+            ->crop(['x' => 0, 'y' => 0, 'width' => 80, 'height' => 40, 'replace' => true])
+            ->assertStatus(403);
+    }
+
+    #[Test]
+    public function it_validates_the_crop_dimensions()
+    {
+        $this
+            ->actingAs($this->userWithPermission())
+            ->crop(['x' => 0, 'y' => 0, 'width' => 0])
+            ->assertStatus(422)
+            ->assertInvalid(['height', 'width']);
+    }
+
+    #[Test]
+    public function it_validates_the_quality()
+    {
+        $this
+            ->actingAs($this->userWithPermission())
+            ->crop(['x' => 0, 'y' => 0, 'width' => 80, 'height' => 40, 'quality' => 101])
+            ->assertStatus(422)
+            ->assertInvalid('quality');
+    }
+
+    #[Test]
+    public function the_quality_affects_the_resulting_file_size()
+    {
+        $noise = $this->makeNoiseImage(300, 300);
+        Storage::disk('test')->put('path/to/low.jpg', $noise);
+        Storage::disk('test')->put('path/to/high.jpg', $noise);
+        $this->container->makeAsset('path/to/low.jpg')->save();
+        $this->container->makeAsset('path/to/high.jpg')->save();
+
+        $user = $this->userWithReuploadPermission();
+
+        $this->actingAs($user)
+            ->postJson($this->cropRoute('path/to/low.jpg'), ['x' => 0, 'y' => 0, 'width' => 200, 'height' => 200, 'quality' => 10, 'replace' => true])
+            ->assertOk();
+
+        $this->actingAs($user)
+            ->postJson($this->cropRoute('path/to/high.jpg'), ['x' => 0, 'y' => 0, 'width' => 200, 'height' => 200, 'quality' => 95, 'replace' => true])
+            ->assertOk();
+
+        $this->assertLessThan(
+            strlen(Storage::disk('test')->get('path/to/high.jpg')),
+            strlen(Storage::disk('test')->get('path/to/low.jpg')),
+        );
+    }
+
+    #[Test]
+    public function it_cannot_crop_a_non_image()
+    {
+        Storage::disk('test')->put('path/to/doc.txt', 'not an image');
+        $this->container->makeAsset('path/to/doc.txt')->save();
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->postJson($this->cropRoute('path/to/doc.txt'), ['x' => 0, 'y' => 0, 'width' => 10, 'height' => 10])
+            ->assertStatus(422);
+    }
+
+    #[Test]
+    public function it_converts_to_a_different_format_when_saving_a_copy()
+    {
+        $this
+            ->actingAs($this->userWithPermission())
+            ->crop(['x' => 0, 'y' => 0, 'width' => 100, 'height' => 100, 'format' => 'webp'])
+            ->assertOk()
+            ->assertJson(['data' => ['path' => 'path/to/test.webp']]);
+
+        Storage::disk('test')->assertExists('path/to/test.webp');
+        $this->assertImageDimensions('path/to/test.jpg', 200, 100, 'Original should be untouched.');
+    }
+
+    #[Test]
+    public function it_cannot_change_the_format_when_replacing_the_original()
+    {
+        $this
+            ->actingAs($this->userWithReuploadPermission())
+            ->crop(['x' => 0, 'y' => 0, 'width' => 100, 'height' => 100, 'format' => 'webp', 'replace' => true])
+            ->assertStatus(422);
+    }
+
+    #[Test]
+    public function it_can_crop_an_avif_image()
+    {
+        // The crop is mocked because encoding AVIF requires GD/Imagick to be
+        // built with libavif, which isn't guaranteed. This asserts the request
+        // is accepted and saved as a copy rather than rejected for its format.
+        $this->mock(CropProcessor::class)->shouldReceive('crop')->once()->andReturn('cropped');
+
+        // Prevent the post-upload thumbnail generation, which would try to read
+        // the mocked (non-image) output and has the same AVIF codec dependency.
+        Event::fake([AssetUploaded::class]);
+
+        Storage::disk('test')->put('path/to/photo.avif', 'source');
+        $this->container->makeAsset('path/to/photo.avif')->save();
+
+        Carbon::setTestNow(Carbon::createFromTimestamp(1697379288, config('app.timezone')));
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->postJson($this->cropRoute('path/to/photo.avif'), ['x' => 0, 'y' => 0, 'width' => 100, 'height' => 100])
+            ->assertOk()
+            ->assertJson(['data' => ['path' => 'path/to/photo-1697379288.avif']]);
+
+        $this->assertEquals('cropped', Storage::disk('test')->get('path/to/photo-1697379288.avif'));
+    }
+
+    #[Test]
+    public function it_validates_the_format()
+    {
+        $this
+            ->actingAs($this->userWithPermission())
+            ->crop(['x' => 0, 'y' => 0, 'width' => 80, 'height' => 40, 'format' => 'tiff'])
+            ->assertStatus(422)
+            ->assertInvalid('format');
+    }
+
+    #[Test]
+    public function it_validates_the_output_against_the_containers_allowed_file_types()
+    {
+        $this->container->validationRules(['extensions:jpg'])->save();
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->crop(['x' => 0, 'y' => 0, 'width' => 100, 'height' => 100, 'format' => 'webp'])
+            ->assertStatus(422);
+    }
+
+    #[Test]
+    public function it_flattens_transparency_onto_the_chosen_background_when_converting_to_jpeg()
+    {
+        Storage::disk('test')->put('path/to/black.png', $this->makeTransparentImage(200, 100));
+        Storage::disk('test')->put('path/to/white.png', $this->makeTransparentImage(200, 100));
+        $this->container->makeAsset('path/to/black.png')->save();
+        $this->container->makeAsset('path/to/white.png')->save();
+
+        $user = $this->userWithPermission();
+
+        $this->actingAs($user)
+            ->postJson($this->cropRoute('path/to/black.png'), ['x' => 0, 'y' => 0, 'width' => 100, 'height' => 100, 'format' => 'jpg', 'background' => 'black'])
+            ->assertOk()
+            ->assertJson(['data' => ['path' => 'path/to/black.jpg']]);
+
+        $this->actingAs($user)
+            ->postJson($this->cropRoute('path/to/white.png'), ['x' => 0, 'y' => 0, 'width' => 100, 'height' => 100, 'format' => 'jpg', 'background' => 'white'])
+            ->assertOk();
+
+        $this->assertLessThan(40, $this->redChannel('path/to/black.jpg'));
+        $this->assertGreaterThan(215, $this->redChannel('path/to/white.jpg'));
+    }
+
+    private function crop($payload)
+    {
+        return $this->postJson($this->cropRoute('path/to/test.jpg'), $payload);
+    }
+
+    private function cropRoute($path)
+    {
+        return cp_route('assets.crop', ['encoded_asset' => base64_encode('test_container::'.$path)]);
+    }
+
+    private function makeImage($width, $height)
+    {
+        $image = Intervention::create(Intervention::manager('gd'), $width, $height)->fill('ff0000');
+
+        return (string) Intervention::encodeByExtension($image, 'jpg');
+    }
+
+    private function makeTransparentImage($width, $height)
+    {
+        $image = Intervention::create(Intervention::manager('gd'), $width, $height);
+
+        return (string) Intervention::encodeByExtension($image, 'png');
+    }
+
+    private function redChannel($path)
+    {
+        $image = Intervention::decode(Intervention::manager('gd'), Storage::disk('test')->get($path));
+
+        $hex = Intervention::colorAt($image, 5, 5)->toHex();
+
+        return hexdec(substr($hex, 0, 2));
+    }
+
+    private function makeNoiseImage($width, $height)
+    {
+        mt_srand(1);
+        $gd = imagecreatetruecolor($width, $height);
+
+        for ($x = 0; $x < $width; $x++) {
+            for ($y = 0; $y < $height; $y++) {
+                imagesetpixel($gd, $x, $y, imagecolorallocate($gd, mt_rand(0, 255), mt_rand(0, 255), mt_rand(0, 255)));
+            }
+        }
+
+        ob_start();
+        imagejpeg($gd, null, 100);
+        $data = ob_get_clean();
+        imagedestroy($gd);
+
+        return $data;
+    }
+
+    private function assertImageDimensions($path, $width, $height, $message = '')
+    {
+        [$actualWidth, $actualHeight] = getimagesizefromstring(Storage::disk('test')->get($path));
+
+        $this->assertEquals([$width, $height], [$actualWidth, $actualHeight], $message);
+    }
+
+    private function userWithPermission()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'view test_container assets', 'upload test_container assets']]);
+
+        return tap(Facades\User::make()->assignRole('test'))->save();
+    }
+
+    private function userWithReuploadPermission()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'view test_container assets', 'upload test_container assets', 'edit test_container assets']]);
+
+        return tap(Facades\User::make()->assignRole('test'))->save();
+    }
+
+    private function userWithoutViewPermission()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'upload test_container assets']]);
+
+        return tap(Facades\User::make()->assignRole('test'))->save();
+    }
+
+    private function userWithoutPermission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+
+        return tap(Facades\User::make()->assignRole('test'))->save();
+    }
+}
diff --git a/tests/Feature/Auth/DeletePasskeyTest.php b/tests/Feature/Auth/DeletePasskeyTest.php
index 54ed4d47819..0a73be97dc7 100644
--- a/tests/Feature/Auth/DeletePasskeyTest.php
+++ b/tests/Feature/Auth/DeletePasskeyTest.php
@@ -38,7 +38,7 @@ public function it_deletes_a_passkey()
         $this
             ->actingAs($user)
             ->deleteRequest('passkey-123')
-            ->assertStatus(201);
+            ->assertStatus(204);
     }
 
     #[Test]
diff --git a/tests/Feature/Auth/PasskeyLoginTest.php b/tests/Feature/Auth/PasskeyLoginTest.php
index 90ecc8a46d6..90228f7f3f2 100644
--- a/tests/Feature/Auth/PasskeyLoginTest.php
+++ b/tests/Feature/Auth/PasskeyLoginTest.php
@@ -65,9 +65,10 @@ public function it_stores_challenge_in_session_for_later_verification()
         // Verify the session has been populated
         $this->assertNotNull(session('webauthn.challenge'));
 
-        // The session challenge is the binary form (32 bytes)
+        // The session challenge is base64 encoded (32 bytes -> 44 chars)
         // The response challenge is the base64url encoded form
-        $this->assertEquals(32, strlen(session('webauthn.challenge')));
+        $this->assertEquals(44, strlen(session('webauthn.challenge')));
+        $this->assertEquals(32, strlen(base64_decode(session('webauthn.challenge'))));
         $this->assertIsString($responseChallenge);
     }
 
@@ -92,47 +93,17 @@ public function it_successfully_logs_in_with_valid_passkey()
     }
 
     #[Test]
-    public function it_redirects_to_referer_after_successful_login()
+    public function it_redirects_to_intended_url_after_successful_login()
     {
         $user = $this->createUser();
-        $refererUrl = 'http://localhost/cp/collections';
         WebAuthn::shouldReceive('getUserFromCredentials')->once()->andReturn($user);
         WebAuthn::shouldReceive('validateAssertion')->once()->andReturnTrue();
 
         $this
-            ->loginRequest(['referer' => $refererUrl])
-            ->assertOk()
-            ->assertJson(['redirect' => $refererUrl]);
-
-        $this->assertAuthenticatedAs($user);
-    }
-
-    #[Test]
-    public function it_does_not_redirect_to_non_cp_referer()
-    {
-        $user = $this->createUser();
-        WebAuthn::shouldReceive('getUserFromCredentials')->once()->andReturn($user);
-        WebAuthn::shouldReceive('validateAssertion')->once()->andReturnTrue();
-
-        $this
-            ->loginRequest(['referer' => 'http://localhost/some-other-page'])
-            ->assertOk()
-            ->assertJson(['redirect' => cp_route('index')]);
-
-        $this->assertAuthenticatedAs($user);
-    }
-
-    #[Test]
-    public function it_does_not_redirect_to_external_cp_referer()
-    {
-        $user = $this->createUser();
-        WebAuthn::shouldReceive('getUserFromCredentials')->once()->andReturn($user);
-        WebAuthn::shouldReceive('validateAssertion')->once()->andReturnTrue();
-
-        $this
-            ->loginRequest(['referer' => 'https://evil.com/cp/collections'])
+            ->withSession(['url.intended' => 'http://localhost/cp/collections'])
+            ->loginRequest()
             ->assertOk()
-            ->assertJson(['redirect' => cp_route('index')]);
+            ->assertJson(['redirect' => 'http://localhost/cp/collections']);
 
         $this->assertAuthenticatedAs($user);
     }
diff --git a/tests/Feature/Auth/StorePasskeyTest.php b/tests/Feature/Auth/StorePasskeyTest.php
index 95ee4c179ad..a421a68b9a8 100644
--- a/tests/Feature/Auth/StorePasskeyTest.php
+++ b/tests/Feature/Auth/StorePasskeyTest.php
@@ -69,7 +69,7 @@ public function it_stores_challenge_in_session_during_creation()
         $responseChallenge = $response->json('challenge');
 
         $this->assertNotNull(session('webauthn.challenge'));
-        $this->assertEquals(16, strlen(session('webauthn.challenge')));
+        $this->assertEquals(16, strlen(base64_decode(session('webauthn.challenge'))));
         $this->assertIsString($responseChallenge);
     }
 
diff --git a/tests/Feature/Collections/ViewCollectionListingTest.php b/tests/Feature/Collections/ViewCollectionListingTest.php
index 873f280e1e8..17ac7701d4c 100644
--- a/tests/Feature/Collections/ViewCollectionListingTest.php
+++ b/tests/Feature/Collections/ViewCollectionListingTest.php
@@ -109,6 +109,23 @@ public function it_shows_a_list_of_collections()
         */
     }
 
+    #[Test]
+    public function it_does_not_eager_load_actions_in_listing()
+    {
+        $this->createCollection('bar');
+
+        $user = tap(User::make()->makeSuper())->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('collections.index'))
+            ->assertSuccessful()
+            ->assertInertia(fn ($page) => $page
+                ->component('collections/Index')
+                ->has('collections', 1)
+                ->missing('collections.0.actions'));
+    }
+
     #[Test]
     public function it_shows_no_results_when_there_are_no_collections()
     {
diff --git a/tests/Feature/Entries/CreateEntryTest.php b/tests/Feature/Entries/CreateEntryTest.php
index ef8245ae536..ff3db43b69b 100644
--- a/tests/Feature/Entries/CreateEntryTest.php
+++ b/tests/Feature/Entries/CreateEntryTest.php
@@ -47,4 +47,46 @@ public function it_populates_the_form_from_query_string()
                 ->where('values.title', 'Foo Bar')
             );
     }
+
+    #[Test]
+    public function the_publish_state_cannot_be_managed_without_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'create test entries']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        Collection::make('test')->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('collections.entries.create', ['test', 'en']))
+            ->assertOk()
+            ->assertInertia(fn ($page) => $page->where('canManagePublishState', false));
+    }
+
+    #[Test]
+    public function the_publish_state_can_be_managed_with_the_publish_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'create test entries', 'publish test entries']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        Collection::make('test')->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('collections.entries.create', ['test', 'en']))
+            ->assertOk()
+            ->assertInertia(fn ($page) => $page->where('canManagePublishState', true));
+    }
+
+    #[Test]
+    public function the_publish_state_can_be_managed_when_able_to_configure_collections()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure collections']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        Collection::make('test')->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('collections.entries.create', ['test', 'en']))
+            ->assertOk()
+            ->assertInertia(fn ($page) => $page->where('canManagePublishState', true));
+    }
 }
diff --git a/tests/Feature/Entries/EntryRevisionsTest.php b/tests/Feature/Entries/EntryRevisionsTest.php
index c949e73d327..5fe4dc34690 100644
--- a/tests/Feature/Entries/EntryRevisionsTest.php
+++ b/tests/Feature/Entries/EntryRevisionsTest.php
@@ -550,6 +550,206 @@ private function restore($entry, $payload)
         return $this->post($entry->restoreRevisionUrl(), $payload);
     }
 
+    #[Test]
+    public function localized_entry_with_non_localizable_date_gets_origin_date_when_reconstructed_from_revision()
+    {
+        $this->setSites([
+            'en' => ['url' => 'http://localhost/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://localhost/fr/', 'locale' => 'fr'],
+        ]);
+
+        $this->setTestBlueprint('test', [
+            'foo' => ['type' => 'text'],
+            'date' => ['type' => 'date', 'localizable' => false],
+        ]);
+        $this->setTestRoles(['test' => ['access cp', 'publish blog entries']]);
+        $user = User::make()->id('user-1')->assignRole('test')->save();
+
+        $this->collection->sites(['en', 'fr'])->save();
+
+        $origin = EntryFactory::id('1')
+            ->slug('test')
+            ->collection('blog')
+            ->locale('en')
+            ->published(true)
+            ->date('2010-12-25')
+            ->data([
+                'blueprint' => 'test',
+                'title' => 'Title',
+                'foo' => 'bar',
+            ])->create();
+
+        $localized = EntryFactory::id('2')
+            ->slug('test')
+            ->collection('blog')
+            ->locale('fr')
+            ->origin($origin)
+            ->published(true)
+            ->data(['blueprint' => 'test'])
+            ->create();
+
+        $this->assertEquals('2010-12-25', $origin->date()->format('Y-m-d'));
+        $this->assertEquals('2010-12-25', $localized->date()->format('Y-m-d'));
+
+        tap($localized->makeWorkingCopy(), function ($copy) {
+            $attrs = $copy->attributes();
+            $attrs['data']['foo'] = 'foo modified in localized working copy';
+            $copy->attributes($attrs);
+        })->save();
+
+        $this->assertTrue($localized->hasWorkingCopy());
+        $this->assertEquals('2010-12-25', $localized->fromWorkingCopy()->date()->format('Y-m-d'));
+
+        tap($origin->makeWorkingCopy(), function ($copy) {
+            $attrs = $copy->attributes();
+            $attrs['date'] = Carbon::parse('2020-06-15')->timestamp;
+            $copy->attributes($attrs);
+        })->save();
+
+        $this
+            ->actingAs($user)
+            ->publish($origin, ['message' => 'Publish origin with new date'])
+            ->assertOk();
+
+        $origin = Entry::find('1');
+        $this->assertEquals('2020-06-15', $origin->date()->format('Y-m-d'));
+
+        $localized = Entry::find('2');
+        $this->assertEquals('2020-06-15', $localized->date()->format('Y-m-d'));
+
+        $this->assertEquals(
+            '2020-06-15',
+            $localized->fromWorkingCopy()->date()->format('Y-m-d'),
+            'Localized entry reconstructed from working copy should use origin\'s current date when date field is not localizable'
+        );
+    }
+
+    #[Test]
+    public function localized_entry_with_localizable_date_keeps_its_own_date_when_reconstructed_from_revision()
+    {
+        $this->setSites([
+            'en' => ['url' => 'http://localhost/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://localhost/fr/', 'locale' => 'fr'],
+        ]);
+
+        $this->setTestBlueprint('test', [
+            'foo' => ['type' => 'text'],
+            'date' => ['type' => 'date', 'localizable' => true],
+        ]);
+        $this->setTestRoles(['test' => ['access cp', 'publish blog entries']]);
+        $user = User::make()->id('user-1')->assignRole('test')->save();
+
+        $this->collection->sites(['en', 'fr'])->save();
+
+        $origin = EntryFactory::id('1')
+            ->slug('test')
+            ->collection('blog')
+            ->locale('en')
+            ->published(true)
+            ->date('2010-12-25')
+            ->data([
+                'blueprint' => 'test',
+                'title' => 'Title',
+                'foo' => 'bar',
+            ])->create();
+
+        $localized = EntryFactory::id('2')
+            ->slug('test')
+            ->collection('blog')
+            ->locale('fr')
+            ->origin($origin)
+            ->published(true)
+            ->date('2015-03-10')
+            ->data(['blueprint' => 'test'])
+            ->create();
+
+        $this->assertEquals('2010-12-25', $origin->date()->format('Y-m-d'));
+        $this->assertEquals('2015-03-10', $localized->date()->format('Y-m-d'));
+
+        tap($localized->makeWorkingCopy(), function ($copy) {
+            $attrs = $copy->attributes();
+            $attrs['data']['foo'] = 'foo modified in localized working copy';
+            $copy->attributes($attrs);
+        })->save();
+
+        $this->assertTrue($localized->hasWorkingCopy());
+        $this->assertEquals('2015-03-10', $localized->fromWorkingCopy()->date()->format('Y-m-d'));
+
+        tap($origin->makeWorkingCopy(), function ($copy) {
+            $attrs = $copy->attributes();
+            $attrs['date'] = Carbon::parse('2020-06-15')->timestamp;
+            $copy->attributes($attrs);
+        })->save();
+
+        $this
+            ->actingAs($user)
+            ->publish($origin, ['message' => 'Publish origin with new date'])
+            ->assertOk();
+
+        $origin = Entry::find('1');
+        $this->assertEquals('2020-06-15', $origin->date()->format('Y-m-d'));
+
+        $localized = Entry::find('2');
+        $this->assertEquals('2015-03-10', $localized->date()->format('Y-m-d'));
+
+        $this->assertEquals(
+            '2015-03-10',
+            $localized->fromWorkingCopy()->date()->format('Y-m-d'),
+            'Localized entry reconstructed from working copy should keep its own date when date field is localizable'
+        );
+    }
+
+    #[Test]
+    public function revision_localizations_only_includes_authorized_sites()
+    {
+        $this->setSites([
+            'en' => ['url' => 'http://localhost/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://localhost/fr/', 'locale' => 'fr'],
+            'de' => ['url' => 'http://localhost/de/', 'locale' => 'de'],
+        ]);
+
+        $this->setTestBlueprint('test', ['foo' => ['type' => 'text']]);
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'view blog entries',
+            'access en site',
+            'access fr site',
+            // Note: no 'access de site' permission
+        ]]);
+        $user = User::make()->id('user-1')->assignRole('test')->save();
+
+        $this->collection->sites(['en', 'fr', 'de'])->save();
+
+        $entry = EntryFactory::id('1')
+            ->slug('test')
+            ->collection('blog')
+            ->locale('en')
+            ->published(true)
+            ->date('2010-12-25')
+            ->data([
+                'blueprint' => 'test',
+                'title' => 'Original title',
+                'foo' => 'bar',
+            ])->create();
+
+        $revision = tap($entry->makeRevision(), function ($copy) {
+            $copy->message('Revision one');
+            $copy->date(Carbon::parse('2017-02-01'));
+        });
+        $revision->save();
+
+        $response = $this
+            ->actingAs($user)
+            ->getJson($entry->revisionsUrl().'/'.$revision->date()->timestamp)
+            ->assertOk();
+
+        $localizations = $response->json('localizations');
+
+        // User should only see en and fr sites, not de
+        $this->assertCount(2, $localizations);
+        $this->assertEquals(['en', 'fr'], array_column($localizations, 'handle'));
+    }
+
     private function setTestBlueprint($handle, $fields)
     {
         $blueprint = Blueprint::makeFromFields($fields)->setHandle($handle);
diff --git a/tests/Feature/Entries/PreviewEntryTest.php b/tests/Feature/Entries/PreviewEntryTest.php
index 986b4aeaa28..9a54e70d680 100644
--- a/tests/Feature/Entries/PreviewEntryTest.php
+++ b/tests/Feature/Entries/PreviewEntryTest.php
@@ -181,6 +181,33 @@ public function it_sets_live_preview_to_true_if_theres_no_additional_data()
         );
     }
 
+    #[Test]
+    public function it_doesnt_create_a_token_without_edit_permission()
+    {
+        Collection::make('blog')->routes('/blog/{slug}')->save();
+
+        EntryFactory::id('the-entry')
+            ->collection('blog')
+            ->slug('the-existing-entry')
+            ->data(['title' => 'The Existing Entry'])
+            ->create();
+
+        LivePreview::shouldReceive('tokenize')->never();
+
+        $this->setTestRoles(['viewer' => ['access cp', 'view blog entries']]);
+        $user = User::make()->assignRole('viewer')->save();
+
+        $this
+            ->actingAs($user)
+            ->postJson('/cp/collections/blog/entries/the-entry/preview', [
+                'preview' => [
+                    'title' => 'Edited title',
+                    'slug' => 'edited-slug',
+                ],
+            ])
+            ->assertForbidden();
+    }
+
     private function user()
     {
         $this->setTestRoles(['test' => ['access cp', 'create blog entries', 'edit blog entries']]);
diff --git a/tests/Feature/Entries/StoreEntryTest.php b/tests/Feature/Entries/StoreEntryTest.php
index 4e8e2debc36..3216bcf6049 100644
--- a/tests/Feature/Entries/StoreEntryTest.php
+++ b/tests/Feature/Entries/StoreEntryTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Feature\Entries;
 
 use Facades\Statamic\Fields\BlueprintRepository;
+use Facades\Tests\Factories\EntryFactory;
 use Illuminate\Support\Facades\Event;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
@@ -343,6 +344,70 @@ public function user_without_publish_permission_gets_initial_published_false_eve
         $this->assertFalse($response->json('values.published'), 'Initial published value should be false when user lacks publish permission, even if collection defaults to published');
     }
 
+    #[Test]
+    public function it_prevents_duplicate_uris_for_structured_entries_with_depth_conditional_routes()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'create test entries']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $collection = tap(
+            Collection::make('test')
+                ->routes('{{ if depth > 1 }}{{ parent_uri }}/{{ slug }}{{ else }}base/{{ slug }}{{ /if }}')
+                ->structureContents(['max_depth' => 10])
+        )->save();
+
+        EntryFactory::id('root-id')->slug('root')->collection('test')->create();
+        EntryFactory::id('child-id')->slug('child')->collection('test')->create();
+
+        $tree = $collection->structure()->in('en');
+        $tree->tree([
+            ['entry' => 'root-id', 'children' => [
+                ['entry' => 'child-id'],
+            ]],
+        ])->save();
+
+        $this
+            ->actingAs($user)
+            ->submit($collection, [
+                'title' => 'Duplicate Child',
+                'slug' => 'child',
+                '_parent' => 'root-id',
+            ])
+            ->assertStatus(422)
+            ->assertJsonValidationErrors(['slug']);
+    }
+
+    #[Test]
+    public function it_prevents_duplicate_uris_when_parent_is_the_explicit_root()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'create test entries']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $collection = tap(
+            Collection::make('test')
+                ->routes('{{ if depth > 1 }}{{ parent_uri }}/{{ slug }}{{ else }}base/{{ slug }}{{ /if }}')
+                ->structureContents(['root' => true, 'max_depth' => 10])
+        )->save();
+
+        EntryFactory::id('root-id')->slug('root')->collection('test')->create();
+        EntryFactory::id('sibling-id')->slug('sibling')->collection('test')->create();
+
+        $collection->structure()->in('en')->tree([
+            ['entry' => 'root-id'],
+            ['entry' => 'sibling-id'],
+        ])->save();
+
+        $this
+            ->actingAs($user)
+            ->submit($collection, [
+                'title' => 'Duplicate Sibling',
+                'slug' => 'sibling',
+                '_parent' => 'root-id',
+            ])
+            ->assertStatus(422)
+            ->assertJsonValidationErrors(['slug']);
+    }
+
     private function seedUserAndCollection()
     {
         $this->setTestRoles(['test' => ['access cp', 'create test entries']]);
diff --git a/tests/Feature/Entries/UpdateEntryTest.php b/tests/Feature/Entries/UpdateEntryTest.php
index f9a4445198e..12598807700 100644
--- a/tests/Feature/Entries/UpdateEntryTest.php
+++ b/tests/Feature/Entries/UpdateEntryTest.php
@@ -469,6 +469,41 @@ public function does_not_validate_max_depth_when_collection_max_depth_is_null()
             ->assertOk();
     }
 
+    #[Test]
+    public function it_prevents_duplicate_uris_for_structured_entries_with_depth_conditional_routes()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'edit test entries', 'access en site']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $collection = tap(
+            Collection::make('test')
+                ->routes('{{ if depth > 1 }}{{ parent_uri }}/{{ slug }}{{ else }}base/{{ slug }}{{ /if }}')
+                ->structureContents(['max_depth' => 10])
+        )->save();
+
+        EntryFactory::id('root-id')->slug('root')->collection('test')->create();
+        EntryFactory::id('child-id')->slug('child')->collection('test')->create();
+
+        $entry = EntryFactory::id('other-child-id')
+            ->slug('other-child')
+            ->collection('test')
+            ->data(['title' => 'Other Child'])
+            ->create();
+
+        $collection->structure()->in('en')->tree([
+            ['entry' => 'root-id', 'children' => [
+                ['entry' => 'child-id'],
+                ['entry' => 'other-child-id'],
+            ]],
+        ])->save();
+
+        $this
+            ->actingAs($user)
+            ->update($entry, ['title' => 'Other Child', 'slug' => 'child'])
+            ->assertStatus(422)
+            ->assertJsonValidationErrors(['slug']);
+    }
+
     private function seedUserAndCollection()
     {
         $this->setTestRoles(['test' => [
diff --git a/tests/Feature/Fields/MetaControllerTest.php b/tests/Feature/Fields/MetaControllerTest.php
new file mode 100644
index 00000000000..89289c26b59
--- /dev/null
+++ b/tests/Feature/Fields/MetaControllerTest.php
@@ -0,0 +1,218 @@
+<?php
+
+namespace Tests\Feature\Fields;
+
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\AssetContainer;
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Role;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class MetaControllerTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    private function fieldMeta($user, array $config, $value)
+    {
+        return $this
+            ->actingAs($user)
+            ->postJson('/cp/fields/field-meta', [
+                'config' => base64_encode(json_encode($config)),
+                'value' => $value,
+            ]);
+    }
+
+    #[Test]
+    public function it_returns_a_placeholder_for_an_unviewable_relationship_item()
+    {
+        Collection::make('pages')->title('Pages')->save();
+        Collection::make('secret')->title('Secret')->save();
+
+        $this->setTestRoles(['test' => ['access cp', 'view pages entries']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $response = $this->fieldMeta($user, [
+            'handle' => 'related',
+            'type' => 'collections',
+        ], ['pages', 'secret'])->assertOk();
+
+        $data = collect($response->json('meta.data'))->keyBy('id');
+
+        $this->assertEquals('Pages', $data['pages']['title']);
+        $this->assertTrue($data['secret']['invalid']);
+        $this->assertEquals('secret', $data['secret']['title']);
+    }
+
+    #[Test]
+    public function the_meta_placeholder_does_not_reveal_whether_an_item_exists()
+    {
+        Collection::make('secret')->title('Secret')->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $response = $this->fieldMeta($user, [
+            'handle' => 'related',
+            'type' => 'collections',
+        ], ['secret', 'does-not-exist'])->assertOk();
+
+        $data = collect($response->json('meta.data'))->keyBy('id');
+
+        $this->assertEquals(
+            ['id' => 'secret', 'title' => 'secret', 'invalid' => true],
+            $data['secret']
+        );
+        $this->assertEquals(
+            ['id' => 'does-not-exist', 'title' => 'does-not-exist', 'invalid' => true],
+            $data['does-not-exist']
+        );
+    }
+
+    #[Test]
+    public function it_gates_policy_less_types_through_the_preload_path()
+    {
+        Role::make('editor')->title('Editor')->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $response = $this->fieldMeta($user, [
+            'handle' => 'roles',
+            'type' => 'user_roles',
+        ], ['editor'])->assertOk();
+
+        $this->assertTrue($response->json('meta.data.0.invalid'));
+        $this->assertEquals('editor', $response->json('meta.data.0.title'));
+    }
+
+    #[Test]
+    public function it_returns_full_data_for_an_authorized_user()
+    {
+        Collection::make('pages')->title('Pages')->save();
+
+        $this->setTestRoles(['test' => ['access cp', 'view pages entries']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $response = $this->fieldMeta($user, [
+            'handle' => 'related',
+            'type' => 'collections',
+        ], ['pages'])->assertOk();
+
+        $this->assertEquals('Pages', $response->json('meta.data.0.title'));
+        $this->assertNull($response->json('meta.data.0.invalid'));
+    }
+
+    #[Test]
+    public function a_super_admin_gets_full_data_for_policy_less_types_through_preload()
+    {
+        Role::make('editor')->title('Editor')->save();
+
+        $response = $this->fieldMeta(User::make()->makeSuper()->save(), [
+            'handle' => 'roles',
+            'type' => 'user_roles',
+        ], ['editor'])->assertOk();
+
+        $this->assertEquals('Editor', $response->json('meta.data.0.title'));
+        $this->assertNull($response->json('meta.data.0.invalid'));
+    }
+
+    #[Test]
+    public function it_does_not_expose_columns_from_an_unviewable_collection_blueprint()
+    {
+        Collection::make('secret')->title('Secret')->save();
+        Blueprint::make('secret')
+            ->setNamespace('collections.secret')
+            ->setContents(['fields' => [
+                ['handle' => 'classified', 'field' => ['type' => 'text']],
+            ]])
+            ->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $response = $this->fieldMeta($user, [
+            'handle' => 'related',
+            'type' => 'entries',
+            'collections' => ['secret'],
+        ], [])->assertOk();
+
+        $columns = collect($response->json('meta.columns'))->pluck('field')->all();
+
+        // Only the default columns, never the unviewable blueprint's fields.
+        $this->assertNotContains('classified', $columns);
+        $this->assertEquals(['title'], $columns);
+    }
+
+    #[Test]
+    public function an_authorized_user_still_gets_the_full_collection_columns_via_preload()
+    {
+        Collection::make('news')->title('News')->save();
+        Blueprint::make('news')
+            ->setNamespace('collections.news')
+            ->setContents(['fields' => [
+                ['handle' => 'intro', 'field' => ['type' => 'text', 'listable' => true]],
+            ]])
+            ->save();
+
+        $this->setTestRoles(['test' => ['access cp', 'view news entries']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $response = $this->fieldMeta($user, [
+            'handle' => 'related',
+            'type' => 'entries',
+            'collections' => ['news'],
+        ], [])->assertOk();
+
+        $columns = collect($response->json('meta.columns'))->pluck('field')->all();
+
+        $this->assertContains('intro', $columns);
+    }
+
+    #[Test]
+    public function it_preloads_meta_using_the_preprocessed_value()
+    {
+        $response = $this->fieldMeta(User::make()->makeSuper()->save(), [
+            'handle' => 'test',
+            'type' => 'grid',
+            'min_rows' => 2,
+            'fields' => [
+                ['handle' => 'words', 'field' => ['type' => 'text']],
+            ],
+        ], [])->assertOk();
+
+        $ids = collect($response->json('value'))->pluck('_id')->all();
+
+        $this->assertCount(2, $ids);
+        $this->assertEquals($ids, array_keys($response->json('meta.existing')));
+    }
+
+    #[Test]
+    public function it_gates_assets_through_the_preload_path()
+    {
+        Storage::fake('private', ['url' => '/assets']);
+        Storage::disk('private')->put('two.txt', '');
+        AssetContainer::make('private')->disk('private')->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $response = $this->fieldMeta($user, [
+            'handle' => 'pic',
+            'type' => 'assets',
+            'container' => 'private',
+        ], ['private::two.txt'])->assertOk();
+
+        $data = collect($response->json('meta.data'))->keyBy('id');
+
+        $this->assertEquals(
+            ['id' => 'private::two.txt', 'url' => 'private::two.txt', 'invalid' => true],
+            $data['private::two.txt']
+        );
+    }
+}
diff --git a/tests/Feature/Fieldsets/EditFieldsetTest.php b/tests/Feature/Fieldsets/EditFieldsetTest.php
index df82c1882d0..24d88b92f13 100644
--- a/tests/Feature/Fieldsets/EditFieldsetTest.php
+++ b/tests/Feature/Fieldsets/EditFieldsetTest.php
@@ -43,12 +43,46 @@ public function it_provides_the_fieldset()
     {
         $this->withoutExceptionHandling();
         $user = Facades\User::make()->makeSuper()->save();
-        $fieldset = (new Fieldset)->setHandle('test')->setContents(['title' => 'Test'])->save();
+        $fieldset = (new Fieldset)->setHandle('test')->setContents([
+            'title' => 'Test',
+            'fields' => [
+                ['handle' => 'title', 'field' => ['type' => 'text']],
+            ],
+        ])->save();
+
+        $this
+            ->actingAs($user)
+            ->get($fieldset->editUrl())
+            ->assertStatus(200)
+            ->assertInertia(fn ($page) => $page
+                ->where('initialFieldset.handle', $fieldset->handle())
+                ->where('initialFieldset.sections.0.fields.0.handle', 'title')
+            );
+    }
+
+    #[Test]
+    public function it_provides_sectioned_fieldsets()
+    {
+        $user = Facades\User::make()->makeSuper()->save();
+        $fieldset = (new Fieldset)->setHandle('test')->setContents([
+            'title' => 'Test',
+            'sections' => [
+                [
+                    'display' => 'SEO',
+                    'fields' => [
+                        ['handle' => 'meta_title', 'field' => ['type' => 'text']],
+                    ],
+                ],
+            ],
+        ])->save();
 
         $this
             ->actingAs($user)
             ->get($fieldset->editUrl())
             ->assertStatus(200)
-            ->assertInertia(fn ($page) => $page->where('initialFieldset.handle', $fieldset->handle()));
+            ->assertInertia(fn ($page) => $page
+                ->where('initialFieldset.sections.0.display', 'SEO')
+                ->where('initialFieldset.sections.0.fields.0.handle', 'meta_title')
+            );
     }
 }
diff --git a/tests/Feature/Fieldsets/UpdateFieldsetTest.php b/tests/Feature/Fieldsets/UpdateFieldsetTest.php
index 619a75c10bf..ff9e694bd4c 100644
--- a/tests/Feature/Fieldsets/UpdateFieldsetTest.php
+++ b/tests/Feature/Fieldsets/UpdateFieldsetTest.php
@@ -105,6 +105,231 @@ public function fieldset_gets_saved()
         ], Facades\Fieldset::find('test')->contents());
     }
 
+    #[Test]
+    public function fieldset_gets_saved_with_sections()
+    {
+        $user = tap(Facades\User::make()->makeSuper())->save();
+        (new Fieldset)->setHandle('seo_defaults')->setContents([
+            'title' => 'SEO Defaults',
+            'fields' => [
+                ['handle' => 'canonical_url', 'field' => ['type' => 'text']],
+            ],
+        ])->save();
+
+        $fieldset = (new Fieldset)->setHandle('test')->setContents([
+            'title' => 'Test',
+            'foo' => 'bar',
+            'fields' => [
+                ['handle' => 'legacy', 'field' => ['type' => 'text']],
+            ],
+        ])->save();
+
+        $this
+            ->actingAs($user)
+            ->submit($fieldset, [
+                'title' => 'Updated title',
+                'sections' => [
+                    [
+                        '_id' => 'section-1',
+                        'display' => 'SEO',
+                        'instructions' => 'SEO fields',
+                        'collapsible' => true,
+                        'collapsed' => true,
+                        'fields' => [
+                            [
+                                '_id' => 'section-1-field-1',
+                                'handle' => 'meta_title',
+                                'type' => 'inline',
+                                'config' => [
+                                    'type' => 'text',
+                                    'display' => 'Meta title',
+                                ],
+                            ],
+                            [
+                                '_id' => 'section-1-field-2',
+                                'type' => 'import',
+                                'fieldset' => 'seo_defaults',
+                                'prefix' => 'seo_',
+                            ],
+                        ],
+                    ],
+                ],
+            ])
+            ->assertStatus(204);
+
+        $this->assertEquals([
+            'title' => 'Updated title',
+            'foo' => 'bar',
+            'sections' => [
+                [
+                    'display' => 'SEO',
+                    'instructions' => 'SEO fields',
+                    'collapsible' => true,
+                    'collapsed' => true,
+                    'fields' => [
+                        [
+                            'handle' => 'meta_title',
+                            'field' => [
+                                'type' => 'text',
+                                'display' => 'Meta title',
+                            ],
+                        ],
+                        [
+                            'import' => 'seo_defaults',
+                            'prefix' => 'seo_',
+                        ],
+                    ],
+                ],
+            ],
+        ], Facades\Fieldset::find('test')->contents());
+    }
+
+    #[Test]
+    public function fieldset_sections_are_removed_when_updating_with_flat_fields()
+    {
+        $user = tap(Facades\User::make()->makeSuper())->save();
+        $fieldset = (new Fieldset)->setHandle('test')->setContents([
+            'title' => 'Test',
+            'sections' => [
+                [
+                    'display' => 'SEO',
+                    'fields' => [
+                        ['handle' => 'legacy', 'field' => ['type' => 'text']],
+                    ],
+                ],
+            ],
+        ])->save();
+
+        $this
+            ->actingAs($user)
+            ->submit($fieldset, [
+                'title' => 'Updated title',
+                'fields' => [
+                    [
+                        '_id' => 'flat-1',
+                        'handle' => 'meta_title',
+                        'type' => 'inline',
+                        'config' => [
+                            'type' => 'text',
+                            'display' => 'Meta title',
+                        ],
+                    ],
+                ],
+            ])
+            ->assertStatus(204);
+
+        $this->assertEquals([
+            'title' => 'Updated title',
+            'fields' => [
+                [
+                    'handle' => 'meta_title',
+                    'field' => [
+                        'type' => 'text',
+                        'display' => 'Meta title',
+                    ],
+                ],
+            ],
+        ], Facades\Fieldset::find('test')->contents());
+    }
+
+    #[Test]
+    public function import_section_behavior_is_saved_when_flattening_sections()
+    {
+        $user = tap(Facades\User::make()->makeSuper())->save();
+        (new Fieldset)->setHandle('seo_defaults')->setContents([
+            'title' => 'SEO Defaults',
+            'fields' => [
+                ['handle' => 'canonical_url', 'field' => ['type' => 'text']],
+            ],
+        ])->save();
+
+        $fieldset = (new Fieldset)->setHandle('test')->setContents([
+            'title' => 'Test',
+            'fields' => [],
+        ])->save();
+
+        $this
+            ->actingAs($user)
+            ->submit($fieldset, [
+                'sections' => [
+                    [
+                        '_id' => 'section-1',
+                        'display' => 'Main',
+                        'fields' => [
+                            [
+                                '_id' => 'section-1-field-1',
+                                'type' => 'import',
+                                'fieldset' => 'seo_defaults',
+                                'section_behavior' => 'flatten',
+                            ],
+                        ],
+                    ],
+                ],
+            ])
+            ->assertStatus(204);
+
+        $this->assertEquals([
+            'title' => 'Updated',
+            'sections' => [
+                [
+                    'display' => 'Main',
+                    'fields' => [
+                        [
+                            'import' => 'seo_defaults',
+                            'section_behavior' => 'flatten',
+                        ],
+                    ],
+                ],
+            ],
+        ], Facades\Fieldset::find('test')->contents());
+    }
+
+    #[Test]
+    public function single_default_section_is_collapsed_back_to_flat_fields()
+    {
+        $user = tap(Facades\User::make()->makeSuper())->save();
+        $fieldset = (new Fieldset)->setHandle('test')->setContents([
+            'title' => 'Test',
+            'fields' => [],
+        ])->save();
+
+        $this
+            ->actingAs($user)
+            ->submit($fieldset, [
+                'sections' => [
+                    [
+                        '_id' => 'section-1',
+                        'display' => 'Fields',
+                        'fields' => [
+                            [
+                                '_id' => 'section-1-field-1',
+                                'handle' => 'meta_title',
+                                'type' => 'inline',
+                                'config' => [
+                                    'type' => 'text',
+                                    'display' => 'Meta title',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ])
+            ->assertStatus(204);
+
+        $this->assertEquals([
+            'title' => 'Updated',
+            'fields' => [
+                [
+                    'handle' => 'meta_title',
+                    'field' => [
+                        'type' => 'text',
+                        'display' => 'Meta title',
+                    ],
+                ],
+            ],
+        ], Facades\Fieldset::find('test')->contents());
+    }
+
     #[Test]
     public function title_is_required()
     {
diff --git a/tests/Feature/Fieldtypes/AssetsFieldtypeControllerTest.php b/tests/Feature/Fieldtypes/AssetsFieldtypeControllerTest.php
new file mode 100644
index 00000000000..7957e5efb9e
--- /dev/null
+++ b/tests/Feature/Fieldtypes/AssetsFieldtypeControllerTest.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace Tests\Feature\Fieldtypes;
+
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\AssetContainer;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class AssetsFieldtypeControllerTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        Storage::fake('public', ['url' => '/assets']);
+        Storage::fake('private', ['url' => '/assets']);
+        Storage::disk('public')->put('one.txt', '');
+        Storage::disk('private')->put('two.txt', '');
+
+        AssetContainer::make('public')->disk('public')->save();
+        AssetContainer::make('private')->disk('private')->save();
+    }
+
+    #[Test]
+    public function it_returns_data_for_viewable_assets_and_placeholders_for_unviewable_ones()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'view public assets']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $response = $this
+            ->actingAs($user)
+            ->postJson('/cp/assets-fieldtype', [
+                'assets' => ['public::one.txt', 'private::two.txt'],
+            ])
+            ->assertOk();
+
+        $data = collect($response->json())->keyBy('id');
+
+        $this->assertCount(2, $data);
+
+        $this->assertArrayNotHasKey('invalid', $data['public::one.txt']);
+
+        $this->assertTrue($data['private::two.txt']['invalid']);
+        $this->assertEquals('private::two.txt', $data['private::two.txt']['url']);
+    }
+
+    #[Test]
+    public function an_unviewable_asset_is_not_silently_dropped()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'view public assets']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $response = $this
+            ->actingAs($user)
+            ->postJson('/cp/assets-fieldtype', [
+                'assets' => ['private::two.txt'],
+            ])
+            ->assertOk();
+
+        $this->assertCount(1, $response->json());
+        $this->assertTrue($response->json('0.invalid'));
+    }
+
+    #[Test]
+    public function the_placeholder_does_not_reveal_whether_an_asset_exists()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'view public assets']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $response = $this
+            ->actingAs($user)
+            ->postJson('/cp/assets-fieldtype', [
+                'assets' => ['private::two.txt', 'private::missing.txt'],
+            ])
+            ->assertOk();
+
+        $data = collect($response->json())->keyBy('id');
+
+        $this->assertEquals(
+            ['id' => 'private::two.txt', 'url' => 'private::two.txt', 'invalid' => true],
+            $data['private::two.txt']
+        );
+        $this->assertEquals(
+            ['id' => 'private::missing.txt', 'url' => 'private::missing.txt', 'invalid' => true],
+            $data['private::missing.txt']
+        );
+    }
+
+    #[Test]
+    public function a_super_admin_gets_full_asset_data()
+    {
+        $response = $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->postJson('/cp/assets-fieldtype', [
+                'assets' => ['private::two.txt'],
+            ])
+            ->assertOk();
+
+        $this->assertEquals('private::two.txt', $response->json('0.id'));
+        $this->assertNull($response->json('0.invalid'));
+    }
+}
diff --git a/tests/Feature/Fieldtypes/FilesTest.php b/tests/Feature/Fieldtypes/FilesTest.php
index fb408f4f7b3..5b23a7069c0 100644
--- a/tests/Feature/Fieldtypes/FilesTest.php
+++ b/tests/Feature/Fieldtypes/FilesTest.php
@@ -96,6 +96,35 @@ public static function uploadProvider()
         ];
     }
 
+    #[Test]
+    public function it_uploads_a_file_to_the_configured_disk_and_path()
+    {
+        config([
+            'statamic.system.file_uploads_disk' => 'uploads',
+            'statamic.system.file_uploads_path' => 'temp-uploads',
+        ]);
+
+        $localDisk = Storage::fake('local');
+        $uploadsDisk = Storage::fake('uploads');
+
+        $file = UploadedFile::fake()->create('test.txt');
+
+        Date::setTestNow(Date::createFromTimestamp(1671484636, config('app.timezone')));
+
+        $this
+            ->actingAs(tap(User::make()->makeSuper())->save())
+            ->post('/cp/fieldtypes/files/upload', ['file' => $file])
+            ->assertOk()
+            ->assertJson([
+                'data' => [
+                    'id' => '1671484636/test.txt',
+                ],
+            ]);
+
+        $uploadsDisk->assertExists('temp-uploads/1671484636/test.txt');
+        $localDisk->assertMissing('statamic/file-uploads/1671484636/test.txt');
+    }
+
     #[Test]
     public function it_replaces_dimensions_rule()
     {
diff --git a/tests/Feature/Fieldtypes/RelationshipFieldtypeTest.php b/tests/Feature/Fieldtypes/RelationshipFieldtypeTest.php
index 3bb3c04d1a4..1c73066127c 100644
--- a/tests/Feature/Fieldtypes/RelationshipFieldtypeTest.php
+++ b/tests/Feature/Fieldtypes/RelationshipFieldtypeTest.php
@@ -3,8 +3,12 @@
 namespace Tests\Feature\Fieldtypes;
 
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry;
+use Statamic\Facades\Form;
+use Statamic\Facades\Nav;
+use Statamic\Facades\Role;
 use Statamic\Facades\Taxonomy;
 use Statamic\Facades\Term;
 use Statamic\Facades\User;
@@ -27,6 +31,10 @@ public function setUp(): void
         $this->collection = Collection::make('test')->save();
 
         app('statamic.scopes')[StartsWithC::handle()] = StartsWithC::class;
+
+        // Register one scope class under an alias that differs from its handle, so the
+        // test can prove the configured alias is what reaches the scope.
+        app('statamic.scopes')['fruit_filter'] = AliasedScope::class;
     }
 
     #[Test]
@@ -60,6 +68,34 @@ public function it_filters_entries_by_query_scopes()
         $this->assertNotContains('Banana', $titles);
     }
 
+    #[Test]
+    public function it_passes_the_active_scope_handles_to_aliased_scopes()
+    {
+        Entry::make()->collection('test')->slug('apple')->data(['title' => 'Apple'])->save();
+        Entry::make()->collection('test')->slug('carrot')->data(['title' => 'Carrot'])->save();
+        Entry::make()->collection('test')->slug('cherry')->data(['title' => 'Cherry'])->save();
+        Entry::make()->collection('test')->slug('banana')->data(['title' => 'Banana'])->save();
+
+        $this->setTestRoles(['test' => ['access cp', 'view test entries']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode([
+            'type' => 'entries',
+            'collections' => ['test'],
+            'query_scopes' => ['fruit_filter'],
+        ]));
+
+        $response = $this
+            ->actingAs($user)
+            ->get("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk();
+
+        $titles = collect($response->json('data'))->pluck('title')->all();
+
+        // The scope only filters when its alias is present in the queryScopes param.
+        $this->assertEqualsCanonicalizing(['Carrot', 'Cherry'], $titles);
+    }
+
     #[Test]
     public function it_limits_access_to_entries_from_collections_the_user_can_view()
     {
@@ -90,7 +126,7 @@ public function it_limits_access_to_entries_from_collections_the_user_can_view()
     }
 
     #[Test]
-    public function it_denies_access_to_entries_when_user_cannot_view_any_of_the_collections()
+    public function it_returns_an_empty_listing_when_user_cannot_view_any_of_the_collections()
     {
         Collection::make('pages')->save();
         Entry::make()->collection('pages')->slug('home')->data(['title' => 'Home'])->save();
@@ -106,10 +142,14 @@ public function it_denies_access_to_entries_when_user_cannot_view_any_of_the_col
             'collections' => ['pages', 'secret'],
         ]));
 
-        $this
+        $response = $this
             ->actingAs($user)
             ->getJson("/cp/fieldtypes/relationship?config={$config}")
-            ->assertForbidden();
+            ->assertOk()
+            ->assertJsonCount(0, 'data');
+
+        // The columns must not be derived from a blueprint the user can't view.
+        $this->assertEmpty($response->json('meta.columns'));
     }
 
     #[Test]
@@ -167,7 +207,7 @@ public function it_limits_access_to_terms_from_taxonomies_the_user_can_view()
     }
 
     #[Test]
-    public function it_forbids_access_to_terms_when_the_user_cannot_view_any_of_the_taxonomies()
+    public function it_returns_an_empty_listing_when_the_user_cannot_view_any_of_the_taxonomies()
     {
         Taxonomy::make('topics')->save();
         Taxonomy::make('secret')->save();
@@ -182,10 +222,522 @@ public function it_forbids_access_to_terms_when_the_user_cannot_view_any_of_the_
             'taxonomies' => ['topics', 'secret'],
         ]));
 
+        $response = $this
+            ->actingAs($user)
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk()
+            ->assertJsonCount(0, 'data');
+
+        // The columns must not be derived from a blueprint the user can't view.
+        $this->assertEmpty($response->json('meta.columns'));
+    }
+
+    #[Test]
+    public function it_does_not_expose_columns_from_an_unviewable_taxonomy_blueprint()
+    {
+        Taxonomy::make('secret')->title('Secret')->save();
+        Taxonomy::make('topics')->title('Topics')->save();
+        Blueprint::make('secret')
+            ->setNamespace('taxonomies.secret')
+            ->setContents(['fields' => [
+                ['handle' => 'classified', 'field' => ['type' => 'text']],
+            ]])
+            ->save();
+        Blueprint::make('topics')
+            ->setNamespace('taxonomies.topics')
+            ->setContents(['fields' => [
+                ['handle' => 'summary', 'field' => ['type' => 'text']],
+            ]])
+            ->save();
+
+        // The user can view the second configured taxonomy but not the first.
+        $this->setTestRoles(['test' => ['access cp', 'view topics terms']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode([
+            'type' => 'terms',
+            'taxonomies' => ['secret', 'topics'],
+        ]));
+
+        $response = $this
+            ->actingAs($user)
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk();
+
+        $columns = collect($response->json('meta.columns'))->pluck('field')->all();
+
+        // Columns come from the viewable taxonomy, never the unviewable first one.
+        $this->assertNotContains('classified', $columns);
+        $this->assertContains('summary', $columns);
+    }
+
+    #[Test]
+    public function an_authorized_user_still_gets_the_full_taxonomy_columns()
+    {
+        Taxonomy::make('secret')->title('Secret')->save();
+        Blueprint::make('secret')
+            ->setNamespace('taxonomies.secret')
+            ->setContents(['fields' => [
+                ['handle' => 'classified', 'field' => ['type' => 'text']],
+            ]])
+            ->save();
+
+        $this->setTestRoles(['test' => ['access cp', 'view secret terms']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode([
+            'type' => 'terms',
+            'taxonomies' => ['secret'],
+        ]));
+
+        $response = $this
+            ->actingAs($user)
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk();
+
+        $columns = collect($response->json('meta.columns'))->pluck('field')->all();
+
+        $this->assertContains('classified', $columns);
+    }
+
+    #[Test]
+    public function it_scopes_collection_listing_to_viewable_collections()
+    {
+        Collection::make('pages')->title('Pages')->save();
+        Collection::make('secret')->title('Secret')->save();
+
+        $this->setTestRoles(['test' => ['access cp', 'view pages entries']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'collections']));
+
+        $response = $this
+            ->actingAs($user)
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk();
+
+        $ids = collect($response->json('data'))->pluck('id')->all();
+
+        $this->assertContains('pages', $ids);
+        $this->assertNotContains('secret', $ids);
+    }
+
+    #[Test]
+    public function it_returns_empty_collection_listing_when_no_collections_are_viewable()
+    {
+        Collection::make('pages')->title('Pages')->save();
+        Collection::make('secret')->title('Secret')->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'collections']));
+
         $this
             ->actingAs($user)
             ->getJson("/cp/fieldtypes/relationship?config={$config}")
-            ->assertForbidden();
+            ->assertOk()
+            ->assertJsonCount(0, 'data');
+    }
+
+    #[Test]
+    public function it_returns_an_empty_user_listing_for_a_user_who_cannot_view_users()
+    {
+        User::make()->email('one@example.com')->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'users']));
+
+        $this
+            ->actingAs($user)
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk()
+            ->assertJsonCount(0, 'data');
+    }
+
+    #[Test]
+    public function it_returns_an_empty_user_role_listing_for_a_user_who_cannot_edit_roles()
+    {
+        Role::make('one')->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'user_roles']));
+
+        $this
+            ->actingAs($user)
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk()
+            ->assertJsonCount(0, 'data');
+    }
+
+    #[Test]
+    public function it_returns_a_placeholder_for_an_unviewable_item_by_id()
+    {
+        Collection::make('pages')->title('Pages')->save();
+        Collection::make('secret')->title('Secret')->save();
+
+        $this->setTestRoles(['test' => ['access cp', 'view pages entries']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'collections']));
+
+        $response = $this
+            ->actingAs($user)
+            ->postJson('/cp/fieldtypes/relationship/data', [
+                'config' => $config,
+                'selections' => ['pages', 'secret'],
+            ])
+            ->assertOk();
+
+        $data = collect($response->json('data'))->keyBy('id');
+
+        $this->assertEquals('Pages', $data['pages']['title']);
+        $this->assertArrayNotHasKey('invalid', $data['pages']);
+
+        $this->assertTrue($data['secret']['invalid']);
+        $this->assertEquals('secret', $data['secret']['title']);
+    }
+
+    #[Test]
+    public function the_by_id_placeholder_does_not_reveal_whether_an_item_exists()
+    {
+        Collection::make('secret')->title('Secret')->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'collections']));
+
+        $response = $this
+            ->actingAs($user)
+            ->postJson('/cp/fieldtypes/relationship/data', [
+                'config' => $config,
+                'selections' => ['secret', 'does-not-exist'],
+            ])
+            ->assertOk();
+
+        $data = collect($response->json('data'))->keyBy('id');
+
+        $this->assertEquals(
+            ['id' => 'secret', 'title' => 'secret', 'invalid' => true],
+            $data['secret']
+        );
+        $this->assertEquals(
+            ['id' => 'does-not-exist', 'title' => 'does-not-exist', 'invalid' => true],
+            $data['does-not-exist']
+        );
+    }
+
+    #[Test]
+    public function it_returns_a_placeholder_by_id_for_policy_less_types_without_the_permission()
+    {
+        Role::make('editor')->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'user_roles']));
+
+        $response = $this
+            ->actingAs($user)
+            ->postJson('/cp/fieldtypes/relationship/data', [
+                'config' => $config,
+                'selections' => ['editor'],
+            ])
+            ->assertOk();
+
+        $this->assertTrue($response->json('data.0.invalid'));
+        $this->assertEquals('editor', $response->json('data.0.title'));
+    }
+
+    #[Test]
+    public function a_super_admin_gets_full_data_for_policy_less_types_by_id()
+    {
+        Role::make('editor')->title('Editor')->save();
+
+        $config = base64_encode(json_encode(['type' => 'user_roles']));
+
+        $response = $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->postJson('/cp/fieldtypes/relationship/data', [
+                'config' => $config,
+                'selections' => ['editor'],
+            ])
+            ->assertOk();
+
+        $this->assertEquals('Editor', $response->json('data.0.title'));
+        $this->assertNull($response->json('data.0.invalid'));
+    }
+
+    #[Test]
+    public function a_super_admin_can_list_policy_less_types()
+    {
+        Role::make('editor')->title('Editor')->save();
+
+        $config = base64_encode(json_encode(['type' => 'user_roles']));
+
+        $response = $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk();
+
+        $this->assertContains('editor', collect($response->json('data'))->pluck('id')->all());
+    }
+
+    #[Test]
+    public function it_scopes_structure_listing_to_viewable_navs_and_collections()
+    {
+        Nav::make('main')->title('Main')->save();
+        Nav::make('secret')->title('Secret')->save();
+        Collection::make('pages')->title('Pages')->structureContents(['root' => true])->save();
+        Collection::make('hidden')->title('Hidden')->structureContents(['root' => true])->save();
+
+        $this->setTestRoles(['test' => ['access cp', 'view main nav', 'view pages entries']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'structures']));
+
+        $response = $this
+            ->actingAs($user)
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk();
+
+        $ids = collect($response->json('data'))->pluck('id')->all();
+
+        $this->assertContains('main', $ids);
+        $this->assertContains('collection::pages', $ids);
+        $this->assertNotContains('secret', $ids);
+        $this->assertNotContains('collection::hidden', $ids);
+    }
+
+    #[Test]
+    public function it_does_not_leak_structures_across_types()
+    {
+        Nav::make('main')->title('Main')->save();
+        Collection::make('pages')->title('Pages')->structureContents(['root' => true])->save();
+
+        // A user with only a nav permission must not see (or resolve) collection-backed structures.
+        $this->setTestRoles(['test' => ['access cp', 'view main nav']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'structures']));
+
+        $listing = $this
+            ->actingAs($user)
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk();
+
+        $ids = collect($listing->json('data'))->pluck('id')->all();
+        $this->assertContains('main', $ids);
+        $this->assertNotContains('collection::pages', $ids);
+
+        $byId = $this
+            ->actingAs($user)
+            ->postJson('/cp/fieldtypes/relationship/data', [
+                'config' => $config,
+                'selections' => ['main', 'collection::pages'],
+            ])
+            ->assertOk();
+
+        $data = collect($byId->json('data'))->keyBy('id');
+        $this->assertArrayNotHasKey('invalid', $data['main']);
+        $this->assertTrue($data['collection::pages']['invalid']);
+    }
+
+    #[Test]
+    public function it_returns_a_placeholder_for_an_unviewable_structure_by_id()
+    {
+        Nav::make('secret')->title('Secret')->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'structures']));
+
+        $response = $this
+            ->actingAs($user)
+            ->postJson('/cp/fieldtypes/relationship/data', [
+                'config' => $config,
+                'selections' => ['secret'],
+            ])
+            ->assertOk();
+
+        $this->assertTrue($response->json('data.0.invalid'));
+        $this->assertEquals('secret', $response->json('data.0.title'));
+    }
+
+    #[Test]
+    public function the_structure_by_id_placeholder_does_not_reveal_whether_a_structure_exists()
+    {
+        Nav::make('secret')->title('Secret')->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'structures']));
+
+        $response = $this
+            ->actingAs($user)
+            ->postJson('/cp/fieldtypes/relationship/data', [
+                'config' => $config,
+                'selections' => ['secret', 'does-not-exist'],
+            ])
+            ->assertOk();
+
+        $data = collect($response->json('data'))->keyBy('id');
+
+        $this->assertEquals(
+            ['id' => 'secret', 'title' => 'secret', 'invalid' => true],
+            $data['secret']
+        );
+        $this->assertEquals(
+            ['id' => 'does-not-exist', 'title' => 'does-not-exist', 'invalid' => true],
+            $data['does-not-exist']
+        );
+    }
+
+    #[Test]
+    public function a_super_admin_sees_all_structures()
+    {
+        Nav::make('main')->title('Main')->save();
+        Collection::make('pages')->title('Pages')->structureContents(['root' => true])->save();
+
+        $config = base64_encode(json_encode(['type' => 'structures']));
+        $user = User::make()->makeSuper()->save();
+
+        $listing = $this
+            ->actingAs($user)
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk();
+
+        $ids = collect($listing->json('data'))->pluck('id')->all();
+        $this->assertContains('main', $ids);
+        $this->assertContains('collection::pages', $ids);
+
+        $byId = $this
+            ->actingAs($user)
+            ->postJson('/cp/fieldtypes/relationship/data', [
+                'config' => $config,
+                'selections' => ['main', 'collection::pages'],
+            ])
+            ->assertOk();
+
+        $data = collect($byId->json('data'))->keyBy('id');
+        $this->assertArrayNotHasKey('invalid', $data['main']);
+        $this->assertArrayNotHasKey('invalid', $data['collection::pages']);
+    }
+
+    #[Test]
+    public function it_scopes_form_listing_to_viewable_forms()
+    {
+        Form::make('contact')->title('Contact')->save();
+        Form::make('secret')->title('Secret')->save();
+
+        $this->setTestRoles(['test' => ['access cp', 'view contact form submissions']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'form']));
+
+        $response = $this
+            ->actingAs($user)
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk();
+
+        $ids = collect($response->json('data'))->pluck('id')->all();
+
+        $this->assertContains('contact', $ids);
+        $this->assertNotContains('secret', $ids);
+    }
+
+    #[Test]
+    public function it_returns_a_placeholder_for_an_unviewable_form_by_id()
+    {
+        Form::make('contact')->title('Contact')->save();
+        Form::make('secret')->title('Secret')->save();
+
+        $this->setTestRoles(['test' => ['access cp', 'view contact form submissions']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'form']));
+
+        $response = $this
+            ->actingAs($user)
+            ->postJson('/cp/fieldtypes/relationship/data', [
+                'config' => $config,
+                'selections' => ['contact', 'secret'],
+            ])
+            ->assertOk();
+
+        $data = collect($response->json('data'))->keyBy('id');
+
+        $this->assertArrayNotHasKey('invalid', $data['contact']);
+        $this->assertTrue($data['secret']['invalid']);
+        $this->assertEquals('secret', $data['secret']['title']);
+    }
+
+    #[Test]
+    public function the_form_by_id_placeholder_does_not_reveal_whether_a_form_exists()
+    {
+        Form::make('secret')->title('Secret')->save();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $config = base64_encode(json_encode(['type' => 'form']));
+
+        $response = $this
+            ->actingAs($user)
+            ->postJson('/cp/fieldtypes/relationship/data', [
+                'config' => $config,
+                'selections' => ['secret', 'does-not-exist'],
+            ])
+            ->assertOk();
+
+        $data = collect($response->json('data'))->keyBy('id');
+
+        $this->assertEquals(
+            ['id' => 'secret', 'title' => 'secret', 'invalid' => true],
+            $data['secret']
+        );
+        $this->assertEquals(
+            ['id' => 'does-not-exist', 'title' => 'does-not-exist', 'invalid' => true],
+            $data['does-not-exist']
+        );
+    }
+
+    #[Test]
+    public function a_super_admin_sees_all_forms()
+    {
+        Form::make('contact')->title('Contact')->save();
+        Form::make('secret')->title('Secret')->save();
+
+        $config = base64_encode(json_encode(['type' => 'form']));
+        $user = User::make()->makeSuper()->save();
+
+        $listing = $this
+            ->actingAs($user)
+            ->getJson("/cp/fieldtypes/relationship?config={$config}")
+            ->assertOk();
+
+        $ids = collect($listing->json('data'))->pluck('id')->all();
+        $this->assertContains('contact', $ids);
+        $this->assertContains('secret', $ids);
+
+        $byId = $this
+            ->actingAs($user)
+            ->postJson('/cp/fieldtypes/relationship/data', [
+                'config' => $config,
+                'selections' => ['contact', 'secret'],
+            ])
+            ->assertOk();
+
+        $data = collect($byId->json('data'))->keyBy('id');
+        $this->assertArrayNotHasKey('invalid', $data['contact']);
+        $this->assertArrayNotHasKey('invalid', $data['secret']);
     }
 }
 
@@ -196,3 +748,13 @@ public function apply($query, $params)
         $query->where('title', 'like', 'C%');
     }
 }
+
+class AliasedScope extends Scope
+{
+    public function apply($query, $params)
+    {
+        if (in_array('fruit_filter', $params['queryScopes'] ?? [])) {
+            $query->where('title', 'like', 'C%');
+        }
+    }
+}
diff --git a/tests/Feature/Forms/ViewSubmissionsListingTest.php b/tests/Feature/Forms/ViewSubmissionsListingTest.php
new file mode 100644
index 00000000000..5f98dc46917
--- /dev/null
+++ b/tests/Feature/Forms/ViewSubmissionsListingTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Tests\Feature\Forms;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Form;
+use Statamic\Facades\FormSubmission;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class ViewSubmissionsListingTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    protected function resolveApplicationConfiguration($app)
+    {
+        parent::resolveApplicationConfiguration($app);
+
+        $app['config']['statamic.forms.forms'] = $this->fakeStacheDirectory.'/forms';
+    }
+
+    #[Test]
+    public function it_does_not_eager_load_actions_in_submissions_listing()
+    {
+        $user = tap(User::make()->makeSuper())->save();
+        $form = tap(Form::make('test'))->save();
+        FormSubmission::make()->form($form)->data(['foo' => 'bar'])->save();
+
+        $this
+            ->actingAs($user)
+            ->getJson(cp_route('forms.submissions.index', $form->handle()))
+            ->assertSuccessful()
+            ->assertJsonCount(1, 'data')
+            ->assertJsonMissingPath('data.0.actions');
+    }
+}
diff --git a/tests/Feature/GraphQL/Fieldtypes/DateFieldtypeTest.php b/tests/Feature/GraphQL/Fieldtypes/DateFieldtypeTest.php
index c34394aa1ca..cc24da567dd 100644
--- a/tests/Feature/GraphQL/Fieldtypes/DateFieldtypeTest.php
+++ b/tests/Feature/GraphQL/Fieldtypes/DateFieldtypeTest.php
@@ -19,7 +19,6 @@ public function setUp(): void
             $reflection = new ReflectionClass(self::this());
 
             $factory = $reflection->getMethod('getFactory');
-            $factory->setAccessible(true);
 
             return Arr::get($factory->invoke(self::this())->getSettings(), 'toStringFormat');
         });
diff --git a/tests/Feature/GraphQL/Fieldtypes/RangeFieldtypeTest.php b/tests/Feature/GraphQL/Fieldtypes/RangeFieldtypeTest.php
index 9ee651bdb5f..dbb9f65e75f 100644
--- a/tests/Feature/GraphQL/Fieldtypes/RangeFieldtypeTest.php
+++ b/tests/Feature/GraphQL/Fieldtypes/RangeFieldtypeTest.php
@@ -9,16 +9,16 @@
 class RangeFieldtypeTest extends FieldtypeTestCase
 {
     #[Test]
-    public function it_gets_an_integer()
+    public function it_processes_integer_values_with_integer_config()
     {
         $this->createEntryWithFields([
             'filled' => [
                 'value' => '7',
-                'field' => ['type' => 'range'],
+                'field' => ['type' => 'range', 'min' => 0, 'max' => 100, 'step' => 1],
             ],
             'undefined' => [
                 'value' => null,
-                'field' => ['type' => 'range'],
+                'field' => ['type' => 'range', 'min' => 0, 'max' => 100, 'step' => 1],
             ],
         ]);
 
@@ -27,4 +27,24 @@ public function it_gets_an_integer()
             'undefined' => null,
         ]);
     }
+
+    #[Test]
+    public function it_processes_decimal_values_with_decimal_config()
+    {
+        $this->createEntryWithFields([
+            'filled' => [
+                'value' => '7.5',
+                'field' => ['type' => 'range', 'min' => 0, 'max' => 100, 'step' => 0.1],
+            ],
+            'another' => [
+                'value' => '3.14',
+                'field' => ['type' => 'range', 'min' => 0, 'max' => 10, 'step' => 0.01],
+            ],
+        ]);
+
+        $this->assertGqlEntryHas('filled, another', [
+            'filled' => 7.5,
+            'another' => 3.14,
+        ]);
+    }
 }
diff --git a/tests/Feature/GraphQL/RequestCacheTest.php b/tests/Feature/GraphQL/RequestCacheTest.php
index e1fc9b72f76..97f6c2927ff 100644
--- a/tests/Feature/GraphQL/RequestCacheTest.php
+++ b/tests/Feature/GraphQL/RequestCacheTest.php
@@ -210,6 +210,23 @@ public function it_ignores_configured_events()
         ], $requests->all());
     }
 
+    #[Test]
+    public function it_caches_response_data_as_primitives()
+    {
+        app()->instance('request-tracking', $requests = Collection::make());
+
+        $this->post('/graphql', ['query' => '{one}']);
+
+        $key = 'gql-cache:'.md5('{one}').'_'.md5(json_encode(null));
+        $cached = Cache::get($key);
+
+        $this->assertIsArray($cached);
+        $this->assertArrayHasKey('content', $cached);
+        $this->assertArrayHasKey('status', $cached);
+        $this->assertArrayHasKey('headers', $cached);
+        $this->assertEquals(200, $cached['status']);
+    }
+
     #[Test]
     public function it_can_disable_caching()
     {
diff --git a/tests/Feature/InertiaRootViewTest.php b/tests/Feature/InertiaRootViewTest.php
new file mode 100644
index 00000000000..79ede48e543
--- /dev/null
+++ b/tests/Feature/InertiaRootViewTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\TestCase;
+
+class InertiaRootViewTest extends TestCase
+{
+    #[Test]
+    public function it_does_not_set_the_inertia_root_view_globally()
+    {
+        $response = Inertia::render('Test')->toResponse(Request::create('/'));
+
+        $this->assertEquals('app', $response->getOriginalContent()->name());
+    }
+}
diff --git a/tests/Feature/Navigation/CreateNavigationPageTest.php b/tests/Feature/Navigation/CreateNavigationPageTest.php
index 807f2b060d3..a870a96f963 100644
--- a/tests/Feature/Navigation/CreateNavigationPageTest.php
+++ b/tests/Feature/Navigation/CreateNavigationPageTest.php
@@ -147,4 +147,109 @@ public function it_gets_the_values_for_an_entry_nav_item()
                 'localizedFields' => [],
             ]);
     }
+
+    #[Test]
+    public function it_denies_access_without_permission_to_view_the_nav()
+    {
+        $this->mockTextFieldtype();
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [])->save();
+        $blueprint = Blueprint::makeFromFields(['foo' => ['type' => 'text']]);
+        BlueprintRepository::partialMock();
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($blueprint);
+
+        $this
+            ->actingAs($user)
+            ->request($nav)
+            ->assertForbidden();
+    }
+
+    #[Test]
+    public function it_denies_access_to_an_entry_the_user_cannot_view()
+    {
+        $this->mockTextFieldtype();
+        $this->setTestRoles(['test' => ['access cp', 'view test nav']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [])->save();
+
+        $entryBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+        ]);
+
+        $navBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+        ]);
+
+        BlueprintRepository::partialMock();
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($navBlueprint);
+        BlueprintRepository::shouldReceive('in')->with('collections/articles')->andReturn(collect(['articles' => $entryBlueprint]));
+
+        tap(Collection::make('articles'))->save();
+
+        EntryFactory::id('123')
+            ->collection('articles')
+            ->data([
+                'title' => 'entry title',
+                'foo' => 'entry foo',
+                'bar' => 'entry bar',
+            ])
+            ->create();
+
+        $this
+            ->actingAs($user)
+            ->request($nav, ['entry' => '123'])
+            ->assertForbidden();
+    }
+
+    #[Test]
+    public function it_allows_access_to_an_entry_the_user_can_view()
+    {
+        $this->mockTextFieldtype();
+        $this->setTestRoles(['test' => ['access cp', 'view test nav', 'view articles entries']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [])->save();
+
+        $entryBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+        ]);
+
+        $navBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+        ]);
+
+        BlueprintRepository::partialMock();
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($navBlueprint);
+        BlueprintRepository::shouldReceive('in')->with('collections/articles')->andReturn(collect(['articles' => $entryBlueprint]));
+
+        tap(Collection::make('articles'))->save();
+
+        EntryFactory::id('123')
+            ->collection('articles')
+            ->data([
+                'title' => 'entry title',
+                'foo' => 'entry foo',
+                'bar' => 'entry bar',
+            ])
+            ->create();
+
+        $this
+            ->actingAs($user)
+            ->request($nav, ['entry' => '123'])
+            ->assertOk()
+            ->assertJson([
+                'originValues' => [
+                    'title' => 'entry title (preprocessed)',
+                    'foo' => 'entry foo (preprocessed)',
+                    'bar' => 'entry bar (preprocessed)',
+                ],
+            ]);
+    }
 }
diff --git a/tests/Feature/Navigation/EditNavigationPageTest.php b/tests/Feature/Navigation/EditNavigationPageTest.php
index bd5c79085de..f7dacbfac53 100644
--- a/tests/Feature/Navigation/EditNavigationPageTest.php
+++ b/tests/Feature/Navigation/EditNavigationPageTest.php
@@ -239,4 +239,130 @@ public function it_gets_the_values_for_an_entry_nav_item()
                 ],
             ]);
     }
+
+    #[Test]
+    public function it_denies_access_without_permission_to_view_the_nav()
+    {
+        $this->mockTextFieldtype();
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [
+            [
+                'id' => 'id7',
+                'title' => 'The title',
+                'url' => 'http://example.com',
+                'data' => ['foo' => 'bar'],
+            ],
+        ])->save();
+        $blueprint = Blueprint::makeFromFields(['foo' => ['type' => 'text']]);
+        BlueprintRepository::partialMock();
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($blueprint);
+
+        $this
+            ->actingAs($user)
+            ->request($nav, 'id7')
+            ->assertForbidden();
+    }
+
+    #[Test]
+    public function it_denies_access_to_an_entry_the_user_cannot_view()
+    {
+        $this->mockTextFieldtype();
+        $this->setTestRoles(['test' => ['access cp', 'view test nav']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [
+            [
+                'id' => 'id7',
+                'entry' => '123',
+                'title' => 'The page title',
+                'data' => ['foo' => 'page foo'],
+            ],
+        ])->save();
+
+        $entryBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+        ]);
+
+        $navBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+        ]);
+
+        BlueprintRepository::partialMock();
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($navBlueprint);
+        BlueprintRepository::shouldReceive('in')->with('collections/articles')->andReturn(collect(['articles' => $entryBlueprint]));
+
+        tap(Collection::make('articles'))->save();
+
+        EntryFactory::id('123')
+            ->collection('articles')
+            ->data([
+                'title' => 'entry title',
+                'foo' => 'entry foo',
+                'bar' => 'entry bar',
+            ])
+            ->create();
+
+        $this
+            ->actingAs($user)
+            ->request($nav, 'id7')
+            ->assertForbidden();
+    }
+
+    #[Test]
+    public function it_allows_access_to_an_entry_the_user_can_view()
+    {
+        $this->mockTextFieldtype();
+        $this->setTestRoles(['test' => ['access cp', 'view test nav', 'view articles entries']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [
+            [
+                'id' => 'id7',
+                'entry' => '123',
+                'title' => 'The page title',
+                'data' => ['foo' => 'page foo'],
+            ],
+        ])->save();
+
+        $entryBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+        ]);
+
+        $navBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+        ]);
+
+        BlueprintRepository::partialMock();
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($navBlueprint);
+        BlueprintRepository::shouldReceive('in')->with('collections/articles')->andReturn(collect(['articles' => $entryBlueprint]));
+
+        tap(Collection::make('articles'))->save();
+
+        EntryFactory::id('123')
+            ->collection('articles')
+            ->data([
+                'title' => 'entry title',
+                'foo' => 'entry foo',
+                'bar' => 'entry bar',
+            ])
+            ->create();
+
+        $this
+            ->actingAs($user)
+            ->request($nav, 'id7')
+            ->assertOk()
+            ->assertJson([
+                'originValues' => [
+                    'title' => 'entry title (preprocessed)',
+                    'foo' => 'entry foo (preprocessed)',
+                    'bar' => 'entry bar (preprocessed)',
+                ],
+            ]);
+    }
 }
diff --git a/tests/Feature/Navigation/UpdateNavigationPageTest.php b/tests/Feature/Navigation/UpdateNavigationPageTest.php
new file mode 100644
index 00000000000..a0d308c6cd9
--- /dev/null
+++ b/tests/Feature/Navigation/UpdateNavigationPageTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Tests\Feature\Navigation;
+
+use Facades\Statamic\Fields\BlueprintRepository;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\Nav;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class UpdateNavigationPageTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    private function request($nav, $params = [], $site = 'en')
+    {
+        $url = cp_route('navigation.pages.update', $nav->handle());
+
+        return $this->postJson($url, array_merge(['site' => $site], $params));
+    }
+
+    private function setNavBlueprint($nav)
+    {
+        $blueprint = Blueprint::makeFromFields([]);
+        BlueprintRepository::partialMock();
+        BlueprintRepository::shouldReceive('find')->with('navigation.'.$nav->handle())->andReturn($blueprint);
+    }
+
+    #[Test]
+    public function it_denies_access_without_permission_to_view_the_nav()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [])->save();
+        $this->setNavBlueprint($nav);
+
+        $this
+            ->actingAs($user)
+            ->request($nav, [
+                'type' => 'url',
+                'values' => ['title' => 'The title', 'url' => 'http://example.com'],
+            ])
+            ->assertForbidden();
+    }
+
+    #[Test]
+    public function it_allows_access_with_permission_to_view_the_nav()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'view test nav']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [])->save();
+        $this->setNavBlueprint($nav);
+
+        $this
+            ->actingAs($user)
+            ->request($nav, [
+                'type' => 'url',
+                'values' => ['title' => 'The title', 'url' => 'http://example.com'],
+            ])
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/RateLimitingTest.php b/tests/Feature/RateLimitingTest.php
new file mode 100644
index 00000000000..45403774513
--- /dev/null
+++ b/tests/Feature/RateLimitingTest.php
@@ -0,0 +1,277 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\RateLimiter;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class RateLimitingTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        Cache::flush();
+    }
+
+    #[Test]
+    public function login_endpoint_is_rate_limited()
+    {
+        collect(range(1, 4))->each(fn () => $this->post('/!/auth/login')->assertNotRateLimited());
+        $this->post('/!/auth/login')->assertRateLimited();
+    }
+
+    #[Test]
+    public function register_endpoint_is_rate_limited()
+    {
+        collect(range(1, 4))->each(fn () => $this->post('/!/auth/register')->assertNotRateLimited());
+        $this->post('/!/auth/register')->assertRateLimited();
+    }
+
+    #[Test]
+    public function password_email_endpoint_is_rate_limited()
+    {
+        collect(range(1, 4))->each(fn () => $this->post('/!/auth/password/email')->assertNotRateLimited());
+        $this->post('/!/auth/password/email')->assertRateLimited();
+    }
+
+    #[Test]
+    public function password_reset_endpoint_is_rate_limited()
+    {
+        collect(range(1, 4))->each(fn () => $this->post('/!/auth/password/reset')->assertNotRateLimited());
+        $this->post('/!/auth/password/reset')->assertRateLimited();
+    }
+
+    #[Test]
+    public function forms_endpoint_is_rate_limited()
+    {
+        collect(range(1, 10))->each(fn () => $this->post('/!/forms/contact')->assertNotRateLimited());
+        $this->post('/!/forms/contact')->assertRateLimited();
+    }
+
+    #[Test]
+    public function forms_precognitive_requests_have_a_higher_limit()
+    {
+        collect(range(1, 30))->each(fn () => $this->withPrecognition()->post('/!/forms/contact')->assertNotRateLimited());
+        $this->withPrecognition()->post('/!/forms/contact')->assertRateLimited();
+    }
+
+    #[Test]
+    public function forms_precognition_and_submission_buckets_are_independent()
+    {
+        // Exhaust the submission bucket...
+        collect(range(1, 10))->each(fn () => $this->post('/!/forms/contact')->assertNotRateLimited());
+        $this->post('/!/forms/contact')->assertRateLimited();
+
+        // ...precognitive validation should still be allowed.
+        $this->withPrecognition()->post('/!/forms/contact')->assertNotRateLimited();
+    }
+
+    #[Test]
+    public function cp_login_endpoint_is_rate_limited()
+    {
+        collect(range(1, 4))->each(fn () => $this->post('/cp/auth/login')->assertNotRateLimited());
+        $this->post('/cp/auth/login')->assertRateLimited();
+    }
+
+    #[Test]
+    public function cp_password_email_endpoint_is_rate_limited()
+    {
+        collect(range(1, 4))->each(fn () => $this->post('/cp/auth/password/email')->assertNotRateLimited());
+        $this->post('/cp/auth/password/email')->assertRateLimited();
+    }
+
+    #[Test]
+    public function cp_password_reset_endpoint_is_rate_limited()
+    {
+        collect(range(1, 4))->each(fn () => $this->post('/cp/auth/password/reset')->assertNotRateLimited());
+        $this->post('/cp/auth/password/reset')->assertRateLimited();
+    }
+
+    #[Test]
+    public function cp_and_frontend_auth_have_independent_buckets()
+    {
+        collect(range(1, 4))->each(fn () => $this->post('/!/auth/login')->assertNotRateLimited());
+        $this->post('/!/auth/login')->assertRateLimited();
+
+        $this->post('/cp/auth/login')->assertNotRateLimited();
+    }
+
+    #[Test]
+    public function auth_rate_limiter_can_be_overridden()
+    {
+        // Simulate a developer overriding the default 4/min limit to 2/min
+        RateLimiter::for('statamic.auth', fn ($request) => Limit::perMinute(2)->by($request->ip()));
+
+        $this->post('/!/auth/login')->assertNotRateLimited();
+        $this->post('/!/auth/login')->assertNotRateLimited();
+        $this->post('/!/auth/login')->assertRateLimited();
+    }
+
+    #[Test]
+    public function cp_auth_rate_limiter_inherits_overrides_to_statamic_auth()
+    {
+        RateLimiter::for('statamic.auth', fn ($request) => Limit::perMinute(2)->by($request->ip()));
+
+        $this->post('/cp/auth/login')->assertNotRateLimited();
+        $this->post('/cp/auth/login')->assertNotRateLimited();
+        $this->post('/cp/auth/login')->assertRateLimited();
+    }
+
+    #[Test]
+    public function cp_auth_rate_limiter_can_be_overridden_independently()
+    {
+        RateLimiter::for('statamic.cp.auth', fn ($request) => Limit::perMinute(2)->by($request->ip()));
+
+        $this->post('/cp/auth/login')->assertNotRateLimited();
+        $this->post('/cp/auth/login')->assertNotRateLimited();
+        $this->post('/cp/auth/login')->assertRateLimited();
+
+        // Frontend auth still uses the default 4/min
+        collect(range(1, 4))->each(fn () => $this->post('/!/auth/login')->assertNotRateLimited());
+    }
+
+    #[Test]
+    public function forms_rate_limiter_can_be_overridden()
+    {
+        // Simulate a developer overriding the default 10/min limit to 2/min
+        RateLimiter::for('statamic.forms', fn ($request) => Limit::perMinute(2)->by($request->ip()));
+
+        $this->post('/!/forms/contact')->assertNotRateLimited();
+        $this->post('/!/forms/contact')->assertNotRateLimited();
+        $this->post('/!/forms/contact')->assertRateLimited();
+    }
+
+    #[Test]
+    public function passkey_endpoint_is_rate_limited()
+    {
+        collect(range(1, 30))->each(fn () => $this->post('/!/auth/passkeys/auth')->assertNotRateLimited());
+        $this->post('/!/auth/passkeys/auth')->assertRateLimited();
+    }
+
+    #[Test]
+    public function cp_passkey_endpoint_is_rate_limited()
+    {
+        collect(range(1, 30))->each(fn () => $this->post('/cp/auth/passkeys')->assertNotRateLimited());
+        $this->post('/cp/auth/passkeys')->assertRateLimited();
+    }
+
+    #[Test]
+    public function elevated_session_confirm_endpoint_is_rate_limited()
+    {
+        $this->actingAs(tap(User::make()->email('foo@bar.com'))->save());
+
+        collect(range(1, 4))->each(fn () => $this->post('/!/auth/elevated-session')->assertNotRateLimited());
+        $this->post('/!/auth/elevated-session')->assertRateLimited();
+    }
+
+    #[Test]
+    public function cp_elevated_session_confirm_endpoint_is_rate_limited()
+    {
+        $this->actingAs(tap(User::make()->email('foo@bar.com')->makeSuper())->save());
+
+        collect(range(1, 4))->each(fn () => $this->post('/cp/elevated-session')->assertNotRateLimited());
+        $this->post('/cp/elevated-session')->assertRateLimited();
+    }
+
+    #[Test]
+    public function elevated_session_passkey_options_endpoint_is_rate_limited()
+    {
+        $this->actingAs(tap(User::make()->email('foo@bar.com'))->save());
+
+        collect(range(1, 30))->each(fn () => $this->get('/!/auth/elevated-session/passkey-options')->assertNotRateLimited());
+        $this->get('/!/auth/elevated-session/passkey-options')->assertRateLimited();
+    }
+
+    #[Test]
+    public function cp_elevated_session_passkey_options_endpoint_is_rate_limited()
+    {
+        $this->actingAs(tap(User::make()->email('foo@bar.com')->makeSuper())->save());
+
+        collect(range(1, 30))->each(fn () => $this->get('/cp/elevated-session/passkey-options')->assertNotRateLimited());
+        $this->get('/cp/elevated-session/passkey-options')->assertRateLimited();
+    }
+
+    #[Test]
+    public function cp_and_frontend_passkeys_have_independent_buckets()
+    {
+        RateLimiter::for('statamic.passkeys', fn ($request) => Limit::perMinute(2)->by($request->ip()));
+
+        $this->post('/!/auth/passkeys/auth')->assertNotRateLimited();
+        $this->post('/!/auth/passkeys/auth')->assertNotRateLimited();
+        $this->post('/!/auth/passkeys/auth')->assertRateLimited();
+
+        $this->post('/cp/auth/passkeys')->assertNotRateLimited();
+    }
+
+    #[Test]
+    public function passkeys_bucket_is_independent_from_auth_bucket()
+    {
+        collect(range(1, 4))->each(fn () => $this->post('/!/auth/login')->assertNotRateLimited());
+        $this->post('/!/auth/login')->assertRateLimited();
+
+        $this->post('/!/auth/passkeys/auth')->assertNotRateLimited();
+    }
+
+    #[Test]
+    public function dictionary_fieldtype_endpoint_is_rate_limited()
+    {
+        $config = base64_encode(json_encode(['type' => 'dictionary', 'dictionary' => 'countries']));
+        $url = route('statamic.dictionary-fieldtype', 'countries').'?config='.$config;
+
+        collect(range(1, 60))->each(fn () => $this->getJson($url)->assertNotRateLimited());
+        $this->getJson($url)->assertRateLimited();
+    }
+
+    #[Test]
+    public function dictionary_fieldtype_rate_limiter_can_be_overridden()
+    {
+        RateLimiter::for('statamic.dictionaries', fn ($request) => Limit::perMinute(2)->by($request->ip()));
+
+        $config = base64_encode(json_encode(['type' => 'dictionary', 'dictionary' => 'countries']));
+        $url = route('statamic.dictionary-fieldtype', 'countries').'?config='.$config;
+
+        $this->getJson($url)->assertNotRateLimited();
+        $this->getJson($url)->assertNotRateLimited();
+        $this->getJson($url)->assertRateLimited();
+    }
+
+    #[Test]
+    public function passkeys_rate_limiter_can_be_overridden()
+    {
+        RateLimiter::for('statamic.passkeys', fn ($request) => Limit::perMinute(2)->by($request->ip()));
+
+        $this->post('/!/auth/passkeys/auth')->assertNotRateLimited();
+        $this->post('/!/auth/passkeys/auth')->assertNotRateLimited();
+        $this->post('/!/auth/passkeys/auth')->assertRateLimited();
+    }
+
+    #[Test]
+    public function cp_passkeys_rate_limiter_inherits_overrides_to_statamic_passkeys()
+    {
+        RateLimiter::for('statamic.passkeys', fn ($request) => Limit::perMinute(2)->by($request->ip()));
+
+        $this->post('/cp/auth/passkeys')->assertNotRateLimited();
+        $this->post('/cp/auth/passkeys')->assertNotRateLimited();
+        $this->post('/cp/auth/passkeys')->assertRateLimited();
+    }
+
+    #[Test]
+    public function cp_passkeys_rate_limiter_can_be_overridden_independently()
+    {
+        RateLimiter::for('statamic.cp.passkeys', fn ($request) => Limit::perMinute(2)->by($request->ip()));
+
+        $this->post('/cp/auth/passkeys')->assertNotRateLimited();
+        $this->post('/cp/auth/passkeys')->assertNotRateLimited();
+        $this->post('/cp/auth/passkeys')->assertRateLimited();
+
+        // Frontend passkey still uses the default 30/min
+        collect(range(1, 30))->each(fn () => $this->post('/!/auth/passkeys/auth')->assertNotRateLimited());
+    }
+}
diff --git a/tests/Feature/Roles/StoreRoleTest.php b/tests/Feature/Roles/StoreRoleTest.php
index 999431e2b95..396afd96ebd 100644
--- a/tests/Feature/Roles/StoreRoleTest.php
+++ b/tests/Feature/Roles/StoreRoleTest.php
@@ -68,6 +68,26 @@ public function it_denies_access_without_active_elevated_session()
             ->assertRedirect('/cp/auth/confirm-password');
     }
 
+    #[Test]
+    public function it_allows_storing_a_role_without_elevated_session_when_elevated_sessions_are_disabled()
+    {
+        config(['statamic.users.elevated_sessions_enabled' => false]);
+
+        $this
+            ->actingAsUserWithPermissions(['edit roles'])
+            ->store([
+                'title' => 'No Elevated Session',
+                'handle' => 'no_elevated_session',
+                'permissions' => ['one', 'two'],
+            ])
+            ->assertOk()
+            ->assertJson(['redirect' => cp_route('roles.index')]);
+
+        $role = Role::find('no_elevated_session');
+        $this->assertEquals('No Elevated Session', $role->title());
+        $this->assertEquals(['one', 'two'], $role->permissions()->all());
+    }
+
     #[Test]
     public function it_stores_a_role()
     {
diff --git a/tests/Feature/Roles/UpdateRoleTest.php b/tests/Feature/Roles/UpdateRoleTest.php
index f0da48eae5f..8355d745497 100644
--- a/tests/Feature/Roles/UpdateRoleTest.php
+++ b/tests/Feature/Roles/UpdateRoleTest.php
@@ -78,7 +78,7 @@ public function it_updates_a_role()
         $role = tap(
             Role::make('test')
                 ->title('Test')
-                ->permissions(['one', 'two'])
+                ->permissions(['configure fields', 'manage preferences'])
         )->save();
 
         $this
@@ -87,7 +87,7 @@ public function it_updates_a_role()
             ->update($role, [
                 'title' => 'Updated',
                 'handle' => 'changed',
-                'permissions' => ['one', 'three'],
+                'permissions' => ['configure fields', 'resolve duplicate ids'],
             ])
             ->assertOk()
             ->assertJson(['redirect' => cp_route('roles.index')]);
@@ -95,7 +95,53 @@ public function it_updates_a_role()
         $this->assertNull(Role::find('test'));
         $role = Role::find('changed');
         $this->assertEquals('Updated', $role->title());
-        $this->assertEquals(['one', 'three'], $role->permissions()->all());
+        $this->assertEquals(['configure fields', 'resolve duplicate ids'], $role->permissions()->all());
+        $this->assertFalse($role->isSuper());
+    }
+
+    #[Test]
+    public function it_preserves_permissions_that_are_no_longer_registered()
+    {
+        // A permission that used to be registered, but no longer is. For example, one
+        // belonging to an addon that's been disabled, or a deprecated core permission.
+        $role = tap(
+            Role::make('test')
+                ->title('Test')
+                ->permissions(['configure fields', 'manage preferences', 'do addon things'])
+        )->save();
+
+        $this
+            ->actingAsUserWithPermissions(['edit roles'])
+            ->withActiveElevatedSession()
+            ->update($role, [
+                'permissions' => ['configure fields'],
+            ])
+            ->assertOk();
+
+        $role = Role::find('test');
+        $this->assertEquals(['configure fields', 'do addon things'], $role->permissions()->all());
+    }
+
+    #[Test]
+    public function demoting_a_super_role_does_not_resurrect_the_super_permission()
+    {
+        $role = tap(
+            Role::make('test')
+                ->title('Test')
+                ->permissions(['super'])
+        )->save();
+
+        $this
+            ->actingAs(tap(User::make()->makeSuper())->save())
+            ->withActiveElevatedSession()
+            ->update($role, [
+                'super' => false,
+                'permissions' => [],
+            ])
+            ->assertOk();
+
+        $role = Role::find('test');
+        $this->assertEquals([], $role->permissions()->all());
         $this->assertFalse($role->isSuper());
     }
 
diff --git a/tests/Feature/Taxonomies/ViewTermsListingTest.php b/tests/Feature/Taxonomies/ViewTermsListingTest.php
new file mode 100644
index 00000000000..b2eb150923d
--- /dev/null
+++ b/tests/Feature/Taxonomies/ViewTermsListingTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Tests\Feature\Taxonomies;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Taxonomy;
+use Statamic\Facades\Term;
+use Statamic\Facades\User;
+use Tests\FakesViews;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class ViewTermsListingTest extends TestCase
+{
+    use FakesViews, PreventSavingStacheItemsToDisk;
+
+    #[Test]
+    public function it_does_not_eager_load_actions_in_listing()
+    {
+        $user = tap(User::make()->makeSuper())->save();
+
+        $taxonomy = tap(Taxonomy::make('tags'))->save();
+        tap(Term::make()->taxonomy('tags')->inDefaultLocale()->slug('alfa')->data(['title' => 'alfa']))->save();
+
+        $this
+            ->actingAs($user)
+            ->getJson(cp_route('taxonomies.terms.index', $taxonomy->handle()))
+            ->assertSuccessful()
+            ->assertJsonCount(1, 'data')
+            ->assertJsonMissingPath('data.0.actions');
+    }
+
+    #[Test]
+    public function it_returns_has_template_true_when_template_exists()
+    {
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('tags.show', '');
+
+        $user = tap(User::make()->makeSuper())->save();
+        $taxonomy = tap(Taxonomy::make('tags'))->save();
+        tap(Term::make()->taxonomy('tags')->inDefaultLocale()->slug('alfa')->data(['title' => 'alfa']))->save();
+
+        $this
+            ->actingAs($user)
+            ->getJson(cp_route('taxonomies.terms.index', $taxonomy->handle()))
+            ->assertSuccessful()
+            ->assertJsonPath('data.0.has_template', true);
+    }
+
+    #[Test]
+    public function it_returns_has_template_false_when_template_does_not_exist()
+    {
+        $this->withFakeViews();
+
+        $user = tap(User::make()->makeSuper())->save();
+        $taxonomy = tap(Taxonomy::make('tags'))->save();
+        tap(Term::make()->taxonomy('tags')->inDefaultLocale()->slug('alfa')->data(['title' => 'alfa']))->save();
+
+        $this
+            ->actingAs($user)
+            ->getJson(cp_route('taxonomies.terms.index', $taxonomy->handle()))
+            ->assertSuccessful()
+            ->assertJsonPath('data.0.has_template', false);
+    }
+}
diff --git a/tests/Feature/Users/DisableTwoFactorTest.php b/tests/Feature/Users/DisableTwoFactorTest.php
index 271143d5185..58ca93b1c52 100644
--- a/tests/Feature/Users/DisableTwoFactorTest.php
+++ b/tests/Feature/Users/DisableTwoFactorTest.php
@@ -29,7 +29,7 @@ public function it_disables_two_factor_authentication()
         $this
             ->actingAs($user)
             ->withActiveElevatedSession()
-            ->delete(cp_route('users.two-factor.disable'))
+            ->deleteJson(cp_route('users.two-factor.disable'))
             ->assertOk()
             ->assertJson(['redirect' => null]);
 
@@ -55,7 +55,7 @@ public function it_disables_two_factor_authentication_when_two_factor_is_enforce
         $this
             ->actingAs($user)
             ->withActiveElevatedSession()
-            ->delete(cp_route('users.two-factor.disable'))
+            ->deleteJson(cp_route('users.two-factor.disable'))
             ->assertOk()
             ->assertJson(['redirect' => cp_route('two-factor-setup')]);
 
diff --git a/tests/Feature/Users/EditUserTest.php b/tests/Feature/Users/EditUserTest.php
index af6ebd93ae6..28562d070e1 100644
--- a/tests/Feature/Users/EditUserTest.php
+++ b/tests/Feature/Users/EditUserTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Feature\Users;
 
 use Inertia\Testing\AssertableInertia as Assert;
+use Orchestra\Testbench\Attributes\DefineEnvironment;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades\User;
@@ -73,6 +74,23 @@ public function it_provides_2fa_data()
             );
     }
 
+    #[Test]
+    #[DefineEnvironment('disableTwoFactor')]
+    public function it_doesnt_provide_2fa_data_when_two_factor_is_disabled()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'edit users']]);
+        $me = tap(User::make()->email('admin@domain.com')->assignRole('test'))->save();
+
+        $this
+            ->actingAsWithElevatedSession($me)
+            ->get($me->editUrl())
+            ->assertOk()
+            ->assertInertia(fn (Assert $page) => $page
+                ->component('users/Edit')
+                ->where('twoFactor', null)
+            );
+    }
+
     #[Test]
     public function it_doesnt_provide_2fa_data_when_editing_someone_else()
     {
@@ -84,6 +102,14 @@ public function it_doesnt_provide_2fa_data_when_editing_someone_else()
             ->actingAsWithElevatedSession($me)
             ->get($user->editUrl())
             ->assertOk()
-            ->assertViewHas('twoFactor', fn ($twoFactor) => $twoFactor === null);
+            ->assertInertia(fn (Assert $page) => $page
+                ->component('users/Edit')
+                ->where('twoFactor', null)
+            );
+    }
+
+    protected function disableTwoFactor($app)
+    {
+        $app['config']->set('statamic.users.two_factor_enabled', false);
     }
 }
diff --git a/tests/Feature/Users/EnableTwoFactorTest.php b/tests/Feature/Users/EnableTwoFactorTest.php
index a2d9f9561d5..f046ffcc467 100644
--- a/tests/Feature/Users/EnableTwoFactorTest.php
+++ b/tests/Feature/Users/EnableTwoFactorTest.php
@@ -51,7 +51,7 @@ public function it_enables_two_factor_authentication($url)
         $this
             ->actingAs($user)
             ->withActiveElevatedSession()
-            ->get($url())
+            ->postJson($url())
             ->assertOk()
             ->assertJsonStructure(['qr', 'secret_key', 'confirm_url']);
 
@@ -75,7 +75,7 @@ public function it_cant_enable_two_factor_authentication_without_elevated_sessio
 
         $this
             ->actingAs($user)
-            ->get(cp_route('users.two-factor.enable'))
+            ->post(cp_route('users.two-factor.enable'))
             ->assertRedirect('/cp/auth/confirm-password');
 
         $this->assertNull($user->two_factor_secret);
@@ -95,7 +95,7 @@ public function it_cant_enable_two_factor_authentication_when_it_is_already_enab
         $this
             ->actingAs($user)
             ->withActiveElevatedSession()
-            ->get($url())
+            ->postJson($url())
             ->assertForbidden();
 
         Event::assertNotDispatched(TwoFactorAuthenticationEnabled::class, fn ($event) => $event->user->id === $user->id);
@@ -103,7 +103,7 @@ public function it_cant_enable_two_factor_authentication_when_it_is_already_enab
 
     #[Test]
     #[DataProvider('enableProvider')]
-    public function it_doesnt_regenerate_secret_when_validation_error_is_present($url)
+    public function it_is_idempotent_when_secret_already_exists($url)
     {
         Event::fake();
 
@@ -112,19 +112,15 @@ public function it_doesnt_regenerate_secret_when_validation_error_is_present($ur
         $user->set('two_factor_recovery_codes', $originalRecoveryCodes = encrypt(['abc', 'def', 'ghi', 'jkl', 'mno', 'pqr', 'stu', 'vwx']));
         $user->save();
 
-        $errors = new \Illuminate\Support\ViewErrorBag;
-        $errors->put('default', new \Illuminate\Support\MessageBag(['code' => 'The provided two factor authentication code was invalid.']));
-
         $this
             ->actingAs($user)
             ->withActiveElevatedSession()
-            ->withSession(['errors' => $errors])
-            ->get($url())
+            ->postJson($url())
             ->assertOk()
             ->assertJsonStructure(['qr', 'secret_key', 'confirm_url']);
 
-        $this->assertEquals($originalSecret, $user->two_factor_secret);
-        $this->assertEquals($originalRecoveryCodes, $user->two_factor_recovery_codes);
+        $this->assertEquals($originalSecret, $user->fresh()->two_factor_secret);
+        $this->assertEquals($originalRecoveryCodes, $user->fresh()->two_factor_recovery_codes);
 
         Event::assertNotDispatched(TwoFactorAuthenticationEnabled::class, fn ($event) => $event->user->id === $user->id);
     }
@@ -143,7 +139,7 @@ public function it_confirms_two_factor_authentication($url)
         $this
             ->actingAs($user)
             ->withActiveElevatedSession()
-            ->post($url(), [
+            ->postJson($url(), [
                 'code' => $this->getOneTimeCode($user),
             ])
             ->assertOk();
@@ -168,7 +164,7 @@ public function it_cant_confirm_two_factor_authentication_without_valid_code($ur
             ->post($url(), [
                 'code' => '123456',
             ])
-            ->assertSessionHasErrors('code');
+            ->assertSessionHasErrors('code', null, 'user.two_factor_setup');
 
         $this->assertNull($user->two_factor_confirmed_at);
     }
diff --git a/tests/Feature/Users/StoreUserTest.php b/tests/Feature/Users/StoreUserTest.php
index e227b9234b2..143efd514db 100644
--- a/tests/Feature/Users/StoreUserTest.php
+++ b/tests/Feature/Users/StoreUserTest.php
@@ -35,6 +35,8 @@ public function it_creates_a_user()
             ->actingAsWithElevatedSession($me)
             ->store()
             ->assertOk();
+
+        $this->assertFalse(User::findByEmail('test@domain.com')->isSuper());
     }
 
     #[Test]
@@ -48,4 +50,32 @@ public function it_requires_an_elevated_session()
             ->store()
             ->assertElevatedSessionRequiredJsonResponse();
     }
+
+    #[Test]
+    public function super_users_can_create_a_super_user()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'create users']]);
+        $me = tap(User::make()->email('admin@domain.com')->assignRole('test')->makeSuper())->save();
+
+        $this
+            ->actingAsWithElevatedSession($me)
+            ->store(['super' => true])
+            ->assertOk();
+
+        $this->assertTrue(User::findByEmail('test@domain.com')->isSuper());
+    }
+
+    #[Test]
+    public function non_super_users_cannot_create_a_super_user()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'create users']]);
+        $me = tap(User::make()->email('admin@domain.com')->assignRole('test'))->save();
+
+        $this
+            ->actingAsWithElevatedSession($me)
+            ->store(['super' => true])
+            ->assertOk();
+
+        $this->assertFalse(User::findByEmail('test@domain.com')->isSuper());
+    }
 }
diff --git a/tests/Feature/Users/TwoFactorChallengeTest.php b/tests/Feature/Users/TwoFactorChallengeTest.php
index 0e95c63fb4d..5787b8864ea 100644
--- a/tests/Feature/Users/TwoFactorChallengeTest.php
+++ b/tests/Feature/Users/TwoFactorChallengeTest.php
@@ -157,22 +157,6 @@ public function it_cant_complete_challenge_with_invalid_recovery_code()
         });
     }
 
-    #[Test]
-    public function it_redirects_to_referer_url_after_successful_challenge()
-    {
-        $user = $this->userWithTwoFactorEnabled();
-
-        $this
-            ->session(['login.id' => $user->id()])
-            ->post(cp_route('two-factor-challenge'), [
-                'code' => $this->getOneTimeCode($user),
-                'referer' => 'http://localhost/cp/collections',
-            ])
-            ->assertRedirect('http://localhost/cp/collections');
-
-        $this->assertAuthenticatedAs($user);
-    }
-
     #[Test]
     public function it_redirects_to_intended_url_after_successful_challenge()
     {
diff --git a/tests/Feature/Users/TwoFactorRecoveryCodesTest.php b/tests/Feature/Users/TwoFactorRecoveryCodesTest.php
index 5184f376466..ddeac34bd21 100644
--- a/tests/Feature/Users/TwoFactorRecoveryCodesTest.php
+++ b/tests/Feature/Users/TwoFactorRecoveryCodesTest.php
@@ -76,7 +76,7 @@ public function it_generates_recovery_codes($url)
         $this
             ->actingAs($user)
             ->withActiveElevatedSession()
-            ->post($url())
+            ->postJson($url())
             ->assertOk()
             ->assertJsonStructure(['recovery_codes']);
     }
diff --git a/tests/Feature/Users/TwoFactorRoutesTest.php b/tests/Feature/Users/TwoFactorRoutesTest.php
new file mode 100644
index 00000000000..08dbb7b8b32
--- /dev/null
+++ b/tests/Feature/Users/TwoFactorRoutesTest.php
@@ -0,0 +1,219 @@
+<?php
+
+namespace Tests\Feature\Users;
+
+use Illuminate\Support\Facades\Route;
+use Orchestra\Testbench\Attributes\DefineEnvironment;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('2fa')]
+class TwoFactorRoutesTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    protected function resolveApplicationConfiguration($app)
+    {
+        parent::resolveApplicationConfiguration($app);
+
+        $app->booted(function () {
+            Route::get('/test-frontend-route', function () {
+                return 'ok';
+            })->middleware('statamic.web');
+
+            Route::get('/custom-setup', function () {
+                return 'setup page';
+            })->middleware('statamic.web');
+
+            Route::get('/login', fn () => 'login page')->name('login');
+        });
+    }
+
+    #[Test]
+    #[DefineEnvironment('disableTwoFactor')]
+    public function two_factor_routes_are_not_registered_when_two_factor_is_disabled()
+    {
+        $this->assertFalse(Route::has('statamic.cp.two-factor-challenge'));
+        $this->assertFalse(Route::has('statamic.cp.two-factor-setup'));
+        $this->assertFalse(Route::has('statamic.cp.users.two-factor.enable'));
+        $this->assertFalse(Route::has('statamic.cp.users.two-factor.confirm'));
+        $this->assertFalse(Route::has('statamic.cp.users.two-factor.disable'));
+        $this->assertFalse(Route::has('statamic.cp.users.two-factor.recovery-codes.show'));
+        $this->assertFalse(Route::has('statamic.cp.users.two-factor.recovery-codes.generate'));
+        $this->assertFalse(Route::has('statamic.cp.users.two-factor.recovery-codes.download'));
+        $this->assertFalse(Route::has('statamic.two-factor-challenge'));
+        $this->assertFalse(Route::has('statamic.two-factor-setup'));
+        $this->assertFalse(Route::has('statamic.users.two-factor.enable'));
+        $this->assertFalse(Route::has('statamic.users.two-factor.confirm'));
+        $this->assertFalse(Route::has('statamic.users.two-factor.recovery-codes.show'));
+        $this->assertFalse(Route::has('statamic.users.two-factor.recovery-codes.generate'));
+        $this->assertFalse(Route::has('statamic.users.two-factor.recovery-codes.download'));
+    }
+
+    #[Test]
+    public function cp_two_factor_setup_middleware_redirects_when_two_factor_is_enforced()
+    {
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
+
+        $user = tap(User::make()->makeSuper()->email('admin@domain.com'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('dashboard'))
+            ->assertRedirect(cp_route('two-factor-setup'))
+            ->assertSessionHas('url.intended', cp_route('dashboard'));
+    }
+
+    #[Test]
+    #[DefineEnvironment('disableTwoFactor')]
+    public function cp_two_factor_setup_middleware_does_not_redirect_when_two_factor_is_disabled()
+    {
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
+
+        $user = tap(User::make()->makeSuper()->email('admin@domain.com'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('dashboard'))
+            ->assertOk();
+    }
+
+    #[Test]
+    public function cp_two_factor_setup_middleware_ignores_frontend_setup_url_config()
+    {
+        config([
+            'statamic.users.two_factor_enforced_roles' => ['*'],
+            'statamic.users.two_factor_setup_url' => '/custom-setup',
+        ]);
+
+        $user = tap(User::make()->makeSuper()->email('admin@domain.com'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('dashboard'))
+            ->assertRedirect(cp_route('two-factor-setup'))
+            ->assertSessionHas('url.intended', cp_route('dashboard'));
+    }
+
+    #[Test]
+    public function frontend_two_factor_setup_middleware_redirects_when_two_factor_is_enforced()
+    {
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
+
+        $user = tap(User::make()->makeSuper()->email('admin@domain.com'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get('/test-frontend-route')
+            ->assertRedirect(route('statamic.two-factor-setup'))
+            ->assertSessionHas('url.intended', url('/test-frontend-route'));
+    }
+
+    #[Test]
+    public function frontend_two_factor_setup_middleware_generates_secret_when_none_exists()
+    {
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
+
+        $user = tap(User::make()->makeSuper()->email('admin@domain.com'))->save();
+
+        $this->assertNull($user->two_factor_secret);
+
+        $this
+            ->actingAs($user)
+            ->get('/test-frontend-route')
+            ->assertRedirect(route('statamic.two-factor-setup'))
+            ->assertSessionHas('url.intended', url('/test-frontend-route'));
+
+        $this->assertNotNull($user->fresh()->two_factor_secret);
+    }
+
+    #[Test]
+    public function frontend_two_factor_setup_middleware_does_not_regenerate_existing_secret()
+    {
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
+
+        $user = tap(User::make()->makeSuper()->email('admin@domain.com')->data([
+            'two_factor_secret' => $existing = encrypt(app(\Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+        ]))->save();
+
+        $this
+            ->actingAs($user)
+            ->get('/test-frontend-route')
+            ->assertRedirect(route('statamic.two-factor-setup'))
+            ->assertSessionHas('url.intended', url('/test-frontend-route'));
+
+        $this->assertEquals($existing, $user->fresh()->two_factor_secret);
+    }
+
+    #[Test]
+    public function frontend_two_factor_setup_middleware_redirects_to_configured_url()
+    {
+        config([
+            'statamic.users.two_factor_enforced_roles' => ['*'],
+            'statamic.users.two_factor_setup_url' => '/custom-setup',
+        ]);
+
+        $user = tap(User::make()->makeSuper()->email('admin@domain.com'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get('/test-frontend-route')
+            ->assertRedirect('/custom-setup');
+    }
+
+    #[Test]
+    public function frontend_two_factor_setup_middleware_allows_configured_url_through()
+    {
+        config([
+            'statamic.users.two_factor_enforced_roles' => ['*'],
+            'statamic.users.two_factor_setup_url' => '/custom-setup',
+        ]);
+
+        $user = tap(User::make()->makeSuper()->email('admin@domain.com'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get('/custom-setup')
+            ->assertOk()
+            ->assertSee('setup page');
+    }
+
+    #[Test]
+    public function frontend_two_factor_action_routes_require_authentication()
+    {
+        $routes = [
+            ['post', route('statamic.users.two-factor.enable')],
+            ['post', route('statamic.users.two-factor.confirm')],
+            ['delete', route('statamic.users.two-factor.disable')],
+            ['get', route('statamic.users.two-factor.recovery-codes.show')],
+            ['post', route('statamic.users.two-factor.recovery-codes.generate')],
+            ['get', route('statamic.users.two-factor.recovery-codes.download')],
+        ];
+
+        foreach ($routes as [$method, $url]) {
+            $this->{$method}($url)->assertRedirect('/login');
+        }
+    }
+
+    #[Test]
+    #[DefineEnvironment('disableTwoFactor')]
+    public function frontend_two_factor_setup_middleware_does_not_redirect_when_two_factor_is_disabled()
+    {
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
+
+        $user = tap(User::make()->makeSuper()->email('admin@domain.com'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get('/test-frontend-route')
+            ->assertOk();
+    }
+
+    protected function disableTwoFactor($app)
+    {
+        $app['config']->set('statamic.users.two_factor_enabled', false);
+    }
+}
diff --git a/tests/Feature/Users/TwoFactorSetupTest.php b/tests/Feature/Users/TwoFactorSetupTest.php
index f4c00429075..3086dc9645b 100644
--- a/tests/Feature/Users/TwoFactorSetupTest.php
+++ b/tests/Feature/Users/TwoFactorSetupTest.php
@@ -35,16 +35,32 @@ public function it_redirects_to_the_dashboard_if_the_user_is_already_set_up()
     }
 
     #[Test]
-    public function redirect_url_is_referer()
+    public function redirect_url_is_intended_url()
     {
         $this
             ->actingAs($this->user())
-            ->get(cp_route('two-factor-setup', [
-                'referer' => 'http://localhost/cp/collections',
-            ]))
+            ->withSession(['url.intended' => 'http://localhost/cp/collections'])
+            ->get(cp_route('two-factor-setup'))
             ->assertInertia(fn ($page) => $page->where('redirect', 'http://localhost/cp/collections'));
     }
 
+    #[Test]
+    public function redirect_url_is_preserved_across_refreshes_of_the_frontend_setup_page()
+    {
+        $user = $this->user();
+
+        $this
+            ->actingAs($user)
+            ->withSession(['url.intended' => '/dashboard'])
+            ->get(route('statamic.two-factor-setup'))
+            ->assertInertia(fn ($page) => $page->where('redirect', '/dashboard'));
+
+        $this
+            ->actingAs($user)
+            ->get(route('statamic.two-factor-setup'))
+            ->assertInertia(fn ($page) => $page->where('redirect', '/dashboard'));
+    }
+
     #[Test]
     public function it_does_not_redirect_to_external_url_on_frontend_route()
     {
diff --git a/tests/Feature/Users/UserExistsTest.php b/tests/Feature/Users/UserExistsTest.php
new file mode 100644
index 00000000000..a503801d38e
--- /dev/null
+++ b/tests/Feature/Users/UserExistsTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Tests\Feature\Users;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class UserExistsTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    #[Test]
+    public function it_denies_users_without_permission_to_view_users()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        tap(User::make()->email('existing@domain.com'))->save();
+        $me = tap(User::make()->email('admin@domain.com')->assignRole('test'))->save();
+
+        $this
+            ->actingAs($me)
+            ->postJson(cp_route('user.exists'), ['email' => 'existing@domain.com'])
+            ->assertForbidden();
+    }
+
+    #[Test]
+    public function it_reports_an_existing_user_for_authorized_users()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'view users']]);
+        tap(User::make()->email('existing@domain.com'))->save();
+        $me = tap(User::make()->email('admin@domain.com')->assignRole('test'))->save();
+
+        $this
+            ->actingAs($me)
+            ->postJson(cp_route('user.exists'), ['email' => 'existing@domain.com'])
+            ->assertOk()
+            ->assertExactJson(['exists' => true]);
+    }
+
+    #[Test]
+    public function it_reports_a_missing_user_for_authorized_users()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'view users']]);
+        $me = tap(User::make()->email('admin@domain.com')->assignRole('test'))->save();
+
+        $this
+            ->actingAs($me)
+            ->postJson(cp_route('user.exists'), ['email' => 'unknown@domain.com'])
+            ->assertOk()
+            ->assertExactJson(['exists' => false]);
+    }
+
+    #[Test]
+    public function it_allows_super_users()
+    {
+        tap(User::make()->email('existing@domain.com'))->save();
+        $me = tap(User::make()->email('admin@domain.com')->makeSuper())->save();
+
+        $this
+            ->actingAs($me)
+            ->postJson(cp_route('user.exists'), ['email' => 'existing@domain.com'])
+            ->assertOk()
+            ->assertExactJson(['exists' => true]);
+    }
+}
diff --git a/tests/Fields/FieldTest.php b/tests/Fields/FieldTest.php
index fe85243b090..b38408923f7 100644
--- a/tests/Fields/FieldTest.php
+++ b/tests/Fields/FieldTest.php
@@ -5,6 +5,7 @@
 use Facades\Statamic\Fields\FieldtypeRepository;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Field as Fields;
 use Statamic\Fields\Field;
 use Statamic\Fields\Fieldtype;
 use Statamic\Fields\Value;
@@ -294,6 +295,7 @@ public function converts_to_array_suitable_for_rendering_fields_in_publish_compo
             ->andReturn(new class extends Fieldtype
             {
                 protected $component = 'example';
+
                 protected $configFields = [
                     'a_config_field_with_pre_processing' => ['type' => 'with_processing'],
                     'a_config_field_without_pre_processing' => ['type' => 'without_processing'],
@@ -474,6 +476,31 @@ public function defaultValue()
         $this->assertEquals('fieldtype defined default preprocessed', $field->preProcess()->value());
     }
 
+    #[Test]
+    public function preprocessing_a_field_with_no_value_and_computed_default_value_will_use_the_computed_function()
+    {
+        FieldtypeRepository::shouldReceive('find')
+            ->with('fieldtype')
+            ->andReturn(new class extends Fieldtype
+            {
+                public function preProcess($data)
+                {
+                    return $data.' preprocessed';
+                }
+
+                public function defaultValue()
+                {
+                    return 'fieldtype defined default';
+                }
+            });
+
+        Fields::computedDefault('computed-value', fn () => 'computed defined default');
+
+        $field = (new Field('test', ['default' => 'computed:computed-value', 'type' => 'fieldtype']));
+
+        $this->assertEquals('computed defined default preprocessed', $field->preProcess()->value());
+    }
+
     #[Test]
     public function converting_to_an_array_will_inline_the_handle()
     {
diff --git a/tests/Fields/FieldsetTest.php b/tests/Fields/FieldsetTest.php
index ff8fb006d08..559edcbee9f 100644
--- a/tests/Fields/FieldsetTest.php
+++ b/tests/Fields/FieldsetTest.php
@@ -117,6 +117,107 @@ public function it_gets_fields()
         $this->assertEquals(['text', 'textarea'], $fields->map->type()->values()->all());
     }
 
+    #[Test]
+    public function it_gets_fields_from_sections()
+    {
+        $fieldset = new Fieldset;
+
+        $fieldset->setContents([
+            'sections' => [
+                [
+                    'display' => 'First section',
+                    'fields' => [
+                        [
+                            'handle' => 'one',
+                            'field' => ['type' => 'text'],
+                        ],
+                    ],
+                ],
+                [
+                    'display' => 'Second section',
+                    'fields' => [
+                        [
+                            'handle' => 'two',
+                            'field' => ['type' => 'textarea'],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+
+        $fields = $fieldset->fields();
+
+        $this->assertTrue($fieldset->hasSections());
+        $this->assertCount(2, $fieldset->sections());
+        $this->assertInstanceOf(Fields::class, $fields);
+        $this->assertEveryItemIsInstanceOf(Field::class, $fields = $fields->all());
+        $this->assertEquals(['one', 'two'], $fields->map->handle()->values()->all());
+        $this->assertEquals(['text', 'textarea'], $fields->map->type()->values()->all());
+    }
+
+    #[Test]
+    public function it_drops_empty_sections_when_storing_flat_fields()
+    {
+        $fieldset = new Fieldset;
+
+        $fieldset->setContents([
+            'title' => 'Test',
+            'sections' => [],
+            'fields' => [
+                ['handle' => 'one', 'field' => ['type' => 'text']],
+            ],
+        ]);
+
+        $this->assertArrayNotHasKey('sections', $fieldset->contents());
+        $this->assertEquals('one', $fieldset->fields()->all()->first()->handle());
+    }
+
+    #[Test]
+    public function it_drops_top_level_fields_when_storing_sections()
+    {
+        $fieldset = new Fieldset;
+
+        $fieldset->setContents([
+            'sections' => [
+                [
+                    'display' => 'A',
+                    'fields' => [
+                        ['handle' => 'one', 'field' => ['type' => 'text']],
+                    ],
+                ],
+            ],
+            'fields' => [
+                ['handle' => 'stale', 'field' => ['type' => 'text']],
+            ],
+        ]);
+
+        $this->assertArrayNotHasKey('fields', $fieldset->contents());
+        $this->assertEquals(['one'], $fieldset->fields()->all()->keys()->all());
+    }
+
+    #[Test]
+    public function it_normalizes_legacy_section_fields_syntax()
+    {
+        $fieldset = new Fieldset;
+
+        $fieldset->setContents([
+            'sections' => [
+                [
+                    'display' => 'First section',
+                    'fields' => [
+                        'one' => ['type' => 'text'],
+                        'two' => ['type' => 'textarea'],
+                    ],
+                ],
+            ],
+        ]);
+
+        $fields = $fieldset->fields()->all();
+
+        $this->assertEquals(['one', 'two'], $fields->map->handle()->values()->all());
+        $this->assertEquals(['text', 'textarea'], $fields->map->type()->values()->all());
+    }
+
     #[Test]
     public function it_gets_fields_using_legacy_syntax()
     {
@@ -445,6 +546,32 @@ public function gets_fieldsets_importing_single_field_from_fieldset()
         $this->assertEquals($fieldsetA->handle(), $importedBy['fieldsets']->first()->handle());
     }
 
+    #[Test]
+    public function gets_fieldsets_importing_fieldset_inside_sections()
+    {
+        $fieldset = Fieldset::make('seo')->setContents(['fields' => [
+            ['handle' => 'meta_title', 'field' => ['type' => 'text']],
+        ]])->save();
+
+        $fieldsetA = Fieldset::make('one')
+            ->setContents([
+                'sections' => [
+                    [
+                        'display' => 'SEO',
+                        'fields' => [
+                            ['import' => 'seo'],
+                        ],
+                    ],
+                ],
+            ])
+            ->save();
+
+        $importedBy = $fieldset->importedBy();
+
+        $this->assertCount(1, $importedBy['fieldsets']);
+        $this->assertEquals($fieldsetA->handle(), $importedBy['fieldsets']->first()->handle());
+    }
+
     #[Test]
     public function it_saves_through_the_repository()
     {
diff --git a/tests/Fields/FieldtypeTest.php b/tests/Fields/FieldtypeTest.php
index b0519eed407..0f8732ca734 100644
--- a/tests/Fields/FieldtypeTest.php
+++ b/tests/Fields/FieldtypeTest.php
@@ -12,10 +12,13 @@
 use Statamic\Fields\Field;
 use Statamic\Fields\Fields;
 use Statamic\Fields\Fieldtype;
+use Tests\FakesViews;
 use Tests\TestCase;
 
 class FieldtypeTest extends TestCase
 {
+    use FakesViews;
+
     #[Test]
     public function it_gets_the_field()
     {
@@ -568,6 +571,120 @@ public function it_can_make_a_fieldtype_selectable_in_forms()
         $this->assertTrue(FieldtypeRepository::selectableInFormIsOverriden('test-selectable'));
     }
 
+    #[Test]
+    public function form_view_returns_the_package_view_for_the_handle()
+    {
+        config(['statamic.templates.language' => 'antlers']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.antlers.fields.text', '');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'text';
+        };
+
+        $this->assertEquals('statamic::forms.antlers.fields.text', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_returns_the_blade_package_view_when_language_is_blade()
+    {
+        config(['statamic.templates.language' => 'blade']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.blade.fields.text', '', 'blade.php');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'text';
+        };
+
+        $this->assertEquals('statamic::forms.blade.fields.text', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_prefers_a_legacy_published_view_over_the_package_view()
+    {
+        config(['statamic.templates.language' => 'antlers']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.fields.text', '');
+        $this->viewShouldReturnRaw('statamic::forms.antlers.fields.text', '');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'text';
+        };
+
+        $this->assertEquals('statamic::forms.fields.text', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_falls_back_to_the_package_default_when_no_handle_view_exists()
+    {
+        config(['statamic.templates.language' => 'antlers']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.antlers.fields.default', '');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'unknown';
+        };
+
+        $this->assertEquals('statamic::forms.antlers.fields.default', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_falls_back_to_the_blade_default_when_no_handle_view_exists_and_language_is_blade()
+    {
+        config(['statamic.templates.language' => 'blade']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.blade.fields.default', '', 'blade.php');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'unknown';
+        };
+
+        $this->assertEquals('statamic::forms.blade.fields.default', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_uses_a_legacy_published_default_view_when_no_handle_view_exists()
+    {
+        config(['statamic.templates.language' => 'antlers']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.fields.default', '');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'unknown';
+        };
+
+        $this->assertEquals('statamic::forms.fields.default', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_prefers_a_legacy_published_default_over_the_package_default()
+    {
+        config(['statamic.templates.language' => 'antlers']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.fields.default', '');
+        $this->viewShouldReturnRaw('statamic::forms.antlers.fields.default', '');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'unknown';
+        };
+
+        $this->assertEquals('statamic::forms.fields.default', $fieldtype->view());
+    }
+
     #[Test]
     public function it_can_make_a_fieldtype_unselectable_in_forms()
     {
diff --git a/tests/Fields/TabTest.php b/tests/Fields/TabTest.php
index 69094f5abb1..11b4d4e0d63 100644
--- a/tests/Fields/TabTest.php
+++ b/tests/Fields/TabTest.php
@@ -4,8 +4,10 @@
 
 use Facades\Statamic\Fields\FieldRepository;
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Fieldset as FieldsetRepository;
 use Statamic\Fields\Field;
 use Statamic\Fields\Fields;
+use Statamic\Fields\Fieldset;
 use Statamic\Fields\Tab;
 use Tests\TestCase;
 
@@ -194,4 +196,165 @@ public function converts_to_array_suitable_for_rendering_fields_in_publish_compo
             ],
         ], $tab->toPublishArray());
     }
+
+    #[Test]
+    public function it_expands_sectioned_fieldset_imports_into_publish_sections()
+    {
+        FieldsetRepository::shouldReceive('find')
+            ->with('seo')
+            ->andReturn((new Fieldset)->setHandle('seo')->setContents([
+                'sections' => [
+                    [
+                        'display' => 'SEO',
+                        'fields' => [
+                            ['handle' => 'meta_title', 'field' => ['type' => 'text']],
+                        ],
+                    ],
+                    [
+                        'display' => 'Social',
+                        'fields' => [
+                            ['handle' => 'og_title', 'field' => ['type' => 'text']],
+                        ],
+                    ],
+                ],
+            ]));
+
+        $tab = (new Tab('main'))->setContents([
+            'sections' => [
+                [
+                    'display' => 'Main',
+                    'fields' => [
+                        ['handle' => 'title', 'field' => ['type' => 'text']],
+                        ['import' => 'seo'],
+                        ['handle' => 'summary', 'field' => ['type' => 'textarea']],
+                    ],
+                ],
+            ],
+        ]);
+
+        $publish = $tab->toPublishArray();
+
+        $this->assertCount(4, $publish['sections']);
+        $this->assertEquals('Main', $publish['sections'][0]['display']);
+        $this->assertEquals(['title'], collect($publish['sections'][0]['fields'])->pluck('handle')->all());
+        $this->assertEquals('SEO', $publish['sections'][1]['display']);
+        $this->assertEquals(['meta_title'], collect($publish['sections'][1]['fields'])->pluck('handle')->all());
+        $this->assertEquals('Social', $publish['sections'][2]['display']);
+        $this->assertEquals(['og_title'], collect($publish['sections'][2]['fields'])->pluck('handle')->all());
+        $this->assertEquals('Main', $publish['sections'][3]['display']);
+        $this->assertEquals(['summary'], collect($publish['sections'][3]['fields'])->pluck('handle')->all());
+    }
+
+    #[Test]
+    public function it_applies_prefixes_to_fields_inside_imported_fieldset_sections()
+    {
+        FieldsetRepository::shouldReceive('find')
+            ->with('seo')
+            ->andReturn((new Fieldset)->setHandle('seo')->setContents([
+                'sections' => [
+                    [
+                        'display' => 'SEO',
+                        'fields' => [
+                            ['handle' => 'meta_title', 'field' => ['type' => 'text']],
+                        ],
+                    ],
+                ],
+            ]));
+
+        $tab = (new Tab('main'))->setContents([
+            'sections' => [
+                [
+                    'fields' => [
+                        ['import' => 'seo', 'prefix' => 'seo_'],
+                    ],
+                ],
+            ],
+        ]);
+
+        $publish = $tab->toPublishArray();
+        $field = $publish['sections'][0]['fields'][0];
+
+        $this->assertEquals('seo_meta_title', $field['handle']);
+        $this->assertEquals('seo_', $field['prefix']);
+    }
+
+    #[Test]
+    public function it_can_flatten_imported_fieldset_sections_in_place()
+    {
+        FieldsetRepository::shouldReceive('find')
+            ->with('seo')
+            ->andReturn((new Fieldset)->setHandle('seo')->setContents([
+                'sections' => [
+                    [
+                        'display' => 'SEO',
+                        'fields' => [
+                            ['handle' => 'meta_title', 'field' => ['type' => 'text']],
+                        ],
+                    ],
+                ],
+            ]));
+
+        $tab = (new Tab('main'))->setContents([
+            'sections' => [
+                [
+                    'display' => 'Main',
+                    'fields' => [
+                        ['handle' => 'title', 'field' => ['type' => 'text']],
+                        ['import' => 'seo', 'section_behavior' => 'flatten'],
+                        ['handle' => 'summary', 'field' => ['type' => 'textarea']],
+                    ],
+                ],
+            ],
+        ]);
+
+        $publish = $tab->toPublishArray();
+
+        $this->assertCount(1, $publish['sections']);
+        $this->assertEquals('Main', $publish['sections'][0]['display']);
+        $this->assertEquals(['title', 'meta_title', 'summary'], collect($publish['sections'][0]['fields'])->pluck('handle')->all());
+    }
+
+    #[Test]
+    public function it_applies_config_overrides_to_fields_inside_imported_fieldset_sections()
+    {
+        FieldsetRepository::shouldReceive('find')
+            ->with('seo')
+            ->andReturn((new Fieldset)->setHandle('seo')->setContents([
+                'sections' => [
+                    [
+                        'display' => 'SEO',
+                        'fields' => [
+                            ['handle' => 'meta_title', 'field' => ['type' => 'text', 'display' => 'Meta Title']],
+                            ['handle' => 'meta_description', 'field' => ['type' => 'textarea', 'display' => 'Meta Description']],
+                        ],
+                    ],
+                ],
+            ]));
+
+        $tab = (new Tab('main'))->setContents([
+            'sections' => [
+                [
+                    'fields' => [
+                        [
+                            'import' => 'seo',
+                            'config' => [
+                                'meta_title' => ['instructions' => 'Keep it under 60 characters.'],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+
+        $publish = $tab->toPublishArray();
+        $fields = collect($publish['sections'][0]['fields']);
+
+        $metaTitle = $fields->firstWhere('handle', 'meta_title');
+        $this->assertEquals('Keep it under 60 characters.', $metaTitle['instructions']);
+        $this->assertEquals('Meta Title', $metaTitle['display']);
+
+        $metaDescription = $fields->firstWhere('handle', 'meta_description');
+        $this->assertNull($metaDescription['instructions']);
+        $this->assertEquals('Meta Description', $metaDescription['display']);
+    }
 }
diff --git a/tests/Fields/ValidatorTest.php b/tests/Fields/ValidatorTest.php
index 095ac46aa12..2468b290663 100644
--- a/tests/Fields/ValidatorTest.php
+++ b/tests/Fields/ValidatorTest.php
@@ -241,6 +241,22 @@ public function it_does_not_make_replacements_in_regex_rules()
         ], $validation->rules());
     }
 
+    #[Test]
+    public function it_only_pre_processes_validatables_once_per_validator_call()
+    {
+        $field = Mockery::mock(Field::class);
+        $field->shouldReceive('setValidationContext')->with([])->andReturnSelf();
+        $field->shouldReceive('rules')->andReturn(['one' => ['required']]);
+        $field->shouldReceive('validationAttributes')->andReturn(['one' => 'One']);
+
+        $fields = Mockery::mock(Fields::class);
+        $fields->shouldReceive('preProcessValidatables')->once()->andReturnSelf();
+        $fields->shouldReceive('all')->andReturn(collect([$field]));
+        $fields->shouldReceive('values')->andReturn(collect(['one' => 'foo']));
+
+        (new Validator)->fields($fields)->validator();
+    }
+
     #[Test]
     public function it_replaces_this_in_sets()
     {
diff --git a/tests/Fieldtypes/BardTest.php b/tests/Fieldtypes/BardTest.php
index 7eca35f1d5a..100eb745c25 100644
--- a/tests/Fieldtypes/BardTest.php
+++ b/tests/Fieldtypes/BardTest.php
@@ -14,6 +14,8 @@
 use Statamic\Fields\Values;
 use Statamic\Fieldtypes\Bard;
 use Statamic\Fieldtypes\Bard\Augmentor;
+use Statamic\Fieldtypes\Link;
+use Statamic\Fieldtypes\Link\LinkType;
 use Statamic\Fieldtypes\RowId;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -30,6 +32,9 @@ public function tearDown(): void
     {
         parent::tearDown();
         static::$functions = null;
+
+        (new \ReflectionClass(Link::class))->setStaticPropertyValue('types', []);
+        (new \ReflectionClass(\Statamic\Fields\Fieldtype::class))->setStaticPropertyValue('extraConfigFields', []);
     }
 
     #[Test]
@@ -631,6 +636,36 @@ public function it_removes_empty_nodes()
         ]);
     }
 
+    #[Test]
+    public function it_does_not_remove_sets_when_trimming_empty_nodes()
+    {
+        $content = [
+            ['type' => 'paragraph'],
+            [
+                'type' => 'set',
+                'attrs' => [
+                    'id' => 'test-set',
+                    'values' => [
+                        'type' => 'one',
+                    ],
+                ],
+            ],
+            ['type' => 'paragraph'],
+        ];
+
+        $this->assertEquals([
+            [
+                'type' => 'set',
+                'attrs' => [
+                    'id' => 'test-set',
+                    'values' => [
+                        'type' => 'one',
+                    ],
+                ],
+            ],
+        ], $this->bard(['remove_empty_nodes' => 'trim'])->process($content));
+    }
+
     #[Test]
     #[DataProvider('groupedSetsProvider')]
     public function it_preloads($areSetsGrouped)
@@ -752,6 +787,8 @@ public function it_preloads($areSetsGrouped)
     #[Test]
     public function it_gets_link_data()
     {
+        $this->actingAs(tap(Facades\User::make()->makeSuper())->save());
+
         tap(Facades\Collection::make('pages')->routes('/{slug}'))->save();
         EntryFactory::collection('pages')->id('1')->slug('about')->data(['title' => 'About'])->create();
         EntryFactory::collection('pages')->id('2')->slug('articles')->data(['title' => 'Articles'])->create();
@@ -775,11 +812,15 @@ public function it_gets_link_data()
 
         $prosemirror = (new Augmentor($this))->renderHtmlToProsemirror($html)['content'];
 
-        $this->assertEquals([
-            'entry::1' => ['title' => 'About', 'permalink' => 'http://localhost/about'],
-            'entry::2' => ['title' => 'Articles', 'permalink' => 'http://localhost/articles'],
-            'entry::3' => ['title' => 'Contact', 'permalink' => 'http://localhost/contact'],
-        ], $bard->getLinkData($prosemirror));
+        // Link data comes from the same CP fieldtype resource used everywhere else entries are
+        // displayed, so we only assert the bits Bard's own toolbar actually cares about (which
+        // refs were extracted, and their title) rather than locking down that resource's full shape.
+        $linkData = $bard->getLinkData($prosemirror);
+
+        $this->assertEquals(['entry::1', 'entry::2', 'entry::3'], array_keys($linkData));
+        $this->assertEquals('About', $linkData['entry::1']['title']);
+        $this->assertEquals('Articles', $linkData['entry::2']['title']);
+        $this->assertEquals('Contact', $linkData['entry::3']['title']);
     }
 
     #[Test]
@@ -1351,6 +1392,186 @@ public function it_doesnt_localize_when_select_across_sites_setting_is_enabled()
         $this->assertEquals('<a href="http://localhost/fr/blog/one-fr">The One</a>', $augmented);
     }
 
+    #[Test]
+    public function it_preserves_query_params_on_entry_links()
+    {
+        tap(Facades\Collection::make('blog')->routes('blog/{slug}'))->save();
+        EntryFactory::collection('blog')->id('123')->slug('my-post')->data(['title' => 'My Post'])->create();
+
+        $field = (new Bard)->setField(new Field('test', ['type' => 'bard']));
+
+        $augmented = $field->augment([
+            ['type' => 'text', 'marks' => [['type' => 'link', 'attrs' => ['href' => 'statamic://entry::123?foo=bar']]], 'text' => 'Link'],
+        ]);
+
+        $this->assertEquals('<a href="/blog/my-post?foo=bar">Link</a>', $augmented);
+    }
+
+    #[Test]
+    public function it_preserves_anchors_on_entry_links()
+    {
+        tap(Facades\Collection::make('blog')->routes('blog/{slug}'))->save();
+        EntryFactory::collection('blog')->id('123')->slug('my-post')->data(['title' => 'My Post'])->create();
+
+        $field = (new Bard)->setField(new Field('test', ['type' => 'bard']));
+
+        $augmented = $field->augment([
+            ['type' => 'text', 'marks' => [['type' => 'link', 'attrs' => ['href' => 'statamic://entry::123#section']]], 'text' => 'Link'],
+        ]);
+
+        $this->assertEquals('<a href="/blog/my-post#section">Link</a>', $augmented);
+    }
+
+    #[Test]
+    public function it_preserves_query_params_and_anchors_on_entry_links()
+    {
+        tap(Facades\Collection::make('blog')->routes('blog/{slug}'))->save();
+        EntryFactory::collection('blog')->id('123')->slug('my-post')->data(['title' => 'My Post'])->create();
+
+        $field = (new Bard)->setField(new Field('test', ['type' => 'bard']));
+
+        $augmented = $field->augment([
+            ['type' => 'text', 'marks' => [['type' => 'link', 'attrs' => ['href' => 'statamic://entry::123?foo=bar#section']]], 'text' => 'Link'],
+        ]);
+
+        $this->assertEquals('<a href="/blog/my-post?foo=bar#section">Link</a>', $augmented);
+    }
+
+    #[Test]
+    public function it_preserves_appends_on_localized_entry_links()
+    {
+        $this->setSites([
+            'en' => ['url' => 'http://localhost/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://localhost/fr/', 'locale' => 'fr'],
+        ]);
+
+        Facades\Site::setCurrent('fr');
+
+        tap(Facades\Collection::make('blog')->routes('blog/{slug}'))->sites(['en', 'fr'])->save();
+
+        EntryFactory::id('parent')->collection('blog')->slug('theparent')->id(123)->locale('en')->create();
+        EntryFactory::id('123-fr')->origin('123')->locale('fr')->collection('blog')->slug('one-fr')->data(['title' => 'Le One'])->create();
+
+        $field = (new Bard)->setField(new Field('test', array_merge(['type' => 'bard'], ['select_across_sites' => false])));
+
+        $augmented = $field->augment([
+            ['type' => 'text', 'marks' => [['type' => 'link', 'attrs' => ['href' => 'statamic://entry::123-fr?foo=bar#section']]], 'text' => 'The One'],
+        ]);
+
+        $this->assertEquals('<a href="/fr/blog/one-fr?foo=bar#section">The One</a>', $augmented);
+    }
+
+    #[Test]
+    public function it_preserves_appends_on_entry_links_with_select_across_sites()
+    {
+        $this->setSites([
+            'en' => ['url' => 'http://localhost/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://localhost/fr/', 'locale' => 'fr'],
+        ]);
+
+        Facades\Site::setCurrent('en');
+
+        tap(Facades\Collection::make('blog')->routes('blog/{slug}'))->sites(['en', 'fr'])->save();
+
+        EntryFactory::id('parent')->collection('blog')->slug('theparent')->id(123)->locale('en')->create();
+        EntryFactory::id('123-fr')->origin('123')->locale('fr')->collection('blog')->slug('one-fr')->data(['title' => 'Le One'])->create();
+
+        $field = (new Bard)->setField(new Field('test', array_merge(['type' => 'bard'], ['select_across_sites' => true])));
+
+        $augmented = $field->augment([
+            ['type' => 'text', 'marks' => [['type' => 'link', 'attrs' => ['href' => 'statamic://entry::123-fr?foo=bar#section']]], 'text' => 'The One'],
+        ]);
+
+        $this->assertEquals('<a href="http://localhost/fr/blog/one-fr?foo=bar#section">The One</a>', $augmented);
+    }
+
+    #[Test]
+    public function it_gets_link_data_with_appends()
+    {
+        $this->actingAs(tap(Facades\User::make()->makeSuper())->save());
+
+        tap(Facades\Collection::make('pages')->routes('/{slug}'))->save();
+        EntryFactory::collection('pages')->id('1')->slug('about')->data(['title' => 'About'])->create();
+
+        $bard = $this->bard(['save_html' => true, 'sets' => null]);
+
+        $html = '<p><a href="statamic://entry::1?foo=bar#section">Link with appends</a></p>';
+
+        $prosemirror = (new Augmentor($this))->renderHtmlToProsemirror($html)['content'];
+
+        $linkData = $bard->getLinkData($prosemirror);
+
+        $this->assertEquals(['entry::1'], array_keys($linkData));
+        $this->assertEquals('About', $linkData['entry::1']['title']);
+    }
+
+    #[Test]
+    public function it_resolves_a_custom_link_type()
+    {
+        Link::extend('bard-test-custom', TestCustomLinkType::class);
+
+        $field = (new Bard)->setField(new Field('test', ['type' => 'bard']));
+
+        $augmented = $field->augment([
+            ['type' => 'text', 'marks' => [['type' => 'link', 'attrs' => ['href' => 'statamic://bard-test-custom::valid']]], 'text' => 'Link'],
+        ]);
+
+        $this->assertEquals('<a href="https://example.com/custom/valid">Link</a>', $augmented);
+    }
+
+    #[Test]
+    public function it_resolves_a_missing_custom_link_type_reference_to_an_empty_href()
+    {
+        Link::extend('bard-test-custom', TestCustomLinkType::class);
+
+        $field = (new Bard)->setField(new Field('test', ['type' => 'bard']));
+
+        $augmented = $field->augment([
+            ['type' => 'text', 'marks' => [['type' => 'link', 'attrs' => ['href' => 'statamic://bard-test-custom::missing']]], 'text' => 'Link'],
+        ]);
+
+        $this->assertEquals('<a>Link</a>', $augmented);
+    }
+
+    #[Test]
+    public function it_gets_link_data_for_a_custom_link_type()
+    {
+        TestCustomLinkFieldtype::register();
+        Link::extend('bard-test-custom', TestCustomLinkType::class);
+
+        $bard = $this->bard(['save_html' => true, 'sets' => null]);
+
+        $html = '<p><a href="statamic://bard-test-custom::valid">Custom Link</a></p>';
+
+        $prosemirror = (new Augmentor($this))->renderHtmlToProsemirror($html)['content'];
+
+        $linkData = $bard->getLinkData($prosemirror);
+
+        $this->assertEquals(['bard-test-custom::valid'], array_keys($linkData));
+        $this->assertEquals('Custom Title', $linkData['bard-test-custom::valid']['title']);
+    }
+
+    #[Test]
+    public function it_includes_visible_custom_link_types_in_preload()
+    {
+        TestCustomLinkFieldtype::register();
+        Link::extend('bard-test-custom', TestCustomLinkType::class);
+
+        $linkTypes = $this->bard()->preload()['linkTypes'];
+
+        $this->assertArrayHasKey('bard-test-custom', $linkTypes);
+        $this->assertEquals('Custom Type', $linkTypes['bard-test-custom']['title']);
+    }
+
+    #[Test]
+    public function it_excludes_non_visible_custom_link_types_from_preload()
+    {
+        TestCustomLinkFieldtype::register();
+        Link::extend('bard-test-hidden', TestHiddenLinkType::class);
+
+        $this->assertArrayNotHasKey('bard-test-hidden', $this->bard()->preload()['linkTypes']);
+    }
+
     private function bard($config = [])
     {
         return (new Bard)->setField(new Field('test', array_merge(['type' => 'bard', 'sets' => ['one' => []]], $config)));
@@ -1375,3 +1596,50 @@ private function groupSets($shouldGroup, $sets)
         ];
     }
 }
+
+class TestCustomLinkType extends LinkType
+{
+    protected ?string $icon = 'test-icon';
+    protected static ?string $title = 'Custom Type';
+
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        return $id === 'valid' ? 'https://example.com/custom/'.$id : null;
+    }
+
+    public function fieldtype(Field $field): ?array
+    {
+        return ['type' => 'test_custom_link'];
+    }
+}
+
+class TestHiddenLinkType extends LinkType
+{
+    protected ?string $icon = 'test-icon';
+    protected static ?string $title = 'Hidden Type';
+
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        return null;
+    }
+
+    public function fieldtype(Field $field): ?array
+    {
+        return ['type' => 'text'];
+    }
+
+    public function visible(Field $field): bool
+    {
+        return false;
+    }
+}
+
+class TestCustomLinkFieldtype extends Fieldtype
+{
+    public static $handle = 'test_custom_link';
+
+    public function preload()
+    {
+        return ['data' => [['title' => 'Custom Title']]];
+    }
+}
diff --git a/tests/Fieldtypes/CheckboxesTest.php b/tests/Fieldtypes/CheckboxesTest.php
index ef5841a30c0..c7ee59050ff 100644
--- a/tests/Fieldtypes/CheckboxesTest.php
+++ b/tests/Fieldtypes/CheckboxesTest.php
@@ -24,4 +24,15 @@ public function it_filters_out_nulls()
         $this->assertSame(['foo', 'bar'], $this->field([])->process(['foo', null, 'bar']));
         $this->assertSame(['foo', 'bar'], $this->field([])->preProcessValidatable(['foo', null, 'bar']));
     }
+
+    #[Test]
+    public function it_migrates_the_legacy_inline_config_to_appearance()
+    {
+        $ft = new Checkboxes;
+
+        $this->assertSame(['appearance' => 'inline'], $ft->migrateConfig(['inline' => true]));
+        $this->assertSame([], $ft->migrateConfig(['inline' => false]));
+        $this->assertSame(['appearance' => 'chips'], $ft->migrateConfig(['appearance' => 'chips', 'inline' => true]));
+        $this->assertSame(['appearance' => 'default'], $ft->migrateConfig(['appearance' => 'default']));
+    }
 }
diff --git a/tests/Fieldtypes/CodeTest.php b/tests/Fieldtypes/CodeTest.php
index 4312aa46507..33765fee6fe 100644
--- a/tests/Fieldtypes/CodeTest.php
+++ b/tests/Fieldtypes/CodeTest.php
@@ -48,6 +48,46 @@ public static function preProcessValuesProvider()
         ];
     }
 
+    #[Test]
+    #[DataProvider('preProcessValidatableValuesProvider')]
+    public function it_preprocesses_validatable_values($value, $expected)
+    {
+        $field = (new Code)->setField(new Field('test', ['type' => 'code']));
+
+        $this->assertEquals($expected, $field->preProcessValidatable($value));
+    }
+
+    public static function preProcessValidatableValuesProvider()
+    {
+        return [
+            'string' => ['bar', 'bar'],
+            'null' => [null, null],
+            'array with code' => [['code' => 'bar', 'mode' => 'htmlmixed'], 'bar'],
+            'array without code' => [['code' => null, 'mode' => 'htmlmixed'], null],
+        ];
+    }
+
+    #[Test]
+    public function required_rule_fails_on_an_empty_code_field()
+    {
+        $fields = (new \Statamic\Fields\Fields)->setItems([[
+            'handle' => 'test',
+            'field' => ['type' => 'code', 'validate' => ['required']],
+        ]]);
+
+        $empty = (new \Statamic\Fields\Validator)->fields(
+            $fields->addValues(['test' => ['code' => null, 'mode' => 'application/ld+json']])
+        );
+
+        $this->assertFalse($empty->validator()->passes());
+
+        $filled = (new \Statamic\Fields\Validator)->fields(
+            $fields->addValues(['test' => ['code' => 'bar', 'mode' => 'application/ld+json']])
+        );
+
+        $this->assertTrue($filled->validator()->passes());
+    }
+
     #[Test]
     public function it_doesnt_do_any_preprocessing_for_config()
     {
diff --git a/tests/Fieldtypes/DateTest.php b/tests/Fieldtypes/DateTest.php
index bbb49a4e2e0..b0050887beb 100644
--- a/tests/Fieldtypes/DateTest.php
+++ b/tests/Fieldtypes/DateTest.php
@@ -214,6 +214,36 @@ public static function processProvider()
                 ['start' => '2012-08-29T00:00:00Z', 'end' => '2013-09-27T23:59:00Z'],
                 ['start' => '2012-08-28 20:00', 'end' => '2013-09-27 19:59'],
             ],
+            'date-only format' => [
+                'UTC',
+                ['format' => 'Y-m-d'],
+                '2012-08-29',
+                '2012-08-29',
+            ],
+            'date-only format in a different timezone' => [
+                'America/New_York',
+                ['format' => 'Y-m-d'],
+                '2012-08-29',
+                '2012-08-29',
+            ],
+            'date-only custom format' => [
+                'UTC',
+                ['format' => 'Y--m--d'],
+                '2012-08-29',
+                '2012--08--29',
+            ],
+            'date-only format range' => [
+                'UTC',
+                ['mode' => 'range', 'format' => 'Y-m-d'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27'],
+            ],
+            'date-only format range in a different timezone' => [
+                'America/New_York',
+                ['mode' => 'range', 'format' => 'Y-m-d'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27'],
+            ],
         ];
     }
 
@@ -294,6 +324,30 @@ public static function preProcessProvider()
                 '2012-08-29 13:43',
                 '2012-08-29T17:43:00.000Z',
             ],
+            'date-only format' => [
+                'UTC',
+                ['format' => 'Y-m-d'],
+                '2012-08-29',
+                '2012-08-29',
+            ],
+            'date-only format in a different timezone' => [
+                'America/New_York',
+                ['format' => 'Y-m-d'],
+                '2012-08-29',
+                '2012-08-29',
+            ],
+            'date-only format in a positive offset timezone' => [
+                'Australia/Sydney',
+                ['format' => 'Y-m-d'],
+                '2012-08-29',
+                '2012-08-29',
+            ],
+            'date-only custom format' => [
+                'America/New_York',
+                ['format' => 'Y--m--d'],
+                '2012--08--29',
+                '2012-08-29',
+            ],
             'null range' => [
                 'UTC',
                 ['mode' => 'range'],
@@ -318,6 +372,18 @@ public static function preProcessProvider()
                 ['start' => '2012-08-29 00:00', 'end' => '2013-09-27 23:59'],
                 ['start' => '2012-08-29T04:00:00.000Z', 'end' => '2013-09-28T03:59:00.000Z'],
             ],
+            'date-only format range' => [
+                'UTC',
+                ['mode' => 'range', 'format' => 'Y-m-d'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27'],
+            ],
+            'date-only format range in a different timezone' => [
+                'America/New_York',
+                ['mode' => 'range', 'format' => 'Y-m-d'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27'],
+            ],
             'range where single date has been provided' => [
                 'UTC',
                 // e.g. If it was once a non-range field.
@@ -326,11 +392,11 @@ public static function preProcessProvider()
                 '2012-08-29',
                 ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2012-08-29T23:59:59.999Z'],
             ],
-            'range where single date has been provided with custom format' => [
+            'range where single date has been provided with date-only custom format' => [
                 'UTC',
                 ['mode' => 'range', 'format' => 'Y--m--d'],
                 '2012--08--29',
-                ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2012-08-29T23:59:59.999Z'],
+                ['start' => '2012-08-29', 'end' => '2012-08-29'],
             ],
             'date where range has been provided' => [
                 'UTC',
@@ -370,37 +436,37 @@ public static function preProcessIndexProvider()
                 'UTC',
                 [],
                 '2012-08-29 00:00',
-                ['date' => '2012-08-29T00:00:00.000Z', 'mode' => 'single', 'time_enabled' => false],
+                ['date' => '2012-08-29T00:00:00.000Z', 'mode' => 'single', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'date with custom format' => [
                 'UTC',
                 ['format' => 'Y--m--d H/i'],
                 '2012--08--29 00/00',
-                ['date' => '2012-08-29T00:00:00.000Z', 'mode' => 'single', 'time_enabled' => false],
+                ['date' => '2012-08-29T00:00:00.000Z', 'mode' => 'single', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'date in a different timezone' => [
                 'America/New_York', // -0400
                 [],
                 '2012-08-29 00:00',
-                ['date' => '2012-08-29T04:00:00.000Z', 'mode' => 'single', 'time_enabled' => false],
+                ['date' => '2012-08-29T04:00:00.000Z', 'mode' => 'single', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'date with time' => [
                 'UTC',
                 ['time_enabled' => true],
                 '2012-08-29 13:43',
-                ['date' => '2012-08-29T13:43:00.000Z', 'mode' => 'single', 'time_enabled' => true],
+                ['date' => '2012-08-29T13:43:00.000Z', 'mode' => 'single', 'time_enabled' => true, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'date with time and custom format' => [
                 'UTC',
                 ['time_enabled' => true, 'format' => 'Y--m--d H:i'],
                 '2012--08--29 13:43',
-                ['date' => '2012-08-29T13:43:00.000Z', 'mode' => 'single', 'time_enabled' => true],
+                ['date' => '2012-08-29T13:43:00.000Z', 'mode' => 'single', 'time_enabled' => true, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'date with time in a different timezone' => [
                 'America/New_York', // -0400
                 ['time_enabled' => true],
                 '2012-08-29 13:43',
-                ['date' => '2012-08-29T17:43:00.000Z', 'mode' => 'single', 'time_enabled' => true],
+                ['date' => '2012-08-29T17:43:00.000Z', 'mode' => 'single', 'time_enabled' => true, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'null range' => [
                 'UTC',
@@ -412,19 +478,19 @@ public static function preProcessIndexProvider()
                 'UTC',
                 ['mode' => 'range'],
                 ['start' => '2012-08-29 00:00', 'end' => '2013-09-27 00:00'],
-                ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2013-09-27T00:00:00.000Z', 'mode' => 'range', 'time_enabled' => false],
+                ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2013-09-27T00:00:00.000Z', 'mode' => 'range', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'range with custom format' => [
                 'UTC',
                 ['mode' => 'range', 'format' => 'Y--m--d H/i'],
                 ['start' => '2012--08--29 00/00', 'end' => '2013--09--27 00/00'],
-                ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2013-09-27T00:00:00.000Z', 'mode' => 'range', 'time_enabled' => false],
+                ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2013-09-27T00:00:00.000Z', 'mode' => 'range', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'range in a different timezone' => [
                 'America/New_York', // -4000
                 ['mode' => 'range'],
                 ['start' => '2012-08-29 00:00', 'end' => '2013-09-27 00:00'],
-                ['start' => '2012-08-29T04:00:00.000Z', 'end' => '2013-09-27T04:00:00.000Z', 'mode' => 'range', 'time_enabled' => false],
+                ['start' => '2012-08-29T04:00:00.000Z', 'end' => '2013-09-27T04:00:00.000Z', 'mode' => 'range', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'range where single date has been provided' => [
                 // e.g. If it was once a non-range field.
@@ -432,32 +498,56 @@ public static function preProcessIndexProvider()
                 'UTC',
                 ['mode' => 'range'],
                 '2012-08-29',
-                ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2012-08-29T00:00:00.000Z', 'mode' => 'range', 'time_enabled' => false],
+                ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2012-08-29T00:00:00.000Z', 'mode' => 'range', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'range where single date has been provided with custom format' => [
                 'UTC',
                 ['mode' => 'range', 'format' => 'Y--m--d H/i'],
                 '2012--08--29 00/00',
-                ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2012-08-29T00:00:00.000Z', 'mode' => 'range', 'time_enabled' => false],
+                ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2012-08-29T00:00:00.000Z', 'mode' => 'range', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'date where range has been provided' => [
                 // e.g. If it was once a range field. Use the start date.
                 'UTC',
                 [],
                 ['start' => '2012-08-29 00:00', 'end' => '2013-09-27 00:00'],
-                ['date' => '2012-08-29T00:00:00.000Z', 'mode' => 'single', 'time_enabled' => false],
+                ['date' => '2012-08-29T00:00:00.000Z', 'mode' => 'single', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'date where range has been provided with custom format' => [
                 'UTC',
                 ['format' => 'Y--m--d H/i'],
                 ['start' => '2012--08--29 00/00', 'end' => '2013--09--27 00/00'],
-                ['date' => '2012-08-29T00:00:00.000Z', 'mode' => 'single', 'time_enabled' => false],
+                ['date' => '2012-08-29T00:00:00.000Z', 'mode' => 'single', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => true],
             ],
             'range where time has been enabled' => [
                 'UTC',
                 ['mode' => 'range', 'time_enabled' => true],
                 ['start' => '2012-08-29 00:00', 'end' => '2013-09-27 00:00'],
-                ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2013-09-27T00:00:00.000Z', 'mode' => 'range', 'time_enabled' => true],
+                ['start' => '2012-08-29T00:00:00.000Z', 'end' => '2013-09-27T00:00:00.000Z', 'mode' => 'range', 'time_enabled' => true, 'timezone' => 'auto', 'format_has_time' => true],
+            ],
+            'date-only format' => [
+                'UTC',
+                ['format' => 'Y-m-d'],
+                '2012-08-29',
+                ['date' => '2012-08-29', 'mode' => 'single', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => false],
+            ],
+            'date-only format in a different timezone' => [
+                'America/New_York',
+                ['format' => 'Y-m-d'],
+                '2012-08-29',
+                ['date' => '2012-08-29', 'mode' => 'single', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => false],
+            ],
+            'date-only format range' => [
+                'UTC',
+                ['mode' => 'range', 'format' => 'Y-m-d'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27', 'mode' => 'range', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => false],
+            ],
+            'date-only format range in a different timezone' => [
+                'America/New_York',
+                ['mode' => 'range', 'format' => 'Y-m-d'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27'],
+                ['start' => '2012-08-29', 'end' => '2013-09-27', 'mode' => 'range', 'time_enabled' => false, 'timezone' => 'auto', 'format_has_time' => false],
             ],
         ];
     }
@@ -603,6 +693,16 @@ public static function validationProvider()
                 '2024-01-29',
                 ['Not a valid date.'],
             ],
+            'valid date-only format' => [
+                ['format' => 'Y-m-d'],
+                '2024-01-29',
+                [],
+            ],
+            'invalid date-only format' => [
+                ['format' => 'Y-m-d'],
+                'marchtember oneteenth',
+                ['Not a valid date.'],
+            ],
             'ridiculous invalid date format' => [
                 [],
                 'marchtember oneteenth',
@@ -681,6 +781,61 @@ public static function validationProvider()
         ];
     }
 
+    #[Test]
+    public function it_preloads_auto_timezone_by_default()
+    {
+        $this->assertEquals('auto', $this->fieldtype()->preload()['timezone']);
+    }
+
+    #[Test]
+    public function it_preloads_per_field_timezone()
+    {
+        $this->assertEquals(
+            'America/New_York',
+            $this->fieldtype(['timezone' => 'America/New_York'])->preload()['timezone']
+        );
+    }
+
+    #[Test]
+    public function it_preloads_cp_default_timezone_when_no_per_field_timezone()
+    {
+        config()->set('statamic.cp.default_timezone', 'Europe/London');
+
+        $this->assertEquals('Europe/London', $this->fieldtype()->preload()['timezone']);
+    }
+
+    #[Test]
+    public function per_field_timezone_takes_precedence_over_cp_default()
+    {
+        config()->set('statamic.cp.default_timezone', 'Europe/London');
+
+        $this->assertEquals(
+            'America/New_York',
+            $this->fieldtype(['timezone' => 'America/New_York'])->preload()['timezone']
+        );
+    }
+
+    #[Test]
+    public function it_preloads_auto_when_cp_default_timezone_is_auto()
+    {
+        config()->set('statamic.cp.default_timezone', 'auto');
+
+        $this->assertEquals('auto', $this->fieldtype()->preload()['timezone']);
+    }
+
+    #[Test]
+    public function it_includes_timezone_in_config_field_items()
+    {
+        $fieldtype = $this->fieldtype();
+        $configFields = (new \ReflectionMethod($fieldtype, 'configFieldItems'))->invoke($fieldtype);
+
+        $dateTimeSection = collect($configFields)->firstWhere('display', __('Date & Time'));
+
+        $this->assertArrayHasKey('timezone', $dateTimeSection['fields']);
+        $this->assertEquals('dictionary', $dateTimeSection['fields']['timezone']['type']);
+        $this->assertEquals('timezones', $dateTimeSection['fields']['timezone']['dictionary']);
+    }
+
     public function fieldtype($config = [])
     {
         $field = new Field('test', array_replace([
diff --git a/tests/Fieldtypes/DictionaryTest.php b/tests/Fieldtypes/DictionaryTest.php
index c0ce886afda..ba8351fdcc4 100644
--- a/tests/Fieldtypes/DictionaryTest.php
+++ b/tests/Fieldtypes/DictionaryTest.php
@@ -6,14 +6,19 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Dictionaries\Countries;
+use Statamic\Dictionaries\Dictionary;
 use Statamic\Dictionaries\Item;
 use Statamic\Exceptions\DictionaryNotFoundException;
 use Statamic\Exceptions\UndefinedDictionaryException;
+use Statamic\Facades\User;
 use Statamic\Fields\Field;
+use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
 class DictionaryTest extends TestCase
 {
+    use PreventSavingStacheItemsToDisk;
+
     #[Test]
     #[DataProvider('dictionaryConfigProvider')]
     public function it_gets_the_dictionary($dictionaryConfig, $expectedConfig)
@@ -91,7 +96,7 @@ public function it_returns_preload_data()
         $preload = $fieldtype->preload();
 
         $this->assertArraySubset([
-            'url' => 'http://localhost/cp/fieldtypes/dictionaries/countries',
+            'url' => 'http://localhost/!/fieldtypes/dictionaries/countries',
             'selectedOptions' => [
                 ['value' => 'USA', 'label' => '🇺🇸 United States', 'invalid' => false],
                 ['value' => 'AUS', 'label' => '🇦🇺 Australia', 'invalid' => false],
@@ -103,6 +108,64 @@ public function it_returns_preload_data()
         ], $preload);
     }
 
+    #[Test]
+    public function a_guest_can_request_options_from_a_dictionary_that_allows_public_access()
+    {
+        $this
+            ->getJson($this->optionsUrl('countries'))
+            ->assertOk()
+            ->assertJsonStructure(['data' => [['key', 'value']]]);
+    }
+
+    #[Test]
+    public function a_guest_cannot_request_options_from_a_dictionary_that_does_not_allow_public_access()
+    {
+        RestrictedDictionary::register();
+
+        $this
+            ->getJson($this->optionsUrl('restricted'))
+            ->assertForbidden();
+    }
+
+    #[Test]
+    public function a_cp_user_can_request_options_from_a_dictionary_that_does_not_allow_public_access()
+    {
+        RestrictedDictionary::register();
+
+        $this
+            ->actingAs(User::make()->makeSuper())
+            ->getJson($this->optionsUrl('restricted'))
+            ->assertOk()
+            ->assertJsonStructure(['data' => [['key', 'value']]]);
+    }
+
+    #[Test]
+    public function a_request_with_a_missing_dictionary_is_rejected()
+    {
+        $config = base64_encode(json_encode(['type' => 'dictionary']));
+
+        $this
+            ->getJson(route('statamic.dictionary-fieldtype', 'countries').'?config='.$config)
+            ->assertNotFound();
+    }
+
+    #[Test]
+    public function a_request_with_an_unknown_dictionary_is_rejected()
+    {
+        $config = base64_encode(json_encode(['type' => 'dictionary', 'dictionary' => 'not_a_real_dictionary']));
+
+        $this
+            ->getJson(route('statamic.dictionary-fieldtype', 'countries').'?config='.$config)
+            ->assertNotFound();
+    }
+
+    private function optionsUrl(string $dictionary): string
+    {
+        $config = base64_encode(json_encode(['type' => 'dictionary', 'dictionary' => $dictionary]));
+
+        return route('statamic.dictionary-fieldtype', $dictionary).'?config='.$config;
+    }
+
     #[Test]
     public function it_augments_a_single_option()
     {
@@ -280,3 +343,18 @@ public function it_returns_extra_renderable_field_data()
         ], $extraRenderableFieldData);
     }
 }
+
+class RestrictedDictionary extends Dictionary
+{
+    protected static $handle = 'restricted';
+
+    public function options(?string $search = null): array
+    {
+        return ['foo' => 'Foo', 'bar' => 'Bar'];
+    }
+
+    public function get(string $key): ?Item
+    {
+        return new Item($key, $this->options()[$key], []);
+    }
+}
diff --git a/tests/Fieldtypes/GridTest.php b/tests/Fieldtypes/GridTest.php
index cb5d1e15536..97c0604f366 100644
--- a/tests/Fieldtypes/GridTest.php
+++ b/tests/Fieldtypes/GridTest.php
@@ -452,6 +452,39 @@ public function it_preloads_preprocessed_default_values()
         $this->assertSame($expected, $field->fieldtype()->preload()['defaults']);
     }
 
+    #[Test]
+    public function it_preloads_new_row_meta_using_the_default_values()
+    {
+        $this->partialMock(RowId::class, function (MockInterface $mock) {
+            $mock->shouldReceive('generate')->twice()->andReturn('random-string-1', 'random-string-2');
+        });
+
+        $field = (new Field('test', [
+            'type' => 'grid',
+            'fields' => [
+                ['handle' => 'nested', 'field' => [
+                    'type' => 'grid',
+                    'min_rows' => 2,
+                    'fields' => [
+                        ['handle' => 'words', 'field' => ['type' => 'text']],
+                    ],
+                ]],
+            ],
+        ]));
+
+        $preloaded = $field->fieldtype()->preload();
+
+        $this->assertEquals(
+            ['random-string-1', 'random-string-2'],
+            collect($preloaded['defaults']['nested'])->pluck('_id')->all()
+        );
+
+        $this->assertEquals(
+            ['random-string-1', 'random-string-2'],
+            array_keys($preloaded['new']['nested']['existing'])
+        );
+    }
+
     #[Test]
     public function it_augments()
     {
@@ -521,6 +554,17 @@ public function augment($value)
         ], collect($augmented)->toArray());
     }
 
+    #[Test]
+    public function it_has_add_row_config()
+    {
+        $configFields = collect((new \ReflectionMethod(Grid::class, 'configFieldItems'))->invoke(new Grid))
+            ->flatMap(fn ($section) => $section['fields']);
+
+        $this->assertSame('text', $configFields['add_row']['type']);
+        $this->assertSame('Add Row Label', $configFields['add_row']['display']);
+        $this->assertSame('Add Row', $configFields['add_row']['placeholder']);
+    }
+
     #[Test]
     public function it_converts_a_queryable_value()
     {
diff --git a/tests/Fieldtypes/HasSelectOptionsTests.php b/tests/Fieldtypes/HasSelectOptionsTests.php
index 849209c6f1c..fa655bf5482 100644
--- a/tests/Fieldtypes/HasSelectOptionsTests.php
+++ b/tests/Fieldtypes/HasSelectOptionsTests.php
@@ -58,4 +58,52 @@ public static function optionsProvider()
             ],
         ];
     }
+
+    #[Test]
+    #[DataProvider('preProcessIndexProvider')]
+    public function it_preprocesses_index_values($options, $value, $expected)
+    {
+        $field = $this->field(['options' => $options]);
+
+        $this->assertSame($expected, $field->preProcessIndex($value));
+    }
+
+    public static function preProcessIndexProvider()
+    {
+        return [
+            'list' => [
+                ['one', 'two', 'three'],
+                'two',
+                ['two'],
+            ],
+            'associative with labels' => [
+                ['one' => 'One', 'two' => 'Two', 'three' => 'Three'],
+                'two',
+                ['Two'],
+            ],
+            'associative without labels' => [
+                ['one' => null, 'two' => null, 'three' => null],
+                'two',
+                ['two'],
+            ],
+            'multidimensional with labels' => [
+                [
+                    ['key' => 'one', 'value' => 'One'],
+                    ['key' => 'two', 'value' => 'Two'],
+                    ['key' => 'three', 'value' => 'Three'],
+                ],
+                'two',
+                ['Two'],
+            ],
+            'multidimensional without labels' => [
+                [
+                    ['key' => 'one', 'value' => null],
+                    ['key' => 'two', 'value' => null],
+                    ['key' => 'three', 'value' => null],
+                ],
+                'two',
+                ['two'],
+            ],
+        ];
+    }
 }
diff --git a/tests/Fieldtypes/IconTest.php b/tests/Fieldtypes/IconTest.php
index c464446bf3a..102c8f2245a 100644
--- a/tests/Fieldtypes/IconTest.php
+++ b/tests/Fieldtypes/IconTest.php
@@ -27,6 +27,12 @@ public function it_accepts_svg_strings()
         $this->assertStringContainsString('<svg class="w-4 h-4"', $result);
     }
 
+    #[Test]
+    public function it_augments_a_missing_icon_to_null()
+    {
+        $this->assertNull($this->fieldtype()->augment('this-icon-does-not-exist'));
+    }
+
     private function fieldtype($config = [])
     {
         return (new Icon)->setField(new Field('test', array_merge(['type' => 'icon'], $config)));
diff --git a/tests/Fieldtypes/LinkTest.php b/tests/Fieldtypes/LinkTest.php
index 22fd36a01bc..fc94945d9e4 100644
--- a/tests/Fieldtypes/LinkTest.php
+++ b/tests/Fieldtypes/LinkTest.php
@@ -4,15 +4,29 @@
 
 use Facades\Statamic\Routing\ResolveRedirect;
 use Mockery;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Entries\Entry;
+use Statamic\Facades;
 use Statamic\Fields\ArrayableString;
 use Statamic\Fields\Field;
 use Statamic\Fieldtypes\Link;
+use Statamic\Fieldtypes\Link\LinkType;
+use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
 class LinkTest extends TestCase
 {
+    use PreventSavingStacheItemsToDisk;
+
+    public function tearDown(): void
+    {
+        parent::tearDown();
+
+        (new \ReflectionClass(Link::class))->setStaticPropertyValue('types', []);
+        (new \ReflectionClass(\Statamic\Fields\Fieldtype::class))->setStaticPropertyValue('extraConfigFields', []);
+    }
+
     #[Test]
     public function it_augments_string_to_string()
     {
@@ -88,4 +102,440 @@ public function it_augments_null_to_null()
         $this->assertNull($augmented->value());
         $this->assertEquals(['url' => null], $augmented->toArray());
     }
+
+    #[Test]
+    public function it_pre_processes_url_for_index()
+    {
+        $fieldtype = (new Link)->setField(new Field('test', ['type' => 'link']));
+
+        $this->assertEquals(
+            ['type' => 'url', 'url' => 'https://example.com', 'icon' => 'external-link'],
+            $fieldtype->preProcessIndex('https://example.com')
+        );
+    }
+
+    #[Test]
+    public function it_pre_processes_numeric_value_for_index()
+    {
+        $fieldtype = (new Link)->setField(new Field('test', ['type' => 'link']));
+
+        $this->assertEquals(
+            ['type' => 'url', 'url' => 404, 'icon' => 'external-link'],
+            $fieldtype->preProcessIndex('404')
+        );
+    }
+
+    #[Test]
+    public function it_pre_processes_entry_reference_for_index()
+    {
+        $entry = Mockery::mock(\Statamic\Contracts\Entries\Entry::class);
+        $entry->shouldReceive('url')->once()->andReturn('/the-entry-url');
+
+        Facades\Entry::shouldReceive('find')->with('entry-id')->once()->andReturn($entry);
+
+        $fieldtype = (new Link)->setField(new Field('test', ['type' => 'link']));
+
+        $this->assertEquals(
+            ['type' => 'entry', 'url' => '/the-entry-url', 'icon' => 'collections'],
+            $fieldtype->preProcessIndex('entry::entry-id')
+        );
+    }
+
+    #[Test]
+    public function it_pre_processes_asset_reference_for_index()
+    {
+        $asset = Mockery::mock(\Statamic\Contracts\Assets\Asset::class);
+        $asset->shouldReceive('url')->once()->andReturn('/assets/image.jpg');
+
+        Facades\Asset::shouldReceive('find')->with('main::image.jpg')->once()->andReturn($asset);
+
+        $fieldtype = (new Link)->setField(new Field('test', ['type' => 'link']));
+
+        $this->assertEquals(
+            ['type' => 'asset', 'url' => '/assets/image.jpg', 'icon' => 'assets'],
+            $fieldtype->preProcessIndex('asset::main::image.jpg')
+        );
+    }
+
+    #[Test]
+    public function it_pre_processes_entry_with_null_url_for_index()
+    {
+        $entry = Mockery::mock(\Statamic\Contracts\Entries\Entry::class);
+        $entry->shouldReceive('url')->once()->andReturnNull();
+
+        Facades\Entry::shouldReceive('find')->with('entry-id')->once()->andReturn($entry);
+
+        $fieldtype = (new Link)->setField(new Field('test', ['type' => 'link']));
+
+        $this->assertNull($fieldtype->preProcessIndex('entry::entry-id'));
+    }
+
+    #[Test]
+    public function it_pre_processes_missing_entry_reference_for_index()
+    {
+        Facades\Entry::shouldReceive('find')->with('missing-id')->once()->andReturnNull();
+
+        $fieldtype = (new Link)->setField(new Field('test', ['type' => 'link']));
+
+        $this->assertNull($fieldtype->preProcessIndex('entry::missing-id'));
+    }
+
+    #[Test]
+    public function it_pre_processes_missing_asset_reference_for_index()
+    {
+        Facades\Asset::shouldReceive('find')->with('main::missing.jpg')->once()->andReturnNull();
+
+        $fieldtype = (new Link)->setField(new Field('test', ['type' => 'link']));
+
+        $this->assertNull($fieldtype->preProcessIndex('asset::main::missing.jpg'));
+    }
+
+    #[Test]
+    public function it_pre_processes_first_child_for_index()
+    {
+        $child = Mockery::mock();
+        $child->shouldReceive('url')->once()->andReturn('/parent/child');
+
+        $pages = Mockery::mock();
+        $pages->shouldReceive('all')->once()->andReturn(collect([$child]));
+
+        $parent = Mockery::mock();
+        $parent->shouldReceive('isRoot')->once()->andReturn(false);
+        $parent->shouldReceive('pages')->once()->andReturn($pages);
+
+        $entry = Mockery::mock(\Statamic\Contracts\Entries\Entry::class);
+        $entry->shouldReceive('page')->once()->andReturn($parent);
+
+        $field = new Field('test', ['type' => 'link']);
+        $field->setParent($entry);
+        $fieldtype = (new Link)->setField($field);
+
+        $this->assertEquals(
+            ['type' => 'child', 'url' => '/parent/child', 'icon' => 'page'],
+            $fieldtype->preProcessIndex('@child')
+        );
+    }
+
+    #[Test]
+    public function it_pre_processes_first_child_for_index_when_parent_is_root()
+    {
+        $child = Mockery::mock();
+        $child->shouldReceive('url')->once()->andReturn('/first-child');
+
+        $tree = Mockery::mock();
+        $tree->shouldReceive('pages')->once()->andReturn($tree);
+        $tree->shouldReceive('all')->once()->andReturn(collect(['root-page', $child])->slice(0));
+
+        $parent = Mockery::mock();
+        $parent->shouldReceive('isRoot')->once()->andReturn(true);
+        $parent->shouldReceive('locale')->once()->andReturn('en');
+        $parent->shouldReceive('structure')->once()->andReturn($structure = Mockery::mock());
+        $structure->shouldReceive('in')->with('en')->once()->andReturn($tree);
+
+        $entry = Mockery::mock(\Statamic\Contracts\Entries\Entry::class);
+        $entry->shouldReceive('page')->once()->andReturn($parent);
+
+        $field = new Field('test', ['type' => 'link']);
+        $field->setParent($entry);
+        $fieldtype = (new Link)->setField($field);
+
+        $this->assertEquals(
+            ['type' => 'child', 'url' => '/first-child', 'icon' => 'page'],
+            $fieldtype->preProcessIndex('@child')
+        );
+    }
+
+    #[Test]
+    public function it_pre_processes_first_child_for_index_when_parent_is_not_an_entry()
+    {
+        $field = new Field('test', ['type' => 'link']);
+        $field->setParent(Mockery::mock());
+        $fieldtype = (new Link)->setField($field);
+
+        $this->assertNull($fieldtype->preProcessIndex('@child'));
+    }
+
+    #[Test]
+    public function it_pre_processes_first_child_for_index_when_no_children()
+    {
+        $pages = Mockery::mock();
+        $pages->shouldReceive('all')->once()->andReturn(collect());
+
+        $parent = Mockery::mock();
+        $parent->shouldReceive('isRoot')->once()->andReturn(false);
+        $parent->shouldReceive('pages')->once()->andReturn($pages);
+
+        $entry = Mockery::mock(\Statamic\Contracts\Entries\Entry::class);
+        $entry->shouldReceive('page')->once()->andReturn($parent);
+
+        $field = new Field('test', ['type' => 'link']);
+        $field->setParent($entry);
+        $fieldtype = (new Link)->setField($field);
+
+        $this->assertNull($fieldtype->preProcessIndex('@child'));
+    }
+
+    #[Test]
+    #[DataProvider('initialOptionProvider')]
+    public function it_preloads_the_initial_option(array $config, mixed $value, bool $withParent, mixed $expected)
+    {
+        $this->actingAs(tap(Facades\User::make()->makeSuper())->save());
+        tap(Facades\Collection::make('pages')->routes('{slug}'))->sites(['en'])->save();
+
+        $field = new Field('test', $config);
+        $field->setValue($value);
+
+        if ($withParent) {
+            $field->setParent(Mockery::mock());
+        }
+
+        $fieldtype = (new Link)->setField($field);
+
+        $this->assertSame($expected, $fieldtype->preload()['initialOption']);
+    }
+
+    public static function initialOptionProvider(): array
+    {
+        return [
+            'configured option is used' => [['type' => 'link', 'default_option' => 'entry'], null, false, 'entry'],
+            'url when required and no default option' => [['type' => 'link', 'required' => true], null, false, 'url'],
+            'null when optional and no default option' => [['type' => 'link'], null, false, null],
+            'first-child falls back to url when unavailable' => [['type' => 'link', 'default_option' => 'first-child', 'required' => true], null, true, 'url'],
+            'asset falls back to url when unavailable and required' => [['type' => 'link', 'default_option' => 'asset', 'required' => true], null, false, 'url'],
+            'asset falls back to null when unavailable and optional' => [['type' => 'link', 'default_option' => 'asset'], null, false, null],
+            'existing value overrides default option' => [['type' => 'link', 'default_option' => 'entry'], 'https://example.com', false, 'url'],
+            'null when has sometimes rule even if required' => [['type' => 'link', 'required' => true, 'validate' => 'sometimes'], null, false, null],
+        ];
+    }
+
+    #[Test]
+    public function it_registers_a_custom_link_type()
+    {
+        Link::extend('link-extend-test-basic', TestBasicLinkType::class);
+
+        $this->assertArrayHasKey('link-extend-test-basic', Link::types());
+
+        $type = Link::resolveType('link-extend-test-basic');
+
+        $this->assertInstanceOf(TestBasicLinkType::class, $type);
+        $this->assertEquals('link-extend-test-basic', $type->handle());
+        $this->assertEquals('Basic Test Type', $type->title());
+    }
+
+    #[Test]
+    public function it_appends_config_field_items_into_links_config_fields()
+    {
+        Link::extend('link-extend-test-config', TestConfigFieldsLinkType::class);
+
+        $fields = (new Link)->configFields();
+
+        $this->assertTrue($fields->has('link_extend_test_field'));
+        $this->assertEquals('text', $fields->get('link_extend_test_field')->type());
+    }
+
+    #[Test]
+    public function it_resolves_a_custom_type_through_resolve_redirect()
+    {
+        Link::extend('link-extend-test-resolve', TestResolvingLinkType::class);
+
+        $resolver = new \Statamic\Routing\ResolveRedirect;
+
+        $this->assertEquals('resolved:the-id', $resolver->item('link-extend-test-resolve::the-id'));
+    }
+
+    #[Test]
+    public function it_passes_parent_and_localize_through_to_resolve()
+    {
+        Link::extend('link-extend-test-context', TestContextCapturingLinkType::class);
+
+        $resolver = new \Statamic\Routing\ResolveRedirect;
+
+        $resolver->item('link-extend-test-context::the-id', 'some-parent', true);
+
+        $this->assertEquals(['the-id', 'some-parent', true], TestContextCapturingLinkType::$captured);
+    }
+
+    #[Test]
+    public function it_includes_a_custom_type_in_preload_when_visible()
+    {
+        $this->setUpRoutableCollection();
+
+        Link::extend('link-extend-test-visible', TestAlwaysVisibleLinkType::class);
+
+        $fieldtype = (new Link)->setField(new Field('test', ['type' => 'link']));
+
+        $types = $fieldtype->preload()['types'];
+
+        $this->assertArrayHasKey('link-extend-test-visible', $types);
+        $this->assertEquals('Always Visible', $types['link-extend-test-visible']['title']);
+    }
+
+    #[Test]
+    public function it_excludes_a_custom_type_from_preload_when_not_visible()
+    {
+        $this->setUpRoutableCollection();
+
+        Link::extend('link-extend-test-hidden', TestNeverVisibleLinkType::class);
+
+        $fieldtype = (new Link)->setField(new Field('test', ['type' => 'link']));
+
+        $this->assertArrayNotHasKey('link-extend-test-hidden', $fieldtype->preload()['types']);
+    }
+
+    #[Test]
+    public function it_excludes_a_custom_type_with_a_null_fieldtype_from_preload()
+    {
+        $this->setUpRoutableCollection();
+
+        Link::extend('link-extend-test-no-picker', TestNoPickerLinkType::class);
+
+        $fieldtype = (new Link)->setField(new Field('test', ['type' => 'link']));
+
+        $this->assertArrayNotHasKey('link-extend-test-no-picker', $fieldtype->preload()['types']);
+    }
+
+    #[Test]
+    public function it_includes_custom_type_and_icon_in_pre_process_index()
+    {
+        Link::extend('link-extend-test-index', TestIndexLinkType::class);
+
+        $fieldtype = (new Link)->setField(new Field('test', ['type' => 'link']));
+
+        $this->assertEquals(
+            ['type' => 'link-extend-test-index', 'url' => '/resolved-url', 'icon' => 'custom-icon'],
+            $fieldtype->preProcessIndex('link-extend-test-index::the-id')
+        );
+    }
+
+    private function setUpRoutableCollection(): void
+    {
+        $this->actingAs(tap(Facades\User::make()->makeSuper())->save());
+        tap(Facades\Collection::make('pages')->routes('{slug}'))->sites(['en'])->save();
+    }
+}
+
+class TestBasicLinkType extends LinkType
+{
+    protected static ?string $title = 'Basic Test Type';
+
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        return "resolved:{$id}";
+    }
+
+    public function fieldtype(Field $field): ?array
+    {
+        return ['type' => 'text'];
+    }
+}
+
+class TestConfigFieldsLinkType extends LinkType
+{
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        return null;
+    }
+
+    public function fieldtype(Field $field): ?array
+    {
+        return ['type' => 'text'];
+    }
+
+    public function configFieldItems(): array
+    {
+        return [
+            'link_extend_test_field' => ['type' => 'text'],
+        ];
+    }
+}
+
+class TestResolvingLinkType extends LinkType
+{
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        return "resolved:{$id}";
+    }
+
+    public function fieldtype(Field $field): ?array
+    {
+        return null;
+    }
+}
+
+class TestContextCapturingLinkType extends LinkType
+{
+    public static $captured;
+
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        static::$captured = [$id, $parent, $localize];
+
+        return null;
+    }
+
+    public function fieldtype(Field $field): ?array
+    {
+        return null;
+    }
+}
+
+class TestAlwaysVisibleLinkType extends LinkType
+{
+    protected static ?string $title = 'Always Visible';
+
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        return null;
+    }
+
+    public function fieldtype(Field $field): ?array
+    {
+        return ['type' => 'text'];
+    }
+}
+
+class TestNeverVisibleLinkType extends LinkType
+{
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        return null;
+    }
+
+    public function fieldtype(Field $field): ?array
+    {
+        return ['type' => 'text'];
+    }
+
+    public function visible(Field $field): bool
+    {
+        return false;
+    }
+}
+
+class TestNoPickerLinkType extends LinkType
+{
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        return null;
+    }
+
+    public function fieldtype(Field $field): ?array
+    {
+        return null;
+    }
+}
+
+class TestIndexLinkType extends LinkType
+{
+    protected ?string $icon = 'custom-icon';
+
+    public function resolve(string $id, $parent = null, bool $localize = false): mixed
+    {
+        return '/resolved-url';
+    }
+
+    public function fieldtype(Field $field): ?array
+    {
+        return null;
+    }
 }
diff --git a/tests/Fieldtypes/ListTest.php b/tests/Fieldtypes/ListTest.php
index 05d4c83bbf3..9b85cb74762 100644
--- a/tests/Fieldtypes/ListTest.php
+++ b/tests/Fieldtypes/ListTest.php
@@ -18,6 +18,17 @@ public function it_processes()
         );
     }
 
+    #[Test]
+    public function it_has_add_row_config()
+    {
+        $configFields = (new \ReflectionMethod(Lists::class, 'configFieldItems'))->invoke(new Lists);
+
+        $this->assertArrayHasKey('add_row', $configFields);
+        $this->assertSame('text', $configFields['add_row']['type']);
+        $this->assertSame('Add Item Label', $configFields['add_row']['display']);
+        $this->assertSame('Add Item', $configFields['add_row']['placeholder']);
+    }
+
     private function field($config = [])
     {
         $ft = new Lists;
diff --git a/tests/Fieldtypes/RadioTest.php b/tests/Fieldtypes/RadioTest.php
index e147acd5f85..ba5e9d74c8e 100644
--- a/tests/Fieldtypes/RadioTest.php
+++ b/tests/Fieldtypes/RadioTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Fieldtypes;
 
+use PHPUnit\Framework\Attributes\Test;
 use Statamic\Fields\Field;
 use Statamic\Fieldtypes\Radio;
 use Tests\TestCase;
@@ -16,4 +17,15 @@ private function field($config)
 
         return $ft->setField(new Field('test', array_merge($config, ['type' => $ft->handle()])));
     }
+
+    #[Test]
+    public function it_migrates_the_legacy_inline_config_to_appearance()
+    {
+        $ft = new Radio;
+
+        $this->assertSame(['appearance' => 'inline'], $ft->migrateConfig(['inline' => true]));
+        $this->assertSame([], $ft->migrateConfig(['inline' => false]));
+        $this->assertSame(['appearance' => 'chips'], $ft->migrateConfig(['appearance' => 'chips', 'inline' => true]));
+        $this->assertSame(['appearance' => 'default'], $ft->migrateConfig(['appearance' => 'default']));
+    }
 }
diff --git a/tests/Fieldtypes/RangeFieldtypeTest.php b/tests/Fieldtypes/RangeFieldtypeTest.php
new file mode 100644
index 00000000000..3bd52fcb4ef
--- /dev/null
+++ b/tests/Fieldtypes/RangeFieldtypeTest.php
@@ -0,0 +1,169 @@
+<?php
+
+namespace Tests\Fieldtypes;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Fields\Field;
+use Statamic\Fieldtypes\Range;
+use Tests\TestCase;
+
+class RangeFieldtypeTest extends TestCase
+{
+    #[Test]
+    public function it_processes_as_integer_with_integer_config()
+    {
+        $fieldtype = (new Range())->setField(new Field('test', [
+            'type' => 'range',
+            'min' => 0,
+            'max' => 100,
+            'step' => 1,
+        ]));
+
+        $result = $fieldtype->process('7');
+
+        $this->assertIsInt($result);
+        $this->assertEquals(7, $result);
+    }
+
+    #[Test]
+    public function it_processes_as_float_with_decimal_step()
+    {
+        $fieldtype = (new Range())->setField(new Field('test', [
+            'type' => 'range',
+            'min' => 0,
+            'max' => 100,
+            'step' => 0.1,
+        ]));
+
+        $result = $fieldtype->process('7.5');
+
+        $this->assertIsFloat($result);
+        $this->assertEquals(7.5, $result);
+    }
+
+    #[Test]
+    public function it_processes_as_float_with_decimal_min()
+    {
+        $fieldtype = (new Range())->setField(new Field('test', [
+            'type' => 'range',
+            'min' => 0.5,
+            'max' => 100,
+            'step' => 1,
+        ]));
+
+        $result = $fieldtype->process('7');
+
+        $this->assertIsFloat($result);
+        $this->assertEquals(7.0, $result);
+    }
+
+    #[Test]
+    public function it_processes_as_float_with_decimal_max()
+    {
+        $fieldtype = (new Range())->setField(new Field('test', [
+            'type' => 'range',
+            'min' => 0,
+            'max' => 99.9,
+            'step' => 1,
+        ]));
+
+        $result = $fieldtype->process('7');
+
+        $this->assertIsFloat($result);
+        $this->assertEquals(7.0, $result);
+    }
+
+    #[Test]
+    public function it_processes_zero_as_integer_with_integer_config()
+    {
+        $fieldtype = (new Range())->setField(new Field('test', [
+            'type' => 'range',
+            'min' => 0,
+            'max' => 100,
+            'step' => 1,
+        ]));
+
+        $result = $fieldtype->process('0');
+
+        $this->assertIsInt($result);
+        $this->assertEquals(0, $result);
+    }
+
+    #[Test]
+    public function it_processes_negative_values_with_decimal_step()
+    {
+        $fieldtype = (new Range())->setField(new Field('test', [
+            'type' => 'range',
+            'min' => -10,
+            'max' => 10,
+            'step' => 0.5,
+        ]));
+
+        $result = $fieldtype->process('-2.5');
+
+        $this->assertIsFloat($result);
+        $this->assertEquals(-2.5, $result);
+    }
+
+    #[Test]
+    public function it_processes_as_float_with_string_decimal_config()
+    {
+        $fieldtype = (new Range())->setField(new Field('test', [
+            'type' => 'range',
+            'min' => '0',
+            'max' => '100',
+            'step' => '0.5',
+        ]));
+
+        $result = $fieldtype->process('7.5');
+
+        $this->assertIsFloat($result);
+        $this->assertEquals(7.5, $result);
+    }
+
+    #[Test]
+    public function it_processes_as_integer_with_string_integer_config()
+    {
+        $fieldtype = (new Range())->setField(new Field('test', [
+            'type' => 'range',
+            'min' => '0',
+            'max' => '100',
+            'step' => '1',
+        ]));
+
+        $result = $fieldtype->process('7');
+
+        $this->assertIsInt($result);
+        $this->assertEquals(7, $result);
+    }
+
+    #[Test]
+    public function it_returns_int_graphql_type_with_integer_config()
+    {
+        $fieldtype = (new Range())->setField(new Field('test', [
+            'type' => 'range',
+            'min' => 0,
+            'max' => 100,
+            'step' => 1,
+        ]));
+
+        $type = $fieldtype->toGqlType();
+
+        $this->assertEquals('Int', $type->name);
+    }
+
+    #[Test]
+    public function it_returns_float_graphql_type_with_decimal_config()
+    {
+        $fieldtype = (new Range())->setField(new Field('test', [
+            'type' => 'range',
+            'min' => 0,
+            'max' => 100,
+            'step' => 0.1,
+        ]));
+
+        $type = $fieldtype->toGqlType();
+
+        $this->assertEquals('Float', $type->name);
+    }
+}
diff --git a/tests/Fieldtypes/ReplicatorTest.php b/tests/Fieldtypes/ReplicatorTest.php
index 50180a47722..ea15c10c54c 100644
--- a/tests/Fieldtypes/ReplicatorTest.php
+++ b/tests/Fieldtypes/ReplicatorTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Fieldtypes;
 
 use Facades\Statamic\Fields\FieldRepository;
+use Facades\Tests\Factories\EntryFactory;
 use Mockery\MockInterface;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
@@ -1182,6 +1183,55 @@ public function it_can_return_set_defaults_when_sets_are_stored_in_legacy_format
         ], $response->json('new'));
     }
 
+    #[Test]
+    public function fields_blink_cache_key_is_site_aware()
+    {
+        $this->setSites([
+            'en' => ['url' => 'http://localhost/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://localhost/fr/', 'locale' => 'fr'],
+        ]);
+
+        tap(Facades\Collection::make('pages')->routes('/{slug}')->sites(['en', 'fr']))->save();
+
+        $enEntry = EntryFactory::collection('pages')->slug('home')->locale('en')->create();
+        $frEntry = EntryFactory::collection('pages')->slug('accueil')->locale('fr')->create();
+
+        $fieldConfig = [
+            'type' => 'replicator',
+            'sets' => [
+                'text' => [
+                    'fields' => [
+                        ['handle' => 'words', 'field' => ['type' => 'text']],
+                    ],
+                ],
+            ],
+        ];
+
+        $enField = (new Field('content', $fieldConfig))->setParent($enEntry);
+        $enFields = $enField->fieldtype()->fields('text');
+
+        $frField = (new Field('content', $fieldConfig))->setParent($frEntry);
+        $frFields = $frField->fieldtype()->fields('text');
+
+        // Each locale must get its own Blink cache entry so the Fields instance
+        // carries the correct parent. Without the fix, $frFields would be the
+        // same cached object as $enFields (containing the en entry as parent).
+        $this->assertNotSame($enFields, $frFields);
+        $this->assertSame($enEntry, $enFields->all()->first()->parent());
+        $this->assertSame($frEntry, $frFields->all()->first()->parent());
+    }
+
+    #[Test]
+    public function it_has_button_label_config()
+    {
+        $configFields = collect((new \ReflectionMethod(Replicator::class, 'configFieldItems'))->invoke(new Replicator))
+            ->flatMap(fn ($section) => $section['fields']);
+
+        $this->assertSame('text', $configFields['button_label']['type']);
+        $this->assertSame('Add Set Label', $configFields['button_label']['display']);
+        $this->assertSame('Add Set', $configFields['button_label']['placeholder']);
+    }
+
     public static function groupedSetsProvider()
     {
         return [
diff --git a/tests/Fieldtypes/UserGroupsTest.php b/tests/Fieldtypes/UserGroupsTest.php
new file mode 100644
index 00000000000..ea4eb20405c
--- /dev/null
+++ b/tests/Fieldtypes/UserGroupsTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Tests\Fieldtypes;
+
+use Illuminate\Http\Request;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Statamic\Fields\Field;
+use Statamic\Fieldtypes\UserGroups;
+use Tests\FakesRoles;
+use Tests\FakesUserGroups;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class UserGroupsTest extends TestCase
+{
+    use FakesRoles;
+    use FakesUserGroups;
+    use PreventSavingStacheItemsToDisk;
+
+    #[Test]
+    public function it_returns_empty_index_items_without_assign_user_groups_permission()
+    {
+        $this->actingAs($this->cpUserWithPermissions(['access cp']));
+
+        $items = $this->fieldtype()->getIndexItems(new Request);
+
+        $this->assertTrue($items->isEmpty());
+    }
+
+    #[Test]
+    public function it_returns_groups_in_index_items_with_assign_user_groups_permission()
+    {
+        $this->setTestUserGroups(['editors' => []]);
+        $this->actingAs($this->cpUserWithPermissions(['access cp', 'assign user groups']));
+
+        $items = $this->fieldtype()->getIndexItems(new Request);
+
+        $this->assertContains('editors', $items->pluck('id'));
+    }
+
+    private function fieldtype()
+    {
+        return (new UserGroups)->setField(new Field('test', ['type' => 'user_groups']));
+    }
+
+    private function cpUserWithPermissions(array $permissions)
+    {
+        $this->setTestRoles(['test' => $permissions]);
+
+        return tap(User::make()->id(uniqid())->assignRole('test'))->save();
+    }
+}
diff --git a/tests/Fieldtypes/UserRolesTest.php b/tests/Fieldtypes/UserRolesTest.php
new file mode 100644
index 00000000000..d3afd330d95
--- /dev/null
+++ b/tests/Fieldtypes/UserRolesTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Tests\Fieldtypes;
+
+use Illuminate\Http\Request;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Statamic\Fields\Field;
+use Statamic\Fieldtypes\UserRoles;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class UserRolesTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    #[Test]
+    public function it_returns_empty_index_items_without_assign_roles_permission()
+    {
+        $this->actingAs($this->cpUserWithPermissions(['access cp']));
+
+        $items = $this->fieldtype()->getIndexItems(new Request);
+
+        $this->assertTrue($items->isEmpty());
+    }
+
+    #[Test]
+    public function it_returns_roles_in_index_items_with_assign_roles_permission()
+    {
+        $this->actingAs($this->cpUserWithPermissions(['access cp', 'assign roles']));
+
+        $items = $this->fieldtype()->getIndexItems(new Request);
+
+        $this->assertContains('editor', $items->pluck('id'));
+    }
+
+    private function fieldtype()
+    {
+        return (new UserRoles)->setField(new Field('test', ['type' => 'user_roles']));
+    }
+
+    private function cpUserWithPermissions(array $permissions)
+    {
+        $this->setTestRoles(['test' => $permissions, 'editor' => []]);
+
+        return tap(User::make()->id(uniqid())->assignRole('test'))->save();
+    }
+}
diff --git a/tests/Fieldtypes/UsersTest.php b/tests/Fieldtypes/UsersTest.php
index 41b82bbe9ef..6295e440f6f 100644
--- a/tests/Fieldtypes/UsersTest.php
+++ b/tests/Fieldtypes/UsersTest.php
@@ -60,6 +60,36 @@ public function it_augments_to_a_single_user_when_max_items_is_one()
         $this->assertEquals('one@domain.com', $augmented->email());
     }
 
+    #[Test]
+    public function it_augments_the_current_user_when_value_is_the_current_string()
+    {
+        $this->actingAs(Facades\User::find('123'));
+
+        $augmented = $this->fieldtype(['max_items' => 1])->augment('current');
+
+        $this->assertInstanceOf(User::class, $augmented);
+        $this->assertEquals('123', $augmented->id());
+    }
+
+    #[Test]
+    public function it_augments_the_current_user_to_a_query_builder_when_value_is_the_current_string()
+    {
+        $this->actingAs(Facades\User::find('123'));
+
+        $augmented = $this->fieldtype()->augment('current');
+
+        $this->assertInstanceOf(Builder::class, $augmented);
+        $this->assertEquals(['123'], $augmented->get()->map->id()->all());
+    }
+
+    #[Test]
+    public function it_augments_to_null_when_value_is_the_current_string_and_no_user_is_authenticated()
+    {
+        $augmented = $this->fieldtype(['max_items' => 1])->augment('current');
+
+        $this->assertNull($augmented);
+    }
+
     #[Test]
     public function it_shallow_augments_to_a_collection_of_users()
     {
@@ -99,15 +129,13 @@ public function it_shallow_augments_to_a_single_user_when_max_items_is_one()
     }
 
     #[Test]
-    public function it_hides_email_from_index_items_without_view_users_permission()
+    public function it_returns_empty_index_items_without_view_users_permission()
     {
         $this->actingAs($this->cpUserWithPermissions(['access cp']));
 
         $items = $this->fieldtype()->getIndexItems(new Request(['paginate' => false]));
-        $namelessUser = $items->firstWhere('id', '789');
 
-        $this->assertArrayNotHasKey('email', $namelessUser);
-        $this->assertEquals('789', $namelessUser['title']);
+        $this->assertTrue($items->isEmpty());
     }
 
     #[Test]
@@ -164,7 +192,6 @@ private function cpUserWithPermissions(array $permissions)
     private function getColumns(Users $fieldtype): array
     {
         $method = new \ReflectionMethod($fieldtype, 'getColumns');
-        $method->setAccessible(true);
 
         return $method->invoke($fieldtype);
     }
diff --git a/tests/Forms/CsvExporterTest.php b/tests/Forms/CsvExporterTest.php
new file mode 100644
index 00000000000..dc17528ffcc
--- /dev/null
+++ b/tests/Forms/CsvExporterTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Forms;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\Form;
+use Statamic\Facades\FormSubmission;
+use Statamic\Forms\Exporters\CsvExporter;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class CsvExporterTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    #[Test]
+    public function it_neutralizes_formula_injection_in_submission_values()
+    {
+        $blueprint = Blueprint::makeFromFields(['name' => ['type' => 'text']]);
+        Blueprint::shouldReceive('find')->with('forms.test')->andReturn($blueprint);
+
+        $form = tap(Form::make('test'))->save();
+        FormSubmission::make()->form($form)->data(['name' => '=1+1'])->save();
+
+        $csv = (new CsvExporter)->setForm($form)->setConfig([])->export();
+
+        $this->assertStringContainsString('\'=1+1', $csv);
+        $this->assertStringNotContainsString('"=1+1', $csv);
+    }
+}
diff --git a/tests/Forms/EmailTest.php b/tests/Forms/EmailTest.php
index 4f166be1d94..1efd59edf46 100644
--- a/tests/Forms/EmailTest.php
+++ b/tests/Forms/EmailTest.php
@@ -168,6 +168,70 @@ public function it_adds_data_to_the_view()
         $this->assertEquals('Statamic', (string) $email->viewData['company']['company_name']);
     }
 
+    #[Test]
+    public function it_escapes_submitted_values_in_the_automagic_email()
+    {
+        $formBlueprint = Blueprint::makeFromFields([
+            'name' => ['type' => 'text'],
+            'message' => ['type' => 'textarea'],
+
+            // The select/radio/checkboxes branches emit `label ?? value`, and the label
+            // falls back to the raw value when there's no matching option. The raw value
+            // is attacker-controlled, so it must be escaped. The option label is author
+            // controlled (it lives in the blueprint), so it's not really exploitable, but
+            // we escape it too for consistency. Both situations are asserted below.
+            'select_labelled' => ['type' => 'select', 'options' => ['a' => '<script>select-label</script>']],
+            'select_raw' => ['type' => 'select'],
+            'radio_labelled' => ['type' => 'radio', 'options' => ['b' => '<script>radio-label</script>']],
+            'radio_raw' => ['type' => 'radio'],
+            'checkboxes' => ['type' => 'checkboxes', 'options' => ['c' => '<script>checkbox-label</script>']],
+        ]);
+
+        BlueprintRepository::shouldReceive('find')->with('forms.test')->andReturn($formBlueprint);
+
+        $form = tap(Form::make('test'))->save();
+
+        $submission = $form->makeSubmission()->data([
+            'name' => '<img src=x onerror=alert(1)>',
+            'message' => "line one\n<script>alert(2)</script>",
+            'select_labelled' => 'a',
+            'select_raw' => '"><svg onload=alert(3)>',
+            'radio_labelled' => 'b',
+            'radio_raw' => '"><svg onload=alert(4)>',
+            'checkboxes' => ['c', '<b>raw-checkbox</b>'],
+        ]);
+
+        $email = new Email($submission, ['to' => 'test@test.com'], Site::default());
+
+        $body = $email->render();
+
+        // Attacker-controlled values are escaped, not emitted as live markup.
+        $assertEscaped = function ($raw, $escaped) use ($body) {
+            $this->assertStringNotContainsString($raw, $body);
+            $this->assertStringContainsString($escaped, $body);
+        };
+
+        // text / textarea
+        $assertEscaped('<img src=x onerror=alert(1)>', '&lt;img src=x onerror=alert(1)&gt;');
+        $assertEscaped('<script>alert(2)</script>', '&lt;script&gt;alert(2)&lt;/script&gt;');
+
+        // select — the author-controlled option label (sanitized for consistency) and
+        // the attacker-controlled raw fallback value.
+        $assertEscaped('<script>select-label</script>', '&lt;script&gt;select-label&lt;/script&gt;');
+        $assertEscaped('<svg onload=alert(3)>', '&lt;svg onload=alert(3)&gt;');
+
+        // radio — same, option label and raw fallback value.
+        $assertEscaped('<script>radio-label</script>', '&lt;script&gt;radio-label&lt;/script&gt;');
+        $assertEscaped('<svg onload=alert(4)>', '&lt;svg onload=alert(4)&gt;');
+
+        // checkboxes — same, option label and raw fallback value.
+        $assertEscaped('<script>checkbox-label</script>', '&lt;script&gt;checkbox-label&lt;/script&gt;');
+        $assertEscaped('<b>raw-checkbox</b>', '&lt;b&gt;raw-checkbox&lt;/b&gt;');
+
+        // Legitimate multiline text still renders line breaks.
+        $this->assertStringContainsString('line one<br', $body);
+    }
+
     #[Test]
     public function attachments_are_added()
     {
diff --git a/tests/Forms/SendEmailsTest.php b/tests/Forms/SendEmailsTest.php
index 0360d85f685..aafcf9f9b9c 100644
--- a/tests/Forms/SendEmailsTest.php
+++ b/tests/Forms/SendEmailsTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Forms;
 
 use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Storage;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Contracts\Forms\SubmissionRepository;
@@ -139,6 +140,34 @@ public function delete_attachments_job_only_saves_submission_when_enabled()
         $this->assertEmpty($submissions);
     }
 
+    #[Test]
+    public function delete_attachments_job_deletes_files_from_the_configured_disk_and_path()
+    {
+        config([
+            'statamic.system.file_uploads_disk' => 'uploads',
+            'statamic.system.file_uploads_path' => 'temp-uploads',
+        ]);
+
+        $localDisk = Storage::fake('local');
+        $uploadsDisk = Storage::fake('uploads');
+        $uploadsDisk->put('temp-uploads/1234567/file.txt', 'contents');
+        $localDisk->put('statamic/file-uploads/1234567/file.txt', 'contents');
+
+        $form = tap(FacadesForm::make('attachments_test')->email([
+            'from' => 'first@sender.com',
+            'to' => 'first@recipient.com',
+        ]))->save();
+
+        $form->blueprint()->ensureField('attachments', ['type' => 'files'])->save();
+
+        $submission = $form->makeSubmission()->data(['attachments' => ['1234567/file.txt']]);
+
+        (new DeleteTemporaryAttachments($submission))->handle();
+
+        $uploadsDisk->assertMissing('temp-uploads/1234567/file.txt');
+        $localDisk->assertExists('statamic/file-uploads/1234567/file.txt');
+    }
+
     #[Test]
     #[DataProvider('noEmailsProvider')]
     public function no_email_jobs_are_queued_if_none_are_configured($emailConfig)
diff --git a/tests/Git/GitTest.php b/tests/Git/GitTest.php
index 38c1a15b3f9..5facba3e872 100644
--- a/tests/Git/GitTest.php
+++ b/tests/Git/GitTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Git;
 
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Queue;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Console\Processes\Git as GitProcess;
@@ -252,13 +253,8 @@ public function it_shell_escapes_git_user_name_and_email()
 
         Git::commit('Message"; echo "deleting all your files now"; #');
 
-        $expectedUser = 'Jimmy\; echo deleting all your files now\; \# <jimmy@haxor.org\; echo deleting all your files now\; \#>';
-        $expectedMessage = 'Message\; echo deleting all your files now\; \#';
-
-        if (static::isRunningWindows()) {
-            $expectedUser = str_replace('\\', '^', $expectedUser);
-            $expectedMessage = str_replace('\\', '^', $expectedMessage);
-        }
+        $expectedUser = 'Jimmy; echo deleting all your files now; # <jimmy@haxor.org; echo deleting all your files now; #>';
+        $expectedMessage = 'Message; echo deleting all your files now; #';
 
         $lastCommit = $this->showLastCommit(base_path('content'));
 
@@ -400,6 +396,115 @@ public function it_dispatches_commit_job()
         Queue::assertPushed(\Statamic\Git\CommitJob::class, 1);
     }
 
+    #[Test]
+    public function it_only_dispatches_one_commit_job_at_a_time()
+    {
+        // ShouldBeUnique acquires its cache lock in Bus\Dispatcher before the job
+        // reaches the queue driver, so Queue::fake() still enforces uniqueness here.
+        Queue::fake();
+
+        Git::dispatchCommit();
+        Git::dispatchCommit();
+        Git::dispatchCommit();
+
+        Queue::assertPushed(\Statamic\Git\CommitJob::class, 1);
+    }
+
+    #[Test]
+    public function it_attributes_coalesced_commits_to_the_configured_user()
+    {
+        Cache::put('statamic-git-pending-saves', [
+            ['name' => 'Alice', 'email' => 'alice@example.com'],
+            ['name' => 'Bob', 'email' => 'bob@example.com'],
+        ]);
+
+        $user = User::make()->email('alice@example.com');
+
+        Git::shouldReceive('as')->with(null)->andReturnSelf()->once();
+        Git::shouldReceive('commit')->withArgs(function ($message) {
+            return str_contains($message, 'Entry saved')
+                && str_contains($message, 'Co-Authored-By: Alice <alice@example.com>')
+                && str_contains($message, 'Co-Authored-By: Bob <bob@example.com>');
+        })->once();
+
+        (new \Statamic\Git\CommitJob('Entry saved', $user))->handle();
+    }
+
+    #[Test]
+    public function it_attributes_non_coalesced_commits_to_the_authenticated_user()
+    {
+        Cache::put('statamic-git-pending-saves', [
+            ['name' => 'Alice', 'email' => 'alice@example.com'],
+        ]);
+
+        $user = User::make()->email('alice@example.com');
+
+        Git::shouldReceive('as')->with($user)->andReturnSelf()->once();
+        Git::shouldReceive('commit')->with('Entry saved')->once();
+
+        (new \Statamic\Git\CommitJob('Entry saved', $user))->handle();
+    }
+
+    #[Test]
+    public function it_adds_co_authored_by_trailers_for_coalesced_saves()
+    {
+        $this->files->put(base_path('content/collections/pages.yaml'), 'title: Pages Title Changed');
+
+        $message = "Content saved\n\nCo-Authored-By: Alice <alice@example.com>\nCo-Authored-By: Bob <bob@example.com>";
+
+        Git::commit($message);
+
+        $commit = $this->showLastCommit(base_path('content'));
+
+        $this->assertStringContainsString('Co-Authored-By: Alice <alice@example.com>', $commit);
+        $this->assertStringContainsString('Co-Authored-By: Bob <bob@example.com>', $commit);
+    }
+
+    #[Test]
+    public function it_deduplicates_co_authors_for_repeated_saves_by_the_same_user()
+    {
+        Cache::put('statamic-git-pending-saves', [
+            ['name' => 'Alice', 'email' => 'alice@example.com'],
+            ['name' => 'Alice', 'email' => 'alice@example.com'],
+            ['name' => 'Bob', 'email' => 'bob@example.com'],
+        ]);
+
+        $user = User::make()->email('alice@example.com');
+
+        Git::shouldReceive('as')->with(null)->andReturnSelf()->once();
+        Git::shouldReceive('commit')->withArgs(function ($message) {
+            return substr_count($message, 'Co-Authored-By:') === 2
+                && str_contains($message, 'Co-Authored-By: Alice <alice@example.com>')
+                && str_contains($message, 'Co-Authored-By: Bob <bob@example.com>');
+        })->once();
+
+        (new \Statamic\Git\CommitJob('Entry saved', $user))->handle();
+    }
+
+    #[Test]
+    public function it_wires_dispatch_to_co_authored_by_trailers_end_to_end()
+    {
+        Queue::fake();
+
+        $this->files->put(base_path('content/collections/pages.yaml'), 'title: Pages Title Changed');
+
+        $alice = User::make()->email('alice@example.com')->data(['name' => 'Alice'])->makeSuper();
+        $bob = User::make()->email('bob@example.com')->data(['name' => 'Bob'])->makeSuper();
+
+        $this->actingAs($alice);
+        Git::dispatchCommit();
+
+        $this->actingAs($bob);
+        Git::dispatchCommit(); // dropped by ShouldBeUnique, but Bob's save is still recorded in cache
+
+        (new \Statamic\Git\CommitJob(null, $alice))->handle();
+
+        $commit = $this->showLastCommit(base_path('content'));
+
+        $this->assertStringContainsString('Co-Authored-By: Alice <alice@example.com>', $commit);
+        $this->assertStringContainsString('Co-Authored-By: Bob <bob@example.com>', $commit);
+    }
+
     #[Test]
     public function it_doesnt_push_by_default()
     {
diff --git a/tests/Http/Middleware/DeleteTemporaryFileUploadsTest.php b/tests/Http/Middleware/DeleteTemporaryFileUploadsTest.php
new file mode 100644
index 00000000000..1784473b09f
--- /dev/null
+++ b/tests/Http/Middleware/DeleteTemporaryFileUploadsTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Http\Middleware;
+
+use Illuminate\Support\Facades\Date;
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Http\Middleware\DeleteTemporaryFileUploads;
+use Tests\TestCase;
+
+class DeleteTemporaryFileUploadsTest extends TestCase
+{
+    #[Test]
+    public function it_deletes_files_over_an_hour_old_from_the_configured_disk_and_path()
+    {
+        config([
+            'statamic.system.file_uploads_disk' => 'uploads',
+            'statamic.system.file_uploads_path' => 'temp-uploads',
+        ]);
+
+        $localDisk = Storage::fake('local');
+        $uploadsDisk = Storage::fake('uploads');
+
+        Date::setTestNow(now());
+
+        $oldTimestamp = now()->subHours(2)->timestamp;
+        $newTimestamp = now()->timestamp;
+
+        $uploadsDisk->put("temp-uploads/{$oldTimestamp}/old.txt", 'old');
+        $uploadsDisk->put("temp-uploads/{$newTimestamp}/new.txt", 'new');
+        $localDisk->put("statamic/file-uploads/{$oldTimestamp}/old.txt", 'old');
+
+        (new \ReflectionMethod(DeleteTemporaryFileUploads::class, 'deleteFilesOverAnHourOld'))
+            ->invoke(new DeleteTemporaryFileUploads);
+
+        $uploadsDisk->assertMissing("temp-uploads/{$oldTimestamp}/old.txt");
+        $uploadsDisk->assertExists("temp-uploads/{$newTimestamp}/new.txt");
+        $localDisk->assertExists("statamic/file-uploads/{$oldTimestamp}/old.txt");
+    }
+}
diff --git a/tests/Http/Middleware/HandleInertiaRequestsTest.php b/tests/Http/Middleware/HandleInertiaRequestsTest.php
new file mode 100644
index 00000000000..8dfd56eb5d8
--- /dev/null
+++ b/tests/Http/Middleware/HandleInertiaRequestsTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Tests\Http\Middleware;
+
+use Illuminate\Support\Facades\Route;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Statamic\Statamic;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class HandleInertiaRequestsTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    protected function resolveApplicationConfiguration($app)
+    {
+        parent::resolveApplicationConfiguration($app);
+
+        Statamic::pushCpRoutes(function () {
+            Route::get('streamed-download-test', function () {
+                return response()->streamDownload(fn () => print 'id,name', 'data.csv');
+            });
+
+            Route::get('file-download-test', function () {
+                return response()->download(__FILE__);
+            });
+
+            Route::get('empty-response-test', function () {
+                return response()->noContent(200);
+            });
+        });
+    }
+
+    #[Test]
+    public function it_converts_streamed_downloads_into_location_visits_for_inertia_requests()
+    {
+        // Inertia requests are made over XHR, which can't trigger downloads. Returning
+        // 409 + X-Inertia-Location makes the client do a full browser visit instead,
+        // which lets the browser handle the download natively.
+
+        $this
+            ->actingAs(User::make()->makeSuper())
+            ->get('/cp/streamed-download-test', ['X-Inertia' => 'true'])
+            ->assertStatus(409)
+            ->assertHeader('X-Inertia-Location', 'http://localhost/cp/streamed-download-test');
+    }
+
+    #[Test]
+    public function it_converts_file_downloads_into_location_visits_for_inertia_requests()
+    {
+        $this
+            ->actingAs(User::make()->makeSuper())
+            ->get('/cp/file-download-test', ['X-Inertia' => 'true'])
+            ->assertStatus(409)
+            ->assertHeader('X-Inertia-Location', 'http://localhost/cp/file-download-test');
+    }
+
+    #[Test]
+    public function it_leaves_downloads_untouched_for_non_inertia_requests()
+    {
+        $this
+            ->actingAs(User::make()->makeSuper())
+            ->get('/cp/streamed-download-test')
+            ->assertOk()
+            ->assertDownload('data.csv');
+    }
+
+    #[Test]
+    public function it_redirects_back_for_empty_inertia_responses()
+    {
+        $this
+            ->actingAs(User::make()->makeSuper())
+            ->from('/cp/utilities')
+            ->get('/cp/empty-response-test', ['X-Inertia' => 'true'])
+            ->assertRedirect('/cp/utilities');
+    }
+}
diff --git a/tests/Http/Middleware/StartSessionTest.php b/tests/Http/Middleware/StartSessionTest.php
new file mode 100644
index 00000000000..ff5454931f6
--- /dev/null
+++ b/tests/Http/Middleware/StartSessionTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Tests\Http\Middleware;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class StartSessionTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    #[Test]
+    public function hitting_the_session_timeout_route_does_not_extend_the_session()
+    {
+        $this->freezeTime();
+        $user = tap(User::make()->makeSuper())->save();
+
+        $this->actingAs($user)->get(cp_route('elevated-session.status'))->assertOk();
+        $this->assertEquals(now()->timestamp, session('last_activity'));
+
+        $this->travel(30)->seconds();
+
+        $this->actingAs($user)->get(cp_route('session.timeout'))->assertOk();
+        $this->assertNotEquals(now()->timestamp, session('last_activity'));
+    }
+
+    #[Test]
+    public function hitting_the_token_route_does_not_extend_the_session()
+    {
+        $this->freezeTime();
+        $user = tap(User::make()->makeSuper())->save();
+
+        $this->actingAs($user)->get(cp_route('elevated-session.status'))->assertOk();
+        $this->assertEquals(now()->timestamp, session('last_activity'));
+
+        $this->travel(30)->seconds();
+
+        $this->actingAs($user)->get(cp_route('token'))->assertOk();
+        $this->assertNotEquals(now()->timestamp, session('last_activity'));
+    }
+
+    #[Test]
+    public function hitting_a_normal_cp_route_extends_the_session()
+    {
+        $this->freezeTime();
+        $user = tap(User::make()->makeSuper())->save();
+
+        $this->actingAs($user)->get(cp_route('elevated-session.status'))->assertOk();
+        $this->assertEquals(now()->timestamp, session('last_activity'));
+
+        $this->travel(30)->seconds();
+
+        $this->actingAs($user)->get(cp_route('elevated-session.status'))->assertOk();
+        $this->assertEquals(now()->timestamp, session('last_activity'));
+    }
+}
diff --git a/tests/Http/Resources/CP/Assets/AssetsFieldtypeAssetTest.php b/tests/Http/Resources/CP/Assets/AssetsFieldtypeAssetTest.php
new file mode 100644
index 00000000000..c0538bbc6ab
--- /dev/null
+++ b/tests/Http/Resources/CP/Assets/AssetsFieldtypeAssetTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Tests\Http\Resources\CP\Assets;
+
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\AssetContainer;
+use Statamic\Facades\User;
+use Statamic\Http\Resources\CP\Assets\AssetsFieldtypeAsset;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class AssetsFieldtypeAssetTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    private $container;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Storage::fake('test', ['url' => '/assets']);
+        Storage::disk('test')->put('img/photo.jpg', '');
+
+        $this->container = AssetContainer::make('test')->disk('test')->save();
+    }
+
+    #[Test]
+    public function it_returns_expected_data()
+    {
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        $asset = AssetContainer::find('test')->asset('img/photo.jpg');
+
+        $resource = (new AssetsFieldtypeAsset($asset))->resolve()['data'];
+
+        $this->assertEquals('test::img/photo.jpg', $resource['id']);
+        $this->assertEquals('photo.jpg', $resource['basename']);
+        $this->assertEquals('asset::test::img/photo.jpg', $resource['reference']);
+        $this->assertEquals('jpg', $resource['extension']);
+        $this->assertEquals('/assets/img/photo.jpg', $resource['url']);
+        $this->assertArrayHasKey('downloadUrl', $resource);
+        $this->assertArrayHasKey('size', $resource);
+        $this->assertTrue($resource['isImage']);
+        $this->assertFalse($resource['isSvg']);
+        $this->assertTrue($resource['isMedia']);
+        $this->assertTrue($resource['isEditable']);
+        $this->assertTrue($resource['isViewable']);
+        $this->assertArrayHasKey('thumbnail', $resource);
+        $this->assertArrayHasKey('values', $resource);
+        $this->assertArrayHasKey('meta', $resource);
+
+        $this->assertArrayNotHasKey('actions', $resource);
+        $this->assertArrayNotHasKey('actionUrl', $resource);
+        $this->assertArrayNotHasKey('blueprint', $resource);
+    }
+
+    #[Test]
+    public function it_reflects_permissions()
+    {
+        $this->setTestRoles(['test' => ['view test assets']]);
+
+        $user = tap(User::make()->assignRole('test'))->save();
+        $this->actingAs($user);
+
+        $asset = AssetContainer::find('test')->asset('img/photo.jpg');
+
+        $resource = (new AssetsFieldtypeAsset($asset))->resolve()['data'];
+
+        $this->assertFalse($resource['isEditable']);
+        $this->assertTrue($resource['isViewable']);
+    }
+}
diff --git a/tests/Http/View/Composers/JavascriptComposerTest.php b/tests/Http/View/Composers/JavascriptComposerTest.php
new file mode 100644
index 00000000000..5f4303a05a3
--- /dev/null
+++ b/tests/Http/View/Composers/JavascriptComposerTest.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Tests\Http\View\Composers;
+
+use Illuminate\Support\Facades\Lang;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Statamic\Http\View\Composers\JavascriptComposer;
+use Statamic\Statamic;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class JavascriptComposerTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    #[Test]
+    public function it_provides_crop_aspect_ratios_to_script_config()
+    {
+        config()->set('statamic.assets.crop_aspect_ratios', [
+            '9:16',
+            ['label' => 'US Letter', 'ratio' => '8.5:11'],
+        ]);
+
+        $user = User::make()
+            ->makeSuper()
+            ->save();
+        $this->actingAs($user);
+
+        $view = app('view')->make('statamic::partials.scripts');
+
+        (new JavascriptComposer)->compose($view);
+
+        $json = Statamic::jsonVariables(request());
+
+        $this->assertSame([
+            ['label' => '9:16', 'value' => 9 / 16],
+            ['label' => 'US Letter', 'value' => 8.5 / 11],
+        ], $json['cropAspectRatios']);
+    }
+
+    #[Test]
+    public function it_does_not_leak_fallback_locale_json_translations_when_locale_is_english()
+    {
+        app()->setFallbackLocale('de');
+        app()->setLocale('en');
+        Lang::addJsonPath(__DIR__.'/../../../__fixtures__/lang-composer-fallback');
+
+        $user = User::make()->makeSuper()->save();
+        $this->actingAs($user);
+
+        $view = app('view')->make('statamic::partials.scripts');
+
+        (new JavascriptComposer)->compose($view);
+
+        $json = Statamic::jsonVariables(request());
+
+        $this->assertArrayNotHasKey('*.Only in fallback', $json['translations']);
+    }
+
+    #[Test]
+    public function it_still_uses_fallback_locale_json_translations_for_non_english_locales()
+    {
+        app()->setFallbackLocale('de');
+        app()->setLocale('fr');
+        Lang::addJsonPath(__DIR__.'/../../../__fixtures__/lang-composer-fallback');
+
+        $user = User::make()->makeSuper()->save();
+        $this->actingAs($user);
+
+        $view = app('view')->make('statamic::partials.scripts');
+
+        (new JavascriptComposer)->compose($view);
+
+        $json = Statamic::jsonVariables(request());
+
+        $this->assertSame('Nur im Fallback', $json['translations']['*.Only in fallback']);
+    }
+}
diff --git a/tests/Imaging/GlideRoutePrefixTest.php b/tests/Imaging/GlideRoutePrefixTest.php
new file mode 100644
index 00000000000..4dae4cd6e61
--- /dev/null
+++ b/tests/Imaging/GlideRoutePrefixTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Tests\Imaging;
+
+use Illuminate\Support\Facades\Route;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\URL;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class GlideRoutePrefixTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    public function tearDown(): void
+    {
+        URL::enforceTrailingSlashes(false);
+        URL::clearUrlCache();
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function it_registers_glide_routes_without_a_double_slash_for_a_path_prefixed_site_with_trailing_slashes()
+    {
+        URL::enforceTrailingSlashes();
+
+        $this->setSites([
+            'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => '/nl/'],
+        ]);
+
+        require __DIR__.'/../../routes/glide.php';
+
+        $uris = collect(Route::getRoutes()->getRoutes())
+            ->map->uri()
+            ->filter(fn ($uri) => str_contains($uri, 'img/asset'))
+            ->values();
+
+        $this->assertContains('nl/img/asset/{container}/{path?}', $uris->all());
+        $this->assertEmpty(
+            $uris->filter(fn ($uri) => str_contains($uri, '//'))->all(),
+            'Glide route prefix should not contain a double slash.'
+        );
+    }
+}
diff --git a/tests/Imaging/GlideTest.php b/tests/Imaging/GlideTest.php
index dc13ca922f3..49677c7cf6d 100644
--- a/tests/Imaging/GlideTest.php
+++ b/tests/Imaging/GlideTest.php
@@ -174,12 +174,10 @@ private function defaultFolderVisibility($filesystem)
 
         $reflection = new \ReflectionClass($adapter);
         $visibilityConverter = $reflection->getProperty('visibility');
-        $visibilityConverter->setAccessible(true);
         $visibilityConverter = $visibilityConverter->getValue($adapter);
 
         $reflection = new \ReflectionClass($visibilityConverter);
         $visibility = $reflection->getProperty('defaultForDirectories');
-        $visibility->setAccessible(true);
 
         return $visibility->getValue($visibilityConverter);
     }
@@ -188,7 +186,6 @@ private function getAdapterFromFilesystem($filesystem)
     {
         $reflection = new \ReflectionClass($filesystem);
         $property = $reflection->getProperty('adapter');
-        $property->setAccessible(true);
 
         return $property->getValue($filesystem);
     }
@@ -197,7 +194,6 @@ private function getRootFromLocalAdapter($adapter)
     {
         $reflection = new \ReflectionClass($adapter);
         $property = $reflection->getProperty('prefixer');
-        $property->setAccessible(true);
         $prefixer = $property->getValue($adapter);
 
         return $prefixer->prefixPath('');
diff --git a/tests/Imaging/GuzzleAdapterTest.php b/tests/Imaging/GuzzleAdapterTest.php
index 47710726ea9..5fb9d2604fa 100644
--- a/tests/Imaging/GuzzleAdapterTest.php
+++ b/tests/Imaging/GuzzleAdapterTest.php
@@ -3,9 +3,7 @@
 namespace Tests\Imaging;
 
 use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
-use GuzzleHttp\Psr7\Uri;
 use Mockery;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Exceptions\InvalidRemoteUrlException;
@@ -23,6 +21,7 @@ public function setUp(): void
             return new RemoteUrlValidator(function ($host) {
                 return match ($host) {
                     'example.com' => [['ip' => '93.184.216.34']],
+                    'cdn.example.com' => [['ip' => '93.184.216.35']],
                     default => [],
                 };
             });
@@ -30,25 +29,70 @@ public function setUp(): void
     }
 
     #[Test]
-    public function it_allows_redirects_when_every_hop_is_public()
+    public function it_pins_the_connection_to_the_validated_ip()
     {
         $client = Mockery::mock(ClientInterface::class);
-        $client->shouldReceive('get')->once()->andReturnUsing(function ($url, $options) {
-            $this->assertEquals('https://example.com/foo.jpg', $url);
-            $this->assertArrayHasKey('allow_redirects', $options);
-            $this->assertArrayHasKey('on_redirect', $options['allow_redirects']);
+        $client->shouldReceive('request')->once()->andReturnUsing(function ($method, $url, $options) {
+            $this->assertSame('GET', $method);
+            $this->assertSame('https://example.com/foo.jpg', $url);
+            $this->assertFalse($options['allow_redirects']);
+            $this->assertSame(['example.com:443:93.184.216.34'], $options['curl'][CURLOPT_RESOLVE]);
 
-            $options['allow_redirects']['on_redirect'](
-                new Request('GET', 'https://example.com/foo.jpg'),
-                new Response(302, ['Location' => 'https://example.com/redirected/foo.jpg']),
-                new Uri('https://example.com/redirected/foo.jpg')
-            );
+            return new Response(200, [], 'image-bytes');
+        });
+
+        $adapter = new GuzzleAdapter('https://example.com', $client);
+
+        $this->assertSame('image-bytes', $adapter->read('foo.jpg'));
+    }
+
+    #[Test]
+    public function it_resolves_the_host_once_and_pins_that_ip()
+    {
+        // DNS rebinding works by returning a public IP for the validation lookup,
+        // then a private one for the connection's lookup. The fix resolves the host
+        // a single time and pins that IP to the connection via CURLOPT_RESOLVE, so
+        // the rebound answer below (127.0.0.1) is never reached. We assert both: the
+        // pin is the public IP, and the resolver is consulted exactly once.
+        $lookups = 0;
+        $resolver = function () use (&$lookups) {
+            return [['ip' => ++$lookups === 1 ? '93.184.216.34' : '127.0.0.1']];
+        };
+
+        $this->app->bind(RemoteUrlValidator::class, fn () => new RemoteUrlValidator($resolver));
+
+        $client = Mockery::mock(ClientInterface::class);
+        $client->shouldReceive('request')->once()->andReturnUsing(function ($method, $url, $options) {
+            $this->assertSame(['example.com:443:93.184.216.34'], $options['curl'][CURLOPT_RESOLVE]);
 
             return new Response(200, [], 'image-bytes');
         });
 
         $adapter = new GuzzleAdapter('https://example.com', $client);
 
+        $this->assertSame('image-bytes', $adapter->read('foo.jpg'));
+        $this->assertSame(1, $lookups, 'The host should be resolved once; the connection must reuse that result, not re-resolve.');
+    }
+
+    #[Test]
+    public function it_follows_redirects_and_pins_every_hop()
+    {
+        $client = Mockery::mock(ClientInterface::class);
+
+        $client->shouldReceive('request')->once()
+            ->with('GET', 'https://example.com/foo.jpg', Mockery::on(function ($options) {
+                return $options['curl'][CURLOPT_RESOLVE] === ['example.com:443:93.184.216.34'];
+            }))
+            ->andReturn(new Response(302, ['Location' => 'https://cdn.example.com/foo.jpg']));
+
+        $client->shouldReceive('request')->once()
+            ->with('GET', 'https://cdn.example.com/foo.jpg', Mockery::on(function ($options) {
+                return $options['curl'][CURLOPT_RESOLVE] === ['cdn.example.com:443:93.184.216.35'];
+            }))
+            ->andReturn(new Response(200, [], 'image-bytes'));
+
+        $adapter = new GuzzleAdapter('https://example.com', $client);
+
         $this->assertSame('image-bytes', $adapter->read('foo.jpg'));
     }
 
@@ -56,15 +100,9 @@ public function it_allows_redirects_when_every_hop_is_public()
     public function it_blocks_redirects_to_non_public_destinations()
     {
         $client = Mockery::mock(ClientInterface::class);
-        $client->shouldReceive('get')->once()->andReturnUsing(function ($url, $options) {
-            $options['allow_redirects']['on_redirect'](
-                new Request('GET', 'https://example.com/foo.jpg'),
-                new Response(302, ['Location' => 'http://169.254.169.254/latest/meta-data/']),
-                new Uri('http://169.254.169.254/latest/meta-data/')
-            );
-
-            return new Response(200, [], 'should-not-return');
-        });
+        $client->shouldReceive('request')->once()->andReturn(
+            new Response(302, ['Location' => 'http://169.254.169.254/latest/meta-data/'])
+        );
 
         $adapter = new GuzzleAdapter('https://example.com', $client);
 
@@ -73,4 +111,41 @@ public function it_blocks_redirects_to_non_public_destinations()
 
         $adapter->read('foo.jpg');
     }
+
+    #[Test]
+    public function it_refuses_to_fetch_when_curl_is_unavailable()
+    {
+        // Without curl the connection can't be pinned to the validated IP, so rather
+        // than silently fall back to a rebindable request we refuse to fetch at all.
+        $client = Mockery::mock(ClientInterface::class);
+        $client->shouldNotReceive('request');
+
+        $adapter = new class('https://example.com', $client) extends GuzzleAdapter
+        {
+            protected function supportsConnectionPinning(): bool
+            {
+                return false;
+            }
+        };
+
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('curl PHP extension is required');
+
+        $adapter->read('foo.jpg');
+    }
+
+    #[Test]
+    public function it_stops_following_redirects_after_the_limit()
+    {
+        $client = Mockery::mock(ClientInterface::class);
+        $client->shouldReceive('request')
+            ->andReturn(new Response(302, ['Location' => 'https://example.com/foo.jpg']));
+
+        $adapter = new GuzzleAdapter('https://example.com', $client);
+
+        $this->expectException(InvalidRemoteUrlException::class);
+        $this->expectExceptionMessage('Too many redirects.');
+
+        $adapter->read('foo.jpg');
+    }
 }
diff --git a/tests/Imaging/ImageGeneratorTest.php b/tests/Imaging/ImageGeneratorTest.php
index 50a5ca50bb1..f774a2af27b 100644
--- a/tests/Imaging/ImageGeneratorTest.php
+++ b/tests/Imaging/ImageGeneratorTest.php
@@ -308,6 +308,38 @@ public function it_blocks_watermark_urls_that_target_non_public_ip_ranges()
         $this->makeGenerator()->setParams(['mark' => 'http://127.0.0.1/watermark.png']);
     }
 
+    public static function ipv4MappedIpv6Provider()
+    {
+        return [
+            'mapped loopback' => ['::ffff:127.0.0.1'],
+            'mapped loopback (hex form)' => ['::ffff:7f00:1'],
+            'mapped RFC1918' => ['::ffff:10.0.0.1'],
+            'mapped link-local metadata' => ['::ffff:169.254.169.254'],
+        ];
+    }
+
+    #[Test]
+    #[DataProvider('ipv4MappedIpv6Provider')]
+    public function it_blocks_ipv4_mapped_ipv6_addresses_via_dns($mappedIp)
+    {
+        $validator = new RemoteUrlValidator(fn ($host) => [['ipv6' => $mappedIp]]);
+
+        $this->expectException(InvalidRemoteUrlException::class);
+        $this->expectExceptionMessage('Destination IP is not publicly routable.');
+
+        $validator->validate('https://attacker.example/foo.jpg');
+    }
+
+    #[Test]
+    public function it_allows_public_ipv6_addresses()
+    {
+        $validator = new RemoteUrlValidator(fn ($host) => [['ipv6' => '2606:4700:4700::1111']]);
+
+        $validator->validate('https://example.com/foo.jpg');
+
+        $this->addToAssertionCount(1);
+    }
+
     #[Test]
     public function the_watermark_disk_is_the_public_directory_by_default()
     {
@@ -445,7 +477,6 @@ private function getRootFromLocalAdapter($adapter)
     {
         $reflection = new \ReflectionClass($adapter);
         $property = $reflection->getProperty('prefixer');
-        $property->setAccessible(true);
         $prefixer = $property->getValue($adapter);
 
         return $prefixer->prefixPath('');
@@ -455,7 +486,6 @@ private function getAdapterFromFilesystem($filesystem)
     {
         $reflection = new \ReflectionClass($filesystem);
         $property = $reflection->getProperty('adapter');
-        $property->setAccessible(true);
 
         return $property->getValue($filesystem);
     }
diff --git a/tests/Imaging/RemoteUrlValidatorTest.php b/tests/Imaging/RemoteUrlValidatorTest.php
new file mode 100644
index 00000000000..fb546113660
--- /dev/null
+++ b/tests/Imaging/RemoteUrlValidatorTest.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Tests\Imaging;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Exceptions\InvalidRemoteUrlException;
+use Statamic\Imaging\RemoteUrlValidator;
+use Tests\TestCase;
+
+class RemoteUrlValidatorTest extends TestCase
+{
+    private function validator(?callable $resolver = null): RemoteUrlValidator
+    {
+        return new RemoteUrlValidator($resolver ?? fn ($host) => match ($host) {
+            'example.com' => [['ip' => '93.184.216.34']],
+            default => [],
+        });
+    }
+
+    #[Test]
+    public function it_resolves_the_host_port_and_validated_ips()
+    {
+        $this->assertSame([
+            'host' => 'example.com',
+            'port' => 443,
+            'ips' => ['93.184.216.34'],
+        ], $this->validator()->resolve('https://example.com/foo.jpg'));
+    }
+
+    #[Test]
+    public function it_defaults_the_port_based_on_the_scheme()
+    {
+        $this->assertSame(443, $this->validator()->resolve('https://example.com/foo.jpg')['port']);
+        $this->assertSame(80, $this->validator()->resolve('http://example.com/foo.jpg')['port']);
+    }
+
+    #[Test]
+    public function it_preserves_an_explicit_port()
+    {
+        $this->assertSame(8080, $this->validator()->resolve('http://example.com:8080/foo.jpg')['port']);
+    }
+
+    #[Test]
+    public function it_returns_every_resolved_ip_so_they_can_all_be_pinned()
+    {
+        $resolved = $this->validator(fn () => [
+            ['ip' => '93.184.216.34'],
+            ['ip' => '93.184.216.35', 'ipv6' => '2606:4700:4700::1111'],
+        ])->resolve('https://example.com/foo.jpg');
+
+        $this->assertSame(['93.184.216.34', '93.184.216.35', '2606:4700:4700::1111'], $resolved['ips']);
+    }
+
+    #[Test]
+    public function it_resolves_an_ip_literal_host_to_itself_without_using_the_resolver()
+    {
+        $resolved = $this->validator(function () {
+            throw new \Exception('The resolver should not be called for an IP literal.');
+        })->resolve('https://93.184.216.34/foo.jpg');
+
+        $this->assertSame([
+            'host' => '93.184.216.34',
+            'port' => 443,
+            'ips' => ['93.184.216.34'],
+        ], $resolved);
+    }
+
+    #[Test]
+    public function it_lowercases_the_host()
+    {
+        $this->assertSame('example.com', $this->validator()->resolve('https://Example.COM/foo.jpg')['host']);
+    }
+
+    #[Test]
+    public function it_blocks_hosts_that_resolve_to_non_public_ips()
+    {
+        $this->expectException(InvalidRemoteUrlException::class);
+        $this->expectExceptionMessage('Destination IP is not publicly routable.');
+
+        $this->validator(fn () => [['ip' => '127.0.0.1']])->resolve('https://internal.test/foo.jpg');
+    }
+
+    #[Test]
+    public function it_blocks_ip_literals_in_non_public_ranges()
+    {
+        $this->expectException(InvalidRemoteUrlException::class);
+        $this->expectExceptionMessage('Destination IP is not publicly routable.');
+
+        $this->validator()->resolve('http://169.254.169.254/latest/meta-data/');
+    }
+
+    #[Test]
+    public function it_blocks_hosts_that_cannot_be_resolved()
+    {
+        $this->expectException(InvalidRemoteUrlException::class);
+        $this->expectExceptionMessage('Unable to resolve URL host.');
+
+        $this->validator(fn () => [])->resolve('https://unknown.test/foo.jpg');
+    }
+
+    #[Test]
+    public function it_blocks_urls_with_credentials()
+    {
+        $this->expectException(InvalidRemoteUrlException::class);
+        $this->expectExceptionMessage('URLs with credentials are not allowed.');
+
+        $this->validator()->resolve('https://user:pass@example.com/foo.jpg');
+    }
+
+    #[Test]
+    public function it_blocks_non_http_schemes()
+    {
+        $this->expectException(InvalidRemoteUrlException::class);
+        $this->expectExceptionMessage('Only http and https URLs are allowed.');
+
+        $this->validator()->resolve('file:///etc/passwd');
+    }
+
+    #[Test]
+    public function it_parses_the_base_path_and_query()
+    {
+        $this->assertSame([
+            'path' => 'foo/bar.jpg',
+            'base' => 'https://example.com',
+            'query' => 'w=100',
+        ], $this->validator()->parse('https://example.com/foo/bar.jpg?w=100'));
+    }
+
+    #[Test]
+    public function it_includes_an_explicit_port_in_the_parsed_base()
+    {
+        $this->assertSame('http://example.com:8080', $this->validator()->parse('http://example.com:8080/foo.jpg')['base']);
+    }
+}
diff --git a/tests/Modifiers/FluentModifyTest.php b/tests/Modifiers/FluentModifyTest.php
index ab8b01997f3..e9a9a04e769 100644
--- a/tests/Modifiers/FluentModifyTest.php
+++ b/tests/Modifiers/FluentModifyTest.php
@@ -2,9 +2,11 @@
 
 namespace Tests\Modifiers;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Fields\Values;
 use Statamic\Modifiers\Modifier;
+use Statamic\Modifiers\ModifierException;
 use Statamic\Modifiers\Modify;
 use Tests\TestCase;
 
@@ -38,6 +40,51 @@ public function passing_a_values_instance_into_it_will_not_convert_it_to_an_arra
         $this->assertSame($values, $result);
     }
 
+    #[Test]
+    #[DataProvider('scalarValues')]
+    public function it_casts_scalar_and_null_values_to_string($value, $expected)
+    {
+        $this->assertSame($expected, (string) Modify::value($value));
+    }
+
+    public static function scalarValues()
+    {
+        return [
+            'integer zero' => [0, '0'],
+            'positive integer' => [42, '42'],
+            'negative integer' => [-7, '-7'],
+            'float' => [1.5, '1.5'],
+            'true' => [true, '1'],
+            'false' => [false, ''],
+            'null' => [null, ''],
+            'string' => ['hello', 'hello'],
+        ];
+    }
+
+    #[Test]
+    public function it_casts_a_modified_integer_chain_result_to_string()
+    {
+        $this->assertSame('5', (string) Modify::value(0)->add(5));
+    }
+
+    #[Test]
+    public function it_throws_when_casting_an_array_to_string()
+    {
+        $this->expectException(ModifierException::class);
+        $this->expectExceptionMessage('Attempted to access modified value as a string, but encountered [array]');
+
+        (string) Modify::value(['foo' => 'bar']);
+    }
+
+    #[Test]
+    public function it_throws_modifier_exception_when_iterating_over_a_scalar()
+    {
+        $this->expectException(ModifierException::class);
+        $this->expectExceptionMessage('Attempted to access modified value as an array, but encountered [int]');
+
+        iterator_to_array(Modify::value(42));
+    }
+
     #[Test]
     public function values_instances_get_converted_to_an_array_when_passing_to_a_modifier()
     {
diff --git a/tests/Modifiers/GetTest.php b/tests/Modifiers/GetTest.php
new file mode 100644
index 00000000000..60a753c4348
--- /dev/null
+++ b/tests/Modifiers/GetTest.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace Tests\Modifiers;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Modifiers\Modify;
+use Tests\TestCase;
+
+class GetTest extends TestCase
+{
+    private function modify($value, $key)
+    {
+        return Modify::value($value)->get([$key])->fetch();
+    }
+
+    #[Test]
+    public function it_gets_a_field_value()
+    {
+        $item = new GetTestItem;
+
+        $this->assertEquals('Hello', $this->modify($item, 'title'));
+    }
+
+    #[Test]
+    public function it_returns_falsy_field_values_instead_of_falling_through_to_a_method()
+    {
+        $item = new GetTestItem;
+
+        $this->assertSame('', $this->modify($item, 'empty'));
+        $this->assertSame(0, $this->modify($item, 'zero'));
+        $this->assertSame(false, $this->modify($item, 'false'));
+    }
+
+    #[Test]
+    public function it_dispatches_to_a_non_destructive_accessor_method()
+    {
+        $item = new GetTestItem;
+
+        $this->assertEquals('https://example.com', $this->modify($item, 'url'));
+    }
+
+    #[Test]
+    public function it_does_not_dispatch_to_destructive_methods()
+    {
+        $item = new GetTestItem;
+
+        $result = $this->modify($item, 'delete');
+
+        $this->assertFalse($item->deleted);
+        $this->assertSame($item, $result);
+    }
+
+    #[Test]
+    public function it_does_not_dispatch_to_destructive_methods_case_insensitively()
+    {
+        // Str::slug() lowercases the parameter (e.g. "deleteQuietly" => "deletequietly"),
+        // but method_exists() is case-insensitive, so the denylist must match regardless of case.
+        $item = new GetTestItem;
+
+        $this->modify($item, 'deletequietly');
+        $this->assertFalse($item->deletedQuietly);
+
+        $this->modify($item, 'savequietly');
+        $this->assertFalse($item->savedQuietly);
+    }
+}
+
+class GetTestItem
+{
+    public $deleted = false;
+    public $deletedQuietly = false;
+    public $saved = false;
+    public $savedQuietly = false;
+
+    public function toArray()
+    {
+        return [
+            'title' => 'Hello',
+            'empty' => '',
+            'zero' => 0,
+            'false' => false,
+        ];
+    }
+
+    public function url()
+    {
+        return 'https://example.com';
+    }
+
+    public function delete()
+    {
+        $this->deleted = true;
+    }
+
+    public function deleteQuietly()
+    {
+        $this->deletedQuietly = true;
+    }
+
+    public function save()
+    {
+        $this->saved = true;
+    }
+
+    public function saveQuietly()
+    {
+        $this->savedQuietly = true;
+    }
+}
diff --git a/tests/Modifiers/LastTest.php b/tests/Modifiers/LastTest.php
index 0dbdaeccb88..e56cf5899c6 100644
--- a/tests/Modifiers/LastTest.php
+++ b/tests/Modifiers/LastTest.php
@@ -46,6 +46,27 @@ public static function arrayProvider()
         ];
     }
 
+    #[Test]
+    #[DataProvider('collectionProvider')]
+    public function it_gets_the_last_value_of_a_collection($value, $expected)
+    {
+        $this->assertEquals($expected, $this->modify($value));
+    }
+
+    public static function collectionProvider()
+    {
+        return [
+            'list' => [
+                collect(['alfa', 'bravo', 'charlie']),
+                'charlie',
+            ],
+            'associative' => [
+                collect(['alfa' => 'bravo', 'charlie' => 'delta']),
+                'delta',
+            ],
+        ];
+    }
+
     private function modify($value, $arg = null)
     {
         return Modify::value($value)->last($arg)->fetch();
diff --git a/tests/OAuth/OAuthCallbackTest.php b/tests/OAuth/OAuthCallbackTest.php
new file mode 100644
index 00000000000..d4e72ad9d0f
--- /dev/null
+++ b/tests/OAuth/OAuthCallbackTest.php
@@ -0,0 +1,377 @@
+<?php
+
+namespace Tests\OAuth;
+
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Event;
+use Laravel\Socialite\Facades\Socialite;
+use Laravel\Socialite\Two\InvalidStateException;
+use Mockery;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Auth\TwoFactor\RecoveryCode;
+use Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider;
+use Statamic\Events\TwoFactorAuthenticationChallenged;
+use Statamic\Facades\OAuth;
+use Statamic\Facades\User as UserFacade;
+use Statamic\OAuth\Provider;
+use Tests\ElevatesSessions;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class OAuthCallbackTest extends TestCase
+{
+    use ElevatesSessions, PreventSavingStacheItemsToDisk;
+
+    protected function defineEnvironment($app)
+    {
+        $app['config']->set('statamic.oauth.enabled', true);
+        $app['config']->set('statamic.oauth.providers', [
+            'test' => 'Test',
+            'stateless' => ['stateless' => true, 'label' => 'Stateless'],
+        ]);
+    }
+
+    public function tearDown(): void
+    {
+        app('files')->deleteDirectory(storage_path('statamic/oauth'));
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function guest_with_a_new_email_is_created_and_logged_in()
+    {
+        $this->assertCount(0, UserFacade::all());
+
+        $this->fakeProvider('test', [], 'sub-1', 'new@example.com');
+
+        $this->hitCallback('test');
+
+        $this->assertCount(1, UserFacade::all());
+        $this->assertNotNull($user = UserFacade::findByEmail('new@example.com'));
+        $this->assertAuthenticatedAs($user);
+        $this->assertEquals($user->id(), $this->provider('test')->getUserId('sub-1'));
+    }
+
+    #[Test]
+    public function guest_matching_an_oauth_id_is_logged_in_without_creating_a_user()
+    {
+        $user = UserFacade::make()->id('user-1')->email('existing@example.com')->save();
+        $this->provider('test')->setUserProviderId($user, 'sub-1');
+
+        $this->fakeProvider('test', [], 'sub-1', 'existing@example.com');
+
+        $this->hitCallback('test');
+
+        $this->assertCount(1, UserFacade::all());
+        $this->assertAuthenticatedAs($user);
+    }
+
+    #[Test]
+    public function guest_whose_email_already_exists_is_denied_and_not_logged_in()
+    {
+        UserFacade::make()->id('user-1')->email('taken@example.com')->save();
+
+        // A different oauth id, but an email that already belongs to an account.
+        $this->fakeProvider('test', [], 'sub-new', 'taken@example.com');
+
+        $response = $this->hitCallback('test');
+
+        $this->assertGuest();
+        $this->assertCount(1, UserFacade::all());
+        $this->assertNull($this->provider('test')->getUserId('sub-new'));
+        $response->assertSessionHas('error', __('statamic::messages.oauth_email_exists'));
+    }
+
+    #[Test]
+    public function authenticated_user_connects_a_provider()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+
+        $this->fakeProvider('test', [], 'sub-1', 'one@example.com');
+
+        $response = $this->actingAs($user)->withElevatedSession()->hitCallback('test');
+
+        $this->assertEquals('user-1', $this->provider('test')->getUserId('sub-1'));
+        $this->assertCount(1, UserFacade::all());
+        $this->assertAuthenticatedAs($user);
+        $response->assertSessionHas('success', __('statamic::messages.oauth_connected', ['provider' => 'Test']));
+    }
+
+    #[Test]
+    public function connecting_a_provider_already_connected_to_the_user_is_idempotent()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        $this->provider('test')->setUserProviderId($user, 'sub-1');
+
+        $this->fakeProvider('test', [], 'sub-1', 'one@example.com');
+
+        $response = $this->actingAs($user)->withElevatedSession()->hitCallback('test');
+
+        $this->assertEquals('user-1', $this->provider('test')->getUserId('sub-1'));
+        $response->assertSessionHas('success', __('statamic::messages.oauth_already_connected', ['provider' => 'Test']));
+    }
+
+    #[Test]
+    public function it_does_not_connect_a_provider_identity_owned_by_another_user()
+    {
+        $other = UserFacade::make()->id('other')->email('other@example.com')->save();
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        $this->provider('test')->setUserProviderId($other, 'sub-1');
+
+        $this->fakeProvider('test', [], 'sub-1', 'one@example.com');
+
+        $response = $this->actingAs($user)->withElevatedSession()->hitCallback('test');
+
+        // Still belongs to the original owner.
+        $this->assertEquals('other', $this->provider('test')->getUserId('sub-1'));
+        $response->assertSessionHas('error', __('statamic::messages.oauth_belongs_to_another_user', ['provider' => 'Test']));
+    }
+
+    #[Test]
+    public function it_does_not_connect_a_stateless_provider()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+
+        $this->fakeProvider('stateless', ['stateless' => true], 'sub-1', 'one@example.com');
+
+        $response = $this->actingAs($user)->withElevatedSession()->hitCallback('stateless');
+
+        $this->assertNull($this->provider('stateless')->getUserId('sub-1'));
+        $response->assertSessionHas('error', __('statamic::messages.oauth_connect_unsupported'));
+    }
+
+    #[Test]
+    public function an_authenticated_connect_re_checks_the_elevated_session_before_linking()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+
+        $this->fakeProvider('test', [], 'sub-1', 'one@example.com');
+
+        // Authenticated (a connect) but NOT elevated — e.g. the elevation lapsed
+        // during the provider round-trip. The callback must re-challenge rather
+        // than link, and must do so before consuming the single-use state/code.
+        $response = $this->actingAs($user)->hitCallback('test');
+
+        $this->assertNull($this->provider('test')->getUserId('sub-1'));
+        $response->assertRedirect(route('statamic.elevated-session'));
+    }
+
+    #[Test]
+    public function a_control_panel_connect_re_checks_against_the_cp_elevation_challenge()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->makeSuper()->save();
+
+        // A connect initiated from the CP stashes redirect=/cp/oauth; a lapsed
+        // elevation must re-challenge in the CP, not bounce to the front-end.
+        $response = $this
+            ->actingAs($user)
+            ->withSession([
+                'statamic.oauth.guard' => 'web',
+                'statamic.oauth.redirect' => '/cp/oauth',
+            ])
+            ->get(route('statamic.oauth.callback', 'test'));
+
+        $this->assertNull($this->provider('test')->getUserId('sub-1'));
+        $response->assertRedirect(cp_route('confirm-password'));
+    }
+
+    #[Test]
+    public function logging_in_merges_user_data_when_enabled()
+    {
+        $user = UserFacade::make()->id('user-1')->email('existing@example.com')->data(['name' => 'Old Name'])->save();
+        $this->provider('test')->setUserProviderId($user, 'sub-1');
+
+        $this->fakeProvider('test', [], 'sub-1', 'existing@example.com', 'New Name');
+
+        $this->hitCallback('test');
+
+        $this->assertAuthenticatedAs($user = UserFacade::find('user-1'));
+        $this->assertEquals('New Name', $user->get('name'));
+    }
+
+    #[Test]
+    public function logging_in_does_not_merge_user_data_when_disabled()
+    {
+        config()->set('statamic.oauth.merge_user_data', false);
+
+        $user = UserFacade::make()->id('user-1')->email('existing@example.com')->data(['name' => 'Old Name'])->save();
+        $this->provider('test')->setUserProviderId($user, 'sub-1');
+
+        $this->fakeProvider('test', [], 'sub-1', 'existing@example.com', 'New Name');
+
+        $this->hitCallback('test');
+
+        $this->assertAuthenticatedAs($user = UserFacade::find('user-1'));
+        $this->assertEquals('Old Name', $user->get('name'));
+    }
+
+    #[Test]
+    public function a_guest_with_a_new_email_is_not_created_when_user_creation_is_disabled()
+    {
+        config()->set('statamic.oauth.create_user', false);
+
+        $this->assertCount(0, UserFacade::all());
+
+        $this->fakeProvider('test', [], 'sub-1', 'new@example.com');
+
+        $response = $this->hitCallback('test');
+
+        $this->assertGuest();
+        $this->assertCount(0, UserFacade::all());
+        $this->assertNull($this->provider('test')->getUserId('sub-1'));
+        $response->assertRedirect();
+    }
+
+    #[Test]
+    public function it_remembers_the_oauth_provider_in_the_session_on_login()
+    {
+        $user = UserFacade::make()->id('user-1')->email('existing@example.com')->save();
+        $this->provider('test')->setUserProviderId($user, 'sub-1');
+
+        $this->fakeProvider('test', [], 'sub-1', 'existing@example.com');
+
+        $response = $this->hitCallback('test');
+
+        $this->assertAuthenticatedAs($user);
+        $response->assertSessionHas('oauth-provider', 'test');
+    }
+
+    #[Test]
+    public function a_two_factor_enabled_user_is_challenged_instead_of_being_logged_in()
+    {
+        Event::fake();
+
+        $user = $this->userWithTwoFactorEnabled('user-1', 'existing@example.com');
+        $this->provider('test')->setUserProviderId($user, 'sub-1');
+
+        $this->fakeProvider('test', [], 'sub-1', 'existing@example.com');
+
+        $response = $this->hitCallback('test');
+
+        $this->assertGuest();
+        $response->assertRedirect(route('statamic.two-factor-challenge'));
+        $response->assertSessionHas('login.id', 'user-1');
+        // The provider is remembered through the challenge so re-auth-on-expiry still works.
+        $response->assertSessionHas('oauth-provider', 'test');
+        Event::assertDispatched(TwoFactorAuthenticationChallenged::class, fn ($event) => $event->user->id() === 'user-1');
+    }
+
+    #[Test]
+    public function a_two_factor_challenge_from_the_cp_redirects_to_the_cp_challenge()
+    {
+        $user = $this->userWithTwoFactorEnabled('user-1', 'existing@example.com');
+        $this->provider('test')->setUserProviderId($user, 'sub-1');
+
+        $this->fakeProvider('test', [], 'sub-1', 'existing@example.com');
+
+        $response = $this
+            ->withSession([
+                'statamic.oauth.guard' => 'web',
+                'statamic.oauth.redirect' => '/cp',
+            ])
+            ->get(route('statamic.oauth.callback', 'test'));
+
+        $this->assertGuest();
+        $response->assertRedirect(cp_route('two-factor-challenge'));
+        $response->assertSessionHas('login.id', 'user-1');
+    }
+
+    #[Test]
+    public function a_two_factor_enabled_user_is_logged_in_when_two_factor_is_disabled()
+    {
+        config()->set('statamic.users.two_factor_enabled', false);
+
+        Event::fake();
+
+        $user = $this->userWithTwoFactorEnabled('user-1', 'existing@example.com');
+        $this->provider('test')->setUserProviderId($user, 'sub-1');
+
+        $this->fakeProvider('test', [], 'sub-1', 'existing@example.com');
+
+        $this->hitCallback('test');
+
+        $this->assertAuthenticatedAs(UserFacade::find('user-1'));
+        Event::assertNotDispatched(TwoFactorAuthenticationChallenged::class);
+    }
+
+    #[Test]
+    public function an_invalid_oauth_state_restarts_the_sign_in()
+    {
+        Socialite::fake('test');
+
+        // The OAuth "state" mismatch (CSRF protection) surfaces as an exception
+        // from Socialite; the callback should restart the flow, not error.
+        $provider = Mockery::mock(Provider::class.'[getSocialiteUser]', ['test', []]);
+        $provider->shouldReceive('getSocialiteUser')->andThrow(new InvalidStateException);
+        OAuth::partialMock()->shouldReceive('provider')->with('test')->andReturn($provider);
+
+        $this
+            ->withSession(['statamic.oauth.guard' => 'web'])
+            ->withHeader('referer', 'http://localhost/')
+            ->get(route('statamic.oauth.callback', 'test'))
+            ->assertRedirect('https://socialite.fake/test/authorize');
+
+        $this->assertGuest();
+    }
+
+    private function userWithTwoFactorEnabled(string $id, string $email)
+    {
+        $user = UserFacade::make()->id($id)->email($email)->save();
+
+        $user->merge([
+            'two_factor_confirmed_at' => now()->timestamp,
+            'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+            'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, fn () => RecoveryCode::generate())->all())),
+        ])->save();
+
+        return $user;
+    }
+
+    private function hitCallback(string $provider)
+    {
+        return $this
+            ->withSession(['statamic.oauth.guard' => 'web'])
+            ->get(route('statamic.oauth.callback', $provider));
+    }
+
+    /**
+     * Replace the provider with a real one whose only mocked method is
+     * getSocialiteUser(), so the Socialite facade is never called but the
+     * storage map and user lookups behave for real.
+     */
+    private function fakeProvider(string $name, array $config, string $id, string $email, string $displayName = 'Foo Bar'): void
+    {
+        $socialiteUser = new class($id, $email, $displayName)
+        {
+            public function __construct(private string $id, private string $email, private string $name)
+            {
+            }
+
+            public function getId()
+            {
+                return $this->id;
+            }
+
+            public function getEmail()
+            {
+                return $this->email;
+            }
+
+            public function getName()
+            {
+                return $this->name;
+            }
+        };
+
+        $provider = Mockery::mock(Provider::class.'[getSocialiteUser]', [$name, $config]);
+        $provider->shouldReceive('getSocialiteUser')->andReturn($socialiteUser);
+
+        OAuth::partialMock()->shouldReceive('provider')->with($name)->andReturn($provider);
+    }
+
+    private function provider(string $name): Provider
+    {
+        return new Provider($name);
+    }
+}
diff --git a/tests/OAuth/OAuthConnectInitiationTest.php b/tests/OAuth/OAuthConnectInitiationTest.php
new file mode 100644
index 00000000000..bcb6d511112
--- /dev/null
+++ b/tests/OAuth/OAuthConnectInitiationTest.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace Tests\OAuth;
+
+use Laravel\Socialite\Facades\Socialite;
+use Mockery;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\OAuth;
+use Statamic\Facades\User as UserFacade;
+use Statamic\OAuth\Provider;
+use Tests\ElevatesSessions;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class OAuthConnectInitiationTest extends TestCase
+{
+    use ElevatesSessions, PreventSavingStacheItemsToDisk;
+
+    protected function defineEnvironment($app)
+    {
+        $app['config']->set('statamic.oauth.enabled', true);
+        $app['config']->set('statamic.oauth.providers', ['test' => 'Test']);
+    }
+
+    public function tearDown(): void
+    {
+        app('files')->deleteDirectory(storage_path('statamic/oauth'));
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function an_authenticated_connect_requires_an_elevated_session_when_enabled()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+
+        $this->actingAs($user)
+            ->get(route('statamic.oauth.login', 'test'))
+            ->assertRedirect(route('statamic.elevated-session'));
+    }
+
+    #[Test]
+    public function an_authenticated_connect_proceeds_to_the_provider_with_an_elevated_session()
+    {
+        Socialite::fake('test');
+
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+
+        $this->actingAs($user)
+            ->withElevatedSession()
+            ->get(route('statamic.oauth.login', 'test'))
+            ->assertRedirect('https://socialite.fake/test/authorize');
+    }
+
+    #[Test]
+    public function an_authenticated_connect_proceeds_when_elevated_sessions_are_disabled()
+    {
+        Socialite::fake('test');
+
+        config(['statamic.users.elevated_sessions_enabled' => false]);
+
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+
+        $this->actingAs($user)
+            ->get(route('statamic.oauth.login', 'test'))
+            ->assertRedirect('https://socialite.fake/test/authorize');
+    }
+
+    #[Test]
+    public function an_unauthenticated_sign_in_is_not_gated_by_elevated_sessions()
+    {
+        Socialite::fake('test');
+
+        // A guest hitting the same route is signing in, not connecting, so the
+        // elevation requirement must not apply even though it's enabled.
+        $this->get(route('statamic.oauth.login', 'test'))
+            ->assertRedirect('https://socialite.fake/test/authorize');
+    }
+
+    #[Test]
+    public function a_cp_connect_redirects_to_the_cp_elevation_challenge()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->makeSuper()->save();
+
+        // The referer tells the controller this connect originated in the CP, so
+        // the user should land on the CP challenge rather than the front-end one.
+        $this->actingAs($user)
+            ->get(route('statamic.oauth.login', 'test'), ['referer' => 'http://localhost/cp/users'])
+            ->assertRedirect(cp_route('confirm-password'));
+    }
+
+    #[Test]
+    public function a_connect_immediately_after_a_fresh_oauth_login_is_already_elevated()
+    {
+        Socialite::fake('test');
+
+        // Logging in via OAuth elevates the session, so an immediate connect
+        // should sail through without a fresh challenge.
+        $user = UserFacade::make()->id('user-1')->email('existing@example.com')->save();
+        (new Provider('test'))->setUserProviderId($user, 'sub-1');
+
+        $this->fakeProviderForLogin('test', 'sub-1', 'existing@example.com');
+
+        $this->withSession(['statamic.oauth.guard' => 'web'])
+            ->get(route('statamic.oauth.callback', 'test'));
+
+        $this->assertAuthenticatedAs(UserFacade::find('user-1'));
+
+        $this->get(route('statamic.oauth.login', 'test'))
+            ->assertRedirect('https://socialite.fake/test/authorize');
+    }
+
+    /**
+     * Replace the provider so the callback can log a user in for real without
+     * touching the live Socialite driver.
+     */
+    private function fakeProviderForLogin(string $name, string $id, string $email): void
+    {
+        $socialiteUser = new class($id, $email)
+        {
+            public function __construct(private string $id, private string $email)
+            {
+            }
+
+            public function getId()
+            {
+                return $this->id;
+            }
+
+            public function getEmail()
+            {
+                return $this->email;
+            }
+
+            public function getName()
+            {
+                return 'Foo Bar';
+            }
+        };
+
+        $provider = Mockery::mock(Provider::class.'[getSocialiteUser]', [$name, []]);
+        $provider->shouldReceive('getSocialiteUser')->andReturn($socialiteUser);
+
+        OAuth::partialMock()->shouldReceive('provider')->with($name)->andReturn($provider);
+    }
+}
diff --git a/tests/OAuth/OAuthDisconnectTest.php b/tests/OAuth/OAuthDisconnectTest.php
new file mode 100644
index 00000000000..c38bcc39fbd
--- /dev/null
+++ b/tests/OAuth/OAuthDisconnectTest.php
@@ -0,0 +1,230 @@
+<?php
+
+namespace Tests\OAuth;
+
+use Illuminate\Support\Facades\Route;
+use Orchestra\Testbench\Attributes\DefineEnvironment;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User as UserFacade;
+use Statamic\Http\Middleware\AuthGuard;
+use Statamic\OAuth\Provider;
+use Tests\ElevatesSessions;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class OAuthDisconnectTest extends TestCase
+{
+    use ElevatesSessions, PreventSavingStacheItemsToDisk;
+
+    protected function defineEnvironment($app)
+    {
+        $app['config']->set('statamic.oauth.enabled', true);
+        $app['config']->set('statamic.oauth.providers', ['test' => 'Test']);
+    }
+
+    protected function publishedConfigWithoutDisconnectRoute($app)
+    {
+        // An older published config will have a `routes` array without the
+        // `disconnect` key. Config is merged shallowly, so the key won't be
+        // backfilled from ours — the route must fall back to a default.
+        $app['config']->set('statamic.oauth.routes', [
+            'login' => 'oauth/{provider}',
+            'callback' => 'oauth/{provider}/callback',
+        ]);
+    }
+
+    public function tearDown(): void
+    {
+        app('files')->deleteDirectory(storage_path('statamic/oauth'));
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function it_disconnects_a_provider_from_the_authenticated_user()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        $other = UserFacade::make()->id('user-2')->email('two@example.com')->save();
+        $provider = new Provider('test');
+        $provider->setUserProviderId($user, 'sub-1');
+        $provider->setUserProviderId($other, 'sub-2');
+
+        $response = $this->actingAs($user)->withElevatedSession()->delete(route('statamic.oauth.disconnect', 'test'));
+
+        $response->assertSessionHas('success', __('statamic::messages.oauth_disconnected', ['provider' => 'Test']));
+
+        $this->assertNull((new Provider('test'))->getUserId('sub-1'));
+
+        // Another user's connection to the same provider is untouched.
+        $this->assertEquals('user-2', (new Provider('test'))->getUserId('sub-2'));
+    }
+
+    #[Test]
+    public function it_returns_no_content_for_json_requests()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        (new Provider('test'))->setUserProviderId($user, 'sub-1');
+
+        $this->actingAs($user)
+            ->withElevatedSession()
+            ->deleteJson(route('statamic.oauth.disconnect', 'test'))
+            ->assertNoContent();
+
+        $this->assertNull((new Provider('test'))->getUserId('sub-1'));
+    }
+
+    #[Test]
+    public function guests_cannot_disconnect()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        (new Provider('test'))->setUserProviderId($user, 'sub-1');
+
+        $this->deleteJson(route('statamic.oauth.disconnect', 'test'))->assertUnauthorized();
+
+        $this->assertEquals('user-1', (new Provider('test'))->getUserId('sub-1'));
+    }
+
+    #[Test]
+    #[DefineEnvironment('publishedConfigWithoutDisconnectRoute')]
+    public function the_disconnect_route_falls_back_when_absent_from_a_published_config()
+    {
+        $this->assertTrue(Route::has('statamic.oauth.disconnect'));
+        $this->assertEquals(url('oauth/test/disconnect'), route('statamic.oauth.disconnect', 'test'));
+    }
+
+    #[Test]
+    public function the_front_end_disconnect_route_requires_a_delete_request_and_the_web_guard()
+    {
+        $route = app('router')->getRoutes()->getByName('statamic.oauth.disconnect');
+
+        // A non-GET, CSRF-protected verb authenticated against the front-end guard.
+        $this->assertContains('DELETE', $route->methods());
+        $this->assertNotContains('GET', $route->methods());
+        $this->assertContains(AuthGuard::class, $route->gatherMiddleware());
+        $this->assertContains('auth', $route->gatherMiddleware());
+    }
+
+    #[Test]
+    public function a_control_panel_user_can_disconnect_through_the_cp_route()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->makeSuper()->save();
+        (new Provider('test'))->setUserProviderId($user, 'sub-1');
+
+        $this->actingAs($user)
+            ->withElevatedSession()
+            ->delete(cp_route('oauth.disconnect', 'test'))
+            ->assertRedirect();
+
+        $this->assertNull((new Provider('test'))->getUserId('sub-1'));
+    }
+
+    #[Test]
+    public function the_cp_disconnect_route_is_a_delete_behind_control_panel_auth()
+    {
+        $route = app('router')->getRoutes()->getByName('statamic.cp.oauth.disconnect');
+
+        $this->assertNotNull($route);
+        $this->assertContains('DELETE', $route->methods());
+        $this->assertNotContains('GET', $route->methods());
+        $this->assertContains('statamic.cp.authenticated', $route->gatherMiddleware());
+    }
+
+    #[Test]
+    public function the_front_end_disconnect_requires_an_elevated_session_when_enabled()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        (new Provider('test'))->setUserProviderId($user, 'sub-1');
+
+        $this->actingAs($user)
+            ->delete(route('statamic.oauth.disconnect', 'test'))
+            ->assertRedirect(route('statamic.elevated-session'));
+
+        // Still connected — the disconnect was blocked.
+        $this->assertEquals('user-1', (new Provider('test'))->getUserId('sub-1'));
+    }
+
+    #[Test]
+    public function the_front_end_disconnect_returns_a_403_for_json_when_not_elevated()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        (new Provider('test'))->setUserProviderId($user, 'sub-1');
+
+        $this->actingAs($user)
+            ->deleteJson(route('statamic.oauth.disconnect', 'test'))
+            ->assertJson(['message' => 'Requires an elevated session.'])
+            ->assertStatus(403);
+
+        $this->assertEquals('user-1', (new Provider('test'))->getUserId('sub-1'));
+    }
+
+    #[Test]
+    public function the_front_end_disconnect_succeeds_with_an_elevated_session()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        (new Provider('test'))->setUserProviderId($user, 'sub-1');
+
+        $this->actingAs($user)
+            ->withElevatedSession()
+            ->delete(route('statamic.oauth.disconnect', 'test'))
+            ->assertSessionHas('success', __('statamic::messages.oauth_disconnected', ['provider' => 'Test']));
+
+        $this->assertNull((new Provider('test'))->getUserId('sub-1'));
+    }
+
+    #[Test]
+    public function the_front_end_disconnect_succeeds_without_a_challenge_when_elevated_sessions_are_disabled()
+    {
+        config(['statamic.users.elevated_sessions_enabled' => false]);
+
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        (new Provider('test'))->setUserProviderId($user, 'sub-1');
+
+        $this->actingAs($user)
+            ->delete(route('statamic.oauth.disconnect', 'test'))
+            ->assertSessionHas('success', __('statamic::messages.oauth_disconnected', ['provider' => 'Test']));
+
+        $this->assertNull((new Provider('test'))->getUserId('sub-1'));
+    }
+
+    #[Test]
+    public function the_cp_disconnect_requires_an_elevated_session_when_enabled()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->makeSuper()->save();
+        (new Provider('test'))->setUserProviderId($user, 'sub-1');
+
+        $this->actingAs($user)
+            ->delete(cp_route('oauth.disconnect', 'test'))
+            ->assertRedirect(cp_route('confirm-password'));
+
+        $this->assertEquals('user-1', (new Provider('test'))->getUserId('sub-1'));
+    }
+
+    #[Test]
+    public function the_cp_disconnect_succeeds_with_an_elevated_session()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->makeSuper()->save();
+        (new Provider('test'))->setUserProviderId($user, 'sub-1');
+
+        $this->actingAs($user)
+            ->withElevatedSession()
+            ->delete(cp_route('oauth.disconnect', 'test'))
+            ->assertRedirect();
+
+        $this->assertNull((new Provider('test'))->getUserId('sub-1'));
+    }
+
+    #[Test]
+    public function the_cp_disconnect_succeeds_without_a_challenge_when_elevated_sessions_are_disabled()
+    {
+        config(['statamic.users.elevated_sessions_enabled' => false]);
+
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->makeSuper()->save();
+        (new Provider('test'))->setUserProviderId($user, 'sub-1');
+
+        $this->actingAs($user)
+            ->delete(cp_route('oauth.disconnect', 'test'))
+            ->assertRedirect();
+
+        $this->assertNull((new Provider('test'))->getUserId('sub-1'));
+    }
+}
diff --git a/tests/OAuth/OAuthLoginTest.php b/tests/OAuth/OAuthLoginTest.php
new file mode 100644
index 00000000000..fed8e09637d
--- /dev/null
+++ b/tests/OAuth/OAuthLoginTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Tests\OAuth;
+
+use Laravel\Socialite\Facades\Socialite;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class OAuthLoginTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    protected function defineEnvironment($app)
+    {
+        $app['config']->set('statamic.oauth.enabled', true);
+        $app['config']->set('statamic.oauth.providers', ['test' => 'Test']);
+
+        // Give the control panel a distinct guard so the referer-based guard
+        // selection is actually observable (both default to "web" otherwise).
+        $app['config']->set('statamic.users.guards.cp', 'cp');
+        $app['config']->set('statamic.users.guards.web', 'web');
+        $app['config']->set('auth.guards.cp', $app['config']->get('auth.guards.web'));
+    }
+
+    #[Test]
+    public function it_redirects_to_the_provider()
+    {
+        Socialite::fake('test');
+
+        $this->get(route('statamic.oauth.login', 'test'))
+            ->assertRedirect('https://socialite.fake/test/authorize');
+    }
+
+    #[Test]
+    public function a_front_end_request_stores_the_web_guard()
+    {
+        Socialite::fake('test');
+
+        $this->get(route('statamic.oauth.login', 'test'))
+            ->assertSessionHas('statamic.oauth.guard', 'web');
+    }
+
+    #[Test]
+    public function a_control_panel_request_stores_the_cp_guard()
+    {
+        Socialite::fake('test');
+
+        $this->get(route('statamic.oauth.login', 'test'), ['referer' => 'http://localhost/cp/dashboard'])
+            ->assertSessionHas('statamic.oauth.guard', 'cp');
+    }
+
+    #[Test]
+    public function it_404s_for_an_unknown_provider()
+    {
+        $this->get(route('statamic.oauth.login', 'unknown'))->assertNotFound();
+    }
+}
diff --git a/tests/OAuth/OAuthPageTest.php b/tests/OAuth/OAuthPageTest.php
new file mode 100644
index 00000000000..b4abd39d0fe
--- /dev/null
+++ b/tests/OAuth/OAuthPageTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Tests\OAuth;
+
+use Illuminate\Support\Facades\Route;
+use Orchestra\Testbench\Attributes\DefineEnvironment;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User as UserFacade;
+use Statamic\OAuth\Provider;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class OAuthPageTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    protected function defineEnvironment($app)
+    {
+        $app['config']->set('statamic.oauth.providers', [
+            'test' => 'Test',
+            'another' => 'Another',
+            'stateless' => ['stateless' => true, 'label' => 'Stateless'],
+        ]);
+    }
+
+    protected function enableOAuth($app)
+    {
+        $app['config']->set('statamic.oauth.enabled', true);
+    }
+
+    public function tearDown(): void
+    {
+        app('files')->deleteDirectory(storage_path('statamic/oauth'));
+
+        parent::tearDown();
+    }
+
+    private function provider(string $name): Provider
+    {
+        return new Provider($name);
+    }
+
+    #[Test]
+    #[DefineEnvironment('enableOAuth')]
+    public function it_renders_the_connected_accounts_page_with_link_state_excluding_stateless_providers()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->makeSuper()->save();
+        $this->provider('test')->setUserProviderId($user, 'sub-1');
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('oauth'))
+            ->assertOk()
+            ->assertInertia(fn ($page) => $page
+                ->component('users/OAuth')
+                ->has('providers', 2)
+                ->where('providers.0.name', 'test')
+                ->where('providers.0.label', 'Test')
+                ->where('providers.0.connected', true)
+                ->where('providers.0.disconnectUrl', cp_route('oauth.disconnect', 'test'))
+                ->where('providers.1.name', 'another')
+                ->where('providers.1.connected', false)
+            );
+    }
+
+    #[Test]
+    #[DefineEnvironment('enableOAuth')]
+    public function the_page_route_is_registered_when_oauth_is_enabled()
+    {
+        $this->assertTrue(Route::has('statamic.cp.oauth'));
+    }
+
+    #[Test]
+    public function the_page_route_is_not_registered_when_oauth_is_disabled()
+    {
+        $this->assertFalse(Route::has('statamic.cp.oauth'));
+    }
+}
diff --git a/tests/OAuth/OAuthRedirectTest.php b/tests/OAuth/OAuthRedirectTest.php
index 02212a49df6..d6c98110c70 100644
--- a/tests/OAuth/OAuthRedirectTest.php
+++ b/tests/OAuth/OAuthRedirectTest.php
@@ -11,7 +11,7 @@ class OAuthRedirectTest extends TestCase
     #[Test]
     public function it_redirects_to_local_url()
     {
-        session(['_previous.url' => 'http://localhost/oauth/test?redirect=/dashboard']);
+        session(['statamic.oauth.redirect' => '/dashboard']);
 
         $this->assertEquals('/dashboard', $this->getSuccessRedirectUrl());
     }
@@ -19,7 +19,7 @@ public function it_redirects_to_local_url()
     #[Test]
     public function it_does_not_redirect_to_external_url()
     {
-        session(['_previous.url' => 'http://localhost/oauth/test?redirect=https://evil.com']);
+        session(['statamic.oauth.redirect' => 'https://evil.com']);
 
         $this->assertEquals('/', $this->getSuccessRedirectUrl());
     }
diff --git a/tests/OAuth/OAuthTagsTest.php b/tests/OAuth/OAuthTagsTest.php
new file mode 100644
index 00000000000..178bf7dbc0d
--- /dev/null
+++ b/tests/OAuth/OAuthTagsTest.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace Tests\OAuth;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User as UserFacade;
+use Statamic\OAuth\Provider;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class OAuthTagsTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    protected function defineEnvironment($app)
+    {
+        $app['config']->set('statamic.oauth.enabled', true);
+        $app['config']->set('statamic.oauth.providers', [
+            'test' => 'Test',
+            'another' => 'Another',
+            'stateless' => ['stateless' => true, 'label' => 'Stateless'],
+        ]);
+    }
+
+    public function tearDown(): void
+    {
+        app('files')->deleteDirectory(storage_path('statamic/oauth'));
+
+        parent::tearDown();
+    }
+
+    private function tag($tag, $params = [])
+    {
+        return Parse::template($tag, $params, trusted: true);
+    }
+
+    private function provider(string $name): Provider
+    {
+        return new Provider($name);
+    }
+
+    #[Test]
+    public function it_loops_over_providers_excluding_stateless_ones()
+    {
+        $output = $this->tag('{{ oauth }}{{ name }}:{{ label }};{{ /oauth }}');
+
+        $this->assertEquals('test:Test;another:Another;', $output);
+        $this->assertStringNotContainsString('stateless', $output);
+    }
+
+    #[Test]
+    public function it_outputs_login_urls()
+    {
+        $output = $this->tag('{{ oauth }}{{ url }};{{ /oauth }}');
+
+        $this->assertEquals(
+            route('statamic.oauth.login', 'test').';'.route('statamic.oauth.login', 'another').';',
+            $output
+        );
+    }
+
+    #[Test]
+    public function it_appends_a_redirect_to_the_login_urls()
+    {
+        $output = $this->tag('{{ oauth redirect="/dashboard" }}{{ url }};{{ /oauth }}');
+
+        $this->assertStringContainsString(route('statamic.oauth.login', 'test').'?redirect=/dashboard;', $output);
+    }
+
+    #[Test]
+    public function the_connected_flag_is_false_for_a_guest()
+    {
+        $output = $this->tag('{{ oauth }}{{ name }}:{{ if connected }}yes{{ else }}no{{ /if }};{{ /oauth }}');
+
+        $this->assertEquals('test:no;another:no;', $output);
+    }
+
+    #[Test]
+    public function the_connected_flag_reflects_the_current_users_connections()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        $this->provider('test')->setUserProviderId($user, 'sub-1');
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ oauth }}{{ name }}:{{ if connected }}yes{{ else }}no{{ /if }};{{ /oauth }}');
+
+        $this->assertEquals('test:yes;another:no;', $output);
+    }
+
+    #[Test]
+    public function it_outputs_no_results_when_there_are_no_connectable_providers()
+    {
+        config()->set('statamic.oauth.providers', [
+            'stateless' => ['stateless' => true, 'label' => 'Stateless'],
+        ]);
+
+        $output = $this->tag('{{ oauth }}{{ name }}{{ if no_results }}none{{ /if }}{{ /oauth }}');
+
+        $this->assertEquals('none', $output);
+    }
+
+    #[Test]
+    public function the_disconnect_form_renders_a_csrf_protected_delete_form()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ oauth:disconnect_form provider="test" }}<button>Disconnect</button>{{ /oauth:disconnect_form }}');
+
+        $this->assertStringContainsString('<form method="POST" action="'.route('statamic.oauth.disconnect', 'test').'"', $output);
+        $this->assertStringContainsString('name="_token"', $output);
+        $this->assertStringContainsString('name="_method" value="DELETE"', $output);
+        $this->assertStringContainsString('<button>Disconnect</button>', $output);
+    }
+
+    #[Test]
+    public function the_disconnect_form_is_empty_for_a_guest()
+    {
+        $output = $this->tag('{{ oauth:disconnect_form provider="test" }}<button>Disconnect</button>{{ /oauth:disconnect_form }}');
+
+        $this->assertEquals('', $output);
+    }
+
+    #[Test]
+    public function the_disconnect_form_is_empty_without_a_provider()
+    {
+        $user = UserFacade::make()->id('user-1')->email('one@example.com')->save();
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ oauth:disconnect_form }}<button>Disconnect</button>{{ /oauth:disconnect_form }}');
+
+        $this->assertEquals('', $output);
+    }
+
+    #[Test]
+    public function the_wildcard_still_outputs_a_login_url()
+    {
+        $this->assertEquals(route('statamic.oauth.login', 'test'), $this->tag('{{ oauth:test }}'));
+    }
+}
diff --git a/tests/OAuth/ProviderTest.php b/tests/OAuth/ProviderTest.php
index 917aba151e6..0f88c2f63e1 100644
--- a/tests/OAuth/ProviderTest.php
+++ b/tests/OAuth/ProviderTest.php
@@ -3,6 +3,7 @@
 namespace Tests\OAuth;
 
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Exceptions\OAuthEmailExistsException;
 use Statamic\Facades\User as UserFacade;
 use Statamic\OAuth\Provider;
 use Tests\PreventSavingStacheItemsToDisk;
@@ -123,12 +124,29 @@ public function it_creates_a_user()
         $this->assertEquals($user->id(), $provider->getUserId('foo-bar'));
     }
 
+    #[Test]
+    public function it_throws_when_creating_a_user_whose_email_already_exists()
+    {
+        $this->user()->save();
+
+        $this->assertCount(1, UserFacade::all());
+
+        try {
+            $this->provider()->createUser($this->socialite());
+            $this->fail('Exception was not thrown.');
+        } catch (OAuthEmailExistsException $e) {
+            $this->assertCount(1, UserFacade::all());
+            $this->assertNull($this->provider()->getUserId('foo-bar'));
+        }
+    }
+
     #[Test]
     public function it_finds_an_existing_user_via_find_user_method()
     {
         $provider = $this->provider();
 
         $savedUser = $this->user()->save();
+        $provider->setUserProviderId($savedUser, 'foo-bar');
 
         $this->assertCount(1, UserFacade::all());
         $this->assertEquals([$savedUser], UserFacade::all()->all());
@@ -140,6 +158,17 @@ public function it_finds_an_existing_user_via_find_user_method()
         $this->assertEquals($savedUser, $foundUser);
     }
 
+    #[Test]
+    public function it_does_not_find_a_user_by_email_via_find_user_method()
+    {
+        $provider = $this->provider();
+
+        // A user exists with the same email, but is not connected to the provider.
+        $this->user()->save();
+
+        $this->assertNull($provider->findUser($this->socialite()));
+    }
+
     #[Test]
     public function it_does_not_find_or_create_a_user_via_find_user_method()
     {
@@ -161,6 +190,7 @@ public function it_finds_an_existing_user_via_find_or_create_user_method()
         $provider = $this->provider();
 
         $savedUser = $this->user()->save();
+        $provider->setUserProviderId($savedUser, 'foo-bar');
 
         $this->assertCount(1, UserFacade::all());
         $this->assertEquals([$savedUser], UserFacade::all()->all());
@@ -182,6 +212,7 @@ public function it_finds_an_existing_user_via_find_or_create_user_method_but_doe
         $provider = $this->provider();
 
         $savedUser = $this->user()->save();
+        $provider->setUserProviderId($savedUser, 'foo-bar');
 
         $this->assertCount(1, UserFacade::all());
         $this->assertEquals([$savedUser], UserFacade::all()->all());
@@ -212,17 +243,32 @@ public function it_creates_a_user_via_find_or_create_user_method()
     }
 
     #[Test]
-    public function it_gets_the_user_by_id_after_merging_data()
+    public function it_determines_whether_a_user_is_connected()
     {
         $provider = $this->provider();
 
-        $user = UserFacade::make()->id('foo')->email('foo@bar.com')->data(['name' => 'foo', 'extra' => 'bar'])->save();
+        $one = UserFacade::make()->id('one')->email('one@bar.com')->save();
+        $two = UserFacade::make()->id('two')->email('two@bar.com')->save();
+        $provider->setUserProviderId($one, 'one-sub');
 
-        $this->assertNull($provider->getUserId('foo-bar'));
+        $this->assertTrue($provider->isConnectedTo($one));
+        $this->assertFalse($provider->isConnectedTo($two));
+    }
 
-        $provider->mergeUser($user, $this->socialite());
+    #[Test]
+    public function it_forgets_a_user()
+    {
+        $provider = $this->provider();
+
+        $one = UserFacade::make()->id('one')->email('one@bar.com')->save();
+        $two = UserFacade::make()->id('two')->email('two@bar.com')->save();
+        $provider->setUserProviderId($one, 'one-sub');
+        $provider->setUserProviderId($two, 'two-sub');
+
+        $provider->forgetUser($one);
 
-        $this->assertEquals('foo', $provider->getUserId('foo-bar'));
+        $this->assertNull($provider->getUserId('one-sub'));
+        $this->assertEquals('two', $provider->getUserId('two-sub'));
     }
 
     private function provider()
diff --git a/tests/Permissions/CorePermissionsTest.php b/tests/Permissions/CorePermissionsTest.php
new file mode 100644
index 00000000000..46aaeeb342e
--- /dev/null
+++ b/tests/Permissions/CorePermissionsTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Tests\Permissions;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Permission;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class CorePermissionsTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    public static function hiddenPermissionProvider()
+    {
+        return [
+            'entries' => ['view {collection} entries', 'configure collections'],
+            'navs' => ['view {nav} nav', 'configure navs'],
+            'globals' => ['edit {global} globals', 'configure globals'],
+            'terms' => ['view {taxonomy} terms', 'configure taxonomies'],
+            'assets' => ['view {container} assets', 'configure asset containers'],
+            'form submissions' => ['view {form} form submissions', 'configure forms'],
+        ];
+    }
+
+    #[Test]
+    #[DataProvider('hiddenPermissionProvider')]
+    public function configure_permissions_hide_their_per_item_permissions($permission, $hider)
+    {
+        $this->assertEquals([$hider], Permission::boot()->get($permission)->hiddenBy());
+    }
+
+    #[Test]
+    public function child_permissions_are_not_hidden_since_their_parents_are()
+    {
+        $this->assertEquals([], Permission::boot()->get('edit {collection} entries')->hiddenBy());
+        $this->assertEquals([], Permission::boot()->get('delete {container} assets')->hiddenBy());
+    }
+
+    #[Test]
+    public function replaced_child_permissions_keep_their_descriptions()
+    {
+        Collection::make('blog')->save();
+
+        $group = Permission::boot()->tree()->firstWhere('handle', 'collections');
+        $view = collect($group['permissions'])->firstWhere('value', 'view blog entries');
+        $edit = collect($view['children'])->firstWhere('value', 'edit blog entries');
+        $publish = collect($edit['children'])->firstWhere('value', 'publish blog entries');
+
+        $this->assertEquals(__('statamic::permissions.publish_{collection}_entries_desc'), $publish['description']);
+    }
+
+    #[Test]
+    public function site_access_is_not_hidden_by_configuring_sites()
+    {
+        $this->setSites([
+            'en' => ['url' => '/', 'locale' => 'en_US', 'name' => 'English'],
+            'fr' => ['url' => '/fr/', 'locale' => 'fr_FR', 'name' => 'French'],
+        ]);
+
+        $this->assertEquals([], Permission::boot()->get('access {site} site')->hiddenBy());
+    }
+}
diff --git a/tests/Permissions/PermissionTest.php b/tests/Permissions/PermissionTest.php
index daa1aec1168..76738dd9d05 100644
--- a/tests/Permissions/PermissionTest.php
+++ b/tests/Permissions/PermissionTest.php
@@ -20,6 +20,7 @@ public function it_makes_a_tree()
                 'label' => 'one',
                 'description' => null,
                 'group' => null,
+                'hidden_by' => [],
                 'children' => [],
             ],
         ], $permission->toTree());
@@ -42,12 +43,14 @@ public function it_makes_tree_with_children()
                 'label' => 'parent',
                 'description' => null,
                 'group' => 'foo',
+                'hidden_by' => [],
                 'children' => [
                     [
                         'value' => 'child',
                         'label' => 'Child!',
                         'description' => null,
                         'group' => 'foo',
+                        'hidden_by' => [],
                         'children' => [],
                     ],
                 ],
@@ -135,6 +138,90 @@ public function it_adds_a_group()
         $this->assertEquals('the-group', $permission->toTree()[0]['group']);
     }
 
+    #[Test]
+    public function it_adds_a_hiding_permission()
+    {
+        $permission = (new Permission)->value('test');
+        $this->assertEquals([], $permission->hiddenBy());
+        $this->assertEquals([], $permission->toTree()[0]['hidden_by']);
+
+        $return = $permission->hiddenBy('other');
+
+        $this->assertEquals($permission, $return);
+        $this->assertEquals(['other'], $permission->hiddenBy());
+        $this->assertEquals(['other'], $permission->toTree()[0]['hidden_by']);
+    }
+
+    #[Test]
+    public function it_adds_multiple_hiding_permissions()
+    {
+        $permission = (new Permission)->value('test')->hiddenBy(['one', 'two']);
+
+        $this->assertEquals(['one', 'two'], $permission->hiddenBy());
+        $this->assertEquals(['one', 'two'], $permission->toTree()[0]['hidden_by']);
+    }
+
+    #[Test]
+    public function it_keeps_the_hiding_permissions_when_replacements_are_defined()
+    {
+        $permission = (new Permission)
+            ->value('edit {handle} form')
+            ->hiddenBy(['configure forms', 'edit forms'])
+            ->replacements('handle', function () {
+                return [
+                    ['value' => 'first', 'label' => 'FIRST'],
+                    ['value' => 'second', 'label' => 'SECOND'],
+                ];
+            });
+
+        $expected = ['configure forms', 'edit forms'];
+
+        $this->assertEquals([$expected, $expected], $permission->permissions()->map->hiddenBy()->all());
+        $this->assertEquals($expected, $permission->toTree()[0]['hidden_by']);
+        $this->assertEquals($expected, $permission->toTree()[1]['hidden_by']);
+    }
+
+    #[Test]
+    public function it_keeps_the_hiding_permissions_of_children_when_replacements_are_defined()
+    {
+        $permission = (new Permission)
+            ->value('view {handle} entries')
+            ->children([
+                (new Permission)
+                    ->value('publish {handle} entries')
+                    ->hiddenBy('configure collections'),
+            ])
+            ->replacements('handle', function () {
+                return [['value' => 'first', 'label' => 'FIRST']];
+            });
+
+        $child = $permission->toTree()[0]['children'][0];
+
+        $this->assertEquals('publish first entries', $child['value']);
+        $this->assertEquals(['configure collections'], $child['hidden_by']);
+    }
+
+    #[Test]
+    public function it_keeps_the_descriptions_when_replacements_are_defined()
+    {
+        $permission = (new Permission)
+            ->value('view {handle} entries')
+            ->description('View the entries')
+            ->children([
+                (new Permission)
+                    ->value('publish {handle} entries')
+                    ->description('Change the publish state'),
+            ])
+            ->replacements('handle', function () {
+                return [['value' => 'first', 'label' => 'FIRST']];
+            });
+
+        $parent = $permission->toTree()[0];
+
+        $this->assertEquals('View the entries', $parent['description']);
+        $this->assertEquals('Change the publish state', $parent['children'][0]['description']);
+    }
+
     #[Test]
     public function it_gets_its_permissions_when_replacements_are_not_defined()
     {
@@ -217,18 +304,21 @@ public function it_combines_replacements_and_children()
                 'label' => 'view FIRST entries',
                 'description' => null,
                 'group' => 'test-group',
+                'hidden_by' => [],
                 'children' => [
                     [
                         'value' => 'edit first entries',
                         'label' => 'edit FIRST entries',
                         'description' => null,
                         'group' => 'test-group',
+                        'hidden_by' => [],
                         'children' => [
                             [
                                 'value' => 'delete first entries',
                                 'label' => 'delete FIRST entries',
                                 'description' => null,
                                 'group' => 'test-group',
+                                'hidden_by' => [],
                                 'children' => [],
                             ],
                         ],
@@ -238,6 +328,7 @@ public function it_combines_replacements_and_children()
                         'label' => 'publish FIRST entries',
                         'description' => null,
                         'group' => 'test-group',
+                        'hidden_by' => [],
                         'children' => [],
                     ],
                 ],
@@ -247,18 +338,21 @@ public function it_combines_replacements_and_children()
                 'label' => 'view SECOND entries',
                 'description' => null,
                 'group' => 'test-group',
+                'hidden_by' => [],
                 'children' => [
                     [
                         'value' => 'edit second entries',
                         'label' => 'edit SECOND entries',
                         'description' => null,
                         'group' => 'test-group',
+                        'hidden_by' => [],
                         'children' => [
                             [
                                 'value' => 'delete second entries',
                                 'label' => 'delete SECOND entries',
                                 'description' => null,
                                 'group' => 'test-group',
+                                'hidden_by' => [],
                                 'children' => [],
                             ],
                         ],
@@ -268,6 +362,7 @@ public function it_combines_replacements_and_children()
                         'label' => 'publish SECOND entries',
                         'description' => null,
                         'group' => 'test-group',
+                        'hidden_by' => [],
                         'children' => [],
                     ],
                 ],
diff --git a/tests/Permissions/PermissionsTest.php b/tests/Permissions/PermissionsTest.php
index e396e78b2f3..390d621c551 100644
--- a/tests/Permissions/PermissionsTest.php
+++ b/tests/Permissions/PermissionsTest.php
@@ -171,18 +171,21 @@ public function it_makes_a_tree()
                         'label' => 'two',
                         'description' => null,
                         'group' => 'test',
+                        'hidden_by' => [],
                         'children' => [
                             [
                                 'value' => 'child-three',
                                 'label' => 'child-three',
                                 'description' => null,
                                 'group' => 'test',
+                                'hidden_by' => [],
                                 'children' => [
                                     [
                                         'value' => 'nested-child',
                                         'label' => 'nested-child',
                                         'description' => null,
                                         'group' => 'test',
+                                        'hidden_by' => [],
                                         'children' => [],
                                     ],
                                 ],
@@ -200,18 +203,21 @@ public function it_makes_a_tree()
                         'label' => 'four FIRST',
                         'description' => null,
                         'group' => 'group-with-replacements',
+                        'hidden_by' => [],
                         'children' => [
                             [
                                 'value' => 'replaced child first',
                                 'label' => 'Replaced FIRST',
                                 'description' => null,
                                 'group' => 'group-with-replacements',
+                                'hidden_by' => [],
                                 'children' => [
                                     [
                                         'value' => 'replaced nested child first',
                                         'label' => 'Replaced Nested FIRST',
                                         'description' => null,
                                         'group' => 'group-with-replacements',
+                                        'hidden_by' => [],
                                         'children' => [],
                                     ],
                                 ],
@@ -223,18 +229,21 @@ public function it_makes_a_tree()
                         'label' => 'four SECOND',
                         'description' => null,
                         'group' => 'group-with-replacements',
+                        'hidden_by' => [],
                         'children' => [
                             [
                                 'value' => 'replaced child second',
                                 'label' => 'Replaced SECOND',
                                 'description' => null,
                                 'group' => 'group-with-replacements',
+                                'hidden_by' => [],
                                 'children' => [
                                     [
                                         'value' => 'replaced nested child second',
                                         'label' => 'Replaced Nested SECOND',
                                         'description' => null,
                                         'group' => 'group-with-replacements',
+                                        'hidden_by' => [],
                                         'children' => [],
                                     ],
                                 ],
@@ -252,12 +261,14 @@ public function it_makes_a_tree()
                         'label' => 'one',
                         'description' => null,
                         'group' => null,
+                        'hidden_by' => [],
                         'children' => [
                             [
                                 'value' => 'child-one',
                                 'label' => 'child-one',
                                 'description' => null,
                                 'group' => null,
+                                'hidden_by' => [],
                                 'children' => [],
                             ],
                             [
@@ -265,6 +276,7 @@ public function it_makes_a_tree()
                                 'label' => 'child-two',
                                 'description' => null,
                                 'group' => null,
+                                'hidden_by' => [],
                                 'children' => [],
                             ],
                         ],
@@ -274,6 +286,7 @@ public function it_makes_a_tree()
                         'label' => 'three',
                         'description' => null,
                         'group' => null,
+                        'hidden_by' => [],
                         'children' => [],
                     ],
                 ],
diff --git a/tests/Policies/EntryPolicyTest.php b/tests/Policies/EntryPolicyTest.php
index db40d4cd835..eb6aa35213a 100644
--- a/tests/Policies/EntryPolicyTest.php
+++ b/tests/Policies/EntryPolicyTest.php
@@ -151,6 +151,32 @@ public function entry_is_not_creatable_without_create_and_site_permissions()
         $this->assertFalse($user->can('create', [Entry::class, $collection]));
     }
 
+    #[Test]
+    public function user_with_configure_permission_can_do_it_all()
+    {
+        $userWithPermission = $this->userWithPermissions(['configure collections']);
+        $userWithoutPermission = $this->userWithPermissions([]);
+
+        $collection = tap(Collection::make('alfa'))->save();
+        $entry = EntryFactory::id('1')->collection($collection)->create();
+
+        $this->assertTrue($userWithPermission->can('view', $entry));
+        $this->assertTrue($userWithPermission->can('edit', $entry));
+        $this->assertTrue($userWithPermission->can('update', $entry));
+        $this->assertTrue($userWithPermission->can('create', [Entry::class, $collection]));
+        $this->assertTrue($userWithPermission->can('store', [Entry::class, $collection]));
+        $this->assertTrue($userWithPermission->can('delete', $entry));
+        $this->assertTrue($userWithPermission->can('publish', $entry));
+
+        $this->assertFalse($userWithoutPermission->can('view', $entry));
+        $this->assertFalse($userWithoutPermission->can('edit', $entry));
+        $this->assertFalse($userWithoutPermission->can('update', $entry));
+        $this->assertFalse($userWithoutPermission->can('create', [Entry::class, $collection]));
+        $this->assertFalse($userWithoutPermission->can('store', [Entry::class, $collection]));
+        $this->assertFalse($userWithoutPermission->can('delete', $entry));
+        $this->assertFalse($userWithoutPermission->can('publish', $entry));
+    }
+
     #[Test]
     public function another_authors_entry_is_editable()
     {
diff --git a/tests/Policies/GlobalSetVariablesPolicyTest.php b/tests/Policies/GlobalSetVariablesPolicyTest.php
index e95e6f58607..1605447be50 100644
--- a/tests/Policies/GlobalSetVariablesPolicyTest.php
+++ b/tests/Policies/GlobalSetVariablesPolicyTest.php
@@ -41,6 +41,20 @@ public function variables_are_editable_with_edit_and_site_permissions()
         $this->assertTrue($user->can('view', $global->in('de')));
     }
 
+    #[Test]
+    public function variables_are_viewable_and_editable_with_configure_permission()
+    {
+        $forbiddenUser = $this->userWithPermissions([]);
+        $authorizedUser = $this->userWithPermissions(['configure globals']);
+        $variables = tap(GlobalSet::make('test'))->save()->inDefaultSite();
+
+        $this->assertTrue($authorizedUser->can('view', $variables));
+        $this->assertTrue($authorizedUser->can('edit', $variables));
+
+        $this->assertFalse($forbiddenUser->can('view', $variables));
+        $this->assertFalse($forbiddenUser->can('edit', $variables));
+    }
+
     #[Test]
     public function variables_can_be_created_with_configure_permission()
     {
diff --git a/tests/Policies/NavTreePolicyTest.php b/tests/Policies/NavTreePolicyTest.php
index 522df211f6e..0091fa78c6b 100644
--- a/tests/Policies/NavTreePolicyTest.php
+++ b/tests/Policies/NavTreePolicyTest.php
@@ -37,6 +37,17 @@ public function trees_are_viewable_with_view_and_site_permissions()
         $this->assertTrue($user->can('view', $nav->makeTree('de')));
     }
 
+    #[Test]
+    public function trees_are_viewable_and_editable_with_configure_permission()
+    {
+        $user = $this->userWithPermissions(['configure navs']);
+
+        $nav = Nav::make('test');
+
+        $this->assertTrue($user->can('view', $nav->makeTree('en')));
+        $this->assertTrue($user->can('edit', $nav->makeTree('en')));
+    }
+
     #[Test]
     public function navs_are_editable_with_edit_permissions()
     {
diff --git a/tests/Policies/TermPolicyTest.php b/tests/Policies/TermPolicyTest.php
index 49bfed15f22..c8a1c67181b 100644
--- a/tests/Policies/TermPolicyTest.php
+++ b/tests/Policies/TermPolicyTest.php
@@ -105,4 +105,30 @@ public function term_is_not_creatable_without_create_and_site_permissions()
         // If no site is specified, it should avoid checking site access.
         $this->assertFalse($user->can('create', [TermContract::class, $taxonomy]));
     }
+
+    #[Test]
+    public function user_with_configure_permission_can_do_it_all()
+    {
+        $userWithPermission = $this->userWithPermissions(['configure taxonomies']);
+        $userWithoutPermission = $this->userWithPermissions([]);
+
+        $taxonomy = tap(Taxonomy::make('tags'))->save();
+        $term = tap(Term::make()->taxonomy('tags')->inDefaultLocale()->slug('alfa')->data([]))->save()->term();
+
+        $this->assertTrue($userWithPermission->can('view', $term));
+        $this->assertTrue($userWithPermission->can('edit', $term));
+        $this->assertTrue($userWithPermission->can('update', $term));
+        $this->assertTrue($userWithPermission->can('create', [TermContract::class, $taxonomy]));
+        $this->assertTrue($userWithPermission->can('store', [TermContract::class, $taxonomy]));
+        $this->assertTrue($userWithPermission->can('delete', $term));
+        $this->assertTrue($userWithPermission->can('publish', $term));
+
+        $this->assertFalse($userWithoutPermission->can('view', $term));
+        $this->assertFalse($userWithoutPermission->can('edit', $term));
+        $this->assertFalse($userWithoutPermission->can('update', $term));
+        $this->assertFalse($userWithoutPermission->can('create', [TermContract::class, $taxonomy]));
+        $this->assertFalse($userWithoutPermission->can('store', [TermContract::class, $taxonomy]));
+        $this->assertFalse($userWithoutPermission->can('delete', $term));
+        $this->assertFalse($userWithoutPermission->can('publish', $term));
+    }
 }
diff --git a/tests/Preferences/PrecedenceTest.php b/tests/Preferences/PrecedenceTest.php
index 8622e7dd402..7e55277776e 100644
--- a/tests/Preferences/PrecedenceTest.php
+++ b/tests/Preferences/PrecedenceTest.php
@@ -245,6 +245,28 @@ public function it_gives_precedence_to_user_and_role_preferences_over_default_pr
         $this->assertTrue(Preference::get('deeply.nested.default'));
     }
 
+    #[Test]
+    public function it_replaces_list_preferences_instead_of_merging_them()
+    {
+        $this->actingAs(User::make()->preferences([
+            'collections' => [
+                'orders' => [
+                    'columns' => ['date', 'title', 'customer'],
+                ],
+            ],
+        ]));
+
+        Preference::default()->set([
+            'collections' => [
+                'orders' => [
+                    'columns' => ['date', 'title', 'customer', 'grand_total', 'order_status'],
+                ],
+            ],
+        ])->save();
+
+        $this->assertEquals(['date', 'title', 'customer'], Preference::get('collections.orders.columns'));
+    }
+
     #[Test]
     public function it_merges_preferences_at_every_level_unless_otherwise_configured()
     {
diff --git a/tests/Query/FakesQueriesTest.php b/tests/Query/FakesQueriesTest.php
index b06726433e7..ec93fcdb788 100644
--- a/tests/Query/FakesQueriesTest.php
+++ b/tests/Query/FakesQueriesTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Query;
 
+use Illuminate\Support\Carbon;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades\User;
 use Tests\TestCase;
@@ -22,6 +23,21 @@ public function it_supports_to_raw_sql()
         $this->assertSame("select * from users where name = 'Jack'", $query->toRawSql());
     }
 
+    #[Test]
+    public function it_converts_date_bindings_to_the_app_timezone_in_raw_sql()
+    {
+        Carbon::setTestNow('2026-07-04 10:00:00');
+
+        $query = User::query()->where('created_at', Carbon::today('Europe/Zurich'));
+
+        $this->assertSame(
+            "select * from users where created_at = '2026-07-03 22:00:00'",
+            $query->toRawSql()
+        );
+
+        Carbon::setTestNow();
+    }
+
     #[Test]
     public function it_supports_dump_raw_sql()
     {
diff --git a/tests/Query/FieldtypeFilterTest.php b/tests/Query/FieldtypeFilterTest.php
new file mode 100644
index 00000000000..e409a0e7d64
--- /dev/null
+++ b/tests/Query/FieldtypeFilterTest.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Tests\Query;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
+use Statamic\Facades\Site;
+use Statamic\Facades\Taxonomy;
+use Statamic\Facades\Term;
+use Statamic\Fields\Field;
+use Statamic\Fieldtypes\Entries as EntriesFieldtype;
+use Statamic\Fieldtypes\Integer as IntegerFieldtype;
+use Statamic\Fieldtypes\Terms as TermsFieldtype;
+use Statamic\Fieldtypes\Text;
+use Statamic\Query\Scopes\Filters\Fields\Dimensions;
+use Tests\Factories\EntryFactory;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class FieldtypeFilterTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    #[Test]
+    #[DataProvider('completenessProvider')]
+    public function it_determines_if_a_filter_is_complete($values, $expected)
+    {
+        $filter = (new Text)->setField(new Field('test', ['type' => 'text']))->filter();
+
+        $this->assertEquals($expected, $filter->isComplete($values));
+    }
+
+    public static function completenessProvider()
+    {
+        return [
+            'no operator' => [['value' => 'foo'], false],
+            'operator but no value' => [['operator' => '='], false],
+            'operator and value' => [['operator' => '=', 'value' => 'foo'], true],
+            'zero string value' => [['operator' => '=', 'value' => '0'], true],
+            'zero integer value' => [['operator' => '=', 'value' => 0], true],
+            'null value' => [['operator' => '=', 'value' => null], false],
+            'empty string value' => [['operator' => '=', 'value' => ''], false],
+            'null operator without value' => [['operator' => 'null'], true],
+            'not-null operator without value' => [['operator' => 'not-null'], true],
+        ];
+    }
+
+    #[Test]
+    #[DataProvider('dimensionsCompletenessProvider')]
+    public function it_determines_if_a_dimensions_filter_is_complete($values, $expected)
+    {
+        $fieldtype = (new IntegerFieldtype)->setField(new Field('test', ['type' => 'integer']));
+        $filter = new Dimensions($fieldtype);
+
+        $this->assertEquals($expected, $filter->isComplete($values));
+    }
+
+    public static function dimensionsCompletenessProvider()
+    {
+        return [
+            'all fields present' => [['dimension' => 'width', 'operator' => '=', 'value' => '100'], true],
+            'zero value' => [['dimension' => 'width', 'operator' => '=', 'value' => 0], true],
+            'zero string value' => [['dimension' => 'width', 'operator' => '=', 'value' => '0'], true],
+            'null value' => [['dimension' => 'width', 'operator' => '=', 'value' => null], false],
+            'missing value' => [['dimension' => 'width', 'operator' => '='], false],
+            'missing dimension' => [['operator' => '=', 'value' => '100'], false],
+        ];
+    }
+
+    #[Test]
+    public function it_shows_the_terms_filter_badge_in_the_selected_site()
+    {
+        $this->setSites([
+            'en' => ['url' => 'http://localhost/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://localhost/fr/', 'locale' => 'fr'],
+        ]);
+
+        Taxonomy::make('tags')->sites(['en', 'fr'])->save();
+
+        Term::make('one')->taxonomy('tags')
+            ->dataForLocale('en', ['title' => 'One'])
+            ->dataForLocale('fr', ['title' => 'Un'])
+            ->save();
+
+        $filter = (new TermsFieldtype)
+            ->setField(new Field('tags', ['type' => 'terms', 'taxonomies' => 'tags']))
+            ->filter();
+
+        Site::setSelected('fr');
+        $this->assertEquals('Tags: Un', $filter->badge(['operator' => 'like', 'term' => 'one']));
+
+        Site::setSelected('en');
+        $this->assertEquals('Tags: One', $filter->badge(['operator' => 'like', 'term' => 'one']));
+    }
+
+    #[Test]
+    #[DataProvider('entriesFilterProvider')]
+    public function it_applies_the_entries_filter($maxItems, $values, $expected)
+    {
+        Collection::make('pages')->save();
+        Collection::make('topics')->save();
+
+        (new EntryFactory)->collection('topics')->id('topic-1')->slug('topic-one')->data(['title' => 'Topic One'])->create();
+        (new EntryFactory)->collection('topics')->id('topic-2')->slug('topic-two')->data(['title' => 'Topic Two'])->create();
+
+        if ($maxItems === 1) {
+            (new EntryFactory)->collection('pages')->id('page-a')->slug('page-a')->data(['related' => 'topic-1'])->create();
+            (new EntryFactory)->collection('pages')->id('page-b')->slug('page-b')->data(['related' => 'topic-2'])->create();
+        } else {
+            (new EntryFactory)->collection('pages')->id('page-a')->slug('page-a')->data(['related' => ['topic-1']])->create();
+            (new EntryFactory)->collection('pages')->id('page-b')->slug('page-b')->data(['related' => ['topic-1', 'topic-2']])->create();
+        }
+
+        (new EntryFactory)->collection('pages')->id('page-c')->slug('page-c')->create();
+
+        $filter = (new EntriesFieldtype)
+            ->setField(new Field('related', ['type' => 'entries', 'max_items' => $maxItems]))
+            ->filter();
+
+        $query = Entry::query()->where('collection', 'pages');
+        $filter->apply($query, 'related', $values);
+
+        $this->assertEquals($expected, $query->get()->map->id()->sort()->values()->all());
+    }
+
+    public static function entriesFilterProvider()
+    {
+        return [
+            'single: is' => [1, ['operator' => '=', 'value' => 'topic-1'], ['page-a']],
+            'single: isnt' => [1, ['operator' => '!=', 'value' => 'topic-1'], ['page-b', 'page-c']],
+            'single: empty' => [1, ['operator' => 'null', 'value' => null], ['page-c']],
+            'single: not empty' => [1, ['operator' => 'not-null', 'value' => null], ['page-a', 'page-b']],
+            'single: no entry selected' => [1, ['operator' => '=', 'value' => null], ['page-a', 'page-b', 'page-c']],
+            'multiple: is' => [null, ['operator' => '=', 'value' => 'topic-1'], ['page-a', 'page-b']],
+            'multiple: is, only one match' => [null, ['operator' => '=', 'value' => 'topic-2'], ['page-b']],
+            'multiple: isnt' => [null, ['operator' => '!=', 'value' => 'topic-1'], ['page-c']],
+            'multiple: empty' => [null, ['operator' => 'null', 'value' => null], ['page-c']],
+            'multiple: not empty' => [null, ['operator' => 'not-null', 'value' => null], ['page-a', 'page-b']],
+        ];
+    }
+
+    #[Test]
+    public function it_shows_the_entries_filter_badge()
+    {
+        Collection::make('topics')->save();
+
+        (new EntryFactory)->collection('topics')->id('topic-1')->slug('topic-one')->data(['title' => 'Topic One'])->create();
+
+        $filter = (new EntriesFieldtype)
+            ->setField(new Field('related', ['type' => 'entries', 'display' => 'Related']))
+            ->filter();
+
+        $this->assertEquals('Related is Topic One', $filter->badge(['operator' => '=', 'value' => 'topic-1']));
+        $this->assertEquals("Related isn't Topic One", $filter->badge(['operator' => '!=', 'value' => 'topic-1']));
+        $this->assertEquals('Related empty', $filter->badge(['operator' => 'null', 'value' => null]));
+        $this->assertEquals('Related not empty', $filter->badge(['operator' => 'not-null', 'value' => null]));
+    }
+}
diff --git a/tests/Query/OrderByTest.php b/tests/Query/OrderByTest.php
index 6f2944d294a..3bc827736ac 100644
--- a/tests/Query/OrderByTest.php
+++ b/tests/Query/OrderByTest.php
@@ -5,6 +5,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Query\OrderBy;
+use Statamic\Tags\Concerns\QueriesOrderBys;
 use Tests\TestCase;
 
 class OrderByTest extends TestCase
@@ -35,4 +36,52 @@ public static function parseProvider()
             ['foo:bar:baz:desc', 'foo->bar->baz', 'desc'],
         ];
     }
+
+    #[Test]
+    #[DataProvider('columnProvider')]
+    public function it_validates_columns($column, $expected)
+    {
+        $this->assertEquals($expected, OrderBy::column($column));
+        $this->assertEquals($expected ?? 'fallback', OrderBy::column($column, 'fallback'));
+    }
+
+    public static function columnProvider()
+    {
+        return [
+            'simple' => ['title', 'title'],
+            'with_underscores' => ['first_name', 'first_name'],
+            'with_numbers' => ['field1', 'field1'],
+            'json_arrow' => ['data->title', 'data->title'],
+            'nested_json_arrow' => ['data->nested->field', 'data->nested->field'],
+            'dotted' => ['table.column', 'table.column'],
+            'single_quote' => ["title'", null],
+            'double_quote' => ['title"', null],
+            'semicolon' => ['title;', null],
+            'space' => ['title foo', null],
+            'parentheses' => ['title()', null],
+            'sql_injection' => ["title'; DROP TABLE entries;--", null],
+            'backtick' => ['title`', null],
+            'comma' => ['title,foo', null],
+            'empty_string' => ['', null],
+            'null' => [null, null],
+        ];
+    }
+
+    #[Test]
+    public function it_filters_unsafe_columns_from_order_bys()
+    {
+        $tag = new class
+        {
+            use QueriesOrderBys;
+
+            public $params = [];
+        };
+
+        $tag->params = ['sort' => "title|foo'; DROP TABLE entries;--|date"];
+
+        $method = new \ReflectionMethod($tag, 'parseOrderBys');
+        $orderBys = $method->invoke($tag);
+
+        $this->assertEquals(['title', 'date'], $orderBys->map->sort->values()->all());
+    }
 }
diff --git a/tests/Query/ResolveValueTest.php b/tests/Query/ResolveValueTest.php
index aac71db4bdc..426a21583ad 100644
--- a/tests/Query/ResolveValueTest.php
+++ b/tests/Query/ResolveValueTest.php
@@ -98,6 +98,33 @@ public function self_resolving_values_will_resolve_themselves()
 
         $this->assertEquals('test', $value);
     }
+
+    #[Test]
+    public function it_does_not_resolve_by_dispatching_to_destructive_methods()
+    {
+        $item = new ContainsDestructiveMethods;
+
+        // "delete" resolves via Str::camel to the denylisted "delete" method,
+        // so it must not be dispatched; it falls through to get() instead.
+        $this->assertEquals('fell through to get', (new ResolveValue)($item, 'delete'));
+        $this->assertFalse($item->deleted);
+    }
+
+    #[Test]
+    public function it_does_not_dispatch_to_destructive_methods_case_insensitively()
+    {
+        $item = new ContainsDestructiveMethods;
+
+        // Str::camel("force-delete") is "forceDelete", and method_exists() is
+        // case-insensitive, so the denylist must match regardless of casing.
+        $this->assertEquals('fell through to get', (new ResolveValue)($item, 'force-delete'));
+        $this->assertFalse($item->forceDeleted);
+
+        // "deletequietly" resolves to a lowercased name that still matches the
+        // denylisted "deleteQuietly" method case-insensitively.
+        $this->assertEquals('fell through to get', (new ResolveValue)($item, 'deletequietly'));
+        $this->assertFalse($item->deletedQuietly);
+    }
 }
 
 class ContainsData
@@ -139,6 +166,33 @@ public function theFooField()
     }
 }
 
+class ContainsDestructiveMethods
+{
+    public $deleted = false;
+    public $forceDeleted = false;
+    public $deletedQuietly = false;
+
+    public function get($field)
+    {
+        return 'fell through to get';
+    }
+
+    public function delete()
+    {
+        $this->deleted = true;
+    }
+
+    public function forceDelete()
+    {
+        $this->forceDeleted = true;
+    }
+
+    public function deleteQuietly()
+    {
+        $this->deletedQuietly = true;
+    }
+}
+
 class ItemThatContainsQueryableValues implements ContainsQueryableValues
 {
     protected $data;
diff --git a/tests/Revisions/RepositoryTest.php b/tests/Revisions/RepositoryTest.php
index 6f94282ee3f..a8e1071f9bf 100644
--- a/tests/Revisions/RepositoryTest.php
+++ b/tests/Revisions/RepositoryTest.php
@@ -83,4 +83,36 @@ public function it_gets_and_filters_items_using_query_builder()
         $this->assertInstanceOf(Collection::class, $revisions);
         $this->assertCount(0, $revisions);
     }
+
+    #[Test]
+    public function it_finds_a_working_copy_by_key()
+    {
+        $revision = $this->repo->findWorkingCopyByKey('123');
+
+        $this->assertInstanceOf(Revision::class, $revision);
+        $this->assertEquals('123', $revision->key());
+        $this->assertEquals('working', $revision->action());
+    }
+
+    #[Test]
+    public function it_returns_null_when_there_is_no_working_copy()
+    {
+        $this->assertNull($this->repo->findWorkingCopyByKey('does-not-exist'));
+    }
+
+    #[Test]
+    public function it_finds_the_working_copy_without_using_the_query_builder()
+    {
+        // Resolving a single working copy reads its file directly. It must not go
+        // through the query builder, which would force the entire revisions store
+        // to be loaded - the cause of slow Stache warming when many entries are
+        // checked for working copies.
+        $repo = \Mockery::mock(RevisionRepository::class, [$this->stache])->makePartial();
+        $repo->shouldNotReceive('query');
+
+        $revision = $repo->findWorkingCopyByKey('123');
+
+        $this->assertInstanceOf(Revision::class, $revision);
+        $this->assertEquals('working', $revision->action());
+    }
 }
diff --git a/tests/Routing/RouteBindingTest.php b/tests/Routing/RouteBindingTest.php
index dc645104b33..665415ac3a6 100644
--- a/tests/Routing/RouteBindingTest.php
+++ b/tests/Routing/RouteBindingTest.php
@@ -129,6 +129,8 @@ public function binds_route_parameters_in_statamic_routes(
     ) {
         $this->setupContent();
 
+        $this->actingAs(tap(Facades\User::make()->makeSuper())->save());
+
         $response = $this->get($uri);
 
         if ($expectationCallback) {
@@ -148,6 +150,8 @@ public function binds_route_parameters_in_statamic_routes_with_bindings_disabled
     ) {
         $this->setupContent();
 
+        $this->actingAs(tap(Facades\User::make()->makeSuper())->save());
+
         $response = $this->get($uri);
 
         if ($expectationCallback) {
diff --git a/tests/Search/CombIndexTest.php b/tests/Search/CombIndexTest.php
index a41f086ac70..fa12fb837ac 100644
--- a/tests/Search/CombIndexTest.php
+++ b/tests/Search/CombIndexTest.php
@@ -4,15 +4,21 @@
 
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Mockery;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Contracts\Search\Searchable;
 use Statamic\Search\Comb\Index;
 use Tests\TestCase;
 
 class CombIndexTest extends TestCase
 {
-    use IndexTests;
+    use IndexTests {
+        tearDown as protected indexTestsTearDown;
+    }
 
     private $fs;
 
+    private ?string $tmpDir = null;
+
     public function setUp(): void
     {
         parent::setUp();
@@ -22,6 +28,18 @@ public function setUp(): void
         $this->instance('filesystem', $this->fs);
     }
 
+    public function tearDown(): void
+    {
+        if ($this->tmpDir && is_dir($this->tmpDir)) {
+            foreach (glob($this->tmpDir.'/*') as $file) {
+                @unlink($file);
+            }
+            @rmdir($this->tmpDir);
+        }
+
+        $this->indexTestsTearDown();
+    }
+
     protected function beforeSearched()
     {
         $this->fs
@@ -39,4 +57,70 @@ public function getIndexClass()
     {
         return Index::class;
     }
+
+    #[Test]
+    public function delete_does_not_rewrite_the_index_when_the_reference_is_absent()
+    {
+        $path = $this->createIndexFile(['entry::a' => ['title' => 'Foo']]);
+
+        $oldMtime = time() - 3600;
+        touch($path, $oldMtime);
+        clearstatcache();
+
+        $index = $this->getIndex('test', ['path' => $this->tmpDir], null);
+
+        $document = Mockery::mock(Searchable::class);
+        $document->shouldReceive('getSearchReference')->andReturn('entry::missing');
+
+        $index->delete($document);
+
+        clearstatcache();
+        $this->assertSame(
+            $oldMtime,
+            filemtime($path),
+            'Comb\Index::delete() rewrote the index file even though the reference was not present.'
+        );
+    }
+
+    #[Test]
+    public function delete_rewrites_the_index_when_the_reference_is_present()
+    {
+        $path = $this->createIndexFile([
+            'entry::a' => ['title' => 'Foo'],
+            'entry::b' => ['title' => 'Bar'],
+        ]);
+
+        $oldMtime = time() - 3600;
+        touch($path, $oldMtime);
+        clearstatcache();
+
+        $index = $this->getIndex('test', ['path' => $this->tmpDir], null);
+
+        $document = Mockery::mock(Searchable::class);
+        $document->shouldReceive('getSearchReference')->andReturn('entry::a');
+
+        $index->delete($document);
+
+        clearstatcache();
+        $this->assertGreaterThan(
+            $oldMtime,
+            filemtime($path),
+            'Comb\Index::delete() did not rewrite the index file even though the reference was present.'
+        );
+
+        $this->assertSame(
+            ['entry::b' => ['title' => 'Bar']],
+            json_decode(file_get_contents($path), true)
+        );
+    }
+
+    private function createIndexFile(array $data): string
+    {
+        $this->tmpDir = sys_get_temp_dir().'/statamic_comb_test_'.uniqid();
+        mkdir($this->tmpDir, 0777, true);
+        $path = $this->tmpDir.'/test.json';
+        file_put_contents($path, json_encode($data));
+
+        return $path;
+    }
 }
diff --git a/tests/Search/Commands/UpdateTest.php b/tests/Search/Commands/UpdateTest.php
new file mode 100644
index 00000000000..b165ae00651
--- /dev/null
+++ b/tests/Search/Commands/UpdateTest.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Tests\Search\Commands;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Search\Commands\Update;
+use Statamic\Search\Index;
+use Tests\TestCase;
+
+class UpdateTest extends TestCase
+{
+    public function tearDown(): void
+    {
+        // Reset the static state of the Index class
+        Index::resolveNameUsing(null);
+
+        parent::tearDown();
+    }
+
+    private function setUpIndexes()
+    {
+        $this->setSites([
+            'en' => ['url' => '/'],
+            'fr' => ['url' => '/fr/'],
+        ]);
+
+        config(['statamic.search.indexes' => [
+            'test' => ['driver' => 'null', 'sites' => ['en', 'fr']],
+            'cp' => ['driver' => 'null'],
+        ]]);
+    }
+
+    #[Test]
+    public function it_updates_the_localized_indexes_matching_the_configured_handle()
+    {
+        $this->setUpIndexes();
+
+        $this->artisan(Update::class, ['index' => 'test'])
+            ->expectsOutputToContain('Index test_en updated.')
+            ->expectsOutputToContain('Index test_fr updated.')
+            ->doesntExpectOutputToContain('Index cp updated.')
+            ->assertExitCode(0);
+    }
+
+    #[Test]
+    public function it_updates_the_localized_indexes_when_the_names_have_been_customized()
+    {
+        // When a custom resolver prefixes the name, the resolved name can no longer be
+        // reversed back into the configured handle by string manipulation.
+        Index::resolveNameUsing(fn ($name, $locale) => 'local_'.$name.'_'.$locale);
+
+        $this->setUpIndexes();
+
+        // The argument is the handle as it appears in the config, so it should still
+        // match both localized versions, and it should leave the cp index alone.
+        $this->artisan(Update::class, ['index' => 'test'])
+            ->expectsOutputToContain('Index local_test_en updated.')
+            ->expectsOutputToContain('Index local_test_fr updated.')
+            ->doesntExpectOutputToContain('Index local_cp_ updated.')
+            ->assertExitCode(0);
+    }
+
+    #[Test]
+    public function it_errors_when_the_index_doesnt_exist()
+    {
+        $this->setUpIndexes();
+
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Index [unknown] does not exist.');
+
+        $this->artisan(Update::class, ['index' => 'unknown'])->run();
+    }
+}
diff --git a/tests/Search/IndexTests.php b/tests/Search/IndexTests.php
index 3ac1feedec4..24e8983d94b 100644
--- a/tests/Search/IndexTests.php
+++ b/tests/Search/IndexTests.php
@@ -2,9 +2,11 @@
 
 namespace Tests\Search;
 
+use Illuminate\Support\Facades\Bus;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Search\Index;
+use Statamic\Search\InsertMultipleJob;
 
 trait IndexTests
 {
@@ -46,4 +48,26 @@ public static function nameProvider()
             'resolver with locale' => ['test', [], 'en', fn ($name, $locale) => 'prefix_'.$name.'_'.$locale, 'prefix_test_en'],
         ];
     }
+
+    #[Test]
+    public function it_dispatches_the_insert_job_with_the_configured_handle_not_the_resolved_name()
+    {
+        Bus::fake();
+
+        // A custom resolver that prefixes the name. The resolved name can no longer be
+        // reversed back into the configured handle by string manipulation.
+        $this->getIndexClass()::resolveNameUsing(fn ($name, $locale) => 'prefix_'.$name.'_'.$locale);
+
+        $index = $this->getIndex('test', [], 'en');
+        $this->assertEquals('prefix_test_en', $index->name());
+
+        $index->insertMultiple(collect(['foo::bar']));
+
+        // The job re-resolves the index via Search::index($name, $locale), so it must
+        // receive the configured handle ('test'), not the resolved name ('prefix_test_en').
+        Bus::assertDispatched(
+            InsertMultipleJob::class,
+            fn (InsertMultipleJob $job) => $job->name === 'test' && $job->locale === 'en'
+        );
+    }
 }
diff --git a/tests/Search/QueryBuilderTest.php b/tests/Search/QueryBuilderTest.php
index 0ddbfda0dda..23b3a65a2ad 100644
--- a/tests/Search/QueryBuilderTest.php
+++ b/tests/Search/QueryBuilderTest.php
@@ -659,6 +659,27 @@ public function values_can_be_plucked()
             'Smeagol\'s Precious',
         ], $query->where('type', 'b')->pluck('title')->all());
     }
+
+    #[Test]
+    public function results_are_found_using_where_status()
+    {
+        $items = collect([
+            ['reference' => 'a', 'status' => 'published'],
+            ['reference' => 'b', 'status' => 'draft'],
+            ['reference' => 'c', 'status' => 'published'],
+            ['reference' => 'd', 'status' => 'scheduled'],
+        ]);
+
+        $results = (new FakeQueryBuilder($items))->withoutData()->whereStatus('published')->get();
+
+        $this->assertCount(2, $results);
+        $this->assertEquals(['a', 'c'], $results->map->reference->all());
+
+        $results = (new FakeQueryBuilder($items))->withoutData()->whereStatus('draft')->get();
+
+        $this->assertCount(1, $results);
+        $this->assertEquals(['b'], $results->map->reference->all());
+    }
 }
 
 class FakeQueryBuilder extends QueryBuilder
diff --git a/tests/Stache/BasicStoreTest.php b/tests/Stache/BasicStoreTest.php
index df470c69011..10fac4f2c51 100644
--- a/tests/Stache/BasicStoreTest.php
+++ b/tests/Stache/BasicStoreTest.php
@@ -44,6 +44,7 @@ public function it_gets_an_item_by_key()
     public function items_are_different_instances_every_time()
     {
         config(['cache.default' => 'file']); // Doesn't work when they're arrays since the object is stored in memory.
+        config()->set('cache.serializable_classes', [TestBasicStoreItem::class]);
         \Illuminate\Support\Facades\Cache::clear();
 
         file_put_contents($this->tempDir.'/foo.yaml', '');
diff --git a/tests/Stache/ColdStacheUriTest.php b/tests/Stache/ColdStacheUriTest.php
new file mode 100644
index 00000000000..1e0c4243895
--- /dev/null
+++ b/tests/Stache/ColdStacheUriTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Tests\Stache;
+
+use Facades\Tests\Factories\EntryFactory;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
+use Statamic\Facades\Stache;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class ColdStacheUriTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function simulateColdStache(): void
+    {
+        Stache::clear();
+    }
+
+    #[Test]
+    public function entries_have_uris_on_cold_stache_with_single_site_structured_collection()
+    {
+        $collection = Collection::make('pages')
+            ->routes('{parent_uri}/{slug}')
+            ->structureContents(['root' => true]);
+        $collection->save();
+
+        EntryFactory::id('alfa-id')->collection('pages')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        EntryFactory::id('bravo-id')->collection('pages')->slug('bravo')->data(['title' => 'Bravo'])->create();
+
+        $this->simulateColdStache();
+
+        // Loading a non-URI index first triggers re-entrant URI index loading via getCachedItem().
+        Stache::store('entries')->store('pages')->index('site')->load();
+
+        $entries = Entry::query()
+            ->where('collection', 'pages')
+            ->whereNotNull('uri')
+            ->whereStatus('published')
+            ->get();
+
+        $this->assertCount(2, $entries);
+    }
+
+    #[Test]
+    public function entries_have_uris_on_cold_stache_with_multisite_structured_collection()
+    {
+        $this->setSites([
+            'en' => ['url' => 'http://localhost/', 'locale' => 'en_US'],
+            'fr' => ['url' => 'http://localhost/fr/', 'locale' => 'fr_FR'],
+        ]);
+
+        $collection = Collection::make('pages')
+            ->routes('{parent_uri}/{slug}')
+            ->structureContents(['root' => true])
+            ->sites(['en', 'fr']);
+        $collection->save();
+
+        EntryFactory::id('alfa-id')->locale('en')->collection('pages')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        EntryFactory::id('bravo-id')->locale('fr')->collection('pages')->slug('bravo')->origin('alfa-id')->data(['title' => 'Bravo'])->create();
+
+        $this->simulateColdStache();
+
+        Stache::store('entries')->store('pages')->index('site')->load();
+
+        $entries = Entry::query()
+            ->where('collection', 'pages')
+            ->whereNotNull('uri')
+            ->whereStatus('published')
+            ->get();
+
+        $this->assertCount(2, $entries);
+    }
+}
diff --git a/tests/Stache/Repositories/EntryRepositoryTest.php b/tests/Stache/Repositories/EntryRepositoryTest.php
index 0bdb1cf80fa..e6fb299c134 100644
--- a/tests/Stache/Repositories/EntryRepositoryTest.php
+++ b/tests/Stache/Repositories/EntryRepositoryTest.php
@@ -71,6 +71,21 @@ public function it_gets_all_entries()
         ], $entries->map->id()->sort()->values()->all());
     }
 
+    #[Test]
+    public function it_ignores_keys_in_indexes_that_no_longer_have_corresponding_files()
+    {
+        $store = $this->stache->store('entries')->store('alphabetical');
+
+        $store->index('title')->load();
+        (function () {
+            $this->paths = $this->paths()->forget('alphabetical-bravo');
+        })->call($store);
+
+        $entries = $this->repo->query()->whereIn('title', ['Alpha', 'Bravo', 'Zulu'])->get();
+
+        $this->assertEquals(['alphabetical-alpha', 'alphabetical-zulu'], $entries->map->id()->all());
+    }
+
     #[Test]
     public function it_gets_entries_from_a_collection()
     {
diff --git a/tests/Stache/StacheTest.php b/tests/Stache/StacheTest.php
index 721b51208be..1a6306e8930 100644
--- a/tests/Stache/StacheTest.php
+++ b/tests/Stache/StacheTest.php
@@ -6,6 +6,7 @@
 use Illuminate\Support\Collection;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Blink;
 use Statamic\Stache\NullLockStore;
 use Statamic\Stache\Stache;
 use Statamic\Stache\Stores\ChildStore;
@@ -135,6 +136,22 @@ public function it_clears_its_cache()
         $this->markTestIncomplete();
     }
 
+    #[Test]
+    public function clearing_forgets_the_cached_collection_structure_trees()
+    {
+        Blink::put('collection-structure-tree-pages-en', 'cached');
+        Blink::put('collection-structure-tree-entries::pages::en', 'cached');
+        Blink::put('structure-pages-en-d751713988987e9331980363e24189ce', 'cached');
+        Blink::put('unrelated-cache', 'kept');
+
+        $this->stache->clear();
+
+        $this->assertFalse(Blink::has('collection-structure-tree-pages-en'));
+        $this->assertFalse(Blink::has('collection-structure-tree-entries::pages::en'));
+        $this->assertFalse(Blink::has('structure-pages-en-d751713988987e9331980363e24189ce'));
+        $this->assertTrue(Blink::has('unrelated-cache'));
+    }
+
     #[Test]
     public function it_refreshes_itself()
     {
diff --git a/tests/Stache/StoreTest.php b/tests/Stache/StoreTest.php
index d6f01ea311b..419e2d2ddbc 100644
--- a/tests/Stache/StoreTest.php
+++ b/tests/Stache/StoreTest.php
@@ -38,7 +38,6 @@ public function it_forces_a_trailing_slash_when_setting_the_directory()
         // Check the value of the property to make sure the property was set with
         // the slash, and that ->directory() isn't just appending it.
         $property = (new \ReflectionClass($this->store))->getProperty('directory');
-        $property->setAccessible(true);
         $this->assertEquals('/path/to/directory/', $property->getValue($this->store));
     }
 
diff --git a/tests/Stache/Stores/CollectionTreeStoreTest.php b/tests/Stache/Stores/CollectionTreeStoreTest.php
index ab70bee9bab..0120f43b03b 100644
--- a/tests/Stache/Stores/CollectionTreeStoreTest.php
+++ b/tests/Stache/Stores/CollectionTreeStoreTest.php
@@ -160,12 +160,11 @@ public function it_saves_to_disk()
 
         $expected = <<<'EOT'
 tree:
-  -
-    entry: test
+  - entry: test
 
 EOT;
 
-        $this->assertStringEqualsFile($this->tempDir.'/pages.yaml', $expected);
+        $this->assertEquals($expected, $this->normalizeYaml(file_get_contents($this->tempDir.'/pages.yaml')));
     }
 
     private function assertTree($array, $item)
@@ -176,7 +175,6 @@ private function assertTree($array, $item)
         // the structure. That'll happen later within the repository.
         $reflect = new \ReflectionObject($item);
         $property = $reflect->getProperty('tree');
-        $property->setAccessible(true);
         $this->assertEquals($array, $property->getValue($item));
     }
 }
diff --git a/tests/Stache/Stores/FormSubmissionStoreTest.php b/tests/Stache/Stores/FormSubmissionStoreTest.php
index 5dd883dfd0c..2dd3093e4f4 100644
--- a/tests/Stache/Stores/FormSubmissionStoreTest.php
+++ b/tests/Stache/Stores/FormSubmissionStoreTest.php
@@ -29,6 +29,24 @@ public function setUp(): void
         Stache::store('form-submissions')->directory($this->directory);
     }
 
+    #[Test]
+    public function it_has_handle_in_key()
+    {
+        Facades\Form::make('contact_form')->save();
+        Facades\Form::make('other_form')->save();
+        $contactSubmission = $this->parent->store('contact_form')->makeItemFromFile(
+            Path::tidy($this->directory).'/contact_form/1631083591.2832.yaml',
+            "name: John Smith\nmessage: Hello"
+        );
+        $otherSubmission = $this->parent->store('other_form')->makeItemFromFile(
+            Path::tidy($this->directory).'/other_form/1631083591.2832.yaml',
+            "name: John Smith\nmessage: Hello"
+        );
+
+        $this->assertEquals('contact_form::1631083591.2832', $this->parent->store('contact_form')->getItemKey($contactSubmission));
+        $this->assertEquals('other_form::1631083591.2832', $this->parent->store('other_form')->getItemKey($otherSubmission));
+    }
+
     #[Test]
     public function it_makes_entry_instances_from_files()
     {
@@ -44,6 +62,21 @@ public function it_makes_entry_instances_from_files()
         $this->assertTrue(Carbon::createFromFormat('Y-m-d H:i:s', '2021-09-08 06:46:31')->eq($item->date()->startOfSecond()));
     }
 
+    #[Test]
+    public function it_sanitizes_non_utf8_data()
+    {
+        $item = $this->parent->store('contact_form')->makeItemFromFile(
+            Path::tidy($this->directory).'/contact_form/1631083591.2832.yaml',
+            "name: 'Test User'\nmessage: !!binary dGVzdCBtZXNzYWdlIHdpdGggYmFkIGJ5dGVzOiDtoL3tsYk="
+        );
+
+        $this->assertInstanceOf(Submission::class, $item);
+        $this->assertEquals('Test User', $item->get('name'));
+        $this->assertStringContainsString('test message with bad bytes:', $item->get('message'));
+        $this->assertTrue(mb_check_encoding($item->get('message'), 'UTF-8'));
+        $this->assertNotNull(json_encode($item->data()->all()));
+    }
+
     #[Test]
     public function it_saves_to_disk()
     {
@@ -57,6 +90,6 @@ public function it_saves_to_disk()
         @unlink($path);
         $this->assertFileDoesNotExist($path);
 
-        $this->assertEquals($path, $this->parent->store('test_form')->paths()->get($submission->id()));
+        $this->assertEquals($path, $this->parent->store('test_form')->paths()->get('test_form::'.$submission->id()));
     }
 }
diff --git a/tests/Stache/Stores/NavTreeStoreTest.php b/tests/Stache/Stores/NavTreeStoreTest.php
index 62f1dca4ff6..4fb46db6429 100644
--- a/tests/Stache/Stores/NavTreeStoreTest.php
+++ b/tests/Stache/Stores/NavTreeStoreTest.php
@@ -123,13 +123,12 @@ public function it_saves_to_disk()
 
         $expected = <<<'EOT'
 tree:
-  -
-    title: Test
+  - title: Test
     url: /test
 
 EOT;
 
-        $this->assertStringEqualsFile($this->tempDir.'/links.yaml', $expected);
+        $this->assertEquals($expected, $this->normalizeYaml(file_get_contents($this->tempDir.'/links.yaml')));
     }
 
     private function assertTree($array, $item)
@@ -140,7 +139,6 @@ private function assertTree($array, $item)
         // the structure. That'll happen later within the repository.
         $reflect = new \ReflectionObject($item);
         $property = $reflect->getProperty('tree');
-        $property->setAccessible(true);
         $this->assertEquals($array, $property->getValue($item));
     }
 }
diff --git a/tests/Stache/Stores/TaxonomiesStoreTest.php b/tests/Stache/Stores/TaxonomiesStoreTest.php
index b457a7cb45b..4fa8465f4da 100644
--- a/tests/Stache/Stores/TaxonomiesStoreTest.php
+++ b/tests/Stache/Stores/TaxonomiesStoreTest.php
@@ -67,6 +67,21 @@ public function it_makes_taxonomy_instances_from_files()
         $this->assertEquals('Example', $item->title());
     }
 
+    #[Test]
+    public function it_hydrates_sort_field_and_direction()
+    {
+        $contents = <<<'YAML'
+title: Tags
+sort_by: foo
+sort_dir: desc
+YAML;
+
+        $item = $this->store->makeItemFromFile($this->tempDir.'/tags.yaml', $contents);
+
+        $this->assertEquals('foo', $item->sortField());
+        $this->assertEquals('desc', $item->sortDirection());
+    }
+
     #[Test]
     public function it_normalizes_preview_target_url_into_format()
     {
diff --git a/tests/StatamicTest.php b/tests/StatamicTest.php
index 841ad5c052b..b6c536861bd 100644
--- a/tests/StatamicTest.php
+++ b/tests/StatamicTest.php
@@ -99,6 +99,40 @@ public static function formatsWithTimeProvider()
         ];
     }
 
+    #[Test]
+    public function it_translates_a_string()
+    {
+        app('translator')->addNamespace('package', __DIR__.'/__fixtures__/lang');
+
+        $this->assertEquals('Hello', Statamic::trans('package::messages.hello'));
+        $this->assertEquals('Hello, Bob', Statamic::trans('package::messages.hello_name', ['name' => 'Bob']));
+    }
+
+    #[Test]
+    public function trans_returns_the_key_when_the_value_is_an_array()
+    {
+        app('translator')->addNamespace('package', __DIR__.'/__fixtures__/lang');
+
+        $this->assertEquals('package::messages', Statamic::trans('package::messages'));
+    }
+
+    #[Test]
+    public function it_pluralizes_with_trans_choice()
+    {
+        app('translator')->addNamespace('package', __DIR__.'/__fixtures__/lang');
+
+        $this->assertEquals('There is one apple', Statamic::transChoice('package::messages.apples', 1));
+        $this->assertEquals('There are 5 apples', Statamic::transChoice('package::messages.apples', 5));
+    }
+
+    #[Test]
+    public function trans_choice_returns_the_key_when_the_value_is_an_array()
+    {
+        app('translator')->addNamespace('package', __DIR__.'/__fixtures__/lang');
+
+        $this->assertEquals('package::messages', Statamic::transChoice('package::messages', 1));
+    }
+
     #[Test]
     public function it_aliases_query_builders()
     {
@@ -296,4 +330,39 @@ public function customAssetUrl($app)
     {
         $app['config']->set('app.asset_url', 'http://test-asset-url.com');
     }
+
+    #[Test]
+    #[DataProvider('cpPerPageProvider')]
+    public function it_resolves_cp_per_page($input, $expected)
+    {
+        config(['statamic.cp.pagination_size_options' => [10, 25, 50, 100, 500]]);
+
+        $this->assertSame($expected, Statamic::cpPerPage($input));
+    }
+
+    public static function cpPerPageProvider()
+    {
+        return [
+            'in range' => [10, 10],
+            'at ceiling' => [500, 500],
+            'above ceiling' => [99999, 500],
+            'numeric string above ceiling' => ['99999', 500],
+            'null' => [null, null],
+            'empty string' => ['', null],
+            'zero' => [0, 1],
+            'negative' => [-5, 1],
+        ];
+    }
+
+    #[Test]
+    public function cp_per_page_falls_back_to_pagination_size_when_options_empty()
+    {
+        config([
+            'statamic.cp.pagination_size_options' => [],
+            'statamic.cp.pagination_size' => 50,
+        ]);
+
+        $this->assertSame(50, Statamic::cpPerPage(1000));
+        $this->assertSame(25, Statamic::cpPerPage(25));
+    }
 }
diff --git a/tests/StaticCaching/DefaultInvalidatorTest.php b/tests/StaticCaching/DefaultInvalidatorTest.php
index 70d22de54f9..c13315a7892 100644
--- a/tests/StaticCaching/DefaultInvalidatorTest.php
+++ b/tests/StaticCaching/DefaultInvalidatorTest.php
@@ -14,6 +14,7 @@
 use Statamic\Contracts\Taxonomies\Taxonomy;
 use Statamic\Contracts\Taxonomies\Term;
 use Statamic\Facades\Site;
+use Statamic\Facades\URL;
 use Statamic\Globals\Variables;
 use Statamic\StaticCaching\Cacher;
 use Statamic\StaticCaching\DefaultInvalidator as Invalidator;
@@ -25,6 +26,13 @@
 
 class DefaultInvalidatorTest extends TestCase
 {
+    public function tearDown(): void
+    {
+        URL::enforceTrailingSlashes(false);
+        URL::clearUrlCache();
+        parent::tearDown();
+    }
+
     #[Test]
     public function specifying_all_as_invalidation_rule_will_just_flush_the_cache()
     {
@@ -388,6 +396,50 @@ public function collection_urls_can_be_invalidated_by_an_entry_in_a_multisite()
         $this->assertNull($invalidator->invalidate($entry));
     }
 
+    #[Test]
+    public function invalidation_urls_respect_trailing_slash_enforcement()
+    {
+        URL::enforceTrailingSlashes();
+
+        $cacher = tap(Mockery::mock(Cacher::class), function ($cacher) {
+            $cacher->shouldReceive('invalidateUrls')->with([
+                'http://test.com/my/test/entry/',
+                'http://localhost/blog/three/',
+                'http://localhost/blog/one/',
+                'http://localhost/blog/two/',
+            ])->once();
+        });
+
+        $entry = tap(Mockery::mock(Entry::class), function ($m) {
+            $m->shouldReceive('isRedirect')->andReturn(false);
+            $m->shouldReceive('absoluteUrl')->andReturn('http://test.com/my/test/entry/');
+            $m->shouldReceive('collectionHandle')->andReturn('blog');
+            $m->shouldReceive('descendants')->andReturn(collect());
+            $m->shouldReceive('site')->andReturn(Site::default());
+            $m->shouldReceive('parent')->andReturnNull();
+            $m->shouldReceive('toAugmentedCollection')
+                ->andReturnSelf()
+                ->shouldReceive('merge')
+                ->andReturn(collect([
+                    'parent_uri' => '/my/test/',
+                ]));
+        });
+
+        $invalidator = new Invalidator($cacher, [
+            'collections' => [
+                'blog' => [
+                    'urls' => [
+                        '/blog/one',
+                        '/blog/two',
+                        'http://localhost/blog/three/',
+                    ],
+                ],
+            ],
+        ]);
+
+        $this->assertNull($invalidator->invalidate($entry));
+    }
+
     #[Test]
     public function entry_urls_are_not_invalidated_by_an_entry_with_a_redirect()
     {
@@ -968,4 +1020,27 @@ public function it_recaches_when_background_recache_token_is_enabled()
 
         $this->assertNull($invalidator->refresh($entry));
     }
+
+    #[Test]
+    public function it_calls_the_custom_invalidate_method_when_background_recache_is_enabled()
+    {
+        config()->set('statamic.static_caching.background_recache', true);
+
+        $cacher = tap(Mockery::mock(Cacher::class), function ($cacher) {
+            $cacher->shouldReceive('refreshUrls')->never();
+            $cacher->shouldReceive('invalidateUrls')->once()->with([
+                'http://localhost/custom',
+            ]);
+        });
+
+        $invalidator = new class($cacher, []) extends Invalidator
+        {
+            public function invalidate($item)
+            {
+                $this->cacher->invalidateUrls(['http://localhost/custom']);
+            }
+        };
+
+        $invalidator->refresh(new \stdClass);
+    }
 }
diff --git a/tests/StaticCaching/HalfMeasureStaticCachingTest.php b/tests/StaticCaching/HalfMeasureStaticCachingTest.php
index 1f009cd44f3..8c4b59325f9 100644
--- a/tests/StaticCaching/HalfMeasureStaticCachingTest.php
+++ b/tests/StaticCaching/HalfMeasureStaticCachingTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\StaticCaching;
 
-use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
 use Orchestra\Testbench\Attributes\DefineEnvironment;
 use PHPUnit\Framework\Attributes\Test;
@@ -126,6 +125,86 @@ public function index()
             ->assertSee('1 3', false);
     }
 
+    public function shareErrorsEnabled($app)
+    {
+        $app['config']->set('statamic.static_caching.share_errors', true);
+    }
+
+    #[Test]
+    #[DefineEnvironment('shareErrorsEnabled')]
+    public function nocache_session_is_written_under_the_real_url_when_share_errors_is_enabled()
+    {
+        \Illuminate\Support\Facades\Cache::flush();
+
+        // Regression: when share_errors is enabled, the middleware's copyError()
+        // step used to call Request::fakeStaticCacheStatus() on every cacheable
+        // response, including 200s. That mutated the singleton nocache Session
+        // URL to /__shared-errors/sitename/200, causing Session::write() to persist the
+        // regions list under the wrong cache key. On subsequent hits in a
+        // fresh PHP process, the cached page was found but its nocache regions
+        // could not be restored, a RegionNotFound was caught, and the request
+        // fell through to a full dynamic re-render — defeating half-measure
+        // caching. See discussion: nocache regions silently failing under
+        // share_errors on 200 responses.
+
+        $this->withStandardFakeViews();
+        $this->viewShouldReturnRaw('default', '{{ title }} {{ nocache }}{{ title }}{{ /nocache }}');
+
+        $this->createPage('about', ['with' => ['title' => 'Hello']]);
+
+        $this->get('/about')->assertOk();
+
+        // The session metadata must be persisted under the real request URL,
+        // not under the fake /__shared-errors/default/200 URL.
+        $store = \Statamic\Facades\StaticCache::cacheStore();
+        $this->assertNotNull(
+            $store->get('nocache::session.'.md5('http://localhost/about')),
+            'Expected nocache session to be stored under the real request URL.'
+        );
+        $this->assertNull(
+            $store->get('nocache::session.'.md5('/__shared-errors/default/200')),
+            'nocache session must not be stored under the shared-errors URL for 200 responses.'
+        );
+    }
+
+    #[Test]
+    #[DefineEnvironment('shareErrorsEnabled')]
+    public function nocache_session_is_written_under_the_real_url_for_shared_errors()
+    {
+        \Illuminate\Support\Facades\Cache::flush();
+
+        // Regression: when share_errors is enabled, rendering an error repoints the
+        // singleton nocache Session URL at /__shared-errors/<site>/<status> (via
+        // RendersHttpExceptions::getCachedError and the middleware's copyError).
+        // Session::write() then persisted the regions list only under that shared
+        // URL. But half-measure caching also stores the error page under its real
+        // URL, so a repeat request to that same URL restored the session by its
+        // real URL, found nothing, caught a RegionNotFound, and fell through to a
+        // full dynamic re-render. The session must be persisted under both URLs.
+
+        $this->withStandardFakeViews();
+        $this->viewShouldReturnRaw('errors.layout', '{{ template_content }}');
+        $this->viewShouldReturnRaw('errors.404', '404 {{ nocache }}dynamic{{ /nocache }}');
+
+        $this->get('/this-does-not-exist')->assertNotFound();
+
+        $store = \Statamic\Facades\StaticCache::cacheStore();
+
+        // Stored under the real request URL so repeat requests (served from the
+        // per-URL cache) can restore their nocache regions.
+        $this->assertNotNull(
+            $store->get('nocache::session.'.md5('http://localhost/this-does-not-exist')),
+            'Expected nocache session to be stored under the real request URL.'
+        );
+
+        // Still stored under the shared-errors URL so the same error served for
+        // other erroring URLs can restore its nocache regions.
+        $this->assertNotNull(
+            $store->get('nocache::session.'.md5('/__shared-errors/en/404')),
+            'Expected nocache session to be stored under the shared-errors URL.'
+        );
+    }
+
     #[Test]
     public function it_can_keep_parts_dynamic_using_nocache_tags_in_loops()
     {
diff --git a/tests/StaticCaching/InvalidateTest.php b/tests/StaticCaching/InvalidateTest.php
index 49e659a0999..d720571c2c2 100644
--- a/tests/StaticCaching/InvalidateTest.php
+++ b/tests/StaticCaching/InvalidateTest.php
@@ -4,8 +4,12 @@
 
 use Mockery;
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Contracts\Entries\Entry;
 use Statamic\Events\BlueprintSaved;
+use Statamic\Events\CollectionTreeEntriesMovedOrRemoved;
+use Statamic\Facades\Entry as EntryFacade;
 use Statamic\Facades\Form;
+use Statamic\StaticCaching\Cacher;
 use Statamic\StaticCaching\Invalidate;
 use Statamic\StaticCaching\Invalidator;
 use Tests\PreventSavingStacheItemsToDisk;
@@ -26,8 +30,81 @@ public function it_invalidates_a_form_when_its_blueprint_is_saved()
             return $form->handle() === 'contact';
         })->getMock();
 
-        $invalidate = new Invalidate($invalidator);
+        $invalidate = new Invalidate($invalidator, Mockery::mock(Cacher::class));
 
         $invalidate->invalidateByBlueprint($event);
     }
+
+    private function mockEntry(string $url): Entry
+    {
+        $entry = Mockery::mock(Entry::class);
+        $entry->shouldReceive('descendants')->andReturn(collect());
+        $entry->shouldReceive('isRedirect')->andReturn(false);
+        $entry->shouldReceive('absoluteUrl')->andReturn($url);
+
+        return $entry;
+    }
+
+    #[Test]
+    public function it_invalidates_removed_entries_when_collection_tree_is_saving()
+    {
+        EntryFacade::shouldReceive('find')->with('entry-1')->andReturn($this->mockEntry('http://example.com/entry-1'));
+        EntryFacade::shouldReceive('find')->with('entry-2')->andReturn($this->mockEntry('http://example.com/entry-2'));
+
+        $event = new CollectionTreeEntriesMovedOrRemoved(removed: ['entry-1', 'entry-2'], moved: []);
+
+        $cacher = Mockery::mock(Cacher::class);
+        $cacher->shouldReceive('invalidateUrls')
+            ->with(['http://example.com/entry-1', 'http://example.com/entry-2'])
+            ->once();
+
+        $invalidate = new Invalidate(Mockery::mock(Invalidator::class), $cacher);
+
+        $invalidate->invalidateMovedOrRemovedEntries($event);
+    }
+
+    #[Test]
+    public function it_invalidates_entries_with_changed_ancestry_when_collection_tree_is_saving()
+    {
+        EntryFacade::shouldReceive('find')->with('entry-1')->andReturn($this->mockEntry('http://example.com/entry-1'));
+
+        $event = new CollectionTreeEntriesMovedOrRemoved(removed: [], moved: ['entry-1']);
+
+        $cacher = Mockery::mock(Cacher::class);
+        $cacher->shouldReceive('invalidateUrls')
+            ->with(['http://example.com/entry-1'])
+            ->once();
+
+        $invalidate = new Invalidate(Mockery::mock(Invalidator::class), $cacher);
+
+        $invalidate->invalidateMovedOrRemovedEntries($event);
+    }
+
+    #[Test]
+    public function it_does_not_invalidate_entries_only_reordered_within_same_parent_when_collection_tree_is_saving()
+    {
+        $event = new CollectionTreeEntriesMovedOrRemoved(removed: [], moved: []);
+
+        $cacher = Mockery::mock(Cacher::class);
+        $cacher->shouldNotReceive('invalidateUrls');
+
+        $invalidate = new Invalidate(Mockery::mock(Invalidator::class), $cacher);
+
+        $invalidate->invalidateMovedOrRemovedEntries($event);
+    }
+
+    #[Test]
+    public function it_skips_entries_that_cannot_be_found_when_collection_tree_is_saving()
+    {
+        EntryFacade::shouldReceive('find')->with('missing-entry')->andReturn(null);
+
+        $event = new CollectionTreeEntriesMovedOrRemoved(removed: ['missing-entry'], moved: []);
+
+        $cacher = Mockery::mock(Cacher::class);
+        $cacher->shouldNotReceive('invalidateUrls');
+
+        $invalidate = new Invalidate(Mockery::mock(Invalidator::class), $cacher);
+
+        $invalidate->invalidateMovedOrRemovedEntries($event);
+    }
 }
diff --git a/tests/StaticCaching/ManagerTest.php b/tests/StaticCaching/ManagerTest.php
index 86d5f8fdbe1..563c2dbacb6 100644
--- a/tests/StaticCaching/ManagerTest.php
+++ b/tests/StaticCaching/ManagerTest.php
@@ -7,10 +7,49 @@
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades\StaticCache;
 use Statamic\StaticCaching\Cacher;
+use Statamic\StaticCaching\Cachers\ApplicationCacher;
 use Tests\TestCase;
 
 class ManagerTest extends TestCase
 {
+    #[Test]
+    public function application_driver_uses_the_default_cache_store_when_no_custom_store_is_defined()
+    {
+        config([
+            'statamic.static_caching.strategy' => 'half',
+            'statamic.static_caching.strategies.half.driver' => 'application',
+        ]);
+
+        $cacher = StaticCache::driver();
+
+        $this->assertInstanceOf(ApplicationCacher::class, $cacher);
+        $this->assertSame(Cache::store(), $this->getCacherCache($cacher));
+    }
+
+    #[Test]
+    public function application_driver_uses_the_custom_static_cache_store_when_defined()
+    {
+        config([
+            'statamic.static_caching.strategy' => 'half',
+            'statamic.static_caching.strategies.half.driver' => 'application',
+            'cache.stores.static_cache' => ['driver' => 'array'],
+        ]);
+
+        $cacher = StaticCache::driver();
+
+        $this->assertInstanceOf(ApplicationCacher::class, $cacher);
+        $this->assertSame(Cache::store('static_cache'), $this->getCacherCache($cacher));
+        $this->assertNotSame(Cache::store(), $this->getCacherCache($cacher));
+    }
+
+    private function getCacherCache(ApplicationCacher $cacher)
+    {
+        $property = new \ReflectionProperty($cacher, 'cache');
+        $property->setAccessible(true);
+
+        return $property->getValue($cacher);
+    }
+
     #[Test]
     public function it_flushes()
     {
diff --git a/tests/StaticCaching/NoCacheDatabaseSessionTest.php b/tests/StaticCaching/NoCacheDatabaseSessionTest.php
new file mode 100644
index 00000000000..52761bc5499
--- /dev/null
+++ b/tests/StaticCaching/NoCacheDatabaseSessionTest.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Tests\StaticCaching;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\StaticCaching\NoCache\DatabaseRegion;
+use Statamic\StaticCaching\NoCache\DatabaseSession;
+use Statamic\StaticCaching\NoCache\StringRegion;
+use Tests\TestCase;
+
+class NoCacheDatabaseSessionTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Schema::create('nocache_regions', function (Blueprint $table) {
+            $table->string('key')->index()->primary();
+            $table->string('url')->index();
+            $table->longText('region');
+            $table->timestamps();
+        });
+    }
+
+    public function tearDown(): void
+    {
+        Schema::dropIfExists('nocache_regions');
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function it_stores_regions_base64_encoded()
+    {
+        $session = new DatabaseSession('http://localhost/test');
+
+        $region = $session->pushRegion('the contents', ['foo' => 'bar'], '.html');
+
+        $stored = DatabaseRegion::where('key', $region->key())->first()->region;
+
+        $this->assertEquals(base64_encode(serialize($region)), $stored);
+    }
+
+    #[Test]
+    public function it_reads_base64_encoded_regions()
+    {
+        $session = new DatabaseSession('http://localhost/test');
+
+        $region = $session->pushRegion('the contents', ['foo' => 'bar'], '.html');
+
+        $retrieved = $session->region($region->key());
+
+        $this->assertInstanceOf(StringRegion::class, $retrieved);
+        $this->assertEquals($region->key(), $retrieved->key());
+        $this->assertEquals(['foo' => 'bar'], $retrieved->context());
+    }
+
+    #[Test]
+    public function it_reads_legacy_non_base64_encoded_regions()
+    {
+        // Simulate a row written before base64 encoding was introduced
+        // (e.g. an existing PostgreSQL or SQLite install that ran the
+        // nocache migration prior to this fix).
+        $session = new DatabaseSession('http://localhost/test');
+        $region = new StringRegion($session, 'the contents', ['foo' => 'bar'], '.html');
+
+        DatabaseRegion::create([
+            'key' => $region->key(),
+            'url' => md5('http://localhost/test'),
+            'region' => serialize($region),
+        ]);
+
+        $retrieved = $session->region($region->key());
+
+        $this->assertInstanceOf(StringRegion::class, $retrieved);
+        $this->assertEquals($region->key(), $retrieved->key());
+        $this->assertEquals(['foo' => 'bar'], $retrieved->context());
+    }
+}
diff --git a/tests/StaticCaching/NoCacheSessionTest.php b/tests/StaticCaching/NoCacheSessionTest.php
index 507825fa8a2..a0b755c27c4 100644
--- a/tests/StaticCaching/NoCacheSessionTest.php
+++ b/tests/StaticCaching/NoCacheSessionTest.php
@@ -6,7 +6,9 @@
 use Illuminate\Support\Facades\Cache;
 use Mockery;
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\StaticCache;
 use Statamic\StaticCaching\Cacher;
+use Statamic\StaticCaching\NoCache\RegionNotFound;
 use Statamic\StaticCaching\NoCache\Session;
 use Statamic\StaticCaching\NoCache\StringRegion;
 use Tests\FakesContent;
@@ -148,6 +150,39 @@ public function it_restores_from_cache()
         $this->assertEquals('http://localhost/cp', $cascade['cp_url']);
     }
 
+    #[Test]
+    public function it_serializes_and_unserializes_regions_through_cache()
+    {
+        $session = new Session('http://localhost/test');
+
+        $region = $session->pushRegion('the contents', ['foo' => 'bar'], '.html');
+
+        $cached = StaticCache::cacheStore()->get('nocache::region.'.$region->key());
+        $this->assertIsString($cached, 'Region should be stored as a serialized string, not an object.');
+
+        $retrieved = $session->region($region->key());
+
+        $this->assertInstanceOf(StringRegion::class, $retrieved);
+        $this->assertEquals($region->key(), $retrieved->key());
+        $this->assertEquals(['foo' => 'bar'], $retrieved->context());
+    }
+
+    #[Test]
+    public function it_throws_region_not_found_when_cached_region_is_an_incomplete_class()
+    {
+        $session = new Session('http://localhost/test');
+
+        $region = $session->pushRegion('the contents', ['foo' => 'bar'], '.html');
+
+        // Simulate what happens when serializable_classes enforcement
+        // turns a cached Region object into __PHP_Incomplete_Class.
+        StaticCache::cacheStore()->forever('nocache::region.'.$region->key(), new \__PHP_Incomplete_Class);
+
+        $this->expectException(RegionNotFound::class);
+
+        $session->region($region->key());
+    }
+
     #[Test]
     public function a_singleton_is_bound_in_the_container()
     {
diff --git a/tests/StaticCaching/SharedErrorsStaticCachingTest.php b/tests/StaticCaching/SharedErrorsStaticCachingTest.php
new file mode 100644
index 00000000000..71a5daaae27
--- /dev/null
+++ b/tests/StaticCaching/SharedErrorsStaticCachingTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Tests\StaticCaching;
+
+use Illuminate\Http\Request;
+use Illuminate\Routing\Events\ResponsePrepared;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Site;
+use Statamic\StaticCaching\Cachers\ApplicationCacher;
+use Tests\TestCase;
+
+class SharedErrorsStaticCachingTest extends TestCase
+{
+    private ApplicationCacher $cacher;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->cacher = new ApplicationCacher($this->app['cache']->store('array'), []);
+    }
+
+    #[Test]
+    public function the_shared_error_is_scoped_to_the_current_site()
+    {
+        $this->setSites([
+            'english' => ['url' => 'http://localhost/', 'locale' => 'en'],
+            'french' => ['url' => 'http://localhost/fr/', 'locale' => 'fr'],
+        ]);
+
+        // Render and share the english 404 first.
+        Site::setCurrent('english');
+        $this->shareError(404, 'English not found');
+
+        // The french site must not be considered to already have a shared error.
+        // Before scoping by site, the english error would leak here and break the
+        // localization (e.g. the language picker) for every other site.
+        Site::setCurrent('french');
+        $this->assertFalse($this->cacher->hasCachedPage($this->sharedErrorRequest(404)));
+
+        $this->shareError(404, 'French not found');
+
+        // Each site now serves its own localized shared error.
+        Site::setCurrent('english');
+        $this->assertTrue($this->cacher->hasCachedPage($this->sharedErrorRequest(404)));
+        $this->assertEquals('English not found', $this->cacher->getCachedPage($this->sharedErrorRequest(404))->content);
+
+        Site::setCurrent('french');
+        $this->assertTrue($this->cacher->hasCachedPage($this->sharedErrorRequest(404)));
+        $this->assertEquals('French not found', $this->cacher->getCachedPage($this->sharedErrorRequest(404))->content);
+    }
+
+    /**
+     * Replicates the request that's built when a shared error is written
+     * (the Cache middleware's copyError) and read (RendersHttpExceptions's
+     * getCachedError) for the current site.
+     */
+    private function sharedErrorRequest(int $status): Request
+    {
+        return Request::createFrom(Request::create('http://localhost/'))->fakeStaticCacheStatus($status);
+    }
+
+    /**
+     * Cache a shared error for the current site, mirroring how the cacher
+     * persists pages once the response has been prepared.
+     */
+    private function shareError(int $status, string $content): void
+    {
+        $request = $this->sharedErrorRequest($status);
+        $response = response($content, $status);
+
+        $this->cacher->cachePage($request, $response);
+
+        // The cacher writes to the store on the ResponsePrepared event, which
+        // the framework fires during the real response lifecycle.
+        event(new ResponsePrepared($request, $response));
+    }
+}
diff --git a/tests/StaticCaching/WriterTest.php b/tests/StaticCaching/WriterTest.php
new file mode 100644
index 00000000000..1121515677e
--- /dev/null
+++ b/tests/StaticCaching/WriterTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Tests\StaticCaching;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\StaticCaching\Cachers\Writer;
+use Tests\TestCase;
+
+class WriterTest extends TestCase
+{
+    private string $path;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->path = storage_path('framework/testing/static-cache-writer/page.html');
+
+        @unlink($this->path);
+    }
+
+    public function tearDown(): void
+    {
+        @unlink($this->path);
+        @rmdir(dirname($this->path));
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function it_writes_the_content_to_disk()
+    {
+        $written = (new Writer)->write($this->path, '<html>hello</html>');
+
+        $this->assertTrue($written);
+        $this->assertSame('<html>hello</html>', file_get_contents($this->path));
+    }
+
+    #[Test]
+    public function it_truncates_stale_bytes_when_overwriting_with_shorter_content()
+    {
+        $writer = new Writer;
+
+        $writer->write($this->path, '<html>this is a much longer page</html>');
+        $writer->write($this->path, '<html>short</html>');
+
+        $this->assertSame('<html>short</html>', file_get_contents($this->path));
+    }
+}
diff --git a/tests/Support/StrTest.php b/tests/Support/StrTest.php
index af5281355c0..8a3e561aea4 100644
--- a/tests/Support/StrTest.php
+++ b/tests/Support/StrTest.php
@@ -162,6 +162,7 @@ public function it_gets_duration_for_humans()
         $this->assertEquals('1:01:01', Str::durationForHumans(3661));
         $this->assertEquals('2:10:00', Str::durationForHumans(7800));
         $this->assertEquals('10:05:30', Str::durationForHumans(36330));
+        $this->assertEquals('0:37', Str::durationForHumans(36.92));
     }
 
     #[Test]
diff --git a/tests/Support/SvgTest.php b/tests/Support/SvgTest.php
new file mode 100644
index 00000000000..ab379a29795
--- /dev/null
+++ b/tests/Support/SvgTest.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace Tests\Support;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Support\Svg;
+use Tests\TestCase;
+
+class SvgTest extends TestCase
+{
+    #[Test]
+    #[DataProvider('sanitizeCssProvider')]
+    public function it_sanitizes_css(string $input, string $expected)
+    {
+        $this->assertSame($expected, trim(Svg::sanitizeCss($input)));
+    }
+
+    public static function sanitizeCssProvider()
+    {
+        return [
+            'strips @import with url()' => [
+                '@import url("https://evil.com/x.css");',
+                '',
+            ],
+            'strips @import with bare string' => [
+                '@import "https://evil.com/x.css";',
+                '',
+            ],
+            'strips @import with protocol-relative url' => [
+                '@import url(//evil.com/x.css);',
+                '',
+            ],
+            'strips @import without semicolon' => [
+                "@import url('https://evil.com/x.css')",
+                '',
+            ],
+            'strips @import using hex escapes' => [
+                '@\\69mport url("https://evil.com/x.css");',
+                '',
+            ],
+            'strips @import using non-hex backslash escapes' => [
+                '@\import url("https://evil.com/x.css");',
+                '',
+            ],
+            'strips @import using mixed hex and non-hex escapes' => [
+                '@\\69\mport url("https://evil.com/x.css");',
+                '',
+            ],
+            'neutralizes external url' => [
+                '.cls { background: url(https://evil.com/beacon.gif); }',
+                '.cls { background: url(); }',
+            ],
+            'neutralizes protocol-relative url' => [
+                '.cls { background: url(//evil.com/x); }',
+                '.cls { background: url(); }',
+            ],
+            'neutralizes quoted external url' => [
+                '.cls { background: url("http://evil.com/x"); }',
+                '.cls { background: url(); }',
+            ],
+            'neutralizes external url using hex escapes' => [
+                '.cls { background: url(\\68\\74\\74\\70\\73://evil.com/beacon.gif); }',
+                '.cls { background: url(); }',
+            ],
+            'neutralizes external url using non-hex backslash escapes' => [
+                '.cls { background: url(\https://evil.com/x); }',
+                '.cls { background: url(); }',
+            ],
+            'neutralizes external url using non-breaking space escape' => [
+                '.cls { background: url(\\a0 https://evil.com/x); }',
+                '.cls { background: url(); }',
+            ],
+            'neutralizes external url using zero-width space escape' => [
+                '.cls { background: url(\\200B https://evil.com/x); }',
+                '.cls { background: url(); }',
+            ],
+            'neutralizes external url using BOM escape' => [
+                '.cls { background: url(\\FEFF https://evil.com/x); }',
+                '.cls { background: url(); }',
+            ],
+            'neutralizes external url in @font-face src' => [
+                '@font-face { font-family: "x"; src: url("https://evil.com/font.woff"); }',
+                '@font-face { font-family: "x"; src: url(); }',
+            ],
+            'preserves normal css' => [
+                '.cls-1 { fill: #333; stroke: red; }',
+                '.cls-1 { fill: #333; stroke: red; }',
+            ],
+            'preserves internal url references' => [
+                '.cls { fill: url(#myGradient); }',
+                '.cls { fill: url(#myGradient); }',
+            ],
+            'preserves data uris' => [
+                '.cls { background: url(data:image/png;base64,abc123); }',
+                '.cls { background: url(data:image/png;base64,abc123); }',
+            ],
+            'handles mixed legitimate and malicious css' => [
+                ".cls-1 { fill: #333; }\n@import url(\"https://evil.com/track.css\");\n.cls-2 { stroke: url(#grad); background: url(https://evil.com/bg.gif); }",
+                ".cls-1 { fill: #333; }\n\n.cls-2 { stroke: url(#grad); background: url(); }",
+            ],
+        ];
+    }
+
+    #[Test]
+    public function it_sanitizes_style_tags_in_full_svg()
+    {
+        $svg = '<svg xmlns="http://www.w3.org/2000/svg"><style>@import url("https://evil.com/track.css"); .cls-1 { fill: #333; }</style><rect class="cls-1"/></svg>';
+
+        $result = Svg::sanitize($svg);
+
+        $this->assertStringNotContainsString('@import', $result);
+        $this->assertStringNotContainsString('evil.com', $result);
+        $this->assertStringContainsString('.cls-1', $result);
+        $this->assertStringContainsString('fill:', $result);
+    }
+
+    #[Test]
+    public function it_passes_through_svg_without_style_tags()
+    {
+        $svg = '<svg xmlns="http://www.w3.org/2000/svg"><rect width="1" height="1" fill="white"/></svg>';
+
+        $result = Svg::sanitize($svg);
+
+        $this->assertStringContainsString('<rect', $result);
+        $this->assertStringContainsString('<svg', $result);
+    }
+
+    #[Test]
+    public function it_preserves_xml_declaration()
+    {
+        $svg = '<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg"><rect/></svg>';
+
+        $result = Svg::sanitize($svg);
+
+        $this->assertStringStartsWith('<?xml', $result);
+    }
+
+    #[Test]
+    public function it_does_not_add_xml_declaration()
+    {
+        $svg = '<svg xmlns="http://www.w3.org/2000/svg"><rect/></svg>';
+
+        $result = Svg::sanitize($svg);
+
+        $this->assertStringStartsWith('<svg', $result);
+    }
+
+    #[Test]
+    public function it_sanitizes_css_inside_cdata_sections()
+    {
+        $svg = '<svg xmlns="http://www.w3.org/2000/svg"><style><![CDATA[@import url("https://evil.com/track.css"); .cls-1 { fill: url(https://evil.com/bg.gif); }]]></style><rect class="cls-1"/></svg>';
+
+        $result = Svg::sanitize($svg);
+
+        $this->assertStringNotContainsString('@import', $result);
+        $this->assertStringNotContainsString('evil.com', $result);
+        $this->assertStringContainsString('.cls-1', $result);
+        $this->assertStringContainsString('fill:', $result);
+    }
+}
diff --git a/tests/Tags/AssetsTest.php b/tests/Tags/AssetsTest.php
new file mode 100644
index 00000000000..c4d2aaf67c6
--- /dev/null
+++ b/tests/Tags/AssetsTest.php
@@ -0,0 +1,283 @@
+<?php
+
+namespace Tests\Tags;
+
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Asset;
+use Statamic\Facades\AssetContainer;
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
+use Statamic\Query\Scopes\Scope;
+use Statamic\Tags\Assets;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class AssetsTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        Storage::fake('test', ['url' => '/assets']);
+
+        Storage::disk('test')->put('a.jpg', UploadedFile::fake()->image('a.jpg')->getContent());
+        Storage::disk('test')->put('b.jpg', UploadedFile::fake()->image('b.jpg')->getContent());
+        Storage::disk('test')->put('c.mp4', UploadedFile::fake()->create('c.mp4')->getContent());
+        Storage::disk('test')->put('d.svg', '<svg xmlns="http://www.w3.org/2000/svg"></svg>');
+        Storage::disk('test')->put('e.mp3', UploadedFile::fake()->create('e.mp3')->getContent());
+        Storage::disk('test')->put('nested/private/f.jpg', UploadedFile::fake()->image('f.jpg')->getContent());
+        Storage::disk('test')->put('nested/public/g.jpg', UploadedFile::fake()->image('g.jpg')->getContent());
+
+        tap(AssetContainer::make('test')->disk('test'))->save();
+
+        Asset::find('test::a.jpg')->data(['title' => 'Alpha'])->save();
+        Asset::find('test::b.jpg')->data(['title' => 'Beta'])->save();
+        Asset::find('test::c.mp4')->data(['title' => 'Gamma'])->save();
+        Asset::find('test::d.svg')->data(['title' => 'Delta'])->save();
+        Asset::find('test::e.mp3')->data(['title' => 'Epsilon'])->save();
+        Asset::find('test::nested/private/f.jpg')->data(['title' => 'Zeta'])->save();
+        Asset::find('test::nested/public/g.jpg')->data(['title' => 'Eta'])->save();
+    }
+
+    #[Test]
+    public function it_filters_assets_by_conditions()
+    {
+        $this->assertSame(['a'], $this->getFilenames([
+            'title:is' => 'Alpha',
+        ]));
+
+        $this->assertSame(['b'], $this->getFilenames([
+            'filename:starts_with' => 'b',
+        ]));
+
+        $this->assertSame(['a', 'b', 'f', 'g'], $this->getFilenames([
+            'extension:is' => 'jpg',
+            'sort' => 'filename:asc',
+        ]));
+    }
+
+    #[Test]
+    public function it_filters_assets_by_custom_field_conditions()
+    {
+        Asset::find('test::b.jpg')->data([
+            'title' => 'Beta',
+            'alt' => 'Bob Ross',
+        ])->save();
+
+        $this->assertSame(['b'], $this->getFilenames([
+            'alt:contains' => 'Bob',
+        ]));
+    }
+
+    #[Test]
+    public function it_supports_query_scopes()
+    {
+        app('statamic.scopes')[AssetsTagJpgScope::handle()] = AssetsTagJpgScope::class;
+
+        $this->assertSame(['a', 'b', 'f', 'g'], $this->getFilenames([
+            'query_scope' => AssetsTagJpgScope::handle(),
+            'sort' => 'filename:asc',
+        ]));
+    }
+
+    #[Test]
+    public function it_filters_assets_by_type()
+    {
+        $this->assertSame(['e'], $this->getFilenames([
+            'type' => 'audio',
+            'sort' => 'filename:asc',
+        ]));
+
+        $this->assertSame(['a', 'b', 'f', 'g'], $this->getFilenames([
+            'type' => 'image',
+            'sort' => 'filename:asc',
+        ]));
+
+        $this->assertSame(['d'], $this->getFilenames([
+            'type' => 'svg',
+            'sort' => 'filename:asc',
+        ]));
+
+        $this->assertSame(['c'], $this->getFilenames([
+            'type' => 'video',
+            'sort' => 'filename:asc',
+        ]));
+
+        $this->assertSame([], $this->getFilenames([
+            'type' => 'invalid',
+            'sort' => 'filename:asc',
+        ]));
+    }
+
+    #[Test]
+    public function it_gets_assets_from_a_collection()
+    {
+        $this->createCollectionWithAssetFields();
+
+        tap(Entry::make()->collection('articles')->data([
+            'hero' => 'a.jpg',
+            'avatar' => 'b.jpg',
+        ]))->save();
+
+        tap(Entry::make()->collection('articles')->data([
+            'hero' => 'c.mp4',
+        ]))->save();
+
+        $this->assertSame(['a', 'b', 'c'], $this->getFilenames([
+            'collection' => 'articles',
+            'sort' => 'filename:asc',
+        ]));
+    }
+
+    #[Test]
+    public function it_gets_unique_assets_from_a_collection()
+    {
+        $this->createCollectionWithAssetFields();
+
+        tap(Entry::make()->collection('articles')->data(['hero' => 'a.jpg']))->save();
+        tap(Entry::make()->collection('articles')->data(['hero' => 'a.jpg']))->save();
+
+        $this->assertSame(['a'], $this->getFilenames([
+            'collection' => 'articles',
+        ]));
+    }
+
+    #[Test]
+    public function it_gets_assets_from_a_collection_filtered_by_type()
+    {
+        $this->createCollectionWithAssetFields();
+
+        tap(Entry::make()->collection('articles')->data([
+            'hero' => 'a.jpg',
+            'avatar' => 'c.mp4',
+        ]))->save();
+
+        $this->assertSame(['a'], $this->getFilenames([
+            'collection' => 'articles',
+            'type' => 'image',
+            'sort' => 'filename:asc',
+        ]));
+    }
+
+    #[Test]
+    public function it_gets_assets_from_a_collection_filtered_by_fields()
+    {
+        $this->createCollectionWithAssetFields();
+
+        tap(Entry::make()->collection('articles')->data([
+            'hero' => 'a.jpg',
+            'avatar' => 'b.jpg',
+        ]))->save();
+
+        $this->assertSame(['a'], $this->getFilenames([
+            'collection' => 'articles',
+            'fields' => 'hero',
+            'sort' => 'filename:asc',
+        ]));
+    }
+
+    #[Test]
+    public function it_filters_by_folder_non_recursively()
+    {
+        $this->assertSame(['f'], $this->getFilenames([
+            'folder' => 'nested/private',
+            'sort' => 'filename:asc',
+        ]));
+    }
+
+    #[Test]
+    public function it_returns_root_assets_when_folder_is_slash_without_recursive()
+    {
+        $this->assertSame(['a', 'b', 'c', 'd', 'e'], $this->getFilenames([
+            'folder' => '/',
+            'sort' => 'filename:asc',
+        ]));
+    }
+
+    #[Test]
+    public function it_keeps_legacy_filtering_params_working()
+    {
+        $this->assertSame(['g'], $this->getFilenames([
+            'folder' => 'nested',
+            'recursive' => true,
+            'sort' => 'filename:asc',
+            'offset' => 1,
+            'limit' => 1,
+        ]));
+
+        $this->assertSame(['a', 'b', 'c', 'd', 'e', 'g'], $this->getFilenames([
+            'not_in' => '/?nested/private',
+            'sort' => 'filename:asc',
+        ]));
+
+        $this->assertSame(['c', 'd'], $this->getFilenames([
+            'not_in' => '/?nested/private',
+            'sort' => 'filename:asc',
+            'offset' => 2,
+            'limit' => 2,
+        ]));
+    }
+
+    #[Test]
+    public function it_returns_no_results_when_query_matches_nothing()
+    {
+        $results = $this->runTag(['title:is' => 'nonexistent']);
+
+        $this->assertIsArray($results);
+        $this->assertTrue($results['no_results']);
+        $this->assertEquals(0, $results['total_results']);
+    }
+
+    private function createCollectionWithAssetFields()
+    {
+        tap(Collection::make('articles'))->save();
+
+        $blueprint = tap(Blueprint::make('article')->setContents([
+            'fields' => [
+                ['handle' => 'hero', 'field' => ['type' => 'assets', 'container' => 'test', 'max_files' => 1]],
+                ['handle' => 'avatar', 'field' => ['type' => 'assets', 'container' => 'test', 'max_files' => 1]],
+            ],
+        ]))->save();
+
+        Blueprint::shouldReceive('in')->with('collections/articles')->andReturn(collect([$blueprint]));
+    }
+
+    private function runTag(array $params = [])
+    {
+        $tag = new Assets;
+        $tag->setContext([]);
+        $tag->setParameters(isset($params['collection'])
+            ? $params
+            : array_merge(['container' => 'test'], $params));
+
+        return $tag->index();
+    }
+
+    private function getFilenames(array $params = []): array
+    {
+        $results = $this->runTag($params);
+
+        if (is_array($results) && isset($results['results'])) {
+            $results = $results['results'];
+        }
+
+        if (is_array($results) && ($results['no_results'] ?? false)) {
+            return [];
+        }
+
+        return collect($results)->map->filename()->values()->all();
+    }
+}
+
+class AssetsTagJpgScope extends Scope
+{
+    public function apply($query, $params)
+    {
+        $query->where('extension', 'jpg');
+    }
+}
diff --git a/tests/Tags/Form/FormCreateAlpineTest.php b/tests/Tags/Form/FormCreateAlpineTest.php
index 5c7a345b39e..bb2b56c327f 100644
--- a/tests/Tags/Form/FormCreateAlpineTest.php
+++ b/tests/Tags/Form/FormCreateAlpineTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Tags\Form;
 
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Form;
 use Statamic\Statamic;
 
 class FormCreateAlpineTest extends FormTestCase
@@ -932,6 +933,32 @@ public function it_dynamically_renders_precognition_text_field_x_on_change()
         $this->assertFieldRendersHtml(['<input id="[[form-handle]]-form-name-field" type="text" name="name" value="" x-model="form.name" @change="form.validate(\'name\')">'], $config, [], ['js' => 'alpine_precognition']);
     }
 
+    #[Test]
+    public function it_validates_precognitive_requests()
+    {
+        $this
+            ->withPrecognition()
+            ->withHeaders(['Precognition-Validate-Only' => 'email'])
+            ->postJson('/!/forms/contact', ['email' => ''])
+            ->assertStatus(422)
+            ->assertJsonValidationErrors(['email'])
+            ->assertJsonMissingValidationErrors(['message']);
+    }
+
+    #[Test]
+    public function it_wont_submit_form_when_precognition_validate_only_header_is_spoofed()
+    {
+        $this->assertEmpty(Form::find('contact')->submissions());
+
+        $this
+            ->withHeaders(['Precognition-Validate-Only' => 'foo'])
+            ->post('/!/forms/contact', [])
+            ->assertSessionHasErrors(['email'], null, 'form.contact')
+            ->assertLocation('/');
+
+        $this->assertEmpty(Form::find('contact')->submissions());
+    }
+
     private function jsonEncode($data)
     {
         return Statamic::modify($data)->toJson()->entities();
diff --git a/tests/Tags/Form/FormUploadValidationTest.php b/tests/Tags/Form/FormUploadValidationTest.php
new file mode 100644
index 00000000000..681d8b6e989
--- /dev/null
+++ b/tests/Tags/Form/FormUploadValidationTest.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Tests\Tags\Form;
+
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\AssetContainer;
+
+class FormUploadValidationTest extends FormTestCase
+{
+    #[Test]
+    public function it_rejects_disallowed_extensions_uploaded_to_a_files_field()
+    {
+        Storage::fake('local');
+
+        $this->createForm([
+            'fields' => [
+                ['handle' => 'document', 'field' => ['type' => 'files']],
+            ],
+        ], 'survey');
+
+        $this
+            ->post('/!/forms/survey', [
+                'document' => UploadedFile::fake()->create('evil.php', 10),
+            ])
+            ->assertSessionHasErrors('document.0', null, 'form.survey');
+    }
+
+    #[Test]
+    public function it_allows_permitted_extensions_uploaded_to_a_files_field()
+    {
+        Storage::fake('local');
+
+        $this->createForm([
+            'fields' => [
+                ['handle' => 'document', 'field' => ['type' => 'files']],
+            ],
+        ], 'survey');
+
+        $this
+            ->post('/!/forms/survey', [
+                'document' => UploadedFile::fake()->create('notes.txt', 10),
+            ])
+            ->assertSessionHasNoErrors();
+    }
+
+    #[Test]
+    public function it_enforces_asset_container_validation_rules_on_an_assets_field()
+    {
+        Storage::fake('avatars');
+        AssetContainer::make('avatars')->disk('avatars')->validationRules(['extensions:jpg,png'])->save();
+
+        $this->createForm([
+            'fields' => [
+                ['handle' => 'bravo', 'field' => ['type' => 'assets', 'container' => 'avatars', 'max_files' => 1]],
+            ],
+        ], 'survey');
+
+        $this
+            ->post('/!/forms/survey', [
+                'bravo' => UploadedFile::fake()->create('script.js', 10),
+            ])
+            ->assertSessionHasErrors('bravo.0', null, 'form.survey');
+    }
+
+    #[Test]
+    public function it_allows_uploads_permitted_by_the_asset_container_validation_rules()
+    {
+        Storage::fake('avatars');
+        AssetContainer::make('avatars')->disk('avatars')->validationRules(['extensions:jpg,png'])->save();
+
+        $this->createForm([
+            'fields' => [
+                ['handle' => 'bravo', 'field' => ['type' => 'assets', 'container' => 'avatars', 'max_files' => 1]],
+            ],
+        ], 'survey');
+
+        $this
+            ->post('/!/forms/survey', [
+                'bravo' => UploadedFile::fake()->image('avatar.jpg'),
+            ])
+            ->assertSessionHasNoErrors();
+    }
+}
diff --git a/tests/Tags/InstalledTest.php b/tests/Tags/InstalledTest.php
index 481d653cda9..a7694810c40 100644
--- a/tests/Tags/InstalledTest.php
+++ b/tests/Tags/InstalledTest.php
@@ -34,4 +34,18 @@ public function it_can_check_if_package_is_installed_using_tag_pair()
         $this->assertEquals('yes', $this->tag('{{ installed:hasselhoff/baywatch-embeds }}yes{{ /installed:hasselhoff/baywatch-embeds }}'));
         $this->assertEquals('', $this->tag('{{ installed:hasselhoff/lotr-embeds }}yes{{ /installed:hasselhoff/lotr-embeds }}'));
     }
+
+    #[Test]
+    public function it_can_check_if_package_is_installed_using_param()
+    {
+        $this->assertEquals('yes', $this->tag('{{ installed package="hasselhoff/baywatch-embeds" }}yes{{ /installed }}'));
+        $this->assertEquals('', $this->tag('{{ installed package="hasselhoff/lotr-embeds" }}yes{{ /installed }}'));
+    }
+
+    #[Test]
+    public function it_outputs_empty_when_passing_nothing()
+    {
+        $this->assertEquals('', $this->tag('{{ installed package="" }}yes{{ /installed }}'));
+        $this->assertEquals('', $this->tag('{{ installed :package="null" }}yes{{ /installed }}'));
+    }
 }
diff --git a/tests/Tags/SvgTagTest.php b/tests/Tags/SvgTagTest.php
index 181c30d5038..0033285061e 100644
--- a/tests/Tags/SvgTagTest.php
+++ b/tests/Tags/SvgTagTest.php
@@ -114,6 +114,19 @@ public function sanitization_can_be_disabled()
         $this->assertEquals('<svg><path/></svg>', $this->tag('{{ svg src="xss" }}'));
     }
 
+    #[Test]
+    public function it_sanitizes_css_in_style_tags()
+    {
+        File::put(resource_path('css-inject.svg'), '<svg xmlns="http://www.w3.org/2000/svg"><style>@import url("https://evil.com/track.css"); .cls-1 { fill: #333; }</style><rect class="cls-1"/></svg>');
+
+        $result = $this->tag('{{ svg src="css-inject" }}');
+
+        $this->assertStringNotContainsString('@import', $result);
+        $this->assertStringNotContainsString('evil.com', $result);
+        $this->assertStringContainsString('.cls-1', $result);
+        $this->assertStringContainsString('fill:', $result);
+    }
+
     #[Test]
     public function fails_gracefully_when_src_is_empty()
     {
diff --git a/tests/Tags/User/DeletePasskeyFormTest.php b/tests/Tags/User/DeletePasskeyFormTest.php
new file mode 100644
index 00000000000..74fbf0b0cf8
--- /dev/null
+++ b/tests/Tags/User/DeletePasskeyFormTest.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Mockery;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Contracts\Auth\Passkey;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Statamic\Statamic;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('passkeys')]
+class DeletePasskeyFormTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, trusted: true);
+    }
+
+    #[Test]
+    public function it_returns_empty_when_not_logged_in()
+    {
+        $output = $this->tag('{{ user:delete_passkey_form id="passkey-123" }}Delete{{ /user:delete_passkey_form }}');
+
+        $this->assertEquals('', $output);
+    }
+
+    #[Test]
+    public function it_returns_empty_when_passkey_not_found()
+    {
+        $user = Mockery::mock(User::make()->email('test@example.com'))->makePartial();
+        $user->shouldReceive('passkeys')->andReturn(collect([]));
+        $user->save();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:delete_passkey_form id="nonexistent" }}Delete{{ /user:delete_passkey_form }}');
+
+        $this->assertEquals('', $output);
+    }
+
+    #[Test]
+    public function it_renders_form()
+    {
+        $passkey = Mockery::mock(Passkey::class);
+        $passkey->shouldReceive('id')->andReturn('passkey-123');
+
+        $user = Mockery::mock(User::make()->email('test@example.com'))->makePartial();
+        $user->shouldReceive('passkeys')->andReturn(collect(['passkey-123' => $passkey]));
+        $user->save();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:delete_passkey_form id="passkey-123" }}<button>Delete</button>{{ /user:delete_passkey_form }}');
+
+        $this->assertStringContainsString('<form', $output);
+        $this->assertStringContainsString('method="POST"', $output);
+        $this->assertStringContainsString('action="'.route('statamic.passkeys.destroy', ['id' => 'passkey-123']).'"', $output);
+        $this->assertStringContainsString('name="_method"', $output);
+        $this->assertStringContainsString('value="DELETE"', $output);
+        $this->assertStringContainsString('name="_token"', $output);
+        $this->assertStringContainsString('<button>Delete</button>', $output);
+    }
+
+    #[Test]
+    public function it_fetches_form_data()
+    {
+        $passkey = Mockery::mock(Passkey::class);
+        $passkey->shouldReceive('id')->andReturn('passkey-789');
+
+        $user = Mockery::mock(User::make()->email('test@example.com'))->makePartial();
+        $user->shouldReceive('passkeys')->andReturn(collect(['passkey-789' => $passkey]));
+        $user->save();
+
+        $this->actingAs($user);
+
+        $form = Statamic::tag('user:delete_passkey_form')->params(['id' => 'passkey-789'])->fetch();
+
+        $this->assertIsArray($form);
+        $this->assertArrayHasKey('attrs', $form);
+        $this->assertArrayHasKey('params', $form);
+        $this->assertEquals('DELETE', $form['params']['_method']);
+    }
+
+    #[Test]
+    public function it_requires_authentication_for_delete()
+    {
+        $this->deleteJson(route('statamic.passkeys.destroy', ['id' => 'passkey-123']))->assertUnauthorized();
+    }
+
+    #[Test]
+    public function it_deletes_a_passkey_via_json()
+    {
+        $mockPasskey = Mockery::mock(Passkey::class);
+        $mockPasskey->shouldReceive('delete')->once();
+
+        $mockCollection = collect(['passkey-123' => $mockPasskey]);
+        $mockCollection = Mockery::mock($mockCollection)->makePartial();
+        $mockCollection->shouldReceive('get')->with('passkey-123')->andReturn($mockPasskey);
+
+        $user = Mockery::mock(User::make()->id('test-user')->email('test@example.com')->password('secret'))->makePartial();
+        $user->shouldReceive('passkeys')->andReturn($mockCollection);
+        $user->save();
+
+        $this
+            ->actingAs($user)
+            ->deleteJson(route('statamic.passkeys.destroy', ['id' => 'passkey-123']))
+            ->assertStatus(204);
+    }
+
+    #[Test]
+    public function it_deletes_a_passkey_via_form_and_redirects()
+    {
+        $mockPasskey = Mockery::mock(Passkey::class);
+        $mockPasskey->shouldReceive('delete')->once();
+
+        $mockCollection = collect(['passkey-123' => $mockPasskey]);
+        $mockCollection = Mockery::mock($mockCollection)->makePartial();
+        $mockCollection->shouldReceive('get')->with('passkey-123')->andReturn($mockPasskey);
+
+        $user = Mockery::mock(User::make()->id('test-user')->email('test@example.com')->password('secret'))->makePartial();
+        $user->shouldReceive('passkeys')->andReturn($mockCollection);
+        $user->save();
+
+        $this
+            ->actingAs($user)
+            ->from('/account/passkeys')
+            ->delete(route('statamic.passkeys.destroy', ['id' => 'passkey-123']))
+            ->assertRedirect('/account/passkeys')
+            ->assertSessionHas('success');
+    }
+
+    #[Test]
+    public function it_returns_403_when_deleting_nonexistent_passkey()
+    {
+        $mockCollection = collect([]);
+        $mockCollection = Mockery::mock($mockCollection)->makePartial();
+        $mockCollection->shouldReceive('get')->with('nonexistent')->andReturnNull();
+
+        $user = Mockery::mock(User::make()->id('test-user')->email('test@example.com')->password('secret'))->makePartial();
+        $user->shouldReceive('passkeys')->andReturn($mockCollection);
+        $user->save();
+
+        $this
+            ->actingAs($user)
+            ->deleteJson(route('statamic.passkeys.destroy', ['id' => 'nonexistent']))
+            ->assertStatus(403);
+    }
+}
diff --git a/tests/Tags/User/DisableTwoFactorFormTest.php b/tests/Tags/User/DisableTwoFactorFormTest.php
new file mode 100644
index 00000000000..571b4be679b
--- /dev/null
+++ b/tests/Tags/User/DisableTwoFactorFormTest.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Auth\TwoFactor\RecoveryCode;
+use Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('2fa')]
+class DisableTwoFactorFormTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, trusted: true);
+    }
+
+    #[Test]
+    public function it_renders_for_user_with_2fa()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:disable_two_factor_form }}{{ /user:disable_two_factor_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/two-factor/disable">', $output);
+        $this->assertStringContainsString('<input type="hidden" name="_method" value="DELETE"', $output);
+        $this->assertStringContainsString(csrf_field(), $output);
+    }
+
+    #[Test]
+    public function it_does_not_render_for_user_without_2fa()
+    {
+        $user = $this->user();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:disable_two_factor_form }}<p>inside</p>{{ /user:disable_two_factor_form }}');
+
+        $this->assertStringNotContainsString('<form', $output);
+        $this->assertStringNotContainsString('<p>inside</p>', $output);
+    }
+
+    #[Test]
+    public function it_does_not_render_for_guests()
+    {
+        $output = $this->tag('{{ user:disable_two_factor_form }}<p>inside</p>{{ /user:disable_two_factor_form }}');
+
+        $this->assertStringNotContainsString('<form', $output);
+        $this->assertStringNotContainsString('<p>inside</p>', $output);
+    }
+
+    #[Test]
+    public function it_renders_with_redirect_param()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:disable_two_factor_form redirect="/account" }}{{ /user:disable_two_factor_form }}');
+
+        $this->assertStringContainsString('<input type="hidden" name="_redirect" value="/account" />', $output);
+    }
+
+    #[Test]
+    public function it_disables_2fa_and_redirects()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->actingAs($user)
+            ->session(['statamic_elevated_session' => now()->timestamp])
+            ->delete(route('statamic.users.two-factor.disable'), [
+                '_redirect' => '/account',
+            ])
+            ->assertRedirect('/account')
+            ->assertSessionHas('user.two_factor_disable.success');
+
+        $this->assertNull($user->fresh()->two_factor_confirmed_at);
+    }
+
+    #[Test]
+    public function it_requires_elevated_session_to_disable()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->actingAs($user)
+            ->delete(route('statamic.users.two-factor.disable'), [
+                '_redirect' => '/account',
+            ])
+            ->assertRedirect(route('statamic.elevated-session'));
+    }
+
+    #[Test]
+    public function it_redirects_to_configured_setup_url_when_2fa_is_enforced()
+    {
+        config([
+            'statamic.users.two_factor_enforced_roles' => ['*'],
+            'statamic.users.two_factor_setup_url' => '/auth/setup-2fa',
+        ]);
+
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->actingAs($user)
+            ->session(['statamic_elevated_session' => now()->timestamp])
+            ->delete(route('statamic.users.two-factor.disable'), [
+                '_redirect' => '/account',
+            ])
+            ->assertRedirect('/auth/setup-2fa')
+            ->assertSessionHas('user.two_factor_disable.success');
+    }
+
+    #[Test]
+    public function it_falls_back_to_default_setup_route_when_no_config_and_2fa_is_enforced()
+    {
+        config(['statamic.users.two_factor_enforced_roles' => ['*']]);
+
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->actingAs($user)
+            ->session(['statamic_elevated_session' => now()->timestamp])
+            ->delete(route('statamic.users.two-factor.disable'), [
+                '_redirect' => '/account',
+            ])
+            ->assertRedirect(route('statamic.two-factor-setup'));
+    }
+
+    #[Test]
+    public function it_prefers_redirect_param_over_intended_url_in_session()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->actingAs($user)
+            ->session([
+                'statamic_elevated_session' => now()->timestamp,
+                'url.intended' => '/dashboard',
+            ])
+            ->delete(route('statamic.users.two-factor.disable'), [
+                '_redirect' => '/account',
+            ])
+            ->assertRedirect('/account');
+
+        $this->assertNull($user->fresh()->two_factor_confirmed_at);
+    }
+
+    #[Test]
+    public function it_redirects_back_without_redirect_param()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->actingAs($user)
+            ->session(['statamic_elevated_session' => now()->timestamp])
+            ->from('/account')
+            ->delete(route('statamic.users.two-factor.disable'))
+            ->assertRedirect('/account')
+            ->assertSessionHas('user.two_factor_disable.success');
+
+        $this->assertNull($user->fresh()->two_factor_confirmed_at);
+    }
+
+    #[Test]
+    public function it_returns_json_for_xhr_requests()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->actingAs($user)
+            ->session(['statamic_elevated_session' => now()->timestamp])
+            ->deleteJson(route('statamic.users.two-factor.disable'))
+            ->assertOk()
+            ->assertJson(['redirect' => null]);
+
+        $this->assertNull($user->fresh()->two_factor_confirmed_at);
+    }
+
+    private function user()
+    {
+        return tap(User::make()->makeSuper()->email('test@example.com'))->save();
+    }
+
+    private function userWithTwoFactorEnabled()
+    {
+        $user = $this->user();
+
+        $user->merge([
+            'two_factor_confirmed_at' => now()->timestamp,
+            'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+            'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, function () {
+                return RecoveryCode::generate();
+            })->all())),
+        ]);
+
+        $user->save();
+
+        return $user;
+    }
+}
diff --git a/tests/Tags/User/ElevatedSessionFormTest.php b/tests/Tags/User/ElevatedSessionFormTest.php
new file mode 100644
index 00000000000..c1eed6de8bb
--- /dev/null
+++ b/tests/Tags/User/ElevatedSessionFormTest.php
@@ -0,0 +1,255 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Str;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Auth\File\Passkey;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Statamic\Notifications\ElevatedSessionVerificationCode;
+use Statamic\Statamic;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('elevated-session')]
+class ElevatedSessionFormTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    protected function resolveApplicationConfiguration($app)
+    {
+        parent::resolveApplicationConfiguration($app);
+
+        $app->booted(function () {
+            Route::get('/test-elevated-form', function () {
+                return Parse::template('{{ user:elevated_session_form }}content{{ /user:elevated_session_form }}', trusted: true);
+            });
+        });
+    }
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, trusted: true);
+    }
+
+    #[Test]
+    public function it_renders_form()
+    {
+        $user = User::make()->email('foo@bar.com')->password('secret');
+        $user->save();
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:elevated_session_form }}{{ /user:elevated_session_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/elevated-session">', $output);
+        $this->assertStringContainsString(csrf_field(), $output);
+        $this->assertStringEndsWith('</form>', $output);
+    }
+
+    #[Test]
+    public function it_renders_form_with_params()
+    {
+        $user = User::make()->email('foo@bar.com')->password('secret');
+        $user->save();
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:elevated_session_form class="form" id="form" }}{{ /user:elevated_session_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/elevated-session" class="form" id="form">', $output);
+    }
+
+    #[Test]
+    public function it_provides_method_context()
+    {
+        $user = User::make()->email('foo@bar.com')->password('secret');
+        $user->save();
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:elevated_session_form }}<p class="method">{{ method }}</p>{{ /user:elevated_session_form }}');
+
+        preg_match('/<p class="method">(.+)<\/p>/U', $output, $matches);
+        $this->assertEquals('password_confirmation', $matches[1]);
+    }
+
+    #[Test]
+    public function it_provides_verification_code_method_for_passwordless_users()
+    {
+        Notification::fake();
+
+        $user = User::make()->email('foo@bar.com');
+        $user->save();
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:elevated_session_form }}<p class="method">{{ method }}</p>{{ /user:elevated_session_form }}');
+
+        preg_match('/<p class="method">(.+)<\/p>/U', $output, $matches);
+        $this->assertEquals('verification_code', $matches[1]);
+    }
+
+    #[Test]
+    public function it_provides_passkey_method_when_passwords_are_disabled()
+    {
+        config(['statamic.webauthn.allow_password_login_with_passkey' => false]);
+
+        $user = User::make()->email('foo@bar.com');
+        $user->save();
+
+        $passkey = \Mockery::mock(Passkey::class);
+        $passkey->shouldReceive('id')->andReturn('passkey-1');
+        $user->setPasskeys(collect([$passkey]));
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:elevated_session_form }}<p class="method">{{ method }}</p>{{ /user:elevated_session_form }}');
+
+        preg_match('/<p class="method">(.+)<\/p>/U', $output, $matches);
+        $this->assertEquals('passkey', $matches[1]);
+    }
+
+    #[Test]
+    public function it_provides_resend_code_url()
+    {
+        $user = User::make()->email('foo@bar.com')->password('secret');
+        $user->save();
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:elevated_session_form }}<a href="{{ resend_code_url }}">Resend</a>{{ /user:elevated_session_form }}');
+
+        $this->assertStringContainsString('href="http://localhost/!/auth/elevated-session/resend-code"', $output);
+    }
+
+    #[Test]
+    public function it_sends_verification_code_when_method_is_verification_code()
+    {
+        Notification::fake();
+        Str::createRandomStringsUsing(fn () => 'abc');
+
+        $user = User::make()->email('foo@bar.com');
+        $user->save();
+        $this->actingAs($user);
+
+        $this->tag('{{ user:elevated_session_form }}{{ /user:elevated_session_form }}');
+
+        Notification::assertSentTo($user, ElevatedSessionVerificationCode::class, function ($notification) {
+            return $notification->verificationCode === 'abc';
+        });
+
+        $this->assertEquals('abc', session()->get('statamic_elevated_session_verification_code')['code']);
+    }
+
+    #[Test]
+    public function it_does_not_render_when_user_not_logged_in()
+    {
+        $output = $this->tag('{{ user:elevated_session_form }}content{{ /user:elevated_session_form }}');
+
+        $this->assertEquals('', $output);
+    }
+
+    #[Test]
+    public function it_fetches_form_data()
+    {
+        $user = User::make()->email('foo@bar.com')->password('secret');
+        $user->save();
+        $this->actingAs($user);
+
+        $form = Statamic::tag('user:elevated_session_form')->fetch();
+
+        $this->assertEquals('http://localhost/!/auth/elevated-session', $form['attrs']['action']);
+        $this->assertEquals('POST', $form['attrs']['method']);
+        $this->assertEquals('password_confirmation', $form['method']);
+        $this->assertArrayHasKey('_token', $form['params']);
+    }
+
+    #[Test]
+    public function it_can_confirm_with_password()
+    {
+        $this->freezeTime();
+
+        $user = User::make()->email('foo@bar.com')->password('secret');
+        $user->save();
+
+        $this
+            ->actingAs($user)
+            ->post('/!/auth/elevated-session', [
+                'password' => 'secret',
+            ])
+            ->assertSessionHas('statamic_elevated_session', now()->timestamp);
+    }
+
+    #[Test]
+    public function it_cannot_confirm_with_incorrect_password()
+    {
+        $user = User::make()->email('foo@bar.com')->password('secret');
+        $user->save();
+
+        $this
+            ->actingAs($user)
+            ->post('/!/auth/elevated-session', [
+                'password' => 'wrong',
+            ])
+            ->assertSessionHasErrors(['password'], null, 'user.elevated_session')
+            ->assertSessionMissing('statamic_elevated_session');
+    }
+
+    #[Test]
+    public function it_can_confirm_with_verification_code()
+    {
+        $this->freezeTime();
+        Notification::fake();
+        Str::createRandomStringsUsing(fn () => 'abc123');
+
+        $user = User::make()->email('foo@bar.com');
+        $user->save();
+
+        $this->actingAs($user);
+        session()->sendElevatedSessionVerificationCode();
+
+        $this
+            ->actingAs($user)
+            ->post('/!/auth/elevated-session', [
+                'verification_code' => 'abc123',
+            ])
+            ->assertSessionHas('statamic_elevated_session', now()->timestamp);
+    }
+
+    #[Test]
+    public function it_cannot_confirm_with_incorrect_verification_code()
+    {
+        Notification::fake();
+        Str::createRandomStringsUsing(fn () => 'abc123');
+
+        $user = User::make()->email('foo@bar.com');
+        $user->save();
+
+        $this->actingAs($user);
+        session()->sendElevatedSessionVerificationCode();
+
+        $this
+            ->actingAs($user)
+            ->post('/!/auth/elevated-session', [
+                'verification_code' => 'wrong',
+            ])
+            ->assertSessionHasErrors(['verification_code'], null, 'user.elevated_session')
+            ->assertSessionMissing('statamic_elevated_session');
+    }
+
+    #[Test]
+    public function it_redirects_to_intended_url_after_confirmation()
+    {
+        $user = User::make()->email('foo@bar.com')->password('secret');
+        $user->save();
+
+        redirect()->setIntendedUrl('/intended-destination');
+
+        $this
+            ->actingAs($user)
+            ->post('/!/auth/elevated-session', [
+                'password' => 'secret',
+            ])
+            ->assertRedirect('/intended-destination');
+    }
+}
diff --git a/tests/Tags/User/ForgotPasswordFormTest.php b/tests/Tags/User/ForgotPasswordFormTest.php
index f2c7e1f282c..cda33cf5f97 100644
--- a/tests/Tags/User/ForgotPasswordFormTest.php
+++ b/tests/Tags/User/ForgotPasswordFormTest.php
@@ -78,7 +78,7 @@ public function it_renders_form_with_redirects_to_anchor()
     }
 
     #[Test]
-    public function it_wont_send_reset_link_for_non_existent_user_and_renders_errors()
+    public function it_returns_generic_success_for_non_existent_user_to_prevent_enumeration()
     {
         $this
             ->post('/!/auth/password/email', [
@@ -101,17 +101,32 @@ public function it_wont_send_reset_link_for_non_existent_user_and_renders_errors
         preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
         preg_match_all('/<p class="email_sent">(.+)<\/p>/U', $output, $emailSent);
 
-        $this->assertEquals([__(Password::INVALID_USER)], $errors[1]);
-        $this->assertEmpty($success[1]);
-        $this->assertEmpty($emailSent[1]);
+        $this->assertEmpty($errors[1]);
+        $this->assertEquals([__(Password::RESET_LINK_SENT)], $success[1]);
+        $this->assertEquals([__(Password::RESET_LINK_SENT)], $emailSent[1]);
     }
 
     #[Test]
-    public function it_wont_send_reset_link_for_invalid_email_and_renders_errors()
+    public function it_returns_generic_success_for_throttled_user_to_prevent_enumeration()
     {
+        $throttled = new class
+        {
+            public function sendResetLink()
+            {
+                return Password::RESET_THROTTLED;
+            }
+        };
+
+        Password::shouldReceive('broker')->andReturn($throttled);
+
+        User::make()
+            ->email('san@holo.com')
+            ->password('chewy')
+            ->save();
+
         $this
             ->post('/!/auth/password/email', [
-                'email' => 'test',
+                'email' => 'san@holo.com',
             ])
             ->assertLocation('/');
 
@@ -130,24 +145,17 @@ public function it_wont_send_reset_link_for_invalid_email_and_renders_errors()
         preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
         preg_match_all('/<p class="email_sent">(.+)<\/p>/U', $output, $emailSent);
 
-        $this->assertEquals([__('validation.email', ['attribute' => 'email'])], $errors[1]);
-        $this->assertEmpty($success[1]);
-        $this->assertEmpty($emailSent[1]);
+        $this->assertEmpty($errors[1]);
+        $this->assertEquals([__(Password::RESET_LINK_SENT)], $success[1]);
+        $this->assertEquals([__(Password::RESET_LINK_SENT)], $emailSent[1]);
     }
 
     #[Test]
-    public function it_will_send_password_reset_email_and_render_success()
+    public function it_wont_send_reset_link_for_invalid_email_and_renders_errors()
     {
-        $this->simulateSuccessfulPasswordResetEmail();
-
-        User::make()
-            ->email('san@holo.com')
-            ->password('chewy')
-            ->save();
-
         $this
             ->post('/!/auth/password/email', [
-                'email' => 'san@holo.com',
+                'email' => 'test',
             ])
             ->assertLocation('/');
 
@@ -156,7 +164,6 @@ public function it_will_send_password_reset_email_and_render_success()
     {{ errors }}
         <p class="error">{{ value }}</p>
     {{ /errors }}
-
     <p class="success">{{ success }}</p>
     <p class="email_sent">{{ email_sent }}</p>
 {{ /user:forgot_password_form }}
@@ -167,13 +174,13 @@ public function it_will_send_password_reset_email_and_render_success()
         preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
         preg_match_all('/<p class="email_sent">(.+)<\/p>/U', $output, $emailSent);
 
-        $this->assertEmpty($errors[1]);
-        $this->assertEquals([__(Password::RESET_LINK_SENT)], $success[1]);
-        $this->assertEquals([__(Password::RESET_LINK_SENT)], $emailSent[1]);
+        $this->assertEquals([__('validation.email', ['attribute' => 'email'])], $errors[1]);
+        $this->assertEmpty($success[1]);
+        $this->assertEmpty($emailSent[1]);
     }
 
     #[Test]
-    public function it_will_send_password_reset_email_and_follow_custom_redirect_with_success()
+    public function it_will_send_password_reset_email_and_render_success()
     {
         $this->simulateSuccessfulPasswordResetEmail();
 
@@ -185,9 +192,8 @@ public function it_will_send_password_reset_email_and_follow_custom_redirect_wit
         $this
             ->post('/!/auth/password/email', [
                 'email' => 'san@holo.com',
-                '_redirect' => '/password-reset-successful',
             ])
-            ->assertLocation('/password-reset-successful');
+            ->assertLocation('/');
 
         $output = $this->tag(<<<'EOT'
 {{ user:forgot_password_form }}
@@ -211,20 +217,28 @@ public function it_will_send_password_reset_email_and_follow_custom_redirect_wit
     }
 
     #[Test]
-    public function it_wont_log_user_in_and_follow_custom_error_redirect_with_errors()
+    public function it_will_send_password_reset_email_and_follow_custom_redirect_with_success()
     {
+        $this->simulateSuccessfulPasswordResetEmail();
+
+        User::make()
+            ->email('san@holo.com')
+            ->password('chewy')
+            ->save();
+
         $this
             ->post('/!/auth/password/email', [
                 'email' => 'san@holo.com',
-                '_error_redirect' => '/password-reset-error',
+                '_redirect' => '/password-reset-successful',
             ])
-            ->assertLocation('/password-reset-error');
+            ->assertLocation('/password-reset-successful');
 
         $output = $this->tag(<<<'EOT'
 {{ user:forgot_password_form }}
     {{ errors }}
         <p class="error">{{ value }}</p>
     {{ /errors }}
+
     <p class="success">{{ success }}</p>
     <p class="email_sent">{{ email_sent }}</p>
 {{ /user:forgot_password_form }}
@@ -235,9 +249,9 @@ public function it_wont_log_user_in_and_follow_custom_error_redirect_with_errors
         preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
         preg_match_all('/<p class="email_sent">(.+)<\/p>/U', $output, $emailSent);
 
-        $this->assertEquals([__(Password::INVALID_USER)], $errors[1]);
-        $this->assertEmpty($success[1]);
-        $this->assertEmpty($emailSent[1]);
+        $this->assertEmpty($errors[1]);
+        $this->assertEquals([__(Password::RESET_LINK_SENT)], $success[1]);
+        $this->assertEquals([__(Password::RESET_LINK_SENT)], $emailSent[1]);
     }
 
     #[Test]
@@ -259,18 +273,6 @@ public function it_wont_follow_redirect_to_external_url()
             ->assertLocation('/forgot-password');
     }
 
-    #[Test]
-    public function it_wont_follow_redirect_to_external_url_on_error()
-    {
-        $this
-            ->from('/forgot-password')
-            ->post('/!/auth/password/email', [
-                'email' => 'nonexistent@test.com',
-                '_error_redirect' => 'https://external-site.com/phishing',
-            ])
-            ->assertLocation('/forgot-password');
-    }
-
     #[Test]
     public function it_will_use_redirect_query_param_off_url()
     {
diff --git a/tests/Tags/User/LoginFormTest.php b/tests/Tags/User/LoginFormTest.php
index 343d329ebff..aa22e294568 100644
--- a/tests/Tags/User/LoginFormTest.php
+++ b/tests/Tags/User/LoginFormTest.php
@@ -4,18 +4,23 @@
 
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Event;
+use Mockery;
+use Orchestra\Testbench\Attributes\DefineEnvironment;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Auth\TwoFactor\RecoveryCode;
+use Statamic\Contracts\Auth\Passkey;
 use Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider;
 use Statamic\Events\TwoFactorAuthenticationChallenged;
 use Statamic\Facades\Parse;
 use Statamic\Facades\User;
+use Statamic\Facades\WebAuthn;
 use Statamic\Statamic;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
 #[Group('2fa')]
+#[Group('passkeys')]
 class LoginFormTest extends TestCase
 {
     use PreventSavingStacheItemsToDisk;
@@ -322,4 +327,319 @@ public function it_redirects_to_the_two_factor_challenge_page()
 
         Event::assertDispatched(TwoFactorAuthenticationChallenged::class, fn ($event) => $event->user->id === 1);
     }
+
+    #[Test]
+    public function it_redirects_to_configured_two_factor_challenge_url()
+    {
+        Event::fake();
+
+        config(['statamic.users.two_factor_challenge_url' => '/custom-2fa-challenge']);
+
+        User::make()
+            ->id(1)
+            ->email('san@holo.com')
+            ->password('chewy')
+            ->data([
+                'two_factor_confirmed_at' => now()->timestamp,
+                'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+                'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, function () {
+                    return RecoveryCode::generate();
+                })->all())),
+            ])
+            ->save();
+
+        $this
+            ->assertGuest()
+            ->post('/!/auth/login', [
+                'token' => 'test-token',
+                'email' => 'san@holo.com',
+                'password' => 'chewy',
+            ])
+            ->assertRedirect('/custom-2fa-challenge')
+            ->assertSessionHas('login.id', 1);
+
+        Event::assertDispatched(TwoFactorAuthenticationChallenged::class);
+    }
+
+    #[Test]
+    public function it_stores_redirect_as_intended_url_for_two_factor_challenge()
+    {
+        User::make()
+            ->id(1)
+            ->email('san@holo.com')
+            ->password('chewy')
+            ->data([
+                'two_factor_confirmed_at' => now()->timestamp,
+                'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+                'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, function () {
+                    return RecoveryCode::generate();
+                })->all())),
+            ])
+            ->save();
+
+        $this
+            ->post('/!/auth/login', [
+                'token' => 'test-token',
+                'email' => 'san@holo.com',
+                'password' => 'chewy',
+                '_redirect' => '/dashboard',
+            ])
+            ->assertSessionHas('url.intended', '/dashboard');
+    }
+
+    #[Test]
+    public function it_redirects_to_intended_url_when_no_redirect_param_is_provided()
+    {
+        User::make()
+            ->id(1)
+            ->email('san@holo.com')
+            ->password('chewy')
+            ->save();
+
+        $this
+            ->withSession(['url.intended' => '/protected'])
+            ->post('/!/auth/login', [
+                'token' => 'test-token',
+                'email' => 'san@holo.com',
+                'password' => 'chewy',
+            ])
+            ->assertRedirect('/protected')
+            ->assertSessionMissing('url.intended');
+    }
+
+    #[Test]
+    public function it_prefers_redirect_param_over_intended_url()
+    {
+        User::make()
+            ->id(1)
+            ->email('san@holo.com')
+            ->password('chewy')
+            ->save();
+
+        $this
+            ->withSession(['url.intended' => '/protected'])
+            ->post('/!/auth/login', [
+                'token' => 'test-token',
+                'email' => 'san@holo.com',
+                'password' => 'chewy',
+                '_redirect' => '/dashboard',
+            ])
+            ->assertRedirect('/dashboard')
+            ->assertSessionMissing('url.intended');
+    }
+
+    #[Test]
+    public function it_stashes_redirect_as_intended_url_when_two_factor_setup_is_required()
+    {
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
+
+        User::make()
+            ->id(1)
+            ->email('san@holo.com')
+            ->password('chewy')
+            ->save();
+
+        $this
+            ->post('/!/auth/login', [
+                'token' => 'test-token',
+                'email' => 'san@holo.com',
+                'password' => 'chewy',
+                '_redirect' => '/dashboard',
+            ])
+            ->assertRedirect('/dashboard')
+            ->assertSessionHas('url.intended', '/dashboard');
+    }
+
+    #[Test]
+    #[DefineEnvironment('disableTwoFactor')]
+    public function it_skips_two_factor_challenge_when_two_factor_is_disabled()
+    {
+        Event::fake();
+
+        $this->assertFalse(auth()->check());
+
+        User::make()
+            ->id(1)
+            ->email('san@holo.com')
+            ->password('chewy')
+            ->data([
+                'two_factor_confirmed_at' => now()->timestamp,
+                'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+                'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, function () {
+                    return RecoveryCode::generate();
+                })->all())),
+            ])
+            ->save();
+
+        $this
+            ->assertGuest()
+            ->post('/!/auth/login', [
+                'token' => 'test-token',
+                'email' => 'san@holo.com',
+                'password' => 'chewy',
+            ])
+            ->assertLocation('/');
+
+        $this->assertTrue(auth()->check());
+
+        Event::assertNotDispatched(TwoFactorAuthenticationChallenged::class);
+    }
+
+    protected function disableTwoFactor($app)
+    {
+        $app['config']->set('statamic.users.two_factor_enabled', false);
+    }
+
+    #[Test]
+    public function it_includes_passkey_data()
+    {
+        $output = $this->tag('{{ user:login_form }}{{ passkey_options_url }}|{{ passkey_verify_url }}{{ /user:login_form }}');
+
+        $this->assertStringContainsString(route('statamic.passkeys.options'), $output);
+        $this->assertStringContainsString(route('statamic.passkeys.login'), $output);
+    }
+
+    #[Test]
+    public function it_allows_password_login_when_user_has_no_passkeys()
+    {
+        $user = User::make()->id('test-user')->email('test@example.com')->password('secret');
+        $user->save();
+
+        config(['statamic.webauthn.allow_password_login_with_passkey' => false]);
+
+        $this
+            ->post('/!/auth/login', [
+                'email' => 'test@example.com',
+                'password' => 'secret',
+            ])
+            ->assertRedirect('/');
+
+        $this->assertAuthenticatedAs($user);
+    }
+
+    #[Test]
+    public function it_blocks_password_login_when_user_has_passkeys_and_enforcement_enabled()
+    {
+        $user = User::make()->id('test-user')->email('test@example.com')->password('secret');
+        $user->save();
+
+        $passkey = Mockery::mock(Passkey::class);
+        $passkey->shouldReceive('id')->andReturn('passkey-1');
+        $user->setPasskeys(collect([$passkey]));
+
+        config(['statamic.webauthn.allow_password_login_with_passkey' => false]);
+
+        $this
+            ->from('/login')
+            ->post('/!/auth/login', [
+                'email' => 'test@example.com',
+                'password' => 'secret',
+            ])
+            ->assertRedirect('/login');
+
+        $this->assertGuest();
+    }
+
+    #[Test]
+    public function it_allows_password_login_when_user_has_passkeys_and_enforcement_disabled()
+    {
+        $user = User::make()->id('test-user')->email('test@example.com')->password('secret');
+        $user->save();
+
+        $passkey = Mockery::mock(Passkey::class);
+        $passkey->shouldReceive('id')->andReturn('passkey-1');
+        $user->setPasskeys(collect([$passkey]));
+
+        config(['statamic.webauthn.allow_password_login_with_passkey' => true]);
+
+        $this
+            ->post('/!/auth/login', [
+                'email' => 'test@example.com',
+                'password' => 'secret',
+            ])
+            ->assertRedirect('/');
+
+        $this->assertAuthenticatedAs($user);
+    }
+
+    #[Test]
+    public function it_gets_passkey_login_options()
+    {
+        $response = $this->get(route('statamic.passkeys.options'));
+
+        $response->assertOk();
+
+        $data = $response->json();
+
+        $this->assertArrayHasKey('challenge', $data);
+        $this->assertArrayHasKey('userVerification', $data);
+        $this->assertEquals('required', $data['userVerification']);
+    }
+
+    #[Test]
+    public function it_logs_in_with_passkey()
+    {
+        $user = User::make()->id('test-user')->email('test@example.com')->password('secret');
+        $user->save();
+
+        WebAuthn::shouldReceive('getUserFromCredentials')->once()->andReturn($user);
+        WebAuthn::shouldReceive('validateAssertion')->once()->andReturnTrue();
+
+        $this
+            ->postJson(route('statamic.passkeys.login'))
+            ->assertOk()
+            ->assertJson(['redirect' => '/']);
+
+        $this->assertAuthenticatedAs($user);
+    }
+
+    #[Test]
+    public function it_redirects_to_provided_url_after_passkey_login()
+    {
+        $user = User::make()->id('test-user')->email('test@example.com')->password('secret');
+        $user->save();
+
+        WebAuthn::shouldReceive('getUserFromCredentials')->once()->andReturn($user);
+        WebAuthn::shouldReceive('validateAssertion')->once()->andReturnTrue();
+
+        $this
+            ->postJson(route('statamic.passkeys.login'), ['redirect' => '/dashboard'])
+            ->assertOk()
+            ->assertJson(['redirect' => '/dashboard']);
+
+        $this->assertAuthenticatedAs($user);
+    }
+
+    #[Test]
+    public function it_does_not_redirect_to_external_url_after_passkey_login()
+    {
+        $user = User::make()->id('test-user')->email('test@example.com')->password('secret');
+        $user->save();
+
+        WebAuthn::shouldReceive('getUserFromCredentials')->once()->andReturn($user);
+        WebAuthn::shouldReceive('validateAssertion')->once()->andReturnTrue();
+
+        $this
+            ->postJson(route('statamic.passkeys.login'), ['redirect' => 'https://evil.com'])
+            ->assertOk()
+            ->assertJson(['redirect' => '/']);
+
+        $this->assertAuthenticatedAs($user);
+    }
+
+    #[Test]
+    public function it_fails_passkey_login_when_validation_fails()
+    {
+        $user = User::make()->id('test-user')->email('test@example.com')->password('secret');
+        $user->save();
+
+        WebAuthn::shouldReceive('getUserFromCredentials')->once()->andReturn($user);
+        WebAuthn::shouldReceive('validateAssertion')->once()->andThrow(new \Exception('Invalid'));
+
+        $this
+            ->postJson(route('statamic.passkeys.login'))
+            ->assertStatus(500);
+
+        $this->assertGuest();
+    }
 }
diff --git a/tests/Tags/User/PasskeyFormTest.php b/tests/Tags/User/PasskeyFormTest.php
new file mode 100644
index 00000000000..448f03795bf
--- /dev/null
+++ b/tests/Tags/User/PasskeyFormTest.php
@@ -0,0 +1,152 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Mockery;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Contracts\Auth\Passkey;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Statamic\Facades\WebAuthn;
+use Statamic\Statamic;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('passkeys')]
+class PasskeyFormTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, trusted: true);
+    }
+
+    #[Test]
+    public function it_renders_urls()
+    {
+        $output = $this->tag('{{ user:passkey_form }}{{ passkey_options_url }}|{{ passkey_verify_url }}{{ /user:passkey_form }}');
+
+        $this->assertStringContainsString(route('statamic.passkeys.create'), $output);
+        $this->assertStringContainsString(route('statamic.passkeys.store'), $output);
+    }
+
+    #[Test]
+    public function it_fetches_form_data()
+    {
+        $form = Statamic::tag('user:passkey_form')->fetch();
+
+        $this->assertIsArray($form);
+        $this->assertEquals(route('statamic.passkeys.create'), $form['passkey_options_url']);
+        $this->assertEquals(route('statamic.passkeys.store'), $form['passkey_verify_url']);
+    }
+
+    #[Test]
+    public function it_requires_authentication_for_create_options()
+    {
+        $this->getJson(route('statamic.passkeys.create'))->assertUnauthorized();
+    }
+
+    #[Test]
+    public function it_requires_authentication_for_store()
+    {
+        $this->postJson(route('statamic.passkeys.store'))->assertUnauthorized();
+    }
+
+    #[Test]
+    public function it_gets_creation_options()
+    {
+        $user = User::make()->id('test-user')->email('test@example.com')->password('secret');
+        $user->save();
+
+        $response = $this
+            ->actingAs($user)
+            ->get(route('statamic.passkeys.create'))
+            ->assertOk();
+
+        $data = $response->json();
+
+        $this->assertArrayHasKey('challenge', $data);
+        $this->assertArrayHasKey('user', $data);
+        $this->assertArrayHasKey('rp', $data);
+    }
+
+    #[Test]
+    public function it_stores_a_passkey()
+    {
+        $user = User::make()->id('test-user')->email('test@example.com')->password('secret');
+        $user->save();
+
+        $mockPasskey = Mockery::mock(Passkey::class);
+
+        $payload = [
+            'id' => 'credential-id',
+            'rawId' => 'raw-id',
+            'response' => [],
+            'type' => 'public-key',
+        ];
+
+        WebAuthn::shouldReceive('validateAttestation')
+            ->once()
+            ->with($user, $payload, 'Test Passkey')
+            ->andReturn($mockPasskey);
+
+        $this
+            ->actingAs($user)
+            ->postJson(route('statamic.passkeys.store'), [
+                ...$payload,
+                'name' => 'Test Passkey',
+            ])
+            ->assertOk()
+            ->assertJson(['verified' => true]);
+    }
+
+    #[Test]
+    public function it_stores_a_passkey_with_default_name()
+    {
+        $user = User::make()->id('test-user')->email('test@example.com')->password('secret');
+        $user->save();
+
+        $mockPasskey = Mockery::mock(Passkey::class);
+
+        $payload = [
+            'id' => 'credential-id',
+            'rawId' => 'raw-id',
+            'response' => [],
+            'type' => 'public-key',
+        ];
+
+        WebAuthn::shouldReceive('validateAttestation')
+            ->once()
+            ->with($user, $payload, 'Passkey')
+            ->andReturn($mockPasskey);
+
+        $this
+            ->actingAs($user)
+            ->postJson(route('statamic.passkeys.store'), $payload)
+            ->assertOk()
+            ->assertJson(['verified' => true]);
+    }
+
+    #[Test]
+    public function it_fails_storing_when_validation_throws_exception()
+    {
+        $user = User::make()->id('test-user')->email('test@example.com')->password('secret');
+        $user->save();
+
+        WebAuthn::shouldReceive('validateAttestation')
+            ->once()
+            ->andThrow(new \Exception('Invalid credentials'));
+
+        $this
+            ->actingAs($user)
+            ->postJson(route('statamic.passkeys.store'), [
+                'id' => 'credential-id',
+                'rawId' => 'raw-id',
+                'response' => [],
+                'type' => 'public-key',
+            ])
+            ->assertStatus(500);
+    }
+}
diff --git a/tests/Tags/User/PasskeysTest.php b/tests/Tags/User/PasskeysTest.php
new file mode 100644
index 00000000000..88dce1a8e86
--- /dev/null
+++ b/tests/Tags/User/PasskeysTest.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Mockery;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Contracts\Auth\Passkey;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Statamic\Statamic;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('passkeys')]
+class PasskeysTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, trusted: true);
+    }
+
+    #[Test]
+    public function it_returns_no_results_when_not_logged_in()
+    {
+        $output = $this->tag('{{ user:passkeys }}{{ name }}{{ /user:passkeys }}');
+
+        $this->assertEquals('', $output);
+    }
+
+    #[Test]
+    public function it_returns_no_results_when_user_has_no_passkeys()
+    {
+        $user = User::make()->email('test@example.com');
+        $user->save();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:passkeys }}{{ name }}{{ /user:passkeys }}{{ unless user:passkeys }}no-passkeys{{ /unless }}');
+
+        $this->assertStringContainsString('no-passkeys', (string) $output);
+    }
+
+    #[Test]
+    public function it_lists_user_passkeys()
+    {
+        $passkey1 = Mockery::mock(Passkey::class);
+        $passkey1->shouldReceive('id')->andReturn('passkey-1');
+        $passkey1->shouldReceive('name')->andReturn('My Laptop');
+        $passkey1->shouldReceive('lastLogin')->andReturn(now()->subDay());
+
+        $passkey2 = Mockery::mock(Passkey::class);
+        $passkey2->shouldReceive('id')->andReturn('passkey-2');
+        $passkey2->shouldReceive('name')->andReturn('My Phone');
+        $passkey2->shouldReceive('lastLogin')->andReturn(null);
+
+        $user = Mockery::mock(User::make()->email('test@example.com'))->makePartial();
+        $user->shouldReceive('passkeys')->andReturn(collect([
+            'passkey-1' => $passkey1,
+            'passkey-2' => $passkey2,
+        ]));
+        $user->save();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:passkeys }}{{ name }},{{ /user:passkeys }}');
+
+        $this->assertStringContainsString('My Laptop', $output);
+        $this->assertStringContainsString('My Phone', $output);
+    }
+
+    #[Test]
+    public function it_fetches_data_without_content()
+    {
+        $passkey = Mockery::mock(Passkey::class);
+        $passkey->shouldReceive('id')->andReturn('passkey-123');
+        $passkey->shouldReceive('name')->andReturn('Test');
+        $passkey->shouldReceive('lastLogin')->andReturn(null);
+
+        $user = Mockery::mock(User::make()->email('test@example.com'))->makePartial();
+        $user->shouldReceive('passkeys')->andReturn(collect(['passkey-123' => $passkey]));
+        $user->save();
+
+        $this->actingAs($user);
+
+        $passkeys = Statamic::tag('user:passkeys')->fetch();
+
+        $this->assertIsArray($passkeys);
+        $this->assertCount(1, $passkeys);
+        $this->assertEquals('passkey-123', $passkeys[0]['id']);
+        $this->assertEquals('Test', $passkeys[0]['name']);
+    }
+
+    #[Test]
+    public function it_returns_empty_array_when_not_logged_in_without_content()
+    {
+        $passkeys = Statamic::tag('user:passkeys')->fetch();
+
+        $this->assertIsArray($passkeys);
+        $this->assertEmpty($passkeys);
+    }
+}
diff --git a/tests/Tags/User/ResetTwoFactorRecoveryCodesFormTest.php b/tests/Tags/User/ResetTwoFactorRecoveryCodesFormTest.php
new file mode 100644
index 00000000000..c8361de9961
--- /dev/null
+++ b/tests/Tags/User/ResetTwoFactorRecoveryCodesFormTest.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Auth\TwoFactor\RecoveryCode;
+use Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('2fa')]
+class ResetTwoFactorRecoveryCodesFormTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, trusted: true);
+    }
+
+    #[Test]
+    public function it_renders_for_user_with_2fa()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:reset_two_factor_recovery_codes_form }}{{ /user:reset_two_factor_recovery_codes_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/two-factor/recovery-codes">', $output);
+        $this->assertStringContainsString(csrf_field(), $output);
+    }
+
+    #[Test]
+    public function it_does_not_render_for_user_without_2fa()
+    {
+        $user = $this->user();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:reset_two_factor_recovery_codes_form }}<p>inside</p>{{ /user:reset_two_factor_recovery_codes_form }}');
+
+        $this->assertStringNotContainsString('<form', $output);
+        $this->assertStringNotContainsString('<p>inside</p>', $output);
+    }
+
+    #[Test]
+    public function it_does_not_render_for_guests()
+    {
+        $output = $this->tag('{{ user:reset_two_factor_recovery_codes_form }}<p>inside</p>{{ /user:reset_two_factor_recovery_codes_form }}');
+
+        $this->assertStringNotContainsString('<form', $output);
+        $this->assertStringNotContainsString('<p>inside</p>', $output);
+    }
+
+    #[Test]
+    public function it_renders_with_redirect_param()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:reset_two_factor_recovery_codes_form redirect="/recovery-codes" }}{{ /user:reset_two_factor_recovery_codes_form }}');
+
+        $this->assertStringContainsString('<input type="hidden" name="_redirect" value="/recovery-codes" />', $output);
+    }
+
+    #[Test]
+    public function it_regenerates_codes_and_redirects()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+        $originalCodes = $user->twoFactorRecoveryCodes();
+
+        $this
+            ->actingAs($user)
+            ->session(['statamic_elevated_session' => now()->timestamp])
+            ->post(route('statamic.users.two-factor.recovery-codes.generate'), [
+                '_redirect' => '/recovery-codes',
+            ])
+            ->assertRedirect('/recovery-codes')
+            ->assertSessionHas('user.two_factor_reset_recovery_codes.success');
+
+        $newCodes = $user->fresh()->twoFactorRecoveryCodes();
+        $this->assertNotEquals($originalCodes, $newCodes);
+        $this->assertCount(8, $newCodes);
+    }
+
+    #[Test]
+    public function it_requires_elevated_session_to_regenerate()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->actingAs($user)
+            ->post(route('statamic.users.two-factor.recovery-codes.generate'), [
+                '_redirect' => '/recovery-codes',
+            ])
+            ->assertRedirect(route('statamic.elevated-session'));
+    }
+
+    #[Test]
+    public function it_redirects_back_without_redirect_param()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->actingAs($user)
+            ->session(['statamic_elevated_session' => now()->timestamp])
+            ->from('/account/security')
+            ->post(route('statamic.users.two-factor.recovery-codes.generate'))
+            ->assertRedirect('/account/security')
+            ->assertSessionHas('user.two_factor_reset_recovery_codes.success');
+    }
+
+    #[Test]
+    public function it_returns_json_for_xhr_requests()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->actingAs($user)
+            ->session(['statamic_elevated_session' => now()->timestamp])
+            ->postJson(route('statamic.users.two-factor.recovery-codes.generate'))
+            ->assertOk()
+            ->assertJsonStructure(['recovery_codes']);
+    }
+
+    private function user()
+    {
+        return tap(User::make()->makeSuper()->email('test@example.com'))->save();
+    }
+
+    private function userWithTwoFactorEnabled()
+    {
+        $user = $this->user();
+
+        $user->merge([
+            'two_factor_confirmed_at' => now()->timestamp,
+            'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+            'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, function () {
+                return RecoveryCode::generate();
+            })->all())),
+        ]);
+
+        $user->save();
+
+        return $user;
+    }
+}
diff --git a/tests/Tags/User/TwoFactorChallengeFormTest.php b/tests/Tags/User/TwoFactorChallengeFormTest.php
new file mode 100644
index 00000000000..8e794534f18
--- /dev/null
+++ b/tests/Tags/User/TwoFactorChallengeFormTest.php
@@ -0,0 +1,259 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use PragmaRX\Google2FA\Google2FA;
+use Statamic\Auth\TwoFactor\RecoveryCode;
+use Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Statamic\Statamic;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('2fa')]
+class TwoFactorChallengeFormTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, trusted: true);
+    }
+
+    #[Test]
+    public function it_renders_form_when_login_id_in_session()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this->session(['login.id' => $user->id()]);
+
+        $output = $this->tag('{{ user:two_factor_challenge_form }}{{ /user:two_factor_challenge_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/two-factor-challenge">', $output);
+        $this->assertStringContainsString(csrf_field(), $output);
+        $this->assertStringEndsWith('</form>', $output);
+    }
+
+    #[Test]
+    public function it_does_not_render_without_login_id_in_session()
+    {
+        $output = $this->tag('{{ user:two_factor_challenge_form }}<p>inside</p>{{ /user:two_factor_challenge_form }}');
+
+        $this->assertStringNotContainsString('<form', $output);
+        $this->assertStringNotContainsString('<p>inside</p>', $output);
+    }
+
+    #[Test]
+    public function it_renders_with_redirect_params()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this->session(['login.id' => $user->id()]);
+
+        $output = $this->tag('{{ user:two_factor_challenge_form redirect="/dashboard" error_redirect="/error" }}{{ /user:two_factor_challenge_form }}');
+
+        $this->assertStringContainsString('<input type="hidden" name="_redirect" value="/dashboard" />', $output);
+        $this->assertStringContainsString('<input type="hidden" name="_error_redirect" value="/error" />', $output);
+    }
+
+    #[Test]
+    public function it_fetches_form_data()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this->session(['login.id' => $user->id()]);
+
+        $form = Statamic::tag('user:two_factor_challenge_form')->fetch();
+
+        $this->assertEquals('http://localhost/!/auth/two-factor-challenge', $form['attrs']['action']);
+        $this->assertEquals('POST', $form['attrs']['method']);
+        $this->assertArrayHasKey('_token', $form['params']);
+    }
+
+    #[Test]
+    public function it_completes_challenge_and_redirects()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->session(['login.id' => $user->id()])
+            ->post(route('statamic.two-factor-challenge'), [
+                'code' => $this->getOneTimeCode($user),
+                '_redirect' => '/dashboard',
+            ])
+            ->assertRedirect('/dashboard');
+
+        $this->assertAuthenticatedAs($user);
+    }
+
+    #[Test]
+    public function it_clears_login_session_keys_after_successful_challenge()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->session(['login.id' => $user->id(), 'login.remember' => true])
+            ->post(route('statamic.two-factor-challenge'), [
+                'code' => $this->getOneTimeCode($user),
+                '_redirect' => '/dashboard',
+            ])
+            ->assertRedirect('/dashboard')
+            ->assertSessionMissing('login.id')
+            ->assertSessionMissing('login.remember');
+    }
+
+    #[Test]
+    public function it_completes_challenge_with_recovery_code_and_redirects()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+        $codes = $user->twoFactorRecoveryCodes();
+
+        $this
+            ->session(['login.id' => $user->id()])
+            ->post(route('statamic.two-factor-challenge'), [
+                'recovery_code' => $codes[0],
+                '_redirect' => '/dashboard',
+            ])
+            ->assertRedirect('/dashboard');
+
+        $this->assertAuthenticatedAs($user);
+        $this->assertNotContains($codes[0], $user->fresh()->twoFactorRecoveryCodes());
+    }
+
+    #[Test]
+    public function it_redirects_to_home_without_redirect_param()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->session(['login.id' => $user->id()])
+            ->post(route('statamic.two-factor-challenge'), [
+                'code' => $this->getOneTimeCode($user),
+            ])
+            ->assertRedirect(route('statamic.site'));
+
+        $this->assertAuthenticatedAs($user);
+    }
+
+    #[Test]
+    public function it_redirects_to_configured_challenge_url_on_invalid_code()
+    {
+        config(['statamic.users.two_factor_challenge_url' => '/two-factor-challenge']);
+
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->session(['login.id' => $user->id()])
+            ->post(route('statamic.two-factor-challenge'), [
+                'code' => '123456',
+                '_redirect' => '/dashboard',
+            ])
+            ->assertRedirect('/two-factor-challenge')
+            ->assertSessionHasErrors('code');
+
+        $this->assertGuest();
+    }
+
+    #[Test]
+    public function it_redirects_to_default_challenge_route_on_invalid_code_without_config()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->session(['login.id' => $user->id()])
+            ->post(route('statamic.two-factor-challenge'), [
+                'code' => '123456',
+            ])
+            ->assertRedirect(route('statamic.two-factor-challenge'))
+            ->assertSessionHasErrors('code');
+
+        $this->assertGuest();
+    }
+
+    #[Test]
+    public function it_redirects_to_error_redirect_on_invalid_code()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->session(['login.id' => $user->id()])
+            ->post(route('statamic.two-factor-challenge'), [
+                'code' => '123456',
+                '_redirect' => '/dashboard',
+                '_error_redirect' => '/challenge-error',
+            ])
+            ->assertRedirect('/challenge-error')
+            ->assertSessionHasErrors('code');
+
+        $this->assertGuest();
+    }
+
+    #[Test]
+    public function it_uses_intended_url_from_session_when_no_redirect_param()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->session([
+                'login.id' => $user->id(),
+                'url.intended' => '/account',
+            ])
+            ->post(route('statamic.two-factor-challenge'), [
+                'code' => $this->getOneTimeCode($user),
+            ])
+            ->assertRedirect('/account');
+
+        $this->assertAuthenticatedAs($user);
+    }
+
+    #[Test]
+    public function it_clears_intended_url_from_session_when_redirect_param_wins()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this
+            ->session([
+                'login.id' => $user->id(),
+                'url.intended' => '/account',
+            ])
+            ->post(route('statamic.two-factor-challenge'), [
+                'code' => $this->getOneTimeCode($user),
+                '_redirect' => '/dashboard',
+            ])
+            ->assertRedirect('/dashboard')
+            ->assertSessionMissing('url.intended');
+
+        $this->assertAuthenticatedAs($user);
+    }
+
+    private function user()
+    {
+        return tap(User::make()->makeSuper()->email('test@example.com'))->save();
+    }
+
+    private function userWithTwoFactorEnabled()
+    {
+        $user = $this->user();
+
+        $user->merge([
+            'two_factor_confirmed_at' => now()->timestamp,
+            'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+            'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, function () {
+                return RecoveryCode::generate();
+            })->all())),
+        ]);
+
+        $user->save();
+
+        return $user;
+    }
+
+    private function getOneTimeCode($user): string
+    {
+        return app(Google2FA::class)->getCurrentOtp($user->twoFactorSecretKey());
+    }
+}
diff --git a/tests/Tags/User/TwoFactorEnableFormTest.php b/tests/Tags/User/TwoFactorEnableFormTest.php
new file mode 100644
index 00000000000..796275e2eea
--- /dev/null
+++ b/tests/Tags/User/TwoFactorEnableFormTest.php
@@ -0,0 +1,251 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Event;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Auth\TwoFactor\RecoveryCode;
+use Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider;
+use Statamic\Events\TwoFactorAuthenticationEnabled;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('2fa')]
+class TwoFactorEnableFormTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, trusted: true);
+    }
+
+    #[Test]
+    public function it_renders_for_authenticated_user_without_secret()
+    {
+        $user = $this->user();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:two_factor_enable_form }}<button>Enable</button>{{ /user:two_factor_enable_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/two-factor/enable">', $output);
+        $this->assertStringContainsString('<button>Enable</button>', $output);
+    }
+
+    #[Test]
+    public function it_renders_for_user_with_pending_setup()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:two_factor_enable_form }}<p>inside</p>{{ /user:two_factor_enable_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/two-factor/enable">', $output);
+        $this->assertStringContainsString('<p>inside</p>', $output);
+    }
+
+    #[Test]
+    public function it_does_not_render_for_user_with_2fa_enabled()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:two_factor_enable_form }}<p>inside</p>{{ /user:two_factor_enable_form }}');
+
+        $this->assertStringNotContainsString('<form', $output);
+        $this->assertStringNotContainsString('<p>inside</p>', $output);
+    }
+
+    #[Test]
+    public function it_does_not_render_for_guests()
+    {
+        $output = $this->tag('{{ user:two_factor_enable_form }}<p>inside</p>{{ /user:two_factor_enable_form }}');
+
+        $this->assertStringNotContainsString('<form', $output);
+        $this->assertStringNotContainsString('<p>inside</p>', $output);
+    }
+
+    #[Test]
+    public function it_renders_with_redirect_param()
+    {
+        $user = $this->user();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:two_factor_enable_form redirect="/dashboard" }}{{ /user:two_factor_enable_form }}');
+
+        $this->assertStringContainsString('<input type="hidden" name="_redirect" value="/dashboard" />', $output);
+    }
+
+    #[Test]
+    public function it_enables_2fa_and_redirects_back()
+    {
+        Event::fake();
+
+        $user = $this->user();
+
+        $this->assertNull($user->two_factor_secret);
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->from('/profile')
+            ->post(route('statamic.users.two-factor.enable'))
+            ->assertRedirect('/profile');
+
+        $this->assertNotNull($user->fresh()->two_factor_secret);
+
+        Event::assertDispatched(TwoFactorAuthenticationEnabled::class, fn ($event) => $event->user->id === $user->id);
+    }
+
+    #[Test]
+    public function it_requires_elevated_session_to_enable()
+    {
+        $user = $this->user();
+
+        $this
+            ->actingAs($user)
+            ->post(route('statamic.users.two-factor.enable'))
+            ->assertRedirect(route('statamic.elevated-session'));
+
+        $this->assertNull($user->fresh()->two_factor_secret);
+    }
+
+    #[Test]
+    public function it_redirects_to_redirect_param()
+    {
+        $user = $this->user();
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->from('/profile')
+            ->post(route('statamic.users.two-factor.enable'), [
+                '_redirect' => '/dashboard',
+            ])
+            ->assertRedirect('/dashboard');
+    }
+
+    #[Test]
+    public function it_ignores_external_redirect_param()
+    {
+        $user = $this->user();
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->from('/profile')
+            ->post(route('statamic.users.two-factor.enable'), [
+                '_redirect' => 'https://evil.example.com',
+            ])
+            ->assertRedirect('/profile');
+    }
+
+    #[Test]
+    public function it_falls_back_to_configured_setup_url_without_redirect_param()
+    {
+        config(['statamic.users.two_factor_setup_url' => '/setup-2fa']);
+
+        $user = $this->user();
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->from('/profile')
+            ->post(route('statamic.users.two-factor.enable'))
+            ->assertRedirect('/setup-2fa');
+    }
+
+    #[Test]
+    public function it_prefers_redirect_param_over_configured_setup_url()
+    {
+        config(['statamic.users.two_factor_setup_url' => '/setup-2fa']);
+
+        $user = $this->user();
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->from('/profile')
+            ->post(route('statamic.users.two-factor.enable'), [
+                '_redirect' => '/dashboard',
+            ])
+            ->assertRedirect('/dashboard');
+    }
+
+    #[Test]
+    public function it_is_idempotent_when_secret_already_exists()
+    {
+        Event::fake();
+
+        $user = $this->user();
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->from('/profile')
+            ->post(route('statamic.users.two-factor.enable'))
+            ->assertRedirect('/profile');
+
+        $firstSecret = $user->fresh()->two_factor_secret;
+        $this->assertNotNull($firstSecret);
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->from('/profile')
+            ->post(route('statamic.users.two-factor.enable'))
+            ->assertRedirect('/profile');
+
+        $this->assertEquals($firstSecret, $user->fresh()->two_factor_secret);
+
+        Event::assertDispatchedTimes(TwoFactorAuthenticationEnabled::class, 1);
+    }
+
+    private function withActiveElevatedSession()
+    {
+        return $this->session(['statamic_elevated_session' => now()->timestamp]);
+    }
+
+    private function user()
+    {
+        return tap(User::make()->makeSuper()->email('test@example.com'))->save();
+    }
+
+    private function userWithTwoFactorPending()
+    {
+        $user = $this->user();
+
+        $user->merge([
+            'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+        ]);
+
+        $user->save();
+
+        return $user;
+    }
+
+    private function userWithTwoFactorEnabled()
+    {
+        $user = $this->user();
+
+        $user->merge([
+            'two_factor_confirmed_at' => now()->timestamp,
+            'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+            'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, function () {
+                return RecoveryCode::generate();
+            })->all())),
+        ]);
+
+        $user->save();
+
+        return $user;
+    }
+}
diff --git a/tests/Tags/User/TwoFactorRecoveryCodesTagTest.php b/tests/Tags/User/TwoFactorRecoveryCodesTagTest.php
new file mode 100644
index 00000000000..901f2754980
--- /dev/null
+++ b/tests/Tags/User/TwoFactorRecoveryCodesTagTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Auth\TwoFactor\RecoveryCode;
+use Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('2fa')]
+class TwoFactorRecoveryCodesTagTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, trusted: true);
+    }
+
+    #[Test]
+    public function it_renders_codes_for_user_with_2fa()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:two_factor_recovery_codes }}<li>{{ code }}</li>{{ /user:two_factor_recovery_codes }}');
+
+        $codes = $user->twoFactorRecoveryCodes();
+
+        foreach ($codes as $code) {
+            $this->assertStringContainsString("<li>{$code}</li>", $output);
+        }
+    }
+
+    #[Test]
+    public function it_does_not_render_for_user_without_2fa()
+    {
+        $user = $this->user();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:two_factor_recovery_codes }}<li>{{ code }}</li>{{ /user:two_factor_recovery_codes }}');
+
+        $this->assertStringNotContainsString('<li>', $output);
+    }
+
+    #[Test]
+    public function it_does_not_render_for_guests()
+    {
+        $output = $this->tag('{{ user:two_factor_recovery_codes }}<li>{{ code }}</li>{{ /user:two_factor_recovery_codes }}');
+
+        $this->assertStringNotContainsString('<li>', $output);
+    }
+
+    private function user()
+    {
+        return tap(User::make()->makeSuper()->email('test@example.com'))->save();
+    }
+
+    private function userWithTwoFactorEnabled()
+    {
+        $user = $this->user();
+
+        $user->merge([
+            'two_factor_confirmed_at' => now()->timestamp,
+            'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+            'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, function () {
+                return RecoveryCode::generate();
+            })->all())),
+        ]);
+
+        $user->save();
+
+        return $user;
+    }
+}
diff --git a/tests/Tags/User/TwoFactorSetupFormTest.php b/tests/Tags/User/TwoFactorSetupFormTest.php
new file mode 100644
index 00000000000..8e527df5146
--- /dev/null
+++ b/tests/Tags/User/TwoFactorSetupFormTest.php
@@ -0,0 +1,287 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use PragmaRX\Google2FA\Google2FA;
+use Statamic\Auth\TwoFactor\RecoveryCode;
+use Statamic\Contracts\Auth\TwoFactor\TwoFactorAuthenticationProvider;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Statamic\Statamic;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+#[Group('2fa')]
+class TwoFactorSetupFormTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, trusted: true);
+    }
+
+    #[Test]
+    public function it_renders_for_user_with_pending_setup()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:two_factor_setup_form }}{{ qr_code }}{{ secret_key }}{{ /user:two_factor_setup_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/two-factor/confirm">', $output);
+        $this->assertStringContainsString('<svg', $output);
+        $this->assertStringContainsString('</svg>', $output);
+    }
+
+    #[Test]
+    public function it_does_not_render_without_pending_setup()
+    {
+        $user = $this->user();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:two_factor_setup_form }}<p>inside</p>{{ /user:two_factor_setup_form }}');
+
+        $this->assertStringNotContainsString('<form', $output);
+        $this->assertStringNotContainsString('<p>inside</p>', $output);
+    }
+
+    #[Test]
+    public function it_provides_qr_code_url()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:two_factor_setup_form }}{{ qr_code_url }}{{ /user:two_factor_setup_form }}');
+
+        $this->assertStringContainsString('data:image/svg+xml;base64,', $output);
+    }
+
+    #[Test]
+    public function it_does_not_render_for_user_with_2fa_enabled()
+    {
+        $user = $this->userWithTwoFactorEnabled();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:two_factor_setup_form }}<p>inside</p>{{ /user:two_factor_setup_form }}');
+
+        $this->assertStringNotContainsString('<form', $output);
+        $this->assertStringNotContainsString('<p>inside</p>', $output);
+    }
+
+    #[Test]
+    public function it_does_not_render_for_guests()
+    {
+        $output = $this->tag('{{ user:two_factor_setup_form }}<p>inside</p>{{ /user:two_factor_setup_form }}');
+
+        $this->assertStringNotContainsString('<form', $output);
+        $this->assertStringNotContainsString('<p>inside</p>', $output);
+    }
+
+    #[Test]
+    public function it_fetches_form_data()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this->actingAs($user);
+
+        $form = Statamic::tag('user:two_factor_setup_form')->fetch();
+
+        $this->assertEquals('http://localhost/!/auth/two-factor/confirm', $form['attrs']['action']);
+        $this->assertEquals('POST', $form['attrs']['method']);
+        $this->assertArrayHasKey('qr_code', $form);
+        $this->assertArrayHasKey('qr_code_url', $form);
+        $this->assertArrayHasKey('secret_key', $form);
+    }
+
+    #[Test]
+    public function it_renders_with_redirect_params()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this->actingAs($user);
+
+        $output = $this->tag('{{ user:two_factor_setup_form redirect="/dashboard" error_redirect="/error" }}{{ /user:two_factor_setup_form }}');
+
+        $this->assertStringContainsString('<input type="hidden" name="_redirect" value="/dashboard" />', $output);
+        $this->assertStringContainsString('<input type="hidden" name="_error_redirect" value="/error" />', $output);
+    }
+
+    #[Test]
+    public function it_confirms_setup_and_redirects()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->post(route('statamic.users.two-factor.confirm'), [
+                'code' => $this->getOneTimeCode($user),
+                '_redirect' => '/dashboard',
+            ])
+            ->assertRedirect('/dashboard')
+            ->assertSessionHas('user.two_factor_setup.success');
+
+        $this->assertNotNull($user->fresh()->two_factor_confirmed_at);
+    }
+
+    #[Test]
+    public function it_requires_elevated_session_to_confirm()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this
+            ->actingAs($user)
+            ->post(route('statamic.users.two-factor.confirm'), [
+                'code' => $this->getOneTimeCode($user),
+            ])
+            ->assertRedirect(route('statamic.elevated-session'));
+
+        $this->assertNull($user->fresh()->two_factor_confirmed_at);
+    }
+
+    #[Test]
+    public function it_redirects_back_without_redirect_param()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->from('/setup-2fa')
+            ->post(route('statamic.users.two-factor.confirm'), [
+                'code' => $this->getOneTimeCode($user),
+            ])
+            ->assertRedirect('/setup-2fa')
+            ->assertSessionHas('user.two_factor_setup.success');
+
+        $this->assertNotNull($user->fresh()->two_factor_confirmed_at);
+    }
+
+    #[Test]
+    public function it_returns_json_for_xhr_requests()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->postJson(route('statamic.users.two-factor.confirm'), [
+                'code' => $this->getOneTimeCode($user),
+            ])
+            ->assertOk()
+            ->assertJson([]);
+
+        $this->assertNotNull($user->fresh()->two_factor_confirmed_at);
+    }
+
+    #[Test]
+    public function it_redirects_back_with_errors_on_invalid_code()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->from('/setup-2fa')
+            ->post(route('statamic.users.two-factor.confirm'), [
+                'code' => '123456',
+                '_redirect' => '/dashboard',
+            ])
+            ->assertRedirect('/setup-2fa')
+            ->assertSessionHasErrors('code', null, 'user.two_factor_setup');
+
+        $this->assertNull($user->fresh()->two_factor_confirmed_at);
+    }
+
+    #[Test]
+    public function it_redirects_to_error_redirect_on_invalid_code()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this
+            ->actingAs($user)
+            ->withActiveElevatedSession()
+            ->post(route('statamic.users.two-factor.confirm'), [
+                'code' => '123456',
+                '_redirect' => '/dashboard',
+                '_error_redirect' => '/setup-error',
+            ])
+            ->assertRedirect('/setup-error')
+            ->assertSessionHasErrors('code', null, 'user.two_factor_setup');
+
+        $this->assertNull($user->fresh()->two_factor_confirmed_at);
+    }
+
+    #[Test]
+    public function it_uses_intended_url_from_session_when_redirect_param_is_empty()
+    {
+        $user = $this->userWithTwoFactorPending();
+
+        $this
+            ->actingAs($user)
+            ->session([
+                'statamic_elevated_session' => now()->timestamp,
+                'url.intended' => '/account',
+            ])
+            ->post(route('statamic.users.two-factor.confirm'), [
+                'code' => $this->getOneTimeCode($user),
+                '_redirect' => '',
+            ])
+            ->assertRedirect('/account');
+
+        $this->assertNotNull($user->fresh()->two_factor_confirmed_at);
+    }
+
+    private function withActiveElevatedSession()
+    {
+        return $this->session(['statamic_elevated_session' => now()->timestamp]);
+    }
+
+    private function user()
+    {
+        return tap(User::make()->makeSuper()->email('test@example.com'))->save();
+    }
+
+    private function userWithTwoFactorEnabled()
+    {
+        $user = $this->user();
+
+        $user->merge([
+            'two_factor_confirmed_at' => now()->timestamp,
+            'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+            'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, function () {
+                return RecoveryCode::generate();
+            })->all())),
+        ]);
+
+        $user->save();
+
+        return $user;
+    }
+
+    private function userWithTwoFactorPending()
+    {
+        $user = $this->user();
+
+        $user->merge([
+            'two_factor_secret' => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+        ]);
+
+        $user->save();
+
+        return $user;
+    }
+
+    private function getOneTimeCode($user): string
+    {
+        return app(Google2FA::class)->getCurrentOtp($user->twoFactorSecretKey());
+    }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 95f764179db..cc9f0f401a1 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -46,6 +46,7 @@ protected function setUp(): void
         }
 
         $this->addGqlMacros();
+        $this->addRateLimitMacros();
     }
 
     public function tearDown(): void
@@ -68,6 +69,7 @@ protected function getPackageProviders($app)
             \Wilderborn\Partyline\ServiceProvider::class,
             \Archetype\ServiceProvider::class,
             \Spatie\LaravelRay\RayServiceProvider::class,
+            \Laravel\Socialite\SocialiteServiceProvider::class,
         ];
     }
 
@@ -199,6 +201,15 @@ protected function assertEveryItemIsInstanceOf($class, $items)
         $this->assertEquals(count($items), $matches, 'Failed asserting that every item is an instance of '.$class);
     }
 
+    protected function normalizeYaml(string $yaml): string
+    {
+        // Normalize formatting changes introduced in symfony/yaml 8.1
+        $yaml = str_replace('{  }', '{}', $yaml);
+        $yaml = preg_replace('/^( *)-\n\1  (\S)/m', '$1- $2', $yaml);
+
+        return $yaml;
+    }
+
     protected function assertContainsHtml($string)
     {
         preg_match('/<[^<]+>/', $string, $matches);
@@ -281,6 +292,21 @@ private function addGqlMacros()
         });
     }
 
+    private function addRateLimitMacros()
+    {
+        TestResponse::macro('assertRateLimited', function () {
+            Assert::assertSame(429, $this->getStatusCode(), 'Expected request to be rate limited, but it was not.');
+
+            return $this;
+        });
+
+        TestResponse::macro('assertNotRateLimited', function () {
+            Assert::assertNotSame(429, $this->getStatusCode(), 'Expected request not to be rate limited, but it was.');
+
+            return $this;
+        });
+    }
+
     public function __call($name, $arguments)
     {
         if ($name == 'assertStringEqualsStringIgnoringLineEndings') {
diff --git a/tests/Tokens/TokenRepositoryTest.php b/tests/Tokens/TokenRepositoryTest.php
index 7ad1172bae5..e26245b8346 100644
--- a/tests/Tokens/TokenRepositoryTest.php
+++ b/tests/Tokens/TokenRepositoryTest.php
@@ -5,6 +5,7 @@
 use Facades\Statamic\Tokens\Generator;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Contracts\Tokens\Token;
 use Statamic\Facades\File;
@@ -129,6 +130,37 @@ public function attempting_to_find_a_non_existent_token_returns_null()
         $this->assertNull($this->tokens->find('missing-token'));
     }
 
+    #[Test]
+    public function it_prevents_path_traversal_in_find()
+    {
+        File::put(storage_path('statamic/evil.yaml'), "handler: 'Handler'\nexpires_at: 9999999999\ndata: []");
+
+        $this->assertNull($this->tokens->find('../evil'));
+    }
+
+    #[Test]
+    #[DataProvider('invalidTokenNameProvider')]
+    public function it_throws_when_making_a_token_with_an_invalid_name($token)
+    {
+        $this->expectException(\InvalidArgumentException::class);
+
+        $this->tokens->make($token, 'Handler');
+    }
+
+    public static function invalidTokenNameProvider()
+    {
+        return [
+            'parent traversal' => ['../evil'],
+            'backslash traversal' => ['..\\evil'],
+            'nested traversal' => ['foo/../../evil'],
+            'forward slash' => ['foo/evil'],
+            'dots only' => ['..'],
+            'absolute path' => ['/etc/passwd'],
+            'windows drive' => ['C:\\evil'],
+            'trailing newline' => ["evil\n"],
+        ];
+    }
+
     #[Test]
     public function it_deletes_expired_tokens()
     {
diff --git a/tests/UpdateScripts/UpdateGlobalVariablesTest.php b/tests/UpdateScripts/UpdateGlobalVariablesTest.php
index 2cc3fc6bf21..9d74711bc03 100644
--- a/tests/UpdateScripts/UpdateGlobalVariablesTest.php
+++ b/tests/UpdateScripts/UpdateGlobalVariablesTest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\File;
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\GlobalSet;
 use Statamic\Facades\YAML;
 use Statamic\UpdateScripts\UpdateGlobalVariables;
 use Tests\PreventSavingStacheItemsToDisk;
@@ -79,6 +80,32 @@ public function it_migrates_global_variables_with_empty_data_in_a_single_site_in
         unlink($this->globalsPath.'/en/test.yaml');
     }
 
+    #[Test]
+    public function migrated_variables_survive_being_saved_later_in_the_same_process()
+    {
+        File::put($this->globalsPath.'/test.yaml', Yaml::dump([
+            'title' => 'Test',
+            'data' => [
+                'foo' => 'Bar',
+            ],
+        ]));
+
+        $this->runUpdateScript(UpdateGlobalVariables::class);
+
+        // Simulates an addon update script saving variables after the migration
+        $variables = GlobalSet::findByHandle('test')->inDefaultSite();
+        $variables->set('baz', 'Qux');
+        $variables->save();
+
+        $this->assertEquals(
+            ['foo' => 'Bar', 'baz' => 'Qux'],
+            YAML::parse(File::get($this->globalsPath.'/en/test.yaml'))
+        );
+
+        unlink($this->globalsPath.'/test.yaml');
+        unlink($this->globalsPath.'/en/test.yaml');
+    }
+
     #[Test]
     public function it_builds_the_sites_array_in_a_multi_site_install()
     {
diff --git a/tests/Yaml/YamlTest.php b/tests/Yaml/YamlTest.php
index 1626abd4c45..fc1e6a26300 100644
--- a/tests/Yaml/YamlTest.php
+++ b/tests/Yaml/YamlTest.php
@@ -68,11 +68,11 @@ public function it_dumps_without_front_matter_when_content_is_an_empty_array()
     {
         $expected = <<<'EOT'
 foo: bar
-content: {  }
+content: {}
 
 EOT;
 
-        $this->assertEquals($expected, YAML::dump(['foo' => 'bar'], []));
+        $this->assertEquals($expected, $this->normalizeYaml(YAML::dump(['foo' => 'bar'], [])));
     }
 
     #[Test]
@@ -134,12 +134,12 @@ public function it_explicitly_dumps_front_matter_including_content_when_its_an_e
         $expected = <<<'EOT'
 ---
 foo: bar
-content: {  }
+content: {}
 ---
 
 EOT;
 
-        $this->assertStringEqualsStringIgnoringLineEndings($expected, YAML::dumpFrontMatter(['foo' => 'bar'], []));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, $this->normalizeYaml(YAML::dumpFrontMatter(['foo' => 'bar'], [])));
     }
 
     #[Test]
diff --git a/tests/__fixtures__/lang-composer-fallback/de.json b/tests/__fixtures__/lang-composer-fallback/de.json
new file mode 100644
index 00000000000..90623ef4955
--- /dev/null
+++ b/tests/__fixtures__/lang-composer-fallback/de.json
@@ -0,0 +1,3 @@
+{
+    "Only in fallback": "Nur im Fallback"
+}
diff --git a/tests/__fixtures__/lang/en/messages.php b/tests/__fixtures__/lang/en/messages.php
index 4e8270ded34..535ec682dd7 100644
--- a/tests/__fixtures__/lang/en/messages.php
+++ b/tests/__fixtures__/lang/en/messages.php
@@ -3,4 +3,5 @@
 return [
     'hello' => 'Hello',
     'hello_name' => 'Hello, :name',
+    'apples' => 'There is one apple|There are :count apples',
 ];
diff --git a/tests/__fixtures__/views/app.blade.php b/tests/__fixtures__/views/app.blade.php
new file mode 100644
index 00000000000..4713df4a786
--- /dev/null
+++ b/tests/__fixtures__/views/app.blade.php
@@ -0,0 +1 @@
+<div id="app" data-page="{{ json_encode($page) }}"></div>
diff --git a/tests/__fixtures__/views/components/kebab_prop.blade.php b/tests/__fixtures__/views/components/kebab_prop.blade.php
new file mode 100644
index 00000000000..25c903d63dc
--- /dev/null
+++ b/tests/__fixtures__/views/components/kebab_prop.blade.php
@@ -0,0 +1,2 @@
+@props(['someProp' => null])
+<div data-test="{{ $someProp }}"></div>
diff --git a/tests/__fixtures__/views/components/kebab_prop_class.antlers.html b/tests/__fixtures__/views/components/kebab_prop_class.antlers.html
new file mode 100644
index 00000000000..c3bee206a20
--- /dev/null
+++ b/tests/__fixtures__/views/components/kebab_prop_class.antlers.html
@@ -0,0 +1 @@
+{{ someProp }}
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
index 3c09664c045..85bf8369a0b 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -4,9 +4,7 @@ import laravel from 'laravel-vite-plugin';
 import vue from '@vitejs/plugin-vue';
 import { visualizer } from 'rollup-plugin-visualizer';
 import svgLoader from 'vite-svg-loader';
-import path from 'path';
 import { playwright } from '@vitest/browser-playwright';
-import tsconfigPaths from 'vite-tsconfig-paths';
 import { storybookTest } from '@storybook/addon-vitest/vitest-plugin';
 
 export default defineConfig(({ mode, command }) => {
@@ -14,6 +12,7 @@ export default defineConfig(({ mode, command }) => {
     const isRunningBuild = command === 'build';
     const isProdBuild = isRunningBuild && mode === 'production';
     const isProdDevBuild = isRunningBuild && mode === 'development';
+    const isTesting = !!process.env.VITEST;
 
     return {
         base: './',
@@ -23,9 +22,8 @@ export default defineConfig(({ mode, command }) => {
             }
         },
         plugins: [
-            tsconfigPaths(),
             tailwindcss(),
-            laravel({
+            !isTesting && laravel({
                 valetTls: env.VALET_TLS,
                 input: ['resources/css/app.css', 'resources/js/index.js'],
                 refresh: true,
@@ -34,21 +32,18 @@ export default defineConfig(({ mode, command }) => {
             }),
             vue(),
             svgLoader(),
+            visualizer({ filename: 'bundle-stats.html' }),
         ],
         css: {
             devSourcemap: true,
         },
         resolve: {
+            tsconfigPaths: true,
             alias: {
                 vue: 'vue/dist/vue.esm-bundler.js',
             },
         },
         build: {
-            rollupOptions: {
-                output: {
-                    plugins: [visualizer({ filename: 'bundle-stats.html' })]
-                },
-            },
             minify: isProdBuild
         },
         test: {