fix(i18n): the sticker entry of the dynamic key list goes at its end

A new element kind, sticker, draws layered vector illustrations from a library in twelve themes, behind its own entry point @trek/shared/stickers. Studio gets a Stickers rail section (themes, localized search, recently used, click or drag to place) and an inspector for colour slots, mirroring, turning and opacity. The assistant gets list_book_assets, add and style of stickers in edit_book_page, stickers in describe_book_page and an overlap warning for a sticker over words. BOOK_SCHEMA_REV goes to 2.

.github/workflows/docker-dev.yml

@@ -5,13 +5,6 @@ name: Build & Push Docker Image (Prerelease)
 # :latest-pre, and tags the commit. Nothing moves :latest. Like the stable
 # release it refuses a commit whose ci-ok is not green. docker.yml with
 # bump=auto later finalizes the line once main carries it.
-#
-# A prerelease asks the TREK services issuer for a registration dialect of its
-# own -pre.N version (registration-dialect.yml, as the stable release does)
-# and builds it into the image; nothing of it is committed, dev keeps the
-# module of the last stable release, which it gets when main is merged back
-# into dev. Without one the image carries dev's module, with a warning when
-# that is the original one or old.
 
 on:
   workflow_dispatch:
@@ -96,23 +89,10 @@ jobs:
           echo "VERSION=$NEW_VERSION" >> "$GITHUB_OUTPUT"
           echo "$STABLE to $NEW_VERSION"
 
-  # The registration dialect of this prerelease, fetched and checked in a job
-  # without write access. It never fails the build.
-  dialect:
-    needs: version-bump
-    uses: ./.github/workflows/registration-dialect.yml
-    with:
-      version: ${{ needs.version-bump.outputs.version }}
-      ref: ${{ needs.version-bump.outputs.sha }}
-    secrets:
-      TREK_DIALECT_TOKEN: ${{ secrets.TREK_DIALECT_TOKEN }}
-
   build:
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 120
-    needs: [version-bump, dialect]
-    # Whatever became of the dialect job: without its artifact the image carries dev's module.
-    if: ${{ !cancelled() && needs.version-bump.result == 'success' }}
+    needs: version-bump
     strategy:
       fail-fast: false
       matrix:
@@ -131,48 +111,6 @@ jobs:
         with:
           ref: ${{ needs.version-bump.outputs.sha }}
 
-      - name: Take over the prerelease's dialect
-        id: take
-        uses: actions/download-artifact@v7
-        continue-on-error: true
-        with:
-          name: registration-dialect
-          path: ${{ runner.temp }}/dialect
-
-      # Into the build context only; the commit stays as it is. Without a
-      # dialect of its own the image speaks dev's module, which the issuer
-      # takes for new installations for 180 days after it was made (longer
-      # while it is the newest stable release's). That is warned about, never
-      # stopped on, and a date that cannot be read only warns as well.
-      - name: Place the dialect
-        env:
-          VERSION: ${{ needs.version-bump.outputs.version }}
-          TAKEN: ${{ steps.take.outcome }}
-          REPORT: ${{ matrix.platform == 'linux/amd64' }}
-        run: |
-          set -u
-          target=server/src/nest/service-identity/registration-dialect.ts
-          fetched="$RUNNER_TEMP/dialect/registration-dialect.ts"
-          if [ "$TAKEN" = success ] && [ -f "$fetched" ]; then
-            cp "$fetched" "$target"
-            echo "$VERSION registers in dialect $(sed -n "s/^const DIALECT = '\(.*\)';$/\1/p" "$target") of its own."
-            exit 0
-          fi
-          [ "$REPORT" = true ] || exit 0
-          id="$(sed -n "s/^const DIALECT = '\(.*\)';$/\1/p" "$target")"
-          created="$(sed -n "s/^  createdAt: '\(.*\)',$/\1/p" "$target")"
-          if [ "$id" = 0 ]; then
-            message="$VERSION got no dialect of its own and registers in the original one, which the issuer accepts only for a transition period."
-          elif made="$(date -u -d "$created" +%s 2>/dev/null)"; then
-            age=$(( ($(date -u +%s) - made) / 86400 ))
-            message="$VERSION got no dialect of its own and registers in dev's dialect $id from $created, $age days old."
-            [ "$age" -gt 150 ] || { echo "$message"; exit 0; }
-          else
-            message="$VERSION got no dialect of its own, and the date of dev's dialect cannot be read from $target."
-          fi
-          echo "::warning::$message"
-          printf '### Registration dialect\n%s\n' "$message" >> "$GITHUB_STEP_SUMMARY"
-
       - uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
 
       - uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
@@ -218,7 +156,6 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 120
     needs: [version-bump, build]
-    if: ${{ !cancelled() && needs.build.result == 'success' }}
     steps:
       - uses: actions/checkout@v6
         with:

.github/workflows/docker.yml

@@ -2,29 +2,17 @@ name: Build & Push Docker Image
 
 # The stable release. Dispatched by hand on main, it:
 #   1. refuses to run unless ci-ok passed on the main commit it releases,
-#   2. works out the version from the tags and the bump input,
-#   3. asks the TREK services issuer for the registration dialect of that
-#      version and checks it, in a job without write access
-#      (registration-dialect.yml); without one the release ships the dialect
-#      already on main, but only while that one still has 90 days to run,
-#   4. commits the bump to package.json, the lockfile, Chart.yaml and the
-#      dialect, tags it and pushes,
-#   5. builds both platforms from exactly that bump commit (never from
+#   2. works out the version from the tags and the bump input, commits the
+#      bump to package.json, the lockfile and Chart.yaml, tags it and pushes,
+#   3. builds both platforms from exactly that bump commit (never from
 #      whatever main points to by then) and publishes :VERSION,
 #      :MAJOR.MINOR, :MAJOR and :latest,
-#   6. publishes the Helm chart from the same commit.
+#   4. publishes the Helm chart from the same commit.
 #
 # Big or risky changes go out as a prerelease first (docker-dev.yml, tagged
 # :latest-pre and :<next>-pre.N); bump=auto here then finalizes that line.
 # Without a prerelease in flight there is no default: the run stops until
 # someone picks patch, minor or major.
-#
-# Each stable release registers new installations in a dialect of its own,
-# which the issuer accepts for 180 days, and for as long as it is the newest
-# release's; renewing a key needs none. dev gets the module when main is merged
-# back into dev after the release; a prerelease asks the issuer for one of its
-# own (docker-dev.yml). The issuer's side, and what to set up before the first
-# release with a dialect, is in the operations guide of the TREK services.
 
 on:
   workflow_dispatch:
@@ -38,10 +26,6 @@ on:
         description: "Type MAJOR (all caps) to confirm a major release"
         type: string
         default: ''
-      allow_stale_dialect:
-        description: 'Ship without a dialect of its own even if the one on main is the original one or has under 90 days left'
-        type: boolean
-        default: false
 
 permissions:
   contents: write
@@ -52,16 +36,13 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  version:
+  version-bump:
     if: github.repository == 'liketrek/TREK'
     runs-on: ubuntu-24.04
-    timeout-minutes: 30
-    permissions:
-      contents: read
-      checks: read
+    timeout-minutes: 120
     outputs:
       version: ${{ steps.bump.outputs.VERSION }}
-      base: ${{ steps.base.outputs.SHA }}
+      sha: ${{ steps.bump.outputs.SHA }}
     steps:
       - name: Release from main only
         if: github.ref != 'refs/heads/main'
@@ -69,17 +50,17 @@ jobs:
           echo "::error::Dispatch this workflow on main, not on $GITHUB_REF."
           exit 1
 
+      - uses: actions/create-github-app-token@v3
+        id: app-token
+        with:
+          app-id: ${{ secrets.RELEASE_APP_ID }}
+          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
+
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           fetch-tags: true
-          persist-credentials: false
-
-      # The bump job checks out exactly this commit, so what ci-ok was checked
-      # on is what gets released, however long the dialect takes.
-      - name: Note the commit being released
-        id: base
-        run: echo "SHA=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+          token: ${{ steps.app-token.outputs.token }}
 
       # The dev push, the main push and any manual run each leave a ci-ok on
       # this commit. scripts/ci/ci-ok-verdict.mjs counts the newest attempt of
@@ -96,13 +77,14 @@ jobs:
           gh api "repos/$GITHUB_REPOSITORY/commits/$sha/check-runs?check_name=ci-ok&filter=all&per_page=100" > "$runs"
           node scripts/ci/ci-ok-verdict.mjs "$runs" "$sha"
 
-      - name: Determine bump type and version
+      - name: Determine bump type and update version
         id: bump
         env:
           BUMP_INPUT: ${{ inputs.bump || 'auto' }}
           CONFIRM_MAJOR: ${{ inputs.confirm_major }}
         run: |
           set -eu
+          git fetch --tags
 
           # Derive version from git tags, no package.json dependency
           STABLE_TAG=$(git tag -l 'v[0-9]*.[0-9]*.[0-9]*' | grep -v '\-pre\.' | sort -V | tail -1)
@@ -161,107 +143,6 @@ jobs:
           echo "VERSION=$NEW_VERSION" >> "$GITHUB_OUTPUT"
           echo "$STABLE to $NEW_VERSION ($BUMP)"
 
-  # The registration dialect of this version, fetched and checked in a job
-  # without write access. It never fails; without an artifact from it the
-  # bump decides below whether the dialect on main may ship.
-  dialect:
-    needs: version
-    uses: ./.github/workflows/registration-dialect.yml
-    with:
-      version: ${{ needs.version.outputs.version }}
-      ref: ${{ needs.version.outputs.base }}
-    secrets:
-      TREK_DIALECT_TOKEN: ${{ secrets.TREK_DIALECT_TOKEN }}
-
-  # Runs whatever became of the dialect job, a timeout or a lost runner
-  # included: no artifact means the dialect on main, if it may still ship.
-  version-bump:
-    needs: [version, dialect]
-    if: ${{ !cancelled() && needs.version.result == 'success' }}
-    runs-on: ubuntu-24.04
-    timeout-minutes: 120
-    outputs:
-      sha: ${{ steps.commit.outputs.SHA }}
-    steps:
-      - uses: actions/create-github-app-token@v3
-        id: app-token
-        with:
-          app-id: ${{ secrets.RELEASE_APP_ID }}
-          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-
-      - uses: actions/checkout@v6
-        with:
-          ref: ${{ needs.version.outputs.base }}
-          fetch-depth: 0
-          fetch-tags: true
-          token: ${{ steps.app-token.outputs.token }}
-
-      - name: Take over the checked dialect
-        id: take
-        uses: actions/download-artifact@v7
-        continue-on-error: true
-        with:
-          name: registration-dialect
-          path: ${{ runner.temp }}/dialect
-
-      # Without a dialect of its own the release ships the one on main, but
-      # only while the issuer takes new registrations in it for 90 more days:
-      # dialect 0 closes on the issuer's transition date, and a dialect with
-      # little left would shut out new installations of this release soon after
-      # it is out. Then this stops before anything is committed, unless
-      # allow_stale_dialect says to ship anyway. The issuer keeps the newest
-      # release's dialect open past its date, so the date here is the least it
-      # has, not the most.
-      - name: Place the dialect
-        env:
-          VERSION: ${{ needs.version.outputs.version }}
-          TAKEN: ${{ steps.take.outcome }}
-          ALLOW_STALE: ${{ inputs.allow_stale_dialect }}
-        run: |
-          set -u
-          target=server/src/nest/service-identity/registration-dialect.ts
-          fetched="$RUNNER_TEMP/dialect/registration-dialect.ts"
-          dialect_id() { sed -n "s/^const DIALECT = '\(.*\)';$/\1/p" "$1"; }
-          report() {
-            echo "$2$1"
-            printf '### Registration dialect\n%s\n' "$1" >> "$GITHUB_STEP_SUMMARY"
-          }
-          if [ "$TAKEN" = success ] && [ -f "$fetched" ]; then
-            cp "$fetched" "$target"
-            report "$VERSION registers in dialect $(dialect_id "$target"), written by the issuer for it." ""
-            exit 0
-          fi
-          id="$(dialect_id "$target")"
-          created="$(sed -n "s/^  createdAt: '\(.*\)',$/\1/p" "$target")"
-          left=""
-          if [ -n "$id" ] && [ "$id" != 0 ] && made="$(date -u -d "$created" +%s 2>/dev/null)"; then
-            left=$(( (made + 180 * 86400 - $(date -u +%s)) / 86400 ))
-          fi
-          if [ -n "$left" ] && [ "$left" -ge 90 ]; then
-            report "$VERSION ships without a dialect of its own and registers in dialect $id from $created, which the issuer takes for new installations for $left more days at least. Its operator can write one by hand for the next patch." "::warning::"
-            exit 0
-          fi
-          if [ "$id" = 0 ]; then
-            what="the original registration, which the issuer accepts only until the end of its transition period"
-          elif [ -n "$left" ]; then
-            what="dialect $id from $created, which has $left days left"
-          else
-            what="a dialect whose id or date cannot be read from $target"
-          fi
-          if [ "$ALLOW_STALE" = true ]; then
-            report "$VERSION ships without a dialect of its own and registers in $what, as allow_stale_dialect asked." "::warning::"
-            exit 0
-          fi
-          report "$VERSION got no dialect of its own and would register in $what. Nothing was committed or pushed. Make sure the issuer runs with its dialect seed and release token and that TREK_DIALECT_TOKEN is set, then run the release again, or tick allow_stale_dialect to ship anyway." "::error::"
-          exit 1
-
-      - name: Update the version, commit, tag and push
-        id: commit
-        env:
-          NEW_VERSION: ${{ needs.version.outputs.version }}
-        run: |
-          set -eu
-
           # Update all workspace + root package.json files and the root lockfile in one shot
           npm version "$NEW_VERSION" --workspaces --include-workspace-root --no-git-tag-version
           sed -i "s/^version: .*/version: $NEW_VERSION/" charts/trek/Chart.yaml
@@ -272,8 +153,7 @@ jobs:
           # landed on main in the meantime.
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add package.json package-lock.json server/package.json client/package.json shared/package.json \
-            charts/trek/Chart.yaml server/src/nest/service-identity/registration-dialect.ts
+          git add package.json package-lock.json server/package.json client/package.json shared/package.json charts/trek/Chart.yaml
           git commit -m "chore: bump version to $NEW_VERSION [skip ci]"
           git tag -a "v$NEW_VERSION" -m "v$NEW_VERSION"
           git push origin HEAD:main --follow-tags
@@ -284,9 +164,7 @@ jobs:
   build:
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 120
-    needs: [version, version-bump]
-    # version-bump may run after a failed dialect job; that alone must not skip what follows it.
-    if: ${{ !cancelled() && needs.version-bump.result == 'success' }}
+    needs: version-bump
     strategy:
       fail-fast: false
       matrix:
@@ -327,7 +205,7 @@ jobs:
           outputs: type=image,name=mauriceboe/trek,push-by-digest=true,name-canonical=true,push=true
           no-cache: true
           build-args: |
-            APP_VERSION=${{ needs.version.outputs.version }}
+            APP_VERSION=${{ needs.version-bump.outputs.version }}
           labels: |
             org.opencontainers.image.revision=${{ steps.meta.outputs.revision }}
             org.opencontainers.image.created=${{ steps.meta.outputs.created }}
@@ -349,8 +227,7 @@ jobs:
   merge:
     runs-on: ubuntu-24.04
     timeout-minutes: 120
-    needs: [version, version-bump, build]
-    if: ${{ !cancelled() && needs.build.result == 'success' }}
+    needs: [version-bump, build]
     steps:
       - uses: actions/checkout@v6
         with:
@@ -375,7 +252,7 @@ jobs:
         working-directory: /tmp/digests
         run: |
           set -euo pipefail
-          VERSION="${{ needs.version.outputs.version }}"
+          VERSION="${{ needs.version-bump.outputs.version }}"
           MAJOR_TAG="$(echo "$VERSION" | cut -d. -f1)"
           # :MAJOR.MINOR takes the patches of one minor line and nothing else,
           # the conservative pin for an install that wants to wait out a
@@ -415,7 +292,6 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 120
     needs: version-bump
-    if: ${{ !cancelled() && needs.version-bump.result == 'success' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v6

.github/workflows/registration-dialect.yml

@@ -1,142 +0,0 @@
-name: Registration dialect
-
-# Asks the TREK services issuer for the registration dialect of one version and
-# checks it, for docker.yml (a stable release commits it with the version bump)
-# and docker-dev.yml (a prerelease only builds it into its image).
-#
-# The issuer's answer runs here, in a job that holds no write token and keeps
-# no git credentials; the token for the issuer is in the environment of the
-# one step that fetches. The answer is held to what a dialect is
-# (scripts/ci/check-registration-dialect.mjs), then type-checked and linted
-# the way TREK's CI would see it once it is on main and dev. Only a module that
-# passes all of it goes on, as the artifact `registration-dialect`; without
-# one the caller decides what ships. This workflow never fails its caller.
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        description: 'The version the dialect is for, X.Y.Z or X.Y.Z-pre.N'
-        type: string
-        required: true
-      ref:
-        description: 'The commit whose checker, types and lint config the dialect is checked with'
-        type: string
-        required: true
-    secrets:
-      TREK_DIALECT_TOKEN:
-        required: false
-
-permissions:
-  contents: read
-
-jobs:
-  dialect:
-    runs-on: ubuntu-24.04
-    timeout-minutes: 20
-    # A failed or timed-out run leaves no artifact, which the caller already
-    # handles; it must not fail the release around it.
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          ref: ${{ inputs.ref }}
-          persist-credentials: false
-
-      - uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: npm
-          cache-dependency-path: package-lock.json
-
-      # The only step that sees the token. The URL is fixed; the answer is
-      # bounded in time and size and goes to a file nothing runs yet.
-      - name: Fetch the dialect from the issuer
-        id: fetch
-        timeout-minutes: 3
-        env:
-          TREK_DIALECT_TOKEN: ${{ secrets.TREK_DIALECT_TOKEN }}
-          VERSION: ${{ inputs.version }}
-        run: |
-          set -uo pipefail
-          out="$RUNNER_TEMP/registration-dialect.ts"
-          if [ -z "${TREK_DIALECT_TOKEN:-}" ]; then
-            echo "::warning::TREK_DIALECT_TOKEN is not set; the issuer was not asked for a dialect for $VERSION."
-            exit 0
-          fi
-          status=$(curl --silent --show-error --proto '=https' --tlsv1.2 --max-time 30 --retry 2 --retry-delay 5 \
-            --max-filesize 262144 -H "Authorization: Bearer $TREK_DIALECT_TOKEN" -H 'Content-Type: application/json' \
-            --data "{\"version\":\"$VERSION\"}" -o "$out" -w '%{http_code}' https://places.liketrek.com/v1/dialects) \
-            || status=000
-          if [ "$status" != 200 ] && [ "$status" != 201 ]; then
-            echo "::warning::The issuer handed out no registration dialect for $VERSION (HTTP $status)."
-            rm -f "$out"
-            exit 0
-          fi
-          if [ "$(wc -c < "$out")" -gt 262144 ]; then
-            echo "::warning::The issuer's registration dialect for $VERSION is larger than a dialect."
-            rm -f "$out"
-            exit 0
-          fi
-          echo "file=$out" >> "$GITHUB_OUTPUT"
-
-      # A module that computes for long is refused by the clock as well.
-      - name: Check the dialect
-        id: check
-        if: steps.fetch.outputs.file != ''
-        timeout-minutes: 2
-        env:
-          FILE: ${{ steps.fetch.outputs.file }}
-          VERSION: ${{ inputs.version }}
-        run: |
-          set -uo pipefail
-          if ! node scripts/ci/check-registration-dialect.mjs "$FILE" "$VERSION"; then
-            echo "::warning::The issuer's registration dialect for $VERSION failed its check."
-            exit 0
-          fi
-          echo "What changes against the dialect in the tree:"
-          git diff --no-index -- server/src/nest/service-identity/registration-dialect.ts "$FILE" || true
-          echo "ok=true" >> "$GITHUB_OUTPUT"
-
-      - name: Install the toolchain
-        if: steps.check.outputs.ok == 'true'
-        timeout-minutes: 8
-        run: |
-          npm ci --ignore-scripts --no-audit --no-fund
-          npm run build --workspace=shared
-
-      # The bump commit skips CI, so this is where the module meets the strict
-      # config (lint:strict lets a new file have no strict errors) and ESLint
-      # with --max-warnings 0 (lint:warnings starts a new file at none) before
-      # it lands on main.
-      - name: Type-check and lint the dialect
-        id: types
-        if: steps.check.outputs.ok == 'true'
-        timeout-minutes: 5
-        working-directory: server
-        env:
-          FILE: ${{ steps.fetch.outputs.file }}
-          VERSION: ${{ inputs.version }}
-        run: |
-          set -uo pipefail
-          cp "$FILE" src/nest/service-identity/registration-dialect.ts
-          printf '%s\n' '{"extends": "./tsconfig.strict.json", "include": [],' \
-            '"files": ["src/nest/service-identity/registration-dialect.ts"]}' > tsconfig.dialect-check.json
-          if ! npx tsc -p tsconfig.dialect-check.json --noEmit --pretty false; then
-            echo "::warning::The issuer's registration dialect for $VERSION does not type-check under the strict config."
-            exit 0
-          fi
-          if ! npx eslint --max-warnings 0 src/nest/service-identity/registration-dialect.ts; then
-            echo "::warning::The issuer's registration dialect for $VERSION does not pass ESLint."
-            exit 0
-          fi
-          echo "ok=true" >> "$GITHUB_OUTPUT"
-
-      - name: Hand the dialect on
-        if: steps.types.outputs.ok == 'true'
-        uses: actions/upload-artifact@v6
-        with:
-          name: registration-dialect
-          path: ${{ steps.fetch.outputs.file }}
-          if-no-files-found: error
-          retention-days: 1

.github/workflows/test.yml

@@ -1161,7 +1161,7 @@ jobs:
           docker run -d --name trek-ci -p 127.0.0.1:3000:3000 \
             --read-only --tmpfs /tmp:noexec,nosuid,size=128m \
             --security-opt no-new-privileges:true \
-            --cap-drop ALL --cap-add CHOWN --cap-add SETUID --cap-add SETGID --cap-add KILL \
+            --cap-drop ALL --cap-add CHOWN --cap-add SETUID --cap-add SETGID \
             -v "$RUNNER_TEMP/trek/data:/app/data" \
             -v "$RUNNER_TEMP/trek/uploads:/app/uploads" \
             -e ENCRYPTION_KEY="$(openssl rand -hex 32)" \
@@ -1194,17 +1194,6 @@ jobs:
           curl -sf http://127.0.0.1:3000/ | grep -q '<div id="root">' \
             || { echo "::error::/ does not serve the client"; exit 1; }
 
-      # Same capabilities as the shipped compose file: dumb-init has to be able
-      # to pass the stop signal on to node, or docker stop ends in SIGKILL (137).
-      - name: Stop gracefully
-        run: |
-          set -euo pipefail
-          docker stop -t 30 trek-ci >/dev/null
-          code="$(docker inspect -f '{{.State.ExitCode}}' trek-ci)"
-          [ "$code" = "0" ] || { echo "::error::docker stop ended with exit code $code, not a graceful shutdown"; exit 1; }
-          docker logs trek-ci 2>&1 | grep 'SIGTERM received' >/dev/null \
-            || { echo "::error::the server never saw SIGTERM"; exit 1; }
-
       - name: Container log
         if: always()
         run: docker logs trek-ci 2>&1 || true

Dockerfile

@@ -22,6 +22,7 @@ WORKDIR /app
 COPY package.json package-lock.json ./
 COPY shared/package.json ./shared/
 COPY client/package.json ./client/
+COPY client/scripts/patch-maplibre.mjs ./client/scripts/
 RUN npm ci --workspace=client
 COPY --from=shared-builder /app/shared/dist ./shared/dist
 COPY client/ ./client/

NOTICE.md

@@ -53,54 +53,3 @@ own switch in the admin panel. https://cloud.google.com/maps-platform/terms
 
 `server/assets/airports.json` is built from **OurAirports**
 (https://ourairports.com/data/), released into the public domain.
-
-## Typefaces: Studio books and the app
-
-Every typeface a book can be set in, and the app's own (Poppins, MuseoModerno,
-Geist), is self-hosted from the **@fontsource** npm packages, which redistribute
-the families published on Google Fonts split into subsets by script. The catalogue of book faces is
-`shared/src/book/book-fonts.data.ts`. Each package carries its licence and the
-copyright notice of the family's authors in its `LICENSE` file.
-
-Both licences allow a font to be bundled with software and embedded in a
-document made with it, so a printed or exported book may carry the faces it is
-set in. No family is renamed, redrawn or sold on its own. SIL OFL 1.1: https://openfontlicense.org. Apache 2.0:
-https://www.apache.org/licenses/LICENSE-2.0
-
-| Family | Package | Licence |
-|---|---|---|
-| Abril Fatface | `@fontsource/abril-fatface` | SIL Open Font License 1.1 |
-| Alfa Slab One | `@fontsource/alfa-slab-one` | SIL Open Font License 1.1 |
-| Allura | `@fontsource/allura` | SIL Open Font License 1.1 |
-| Anton | `@fontsource/anton` | SIL Open Font License 1.1 |
-| Archivo Black | `@fontsource/archivo-black` | SIL Open Font License 1.1 |
-| Bebas Neue | `@fontsource/bebas-neue` | SIL Open Font License 1.1 |
-| Big Shoulders Display | `@fontsource/big-shoulders-display` | SIL Open Font License 1.1 |
-| Bodoni Moda | `@fontsource/bodoni-moda` | SIL Open Font License 1.1 |
-| Bricolage Grotesque | `@fontsource/bricolage-grotesque` | SIL Open Font License 1.1 |
-| Caveat | `@fontsource/caveat` | SIL Open Font License 1.1 |
-| Cormorant Garamond | `@fontsource/cormorant-garamond` | SIL Open Font License 1.1 |
-| Dancing Script | `@fontsource/dancing-script` | SIL Open Font License 1.1 |
-| DM Mono | `@fontsource/dm-mono` | SIL Open Font License 1.1 |
-| DM Serif Display | `@fontsource/dm-serif-display` | SIL Open Font License 1.1 |
-| EB Garamond | `@fontsource/eb-garamond` | SIL Open Font License 1.1 |
-| Fraunces | `@fontsource/fraunces` | SIL Open Font License 1.1 |
-| Great Vibes | `@fontsource/great-vibes` | SIL Open Font License 1.1 |
-| Homemade Apple | `@fontsource/homemade-apple` | Apache License 2.0 |
-| Inter | `@fontsource/inter` | SIL Open Font License 1.1 |
-| Kaushan Script | `@fontsource/kaushan-script` | SIL Open Font License 1.1 |
-| League Gothic | `@fontsource/league-gothic` | SIL Open Font License 1.1 |
-| Lora | `@fontsource/lora` | SIL Open Font License 1.1 |
-| Montserrat | `@fontsource/montserrat` | SIL Open Font License 1.1 |
-| MuseoModerno | `@fontsource/museomoderno` | SIL Open Font License 1.1 |
-| Oswald | `@fontsource/oswald` | SIL Open Font License 1.1 |
-| Pacifico | `@fontsource/pacifico` | SIL Open Font License 1.1 |
-| Parisienne | `@fontsource/parisienne` | SIL Open Font License 1.1 |
-| Permanent Marker | `@fontsource/permanent-marker` | Apache License 2.0 |
-| Playfair Display | `@fontsource/playfair-display` | SIL Open Font License 1.1 |
-| Poppins | `@fontsource/poppins` | SIL Open Font License 1.1 |
-| Sacramento | `@fontsource/sacramento` | SIL Open Font License 1.1 |
-| Satisfy | `@fontsource/satisfy` | Apache License 2.0 |
-| Shrikhand | `@fontsource/shrikhand` | SIL Open Font License 1.1 |
-| Yellowtail | `@fontsource/yellowtail` | Apache License 2.0 |
-| Geist Sans | `@fontsource/geist-sans` | SIL Open Font License 1.1 |

README.md

@@ -6,9 +6,14 @@
   <img src="docs/logo-trek-dark.svg" alt="TREK" height="96" />
 </picture>
 
-### Every part of your trip. One app you own.
+<br />
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="docs/subtitle-light.png" />
+  <source media="(prefers-color-scheme: light)" srcset="docs/subtitle-dark.png" />
+  <img src="docs/subtitle-dark.png" alt="your trip. your plan." height="28" />
+</picture>
 
-TREK has grown from a travel planner into a whole ecosystem for trips: plan together in real time on a live map, build hikes, tours and road trips, keep bookings and shared costs in order, pack, write the journal, lay out the photo book and hand the busy work to the built-in AI. Self-hosted, on the web, on your phone and offline.
+A self-hosted, real-time collaborative travel planner — with maps, budgets, packing lists, a journal, and AI built in.
 
 <br />
 
@@ -27,16 +32,11 @@ TREK has grown from a travel planner into a whole ecosystem for trips: plan toge
 <a href="https://ko-fi.com/mauriceboe"><img alt="Ko-fi" src="https://img.shields.io/badge/Ko--fi-support-FF5E5B?style=for-the-badge" /></a>
 &nbsp;
 <a href="https://www.buymeacoffee.com/mauriceboe"><img alt="BMAC" src="https://img.shields.io/badge/BMAC-support-FFDD00?style=for-the-badge" /></a>
-&nbsp;
-<a href="LICENSE"><img alt="License" src="https://img.shields.io/badge/License-AGPL_v3-6B7280?style=for-the-badge" /></a>
-&nbsp;
-<a href="https://github.com/liketrek/TREK/releases"><img alt="Latest Release" src="https://img.shields.io/github/v/release/liketrek/trek?include_prereleases&style=for-the-badge&label=Release&color=6B7280" /></a>
-&nbsp;
-<a href="https://hub.docker.com/r/mauriceboe/trek"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/mauriceboe/trek?style=for-the-badge&label=Docker%20pulls&color=6B7280" /></a>
-&nbsp;
-<a href="https://github.com/liketrek/TREK"><img alt="Stars" src="https://img.shields.io/github/stars/liketrek/trek?style=for-the-badge&label=Stars&color=6B7280" /></a>
-
-<sub>PUBLIC SERVICES PROUDLY SPONSORED BY</sub><br /><a href="https://cloud.dataforest.net/en?mtm_campaign=trek"><picture><source media="(prefers-color-scheme: dark)" srcset="docs/sponsors/dataforest-light.svg" /><source media="(prefers-color-scheme: light)" srcset="docs/sponsors/dataforest-dark.svg" /><img src="docs/sponsors/dataforest-dark.svg" alt="dataforest cloud" height="30" /></picture></a>
+<br />
+<a href="LICENSE"><img alt="License" src="https://img.shields.io/badge/license-AGPL_v3-6B7280?style=flat-square" /></a>
+<a href="https://github.com/liketrek/TREK/releases"><img alt="Latest Release" src="https://img.shields.io/github/v/release/liketrek/trek?include_prereleases&style=flat-square&color=6B7280" /></a>
+<a href="https://hub.docker.com/r/mauriceboe/trek"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/mauriceboe/trek?style=flat-square&color=6B7280" /></a>
+<a href="https://github.com/liketrek/TREK"><img alt="Stars" src="https://img.shields.io/github/stars/liketrek/trek?style=flat-square&color=6B7280" /></a>
 </div>
 
 ---
@@ -62,7 +62,7 @@ TREK has grown from a travel planner into a whole ecosystem for trips: plan toge
 
 <br />
 
-Most of what follows is an addon an admin switches on or off. Lists, Costs, Documents, Collab, Tours, Vacay and Atlas ship on; Journey, Collections, MCP, the AI assistant, AI Parsing, Road trip, Dawarich and AirTrail ship off and are marked below.
+Most of what follows is an addon an admin switches on or off. Lists, Costs, Documents, Collab, Vacay and Atlas ship on; Journey, Collections, MCP, AI Parsing and AirTrail ship off and are marked below.
 
 <table>
 <tr>
@@ -70,110 +70,76 @@ Most of what follows is an addon an admin switches on or off. Lists, Costs, Docu
 
 #### 🧭 Planning
 
-- **Day plans**: drag places, notes and bookings between days with undo, or drop a map marker straight onto a day
-- **Maps**: Leaflet, Mapbox GL or MapLibre GL (OpenFreeMap, no token) with clustering, photo markers, route lines and a whole-trip route overview
-- **Places**: search the TREK Places index and OpenStreetMap with no key, or Google Places and Amap with one. Descriptions, hours and photos from Wikipedia, Wikidata and Wikimedia Commons, plus a rating and a custom image per place
-- **Explore**: nearby places by category for the map view, from the TREK Places index with Overpass as fallback
-- **Routes**: auto-sort a day (nearest neighbour then 2-opt, locked stops and hotels stay put), a travel mode per leg over OSRM or Valhalla, then open the day in Google Maps or CoMaps and a place in seven navigation apps
-- **Public transport**: door-to-door itineraries over Transitous, or Google where Transitous has no data
-- **Import and export**: Google Maps and Naver Maps lists, Google Maps directions links, GPX, KML and KMZ in; GPX and an ICS feed per trip or across all trips out
-- **Weather**: 16-day forecast from Open-Meteo, no key, and the archive for dates beyond it
-- **Trip dates**: move a trip and its days re-date themselves, with the bookings along or re-anchored. Trips also copy and archive
-- **Road trip** (off by default): drives with stops, day windows and arrival times that recompute, route alternatives, hazards and EV charging with range
+- **Day plans**: drag places between days and reorder inside a day, with undo. Notes and bookings drag the same way, and a map marker drops straight onto a day
+- **Maps**: Leaflet, Mapbox GL or MapLibre GL (OpenFreeMap, no token), with clustering, photo markers and route lines. 3D buildings and terrain are Mapbox only
+- **Place search**: Google Places when a key is set (photos, ratings, opening hours), otherwise OpenStreetMap with no key
+- **Place enrichment**: descriptions, facts, hours and photo candidates from OpenStreetMap, Wikipedia, Wikidata and Wikimedia Commons
+- **POI explore**: pull OpenStreetMap POIs by category for the current viewport over Overpass
+- **Import**: shared Google Maps and Naver Maps lists, plus GPX, KML and KMZ files
+- **Export**: GPX of a trip's places and tracks, and an ICS feed per trip or across all of them
+- **Routes**: auto-sort a day (nearest neighbour then 2-opt, locked stops and hotel anchors stay put), driving, walking or cycling profiles over OSRM, then open it in Google Maps or CoMaps
+- **Public transport**: door-to-door itineraries over Transitous
+- **Weather**: 16-day forecast from Open-Meteo, no key. Dates outside that window read the archive for the same date instead
+- **Day notes**: markdown body with an icon and a colour, reordered by drag and drop or moved to another day
+- **Trip dates**: move a trip and the days re-date themselves, either dragging the bookings along or re-anchoring them. Trips also copy and archive
 
 </td>
 <td width="50%" valign="top">
 
-#### 🥾 Tours
-
-- **Seven tour types**: hike, city walk, run, bike (touring, road, gravel, MTB), paddle (kayak, canoe, SUP), horse ride, and ski and winter (alpine, cross-country, touring, snowshoe, winter hike)
-- **Routing**: legs routed over Valhalla with shaping points, hand-drawn legs, route variants, round hikes of a wished length and trip places as stops, all with undo
-- **Hikes**: routed within a maximum SAC grade (T1 to T6), the trail grades along the way, and via ferratas on the map
-- **Terrain**: elevation profile, ascent and descent, and a 3D terrain map with grade colouring and a flyover, no token needed. Topo, hiking, cycling and satellite bases with sea marks and ski pistes as overlays
-- **Multi-day tours**: one route cut into stages and spread across the trip's days
-- **Along the way**: viewpoints, huts, water, food and more within a corridor of the route, inserted as a stop with the detour it adds
-- **Ski, paddle and city walks**: a piste router by difficulty and lift type; a water router with portages, locks and a wind forecast; city walks with stays, opening hours and transit between stops
-- **Plan against reality**: link a recorded GPX to a planned day and compare distance, ascent and time. Import trails from a wanderer instance, save tours to a collection and take them into another trip
-
-</td>
-</tr>
-<tr>
-<td width="50%" valign="top">
-
 #### 🧳 Bookings and money
 
-- **Reservations**: 18 booking types with status, confirmation code, travellers and attached files
-- **Flights and trains**: several legs with stopovers and endpoint timezones, against 4,045 bundled airports so local times resolve without a key
-- **Accommodation**: a stay spans a range of nights with a check-in window
-- **Booking import**: EML, PDF, PKPass, HTML, TXT and photos of confirmations, through [KItinerary](https://invent.kde.org/pim/kitinerary) or an AI model, with a review step before anything is saved. Prices become linked costs
-- **AirTrail** (off by default): import flights from a self-hosted AirTrail instance and keep them in sync
-- **Costs**: split in integer cents with equal or custom shares, several payers, settle-up suggestions, a per-person summary, a settlement log and CSV export. A receipt photo can fill in an expense
-- **Currencies**: one per expense with the rate frozen at entry, from Frankfurter with no key
-- **Packing lists and to-dos**: categories, templates, assignees and visibility tiers; bags with weights as an admin switch; to-dos with due dates, priorities and reminders
-- **Files**: attach to a trip, place, day or booking, 50 MB each and 500 MB for video, with trash and restore
-- **PDF export**: cover, place photos, day notes, bookings and costs, with an optional page break per day
+- **Reservations**: 16 booking types with status, confirmation code, travellers and attached files
+- **Flights and trains**: several legs with stopovers, per-leg times and endpoint timezones, against 4,045 bundled airports so local times resolve without a key
+- **Accommodation**: a stay spans a range of days with a check-in window, and shows on every night it covers
+- **Booking import**: EML, PDF, PKPass, HTML and TXT confirmations through [KItinerary](https://invent.kde.org/pim/kitinerary). Needs the `kitinerary-extractor` binary, which ships in the Docker image
+- **AirTrail** (off by default): link a self-hosted AirTrail instance to import flights as reservations and keep them in sync
+- **Costs**: split expenses in integer cents with equal or custom shares, several payers per expense, settle-up suggestions, a settlement log, and CSV export
+- **Currencies**: a currency per expense with the rate frozen at entry. Rates come from Frankfurter, no key
+- **Packing lists**: categories, admin-managed templates, assignees, three visibility tiers, and a packed-of-total line. Bags with weight roll-up are a separate admin switch, off by default
+- **To-dos**: assignee, due date, priority, and a reminder before one falls due
+- **Files**: attach to a trip, place, day entry or reservation. 50 MB each, 500 MB for video, with trash and restore
+- **PDF export**: cover page, place photos, day notes, bookings and costs, with an optional page break per day
 
 </td>
+</tr>
+<tr>
 <td width="50%" valign="top">
 
 #### 👥 Collaboration
 
-- **Real-time sync** (WebSocket): edits land live for everyone who has the trip open
-- **Members**: add by email or username, hand over ownership, or add guests who have no login at all
-- **Permissions**: an admin maps each of 17 trip actions to admin, trip owner, trip member or everybody
-- **Invites**: one reusable link per trip with an optional expiry, and admin signup invites that drop a new account straight into a trip
-- **Public share**: a read-only trip page without an account, with switches for map, bookings, packing, costs and chat
-- **Collab**: group chat with replies, reactions and link previews, shared notes, links, polls and a What's Next list, each one its own switch
-- **Notifications**: an inbox grouped by day with answers right from the notification, and a per-user matrix of events against in-app, email, webhook, ntfy, Web Push and plugin channels
+- **Real-time sync** (WebSocket): edits land live for everyone who has that trip open
+- **Members**: add by email or username, hand ownership to someone else, or add guests who have no login at all
+- **Permissions**: an admin maps each of 16 trip actions to admin, trip owner, trip member or everybody
+- **Invite links**: one reusable link per trip with an optional expiry. Admins can also issue signup invites with a use limit that drop the new account straight into a trip
+- **Public share**: a read-only trip page anyone can open without an account
+- **Collab**: group chat with replies, reactions and link previews, shared notes with attachments, polls, and a What's Next list of upcoming activities. Each of the four switches on its own
 
-</td>
-</tr>
-<tr>
-<td width="50%" valign="top">
+#### 📔 Journal, Atlas and Vacay
 
-#### 📔 Journey and TREK Studio
-
-- **Journey** (off by default): dated entries with story, mood, weather and tags, photos and video from uploads, [Immich](https://immich.app) or Synology Photos, map views, co-authors, drafts and a public share link
-- **Linked journal**: a trip can show one journal as its own, with the members picked on the trip as viewers or editors
-- **Recorded days** (with Dawarich): keep a day's recorded route and turn its stays into entries
-- **TREK Studio**: turn a journal into a printable photo book. 34 print-licensed typefaces, 17 themes, 108 designed pages in twelve styles, 160 recolourable stickers, text effects, layers and a Travel tab with route maps, country stamps and trip figures
-- **Auto layout**: lays the whole book on the designed pages in the style of its theme, every photo in a frame, or rebuilds one spread
-- **Print and share**: PDF export as pages or spreads with crop marks, several people editing at once, and design files to move a spread into another book
-
-</td>
-<td width="50%" valign="top">
-
-#### 🗺️ Atlas, Vacay and Collections
-
-- **Atlas**: countries and regions visited on [geoBoundaries](https://www.geoboundaries.org/) outlines, a bucket list, travel stats, and a tour activities tab with planned against recorded totals
-- **Vacay**: leave calendar with half days, public holidays from date.nager.at, school holidays for 16 European countries, company holidays, carry-over between years, and joint or read-only sharing
-- **Collections** (off by default): a place library outside any trip with lists, labels, ratings, a status per place, cover images, GPX and file export, copy into a trip, and sharing by invite
-- **Dawarich** (off by default): link a Dawarich instance for recorded tracks, suggested stays and countries for the Atlas
-
-</td>
-</tr>
-<tr>
-<td width="50%" valign="top">
-
-#### 🤖 AI assistant and MCP
-
-- **AI assistant** (off by default): a chat that plans with you in a trip, across all your trips, in a journal and in Studio, and works with tours, costs, bookings, packing, Vacay and the Atlas
-- **Your own model**: an API key for Anthropic, OpenAI, Gemini or OpenRouter, a ChatGPT plan, or any OpenAI-compatible endpoint, set for the instance or per user
-- **You stay in charge**: reads run at once, every change waits as a card to apply or discard and can be undone for 15 minutes. Nothing leaves before you agree to the provider, and a file's text only with your consent
-- **Attachments**: drop a booking confirmation, a GPX file or a photo into the chat, and the assistant offers what to do with it
-- **MCP server** (off by default): OAuth 2.1 with mandatory PKCE and dynamic client registration, 410 tools, 30 resources and 4 prompts, 35 scopes in 17 groups ticked on the consent screen, and every call in the audit log
-- **Addon-aware**: twelve addon gates decide which tools a session sees, and flipping one re-registers live sessions
+- **Journey** (off by default): dated entries with story, mood, weather and tags, photos and video from uploads or a linked [Immich](https://immich.app) or Synology Photos library, map views, co-authors, and a public share link
+- **Atlas**: mark countries and sub-national regions visited on [geoBoundaries](https://www.geoboundaries.org/) outlines, plus a bucket list, travel stats and a consecutive-years-travelled count
+- **Vacay**: leave calendar with half days, public holidays from date.nager.at, school holiday overlays for 16 European countries, carry-over between years, and joint or read-only sharing of a plan
+- **Collections** (off by default): a place library outside any trip, with labels, ratings, a custom image per place, copy-into-a-trip, and sharing by invite
 
 </td>
 <td width="50%" valign="top">
 
 #### 🧩 Plugins
 
-- **Third-party plugins**: install from the TREK registry or sideload a zip, with their own pages under `/plugins/<id>`
-- **Sandboxed**: one child process per plugin, 66 grantable permissions, an admin-edited outbound host allowlist, memory and call caps
-- **Trust**: registry downloads are pinned by sha256 and checked against the author's minisign key, a sideloaded zip is marked unverified, and `TREK_PLUGINS_ENABLED=false` turns the whole system off
-- **Extension points**: map layers, place details, day schedules, PDF sections, Atlas layers, journal rows, trip warnings, search and photo providers, route profiles, notification channels and MCP tools
-- **SDK**: [`trek-plugin-sdk`](https://www.npmjs.com/package/trek-plugin-sdk) with a CLI to create, validate, run against real data, sign and publish
+- **Third-party plugins**: install from the TREK registry or sideload a zip, switch on per instance, with their own pages under `/plugins/<id>`
+- **Sandboxed**: one child process per plugin, 63 grantable permissions, an admin-edited outbound host allowlist, memory and RPC caps, and daily caps on AI and notification calls
+- **Trust**: registry downloads are pinned by sha256 and checked against the author's minisign key. A sideloaded zip is marked unverified, and `TREK_PLUGINS_ENABLED=false` turns the whole system off
+- **Extension points**: map markers and layers, place details, day schedules, PDF sections, Atlas layers, journal rows, trip warnings, calendar sources, route profiles and notification channels. Plugin pages run in an opaque-origin iframe
+- **SDK**: [`trek-plugin-sdk`](https://www.npmjs.com/package/trek-plugin-sdk) on npm, with a manifest validator, a mock host, and a dev-link mode that runs a local build against real data
+
+#### 🤖 AI and MCP
+
+- **MCP server** (off by default): OAuth 2.1 with mandatory PKCE and dynamic client registration. 199 tools, 30 resources, 4 prompts
+- **Scopes**: 29 scopes in 14 groups, each one tickable on the consent screen. Tokens are bound to the `/mcp` resource, and every tool call lands in the audit log
+- **Reach**: create trips and days, edit places, packing lists, to-dos, costs, reservations, collections and journeys, mark countries visited, all inside the scopes the token holds
+- **Prompts**: `trip-summary`, plus `packing-list` and `budget-overview` when those addons are on
+- **Addon-aware**: seven addon gates decide which tools and resources a session sees. Flipping one drops live sessions so the surface re-registers
+- **Booking extraction** (off by default): read a confirmation with a local Ollama server, any OpenAI-compatible endpoint, or Anthropic, configured instance-wide or per user
 
 </td>
 </tr>
@@ -182,26 +148,30 @@ Most of what follows is an addon an admin switches on or off. Lists, Costs, Docu
 
 #### 📱 Mobile and offline
 
-- **Installable**: iOS and Android straight from the browser, no App Store, standalone with a themed status bar
-- **Phone layouts**: their own screens for every part of the app, with a bottom bar and dashboard widgets the user orders
-- **Offline reads**: the app shell is precached and trips, places, tours, files and nearby places live in a per-user IndexedDB store, so a trip opens with no network
-- **Offline writes**: changes queue and replay with an `X-Idempotency-Key`, and a stale edit waits for a keep-mine or keep-theirs choice
-- **Offline maps**: raster and vector tiles of a trip downloaded ahead, and a switch that takes the whole app offline on purpose
+- **Installable**: iOS and Android straight from the browser, no App Store. Runs standalone without browser chrome, with the status bar tinted per theme
+- **Phone layouts**: a separate shell below 768px with its own tokens, a bottom bar and safe-area insets. Which items sit in that bar is up to the user
+- **Offline reads**: the app shell and every route chunk are precached, and trips, places and file blobs live in a per-user IndexedDB store, so a trip opens with no network
+- **Offline writes**: mutations queue and replay with an `X-Idempotency-Key`, so a reconnect cannot double-apply. A stale edit is parked for a keep-mine or keep-theirs choice
+- **Offline maps**: pre-download a trip's raster tiles, and clear them again
+- **API responses are never cached** by the service worker. They vary per session, so they always come from the network
 
 </td>
 <td width="50%" valign="top">
 
 #### ⚙️ Admin, accounts and security
 
-- **Sign-in**: password, OIDC and passkeys each switch on and off on their own, `OIDC_ONLY` leaves SSO as the only way in, and an OIDC claim can grant admin
-- **SSO and 2FA**: one OIDC provider by discovery with PKCE (Authentik, Keycloak, Google and the like), TOTP with backup codes that an admin can require, and passkeys that count as the second factor
-- **Sessions**: every sign-in is a session you can see and end, one by one or all others at once
-- **Hardening**: rate limits on sign-in, reset and 2FA, a password policy, secrets encrypted at rest and masked on read, and an SSRF guard on every URL you configure
-- **Admin panel**: users and the permission matrix, defaults for new users, categories and templates, addons, plugins, storage, notifications, MCP tokens, backups, audit log and releases
-- **Backups and storage**: scheduled backups with retention that restore their own secrets, and local or S3-compatible storage per content category with replicas
-- **Appearance**: light, dark or follow the OS, seven colour schemes plus a custom accent, transparency, density, reduced motion and text size
+- **Login methods**: password login, password registration, OIDC login, OIDC registration and passkey login each switch on and off on their own. `OIDC_ONLY` leaves SSO as the only way in
+- **SSO (OIDC)**: one provider by discovery, with PKCE and `id_token` verification (Authentik, Keycloak, Google and the like)
+- **2FA**: TOTP with ten single-use backup codes, and an admin can require it instance-wide
+- **Passkeys**: WebAuthn login by fingerprint, face, PIN or security key, off until an admin enables it. A passkey also satisfies the 2FA requirement
+- **Hardening**: per-IP limits on login, password reset and 2FA attempts, a password policy, secrets encrypted at rest and masked on read, and an SSRF guard on every URL you configure
+- **Admin panel**: users and invites, the permission matrix, packing templates, categories, addons, plugins, API keys, MCP tokens and OAuth sessions, backups, storage, audit log, and GitHub releases
+- **Backups**: manual or scheduled hourly, daily, weekly or monthly, with retention in days. The zip carries the at-rest key, so a restore can decrypt its own secrets
+- **Storage**: pluggable storage backends per content category — keep everything on local disk, or add S3-compatible backends and replicate any category to them, configured entirely from the admin panel
+- **Notifications**: a per-user matrix of events against in-app, email (SMTP), webhook, ntfy and Web Push (on every device you turn it on for, even with TREK closed), plus any channel a plugin registers
+- **Appearance**: light, dark or follow the OS, seven colour schemes plus a custom accent, transparency, compact density, reduce motion, and text size per tier
 - **27 languages**: en, de, es, fr, it, nl, hu, ru, zh, zh-TW, pl, cs, ar (right to left), br, id, tr, ja, ko, uk, gr, sv, vi, ca, az, et, sk, th
-- **Help center**: a ? in the top bar with 381 step-by-step guides with screenshots, searched together with the wiki that ships in the image
+- **In-app help**: the wiki ships inside the image and is served from disk at `/help`, so the docs match the version you are running
 
 </td>
 </tr>
@@ -214,39 +184,7 @@ Most of what follows is an addon an admin switches on or off. Lists, Costs, Docu
 <div align="center">
   <a href="docs/screenshots/showcase-desktop-1.webp"><img src="docs/screenshots/showcase-desktop-1.webp" alt="Atlas · dashboard · trip planner" width="100%" /></a>
   <a href="docs/screenshots/showcase-mobile.webp"><img src="docs/screenshots/showcase-mobile.webp" alt="Mobile PWA · dashboard, day plan, map, costs" width="100%" /></a>
-</div>
-
-<br />
-
-## Powered by dataforest cloud
-
-<div align="center">
-
-<br />
-
-<a href="https://cloud.dataforest.net/en?mtm_campaign=trek">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="docs/sponsors/dataforest-light.svg" />
-    <source media="(prefers-color-scheme: light)" srcset="docs/sponsors/dataforest-dark.svg" />
-    <img src="docs/sponsors/dataforest-dark.svg" alt="dataforest cloud" height="60" />
-  </picture>
-</a>
-
-<br />
-<br />
-
-**Every TREK installation in the world searches through servers that dataforest cloud sponsors.**
-
-The place index with over 88 million places, the address search in every TREK language and the planet-wide routing all run on dataforest cloud in Frankfurt, Germany, free of charge for everyone who self-hosts TREK. Without this sponsorship, these services would not exist in this form.
-
-Thank you, dataforest, for backing open source this generously. 💚
-
-<br />
-
-<a href="https://cloud.dataforest.net/en?mtm_campaign=trek"><img alt="Visit dataforest cloud" src="https://img.shields.io/badge/Visit-dataforest_cloud-02C382?style=for-the-badge" /></a>
-
-Looking for a server for your own TREK? dataforest cloud is where TREK's own services live.
-
+  <a href="docs/screenshots/showcase-desktop-2.webp"><img src="docs/screenshots/showcase-desktop-2.webp" alt="Collections · journey journal · costs" width="100%" /></a>
 </div>
 
 <br />
@@ -266,18 +204,12 @@ the details.
 ## Get started in 30 seconds
 
 ```bash
-ENCRYPTION_KEY=$(openssl rand -hex 32) docker run -d --name trek -p 3000:3000 \
+ENCRYPTION_KEY=$(openssl rand -hex 32) docker run -d -p 3000:3000 \
   -e ENCRYPTION_KEY=$ENCRYPTION_KEY \
-  -e COOKIE_SECURE=false \
   -v ./data:/app/data -v ./uploads:/app/uploads mauriceboe/trek
 ```
 
-Open `http://localhost:3000`, or `http://<server-ip>:3000` from another machine. On first boot TREK seeds an admin account — if you set `ADMIN_EMAIL`/`ADMIN_PASSWORD` those are used, otherwise the credentials are printed to the container log (`docker logs trek`).
-
-`COOKIE_SECURE=false` is only for trying TREK over plain HTTP: without it the browser drops the session cookie and the login does not stick. Once TREK sits behind HTTPS (see [Reverse Proxy](#reverse-proxy)), remove it.
-
-> [!TIP]
-> **No server yet?** TREK's own public services run on [**dataforest cloud**](https://cloud.dataforest.net/en?mtm_campaign=trek), our infrastructure sponsor. A small seed is plenty for a TREK instance and is ready within a minute.
+Open `http://localhost:3000`. On first boot TREK seeds an admin account — if you set `ADMIN_EMAIL`/`ADMIN_PASSWORD` those are used, otherwise the credentials are printed to the container log (`docker logs trek`).
 
 <div align="center">
 
@@ -433,6 +365,16 @@ Caddy handles TLS and WebSockets automatically.
 Every variable, its default and what it does: see
 [Environment Variables](https://github.com/liketrek/TREK/wiki/Environment-Variables).
 
+## Star History
+
+<a href="https://www.star-history.com/?repos=liketrek%2FTREK&type=date&legend=bottom-right">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=liketrek/TREK&type=date&theme=dark&legend=bottom-right&sealed_token=tW9agibKugOyPk0yPURgSdnizM7K72zbJENGD9iyk24ZcwYHtCUn-hk9jh1gdacO0O7xJ3Io7LaNrwYD3mChzcpzZIqDC8_HevYG1qnT0XNTmN6Ez4UZrQ" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=liketrek/TREK&type=date&legend=bottom-right&sealed_token=tW9agibKugOyPk0yPURgSdnizM7K72zbJENGD9iyk24ZcwYHtCUn-hk9jh1gdacO0O7xJ3Io7LaNrwYD3mChzcpzZIqDC8_HevYG1qnT0XNTmN6Ez4UZrQ" />
+   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=liketrek/TREK&type=date&legend=bottom-right&sealed_token=tW9agibKugOyPk0yPURgSdnizM7K72zbJENGD9iyk24ZcwYHtCUn-hk9jh1gdacO0O7xJ3Io7LaNrwYD3mChzcpzZIqDC8_HevYG1qnT0XNTmN6Ez4UZrQ" />
+ </picture>
+</a>
+
 ## Data sources
 
 The Atlas map's country and sub-national (province/county) boundaries come from

charts/trek/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
 name: trek
-version: 5.0.1
+version: 4.3.4
 description: Minimal Helm chart for TREK app
-appVersion: "5.0.1"
+appVersion: "4.3.4"

charts/trek/templates/configmap.yaml

@@ -112,21 +112,6 @@ data:
   {{- if .Values.env.TREK_PLACES_URL }}
   TREK_PLACES_URL: {{ .Values.env.TREK_PLACES_URL | quote }}
   {{- end }}
-  {{- if .Values.env.TREK_SERVICES }}
-  TREK_SERVICES: {{ .Values.env.TREK_SERVICES | quote }}
-  {{- end }}
-  {{- if .Values.env.TREK_SERVICES_HOSTS }}
-  TREK_SERVICES_HOSTS: {{ .Values.env.TREK_SERVICES_HOSTS | quote }}
-  {{- end }}
-  {{- if .Values.env.TREK_PHOTON_URL }}
-  TREK_PHOTON_URL: {{ .Values.env.TREK_PHOTON_URL | quote }}
-  {{- end }}
-  {{- if .Values.env.TREK_VALHALLA_URL }}
-  TREK_VALHALLA_URL: {{ .Values.env.TREK_VALHALLA_URL | quote }}
-  {{- end }}
-  {{- if .Values.env.GOOGLE_LIST_DATA_BASE }}
-  GOOGLE_LIST_DATA_BASE: {{ .Values.env.GOOGLE_LIST_DATA_BASE | quote }}
-  {{- end }}
   {{- if .Values.env.AMAP_API_BASE }}
   AMAP_API_BASE: {{ .Values.env.AMAP_API_BASE | quote }}
   {{- end }}

charts/trek/templates/deployment.yaml

@@ -85,12 +85,6 @@ spec:
                   name: {{ default (printf "%s-secret" (include "trek.fullname" .)) .Values.existingSecret }}
                   key: PLACES_API_KEY
                   optional: true
-            - name: TREK_SERVICES_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: {{ default (printf "%s-secret" (include "trek.fullname" .)) .Values.existingSecret }}
-                  key: TREK_SERVICES_KEY
-                  optional: true
             - name: AMAP_API_KEY
               valueFrom:
                 secretKeyRef:

charts/trek/templates/secret.yaml

@@ -23,9 +23,6 @@ data:
   {{- if .Values.secretEnv.PLACES_API_KEY }}
   PLACES_API_KEY: {{ .Values.secretEnv.PLACES_API_KEY | b64enc | quote }}
   {{- end }}
-  {{- if .Values.secretEnv.TREK_SERVICES_KEY }}
-  TREK_SERVICES_KEY: {{ .Values.secretEnv.TREK_SERVICES_KEY | b64enc | quote }}
-  {{- end }}
   {{- if .Values.secretEnv.AMAP_API_KEY }}
   AMAP_API_KEY: {{ .Values.secretEnv.AMAP_API_KEY | b64enc | quote }}
   {{- end }}
@@ -80,9 +77,6 @@ stringData:
   {{- if .Values.secretEnv.PLACES_API_KEY }}
   PLACES_API_KEY: {{ .Values.secretEnv.PLACES_API_KEY | quote }}
   {{- end }}
-  {{- if .Values.secretEnv.TREK_SERVICES_KEY }}
-  TREK_SERVICES_KEY: {{ .Values.secretEnv.TREK_SERVICES_KEY | quote }}
-  {{- end }}
   {{- if .Values.secretEnv.AMAP_API_KEY }}
   AMAP_API_KEY: {{ .Values.secretEnv.AMAP_API_KEY | quote }}
   {{- end }}

charts/trek/values.yaml

@@ -92,8 +92,7 @@ env:
   # Custom Nominatim base URL for every geocoding call the server makes (place search, reverse lookup, Atlas region
   # fill). When set it REPLACES the public OpenStreetMap service, with no fallback, so the instance behind it needs
   # the coverage you expect and has to speak the Nominatim API. TREK keeps its ~1 request per second spacing either
-  # way, and search and reverse lookups no longer go to the TREK services' Photon. Defaults to
-  # https://nominatim.openstreetmap.org.
+  # way. Defaults to https://nominatim.openstreetmap.org.
   # OVERPASS_URL: ""
   # Custom Overpass endpoint(s) for the map POI "explore" search, comma-separated. When set, REPLACES the bundled
   # public mirrors — point it at an internal/self-hosted Overpass instance when the public mirrors are unreachable
@@ -109,24 +108,9 @@ env:
   # nothing there. There is no switch in the admin panel on purpose: whether searches leave the instance is decided
   # here. Defaults to on.
   # TREK_PLACES_URL: ""
-  # GOOGLE_LIST_DATA_BASE: ""
   # Base URL of a copy of the Places API you run yourself; it has to answer the same /v1 API. Read from
   # configuration rather than typed by a user, so an in-cluster address works without ALLOW_INTERNAL_NETWORK.
   # Defaults to https://places.liketrek.com.
-  # TREK_SERVICES: "off"
-  # Places search identifies this installation with a key it registers by itself on first use and keeps in the
-  # database. "off" sends no key; searches then use the shared pool. A key issued to you goes under
-  # secretEnv.TREK_SERVICES_KEY. Defaults to auto.
-  # TREK_SERVICES_HOSTS: ""
-  # Comma-separated hosts that receive the installation key over https. Defaults to
-  # places.liketrek.com,photon.liketrek.com,valhalla.liketrek.com.
-  # TREK_PHOTON_URL: ""
-  # The address search (Photon) of the TREK services. With a key, search and reverse lookups ask it before
-  # Nominatim and fall back to Nominatim when it does not answer. Never asked when NOMINATIM_URL is set.
-  # Defaults to https://photon.liketrek.com.
-  # TREK_VALHALLA_URL: ""
-  # The Valhalla of the TREK services, which this server relays routing to unless the admin picks another
-  # routing service. The browser never talks to it. Defaults to https://valhalla.liketrek.com.
   # AMAP_API_BASE: ""
   # Send the Amap (高德地图) calls through an egress proxy, a cache or a gateway that speaks the same API instead of
   # restapi.amap.com directly. The key itself is a credential and goes under secretEnv.AMAP_API_KEY, or into
@@ -179,9 +163,6 @@ secretEnv:
   # with signing enabled, because such a key rejects every unsigned request. Leave empty
   # otherwise. The endpoint itself is not a secret and is set under env.AMAP_API_BASE.
   AMAP_API_SECRET: ""
-  # Optional key issued for this installation by the TREK services. Wins over the key TREK
-  # registers by itself and turns that registration off. Leave empty to let TREK register.
-  TREK_SERVICES_KEY: ""
   # Optional Web Push key pair, private half (base64url, 32 bytes). Only used together with
   # env.VAPID_PUBLIC_KEY; a pair whose halves do not belong together, or only one half, turns
   # push off with an error in the log until it is fixed, and every device stays registered.
@@ -197,7 +178,7 @@ generateEncryptionKey: false
 # If set, the chart renders no Secret of its own and instead reads every secret env
 # var from this existing Kubernetes secret. Expected keys: ENCRYPTION_KEY (rename via
 # existingSecretKey), ADMIN_EMAIL, ADMIN_PASSWORD, OIDC_CLIENT_SECRET,
-# UNSPLASH_ACCESS_KEY, PLACES_API_KEY, AMAP_API_KEY, AMAP_API_SECRET, TREK_SERVICES_KEY,
+# UNSPLASH_ACCESS_KEY, PLACES_API_KEY, AMAP_API_KEY, AMAP_API_SECRET,
 # VAPID_PRIVATE_KEY, SMTP_PASS, MAPBOX_ACCESS_TOKEN, CARTO_API_KEY, DEMO_ADMIN_PASS.
 # Missing keys are simply left unset (they are optional), so only provide the ones your
 # setup needs.

client/bookFontPrecache.js

@@ -1,67 +0,0 @@
-import { BOOK_FONT_FACES, BOOK_FONTS_PRECACHED } from '@trek/shared';
-
-/**
- * Which font files the service worker installs with the app.
- *
- * The precache takes every woff and woff2 the build emits, and with the book's
- * catalogue at thirty four families that is every weight, both styles and
- * every script subset of each: megabytes fetched at install by every user,
- * most of it for faces no book of theirs is set in. So the book's faces are
- * held to this:
- *
- * - The faces the app itself draws (Poppins and MuseoModerno for the chrome,
- *   imported in src/main.tsx) stay exactly as they were.
- * - The faces the book shipped with before the catalogue grew
- *   (`BOOK_FONTS_PRECACHED`) keep their latin woff2, so a book set in them
- *   still opens offline before Studio was ever opened online.
- * - Every other file of a book family, woff, other subsets, new families,
- *   real italics, is left to the `book-fonts` runtime cache in vite.config.js,
- *   which the Studio fills with the faces of each book it opens
- *   (src/components/Studio/bookFontWarm.ts).
- *
- * Shared by vite.config.js and its test, which reads the filter against file
- * names as the build writes them.
- */
-
-/** The faces src/main.tsx imports for the app chrome, which the book shares; bookFontPrecache.test.ts checks this copy. */
-export const APP_FACES = {
-  poppins: [300, 400, 500, 600, 700],
-  museomoderno: [400, 700, 800],
-};
-
-/** The book packages, longest name first, so `dm-serif-display` is never read as `dm-…`. */
-const BOOK_PACKAGES = [...new Set(Object.values(BOOK_FONT_FACES).map((f) => f.pkg))].sort(
-  (a, b) => b.length - a.length
-);
-
-const PRECACHED = new Map(
-  Object.entries(BOOK_FONTS_PRECACHED).map(([id, weights]) => [BOOK_FONT_FACES[id].pkg, new Set(weights)])
-);
-
-/**
- * A font file as the build names it, `<package>-<subset>-<weight>-<style>-<hash>.<ext>`,
- * read against the book's packages; null for any other file.
- */
-export function bookFontFile(url) {
-  const name = url.split('/').pop() ?? '';
-  const match = /^(.+)-(\d{3})-(normal|italic)-[\w-]+\.(woff2?)$/.exec(name);
-  if (!match) return null;
-  const [, head, weight, style, ext] = match;
-  const pkg = BOOK_PACKAGES.find((p) => head.startsWith(`${p}-`));
-  if (!pkg) return null;
-  return { pkg, subset: head.slice(pkg.length + 1), weight: Number(weight), italic: style === 'italic', ext };
-}
-
-/** Whether a file of the build goes into the install-time precache. */
-export function keepInPrecache(url) {
-  const file = bookFontFile(url);
-  if (!file) return true;
-  if (!file.italic && APP_FACES[file.pkg]?.includes(file.weight)) return true;
-  const kept = PRECACHED.get(file.pkg);
-  return !file.italic && file.subset === 'latin' && file.ext === 'woff2' && !!kept?.has(file.weight);
-}
-
-/** The precache manifest without the book faces left to the runtime cache: a Workbox `manifestTransforms` entry. */
-export function withoutRuntimeFonts(entries) {
-  return { manifest: entries.filter((entry) => keepInPrecache(entry.url)), warnings: [] };
-}

client/e2e/help/journey.guide.ts

@@ -451,7 +451,7 @@ const releaseRecordedDay = (page: Page) => releaseJournalDawarich(page.request,
 // ── Studio ────────────────────────────────────────────────────────────────────
 
 const rail = (page: Page) => page.locator('.st-rail')
-const railButton = (page: Page, name: string) => rail(page).getByRole('tab', { name, exact: true })
+const railButton = (page: Page, name: string) => rail(page).getByRole('button', { name, exact: true })
 const sidePanel = (page: Page) => page.locator('.st-panel.st-side')
 const inspector = (page: Page) => page.locator('.st-inspector')
 const studioMenu = (page: Page) => page.locator('.st-menu').last()
@@ -460,20 +460,6 @@ const exportDialog = (page: Page) => page.getByRole('dialog', { name: 'Export' }
 const thumbs = (page: Page) => page.locator('.st-thumb-row')
 /** The hit targets over the spread, one per element. */
 const sheetElements = (page: Page) => page.locator('.st-sheet > div[style*="left:"]')
-/**
- * The hit target of the first text on the spread on screen. The targets above the page are empty
- * boxes, so the one over the drawn words is found by where the words are and marked for the locator.
- */
-async function markTextTarget(page: Page): Promise<void> {
-  const words = page.locator('.st-sheet').getByText(/\p{L}{3,}/u).first()
-  await expect(words).toBeVisible()
-  await words.evaluate(el => {
-    const r = el.getBoundingClientRect()
-    const hit = document.elementFromPoint(r.left + r.width / 2, r.top + r.height / 2)
-    hit?.setAttribute('data-help-text', '')
-  })
-}
-const textTarget = (page: Page) => page.locator('.st-sheet [data-help-text]')
 
 async function studioSection(page: Page, name: string): Promise<void> {
   await railButton(page, name).click()
@@ -1314,7 +1300,7 @@ const SCRIPTS: Record<string, GuideScript> = {
         },
       },
       {
-        target: p => p.locator('.st-head-close'),
+        target: p => p.locator('.st-back'),
       },
     ],
   },
@@ -1445,7 +1431,7 @@ const SCRIPTS: Record<string, GuideScript> = {
       },
       {
         prepare: async p => {
-          await sidePanel(p).getByRole('tab', { name: /Entries/ }).click()
+          await sidePanel(p).locator('.st-tabs button').filter({ hasText: 'Entries' }).click()
           await expect(sidePanel(p).locator('.st-entry').first()).toBeVisible()
           await settle(p)
         },
@@ -1472,162 +1458,16 @@ const SCRIPTS: Record<string, GuideScript> = {
     ],
   },
 
-  'studio-my-layouts': {
-    guide: guide('studio-my-layouts'),
-    start: openStudio,
-    steps: [
-      {
-        prepare: async p => {
-          await studioSection(p, 'Pages')
-          await thumbs(p).nth(2).locator('.st-thumb').click()
-          await settle(p)
-        },
-        target: p => railButton(p, 'Layouts'),
-        act: async p => { await studioSection(p, 'Layouts') },
-      },
-      {
-        // Pointed at rather than pressed, so the seed book keeps no layout of its own for the guides after this one.
-        prepare: async p => {
-          await sidePanel(p).getByRole('button', { name: 'Save this page as a layout' }).scrollIntoViewIfNeeded()
-          await settle(p)
-        },
-        target: p => sidePanel(p).locator('.st-saved-layouts'),
-      },
-    ],
-  },
-
-  'studio-theme': {
-    guide: guide('studio-theme'),
-    start: openStudio,
-    steps: [
-      {
-        target: p => railButton(p, 'Theme'),
-        act: async p => { await studioSection(p, 'Theme') },
-      },
-      {
-        target: p => sidePanel(p).locator('.st-theme-grid'),
-        act: async p => {
-          await sidePanel(p).locator('.st-theme-card').nth(1).click()
-          await settle(p)
-        },
-      },
-      {
-        prepare: async p => {
-          await sidePanel(p).getByRole('button', { name: 'Apply to the book' }).scrollIntoViewIfNeeded()
-          await settle(p)
-        },
-        target: p => sidePanel(p).locator('.st-theme-apply'),
-      },
-    ],
-  },
-
-  'studio-stickers': {
-    guide: guide('studio-stickers'),
-    start: openStudio,
-    steps: [
-      {
-        prepare: async p => { await studioSection(p, 'Elements') },
-        target: p => sidePanel(p).getByRole('tab', { name: 'Stickers' }),
-        act: async p => {
-          await sidePanel(p).getByRole('tab', { name: 'Stickers' }).click()
-          await expect(sidePanel(p).locator('.st-shape-grid').first()).toBeVisible()
-          await settle(p)
-        },
-      },
-      {
-        target: p => sidePanel(p).locator('.st-shape-grid').first(),
-      },
-    ],
-  },
-
   'studio-travel': {
     guide: guide('studio-travel'),
     start: openStudio,
     steps: [
       {
         target: p => railButton(p, 'Travel'),
-        act: async p => {
-          await studioSection(p, 'Travel')
-          await expect(sidePanel(p).locator('.st-travel-card').first()).toBeVisible({ timeout: 15_000 })
-          await settle(p)
-        },
+        act: async p => { await studioSection(p, 'Travel') },
       },
       {
-        target: p => sidePanel(p).locator('.st-travel-grid').first(),
-      },
-      {
-        target: p => sidePanel(p).locator('.st-travel-card').first(),
-      },
-    ],
-  },
-
-  'studio-text-effects': {
-    guide: guide('studio-text-effects'),
-    start: openStudio,
-    steps: [
-      {
-        prepare: async p => {
-          await studioSection(p, 'Pages')
-          await thumbs(p).nth(2).locator('.st-thumb').click()
-          await settle(p)
-          await markTextTarget(p)
-        },
-        target: p => textTarget(p),
-        act: async p => {
-          await textTarget(p).click()
-          await expect(inspector(p).getByRole('button', { name: 'Effects' })).toBeVisible()
-          await settle(p)
-        },
-      },
-      {
-        prepare: async p => {
-          const head = inspector(p).getByRole('button', { name: 'Effects' })
-          if ((await head.getAttribute('aria-expanded')) !== 'true') await head.click()
-          await head.scrollIntoViewIfNeeded()
-          await settle(p)
-        },
-        target: p => inspector(p).locator('.st-section').filter({ has: p.getByRole('button', { name: 'Effects' }) }),
-      },
-    ],
-  },
-
-  'studio-background': {
-    guide: guide('studio-background'),
-    start: openStudio,
-    steps: [
-      {
-        prepare: async p => {
-          await studioSection(p, 'Pages')
-          await thumbs(p).nth(2).locator('.st-thumb').click()
-          await settle(p)
-        },
-        target: p => inspector(p).locator('.st-section').filter({ hasText: 'Page background' }).first(),
-      },
-      {
-        target: p => inspector(p).locator('.st-paint-tabs').first(),
-      },
-    ],
-  },
-
-  'studio-layers': {
-    guide: guide('studio-layers'),
-    start: openStudio,
-    steps: [
-      {
-        prepare: async p => {
-          await studioSection(p, 'Pages')
-          await thumbs(p).nth(2).locator('.st-thumb').click()
-          await settle(p)
-        },
-        target: p => railButton(p, 'Layers'),
-        act: async p => {
-          await studioSection(p, 'Layers')
-          await expect(sidePanel(p).locator('.st-layer').first()).toBeVisible()
-          await settle(p)
-        },
-      },
-      {
-        target: p => sidePanel(p).locator('.st-layer').first(),
+        target: sidePanel,
       },
     ],
   },

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trek/client",
-  "version": "5.0.1",
+  "version": "4.3.4",
   "engines": {
     "node": "^22.22.2 || ^24.15.0 || >=26.0.0"
   },
@@ -8,7 +8,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "prebuild": "node scripts/generate-icons.mjs",
+    "prebuild": "node scripts/patch-maplibre.mjs && node scripts/generate-icons.mjs",
     "build": "vite build",
     "build:analyze": "vite build --mode analyze",
     "preview": "vite preview",
@@ -41,45 +41,20 @@
     "shots:promote": "node e2e/screenshots/promote.mjs",
     "e2e:report": "playwright show-report",
     "format": "prettier --write \"src/**/*.tsx\" \"src/**/*.css\"",
-    "format:check": "prettier --check \"src/**/*.tsx\" \"src/**/*.css\""
+    "format:check": "prettier --check \"src/**/*.tsx\" \"src/**/*.css\"",
+    "postinstall": "node scripts/patch-maplibre.mjs",
+    "predev": "node scripts/patch-maplibre.mjs"
   },
   "dependencies": {
     "@assistant-ui/react": "0.15.25",
-    "@fontsource/abril-fatface": "^5.3.0",
-    "@fontsource/alfa-slab-one": "^5.3.0",
-    "@fontsource/allura": "^5.3.0",
-    "@fontsource/anton": "^5.3.0",
-    "@fontsource/archivo-black": "^5.3.0",
     "@fontsource/bebas-neue": "^5.3.0",
-    "@fontsource/big-shoulders-display": "^5.3.0",
-    "@fontsource/bodoni-moda": "^5.3.0",
-    "@fontsource/bricolage-grotesque": "^5.3.0",
-    "@fontsource/caveat": "^5.3.0",
-    "@fontsource/cormorant-garamond": "^5.3.0",
-    "@fontsource/dancing-script": "^5.3.0",
-    "@fontsource/dm-mono": "^5.3.0",
-    "@fontsource/dm-serif-display": "^5.3.0",
     "@fontsource/eb-garamond": "^5.3.0",
-    "@fontsource/fraunces": "^5.3.0",
     "@fontsource/geist-sans": "^5.3.0",
-    "@fontsource/great-vibes": "^5.3.0",
-    "@fontsource/homemade-apple": "^5.3.0",
     "@fontsource/inter": "^5.3.0",
-    "@fontsource/kaushan-script": "^5.3.0",
-    "@fontsource/league-gothic": "^5.3.0",
     "@fontsource/lora": "^5.3.0",
-    "@fontsource/montserrat": "^5.3.0",
     "@fontsource/museomoderno": "^5.3.0",
-    "@fontsource/oswald": "^5.3.0",
-    "@fontsource/pacifico": "^5.3.0",
-    "@fontsource/parisienne": "^5.3.0",
-    "@fontsource/permanent-marker": "^5.3.0",
     "@fontsource/playfair-display": "^5.3.0",
     "@fontsource/poppins": "^5.3.0",
-    "@fontsource/sacramento": "^5.3.0",
-    "@fontsource/satisfy": "^5.3.0",
-    "@fontsource/shrikhand": "^5.3.0",
-    "@fontsource/yellowtail": "^5.3.0",
     "@mapbox/mapbox-gl-rtl-text": "^0.4.0",
     "@maplibre/maplibre-gl-leaflet": "0.1.4",
     "@simplewebauthn/browser": "^13.3.0",
@@ -92,7 +67,7 @@
     "leaflet": "^1.9.4",
     "lucide-react": "^0.577.0",
     "mapbox-gl": "^3.31.0",
-    "maplibre-gl": "6.15.0",
+    "maplibre-gl": "5.24.0",
     "modern-screenshot": "4.7.0",
     "plyr": "^3.8.4",
     "react": "^19.3.0",
@@ -106,7 +81,7 @@
     "remark-breaks": "^4.0.0",
     "remark-gfm": "^4.0.1",
     "tz-lookup": "^6.1.25",
-    "zod": "^4.6.7",
+    "zod": "^4.6.5",
     "zustand": "^5.0.15"
   },
   "devDependencies": {

client/scripts/eslint-baseline.json

@@ -1,26 +1,26 @@
 {
   "src": {
-    "@typescript-eslint/no-non-null-assertion": 382,
-    "@typescript-eslint/no-misused-promises": 847,
+    "@typescript-eslint/no-non-null-assertion": 404,
+    "@typescript-eslint/no-misused-promises": 854,
     "no-console": 88,
-    "complexity": 218,
+    "complexity": 226,
     "@typescript-eslint/no-explicit-any": 146,
-    "trek/no-swallowed-catch": 129,
-    "max-params": 32,
+    "trek/no-swallowed-catch": 131,
+    "max-params": 33,
     "trek/store-without-selector": 67,
-    "react-hooks/refs": 555,
-    "react-hooks/set-state-in-effect": 194,
-    "@typescript-eslint/no-floating-promises": 164,
+    "react-hooks/refs": 557,
+    "react-hooks/set-state-in-effect": 195,
+    "@typescript-eslint/no-floating-promises": 165,
     "react-hooks/exhaustive-deps": 116,
-    "@typescript-eslint/no-unused-vars": 124,
+    "@typescript-eslint/no-unused-vars": 126,
     "react-hooks/immutability": 28,
-    "max-lines-per-function": 130,
+    "max-lines-per-function": 132,
     "react-hooks/static-components": 78,
     "react-hooks/preserve-manual-memoization": 12,
     "no-useless-assignment": 7,
     "no-empty": 19,
     "trek/no-window-globals": 41,
-    "react-refresh/only-export-components": 44,
+    "react-refresh/only-export-components": 46,
     "unused-disable-directive": 6,
     "max-depth": 21,
     "react-hooks/void-use-memo": 1,
@@ -30,16 +30,16 @@
     "no-useless-escape": 1
   },
   "suppressed": {
-    "@typescript-eslint/no-explicit-any": 38,
+    "@typescript-eslint/no-explicit-any": 40,
     "react-hooks/exhaustive-deps": 46
   },
   "tests": {
-    "@typescript-eslint/no-explicit-any": 490,
-    "@typescript-eslint/no-non-null-assertion": 1915,
+    "@typescript-eslint/no-explicit-any": 491,
+    "@typescript-eslint/no-non-null-assertion": 1932,
     "@typescript-eslint/no-misused-promises": 22,
     "@typescript-eslint/no-unused-vars": 51,
     "@typescript-eslint/no-floating-promises": 33,
-    "trek/no-window-globals": 325,
+    "trek/no-window-globals": 331,
     "trek/no-swallowed-catch": 14,
     "react-hooks/globals": 5,
     "react-hooks/refs": 22,

client/scripts/feature-pairs.json

@@ -65,19 +65,10 @@
     },
     {
       "feature": "AI assistant chat",
-      "hooks": ["src/components/Assistant/useAssistantThread.ts", "src/components/Assistant/useAssistantStatus.ts"],
+      "hooks": ["src/components/Assistant/useAssistantThread.ts"],
       "desktop": ["src/components/Assistant/AssistantWindow.tsx"],
       "mobile": ["src/mobile/screens/trip/assistant/MAssistantScreen.tsx"]
     },
-    {
-      "feature": "AI assistant home chat",
-      "hooks": ["src/components/Assistant/useAssistantHome.ts"],
-      "desktop": ["src/components/Assistant/AssistantWindow.tsx"],
-      "mobile": [
-        "src/mobile/screens/assistant/MAssistantHomeScreen.tsx",
-        "src/mobile/screens/dashboard/MDashboard.tsx"
-      ]
-    },
     {
       "feature": "Assistant hints",
       "hooks": ["src/components/Assistant/useAssistantHints.ts"],
@@ -130,15 +121,6 @@
         "src/mobile/screens/trip/sheets/MTransportFormSheet.tsx"
       ]
     },
-    {
-      "feature": "Booking save follow-up: travellers and files before the editor closes",
-      "hooks": ["src/components/Planner/useBookingFollowUp.ts"],
-      "desktop": ["src/components/Planner/ReservationModal.tsx", "src/components/Planner/TransportModal.tsx"],
-      "mobile": [
-        "src/mobile/screens/trip/sheets/MReservationSheet.tsx",
-        "src/mobile/screens/trip/sheets/MTransportFormSheet.tsx"
-      ]
-    },
     {
       "feature": "Bookings and transports lists",
       "hooks": ["src/components/Planner/bookings/bookingsModel.ts"],
@@ -610,6 +592,7 @@
       "hooks": ["src/components/Planner/usePlaceActions.ts"],
       "desktop": [
         "src/components/Planner/PlaceInspector.tsx",
+        "src/components/shared/PlaceAvatarUpload.tsx",
         "src/pages/tripPlanner/useTripPlannerPage.ts"
       ],
       "mobile": ["src/mobile/screens/trip/sheets/MPlaceSheet.tsx"]
@@ -670,24 +653,9 @@
       "desktop": ["src/components/Roadtrip/RoadtripStayModal.tsx"],
       "mobile": ["src/mobile/screens/trip/roadtrip/MRtStaySheet.tsx"]
     },
-    {
-      "feature": "Settings / Demo account locks",
-      "hooks": ["src/components/Demo/useDemoLock.ts"],
-      "desktop": [
-        "src/components/Settings/AccountDemoLock.tsx",
-        "src/components/Settings/DisplaySettingsTab.tsx",
-        "src/components/Settings/IntegrationsTab.tsx",
-        "src/components/Settings/ai/AiConnectionSection.tsx"
-      ],
-      "mobile": [
-        "src/mobile/screens/settings/MAiConnectionSection.tsx",
-        "src/mobile/screens/settings/MSettingsGeneral.tsx",
-        "src/mobile/screens/settings/MSettingsMcp.tsx"
-      ]
-    },
     {
       "feature": "Settings / Account",
-      "hooks": ["src/components/Settings/AccountDemoLock.tsx", "src/components/Settings/useAccountSettings.ts"],
+      "hooks": ["src/components/Settings/useAccountSettings.ts"],
       "desktop": ["src/components/Settings/AccountTab.tsx"],
       "mobile": ["src/mobile/screens/settings/MSettingsAccount.tsx"]
     },

client/scripts/format-baseline.json

@@ -55,6 +55,7 @@
   "scripts/check-gl-split.mjs",
   "scripts/check-page-pattern.mjs",
   "scripts/generate-icons.mjs",
+  "scripts/patch-maplibre.mjs",
   "src/App.test.tsx",
   "src/App.tsx",
   "src/App.versionHandover.test.tsx",
@@ -408,6 +409,7 @@
   "src/components/Journey/usePhotoZoom.ts",
   "src/components/Layout/BottomNav.test.tsx",
   "src/components/Layout/BottomNav.tsx",
+  "src/components/Layout/DemoBanner.tsx",
   "src/components/Layout/InAppNotificationBell.test.tsx",
   "src/components/Layout/InAppNotificationBell.tsx",
   "src/components/Layout/MobileTopBar.test.tsx",
@@ -1121,6 +1123,8 @@
   "src/components/shared/PasswordChecklist.tsx",
   "src/components/shared/PlaceAvatar.test.tsx",
   "src/components/shared/PlaceAvatar.tsx",
+  "src/components/shared/PlaceAvatarUpload.test.tsx",
+  "src/components/shared/PlaceAvatarUpload.tsx",
   "src/components/shared/PluginIcon.test.tsx",
   "src/components/shared/PluginIcon.tsx",
   "src/components/shared/PublicLanguagePicker.test.tsx",

client/scripts/i18n-keys.mjs

@@ -117,6 +117,11 @@ export const DYNAMIC_ALLOWED = [
     template: 'settings.${mode}',
     because: "mode is a ThemeMode from resolveMode(), 'light' | 'dark' | 'auto', and settings.light/dark/auto exist",
   },
+  ...['components/Studio/StudioElementsPanel.tsx', 'components/Studio/StudioInspector.tsx'].map((file) => ({
+    file,
+    template: 'journey.studio.${key}',
+    because: 'key comes from an `as const` tuple of frame and stroke styles written beside the call, typed literals',
+  })),
   {
     file: 'mobile/screens/trip/sheets/MBookingFields.tsx',
     template: 'reservations.${s}',
@@ -146,13 +151,6 @@ export const DYNAMIC_ALLOWED = [
       'id is a sticker id of the library in @trek/shared/stickers; stickerLibrary.test.ts resolves the key of every ' +
       'sticker the library holds against en',
   },
-  {
-    file: 'components/Studio/shapes.ts',
-    template: 'journey.studio.shapeName.${shape}',
-    because:
-      'shapeName takes a BookShapeId; shared/src/book/book-shape-catalogue.spec.ts holds an en name for every ' +
-      'shape of BOOK_SHAPE_GROUPS',
-  },
 ];
 
 const KEY_RE = /^[a-z][a-zA-Z0-9_]*(?:\.[a-zA-Z0-9_:-]+)+$/;

client/scripts/i18n-unused-baseline.json

@@ -1,5 +1,5 @@
 {
-  "admin.ts": 112,
+  "admin.ts": 126,
   "atlas.ts": 9,
   "backup.ts": 10,
   "budget.ts": 36,
@@ -26,7 +26,7 @@
   "packing.ts": 6,
   "pdf.ts": 1,
   "perm.ts": 4,
-  "places.ts": 9,
+  "places.ts": 10,
   "planner.ts": 53,
   "reservations.ts": 21,
   "roadtrip.ts": 36,

client/scripts/layers-baseline.json

@@ -38,8 +38,8 @@
   "src/components/Roadtrip/RoadtripSidebarDriveBands.tsx": 1,
   "src/components/Roadtrip/RoadtripSidebarRefuelBand.tsx": 1,
   "src/components/Studio/StudioShell.tsx": 1,
-  "src/components/Studio/sidebar/StudioEntryCard.tsx": 1,
-  "src/components/Studio/travel/BadgeIcon.tsx": 1,
+  "src/components/Studio/StudioSidebar.tsx": 1,
+  "src/components/Studio/TravelElements.tsx": 1,
   "src/components/Todo/useTodoList.ts": 1,
   "src/components/shared/ConfirmDialog.tsx": 1,
   "src/components/shared/CountryFlag.tsx": 1,

client/scripts/offline-baseline.json

@@ -116,6 +116,7 @@
   "src/components/Vacay/useVacayCalendarLogic.ts",
   "src/components/Vacay/useVacaySettings.ts",
   "src/components/Vacay/useVacayUserPicker.ts",
+  "src/components/shared/PlaceAvatarUpload.tsx",
   "src/hooks/useAirtrailConnection.ts",
   "src/hooks/useDawarichConnection.ts",
   "src/hooks/useDawarichSuggestions.ts",
@@ -150,6 +151,7 @@
   "src/pages/resetPassword/useResetPassword.ts",
   "src/pages/settings/useSettings.ts",
   "src/pages/sharedTrip/useSharedTrip.ts",
+  "src/pages/tripPlanner/useBookingEdits.ts",
   "src/pages/tripPlanner/usePlaceFormOpeners.ts",
   "src/pages/tripPlanner/usePlannerDialogs.ts",
   "src/pages/tripPlanner/useTripPlanner.ts",

client/scripts/patch-maplibre.mjs

@@ -0,0 +1,34 @@
+import { readFileSync, writeFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { dirname, join } from 'node:path'
+
+const require = createRequire(import.meta.url)
+const packagePath = require.resolve('maplibre-gl/package.json')
+const { version } = JSON.parse(readFileSync(packagePath, 'utf8'))
+
+if (version !== '5.24.0') throw new Error('Recheck the MapLibre sanitizer backport before changing its version')
+
+// Backport maplibre-gl-js#8189 without removing WebGL1 support in version 6.
+const loops = [
+  ['of elem.attributes)', 'of Array.from(elem.attributes))'],
+  ['of e.attributes)', 'of Array.from(e.attributes))'],
+]
+
+for (const filename of [
+  'src/util/dom.ts',
+  'dist/maplibre-gl.js',
+  'dist/maplibre-gl-dev.js',
+  'dist/maplibre-gl-csp.js',
+  'dist/maplibre-gl-csp-dev.js',
+]) {
+  const target = join(dirname(packagePath), filename)
+  const code = readFileSync(target, 'utf8')
+  const loop = loops.find(([before, after]) => code.includes(before) || code.includes(after))
+  if (!loop) throw new Error(`MapLibre sanitizer loop not found in ${filename}`)
+  const [before, after] = loop
+  if (code.split(before).length === 1 && code.split(after).length === 2) continue
+  if (code.split(before).length !== 2 || code.includes(after)) {
+    throw new Error(`Unexpected MapLibre sanitizer in ${filename}`)
+  }
+  writeFileSync(target, code.replace(before, after))
+}

client/scripts/rtl-baseline.json

@@ -1,5 +1,5 @@
 {
-  "components/Admin/plugins/pluginMenu.ts": 2,
+  "components/Admin/AdminPluginsPanel.tsx": 2,
   "components/Budget/BudgetPanelMemberChips.tsx": 6,
   "components/Budget/CostsPanel.tsx": 3,
   "components/Budget/ReceiptPreviewModal.tsx": 2,
@@ -18,6 +18,7 @@
   "components/Journey/JourneyMap.tsx": 1,
   "components/Journey/JourneyMapGL.tsx": 2,
   "components/Journey/MobileEntryView.tsx": 1,
+  "components/Journey/PhotoLightbox.tsx": 3,
   "components/Journey/journeyPhotoLayer.ts": 1,
   "components/Layout/Navbar.tsx": 1,
   "components/Layout/OfflineBanner.tsx": 1,
@@ -51,14 +52,17 @@
   "components/Studio/BookSheetsView.tsx": 3,
   "components/Studio/PageNumbers.tsx": 1,
   "components/Studio/PeerCursors.tsx": 1,
-  "components/Studio/PhotoView.tsx": 4,
-  "components/Studio/SpreadView.tsx": 4,
-  "components/Studio/StudioCanvas.tsx": 12,
+  "components/Studio/SpreadView.tsx": 8,
+  "components/Studio/StudioCanvas.tsx": 22,
   "components/Studio/StudioElementsPanel.tsx": 1,
   "components/Studio/StudioExport.tsx": 1,
+  "components/Studio/StudioInspector.tsx": 1,
   "components/Studio/StudioSavedLayouts.tsx": 1,
+  "components/Studio/StudioSidebar.tsx": 2,
   "components/Studio/TravelElements.tsx": 4,
   "components/Studio/TravelPreview.tsx": 1,
+  "components/SystemNotices/ReleaseNoticeVisuals.tsx": 3,
+  "components/SystemNotices/releaseNotice.css": 2,
   "components/Vacay/VacayCalendar.tsx": 3,
   "components/Vacay/VacayMonthCard.tsx": 7,
   "components/Vacay/VacaySettings.tsx": 1,
@@ -69,6 +73,7 @@
   "components/shared/DetailShell.tsx": 1,
   "components/shared/ElevationProfile.tsx": 2,
   "components/shared/NavigationMenu.tsx": 2,
+  "components/shared/PlaceAvatarUpload.tsx": 3,
   "components/shared/PublicLanguagePicker.tsx": 1,
   "components/shared/SlidingTabs.tsx": 3,
   "components/shared/StarRating.tsx": 3,

client/scripts/rtl-disable-baseline.json

@@ -1,8 +1,4 @@
 {
-  "components/Collections/CollectionMap.tsx": 1,
-  "components/Studio/LineHandles.tsx": 1,
-  "components/Studio/StudioSelectionChrome.tsx": 2,
-  "components/Studio/inspector/FocalPad.tsx": 1,
-  "mobile/components/trek3d/MascotClip.tsx": 1,
-  "pages/tripPlanner/PlanMapStage.tsx": 4
+  "pages/tripPlanner/PlanMapStage.tsx": 4,
+  "mobile/components/trek3d/MascotClip.tsx": 1
 }

client/scripts/size-baseline.json

@@ -2,28 +2,29 @@
   "e2e/help/fixtures.ts": 2291,
   "src/api/client.ts": 1873,
   "src/components/Admin/AdminPluginsPanel.test.tsx": 2704,
-  "src/components/Admin/AdminPluginsPanel.tsx": 1277,
+  "src/components/Admin/AdminPluginsPanel.tsx": 1667,
   "src/components/Budget/CostsPanel.test.tsx": 2736,
   "src/components/Budget/CostsPanel.tsx": 1798,
-  "src/components/Map/MapView.tsx": 1385,
-  "src/components/Map/MapViewGL.test.tsx": 2919,
-  "src/components/Map/MapViewGL.tsx": 2218,
-  "src/components/PDF/TripPDF.tsx": 1039,
+  "src/components/Map/MapView.tsx": 1399,
+  "src/components/Map/MapViewGL.test.tsx": 2920,
+  "src/components/Map/MapViewGL.tsx": 2290,
+  "src/components/Map/RouteCalculator.ts": 1195,
+  "src/components/PDF/TripPDF.tsx": 1082,
   "src/components/Planner/DayDetailPanel.test.tsx": 2333,
   "src/components/Planner/DayPlanSidebar.test.tsx": 5349,
-  "src/components/Planner/DayPlanSidebar.tsx": 2936,
+  "src/components/Planner/DayPlanSidebar.tsx": 2953,
   "src/components/Planner/PlaceFormModal.test.tsx": 2836,
-  "src/components/Planner/PlaceFormModal.tsx": 1157,
-  "src/components/Planner/PlaceInspector.tsx": 1290,
-  "src/components/Studio/TravelElements.tsx": 1559,
+  "src/components/Planner/PlaceFormModal.tsx": 1193,
+  "src/components/Planner/PlaceInspector.tsx": 1304,
+  "src/components/Studio/TravelElements.tsx": 1738,
   "src/components/Studio/countryShapes.ts": 2595,
   "src/index.css": 1636,
   "src/mobile/screens/admin/MAdminPluginsPanel.tsx": 1507,
   "src/pages/JourneyDetailPage.test.tsx": 4030,
   "src/pages/LoginPage.tsx": 1348,
-  "src/pages/TripPlannerPage.tsx": 1128,
+  "src/pages/TripPlannerPage.tsx": 1131,
   "src/pages/atlas/useAtlas.ts": 1211,
   "src/pages/tripPlanner/useTripPlanner.roadtrip.test.tsx": 3518,
   "src/pages/tripPlanner/useTripPlanner.test.tsx": 3270,
-  "src/styles/studio.css": 1918
+  "src/styles/studio.css": 2087
 }

client/scripts/strict-baseline.json

@@ -51,7 +51,7 @@
   "src/components/Planner/DayPlanSidebarNoteModal.test.tsx": 1,
   "src/components/Planner/PlaceFormModal.test.tsx": 3,
   "src/components/Planner/PlaceFormModal.tsx": 1,
-  "src/components/Planner/PlaceInspector.tsx": 16,
+  "src/components/Planner/PlaceInspector.tsx": 17,
   "src/components/Planner/PlacesBulkCategoryModal.test.tsx": 1,
   "src/components/Planner/PlacesSidebar.tsx": 1,
   "src/components/Planner/PlacesSidebarMobileDayPicker.tsx": 8,
@@ -82,6 +82,8 @@
   "src/components/Settings/NotificationsTab.test.tsx": 1,
   "src/components/Settings/PasskeysSection.tsx": 1,
   "src/components/Settings/PhotoProvidersSection.test.tsx": 2,
+  "src/components/Studio/StudioCanvas.tsx": 1,
+  "src/components/Studio/StudioInspector.tsx": 1,
   "src/components/Todo/todoListModel.ts": 1,
   "src/components/Tours/planner/TourPlannerPanels.tsx": 2,
   "src/components/Tours/planner/useTourPlanner.ts": 2,
@@ -96,6 +98,7 @@
   "src/components/shared/CustomSelect.test.tsx": 1,
   "src/components/shared/PlaceAvatar.test.tsx": 2,
   "src/components/shared/PlaceAvatar.tsx": 1,
+  "src/components/shared/PlaceAvatarUpload.test.tsx": 1,
   "src/hooks/useDawarichSuggestions.test.ts": 1,
   "src/mobile/screens/admin/MAdminAddonManager.tsx": 2,
   "src/mobile/screens/admin/MAdminPluginsPanel.tsx": 6,

client/scripts/theme-baseline.json

@@ -1,7 +1,7 @@
 {
   "App.tsx": 11,
+  "components/Admin/AdminPluginsPanel.tsx": 2,
   "components/Admin/DefaultUserSettingsTab.tsx": 1,
-  "components/Admin/plugins/pluginMenu.ts": 2,
   "components/Atlas/AtlasCountryPlaces.tsx": 6,
   "components/BackgroundTasks/BackgroundTasksWidget.tsx": 4,
   "components/Budget/BudgetPanel.helpers.ts": 2,
@@ -51,7 +51,8 @@
   "components/Journey/journeyMapPopup.ts": 17,
   "components/Journey/moodConfig.ts": 5,
   "components/Layout/BottomNav.tsx": 3,
-  "components/Layout/InAppNotificationBell.tsx": 3,
+  "components/Layout/DemoBanner.tsx": 25,
+  "components/Layout/InAppNotificationBell.tsx": 8,
   "components/Layout/MobileTopBar.tsx": 51,
   "components/Layout/Navbar.tsx": 21,
   "components/Layout/NewVersionNotice.tsx": 3,
@@ -71,6 +72,7 @@
   "components/Map/poiCategories.ts": 7,
   "components/Map/ratingBadge.ts": 2,
   "components/Map/reservationsMapbox.ts": 1,
+  "components/Notifications/InAppNotificationItem.tsx": 8,
   "components/PDF/TripPDF.tsx": 53,
   "components/Packing/PackingListPanelBagModal.tsx": 2,
   "components/Packing/PackingListPanelCategoryGroup.tsx": 5,
@@ -98,13 +100,14 @@
   "components/Roadtrip/serviceMarker.ts": 1,
   "components/Settings/useAppearanceEditor.ts": 5,
   "components/Studio/BookSheetsView.tsx": 2,
-  "components/Studio/PhotoView.tsx": 2,
-  "components/Studio/SpreadView.tsx": 1,
+  "components/Studio/SpreadView.tsx": 3,
   "components/Studio/StudioElementsPanel.tsx": 8,
+  "components/Studio/StudioInspector.tsx": 2,
   "components/Studio/StudioShell.tsx": 2,
+  "components/Studio/StudioSidebar.tsx": 2,
   "components/Studio/TravelElements.tsx": 5,
   "components/Studio/printSheets.ts": 5,
-  "components/Studio/sidebar/contentDrops.ts": 2,
+  "components/SystemNotices/ReleaseNoticeVisuals.tsx": 4,
   "components/SystemNotices/SystemNoticeBanner.tsx": 28,
   "components/SystemNotices/SystemNoticeModal.tsx": 107,
   "components/Todo/TodoListPanel.tsx": 6,
@@ -129,6 +132,7 @@
   "components/shared/Modal.tsx": 3,
   "components/shared/NavigationMenu.tsx": 1,
   "components/shared/NoteColorPicker.tsx": 2,
+  "components/shared/PlaceAvatarUpload.tsx": 3,
   "components/shared/PublicLanguagePicker.tsx": 3,
   "components/shared/Skeleton.tsx": 2,
   "components/shared/Spinner.tsx": 2,
@@ -205,7 +209,7 @@
   "mobile/screens/settings/MSetPickerSheet.tsx": 2,
   "mobile/screens/settings/MSettings.tsx": 2,
   "mobile/screens/settings/MSettingsAbout.tsx": 5,
-  "mobile/screens/settings/MSettingsAccount.tsx": 20,
+  "mobile/screens/settings/MSettingsAccount.tsx": 21,
   "mobile/screens/settings/MSettingsAppearance.tsx": 12,
   "mobile/screens/settings/MSettingsMap.tsx": 5,
   "mobile/screens/settings/MSettingsMcp.tsx": 30,
@@ -248,7 +252,7 @@
   "mobile/screens/trip/sheets/MMehrSheet.tsx": 3,
   "mobile/screens/trip/sheets/MNoteSheet.tsx": 1,
   "mobile/screens/trip/sheets/MPlaceEditSheet.tsx": 2,
-  "mobile/screens/trip/sheets/MPlaceSheet.tsx": 23,
+  "mobile/screens/trip/sheets/MPlaceSheet.tsx": 27,
   "mobile/screens/trip/sheets/MReservationSheet.tsx": 2,
   "mobile/screens/trip/sheets/MTransportFormSheet.tsx": 9,
   "mobile/screens/trip/sheets/MTransportSheet.tsx": 12,
@@ -292,6 +296,7 @@
   "pages/FilesPage.tsx": 11,
   "pages/ForgotPasswordPage.tsx": 18,
   "pages/HelpPage.tsx": 21,
+  "pages/InAppNotificationsPage.tsx": 9,
   "pages/JoinTripPage.tsx": 4,
   "pages/JourneyDetailPage.tsx": 53,
   "pages/JourneyPage.tsx": 64,

client/scripts/theme-disable-baseline.json

@@ -40,14 +40,12 @@
   "components/Settings/AppearanceSettingsTab.tsx": 1,
   "components/Settings/PasskeysSection.tsx": 1,
   "components/Studio/BookSheetsView.tsx": 1,
-  "components/Studio/PhotoView.tsx": 1,
-  "components/Studio/SpreadView.tsx": 1,
+  "components/Studio/SpreadView.tsx": 2,
   "components/Studio/StudioElementsPanel.tsx": 2,
   "components/Studio/StudioSwatches.tsx": 1,
-  "components/Studio/TravelElements.tsx": 3,
+  "components/Studio/TravelElements.tsx": 6,
   "components/Studio/peerColour.ts": 1,
   "components/Studio/printSheets.ts": 4,
-  "components/Studio/travel/badgeLook.ts": 2,
   "components/Trips/TripMemberAvatar.tsx": 2,
   "components/Vacay/VacayPersons.tsx": 1,
   "components/shared/DialogShell.tsx": 2,

client/src/App.tsx

@@ -67,7 +67,6 @@ const OAuthAuthorizePage = lazyWithRetry(() => import('./pages/OAuthAuthorizePag
 const TourSaveToCollectionHost = lazyWithRetry(() => import('./components/Tours/collection/TourSaveToCollectionHost'))
 // The desktop assistant window: its own chunk, and nothing at all until a connection is set up.
 const AssistantHost = lazyWithRetry(() => import('./components/Assistant/AssistantHost'))
-const MAssistantHomeScreen = lazyWithRetry(() => import('./mobile/screens/assistant/MAssistantHomeScreen'))
 
 // The ten phone screens are chunks of their own, alongside the desktop pages
 // rather than inside them. Each page used to import its M screen statically and
@@ -411,10 +410,10 @@ export default function App() {
       {!hideAuthedWidgets && <ErrorBoundary boundaryId="widget:background-tasks" fallback={null}><BackgroundTasksWidget /></ErrorBoundary>}
       {!hideAuthedWidgets && (isPhone ? <MSaveToCollectionSheet /> : <SaveToCollectionModal />)}
       {!hideAuthedWidgets && keepingTour && <ErrorBoundary boundaryId="widget:keep-tour" fallback={null}><Suspense fallback={null}><TourSaveToCollectionHost /></Suspense></ErrorBoundary>}
-      {/* The phone has its own assistant screen inside the trip, and the home chat's outside it. */}
-      {!hideAuthedWidgets && isAuthenticated && (
+      {/* The phone has its own assistant screen inside the trip. */}
+      {!hideAuthedWidgets && isAuthenticated && !isPhone && (
         <ErrorBoundary boundaryId="widget:assistant" fallback={null}>
-          <Suspense fallback={null}>{isPhone ? <MAssistantHomeScreen /> : <AssistantHost />}</Suspense>
+          <Suspense fallback={null}><AssistantHost /></Suspense>
         </ErrorBoundary>
       )}
       <ErrorBoundary boundaryId="widget:offline-banner" fallback={null}><OfflineBanner /></ErrorBoundary>

client/src/api/assistant.test.ts

@@ -165,46 +165,4 @@ describe('assistantApi JSON calls', () => {
     await assistantApi.stop(journey);
     expect(hits).toEqual(['threads', 'undo', 'stop']);
   });
-
-  it('FE-AI-API-009: the home scope reaches the routes outside any trip', async () => {
-    const home = { kind: 'home' } as const;
-    const fetchSpy = vi.spyOn(globalThis, 'fetch').mockImplementation(async () => streamResponse('data: [DONE]\n\n'));
-    const signal = new AbortController().signal;
-    await assistantApi.chat(home, BODY, signal);
-    await assistantApi.decide(home, 7, { locale: 'en', timeZone: 'UTC', decisions: [] }, signal);
-    expect(fetchSpy.mock.calls.map(([url]) => url)).toEqual([
-      '/api/assistant/chat',
-      '/api/assistant/threads/7/decisions',
-    ]);
-
-    const hits: string[] = [];
-    server.use(
-      http.get('/api/assistant/threads', () => {
-        hits.push('threads');
-        return HttpResponse.json({ threads: [] });
-      }),
-      http.get('/api/assistant/threads/3', () => {
-        hits.push('thread');
-        return HttpResponse.json({ thread: { id: 3, title: 't', lastMessageAt: 'x' }, messages: [] });
-      }),
-      http.delete('/api/assistant/threads/3', () => {
-        hits.push('delete');
-        return HttpResponse.json({ success: true });
-      }),
-      http.post('/api/assistant/tool-calls/:id/undo', () => {
-        hits.push('undo');
-        return HttpResponse.json({ undone: true });
-      }),
-      http.post('/api/assistant/stop', () => {
-        hits.push('stop');
-        return HttpResponse.json({ success: true });
-      })
-    );
-    await assistantApi.threads(home);
-    await assistantApi.thread(home, 3);
-    await assistantApi.deleteThread(home, 3);
-    await assistantApi.undo(home, 'c1');
-    await assistantApi.stop(home);
-    expect(hits).toEqual(['threads', 'thread', 'delete', 'undo', 'stop']);
-  });
 });

client/src/api/assistant.ts

@@ -5,6 +5,7 @@ import {
   type AiApiKeyConnectRequest,
   type AiAuthStartResponse,
   type AiChatgptFinishRequest,
+  type AiClaudeConnectorResponse,
   type AiConnectionScope,
   type AiConnectionView,
   type AiInstanceConnectionRequest,
@@ -17,7 +18,6 @@ import {
   type AssistantChatRequest,
   type AssistantDecisionsRequest,
   type AssistantErrorCode,
-  type AssistantInsertFoundPlaceRequest,
   type AssistantRenderUploadResponse,
   type AssistantScope,
   type AssistantShareRequest,
@@ -102,16 +102,14 @@ const tripBase = (tripId: number) => `/trips/${tripId}/assistant`;
 
 /**
  * What a conversation call is about: a trip's id (the planner's chat), or a
- * scope, which also reaches a journey's chat in TREK Studio and the home chat
- * outside any one trip. Threads, turns, decisions, undo and stop exist under
- * all three; files, found places, proposals and sharing belong to a trip and
- * take its id.
+ * scope, which also reaches a journey's chat in TREK Studio. Threads, turns,
+ * decisions, undo and stop exist under both; files, found places, proposals
+ * and sharing belong to a trip and take its id.
  */
 export type AssistantTarget = number | AssistantScope;
 
 function scopeBase(target: AssistantTarget): string {
   if (typeof target === 'number') return tripBase(target);
-  if (target.kind === 'home') return '/assistant';
   return target.kind === 'trip' ? tripBase(target.tripId) : `/journeys/${target.journeyId}/assistant`;
 }
 
@@ -145,13 +143,6 @@ export const assistantApi = {
     body: AssistantAddFoundPlaceRequest
   ): Promise<AssistantAddFoundPlaceResponse> =>
     apiClient.post(`${tripBase(tripId)}/threads/${threadId}/found-places`, body).then((r) => r.data),
-  // "+ Tour": a found place taken into the saved tour open in the planner, held as a change like "+ Day 3".
-  insertFoundPlace: (
-    tripId: number,
-    threadId: number,
-    body: AssistantInsertFoundPlaceRequest
-  ): Promise<AssistantAddFoundPlaceResponse> =>
-    apiClient.post(`${tripBase(tripId)}/threads/${threadId}/found-places/tour`, body).then((r) => r.data),
   // A proposal an answer showed as a card ("Plan this"): answers like a found place, with the message holding it.
   takeProposal: (
     tripId: number,
@@ -229,8 +220,10 @@ export const aiAdminApi = {
   connection: (): Promise<AiAdminConnectionResponse> => apiClient.get('/admin/ai/connection').then((r) => r.data),
   saveConnection: (body: AiInstanceConnectionRequest): Promise<AiAdminConnectionResponse> =>
     apiClient.put('/admin/ai/connection', body, viaProvider).then((r) => r.data),
-  setModel: (model: string): Promise<AiAdminConnectionResponse> =>
-    apiClient.patch('/admin/ai/connection/model', { model }).then((r) => r.data),
   removeConnection: (): Promise<SuccessResponse> => apiClient.delete('/admin/ai/connection').then((r) => r.data),
   models: (): Promise<AiModelListResponse> => apiClient.get('/admin/ai/models', viaProvider).then((r) => r.data),
 };
+
+export const claudeConnectorApi = {
+  get: (): Promise<AiClaudeConnectorResponse> => apiClient.get('/integrations/claude-connector').then((r) => r.data),
+};

client/src/api/client.surface.test.ts

@@ -692,7 +692,6 @@ describe('client > request payloads', () => {
   it('FE-APISURF-030: adminApi.pluginActivate only sends consent when granted', async () => {
     expect((await traceOne(() => adminApi.pluginActivate('koffi'))).body).toEqual({})
     expect((await traceOne(() => adminApi.pluginActivate('koffi', true))).body).toEqual({ consent: true })
-    expect((await traceOne(() => adminApi.pluginActivate('koffi', false, true))).body).toEqual({ acceptTrekRange: true })
   })
 
   it('FE-APISURF-031: adminApi.pluginInstall spreads its options next to the id', async () => {

client/src/api/client.ts

@@ -574,9 +574,9 @@ export const adminApi = {
   plugins: () => apiClient.get('/admin/plugins').then(r => r.data),
   pluginBrowse: (refresh?: boolean) => apiClient.get('/admin/plugins/registry', { params: refresh ? { refresh: 1 } : undefined }).then(r => r.data),
   pluginDetail: (id: string) => apiClient.get(`/admin/plugins/registry/${encodeURIComponent(id)}`).then(r => r.data),
-  pluginInstall: (id: string, opts?: Omit<PluginInstallRequest, 'id'>) =>
+  pluginInstall: (id: string, opts?: Pick<PluginInstallRequest, 'version' | 'constraint' | 'withDependencies'>) =>
     apiClient.post('/admin/plugins/install', { id, ...opts } satisfies PluginInstallRequest).then(r => r.data),
-  pluginActivate: (id: string, consent?: boolean, accept?: boolean) => apiClient.post(`/admin/plugins/${id}/activate`, { consent: consent || undefined, acceptTrekRange: accept || undefined }).then(r => r.data),
+  pluginActivate: (id: string, consent?: boolean) => apiClient.post(`/admin/plugins/${id}/activate`, consent ? { consent: true } : {}).then(r => r.data),
   pluginDeactivate: (id: string) => apiClient.post(`/admin/plugins/${id}/deactivate`).then(r => r.data),
   // `version` pins the exact version to install (the rollback path); omitted, the server
   // resolves the newest TREK-compatible version itself.

client/src/api/serviceIdentity.ts

@@ -1,8 +0,0 @@
-import apiClient from './client';
-
-/** /api/admin/service-identity: how this installation stands with the TREK services. Admin only. */
-export const serviceIdentityApi = {
-  status: (signal?: AbortSignal): Promise<unknown> =>
-    apiClient.get('/admin/service-identity', { signal }).then((r) => r.data),
-  regenerate: (): Promise<unknown> => apiClient.post('/admin/service-identity/regenerate').then((r) => r.data),
-};

client/src/api/valhallaRelay.ts

@@ -1,19 +0,0 @@
-import type { ValhallaRelayAction } from '@trek/shared';
-
-/**
- * POST /api/routing/valhalla/:action: a question for the TREK services'
- * Valhalla, which this server asks with the installation key. The answer is
- * Valhalla's own, its status included, so it is handed back as a Response and
- * read like the answer of any other Valhalla. Plain fetch on purpose: the
- * shared client would turn a 401 into a sign-in redirect and a 429 into a
- * toast, where the planner only wants to ask FOSSGIS instead.
- */
-export function postValhallaRelay(action: ValhallaRelayAction, body: unknown, signal?: AbortSignal): Promise<Response> {
-  return fetch(`/api/routing/valhalla/${action}`, {
-    method: 'POST',
-    credentials: 'include',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(body),
-    signal,
-  });
-}

client/src/components/Admin/AddonManager.test.tsx

@@ -712,33 +712,4 @@ describe('AddonManager', () => {
     expect(roadtrip.querySelector('svg.lucide-car-front')).toBeInTheDocument();
     expect(tours.querySelector('svg.lucide-puzzle')).not.toBeInTheDocument();
   });
-
-  it('FE-ADMIN-ADDON-045: finds an addon by name or description and shows the ones on or off', async () => {
-    const user = userEvent.setup();
-    server.use(
-      addonsRoute([
-        buildAddon({ id: 'x-lists', name: 'Todo List', description: 'Track tasks', type: 'trip', enabled: true }),
-        buildAddon({ id: 'x-costs', name: 'Budget', description: 'Split costs', type: 'trip', enabled: false }),
-        buildAddon({ id: 'x-holiday', name: 'Vacay', description: 'Holiday planner', type: 'global', enabled: true }),
-      ])
-    );
-    render(<AddonManager />);
-    await screen.findByText('Todo List');
-
-    await user.type(screen.getByRole('searchbox', { name: 'Search addons' }), 'costs');
-    expect(screen.getByText('Budget')).toBeInTheDocument();
-    expect(screen.queryByText('Todo List')).toBeNull();
-    expect(screen.queryByText('Vacay')).toBeNull();
-
-    await user.clear(screen.getByRole('searchbox', { name: 'Search addons' }));
-    await user.click(screen.getByRole('button', { name: 'On' }));
-    expect(screen.getByText('Todo List')).toBeInTheDocument();
-    expect(screen.getByText('Vacay')).toBeInTheDocument();
-    expect(screen.queryByText('Budget')).toBeNull();
-
-    await user.click(screen.getByRole('button', { name: 'Off' }));
-    await user.type(screen.getByRole('searchbox', { name: 'Search addons' }), 'nothing like this');
-    expect(screen.getByText('No addon matches the search or the filter.')).toBeInTheDocument();
-  });
 });
-

client/src/components/Admin/AddonManager.tsx

@@ -1,11 +1,11 @@
-import { useState, type ComponentType } from 'react'
+import type { ComponentType } from 'react'
 import { useTranslation } from '../../i18n'
 import { useIsDark } from '../../hooks/useIsDark'
-import { Puzzle, ListChecks, Wallet, FileText, CalendarDays, Globe, Briefcase, Image, Terminal, Link2, Compass, BookOpen, Sparkles, Luggage, Plane, Bookmark, Users, Loader2, Mountain, CarFront, Search } from 'lucide-react'
+import { Puzzle, ListChecks, Wallet, FileText, CalendarDays, Globe, Briefcase, Image, Terminal, Link2, Compass, BookOpen, Sparkles, Luggage, Plane, Bookmark, Users, Loader2, Mountain, CarFront } from 'lucide-react'
 import EmptyState from '../shared/EmptyState'
 import DawarichIcon from '../shared/DawarichIcon'
 import AirTrailIcon from '../shared/AirTrailIcon'
-import { DOCUMENT_PROVIDER_ICONS } from '../shared/documentProviderIconMap'
+import { DOCUMENT_PROVIDER_ICONS } from '../shared/DocumentProviderIcons'
 import AddonTile from './AddonTile'
 import AddonSubRow from './AddonSubRow'
 import { Tooltip } from '../shared/Tooltip'
@@ -76,8 +76,6 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
     toggleToursWanderer,
     mapSwitches,
   } = useAddonManager()
-  const [query, setQuery] = useState('')
-  const [view, setView] = useState<AddonView>('all')
 
   if (loading) {
     return (
@@ -196,10 +194,10 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
     )
   }
 
-  /* A card per type, the way every other admin tab sets its cards: Trip in the
-     left column, Global and Integration in the right one, each card with the
-     dialogs' head band carrying the type, its count and what it means. Above
-     them one card says how many are on and finds an addon by name. */
+  /* One column per type, side by side, instead of three stacked sections. Stacked, each
+     section opened its own set of columns and the tall tiles (Collab, Journey) set a
+     section's height while its neighbours ran out early. Side by side the column's
+     head carries the type, so the tiles need no badge of their own. */
   const groups = [
     { key: 'trip', addons: tripAddons },
     { key: 'global', addons: globalAddons },
@@ -216,145 +214,68 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
     </span>
   )
 
-  /** Whether an addon is shown under the search and the filter. */
-  const shown = (addon: Addon) => {
-    if (view === 'on' && !addon.enabled) return false
-    if (view === 'off' && addon.enabled) return false
-    const q = query.trim().toLocaleLowerCase()
-    if (!q) return true
-    const label = getAddonLabel(t, addon)
-    return `${label.name} ${label.description ?? ''}`.toLocaleLowerCase().includes(q)
-  }
-
-  const card = (g: (typeof groups)[number]) => {
-    const meta = TYPE_META[g.key]
-    const all = g.key === 'integration' ? [...aiAddons, ...g.addons] : g.addons
-    const visible = g.addons.filter(shown)
-    const ai = g.key === 'integration' && aiAddons.some(shown)
-    if (!visible.length && !ai) return null
-    const on = all.filter(a => a.enabled).length
-    return (
-      <SettingsCard
-        key={g.key}
-        icon={meta.icon}
-        title={t(meta.labelKey)}
-        hint={t(meta.hintKey)}
-        badge={(
-          <Tooltip label={t('admin.addons.group.count', { enabled: on, total: all.length })}>
-            <span className="inline-flex"><StatusPill tone={on > 0 ? 'success' : 'neutral'}>{on}/{all.length}</StatusPill></span>
-          </Tooltip>
-        )}
-        bodyClassName="p-3"
-      >
-        <div className="divide-y divide-edge-faint overflow-hidden rounded-[12px] border border-edge-faint bg-surface-card">
-          {/* The AI addons share a connection and a settings dialog, so they head the card as one tile. */}
-          {ai && <AiAddonTile addons={aiAddons} onToggle={handleToggle} />}
-          {visible.map(tile)}
-        </div>
-      </SettingsCard>
-    )
-  }
-
-  const [first, ...rest] = groups
-  const cards = { start: first ? card(first) : null, end: rest.map(card).filter(Boolean) }
-
   return (
-    <>
-      <SettingsCard
-        icon={Puzzle}
-        title={t('admin.addons.title')}
-        hint={subtitle}
-        badge={totalCount > 0 ? (
-          <Tooltip label={t('admin.addons.group.count', { enabled: enabledCount, total: totalCount })}>
-            <span className="inline-flex">
-              <StatusPill tone={enabledCount > 0 ? 'success' : 'neutral'}>{enabledCount}/{totalCount}</StatusPill>
-            </span>
-          </Tooltip>
-        ) : undefined}
-      >
-        {addons.length === 0
-          ? <EmptyState scene="idle" title={t('admin.addons.noAddons')} surface="var(--bg-secondary)" />
-          : <AddonToolbar groups={groups.map(g => ({ key: g.key, addons: g.key === 'integration' ? [...aiAddons, ...g.addons] : g.addons }))} query={query} onQuery={setQuery} view={view} onView={setView} t={t} />}
-      </SettingsCard>
-
-      {addons.length > 0 && (cards.start || cards.end.length > 0 ? (
-        <div className="grid grid-cols-1 gap-x-5 xl:grid-cols-2 xl:items-start">
-          <div className="min-w-0">{cards.start}</div>
-          <div className="min-w-0">{cards.end}</div>
-        </div>
+    <SettingsCard
+      icon={Puzzle}
+      title={t('admin.addons.title')}
+      hint={subtitle}
+      badge={totalCount > 0 ? (
+        <Tooltip label={t('admin.addons.group.count', { enabled: enabledCount, total: totalCount })}>
+          <span className="inline-flex">
+            <StatusPill tone={enabledCount > 0 ? 'success' : 'neutral'}>{enabledCount}/{totalCount}</StatusPill>
+          </span>
+        </Tooltip>
+      ) : undefined}
+    >
+      {addons.length === 0 ? (
+        <EmptyState scene="idle" title={t('admin.addons.noAddons')} surface="var(--bg-secondary)" />
       ) : (
-        <p className="m-0 rounded-2xl border border-dashed border-edge-faint px-4 py-8 text-center text-content-muted" style={fs(13, 'body')}>
-          {t('admin.addons.noMatch')}
-        </p>
-      ))}
-    </>
+        <div className="grid grid-cols-1 items-start gap-4 md:grid-cols-2 xl:grid-cols-3">
+          {groups.map(g => {
+            const meta = TYPE_META[g.key]
+            return (
+              <section key={g.key} className="min-w-0 overflow-hidden rounded-[14px] border border-edge-faint bg-surface-card">
+                <GroupHead icon={meta.icon} label={t(meta.labelKey)} hint={t(meta.hintKey)} addons={g.key === 'integration' ? [...aiAddons, ...g.addons] : g.addons} t={t} />
+                <div className="divide-y divide-edge-faint">
+                  {/* The AI addons share a connection and a settings dialog, so they head the column as one tile. */}
+                  {g.key === 'integration' && aiAddons.length > 0 && <AiAddonTile addons={aiAddons} onToggle={handleToggle} />}
+                  {g.addons.map(tile)}
+                </div>
+              </section>
+            )
+          })}
+        </div>
+      )}
+    </SettingsCard>
   )
 }
 
-type AddonView = 'all' | 'on' | 'off'
-
-/**
- * The head card's body: a tile per type with how many of it are on, then a
- * search over the addons' names and descriptions and a switch between all,
- * the ones on and the ones off.
- */
-function AddonToolbar({ groups, query, onQuery, view, onView, t }: {
-  groups: { key: string; addons: Addon[] }[]
-  query: string
-  onQuery: (q: string) => void
-  view: AddonView
-  onView: (v: AddonView) => void
+/** The head band of one type's column: icon tile, the type, its count and what it means. */
+function GroupHead({ icon: Icon, label, hint, addons, t }: {
+  icon: ComponentType<{ size?: number; className?: string; strokeWidth?: number }>
+  label: string
+  hint: string
+  addons: Addon[]
   t: (key: string, params?: Record<string, unknown>) => string
 }) {
+  const enabled = addons.filter(a => a.enabled).length
   return (
-    <>
-      <div className="grid grid-cols-1 gap-2 sm:grid-cols-3">
-        {groups.map(g => {
-          const meta = TYPE_META[g.key]
-          const Icon = meta.icon
-          const on = g.addons.filter(a => a.enabled).length
-          return (
-            <div key={g.key} className="flex items-center gap-3 rounded-[12px] border border-edge-faint bg-surface-card px-3 py-2.5">
-              <span className="grid h-8 w-8 flex-none place-items-center rounded-[10px] bg-surface-secondary text-content-secondary">
-                <Icon size={15} />
-              </span>
-              <span className="min-w-0 flex-1">
-                <span className="block truncate font-semibold text-content" style={fs(12.5, 'body')}>{t(meta.labelKey)}</span>
-                <span className="block text-content-faint" style={fs(11)}>{t('admin.addons.group.count', { enabled: on, total: g.addons.length })}</span>
-              </span>
-              <span className={`font-geist font-bold tabular-nums ${on > 0 ? 'text-content' : 'text-content-faint'}`} style={fs(18, 'body')} aria-hidden>{on}</span>
-            </div>
-          )
-        })}
-      </div>
-      <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-        <label className="relative flex min-w-0 flex-1 items-center">
-          <Search size={14} className="pointer-events-none absolute start-3 text-content-faint" />
-          <input
-            type="search"
-            value={query}
-            onChange={e => onQuery(e.target.value)}
-            placeholder={t('admin.addons.search')}
-            aria-label={t('admin.addons.search')}
-            className="h-9 w-full rounded-[10px] border border-edge-faint bg-surface-card ps-8 pe-3 text-content outline-none transition-colors placeholder:text-content-faint focus:border-accent"
-            style={fs(13, 'body')}
-          />
-        </label>
-        <div className="inline-flex flex-none gap-1 rounded-[10px] bg-surface-tertiary p-1" role="group" aria-label={t('admin.addons.filter')}>
-          {(['all', 'on', 'off'] as const).map(v => (
-            <button
-              key={v}
-              type="button"
-              onClick={() => onView(v)}
-              aria-pressed={view === v}
-              className={`h-7 rounded-[8px] px-3 font-medium transition-colors ${view === v ? 'bg-surface-card text-content shadow-sm' : 'text-content-muted hover:text-content'}`}
-              style={fs(12.5, 'body')}
-            >
-              {t(`admin.addons.filter.${v}`)}
-            </button>
-          ))}
+    <div className="flex items-start gap-2.5 border-b border-edge-faint bg-surface-tertiary px-3.5 py-2.5">
+      <span className="mt-px grid h-7 w-7 flex-none place-items-center rounded-[9px] bg-surface-card text-content-secondary shadow-sm">
+        <Icon size={13} strokeWidth={2} />
+      </span>
+      <div className="min-w-0 flex-1">
+        <div className="flex items-center gap-2">
+          <h3 className="m-0 min-w-0 flex-1 truncate font-bold text-content" style={fs(13, 'body')}>{label}</h3>
+          <Tooltip label={t('admin.addons.group.count', { enabled, total: addons.length })}>
+            <span className="inline-flex">
+              <StatusPill>{enabled}/{addons.length}</StatusPill>
+            </span>
+          </Tooltip>
         </div>
+        {/* Says what the type means: the only place that still explains it. */}
+        <p className="m-0 mt-0.5 leading-snug text-content-faint" style={fs(11)}>{hint}</p>
       </div>
-    </>
+    </div>
   )
 }

client/src/components/Admin/AddonSubRow.tsx

@@ -19,7 +19,6 @@ export default function AddonSubRow({
   icon,
   title,
   description,
-  badge,
   enabled,
   onToggle,
 }: {
@@ -27,8 +26,6 @@ export default function AddonSubRow({
   icon?: ReactNode
   title: string
   description?: string
-  /** A small pill after the title, e.g. the beta mark on the assistant. */
-  badge?: ReactNode
   enabled: boolean
   onToggle: () => void
 }) {
@@ -37,11 +34,8 @@ export default function AddonSubRow({
       {icon
         ? <span className={`grid h-6 w-6 flex-none place-items-center ${enabled ? 'text-content-muted' : 'text-content-faint'}`}>{icon}</span>
         : <span className="w-6 flex-none" aria-hidden />}
-      <span className="flex min-w-0 flex-1 items-center gap-2">
-        <span className={`min-w-0 truncate font-medium ${enabled ? 'text-content' : 'text-content-muted'}`} style={fs(12.5, 'body')} title={description}>
-          {title}
-        </span>
-        {badge}
+      <span className={`min-w-0 flex-1 truncate font-medium ${enabled ? 'text-content' : 'text-content-muted'}`} style={fs(12.5, 'body')} title={description}>
+        {title}
       </span>
       <ToggleSwitch on={enabled} onToggle={onToggle} label={title} />
     </li>

client/src/components/Admin/AdminPluginsPanel.test.tsx

@@ -489,10 +489,10 @@ describe('AdminPluginsPanel — TREK-version compatibility', () => {
     fireEvent.click(await screen.findByText('Discover'))
   }
 
-  it('marks a plugin no published version runs on, and still lets the admin install it', async () => {
+  it('blocks Install when no published version runs on this TREK, and says why', async () => {
     await openDiscover({ trek: '>=4.0.0', hostVersion: '3.3.0', compatible: false, latestCompatible: null })
-    expect(await screen.findByText('Not confirmed for TREK 3.3.0 yet')).toBeInTheDocument()
-    expect(screen.getByRole('button', { name: /^install$/i })).toBeEnabled()
+    const btn = await screen.findByRole('button', { name: /^incompatible$/i })
+    expect(btn).toBeDisabled()
   })
 
   it('offers the newest version that DOES run here rather than a dead button', async () => {
@@ -549,11 +549,9 @@ function panelRoot(container: HTMLElement): HTMLElement {
 }
 
 /** Opens one of the toolbar dropdowns (identified by its current title) and picks an option. */
-/** The toolbar's one Filter button; a pick in its menu leaves the menu open. */
-const filterButton = (): HTMLElement => screen.getByRole('button', { name: /^Filter/ })
-async function pickFilter(option: RegExp) {
-  if ((await screen.findByRole('button', { name: /^Filter/ })).getAttribute('aria-expanded') !== 'true') fireEvent.click(filterButton())
-  fireEvent.click(await screen.findByRole('menuitemradio', { name: option }))
+async function pickFilter(trigger: RegExp, option: RegExp) {
+  fireEvent.click(await screen.findByTitle(trigger))
+  fireEvent.click(await screen.findByRole('button', { name: option }))
 }
 
 /** The enable toggle of a named installed row. */
@@ -612,9 +610,9 @@ describe('AdminPluginsPanel — load states and toolbar', () => {
     render(<AdminPluginsPanel />)
     await screen.findByText('Gotify')
 
-    await pickFilter(/^Widget$/)
+    await pickFilter(/^Type: All types$/, /^Widget$/)
 
-    expect(await screen.findByRole('menuitemradio', { name: 'Widget' })).toHaveAttribute('aria-checked', 'true')
+    expect(await screen.findByTitle('Type: Widget')).toBeInTheDocument()
     expect(screen.getByText('Countdown')).toBeInTheDocument()
     expect(screen.queryByText('Gotify')).not.toBeInTheDocument()
   })
@@ -628,15 +626,15 @@ describe('AdminPluginsPanel — load states and toolbar', () => {
     render(<AdminPluginsPanel />)
     await screen.findByText('OnOne')
 
-    await pickFilter(/^Off$/)
+    await pickFilter(/^Status: All$/, /^Off$/)
     expect(await screen.findByText('OffOne')).toBeInTheDocument()
     expect(screen.queryByText('OnOne')).not.toBeInTheDocument()
 
-    await pickFilter(/^Error$/)
+    await pickFilter(/^Status: Off$/, /^Error$/)
     expect(await screen.findByText('BadOne')).toBeInTheDocument()
     expect(screen.getByText('boom')).toBeInTheDocument()
 
-    await pickFilter(/^Update available$/)
+    await pickFilter(/^Status: Error$/, /^Update available$/)
     expect(await screen.findByText('OnOne')).toBeInTheDocument()
     expect(screen.queryByText('BadOne')).not.toBeInTheDocument()
   })
@@ -646,10 +644,11 @@ describe('AdminPluginsPanel — load states and toolbar', () => {
     render(<AdminPluginsPanel />)
     await screen.findByText('Gotify')
 
-    await pickFilter(/^Updates first$/)
-    expect(filterButton()).toHaveTextContent('Updates first')
+    await pickFilter(/^Sort: Name$/, /^Updates first$/)
+    expect(await screen.findByTitle('Sort: Updates first')).toBeInTheDocument()
+
     await clickDiscover()
-    await waitFor(() => expect(filterButton()).toHaveTextContent(/Name$/))
+    await waitFor(() => expect(screen.getByTitle('Sort: Name')).toBeInTheDocument())
   })
 
   it('FE-COMP-PLUGINS-PANEL-008: rescan re-pulls the registry past its cache and confirms with a toast', async () => {
@@ -1664,16 +1663,15 @@ describe('AdminPluginsPanel — Discover cards and the detail modal', () => {
   })
 })
 
-describe('AdminPluginsPanel — security dialog', () => {
-  it('FE-COMP-PLUGINS-PANEL-048: the shield in the header opens how plugins are contained', async () => {
+describe('AdminPluginsPanel — security footer', () => {
+  it('FE-COMP-PLUGINS-PANEL-048: the containment note expands into its sections', async () => {
     panelWith([])
     render(<AdminPluginsPanel />)
     await screen.findByText('No plugins installed yet.')
 
     expect(screen.queryByText('Every plugin runs boxed in')).not.toBeInTheDocument()
-    fireEvent.click(screen.getByRole('button', { name: 'How plugins are secured' }))
+    fireEvent.click(screen.getByText('How plugins are contained — and the limits'))
 
-    expect(screen.getByRole('dialog', { name: 'How plugins are secured' })).toBeInTheDocument()
     expect(screen.getByText('Every plugin runs boxed in')).toBeInTheDocument()
     expect(screen.getByText('What "Reviewed" means')).toBeInTheDocument()
     expect(screen.getByText('What "Signed" means')).toBeInTheDocument()
@@ -1702,9 +1700,9 @@ describe('AdminPluginsPanel toolbar and dialogs', () => {
     row({ id: 'c-page', name: 'Gamma Page', description: 'a page', type: 'page', enabled: 1, status: 'error', last_error: 'boom' }),
   ]
 
-  const pickFilter = async (user: ReturnType<typeof userEvent.setup>, option: RegExp) => {
-    if (filterButton().getAttribute('aria-expanded') !== 'true') await user.click(filterButton())
-    await user.click(screen.getByRole('menuitemradio', { name: option }))
+  const pickFilter = async (user: ReturnType<typeof userEvent.setup>, filter: RegExp, option: RegExp) => {
+    await user.click(screen.getByTitle(filter))
+    await user.click(screen.getByRole('button', { name: option }))
   }
 
   it('FE-W5PLG-001: the search box narrows the installed list by name and description', async () => {
@@ -1736,7 +1734,7 @@ describe('AdminPluginsPanel toolbar and dialogs', () => {
     render(<AdminPluginsPanel />)
     await screen.findByText('Alpha Widget')
 
-    await pickFilter(user, /^Widget$/)
+    await pickFilter(user, /^Type:/, /^Widget$/)
 
     await waitFor(() => expect(screen.queryByText('Beta Bridge')).not.toBeInTheDocument())
     expect(screen.getByText('Alpha Widget')).toBeInTheDocument()
@@ -1748,15 +1746,15 @@ describe('AdminPluginsPanel toolbar and dialogs', () => {
     render(<AdminPluginsPanel />)
     await screen.findByText('Alpha Widget')
 
-    await pickFilter(user, /^Active$/)
+    await pickFilter(user, /^Status:/, /^Active$/)
     await waitFor(() => expect(screen.queryByText('Beta Bridge')).not.toBeInTheDocument())
     expect(screen.queryByText('Gamma Page')).not.toBeInTheDocument()
 
-    await pickFilter(user, /^Off$/)
+    await pickFilter(user, /^Status:/, /^Off$/)
     await waitFor(() => expect(screen.getByText('Beta Bridge')).toBeInTheDocument())
     expect(screen.queryByText('Alpha Widget')).not.toBeInTheDocument()
 
-    await pickFilter(user, /^Error$/)
+    await pickFilter(user, /^Status:/, /^Error$/)
     await waitFor(() => expect(screen.getByText('Gamma Page')).toBeInTheDocument())
     expect(screen.queryByText('Alpha Widget')).not.toBeInTheDocument()
   })
@@ -1768,13 +1766,13 @@ describe('AdminPluginsPanel toolbar and dialogs', () => {
     await screen.findByText('Alpha Widget')
     await waitFor(() => expect(screen.getByText(/updates? available/i)).toBeInTheDocument())
 
-    await pickFilter(user, /^Updates first$/)
+    await pickFilter(user, /^Sort:/, /^Updates first$/)
     await waitFor(() => {
       const names = screen.getAllByText(/Alpha Widget|Beta Bridge|Gamma Page/).map(e => e.textContent)
       expect(names[0]).toBe('Gamma Page')
     })
 
-    await pickFilter(user, /^Update available$/)
+    await pickFilter(user, /^Status:/, /^Update available$/)
     await waitFor(() => expect(screen.queryByText('Alpha Widget')).not.toBeInTheDocument())
     expect(screen.getByText('Gamma Page')).toBeInTheDocument()
   })
@@ -1785,10 +1783,11 @@ describe('AdminPluginsPanel toolbar and dialogs', () => {
     render(<AdminPluginsPanel />)
     await screen.findByText('Alpha Widget')
 
-    await pickFilter(user, /^Updates first$/)
-    expect(filterButton()).toHaveTextContent('Updates first')
+    await pickFilter(user, /^Sort:/, /^Updates first$/)
+    expect(screen.getByTitle(/^Sort: Updates first$/)).toBeInTheDocument()
+
     await user.click(screen.getByRole('tab', { name: /Discover/ }))
-    await waitFor(() => expect(filterButton()).toHaveTextContent(/Name$/))
+    await waitFor(() => expect(screen.getByTitle(/^Sort: Name$/)).toBeInTheDocument())
   })
 
   it('FE-W5PLG-007: the registry sorts by downloads and by review date', async () => {
@@ -1803,19 +1802,19 @@ describe('AdminPluginsPanel toolbar and dialogs', () => {
     await user.click(screen.getByRole('tab', { name: /Discover/ }))
     await screen.findByText('Old Tool')
 
-    await pickFilter(user, /^Most downloads$/)
+    await pickFilter(user, /^Sort:/, /^Most downloads$/)
     await waitFor(() => {
       const names = screen.getAllByText(/^(Old|New) Tool$/).map(e => e.textContent)
       expect(names[0]).toBe('New Tool')
     })
 
-    await pickFilter(user, /^Recently updated$/)
+    await pickFilter(user, /^Sort:/, /^Recently updated$/)
     await waitFor(() => {
       const names = screen.getAllByText(/^(Old|New) Tool$/).map(e => e.textContent)
       expect(names[0]).toBe('New Tool')
     })
 
-    await pickFilter(user, /^Name$/)
+    await pickFilter(user, /^Sort:/, /^Name$/)
     await waitFor(() => {
       const names = screen.getAllByText(/^(Old|New) Tool$/).map(e => e.textContent)
       expect(names[0]).toBe('New Tool')
@@ -1834,7 +1833,7 @@ describe('AdminPluginsPanel toolbar and dialogs', () => {
     await user.click(screen.getByRole('tab', { name: /Discover/ }))
     await screen.findByText('Mapper')
 
-    await pickFilter(user, /^Page$/)
+    await pickFilter(user, /^Type:/, /^Page$/)
     await waitFor(() => expect(screen.queryByText('Mapper')).not.toBeInTheDocument())
     expect(screen.getByText('Poster')).toBeInTheDocument()
 
@@ -1963,12 +1962,12 @@ describe('AdminPluginsPanel toolbar and dialogs', () => {
     const { container } = render(<AdminPluginsPanel />)
     await screen.findByText('Alpha Widget')
 
-    await user.click(filterButton())
-    expect(screen.getByRole('menuitemradio', { name: /^Widget$/ })).toBeInTheDocument()
+    await user.click(screen.getByTitle(/^Type:/))
+    expect(screen.getByRole('button', { name: /^Widget$/ })).toBeInTheDocument()
 
     const layer = container.querySelector('.fixed.inset-0.z-20') as HTMLElement
     fireEvent.click(layer)
-    await waitFor(() => expect(screen.queryByRole('menuitemradio', { name: /^Widget$/ })).not.toBeInTheDocument())
+    await waitFor(() => expect(screen.queryByRole('button', { name: /^Widget$/ })).not.toBeInTheDocument())
   })
 })
 
@@ -2005,11 +2004,12 @@ describe('AdminPluginsPanel registry cards and dependency chips', () => {
     await screen.findByText('Alpha Widget')
 
     await openDiscover(user)
-    await user.click(filterButton())
-    await user.click(screen.getByRole('menuitemradio', { name: /^Most downloads$/ }))
-    expect(filterButton()).toHaveTextContent('Most downloads')
+    await user.click(screen.getByTitle(/^Sort:/))
+    await user.click(screen.getByRole('button', { name: /^Most downloads$/ }))
+    expect(screen.getByTitle(/^Sort: Most downloads$/)).toBeInTheDocument()
+
     await user.click(screen.getByRole('tab', { name: /Installed/ }))
-    await waitFor(() => expect(filterButton()).toHaveTextContent(/Name$/))
+    await waitFor(() => expect(screen.getByTitle(/^Sort: Name$/)).toBeInTheDocument())
   })
 
   it('FE-W5PLG-017: an outrun release offers the newest compatible version instead of a dead button', async () => {
@@ -2026,8 +2026,9 @@ describe('AdminPluginsPanel registry cards and dependency chips', () => {
     expect(offer).not.toBeDisabled()
     expect(offer).toHaveAttribute('title', expect.stringContaining('3.5.0'))
 
-    // Nothing fits: no dead button any more, but a card that says so before anything installs.
-    expect(screen.getByText(/^Not confirmed for TREK .+ yet$/)).toBeInTheDocument()
+    const dead = screen.getByRole('button', { name: /^Incompatible$/ })
+    expect(dead).toBeDisabled()
+    expect(dead.getAttribute('title')).toBeTruthy()
   })
 
   it('FE-W5PLG-018: an already installed registry entry cannot be installed again', async () => {
@@ -2555,7 +2556,7 @@ describe('AdminPluginsPanel — TREK-range bypass (TREK_PLUGINS_IGNORE_TREK_RANG
     expect(await screen.findByText('Version checks off')).toBeInTheDocument()
   })
 
-  it('FE-PLG-BYPASS-002: offers Install for an incompatible entry and asks before installing', async () => {
+  it('FE-PLG-BYPASS-002: offers "Install anyway" for an incompatible entry and asks before installing', async () => {
     let posted: unknown = null
     bypassPanel([plugin({ id: 'something-else' })], incompatibleEntry())
     server.use(http.post('*/api/admin/plugins/install', async ({ request }) => {
@@ -2565,7 +2566,7 @@ describe('AdminPluginsPanel — TREK-range bypass (TREK_PLUGINS_IGNORE_TREK_RANG
     withToast()
     fireEvent.click(await screen.findByText('Discover'))
 
-    const btn = await screen.findByRole('button', { name: /^install$/i })
+    const btn = await screen.findByRole('button', { name: /^install anyway$/i })
     expect(btn).toBeEnabled()
     fireEvent.click(btn)
 
@@ -2584,7 +2585,7 @@ describe('AdminPluginsPanel — TREK-range bypass (TREK_PLUGINS_IGNORE_TREK_RANG
     server.use(http.post('*/api/admin/plugins/install', () => { posted = true; return HttpResponse.json({ id: 'trek-gotify', version: '2.0.0', trekRangeBypassed: null }) }))
     withToast()
     fireEvent.click(await screen.findByText('Discover'))
-    fireEvent.click(await screen.findByRole('button', { name: /^install$/i }))
+    fireEvent.click(await screen.findByRole('button', { name: /^install anyway$/i }))
 
     const dialog = await screen.findByRole('dialog', { name: /outside its supported trek versions/i })
     fireEvent.click(within(dialog).getByRole('button', { name: /cancel/i }))

client/src/components/Admin/AdminPluginsPanel.tsx

@@ -1,9 +1,10 @@
-import { useState, type ReactNode } from 'react'
+import { useEffect, useRef, useState, type CSSProperties, type ReactNode } from 'react'
+import { createPortal } from 'react-dom'
 import {
   Blocks, AlertTriangle, RefreshCw, Trash2, Download, Bug, ShieldCheck, UploadCloud,
-  ArrowUpCircle, Github, ExternalLink, Check, Search, Link2, KeyRound, ShieldAlert,
-  SlidersHorizontal, CircleDot, Database,
-  Globe, History, Puzzle, Bot, Loader2,
+  ArrowUpCircle, Github, ExternalLink, ChevronDown, Check, Lock, Search, Link2, KeyRound, ShieldAlert,
+  SlidersHorizontal, ArrowUpDown, CircleDot, MoreHorizontal, RotateCw, Database,
+  Globe, Info, History, PauseCircle, Puzzle, Bot, Loader2,
 } from 'lucide-react'
 import PluginIcon from '../shared/PluginIcon'
 import { useInstanceSettings } from './useInstanceSettings'
@@ -22,17 +23,15 @@ import {
   SettingsCard, SettingRows, SettingRow, SettingsHint, StatusPill,
   SETTINGS_BUTTON_PRIMARY, SETTINGS_ICON_BUTTON,
 } from '../Settings/settingsKit'
+import { POPOVER } from '../Packing/packingPopoverStyles'
 import {
-  KNOWN_TYPES, PERM_KEYS, blockIsCurrent, dependencyRows, fingerprint, formatCompactCount,
-  installOffer, signatureBlockView,
-  type PluginDep, type PluginRow, type RegistryItem, type SigSubject,
-  type T, type VersionInfo, type VersionMismatch,
+  KNOWN_TYPES, PERM_KEYS, blockIsCurrent, dependencyRows, deriveDeps, fingerprint, formatCompactCount,
+  installOffer, isRegistrySourced, parseJson, signatureBlockView, sortLabel, statusLabel,
+  type PluginDep, type PluginRow, type RegistryItem, type SigSubject, type SortKey,
+  type StatusFilter, type T, type TypeFilter, type VersionInfo, type VersionMismatch,
 } from './plugins/pluginModel'
 import { usePluginDetail } from './plugins/usePluginDetail'
 import { usePluginsAdmin } from './plugins/usePluginsAdmin'
-import PluginFilterMenu from './plugins/PluginFilterMenu'
-import PluginInstalledRow from './plugins/PluginInstalledRow'
-import PluginSecurityDialog from './plugins/PluginSecurityDialog'
 
 /**
  * Admin → Plugins (#plugins). A full plugin-management surface: a segmented
@@ -43,13 +42,31 @@ import PluginSecurityDialog from './plugins/PluginSecurityDialog'
  * tile; the security section at the bottom explains the model honestly.
  */
 
+// Runtime health → dot colour on the icon tile.
+const HEALTH: Record<string, string> = {
+  active: 'bg-success',
+  starting: 'bg-info animate-pulse',
+  error: 'bg-danger',
+  inactive: 'bg-content-faint/60',
+  disabled: 'bg-warning',
+  incompatible: 'bg-warning',
+}
+
 /** The head band of a dialog that warns before something happens: a faint wash of the warning tone. */
 const WARN_TINT = 'color-mix(in srgb, var(--warning) 10%, transparent)'
 /** The eyebrow over a block, the size the dialogs' sections use. */
 const EYEBROW = 'm-0 font-geist font-bold uppercase tracking-[.08em] text-content-faint'
+/** A capability or dependency chip on an installed row. */
+const CHIP = 'inline-flex max-w-full items-center gap-1.5 rounded-full border px-2 py-[2px] font-medium'
+const CHIP_NEUTRAL = 'border-edge-faint bg-surface-secondary text-content-secondary'
+const CHIP_NET = 'border-transparent bg-info-soft text-info'
+const CHIP_WARN = 'border-transparent bg-warning-soft text-warning'
 /** A small action inside a row or a card: the kit's button, a size down. */
 const SMALL_BUTTON = 'inline-flex flex-none items-center justify-center gap-1.5 rounded-[10px] bg-surface-card px-2.5 py-1.5 font-semibold text-content shadow-sm ring-1 ring-edge-faint hover:bg-surface-secondary disabled:cursor-default disabled:opacity-50'
 const SMALL_PRIMARY = 'inline-flex flex-none items-center justify-center gap-1.5 rounded-[10px] bg-accent px-3 py-1.5 font-semibold text-accent-text hover:opacity-90 disabled:cursor-default disabled:bg-surface-tertiary disabled:text-content-faint'
+/** A line of state under a row's name: a refused update, a paused one, an error. */
+const ROW_NOTE = 'mt-1.5 flex min-w-0 items-center gap-1.5'
+
 /** A pill that explains itself on hover. */
 function HintPill({ hint, children }: { hint: string; children: ReactNode }) {
   return (
@@ -59,6 +76,19 @@ function HintPill({ hint, children }: { hint: string; children: ReactNode }) {
   )
 }
 
+function ReviewedBadge({ t }: { t: T }) {
+  return <ShieldCheck size={13} className="text-success shrink-0" aria-label={t('admin.plugins.reviewed')} />
+}
+
+/** Marks a manually-uploaded (sideloaded) plugin: no registry, unsigned, not reviewed. */
+function SideloadedBadge({ t }: { t: T }) {
+  return (
+    <HintPill hint={t('admin.plugins.sideloadedHint')}>
+      <StatusPill tone="warning" icon={<UploadCloud size={11} />}>{t('admin.plugins.sideloaded')}</StatusPill>
+    </HintPill>
+  )
+}
+
 /**
  * Signed / Unsigned, for registry plugins only (see isRegistrySourced).
  *
@@ -83,6 +113,15 @@ function TrustBadge({ signed, t }: { signed: boolean; t: T }) {
   )
 }
 
+/** Marks a dev-linked plugin: loaded from a local build dir + hot-reloaded (dev only). */
+function DevLinkBadge({ t }: { t: T }) {
+  return (
+    <HintPill hint={t('admin.plugins.devLinkHint')}>
+      <StatusPill icon={<Link2 size={11} />}>{t('admin.plugins.devLinkBadge')}</StatusPill>
+    </HintPill>
+  )
+}
+
 function TypeBadge({ type, t }: { type: string; t: T }) {
   return (
     <span className="inline-flex flex-none items-center rounded-full bg-surface-tertiary px-2 py-[3px] font-geist font-bold uppercase tracking-[.06em] text-content-muted" style={fs(9.5)}>
@@ -106,7 +145,6 @@ export default function AdminPluginsPanel() {
     sort, statusFilter, toggle, typeFilter, uninstallConfirmed, updatable, updateAll, updateAvailable, uploadInputRef,
     uploadPlugin, versionPicker, view,
   } = usePluginsAdmin()
-  const [securityOpen, setSecurityOpen] = useState(false)
 
   return (
     <div className="relative mb-24 sm:mb-0"
@@ -143,9 +181,6 @@ export default function AdminPluginsPanel() {
         ) : undefined}
         action={ready ? (
           <>
-            <BandButton label={t('admin.plugins.security.short')} onClick={() => setSecurityOpen(true)}>
-              <ShieldCheck size={15} strokeWidth={2} />
-            </BandButton>
             <BandButton label={t('admin.plugins.upload')} onClick={pickUpload} disabled={busy === '__upload'}>
               <UploadCloud size={15} strokeWidth={2} />
             </BandButton>
@@ -207,9 +242,31 @@ export default function AdminPluginsPanel() {
                 />
               </label>
 
-              <PluginFilterMenu t={t} view={view} typeFilter={typeFilter} setTypeFilter={setTypeFilter}
-                statusFilter={statusFilter} setStatusFilter={setStatusFilter} sort={sort} setSort={setSort}
-                menu={menu} setMenu={setMenu} />
+              <FilterMenu id="type" label={t('admin.plugins.filterType')} value={typeFilter} menu={menu} setMenu={setMenu} icon={<SlidersHorizontal size={14} />}
+                options={[
+                  ['all', t('admin.plugins.allTypes')], ['widget', t('admin.plugins.type.widget')],
+                  ['integration', t('admin.plugins.type.integration')], ['page', t('admin.plugins.type.page')],
+                  ['trip-page', t('admin.plugins.type.trip-page')],
+                ]}
+                valueLabel={typeFilter === 'all' ? t('admin.plugins.allTypes') : t(`admin.plugins.type.${typeFilter}` as never)}
+                onPick={v => setTypeFilter(v as TypeFilter)} />
+
+              {view === 'installed' && (
+                <FilterMenu id="status" label={t('admin.plugins.filterStatus')} value={statusFilter} menu={menu} setMenu={setMenu} icon={<CircleDot size={14} />}
+                  options={[
+                    ['all', t('admin.plugins.allStatuses')], ['on', t('admin.plugins.status.active')], ['off', t('admin.plugins.stateOff')],
+                    ['update', t('admin.plugins.filterUpdate')], ['err', t('admin.plugins.status.error')],
+                  ]}
+                  valueLabel={statusLabel(statusFilter, t)}
+                  onPick={v => setStatusFilter(v as StatusFilter)} />
+              )}
+
+              <FilterMenu id="sort" label={t('admin.plugins.sortBy')} value={sort} menu={menu} setMenu={setMenu} icon={<ArrowUpDown size={14} />}
+                options={view === 'discover'
+                  ? [['name', t('admin.plugins.sortName')], ['recent', t('admin.plugins.sortRecent')], ['downloads', t('admin.plugins.sortDownloads')]]
+                  : [['name', t('admin.plugins.sortName')], ['recent', t('admin.plugins.sortRecent')], ['updates', t('admin.plugins.sortUpdates')]]}
+                valueLabel={sortLabel(sort, t)}
+                onPick={v => setSort(v as SortKey)} />
             </div>
 
             {view === 'discover' ? (
@@ -242,7 +299,7 @@ export default function AdminPluginsPanel() {
                 ) : (
                   <SettingRows>
                     {shownInstalled.map(p => (
-                      <PluginInstalledRow key={p.id} p={p} t={t} busy={busy} menu={menu} setMenu={setMenu}
+                      <InstalledRow key={p.id} p={p} t={t} busy={busy} menu={menu} setMenu={setMenu}
                         hasUpdate={updateAvailable(p)} latestVer={latest[p.id]}
                         newerIncompatible={newerIncompatible(p)}
                         blocked={blockIsCurrent(p, latest[p.id])}
@@ -263,7 +320,7 @@ export default function AdminPluginsPanel() {
         )}
       </SettingsCard>
 
-      {securityOpen && <PluginSecurityDialog t={t} onClose={() => setSecurityOpen(false)} />}
+      <SecurityInfo t={t} />
 
       {/* Registry detail dialog */}
       {detailFor && (
@@ -381,6 +438,268 @@ function SegBtn({ active, onClick, label, count }: { active: boolean; onClick: (
   )
 }
 
+/** Re-renders while the page moves under an open, portaled menu, so it stays pinned to its trigger. */
+function useFollowTrigger(open: boolean) {
+  const [, reanchor] = useState(0)
+  useEffect(() => {
+    if (!open) return
+    const onMove = () => reanchor(n => n + 1)
+    window.addEventListener('scroll', onMove, true)
+    window.addEventListener('resize', onMove)
+    return () => {
+      window.removeEventListener('scroll', onMove, true)
+      window.removeEventListener('resize', onMove)
+    }
+  }, [open])
+}
+
+function FilterMenu({ id, label, valueLabel, options, onPick, value, menu, setMenu, icon }: {
+  id: string; label: string; valueLabel: string
+  options: Array<[string, string]>; onPick: (v: string) => void; value: string
+  menu: string | null; setMenu: (v: string | null) => void; icon?: ReactNode
+}) {
+  const open = menu === id
+  const active = value !== options[0]?.[0]
+  const btnRef = useRef<HTMLButtonElement>(null)
+  // Portaled like the row menu: the card around the toolbar clips what overflows it.
+  useFollowTrigger(open)
+  return (
+    <div className="relative flex-none">
+      <button type="button" ref={btnRef} onClick={() => setMenu(open ? null : id)} title={`${label}: ${valueLabel}`} aria-expanded={open}
+        className={`inline-flex h-9 items-center gap-1.5 whitespace-nowrap rounded-[10px] border bg-surface-card px-3 text-content-secondary transition-colors hover:text-content ${
+          active ? 'border-[color:var(--text-primary)]' : 'border-edge'}`}
+        style={fs(12.5, 'body')}>
+        <span className="flex-none text-content-faint">{icon}</span>
+        <span>{label}: </span>
+        <span className="font-semibold text-content">{valueLabel}</span>
+        <ChevronDown size={13} className={`flex-none text-content-faint transition-transform ${open ? 'rotate-180' : ''}`} />
+      </button>
+      {open && createPortal(
+        <div className="min-w-[200px] max-w-[calc(100vw-2rem)]" style={{ ...POPOVER, ...anchorMenu(btnRef.current) }}>
+          {options.map(([v, lbl]) => (
+            <button type="button" key={v} onClick={() => { onPick(v); setMenu(null) }}
+              className={`${MENU_ITEM} ${value === v ? 'font-semibold text-content' : 'text-content-secondary'}`} style={fs(12.5, 'body')}>
+              <span className="min-w-0 flex-1 truncate text-start">{lbl}</span>
+              <Check size={14} className={`flex-none text-content-muted ${value === v ? 'opacity-100' : 'opacity-0'}`} />
+            </button>
+          ))}
+        </div>,
+        document.body,
+      )}
+    </div>
+  )
+}
+
+function InstalledRow({ p, t, busy, menu, setMenu, hasUpdate, latestVer, newerIncompatible, blocked, onToggle, onUpdate, onRestart, onChangeVersion, onResume, onReviewBlock, onErrors, onEgress, onSettings, onUninstall }: {
+  p: PluginRow; t: T; busy: string | null; menu: string | null; setMenu: (v: string | null) => void
+  hasUpdate: boolean; latestVer?: string; newerIncompatible: { version: string; range: string } | null; blocked: boolean
+  onToggle: () => void; onUpdate: () => void; onRestart: () => void; onChangeVersion: () => void; onResume: () => void; onReviewBlock: () => void
+  onErrors: () => void; onEgress: () => void; onSettings: () => void; onUninstall: () => void
+}) {
+  const caps = deriveCaps(parseJson<string[]>(p.permissions, []), parseJson<{ widget?: { slot?: string } }>(p.capabilities, {}), t)
+  const deps = deriveDeps(p, t)
+  const menuOpen = menu === `row:${p.id}`
+  const menuBtnRef = useRef<HTMLButtonElement>(null)
+  const working = busy === p.id
+  const on = p.enabled === 1 && p.status !== 'error'
+
+  // The menu is portaled to <body> and positioned `fixed` against the ⋯ button,
+  // because the row's ancestor (PageSidebar) is `overflow-hidden` and would clip
+  // an in-flow `absolute` menu — losing Delete on the lower rows of a long list.
+  // Re-anchor while the page moves under it.
+  useFollowTrigger(menuOpen)
+
+  const hostCount = p.egressHostCount ?? 0
+
+  return (
+    <div className={`group relative flex items-start gap-3 px-3.5 py-3 transition-colors hover:bg-surface-secondary ${working ? 'opacity-60' : ''}`}>
+      <div className="relative mt-0.5 flex-none">
+        <span className="grid h-10 w-10 place-items-center rounded-[12px] border border-edge-faint bg-surface-secondary">
+          <PluginIcon name={p.icon} size={19} className="text-content-secondary" />
+        </span>
+        <Tooltip label={t(`admin.plugins.status.${p.status}` as never)}>
+          <span className={`absolute -bottom-0.5 -end-0.5 h-3 w-3 rounded-full ring-2 ring-surface-card ${HEALTH[p.status] || HEALTH.inactive}`} />
+        </Tooltip>
+      </div>
+
+      <div className="min-w-0 flex-1">
+        <div className="flex flex-wrap items-center gap-x-2 gap-y-1">
+          <span className="min-w-0 truncate font-semibold tracking-[-.006em] text-content" style={fs(13.5, 'body')}>{p.name}</span>
+          {p.version && <span className="font-geist font-medium tabular-nums text-content-faint" style={fs(11)}>v{p.version}</span>}
+          {p.reviewed_at && <ReviewedBadge t={t} />}
+          {p.source_repo === 'local:upload' && <SideloadedBadge t={t} />}
+          {p.source_repo === 'local:link' && <DevLinkBadge t={t} />}
+          {/* Registry plugins only — a sideloaded/dev-linked plugin already says something
+              strictly stronger, and stacking "Unsigned" on top of it just dilutes the amber. */}
+          {isRegistrySourced(p.source_repo) && <TrustBadge signed={!!p.signed} t={t} />}
+        </div>
+        {p.description && <p className="m-0 mt-0.5 truncate text-content-muted" style={fs(12, 'body')}>{p.description}</p>}
+        {/* A refused update leaves a WORKING plugin pinned at its old version — so this is
+            its own row state, not an error state, and it persists until it is resolved
+            rather than dying with the toast that first reported it. */}
+        {blocked && p.updateBlock && (
+          <div className={`${ROW_NOTE} text-warning`} style={fs(11.5)}>
+            <ShieldAlert size={13} className="flex-none" />
+            <span className="truncate">{t('admin.plugins.updateBlocked', { reason: p.updateBlock.detail ?? p.updateBlock.code })}</span>
+            <button type="button" onClick={onReviewBlock}
+              className="flex-none font-semibold underline underline-offset-2 hover:opacity-80">
+              {t('admin.plugins.reviewBlock')}
+            </button>
+          </div>
+        )}
+        {/* A newer version this TREK can't run — informational, never a button: the fix
+            is a TREK upgrade, so the row must not nag or offer a doomed install. */}
+        {newerIncompatible && (
+          <div className={`${ROW_NOTE} text-content-faint`} style={fs(11.5)}>
+            <Info size={13} className="flex-none" />
+            <span className="truncate">{t('admin.plugins.newerNeedsTrek', { version: newerIncompatible.version, range: newerIncompatible.range })}</span>
+          </div>
+        )}
+        {/* Held: the admin deliberately installed a non-latest version, so updates are
+            paused rather than nagged — resuming is one click, right where the pause shows. */}
+        {p.updateHold && (
+          <div className={`${ROW_NOTE} text-content-faint`} style={fs(11.5)}>
+            <PauseCircle size={13} className="flex-none" />
+            <span className="truncate">{t('admin.plugins.updatesHeld', { version: p.version ?? '' })}</span>
+            <button type="button" onClick={onResume} disabled={working}
+              className="flex-none font-semibold text-content-secondary underline underline-offset-2 hover:opacity-80 disabled:opacity-50">
+              {t('admin.plugins.resumeUpdates')}
+            </button>
+          </div>
+        )}
+        {p.status === 'error' && p.last_error ? (
+          <div className={`${ROW_NOTE} text-danger`} style={fs(11.5)}>
+            <AlertTriangle size={13} className="flex-none" /><span className="truncate">{p.last_error}</span>
+          </div>
+        ) : (caps.length > 0 || p.operatorEgress) && (
+          <div className="mt-2 flex flex-wrap items-center gap-1.5">
+            {caps.map((c, i) => (
+              <span key={i} className={`${CHIP} ${c.net ? CHIP_NET : CHIP_NEUTRAL}`} style={fs(11)}>
+                <c.icon size={12} className={c.net ? 'text-info' : 'text-content-muted'} /><span className="truncate">{c.label}</span>
+              </span>
+            ))}
+            {/* This plugin talks to a service only the OPERATOR can name (a self-hosted
+                Gotify/ntfy), so its manifest can't list the host — the admin adds it.
+                Actionable, and warning-toned until at least one host exists, because
+                until then the plugin cannot reach anything and looks silently broken. */}
+            {p.operatorEgress && (
+              <Tooltip label={t('admin.plugins.allowedHosts.hint')}>
+                <button type="button" onClick={onEgress}
+                  className={`${CHIP} ${hostCount > 0 ? CHIP_NET : CHIP_WARN} hover:opacity-80`} style={fs(11)}>
+                  <Globe size={12} />
+                  {hostCount > 0
+                    ? t('admin.plugins.allowedHosts.count', { n: hostCount })
+                    : t('admin.plugins.allowedHosts.add')}
+                </button>
+              </Tooltip>
+            )}
+          </div>
+        )}
+        {deps.length > 0 && (
+          <div className="mt-1.5 flex flex-wrap items-center gap-1.5">
+            {deps.map((d, i) => (
+              <span key={i} className={`${CHIP} ${d.blocked || d.warn ? CHIP_WARN : CHIP_NEUTRAL}`} style={fs(11)}>
+                <d.icon size={12} className={d.blocked || d.warn ? 'text-warning' : 'text-content-muted'} /><span className="truncate">{d.label}</span>
+              </span>
+            ))}
+          </div>
+        )}
+      </div>
+
+      <div className="flex flex-none items-center gap-2 self-center">
+        {hasUpdate && (
+          <button type="button" onClick={onUpdate} disabled={working}
+            className="inline-flex items-center gap-1.5 rounded-full bg-warning-soft px-2.5 py-1 font-semibold text-warning hover:opacity-90 disabled:opacity-50"
+            style={fs(11.5)}>
+            <ArrowUpCircle size={13} /> <span>{t('admin.plugins.updateTo', { version: latestVer })}</span>
+          </button>
+        )}
+        <span className={`min-w-[42px] text-end font-medium ${on ? 'text-content-secondary' : 'text-content-faint'}`} style={fs(12)}>
+          {p.enabled === 1 ? t('admin.plugins.status.active') : t('admin.plugins.stateOff')}
+        </span>
+        <ToggleSwitch on={p.enabled === 1} label={t('admin.plugins.enabledToggle')} onToggle={onToggle} />
+        <div className="relative">
+          <Tooltip label={t('admin.table.actions')} disabled={menuOpen}>
+            <button type="button" ref={menuBtnRef} data-testid={`plugin-row-menu-btn-${p.id}`} onClick={() => setMenu(menuOpen ? null : `row:${p.id}`)}
+              aria-expanded={menuOpen} aria-label={t('admin.table.actions')}
+              className={`grid h-8 w-8 place-items-center rounded-[10px] transition-colors ${menuOpen ? 'bg-surface-card text-content shadow-sm ring-1 ring-edge-faint' : 'text-content-faint hover:bg-surface-card hover:text-content'}`}>
+              <MoreHorizontal size={17} />
+            </button>
+          </Tooltip>
+          {menuOpen && createPortal(
+            <div data-testid={`plugin-row-menu-${p.id}`} style={{ ...POPOVER, ...anchorMenu(menuBtnRef.current) }}
+              className="min-w-[200px]">
+              {p.enabled === 1 && (
+                <MenuItem icon={<RotateCw size={14} />} label={t('admin.plugins.restart')} onClick={onRestart} />
+              )}
+              {/* A plugin gets the item if it declares scope:'instance' fields OR actions —
+                  an action-only plugin still needs the dialog to run its buttons. */}
+              {((p.instanceSettingsCount ?? 0) > 0 || (p.instanceActionsCount ?? 0) > 0) && (
+                <MenuItem icon={<SlidersHorizontal size={14} />} label={t('admin.plugins.instanceSettings')} onClick={onSettings} />
+              )}
+              <MenuItem icon={<Bug size={14} />} label={t('admin.plugins.viewErrors')} onClick={onErrors} />
+              {/* Only a plugin that DECLARED operatorEgress gets the item — an admin must
+                  never be invited to widen egress for a plugin that didn't ask for it
+                  (same rule the row's egress chip follows). */}
+              {p.operatorEgress && (
+                <MenuItem icon={<Globe size={14} />} label={t('admin.plugins.allowedHosts')} onClick={onEgress} />
+              )}
+              {/* Registry plugins only — a sideload/dev-link has no registry versions to pick from. */}
+              {isRegistrySourced(p.source_repo) && (
+                <MenuItem icon={<History size={14} />} label={t('admin.plugins.changeVersion')} onClick={onChangeVersion} />
+              )}
+              {p.source_repo && p.source_repo !== 'local:upload' && p.source_repo !== 'local:link' && (
+                <>
+                  <a href={`https://github.com/${p.source_repo}`} target="_blank" rel="noreferrer" onClick={() => setMenu(null)}
+                    className={`${MENU_ITEM} text-content-secondary`} style={fs(12.5, 'body')}>
+                    <span className="flex w-4 flex-none justify-center text-content-muted"><Github size={14} /></span> {t('admin.plugins.sourceRepo')}
+                  </a>
+                  <a href={`https://github.com/${p.source_repo}/issues`} target="_blank" rel="noreferrer" onClick={() => setMenu(null)}
+                    className={`${MENU_ITEM} text-content-secondary`} style={fs(12.5, 'body')}>
+                    <span className="flex w-4 flex-none justify-center text-content-muted"><CircleDot size={14} /></span> {t('admin.plugins.reportIssue')}
+                  </a>
+                </>
+              )}
+              <div className="mx-1.5 my-1 h-px bg-edge-faint" />
+              <MenuItem icon={<Trash2 size={14} />} label={t('common.delete')} danger onClick={onUninstall} />
+            </div>,
+            document.body,
+          )}
+        </div>
+      </div>
+    </div>
+  )
+}
+
+/** Tallest the ⋯ menu gets (6 items + divider + padding). Drives the flip. */
+const ROW_MENU_MAX_H = 260
+
+/** Pin a portaled menu to the right edge of its trigger, flipping up when the bottom is tight. */
+function anchorMenu(trigger: HTMLElement | null): CSSProperties {
+  const r = trigger?.getBoundingClientRect()
+  if (!r) return { position: 'fixed', top: 0, right: 0, zIndex: 100 }
+  const spaceBelow = window.innerHeight - r.bottom
+  const openUp = spaceBelow < ROW_MENU_MAX_H && r.top > spaceBelow
+  return {
+    position: 'fixed',
+    right: Math.max(8, window.innerWidth - r.right),
+    ...(openUp ? { bottom: window.innerHeight - r.top + 4 } : { top: r.bottom + 4 }),
+    zIndex: 100,
+  }
+}
+
+/** One entry of a popover menu, in the packing popovers' shape. */
+const MENU_ITEM = 'flex w-full items-center gap-2.5 rounded-[9px] px-2.5 py-2 font-medium transition-colors hover:bg-surface-tertiary'
+
+function MenuItem({ icon, label, onClick, danger }: { icon: ReactNode; label: string; onClick: () => void; danger?: boolean }) {
+  return (
+    <button type="button" onClick={onClick}
+      className={`${MENU_ITEM} ${danger ? 'text-danger hover:bg-danger-soft' : 'text-content-secondary'}`} style={fs(12.5, 'body')}>
+      <span className={`flex w-4 flex-none justify-center ${danger ? 'text-danger' : 'text-content-muted'}`}>{icon}</span> {label}
+    </button>
+  )
+}
+
 function Screenshot({ url, className, iconSize = 28 }: { url: string | null; className: string; iconSize?: number }) {
   const [failed, setFailed] = useState(false)
   return (
@@ -432,16 +751,6 @@ function RegistryGrid({ items, onInstall, onOpenDetail, busy, t, installedIds, f
                   <StatusPill icon={<ShieldCheck size={11} className="text-success" />}>{t('admin.plugins.reviewed')}</StatusPill>
                 </span>
               )}
-              {/* Says up front that this one has not been confirmed for the TREK it would run on,
-                  so "Install" never reads as a plain install; the dialog explains the risk. */}
-              {!installed && offer.warn && (
-                // Solid, not the soft pill "Reviewed" uses: it has to stand out on any screenshot.
-                <span className="absolute start-2.5 top-2.5 inline-flex max-w-[62%] items-center gap-1 rounded-full bg-warning px-2 py-[3px] font-geist font-semibold text-[color:var(--surface-card)] shadow-md"
-                  style={fs(11)}>
-                  <AlertTriangle size={11} className="flex-none" />
-                  <span className="truncate">{t('admin.plugins.untestedChip', { host: offer.warn.hostVersion })}</span>
-                </span>
-              )}
               <span className="absolute -bottom-4 start-3.5 z-[1] grid h-10 w-10 place-items-center rounded-[12px] border border-edge-faint bg-surface-card shadow-sm">
                 <PluginIcon name={item.icon} size={20} className="text-content-secondary" />
               </span>
@@ -520,8 +829,8 @@ function Tile({ children, warn }: { children: ReactNode; warn?: boolean }) {
  * The TREK_PLUGINS_IGNORE_TREK_RANGE warning (copy and modes from useRangeBypass). Its own
  * component rather than ConfirmDialog because the notice mode has no cancel button.
  */
-function RangeBypassDialog({ copy: { title, body, confirm, confirmLabel }, onConfirm, onClose, t }: {
-  copy: { title: string; body: string; confirm: boolean; confirmLabel: string }; onConfirm: () => void; onClose: () => void; t: T
+function RangeBypassDialog({ copy: { title, body, confirm }, onConfirm, onClose, t }: {
+  copy: { title: string; body: string; confirm: boolean }; onConfirm: () => void; onClose: () => void; t: T
 }) {
   return (
     <DialogShell
@@ -535,7 +844,7 @@ function RangeBypassDialog({ copy: { title, body, confirm, confirmLabel }, onCon
           {confirm ? (
             <>
               <DialogButton onClick={onClose}>{t('common.cancel')}</DialogButton>
-              <DialogButton variant="primary" onClick={onConfirm}>{confirmLabel}</DialogButton>
+              <DialogButton variant="primary" onClick={onConfirm}>{t('admin.plugins.installAnyway')}</DialogButton>
             </>
           ) : (
             <DialogButton variant="primary" onClick={onClose}>{t('common.ok')}</DialogButton>
@@ -1186,3 +1495,45 @@ function DependencyResolveDialog({ data, t, busy, installedIds, onDownload, onCl
     </DialogShell>
   )
 }
+
+// Footer: a plain-language note on what "Reviewed" means, plus a collapsible
+// panel that lays out how plugins are contained, the limits, and the worst case.
+function SecurityInfo({ t }: { t: T }) {
+  const [open, setOpen] = useState(false)
+  const sections: Array<[string, string]> = [
+    ['admin.plugins.security.isolationTitle', 'admin.plugins.security.isolationBody'],
+    ['admin.plugins.security.permsTitle', 'admin.plugins.security.permsBody'],
+    ['admin.plugins.security.limitsTitle', 'admin.plugins.security.limitsBody'],
+    ['admin.plugins.security.worstTitle', 'admin.plugins.security.worstBody'],
+    ['admin.plugins.security.reviewedTitle', 'admin.plugins.security.reviewedBody'],
+    ['admin.plugins.security.signedTitle', 'admin.plugins.security.signedBody'],
+    ['admin.plugins.security.trustTitle', 'admin.plugins.security.trustBody'],
+  ]
+  return (
+    <SettingsCard
+      icon={Lock}
+      title={(
+        <button type="button" onClick={() => setOpen(o => !o)} aria-expanded={open}
+          className="inline-flex max-w-full items-center gap-1.5 text-start font-bold text-content hover:opacity-80">
+          <span className="truncate">{t('admin.plugins.security.title')}</span>
+          <ChevronDown size={15} className={`flex-none text-content-faint transition-transform ${open ? 'rotate-180' : ''}`} />
+        </button>
+      )}
+    >
+      <div className="flex items-start gap-2.5">
+        <ShieldCheck size={14} className="mt-0.5 flex-none text-content-faint" />
+        <SettingsHint>{t('admin.plugins.reviewedMeaning')}</SettingsHint>
+      </div>
+      {open && (
+        <div className="grid gap-2.5 sm:grid-cols-2">
+          {sections.map(([h, b]) => (
+            <div key={h} className="rounded-[12px] border border-edge-faint bg-surface-card px-3.5 py-3">
+              <h4 className="m-0 font-semibold text-content" style={fs(12.5, 'body')}>{t(h as never)}</h4>
+              <p className="m-0 mt-1 leading-relaxed text-content-muted" style={fs(12, 'body')}>{t(b as never)}</p>
+            </div>
+          ))}
+        </div>
+      )}
+    </SettingsCard>
+  )
+}

client/src/components/Admin/GitHubPanel.tsx

@@ -102,13 +102,6 @@ export default function GitHubPanel({ isPrerelease = false }: { isPrerelease?: b
           </ul>
         );
       }
-      if (block.kind === 'h5') {
-        return (
-          <h5 key={idx} className="mb-1 mt-3 font-semibold text-content first:mt-0" style={fs(12.5, 'body')}>
-            {block.text}
-          </h5>
-        );
-      }
       if (block.kind === 'h4') {
         return (
           <h4 key={idx} className="mb-1 mt-3 font-geist font-bold uppercase tracking-[.08em] text-content-faint first:mt-0" style={fs(10)}>

client/src/components/Admin/RoutingInstanceFields.tsx

@@ -1,5 +1,4 @@
 import { useId, useState } from 'react'
-import type { ValhallaProvider } from '@trek/shared'
 import { useTranslation } from '../../i18n/TranslationContext'
 import { fs } from '../shared/DialogShell'
 import { INPUT, LABEL } from '../shared/dialogParts'
@@ -7,7 +6,6 @@ import { INPUT, LABEL } from '../shared/dialogParts'
 export interface RoutingDefaults {
   routing_base_url?: string
   valhalla_base_url?: string
-  routing_valhalla_provider?: ValhallaProvider
 }
 
 interface RoutingFieldsProps {
@@ -27,14 +25,6 @@ const ROUTERS = [
   { key: 'valhalla_base_url', label: 'settings.valhallaBase', hint: 'settings.valhallaBaseHint', placeholder: 'https://valhalla.example.org' },
 ] as const
 
-// '' is no choice of the admin: the instance then decides as before the choice existed.
-const PROVIDERS = [
-  { value: '', labelKey: 'settings.valhallaProviderOption.auto' },
-  { value: 'trek', labelKey: 'settings.valhallaProviderOption.trek' },
-  { value: 'fossgis', labelKey: 'settings.valhallaProviderOption.fossgis' },
-  { value: 'custom', labelKey: 'settings.valhallaProviderOption.custom' },
-] as const
-
 // The phone screen's look, unchanged: MAdminDefaultUserSettings passes its own hint class.
 const PHONE = {
   wrap: 'min-w-0 space-y-1.5',
@@ -53,12 +43,6 @@ const DESKTOP = {
   input: INPUT,
 }
 
-function FieldHint({ id, text, hintClassName }: { id: string; text: string; hintClassName?: string }) {
-  return hintClassName !== undefined
-    ? <p id={id} className={hintClassName}>{text}</p>
-    : <p id={id} className="m-0 mt-1 leading-normal text-content-faint" style={fs(11)}>{text}</p>
-}
-
 function RoutingUrlField({ router, defaults, onSave, onReset, hintClassName }: RoutingFieldsProps & { router: typeof ROUTERS[number] }) {
   const { t } = useTranslation()
   const id = useId()
@@ -97,45 +81,14 @@ function RoutingUrlField({ router, defaults, onSave, onReset, hintClassName }: R
         aria-describedby={`${id}-hint`}
         className={look.input}
       />
-      <FieldHint id={`${id}-hint`} text={t(router.hint)} hintClassName={hintClassName} />
-    </div>
-  )
-}
-
-/** Which Valhalla answers what OSRM cannot; picking "automatic" clears the choice. */
-function RoutingProviderField({ defaults, onSave, onReset, hintClassName }: RoutingFieldsProps) {
-  const { t } = useTranslation()
-  const id = useId()
-  const [saving, setSaving] = useState(false)
-  const phone = hintClassName !== undefined
-  const look = phone ? PHONE : DESKTOP
-  const pick = async (value: string) => {
-    setSaving(true)
-    try {
-      if (value === '') await onReset('routing_valhalla_provider')
-      else await onSave({ routing_valhalla_provider: value as ValhallaProvider })
-    } finally { setSaving(false) }
-  }
-  return (
-    <div className={`${look.wrap} ${!phone && saving ? 'opacity-60' : ''}`} aria-busy={saving}>
-      <div className={look.head}>
-        <label htmlFor={id} className={look.label}>{t('settings.valhallaProvider')}</label>
-      </div>
-      <select id={id} value={defaults.routing_valhalla_provider ?? ''} disabled={saving}
-        onChange={e => void pick(e.target.value)} aria-describedby={`${id}-hint`} className={look.input}>
-        {PROVIDERS.map(option => <option key={option.value} value={option.value}>{t(option.labelKey)}</option>)}
-      </select>
-      <FieldHint id={`${id}-hint`} text={t('settings.valhallaProviderHint')} hintClassName={hintClassName} />
+      {phone
+        ? <p id={`${id}-hint`} className={hintClassName}>{t(router.hint)}</p>
+        : <p id={`${id}-hint`} className="m-0 mt-1 leading-normal text-content-faint" style={fs(11)}>{t(router.hint)}</p>}
     </div>
   )
 }
 
 export default function RoutingInstanceFields(props: RoutingFieldsProps) {
   const phone = props.hintClassName !== undefined
-  return (
-    <div className={phone ? 'flex flex-col gap-3' : 'flex flex-col gap-4'}>
-      <RoutingProviderField {...props} />
-      {ROUTERS.map(router => <RoutingUrlField key={router.key} router={router} {...props} />)}
-    </div>
-  )
+  return <div className={phone ? 'flex flex-col gap-3' : 'flex flex-col gap-4'}>{ROUTERS.map(router => <RoutingUrlField key={router.key} router={router} {...props} />)}</div>
 }

client/src/components/Admin/ServiceIdentityPanel.test.tsx

@@ -1,154 +0,0 @@
-// FE-ADMIN-SVCID-001 to FE-ADMIN-SVCID-010
-import userEvent from '@testing-library/user-event';
-import type { ServiceIdentityStatus } from '@trek/shared';
-import { http, HttpResponse } from 'msw';
-import { describe, expect, it, vi } from 'vitest';
-import { server } from '../../../tests/helpers/msw/server';
-import { render, screen, waitFor } from '../../../tests/helpers/render';
-import ServiceIdentityPanel from './ServiceIdentityPanel';
-
-// The keys themselves, so a test fails on a missing or renamed key rather than on wording.
-vi.mock('../../i18n', async (importOriginal) => ({
-  ...(await importOriginal<typeof import('../../i18n')>()),
-  useTranslation: () => ({ t: (key: string) => key, locale: 'en-US' }),
-}));
-
-const QUOTA = { limit: 10_000, used: 2_500, remaining: 7_500, resetAt: '2026-10-30T00:00:00.000Z' };
-const CONNECTED: ServiceIdentityStatus = {
-  state: 'connected',
-  tier: 'std',
-  keySource: 'registered',
-  services: [
-    { service: 'places', inUse: true, quota: QUOTA },
-    { service: 'photon', inUse: false, quota: null },
-    { service: 'valhalla', inUse: false, quota: null },
-  ],
-  lastSeenAt: '2026-10-29T12:00:00.000Z',
-};
-
-function serve(status: ServiceIdentityStatus) {
-  server.use(http.get('/api/admin/service-identity', () => HttpResponse.json(status)));
-}
-
-describe('ServiceIdentityPanel', () => {
-  it('FE-ADMIN-SVCID-001: shows the state, the tier and today against the limit', async () => {
-    serve(CONNECTED);
-    render(<ServiceIdentityPanel />);
-    expect(await screen.findByText('admin.trekApi.quota.state.connected')).toBeInTheDocument();
-    expect(screen.getByText('admin.trekApi.quota.tier.std')).toBeInTheDocument();
-    const bar = screen.getByRole('progressbar', { name: 'admin.trekApi.quota.service.places' });
-    expect(bar).toHaveAttribute('aria-valuenow', '2500');
-    expect(bar).toHaveAttribute('aria-valuemax', '10000');
-    expect(screen.getByText('2,500 / 10,000')).toBeInTheDocument();
-    expect(screen.getByText('7,500')).toBeInTheDocument();
-    expect(screen.getByText('admin.trekApi.quota.resets')).toBeInTheDocument();
-    expect(screen.queryByText(/admin\.trekApi\.quota\.hint\./)).toBeNull();
-  });
-
-  it('FE-ADMIN-SVCID-002: an installation without a key says so and offers a new identity', async () => {
-    serve({ state: 'legacy', tier: 'legacy', keySource: null, services: [], lastSeenAt: null });
-    render(<ServiceIdentityPanel />);
-    expect(await screen.findByText('admin.trekApi.quota.hint.legacy')).toBeInTheDocument();
-    expect(screen.queryByRole('progressbar')).toBeNull();
-    expect(screen.getByRole('button', { name: 'admin.trekApi.quota.regenerate' })).toBeInTheDocument();
-  });
-
-  it('FE-ADMIN-SVCID-003: switched off, it shows why and offers nothing', async () => {
-    serve({ state: 'off', tier: null, keySource: null, services: [], lastSeenAt: null });
-    render(<ServiceIdentityPanel />);
-    expect(await screen.findByText('admin.trekApi.quota.hint.off')).toBeInTheDocument();
-    expect(screen.queryByRole('button', { name: 'admin.trekApi.quota.regenerate' })).toBeNull();
-  });
-
-  it('FE-ADMIN-SVCID-004: a key from the environment is named, and only changed there', async () => {
-    serve({ ...CONNECTED, keySource: 'env', tier: 'own' });
-    render(<ServiceIdentityPanel />);
-    expect(await screen.findByText('admin.trekApi.quota.envKey')).toBeInTheDocument();
-    expect(screen.queryByRole('button', { name: 'admin.trekApi.quota.regenerate' })).toBeNull();
-  });
-
-  it('FE-ADMIN-SVCID-005: a service in use without an allowance to show says it cannot be read', async () => {
-    serve({ ...CONNECTED, services: [{ service: 'places', inUse: true, quota: null }] });
-    render(<ServiceIdentityPanel />);
-    expect(await screen.findByText('admin.trekApi.quota.unavailable')).toBeInTheDocument();
-    expect(screen.queryByRole('progressbar')).toBeNull();
-  });
-
-  it('FE-ADMIN-SVCID-009: lists place search, address search and routing, each with its own allowance', async () => {
-    serve({
-      ...CONNECTED,
-      services: [
-        { service: 'places', inUse: true, quota: QUOTA },
-        { service: 'photon', inUse: true, quota: { ...QUOTA, used: 40, remaining: 9_960 } },
-        { service: 'valhalla', inUse: true, quota: { ...QUOTA, used: 9_500, remaining: 500 } },
-      ],
-    });
-    render(<ServiceIdentityPanel />);
-    const list = await screen.findByRole('list', { name: 'admin.trekApi.quota.title' });
-    expect(list.querySelectorAll('li')).toHaveLength(3);
-    const value = (name: string) => screen.getByRole('progressbar', { name }).getAttribute('aria-valuenow');
-    expect(value('admin.trekApi.quota.service.places')).toBe('2500');
-    expect(value('admin.trekApi.quota.service.photon')).toBe('40');
-    expect(value('admin.trekApi.quota.service.valhalla')).toBe('9500');
-    expect(screen.queryByText('admin.trekApi.quota.notInUse')).toBeNull();
-  });
-
-  it('FE-ADMIN-SVCID-010: a service this instance does not ask is named as not in use, its allowance still shown', async () => {
-    serve({
-      ...CONNECTED,
-      services: [
-        { service: 'places', inUse: true, quota: QUOTA },
-        { service: 'photon', inUse: false, quota: null },
-        { service: 'valhalla', inUse: false, quota: QUOTA },
-      ],
-    });
-    render(<ServiceIdentityPanel />);
-    expect(await screen.findAllByText('admin.trekApi.quota.notInUse')).toHaveLength(2);
-    expect(screen.getAllByRole('progressbar')).toHaveLength(2);
-    expect(screen.queryByText('admin.trekApi.quota.unavailable')).toBeNull();
-  });
-
-  it('FE-ADMIN-SVCID-006: a failed read says so instead of showing nothing', async () => {
-    server.use(http.get('/api/admin/service-identity', () => HttpResponse.json({ error: 'nope' }, { status: 500 })));
-    render(<ServiceIdentityPanel />);
-    expect(await screen.findByText('admin.trekApi.quota.unavailable')).toBeInTheDocument();
-  });
-
-  it('FE-ADMIN-SVCID-007: a revoked key asks before it starts over, then shows the new state', async () => {
-    let regenerated = 0;
-    serve({ state: 'revoked', tier: 'std', keySource: 'registered', services: [], lastSeenAt: null });
-    server.use(
-      http.post('/api/admin/service-identity/regenerate', () => {
-        regenerated += 1;
-        return HttpResponse.json({
-          state: 'registering',
-          tier: 'legacy',
-          keySource: null,
-          services: [],
-          lastSeenAt: null,
-        });
-      })
-    );
-    const user = userEvent.setup();
-    render(<ServiceIdentityPanel />);
-    expect(await screen.findByText('admin.trekApi.quota.hint.revoked')).toBeInTheDocument();
-
-    await user.click(screen.getByRole('button', { name: 'admin.trekApi.quota.regenerate' }));
-    expect(screen.getByText('admin.trekApi.quota.regenerateBody')).toBeInTheDocument();
-    expect(regenerated).toBe(0);
-
-    const regenerateButtons = screen.getAllByRole('button', { name: 'admin.trekApi.quota.regenerate' });
-    const confirm = regenerateButtons[regenerateButtons.length - 1];
-    if (!confirm) throw new Error('no confirm button');
-    await user.click(confirm);
-    await waitFor(() => expect(regenerated).toBe(1));
-    expect(await screen.findByText('admin.trekApi.quota.hint.registering')).toBeInTheDocument();
-  });
-
-  it('FE-ADMIN-SVCID-008: a managed install leaves the identity to its operator', async () => {
-    serve({ state: 'revoked', tier: 'std', keySource: 'registered', services: [], lastSeenAt: null });
-    render(<ServiceIdentityPanel managed />);
-    expect(await screen.findByText('admin.trekApi.quota.hint.revoked')).toBeInTheDocument();
-    expect(screen.queryByRole('button', { name: 'admin.trekApi.quota.regenerate' })).toBeNull();
-  });
-});

client/src/components/Admin/ServiceIdentityPanel.tsx

@@ -1,188 +0,0 @@
-import type { ServiceAllowance, ServiceIdentityState, ServiceIdentityStatus, ServiceQuotaView } from '@trek/shared';
-import { RefreshCw } from 'lucide-react';
-import { useRef, useState } from 'react';
-import { useTranslation } from '../../i18n';
-import { useSettingsStore } from '../../store/settingsStore';
-import type { TranslationFn } from '../../types';
-import { getApiErrorMessage } from '../../utils/apiError';
-import { formatClockTime } from '../../utils/formatters';
-import ConfirmDialog from '../shared/ConfirmDialog';
-import { useToast } from '../shared/Toast';
-import { useServiceIdentity } from './useServiceIdentity';
-
-const STATE_DOT: Record<ServiceIdentityState, string> = {
-  connected: 'bg-success',
-  registering: 'bg-warning motion-safe:animate-pulse',
-  legacy: 'bg-[var(--text-faint)]',
-  off: 'bg-[var(--text-faint)]',
-  revoked: 'bg-danger',
-};
-
-/** Below a tenth of the day left the bar turns amber, at nothing left red. */
-function barTone(quota: ServiceQuotaView): string {
-  if (quota.remaining === 0) return 'bg-danger';
-  return quota.remaining < quota.limit / 10 ? 'bg-warning' : 'bg-accent';
-}
-
-function Stat({ label, value }: { label: string; value: string }) {
-  return (
-    <div className="min-w-0">
-      <dt className="text-caption text-content-muted">{label}</dt>
-      <dd className="m-0 truncate text-body font-medium tabular-nums text-content">{value}</dd>
-    </div>
-  );
-}
-
-function QuotaMeter({ quota, label }: { quota: ServiceQuotaView; label: string }) {
-  const { t, locale } = useTranslation();
-  const is12h = useSettingsStore((s) => s.settings.time_format === '12h');
-  const number = new Intl.NumberFormat(locale);
-  const share = quota.limit > 0 ? Math.min(100, (quota.used / quota.limit) * 100) : 100;
-  const reset = new Date(quota.resetAt);
-  const resetAt = formatClockTime(
-    `${String(reset.getHours()).padStart(2, '0')}:${String(reset.getMinutes()).padStart(2, '0')}`,
-    is12h
-  );
-
-  return (
-    <div className="flex flex-col gap-2.5">
-      <div
-        role="progressbar"
-        aria-label={label}
-        aria-valuemin={0}
-        aria-valuemax={quota.limit}
-        aria-valuenow={quota.used}
-        className="h-1.5 overflow-hidden rounded-full bg-surface-tertiary"
-      >
-        <div
-          className={`h-full rounded-full transition-[width] duration-500 ${barTone(quota)}`}
-          style={{ width: `${share}%` }}
-        />
-      </div>
-      <dl className="m-0 grid grid-cols-3 gap-3">
-        <Stat
-          label={t('admin.trekApi.quota.used')}
-          value={`${number.format(quota.used)} / ${number.format(quota.limit)}`}
-        />
-        <Stat label={t('admin.trekApi.quota.remaining')} value={number.format(quota.remaining)} />
-        <Stat label={t('admin.trekApi.quota.resets')} value={resetAt} />
-      </dl>
-    </div>
-  );
-}
-
-function rowNote(t: TranslationFn, allowance: ServiceAllowance): string | null {
-  if (!allowance.inUse) return t('admin.trekApi.quota.notInUse');
-  return allowance.quota ? null : t('admin.trekApi.quota.unavailable');
-}
-
-/**
- * One service under the key: its name, today's allowance where its host told
- * it, and whether this instance asks it at all. A service not in use is
- * dimmed rather than hidden, so the list reads the same on every install.
- */
-function ServiceRow({ allowance }: { allowance: ServiceAllowance }) {
-  const { t } = useTranslation();
-  const name = t(`admin.trekApi.quota.service.${allowance.service}`);
-  const note = rowNote(t, allowance);
-
-  return (
-    <li className={`flex flex-col gap-2 py-2.5 first:pt-0 last:pb-0 ${allowance.inUse ? '' : 'opacity-60'}`}>
-      <p className="m-0 text-caption font-medium text-content-secondary">{name}</p>
-      {allowance.quota && <QuotaMeter quota={allowance.quota} label={name} />}
-      {note && <p className="m-0 text-caption leading-snug text-content-muted">{note}</p>}
-    </li>
-  );
-}
-
-function stateHint(t: TranslationFn, status: ServiceIdentityStatus | null, failed: boolean): string | null {
-  if (!status) return failed ? t('admin.trekApi.quota.unavailable') : null;
-  return status.state === 'connected' ? null : t(`admin.trekApi.quota.hint.${status.state}`);
-}
-
-/**
- * How this installation stands with the TREK services: whether it has its key,
- * and for place search, address search and routing today's allowance against
- * what is used, and when the count starts again.
- * Read when the card is in view and refreshed every 30 seconds while it stays.
- * A managed install leaves the identity to its operator, so it offers no new one.
- */
-export default function ServiceIdentityPanel({ managed = false }: { managed?: boolean }) {
-  const { t } = useTranslation();
-  const toast = useToast();
-  const panel = useRef<HTMLElement>(null);
-  const { status, failed, regenerating, regenerate } = useServiceIdentity(panel);
-  const [confirming, setConfirming] = useState(false);
-
-  const confirmRegenerate = async () => {
-    setConfirming(false);
-    try {
-      await regenerate();
-      toast.success(t('admin.trekApi.quota.regenerated'));
-    } catch (err) {
-      toast.error(getApiErrorMessage(err, t('common.error')));
-    }
-  };
-
-  const hint = stateHint(t, status, failed);
-  const canRegenerate = !managed && status !== null && status.keySource !== 'env' && status.state !== 'off';
-
-  return (
-    <section
-      ref={panel}
-      aria-label={t('admin.trekApi.quota.title')}
-      className="flex flex-col gap-3 rounded-xl border border-edge-faint bg-surface-secondary px-3.5 py-3"
-    >
-      <div className="flex flex-wrap items-center justify-between gap-2">
-        <p className="m-0 flex items-center gap-2 text-body font-medium text-content">
-          <span aria-hidden="true" className={`h-2 w-2 flex-none rounded-full ${STATE_DOT[status?.state ?? 'off']}`} />
-          {status ? t(`admin.trekApi.quota.state.${status.state}`) : t('admin.trekApi.quota.title')}
-        </p>
-        {status?.tier && (
-          <span className="rounded-full border border-edge-faint bg-surface-card px-2 py-0.5 text-caption font-medium text-content-secondary">
-            {t(`admin.trekApi.quota.tier.${status.tier}`)}
-          </span>
-        )}
-      </div>
-
-      {status && status.services.length > 0 && (
-        <ul aria-label={t('admin.trekApi.quota.title')} className="m-0 list-none divide-y divide-edge-faint p-0">
-          {status.services.map((allowance) => (
-            <ServiceRow key={allowance.service} allowance={allowance} />
-          ))}
-        </ul>
-      )}
-      {hint && <p className="m-0 text-caption leading-snug text-content-muted">{hint}</p>}
-
-      {status?.keySource === 'env' && (
-        <p className="m-0 text-caption text-content-faint">{t('admin.trekApi.quota.envKey')}</p>
-      )}
-      {canRegenerate && (
-        <button
-          type="button"
-          onClick={() => setConfirming(true)}
-          disabled={regenerating}
-          className="inline-flex items-center gap-1.5 self-start rounded-lg text-caption font-medium text-content-secondary hover:text-content disabled:opacity-50"
-        >
-          <RefreshCw
-            size={13}
-            strokeWidth={2}
-            className={regenerating ? 'motion-safe:animate-spin' : ''}
-            aria-hidden="true"
-          />
-          {t('admin.trekApi.quota.regenerate')}
-        </button>
-      )}
-
-      <ConfirmDialog
-        isOpen={confirming}
-        onClose={() => setConfirming(false)}
-        onConfirm={() => void confirmRegenerate()}
-        title={t('admin.trekApi.quota.regenerateTitle')}
-        message={t('admin.trekApi.quota.regenerateBody')}
-        confirmLabel={t('admin.trekApi.quota.regenerate')}
-        danger={false}
-      />
-    </section>
-  );
-}

client/src/components/Admin/addons/AiAddonTile.tsx

@@ -66,7 +66,6 @@ export default function AiAddonTile({
                 icon={<Icon size={14} />}
                 title={label.name}
                 description={label.description}
-                badge={addon.id === 'ai_assistant' ? <BetaBadge label={t('assistant.setup.beta')} /> : undefined}
                 enabled={addon.enabled}
                 onToggle={() => onToggle(addon)}
               />
@@ -94,16 +93,3 @@ export default function AiAddonTile({
     </article>
   );
 }
-
-/** The assistant is still young; its switch says so with a small accent pill. */
-function BetaBadge({ label }: { label: string }): React.ReactElement {
-  return (
-    <span
-      className="inline-flex flex-none items-center gap-1 rounded-full bg-accent px-[7px] py-[2px] font-geist font-bold uppercase leading-none tracking-[.08em] text-accent-text shadow-sm"
-      style={fs(9)}
-    >
-      <Sparkles size={9} strokeWidth={2.6} aria-hidden />
-      {label}
-    </span>
-  );
-}