rebase

migrate session config from store
add map codec tests
2026-07-22 21:34:19 +03:00 · 2026-07-22 00:36:02 +05:30 · 2026-07-22 00:06:24 +05:30 · 2026-07-22 00:04:42 +05:30 · 2026-07-22 00:01:27 +05:30 · 2026-07-21 19:38:00 +05:30
155 changed files with 16537 additions and 1842 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -83,7 +83,7 @@
    }
  },
  "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:4": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {
      // https://github.com/devcontainers/features/issues/1466
      "moby": false
    }
--- a/.github/workflows/auto-close.yml
+++ b/.github/workflows/auto-close.yml
@@ -15,7 +15,7 @@ jobs:
    outputs:
      uses_template: ${{ steps.check.outputs.uses_template }}
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          sparse-checkout: .github/pull_request_template.md
          sparse-checkout-cone-mode: false
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -87,7 +87,7 @@ jobs:
          permission-contents: read
          permission-pull-requests: write

-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          ref: ${{ inputs.ref }}
          persist-credentials: false
@@ -106,14 +106,14 @@ jobs:
        working-directory: ./mobile
        run: printf "%s" $KEY_JKS | base64 -d > android/key.jks

-      - uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
+      - uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
        with:
          distribution: 'zulu'
          java-version: '17'

      - name: Restore Gradle Cache
        id: cache-gradle-restore
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
        with:
          path: |
            ~/.gradle/caches
@@ -184,7 +184,7 @@ jobs:

      - name: Save Gradle Cache
        id: cache-gradle-save
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
        if: github.ref == 'refs/heads/main'
        with:
          path: |
@@ -201,7 +201,7 @@ jobs:
      contents: read
    # Run on main branch or workflow_dispatch, or on PRs/other branches (build only, no upload)
    if: ${{ !github.event.pull_request.head.repo.fork && fromJSON(needs.pre-job.outputs.should_run).mobile == true }}
-    runs-on: macos-26
+    runs-on: macos-15

    steps:
      - id: token
@@ -215,7 +215,7 @@ jobs:
        run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          ref: ${{ inputs.ref || github.sha }}
          persist-credentials: false
@@ -241,7 +241,7 @@ jobs:
        run: flutter build ios --config-only --no-codesign

      - name: Setup Ruby
-        uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1.319.0
+        uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
        with:
          ruby-version: '3.3'
          bundler-cache: true
--- a/.github/workflows/cache-cleanup.yml
+++ b/.github/workflows/cache-cleanup.yml
@@ -27,7 +27,7 @@ jobs:
          permission-actions: write

      - name: Check out code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
--- a/.github/workflows/check-openapi.yml
+++ b/.github/workflows/check-openapi.yml
@@ -20,12 +20,12 @@ jobs:
      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false

      - name: Check for breaking API changes
-        uses: oasdiff/oasdiff-action/breaking@024f6c399f9a21ada1addb0f9a36ce1bfac995f1 # v0.1.6
+        uses: oasdiff/oasdiff-action/breaking@291b6594ce617f22f49af5898ee038ed0b46e8fe # v0.1.5
        with:
          base: https://raw.githubusercontent.com/${{ github.repository }}/main/open-api/immich-openapi-specs.json
          revision: open-api/immich-openapi-specs.json
@@ -38,7 +38,7 @@ jobs:
      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false

--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -38,7 +38,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -71,7 +71,7 @@ jobs:
          permission-contents: read

      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
--- a/.github/workflows/close-duplicates.yml
+++ b/.github/workflows/close-duplicates.yml
@@ -39,7 +39,7 @@ jobs:
    needs: [get_body, should_run]
    if: ${{ needs.should_run.outputs.should_run == 'true' }}
    container:
-      image: ghcr.io/immich-app/mdq:main@sha256:d603f5618c1fc9f2b4d506ffed54ba6bcfec83d56b893b5fa8b3f899a402fa0a
+      image: ghcr.io/immich-app/mdq:main@sha256:e3fe456f346b02c2f479462100763aee3ba8245768dfeac3c4262acb068e5c62
    outputs:
      checked: ${{ steps.get_checkbox.outputs.checked }}
    steps:
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -51,14 +51,14 @@ jobs:
          permission-contents: read

      - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+        uses: github/codeql-action/init@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -71,7 +71,7 @@ jobs:
      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+        uses: github/codeql-action/autobuild@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0

      # ℹ️ Command-line programs to run using the OS shell.
      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -84,6 +84,6 @@ jobs:
      #   ./location_of_script_within_repo/buildscript.sh

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+        uses: github/codeql-action/analyze@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
        with:
          category: '/language:${{matrix.language}}'
--- a/.github/workflows/docs-build.yml
+++ b/.github/workflows/docs-build.yml
@@ -62,7 +62,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
--- a/.github/workflows/docs-deploy.yml
+++ b/.github/workflows/docs-deploy.yml
@@ -137,7 +137,7 @@ jobs:
          permission-pull-requests: write

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
--- a/.github/workflows/docs-destroy.yml
+++ b/.github/workflows/docs-destroy.yml
@@ -25,7 +25,7 @@ jobs:
          permission-pull-requests: write

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
--- a/.github/workflows/fdroid.yml
+++ b/.github/workflows/fdroid.yml
@@ -14,7 +14,7 @@ jobs:
      contents: read
    steps:
      - name: Checkout pubspec for versionCode
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          ref: ${{ github.event.release.tag_name }}
          persist-credentials: false
--- a/.github/workflows/fix-format.yml
+++ b/.github/workflows/fix-format.yml
@@ -23,7 +23,7 @@ jobs:
          permission-pull-requests: write

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          ref: ${{ github.event.pull_request.head.ref }}
          persist-credentials: true
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -61,7 +61,7 @@ jobs:
          permission-contents: write

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          token: ${{ steps.token.outputs.token }}
          persist-credentials: true
@@ -140,7 +140,7 @@ jobs:
          permission-actions: read

      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          token: ${{ steps.generate-token.outputs.token }}
          persist-credentials: false
@@ -152,7 +152,7 @@ jobs:
          github-token: ${{ steps.generate-token.outputs.token }}

      - name: Create draft release
-        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
+        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
        with:
          draft: true
          prerelease: ${{ needs.bump_version.outputs.rc }}
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -23,7 +23,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -58,7 +58,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -85,7 +85,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -114,7 +114,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -146,7 +146,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -178,7 +178,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -223,7 +223,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -262,7 +262,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -291,7 +291,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -342,7 +342,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -375,7 +375,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          submodules: 'recursive'
@@ -412,7 +412,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          submodules: 'recursive'
@@ -422,7 +422,7 @@ jobs:
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9

      - name: Setup Node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: '.nvmrc'
          cache: 'pnpm'
@@ -490,7 +490,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          submodules: 'recursive'
@@ -500,7 +500,7 @@ jobs:
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9

      - name: Setup Node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: '.nvmrc'
          cache: 'pnpm'
@@ -598,7 +598,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
          permission-contents: read

-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -637,7 +637,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
          permission-contents: read

-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -669,7 +669,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -699,7 +699,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
          permission-contents: read

-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -722,7 +722,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -781,7 +781,7 @@ jobs:
          permission-contents: read

      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
--- a/deployment/mise.toml
+++ b/deployment/mise.toml
@@ -1,6 +1,6 @@
 [tools]
-terragrunt = "1.1.1"
-opentofu = "1.12.4"
+terragrunt = "1.0.3"
+opentofu = "1.11.6"

 [tasks."tg:fmt"]
 run = "terragrunt hclfmt"
--- a/deployment/modules/cloudflare/docs-release/.terraform.lock.hcl
+++ b/deployment/modules/cloudflare/docs-release/.terraform.lock.hcl
@@ -2,35 +2,37 @@
 # Manual edits may be lost in future updates.

 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.8"
-  constraints = "4.52.8"
+  version     = "4.52.7"
+  constraints = "4.52.7"
  hashes = [
-    "h1:2uxVaMaGPDJljXqYzuD6xtyfOKdNudtGIgawRTkFJIs=",
-    "h1:34HL1GDpqYdn2iEC+85pCi+NddZf30qH3fJ8y3P6CAM=",
-    "h1:4Z+uD+YY/7HrqdypM7DyUK+RtWepoLBc9fqtRQYZx4I=",
-    "h1:8Ss6wlJL2BHvkIZU1iaHvyUntqNhPFZ0fl6mjsxhctc=",
-    "h1:AYeWWMTWaNg01N3hivxr/6YlG41j1RietMnft9vLjUI=",
-    "h1:BGRNOzo8NUgbx5RwpWkWmr38f/s3txb7mzQhqfM5blI=",
-    "h1:EEXRMdC8bPlpLuOU8u+dE8mFJe3BpquFdH6vXcKseY4=",
-    "h1:ENp29e6O6OnaHJlbtmRlyjlAmm3Wt4mGctWUpBY3d0g=",
-    "h1:IAtBAbGVe1npj/n1NvCIZkSYGl7qaPYT+FnVdZ2CZ00=",
-    "h1:QRGGKngrxLORr4CImKXLDDJL5s67zUNBDAgk6FIIFNk=",
-    "h1:bNql6cC+MfDbaJK3q7a8C1m3A21o7e5mrjBIGtk0RdI=",
-    "h1:gmNv+PEOkYDdu+c15bfpcoAE3EI7pgmov9RMf3GZLsI=",
-    "h1:yieZ7NWRYQcLYHUevzDDrrmDkoQICM+3ZeX4i/mw9ME=",
-    "zh:08b305329a680a9213b2d8e642fbce7e4d97a524b1d2cef59e190ba9d678c477",
-    "zh:47975bd711ee18a46e589822171fa87474a552b332bfc8dea8fd1a64504eed8d",
-    "zh:5640d0d226bbafff3395542456c29feb942ca9c55ac01b4245a34c0590a33363",
-    "zh:5b0ad839fafba938c60a95d6b4a865843643591e97573ed2b9c4af3754064f74",
+    "h1:+O72J3QYiZtYmYYZM/Eh0f4NNfl1BvjX1eju43qTQsQ=",
+    "h1:0oqjYIPXcXh7XiDiKI085cHDYQQ5mh8kDl9dmBtvtog=",
+    "h1:4b4ESb87MGv5bnadgYe7sK5rEkKMZhbkQcwPubQTsR4=",
+    "h1:6mTr3eA1Ddb348lLmJuyvn98z4KF+ejqaUEJ76D1rzQ=",
+    "h1:9/3YH+9k9HqsvFtbmBf7SO2+xqZeZrXNKzLkjNuhUEA=",
+    "h1:Jcq4tBWgyH4/2JsojNBSRaN0mcItVMchO+lynonrlqc=",
+    "h1:Y4Vv/2RdP0Q+uxqhOxzOdKxuuEMjXPDcU0vPc5bCQzI=",
+    "h1:a0gW8FBKsbP9Fi0HEDoy49WIbEWVHk9+BR4/iwuBdDQ=",
+    "h1:gElv6iqJtg8OKN77gbw+MjrkrQmJHPkkMEi1J+0xkpU=",
+    "h1:oslXUugD/NQ+duJgT4BhKQyfGbuFOANknMvR73fiOeM=",
+    "h1:pPItIWii5oymR+geZB219ROSPuSODPLTlM4S/u8xLvM=",
+    "h1:u67GWw8GwD9NDlDzp9Y5VRnSQGcCrE8rSpkGPaBpDl0=",
+    "h1:uUUa9dY0XQOycI8pxg16PFFtL0WCTi9uEJz8trTQ7pU=",
+    "h1:y3rV8KF2q6GEMANNlf5EkKJurlfbKlIKpjGcdxoy7pQ=",
+    "zh:0c904ce31a4c6c4a5b3bf7ff1560e77c0cc7e2450c8553ded8e8c90398e1418b",
+    "zh:36183d310c36373fe4cb936b83c595c6fd3b0a94bc7827f28e5789ccbf59752e",
+    "zh:556a568a6f0235e8f41647de9e4d3a1e7b1d6502df8b19b54ec441f1c653ea10",
+    "zh:633ebbd5b0245e75e500ef9be4d9e62288f97e8da3baaa51323892a786d90285",
+    "zh:6acfe60cf52a65ba8f044f748548d2119e7f4fd7f8ebcb14698960d87c68f529",
    "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:93a9bc1139f5c02a44fdbf51fb2ce0891e2a42033b66febb928ccf72e870408f",
-    "zh:977f75cdf365686aa16ae02dcc0fc1769bae6f86be6e165393756c940bfb4af0",
-    "zh:9afcda2660b3dc6ee6329acea532a719225bd1f6cf46f695feb2d77160847c1b",
-    "zh:9e3da67b1b05b03d1f0c18b8677edf3797815b5dd49629f10eb2f457dccbed30",
-    "zh:b8d7da230f5266367c1b6b1cf31aa39087e231a87d55b71bb9d5c854ca1fcfe6",
-    "zh:cc96e7cd7350456b7a11a53d1c76c73a542de8359f9750f637ff865e8e77be91",
-    "zh:da1f58d067def243047bb7178cb197e2b9c3a791a9eb380ad92b73290615ae29",
-    "zh:ed5f3e1f59a338bcdce0a2537a8a2f299cfe18c168626799b2a9c97af3d8d3cb",
-    "zh:f16cc31f73a58a26ffe2d93223eddb7c340623a4e2ef38c6091766fd611e3e11",
+    "zh:904acc31ebb9d6ef68c792074b30532ee61bf515f19e0a3c75b46f126cca1f13",
+    "zh:a1d0a81246afc8750286d3f6fe7a8fbe6460dd2662407b28dbfbabb612e5fa9d",
+    "zh:a41a36fe253fc365fe2b7ffc749624688b2693b4634862fda161179ab100029f",
+    "zh:a7ef269e77ffa8715c8945a2c14322c7ff159ea44c15f62505f3cbb2cae3b32d",
+    "zh:b01aa3bed30610633b762df64332b26f8844a68c3960cebcb30f04918efc67fe",
+    "zh:b069cc2cd18cae10757df3ae030508eac8d55de7e49eda7a5e3e11f2f7fe6455",
+    "zh:b2d2c6313729ebb7465dceece374049e2d08bda34473901be9ff46a8836d42b2",
+    "zh:db0e114edaf4bc2f3d4769958807c83022bfbc619a00bdf4c4bd17faa4ab2d8b",
+    "zh:ecc0aa8b9044f664fd2aaf8fa992d976578f78478980555b4b8f6148e8d1a5fe",
  ]
 }
--- a/deployment/modules/cloudflare/docs-release/config.tf
+++ b/deployment/modules/cloudflare/docs-release/config.tf
@@ -5,7 +5,7 @@ terraform {
  required_providers {
    cloudflare = {
      source = "cloudflare/cloudflare"
-      version = "4.52.8"
+      version = "4.52.7"
    }
  }
 }
--- a/deployment/modules/cloudflare/docs/.terraform.lock.hcl
+++ b/deployment/modules/cloudflare/docs/.terraform.lock.hcl
@@ -2,35 +2,37 @@
 # Manual edits may be lost in future updates.

 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.8"
-  constraints = "4.52.8"
+  version     = "4.52.7"
+  constraints = "4.52.7"
  hashes = [
-    "h1:2uxVaMaGPDJljXqYzuD6xtyfOKdNudtGIgawRTkFJIs=",
-    "h1:34HL1GDpqYdn2iEC+85pCi+NddZf30qH3fJ8y3P6CAM=",
-    "h1:4Z+uD+YY/7HrqdypM7DyUK+RtWepoLBc9fqtRQYZx4I=",
-    "h1:8Ss6wlJL2BHvkIZU1iaHvyUntqNhPFZ0fl6mjsxhctc=",
-    "h1:AYeWWMTWaNg01N3hivxr/6YlG41j1RietMnft9vLjUI=",
-    "h1:BGRNOzo8NUgbx5RwpWkWmr38f/s3txb7mzQhqfM5blI=",
-    "h1:EEXRMdC8bPlpLuOU8u+dE8mFJe3BpquFdH6vXcKseY4=",
-    "h1:ENp29e6O6OnaHJlbtmRlyjlAmm3Wt4mGctWUpBY3d0g=",
-    "h1:IAtBAbGVe1npj/n1NvCIZkSYGl7qaPYT+FnVdZ2CZ00=",
-    "h1:QRGGKngrxLORr4CImKXLDDJL5s67zUNBDAgk6FIIFNk=",
-    "h1:bNql6cC+MfDbaJK3q7a8C1m3A21o7e5mrjBIGtk0RdI=",
-    "h1:gmNv+PEOkYDdu+c15bfpcoAE3EI7pgmov9RMf3GZLsI=",
-    "h1:yieZ7NWRYQcLYHUevzDDrrmDkoQICM+3ZeX4i/mw9ME=",
-    "zh:08b305329a680a9213b2d8e642fbce7e4d97a524b1d2cef59e190ba9d678c477",
-    "zh:47975bd711ee18a46e589822171fa87474a552b332bfc8dea8fd1a64504eed8d",
-    "zh:5640d0d226bbafff3395542456c29feb942ca9c55ac01b4245a34c0590a33363",
-    "zh:5b0ad839fafba938c60a95d6b4a865843643591e97573ed2b9c4af3754064f74",
+    "h1:+O72J3QYiZtYmYYZM/Eh0f4NNfl1BvjX1eju43qTQsQ=",
+    "h1:0oqjYIPXcXh7XiDiKI085cHDYQQ5mh8kDl9dmBtvtog=",
+    "h1:4b4ESb87MGv5bnadgYe7sK5rEkKMZhbkQcwPubQTsR4=",
+    "h1:6mTr3eA1Ddb348lLmJuyvn98z4KF+ejqaUEJ76D1rzQ=",
+    "h1:9/3YH+9k9HqsvFtbmBf7SO2+xqZeZrXNKzLkjNuhUEA=",
+    "h1:Jcq4tBWgyH4/2JsojNBSRaN0mcItVMchO+lynonrlqc=",
+    "h1:Y4Vv/2RdP0Q+uxqhOxzOdKxuuEMjXPDcU0vPc5bCQzI=",
+    "h1:a0gW8FBKsbP9Fi0HEDoy49WIbEWVHk9+BR4/iwuBdDQ=",
+    "h1:gElv6iqJtg8OKN77gbw+MjrkrQmJHPkkMEi1J+0xkpU=",
+    "h1:oslXUugD/NQ+duJgT4BhKQyfGbuFOANknMvR73fiOeM=",
+    "h1:pPItIWii5oymR+geZB219ROSPuSODPLTlM4S/u8xLvM=",
+    "h1:u67GWw8GwD9NDlDzp9Y5VRnSQGcCrE8rSpkGPaBpDl0=",
+    "h1:uUUa9dY0XQOycI8pxg16PFFtL0WCTi9uEJz8trTQ7pU=",
+    "h1:y3rV8KF2q6GEMANNlf5EkKJurlfbKlIKpjGcdxoy7pQ=",
+    "zh:0c904ce31a4c6c4a5b3bf7ff1560e77c0cc7e2450c8553ded8e8c90398e1418b",
+    "zh:36183d310c36373fe4cb936b83c595c6fd3b0a94bc7827f28e5789ccbf59752e",
+    "zh:556a568a6f0235e8f41647de9e4d3a1e7b1d6502df8b19b54ec441f1c653ea10",
+    "zh:633ebbd5b0245e75e500ef9be4d9e62288f97e8da3baaa51323892a786d90285",
+    "zh:6acfe60cf52a65ba8f044f748548d2119e7f4fd7f8ebcb14698960d87c68f529",
    "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:93a9bc1139f5c02a44fdbf51fb2ce0891e2a42033b66febb928ccf72e870408f",
-    "zh:977f75cdf365686aa16ae02dcc0fc1769bae6f86be6e165393756c940bfb4af0",
-    "zh:9afcda2660b3dc6ee6329acea532a719225bd1f6cf46f695feb2d77160847c1b",
-    "zh:9e3da67b1b05b03d1f0c18b8677edf3797815b5dd49629f10eb2f457dccbed30",
-    "zh:b8d7da230f5266367c1b6b1cf31aa39087e231a87d55b71bb9d5c854ca1fcfe6",
-    "zh:cc96e7cd7350456b7a11a53d1c76c73a542de8359f9750f637ff865e8e77be91",
-    "zh:da1f58d067def243047bb7178cb197e2b9c3a791a9eb380ad92b73290615ae29",
-    "zh:ed5f3e1f59a338bcdce0a2537a8a2f299cfe18c168626799b2a9c97af3d8d3cb",
-    "zh:f16cc31f73a58a26ffe2d93223eddb7c340623a4e2ef38c6091766fd611e3e11",
+    "zh:904acc31ebb9d6ef68c792074b30532ee61bf515f19e0a3c75b46f126cca1f13",
+    "zh:a1d0a81246afc8750286d3f6fe7a8fbe6460dd2662407b28dbfbabb612e5fa9d",
+    "zh:a41a36fe253fc365fe2b7ffc749624688b2693b4634862fda161179ab100029f",
+    "zh:a7ef269e77ffa8715c8945a2c14322c7ff159ea44c15f62505f3cbb2cae3b32d",
+    "zh:b01aa3bed30610633b762df64332b26f8844a68c3960cebcb30f04918efc67fe",
+    "zh:b069cc2cd18cae10757df3ae030508eac8d55de7e49eda7a5e3e11f2f7fe6455",
+    "zh:b2d2c6313729ebb7465dceece374049e2d08bda34473901be9ff46a8836d42b2",
+    "zh:db0e114edaf4bc2f3d4769958807c83022bfbc619a00bdf4c4bd17faa4ab2d8b",
+    "zh:ecc0aa8b9044f664fd2aaf8fa992d976578f78478980555b4b8f6148e8d1a5fe",
  ]
 }
--- a/deployment/modules/cloudflare/docs/config.tf
+++ b/deployment/modules/cloudflare/docs/config.tf
@@ -5,7 +5,7 @@ terraform {
  required_providers {
    cloudflare = {
      source = "cloudflare/cloudflare"
-      version = "4.52.8"
+      version = "4.52.7"
    }
  }
 }
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -97,7 +97,7 @@ services:
    command: ['./run.sh', '-disable-reporting']
    ports:
      - 3000:3000
-    image: grafana/grafana:12.4.5-ubuntu@sha256:00396460e499415c828b7c298f19287c8a0f95e72412ee37ac11723655c2d6b9
+    image: grafana/grafana:12.4.4-ubuntu@sha256:df2e7ef5f32f771794cf76bad5f2bceac227036460a2cc269a9045e5662abc58
    volumes:
      - grafana-data:/var/lib/grafana

--- a/docs/docs/administration/img/reset-admin-password.webp
+++ b/docs/docs/administration/img/reset-admin-password.webp
--- a/docs/docs/administration/server-commands.md
+++ b/docs/docs/administration/server-commands.md
@@ -35,7 +35,6 @@ Found Admin:
 - Email=admin@example.com
 - Name=Immich Admin
 ? Please choose a new password (optional) immich-is-cool
-? Invalidate existing sessions? Yes
 The admin password has been updated.
 ```

--- a/e2e/src/specs/server/cli/upload.e2e-spec.ts
+++ b/e2e/src/specs/server/cli/upload.e2e-spec.ts
@@ -650,7 +650,7 @@ describe(`immich upload`, () => {
      ]);

      expect(stdout).toBe('');
-      expect(stderr).toEqual(`error: option '-n, --dry-run' cannot be used with option '--skip-hash'`);
+      expect(stderr).toEqual(`error: option '-n, --dry-run' cannot be used with option '-h, --skip-hash'`);
      expect(exitCode).not.toBe(0);

      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
--- a/e2e/src/specs/server/immich-admin/immich-admin.e2e-spec.ts
+++ b/e2e/src/specs/server/immich-admin/immich-admin.e2e-spec.ts
@@ -65,10 +65,6 @@ describe(`immich-admin`, () => {
      child.stdout.on('data', (chunk) => {
        data += chunk;
        if (data.includes('Please choose a new password (optional)')) {
-          child.stdin.write('\n');
-        }
-
-        if (data.includes('Invalidate existing sessions?')) {
          child.stdin.end('\n');
        }
      });
--- a/mise.lock
+++ b/mise.lock
@@ -94,23 +94,6 @@ url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets
 version = "7.1.3-6"
 backend = "github:jellyfin/jellyfin-ffmpeg"

-[tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_linuxarm64-gpl.tar.xz"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64"]
-checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64-musl"]
-checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
-
-[[tools."github:jellyfin/jellyfin-ffmpeg"]]
-version = "7.1.3-6"
-backend = "github:jellyfin/jellyfin-ffmpeg"
-
 [tools."github:jellyfin/jellyfin-ffmpeg".options]
 asset_pattern = "jellyfin-ffmpeg_*_portable_linux64-gpl.tar.xz"

@@ -129,12 +112,17 @@ version = "7.1.3-6"
 backend = "github:jellyfin/jellyfin-ffmpeg"

 [tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_mac64-gpl.tar.xz"
+asset_pattern = "jellyfin-ffmpeg_*_portable_linuxarm64-gpl.tar.xz"

-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-x64"]
-checksum = "sha256:066ede9774aaae97a18098aaeea8b7e0d286653eb8618f640476e99c59a536c2"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_mac64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995889"
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64"]
+checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64-musl"]
+checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"

 [[tools."github:jellyfin/jellyfin-ffmpeg"]]
 version = "7.1.3-6"
@@ -145,6 +133,18 @@ checksum = "sha256:7b7168149689610296f3a187c717056ce0786cc125a31caf28056737e9ba1
 url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_win64-clang-gpl.zip"
 url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409036094"

+[[tools."github:jellyfin/jellyfin-ffmpeg"]]
+version = "7.1.3-6"
+backend = "github:jellyfin/jellyfin-ffmpeg"
+
+[tools."github:jellyfin/jellyfin-ffmpeg".options]
+asset_pattern = "jellyfin-ffmpeg_*_portable_mac64-gpl.tar.xz"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-x64"]
+checksum = "sha256:066ede9774aaae97a18098aaeea8b7e0d286653eb8618f640476e99c59a536c2"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_mac64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995889"
+
 [[tools."github:webassembly/binaryen"]]
 version = "version_124"
 backend = "github:webassembly/binaryen"
@@ -248,43 +248,43 @@ version = "7.5.0"
 backend = "npm:oazapfts"

 [[tools.opentofu]]
-version = "1.12.4"
+version = "1.11.6"
 backend = "aqua:opentofu/opentofu"

 [tools.opentofu."platforms.linux-arm64"]
-checksum = "sha256:dc7bfcd93ce9795a86c58fbf71efd013c39dcd1febb13c9cd3555c43b9c2403a"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646678"
+checksum = "sha256:d4f2ab15776925864b049bb329d69682851de6f5204f256e9fa86d07a0308850"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536382"

 [tools.opentofu."platforms.linux-arm64-musl"]
-checksum = "sha256:dc7bfcd93ce9795a86c58fbf71efd013c39dcd1febb13c9cd3555c43b9c2403a"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646678"
+checksum = "sha256:d4f2ab15776925864b049bb329d69682851de6f5204f256e9fa86d07a0308850"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536382"

 [tools.opentofu."platforms.linux-x64"]
-checksum = "sha256:81836d0f12b4fe9013b85586349f993def9429b6383bb77cdd6c2f3a9d9aac24"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646677"
+checksum = "sha256:02800fafa2753a9f50c38483e2fdf5bc353fd62895eb9e25eec9a5145df3a69e"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536401"

 [tools.opentofu."platforms.linux-x64-musl"]
-checksum = "sha256:81836d0f12b4fe9013b85586349f993def9429b6383bb77cdd6c2f3a9d9aac24"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646677"
+checksum = "sha256:02800fafa2753a9f50c38483e2fdf5bc353fd62895eb9e25eec9a5145df3a69e"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536401"

 [tools.opentofu."platforms.macos-arm64"]
-checksum = "sha256:7c06e4390d9ccd467773e37ff1c3d833c7ca0c24742cd9e9ad47284bea472247"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_darwin_arm64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646544"
+checksum = "sha256:62d7fa8539e13b444827aa0a3b90c5972da5c47e8f8882d9dcf2e430e78840c1"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_darwin_arm64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536399"

 [tools.opentofu."platforms.macos-x64"]
-checksum = "sha256:ead1d2ce643addb4ffeb93240b9377ae1c2fd793a6bd22d65922ac37adfdf546"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_darwin_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646688"
+checksum = "sha256:1408cdef1c380f914565e6b4bb70794c6b163f195fcb233357f3d6c5745906b6"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_darwin_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536384"

 [tools.opentofu."platforms.windows-x64"]
-checksum = "sha256:a4d86a07755c8d151f20f945e6cfb5b40deeed942af36a9bd385c5c2e965d5dd"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_windows_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646543"
+checksum = "sha256:27323f70c875b8251bfd7e61a4cffc3ebff4e56ed1e611b955016f0c7077367e"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_windows_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536406"

 [[tools.pnpm]]
 version = "11.13.1"
@@ -327,40 +327,40 @@ url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/478563981"
 provenance = "github-attestations"

 [[tools.terragrunt]]
-version = "1.1.1"
+version = "1.0.3"
 backend = "aqua:gruntwork-io/terragrunt"

 [tools.terragrunt."platforms.linux-arm64"]
-checksum = "sha256:a374a7993ff3d99665a7e014007d3647ec7f0465c9d55c85e9f94c932e73cea2"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476786148"
+checksum = "sha256:e5b60ab05b5214db694e6bc215d8124fb626e277cdb56b86f6147ae110d510fe"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654253"

 [tools.terragrunt."platforms.linux-arm64-musl"]
-checksum = "sha256:a374a7993ff3d99665a7e014007d3647ec7f0465c9d55c85e9f94c932e73cea2"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476786148"
+checksum = "sha256:e5b60ab05b5214db694e6bc215d8124fb626e277cdb56b86f6147ae110d510fe"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654253"

 [tools.terragrunt."platforms.linux-x64"]
-checksum = "sha256:ce90077ac31ef17a2ba10d11d45f36c6501997a8f4f79d703bb7daba37032f53"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785968"
+checksum = "sha256:6d48049baf82e0bf9c804368dc85cbfeadc10955e33777e9e8de3e020b94b073"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654196"

 [tools.terragrunt."platforms.linux-x64-musl"]
-checksum = "sha256:ce90077ac31ef17a2ba10d11d45f36c6501997a8f4f79d703bb7daba37032f53"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785968"
+checksum = "sha256:6d48049baf82e0bf9c804368dc85cbfeadc10955e33777e9e8de3e020b94b073"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654196"

 [tools.terragrunt."platforms.macos-arm64"]
-checksum = "sha256:9ec8f678b9ae6c81d5d9d77b94cbf6349ce639d5938694b4adc9dea73e416794"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_darwin_arm64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785628"
+checksum = "sha256:aacb5be2ca5475300cbce246dfbd8a45eb47510fbaa70fab8561c49ef5db03aa"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_darwin_arm64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654084"

 [tools.terragrunt."platforms.macos-x64"]
-checksum = "sha256:73e768a69fa44a60f9d9174f54aaf179327e08706f633c9c79d5f5c9622c91c2"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_darwin_amd64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785520"
+checksum = "sha256:3133c2251e191aede8e3dd2a5b3aee2e91c5f08f88f117aee40eed9a24c8ef6b"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_darwin_amd64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406653970"

 [tools.terragrunt."platforms.windows-x64"]
-checksum = "sha256:dd50a324691e072a3ac879e9ec43d6310e2936c929fda658eb2811fefcc75115"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_windows_amd64.exe.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476786421"
+checksum = "sha256:183b2745b4e04980a6bfa4450ff81956a12596ca22d70f7aaa793980f5b036db"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_windows_amd64.exe.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654412"
--- a/mise.toml
+++ b/mise.toml
@@ -1,4 +1,4 @@
-monorepo_root = true
+experimental_monorepo_root = true

 [monorepo]
 config_roots = [
@@ -17,8 +17,8 @@ config_roots = [
 [tools]
 node = "24.15.0"
 pnpm = "11.13.1"
-terragrunt = "1.1.1"
-opentofu = "1.12.4"
+terragrunt = "1.0.3"
+opentofu = "1.11.6"
 "npm:oazapfts" = "7.5.0"
 "github:extism/cli" = "1.6.3"
 "github:webassembly/binaryen" = "version_124"
@@ -35,6 +35,7 @@ macos-x64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_mac64-gpl.tar.xz" }
 macos-arm64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_macarm64-gpl.tar.xz" }

 [settings]
+experimental = true
 pin = true
 lockfile = true

--- a/mobile/drift_schemas/main/drift_schema_v32.json
+++ b/mobile/drift_schemas/main/drift_schema_v32.json
--- a/mobile/integration_test/background_sync_teardown_test.dart
+++ b/mobile/integration_test/background_sync_teardown_test.dart
@@ -40,7 +40,7 @@ void main() {
  tearDown(() async {
    await workerManagerPatch.dispose();
    await server.close();
-    await Store.delete(StoreKey.serverEndpoint);
+    await Store.delete(StoreKey.legacyServerEndpoint);
    await Store.delete(StoreKey.syncMigrationStatus);
  });

@@ -119,7 +119,9 @@ void main() {
    final releaseTxn = Completer<void>();
    final txnHeld = Completer<void>();
    final txn = drift.transaction(() async {
-      await drift.into(drift.userEntity).insert(
+      await drift
+          .into(drift.userEntity)
+          .insert(
            UserEntityCompanion.insert(
              id: 'holder',
              name: 'holder',
--- a/mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/maplibre/maplibre-gl-native-distribution.git",
      "state" : {
-        "revision" : "84a79bc375a301169390ac110c868f06c857b83f",
-        "version" : "6.27.0"
+        "revision" : "60d9bb85c94ce6e7fc4406cd32529fd12bdb7809",
+        "version" : "6.14.0"
      }
    },
    {
--- a/mobile/ios/Runner/Connectivity/ConnectivityApiImpl.swift
+++ b/mobile/ios/Runner/Connectivity/ConnectivityApiImpl.swift
@@ -43,16 +43,15 @@ class ConnectivityApiImpl: ConnectivityApi {
      capabilities.append(.vpn)
    }
    
-    // Determine if connection is unmetered from the OS metered flags rather than
-    // the interface type, so wired ethernet (iPhone USB adapters, Apple Silicon
-    // Macs) is treated as unmetered like Wi-Fi:
-    // - Not on cellular
-    // - Not expensive (also rules out cellular and personal hotspot)
-    // - Not constrained (Low Data Mode)
-    // Note: VPN over cellular stays metered because the path is still expensive.
+    // Determine if connection is unmetered:
+    // - Must be on WiFi (not cellular)
+    // - Must not be expensive (rules out personal hotspot)
+    // - Must not be constrained (Low Data Mode)
+    // Note: VPN over cellular should still be considered metered
    let isOnCellular = path.usesInterfaceType(.cellular)
-
-    if !isOnCellular && !path.isExpensive && !path.isConstrained {
+    let isOnWifi = path.usesInterfaceType(.wifi)
+    
+    if isOnWifi && !isOnCellular && !path.isExpensive && !path.isConstrained {
      capabilities.append(.unmetered)
    }
    
--- a/mobile/ios/WidgetExtension/ImmichAPI.swift
+++ b/mobile/ios/WidgetExtension/ImmichAPI.swift
@@ -203,10 +203,7 @@ class ImmichAPI {

  func fetchMemory(for date: Date) async throws -> [MemoryResult] {
    // get URL
-    let localDay = date.formatted(
-      Date.ISO8601FormatStyle(timeZone: .current).year().month().day().dateSeparator(.dash)
-    )
-    let memoryParams = [URLQueryItem(name: "for", value: localDay)]
+    let memoryParams = [URLQueryItem(name: "for", value: date.ISO8601Format())]
    guard
      let searchURL = buildRequestURL(
        serverConfig: serverConfig,
--- a/mobile/lib/domain/models/events.model.dart
+++ b/mobile/lib/domain/models/events.model.dart
@@ -24,12 +24,6 @@ class ViewerReloadAssetEvent extends Event {
  const ViewerReloadAssetEvent();
 }

-class ViewerStackAssetDeletedEvent extends Event {
-  final int stackIndex;
-
-  const ViewerStackAssetDeletedEvent({required this.stackIndex});
-}
-
 // Multi-Select Events
 class MultiSelectToggleEvent extends Event {
  final bool isEnabled;
--- a/mobile/lib/domain/models/session.model.dart
+++ b/mobile/lib/domain/models/session.model.dart
@@ -0,0 +1,63 @@
+import 'package:immich_mobile/domain/models/value_codec.dart';
+import 'package:immich_mobile/utils/option.dart';
+
+enum SessionKey<T> {
+  serverUrl<String?>(),
+  accessToken<String?>(),
+  serverEndpoint<String?>();
+
+  ValueCodec<T> get _codec => ValueCodec.forType(T);
+
+  String encode(T value) => _codec.encode(value);
+
+  T decode(String raw) => _codec.decode(raw);
+}
+
+const defaultSession = Session();
+
+class Session {
+  final String? serverUrl;
+  final String? accessToken;
+  final String? serverEndpoint;
+
+  const Session({this.serverUrl, this.accessToken, this.serverEndpoint});
+
+  Session copyWith({Option<String>? serverUrl, Option<String>? accessToken, Option<String>? serverEndpoint}) => .new(
+    serverUrl: serverUrl.patch(this.serverUrl),
+    accessToken: accessToken.patch(this.accessToken),
+    serverEndpoint: serverEndpoint.patch(this.serverEndpoint),
+  );
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is Session &&
+          other.serverUrl == serverUrl &&
+          other.accessToken == accessToken &&
+          other.serverEndpoint == serverEndpoint);
+
+  @override
+  int get hashCode => Object.hash(serverUrl, accessToken, serverEndpoint);
+
+  @override
+  String toString() => 'Session(serverUrl: $serverUrl, accessToken: $accessToken, serverEndpoint: $serverEndpoint)';
+
+  T read<T>(SessionKey<T> key) =>
+      (switch (key) {
+            .serverUrl => serverUrl,
+            .accessToken => accessToken,
+            .serverEndpoint => serverEndpoint,
+          })
+          as T;
+
+  factory Session.fromEntries(Map<SessionKey, Object?> overrides) =>
+      overrides.entries.fold(const Session(), (session, entry) => session.write(entry.key, entry.value));
+
+  Session write<T, U extends T>(SessionKey<T> key, U value) {
+    return switch (key) {
+      .serverUrl => copyWith(serverUrl: .fromNullable(value as String?)),
+      .accessToken => copyWith(accessToken: .fromNullable(value as String?)),
+      .serverEndpoint => copyWith(serverEndpoint: .fromNullable(value as String?)),
+    };
+  }
+}
--- a/mobile/lib/domain/models/store.model.dart
+++ b/mobile/lib/domain/models/store.model.dart
@@ -6,9 +6,6 @@ enum StoreKey<T> {
  version<int>._(0),
  currentUser<UserDto>._(2),
  deviceId<String>._(4),
-  serverUrl<String>._(10),
-  accessToken<String>._(11),
-  serverEndpoint<String>._(12),
  advancedTroubleshooting<bool>._(114),
  enableHapticFeedback<bool>._(126),

@@ -19,6 +16,9 @@ enum StoreKey<T> {
  syncMigrationStatus<String>._(1013),

  // Legacy keys that have been migrated to the new metadata store
+  legacyServerUrl<String>._(10),
+  legacyAccessToken<String>._(11),
+  legacyServerEndpoint<String>._(12),
  legacyBackupRequireCharging<bool>._(7),
  legacyBackupTriggerDelay<int>._(8),
  legacySyncAlbums<bool>._(131),
--- a/mobile/lib/domain/services/remote_album.service.dart
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -159,8 +159,8 @@ class RemoteAlbumService {
    return updatedAlbum;
  }

-  Stream<(DateTime, DateTime)> watchDateRange(String albumId) {
-    return _repository.watchDateRange(albumId);
+  FutureOr<(DateTime, DateTime)> getDateRange(String albumId) {
+    return _repository.getDateRange(albumId);
  }

  Future<List<UserDto>> getSharedUsers(String albumId) {
@@ -175,12 +175,12 @@ class RemoteAlbumService {
    return _repository.getAssets(albumId);
  }

-  Future<({int added, int failed})> addAssets({required String albumId, required List<String> assetIds}) async {
+  Future<int> addAssets({required String albumId, required List<String> assetIds}) async {
    final album = await _albumApiRepository.addAssets(albumId, assetIds);

    await _repository.addAssets(albumId, album.added);

-    return (added: album.added.length, failed: album.failed.length);
+    return album.added.length;
  }

  /// !TODO The name here is not clear as we have addAssets method above,
@@ -196,7 +196,7 @@ class RemoteAlbumService {
  }) async {
    int addedCount = 0;
    if (candidates.remoteAssetIds.isNotEmpty) {
-      addedCount += (await addAssets(albumId: albumId, assetIds: candidates.remoteAssetIds)).added;
+      addedCount += await addAssets(albumId: albumId, assetIds: candidates.remoteAssetIds);
    }
    if (candidates.localAssetsToUpload.isNotEmpty) {
      addedCount += await _uploadAndAddLocals(
--- a/mobile/lib/infrastructure/entities/session.entity.dart
+++ b/mobile/lib/infrastructure/entities/session.entity.dart
@@ -0,0 +1,18 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class SessionEntity extends Table with DriftDefaultsMixin {
+  const SessionEntity();
+
+  TextColumn get key => text()();
+
+  TextColumn get value => text().nullable()();
+
+  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+
+  @override
+  Set<Column> get primaryKey => {key};
+
+  @override
+  String get tableName => "session";
+}
--- a/mobile/lib/infrastructure/entities/session.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/session.entity.drift.dart
@@ -0,0 +1,427 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/session.entity.dart'
+    as i2;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
+
+typedef $$SessionEntityTableCreateCompanionBuilder =
+    i1.SessionEntityCompanion Function({
+      required String key,
+      i0.Value<String?> value,
+      i0.Value<DateTime> updatedAt,
+    });
+typedef $$SessionEntityTableUpdateCompanionBuilder =
+    i1.SessionEntityCompanion Function({
+      i0.Value<String> key,
+      i0.Value<String?> value,
+      i0.Value<DateTime> updatedAt,
+    });
+
+class $$SessionEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$SessionEntityTable> {
+  $$SessionEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get key => $composableBuilder(
+    column: $table.key,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<String> get value => $composableBuilder(
+    column: $table.value,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+}
+
+class $$SessionEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$SessionEntityTable> {
+  $$SessionEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get key => $composableBuilder(
+    column: $table.key,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<String> get value => $composableBuilder(
+    column: $table.value,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+}
+
+class $$SessionEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$SessionEntityTable> {
+  $$SessionEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get key =>
+      $composableBuilder(column: $table.key, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get value =>
+      $composableBuilder(column: $table.value, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get updatedAt =>
+      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
+}
+
+class $$SessionEntityTableTableManager
+    extends
+        i0.RootTableManager<
+          i0.GeneratedDatabase,
+          i1.$SessionEntityTable,
+          i1.SessionEntityData,
+          i1.$$SessionEntityTableFilterComposer,
+          i1.$$SessionEntityTableOrderingComposer,
+          i1.$$SessionEntityTableAnnotationComposer,
+          $$SessionEntityTableCreateCompanionBuilder,
+          $$SessionEntityTableUpdateCompanionBuilder,
+          (
+            i1.SessionEntityData,
+            i0.BaseReferences<
+              i0.GeneratedDatabase,
+              i1.$SessionEntityTable,
+              i1.SessionEntityData
+            >,
+          ),
+          i1.SessionEntityData,
+          i0.PrefetchHooks Function()
+        > {
+  $$SessionEntityTableTableManager(
+    i0.GeneratedDatabase db,
+    i1.$SessionEntityTable table,
+  ) : super(
+        i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$SessionEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$SessionEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$SessionEntityTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                i0.Value<String> key = const i0.Value.absent(),
+                i0.Value<String?> value = const i0.Value.absent(),
+                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+              }) => i1.SessionEntityCompanion(
+                key: key,
+                value: value,
+                updatedAt: updatedAt,
+              ),
+          createCompanionCallback:
+              ({
+                required String key,
+                i0.Value<String?> value = const i0.Value.absent(),
+                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+              }) => i1.SessionEntityCompanion.insert(
+                key: key,
+                value: value,
+                updatedAt: updatedAt,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$SessionEntityTableProcessedTableManager =
+    i0.ProcessedTableManager<
+      i0.GeneratedDatabase,
+      i1.$SessionEntityTable,
+      i1.SessionEntityData,
+      i1.$$SessionEntityTableFilterComposer,
+      i1.$$SessionEntityTableOrderingComposer,
+      i1.$$SessionEntityTableAnnotationComposer,
+      $$SessionEntityTableCreateCompanionBuilder,
+      $$SessionEntityTableUpdateCompanionBuilder,
+      (
+        i1.SessionEntityData,
+        i0.BaseReferences<
+          i0.GeneratedDatabase,
+          i1.$SessionEntityTable,
+          i1.SessionEntityData
+        >,
+      ),
+      i1.SessionEntityData,
+      i0.PrefetchHooks Function()
+    >;
+
+class $SessionEntityTable extends i2.SessionEntity
+    with i0.TableInfo<$SessionEntityTable, i1.SessionEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $SessionEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _keyMeta = const i0.VerificationMeta('key');
+  @override
+  late final i0.GeneratedColumn<String> key = i0.GeneratedColumn<String>(
+    'key',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const i0.VerificationMeta _valueMeta = const i0.VerificationMeta(
+    'value',
+  );
+  @override
+  late final i0.GeneratedColumn<String> value = i0.GeneratedColumn<String>(
+    'value',
+    aliasedName,
+    true,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  static const i0.VerificationMeta _updatedAtMeta = const i0.VerificationMeta(
+    'updatedAt',
+  );
+  @override
+  late final i0.GeneratedColumn<DateTime> updatedAt =
+      i0.GeneratedColumn<DateTime>(
+        'updated_at',
+        aliasedName,
+        false,
+        type: i0.DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+        defaultValue: i3.currentDateAndTime,
+      );
+  @override
+  List<i0.GeneratedColumn> get $columns => [key, value, updatedAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'session';
+  @override
+  i0.VerificationContext validateIntegrity(
+    i0.Insertable<i1.SessionEntityData> instance, {
+    bool isInserting = false,
+  }) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('key')) {
+      context.handle(
+        _keyMeta,
+        key.isAcceptableOrUnknown(data['key']!, _keyMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_keyMeta);
+    }
+    if (data.containsKey('value')) {
+      context.handle(
+        _valueMeta,
+        value.isAcceptableOrUnknown(data['value']!, _valueMeta),
+      );
+    }
+    if (data.containsKey('updated_at')) {
+      context.handle(
+        _updatedAtMeta,
+        updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {key};
+  @override
+  i1.SessionEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.SessionEntityData(
+      key: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}key'],
+      )!,
+      value: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}value'],
+      ),
+      updatedAt: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+    );
+  }
+
+  @override
+  $SessionEntityTable createAlias(String alias) {
+    return $SessionEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class SessionEntityData extends i0.DataClass
+    implements i0.Insertable<i1.SessionEntityData> {
+  final String key;
+  final String? value;
+  final DateTime updatedAt;
+  const SessionEntityData({
+    required this.key,
+    this.value,
+    required this.updatedAt,
+  });
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['key'] = i0.Variable<String>(key);
+    if (!nullToAbsent || value != null) {
+      map['value'] = i0.Variable<String>(value);
+    }
+    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    return map;
+  }
+
+  factory SessionEntityData.fromJson(
+    Map<String, dynamic> json, {
+    i0.ValueSerializer? serializer,
+  }) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return SessionEntityData(
+      key: serializer.fromJson<String>(json['key']),
+      value: serializer.fromJson<String?>(json['value']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'key': serializer.toJson<String>(key),
+      'value': serializer.toJson<String?>(value),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+    };
+  }
+
+  i1.SessionEntityData copyWith({
+    String? key,
+    i0.Value<String?> value = const i0.Value.absent(),
+    DateTime? updatedAt,
+  }) => i1.SessionEntityData(
+    key: key ?? this.key,
+    value: value.present ? value.value : this.value,
+    updatedAt: updatedAt ?? this.updatedAt,
+  );
+  SessionEntityData copyWithCompanion(i1.SessionEntityCompanion data) {
+    return SessionEntityData(
+      key: data.key.present ? data.key.value : this.key,
+      value: data.value.present ? data.value.value : this.value,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SessionEntityData(')
+          ..write('key: $key, ')
+          ..write('value: $value, ')
+          ..write('updatedAt: $updatedAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(key, value, updatedAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.SessionEntityData &&
+          other.key == this.key &&
+          other.value == this.value &&
+          other.updatedAt == this.updatedAt);
+}
+
+class SessionEntityCompanion extends i0.UpdateCompanion<i1.SessionEntityData> {
+  final i0.Value<String> key;
+  final i0.Value<String?> value;
+  final i0.Value<DateTime> updatedAt;
+  const SessionEntityCompanion({
+    this.key = const i0.Value.absent(),
+    this.value = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+  });
+  SessionEntityCompanion.insert({
+    required String key,
+    this.value = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+  }) : key = i0.Value(key);
+  static i0.Insertable<i1.SessionEntityData> custom({
+    i0.Expression<String>? key,
+    i0.Expression<String>? value,
+    i0.Expression<DateTime>? updatedAt,
+  }) {
+    return i0.RawValuesInsertable({
+      if (key != null) 'key': key,
+      if (value != null) 'value': value,
+      if (updatedAt != null) 'updated_at': updatedAt,
+    });
+  }
+
+  i1.SessionEntityCompanion copyWith({
+    i0.Value<String>? key,
+    i0.Value<String?>? value,
+    i0.Value<DateTime>? updatedAt,
+  }) {
+    return i1.SessionEntityCompanion(
+      key: key ?? this.key,
+      value: value ?? this.value,
+      updatedAt: updatedAt ?? this.updatedAt,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (key.present) {
+      map['key'] = i0.Variable<String>(key.value);
+    }
+    if (value.present) {
+      map['value'] = i0.Variable<String>(value.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SessionEntityCompanion(')
+          ..write('key: $key, ')
+          ..write('value: $value, ')
+          ..write('updatedAt: $updatedAt')
+          ..write(')'))
+        .toString();
+  }
+}
--- a/mobile/lib/infrastructure/repositories/cached_key_value_repository.dart
+++ b/mobile/lib/infrastructure/repositories/cached_key_value_repository.dart
@@ -21,6 +21,7 @@ abstract class CachedKeyValueRepository<K extends Enum, S> {

  Future<void> refresh() async => _snapshot = _build(await selectable().get());

+  @protected
  Stream<S> watchSnapshot() => selectable().watch().map((rows) => _snapshot = _build(rows));

  S _build(List<({String key, String? value})> rows) => buildSnapshot(
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -25,6 +25,7 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.d
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/session.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
@@ -67,6 +68,7 @@ import 'package:sqlite_async/sqlite_async.dart';
    AssetEditEntity,
    SettingsEntity,
    AssetOcrEntity,
+    SessionEntity,
  ],
  include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -120,7 +122,7 @@ class Drift extends $Drift {
  }

  @override
-  int get schemaVersion => 31;
+  int get schemaVersion => 32;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -317,6 +319,10 @@ class Drift extends $Drift {
              },
              from30To31: (m, v31) async {
                await m.createIndex(v31.idxRemoteAssetUploaded);
+                // await m.createTable(v31.session);
+              },
+              from31To32: (m, v32) async {
+                await m.createTable(v32.session);
              },
            ),
          ),
--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -47,9 +47,11 @@ import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart
    as i22;
 import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart'
    as i23;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart'
    as i24;
-import 'package:drift/internal/modular.dart' as i25;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i25;
+import 'package:drift/internal/modular.dart' as i26;

 abstract class $Drift extends i0.GeneratedDatabase {
  $Drift(i0.QueryExecutor e) : super(e);
@@ -99,9 +101,12 @@ abstract class $Drift extends i0.GeneratedDatabase {
  late final i23.$AssetOcrEntityTable assetOcrEntity = i23.$AssetOcrEntityTable(
    this,
  );
-  i24.MergedAssetDrift get mergedAssetDrift => i25.ReadDatabaseContainer(
+  late final i24.$SessionEntityTable sessionEntity = i24.$SessionEntityTable(
    this,
-  ).accessor<i24.MergedAssetDrift>(i24.MergedAssetDrift.new);
+  );
+  i25.MergedAssetDrift get mergedAssetDrift => i26.ReadDatabaseContainer(
+    this,
+  ).accessor<i25.MergedAssetDrift>(i25.MergedAssetDrift.new);
  @override
  Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
      allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -141,6 +146,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
    assetEditEntity,
    settingsEntity,
    assetOcrEntity,
+    sessionEntity,
    i10.idxPartnerSharedWithId,
    i11.idxLatLng,
    i11.idxRemoteExifCity,
@@ -415,4 +421,6 @@ class $DriftManager {
      i22.$$SettingsEntityTableTableManager(_db, _db.settingsEntity);
  i23.$$AssetOcrEntityTableTableManager get assetOcrEntity =>
      i23.$$AssetOcrEntityTableTableManager(_db, _db.assetOcrEntity);
+  i24.$$SessionEntityTableTableManager get sessionEntity =>
+      i24.$$SessionEntityTableTableManager(_db, _db.sessionEntity);
 }
--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -16506,6 +16506,603 @@ final class Schema31 extends i0.VersionedSchema {
  );
 }

+final class Schema32 extends i0.VersionedSchema {
+  Schema32({required super.database}) : super(version: 32);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAlbumAssetAlbumAsset,
+    idxLocalAssetChecksum,
+    idxLocalAssetCloudId,
+    idxLocalAssetCreatedAt,
+    idxStackPrimaryAssetId,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    idxRemoteAssetStackId,
+    idxRemoteAssetOwnerVisibilityDeletedCreated,
+    idxRemoteAssetUploaded,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    remoteAssetCloudIdEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    trashedLocalAssetEntity,
+    assetEditEntity,
+    settings,
+    assetOcrEntity,
+    session,
+    idxPartnerSharedWithId,
+    idxLatLng,
+    idxRemoteExifCity,
+    idxRemoteAlbumAssetAlbumAsset,
+    idxRemoteAssetCloudId,
+    idxPersonOwnerId,
+    idxAssetFacePersonId,
+    idxAssetFaceAssetId,
+    idxAssetFaceVisiblePerson,
+    idxTrashedLocalAssetChecksum,
+    idxTrashedLocalAssetAlbum,
+    idxAssetEditAssetId,
+    idxAssetOcrAssetId,
+  ];
+  late final Shape33 userEntity = Shape33(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_109,
+        _column_110,
+        _column_111,
+        _column_112,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape50 remoteAssetEntity = Shape50(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_119,
+        _column_120,
+        _column_121,
+        _column_122,
+        _column_123,
+        _column_124,
+        _column_212,
+        _column_125,
+        _column_126,
+        _column_127,
+        _column_128,
+        _column_129,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape35 stackEntity = Shape35(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_121,
+        _column_130,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape36 localAssetEntity = Shape36(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_131,
+        _column_120,
+        _column_132,
+        _column_133,
+        _column_134,
+        _column_135,
+        _column_136,
+        _column_137,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape48 remoteAlbumEntity = Shape48(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_138,
+        _column_114,
+        _column_115,
+        _column_139,
+        _column_140,
+        _column_141,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape38 localAlbumEntity = Shape38(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_115,
+        _column_142,
+        _column_143,
+        _column_144,
+        _column_145,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape39 localAlbumAssetEntity = Shape39(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_146, _column_147, _column_145],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
+    'idx_local_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxLocalAssetChecksum = i1.Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  final i1.Index idxLocalAssetCloudId = i1.Index(
+    'idx_local_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
+  );
+  final i1.Index idxLocalAssetCreatedAt = i1.Index(
+    'idx_local_asset_created_at',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_created_at ON local_asset_entity (created_at)',
+  );
+  final i1.Index idxStackPrimaryAssetId = i1.Index(
+    'idx_stack_primary_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
+  );
+  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  final i1.Index idxRemoteAssetChecksum = i1.Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  final i1.Index idxRemoteAssetStackId = i1.Index(
+    'idx_remote_asset_stack_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
+  );
+  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
+    'idx_remote_asset_owner_visibility_deleted_created',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
+  );
+  final i1.Index idxRemoteAssetUploaded = i1.Index(
+    'idx_remote_asset_uploaded',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_uploaded ON remote_asset_entity (uploaded_at)',
+  );
+  late final Shape40 authUserEntity = Shape40(
+    source: i0.VersionedTable(
+      entityName: 'auth_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_109,
+        _column_148,
+        _column_110,
+        _column_111,
+        _column_149,
+        _column_150,
+        _column_151,
+        _column_152,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape4 userMetadataEntity = Shape4(
+    source: i0.VersionedTable(
+      entityName: 'user_metadata_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
+      columns: [_column_153, _column_154, _column_155],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape41 partnerEntity = Shape41(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_156, _column_157, _column_158],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape42 remoteExifEntity = Shape42(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_159,
+        _column_160,
+        _column_161,
+        _column_162,
+        _column_163,
+        _column_164,
+        _column_117,
+        _column_116,
+        _column_165,
+        _column_166,
+        _column_167,
+        _column_168,
+        _column_135,
+        _column_136,
+        _column_169,
+        _column_170,
+        _column_171,
+        _column_172,
+        _column_173,
+        _column_174,
+        _column_175,
+        _column_176,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_159, _column_177],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape10 remoteAlbumUserEntity = Shape10(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
+      columns: [_column_177, _column_153, _column_178],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape43 remoteAssetCloudIdEntity = Shape43(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_cloud_id_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_159,
+        _column_179,
+        _column_180,
+        _column_134,
+        _column_135,
+        _column_136,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape44 memoryEntity = Shape44(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_124,
+        _column_121,
+        _column_113,
+        _column_181,
+        _column_182,
+        _column_183,
+        _column_184,
+        _column_185,
+        _column_186,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape12 memoryAssetEntity = Shape12(
+    source: i0.VersionedTable(
+      entityName: 'memory_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
+      columns: [_column_159, _column_187],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape45 personEntity = Shape45(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_121,
+        _column_108,
+        _column_188,
+        _column_189,
+        _column_190,
+        _column_191,
+        _column_192,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape46 assetFaceEntity = Shape46(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_193,
+        _column_194,
+        _column_195,
+        _column_196,
+        _column_197,
+        _column_198,
+        _column_199,
+        _column_200,
+        _column_201,
+        _column_124,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape18 storeEntity = Shape18(
+    source: i0.VersionedTable(
+      entityName: 'store_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_202, _column_203, _column_204],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape47 trashedLocalAssetEntity = Shape47(
+    source: i0.VersionedTable(
+      entityName: 'trashed_local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id, album_id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_205,
+        _column_131,
+        _column_120,
+        _column_132,
+        _column_206,
+        _column_137,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape32 assetEditEntity = Shape32(
+    source: i0.VersionedTable(
+      entityName: 'asset_edit_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_207,
+        _column_208,
+        _column_209,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape49 settings = Shape49(
+    source: i0.VersionedTable(
+      entityName: 'settings',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY("key")'],
+      columns: [_column_210, _column_224, _column_115],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape51 assetOcrEntity = Shape51(
+    source: i0.VersionedTable(
+      entityName: 'asset_ocr_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_213,
+        _column_214,
+        _column_215,
+        _column_216,
+        _column_217,
+        _column_218,
+        _column_219,
+        _column_220,
+        _column_221,
+        _column_222,
+        _column_223,
+        _column_201,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape49 session = Shape49(
+    source: i0.VersionedTable(
+      entityName: 'session',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY("key")'],
+      columns: [_column_210, _column_224, _column_115],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxPartnerSharedWithId = i1.Index(
+    'idx_partner_shared_with_id',
+    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
+  );
+  final i1.Index idxLatLng = i1.Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+  final i1.Index idxRemoteExifCity = i1.Index(
+    'idx_remote_exif_city',
+    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
+  );
+  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
+    'idx_remote_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxRemoteAssetCloudId = i1.Index(
+    'idx_remote_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
+  );
+  final i1.Index idxPersonOwnerId = i1.Index(
+    'idx_person_owner_id',
+    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
+  );
+  final i1.Index idxAssetFacePersonId = i1.Index(
+    'idx_asset_face_person_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
+  );
+  final i1.Index idxAssetFaceAssetId = i1.Index(
+    'idx_asset_face_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
+  );
+  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
+    'idx_asset_face_visible_person',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
+  );
+  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
+    'idx_trashed_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
+  );
+  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
+    'idx_trashed_local_asset_album',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
+  );
+  final i1.Index idxAssetEditAssetId = i1.Index(
+    'idx_asset_edit_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
+  );
+  final i1.Index idxAssetOcrAssetId = i1.Index(
+    'idx_asset_ocr_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_ocr_asset_id ON asset_ocr_entity (asset_id)',
+  );
+}
+
 i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
  required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -16537,6 +17134,7 @@ i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema29 schema) from28To29,
  required Future<void> Function(i1.Migrator m, Schema30 schema) from29To30,
  required Future<void> Function(i1.Migrator m, Schema31 schema) from30To31,
+  required Future<void> Function(i1.Migrator m, Schema32 schema) from31To32,
 }) {
  return (currentVersion, database) async {
    switch (currentVersion) {
@@ -16690,6 +17288,11 @@ i0.MigrationStepWithVersion migrationSteps({
        final migrator = i1.Migrator(database, schema);
        await from30To31(migrator, schema);
        return 31;
+      case 31:
+        final schema = Schema32(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from31To32(migrator, schema);
+        return 32;
      default:
        throw ArgumentError.value('Unknown migration from $currentVersion');
    }
@@ -16727,6 +17330,7 @@ i1.OnUpgrade stepByStep({
  required Future<void> Function(i1.Migrator m, Schema29 schema) from28To29,
  required Future<void> Function(i1.Migrator m, Schema30 schema) from29To30,
  required Future<void> Function(i1.Migrator m, Schema31 schema) from30To31,
+  required Future<void> Function(i1.Migrator m, Schema32 schema) from31To32,
 }) => i0.VersionedSchema.stepByStepHelper(
  step: migrationSteps(
    from1To2: from1To2,
@@ -16759,5 +17363,6 @@ i1.OnUpgrade stepByStep({
    from28To29: from28To29,
    from29To30: from29To30,
    from30To31: from30To31,
+    from31To32: from31To32,
  ),
 );
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -217,7 +217,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
    });
  }

-  Stream<(DateTime, DateTime)> watchDateRange(String albumId) {
+  FutureOr<(DateTime, DateTime)> getDateRange(String albumId) {
    final query = _db.remoteAlbumAssetEntity.selectOnly()
      ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId))
      ..addColumns([_db.remoteAssetEntity.createdAt.min(), _db.remoteAssetEntity.createdAt.max()])
@@ -229,7 +229,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
      final minDate = row.read(_db.remoteAssetEntity.createdAt.min());
      final maxDate = row.read(_db.remoteAssetEntity.createdAt.max());
      return (minDate ?? DateTime.now(), maxDate ?? DateTime.now());
-    }).watchSingle();
+    }).getSingle();
  }

  Future<List<UserDto>> getSharedUsers(String albumId) async {
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -71,13 +71,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
    }

    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
-            row.stackId.equals(stackId) &
-            row.id.equals(asset.id).not() &
-            row.deletedAt.isNull() &
-            row.visibility.equalsValue(AssetVisibility.timeline),
-      )
+      ..where((row) => row.stackId.equals(stackId) & row.id.equals(asset.id).not())
      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)]);

    return query.map((row) => row.toDto()).get();
--- a/mobile/lib/infrastructure/repositories/session.repository.dart
+++ b/mobile/lib/infrastructure/repositories/session.repository.dart
@@ -0,0 +1,82 @@
+import 'package:drift/drift.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
+import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/cached_key_value_repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class SessionRepository extends CachedKeyValueRepository<SessionKey, Session> {
+  final Drift _db;
+
+  SessionRepository._(this._db) : super(const .new());
+
+  static SessionRepository? _instance;
+
+  static SessionRepository get instance {
+    final instance = _instance;
+    if (instance == null) {
+      throw StateError('SessionRepository not initialized. Call ensureInitialized() first');
+    }
+    return instance;
+  }
+
+  static Future<SessionRepository> ensureInitialized(Drift db) async {
+    if (_instance == null) {
+      final instance = SessionRepository._(db);
+      await instance.refresh();
+      _instance = instance;
+    }
+    return _instance!;
+  }
+
+  @override
+  List<SessionKey> get keys => SessionKey.values;
+
+  @override
+  Object decodeValue(SessionKey key, String raw) => key.decode(raw);
+
+  @override
+  Session buildSnapshot(Map<SessionKey, Object?> overrides) => Session.fromEntries(overrides);
+
+  @override
+  @protected
+  Selectable<({String key, String? value})> selectable() =>
+      _db.select(_db.sessionEntity).map((row) => (key: row.key, value: row.value));
+
+  Session get session => snapshot;
+
+  Future<void> clear(Iterable<SessionKey> keys) async {
+    if (keys.isEmpty) {
+      return;
+    }
+
+    final names = keys.map((key) => key.name).toList();
+    await (_db.delete(_db.sessionEntity)..where((row) => row.key.isIn(names))).go();
+
+    var session = snapshot;
+    for (final key in keys) {
+      session = session.write(key, defaultSession.read(key));
+    }
+    snapshot = session;
+  }
+
+  Future<void> write<T, U extends T>(SessionKey<T> key, U value) async {
+    if (value == snapshot.read(key)) {
+      return;
+    }
+
+    String? resolvedValue;
+    if (value != null) {
+      resolvedValue = key.encode(value);
+    }
+
+    await _db
+        .into(_db.sessionEntity)
+        .insertOnConflictUpdate(
+          SessionEntityCompanion.insert(key: key.name, value: .new(resolvedValue), updatedAt: .new(DateTime.now())),
+        );
+    snapshot = snapshot.write(key, value);
+  }
+
+  Stream<Session> watch() => watchSnapshot();
+}
--- a/mobile/lib/infrastructure/repositories/settings.repository.dart
+++ b/mobile/lib/infrastructure/repositories/settings.repository.dart
@@ -1,4 +1,5 @@
 import 'package:drift/drift.dart';
+import 'package:flutter/material.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
@@ -39,6 +40,7 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
  AppConfig buildSnapshot(Map<SettingsKey, Object?> overrides) => AppConfig.fromEntries(overrides);

  @override
+  @protected
  Selectable<({String key, String? value})> selectable() =>
      _db.select(_db.settingsEntity).map((row) => (key: row.key, value: row.value));

@@ -81,5 +83,5 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
    snapshot = snapshot.write(key, value);
  }

-  Stream<AppConfig> watchConfig() => watchSnapshot();
+  Stream<AppConfig> watch() => watchSnapshot();
 }
--- a/mobile/lib/pages/common/splash_screen.page.dart
+++ b/mobile/lib/pages/common/splash_screen.page.dart
@@ -16,6 +16,7 @@ import 'package:immich_mobile/infrastructure/repositories/settings.repository.da
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/view_intent/view_intent_handler.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
@@ -298,9 +299,10 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
  }

  void resumeSession() async {
-    final serverUrl = Store.tryGet(StoreKey.serverUrl);
-    final endpoint = Store.tryGet(StoreKey.serverEndpoint);
-    final accessToken = Store.tryGet(StoreKey.accessToken);
+    final session = ref.read(sessionProvider);
+    final serverUrl = session.serverUrl;
+    final endpoint = session.serverEndpoint;
+    final accessToken = session.accessToken;

    if (accessToken != null && serverUrl != null && endpoint != null) {
      final infoProvider = ref.read(serverInfoProvider.notifier);
--- a/mobile/lib/pages/library/partner/partner.page.dart
+++ b/mobile/lib/pages/library/partner/partner.page.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/partner.action.dart';
 import 'package:immich_mobile/presentation/widgets/people/partner_user_avatar.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -33,7 +33,7 @@ class PartnerPage extends ConsumerWidget {
        title: Text(context.t.partners),
        elevation: 0,
        centerTitle: false,
-        actions: const [PartnerAddAction(display: ActionDisplay.iconButton)],
+        actions: const [ActionIconButtonWidget(action: PartnerAddAction())],
      ),
      body: sharedByAsync.when(
        data: (partners) => PartnerSharedByList(partners: partners.toList(growable: false)),
@@ -60,7 +60,7 @@ class _EmptyPartners extends StatelessWidget {
          ),
          const Align(
            alignment: .center,
-            child: PartnerAddAction(),
+            child: ActionButtonWidget(action: PartnerAddAction()),
          ),
        ],
      ),
@@ -88,10 +88,8 @@ class PartnerSharedByList extends StatelessWidget {
          leading: PartnerUserAvatar(userId: partner.id, name: partner.name),
          title: Text(partner.name),
          subtitle: Text(partner.email),
-          trailing: PartnerRemoveAction(
-            sharedWithId: partner.id,
-            partnerName: partner.name,
-            display: ActionDisplay.iconButton,
+          trailing: ActionIconButtonWidget(
+            action: PartnerRemoveAction(sharedWithId: partner.id, partnerName: partner.name),
          ),
        );
      },
--- a/mobile/lib/presentation/actions/action.dart
+++ b/mobile/lib/presentation/actions/action.dart
@@ -1,17 +1,32 @@
-import 'package:flutter/widgets.dart' hide Action;
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';

-enum ActionDisplay { button, iconButton, menuItem, columnButton }
+class ActionScope {
+  final BuildContext context;
+  final WidgetRef ref;
+  final UserDto authUser;

-class Action {
-  final IconData icon;
-  final bool isVisible;
-  final String label;
-  final Future<void> Function() onAction;
-
-  const Action({
-    required this.icon,
-    this.isVisible = true,
-    required this.label,
-    required this.onAction,
-  });
+  const ActionScope({required this.context, required this.ref, required this.authUser});
+}
+
+abstract class BaseAction {
+  const BaseAction();
+
+  IconData get icon;
+
+  String label(ActionScope scope);
+
+  bool isVisible(ActionScope scope) => true;
+
+  Future<void> onAction(ActionScope scope);
+}
+
+abstract class AssetAction<T extends BaseAsset> extends BaseAction {
+  final Iterable<BaseAsset> assets;
+
+  const AssetAction({required this.assets});
+
+  Iterable<T> filter(ActionScope scope) => assets.whereType<T>();
 }
--- a/mobile/lib/presentation/actions/action.widget.dart
+++ b/mobile/lib/presentation/actions/action.widget.dart
@@ -1,30 +1,95 @@
-import 'package:flutter/material.dart' hide Action;
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/utils/error_handler.dart';
 import 'package:immich_ui/immich_ui.dart';

-abstract class ActionWidget extends ConsumerWidget {
-  final ActionDisplay display;
+class _ActionWidgetScope {
+  final String label;
+  final VoidCallback onAction;

-  const ActionWidget({super.key, this.display = ActionDisplay.button});
+  const _ActionWidgetScope({required this.label, required this.onAction});
+}

-  Action resolve(BuildContext context, WidgetRef ref);
+class _ActionWidget extends ConsumerWidget {
+  final BaseAction action;
+  final Widget Function(_ActionWidgetScope context) builder;
+
+  const _ActionWidget({required this.action, required this.builder});
+
+  Future<void> _onAction(ActionScope scope) async {
+    try {
+      await action.onAction(scope);
+    } catch (error, stackTrace) {
+      handleError(scope.context, error, stack: stackTrace, description: 'Action failed: ${action.runtimeType}');
+    }
+  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final action = resolve(context, ref);
-    if (!action.isVisible) {
+    final authUser = ref.watch(currentUserProvider);
+    if (authUser == null) {
      return const SizedBox.shrink();
    }

-    return switch (display) {
-      ActionDisplay.button =>
-        ImmichTextButton(labelText: action.label, icon: action.icon, onPressed: action.onAction),
-      ActionDisplay.iconButton => ImmichIconButton(icon: action.icon, onPressed: action.onAction),
-      ActionDisplay.menuItem =>
-        ImmichMenuItem(icon: action.icon, label: action.label, onPressed: action.onAction),
-      ActionDisplay.columnButton =>
-        ImmichColumnButton(icon: action.icon, label: action.label, onPressed: action.onAction),
-    };
+    final scope = ActionScope(context: context, ref: ref, authUser: authUser);
+    if (!action.isVisible(scope)) {
+      return const SizedBox.shrink();
+    }
+
+    return builder(.new(label: action.label(scope), onAction: () => _onAction(scope)));
  }
 }
+
+class ActionIconButtonWidget extends StatelessWidget {
+  final BaseAction action;
+  final ImmichVariant variant;
+
+  const ActionIconButtonWidget({super.key, required this.action, this.variant = .ghost});
+
+  @override
+  Widget build(BuildContext context) => _ActionWidget(
+    action: action,
+    builder: (ctx) => ImmichIconButton(icon: action.icon, onPressed: ctx.onAction, variant: variant),
+  );
+}
+
+class ActionButtonWidget extends StatelessWidget {
+  final BaseAction action;
+  final ImmichVariant variant;
+
+  const ActionButtonWidget({super.key, required this.action, this.variant = .ghost});
+
+  @override
+  Widget build(BuildContext context) => _ActionWidget(
+    action: action,
+    builder: (ctx) =>
+        ImmichTextButton(labelText: ctx.label, icon: action.icon, onPressed: ctx.onAction, variant: variant),
+  );
+}
+
+class ActionColumnButtonWidget extends StatelessWidget {
+  final BaseAction action;
+
+  const ActionColumnButtonWidget({super.key, required this.action});
+
+  @override
+  Widget build(BuildContext context) => _ActionWidget(
+    action: action,
+    builder: (ctx) => ImmichColumnButton(icon: action.icon, label: ctx.label, onPressed: ctx.onAction),
+  );
+}
+
+class ActionMenuItemWidget extends StatelessWidget {
+  final BaseAction action;
+
+  const ActionMenuItemWidget({super.key, required this.action});
+
+  @override
+  Widget build(BuildContext context) => _ActionWidget(
+    action: action,
+    builder: (ctx) => ImmichMenuItem(icon: action.icon, label: ctx.label, onPressed: ctx.onAction),
+  );
+}
--- a/mobile/lib/presentation/actions/asset_action.dart
+++ b/mobile/lib/presentation/actions/asset_action.dart
@@ -1,33 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-
-typedef AssetActionSelection = ({Set<BaseAsset> assets, void Function() clearSelect});
-
-final assetsActionProvider = Provider.family<AssetActionSelection, ActionSource>((ref, source) {
-  final assets = switch (source) {
-    ActionSource.timeline => ref.watch(multiSelectProvider.select((s) => s.selectedAssets)),
-    ActionSource.viewer => switch (ref.watch(assetViewerProvider.select((s) => s.currentAsset))) {
-      BaseAsset asset => {asset},
-      null => const <BaseAsset>{},
-    },
-  };
-
-  return (
-    assets: assets,
-    clearSelect: () {
-      if (source == ActionSource.timeline) {
-        ref.read(multiSelectProvider.notifier).reset();
-      }
-    },
-  );
-});
-
-abstract class AssetAction extends ActionWidget {
-  final ActionSource source;
-
-  const AssetAction({super.key, super.display, this.source = ActionSource.timeline});
-}
--- a/mobile/lib/presentation/actions/asset_debug.action.dart
+++ b/mobile/lib/presentation/actions/asset_debug.action.dart
@@ -1,30 +1,27 @@
 import 'dart:async';

 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart' hide Action;
-import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/presentation/actions/asset_action.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/routing/router.dart';

-class AssetDebugAction extends AssetAction {
-  const AssetDebugAction({super.key, super.display, super.source});
+class AssetDebugAction extends AssetAction<BaseAsset> {
+  const AssetDebugAction({required super.assets});

  @override
-  Action resolve(BuildContext context, WidgetRef ref) {
-    final (:assets, :clearSelect) = ref.watch(assetsActionProvider(source));
-    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);
+  IconData get icon => Icons.help_outline_rounded;

-    return Action(
-      icon: Icons.help_outline_rounded,
-      isVisible: assets.length == 1 && advancedTroubleshooting,
-      label: context.t.troubleshoot,
-      onAction: () async {
-        unawaited(context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
-        clearSelect();
-      },
-    );
-  }
+  @override
+  String label(ActionScope scope) => scope.context.t.troubleshoot;
+
+  @override
+  bool isVisible(ActionScope scope) =>
+      assets.length == 1 && scope.ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);
+
+  @override
+  Future<void> onAction(ActionScope scope) async =>
+      unawaited(scope.context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
 }
--- a/mobile/lib/presentation/actions/favorite.action.dart
+++ b/mobile/lib/presentation/actions/favorite.action.dart
@@ -1,60 +1,38 @@
-import 'package:flutter/material.dart' hide Action;
-import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:flutter/material.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/presentation/actions/asset_action.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/utils/asset_filter.dart';
 import 'package:immich_ui/immich_ui.dart';

-class FavoriteAction extends AssetAction {
-  const FavoriteAction({super.key, super.display, super.source});
+class FavoriteAction extends AssetAction<RemoteAsset> {
+  final bool favorite;
+
+  FavoriteAction({required super.assets}) : favorite = assets.any((asset) => !asset.isFavorite);

  @override
-  Action resolve(BuildContext context, WidgetRef ref) {
-    final (:assets, :clearSelect) = ref.watch(assetsActionProvider(source));
-    final userId = ref.read(currentUserProvider)?.id;
-    final targets = userId == null
-        ? const <RemoteAsset>[]
-        : AssetFilter(assets).owned(userId).favorite(isFavorite: false).toList(growable: false);
-
-    return Action(
-      icon: Icons.favorite_border_rounded,
-      isVisible: targets.isNotEmpty,
-      label: context.t.favorite,
-      onAction: () async {
-        final ids = targets.map((asset) => asset.id).toList(growable: false);
-        await ref.read(assetServiceProvider).updateFavorite(ids, true);
-        snackbar.success(StaticTranslations.instance.favorite_action_prompt(count: ids.length));
-        clearSelect();
-      },
-    );
-  }
-}
-
-class UnfavoriteAction extends AssetAction {
-  const UnfavoriteAction({super.key, super.display, super.source});
+  IconData get icon => favorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;

  @override
-  Action resolve(BuildContext context, WidgetRef ref) {
-    final (:assets, :clearSelect) = ref.watch(assetsActionProvider(source));
-    final userId = ref.read(currentUserProvider)?.id;
-    final targets = userId == null
-        ? const <RemoteAsset>[]
-        : AssetFilter(assets).owned(userId).favorite(isFavorite: true).toList(growable: false);
+  String label(ActionScope scope) => favorite ? scope.context.t.favorite : scope.context.t.unfavorite;

-    return Action(
-      icon: Icons.favorite_rounded,
-      isVisible: targets.isNotEmpty,
-      label: context.t.unfavorite,
-      onAction: () async {
-        final ids = targets.map((asset) => asset.id).toList(growable: false);
-        await ref.read(assetServiceProvider).updateFavorite(ids, false);
-        snackbar.success(StaticTranslations.instance.unfavorite_action_prompt(count: ids.length));
-        clearSelect();
-      },
-    );
+  @override
+  Iterable<RemoteAsset> filter(ActionScope scope) =>
+      AssetFilter(assets).owned(scope.authUser.id).favorite(isFavorite: !favorite);
+
+  @override
+  bool isVisible(ActionScope scope) => filter(scope).isNotEmpty;
+
+  @override
+  Future<void> onAction(ActionScope scope) async {
+    final ActionScope(:ref) = scope;
+    final assets = filter(scope).map((asset) => asset.id).toList(growable: false);
+
+    await ref.read(assetServiceProvider).updateFavorite(assets, favorite);
+    final message = favorite
+        ? StaticTranslations.instance.favorite_action_prompt(count: assets.length)
+        : StaticTranslations.instance.unfavorite_action_prompt(count: assets.length);
+    snackbar.success(message);
  }
 }
--- a/mobile/lib/presentation/actions/partner.action.dart
+++ b/mobile/lib/presentation/actions/partner.action.dart
@@ -1,76 +1,69 @@
-import 'package:flutter/material.dart' hide Action;
+import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/widgets/people/partner_user_avatar.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';

-class PartnerAddAction extends ActionWidget {
-  const PartnerAddAction({super.key, super.display});
+class PartnerAddAction extends BaseAction {
+  const PartnerAddAction();

  @override
-  Action resolve(BuildContext context, WidgetRef ref) {
-    return Action(
-      icon: Icons.person_add_rounded,
-      label: context.t.add_partner,
-      onAction: () async {
-        final authUser = ref.read(currentUserProvider);
-        if (authUser == null) {
-          return;
-        }
+  IconData get icon => Icons.person_add_rounded;

-        final selected = await showDialog<User>(context: context, builder: (_) => const PartnerSelectionDialog());
-        if (selected == null) {
-          return;
-        }
+  @override
+  String label(ActionScope scope) => scope.context.t.add_partner;

-        await ref.read(partnerServiceProvider).create(sharedById: authUser.id, sharedWithId: selected.id);
-      },
-    );
+  @override
+  Future<void> onAction(ActionScope scope) async {
+    final ActionScope(:context, :ref, :authUser) = scope;
+    final selected = await showDialog<User>(context: context, builder: (_) => const PartnerSelectionDialog());
+    if (selected == null) {
+      return;
+    }
+
+    await ref.read(partnerServiceProvider).create(sharedById: authUser.id, sharedWithId: selected.id);
  }
 }

-class PartnerRemoveAction extends ActionWidget {
+class PartnerRemoveAction extends BaseAction {
+  const PartnerRemoveAction({required this.sharedWithId, required this.partnerName});
+
  final String sharedWithId;
  final String partnerName;

-  const PartnerRemoveAction({super.key, super.display, required this.sharedWithId, required this.partnerName});
+  @override
+  IconData get icon => Icons.person_remove_rounded;

  @override
-  Action resolve(BuildContext context, WidgetRef ref) {
-    return Action(
-      icon: Icons.person_remove_rounded,
-      label: context.t.remove,
-      onAction: () async {
-        final authUser = ref.read(currentUserProvider);
-        if (authUser == null) {
-          return;
-        }
+  String label(ActionScope scope) => scope.context.t.remove;

-        final confirmed = await showDialog<bool>(
-          context: context,
-          builder: (_) => ConfirmDialog(
-            title: context.t.stop_photo_sharing,
-            content: context.t.partner_page_stop_sharing_content(partner: partnerName),
-          ),
-        );
-        if (confirmed != true) {
-          return;
-        }
+  @override
+  Future<void> onAction(ActionScope scope) async {
+    final ActionScope(:context, :ref, :authUser) = scope;

-        await ref.read(partnerServiceProvider).delete(sharedById: authUser.id, sharedWithId: sharedWithId);
-      },
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (_) => ConfirmDialog(
+        title: context.t.stop_photo_sharing,
+        content: context.t.partner_page_stop_sharing_content(partner: partnerName),
+      ),
    );
+    if (confirmed != true) {
+      return;
+    }
+
+    await ref.read(partnerServiceProvider).delete(sharedById: authUser.id, sharedWithId: sharedWithId);
  }
 }

@visibleForTesting
 final candidatesStateProvider = StreamProvider.autoDispose<Iterable<User>>((ref) {
  final currentUser = ref.watch(currentUserProvider);
+  // TODO: Refactor with a route guard to avoid this check in every provider
  if (currentUser == null) {
    return const Stream.empty();
  }
--- a/mobile/lib/presentation/actions/timeline.action.dart
+++ b/mobile/lib/presentation/actions/timeline.action.dart
@@ -0,0 +1,24 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+
+class TimelineAction extends BaseAction {
+  final BaseAction action;
+
+  const TimelineAction({required this.action});
+
+  @override
+  IconData get icon => action.icon;
+
+  @override
+  String label(ActionScope scope) => action.label(scope);
+
+  @override
+  bool isVisible(ActionScope scope) => action.isVisible(scope);
+
+  @override
+  Future<void> onAction(ActionScope scope) async {
+    await action.onAction(scope);
+    scope.ref.read(multiSelectProvider.notifier).reset();
+  }
+}
--- a/mobile/lib/presentation/pages/drift_create_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_create_album.page.dart
@@ -26,7 +26,6 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
  FocusNode albumTitleTextFieldFocusNode = FocusNode();
  FocusNode albumDescriptionTextFieldFocusNode = FocusNode();
  bool isAlbumTitleTextFieldFocus = false;
-  bool isCreatingAlbum = false;
  Set<BaseAsset> selectedAssets = {};

  @override
@@ -49,7 +48,7 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
    super.dispose();
  }

-  bool get _canCreateAlbum => albumTitleController.text.trim().isNotEmpty && !isCreatingAlbum;
+  bool get _canCreateAlbum => albumTitleController.text.trim().isNotEmpty;

  String _getEffectiveTitle() {
    return albumTitleController.text.isNotEmpty
@@ -168,12 +167,7 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
  }

  Future<void> createAlbum() async {
-    if (isCreatingAlbum) {
-      return;
-    }
-
    onBackgroundTapped();
-    setState(() => isCreatingAlbum = true);

    final title = _getEffectiveTitle().trim();

@@ -193,10 +187,6 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
      if (context.mounted) {
        ImmichToast.show(context: context, toastType: ToastType.error, msg: 'errors.failed_to_create_album'.t());
      }
-    } finally {
-      if (mounted) {
-        setState(() => isCreatingAlbum = false);
-      }
    }
  }

--- a/mobile/lib/presentation/pages/drift_slideshow.page.dart
+++ b/mobile/lib/presentation/pages/drift_slideshow.page.dart
@@ -51,7 +51,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
  int? _crossfadeFromIndex;
  int? _crossfadeToIndex;
  int _zoomCycle = 0;
-  bool _disableAnimations = false;

  @override
  initState() {
@@ -71,12 +70,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
    unawaited(WakelockPlus.enable());
  }

-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    _disableAnimations = MediaQuery.disableAnimationsOf(context);
-  }
-
  @override
  dispose() {
    _timer.cancel();
@@ -173,11 +166,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
  }

  void _crossFadeToPage(int page) {
-    if (_disableAnimations) {
-      _pageController.jumpToPage(page);
-      return;
-    }
-
    final previousIndex = _index;
    _pageController.jumpToPage(page);
    setState(() {
@@ -285,12 +273,19 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
    }

    if (asset.isImage) {
-      return _SlideshowProgressBar(
+      final elapsed = _stopwatch.elapsedMilliseconds;
+      final duration = _config.duration * 1000;
+
+      return TweenAnimationBuilder(
        key: Key(_index.toString()),
-        durationMs: _config.duration * 1000,
-        elapsedMs: _stopwatch.elapsedMilliseconds,
-        paused: _paused,
-        color: context.colorScheme.primary,
+        tween: Tween<double>(begin: elapsed / duration.toDouble(), end: _paused ? elapsed / duration.toDouble() : 1.0),
+        duration: Duration(milliseconds: _paused ? 1 : max(duration - elapsed, 1)),
+        builder: (context, value, _) => LinearProgressIndicator(
+          color: context.colorScheme.primary,
+          borderRadius: const BorderRadius.all(Radius.zero),
+          minHeight: 5,
+          value: value,
+        ),
      );
    } else {
      return LinearProgressIndicator(
@@ -339,21 +334,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
    final imageProvider = getFullImageProvider(asset, size: context.sizeData);

    if (asset.isImage) {
-      PhotoView buildPhotoView(PhotoViewComputedScale initialScale) => PhotoView(
-        imageProvider: imageProvider,
-        index: index,
-        disableScaleGestures: true,
-        gaplessPlayback: true,
-        filterQuality: FilterQuality.high,
-        initialScale: initialScale,
-        controller: PhotoViewController(),
-        onTapUp: (_, _, _) => _onTapUp(),
-      );
-
-      if (_disableAnimations) {
-        return buildPhotoView(scale);
-      }
-
      final zoomOut = _zoomCycle.isOdd;
      final elapsed = _stopwatch.elapsedMilliseconds;
      final duration = _config.duration * 1000;
@@ -369,7 +349,16 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
              : 1.0,
        ),
        duration: Duration(milliseconds: _paused ? 1 : max(duration - elapsed, 1)),
-        builder: (context, value, _) => buildPhotoView(scale * (1.0 + value * _kenBurnsZoom)),
+        builder: (context, value, _) => PhotoView(
+          imageProvider: imageProvider,
+          index: index,
+          disableScaleGestures: true,
+          gaplessPlayback: true,
+          filterQuality: FilterQuality.high,
+          initialScale: scale * (1.0 + value * _kenBurnsZoom),
+          controller: PhotoViewController(),
+          onTapUp: (_, _, _) => _onTapUp(),
+        ),
      );
    } else {
      final status = ref.watch(videoPlayerProvider(asset.heroTag).select((s) => s.status));
@@ -474,75 +463,3 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
    );
  }
 }
-
-/// Progress bar for image slides, driven by an explicit [AnimationController].
-///
-/// [TweenAnimationBuilder] creates its controller internally with the default
-/// [AnimationBehavior.normal], which makes it run ~20x too fast while the system
-/// "reduce motion" setting is on (flutter/flutter#164287). This owns its
-/// controller so it can use [AnimationBehavior.preserve] and animate at the real
-/// slide duration regardless of that setting.
-class _SlideshowProgressBar extends StatefulWidget {
-  final int durationMs;
-  final int elapsedMs;
-  final bool paused;
-  final Color color;
-
-  const _SlideshowProgressBar({
-    super.key,
-    required this.durationMs,
-    required this.elapsedMs,
-    required this.paused,
-    required this.color,
-  });
-
-  @override
-  State<_SlideshowProgressBar> createState() => _SlideshowProgressBarState();
-}
-
-class _SlideshowProgressBarState extends State<_SlideshowProgressBar> with SingleTickerProviderStateMixin {
-  late final AnimationController _controller;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      vsync: this,
-      duration: Duration(milliseconds: widget.durationMs),
-      animationBehavior: AnimationBehavior.preserve,
-    )..value = (widget.elapsedMs / widget.durationMs).clamp(0.0, 1.0);
-    if (!widget.paused) {
-      _controller.forward();
-    }
-  }
-
-  @override
-  void didUpdateWidget(_SlideshowProgressBar oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (widget.durationMs != oldWidget.durationMs) {
-      _controller.duration = Duration(milliseconds: widget.durationMs);
-    }
-    if (widget.paused != oldWidget.paused) {
-      widget.paused ? _controller.stop() : _controller.forward();
-    }
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AnimatedBuilder(
-      animation: _controller,
-      builder: (context, _) => LinearProgressIndicator(
-        color: widget.color,
-        borderRadius: const BorderRadius.all(Radius.zero),
-        minHeight: 5,
-        value: _controller.value,
-      ),
-    );
-  }
-}
--- a/mobile/lib/presentation/widgets/action_buttons/add_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/add_action_button.widget.dart
@@ -2,7 +2,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
@@ -155,8 +154,12 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
      return;
    }

-    // Only report the failure when nothing was added; if some succeeded we show "added".
-    if (result.count > 0) {
+    if (result.count == 0) {
+      ImmichToast.show(
+        context: context,
+        msg: 'add_to_album_bottom_sheet_already_exists'.tr(namedArgs: {'album': album.name}),
+      );
+    } else {
      ImmichToast.show(
        context: context,
        msg: 'add_to_album_bottom_sheet_added'.tr(namedArgs: {'album': album.name}),
@@ -164,17 +167,6 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {

      // Refresh the "Appears in" list on the asset's info panel.
      ref.invalidate(albumsContainingAssetProvider(latest.remoteId!));
-    } else if (result.failedCount > 0) {
-      ImmichToast.show(
-        context: context,
-        msg: 'assets_cannot_be_added_to_album_count'.t(context: context, args: {'count': result.failedCount}),
-        toastType: ToastType.error,
-      );
-    } else {
-      ImmichToast.show(
-        context: context,
-        msg: 'add_to_album_bottom_sheet_already_exists'.tr(namedArgs: {'album': album.name}),
-      );
    }

    if (!context.mounted) {
--- a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
@@ -2,13 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -61,19 +59,13 @@ class DeleteActionButton extends ConsumerWidget {
      }
    }

-    final currentAsset = ref.read(assetViewerProvider).currentAsset;
-    final stackIndex = ref.read(assetViewerProvider).stackIndex;
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }

    final result = await ref.read(actionProvider.notifier).trashRemoteAndDeleteLocal(source);
    ref.read(multiSelectProvider.notifier).reset();

-    if (source == ActionSource.viewer && result.success) {
-      final shouldRefreshStack = currentAsset is RemoteAsset && currentAsset.stackId != null;
-      EventStream.shared.emit(
-        shouldRefreshStack ? ViewerStackAssetDeletedEvent(stackIndex: stackIndex) : const ViewerReloadAssetEvent(),
-      );
-    }
-
    final successMessage = 'delete_action_prompt'.t(context: context, args: {'count': result.count.toString()});

    if (context.mounted) {
--- a/mobile/lib/presentation/widgets/action_buttons/open_in_browser_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/open_in_browser_action_button.widget.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:url_launcher/url_launcher.dart';

@@ -22,7 +21,7 @@ class OpenInBrowserActionButton extends ConsumerWidget {
  });

  void _onTap() async {
-    final serverEndpoint = Store.get(StoreKey.serverEndpoint).replaceFirst('/api', '');
+    final serverEndpoint = SessionRepository.instance.session.serverEndpoint!.replaceFirst('/api', '');

    String originPath = '';
    switch (origin) {
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_page.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_page.widget.dart
@@ -413,8 +413,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
    final showAssetStack = ref.watch(timelineServiceProvider.select((s) => s.origin != TimelineOrigin.trash));
    final stackChildren = showAssetStack ? ref.watch(stackChildrenNotifier(asset)).valueOrNull : null;
    if (stackChildren != null && stackChildren.isNotEmpty) {
-      final safeStackIndex = stackIndex.clamp(0, stackChildren.length - 1);
-      displayAsset = stackChildren.elementAt(safeStackIndex);
+      displayAsset = stackChildren.elementAt(stackIndex);
    }

    final isCurrent = currentAsset != null && currentAsset.refersToSameAsset(displayAsset);
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart
@@ -11,10 +11,6 @@ class StackChildrenNotifier extends AutoDisposeFamilyAsyncNotifier<List<RemoteAs

    return ref.watch(assetServiceProvider).getStack(asset);
  }
-
-  void setStack(List<RemoteAsset> stack) {
-    state = AsyncData(stack);
-  }
 }

 final stackChildrenNotifier = AsyncNotifierProvider.autoDispose
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:math' as math;

 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -222,8 +221,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
        _onTimelineReloadEvent();
      case ViewerReloadAssetEvent():
        _onViewerReloadEvent();
-      case ViewerStackAssetDeletedEvent event:
-        _onViewerStackAssetDeletedEvent(event);
      default:
    }
  }
@@ -239,33 +236,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
    _onAssetChanged(target);
  }

-  Future<void> _onViewerStackAssetDeletedEvent(ViewerStackAssetDeletedEvent event) async {
-    final timelineAsset = ref.read(timelineServiceProvider).getAssetSafe(_currentPage);
-    if (timelineAsset == null) {
-      _onViewerReloadEvent();
-      return;
-    }
-
-    final stackProvider = stackChildrenNotifier(timelineAsset);
-
-    ref.invalidate(stackProvider);
-    final stack = await ref.read(stackProvider.future);
-
-    if (!mounted) {
-      return;
-    }
-
-    if (stack.isEmpty) {
-      _onViewerReloadEvent();
-      return;
-    }
-
-    final targetIndex = math.min(event.stackIndex, stack.length - 1);
-    ref.read(assetViewerProvider.notifier)
-      ..setAsset(stack[targetIndex])
-      ..setStackIndex(targetIndex);
-  }
-
  void _onTimelineReloadEvent() {
    final timelineService = ref.read(timelineServiceProvider);
    final totalAssets = timelineService.totalAssets;
@@ -282,11 +252,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
    if (index != _currentPage) {
      _pageController.jumpToPage(index);
      _onAssetChanged(index);
-    } else if (currentAsset is RemoteAsset && currentAsset.stackId != null && assetIndex == null) {
-      final timelineAsset = timelineService.getAssetSafe(index);
-      if (timelineAsset is! RemoteAsset || currentAsset.stackId != timelineAsset.stackId) {
-        _onAssetChanged(index);
-      }
    } else if (currentAsset != null && assetIndex == null) {
      _onAssetChanged(index);
    }
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
@@ -101,7 +101,7 @@ class ViewerBottomBar extends ConsumerWidget {
                      child: Column(
                        mainAxisSize: MainAxisSize.min,
                        children: [
-                          if (asset.isImage) OcrToggleButton(asset: asset),
+                          OcrToggleButton(asset: asset),
                          if (asset.isVideo) VideoControls(videoPlayerName: asset.heroTag),
                          if (!isReadonlyModeEnabled)
                            Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),
--- a/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
@@ -4,8 +4,6 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
@@ -13,6 +11,7 @@ import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.pro
 import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:logging/logging.dart';
@@ -148,7 +147,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg

      final remoteAsset = videoAsset as RemoteAsset;

-      final serverEndpoint = Store.get(StoreKey.serverEndpoint);
+      final serverEndpoint = ref.read(sessionProvider).serverEndpoint!;
      final isOriginalVideo = ref.read(appConfigProvider).viewer.loadOriginalVideo;
      final String postfixUrl = isOriginalVideo ? 'original' : 'video/playback';
      final String assetId = remoteAsset.livePhotoVideoId ?? remoteAsset.id;
--- a/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart
@@ -2,10 +2,9 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart';
@@ -44,6 +43,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
    double opacity = ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity)) * (showingControls ? 1 : 0);

    final originalTheme = context.themeData;
+    final assetForAction = [asset];

    final actions = <Widget>[
      if (asset.isMotionPhoto) const MotionPhotoActionButton(iconOnly: true),
@@ -61,8 +61,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
          },
        ),

-      const FavoriteAction(source: ActionSource.viewer, display: ActionDisplay.iconButton),
-      const UnfavoriteAction(source: ActionSource.viewer, display: ActionDisplay.iconButton),
+      ActionIconButtonWidget(action: FavoriteAction(assets: assetForAction)),

      ImmichColorOverride(color: null, child: ViewerKebabMenu(originalTheme: originalTheme)),
    ];
--- a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
@@ -3,8 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
@@ -75,6 +76,9 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
      return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
    }

+    final assets = multiselect.selectedAssets.toList(growable: false);
+    final actions = [FavoriteAction(assets: assets)];
+
    return BaseBottomSheet(
      controller: sheetController,
      initialChildSize: 0.25,
@@ -85,7 +89,7 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
        if (multiselect.hasRemote) ...[
          const ShareLinkActionButton(source: ActionSource.timeline),
          const UnArchiveActionButton(source: ActionSource.timeline),
-          const FavoriteAction(source: ActionSource.timeline, display: ActionDisplay.columnButton),
+          ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
          if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
          isTrashEnable
              ? const TrashActionButton(source: ActionSource.timeline)
--- a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
@@ -4,8 +4,9 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
@@ -40,7 +41,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
      }

      final remoteAssets = selectedAssets.whereType<RemoteAsset>();
-      final result = await ref
+      final addedCount = await ref
          .read(remoteAlbumProvider.notifier)
          .addAssets(album.id, remoteAssets.map((e) => e.id).toList());

@@ -51,28 +52,24 @@ class FavoriteBottomSheet extends ConsumerWidget {
        );
      }

-      // Only report the failure when nothing was added; if some succeeded we show "added".
-      if (result.added > 0) {
+      if (addedCount != remoteAssets.length) {
        ImmichToast.show(
          context: context,
-          msg: 'add_to_album_bottom_sheet_added'.t(args: {"album": album.name}),
-        );
-      } else if (result.failed > 0) {
-        ImmichToast.show(
-          context: context,
-          msg: 'assets_cannot_be_added_to_album_count'.t(context: context, args: {'count': result.failed}),
-          toastType: ToastType.error,
+          msg: 'add_to_album_bottom_sheet_already_exists'.t(args: {"album": album.name}),
        );
      } else {
        ImmichToast.show(
          context: context,
-          msg: 'add_to_album_bottom_sheet_already_exists'.t(args: {"album": album.name}),
+          msg: 'add_to_album_bottom_sheet_added'.t(args: {"album": album.name}),
        );
      }

      ref.read(multiSelectProvider.notifier).reset();
    }

+    final assets = multiselect.selectedAssets.toList(growable: false);
+    final actions = [FavoriteAction(assets: assets)];
+
    return BaseBottomSheet(
      initialChildSize: 0.4,
      maxChildSize: 0.7,
@@ -81,7 +78,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
        const ShareActionButton(source: ActionSource.timeline),
        if (multiselect.hasRemote) ...[
          const ShareLinkActionButton(source: ActionSource.timeline),
-          const FavoriteAction(source: ActionSource.timeline, display: ActionDisplay.columnButton),
+          ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
          const ArchiveActionButton(source: ActionSource.timeline),
          if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
          isTrashEnable
--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -3,8 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
+import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/bulk_tag_assets_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
@@ -82,6 +83,9 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
      return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
    }

+    final assets = multiselect.selectedAssets.toList(growable: false);
+    final actions = [AssetDebugAction(assets: assets)];
+
    return BaseBottomSheet(
      controller: sheetController,
      initialChildSize: widget.minChildSize ?? 0.15,
@@ -89,7 +93,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
      maxChildSize: 0.85,
      shouldCloseOnMinExtent: false,
      actions: [
-        const AssetDebugAction(source: ActionSource.timeline, display: ActionDisplay.columnButton),
+        ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
        const ShareActionButton(source: ActionSource.timeline),
        if (multiselect.hasRemote) ...[
          const ShareLinkActionButton(source: ActionSource.timeline),
--- a/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart
@@ -1,76 +1,23 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';

-class PartnerDetailBottomSheet extends ConsumerStatefulWidget {
+class PartnerDetailBottomSheet extends ConsumerWidget {
  const PartnerDetailBottomSheet({super.key});

  @override
-  ConsumerState<PartnerDetailBottomSheet> createState() => _PartnerDetailBottomSheetState();
-}
-
-class _PartnerDetailBottomSheetState extends ConsumerState<PartnerDetailBottomSheet> {
-  late final DraggableScrollableController sheetController;
-
-  @override
-  void initState() {
-    super.initState();
-    sheetController = DraggableScrollableController();
-  }
-
-  @override
-  void dispose() {
-    sheetController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    Future<void> addToAlbum(RemoteAlbum album) async {
-      final result = await ref.read(actionProvider.notifier).addToAlbum(ActionSource.timeline, album);
-
-      if (!context.mounted) {
-        return;
-      }
-
-      if (!result.success) {
-        ImmichToast.show(context: context, msg: 'scaffold_body_error_occurred'.tr(), toastType: ToastType.error);
-        return;
-      }
-
-      ImmichToast.show(
-        context: context,
-        msg: result.count == 0
-            ? 'add_to_album_bottom_sheet_already_exists'.tr(namedArgs: {'album': album.name})
-            : 'add_to_album_bottom_sheet_added'.tr(namedArgs: {'album': album.name}),
-      );
-    }
-
-    Future<void> onKeyboardExpand() {
-      return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
-    }
-
-    return BaseBottomSheet(
-      controller: sheetController,
+  Widget build(BuildContext context, WidgetRef ref) {
+    return const BaseBottomSheet(
      initialChildSize: 0.25,
-      maxChildSize: 0.85,
+      maxChildSize: 0.4,
      shouldCloseOnMinExtent: false,
-      actions: const [
+      actions: [
        ShareActionButton(source: ActionSource.timeline),
        DownloadActionButton(source: ActionSource.timeline),
      ],
-      slivers: [
-        const AddToAlbumHeader(),
-        AlbumSelector(onAlbumSelected: addToAlbum, onKeyboardExpanded: onKeyboardExpand),
-      ],
    );
  }
 }
--- a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
@@ -3,8 +3,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
@@ -84,6 +85,9 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
      return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
    }

+    final assets = multiselect.selectedAssets.toList(growable: false);
+    final actions = [FavoriteAction(assets: assets)];
+
    return BaseBottomSheet(
      controller: sheetController,
      initialChildSize: 0.22,
@@ -97,7 +101,7 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>

          if (ownsAlbum) ...[
            const ArchiveActionButton(source: ActionSource.timeline),
-            const FavoriteAction(source: ActionSource.timeline, display: ActionDisplay.columnButton),
+            ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
          ],
          const DownloadActionButton(source: ActionSource.timeline),
          if (ownsAlbum) ...[
--- a/mobile/lib/presentation/widgets/map/map.widget.dart
+++ b/mobile/lib/presentation/widgets/map/map.widget.dart
@@ -16,6 +16,7 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/map_bottom_sheet
 import 'package:immich_mobile/presentation/widgets/map/map.state.dart';
 import 'package:immich_mobile/presentation/widgets/map/map_utils.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
 import 'package:immich_mobile/utils/debounce.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -132,7 +133,8 @@ class _DriftMapState extends ConsumerState<DriftMap> {
    // When the AssetViewer is open, the DriftMap route stays alive in the background.
    // If we continue to update bounds, the map-scoped timeline service gets recreated and the previous one disposed,
    // which can invalidate the TimelineService instance that was passed into AssetViewerRoute (causing "loading forever").
-    if (ref.read(isAssetViewerOpenProvider)) {
+    final currentRoute = ref.read(currentRouteNameProvider);
+    if (currentRoute == AssetViewerRoute.name) {
      return;
    }

@@ -181,11 +183,6 @@ class _DriftMapState extends ConsumerState<DriftMap> {

  @override
  Widget build(BuildContext context) {
-    ref.listen<bool>(isAssetViewerOpenProvider, (previous, current) {
-      if (previous == true && !current) {
-        _debouncer.run(() => setBounds(forceReload: true));
-      }
-    });
    return Stack(
      children: [
        _Map(initialLocation: widget.initialLocation, onMapCreated: onMapCreated, onMapReady: onMapReady),
--- a/mobile/lib/presentation/widgets/people/partner_user_avatar.widget.dart
+++ b/mobile/lib/presentation/widgets/people/partner_user_avatar.widget.dart
@@ -1,18 +1,18 @@
 import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';

-class PartnerUserAvatar extends StatelessWidget {
+class PartnerUserAvatar extends ConsumerWidget {
  const PartnerUserAvatar({super.key, required this.userId, required this.name});

  final String userId;
  final String name;

  @override
-  Widget build(BuildContext context) {
-    final url = "${Store.get(StoreKey.serverEndpoint)}/users/$userId/profile-image";
+  Widget build(BuildContext context, WidgetRef ref) {
+    final url = "${ref.read(sessionProvider).serverEndpoint}/users/$userId/profile-image";
    final nameFirstLetter = name.isNotEmpty ? name[0] : "";
    return CircleAvatar(
      radius: 16,
--- a/mobile/lib/providers/asset_viewer/download.provider.dart
+++ b/mobile/lib/providers/asset_viewer/download.provider.dart
@@ -1,6 +1,9 @@
+import 'dart:async';
+
 import 'package:background_downloader/background_downloader.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/models/download/download_state.model.dart';
+import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/services/download.service.dart';

 class DownloadStateNotifier extends StateNotifier<DownloadState> {
@@ -14,9 +17,79 @@ class DownloadStateNotifier extends StateNotifier<DownloadState> {
          taskProgress: <String, DownloadInfo>{},
        ),
      ) {
+    _downloadService.onImageDownloadStatus = _downloadImageCallback;
+    _downloadService.onVideoDownloadStatus = _downloadVideoCallback;
+    _downloadService.onLivePhotoDownloadStatus = _downloadLivePhotoCallback;
    _downloadService.onTaskProgress = _taskProgressCallback;
  }

+  void _updateDownloadStatus(String taskId, TaskStatus status) {
+    if (status == TaskStatus.canceled) {
+      return;
+    }
+
+    state = state.copyWith(
+      taskProgress: <String, DownloadInfo>{}
+        ..addAll(state.taskProgress)
+        ..addAll({
+          taskId: DownloadInfo(
+            progress: state.taskProgress[taskId]?.progress ?? 0,
+            fileName: state.taskProgress[taskId]?.fileName ?? '',
+            status: status,
+          ),
+        }),
+    );
+  }
+
+  // Download live photo callback
+  void _downloadLivePhotoCallback(TaskStatusUpdate update) {
+    _updateDownloadStatus(update.task.taskId, update.status);
+
+    switch (update.status) {
+      case TaskStatus.complete:
+        if (update.task.metaData.isEmpty) {
+          return;
+        }
+        final livePhotosId = LivePhotosMetadata.fromJson(update.task.metaData).id;
+        _downloadService.saveLivePhotos(update.task, livePhotosId);
+        _onDownloadComplete(update.task.taskId);
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  // Download image callback
+  void _downloadImageCallback(TaskStatusUpdate update) {
+    _updateDownloadStatus(update.task.taskId, update.status);
+
+    switch (update.status) {
+      case TaskStatus.complete:
+        _downloadService.saveImageWithPath(update.task);
+        _onDownloadComplete(update.task.taskId);
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  // Download video callback
+  void _downloadVideoCallback(TaskStatusUpdate update) {
+    _updateDownloadStatus(update.task.taskId, update.status);
+
+    switch (update.status) {
+      case TaskStatus.complete:
+        _downloadService.saveVideo(update.task);
+        _onDownloadComplete(update.task.taskId);
+        break;
+
+      default:
+        break;
+    }
+  }
+
  void _taskProgressCallback(TaskProgressUpdate update) {
    // Ignore if the task is canceled or completed
    if (update.progress == -2 || update.progress == -1) {
@@ -37,6 +110,20 @@ class DownloadStateNotifier extends StateNotifier<DownloadState> {
    );
  }

+  void _onDownloadComplete(String id) {
+    Future.delayed(const Duration(seconds: 2), () {
+      state = state.copyWith(
+        taskProgress: <String, DownloadInfo>{}
+          ..addAll(state.taskProgress)
+          ..remove(id),
+      );
+
+      if (state.taskProgress.isEmpty) {
+        state = state.copyWith(showProgress: false);
+      }
+    });
+  }
+
  void cancelDownload(String id) async {
    final isCanceled = await _downloadService.cancelDownload(id);

--- a/mobile/lib/providers/auth.provider.dart
+++ b/mobile/lib/providers/auth.provider.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:flutter_udid/flutter_udid.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
@@ -10,6 +11,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/models/auth/auth_state.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
@@ -125,10 +127,10 @@ class AuthNotifier extends StateNotifier<AuthState> {
  }

  Future<bool> saveAuthInfo({required String accessToken}) async {
-    await Store.put(StoreKey.accessToken, accessToken);
+    await _ref.read(sessionRepository).write(SessionKey.accessToken, accessToken);
    await _apiService.updateHeaders();

-    final serverEndpoint = Store.get(StoreKey.serverEndpoint);
+    final serverEndpoint = _ref.read(sessionProvider).serverEndpoint!;
    final headerMap = _ref.read(appConfigProvider).network.customHeaders;
    final customHeaders = headerMap.isEmpty ? null : jsonEncode(headerMap);
    await _widgetService.writeCredentials(serverEndpoint, accessToken, customHeaders);
@@ -194,9 +196,9 @@ class AuthNotifier extends StateNotifier<AuthState> {
    return _ref.read(appConfigProvider).network.localEndpoint;
  }

-  /// Returns the current server endpoint (with /api) URL from the store
+  /// Returns the current server endpoint (with /api) URL from the session
  String? getServerEndpoint() {
-    return Store.tryGet(StoreKey.serverEndpoint);
+    return _ref.read(sessionProvider).serverEndpoint;
  }

  Future<String?> setOpenApiServiceEndpoint() {
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -1,6 +1,7 @@
 import 'dart:async';

 import 'package:auto_route/auto_route.dart';
+import 'package:background_downloader/background_downloader.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
@@ -9,6 +10,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/services/asset.service.dart';
 import 'package:immich_mobile/domain/services/remote_album.service.dart';
+import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
@@ -21,6 +23,7 @@ import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/action.service.dart';
+import 'package:immich_mobile/services/download.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/utils/semver.dart';
 import 'package:immich_mobile/widgets/asset_grid/delete_dialog.dart';
@@ -34,25 +37,18 @@ class ActionResult {
  final bool success;
  final String? error;
  final List<String> remoteAssetIds;
-  final int failedCount;

-  const ActionResult({
-    required this.count,
-    required this.success,
-    this.error,
-    this.remoteAssetIds = const [],
-    this.failedCount = 0,
-  });
+  const ActionResult({required this.count, required this.success, this.error, this.remoteAssetIds = const []});

  @override
-  String toString() =>
-      'ActionResult(count: $count, success: $success, error: $error, remoteAssetIds: $remoteAssetIds, failedCount: $failedCount)';
+  String toString() => 'ActionResult(count: $count, success: $success, error: $error, remoteAssetIds: $remoteAssetIds)';
 }

 class ActionNotifier extends Notifier<void> {
  final Logger _logger = Logger('ActionNotifier');
  late ActionService _service;
  late ForegroundUploadService _foregroundUploadService;
+  late DownloadService _downloadService;
  late AssetService _assetService;

  ActionNotifier() : super();
@@ -62,6 +58,29 @@ class ActionNotifier extends Notifier<void> {
    _foregroundUploadService = ref.watch(foregroundUploadServiceProvider);
    _service = ref.watch(actionServiceProvider);
    _assetService = ref.watch(assetServiceProvider);
+    _downloadService = ref.watch(downloadServiceProvider);
+    _downloadService.onImageDownloadStatus = _downloadImageCallback;
+    _downloadService.onVideoDownloadStatus = _downloadVideoCallback;
+    _downloadService.onLivePhotoDownloadStatus = _downloadLivePhotoCallback;
+  }
+
+  void _downloadImageCallback(TaskStatusUpdate update) {
+    if (update.status == TaskStatus.complete) {
+      _downloadService.saveImageWithPath(update.task);
+    }
+  }
+
+  void _downloadVideoCallback(TaskStatusUpdate update) {
+    if (update.status == TaskStatus.complete) {
+      _downloadService.saveVideo(update.task);
+    }
+  }
+
+  void _downloadLivePhotoCallback(TaskStatusUpdate update) async {
+    if (update.status == TaskStatus.complete) {
+      final livePhotosId = LivePhotosMetadata.fromJson(update.task.metaData).id;
+      unawaited(_downloadService.saveLivePhotos(update.task, livePhotosId));
+    }
  }

  List<String> _getRemoteIdsForSource(ActionSource source) {
@@ -374,12 +393,9 @@ class ActionNotifier extends Notifier<void> {
    final albumNotifier = ref.read(remoteAlbumProvider.notifier);

    int addedRemote = 0;
-    int failedRemote = 0;
    if (remoteIds.isNotEmpty) {
      try {
-        final result = await albumNotifier.addAssets(album.id, remoteIds);
-        addedRemote = result.added;
-        failedRemote = result.failed;
+        addedRemote = await albumNotifier.addAssets(album.id, remoteIds);
      } catch (error, stack) {
        _logger.severe('Failed to add assets to album ${album.id}', error, stack);
        return ActionResult(count: 0, success: false, error: error.toString());
@@ -393,7 +409,7 @@ class ActionNotifier extends Notifier<void> {
    }

    if (localAssets.isEmpty) {
-      return ActionResult(count: addedRemote, success: true, failedCount: failedRemote);
+      return ActionResult(count: addedRemote, success: true);
    }

    final uploadResult = await upload(
@@ -408,7 +424,6 @@ class ActionNotifier extends Notifier<void> {
      count: addedRemote + uploadResult.count,
      success: uploadResult.success,
      error: uploadResult.error,
-      failedCount: failedRemote,
    );
  }

--- a/mobile/lib/providers/infrastructure/remote_album.provider.dart
+++ b/mobile/lib/providers/infrastructure/remote_album.provider.dart
@@ -200,12 +200,12 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
    return _remoteAlbumService.getAssets(albumId);
  }

-  Future<({int added, int failed})> addAssets(String albumId, List<String> assetIds) async {
-    final result = await _remoteAlbumService.addAssets(albumId: albumId, assetIds: assetIds);
-    if (result.added > 0) {
+  Future<int> addAssets(String albumId, List<String> assetIds) async {
+    final added = await _remoteAlbumService.addAssets(albumId: albumId, assetIds: assetIds);
+    if (added > 0) {
      await _refreshAlbumInState(albumId);
    }
-    return result;
+    return added;
  }

  /// Links a freshly-uploaded local asset to an album using its new remote ID,
@@ -313,9 +313,9 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
  }
 }

-final remoteAlbumDateRangeProvider = StreamProvider.autoDispose.family<(DateTime, DateTime), String>((ref, albumId) {
+final remoteAlbumDateRangeProvider = FutureProvider.family<(DateTime, DateTime), String>((ref, albumId) async {
  final service = ref.watch(remoteAlbumServiceProvider);
-  return service.watchDateRange(albumId);
+  return service.getDateRange(albumId);
 });

 final remoteAlbumSharedUsersProvider = FutureProvider.autoDispose.family<List<UserDto>, String>((ref, albumId) async {
--- a/mobile/lib/providers/infrastructure/session.provider.dart
+++ b/mobile/lib/providers/infrastructure/session.provider.dart
@@ -0,0 +1,12 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
+
+final sessionRepository = Provider.autoDispose<SessionRepository>((_) => SessionRepository.instance);
+
+final sessionProvider = Provider.autoDispose<Session>((ref) {
+  final repo = ref.watch(sessionRepository);
+  final subscription = repo.watch().listen((event) => ref.state = event);
+  ref.onDispose(subscription.cancel);
+  return repo.session;
+});
--- a/mobile/lib/providers/infrastructure/settings.provider.dart
+++ b/mobile/lib/providers/infrastructure/settings.provider.dart
@@ -6,7 +6,7 @@ final settingsProvider = Provider.autoDispose<SettingsRepository>((_) => Setting

 final appConfigProvider = Provider.autoDispose<AppConfig>((ref) {
  final repo = ref.watch(settingsProvider);
-  final subscription = repo.watchConfig().listen((event) => ref.state = event);
+  final subscription = repo.watch().listen((event) => ref.state = event);
  ref.onDispose(subscription.cancel);
  return repo.appConfig;
 });
--- a/mobile/lib/providers/routes.provider.dart
+++ b/mobile/lib/providers/routes.provider.dart
@@ -1,19 +1,7 @@
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/routing/router.dart';
-
-@visibleForTesting
-bool isRouteInStack(Ref ref, String routeName) {
-  final router = ref.watch(appRouterProvider);
-  void onChange() => ref.invalidateSelf();
-  router.addListener(onChange);
-  ref.onDispose(() => router.removeListener(onChange));
-  return router.stackData.any((route) => route.name == routeName);
-}
-
-final inLockedViewProvider = Provider<bool>((ref) => isRouteInStack(ref, DriftLockedFolderRoute.name));
-final isAssetViewerOpenProvider = Provider<bool>((ref) => isRouteInStack(ref, AssetViewerRoute.name));

+final inLockedViewProvider = StateProvider<bool>((ref) => false);
 final currentRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteDataProvider = StateProvider<RouteSettings?>((ref) => null);
--- a/mobile/lib/providers/websocket.provider.dart
+++ b/mobile/lib/providers/websocket.provider.dart
@@ -1,12 +1,11 @@
 import 'dart:async';

 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/models/server_info/server_version.model.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/utils/debounce.dart';
@@ -68,7 +67,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {

    if (authenticationState.isAuthenticated) {
      try {
-        final endpoint = Uri.parse(Store.get(StoreKey.serverEndpoint));
+        final endpoint = Uri.parse(_ref.read(sessionProvider).serverEndpoint!);
        dPrint(() => "Attempting to connect to websocket");
        // Configure socket transports must be specified
        Socket socket = io(
@@ -103,7 +102,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
        socket.on('AssetUploadReadyV2', _handleSyncAssetUploadReadyV2);
        socket.on('AssetEditReadyV1', _handleSyncAssetEditReadyV1);
        socket.on('AssetEditReadyV2', _handleSyncAssetEditReadyV2);
-        socket.on('on_album_update', _handleAlbumUpdate);
        socket.on('on_config_update', _handleOnConfigUpdate);
        socket.on('on_new_release', _handleReleaseUpdates);
      } catch (e) {
@@ -185,10 +183,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV1(data));
  }

-  void _handleAlbumUpdate(dynamic _) {
-    unawaited(_ref.read(backgroundSyncProvider).syncRemote());
-  }
-
  void _handleSyncAssetEditReadyV2(dynamic data) {
    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV2(data));
  }
--- a/mobile/lib/repositories/download.repository.dart
+++ b/mobile/lib/repositories/download.repository.dart
@@ -27,11 +27,9 @@ class DownloadRepository {

  void Function(TaskStatusUpdate)? onVideoDownloadStatus;

-  void Function(TaskProgressUpdate)? onTaskProgress;
+  void Function(TaskStatusUpdate)? onLivePhotoDownloadStatus;

-  // #29900: `taskStatusCallback` is called before the DB has been updated, causing a race between the two Live Photo tasks
-  // This callback instead listens directly to DB updates
-  void Function(TaskRecord)? onLivePhotoRecordComplete;
+  void Function(TaskProgressUpdate)? onTaskProgress;

  DownloadRepository() {
    _downloader.registerCallbacks(
@@ -48,12 +46,9 @@ class DownloadRepository {

    _downloader.registerCallbacks(
      group: kDownloadGroupLivePhoto,
+      taskStatusCallback: (update) => onLivePhotoDownloadStatus?.call(update),
      taskProgressCallback: (update) => onTaskProgress?.call(update),
    );
-
-    _downloader.database.updates
-        .where((record) => record.group == kDownloadGroupLivePhoto && record.status == TaskStatus.complete)
-        .listen((record) => onLivePhotoRecordComplete?.call(record));
  }

  Future<List<bool>> downloadAll(List<DownloadTask> tasks) {
--- a/mobile/lib/repositories/drift_album_api_repository.dart
+++ b/mobile/lib/repositories/drift_album_api_repository.dart
@@ -59,7 +59,7 @@ class DriftAlbumApiRepository extends ApiRepository {
    for (final dto in response) {
      if (dto.success) {
        added.add(dto.id);
-      } else if (dto.error.orElse(null) != BulkIdErrorReason.duplicate) {
+      } else {
        failed.add(dto.id);
      }
    }
--- a/mobile/lib/repositories/upload.repository.dart
+++ b/mobile/lib/repositories/upload.repository.dart
@@ -5,9 +5,8 @@ import 'dart:io';
 import 'package:background_downloader/background_downloader.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:http/http.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
@@ -96,7 +95,7 @@ class UploadRepository {
    void Function(int bytes, int totalBytes)? onProgress,
    required String logContext,
  }) async {
-    final String savedEndpoint = Store.get(StoreKey.serverEndpoint);
+    final String savedEndpoint = SessionRepository.instance.session.serverEndpoint!;
    final baseRequest = ProgressMultipartRequest(
      'POST',
      Uri.parse('$savedEndpoint/assets'),
--- a/mobile/lib/routing/app_navigation_observer.dart
+++ b/mobile/lib/routing/app_navigation_observer.dart
@@ -4,6 +4,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
+import 'package:immich_mobile/routing/router.dart';

 class AppNavigationObserver extends AutoRouterObserver {
  /// Riverpod Instance
@@ -11,12 +12,35 @@ class AppNavigationObserver extends AutoRouterObserver {

  AppNavigationObserver({required this.ref});

+  @override
+  Future<void> didChangeTabRoute(TabPageRoute route, TabPageRoute previousRoute) async {
+    unawaited(Future(() => ref.read(inLockedViewProvider.notifier).state = false));
+  }
+
  @override
  void didPush(Route route, Route? previousRoute) {
+    _handleDriftLockedFolderState(route, previousRoute);
    Future(() {
      ref.read(currentRouteNameProvider.notifier).state = route.settings.name;
      ref.read(previousRouteNameProvider.notifier).state = previousRoute?.settings.name;
      ref.read(previousRouteDataProvider.notifier).state = previousRoute?.settings;
    });
  }
+
+  _handleDriftLockedFolderState(Route route, Route? previousRoute) {
+    final isInLockedView = ref.read(inLockedViewProvider);
+    final isFromLockedViewToDetailView =
+        route.settings.name == AssetViewerRoute.name && previousRoute?.settings.name == DriftLockedFolderRoute.name;
+
+    final isFromDetailViewToInfoPanelView =
+        route.settings.name == null && previousRoute?.settings.name == AssetViewerRoute.name && isInLockedView;
+
+    if (route.settings.name == DriftLockedFolderRoute.name ||
+        isFromLockedViewToDetailView ||
+        isFromDetailViewToInfoPanelView) {
+      Future(() => ref.read(inLockedViewProvider.notifier).state = true);
+    } else {
+      Future(() => ref.read(inLockedViewProvider.notifier).state = false);
+    }
+  }
 }
--- a/mobile/lib/routing/auth_guard.dart
+++ b/mobile/lib/routing/auth_guard.dart
@@ -2,9 +2,7 @@ import 'dart:async';
 import 'dart:io';

 import 'package:auto_route/auto_route.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
@@ -23,10 +21,8 @@ class AuthGuard extends AutoRouteGuard {
    // guards, so we keep this function fully sync and validate the token in
    // the background — otherwise a slow validateAccessToken() request would
    // block the route transition for as long as the OS-level HTTP timeout.
-    try {
-      Store.get(StoreKey.accessToken);
-    } on StoreKeyNotFoundException catch (_) {
-      _log.warning('No access token in the store.');
+    if (SessionRepository.instance.session.accessToken == null) {
+      _log.warning('No access token in the session.');
      resolver.next(false);
      unawaited(router.replaceAll([const LoginRoute()]));
      return;
@@ -40,7 +36,7 @@ class AuthGuard extends AutoRouteGuard {
    if (_validateInFlight) {
      return;
    }
-    final token = Store.tryGet(StoreKey.accessToken);
+    final token = SessionRepository.instance.session.accessToken;
    if (token == null) {
      return;
    }
@@ -50,7 +46,7 @@ class AuthGuard extends AutoRouteGuard {
      if (res == null || res.authStatus != true) {
        // Token may have changed during validation (user logged out + logged in
        // again); only act if it still applies to the current session.
-        if (Store.tryGet(StoreKey.accessToken) != token) {
+        if (SessionRepository.instance.session.accessToken != token) {
          return;
        }
        _log.fine('User token is invalid. Redirecting to login');
@@ -61,7 +57,7 @@ class AuthGuard extends AutoRouteGuard {
      if (e.code != HttpStatus.unauthorized) {
        return;
      }
-      if (Store.tryGet(StoreKey.accessToken) != token) {
+      if (SessionRepository.instance.session.accessToken != token) {
        return;
      }
      _log.warning("Unauthorized access token.");
--- a/mobile/lib/services/api.service.dart
+++ b/mobile/lib/services/api.service.dart
@@ -3,9 +3,9 @@ import 'dart:convert';
 import 'dart:io';

 import 'package:device_info_plus/device_info_plus.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
@@ -41,7 +41,7 @@ class ApiService {
    // The below line ensures that the api clients are initialized when the service is instantiated
    // This is required to avoid late initialization errors when the clients are access before the endpoint is resolved
    setEndpoint('');
-    final endpoint = Store.tryGet(StoreKey.serverEndpoint);
+    final endpoint = SessionRepository.instance.session.serverEndpoint;
    if (endpoint != null && endpoint.isNotEmpty) {
      setEndpoint(endpoint);
    }
@@ -84,7 +84,7 @@ class ApiService {
    setEndpoint(endpoint);

    // Save in local database for next startup
-    await Store.put(StoreKey.serverEndpoint, endpoint);
+    await SessionRepository.instance.write(SessionKey.serverEndpoint, endpoint);
    return endpoint;
  }

@@ -173,7 +173,7 @@ class ApiService {

  static List<String> getServerUrls() {
    final urls = <String>[];
-    final serverEndpoint = Store.tryGet(StoreKey.serverEndpoint);
+    final serverEndpoint = SessionRepository.instance.session.serverEndpoint;
    if (serverEndpoint != null && serverEndpoint.isNotEmpty) {
      urls.add(serverEndpoint);
    }
--- a/mobile/lib/services/auth.service.dart
+++ b/mobile/lib/services/auth.service.dart
@@ -1,12 +1,14 @@
 import 'dart:async';

 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
@@ -55,7 +57,7 @@ class AuthService {
  Future<String> validateServerUrl(String url) async {
    final validUrl = await _apiService.resolveAndSetEndpoint(url);
    await _apiService.setDeviceInfoHeader();
-    await Store.put(StoreKey.serverUrl, validUrl);
+    await SessionRepository.instance.write(SessionKey.serverUrl, validUrl);

    return validUrl;
  }
@@ -119,7 +121,7 @@ class AuthService {
    await Future.wait([
      _authRepository.clearLocalData(),
      Store.delete(StoreKey.currentUser),
-      Store.delete(StoreKey.accessToken),
+      SessionRepository.instance.clear([SessionKey.accessToken]),
      SettingsRepository.instance.clear(const [
        .networkAutoEndpointSwitching,
        .networkPreferredWifiName,
--- a/mobile/lib/services/background_upload.service.dart
+++ b/mobile/lib/services/background_upload.service.dart
@@ -13,6 +13,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
@@ -290,10 +291,13 @@ class BackgroundUploadService {
      return null;
    }

-    final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-    // Some apps (e.g. DJI/Fusion) return names without an extension; fall back to the asset name for those.
-    final extension = p.extension(file.path).isNotEmpty ? p.extension(file.path) : p.extension(asset.name);
-    final originalFileName = p.setExtension(fileName, extension);
+    String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
+    final hasExtension = p.extension(fileName).isNotEmpty;
+    if (!hasExtension) {
+      fileName = p.setExtension(fileName, p.extension(asset.name));
+    }
+
+    final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;

    String metadata = UploadTaskMetadata(
      localAssetId: asset.id,
@@ -386,7 +390,7 @@ class BackgroundUploadService {
    String? latitude,
    String? longitude,
  }) async {
-    final serverEndpoint = Store.get(StoreKey.serverEndpoint);
+    final serverEndpoint = SessionRepository.instance.session.serverEndpoint!;
    final url = Uri.parse('$serverEndpoint/assets').toString();
    final headers = ApiService.getRequestHeaders();
    final deviceId = Store.get(StoreKey.deviceId);
--- a/mobile/lib/services/download.service.dart
+++ b/mobile/lib/services/download.service.dart
@@ -1,8 +1,6 @@
-import 'dart:async';
 import 'dart:io';

 import 'package:background_downloader/background_downloader.dart';
-import 'package:collection/collection.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
@@ -20,27 +18,14 @@ class DownloadService {
  final Logger _log = Logger("DownloadService");
  void Function(TaskStatusUpdate)? onImageDownloadStatus;
  void Function(TaskStatusUpdate)? onVideoDownloadStatus;
+  void Function(TaskStatusUpdate)? onLivePhotoDownloadStatus;
  void Function(TaskProgressUpdate)? onTaskProgress;

-  /// Active Live Photo IDs undergoing saving
-  final Set<String> _savingLivePhotoIds = {};
-
  DownloadService(this._fileMediaRepository, this._downloadRepository) {
    _downloadRepository.onImageDownloadStatus = _onImageDownloadCallback;
    _downloadRepository.onVideoDownloadStatus = _onVideoDownloadCallback;
+    _downloadRepository.onLivePhotoDownloadStatus = _onLivePhotoDownloadCallback;
    _downloadRepository.onTaskProgress = _onTaskProgressCallback;
-    _downloadRepository.onLivePhotoRecordComplete = _onLivePhotoRecordComplete;
-
-    unawaited(_savePreviouslyCompletedLivePhotos());
-  }
-
-  Future<void> _savePreviouslyCompletedLivePhotos() async {
-    // Specifically fetch Live Photo video components only, as to not double fetch assets
-    final records = await _downloadRepository.getLiveVideoTasks();
-    final completedIds = records.map((record) => LivePhotosMetadata.fromJson(record.task.metaData).id).toSet();
-    for (final id in completedIds) {
-      await _saveLivePhotos(id);
-    }
  }

  void _onTaskProgressCallback(TaskProgressUpdate update) {
@@ -48,27 +33,18 @@ class DownloadService {
  }

  void _onImageDownloadCallback(TaskStatusUpdate update) {
-    if (update.status == TaskStatus.complete) {
-      unawaited(_saveImageWithPath(update.task));
-    }
-
    onImageDownloadStatus?.call(update);
  }

  void _onVideoDownloadCallback(TaskStatusUpdate update) {
-    if (update.status == TaskStatus.complete) {
-      unawaited(_saveVideo(update.task));
-    }
-
    onVideoDownloadStatus?.call(update);
  }

-  void _onLivePhotoRecordComplete(TaskRecord record) async {
-    final livePhotosId = LivePhotosMetadata.fromJson(record.task.metaData).id;
-    await _saveLivePhotos(livePhotosId);
+  void _onLivePhotoDownloadCallback(TaskStatusUpdate update) {
+    onLivePhotoDownloadStatus?.call(update);
  }

-  Future<bool> _saveImageWithPath(Task task) async {
+  Future<bool> saveImageWithPath(Task task) async {
    final filePath = await task.filePath();
    final title = task.filename;
    final relativePath = Platform.isAndroid ? 'DCIM/Immich' : null;
@@ -89,7 +65,7 @@ class DownloadService {
    }
  }

-  Future<bool> _saveVideo(Task task) async {
+  Future<bool> saveVideo(Task task) async {
    final filePath = await task.filePath();
    final title = task.filename;
    final relativePath = Platform.isAndroid ? 'DCIM/Immich' : null;
@@ -107,21 +83,14 @@ class DownloadService {
    }
  }

-  Future<bool> _saveLivePhotos(String livePhotosId) async {
+  Future<bool> saveLivePhotos(Task task, String livePhotosId) async {
    final records = await _downloadRepository.getLiveVideoTasks();
+    if (records.length < 2) {
+      return false;
+    }
+
    final imageRecord = _findTaskRecord(records, livePhotosId, LivePhotosPart.image);
    final videoRecord = _findTaskRecord(records, livePhotosId, LivePhotosPart.video);
-
-    if (imageRecord == null || videoRecord == null) {
-      return false;
-    }
-
-    // Write semaphore for this `livePhotoId`
-    if (!_savingLivePhotoIds.add(livePhotosId)) {
-      return false;
-    }
-
-    final title = imageRecord.task.filename;
    final imageFilePath = await imageRecord.task.filePath();
    final videoFilePath = await videoRecord.task.filePath();

@@ -129,14 +98,14 @@ class DownloadService {
      final result = await _fileMediaRepository.saveLivePhoto(
        image: File(imageFilePath),
        video: File(videoFilePath),
-        title: title,
+        title: task.filename,
      );

      return result != null;
    } on PlatformException catch (error, stack) {
      // Handle saving MotionPhotos on iOS
      if (error.code.startsWith('PHPhotosErrorDomain')) {
-        final result = await _fileMediaRepository.saveImageWithFile(imageFilePath, title: title);
+        final result = await _fileMediaRepository.saveImageWithFile(imageFilePath, title: task.filename);
        return result != null;
      }
      _log.severe("Error saving live photo", error, stack);
@@ -156,7 +125,6 @@ class DownloadService {
      }

      await _downloadRepository.deleteRecordsWithIds([imageRecord.task.taskId, videoRecord.task.taskId]);
-      _savingLivePhotoIds.remove(livePhotosId);
    }
  }

@@ -165,8 +133,8 @@ class DownloadService {
  }
 }

-TaskRecord? _findTaskRecord(List<TaskRecord> records, String livePhotosId, LivePhotosPart part) {
-  return records.firstWhereOrNull((record) {
+TaskRecord _findTaskRecord(List<TaskRecord> records, String livePhotosId, LivePhotosPart part) {
+  return records.firstWhere((record) {
    final metadata = LivePhotosMetadata.fromJson(record.task.metaData);
    return metadata.id == livePhotosId && metadata.part == part;
  });
--- a/mobile/lib/services/foreground_upload.service.dart
+++ b/mobile/lib/services/foreground_upload.service.dart
@@ -309,10 +309,17 @@ class ForegroundUploadService {
        return;
      }

-      final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-      // Some apps (e.g. DJI/Fusion) return names without an extension; fall back to the asset name for those.
-      final extension = p.extension(file.path).isNotEmpty ? p.extension(file.path) : p.extension(asset.name);
-      final originalFileName = p.setExtension(fileName, extension);
+      String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
+
+      /// Handle special file name from DJI or Fusion app
+      /// If the file name has no extension, likely due to special renaming template by specific apps
+      /// we append the original extension from the asset name
+      final hasExtension = p.extension(fileName).isNotEmpty;
+      if (!hasExtension) {
+        fileName = p.setExtension(fileName, p.extension(asset.name));
+      }
+
+      final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
      final deviceId = Store.get(StoreKey.deviceId);

      final fields = {
--- a/mobile/lib/utils/action_button.utils.dart
+++ b/mobile/lib/utils/action_button.utils.dart
@@ -7,7 +7,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
@@ -192,7 +192,7 @@ enum ActionButtonType {
    bool menuItem = false,
  ]) {
    return switch (this) {
-      ActionButtonType.advancedInfo => AssetDebugAction(source: context.source, display: ActionDisplay.menuItem),
+      ActionButtonType.advancedInfo => ActionMenuItemWidget(action: AssetDebugAction(assets: [context.asset])),
      ActionButtonType.share => ShareActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
      ActionButtonType.shareLink => ShareLinkActionButton(
        source: context.source,
--- a/mobile/lib/utils/bootstrap.dart
+++ b/mobile/lib/utils/bootstrap.dart
@@ -7,6 +7,7 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
@@ -53,6 +54,8 @@ abstract final class Bootstrap {

    await StoreService.init(storeRepository: storeRepo, listenUpdates: listenStoreUpdates);

+    await SessionRepository.ensureInitialized(drift);
+
    final settingsRepo = await SettingsRepository.ensureInitialized(drift);
    final logDb = await _initLogger(settingsRepository: settingsRepo, shouldBufferLogs: shouldBufferLogs);

--- a/mobile/lib/utils/image_url_builder.dart
+++ b/mobile/lib/utils/image_url_builder.dart
@@ -1,9 +1,8 @@
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:openapi/api.dart';

 String getOriginalUrlForRemoteId(final String id, {bool edited = true}) {
-  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/original?edited=$edited';
+  return '${SessionRepository.instance.session.serverEndpoint!}/assets/$id/original?edited=$edited';
 }

 String getThumbnailUrlForRemoteId(
@@ -12,14 +11,14 @@ String getThumbnailUrlForRemoteId(
  bool edited = true,
  String? thumbhash,
 }) {
-  final url = '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.toString()}&edited=$edited';
+  final url = '${SessionRepository.instance.session.serverEndpoint!}/assets/$id/thumbnail?size=$type&edited=$edited';
  return thumbhash != null ? '$url&c=${Uri.encodeComponent(thumbhash)}' : url;
 }

 String getPlaybackUrlForRemoteId(final String id) {
-  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/video/playback?';
+  return '${SessionRepository.instance.session.serverEndpoint!}/assets/$id/video/playback?';
 }

 String getFaceThumbnailUrl(final String personId) {
-  return '${Store.get(StoreKey.serverEndpoint)}/people/$personId/thumbnail';
+  return '${SessionRepository.instance.session.serverEndpoint!}/people/$personId/thumbnail';
 }
--- a/mobile/lib/utils/migration.dart
+++ b/mobile/lib/utils/migration.dart
@@ -8,19 +8,22 @@ import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/feature_message.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';

-const int targetVersion = 26;
+const int targetVersion = 27;

 Future<void> migrateDatabaseIfNeeded(Drift drift) async {
  final int? storedVersion = Store.tryGet(StoreKey.version);
@@ -37,19 +40,22 @@ Future<void> migrateDatabaseIfNeeded(Drift drift) async {
  if (storedVersion == null) {
    await FeatureMessageService(SettingsRepository.instance).markSeen();
  }
+  if (version < 27) {
+    await _migrateTo27(drift);
+  }

  await Store.put(StoreKey.version, targetVersion);
  return;
 }

 Future<void> _migrateTo25() async {
-  final accessToken = Store.tryGet(StoreKey.accessToken);
+  final accessToken = Store.tryGet(StoreKey.legacyAccessToken);
  if (accessToken == null || accessToken.isEmpty) {
    return;
  }

  final urls = <String>[];
-  final serverEndpoint = Store.tryGet(StoreKey.serverEndpoint);
+  final serverEndpoint = Store.tryGet(StoreKey.legacyServerEndpoint);
  if (serverEndpoint != null && serverEndpoint.isNotEmpty) {
    urls.add(serverEndpoint);
  }
@@ -80,7 +86,7 @@ Future<void> _migrateTo25() async {
 }

 Future<void> _migrateTo26(Drift drift) async {
-  final migrator = _StoreMigrator(drift);
+  final migrator = _StoreMigrator.settings(drift);
  await migrator.migrateEnumIndex(StoreKey.legacyLogLevel, SettingsKey.logLevel, LogLevel.values);
  // Theme
  await migrator.migrateEnumName(StoreKey.legacyThemeMode, SettingsKey.themeMode, ThemeMode.values);
@@ -145,7 +151,17 @@ Future<void> _migrateTo26(Drift drift) async {
  await migrator.complete();
 }

-Future<void> _migrateAlbumSortMode(_StoreMigrator migrator) async {
+Future<void> _migrateTo27(Drift drift) async {
+  final migrator = _StoreMigrator.session(drift);
+  await migrator.migrateString(StoreKey.legacyServerUrl, SessionKey.serverUrl);
+  await migrator.migrateString(StoreKey.legacyAccessToken, SessionKey.accessToken);
+  await migrator.migrateString(StoreKey.legacyServerEndpoint, SessionKey.serverEndpoint);
+  await migrator.complete();
+
+  await SessionRepository.instance.refresh();
+}
+
+Future<void> _migrateAlbumSortMode(_StoreMigrator<SettingsKey> migrator) async {
  final raw = await migrator.readLegacyStoreInt(StoreKey.legacySelectedAlbumSortOrder.id);
  final mode = AlbumSortMode.values.firstWhereOrNull((e) => raw != null && e.storeIndex == raw);
  if (mode == null) {
@@ -155,7 +171,7 @@ Future<void> _migrateAlbumSortMode(_StoreMigrator migrator) async {
  migrator.stage(StoreKey.legacySelectedAlbumSortOrder, SettingsKey.albumSortMode, mode);
 }

-Future<void> _migrateExternalEndpointList(_StoreMigrator migrator) async {
+Future<void> _migrateExternalEndpointList(_StoreMigrator<SettingsKey> migrator) async {
  final raw = await migrator.readLegacyStoreString(StoreKey.legacyExternalEndpointList.id);
  if (raw == null) {
    return;
@@ -179,7 +195,7 @@ Future<void> _migrateExternalEndpointList(_StoreMigrator migrator) async {
  migrator.stage(StoreKey.legacyExternalEndpointList, SettingsKey.networkExternalEndpointList, urls);
 }

-Future<void> _migrateCustomHeaders(_StoreMigrator migrator) async {
+Future<void> _migrateCustomHeaders(_StoreMigrator<SettingsKey> migrator) async {
  final raw = await migrator.readLegacyStoreString(StoreKey.legacyCustomHeaders.id);
  if (raw == null) {
    return;
@@ -202,14 +218,39 @@ Future<void> _migrateCustomHeaders(_StoreMigrator migrator) async {
  migrator.stage(StoreKey.legacyCustomHeaders, SettingsKey.networkCustomHeaders, headers);
 }

-class _StoreMigrator {
+class _StoreMigrator<K extends Enum> {
+  _StoreMigrator._(this._db, {required this.encode, required this.readDefault, required this.insertRow});
+
+  static _StoreMigrator<SettingsKey> settings(Drift db) => _StoreMigrator<SettingsKey>._(
+    db,
+    encode: (key, value) => key.encode(value),
+    readDefault: (key) => defaultConfig.read(key),
+    insertRow: (batch, name, value) => batch.insert(
+      db.settingsEntity,
+      SettingsEntityCompanion(key: Value(name), value: Value(value)),
+      mode: InsertMode.insertOrReplace,
+    ),
+  );
+
+  static _StoreMigrator<SessionKey> session(Drift db) => _StoreMigrator<SessionKey>._(
+    db,
+    encode: (key, value) => key.encode(value),
+    readDefault: (key) => defaultSession.read(key),
+    insertRow: (batch, name, value) => batch.insert(
+      db.sessionEntity,
+      SessionEntityCompanion(key: Value(name), value: Value(value)),
+      mode: InsertMode.insertOrReplace,
+    ),
+  );
+
  final Drift _db;
-  final Map<SettingsKey, Object?> _cache = {};
+  final String Function(K key, Object value) encode;
+  final Object? Function(K key) readDefault;
+  final void Function(Batch batch, String name, String? value) insertRow;
+  final Map<K, Object?> _cache = {};
  final List<int> _migratedStoreIds = [];

-  _StoreMigrator(this._db);
-
-  Future<void> migrateEnumIndex<T extends Enum>(StoreKey<int> legacyKey, SettingsKey<T> newKey, List<T> values) async {
+  Future<void> migrateEnumIndex<T extends Enum>(StoreKey<int> legacyKey, K newKey, List<T> values) async {
    final index = await readLegacyStoreInt(legacyKey.id);
    if (index == null) {
      return;
@@ -224,11 +265,7 @@ class _StoreMigrator {
    _migratedStoreIds.add(legacyKey.id);
  }

-  Future<void> migrateEnumName<T extends Enum>(
-    StoreKey<String> legacyKey,
-    SettingsKey<T> newKey,
-    List<T> values,
-  ) async {
+  Future<void> migrateEnumName<T extends Enum>(StoreKey<String> legacyKey, K newKey, List<T> values) async {
    final name = await readLegacyStoreString(legacyKey.id);
    if (name == null) {
      return;
@@ -243,18 +280,17 @@ class _StoreMigrator {
    _migratedStoreIds.add(legacyKey.id);
  }

-  Future<void> migrateBool(StoreKey<bool> legacyKey, SettingsKey<bool> newKey) async {
+  Future<void> migrateBool(StoreKey<bool> legacyKey, K newKey) async {
    final intValue = await readLegacyStoreInt(legacyKey.id);
    if (intValue == null) {
      return;
    }

-    final boolValue = intValue != 0;
-    _cache[newKey] = boolValue;
+    _cache[newKey] = intValue != 0;
    _migratedStoreIds.add(legacyKey.id);
  }

-  Future<void> migrateInt(StoreKey<int> legacyKey, SettingsKey<int> newKey) async {
+  Future<void> migrateInt(StoreKey<int> legacyKey, K newKey) async {
    final intValue = await readLegacyStoreInt(legacyKey.id);
    if (intValue == null) {
      return;
@@ -264,9 +300,9 @@ class _StoreMigrator {
    _migratedStoreIds.add(legacyKey.id);
  }

-  Future<void> migrateString(StoreKey<String> legacyKey, SettingsKey<String> newKey) async {
+  Future<void> migrateString(StoreKey<String> legacyKey, K newKey) async {
    final value = await readLegacyStoreString(legacyKey.id);
-    if (value == null) {
+    if (value == null || value.isEmpty) {
      return;
    }

@@ -274,7 +310,12 @@ class _StoreMigrator {
    _migratedStoreIds.add(legacyKey.id);
  }

-  void stage<T, U extends T>(StoreKey legacyKey, SettingsKey<T> newKey, U value) {
+  Future<void> migrateNullableString(StoreKey<String> legacyKey, K newKey) async {
+    _cache[newKey] = await readLegacyStoreString(legacyKey.id);
+    _migratedStoreIds.add(legacyKey.id);
+  }
+
+  void stage(StoreKey legacyKey, K newKey, Object? value) {
    _cache[newKey] = value;
    _migratedStoreIds.add(legacyKey.id);
  }
@@ -282,20 +323,12 @@ class _StoreMigrator {
  Future<void> complete() async {
    await _db.batch((batch) {
      for (final entry in _cache.entries) {
-        if (entry.value == defaultConfig.read(entry.key)) {
+        if (entry.value == readDefault(entry.key)) {
          continue;
        }

-        String? resolvedValue;
-        if (entry.value != null) {
-          resolvedValue = entry.key.encode(entry.value);
-        }
-
-        batch.insert(
-          _db.settingsEntity,
-          SettingsEntityCompanion(key: Value(entry.key.name), value: Value(resolvedValue)),
-          mode: InsertMode.insertOrReplace,
-        );
+        final value = entry.value;
+        insertRow(batch, entry.key.name, value == null ? null : encode(entry.key, value));
      }
    });
    await deleteLegacyStoreRows(_migratedStoreIds);
--- a/mobile/lib/utils/url_helper.dart
+++ b/mobile/lib/utils/url_helper.dart
@@ -1,5 +1,4 @@
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:punycode/punycode.dart';

 String sanitizeUrl(String url) {
@@ -11,7 +10,7 @@ String sanitizeUrl(String url) {
 }

 String? getServerUrl() {
-  final serverUrl = punycodeDecodeUrl(Store.tryGet(StoreKey.serverEndpoint));
+  final serverUrl = punycodeDecodeUrl(SessionRepository.instance.session.serverEndpoint);
  final serverUri = serverUrl != null ? Uri.tryParse(serverUrl) : null;
  if (serverUri == null) {
    return null;
--- a/mobile/lib/widgets/common/user_avatar.dart
+++ b/mobile/lib/widgets/common/user_avatar.dart
@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';

 Widget userAvatar(BuildContext context, UserDto u, {double? radius}) {
-  final url = "${Store.get(StoreKey.serverEndpoint)}/users/${u.id}/profile-image";
+  final url = "${SessionRepository.instance.session.serverEndpoint!}/users/${u.id}/profile-image";
  final nameFirstLetter = u.name.isNotEmpty ? u.name[0] : "";
  return CircleAvatar(
    radius: radius,
--- a/mobile/lib/widgets/common/user_circle_avatar.dart
+++ b/mobile/lib/widgets/common/user_circle_avatar.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';

 // ignore: must_be_immutable
 class UserCircleAvatar extends ConsumerWidget {
@@ -18,7 +17,7 @@ class UserCircleAvatar extends ConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
    final userAvatarColor = user.avatarColor.toColor().withValues(alpha: opacity);
    final profileImageUrl =
-        '${Store.get(StoreKey.serverEndpoint)}/users/${user.id}/profile-image?d=${user.profileChangedAt.millisecondsSinceEpoch}';
+        '${ref.read(sessionProvider).serverEndpoint}/users/${user.id}/profile-image?d=${user.profileChangedAt.millisecondsSinceEpoch}';

    final textColor = (user.avatarColor.toColor().computeLuminance() > 0.5 ? Colors.black : Colors.white).withValues(
      alpha: opacity,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
shenlong-tanwen	3ab8c6e3db	rebase	2026-07-22 00:36:02 +05:30
shenlong-tanwen	865adba8c1	migrate session config from store	2026-07-22 00:06:24 +05:30
shenlong-tanwen	9136a72712	add map codec tests	2026-07-22 00:04:42 +05:30
shenlong-tanwen	1b1b14e3e4	add map codec tests	2026-07-22 00:01:27 +05:30
shenlong-tanwen	5c5b41500b	rebase over null store key	2026-07-21 19:38:00 +05:30
shenlong-tanwen	00542011fb	extract CachedKeyValueRepository	2026-07-21 19:38:00 +05:30
shenlong-tanwen	f8be7dc573	refactor(mobile): extract shared ValueCodec from SettingsKey # Conflicts: # mobile/lib/domain/models/settings_key.dart # Conflicts: # mobile/lib/domain/models/settings_key.dart	2026-07-21 19:38:00 +05:30