Merge branch 'main' into tests-fixes-2

fix: apiv1  token auth and doc updates

.env.example

@@ -1,5 +1,7 @@
 export WEB_APP_URL="http://localhost:8000"
 export RELEASE_COOKIE="PDpbnyo6mEI_0T4ZsHH_ESmi1vT1toQ8PTc0vbfg5FIT4Ih-Lh98mw=="
+# Erlang node name for distributed Erlang (optional - defaults to wanderer@hostname)
+# export RELEASE_NODE="wanderer@localhost"
 export EVE_CLIENT_ID="<EVE_CLIENT_ID>"
 export EVE_CLIENT_SECRET="<EVE_CLIENT_SECRET>"
 export EVE_CLIENT_WITH_WALLET_ID="<EVE_CLIENT_WITH_WALLET_ID>"

.github/workflows/build-develop.yml

@@ -1,9 +1,9 @@
-name: Build Docker Image
+name: Build Develop
 
 on:
   push:
-    tags:
-      - '**'
+    branches:
+      - develop
 
 env:
   MIX_ENV: prod
@@ -18,12 +18,85 @@ permissions:
   contents: write
 
 jobs:
+  build:
+    name: 🛠 Build
+    runs-on: ubuntu-22.04
+    if: ${{ github.ref == 'refs/heads/develop' && github.event_name == 'push' }}
+    permissions:
+      checks: write
+      contents: write
+      packages: write
+      attestations: write
+      id-token: write
+      pull-requests: write
+      repository-projects: write
+    strategy:
+      matrix:
+        otp: ["27"]
+        elixir: ["1.17"]
+        node-version: ["18.x"]
+    outputs:
+      commit_hash: ${{ steps.set-commit-develop.outputs.commit_hash }}
+    steps:
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
+      - name: Setup Elixir
+        uses: erlef/setup-beam@v1
+        with:
+          otp-version: ${{matrix.otp}}
+          elixir-version: ${{matrix.elixir}}
+        # nix build would also work here because `todos` is the default package
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v3
+        with:
+          ssh-key: "${{ secrets.COMMIT_KEY }}"
+          fetch-depth: 0
+      - name: 😅 Cache deps
+        id: cache-deps
+        uses: actions/cache@v4
+        env:
+          cache-name: cache-elixir-deps
+        with:
+          path: |
+            deps
+          key: ${{ runner.os }}-mix-${{ matrix.elixir }}-${{ matrix.otp }}-${{ hashFiles('**/mix.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-mix-${{ matrix.elixir }}-${{ matrix.otp }}-
+      - name: 😅 Cache compiled build
+        id: cache-build
+        uses: actions/cache@v4
+        env:
+          cache-name: cache-compiled-build
+        with:
+          path: |
+            _build
+          key: ${{ runner.os }}-build-${{ hashFiles('**/mix.lock') }}-${{ hashFiles( '**/lib/**/*.{ex,eex}', '**/config/*.exs', '**/mix.exs' ) }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ hashFiles('**/mix.lock') }}-
+            ${{ runner.os }}-build-
+      # Step: Download project dependencies. If unchanged, uses
+      # the cached version.
+      - name: 🌐 Install dependencies
+        run: mix deps.get --only "prod"
+
+      # Step: Compile the project treating any warnings as errors.
+      # Customize this step if a different behavior is desired.
+      - name: 🛠 Compiles without warnings
+        if: steps.cache-build.outputs.cache-hit != 'true'
+        run: mix compile
+
+      - name: Set commit hash for develop
+        id: set-commit-develop
+        run: |
+          echo "commit_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
   docker:
     name: 🛠 Build Docker Images
+    needs: build
     runs-on: ubuntu-22.04
-    outputs:
-      release-tag: ${{ steps.get-latest-tag.outputs.tag }}
-      release-notes: ${{ steps.get-content.outputs.string }}
     permissions:
       checks: write
       contents: write
@@ -37,6 +110,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
+          - linux/arm64
     steps:
       - name: Prepare
         run: |
@@ -46,25 +120,9 @@ jobs:
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
         with:
+          ref: ${{ needs.build.outputs.commit_hash }}
           fetch-depth: 0
 
-      - name: Get Release Tag
-        id: get-latest-tag
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
-        with:
-          fallback: 1.0.0
-
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ steps.get-latest-tag.outputs.tag }}
-          fetch-depth: 0
-
-      - name: Prepare Changelog
-        run: |
-          yes | cp -rf CHANGELOG.md priv/changelog/CHANGELOG.md
-          sed -i '1i%{title: "Change Log"}\n\n---\n' priv/changelog/CHANGELOG.md
-
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
@@ -113,24 +171,6 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
-      - uses: markpatterson27/markdown-to-output@v1
-        id: extract-changelog
-        with:
-          filepath: CHANGELOG.md
-
-      - name: Get content
-        uses: 2428392/gh-truncate-string-action@v1.3.0
-        id: get-content
-        with:
-          stringToTruncate: |
-            📣 Wanderer new release available 🎉
-
-            **Version**: ${{ steps.get-latest-tag.outputs.tag }}
-
-            ${{ steps.extract-changelog.outputs.body }}
-          maxLength: 500
-          truncationSymbol: "…"
-
   merge:
     runs-on: ubuntu-latest
     needs:
@@ -161,9 +201,8 @@ jobs:
           tags: |
             type=ref,event=branch
             type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{version}},value=${{ needs.docker.outputs.release-tag }}
+            type=raw,value=develop,enable=${{ github.ref == 'refs/heads/develop' }}
+            type=raw,value=develop-{{sha}},enable=${{ github.ref == 'refs/heads/develop' }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
@@ -176,12 +215,20 @@ jobs:
           docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
 
   notify:
-    name: 🏷 Notify about release
+    name: 🏷 Notify about develop release
     runs-on: ubuntu-22.04
     needs: [docker, merge]
     steps:
       - name: Discord Webhook Action
         uses: tsickert/discord-webhook@v5.3.0
         with:
-          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          content: ${{ needs.docker.outputs.release-notes }}
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL_DEV }}
+          content: |
+            📣 New develop release available 🚀
+
+            **Commit**: `${{ github.sha }}`
+            **Status**: Development/Testing Release
+
+            Docker image: `wandererltd/community-edition:develop`
+
+            ⚠️ This is an unstable development release for testing purposes.

.github/workflows/build.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - develop
 
 env:
   MIX_ENV: prod
@@ -22,7 +21,7 @@ jobs:
   build:
     name: 🛠 Build
     runs-on: ubuntu-22.04
-    if: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop') && github.event_name == 'push' }}
+    if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
     permissions:
       checks: write
       contents: write
@@ -37,7 +36,7 @@ jobs:
         elixir: ["1.17"]
         node-version: ["18.x"]
     outputs:
-      commit_hash: ${{ steps.generate-changelog.outputs.commit_hash || steps.set-commit-develop.outputs.commit_hash }}
+      commit_hash: ${{ steps.generate-changelog.outputs.commit_hash }}
     steps:
       - name: Prepare
         run: |
@@ -91,7 +90,6 @@ jobs:
 
       - name: Generate Changelog & Update Tag Version
         id: generate-changelog
-        if: github.ref == 'refs/heads/main'
         run: |
           git config --global user.name 'CI'
           git config --global user.email 'ci@users.noreply.github.com'
@@ -102,15 +100,16 @@ jobs:
 
       - name: Set commit hash for develop
         id: set-commit-develop
-        if: github.ref == 'refs/heads/develop'
         run: |
           echo "commit_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
 
   docker:
     name: 🛠 Build Docker Images
-    if: github.ref == 'refs/heads/develop'
     needs: build
     runs-on: ubuntu-22.04
+    outputs:
+      release-tag: ${{ steps.get-latest-tag.outputs.tag }}
+      release-notes: ${{ steps.get-content.outputs.string }}
     permissions:
       checks: write
       contents: write
@@ -137,6 +136,17 @@ jobs:
           ref: ${{ needs.build.outputs.commit_hash }}
           fetch-depth: 0
 
+      - name: Get Release Tag
+        id: get-latest-tag
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+        with:
+          fallback: 1.0.0
+
+      - name: Prepare Changelog
+        run: |
+          yes | cp -rf CHANGELOG.md priv/changelog/CHANGELOG.md
+          sed -i '1i%{title: "Change Log"}\n\n---\n' priv/changelog/CHANGELOG.md
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
@@ -185,6 +195,24 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
+      - uses: markpatterson27/markdown-to-output@v1
+        id: extract-changelog
+        with:
+          filepath: CHANGELOG.md
+
+      - name: Get content
+        uses: 2428392/gh-truncate-string-action@v1.3.0
+        id: get-content
+        with:
+          stringToTruncate: |
+            📣 Wanderer new release available 🎉
+
+            **Version**: ${{ steps.get-latest-tag.outputs.tag }}
+
+            ${{ steps.extract-changelog.outputs.body }}
+          maxLength: 500
+          truncationSymbol: "…"
+
   merge:
     runs-on: ubuntu-latest
     needs:
@@ -215,8 +243,9 @@ jobs:
           tags: |
             type=ref,event=branch
             type=ref,event=pr
-            type=raw,value=develop,enable=${{ github.ref == 'refs/heads/develop' }}
-            type=raw,value=develop-{{sha}},enable=${{ github.ref == 'refs/heads/develop' }}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{version}},value=${{ needs.docker.outputs.release-tag }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
@@ -259,3 +288,14 @@ jobs:
             ## How to Promote?
             In order to promote this to prod, edit the draft and press **"Publish release"**.
           draft: true
+
+  notify:
+    name: 🏷 Notify about release
+    runs-on: ubuntu-22.04
+    needs: [docker, merge]
+    steps:
+      - name: Discord Webhook Action
+        uses: tsickert/discord-webhook@v5.3.0
+        with:
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          content: ${{ needs.docker.outputs.release-notes }}

.github/workflows/docker-arm.yml

@@ -1,187 +0,0 @@
-name: Build Docker ARM Image
-
-on:
-  push:
-    tags:
-      - '**'
-
-env:
-  MIX_ENV: prod
-  GH_TOKEN: ${{ github.token }}
-  REGISTRY_IMAGE: wandererltd/community-edition-arm
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: write
-
-jobs:
-  docker:
-    name: 🛠 Build Docker Images
-    runs-on: ubuntu-22.04
-    outputs:
-      release-tag: ${{ steps.get-latest-tag.outputs.tag }}
-      release-notes: ${{ steps.get-content.outputs.string }}
-    permissions:
-      checks: write
-      contents: write
-      packages: write
-      attestations: write
-      id-token: write
-      pull-requests: write
-      repository-projects: write
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/arm64
-    steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Get Release Tag
-        id: get-latest-tag
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
-        with:
-          fallback: 1.0.0
-
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ steps.get-latest-tag.outputs.tag }}
-          fetch-depth: 0
-
-      - name: Prepare Changelog
-        run: |
-          yes | cp -rf CHANGELOG.md priv/changelog/CHANGELOG.md
-          sed -i '1i%{title: "Change Log"}\n\n---\n' priv/changelog/CHANGELOG.md
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.WANDERER_DOCKER_USER }}
-          password: ${{ secrets.WANDERER_DOCKER_PASSWORD }}
-
-      - name: Build and push
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          context: .
-          file: ./Dockerfile
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: ${{ matrix.platform }}
-          outputs: type=image,"name=${{ env.REGISTRY_IMAGE }}",push-by-digest=true,name-canonical=true,push=true
-          build-args: |
-            MIX_ENV=prod
-            BUILD_METADATA=${{ steps.meta.outputs.json }}
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-      - uses: markpatterson27/markdown-to-output@v1
-        id: extract-changelog
-        with:
-          filepath: CHANGELOG.md
-
-      - name: Get content
-        uses: 2428392/gh-truncate-string-action@v1.3.0
-        id: get-content
-        with:
-          stringToTruncate: |
-            📣 Wanderer **ARM**  release available 🎉
-
-            **Version**: :${{ steps.get-latest-tag.outputs.tag }}
-
-            ${{ steps.extract-changelog.outputs.body }}
-          maxLength: 500
-          truncationSymbol: "…"
-
-  merge:
-    runs-on: ubuntu-latest
-    needs:
-      - docker
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.WANDERER_DOCKER_USER }}
-          password: ${{ secrets.WANDERER_DOCKER_PASSWORD }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.REGISTRY_IMAGE }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{version}},value=${{ needs.docker.outputs.release-tag }}
-
-      - name: Create manifest list and push
-        working-directory: /tmp/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
-
-      - name: Inspect image
-        run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
-
-  notify:
-    name: 🏷 Notify about release
-    runs-on: ubuntu-22.04
-    needs: [docker, merge]
-    steps:
-      - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@v5.3.0
-        with:
-          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          content: ${{ needs.docker.outputs.release-notes }}

CHANGELOG.md

@@ -2,6 +2,361 @@
 
 <!-- changelog -->
 
+## [v1.85.5](https://github.com/wanderer-industries/wanderer/compare/v1.85.4...v1.85.5) (2025-11-24)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed connections cleanup and rally points delete issues
+
+## [v1.85.4](https://github.com/wanderer-industries/wanderer/compare/v1.85.3...v1.85.4) (2025-11-22)
+
+
+
+
+### Bug Fixes:
+
+* core: invalidate map characters every 1 hour for any missing/revoked permissions
+
+## [v1.85.3](https://github.com/wanderer-industries/wanderer/compare/v1.85.2...v1.85.3) (2025-11-22)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed connection time status issues. fixed character alliance update issues
+
+## [v1.85.2](https://github.com/wanderer-industries/wanderer/compare/v1.85.1...v1.85.2) (2025-11-20)
+
+
+
+
+### Bug Fixes:
+
+* core: increased API pool limits
+
+## [v1.85.1](https://github.com/wanderer-industries/wanderer/compare/v1.85.0...v1.85.1) (2025-11-20)
+
+
+
+
+### Bug Fixes:
+
+* core: increased API pool limits
+
+## [v1.85.0](https://github.com/wanderer-industries/wanderer/compare/v1.84.37...v1.85.0) (2025-11-19)
+
+
+
+
+### Features:
+
+* core: added support for new ship types
+
+## [v1.84.37](https://github.com/wanderer-industries/wanderer/compare/v1.84.36...v1.84.37) (2025-11-19)
+
+
+
+
+### Bug Fixes:
+
+* auth: fixed character auth issues
+
+## [v1.84.36](https://github.com/wanderer-industries/wanderer/compare/v1.84.35...v1.84.36) (2025-11-19)
+
+
+
+
+### Bug Fixes:
+
+* fixed duplicated map slugs
+
+## [v1.84.35](https://github.com/wanderer-industries/wanderer/compare/v1.84.34...v1.84.35) (2025-11-19)
+
+
+
+
+### Bug Fixes:
+
+* structure search / paste issues
+
+## [v1.84.34](https://github.com/wanderer-industries/wanderer/compare/v1.84.33...v1.84.34) (2025-11-18)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed character tracking issues
+
+## [v1.84.33](https://github.com/wanderer-industries/wanderer/compare/v1.84.32...v1.84.33) (2025-11-18)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed character tracking issues
+
+## [v1.84.32](https://github.com/wanderer-industries/wanderer/compare/v1.84.31...v1.84.32) (2025-11-18)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed character tracking issues
+
+## [v1.84.31](https://github.com/wanderer-industries/wanderer/compare/v1.84.30...v1.84.31) (2025-11-17)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed connactions validation logic
+
+## [v1.84.30](https://github.com/wanderer-industries/wanderer/compare/v1.84.29...v1.84.30) (2025-11-17)
+
+
+
+
+## [v1.84.29](https://github.com/wanderer-industries/wanderer/compare/v1.84.28...v1.84.29) (2025-11-17)
+
+
+
+
+## [v1.84.28](https://github.com/wanderer-industries/wanderer/compare/v1.84.27...v1.84.28) (2025-11-17)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed ACL updates
+
+## [v1.84.27](https://github.com/wanderer-industries/wanderer/compare/v1.84.26...v1.84.27) (2025-11-17)
+
+
+
+
+### Bug Fixes:
+
+* core: supported characters_updates for external events
+
+* core: improved character tracking
+
+* core: improved character tracking
+
+* core: improved character location tracking
+
+## [v1.84.26](https://github.com/wanderer-industries/wanderer/compare/v1.84.25...v1.84.26) (2025-11-16)
+
+
+
+
+### Bug Fixes:
+
+* core: disable character tracker pausing
+
+## [v1.84.25](https://github.com/wanderer-industries/wanderer/compare/v1.84.24...v1.84.25) (2025-11-16)
+
+
+
+
+### Bug Fixes:
+
+* core: used upsert for adding map systems
+
+## [v1.84.24](https://github.com/wanderer-industries/wanderer/compare/v1.84.23...v1.84.24) (2025-11-15)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fixed problem related with error if settings was removed and mapper crashed. Fixed settings reset.
+
+## [v1.84.23](https://github.com/wanderer-industries/wanderer/compare/v1.84.22...v1.84.23) (2025-11-15)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed map pings cancel errors
+
+## [v1.84.22](https://github.com/wanderer-industries/wanderer/compare/v1.84.21...v1.84.22) (2025-11-15)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed map initialization
+
+## [v1.84.21](https://github.com/wanderer-industries/wanderer/compare/v1.84.20...v1.84.21) (2025-11-15)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed map characters adding
+
+## [v1.84.20](https://github.com/wanderer-industries/wanderer/compare/v1.84.19...v1.84.20) (2025-11-15)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed map start issues
+
+## [v1.84.19](https://github.com/wanderer-industries/wanderer/compare/v1.84.18...v1.84.19) (2025-11-14)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed map start issues
+
+## [v1.84.18](https://github.com/wanderer-industries/wanderer/compare/v1.84.17...v1.84.18) (2025-11-14)
+
+
+
+
+### Bug Fixes:
+
+* core: added gracefull map poll recovery from saved state. added map slug unique checks
+
+## [v1.84.17](https://github.com/wanderer-industries/wanderer/compare/v1.84.16...v1.84.17) (2025-11-14)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed activity tracking issues
+
+## [v1.84.16](https://github.com/wanderer-industries/wanderer/compare/v1.84.15...v1.84.16) (2025-11-13)
+
+
+
+
+### Bug Fixes:
+
+* core: removed maps auto-start logic
+
+## [v1.84.15](https://github.com/wanderer-industries/wanderer/compare/v1.84.14...v1.84.15) (2025-11-13)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed maps start/stop logic, added server downtime period support
+
+## [v1.84.14](https://github.com/wanderer-industries/wanderer/compare/v1.84.13...v1.84.14) (2025-11-13)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fixed problem related with error if settings was removed and mapper crashed. Fixed settings reset.
+
+## [v1.84.13](https://github.com/wanderer-industries/wanderer/compare/v1.84.12...v1.84.13) (2025-11-13)
+
+
+
+
+## [v1.84.12](https://github.com/wanderer-industries/wanderer/compare/v1.84.11...v1.84.12) (2025-11-13)
+
+
+
+
+## [v1.84.11](https://github.com/wanderer-industries/wanderer/compare/v1.84.10...v1.84.11) (2025-11-12)
+
+
+
+
+### Bug Fixes:
+
+* api and doc updates
+
+## [v1.84.10](https://github.com/wanderer-industries/wanderer/compare/v1.84.9...v1.84.10) (2025-11-12)
+
+
+
+
+### Bug Fixes:
+
+* core: Fixed adding system on character dock
+
+## [v1.84.9](https://github.com/wanderer-industries/wanderer/compare/v1.84.8...v1.84.9) (2025-11-12)
+
+
+
+
+## [v1.84.8](https://github.com/wanderer-industries/wanderer/compare/v1.84.7...v1.84.8) (2025-11-12)
+
+
+
+
+### Bug Fixes:
+
+* core: added cleanup jobs for old system signatures & chain passages
+
+## [v1.84.7](https://github.com/wanderer-industries/wanderer/compare/v1.84.6...v1.84.7) (2025-11-12)
+
+
+
+
+### Bug Fixes:
+
+* api and structure search fixes
+
+## [v1.84.6](https://github.com/wanderer-industries/wanderer/compare/v1.84.5...v1.84.6) (2025-11-12)
+
+
+
+
+### Bug Fixes:
+
+* core: Added map slug uniqness checking while using API
+
+## [v1.84.5](https://github.com/wanderer-industries/wanderer/compare/v1.84.4...v1.84.5) (2025-11-11)
+
+
+
+
+### Bug Fixes:
+
+* core: Added tracking for map & character event handling errors
+
+## [v1.84.4](https://github.com/wanderer-industries/wanderer/compare/v1.84.3...v1.84.4) (2025-11-11)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed issue with updating system signatures
+
+## [v1.84.3](https://github.com/wanderer-industries/wanderer/compare/v1.84.2...v1.84.3) (2025-11-11)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed linked signature time status update
+
 ## [v1.84.2](https://github.com/wanderer-industries/wanderer/compare/v1.84.1...v1.84.2) (2025-11-10)
 
 

Makefile

@@ -30,10 +30,10 @@ format f:
 	mix format
 
 test t:
-	mix test
+	MIX_ENV=test mix test
 
 coverage cover co:
-	mix test --cover
+	MIX_ENV=test mix test --cover
 
 unit-tests ut:
 	@echo "Running unit tests..."
@@ -45,4 +45,3 @@ versions v:
 	@cat .tool-versions
 	@cat Aptfile
 	@echo
-

assets/css/app.css

@@ -73,7 +73,9 @@ body > div:first-of-type {
 }
 
 .maps_bg {
-  background-image: url('../images/maps_bg.webp');
+  /* OLD image */
+  /* background-image: url('../images/maps_bg.webp'); */
+  background-image: url('https://wanderer-industries.github.io/wanderer-assets/images/eve-screen-catalyst-expansion-bg.jpg');
   background-size: cover;
   background-position: center;
   width: 100%;

assets/js/hooks/Mapper/components/characters/Characters.tsx

@@ -51,20 +51,8 @@ export const Characters = ({ data }: CharactersProps) => {
             ['border-lime-600/70']: character.online,
           },
         )}
-        title={character.tracking_paused ? `${character.name} - Tracking Paused (click to resume)` : character.name}
+        title={character.name}
       >
-        {character.tracking_paused && (
-          <>
-            <span
-              className={clsx(
-                'absolute flex flex-col  p-[2px]  top-[0px] left-[0px] w-[35px] h-[35px]',
-                'text-yellow-500 text-[9px] z-10 bg-gray-800/40',
-                'pi',
-                PrimeIcons.PAUSE,
-              )}
-            />
-          </>
-        )}
         {mainCharacterEveId === character.eve_id && (
           <span
             className={clsx(

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeDefault.module.scss

@@ -1,6 +1,6 @@
 @use "sass:color";
 @use '@/hooks/Mapper/components/map/styles/eve-common-variables';
-@import '@/hooks/Mapper/components/map/styles/solar-system-node';
+@use '@/hooks/Mapper/components/map/styles/solar-system-node' as v;
 
 @keyframes move-stripes {
   from {
@@ -26,8 +26,8 @@
   background-color: var(--rf-node-bg-color, #202020) !important;
   color: var(--rf-text-color, #ffffff);
 
-  box-shadow: 0 0 5px rgba($dark-bg, 0.5);
-  border: 1px solid color.adjust($pastel-blue, $lightness: -10%);
+  box-shadow: 0 0 5px rgba(v.$dark-bg, 0.5);
+  border: 1px solid color.adjust(v.$pastel-blue, $lightness: -10%);
   border-radius: 5px;
   position: relative;
   z-index: 3;
@@ -99,7 +99,7 @@
   }
 
   &.selected {
-    border-color: $pastel-pink;
+    border-color: v.$pastel-pink;
     box-shadow: 0 0 10px #9a1af1c2;
   }
 
@@ -113,11 +113,11 @@
       bottom: 0;
       z-index: -1;
 
-      border-color: $neon-color-1;
+      border-color: v.$neon-color-1;
       background: repeating-linear-gradient(
           45deg,
-          $neon-color-3 0px,
-          $neon-color-3 8px,
+          v.$neon-color-3 0px,
+          v.$neon-color-3 8px,
           transparent 8px,
           transparent 21px
       );
@@ -146,7 +146,7 @@
     border: 1px solid var(--eve-solar-system-status-color-lookingFor-dark15);
     background-image: linear-gradient(275deg, #45ff8f2f, #457fff2f);
     &.selected {
-      border-color: $pastel-pink;
+      border-color: v.$pastel-pink;
     }
   }
 
@@ -347,13 +347,13 @@
 .Handle {
   min-width: initial;
   min-height: initial;
-  border: 1px solid $pastel-blue;
+  border: 1px solid v.$pastel-blue;
   width: 5px;
   height: 5px;
   pointer-events: auto;
 
   &.selected {
-    border-color: $pastel-pink;
+    border-color: v.$pastel-pink;
   }
 
   &.HandleTop {

assets/js/hooks/Mapper/components/map/hooks/api/useCommandsCharacters.ts

@@ -14,8 +14,27 @@ export const useCommandsCharacters = () => {
   const ref = useRef({ update });
   ref.current = { update };
 
-  const charactersUpdated = useCallback((characters: CommandCharactersUpdated) => {
-    ref.current.update(() => ({ characters: characters.slice() }));
+  const charactersUpdated = useCallback((updatedCharacters: CommandCharactersUpdated) => {
+    ref.current.update(state => {
+      const existing = state.characters ?? [];
+      // Put updatedCharacters into a map keyed by ID
+      const updatedMap = new Map(updatedCharacters.map(c => [c.eve_id, c]));
+
+      // 1. Update existing characters when possible
+      const merged = existing.map(character => {
+        const updated = updatedMap.get(character.eve_id);
+        if (updated) {
+          updatedMap.delete(character.eve_id); // Mark as processed
+          return { ...character, ...updated };
+        }
+        return character;
+      });
+
+      // 2. Any remaining items in updatedMap are NEW characters → add them
+      const newCharacters = Array.from(updatedMap.values());
+
+      return { characters: [...merged, ...newCharacters] };
+    });
   }, []);
 
   const characterAdded = useCallback((value: CommandCharacterAdded) => {

assets/js/hooks/Mapper/components/mapInterface/MapInterface.tsx

@@ -4,10 +4,13 @@ import { DEFAULT_WIDGETS } from '@/hooks/Mapper/components/mapInterface/constant
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 
 export const MapInterface = () => {
-  // const [items, setItems] = useState<WindowProps[]>(restoreWindowsFromLS);
   const { windowsSettings, updateWidgetSettings } = useMapRootState();
 
   const items = useMemo(() => {
+    if (Object.keys(windowsSettings).length === 0) {
+      return [];
+    }
+
     return windowsSettings.windows
       .map(x => {
         const content = DEFAULT_WIDGETS.find(y => y.id === x.id)?.content;

assets/js/hooks/Mapper/components/mapInterface/components/Comments/Comments.tsx

@@ -1,7 +1,7 @@
 import { MarkdownComment } from '@/hooks/Mapper/components/mapInterface/components/Comments/components';
-import { useEffect, useRef, useState } from 'react';
-import { CommentType } from '@/hooks/Mapper/types';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { CommentType } from '@/hooks/Mapper/types';
+import { useEffect, useMemo, useRef, useState } from 'react';
 
 export interface CommentsProps {}
 
@@ -14,7 +14,9 @@ export const Comments = ({}: CommentsProps) => {
     comments: { loadComments, comments, lastUpdateKey },
   } = useMapRootState();
 
-  const [systemId] = selectedSystems;
+  const systemId = useMemo(() => {
+    return +selectedSystems[0];
+  }, [selectedSystems]);
 
   const ref = useRef({ loadComments, systemId });
   ref.current = { loadComments, systemId };

assets/js/hooks/Mapper/components/mapInterface/components/CommentsEditor/CommentsEditor.tsx

@@ -1,11 +1,11 @@
+import { MarkdownEditor } from '@/hooks/Mapper/components/mapInterface/components/MarkdownEditor';
 import { TooltipPosition, WdImageSize, WdImgButton } from '@/hooks/Mapper/components/ui-kit';
+import { useHotkey } from '@/hooks/Mapper/hooks';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { OutCommand } from '@/hooks/Mapper/types';
 import clsx from 'clsx';
 import { PrimeIcons } from 'primereact/api';
-import { MarkdownEditor } from '@/hooks/Mapper/components/mapInterface/components/MarkdownEditor';
-import { useHotkey } from '@/hooks/Mapper/hooks';
-import { useCallback, useRef, useState } from 'react';
-import { OutCommand } from '@/hooks/Mapper/types';
-import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { useCallback, useMemo, useRef, useState } from 'react';
 
 export interface CommentsEditorProps {}
 
@@ -18,7 +18,9 @@ export const CommentsEditor = ({}: CommentsEditorProps) => {
     outCommand,
   } = useMapRootState();
 
-  const [systemId] = selectedSystems;
+  const systemId = useMemo(() => {
+    return +selectedSystems[0];
+  }, [selectedSystems]);
 
   const ref = useRef({ outCommand, systemId, textVal });
   ref.current = { outCommand, systemId, textVal };

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemStructures/SystemStructures.tsx

@@ -30,10 +30,14 @@ export const SystemStructures: React.FC = () => {
 
   const processClipboard = useCallback(
     (text: string) => {
+      if (!systemId) {
+        console.warn('Cannot update structures: no system selected');
+        return;
+      }
       const updated = processSnippetText(text, structures);
       handleUpdateStructures(updated);
     },
-    [structures, handleUpdateStructures],
+    [systemId, structures, handleUpdateStructures],
   );
 
   const handlePaste = useCallback(

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemStructures/SystemStructuresDialog/SystemStructuresDialog.tsx

@@ -30,9 +30,6 @@ export const SystemStructuresDialog: React.FC<StructuresEditDialogProps> = ({
 
   const { outCommand } = useMapRootState();
 
-  const [prevQuery, setPrevQuery] = useState('');
-  const [prevResults, setPrevResults] = useState<{ label: string; value: string }[]>([]);
-
   useEffect(() => {
     if (structure) {
       setEditData(structure);
@@ -46,34 +43,24 @@ export const SystemStructuresDialog: React.FC<StructuresEditDialogProps> = ({
   // Searching corporation owners via auto-complete
   const searchOwners = useCallback(
     async (e: { query: string }) => {
-      const newQuery = e.query.trim();
-      if (!newQuery) {
+      const query = e.query.trim();
+      if (!query) {
         setOwnerSuggestions([]);
         return;
       }
 
-      // If user typed more text but we have partial match in prevResults
-      if (newQuery.startsWith(prevQuery) && prevResults.length > 0) {
-        const filtered = prevResults.filter(item => item.label.toLowerCase().includes(newQuery.toLowerCase()));
-        setOwnerSuggestions(filtered);
-        return;
-      }
-
       try {
-        // TODO fix it
         const { results = [] } = await outCommand({
           type: OutCommand.getCorporationNames,
-          data: { search: newQuery },
+          data: { search: query },
         });
         setOwnerSuggestions(results);
-        setPrevQuery(newQuery);
-        setPrevResults(results);
       } catch (err) {
         console.error('Failed to fetch owners:', err);
         setOwnerSuggestions([]);
       }
     },
-    [prevQuery, prevResults, outCommand],
+    [outCommand],
   );
 
   const handleChange = (field: keyof StructureItem, val: string | Date) => {
@@ -122,7 +109,6 @@ export const SystemStructuresDialog: React.FC<StructuresEditDialogProps> = ({
     // fetch corporation ticker if we have an ownerId
     if (editData.ownerId) {
       try {
-        // TODO fix it
         const { ticker } = await outCommand({
           type: OutCommand.getCorporationTicker,
           data: { corp_id: editData.ownerId },

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemStructures/hooks/useSystemStructures.ts

@@ -56,6 +56,11 @@ export function useSystemStructures({ systemId, outCommand }: UseSystemStructure
 
   const handleUpdateStructures = useCallback(
     async (newList: StructureItem[]) => {
+      if (!systemId) {
+        console.warn('Cannot update structures: systemId is undefined');
+        return;
+      }
+
       const { added, updated, removed } = getActualStructures(structures, newList);
 
       const sanitizedAdded = added.map(sanitizeIds);

assets/js/hooks/Mapper/components/mapRootContent/components/MapSettings/components/CommonSettings.tsx

@@ -10,9 +10,14 @@ import { useCallback } from 'react';
 import { TooltipPosition, WdButton, WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit';
 import { ConfirmPopup } from 'primereact/confirmpopup';
 import { useConfirmPopup } from '@/hooks/Mapper/hooks';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 
 export const CommonSettings = () => {
   const { renderSettingItem } = useMapSettings();
+  const {
+    storedSettings: { resetSettings },
+  } = useMapRootState();
+
   const { cfShow, cfHide, cfVisible, cfRef } = useConfirmPopup();
 
   const renderSettingsList = useCallback(
@@ -22,7 +27,7 @@ export const CommonSettings = () => {
     [renderSettingItem],
   );
 
-  const handleResetSettings = () => {};
+  const handleResetSettings = useCallback(() => resetSettings(), [resetSettings]);
 
   return (
     <div className="flex flex-col h-full gap-1">

assets/js/hooks/Mapper/components/mapRootContent/components/TopSearch/TopSearch.module.scss

@@ -1,6 +1,6 @@
 @use "sass:color";
 @use '@/hooks/Mapper/components/map/styles/eve-common-variables';
-@import '@/hooks/Mapper/components/map/styles/solar-system-node';
+@use '@/hooks/Mapper/components/map/styles/solar-system-node' as v;
 
 :root {
   --rf-has-user-characters: #ffc75d;
@@ -108,7 +108,7 @@
   }
 
   &.selected {
-    border-color: $pastel-pink;
+    border-color: v.$pastel-pink;
     box-shadow: 0 0 10px #9a1af1c2;
   }
 
@@ -122,11 +122,11 @@
       bottom: 0;
       z-index: -1;
 
-      border-color: $neon-color-1;
+      border-color: v.$neon-color-1;
       background: repeating-linear-gradient(
           45deg,
-          $neon-color-3 0px,
-          $neon-color-3 8px,
+          v.$neon-color-3 0px,
+          v.$neon-color-3 8px,
           transparent 8px,
           transparent 21px
       );
@@ -152,7 +152,7 @@
   &.eve-system-status-lookingFor {
     background-image: linear-gradient(275deg, #45ff8f2f, #457fff2f);
     &.selected {
-      border-color: $pastel-pink;
+      border-color: v.$pastel-pink;
     }
   }
 

assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx

@@ -6,9 +6,11 @@ import {
   MapUnionTypes,
   OutCommandHandler,
   SolarSystemConnection,
+  StringBoolean,
   TrackingCharacter,
   UseCharactersCacheData,
   UseCommentsData,
+  UserPermission,
 } from '@/hooks/Mapper/types';
 import { useCharactersCache, useComments, useMapRootHandlers } from '@/hooks/Mapper/mapRootProvider/hooks';
 import { WithChildren } from '@/hooks/Mapper/types/common.ts';
@@ -80,7 +82,16 @@ const INITIAL_DATA: MapRootData = {
   selectedSystems: [],
   selectedConnections: [],
   userPermissions: {},
-  options: {},
+  options: {
+    allowed_copy_for: UserPermission.VIEW_SYSTEM,
+    allowed_paste_for: UserPermission.VIEW_SYSTEM,
+    layout: '',
+    restrict_offline_showing: 'false',
+    show_linked_signature_id: 'false',
+    show_linked_signature_id_temp_name: 'false',
+    show_temp_system_name: 'false',
+    store_custom_labels: 'false',
+  },
   isSubscriptionActive: false,
   linkSignatureToSystem: null,
   mainCharacterEveId: null,
@@ -135,7 +146,7 @@ export interface MapRootContextProps {
     hasOldSettings: boolean;
     getSettingsForExport(): string | undefined;
     applySettings(settings: MapUserSettings): boolean;
-    resetSettings(settings: MapUserSettings): void;
+    resetSettings(): void;
     checkOldSettings(): void;
   };
 }

assets/js/hooks/Mapper/mapRootProvider/hooks/api/useCommandComments.ts

@@ -12,7 +12,7 @@ export const useCommandComments = () => {
   }, []);
 
   const removeComment = useCallback((data: CommandCommentRemoved) => {
-    ref.current.removeComment(data.solarSystemId.toString(), data.commentId);
+    ref.current.removeComment(data.solarSystemId, data.commentId);
   }, []);
 
   return { addComment, removeComment };

assets/js/hooks/Mapper/mapRootProvider/hooks/api/useCommandsCharacters.ts

@@ -1,5 +1,4 @@
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
-import { useCallback, useRef } from 'react';
 import {
   CommandCharacterAdded,
   CommandCharacterRemoved,
@@ -7,6 +6,7 @@ import {
   CommandCharacterUpdated,
   CommandPresentCharacters,
 } from '@/hooks/Mapper/types';
+import { useCallback, useRef } from 'react';
 
 export const useCommandsCharacters = () => {
   const { update } = useMapRootState();
@@ -14,8 +14,27 @@ export const useCommandsCharacters = () => {
   const ref = useRef({ update });
   ref.current = { update };
 
-  const charactersUpdated = useCallback((characters: CommandCharactersUpdated) => {
-    ref.current.update(() => ({ characters: characters.slice() }));
+  const charactersUpdated = useCallback((updatedCharacters: CommandCharactersUpdated) => {
+    ref.current.update(state => {
+      const existing = state.characters ?? [];
+      // Put updatedCharacters into a map keyed by ID
+      const updatedMap = new Map(updatedCharacters.map(c => [c.eve_id, c]));
+
+      // 1. Update existing characters when possible
+      const merged = existing.map(character => {
+        const updated = updatedMap.get(character.eve_id);
+        if (updated) {
+          updatedMap.delete(character.eve_id); // Mark as processed
+          return { ...character, ...updated };
+        }
+        return character;
+      });
+
+      // 2. Any remaining items in updatedMap are NEW characters → add them
+      const newCharacters = Array.from(updatedMap.values());
+
+      return { characters: [...merged, ...newCharacters] };
+    });
   }, []);
 
   const characterAdded = useCallback((value: CommandCharacterAdded) => {

assets/js/hooks/Mapper/mapRootProvider/hooks/useComments.ts

@@ -1,5 +1,5 @@
-import { useCallback, useRef, useState } from 'react';
 import { CommentSystem, CommentType, OutCommand, OutCommandHandler, UseCommentsData } from '@/hooks/Mapper/types';
+import { useCallback, useRef, useState } from 'react';
 
 interface UseCommentsProps {
   outCommand: OutCommandHandler;
@@ -8,12 +8,12 @@ interface UseCommentsProps {
 export const useComments = ({ outCommand }: UseCommentsProps): UseCommentsData => {
   const [lastUpdateKey, setLastUpdateKey] = useState(0);
 
-  const commentBySystemsRef = useRef<Map<string, CommentSystem>>(new Map());
+  const commentBySystemsRef = useRef<Map<number, CommentSystem>>(new Map());
 
   const ref = useRef({ outCommand });
   ref.current = { outCommand };
 
-  const loadComments = useCallback(async (systemId: string) => {
+  const loadComments = useCallback(async (systemId: number) => {
     let cSystem = commentBySystemsRef.current.get(systemId);
     if (cSystem?.loading || cSystem?.loaded) {
       return;
@@ -45,7 +45,7 @@ export const useComments = ({ outCommand }: UseCommentsProps): UseCommentsData =
     setLastUpdateKey(x => x + 1);
   }, []);
 
-  const addComment = useCallback((systemId: string, comment: CommentType) => {
+  const addComment = useCallback((systemId: number, comment: CommentType) => {
     const cSystem = commentBySystemsRef.current.get(systemId);
     if (cSystem) {
       cSystem.comments.push(comment);
@@ -61,8 +61,9 @@ export const useComments = ({ outCommand }: UseCommentsProps): UseCommentsData =
     setLastUpdateKey(x => x + 1);
   }, []);
 
-  const removeComment = useCallback((systemId: string, commentId: string) => {
+  const removeComment = useCallback((systemId: number, commentId: string) => {
     const cSystem = commentBySystemsRef.current.get(systemId);
+    console.log('cSystem', cSystem);
     if (!cSystem) {
       return;
     }

assets/js/hooks/Mapper/mapRootProvider/hooks/useMapUserSettings.ts

@@ -148,10 +148,6 @@ export const useMapUserSettings = ({ map_slug }: MapRootData, outCommand: OutCom
     setHasOldSettings(!!(widgetsOld || interfaceSettings || widgetRoutes || widgetLocal || widgetKills || onTheMapOld));
   }, []);
 
-  useEffect(() => {
-    checkOldSettings();
-  }, [checkOldSettings]);
-
   const getSettingsForExport = useCallback(() => {
     const { map_slug } = ref.current;
 
@@ -166,6 +162,24 @@ export const useMapUserSettings = ({ map_slug }: MapRootData, outCommand: OutCom
     applySettings(createDefaultStoredSettings());
   }, [applySettings]);
 
+  useEffect(() => {
+    checkOldSettings();
+  }, [checkOldSettings]);
+
+  // IN Case if in runtime someone clear settings
+  useEffect(() => {
+    if (Object.keys(windowsSettings).length !== 0) {
+      return;
+    }
+
+    if (!isReady) {
+      return;
+    }
+
+    resetSettings();
+    location.reload();
+  }, [isReady, resetSettings, windowsSettings]);
+
   return {
     isReady,
     hasOldSettings,

assets/js/hooks/Mapper/types/character.ts

@@ -33,7 +33,6 @@ export type CharacterTypeRaw = {
   corporation_id: number;
   corporation_name: string;
   corporation_ticker: string;
-  tracking_paused: boolean;
 };
 
 export interface TrackingCharacter {

assets/js/hooks/Mapper/types/comment.ts

@@ -13,9 +13,9 @@ export type CommentSystem = {
 };
 
 export interface UseCommentsData {
-  loadComments: (systemId: string) => Promise<void>;
-  addComment: (systemId: string, comment: CommentType) => void;
-  removeComment: (systemId: string, commentId: string) => void;
-  comments: Map<string, CommentSystem>;
+  loadComments: (systemId: number) => Promise<void>;
+  addComment: (systemId: number, comment: CommentType) => void;
+  removeComment: (systemId: number, commentId: string) => void;
+  comments: Map<number, CommentSystem>;
   lastUpdateKey: number;
 }

assets/js/hooks/Mapper/types/mapHandlers.ts

@@ -131,7 +131,7 @@ export type CommandLinkSignatureToSystem = {
 };
 export type CommandLinkSignaturesUpdated = number;
 export type CommandCommentAdd = {
-  solarSystemId: string;
+  solarSystemId: number;
   comment: CommentType;
 };
 export type CommandCommentRemoved = {

assets/lib/phoenix/index.js

@@ -12,11 +12,11 @@ const animateBg = function (bgCanvas) {
    */
   const randomInRange = (max, min) => Math.floor(Math.random() * (max - min + 1)) + min;
   const BASE_SIZE = 1;
-  const VELOCITY_INC = 1.01;
+  const VELOCITY_INC = 1.002;
   const VELOCITY_INIT_INC = 0.525;
   const JUMP_VELOCITY_INC = 0.55;
   const JUMP_SIZE_INC = 1.15;
-  const SIZE_INC = 1.01;
+  const SIZE_INC = 1.002;
   const RAD = Math.PI / 180;
   const WARP_COLORS = [
     [197, 239, 247],

config/config.exs

@@ -27,11 +27,7 @@ config :wanderer_app,
   generators: [timestamp_type: :utc_datetime],
   ddrt: WandererApp.Map.CacheRTree,
   logger: Logger,
-  pubsub_client: Phoenix.PubSub,
-  wanderer_kills_base_url:
-    System.get_env("WANDERER_KILLS_BASE_URL", "ws://host.docker.internal:4004"),
-  wanderer_kills_service_enabled:
-    System.get_env("WANDERER_KILLS_SERVICE_ENABLED", "false") == "true"
+  pubsub_client: Phoenix.PubSub
 
 config :wanderer_app, WandererAppWeb.Endpoint,
   adapter: Bandit.PhoenixAdapter,

config/dev.exs

@@ -4,7 +4,7 @@ import Config
 config :wanderer_app, WandererApp.Repo,
   username: "postgres",
   password: "postgres",
-  hostname: System.get_env("DB_HOST", "localhost"),
+  hostname: "localhost",
   database: "wanderer_dev",
   stacktrace: true,
   show_sensitive_data_on_connection_error: true,

config/runtime.exs

@@ -177,7 +177,34 @@ config :wanderer_app,
     ],
     extra_characters_50: map_subscription_extra_characters_50_price,
     extra_hubs_10: map_subscription_extra_hubs_10_price
-  }
+  },
+  # Finch pool configuration - separate pools for different services
+  # ESI Character Tracking pool - high capacity for bulk character operations
+  # With 30+ TrackerPools × ~100 concurrent tasks, need large pool
+  finch_esi_character_pool_size:
+    System.get_env("WANDERER_FINCH_ESI_CHARACTER_POOL_SIZE", "200") |> String.to_integer(),
+  finch_esi_character_pool_count:
+    System.get_env("WANDERER_FINCH_ESI_CHARACTER_POOL_COUNT", "4") |> String.to_integer(),
+  # ESI General pool - standard capacity for general ESI operations
+  finch_esi_general_pool_size:
+    System.get_env("WANDERER_FINCH_ESI_GENERAL_POOL_SIZE", "50") |> String.to_integer(),
+  finch_esi_general_pool_count:
+    System.get_env("WANDERER_FINCH_ESI_GENERAL_POOL_COUNT", "4") |> String.to_integer(),
+  # Webhooks pool - isolated from ESI rate limits
+  finch_webhooks_pool_size:
+    System.get_env("WANDERER_FINCH_WEBHOOKS_POOL_SIZE", "25") |> String.to_integer(),
+  finch_webhooks_pool_count:
+    System.get_env("WANDERER_FINCH_WEBHOOKS_POOL_COUNT", "2") |> String.to_integer(),
+  # Default pool - everything else (email, license manager, etc.)
+  finch_default_pool_size:
+    System.get_env("WANDERER_FINCH_DEFAULT_POOL_SIZE", "25") |> String.to_integer(),
+  finch_default_pool_count:
+    System.get_env("WANDERER_FINCH_DEFAULT_POOL_COUNT", "2") |> String.to_integer(),
+  # Character tracker concurrency settings
+  # Location updates need high concurrency for <2s response with 3000+ characters
+  location_concurrency:
+    System.get_env("WANDERER_LOCATION_CONCURRENCY", "#{System.schedulers_online() * 12}")
+    |> String.to_integer()
 
 config :ueberauth, Ueberauth,
   providers: [
@@ -258,7 +285,9 @@ config :wanderer_app, WandererApp.Scheduler,
   timezone: :utc,
   jobs:
     [
-      {"@daily", {WandererApp.Map.Audit, :archive, []}}
+      {"@daily", {WandererApp.Map.Audit, :archive, []}},
+      {"@daily", {WandererApp.Map.GarbageCollector, :cleanup_chain_passages, []}},
+      {"@daily", {WandererApp.Map.GarbageCollector, :cleanup_system_signatures, []}}
     ] ++ sheduler_jobs,
   timeout: :infinity
 
@@ -403,7 +432,7 @@ config :wanderer_app, :license_manager,
 config :wanderer_app, :sse,
   enabled:
     config_dir
-    |> get_var_from_path_or_env("WANDERER_SSE_ENABLED", "true")
+    |> get_var_from_path_or_env("WANDERER_SSE_ENABLED", "false")
     |> String.to_existing_atom(),
   max_connections_total:
     config_dir |> get_int_from_path_or_env("WANDERER_SSE_MAX_CONNECTIONS", 1000),
@@ -418,6 +447,6 @@ config :wanderer_app, :sse,
 config :wanderer_app, :external_events,
   webhooks_enabled:
     config_dir
-    |> get_var_from_path_or_env("WANDERER_WEBHOOKS_ENABLED", "true")
+    |> get_var_from_path_or_env("WANDERER_WEBHOOKS_ENABLED", "false")
     |> String.to_existing_atom(),
   webhook_timeout_ms: config_dir |> get_int_from_path_or_env("WANDERER_WEBHOOK_TIMEOUT_MS", 15000)

config/test.exs

@@ -24,7 +24,11 @@ config :wanderer_app,
   pubsub_client: Test.PubSubMock,
   cached_info: WandererApp.CachedInfo.Mock,
   character_api_disabled: false,
-  environment: :test
+  environment: :test,
+  map_subscriptions_enabled: false,
+  wanderer_kills_service_enabled: false,
+  sse: [enabled: false],
+  external_events: [webhooks_enabled: false]
 
 # We don't run a server during test. If one is required,
 # you can enable the server option below.

lib/wanderer_app/api/access_list.ex

@@ -60,19 +60,17 @@ defmodule WandererApp.Api.AccessList do
       # Added :api_key to the accepted attributes
       accept [:name, :description, :owner_id, :api_key]
       primary?(true)
-
-      argument :owner_id, :uuid, allow_nil?: false
-
-      change manage_relationship(:owner_id, :owner, on_lookup: :relate, on_no_match: nil)
     end
 
     update :update do
       accept [:name, :description, :owner_id, :api_key]
       primary?(true)
+      require_atomic? false
     end
 
     update :assign_owner do
       accept [:owner_id]
+      require_atomic? false
     end
   end
 

lib/wanderer_app/api/access_list_member.ex

@@ -53,7 +53,11 @@ defmodule WandererApp.Api.AccessListMember do
       :role
     ]
 
-    defaults [:create, :read, :update, :destroy]
+    defaults [:create, :read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     read :read_by_access_list do
       argument(:access_list_id, :string, allow_nil?: false)
@@ -67,12 +71,14 @@ defmodule WandererApp.Api.AccessListMember do
 
     update :block do
       accept([])
+      require_atomic? false
 
       change(set_attribute(:blocked, true))
     end
 
     update :unblock do
       accept([])
+      require_atomic? false
 
       change(set_attribute(:blocked, false))
     end

lib/wanderer_app/api/actor_helpers.ex

@@ -0,0 +1,80 @@
+defmodule WandererApp.Api.ActorHelpers do
+  @moduledoc """
+  Utilities for extracting actor information from Ash contexts.
+
+  Provides helper functions for working with ActorWithMap and extracting
+  user, map, and character information from various context formats.
+  """
+
+  alias WandererApp.Api.ActorWithMap
+
+  @doc """
+  Extract map from actor or context.
+
+  Handles various context formats:
+  - Direct ActorWithMap struct
+  - Context map with :actor key
+  - Context map with :map key
+  - Ash.Resource.Change.Context struct
+  """
+  def get_map(%{actor: %ActorWithMap{map: %{} = map}}), do: map
+  def get_map(%{map: %{} = map}), do: map
+
+  # Handle Ash.Resource.Change.Context struct
+  def get_map(%Ash.Resource.Change.Context{actor: %ActorWithMap{map: %{} = map}}), do: map
+  def get_map(%Ash.Resource.Change.Context{actor: _}), do: nil
+
+  def get_map(context) when is_map(context) do
+    # For plain maps, check private.actor
+    with private when is_map(private) <- Map.get(context, :private),
+         %ActorWithMap{map: %{} = map} <- Map.get(private, :actor) do
+      map
+    else
+      _ -> nil
+    end
+  end
+
+  def get_map(_), do: nil
+
+  @doc """
+  Extract user from actor.
+
+  Handles:
+  - ActorWithMap struct
+  - Direct user struct with :id field
+  """
+  def get_user(%ActorWithMap{user: user}), do: user
+  def get_user(%{id: _} = user), do: user
+  def get_user(_), do: nil
+
+  @doc """
+  Get character IDs for the actor.
+
+  Used for ACL filtering to determine which resources the user can access.
+  Returns {:ok, list} or {:ok, []} if no characters found.
+  """
+  def get_character_ids(%ActorWithMap{user: user}), do: get_character_ids(user)
+
+  def get_character_ids(%{characters: characters}) when is_list(characters) do
+    {:ok, Enum.map(characters, & &1.id)}
+  end
+
+  def get_character_ids(%{characters: %Ecto.Association.NotLoaded{}, id: user_id}) do
+    # Load characters from database
+    load_characters_by_id(user_id)
+  end
+
+  def get_character_ids(%{id: user_id}) do
+    # Fallback: load user with characters
+    load_characters_by_id(user_id)
+  end
+
+  def get_character_ids(_), do: {:ok, []}
+
+  defp load_characters_by_id(user_id) do
+    case WandererApp.Api.User.by_id(user_id, load: [:characters]) do
+      {:ok, user} -> {:ok, Enum.map(user.characters, & &1.id)}
+      _ -> {:ok, []}
+    end
+  end
+end

lib/wanderer_app/api/actor_with_map.ex

@@ -0,0 +1,15 @@
+defmodule WandererApp.Api.ActorWithMap do
+  @moduledoc """
+  Wraps a user and map together as an actor for token-based authentication.
+
+  When API requests use Bearer token auth, the token identifies both the user
+  (map owner) and the map. This struct allows passing both through Ash's actor system.
+  """
+
+  @enforce_keys [:user, :map]
+  defstruct [:user, :map]
+
+  def new(user, map) do
+    %__MODULE__{user: user, map: map}
+  end
+end

lib/wanderer_app/api/changes/inject_map_from_actor.ex

@@ -0,0 +1,39 @@
+defmodule WandererApp.Api.Changes.InjectMapFromActor do
+  @moduledoc """
+  Ash change that injects map_id from the authenticated actor.
+
+  For token-based auth, the map is determined by the API token.
+  This change automatically sets map_id, so clients don't need to provide it.
+  """
+
+  use Ash.Resource.Change
+
+  alias WandererApp.Api.ActorHelpers
+
+  @impl true
+  def change(changeset, _opts, context) do
+    case ActorHelpers.get_map(context) do
+      %{id: map_id} ->
+        Ash.Changeset.force_change_attribute(changeset, :map_id, map_id)
+
+      _other ->
+        # nil or unexpected return shape - check for direct map_id
+        # Check params (input), arguments, and attributes (in that order)
+        map_id = Map.get(changeset.params, :map_id) ||
+                 Ash.Changeset.get_argument(changeset, :map_id) ||
+                 Ash.Changeset.get_attribute(changeset, :map_id)
+
+        case map_id do
+          nil ->
+            Ash.Changeset.add_error(changeset,
+              field: :map_id,
+              message: "map_id is required (provide via token or attribute)"
+            )
+
+          _map_id ->
+            # map_id provided directly (internal calls, tests)
+            changeset
+        end
+    end
+  end
+end

lib/wanderer_app/api/changes/slugify_name.ex

@@ -1,7 +1,25 @@
 defmodule WandererApp.Api.Changes.SlugifyName do
+  @moduledoc """
+  Ensures map slugs are unique by:
+  1. Slugifying the provided slug/name
+  2. Checking for existing slugs (optimization)
+  3. Finding next available slug with numeric suffix if needed
+  4. Relying on database unique constraint as final arbiter
+
+  Race Condition Mitigation:
+  - Optimistic check reduces DB roundtrips for most cases
+  - Database unique index ensures no duplicates slip through
+  - Proper error messages for constraint violations
+  - Telemetry events for monitoring conflicts
+  """
   use Ash.Resource.Change
 
   alias Ash.Changeset
+  require Ash.Query
+  require Logger
+
+  # Maximum number of attempts to find a unique slug
+  @max_attempts 100
 
   @impl true
   @spec change(Changeset.t(), keyword, Change.context()) :: Changeset.t()
@@ -12,10 +30,95 @@ defmodule WandererApp.Api.Changes.SlugifyName do
   defp maybe_slugify_name(changeset) do
     case Changeset.get_attribute(changeset, :slug) do
       slug when is_binary(slug) ->
-        Changeset.force_change_attribute(changeset, :slug, Slug.slugify(slug))
+        base_slug = Slug.slugify(slug)
+        unique_slug = ensure_unique_slug(changeset, base_slug)
+        Changeset.force_change_attribute(changeset, :slug, unique_slug)
 
       _ ->
         changeset
     end
   end
+
+  defp ensure_unique_slug(changeset, base_slug) do
+    # Get the current record ID if this is an update operation
+    current_id = Changeset.get_attribute(changeset, :id)
+
+    # Check if the base slug is available (optimization to avoid numeric suffixes when possible)
+    if slug_available?(base_slug, current_id) do
+      base_slug
+    else
+      # Find the next available slug with a numeric suffix
+      find_available_slug(base_slug, current_id, 2)
+    end
+  end
+
+  defp find_available_slug(base_slug, current_id, n) when n <= @max_attempts do
+    candidate_slug = "#{base_slug}-#{n}"
+
+    if slug_available?(candidate_slug, current_id) do
+      # Emit telemetry when we had to use a suffix (indicates potential conflict)
+      :telemetry.execute(
+        [:wanderer_app, :map, :slug_suffix_used],
+        %{suffix_number: n},
+        %{base_slug: base_slug, final_slug: candidate_slug}
+      )
+
+      candidate_slug
+    else
+      find_available_slug(base_slug, current_id, n + 1)
+    end
+  end
+
+  defp find_available_slug(base_slug, _current_id, n) when n > @max_attempts do
+    # Fallback: use timestamp suffix if we've tried too many numeric suffixes
+    # This handles edge cases where many maps have similar names
+    timestamp = System.system_time(:millisecond)
+    fallback_slug = "#{base_slug}-#{timestamp}"
+
+    Logger.warning(
+      "Slug generation exceeded #{@max_attempts} attempts for '#{base_slug}', using timestamp fallback",
+      base_slug: base_slug,
+      fallback_slug: fallback_slug
+    )
+
+    :telemetry.execute(
+      [:wanderer_app, :map, :slug_fallback_used],
+      %{attempts: n},
+      %{base_slug: base_slug, fallback_slug: fallback_slug}
+    )
+
+    fallback_slug
+  end
+
+  defp slug_available?(slug, current_id) do
+    query =
+      WandererApp.Api.Map
+      |> Ash.Query.filter(slug == ^slug)
+      |> then(fn query ->
+        # Exclude the current record if this is an update
+        if current_id do
+          Ash.Query.filter(query, id != ^current_id)
+        else
+          query
+        end
+      end)
+      |> Ash.Query.limit(1)
+
+    case Ash.read(query) do
+      {:ok, []} ->
+        true
+
+      {:ok, _existing} ->
+        false
+
+      {:error, error} ->
+        # Log error but be conservative - assume slug is not available
+        Logger.warning("Error checking slug availability",
+          slug: slug,
+          error: inspect(error)
+        )
+
+        false
+    end
+  end
 end

lib/wanderer_app/api/character.ex

@@ -69,11 +69,6 @@ defmodule WandererApp.Api.Character do
       filter(expr(user_id == ^arg(:user_id) and deleted == false))
     end
 
-    read :available_by_map do
-      argument(:map_id, :uuid, allow_nil?: false)
-      filter(expr(user_id == ^arg(:user_id) and deleted == false))
-    end
-
     read :last_active do
       argument(:from, :utc_datetime, allow_nil?: false)
 
@@ -100,6 +95,7 @@ defmodule WandererApp.Api.Character do
 
     update :mark_as_deleted do
       accept([])
+      require_atomic? false
 
       change(atomic_update(:deleted, true))
       change(atomic_update(:user_id, nil))
@@ -107,6 +103,7 @@ defmodule WandererApp.Api.Character do
 
     update :update_online do
       accept([:online])
+      require_atomic? false
     end
 
     update :update_location do

lib/wanderer_app/api/corp_wallet_transaction.ex

@@ -33,7 +33,11 @@ defmodule WandererApp.Api.CorpWalletTransaction do
       :ref_type
     ]
 
-    defaults [:create, :read, :update, :destroy]
+    defaults [:create, :read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     create :new do
       accept [

lib/wanderer_app/api/license.ex

@@ -36,7 +36,11 @@ defmodule WandererApp.Api.License do
       :expire_at
     ]
 
-    defaults [:read, :update, :destroy]
+    defaults [:read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     create :create do
       primary? true
@@ -58,12 +62,14 @@ defmodule WandererApp.Api.License do
 
     update :invalidate do
       accept([])
+      require_atomic? false
 
       change(set_attribute(:is_valid, false))
     end
 
     update :set_valid do
       accept([])
+      require_atomic? false
 
       change(set_attribute(:is_valid, true))
     end

lib/wanderer_app/api/map.ex

@@ -31,19 +31,20 @@ defmodule WandererApp.Api.Map do
     routes do
       base("/maps")
       get(:by_slug, route: "/:slug")
-      index :read
+      # index :read
       post(:new)
       patch(:update)
       delete(:destroy)
 
       # Custom action for map duplication
-      post(:duplicate, route: "/:id/duplicate")
+      # post(:duplicate, route: "/:id/duplicate")
     end
   end
 
   code_interface do
     define(:available, action: :available)
     define(:get_map_by_slug, action: :by_slug, args: [:slug])
+    define(:by_api_key, action: :by_api_key, args: [:api_key])
     define(:new, action: :new)
     define(:create, action: :create)
     define(:update, action: :update)
@@ -90,22 +91,25 @@ defmodule WandererApp.Api.Map do
       filter expr(slug == ^arg(:slug))
     end
 
+    read :by_api_key do
+      get? true
+      argument :api_key, :string, allow_nil?: false
+
+      prepare WandererApp.Api.Preparations.SecureApiKeyLookup
+    end
+
     read :available do
       prepare WandererApp.Api.Preparations.FilterMapsByRoles
     end
 
     create :new do
-      accept [:name, :slug, :description, :scope, :only_tracked_characters, :owner_id]
+      accept [:name, :slug, :description, :scope, :only_tracked_characters, :owner_id, :sse_enabled]
       primary?(true)
-
-      argument :owner_id, :uuid, allow_nil?: false
       argument :create_default_acl, :boolean, allow_nil?: true
       argument :acls, {:array, :uuid}, allow_nil?: true
       argument :acls_text_input, :string, allow_nil?: true
       argument :scope_text_input, :string, allow_nil?: true
       argument :acls_empty_selection, :string, allow_nil?: true
-
-      change manage_relationship(:owner_id, :owner, on_lookup: :relate, on_no_match: nil)
       change manage_relationship(:acls, type: :append_and_remove)
       change WandererApp.Api.Changes.SlugifyName
     end
@@ -113,7 +117,16 @@ defmodule WandererApp.Api.Map do
     update :update do
       primary? true
       require_atomic? false
-      accept [:name, :slug, :description, :scope, :only_tracked_characters, :owner_id]
+
+      accept [
+        :name,
+        :slug,
+        :description,
+        :scope,
+        :only_tracked_characters,
+        :owner_id,
+        :sse_enabled
+      ]
 
       argument :owner_id_text_input, :string, allow_nil?: true
       argument :acls_text_input, :string, allow_nil?: true
@@ -128,6 +141,9 @@ defmodule WandererApp.Api.Map do
              )
 
       change WandererApp.Api.Changes.SlugifyName
+
+      # Validate subscription when enabling SSE
+      validate &validate_sse_subscription/2
     end
 
     update :update_acls do
@@ -142,33 +158,38 @@ defmodule WandererApp.Api.Map do
 
     update :assign_owner do
       accept [:owner_id]
+      require_atomic? false
     end
 
     update :update_hubs do
       accept [:hubs]
+      require_atomic? false
     end
 
     update :update_options do
       accept [:options]
+      require_atomic? false
     end
 
     update :mark_as_deleted do
       accept([])
+      require_atomic? false
 
       change(set_attribute(:deleted, true))
     end
 
     update :update_api_key do
       accept [:public_api_key]
+      require_atomic? false
     end
 
     update :toggle_webhooks do
       accept [:webhooks_enabled]
+      require_atomic? false
     end
 
     create :duplicate do
       accept [:name, :description, :scope, :only_tracked_characters]
-
       argument :source_map_id, :uuid, allow_nil?: false
       argument :copy_acls, :boolean, default: true
       argument :copy_user_settings, :boolean, default: true
@@ -312,12 +333,19 @@ defmodule WandererApp.Api.Map do
       public?(true)
     end
 
+    attribute :sse_enabled, :boolean do
+      default(false)
+      allow_nil?(false)
+      public?(true)
+    end
+
     create_timestamp(:inserted_at)
     update_timestamp(:updated_at)
   end
 
   identities do
     identity :unique_slug, [:slug]
+    identity :unique_public_api_key, [:public_api_key]
   end
 
   relationships do
@@ -344,4 +372,60 @@ defmodule WandererApp.Api.Map do
       public? false
     end
   end
+
+  # Private validation functions
+
+  @doc false
+  # Validates that SSE can be enabled based on subscription status.
+  #
+  # Validation rules:
+  # 1. Skip if SSE not being enabled (no validation needed)
+  # 2. Skip during map creation (map_id is nil, subscription doesn't exist yet)
+  # 3. Skip in Community Edition mode (subscriptions disabled globally)
+  # 4. Require active subscription in Enterprise mode
+  #
+  # This ensures users cannot enable SSE without a valid subscription in Enterprise mode,
+  # while allowing SSE in Community Edition and during map creation.
+  defp validate_sse_subscription(changeset, _context) do
+    sse_enabled = Ash.Changeset.get_attribute(changeset, :sse_enabled)
+    map_id = changeset.data.id
+    subscriptions_enabled = WandererApp.Env.map_subscriptions_enabled?()
+
+    cond do
+      # Not enabling SSE - no validation needed
+      not sse_enabled ->
+        :ok
+
+      # Map creation (no ID yet) - skip validation
+      # Subscription check will happen on first update if they try to enable SSE
+      is_nil(map_id) ->
+        :ok
+
+      # Community Edition mode - always allow
+      not subscriptions_enabled ->
+        :ok
+
+      # Enterprise mode - check subscription
+      true ->
+        validate_active_subscription(map_id)
+    end
+  end
+
+  # Helper to check if map has an active subscription
+  defp validate_active_subscription(map_id) do
+    case WandererApp.Map.is_subscription_active?(map_id) do
+      {:ok, true} ->
+        :ok
+
+      {:ok, false} ->
+        {:error, field: :sse_enabled, message: "Active subscription required to enable SSE"}
+
+      {:error, reason} ->
+        require Logger
+        Logger.warning("Failed to check subscription for map #{map_id}: #{inspect(reason)}")
+        # Fail open - allow the operation but log the error
+        # This prevents database errors from blocking legitimate operations
+        :ok
+    end
+  end
 end

lib/wanderer_app/api/map_access_list.ex

@@ -61,7 +61,11 @@ defmodule WandererApp.Api.MapAccessList do
       :access_list_id
     ]
 
-    defaults [:create, :read, :update, :destroy]
+    defaults [:create, :read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     read :read_by_map do
       argument(:map_id, :string, allow_nil?: false)

lib/wanderer_app/api/map_chain_passages.ex

@@ -27,7 +27,11 @@ defmodule WandererApp.Api.MapChainPassages do
       :solar_system_target_id
     ]
 
-    defaults [:create, :read, :update, :destroy]
+    defaults [:create, :read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     create :new do
       accept [
@@ -40,12 +44,6 @@ defmodule WandererApp.Api.MapChainPassages do
       ]
 
       primary?(true)
-
-      argument :map_id, :uuid, allow_nil?: false
-      argument :character_id, :uuid, allow_nil?: false
-
-      change manage_relationship(:map_id, :map, on_lookup: :relate, on_no_match: nil)
-      change manage_relationship(:character_id, :character, on_lookup: :relate, on_no_match: nil)
     end
 
     action :by_map_id, {:array, :struct} do

lib/wanderer_app/api/map_character_settings.ex

@@ -81,12 +81,6 @@ defmodule WandererApp.Api.MapCharacterSettings do
         :character_id,
         :tracked
       ]
-
-      argument :map_id, :uuid, allow_nil?: false
-      argument :character_id, :uuid, allow_nil?: false
-
-      change manage_relationship(:map_id, :map, on_lookup: :relate, on_no_match: nil)
-      change manage_relationship(:character_id, :character, on_lookup: :relate, on_no_match: nil)
     end
 
     read :by_map_filtered do
@@ -146,7 +140,7 @@ defmodule WandererApp.Api.MapCharacterSettings do
     update :track do
       accept [:map_id, :character_id]
       argument :map_id, :string, allow_nil?: false
-      argument :character_id, :uuid, allow_nil?: false
+      require_atomic? false
 
       # Load the record first
       load do
@@ -160,7 +154,7 @@ defmodule WandererApp.Api.MapCharacterSettings do
     update :untrack do
       accept [:map_id, :character_id]
       argument :map_id, :string, allow_nil?: false
-      argument :character_id, :uuid, allow_nil?: false
+      require_atomic? false
 
       # Load the record first
       load do
@@ -174,7 +168,7 @@ defmodule WandererApp.Api.MapCharacterSettings do
     update :follow do
       accept [:map_id, :character_id]
       argument :map_id, :string, allow_nil?: false
-      argument :character_id, :uuid, allow_nil?: false
+      require_atomic? false
 
       # Load the record first
       load do
@@ -188,7 +182,7 @@ defmodule WandererApp.Api.MapCharacterSettings do
     update :unfollow do
       accept [:map_id, :character_id]
       argument :map_id, :string, allow_nil?: false
-      argument :character_id, :uuid, allow_nil?: false
+      require_atomic? false
 
       # Load the record first
       load do

lib/wanderer_app/api/map_connection.ex

@@ -4,7 +4,8 @@ defmodule WandererApp.Api.MapConnection do
   use Ash.Resource,
     domain: WandererApp.Api,
     data_layer: AshPostgres.DataLayer,
-    extensions: [AshJsonApi.Resource]
+    extensions: [AshJsonApi.Resource],
+    primary_read_warning?: false
 
   postgres do
     repo(WandererApp.Repo)
@@ -73,7 +74,56 @@ defmodule WandererApp.Api.MapConnection do
       :custom_info
     ]
 
-    defaults [:create, :read, :update, :destroy]
+    create :create do
+      primary? true
+
+      accept [
+        :map_id,
+        :solar_system_source,
+        :solar_system_target,
+        :type,
+        :ship_size_type,
+        :mass_status,
+        :time_status,
+        :wormhole_type,
+        :count_of_passage,
+        :locked,
+        :custom_info
+      ]
+
+      # Inject map_id from token
+      change WandererApp.Api.Changes.InjectMapFromActor
+    end
+
+    read :read do
+      primary? true
+
+      # Security: Filter to only connections from actor's map
+      prepare WandererApp.Api.Preparations.FilterConnectionsByActorMap
+    end
+
+    update :update do
+      primary? true
+
+      accept [
+        :solar_system_source,
+        :solar_system_target,
+        :type,
+        :ship_size_type,
+        :mass_status,
+        :time_status,
+        :wormhole_type,
+        :count_of_passage,
+        :locked,
+        :custom_info
+      ]
+
+      require_atomic? false
+    end
+
+    destroy :destroy do
+      primary? true
+    end
 
     read :read_by_map do
       argument(:map_id, :string, allow_nil?: false)
@@ -110,30 +160,37 @@ defmodule WandererApp.Api.MapConnection do
 
     update :update_mass_status do
       accept [:mass_status]
+      require_atomic? false
     end
 
     update :update_time_status do
       accept [:time_status]
+      require_atomic? false
     end
 
     update :update_ship_size_type do
       accept [:ship_size_type]
+      require_atomic? false
     end
 
     update :update_locked do
       accept [:locked]
+      require_atomic? false
     end
 
     update :update_custom_info do
       accept [:custom_info]
+      require_atomic? false
     end
 
     update :update_type do
       accept [:type]
+      require_atomic? false
     end
 
     update :update_wormhole_type do
       accept [:wormhole_type]
+      require_atomic? false
     end
   end
 

lib/wanderer_app/api/map_invite.ex

@@ -30,7 +30,11 @@ defmodule WandererApp.Api.MapInvite do
       :token
     ]
 
-    defaults [:read, :update, :destroy]
+    defaults [:read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     create :new do
       accept [
@@ -41,10 +45,6 @@ defmodule WandererApp.Api.MapInvite do
       ]
 
       primary?(true)
-
-      argument :map_id, :uuid, allow_nil?: true
-
-      change manage_relationship(:map_id, :map, on_lookup: :relate, on_no_match: nil)
     end
 
     read :by_map do

lib/wanderer_app/api/map_ping.ex

@@ -3,7 +3,8 @@ defmodule WandererApp.Api.MapPing do
 
   use Ash.Resource,
     domain: WandererApp.Api,
-    data_layer: AshPostgres.DataLayer
+    data_layer: AshPostgres.DataLayer,
+    primary_read_warning?: false
 
   postgres do
     repo(WandererApp.Repo)
@@ -36,7 +37,18 @@ defmodule WandererApp.Api.MapPing do
       :message
     ]
 
-    defaults [:read, :update, :destroy]
+    defaults [:destroy]
+
+    update :update do
+      require_atomic? false
+    end
+
+    read :read do
+      primary? true
+
+      # Security: Filter to only pings from actor's map
+      prepare WandererApp.Api.Preparations.FilterPingsByActorMap
+    end
 
     create :new do
       accept [
@@ -48,14 +60,6 @@ defmodule WandererApp.Api.MapPing do
       ]
 
       primary?(true)
-
-      argument :map_id, :uuid, allow_nil?: false
-      argument :system_id, :uuid, allow_nil?: false
-      argument :character_id, :uuid, allow_nil?: false
-
-      change manage_relationship(:map_id, :map, on_lookup: :relate, on_no_match: nil)
-      change manage_relationship(:system_id, :system, on_lookup: :relate, on_no_match: nil)
-      change manage_relationship(:character_id, :character, on_lookup: :relate, on_no_match: nil)
     end
 
     read :by_map do

lib/wanderer_app/api/map_solar_system.ex

@@ -65,7 +65,11 @@ defmodule WandererApp.Api.MapSolarSystem do
       :sun_type_id
     ]
 
-    defaults [:read, :destroy, :update]
+    defaults [:read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     create :create do
       primary? true

lib/wanderer_app/api/map_solar_system_jumps.ex

@@ -24,7 +24,11 @@ defmodule WandererApp.Api.MapSolarSystemJumps do
       :to_solar_system_id
     ]
 
-    defaults [:read, :destroy, :update]
+    defaults [:read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     create :create do
       primary? true

lib/wanderer_app/api/map_state.ex

@@ -45,7 +45,11 @@ defmodule WandererApp.Api.MapState do
       :connections_start_time
     ]
 
-    defaults [:read, :update, :destroy]
+    defaults [:read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     create :create do
       primary? true

lib/wanderer_app/api/map_subscription.ex

@@ -62,10 +62,14 @@ defmodule WandererApp.Api.MapSubscription do
       :auto_renew?
     ]
 
-    defaults [:create, :read, :update, :destroy]
+    defaults [:create, :read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     read :all_active do
-      prepare build(sort: [updated_at: :asc])
+      prepare build(sort: [updated_at: :asc], load: [:map])
 
       filter(expr(status == :active))
     end
@@ -88,32 +92,39 @@ defmodule WandererApp.Api.MapSubscription do
 
     update :update_plan do
       accept [:plan]
+      require_atomic? false
     end
 
     update :update_characters_limit do
       accept [:characters_limit]
+      require_atomic? false
     end
 
     update :update_hubs_limit do
       accept [:hubs_limit]
+      require_atomic? false
     end
 
     update :update_active_till do
       accept [:active_till]
+      require_atomic? false
     end
 
     update :update_auto_renew do
       accept [:auto_renew?]
+      require_atomic? false
     end
 
     update :cancel do
       accept([])
+      require_atomic? false
 
       change(set_attribute(:status, :cancelled))
     end
 
     update :expire do
       accept([])
+      require_atomic? false
 
       change(set_attribute(:status, :expired))
     end

lib/wanderer_app/api/map_system.ex

@@ -24,16 +24,12 @@ defmodule WandererApp.Api.MapSystem do
   use Ash.Resource,
     domain: WandererApp.Api,
     data_layer: AshPostgres.DataLayer,
-    extensions: [AshJsonApi.Resource]
+    extensions: [AshJsonApi.Resource],
+    primary_read_warning?: false
 
   postgres do
     repo(WandererApp.Repo)
     table("map_system_v1")
-
-    custom_indexes do
-      # Partial index for efficient visible systems query
-      index [:map_id], where: "visible = true", name: "map_system_v1_map_id_visible_index"
-    end
   end
 
   json_api do
@@ -67,12 +63,10 @@ defmodule WandererApp.Api.MapSystem do
 
   code_interface do
     define(:create, action: :create)
+    define(:upsert, action: :upsert)
     define(:destroy, action: :destroy)
 
-    define(:by_id,
-      get_by: [:id],
-      action: :read
-    )
+    define :by_id, action: :get_by_id, args: [:id], get?: true
 
     define(:by_solar_system_id,
       get_by: [:solar_system_id],
@@ -102,6 +96,7 @@ defmodule WandererApp.Api.MapSystem do
     define(:update_status, action: :update_status)
     define(:update_tag, action: :update_tag)
     define(:update_temporary_name, action: :update_temporary_name)
+    define(:update_custom_name, action: :update_custom_name)
     define(:update_labels, action: :update_labels)
     define(:update_linked_sig_eve_id, action: :update_linked_sig_eve_id)
     define(:update_position, action: :update_position)
@@ -127,11 +122,88 @@ defmodule WandererApp.Api.MapSystem do
       :linked_sig_eve_id
     ]
 
-    defaults [:create, :update, :destroy]
+    create :create do
+      primary? true
+
+      accept [
+        :map_id,
+        :name,
+        :solar_system_id,
+        :position_x,
+        :position_y,
+        :status,
+        :visible,
+        :locked,
+        :custom_name,
+        :description,
+        :tag,
+        :temporary_name,
+        :labels,
+        :added_at,
+        :linked_sig_eve_id
+      ]
+
+      # Inject map_id from token
+      change WandererApp.Api.Changes.InjectMapFromActor
+    end
+
+    update :update do
+      primary? true
+      require_atomic? false
+
+      # Note: name and solar_system_id are not in accept
+      # - solar_system_id should be immutable (identifier)
+      # - name has allow_nil? false which makes it required in JSON:API
+      accept [
+        :position_x,
+        :position_y,
+        :status,
+        :visible,
+        :locked,
+        :custom_name,
+        :description,
+        :tag,
+        :temporary_name,
+        :labels,
+        :linked_sig_eve_id
+      ]
+    end
+
+    destroy :destroy do
+      primary? true
+    end
+
+    create :upsert do
+      primary? false
+      upsert? true
+      upsert_identity :map_solar_system_id
+
+      # Update these fields on conflict
+      upsert_fields [
+        :position_x,
+        :position_y,
+        :visible,
+        :name
+      ]
+
+      accept [
+        :map_id,
+        :solar_system_id,
+        :name,
+        :position_x,
+        :position_y,
+        :visible,
+        :locked,
+        :status
+      ]
+    end
 
     read :read do
       primary?(true)
 
+      # Security: Filter to only systems from actor's map
+      prepare WandererApp.Api.Preparations.FilterSystemsByActorMap
+
       pagination offset?: true,
                  default_limit: 100,
                  max_page_size: 500,
@@ -139,6 +211,11 @@ defmodule WandererApp.Api.MapSystem do
                  required?: false
     end
 
+    read :get_by_id do
+      argument(:id, :string, allow_nil?: false)
+      filter(expr(id == ^arg(:id)))
+    end
+
     read :read_all_by_map do
       argument(:map_id, :string, allow_nil?: false)
       filter(expr(map_id == ^arg(:map_id)))
@@ -160,44 +237,59 @@ defmodule WandererApp.Api.MapSystem do
 
     update :update_name do
       accept [:name]
+      require_atomic? false
     end
 
     update :update_description do
       accept [:description]
+      require_atomic? false
     end
 
     update :update_locked do
       accept [:locked]
+      require_atomic? false
     end
 
     update :update_status do
       accept [:status]
+      require_atomic? false
     end
 
     update :update_tag do
       accept [:tag]
+      require_atomic? false
     end
 
     update :update_temporary_name do
       accept [:temporary_name]
+      require_atomic? false
+    end
+
+    update :update_custom_name do
+      accept [:custom_name]
+      require_atomic? false
     end
 
     update :update_labels do
       accept [:labels]
+      require_atomic? false
     end
 
     update :update_position do
       accept [:position_x, :position_y]
+      require_atomic? false
 
       change(set_attribute(:visible, true))
     end
 
     update :update_linked_sig_eve_id do
       accept [:linked_sig_eve_id]
+      require_atomic? false
     end
 
     update :update_visible do
       accept [:visible]
+      require_atomic? false
     end
   end
 

lib/wanderer_app/api/map_system_comment.ex

@@ -59,12 +59,6 @@ defmodule WandererApp.Api.MapSystemComment do
         :character_id,
         :text
       ]
-
-      argument :system_id, :uuid, allow_nil?: false
-      argument :character_id, :uuid, allow_nil?: false
-
-      change manage_relationship(:system_id, :system, on_lookup: :relate, on_no_match: nil)
-      change manage_relationship(:character_id, :character, on_lookup: :relate, on_no_match: nil)
     end
 
     read :by_system_id do

lib/wanderer_app/api/map_system_signature.ex

@@ -111,10 +111,6 @@ defmodule WandererApp.Api.MapSystemSignature do
         :custom_info,
         :deleted
       ]
-
-      argument :system_id, :uuid, allow_nil?: false
-
-      change manage_relationship(:system_id, :system, on_lookup: :relate, on_no_match: nil)
     end
 
     update :update do
@@ -139,14 +135,17 @@ defmodule WandererApp.Api.MapSystemSignature do
 
     update :update_linked_system do
       accept [:linked_system_id]
+      require_atomic? false
     end
 
     update :update_type do
       accept [:type]
+      require_atomic? false
     end
 
     update :update_group do
       accept [:group]
+      require_atomic? false
     end
 
     read :by_system_id do

lib/wanderer_app/api/map_system_structure.ex

@@ -122,13 +122,6 @@ defmodule WandererApp.Api.MapSystemStructure do
         :status,
         :end_time
       ]
-
-      argument :system_id, :uuid, allow_nil?: false
-
-      change manage_relationship(:system_id, :system,
-               on_lookup: :relate,
-               on_no_match: nil
-             )
     end
 
     update :update do

lib/wanderer_app/api/map_transaction.ex

@@ -29,7 +29,11 @@ defmodule WandererApp.Api.MapTransaction do
       :amount
     ]
 
-    defaults [:create, :read, :update, :destroy]
+    defaults [:create, :read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     read :by_map do
       argument(:map_id, :string, allow_nil?: false)

lib/wanderer_app/api/map_user_settings.ex

@@ -53,22 +53,30 @@ defmodule WandererApp.Api.MapUserSettings do
       :settings
     ]
 
-    defaults [:create, :read, :update, :destroy]
+    defaults [:create, :read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     update :update_settings do
       accept [:settings]
+      require_atomic? false
     end
 
     update :update_main_character do
       accept [:main_character_eve_id]
+      require_atomic? false
     end
 
     update :update_following_character do
       accept [:following_character_eve_id]
+      require_atomic? false
     end
 
     update :update_hubs do
       accept [:hubs]
+      require_atomic? false
     end
   end
 

lib/wanderer_app/api/map_webhook_subscription.ex

@@ -58,6 +58,7 @@ defmodule WandererApp.Api.MapWebhookSubscription do
         :consecutive_failures,
         :secret
       ]
+      require_atomic? false
     end
 
     read :by_map do

lib/wanderer_app/api/preparations/filter_by_actor_map.ex

@@ -0,0 +1,64 @@
+defmodule WandererApp.Api.Preparations.FilterByActorMap do
+  @moduledoc """
+  Shared filtering logic for actor map context.
+
+  Filters queries to only return resources belonging to the actor's map.
+  Used by preparations for MapSystem, MapConnection, and MapPing resources.
+  """
+
+  require Ash.Query
+
+  alias WandererApp.Api.ActorHelpers
+
+  @doc """
+  Filter a query by the actor's map context.
+
+  If a map is found in the context, filters the query to only return
+  resources where map_id matches. If no map context exists, returns
+  a query that will return no results.
+
+  ## Parameters
+
+    * `query` - The Ash query to filter
+    * `context` - The Ash context containing actor/map information
+    * `resource_name` - Name of the resource for telemetry (atom)
+
+  ## Examples
+
+      iex> query = Ash.Query.new(WandererApp.Api.MapSystem)
+      iex> context = %{map: %{id: "map-123"}}
+      iex> result = FilterByActorMap.filter_by_map(query, context, :map_system)
+      # Returns query filtered by map_id == "map-123"
+  """
+  def filter_by_map(query, context, resource_name) do
+    case ActorHelpers.get_map(context) do
+      %{id: map_id} ->
+        emit_telemetry(resource_name, map_id)
+        Ash.Query.filter(query, map_id == ^map_id)
+
+      nil ->
+        emit_telemetry_no_context(resource_name)
+        Ash.Query.filter(query, false)
+
+      _other ->
+        emit_telemetry_no_context(resource_name)
+        Ash.Query.filter(query, false)
+    end
+  end
+
+  defp emit_telemetry(resource_name, map_id) do
+    :telemetry.execute(
+      [:wanderer_app, :ash, :preparation, :filter_by_map],
+      %{count: 1},
+      %{resource: resource_name, map_id: map_id}
+    )
+  end
+
+  defp emit_telemetry_no_context(resource_name) do
+    :telemetry.execute(
+      [:wanderer_app, :ash, :preparation, :filter_by_map, :no_context],
+      %{count: 1},
+      %{resource: resource_name}
+    )
+  end
+end

lib/wanderer_app/api/preparations/filter_connections_by_actor_map.ex

@@ -0,0 +1,17 @@
+defmodule WandererApp.Api.Preparations.FilterConnectionsByActorMap do
+  @moduledoc """
+  Ash preparation that filters connections to only those from the actor's map.
+
+  For token-based auth, this ensures the API only returns connections
+  from the map associated with the token.
+  """
+
+  use Ash.Resource.Preparation
+
+  alias WandererApp.Api.Preparations.FilterByActorMap
+
+  @impl true
+  def prepare(query, _opts, context) do
+    FilterByActorMap.filter_by_map(query, context, :map_connection)
+  end
+end

lib/wanderer_app/api/preparations/filter_pings_by_actor_map.ex

@@ -0,0 +1,17 @@
+defmodule WandererApp.Api.Preparations.FilterPingsByActorMap do
+  @moduledoc """
+  Ash preparation that filters pings to only those from the actor's map.
+
+  For token-based auth, this ensures the API only returns pings
+  from the map associated with the token.
+  """
+
+  use Ash.Resource.Preparation
+
+  alias WandererApp.Api.Preparations.FilterByActorMap
+
+  @impl true
+  def prepare(query, _opts, context) do
+    FilterByActorMap.filter_by_map(query, context, :map_ping)
+  end
+end

lib/wanderer_app/api/preparations/filter_systems_by_actor_map.ex

@@ -0,0 +1,17 @@
+defmodule WandererApp.Api.Preparations.FilterSystemsByActorMap do
+  @moduledoc """
+  Ash preparation that filters systems to only those from the actor's map.
+
+  For token-based auth, this ensures the API only returns systems
+  from the map associated with the token.
+  """
+
+  use Ash.Resource.Preparation
+
+  alias WandererApp.Api.Preparations.FilterByActorMap
+
+  @impl true
+  def prepare(query, _opts, context) do
+    FilterByActorMap.filter_by_map(query, context, :map_system)
+  end
+end

lib/wanderer_app/api/preparations/secure_api_key_lookup.ex

@@ -0,0 +1,62 @@
+defmodule WandererApp.Api.Preparations.SecureApiKeyLookup do
+  @moduledoc """
+  Preparation that performs secure API key lookup using constant-time comparison.
+
+  This preparation:
+  1. Queries for the map with the given API key using database index
+  2. Performs constant-time comparison to verify the key matches
+  3. Returns the map only if the secure comparison passes
+
+  The constant-time comparison prevents timing attacks where an attacker
+  could deduce information about valid API keys by measuring response times.
+  """
+
+  use Ash.Resource.Preparation
+  require Ash.Query
+
+  @dummy_key "dummy_key_for_timing_consistency_00000000"
+
+  def prepare(query, _params, _context) do
+    api_key = Ash.Query.get_argument(query, :api_key)
+
+    if is_nil(api_key) or api_key == "" do
+      # Return empty result for invalid input
+      Ash.Query.filter(query, expr(false))
+    else
+      # First, do the database lookup using the index
+      # Then apply constant-time comparison in after_action
+      query
+      |> Ash.Query.filter(expr(public_api_key == ^api_key))
+      |> Ash.Query.after_action(fn _query, results ->
+        verify_results_with_secure_compare(results, api_key)
+      end)
+    end
+  end
+
+  defp verify_results_with_secure_compare(results, provided_key) do
+    case results do
+      [map] ->
+        # Map found - verify with constant-time comparison
+        stored_key = map.public_api_key || @dummy_key
+
+        if Plug.Crypto.secure_compare(stored_key, provided_key) do
+          {:ok, [map]}
+        else
+          # Keys don't match (shouldn't happen if DB returned it, but safety check)
+          {:ok, []}
+        end
+
+      [] ->
+        # No map found - still do a comparison to maintain consistent timing
+        # This prevents timing attacks from distinguishing "not found" from "found but wrong"
+        _result = Plug.Crypto.secure_compare(@dummy_key, provided_key)
+        {:ok, []}
+
+      _multiple ->
+        # Multiple results - shouldn't happen with unique constraint
+        # Do comparison for timing consistency and return error
+        _result = Plug.Crypto.secure_compare(@dummy_key, provided_key)
+        {:ok, []}
+    end
+  end
+end

lib/wanderer_app/api/ship_type_info.ex

@@ -49,7 +49,11 @@ defmodule WandererApp.Api.ShipTypeInfo do
       :volume
     ]
 
-    defaults [:read, :destroy, :update]
+    defaults [:read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     create :create do
       primary? true

lib/wanderer_app/api/user.ex

@@ -51,10 +51,15 @@ defmodule WandererApp.Api.User do
       :hash
     ]
 
-    defaults [:create, :read, :update, :destroy]
+    defaults [:create, :read, :destroy]
+
+    update :update do
+      require_atomic? false
+    end
 
     update :update_last_map do
       accept([:last_map_id])
+      require_atomic? false
     end
 
     update :update_balance do

lib/wanderer_app/api/user_activity.ex

@@ -4,7 +4,8 @@ defmodule WandererApp.Api.UserActivity do
   use Ash.Resource,
     domain: WandererApp.Api,
     data_layer: AshPostgres.DataLayer,
-    extensions: [AshJsonApi.Resource]
+    extensions: [AshJsonApi.Resource],
+    primary_read_warning?: false
 
   require Ash.Expr
 
@@ -55,7 +56,8 @@ defmodule WandererApp.Api.UserActivity do
       :entity_type,
       :event_type,
       :event_data,
-      :user_id
+      :user_id,
+      :character_id
     ]
 
     read :read do
@@ -70,14 +72,8 @@ defmodule WandererApp.Api.UserActivity do
     end
 
     create :new do
-      accept [:entity_id, :entity_type, :event_type, :event_data]
+      accept [:entity_id, :entity_type, :event_type, :event_data, :user_id, :character_id]
       primary?(true)
-
-      argument :user_id, :uuid, allow_nil?: true
-      argument :character_id, :uuid, allow_nil?: true
-
-      change manage_relationship(:user_id, :user, on_lookup: :relate, on_no_match: nil)
-      change manage_relationship(:character_id, :character, on_lookup: :relate, on_no_match: nil)
     end
 
     destroy :archive do

lib/wanderer_app/api/user_transaction.ex

@@ -28,10 +28,6 @@ defmodule WandererApp.Api.UserTransaction do
     create :new do
       accept [:journal_ref_id, :user_id, :date, :amount, :corporation_id]
       primary?(true)
-
-      argument :user_id, :uuid, allow_nil?: false
-
-      change manage_relationship(:user_id, :user, on_lookup: :relate, on_no_match: nil)
     end
   end
 

lib/wanderer_app/application.ex

@@ -16,15 +16,48 @@ defmodule WandererApp.Application do
       WandererApp.Vault,
       WandererApp.Repo,
       {Phoenix.PubSub, name: WandererApp.PubSub, adapter_name: Phoenix.PubSub.PG2},
+      # Multiple Finch pools for different services to prevent connection pool exhaustion
+      # ESI Character Tracking pool - high capacity for bulk character operations
+      {
+        Finch,
+        name: WandererApp.Finch.ESI.CharacterTracking,
+        pools: %{
+          default: [
+            size: Application.get_env(:wanderer_app, :finch_esi_character_pool_size, 100),
+            count: Application.get_env(:wanderer_app, :finch_esi_character_pool_count, 4)
+          ]
+        }
+      },
+      # ESI General pool - standard capacity for general ESI operations
+      {
+        Finch,
+        name: WandererApp.Finch.ESI.General,
+        pools: %{
+          default: [
+            size: Application.get_env(:wanderer_app, :finch_esi_general_pool_size, 50),
+            count: Application.get_env(:wanderer_app, :finch_esi_general_pool_count, 4)
+          ]
+        }
+      },
+      # Webhooks pool - isolated from ESI rate limits
+      {
+        Finch,
+        name: WandererApp.Finch.Webhooks,
+        pools: %{
+          default: [
+            size: Application.get_env(:wanderer_app, :finch_webhooks_pool_size, 25),
+            count: Application.get_env(:wanderer_app, :finch_webhooks_pool_count, 2)
+          ]
+        }
+      },
+      # Default pool - everything else (email, license manager, etc.)
       {
         Finch,
         name: WandererApp.Finch,
         pools: %{
           default: [
-            # number of connections per pool
-            size: 50,
-            # number of pools (so total 50 connections)
-            count: 4
+            size: Application.get_env(:wanderer_app, :finch_default_pool_size, 25),
+            count: Application.get_env(:wanderer_app, :finch_default_pool_count, 2)
           ]
         }
       },
@@ -120,13 +153,16 @@ defmodule WandererApp.Application do
     :ok
   end
 
-  defp maybe_start_corp_wallet_tracker(true),
-    do: [
-      WandererApp.StartCorpWalletTrackerTask
-    ]
+  defp maybe_start_corp_wallet_tracker(true) do
+    # Don't start corp wallet tracker in test environment
+    if Application.get_env(:wanderer_app, :environment) == :test do
+      []
+    else
+      [WandererApp.StartCorpWalletTrackerTask]
+    end
+  end
 
-  defp maybe_start_corp_wallet_tracker(_),
-    do: []
+  defp maybe_start_corp_wallet_tracker(_), do: []
 
   defp maybe_start_kills_services do
     # Don't start kills services in test environment

lib/wanderer_app/cache.ex

@@ -73,6 +73,54 @@ defmodule WandererApp.Cache do
 
   def filter_by_attr_in(type, attr, includes), do: type |> get() |> filter_in(attr, includes)
 
+  @doc """
+  Batch lookup multiple keys from cache.
+  Returns a map of key => value pairs, with `default` used for missing keys.
+  """
+  def lookup_all(keys, default \\ nil) when is_list(keys) do
+    # Get all values from cache
+    values = get_all(keys)
+
+    # Build result map with defaults for missing keys
+    result =
+      keys
+      |> Enum.map(fn key ->
+        value = Map.get(values, key, default)
+        {key, value}
+      end)
+      |> Map.new()
+
+    {:ok, result}
+  end
+
+  @doc """
+  Batch insert multiple key-value pairs into cache.
+  Accepts a map of key => value pairs or a list of {key, value} tuples.
+  Skips nil values (deletes the key instead).
+  """
+  def insert_all(entries, opts \\ [])
+
+  def insert_all(entries, opts) when is_map(entries) do
+    # Filter out nil values and delete those keys
+    {to_delete, to_insert} =
+      entries
+      |> Enum.split_with(fn {_key, value} -> is_nil(value) end)
+
+    # Delete keys with nil values
+    Enum.each(to_delete, fn {key, _} -> delete(key) end)
+
+    # Insert non-nil values
+    unless Enum.empty?(to_insert) do
+      put_all(to_insert, opts)
+    end
+
+    :ok
+  end
+
+  def insert_all(entries, opts) when is_list(entries) do
+    insert_all(Map.new(entries), opts)
+  end
+
   defp find(list, %{} = attrs, match: match) do
     list
     |> Enum.find(fn item ->

lib/wanderer_app/cached_info.ex

@@ -1,6 +1,8 @@
 defmodule WandererApp.CachedInfo do
   require Logger
 
+  alias WandererAppWeb.Helpers.APIUtils
+
   def run(_arg) do
     :ok = cache_trig_systems()
   end
@@ -29,14 +31,71 @@ defmodule WandererApp.CachedInfo do
           )
         end)
 
-        Cachex.get(:ship_types_cache, type_id)
+        get_ship_type_from_cache_or_api(type_id)
 
       {:ok, ship_type} ->
         {:ok, ship_type}
     end
   end
 
+  defp get_ship_type_from_cache_or_api(type_id) do
+    case Cachex.get(:ship_types_cache, type_id) do
+      {:ok, ship_type} when not is_nil(ship_type) ->
+        {:ok, ship_type}
+
+      {:ok, nil} ->
+        case WandererApp.Esi.get_type_info(type_id) do
+          {:ok, info} when not is_nil(info) ->
+            ship_type = parse_type(type_id, info)
+            {:ok, group_info} = get_group_info(ship_type.group_id)
+
+            {:ok, ship_type_info} =
+              WandererApp.Api.ShipTypeInfo |> Ash.create(ship_type |> Map.merge(group_info))
+
+            {:ok,
+             ship_type_info
+             |> Map.take([
+               :type_id,
+               :group_id,
+               :group_name,
+               :name,
+               :description,
+               :mass,
+               :capacity,
+               :volume
+             ])}
+
+          {:error, reason} ->
+            Logger.error("Failed to get ship_type #{type_id} from ESI: #{inspect(reason)}")
+            {:ok, nil}
+
+          error ->
+            Logger.error("Failed to get ship_type #{type_id} from ESI: #{inspect(error)}")
+            {:ok, nil}
+        end
+    end
+  end
+
+  def get_group_info(nil), do: {:ok, nil}
+
+  def get_group_info(group_id) do
+    case WandererApp.Esi.get_group_info(group_id) do
+      {:ok, info} when not is_nil(info) ->
+        {:ok, parse_group(group_id, info)}
+
+      {:error, reason} ->
+        Logger.error("Failed to get group_info #{group_id} from ESI: #{inspect(reason)}")
+        {:ok, %{group_name: ""}}
+
+      error ->
+        Logger.error("Failed to get group_info #{group_id} from ESI: #{inspect(error)}")
+        {:ok, %{group_name: ""}}
+    end
+  end
+
   def get_system_static_info(solar_system_id) do
+    {:ok, solar_system_id} = APIUtils.parse_int(solar_system_id)
+
     case Cachex.get(:system_static_info_cache, solar_system_id) do
       {:ok, nil} ->
         case WandererApp.Api.MapSolarSystem.read() do
@@ -149,6 +208,25 @@ defmodule WandererApp.CachedInfo do
     end
   end
 
+  defp parse_group(group_id, group) do
+    %{
+      group_id: group_id,
+      group_name: Map.get(group, "name")
+    }
+  end
+
+  defp parse_type(type_id, type) do
+    %{
+      type_id: type_id,
+      name: Map.get(type, "name"),
+      description: Map.get(type, "description"),
+      group_id: Map.get(type, "group_id"),
+      mass: "#{Map.get(type, "mass")}",
+      capacity: "#{Map.get(type, "capacity")}",
+      volume: "#{Map.get(type, "volume")}"
+    }
+  end
+
   defp build_jump_index() do
     case get_solar_system_jumps() do
       {:ok, jumps} ->

lib/wanderer_app/character.ex

@@ -4,6 +4,8 @@ defmodule WandererApp.Character do
 
   require Logger
 
+  alias WandererApp.Cache
+
   @read_character_wallet_scope "esi-wallet.read_character_wallet.v1"
   @read_corp_wallet_scope "esi-wallet.read_corporation_wallets.v1"
 
@@ -16,6 +18,9 @@ defmodule WandererApp.Character do
     ship_item_id: nil
   }
 
+  @present_on_map_ttl :timer.seconds(10)
+  @not_present_on_map_ttl :timer.minutes(2)
+
   def get_by_eve_id(character_eve_id) when is_binary(character_eve_id) do
     WandererApp.Api.Character.by_eve_id(character_eve_id)
   end
@@ -41,7 +46,7 @@ defmodule WandererApp.Character do
 
   def get_character!(character_id) do
     case get_character(character_id) do
-      {:ok, character} ->
+      {:ok, character} when not is_nil(character) ->
         character
 
       _ ->
@@ -50,16 +55,10 @@ defmodule WandererApp.Character do
     end
   end
 
-  def get_map_character(map_id, character_id, opts \\ []) do
+  def get_map_character(map_id, character_id) do
     case get_character(character_id) do
-      {:ok, character} ->
-        # If we are forcing the character to not be present, we merge the character state with map settings
-        character_is_present =
-          if opts |> Keyword.get(:not_present, false) do
-            false
-          else
-            WandererApp.Character.TrackerManager.Impl.character_is_present(map_id, character_id)
-          end
+      {:ok, character} when not is_nil(character) ->
+        character_is_present = character_is_present?(map_id, character_id)
 
         {:ok,
          character
@@ -187,6 +186,10 @@ defmodule WandererApp.Character do
           {:ok, result} ->
             {:ok, result |> prepare_search_results()}
 
+          {:error, error} ->
+            Logger.warning("#{__MODULE__} failed search: #{inspect(error)}")
+            {:ok, []}
+
           error ->
             Logger.warning("#{__MODULE__} failed search: #{inspect(error)}")
             {:ok, []}
@@ -263,22 +266,26 @@ defmodule WandererApp.Character do
     end
   end
 
-  defp maybe_merge_map_character_settings(%{id: character_id} = character, _map_id, true) do
-    {:ok, tracking_paused} =
-      WandererApp.Cache.lookup("character:#{character_id}:tracking_paused", false)
+  @decorate cacheable(
+              cache: Cache,
+              key: "character-present-#{map_id}-#{character_id}",
+              opts: [ttl: @present_on_map_ttl]
+            )
+  defp character_is_present?(map_id, character_id),
+    do: WandererApp.Character.TrackerManager.Impl.character_is_present(map_id, character_id)
 
-    character
-    |> Map.merge(%{tracking_paused: tracking_paused})
-  end
+  defp maybe_merge_map_character_settings(character, _map_id, true), do: character
 
+  @decorate cacheable(
+              cache: Cache,
+              key: "not-present-map-character-#{map_id}-#{character_id}",
+              opts: [ttl: @not_present_on_map_ttl]
+            )
   defp maybe_merge_map_character_settings(
          %{id: character_id} = character,
          map_id,
-         _character_is_present
+         false
        ) do
-    {:ok, tracking_paused} =
-      WandererApp.Cache.lookup("character:#{character_id}:tracking_paused", false)
-
     WandererApp.MapCharacterSettingsRepo.get(map_id, character_id)
     |> case do
       {:ok, settings} when not is_nil(settings) ->
@@ -296,7 +303,7 @@ defmodule WandererApp.Character do
         character
         |> Map.merge(@default_character_tracking_data)
     end
-    |> Map.merge(%{online: false, tracking_paused: tracking_paused})
+    |> Map.merge(%{online: false})
   end
 
   defp prepare_search_results(result) do
@@ -324,7 +331,7 @@ defmodule WandererApp.Character do
     do:
       {:ok,
        Enum.map(eve_ids, fn eve_id ->
-         Task.async(fn -> apply(WandererApp.Esi.ApiClient, method, [eve_id]) end)
+         Task.async(fn -> apply(WandererApp.Esi, method, [eve_id]) end)
        end)
        # 145000 == Timeout in milliseconds
        |> Enum.map(fn task -> Task.await(task, 145_000) end)

lib/wanderer_app/character/tracker.ex

@@ -14,8 +14,8 @@ defmodule WandererApp.Character.Tracker do
     active_maps: [],
     is_online: false,
     track_online: true,
-    track_location: true,
-    track_ship: true,
+    track_location: false,
+    track_ship: false,
     track_wallet: false,
     status: "new"
   ]
@@ -36,14 +36,11 @@ defmodule WandererApp.Character.Tracker do
           status: binary()
         }
 
-  @pause_tracking_timeout :timer.minutes(60 * 10)
   @offline_timeout :timer.minutes(5)
-  @online_error_timeout :timer.minutes(10)
-  @ship_error_timeout :timer.minutes(10)
-  @location_error_timeout :timer.minutes(10)
+  @location_error_timeout :timer.seconds(30)
+  @location_error_threshold 3
   @online_forbidden_ttl :timer.seconds(7)
   @offline_check_delay_ttl :timer.seconds(15)
-  @online_limit_ttl :timer.seconds(7)
   @forbidden_ttl :timer.seconds(10)
   @limit_ttl :timer.seconds(5)
   @location_limit_ttl :timer.seconds(1)
@@ -93,81 +90,16 @@ defmodule WandererApp.Character.Tracker do
     end
   end
 
-  def check_online_errors(character_id),
-    do: check_tracking_errors(character_id, "online", @online_error_timeout)
-
-  def check_ship_errors(character_id),
-    do: check_tracking_errors(character_id, "ship", @ship_error_timeout)
-
-  def check_location_errors(character_id),
-    do: check_tracking_errors(character_id, "location", @location_error_timeout)
-
-  defp check_tracking_errors(character_id, type, timeout) do
-    WandererApp.Cache.lookup!("character:#{character_id}:#{type}_error_time")
-    |> case do
-      nil ->
-        :skip
-
-      error_time ->
-        duration = DateTime.diff(DateTime.utc_now(), error_time, :millisecond)
-
-        if duration >= timeout do
-          pause_tracking(character_id)
-          WandererApp.Cache.delete("character:#{character_id}:#{type}_error_time")
-
-          :ok
-        else
-          :skip
-        end
-    end
+  defp increment_location_error_count(character_id) do
+    cache_key = "character:#{character_id}:location_error_count"
+    current_count = WandererApp.Cache.lookup!(cache_key) || 0
+    new_count = current_count + 1
+    WandererApp.Cache.put(cache_key, new_count)
+    new_count
   end
 
-  defp pause_tracking(character_id) do
-    if WandererApp.Character.can_pause_tracking?(character_id) &&
-         not WandererApp.Cache.has_key?("character:#{character_id}:tracking_paused") do
-      # Log character tracking statistics before pausing
-      Logger.debug(fn ->
-        {:ok, character_state} = WandererApp.Character.get_character_state(character_id)
-
-        "CHARACTER_TRACKING_PAUSED: Character tracking paused due to sustained errors: #{inspect(character_id: character_id,
-        active_maps: length(character_state.active_maps),
-        is_online: character_state.is_online,
-        tracking_duration_minutes: get_tracking_duration_minutes(character_id))}"
-      end)
-
-      WandererApp.Cache.delete("character:#{character_id}:online_forbidden")
-      WandererApp.Cache.delete("character:#{character_id}:online_error_time")
-      WandererApp.Cache.delete("character:#{character_id}:ship_error_time")
-      WandererApp.Cache.delete("character:#{character_id}:location_error_time")
-      WandererApp.Character.update_character(character_id, %{online: false})
-
-      WandererApp.Character.update_character_state(character_id, %{
-        is_online: false
-      })
-
-      # Original log kept for backward compatibility
-      Logger.warning("[CharacterTracker] paused for #{character_id}")
-
-      WandererApp.Cache.put(
-        "character:#{character_id}:tracking_paused",
-        true,
-        ttl: @pause_tracking_timeout
-      )
-
-      {:ok, %{solar_system_id: solar_system_id}} =
-        WandererApp.Character.get_character(character_id)
-
-      {:ok, %{active_maps: active_maps}} =
-        WandererApp.Character.get_character_state(character_id)
-
-      active_maps
-      |> Enum.each(fn map_id ->
-        WandererApp.Cache.put(
-          "map:#{map_id}:character:#{character_id}:start_solar_system_id",
-          solar_system_id
-        )
-      end)
-    end
+  defp reset_location_error_count(character_id) do
+    WandererApp.Cache.delete("character:#{character_id}:location_error_count")
   end
 
   def update_settings(character_id, track_settings) do
@@ -194,8 +126,7 @@ defmodule WandererApp.Character.Tracker do
     case WandererApp.Character.get_character(character_id) do
       {:ok, %{eve_id: eve_id, access_token: access_token, tracking_pool: tracking_pool}}
       when not is_nil(access_token) ->
-        (WandererApp.Cache.has_key?("character:#{character_id}:online_forbidden") ||
-           WandererApp.Cache.has_key?("character:#{character_id}:tracking_paused"))
+        WandererApp.Cache.has_key?("character:#{character_id}:online_forbidden")
         |> case do
           true ->
             {:error, :skipped}
@@ -224,9 +155,10 @@ defmodule WandererApp.Character.Tracker do
                   )
                 end
 
-                if online.online == true && online.online != is_online do
+                if online.online == true && not is_online do
                   WandererApp.Cache.delete("character:#{character_id}:ship_error_time")
                   WandererApp.Cache.delete("character:#{character_id}:location_error_time")
+                  WandererApp.Cache.delete("character:#{character_id}:location_error_count")
                   WandererApp.Cache.delete("character:#{character_id}:info_forbidden")
                   WandererApp.Cache.delete("character:#{character_id}:ship_forbidden")
                   WandererApp.Cache.delete("character:#{character_id}:location_forbidden")
@@ -294,12 +226,6 @@ defmodule WandererApp.Character.Tracker do
               {:error, :error_limited, headers} ->
                 reset_timeout = get_reset_timeout(headers)
 
-                reset_seconds =
-                  Map.get(headers, "x-esi-error-limit-reset", ["unknown"]) |> List.first()
-
-                remaining =
-                  Map.get(headers, "x-esi-error-limit-remain", ["unknown"]) |> List.first()
-
                 WandererApp.Cache.put(
                   "character:#{character_id}:online_forbidden",
                   true,
@@ -357,8 +283,7 @@ defmodule WandererApp.Character.Tracker do
   defp get_reset_timeout(_headers, default_timeout), do: default_timeout
 
   def update_info(character_id) do
-    (WandererApp.Cache.has_key?("character:#{character_id}:info_forbidden") ||
-       WandererApp.Cache.has_key?("character:#{character_id}:tracking_paused"))
+    WandererApp.Cache.has_key?("character:#{character_id}:info_forbidden")
     |> case do
       true ->
         {:error, :skipped}
@@ -442,8 +367,7 @@ defmodule WandererApp.Character.Tracker do
       {:ok, %{eve_id: eve_id, access_token: access_token, tracking_pool: tracking_pool}}
       when not is_nil(access_token) ->
         (WandererApp.Cache.has_key?("character:#{character_id}:online_forbidden") ||
-           WandererApp.Cache.has_key?("character:#{character_id}:ship_forbidden") ||
-           WandererApp.Cache.has_key?("character:#{character_id}:tracking_paused"))
+           WandererApp.Cache.has_key?("character:#{character_id}:ship_forbidden"))
         |> case do
           true ->
             {:error, :skipped}
@@ -552,7 +476,7 @@ defmodule WandererApp.Character.Tracker do
     case WandererApp.Character.get_character(character_id) do
       {:ok, %{eve_id: eve_id, access_token: access_token, tracking_pool: tracking_pool}}
       when not is_nil(access_token) ->
-        WandererApp.Cache.has_key?("character:#{character_id}:tracking_paused")
+        WandererApp.Cache.has_key?("character:#{character_id}:location_forbidden")
         |> case do
           true ->
             {:error, :skipped}
@@ -565,19 +489,33 @@ defmodule WandererApp.Character.Tracker do
                    character_id: character_id
                  ) do
               {:ok, location} when is_map(location) and not is_struct(location) ->
+                reset_location_error_count(character_id)
+                WandererApp.Cache.delete("character:#{character_id}:location_error_time")
+
                 character_state
                 |> maybe_update_location(location)
 
                 :ok
 
               {:error, error} when error in [:forbidden, :not_found, :timeout] ->
+                error_count = increment_location_error_count(character_id)
+
                 Logger.warning("ESI_ERROR: Character location tracking failed",
                   character_id: character_id,
                   tracking_pool: tracking_pool,
                   error_type: error,
+                  error_count: error_count,
                   endpoint: "character_location"
                 )
 
+                if error_count >= @location_error_threshold do
+                  WandererApp.Cache.put(
+                    "character:#{character_id}:location_forbidden",
+                    true,
+                    ttl: @location_error_timeout
+                  )
+                end
+
                 if is_nil(
                      WandererApp.Cache.lookup!("character:#{character_id}:location_error_time")
                    ) do
@@ -601,13 +539,24 @@ defmodule WandererApp.Character.Tracker do
                 {:error, :error_limited}
 
               {:error, error} ->
+                error_count = increment_location_error_count(character_id)
+
                 Logger.error("ESI_ERROR: Character location tracking failed: #{inspect(error)}",
                   character_id: character_id,
                   tracking_pool: tracking_pool,
                   error_type: error,
+                  error_count: error_count,
                   endpoint: "character_location"
                 )
 
+                if error_count >= @location_error_threshold do
+                  WandererApp.Cache.put(
+                    "character:#{character_id}:location_forbidden",
+                    true,
+                    ttl: @location_error_timeout
+                  )
+                end
+
                 if is_nil(
                      WandererApp.Cache.lookup!("character:#{character_id}:location_error_time")
                    ) do
@@ -620,13 +569,24 @@ defmodule WandererApp.Character.Tracker do
                 {:error, :skipped}
 
               _ ->
+                error_count = increment_location_error_count(character_id)
+
                 Logger.error("ESI_ERROR: Character location tracking failed - wrong response",
                   character_id: character_id,
                   tracking_pool: tracking_pool,
                   error_type: "wrong_response",
+                  error_count: error_count,
                   endpoint: "character_location"
                 )
 
+                if error_count >= @location_error_threshold do
+                  WandererApp.Cache.put(
+                    "character:#{character_id}:location_forbidden",
+                    true,
+                    ttl: @location_error_timeout
+                  )
+                end
+
                 if is_nil(
                      WandererApp.Cache.lookup!("character:#{character_id}:location_error_time")
                    ) do
@@ -662,8 +622,7 @@ defmodule WandererApp.Character.Tracker do
         |> case do
           true ->
             (WandererApp.Cache.has_key?("character:#{character_id}:online_forbidden") ||
-               WandererApp.Cache.has_key?("character:#{character_id}:wallet_forbidden") ||
-               WandererApp.Cache.has_key?("character:#{character_id}:tracking_paused"))
+               WandererApp.Cache.has_key?("character:#{character_id}:wallet_forbidden"))
             |> case do
               true ->
                 {:error, :skipped}
@@ -750,6 +709,7 @@ defmodule WandererApp.Character.Tracker do
     end
   end
 
+  # when old_alliance_id != alliance_id and is_nil(alliance_id)
   defp maybe_update_alliance(
          %{character_id: character_id, alliance_id: old_alliance_id} = state,
          alliance_id
@@ -775,6 +735,7 @@ defmodule WandererApp.Character.Tracker do
     )
 
     state
+    |> Map.merge(%{alliance_id: nil})
   end
 
   defp maybe_update_alliance(
@@ -782,8 +743,7 @@ defmodule WandererApp.Character.Tracker do
          alliance_id
        )
        when old_alliance_id != alliance_id do
-    (WandererApp.Cache.has_key?("character:#{character_id}:online_forbidden") ||
-       WandererApp.Cache.has_key?("character:#{character_id}:tracking_paused"))
+    WandererApp.Cache.has_key?("character:#{character_id}:online_forbidden")
     |> case do
       true ->
         state
@@ -813,6 +773,7 @@ defmodule WandererApp.Character.Tracker do
             )
 
             state
+            |> Map.merge(%{alliance_id: alliance_id})
 
           _error ->
             Logger.error("Failed to get alliance info for #{alliance_id}")
@@ -829,8 +790,7 @@ defmodule WandererApp.Character.Tracker do
        )
        when old_corporation_id != corporation_id do
     (WandererApp.Cache.has_key?("character:#{character_id}:online_forbidden") ||
-       WandererApp.Cache.has_key?("character:#{character_id}:corporation_info_forbidden") ||
-       WandererApp.Cache.has_key?("character:#{character_id}:tracking_paused"))
+       WandererApp.Cache.has_key?("character:#{character_id}:corporation_info_forbidden"))
     |> case do
       true ->
         state
@@ -1006,9 +966,7 @@ defmodule WandererApp.Character.Tracker do
        ),
        do: %{
          state
-         | track_online: true,
-           track_location: true,
-           track_ship: true
+         | track_online: true
        }
 
   defp maybe_start_online_tracking(
@@ -1052,11 +1010,6 @@ defmodule WandererApp.Character.Tracker do
         DateTime.utc_now()
       )
 
-      WandererApp.Cache.put(
-        "map:#{map_id}:character:#{character_id}:start_solar_system_id",
-        track_settings |> Map.get(:solar_system_id)
-      )
-
       WandererApp.Cache.delete("map:#{map_id}:character:#{character_id}:solar_system_id")
       WandererApp.Cache.delete("map:#{map_id}:character:#{character_id}:station_id")
       WandererApp.Cache.delete("map:#{map_id}:character:#{character_id}:structure_id")
@@ -1107,7 +1060,7 @@ defmodule WandererApp.Character.Tracker do
       )
     end
 
-    state
+    %{state | track_location: false, track_ship: false}
   end
 
   defp maybe_stop_tracking(
@@ -1137,19 +1090,6 @@ defmodule WandererApp.Character.Tracker do
 
   defp get_online(_), do: %{online: false}
 
-  defp get_tracking_duration_minutes(character_id) do
-    case WandererApp.Cache.lookup!("character:#{character_id}:map:*:tracking_start_time") do
-      nil ->
-        0
-
-      start_time when is_struct(start_time, DateTime) ->
-        DateTime.diff(DateTime.utc_now(), start_time, :minute)
-
-      _ ->
-        0
-    end
-  end
-
   # Telemetry handler for database pool monitoring
   def handle_pool_query(_event_name, measurements, metadata, _config) do
     queue_time = measurements[:queue_time]

lib/wanderer_app/character/tracker_manager.ex

@@ -14,8 +14,8 @@ defmodule WandererApp.Character.TrackerManager do
     GenServer.start_link(__MODULE__, args, name: __MODULE__)
   end
 
-  def start_tracking(character_id, opts \\ []),
-    do: GenServer.cast(__MODULE__, {&Impl.start_tracking/3, [character_id, opts]})
+  def start_tracking(character_id),
+    do: GenServer.cast(__MODULE__, {&Impl.start_tracking/2, [character_id]})
 
   def stop_tracking(character_id),
     do: GenServer.cast(__MODULE__, {&Impl.stop_tracking/2, [character_id]})

lib/wanderer_app/character/tracker_manager_impl.ex

@@ -40,13 +40,13 @@ defmodule WandererApp.Character.TrackerManager.Impl do
 
     tracked_characters
     |> Enum.each(fn character_id ->
-      start_tracking(state, character_id, %{})
+      start_tracking(state, character_id)
     end)
 
     state
   end
 
-  def start_tracking(state, character_id, opts) do
+  def start_tracking(state, character_id) do
     if not WandererApp.Cache.has_key?("#{character_id}:track_requested") do
       WandererApp.Cache.insert(
         "#{character_id}:track_requested",

lib/wanderer_app/character/tracker_pool.ex

@@ -8,7 +8,8 @@ defmodule WandererApp.Character.TrackerPool do
     :tracked_ids,
     :uuid,
     :characters,
-    server_online: true
+    server_online: false,
+    last_location_duration: 0
   ]
 
   @name __MODULE__
@@ -19,13 +20,20 @@ defmodule WandererApp.Character.TrackerPool do
   @update_location_interval :timer.seconds(1)
   @update_online_interval :timer.seconds(30)
   @check_offline_characters_interval :timer.minutes(5)
-  @check_online_errors_interval :timer.minutes(1)
-  @check_ship_errors_interval :timer.minutes(1)
-  @check_location_errors_interval :timer.minutes(1)
   @update_ship_interval :timer.seconds(2)
   @update_info_interval :timer.minutes(2)
   @update_wallet_interval :timer.minutes(10)
 
+  # Per-operation concurrency limits
+  # Location updates are critical and need high concurrency (100 chars in ~200ms)
+  # Note: This is fetched at runtime since it's configured via runtime.exs
+  defp location_concurrency do
+    Application.get_env(:wanderer_app, :location_concurrency, System.schedulers_online() * 12)
+  end
+
+  # Other operations can use lower concurrency
+  @standard_concurrency System.schedulers_online() * 2
+
   @logger Application.compile_env(:wanderer_app, :logger)
 
   def new(), do: __struct__()
@@ -109,17 +117,23 @@ defmodule WandererApp.Character.TrackerPool do
       "server_status"
     )
 
-    Process.send_after(self(), :update_online, 100)
-    Process.send_after(self(), :check_online_errors, :timer.seconds(60))
-    Process.send_after(self(), :check_ship_errors, :timer.seconds(90))
-    Process.send_after(self(), :check_location_errors, :timer.seconds(120))
+    # Stagger pool startups to distribute load across multiple pools
+    # Critical location updates get minimal stagger (0-500ms)
+    # Other operations get wider stagger (0-10s) to reduce thundering herd
+    location_stagger = :rand.uniform(500)
+    online_stagger = :rand.uniform(10_000)
+    ship_stagger = :rand.uniform(10_000)
+    info_stagger = :rand.uniform(60_000)
+
+    Process.send_after(self(), :update_online, 100 + online_stagger)
+    Process.send_after(self(), :update_location, 300 + location_stagger)
+    Process.send_after(self(), :update_ship, 500 + ship_stagger)
+    Process.send_after(self(), :update_info, 1500 + info_stagger)
     Process.send_after(self(), :check_offline_characters, @check_offline_characters_interval)
-    Process.send_after(self(), :update_location, 300)
-    Process.send_after(self(), :update_ship, 500)
-    Process.send_after(self(), :update_info, 1500)
 
     if WandererApp.Env.wallet_tracking_enabled?() do
-      Process.send_after(self(), :update_wallet, 1000)
+      wallet_stagger = :rand.uniform(120_000)
+      Process.send_after(self(), :update_wallet, 1000 + wallet_stagger)
     end
 
     {:noreply, state}
@@ -169,7 +183,7 @@ defmodule WandererApp.Character.TrackerPool do
         fn character_id ->
           WandererApp.Character.Tracker.update_online(character_id)
         end,
-        max_concurrency: System.schedulers_online() * 4,
+        max_concurrency: @standard_concurrency,
         on_timeout: :kill_task,
         timeout: :timer.seconds(5)
       )
@@ -180,6 +194,8 @@ defmodule WandererApp.Character.TrackerPool do
         [Tracker Pool] update_online => exception: #{Exception.message(e)}
         #{Exception.format_stacktrace(__STACKTRACE__)}
         """)
+
+        ErrorTracker.report(e, __STACKTRACE__)
     end
 
     {:noreply, state}
@@ -230,7 +246,7 @@ defmodule WandererApp.Character.TrackerPool do
           WandererApp.Character.Tracker.check_offline(character_id)
         end,
         timeout: :timer.seconds(15),
-        max_concurrency: System.schedulers_online() * 4,
+        max_concurrency: @standard_concurrency,
         on_timeout: :kill_task
       )
       |> Enum.each(fn
@@ -248,126 +264,6 @@ defmodule WandererApp.Character.TrackerPool do
     {:noreply, state}
   end
 
-  def handle_info(
-        :check_online_errors,
-        %{
-          characters: characters
-        } =
-          state
-      ) do
-    Process.send_after(self(), :check_online_errors, @check_online_errors_interval)
-
-    try do
-      characters
-      |> Task.async_stream(
-        fn character_id ->
-          WandererApp.TaskWrapper.start_link(
-            WandererApp.Character.Tracker,
-            :check_online_errors,
-            [
-              character_id
-            ]
-          )
-        end,
-        timeout: :timer.seconds(15),
-        max_concurrency: System.schedulers_online() * 4,
-        on_timeout: :kill_task
-      )
-      |> Enum.each(fn
-        {:ok, _result} -> :ok
-        error -> @logger.error("Error in check_online_errors: #{inspect(error)}")
-      end)
-    rescue
-      e ->
-        Logger.error("""
-        [Tracker Pool] check_online_errors => exception: #{Exception.message(e)}
-        #{Exception.format_stacktrace(__STACKTRACE__)}
-        """)
-    end
-
-    {:noreply, state}
-  end
-
-  def handle_info(
-        :check_ship_errors,
-        %{
-          characters: characters
-        } =
-          state
-      ) do
-    Process.send_after(self(), :check_ship_errors, @check_ship_errors_interval)
-
-    try do
-      characters
-      |> Task.async_stream(
-        fn character_id ->
-          WandererApp.TaskWrapper.start_link(
-            WandererApp.Character.Tracker,
-            :check_ship_errors,
-            [
-              character_id
-            ]
-          )
-        end,
-        timeout: :timer.seconds(15),
-        max_concurrency: System.schedulers_online() * 4,
-        on_timeout: :kill_task
-      )
-      |> Enum.each(fn
-        {:ok, _result} -> :ok
-        error -> @logger.error("Error in check_ship_errors: #{inspect(error)}")
-      end)
-    rescue
-      e ->
-        Logger.error("""
-        [Tracker Pool] check_ship_errors => exception: #{Exception.message(e)}
-        #{Exception.format_stacktrace(__STACKTRACE__)}
-        """)
-    end
-
-    {:noreply, state}
-  end
-
-  def handle_info(
-        :check_location_errors,
-        %{
-          characters: characters
-        } =
-          state
-      ) do
-    Process.send_after(self(), :check_location_errors, @check_location_errors_interval)
-
-    try do
-      characters
-      |> Task.async_stream(
-        fn character_id ->
-          WandererApp.TaskWrapper.start_link(
-            WandererApp.Character.Tracker,
-            :check_location_errors,
-            [
-              character_id
-            ]
-          )
-        end,
-        timeout: :timer.seconds(15),
-        max_concurrency: System.schedulers_online() * 4,
-        on_timeout: :kill_task
-      )
-      |> Enum.each(fn
-        {:ok, _result} -> :ok
-        error -> @logger.error("Error in check_location_errors: #{inspect(error)}")
-      end)
-    rescue
-      e ->
-        Logger.error("""
-        [Tracker Pool] check_location_errors => exception: #{Exception.message(e)}
-        #{Exception.format_stacktrace(__STACKTRACE__)}
-        """)
-    end
-
-    {:noreply, state}
-  end
-
   def handle_info(
         :update_location,
         %{
@@ -378,26 +274,52 @@ defmodule WandererApp.Character.TrackerPool do
       ) do
     Process.send_after(self(), :update_location, @update_location_interval)
 
+    start_time = System.monotonic_time(:millisecond)
+
     try do
       characters
       |> Task.async_stream(
         fn character_id ->
           WandererApp.Character.Tracker.update_location(character_id)
         end,
-        max_concurrency: System.schedulers_online() * 4,
+        max_concurrency: location_concurrency(),
         on_timeout: :kill_task,
         timeout: :timer.seconds(5)
       )
       |> Enum.each(fn _result -> :ok end)
+
+      # Emit telemetry for location update performance
+      duration = System.monotonic_time(:millisecond) - start_time
+
+      :telemetry.execute(
+        [:wanderer_app, :tracker_pool, :location_update],
+        %{duration: duration, character_count: length(characters)},
+        %{pool_uuid: state.uuid}
+      )
+
+      # Warn if location updates are falling behind (taking > 800ms for 100 chars)
+      if duration > 2000 do
+        Logger.warning(
+          "[Tracker Pool] Location updates falling behind: #{duration}ms for #{length(characters)} chars (pool: #{state.uuid})"
+        )
+
+        :telemetry.execute(
+          [:wanderer_app, :tracker_pool, :location_lag],
+          %{duration: duration, character_count: length(characters)},
+          %{pool_uuid: state.uuid}
+        )
+      end
+
+      {:noreply, %{state | last_location_duration: duration}}
     rescue
       e ->
         Logger.error("""
         [Tracker Pool] update_location => exception: #{Exception.message(e)}
         #{Exception.format_stacktrace(__STACKTRACE__)}
         """)
-    end
 
-    {:noreply, state}
+        {:noreply, state}
+    end
   end
 
   def handle_info(
@@ -413,32 +335,48 @@ defmodule WandererApp.Character.TrackerPool do
         :update_ship,
         %{
           characters: characters,
-          server_online: true
+          server_online: true,
+          last_location_duration: location_duration
         } =
           state
       ) do
     Process.send_after(self(), :update_ship, @update_ship_interval)
 
-    try do
-      characters
-      |> Task.async_stream(
-        fn character_id ->
-          WandererApp.Character.Tracker.update_ship(character_id)
-        end,
-        max_concurrency: System.schedulers_online() * 4,
-        on_timeout: :kill_task,
-        timeout: :timer.seconds(5)
+    # Backpressure: Skip ship updates if location updates are falling behind
+    if location_duration > 1000 do
+      Logger.debug(
+        "[Tracker Pool] Skipping ship update due to location lag (#{location_duration}ms)"
       )
-      |> Enum.each(fn _result -> :ok end)
-    rescue
-      e ->
-        Logger.error("""
-        [Tracker Pool] update_ship => exception: #{Exception.message(e)}
-        #{Exception.format_stacktrace(__STACKTRACE__)}
-        """)
-    end
 
-    {:noreply, state}
+      :telemetry.execute(
+        [:wanderer_app, :tracker_pool, :ship_skipped],
+        %{count: 1},
+        %{pool_uuid: state.uuid, reason: :location_lag}
+      )
+
+      {:noreply, state}
+    else
+      try do
+        characters
+        |> Task.async_stream(
+          fn character_id ->
+            WandererApp.Character.Tracker.update_ship(character_id)
+          end,
+          max_concurrency: @standard_concurrency,
+          on_timeout: :kill_task,
+          timeout: :timer.seconds(5)
+        )
+        |> Enum.each(fn _result -> :ok end)
+      rescue
+        e ->
+          Logger.error("""
+          [Tracker Pool] update_ship => exception: #{Exception.message(e)}
+          #{Exception.format_stacktrace(__STACKTRACE__)}
+          """)
+      end
+
+      {:noreply, state}
+    end
   end
 
   def handle_info(
@@ -454,35 +392,51 @@ defmodule WandererApp.Character.TrackerPool do
         :update_info,
         %{
           characters: characters,
-          server_online: true
+          server_online: true,
+          last_location_duration: location_duration
         } =
           state
       ) do
     Process.send_after(self(), :update_info, @update_info_interval)
 
-    try do
-      characters
-      |> Task.async_stream(
-        fn character_id ->
-          WandererApp.Character.Tracker.update_info(character_id)
-        end,
-        timeout: :timer.seconds(15),
-        max_concurrency: System.schedulers_online() * 4,
-        on_timeout: :kill_task
+    # Backpressure: Skip info updates if location updates are severely falling behind
+    if location_duration > 1500 do
+      Logger.debug(
+        "[Tracker Pool] Skipping info update due to location lag (#{location_duration}ms)"
       )
-      |> Enum.each(fn
-        {:ok, _result} -> :ok
-        error -> Logger.error("Error in update_info: #{inspect(error)}")
-      end)
-    rescue
-      e ->
-        Logger.error("""
-        [Tracker Pool] update_info => exception: #{Exception.message(e)}
-        #{Exception.format_stacktrace(__STACKTRACE__)}
-        """)
-    end
 
-    {:noreply, state}
+      :telemetry.execute(
+        [:wanderer_app, :tracker_pool, :info_skipped],
+        %{count: 1},
+        %{pool_uuid: state.uuid, reason: :location_lag}
+      )
+
+      {:noreply, state}
+    else
+      try do
+        characters
+        |> Task.async_stream(
+          fn character_id ->
+            WandererApp.Character.Tracker.update_info(character_id)
+          end,
+          timeout: :timer.seconds(15),
+          max_concurrency: @standard_concurrency,
+          on_timeout: :kill_task
+        )
+        |> Enum.each(fn
+          {:ok, _result} -> :ok
+          error -> Logger.error("Error in update_info: #{inspect(error)}")
+        end)
+      rescue
+        e ->
+          Logger.error("""
+          [Tracker Pool] update_info => exception: #{Exception.message(e)}
+          #{Exception.format_stacktrace(__STACKTRACE__)}
+          """)
+      end
+
+      {:noreply, state}
+    end
   end
 
   def handle_info(
@@ -511,7 +465,7 @@ defmodule WandererApp.Character.TrackerPool do
           WandererApp.Character.Tracker.update_wallet(character_id)
         end,
         timeout: :timer.minutes(5),
-        max_concurrency: System.schedulers_online() * 4,
+        max_concurrency: @standard_concurrency,
         on_timeout: :kill_task
       )
       |> Enum.each(fn

lib/wanderer_app/character/tracker_pool_dynamic_supervisor.ex

@@ -52,7 +52,7 @@ defmodule WandererApp.Character.TrackerPoolDynamicSupervisor do
 
   defp get_available_pool([]), do: nil
 
-  defp get_available_pool([{pid, uuid} | pools]) do
+  defp get_available_pool([{_pid, uuid} | pools]) do
     case Registry.lookup(@unique_registry, Module.concat(WandererApp.Character.TrackerPool, uuid)) do
       [] ->
         nil
@@ -62,8 +62,8 @@ defmodule WandererApp.Character.TrackerPoolDynamicSupervisor do
           nil ->
             get_available_pool(pools)
 
-          pid ->
-            pid
+          pool_pid ->
+            pool_pid
         end
     end
   end

lib/wanderer_app/character/transactions_tracker_impl.ex

@@ -12,7 +12,7 @@ defmodule WandererApp.Character.TransactionsTracker.Impl do
     total_balance: 0,
     transactions: [],
     retries: 5,
-    server_online: true,
+    server_online: false,
     status: :started
   ]
 
@@ -75,7 +75,7 @@ defmodule WandererApp.Character.TransactionsTracker.Impl do
 
   def handle_event(
         :update_corp_wallets,
-        %{character: character} = state
+        %{character: character, server_online: true} = state
       ) do
     Process.send_after(self(), :update_corp_wallets, @update_interval)
 
@@ -88,26 +88,26 @@ defmodule WandererApp.Character.TransactionsTracker.Impl do
         :update_corp_wallets,
         state
       ) do
-    Process.send_after(self(), :update_corp_wallets, :timer.seconds(15))
+    Process.send_after(self(), :update_corp_wallets, @update_interval)
 
     state
   end
 
   def handle_event(
         :check_wallets,
-        %{wallets: []} = state
+        %{character: character, wallets: wallets, server_online: true} = state
       ) do
-    Process.send_after(self(), :check_wallets, :timer.seconds(5))
+    Process.send_after(self(), :check_wallets, @update_interval)
 
-    state
-  end
-
-  def handle_event(
-        :check_wallets,
-        %{character: character, wallets: wallets} = state
-      ) do
     check_wallets(wallets, character)
 
+    state
+  end
+
+  def handle_event(
+        :check_wallets,
+        state
+      ) do
     Process.send_after(self(), :check_wallets, @update_interval)
 
     state

lib/wanderer_app/env.ex

@@ -17,7 +17,6 @@ defmodule WandererApp.Env do
   def invites(), do: get_key(:invites, false)
 
   def map_subscriptions_enabled?(), do: get_key(:map_subscriptions_enabled, false)
-  def websocket_events_enabled?(), do: get_key(:websocket_events_enabled, false)
   def public_api_disabled?(), do: get_key(:public_api_disabled, false)
 
   @decorate cacheable(

lib/wanderer_app/esi.ex

@@ -2,6 +2,8 @@ defmodule WandererApp.Esi do
   @moduledoc group: :esi
 
   defdelegate get_server_status, to: WandererApp.Esi.ApiClient
+  defdelegate get_group_info(group_id, opts \\ []), to: WandererApp.Esi.ApiClient
+  defdelegate get_type_info(type_id, opts \\ []), to: WandererApp.Esi.ApiClient
   defdelegate get_alliance_info(eve_id, opts \\ []), to: WandererApp.Esi.ApiClient
   defdelegate get_corporation_info(eve_id, opts \\ []), to: WandererApp.Esi.ApiClient
   defdelegate get_character_info(eve_id, opts \\ []), to: WandererApp.Esi.ApiClient

lib/wanderer_app/esi/api_client.ex

@@ -17,6 +17,17 @@ defmodule WandererApp.Esi.ApiClient do
 
   @logger Application.compile_env(:wanderer_app, :logger)
 
+  # Pool selection for different operation types
+  # Character tracking operations use dedicated high-capacity pool
+  @character_tracking_pool WandererApp.Finch.ESI.CharacterTracking
+  # General ESI operations use standard pool
+  @general_pool WandererApp.Finch.ESI.General
+
+  # Helper function to get Req options with appropriate Finch pool
+  defp req_options_for_pool(pool) do
+    [base_url: "https://esi.evetech.net", finch: pool]
+  end
+
   def get_server_status, do: do_get("/status", [], @cache_opts)
 
   def set_autopilot_waypoint(add_to_beginning, clear_other_waypoints, destination_id, opts \\ []),
@@ -38,10 +49,13 @@ defmodule WandererApp.Esi.ApiClient do
       do:
         do_post_esi(
           "/characters/affiliation/",
-          json: character_eve_ids,
-          params: %{
-            datasource: "tranquility"
-          }
+          [
+            json: character_eve_ids,
+            params: %{
+              datasource: "tranquility"
+            }
+          ],
+          @character_tracking_pool
         )
 
   def get_routes_custom(hubs, origin, params),
@@ -116,7 +130,33 @@ defmodule WandererApp.Esi.ApiClient do
 
   @decorate cacheable(
               cache: Cache,
-              key: "info-#{eve_id}",
+              key: "group-info-#{group_id}",
+              opts: [ttl: @ttl]
+            )
+  def get_group_info(group_id, opts),
+    do:
+      do_get(
+        "/universe/groups/#{group_id}/",
+        opts,
+        @cache_opts
+      )
+
+  @decorate cacheable(
+              cache: Cache,
+              key: "type-info-#{type_id}",
+              opts: [ttl: @ttl]
+            )
+  def get_type_info(type_id, opts),
+    do:
+      do_get(
+        "/universe/types/#{type_id}/",
+        opts,
+        @cache_opts
+      )
+
+  @decorate cacheable(
+              cache: Cache,
+              key: "alliance-info-#{eve_id}",
               opts: [ttl: @ttl]
             )
   def get_alliance_info(eve_id, opts \\ []) do
@@ -137,7 +177,7 @@ defmodule WandererApp.Esi.ApiClient do
 
   @decorate cacheable(
               cache: Cache,
-              key: "info-#{eve_id}",
+              key: "corporation-info-#{eve_id}",
               opts: [ttl: @ttl]
             )
   def get_corporation_info(eve_id, opts \\ []) do
@@ -150,7 +190,7 @@ defmodule WandererApp.Esi.ApiClient do
 
   @decorate cacheable(
               cache: Cache,
-              key: "info-#{eve_id}",
+              key: "character-info-#{eve_id}",
               opts: [ttl: @ttl]
             )
   def get_character_info(eve_id, opts \\ []) do
@@ -203,8 +243,17 @@ defmodule WandererApp.Esi.ApiClient do
     do: get_character_auth_data(character_eve_id, "ship", opts ++ @cache_opts)
 
   def search(character_eve_id, opts \\ []) do
-    search_val = to_string(opts[:params][:search] || "")
-    categories_val = to_string(opts[:params][:categories] || "character,alliance,corporation")
+    params = Keyword.get(opts, :params, %{}) |> Map.new()
+
+    search_val =
+      to_string(Map.get(params, :search) || Map.get(params, "search") || "")
+
+    categories_val =
+      to_string(
+        Map.get(params, :categories) ||
+          Map.get(params, "categories") ||
+          "character,alliance,corporation"
+      )
 
     query_params = [
       {"search", search_val},
@@ -220,7 +269,7 @@ defmodule WandererApp.Esi.ApiClient do
 
   @decorate cacheable(
               cache: Cache,
-              key: "search-#{character_eve_id}-#{categories_val}-#{search_val |> Slug.slugify()}",
+              key: "search-#{character_eve_id}-#{categories_val}-#{Base.encode64(search_val)}",
               opts: [ttl: @ttl]
             )
   defp get_search(character_eve_id, search_val, categories_val, merged_opts) do
@@ -254,14 +303,18 @@ defmodule WandererApp.Esi.ApiClient do
 
     character_id = opts |> Keyword.get(:character_id, nil)
 
+    # Use character tracking pool for character operations
+    pool = @character_tracking_pool
+
     if not is_access_token_expired?(character_id) do
       do_get(
         path,
         auth_opts,
-        opts |> with_refresh_token()
+        opts |> with_refresh_token(),
+        pool
       )
     else
-      do_get_retry(path, auth_opts, opts |> with_refresh_token())
+      do_get_retry(path, auth_opts, opts |> with_refresh_token(), :forbidden, pool)
     end
   end
 
@@ -295,19 +348,19 @@ defmodule WandererApp.Esi.ApiClient do
   defp with_cache_opts(opts),
     do: opts |> Keyword.merge(@cache_opts) |> Keyword.merge(cache_dir: System.tmp_dir!())
 
-  defp do_get(path, api_opts \\ [], opts \\ []) do
+  defp do_get(path, api_opts \\ [], opts \\ [], pool \\ @general_pool) do
     case Cachex.get(:api_cache, path) do
       {:ok, cached_data} when not is_nil(cached_data) ->
         {:ok, cached_data}
 
       _ ->
-        do_get_request(path, api_opts, opts)
+        do_get_request(path, api_opts, opts, pool)
     end
   end
 
-  defp do_get_request(path, api_opts \\ [], opts \\ []) do
+  defp do_get_request(path, api_opts \\ [], opts \\ [], pool \\ @general_pool) do
     try do
-      @req_esi_options
+      req_options_for_pool(pool)
       |> Req.new()
       |> Req.get(
         api_opts
@@ -398,12 +451,48 @@ defmodule WandererApp.Esi.ApiClient do
         {:ok, %{status: status, headers: headers}} ->
           {:error, "Unexpected status: #{status}"}
 
-        {:error, _reason} ->
+        {:error, %Mint.TransportError{reason: :timeout}} ->
+          # Emit telemetry for pool timeout
+          :telemetry.execute(
+            [:wanderer_app, :finch, :pool_timeout],
+            %{count: 1},
+            %{method: "GET", path: path, pool: pool}
+          )
+
+          {:error, :pool_timeout}
+
+        {:error, reason} ->
+          # Check if this is a Finch pool error
+          if is_exception(reason) and Exception.message(reason) =~ "unable to provide a connection" do
+            :telemetry.execute(
+              [:wanderer_app, :finch, :pool_exhausted],
+              %{count: 1},
+              %{method: "GET", path: path, pool: pool}
+            )
+          end
+
           {:error, "Request failed"}
       end
     rescue
       e ->
-        Logger.error(Exception.message(e))
+        error_msg = Exception.message(e)
+
+        # Emit telemetry for pool exhaustion errors
+        if error_msg =~ "unable to provide a connection" do
+          :telemetry.execute(
+            [:wanderer_app, :finch, :pool_exhausted],
+            %{count: 1},
+            %{method: "GET", path: path, pool: pool}
+          )
+
+          Logger.error("FINCH_POOL_EXHAUSTED: #{error_msg}",
+            method: "GET",
+            path: path,
+            pool: inspect(pool)
+          )
+        else
+          Logger.error(error_msg)
+        end
 
         {:error, "Request failed"}
     end
@@ -492,13 +581,13 @@ defmodule WandererApp.Esi.ApiClient do
     end
   end
 
-  defp do_post_esi(url, opts) do
+  defp do_post_esi(url, opts, pool \\ @general_pool) do
     try do
       req_opts =
         (opts |> with_user_agent_opts() |> Keyword.merge(@retry_opts)) ++
           [params: opts[:params] || []]
 
-      Req.new(@req_esi_options ++ req_opts)
+      Req.new(req_options_for_pool(pool) ++ req_opts)
       |> Req.post(url: url)
       |> case do
         {:ok, %{status: status, body: body}} when status in [200, 201] ->
@@ -576,18 +665,54 @@ defmodule WandererApp.Esi.ApiClient do
         {:ok, %{status: status}} ->
           {:error, "Unexpected status: #{status}"}
 
+        {:error, %Mint.TransportError{reason: :timeout}} ->
+          # Emit telemetry for pool timeout
+          :telemetry.execute(
+            [:wanderer_app, :finch, :pool_timeout],
+            %{count: 1},
+            %{method: "POST_ESI", path: url, pool: pool}
+          )
+
+          {:error, :pool_timeout}
+
         {:error, reason} ->
+          # Check if this is a Finch pool error
+          if is_exception(reason) and Exception.message(reason) =~ "unable to provide a connection" do
+            :telemetry.execute(
+              [:wanderer_app, :finch, :pool_exhausted],
+              %{count: 1},
+              %{method: "POST_ESI", path: url, pool: pool}
+            )
+          end
+
           {:error, reason}
       end
     rescue
       e ->
-        @logger.error(Exception.message(e))
+        error_msg = Exception.message(e)
+
+        # Emit telemetry for pool exhaustion errors
+        if error_msg =~ "unable to provide a connection" do
+          :telemetry.execute(
+            [:wanderer_app, :finch, :pool_exhausted],
+            %{count: 1},
+            %{method: "POST_ESI", path: url, pool: pool}
+          )
+
+          @logger.error("FINCH_POOL_EXHAUSTED: #{error_msg}",
+            method: "POST_ESI",
+            path: url,
+            pool: inspect(pool)
+          )
+        else
+          @logger.error(error_msg)
+        end
 
         {:error, "Request failed"}
     end
   end
 
-  defp do_get_retry(path, api_opts, opts, status \\ :forbidden) do
+  defp do_get_retry(path, api_opts, opts, status \\ :forbidden, pool \\ @general_pool) do
     refresh_token? = opts |> Keyword.get(:refresh_token?, false)
     retry_count = opts |> Keyword.get(:retry_count, 0)
     character_id = opts |> Keyword.get(:character_id, nil)
@@ -602,7 +727,8 @@ defmodule WandererApp.Esi.ApiClient do
           do_get(
             path,
             api_opts |> Keyword.merge(auth_opts),
-            opts |> Keyword.merge(retry_count: retry_count + 1)
+            opts |> Keyword.merge(retry_count: retry_count + 1),
+            pool
           )
 
         {:error, _error} ->

lib/wanderer_app/external_events.ex

@@ -2,7 +2,7 @@ defmodule WandererApp.ExternalEvents do
   @moduledoc """
   External event system for SSE and webhook delivery.
 
-  This system is completely separate from the internal Phoenix PubSub 
+  This system is completely separate from the internal Phoenix PubSub
   event system and does NOT modify any existing event flows.
 
   External events are delivered to:
@@ -72,20 +72,12 @@ defmodule WandererApp.ExternalEvents do
 
       # Check if MapEventRelay is alive before sending
       if Process.whereis(MapEventRelay) do
-        try do
-          # Use call with timeout instead of cast for better error handling
-          GenServer.call(MapEventRelay, {:deliver_event, event}, 5000)
-          :ok
-        catch
-          :exit, {:timeout, _} ->
-            Logger.error("Timeout delivering event to MapEventRelay for map #{map_id}")
-            {:error, :timeout}
-
-          :exit, reason ->
-            Logger.error("Failed to deliver event to MapEventRelay: #{inspect(reason)}")
-            {:error, reason}
-        end
+        # Use cast for async delivery to avoid blocking the caller
+        # This is critical for performance in hot paths (character updates)
+        GenServer.cast(MapEventRelay, {:deliver_event, event})
+        :ok
       else
+        Logger.debug(fn -> "MapEventRelay not available for event delivery (map: #{map_id})" end)
         {:error, :relay_not_available}
       end
     else

lib/wanderer_app/external_events/event.ex

@@ -20,6 +20,7 @@ defmodule WandererApp.ExternalEvents.Event do
           | :character_added
           | :character_removed
           | :character_updated
+          | :characters_updated
           | :map_kill
           | :acl_member_added
           | :acl_member_removed
@@ -42,50 +43,6 @@ defmodule WandererApp.ExternalEvents.Event do
 
   defstruct [:id, :map_id, :type, :payload, :timestamp]
 
-  @doc """
-  Creates a new external event with ULID for ordering.
-
-  Validates that the event_type is supported before creating the event.
-  """
-  @spec new(String.t(), event_type(), map()) :: t() | {:error, :invalid_event_type}
-  def new(map_id, event_type, payload) when is_binary(map_id) and is_map(payload) do
-    if valid_event_type?(event_type) do
-      %__MODULE__{
-        id: Ecto.ULID.generate(System.system_time(:millisecond)),
-        map_id: map_id,
-        type: event_type,
-        payload: payload,
-        timestamp: DateTime.utc_now()
-      }
-    else
-      raise ArgumentError,
-            "Invalid event type: #{inspect(event_type)}. Must be one of: #{supported_event_types() |> Enum.map(&to_string/1) |> Enum.join(", ")}"
-    end
-  end
-
-  @doc """
-  Converts an event to JSON format for delivery.
-  """
-  @spec to_json(t()) :: map()
-  def to_json(%__MODULE__{} = event) do
-    %{
-      "id" => event.id,
-      "type" => to_string(event.type),
-      "map_id" => event.map_id,
-      "timestamp" => DateTime.to_iso8601(event.timestamp),
-      "payload" => serialize_payload(event.payload)
-    }
-  end
-
-  # Convert Ash structs and other complex types to plain maps
-  defp serialize_payload(payload) when is_struct(payload) do
-    serialize_payload(payload, MapSet.new())
-  end
-
-  defp serialize_payload(payload) when is_map(payload) do
-    serialize_payload(payload, MapSet.new())
-  end
-
   # Define allowlisted fields for different struct types
   @system_fields [
     :id,
@@ -133,6 +90,73 @@ defmodule WandererApp.ExternalEvents.Event do
   ]
   @signature_fields [:id, :signature_id, :name, :type, :group]
 
+  @supported_event_types [
+    :add_system,
+    :deleted_system,
+    :system_renamed,
+    :system_metadata_changed,
+    :signatures_updated,
+    :signature_added,
+    :signature_removed,
+    :connection_added,
+    :connection_removed,
+    :connection_updated,
+    :character_added,
+    :character_removed,
+    :character_updated,
+    :characters_updated,
+    :map_kill,
+    :acl_member_added,
+    :acl_member_removed,
+    :acl_member_updated,
+    :rally_point_added,
+    :rally_point_removed
+  ]
+
+  @doc """
+  Creates a new external event with ULID for ordering.
+
+  Validates that the event_type is supported before creating the event.
+  """
+  @spec new(String.t(), event_type(), map()) :: t() | {:error, :invalid_event_type}
+  def new(map_id, event_type, payload) when is_binary(map_id) and is_map(payload) do
+    if valid_event_type?(event_type) do
+      %__MODULE__{
+        id: Ecto.ULID.generate(System.system_time(:millisecond)),
+        map_id: map_id,
+        type: event_type,
+        payload: payload,
+        timestamp: DateTime.utc_now()
+      }
+    else
+      raise ArgumentError,
+            "Invalid event type: #{inspect(event_type)}. Must be one of: #{supported_event_types() |> Enum.map(&to_string/1) |> Enum.join(", ")}"
+    end
+  end
+
+  @doc """
+  Converts an event to JSON format for delivery.
+  """
+  @spec to_json(t()) :: map()
+  def to_json(%__MODULE__{} = event) do
+    %{
+      "id" => event.id,
+      "type" => to_string(event.type),
+      "map_id" => event.map_id,
+      "timestamp" => DateTime.to_iso8601(event.timestamp),
+      "payload" => serialize_payload(event.payload)
+    }
+  end
+
+  # Convert Ash structs and other complex types to plain maps
+  defp serialize_payload(payload) when is_struct(payload) do
+    serialize_payload(payload, MapSet.new())
+  end
+
+  defp serialize_payload(payload) when is_map(payload) do
+    serialize_payload(payload, MapSet.new())
+  end
+
   # Overloaded versions with visited tracking
   defp serialize_payload(payload, visited) when is_struct(payload) do
     # Check for circular reference
@@ -193,29 +217,7 @@ defmodule WandererApp.ExternalEvents.Event do
   Returns all supported event types.
   """
   @spec supported_event_types() :: [event_type()]
-  def supported_event_types do
-    [
-      :add_system,
-      :deleted_system,
-      :system_renamed,
-      :system_metadata_changed,
-      :signatures_updated,
-      :signature_added,
-      :signature_removed,
-      :connection_added,
-      :connection_removed,
-      :connection_updated,
-      :character_added,
-      :character_removed,
-      :character_updated,
-      :map_kill,
-      :acl_member_added,
-      :acl_member_removed,
-      :acl_member_updated,
-      :rally_point_added,
-      :rally_point_removed
-    ]
-  end
+  def supported_event_types, do: @supported_event_types
 
   @doc """
   Validates an event type.

lib/wanderer_app/external_events/map_event_relay.ex

@@ -82,16 +82,9 @@ defmodule WandererApp.ExternalEvents.MapEventRelay do
 
   @impl true
   def handle_call({:deliver_event, %Event{} = event}, _from, state) do
-    # Log ACL events at info level for debugging
-    if event.type in [:acl_member_added, :acl_member_removed, :acl_member_updated] do
-      Logger.debug(fn ->
-        "MapEventRelay received :deliver_event (call) for map #{event.map_id}, type: #{event.type}"
-      end)
-    else
-      Logger.debug(fn ->
-        "MapEventRelay received :deliver_event (call) for map #{event.map_id}, type: #{event.type}"
-      end)
-    end
+    Logger.debug(fn ->
+      "MapEventRelay received :deliver_event (call) for map #{event.map_id}, type: #{event.type}"
+    end)
 
     new_state = deliver_single_event(event, state)
     {:reply, :ok, new_state}
@@ -162,26 +155,23 @@ defmodule WandererApp.ExternalEvents.MapEventRelay do
     # 1. Store in ETS for backfill
     store_event(event, state.ets_table)
 
-    # 2. Convert event to JSON for delivery methods
     event_json = Event.to_json(event)
 
-    Logger.debug(fn ->
-      "MapEventRelay converted event to JSON: #{inspect(String.slice(inspect(event_json), 0, 200))}..."
-    end)
-
-    # 3. Send to webhook subscriptions via WebhookDispatcher
     WebhookDispatcher.dispatch_event(event.map_id, event)
 
-    # 4. Broadcast to SSE clients
-    Logger.debug(fn -> "MapEventRelay broadcasting to SSE clients for map #{event.map_id}" end)
-    WandererApp.ExternalEvents.SseStreamManager.broadcast_event(event.map_id, event_json)
+    case WandererApp.ExternalEvents.SseAccessControl.sse_allowed?(event.map_id) do
+      :ok ->
+        WandererApp.ExternalEvents.SseStreamManager.broadcast_event(event.map_id, event_json)
 
-    # Emit delivered telemetry
-    :telemetry.execute(
-      [:wanderer_app, :external_events, :relay, :delivered],
-      %{count: 1},
-      %{map_id: event.map_id, event_type: event.type}
-    )
+        :telemetry.execute(
+          [:wanderer_app, :external_events, :relay, :delivered],
+          %{count: 1},
+          %{map_id: event.map_id, event_type: event.type}
+        )
+
+      {:error, _reason} ->
+        :ok
+    end
 
     %{state | event_count: state.event_count + 1}
   end

lib/wanderer_app/external_events/sse_access_control.ex

@@ -0,0 +1,71 @@
+defmodule WandererApp.ExternalEvents.SseAccessControl do
+  @moduledoc """
+  Handles SSE access control checks including subscription validation.
+
+  Note: Community Edition mode is automatically handled by the
+  WandererApp.Map.is_subscription_active?/1 function, which returns
+  {:ok, true} when subscriptions are disabled globally.
+  """
+
+  @doc """
+  Checks if SSE is allowed for a given map.
+
+  Returns:
+  - :ok if SSE is allowed
+  - {:error, reason} if SSE is not allowed
+
+  Checks in order:
+  1. Global SSE enabled (config)
+  2. Map exists
+  3. Map SSE enabled (per-map setting)
+  4. Subscription active (CE mode handled internally)
+  """
+  def sse_allowed?(map_id) do
+    with :ok <- check_sse_globally_enabled(),
+         {:ok, map} <- fetch_map(map_id),
+         :ok <- check_map_sse_enabled(map),
+         :ok <- check_subscription_or_ce(map_id) do
+      :ok
+    end
+  end
+
+  defp check_sse_globally_enabled do
+    if WandererApp.Env.sse_enabled?() do
+      :ok
+    else
+      {:error, :sse_globally_disabled}
+    end
+  end
+
+  # Fetches the map by ID.
+  # Returns {:ok, map} or {:error, :map_not_found}
+  defp fetch_map(map_id) do
+    case WandererApp.Api.Map.by_id(map_id) do
+      {:ok, _map} = result -> result
+      _ -> {:error, :map_not_found}
+    end
+  end
+
+  defp check_map_sse_enabled(map) do
+    if map.sse_enabled do
+      :ok
+    else
+      {:error, :sse_disabled_for_map}
+    end
+  end
+
+  # Checks if map has active subscription or if running Community Edition.
+  #
+  # Returns :ok if:
+  # - Community Edition (handled internally by is_subscription_active?/1), OR
+  # - Map has active subscription
+  #
+  # Returns {:error, :subscription_required} if subscription check fails.
+  defp check_subscription_or_ce(map_id) do
+    case WandererApp.Map.is_subscription_active?(map_id) do
+      {:ok, true} -> :ok
+      {:ok, false} -> {:error, :subscription_required}
+      {:error, _reason} = error -> error
+    end
+  end
+end

lib/wanderer_app/external_events/webhook_dispatcher.ex

@@ -90,7 +90,9 @@ defmodule WandererApp.ExternalEvents.WebhookDispatcher do
 
   @impl true
   def handle_cast({:dispatch_events, map_id, events}, state) do
-    Logger.debug(fn -> "WebhookDispatcher received #{length(events)} events for map #{map_id}" end)
+    Logger.debug(fn ->
+      "WebhookDispatcher received #{length(events)} events for map #{map_id}"
+    end)
 
     # Emit telemetry for batch events
     :telemetry.execute(
@@ -290,7 +292,7 @@ defmodule WandererApp.ExternalEvents.WebhookDispatcher do
 
     request = Finch.build(:post, url, headers, payload)
 
-    case Finch.request(request, WandererApp.Finch, timeout: 30_000) do
+    case Finch.request(request, WandererApp.Finch.Webhooks, timeout: 30_000) do
       {:ok, %Finch.Response{status: status}} ->
         {:ok, status}
 

lib/wanderer_app/init_corp_wallet_tracker_task.ex

@@ -31,7 +31,7 @@ defmodule WandererApp.StartCorpWalletTrackerTask do
 
     if not is_nil(admin_character) do
       :ok =
-        WandererApp.Character.TrackerManager.start_tracking(admin_character.id, keep_alive: true)
+        WandererApp.Character.TrackerManager.start_tracking(admin_character.id)
 
       {:ok, _pid} =
         WandererApp.Character.TrackerManager.start_transaction_tracker(admin_character.id)

lib/wanderer_app/kills/client.ex

@@ -546,7 +546,7 @@ defmodule WandererApp.Kills.Client do
     end
   end
 
-  defp check_health(%{socket_pid: pid, last_message_time: last_msg_time} = state)
+  defp check_health(%{socket_pid: pid, last_message_time: last_msg_time} = _state)
        when not is_nil(pid) and not is_nil(last_msg_time) do
     cond do
       not socket_alive?(pid) ->

lib/wanderer_app/kills/map_event_listener.ex

@@ -229,7 +229,7 @@ defmodule WandererApp.Kills.MapEventListener do
       {:error, :not_running} ->
         {:error, :not_running}
 
-      {:ok, status} ->
+      {:ok, _status} ->
         {:error, :not_connected}
 
       error ->

lib/wanderer_app/license/license_manager.ex

@@ -136,9 +136,6 @@ defmodule WandererApp.License.LicenseManager do
     end
   end
 
-  @doc """
-  Updates a license's expiration date based on the map's subscription.
-  """
   def update_license_expiration_from_subscription(map_id) do
     with {:ok, license} <- get_license_by_map_id(map_id),
          {:ok, subscription} <- SubscriptionManager.get_active_map_subscription(map_id) do
@@ -146,24 +143,15 @@ defmodule WandererApp.License.LicenseManager do
     end
   end
 
-  @doc """
-  Formats a datetime as YYYY-MM-DD.
-  """
   defp format_date(datetime) do
     Calendar.strftime(datetime, "%Y-%m-%d")
   end
 
-  @doc """
-  Generates a link to the map.
-  """
   defp generate_map_link(map_slug) do
     base_url = Application.get_env(:wanderer_app, :web_app_url)
     "#{base_url}/#{map_slug}"
   end
 
-  @doc """
-  Gets the map owner's data.
-  """
   defp get_map_owner_email(map) do
     {:ok, %{owner: owner}} = map |> Ash.load([:owner])
     "#{owner.name}(#{owner.eve_id})"

lib/wanderer_app/license/license_manager_client.ex

@@ -135,7 +135,7 @@ defmodule WandererApp.License.LicenseManagerClient do
     Application.get_env(:wanderer_app, :license_manager)[:auth_key]
   end
 
-  defp parse_error_response(status, %{"error" => error_message}) do
+  defp parse_error_response(_status, %{"error" => error_message}) do
     {:error, error_message}
   end
 

lib/wanderer_app/map.ex

@@ -53,8 +53,8 @@ defmodule WandererApp.Map do
       {:ok, map} ->
         map
 
-      _ ->
-        Logger.error(fn -> "Failed to get map #{map_id}" end)
+      error ->
+        Logger.error("Failed to get map #{map_id}: #{inspect(error)}")
         %{}
     end
   end
@@ -134,6 +134,22 @@ defmodule WandererApp.Map do
   def get_options(map_id),
     do: {:ok, map_id |> get_map!() |> Map.get(:options, Map.new())}
 
+  def get_tracked_character_ids(map_id) do
+    {:ok,
+     map_id
+     |> get_map!()
+     |> Map.get(:characters, [])
+     |> Enum.filter(fn character_id ->
+       {:ok, tracking_start_time} =
+         WandererApp.Cache.lookup(
+           "character:#{character_id}:map:#{map_id}:tracking_start_time",
+           nil
+         )
+
+       not is_nil(tracking_start_time)
+     end)}
+  end
+
   @doc """
   Returns a full list of characters in the map
   """
@@ -183,9 +199,31 @@ defmodule WandererApp.Map do
 
   def add_characters!(map, []), do: map
 
-  def add_characters!(%{map_id: map_id} = map, [character | rest]) do
-    add_character(map_id, character)
-    add_characters!(map, rest)
+  def add_characters!(%{map_id: map_id} = map, characters) when is_list(characters) do
+    # Get current characters list once
+    current_characters = Map.get(map, :characters, [])
+
+    characters_ids =
+      characters
+      |> Enum.map(fn %{character_id: char_id} -> char_id end)
+
+    # Filter out characters that already exist
+    new_character_ids =
+      characters_ids
+      |> Enum.reject(fn char_id -> char_id in current_characters end)
+
+    # If all characters already exist, return early
+    if new_character_ids == [] do
+      map
+    else
+      case update_map(map_id, %{characters: new_character_ids ++ current_characters}) do
+        {:commit, map} ->
+          map
+
+        _ ->
+          map
+      end
+    end
   end
 
   def add_character(
@@ -198,64 +236,13 @@ defmodule WandererApp.Map do
 
     case not (characters |> Enum.member?(character_id)) do
       true ->
-        WandererApp.Character.get_map_character(map_id, character_id)
-        |> case do
-          {:ok,
-           %{
-             alliance_id: alliance_id,
-             corporation_id: corporation_id,
-             solar_system_id: solar_system_id,
-             structure_id: structure_id,
-             station_id: station_id,
-             ship: ship_type_id,
-             ship_name: ship_name
-           }} ->
-            map_id
-            |> update_map(%{characters: [character_id | characters]})
+        map_id
+        |> update_map(%{characters: [character_id | characters]})
 
-            # WandererApp.Cache.insert(
-            #   "map:#{map_id}:character:#{character_id}:alliance_id",
-            #   alliance_id
-            # )
-
-            # WandererApp.Cache.insert(
-            #   "map:#{map_id}:character:#{character_id}:corporation_id",
-            #   corporation_id
-            # )
-
-            # WandererApp.Cache.insert(
-            #   "map:#{map_id}:character:#{character_id}:solar_system_id",
-            #   solar_system_id
-            # )
-
-            # WandererApp.Cache.insert(
-            #   "map:#{map_id}:character:#{character_id}:structure_id",
-            #   structure_id
-            # )
-
-            # WandererApp.Cache.insert(
-            #   "map:#{map_id}:character:#{character_id}:station_id",
-            #   station_id
-            # )
-
-            # WandererApp.Cache.insert(
-            #   "map:#{map_id}:character:#{character_id}:ship_type_id",
-            #   ship_type_id
-            # )
-
-            # WandererApp.Cache.insert(
-            #   "map:#{map_id}:character:#{character_id}:ship_name",
-            #   ship_name
-            # )
-
-            :ok
-
-          error ->
-            error
-        end
+        :ok
 
       _ ->
-        {:error, :already_exists}
+        :ok
     end
   end
 
@@ -532,15 +519,16 @@ defmodule WandererApp.Map do
         solar_system_source,
         solar_system_target
       ) do
-    case map_id
-         |> get_map!()
-         |> Map.get(:connections, Map.new())
+    connections =
+      map_id
+      |> get_map!()
+      |> Map.get(:connections, Map.new())
+
+    case connections
          |> Map.get("#{solar_system_source}_#{solar_system_target}") do
       nil ->
         {:ok,
-         map_id
-         |> get_map!()
-         |> Map.get(:connections, Map.new())
+         connections
          |> Map.get("#{solar_system_target}_#{solar_system_source}")}
 
       connection ->

lib/wanderer_app/map/cache_rtree.ex

@@ -23,7 +23,8 @@ defmodule WandererApp.Map.CacheRTree do
 
   alias WandererApp.Cache
 
-  @grid_size 150  # Grid cell size in pixels
+  # Grid cell size in pixels
+  @grid_size 150
 
   # Type definitions matching DDRT behavior
   @type id :: number() | String.t()
@@ -59,19 +60,26 @@ defmodule WandererApp.Map.CacheRTree do
 
     # Update leaves storage
     current_leaves = get_leaves(name)
-    new_leaves = Enum.reduce(leaves, current_leaves, fn {id, box}, acc ->
-      Map.put(acc, id, {id, box})
-    end)
+
+    new_leaves =
+      Enum.reduce(leaves, current_leaves, fn {id, box}, acc ->
+        Map.put(acc, id, {id, box})
+      end)
+
     put_leaves(name, new_leaves)
 
     # Update spatial grid
     current_grid = get_grid(name)
-    new_grid = Enum.reduce(leaves, current_grid, fn leaf, grid ->
-      add_to_grid(grid, leaf)
-    end)
+
+    new_grid =
+      Enum.reduce(leaves, current_grid, fn leaf, grid ->
+        add_to_grid(grid, leaf)
+      end)
+
     put_grid(name, new_grid)
 
-    {:ok, %{}}  # Match DRTree return format
+    # Match DRTree return format
+    {:ok, %{}}
   end
 
   @doc """
@@ -97,17 +105,19 @@ defmodule WandererApp.Map.CacheRTree do
     current_grid = get_grid(name)
 
     # Remove from leaves and track bounding boxes for grid cleanup
-    {new_leaves, removed} = Enum.reduce(ids, {current_leaves, []}, fn id, {leaves, removed} ->
-      case Map.pop(leaves, id) do
-        {nil, leaves} -> {leaves, removed}
-        {{^id, box}, leaves} -> {leaves, [{id, box} | removed]}
-      end
-    end)
+    {new_leaves, removed} =
+      Enum.reduce(ids, {current_leaves, []}, fn id, {leaves, removed} ->
+        case Map.pop(leaves, id) do
+          {nil, leaves} -> {leaves, removed}
+          {{^id, box}, leaves} -> {leaves, [{id, box} | removed]}
+        end
+      end)
 
     # Update grid
-    new_grid = Enum.reduce(removed, current_grid, fn {id, box}, grid ->
-      remove_from_grid(grid, id, box)
-    end)
+    new_grid =
+      Enum.reduce(removed, current_grid, fn {id, box}, grid ->
+        remove_from_grid(grid, id, box)
+      end)
 
     put_leaves(name, new_leaves)
     put_grid(name, new_grid)
@@ -133,17 +143,21 @@ defmodule WandererApp.Map.CacheRTree do
   """
   @impl true
   def update(id, box_or_tuple, name) do
-    {old_box, new_box} = case box_or_tuple do
-      {old, new} ->
-        {old, new}
-      box ->
-        # Need to look up old box
-        leaves = get_leaves(name)
-        case Map.get(leaves, id) do
-          {^id, old} -> {old, box}
-          nil -> {nil, box}  # Will be handled as new insert
-        end
-    end
+    {old_box, new_box} =
+      case box_or_tuple do
+        {old, new} ->
+          {old, new}
+
+        box ->
+          # Need to look up old box
+          leaves = get_leaves(name)
+
+          case Map.get(leaves, id) do
+            {^id, old} -> {old, box}
+            # Will be handled as new insert
+            nil -> {nil, box}
+          end
+      end
 
     # Delete old, insert new
     if old_box, do: delete([id], name)
@@ -184,6 +198,7 @@ defmodule WandererApp.Map.CacheRTree do
 
     # Precise intersection test
     leaves = get_leaves(name)
+
     matching_ids =
       Enum.filter(candidate_ids, fn id ->
         case Map.get(leaves, id) do
@@ -216,6 +231,7 @@ defmodule WandererApp.Map.CacheRTree do
       iex> CacheRTree.init_tree("rtree_map_456", %{width: 150, verbose: false})
       :ok
   """
+  @impl true
   def init_tree(name, config \\ %{}) do
     Cache.put(cache_key(name, :leaves), %{})
     Cache.put(cache_key(name, :grid), %{})
@@ -319,6 +335,7 @@ defmodule WandererApp.Map.CacheRTree do
 
   # Floor division that works correctly with negative numbers
   defp div_floor(a, b) when a >= 0, do: div(a, b)
+
   defp div_floor(a, b) when a < 0 do
     case rem(a, b) do
       0 -> div(a, b)
@@ -331,9 +348,9 @@ defmodule WandererApp.Map.CacheRTree do
     [{x1_min, x1_max}, {y1_min, y1_max}] = box1
     [{x2_min, x2_max}, {y2_min, y2_max}] = box2
 
-    # Boxes intersect if they overlap on both axes
-    x_overlap = x1_min <= x2_max and x2_min <= x1_max
-    y_overlap = y1_min <= y2_max and y2_min <= y1_max
+    # Boxes intersect if they overlap on both axes (strict intersection - not just touching)
+    x_overlap = x1_min < x2_max and x2_min < x1_max
+    y_overlap = y1_min < y2_max and y2_min < y1_max
 
     x_overlap and y_overlap
   end

lib/wanderer_app/map/map_garbage_collector.ex

@@ -0,0 +1,38 @@
+defmodule WandererApp.Map.GarbageCollector do
+  @moduledoc """
+  Manager map subscription plans
+  """
+
+  require Logger
+  require Ash.Query
+
+  @logger Application.compile_env(:wanderer_app, :logger)
+  @one_week_seconds 7 * 24 * 60 * 60
+  @two_weeks_seconds 14 * 24 * 60 * 60
+
+  def cleanup_chain_passages() do
+    Logger.info("Start cleanup old map chain passages...")
+
+    WandererApp.Api.MapChainPassages
+    |> Ash.Query.filter(updated_at: [less_than: get_cutoff_time(@one_week_seconds)])
+    |> Ash.bulk_destroy!(:destroy, %{}, batch_size: 100)
+
+    @logger.info(fn -> "All map chain passages processed" end)
+
+    :ok
+  end
+
+  def cleanup_system_signatures() do
+    Logger.info("Start cleanup old map system signatures...")
+
+    WandererApp.Api.MapSystemSignature
+    |> Ash.Query.filter(updated_at: [less_than: get_cutoff_time(@two_weeks_seconds)])
+    |> Ash.bulk_destroy!(:destroy, %{}, batch_size: 100)
+
+    @logger.info(fn -> "All map system signatures processed" end)
+
+    :ok
+  end
+
+  defp get_cutoff_time(seconds), do: DateTime.utc_now() |> DateTime.add(-seconds, :second)
+end

lib/wanderer_app/map/map_manager.ex

@@ -9,8 +9,8 @@ defmodule WandererApp.Map.Manager do
 
   alias WandererApp.Map.Server
 
-  @maps_start_per_second 10
-  @maps_start_interval 1000
+  @maps_start_chunk_size 20
+  @maps_start_interval 500
   @maps_queue :maps_queue
   @check_maps_queue_interval :timer.seconds(1)
 
@@ -58,10 +58,6 @@ defmodule WandererApp.Map.Manager do
     {:ok, pings_cleanup_timer} =
       :timer.send_interval(@pings_cleanup_interval, :cleanup_pings)
 
-    safe_async_task(fn ->
-      start_last_active_maps()
-    end)
-
     {:ok,
      %{
        check_maps_queue_timer: check_maps_queue_timer,
@@ -134,26 +130,12 @@ defmodule WandererApp.Map.Manager do
     end
   end
 
-  defp start_last_active_maps() do
-    {:ok, last_map_states} =
-      WandererApp.Api.MapState.get_last_active(
-        DateTime.utc_now()
-        |> DateTime.add(-30, :minute)
-      )
-
-    last_map_states
-    |> Enum.map(fn %{map_id: map_id} -> map_id end)
-    |> Enum.each(fn map_id -> start_map(map_id) end)
-
-    :ok
-  end
-
   defp start_maps() do
     chunks =
       @maps_queue
       |> WandererApp.Queue.to_list!()
       |> Enum.uniq()
-      |> Enum.chunk_every(@maps_start_per_second)
+      |> Enum.chunk_every(@maps_start_chunk_size)
 
     WandererApp.Queue.clear(@maps_queue)
 

lib/wanderer_app/map/map_pool.ex

@@ -4,7 +4,7 @@ defmodule WandererApp.Map.MapPool do
 
   require Logger
 
-  alias WandererApp.Map.Server
+  alias WandererApp.Map.{MapPoolState, Server}
 
   defstruct [
     :map_ids,
@@ -15,8 +15,9 @@ defmodule WandererApp.Map.MapPool do
   @cache :map_pool_cache
   @registry :map_pool_registry
   @unique_registry :unique_map_pool_registry
+  @map_pool_limit 10
 
-  @garbage_collection_interval :timer.hours(12)
+  @garbage_collection_interval :timer.hours(4)
   @systems_cleanup_timeout :timer.minutes(30)
   @characters_cleanup_timeout :timer.minutes(5)
   @connections_cleanup_timeout :timer.minutes(5)
@@ -25,7 +26,17 @@ defmodule WandererApp.Map.MapPool do
   def new(), do: __struct__()
   def new(args), do: __struct__(args)
 
-  def start_link(map_ids) do
+  # Accept both {uuid, map_ids} tuple (from supervisor restart) and just map_ids (legacy)
+  def start_link({uuid, map_ids}) when is_binary(uuid) and is_list(map_ids) do
+    GenServer.start_link(
+      @name,
+      {uuid, map_ids},
+      name: Module.concat(__MODULE__, uuid)
+    )
+  end
+
+  # For backward compatibility - generate UUID if only map_ids provided
+  def start_link(map_ids) when is_list(map_ids) do
     uuid = UUID.uuid1()
 
     GenServer.start_link(
@@ -37,13 +48,42 @@ defmodule WandererApp.Map.MapPool do
 
   @impl true
   def init({uuid, map_ids}) do
-    {:ok, _} = Registry.register(@unique_registry, Module.concat(__MODULE__, uuid), map_ids)
+    # Check for crash recovery - if we have previous state in ETS, merge it with new map_ids
+    {final_map_ids, recovery_info} =
+      case MapPoolState.get_pool_state(uuid) do
+        {:ok, recovered_map_ids} ->
+          # Merge and deduplicate map IDs
+          merged = Enum.uniq(recovered_map_ids ++ map_ids)
+          recovery_count = length(recovered_map_ids)
+
+          Logger.info(
+            "[Map Pool #{uuid}] Crash recovery detected: recovering #{recovery_count} maps",
+            pool_uuid: uuid,
+            recovered_maps: recovered_map_ids,
+            new_maps: map_ids,
+            total_maps: length(merged)
+          )
+
+          # Emit telemetry for crash recovery
+          :telemetry.execute(
+            [:wanderer_app, :map_pool, :recovery, :start],
+            %{recovered_map_count: recovery_count, total_map_count: length(merged)},
+            %{pool_uuid: uuid}
+          )
+
+          {merged, %{recovered: true, count: recovery_count}}
+
+        {:error, :not_found} ->
+          # Normal startup, no previous state to recover
+          {map_ids, %{recovered: false}}
+      end
+
+    # Register with empty list - maps will be added as they're started in handle_continue
+    {:ok, _} = Registry.register(@unique_registry, Module.concat(__MODULE__, uuid), [])
     {:ok, _} = Registry.register(@registry, __MODULE__, uuid)
 
-    map_ids
-    |> Enum.each(fn id ->
-      Cachex.put(@cache, id, uuid)
-    end)
+    # Don't pre-populate cache - will be populated as maps start in handle_continue
+    # This prevents duplicates when recovering
 
     state =
       %{
@@ -52,23 +92,100 @@ defmodule WandererApp.Map.MapPool do
       }
       |> new()
 
-    {:ok, state, {:continue, {:start, map_ids}}}
+    {:ok, state, {:continue, {:start, {final_map_ids, recovery_info}}}}
   end
 
   @impl true
-  def terminate(_reason, _state) do
+  def terminate(reason, %{uuid: uuid} = _state) do
+    # On graceful shutdown, clean up ETS state
+    # On crash, keep ETS state for recovery
+    case reason do
+      :normal ->
+        Logger.debug("[Map Pool #{uuid}] Graceful shutdown, cleaning up ETS state")
+        MapPoolState.delete_pool_state(uuid)
+
+      :shutdown ->
+        Logger.debug("[Map Pool #{uuid}] Graceful shutdown, cleaning up ETS state")
+        MapPoolState.delete_pool_state(uuid)
+
+      {:shutdown, _} ->
+        Logger.debug("[Map Pool #{uuid}] Graceful shutdown, cleaning up ETS state")
+        MapPoolState.delete_pool_state(uuid)
+
+      _ ->
+        Logger.warning(
+          "[Map Pool #{uuid}] Abnormal termination (#{inspect(reason)}), keeping ETS state for recovery"
+        )
+
+        # Keep ETS state for crash recovery
+        :ok
+    end
+
     :ok
   end
 
   @impl true
-  def handle_continue({:start, map_ids}, state) do
+  def handle_continue({:start, {map_ids, recovery_info}}, state) do
     Logger.info("#{@name} started")
 
-    map_ids
-    |> Enum.each(fn map_id ->
-      GenServer.cast(self(), {:start_map, map_id})
-    end)
+    # Track recovery statistics
+    start_time = System.monotonic_time(:millisecond)
+    initial_count = length(map_ids)
 
+    # Start maps synchronously and accumulate state changes
+    {new_state, failed_maps} =
+      map_ids
+      |> Enum.reduce({state, []}, fn map_id, {current_state, failed} ->
+        case do_start_map(map_id, current_state) do
+          {:ok, updated_state} ->
+            {updated_state, failed}
+
+          {:error, reason} ->
+            Logger.error("[Map Pool] Failed to start map #{map_id}: #{reason}")
+
+            # Emit telemetry for individual map recovery failure
+            if recovery_info.recovered do
+              :telemetry.execute(
+                [:wanderer_app, :map_pool, :recovery, :map_failed],
+                %{map_id: map_id},
+                %{pool_uuid: state.uuid, reason: reason}
+              )
+            end
+
+            {current_state, [map_id | failed]}
+        end
+      end)
+
+    # Calculate final statistics
+    end_time = System.monotonic_time(:millisecond)
+    duration_ms = end_time - start_time
+    successful_count = length(new_state.map_ids)
+    failed_count = length(failed_maps)
+
+    # Log and emit telemetry for recovery completion
+    if recovery_info.recovered do
+      Logger.info(
+        "[Map Pool #{state.uuid}] Crash recovery completed: #{successful_count}/#{initial_count} maps recovered in #{duration_ms}ms",
+        pool_uuid: state.uuid,
+        recovered_count: successful_count,
+        failed_count: failed_count,
+        total_count: initial_count,
+        duration_ms: duration_ms,
+        failed_maps: failed_maps
+      )
+
+      :telemetry.execute(
+        [:wanderer_app, :map_pool, :recovery, :complete],
+        %{
+          recovered_count: successful_count,
+          failed_count: failed_count,
+          duration_ms: duration_ms
+        },
+        %{pool_uuid: state.uuid}
+      )
+    end
+
+    # Schedule periodic tasks
     Process.send_after(self(), :backup_state, @backup_state_timeout)
     Process.send_after(self(), :cleanup_systems, 15_000)
     Process.send_after(self(), :cleanup_characters, @characters_cleanup_timeout)
@@ -77,56 +194,372 @@ defmodule WandererApp.Map.MapPool do
     # Start message queue monitoring
     Process.send_after(self(), :monitor_message_queue, :timer.seconds(30))
 
-    {:noreply, state}
+    {:noreply, new_state}
+  end
+
+  @impl true
+  def handle_continue({:init_map, map_id}, %{uuid: uuid} = state) do
+    # Perform the actual map initialization asynchronously
+    # This runs after the GenServer.call has already returned
+    start_time = System.monotonic_time(:millisecond)
+
+    try do
+      # Initialize the map state and start the map server using extracted helper
+      do_initialize_map_server(map_id)
+
+      duration = System.monotonic_time(:millisecond) - start_time
+
+      Logger.info("[Map Pool #{uuid}] Map #{map_id} initialized successfully in #{duration}ms")
+
+      # Emit telemetry for slow initializations
+      if duration > 5_000 do
+        Logger.warning("[Map Pool #{uuid}] Slow map initialization: #{map_id} took #{duration}ms")
+
+        :telemetry.execute(
+          [:wanderer_app, :map_pool, :slow_init],
+          %{duration_ms: duration},
+          %{map_id: map_id, pool_uuid: uuid}
+        )
+      end
+
+      {:noreply, state}
+    rescue
+      e ->
+        duration = System.monotonic_time(:millisecond) - start_time
+
+        Logger.error("""
+        [Map Pool #{uuid}] Failed to initialize map #{map_id} after #{duration}ms: #{Exception.message(e)}
+        #{Exception.format_stacktrace(__STACKTRACE__)}
+        """)
+
+        # Rollback: Remove from state, registry, cache, and ETS using extracted helper
+        new_state = do_unregister_map(map_id, uuid, state)
+
+        # Emit telemetry for failed initialization
+        :telemetry.execute(
+          [:wanderer_app, :map_pool, :init_failed],
+          %{duration_ms: duration},
+          %{map_id: map_id, pool_uuid: uuid, reason: Exception.message(e)}
+        )
+
+        {:noreply, new_state}
+    end
   end
 
   @impl true
   def handle_cast(:stop, state), do: {:stop, :normal, state}
 
   @impl true
-  def handle_cast({:start_map, map_id}, %{map_ids: map_ids, uuid: uuid} = state) do
-    if map_id not in map_ids do
-      Registry.update_value(@unique_registry, Module.concat(__MODULE__, uuid), fn r_map_ids ->
-        [map_id | r_map_ids]
+  def handle_call({:start_map, map_id}, _from, %{map_ids: map_ids, uuid: uuid} = state) do
+    # Enforce capacity limit to prevent pool overload due to race conditions
+    if length(map_ids) >= @map_pool_limit do
+      Logger.warning(
+        "[Map Pool #{uuid}] Pool at capacity (#{length(map_ids)}/#{@map_pool_limit}), " <>
+          "rejecting map #{map_id} and triggering new pool creation"
+      )
+
+      # Trigger a new pool creation attempt asynchronously
+      # This allows the system to create a new pool for this map
+      spawn(fn ->
+        WandererApp.Map.MapPoolDynamicSupervisor.start_map(map_id)
       end)
 
-      Cachex.put(@cache, map_id, uuid)
-
-      map_id
-      |> WandererApp.Map.get_map_state!()
-      |> Server.Impl.start_map()
-
-      {:noreply, %{state | map_ids: [map_id | map_ids]}}
+      {:reply, :ok, state}
     else
-      {:noreply, state}
+      # Check if map is already started or being initialized
+      if map_id in map_ids do
+        Logger.debug("[Map Pool #{uuid}] Map #{map_id} already in pool")
+        {:reply, {:ok, :already_started}, state}
+      else
+        # Pre-register the map in registry and cache to claim ownership
+        # This prevents race conditions where multiple pools try to start the same map
+        registry_result =
+          Registry.update_value(@unique_registry, Module.concat(__MODULE__, uuid), fn r_map_ids ->
+            [map_id | r_map_ids]
+          end)
+
+        case registry_result do
+          {_new_value, _old_value} ->
+            # Add to cache
+            Cachex.put(@cache, map_id, uuid)
+
+            # Add to state
+            new_state = %{state | map_ids: [map_id | map_ids]}
+
+            # Persist state to ETS
+            MapPoolState.save_pool_state(uuid, new_state.map_ids)
+
+            Logger.debug("[Map Pool #{uuid}] Map #{map_id} queued for async initialization")
+
+            # Return immediately and initialize asynchronously
+            {:reply, {:ok, :initializing}, new_state, {:continue, {:init_map, map_id}}}
+
+          :error ->
+            Logger.error("[Map Pool #{uuid}] Failed to register map #{map_id} in registry")
+            {:reply, {:error, :registration_failed}, state}
+        end
+      end
     end
   end
 
   @impl true
-  def handle_cast(
+  def handle_call(
         {:stop_map, map_id},
-        %{map_ids: map_ids, uuid: uuid} = state
+        _from,
+        state
       ) do
+    case do_stop_map(map_id, state) do
+      {:ok, new_state} ->
+        {:reply, :ok, new_state}
+
+      {:error, reason} ->
+        {:reply, {:error, reason}, state}
+    end
+  end
+
+  defp do_start_map(map_id, %{map_ids: map_ids, uuid: uuid} = state) do
+    if map_id in map_ids do
+      # Map already started
+      {:ok, state}
+    else
+      # Track what operations succeeded for potential rollback
+      completed_operations = []
+
+      try do
+        # Step 1: Update Registry (most critical, do first)
+        registry_result =
+          Registry.update_value(@unique_registry, Module.concat(__MODULE__, uuid), fn r_map_ids ->
+            [map_id | r_map_ids]
+          end)
+
+        completed_operations = [:registry | completed_operations]
+
+        case registry_result do
+          {new_value, _old_value} when is_list(new_value) ->
+            :ok
+
+          :error ->
+            raise "Failed to update registry for pool #{uuid}"
+        end
+
+        # Step 2: Add to cache
+        case Cachex.put(@cache, map_id, uuid) do
+          {:ok, _} ->
+            :ok
+
+          {:error, reason} ->
+            raise "Failed to add to cache: #{inspect(reason)}"
+        end
+
+        completed_operations = [:cache | completed_operations]
+
+        # Step 3: Start the map server using extracted helper
+        do_initialize_map_server(map_id)
+
+        completed_operations = [:map_server | completed_operations]
+
+        # Step 4: Update GenServer state (last, as this is in-memory and fast)
+        new_state = %{state | map_ids: [map_id | map_ids]}
+
+        # Step 5: Persist state to ETS for crash recovery
+        MapPoolState.save_pool_state(uuid, new_state.map_ids)
+
+        Logger.debug("[Map Pool] Successfully started map #{map_id} in pool #{uuid}")
+        {:ok, new_state}
+      rescue
+        e ->
+          Logger.error("""
+          [Map Pool] Failed to start map #{map_id} (completed: #{inspect(completed_operations)}): #{Exception.message(e)}
+          #{Exception.format_stacktrace(__STACKTRACE__)}
+          """)
+
+          # Attempt rollback of completed operations
+          rollback_start_map_operations(map_id, uuid, completed_operations)
+
+          {:error, Exception.message(e)}
+      end
+    end
+  end
+
+  defp rollback_start_map_operations(map_id, uuid, completed_operations) do
+    Logger.warning("[Map Pool] Attempting to rollback start_map operations for #{map_id}")
+
+    # Rollback in reverse order
+    if :map_server in completed_operations do
+      Logger.debug("[Map Pool] Rollback: Stopping map server for #{map_id}")
+
+      try do
+        Server.Impl.stop_map(map_id)
+      rescue
+        e ->
+          Logger.error("[Map Pool] Rollback failed to stop map server: #{Exception.message(e)}")
+      end
+    end
+
+    if :cache in completed_operations do
+      Logger.debug("[Map Pool] Rollback: Removing #{map_id} from cache")
+
+      case Cachex.del(@cache, map_id) do
+        {:ok, _} ->
+          :ok
+
+        {:error, reason} ->
+          Logger.error("[Map Pool] Rollback failed for cache: #{inspect(reason)}")
+      end
+    end
+
+    if :registry in completed_operations do
+      Logger.debug("[Map Pool] Rollback: Removing #{map_id} from registry")
+
+      try do
+        Registry.update_value(@unique_registry, Module.concat(__MODULE__, uuid), fn r_map_ids ->
+          r_map_ids |> Enum.reject(fn id -> id == map_id end)
+        end)
+      rescue
+        e ->
+          Logger.error("[Map Pool] Rollback failed for registry: #{Exception.message(e)}")
+      end
+    end
+  end
+
+  defp do_stop_map(map_id, %{map_ids: map_ids, uuid: uuid} = state) do
+    # Track what operations succeeded for potential rollback
+    completed_operations = []
+
+    try do
+      # Step 1: Update Registry (most critical, do first)
+      registry_result =
+        Registry.update_value(@unique_registry, Module.concat(__MODULE__, uuid), fn r_map_ids ->
+          r_map_ids |> Enum.reject(fn id -> id == map_id end)
+        end)
+
+      completed_operations = [:registry | completed_operations]
+
+      case registry_result do
+        {new_value, _old_value} when is_list(new_value) ->
+          :ok
+
+        :error ->
+          raise "Failed to update registry for pool #{uuid}"
+      end
+
+      # Step 2: Delete from cache
+      case Cachex.del(@cache, map_id) do
+        {:ok, _} ->
+          :ok
+
+        {:error, reason} ->
+          raise "Failed to delete from cache: #{inspect(reason)}"
+      end
+
+      completed_operations = [:cache | completed_operations]
+
+      # Step 3: Stop the map server (clean up all map resources)
+      map_id
+      |> Server.Impl.stop_map()
+
+      completed_operations = [:map_server | completed_operations]
+
+      # Step 4: Update GenServer state (last, as this is in-memory and fast)
+      new_state = %{state | map_ids: map_ids |> Enum.reject(fn id -> id == map_id end)}
+
+      # Step 5: Persist state to ETS for crash recovery
+      MapPoolState.save_pool_state(uuid, new_state.map_ids)
+
+      Logger.debug("[Map Pool] Successfully stopped map #{map_id} from pool #{uuid}")
+      {:ok, new_state}
+    rescue
+      e ->
+        Logger.error("""
+        [Map Pool] Failed to stop map #{map_id} (completed: #{inspect(completed_operations)}): #{Exception.message(e)}
+        #{Exception.format_stacktrace(__STACKTRACE__)}
+        """)
+
+        # Attempt rollback of completed operations
+        rollback_stop_map_operations(map_id, uuid, completed_operations)
+
+        {:error, Exception.message(e)}
+    end
+  end
+
+  # Helper function to initialize the map server (no state management)
+  # This extracts the common map initialization logic used in both
+  # synchronous (do_start_map) and asynchronous ({:init_map, map_id}) paths
+  defp do_initialize_map_server(map_id) do
+    map_id
+    |> WandererApp.Map.get_map_state!()
+    |> Server.Impl.start_map()
+  end
+
+  # Helper function to unregister a map from all tracking
+  # Used for rollback when map initialization fails in the async path
+  defp do_unregister_map(map_id, uuid, state) do
+    # Remove from registry
     Registry.update_value(@unique_registry, Module.concat(__MODULE__, uuid), fn r_map_ids ->
-      r_map_ids |> Enum.reject(fn id -> id == map_id end)
+      Enum.reject(r_map_ids, &(&1 == map_id))
     end)
 
+    # Remove from cache
     Cachex.del(@cache, map_id)
 
-    map_id
-    |> Server.Impl.stop_map()
+    # Update state
+    new_state = %{state | map_ids: Enum.reject(state.map_ids, &(&1 == map_id))}
 
-    {:noreply, %{state | map_ids: map_ids |> Enum.reject(fn id -> id == map_id end)}}
+    # Update ETS
+    MapPoolState.save_pool_state(uuid, new_state.map_ids)
+
+    new_state
+  end
+
+  defp rollback_stop_map_operations(map_id, uuid, completed_operations) do
+    Logger.warning("[Map Pool] Attempting to rollback stop_map operations for #{map_id}")
+
+    # Rollback in reverse order
+    if :cache in completed_operations do
+      Logger.debug("[Map Pool] Rollback: Re-adding #{map_id} to cache")
+
+      case Cachex.put(@cache, map_id, uuid) do
+        {:ok, _} ->
+          :ok
+
+        {:error, reason} ->
+          Logger.error("[Map Pool] Rollback failed for cache: #{inspect(reason)}")
+      end
+    end
+
+    if :registry in completed_operations do
+      Logger.debug("[Map Pool] Rollback: Re-adding #{map_id} to registry")
+
+      try do
+        Registry.update_value(@unique_registry, Module.concat(__MODULE__, uuid), fn r_map_ids ->
+          if map_id in r_map_ids do
+            r_map_ids
+          else
+            [map_id | r_map_ids]
+          end
+        end)
+      rescue
+        e ->
+          Logger.error("[Map Pool] Rollback failed for registry: #{Exception.message(e)}")
+      end
+    end
+
+    # Note: We don't rollback map_server stop as Server.Impl.stop_map() is idempotent
+    # and the cleanup operations are safe to leave in a "stopped" state
   end
 
   @impl true
   def handle_call(:error, _, state), do: {:stop, :error, :ok, state}
 
   @impl true
-  def handle_info(:backup_state, %{map_ids: map_ids} = state) do
+  def handle_info(:backup_state, %{map_ids: map_ids, uuid: uuid} = state) do
     Process.send_after(self(), :backup_state, @backup_state_timeout)
 
     try do
+      # Persist pool state to ETS
+      MapPoolState.save_pool_state(uuid, map_ids)
+
+      # Backup individual map states to database
       map_ids
       |> Task.async_stream(
         fn map_id ->
@@ -231,25 +664,38 @@ defmodule WandererApp.Map.MapPool do
     Process.send_after(self(), :garbage_collect, @garbage_collection_interval)
 
     try do
-      map_ids
-      |> Enum.each(fn map_id ->
-        # presence_character_ids =
-        #   WandererApp.Cache.lookup!("map_#{map_id}:presence_character_ids", [])
+      # Process each map and accumulate state changes
+      new_state =
+        map_ids
+        |> Enum.reduce(state, fn map_id, current_state ->
+          presence_character_ids =
+            WandererApp.Cache.lookup!("map_#{map_id}:presence_character_ids", [])
 
-        # if presence_character_ids |> Enum.empty?() do
-        Logger.info(
-          "#{uuid}: No more characters present on: #{map_id}, shutting down map server..."
-        )
+          if presence_character_ids |> Enum.empty?() do
+            Logger.info(
+              "#{uuid}: No more characters present on: #{map_id}, shutting down map server..."
+            )
 
-        GenServer.cast(self(), {:stop_map, map_id})
-        # end
-      end)
+            case do_stop_map(map_id, current_state) do
+              {:ok, updated_state} ->
+                Logger.debug("#{uuid}: Successfully stopped map #{map_id}")
+                updated_state
+
+              {:error, reason} ->
+                Logger.error("#{uuid}: Failed to stop map #{map_id}: #{reason}")
+                current_state
+            end
+          else
+            current_state
+          end
+        end)
+
+      {:noreply, new_state}
     rescue
       e ->
-        Logger.error(Exception.message(e))
+        Logger.error("#{uuid}: Garbage collection error: #{Exception.message(e)}")
+        {:noreply, state}
     end
-
-    {:noreply, state}
   end
 
   @impl true
@@ -277,40 +723,69 @@ defmodule WandererApp.Map.MapPool do
     {:noreply, state}
   end
 
-  def handle_info(
-        :update_online,
-        %{
-          characters: characters,
-          server_online: true
-        } =
-          state
-      ) do
-    Process.send_after(self(), :update_online, @update_online_interval)
+  def handle_info(:map_deleted, %{map_ids: map_ids} = state) do
+    # When a map is deleted, stop all maps in this pool that are deleted
+    # This is a graceful shutdown triggered by user action
+    Logger.info("[Map Pool #{state.uuid}] Received map_deleted event, stopping affected maps")
 
-    try do
-      characters
-      |> Task.async_stream(
-        fn character_id ->
-          WandererApp.Character.Tracker.update_online(character_id)
-        end,
-        max_concurrency: System.schedulers_online() * 4,
-        on_timeout: :kill_task,
-        timeout: :timer.seconds(5)
-      )
-      |> Enum.each(fn _result -> :ok end)
-    rescue
-      e ->
-        Logger.error("""
-        [Tracker Pool] update_online => exception: #{Exception.message(e)}
-        #{Exception.format_stacktrace(__STACKTRACE__)}
-        """)
-    end
+    # Check which of our maps were deleted and stop them
+    new_state =
+      map_ids
+      |> Enum.reduce(state, fn map_id, current_state ->
+        # Check if the map still exists in the database
+        case WandererApp.MapRepo.get(map_id) do
+          {:ok, %{deleted: true}} ->
+            Logger.info("[Map Pool #{state.uuid}] Map #{map_id} was deleted, stopping it")
 
-    {:noreply, state}
+            case do_stop_map(map_id, current_state) do
+              {:ok, updated_state} ->
+                updated_state
+
+              {:error, reason} ->
+                Logger.error(
+                  "[Map Pool #{state.uuid}] Failed to stop deleted map #{map_id}: #{reason}"
+                )
+
+                current_state
+            end
+
+          {:ok, _map} ->
+            # Map still exists and is not deleted
+            current_state
+
+          {:error, _} ->
+            # Map doesn't exist, should stop it
+            Logger.info("[Map Pool #{state.uuid}] Map #{map_id} not found, stopping it")
+
+            case do_stop_map(map_id, current_state) do
+              {:ok, updated_state} ->
+                updated_state
+
+              {:error, reason} ->
+                Logger.error(
+                  "[Map Pool #{state.uuid}] Failed to stop missing map #{map_id}: #{reason}"
+                )
+
+                current_state
+            end
+        end
+      end)
+
+    {:noreply, new_state}
   end
 
   def handle_info(event, state) do
-    Server.Impl.handle_event(event)
+    try do
+      Server.Impl.handle_event(event)
+    rescue
+      e ->
+        Logger.error("""
+        [Map Pool] handle_info => exception: #{Exception.message(e)}
+        #{Exception.format_stacktrace(__STACKTRACE__)}
+        """)
+
+        ErrorTracker.report(e, __STACKTRACE__)
+    end
 
     {:noreply, state}
   end

lib/wanderer_app/map/map_pool_dynamic_supervisor.ex

@@ -8,6 +8,7 @@ defmodule WandererApp.Map.MapPoolDynamicSupervisor do
   @registry :map_pool_registry
   @unique_registry :unique_map_pool_registry
   @map_pool_limit 10
+  @genserver_call_timeout :timer.minutes(2)
 
   @name __MODULE__
 
@@ -30,29 +31,115 @@ defmodule WandererApp.Map.MapPoolDynamicSupervisor do
             start_child([map_id], pools |> Enum.count())
 
           pid ->
-            GenServer.cast(pid, {:start_map, map_id})
+            result = GenServer.call(pid, {:start_map, map_id}, @genserver_call_timeout)
+
+            case result do
+              {:ok, :initializing} ->
+                Logger.debug(
+                  "[Map Pool Supervisor] Map #{map_id} queued for async initialization"
+                )
+
+                result
+
+              {:ok, :already_started} ->
+                Logger.debug("[Map Pool Supervisor] Map #{map_id} already started")
+                result
+
+              :ok ->
+                # Legacy synchronous response (from crash recovery path)
+                Logger.debug("[Map Pool Supervisor] Map #{map_id} started synchronously")
+                result
+
+              other ->
+                Logger.warning(
+                  "[Map Pool Supervisor] Unexpected response for map #{map_id}: #{inspect(other)}"
+                )
+
+                other
+            end
         end
     end
   end
 
   def stop_map(map_id) do
-    {:ok, pool_uuid} = Cachex.get(@cache, map_id)
+    case Cachex.get(@cache, map_id) do
+      {:ok, nil} ->
+        # Cache miss - try to find the pool by scanning the registry
+        Logger.warning(
+          "Cache miss for map #{map_id}, scanning registry for pool containing this map"
+        )
 
-    case Registry.lookup(
-           @unique_registry,
-           Module.concat(WandererApp.Map.MapPool, pool_uuid)
-         ) do
+        find_pool_by_scanning_registry(map_id)
+
+      {:ok, pool_uuid} ->
+        # Cache hit - use the pool_uuid to lookup the pool
+        case Registry.lookup(
+               @unique_registry,
+               Module.concat(WandererApp.Map.MapPool, pool_uuid)
+             ) do
+          [] ->
+            Logger.warning(
+              "Pool with UUID #{pool_uuid} not found in registry for map #{map_id}, scanning registry"
+            )
+
+            find_pool_by_scanning_registry(map_id)
+
+          [{pool_pid, _}] ->
+            GenServer.call(pool_pid, {:stop_map, map_id}, @genserver_call_timeout)
+        end
+
+      {:error, reason} ->
+        Logger.error("Failed to lookup map #{map_id} in cache: #{inspect(reason)}")
+        :ok
+    end
+  end
+
+  defp find_pool_by_scanning_registry(map_id) do
+    case Registry.lookup(@registry, WandererApp.Map.MapPool) do
       [] ->
+        Logger.debug("No map pools found in registry for map #{map_id}")
         :ok
 
-      [{pool_pid, _}] ->
-        GenServer.cast(pool_pid, {:stop_map, map_id})
+      pools ->
+        # Scan all pools to find the one containing this map_id
+        found_pool =
+          Enum.find_value(pools, fn {_pid, uuid} ->
+            case Registry.lookup(
+                   @unique_registry,
+                   Module.concat(WandererApp.Map.MapPool, uuid)
+                 ) do
+              [{pool_pid, map_ids}] ->
+                if map_id in map_ids do
+                  {pool_pid, uuid}
+                else
+                  nil
+                end
+
+              _ ->
+                nil
+            end
+          end)
+
+        case found_pool do
+          {pool_pid, pool_uuid} ->
+            Logger.info(
+              "Found map #{map_id} in pool #{pool_uuid} via registry scan, updating cache"
+            )
+
+            # Update the cache to fix the inconsistency
+            Cachex.put(@cache, map_id, pool_uuid)
+            GenServer.call(pool_pid, {:stop_map, map_id}, @genserver_call_timeout)
+
+          nil ->
+            Logger.debug("Map #{map_id} not found in any pool registry")
+            :ok
+        end
     end
   end
 
   defp get_available_pool([]), do: nil
 
-  defp get_available_pool([{pid, uuid} | pools]) do
+  defp get_available_pool([{_pid, uuid} | pools]) do
     case Registry.lookup(@unique_registry, Module.concat(WandererApp.Map.MapPool, uuid)) do
       [] ->
         nil
@@ -79,9 +166,13 @@ defmodule WandererApp.Map.MapPoolDynamicSupervisor do
   end
 
   defp start_child(map_ids, pools_count) do
-    case DynamicSupervisor.start_child(@name, {WandererApp.Map.MapPool, map_ids}) do
+    # Generate UUID for the new pool - this will be used for crash recovery
+    uuid = UUID.uuid1()
+
+    # Pass both UUID and map_ids to the pool for crash recovery support
+    case DynamicSupervisor.start_child(@name, {WandererApp.Map.MapPool, {uuid, map_ids}}) do
       {:ok, pid} ->
-        Logger.info("Starting map pool, total map_pools: #{pools_count + 1}")
+        Logger.info("Starting map pool #{uuid}, total map_pools: #{pools_count + 1}")
         {:ok, pid}
 
       {:error, {:already_started, pid}} ->

lib/wanderer_app/map/map_pool_state.ex

@@ -0,0 +1,190 @@
+defmodule WandererApp.Map.MapPoolState do
+  @moduledoc """
+  Helper module for persisting MapPool state to ETS for crash recovery.
+
+  This module provides functions to save and retrieve MapPool state from an ETS table.
+  The state survives GenServer crashes but is lost on node restart, which ensures
+  automatic recovery from crashes while avoiding stale state on system restart.
+
+  ## ETS Table Ownership
+
+  The ETS table `:map_pool_state_table` is owned by the MapPoolSupervisor,
+  ensuring it survives individual MapPool process crashes.
+
+  ## State Format
+
+  State is stored as tuples: `{pool_uuid, map_ids, last_updated_timestamp}`
+  where:
+  - `pool_uuid` is the unique identifier for the pool (key)
+  - `map_ids` is a list of map IDs managed by this pool
+  - `last_updated_timestamp` is the Unix timestamp of the last update
+  """
+
+  require Logger
+
+  @table_name :map_pool_state_table
+  @stale_threshold_hours 24
+
+  @doc """
+  Initializes the ETS table for storing MapPool state.
+
+  This should be called by the MapPoolSupervisor during initialization.
+  The table is created as:
+  - `:set` - Each pool UUID has exactly one entry
+  - `:public` - Any process can read/write
+  - `:named_table` - Can be accessed by name
+
+  Returns the table reference or raises if table already exists.
+  """
+  @spec init_table() :: :ets.table()
+  def init_table do
+    :ets.new(@table_name, [:set, :public, :named_table])
+  end
+
+  @doc """
+  Saves the current state of a MapPool to ETS.
+
+  ## Parameters
+  - `uuid` - The unique identifier for the pool
+  - `map_ids` - List of map IDs currently managed by this pool
+
+  ## Examples
+
+      iex> MapPoolState.save_pool_state("pool-123", [1, 2, 3])
+      :ok
+  """
+  @spec save_pool_state(String.t(), [integer()]) :: :ok
+  def save_pool_state(uuid, map_ids) when is_binary(uuid) and is_list(map_ids) do
+    timestamp = System.system_time(:second)
+    true = :ets.insert(@table_name, {uuid, map_ids, timestamp})
+
+    Logger.debug("Saved MapPool state for #{uuid}: #{length(map_ids)} maps",
+      pool_uuid: uuid,
+      map_count: length(map_ids)
+    )
+
+    :ok
+  end
+
+  @doc """
+  Retrieves the saved state for a MapPool from ETS.
+
+  ## Parameters
+  - `uuid` - The unique identifier for the pool
+
+  ## Returns
+  - `{:ok, map_ids}` if state exists
+  - `{:error, :not_found}` if no state exists for this UUID
+
+  ## Examples
+
+      iex> MapPoolState.get_pool_state("pool-123")
+      {:ok, [1, 2, 3]}
+
+      iex> MapPoolState.get_pool_state("non-existent")
+      {:error, :not_found}
+  """
+  @spec get_pool_state(String.t()) :: {:ok, [integer()]} | {:error, :not_found}
+  def get_pool_state(uuid) when is_binary(uuid) do
+    case :ets.lookup(@table_name, uuid) do
+      [{^uuid, map_ids, _timestamp}] ->
+        {:ok, map_ids}
+
+      [] ->
+        {:error, :not_found}
+    end
+  end
+
+  @doc """
+  Deletes the state for a MapPool from ETS.
+
+  This should be called when a pool is gracefully shut down.
+
+  ## Parameters
+  - `uuid` - The unique identifier for the pool
+
+  ## Examples
+
+      iex> MapPoolState.delete_pool_state("pool-123")
+      :ok
+  """
+  @spec delete_pool_state(String.t()) :: :ok
+  def delete_pool_state(uuid) when is_binary(uuid) do
+    true = :ets.delete(@table_name, uuid)
+
+    Logger.debug("Deleted MapPool state for #{uuid}", pool_uuid: uuid)
+
+    :ok
+  end
+
+  @doc """
+  Removes stale entries from the ETS table.
+
+  Entries are considered stale if they haven't been updated in the last
+  #{@stale_threshold_hours} hours. This helps prevent the table from growing
+  unbounded due to pool UUIDs that are no longer in use.
+
+  Returns the number of entries deleted.
+
+  ## Examples
+
+      iex> MapPoolState.cleanup_stale_entries()
+      {:ok, 3}
+  """
+  @spec cleanup_stale_entries() :: {:ok, non_neg_integer()}
+  def cleanup_stale_entries do
+    stale_threshold = System.system_time(:second) - @stale_threshold_hours * 3600
+
+    match_spec = [
+      {
+        {:"$1", :"$2", :"$3"},
+        [{:<, :"$3", stale_threshold}],
+        [:"$1"]
+      }
+    ]
+
+    stale_uuids = :ets.select(@table_name, match_spec)
+
+    Enum.each(stale_uuids, fn uuid ->
+      :ets.delete(@table_name, uuid)
+
+      Logger.info("Cleaned up stale MapPool state for #{uuid}",
+        pool_uuid: uuid,
+        reason: :stale
+      )
+    end)
+
+    {:ok, length(stale_uuids)}
+  end
+
+  @doc """
+  Returns all pool states currently stored in ETS.
+
+  Useful for debugging and monitoring.
+
+  ## Examples
+
+      iex> MapPoolState.list_all_states()
+      [
+        {"pool-123", [1, 2, 3], 1699564800},
+        {"pool-456", [4, 5], 1699564900}
+      ]
+  """
+  @spec list_all_states() :: [{String.t(), [integer()], integer()}]
+  def list_all_states do
+    :ets.tab2list(@table_name)
+  end
+
+  @doc """
+  Returns the count of pool states currently stored in ETS.
+
+  ## Examples
+
+      iex> MapPoolState.count_states()
+      5
+  """
+  @spec count_states() :: non_neg_integer()
+  def count_states do
+    :ets.info(@table_name, :size)
+  end
+end

lib/wanderer_app/map/map_pool_supervisor.ex

@@ -2,6 +2,8 @@ defmodule WandererApp.Map.MapPoolSupervisor do
   @moduledoc false
   use Supervisor
 
+  alias WandererApp.Map.MapPoolState
+
   @name __MODULE__
   @registry :map_pool_registry
   @unique_registry :unique_map_pool_registry
@@ -11,10 +13,15 @@ defmodule WandererApp.Map.MapPoolSupervisor do
   end
 
   def init(_args) do
+    # Initialize ETS table for MapPool state persistence
+    # This table survives individual MapPool crashes but is lost on node restart
+    MapPoolState.init_table()
+
     children = [
       {Registry, [keys: :unique, name: @unique_registry]},
       {Registry, [keys: :duplicate, name: @registry]},
-      {WandererApp.Map.MapPoolDynamicSupervisor, []}
+      {WandererApp.Map.MapPoolDynamicSupervisor, []},
+      {WandererApp.Map.Reconciler, []}
     ]
 
     Supervisor.init(children, strategy: :rest_for_one, max_restarts: 10)

lib/wanderer_app/map/map_position_calculator.ex

@@ -106,6 +106,9 @@ defmodule WandererApp.Map.PositionCalculator do
 
   defp get_start_index(n, "top_to_bottom"), do: div(n, 2) + n - 1
 
+  # Default to left_to_right when layout is nil
+  defp get_start_index(n, nil), do: div(n, 2)
+
   defp adjusted_coordinates(n, start_x, start_y, opts) when n > 1 do
     sorted_coords = sorted_edge_coordinates(n, opts)