fix(mobile): dedupe stale remote_asset rows on sync

queue a pre-delete on the matching partial-index tuple before each upsert in updateAssetsV1/V2 so the second insert does not crash on SqliteException(2067) when the server re-issues a new id for the same (ownerId, checksum). closes #22522 #27186.
2026-05-21 07:06:31 -04:00 · 2026-05-15 23:31:38 +06:00
322 changed files with 9602 additions and 39421 deletions
@@ -16,7 +16,7 @@ services:
      - ${UPLOAD_LOCATION:-upload-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/data
      - /etc/localtime:/etc/localtime:ro
      - pnpm_store_server:/buildcache/pnpm-store
-      - ../packages/plugin-core:/build/plugins/immich-plugin-core
+      - ../packages/plugins:/build/corePlugin
  immich-web:
    env_file: !reset []
  immich-machine-learning:
@@ -91,7 +91,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -159,14 +159,14 @@ jobs:

      - name: Comment APK download link on PR
        if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork }}
-        uses: immich-app/devtools/actions/sticky-comment@0135acd12ad9f3369b94a2aa3c0ae8c835a4e926 # sticky-comment-action-v1.0.0
+        uses: mshick/add-pr-comment@8e4927817251f1ff60c001f04568532b38e0b4a0 # v3.11.0
        env:
          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
          APK_URL: ${{ steps.upload-apk.outputs.artifact-url }}
        with:
-          id: mobile-android-apk
-          token: ${{ steps.token.outputs.token }}
-          body: |
+          github-token: ${{ steps.token.outputs.token }}
+          message-id: 'mobile-android-apk'
+          message: |
            📱 **Android release APK (universal)** — `${{ env.HEAD_SHA }}`

            Download: ${{ env.APK_URL }}
@@ -216,7 +216,7 @@ jobs:
          persist-credentials: false

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -231,7 +231,7 @@ jobs:
        run: mise //mobile:codegen:pigeon

      - name: Setup Ruby
-        uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1.307.0
+        uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1.306.0
        with:
          ruby-version: '3.3'
          bundler-cache: true
@@ -24,7 +24,7 @@ jobs:
          persist-credentials: false

      - name: Check for breaking API changes
-        uses: oasdiff/oasdiff-action/breaking@6147a58e5d1249a12f42fc864ab791d571a30015 # v0.0.47
+        uses: oasdiff/oasdiff-action/breaking@26ccb332c67a45ca649de9faf60552ef1b8260d9 # v0.0.46
        with:
          base: https://raw.githubusercontent.com/${{ github.repository }}/main/open-api/immich-openapi-specs.json
          revision: open-api/immich-openapi-specs.json
@@ -43,7 +43,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -57,7 +57,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
+        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,7 +70,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@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
+        uses: github/codeql-action/autobuild@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3

      # ℹ️ 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
@@ -83,6 +83,6 @@ jobs:
      #   ./location_of_script_within_repo/buildscript.sh

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
+        uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
        with:
          category: '/language:${{matrix.language}}'
@@ -66,7 +66,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -131,7 +131,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -213,11 +213,12 @@ jobs:
        run: 'mise run //deployment:tf apply'

      - name: Comment
-        uses: immich-app/devtools/actions/sticky-comment@0135acd12ad9f3369b94a2aa3c0ae8c835a4e926 # sticky-comment-action-v1.0.0
+        uses: actions-cool/maintain-one-comment@909842216bc8e8658364c572ec52100f4c2cc50a # v3.3.0
        if: ${{ steps.parameters.outputs.event == 'pr' }}
        with:
-          id: docs-pr-url
          token: ${{ steps.token.outputs.token }}
          number: ${{ fromJson(needs.checks.outputs.parameters).pr_number }}
          body: |
            📖 Documentation deployed to [${{ steps.docs-output.outputs.subdomain }}](https://${{ steps.docs-output.outputs.subdomain }})
+          emojis: 'rocket'
+          body-include: '<!-- Docs PR URL -->'
@@ -29,7 +29,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -44,8 +44,9 @@ jobs:
        run: 'mise run //deployment:tf destroy -- -refresh=false'

      - name: Comment
-        uses: immich-app/devtools/actions/sticky-comment@0135acd12ad9f3369b94a2aa3c0ae8c835a4e926 # sticky-comment-action-v1.0.0
+        uses: actions-cool/maintain-one-comment@909842216bc8e8658364c572ec52100f4c2cc50a # v3.3.0
        with:
-          id: docs-pr-url
          token: ${{ steps.token.outputs.token }}
+          number: ${{ github.event.number }}
          delete: true
+          body-include: '<!-- Docs PR URL -->'
@@ -28,7 +28,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -31,7 +31,7 @@ jobs:
      - name: Generate a token
        id: generate_token
        if: ${{ inputs.skip != true }}
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -13,4 +13,3 @@ jobs:
      actions: read
      contents: read
      security-events: write
-    secrets: inherit
@@ -62,7 +62,7 @@ jobs:
          ref: main

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -119,7 +119,7 @@ jobs:
    steps:
      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -19,11 +19,11 @@ jobs:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

-      - uses: immich-app/devtools/actions/sticky-comment@0135acd12ad9f3369b94a2aa3c0ae8c835a4e926 # sticky-comment-action-v1.0.0
+      - uses: mshick/add-pr-comment@8e4927817251f1ff60c001f04568532b38e0b4a0 # v3.11.0
        with:
-          id: preview-status
-          token: ${{ steps.token.outputs.token }}
-          body: 'Deploying preview environment to https://pr-${{ github.event.pull_request.number }}.preview.internal.immich.build/'
+          github-token: ${{ steps.token.outputs.token }}
+          message-id: 'preview-status'
+          message: 'Deploying preview environment to https://pr-${{ github.event.pull_request.number }}.preview.internal.immich.build/'

  remove-label:
    runs-on: ubuntu-latest
@@ -48,16 +48,16 @@ jobs:
              name: 'preview'
            })

-      - uses: immich-app/devtools/actions/sticky-comment@0135acd12ad9f3369b94a2aa3c0ae8c835a4e926 # sticky-comment-action-v1.0.0
+      - uses: mshick/add-pr-comment@8e4927817251f1ff60c001f04568532b38e0b4a0 # v3.11.0
        if: ${{ github.event.pull_request.head.repo.fork }}
        with:
-          id: preview-status
-          token: ${{ steps.token.outputs.token }}
-          body: 'PRs from forks cannot have preview environments.'
+          github-token: ${{ steps.token.outputs.token }}
+          message-id: 'preview-status'
+          message: 'PRs from forks cannot have preview environments.'

-      - uses: immich-app/devtools/actions/sticky-comment@0135acd12ad9f3369b94a2aa3c0ae8c835a4e926 # sticky-comment-action-v1.0.0
+      - uses: mshick/add-pr-comment@8e4927817251f1ff60c001f04568532b38e0b4a0 # v3.11.0
        if: ${{ !github.event.pull_request.head.repo.fork }}
        with:
-          id: preview-status
-          token: ${{ steps.token.outputs.token }}
-          body: 'Preview environment has been removed.'
+          github-token: ${{ steps.token.outputs.token }}
+          message-id: 'preview-status'
+          message: 'Preview environment has been removed.'
@@ -28,7 +28,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -61,7 +61,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -30,32 +30,25 @@ jobs:
          filters: |
            i18n:
              - 'i18n/**'
-              - 'mise.toml'
            web:
              - 'web/**'
              - 'i18n/**'
              - 'packages/sdk/**'
              - 'pnpm-lock.yaml'
-              - 'mise.toml'
            server:
              - 'server/**'
              - 'pnpm-lock.yaml'
-              - 'mise.toml'
            cli:
              - 'packages/cli/**'
              - 'packages/sdk/**'
              - 'pnpm-lock.yaml'
-              - 'mise.toml'
            e2e:
              - 'e2e/**'
              - 'pnpm-lock.yaml'
-              - 'mise.toml'
            mobile:
              - 'mobile/**'
-              - 'mise.toml'
            machine-learning:
              - 'machine-learning/**'
-              - 'mise.toml'
            .github:
              - '.github/**'
          force-filters: |
@@ -69,6 +62,9 @@ jobs:
    runs-on: ubuntu-latest
    permissions:
      contents: read
+    defaults:
+      run:
+        working-directory: ./server
    steps:
      - id: token
        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
@@ -83,12 +79,12 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

      - name: Run ci-unit
-        run: mise run //server:ci-unit
+        run: mise run ci-unit

  cli-unit-tests:
    name: Unit Test CLI
@@ -114,7 +110,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -145,7 +141,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -189,7 +185,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -227,7 +223,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -255,7 +251,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -305,7 +301,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -338,7 +334,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -384,7 +380,7 @@ jobs:
          cache-dependency-path: '**/pnpm-lock.yaml'

      - name: Setup packages
-        run: pnpm --filter @immich/sdk --filter @immich/cli install --frozen-lockfile && pnpm --filter @immich/sdk --filter @immich/cli build
+        run: pnpm --filter "@immich/*" install --frozen-lockfile && pnpm --filter "@immich/*" build

      - name: Run setup web
        run: pnpm install --frozen-lockfile && pnpm exec svelte-kit sync
@@ -557,7 +553,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -594,7 +590,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -625,7 +621,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

@@ -676,12 +672,13 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

      - name: Install server dependencies
        run: SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter immich install --frozen-lockfile
+
      - name: Run API generation
        run: mise //:open-api
        working-directory: open-api
@@ -720,6 +717,9 @@ jobs:
          --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
        ports:
          - 5432:5432
+    defaults:
+      run:
+        working-directory: ./server
    steps:
      - id: token
        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
@@ -734,28 +734,25 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
+        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
        with:
          github_token: ${{ steps.token.outputs.token }}

      - name: Install server dependencies
        run: SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm install --frozen-lockfile

-      - name: Build plugins
-        run: mise //:plugins
-
      - name: Build the app
-        run: mise //server:build
+        run: pnpm build

      - name: Run existing migrations
-        run: pnpm --filter immich migrations:run
+        run: pnpm migrations:run

      - name: Test npm run schema:reset command works
-        run: pnpm --filter immich schema:reset
+        run: pnpm schema:reset

      - name: Generate new migrations
        continue-on-error: true
-        run: pnpm --filter migrations:generate src/TestMigration
+        run: pnpm migrations:generate src/TestMigration

      - name: Find file changes
        uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4
@@ -771,7 +768,7 @@ jobs:
        run: |
          echo "ERROR: Generated migration files not up to date!"
          echo "Changed files: ${CHANGED_FILES}"
-          cat ./server/src/*-TestMigration.ts
+          cat ./src/*-TestMigration.ts
          exit 1

      - name: Run SQL generation
@@ -1,65 +0,0 @@
-# @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
-
-[[tools.opentofu]]
-version = "1.11.6"
-backend = "aqua:opentofu/opentofu"
-
-[tools.opentofu."platforms.linux-arm64"]
-checksum = "sha256:d4f2ab15776925864b049bb329d69682851de6f5204f256e9fa86d07a0308850"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_arm64.tar.gz"
-
-[tools.opentofu."platforms.linux-arm64-musl"]
-checksum = "sha256:d4f2ab15776925864b049bb329d69682851de6f5204f256e9fa86d07a0308850"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_arm64.tar.gz"
-
-[tools.opentofu."platforms.linux-x64"]
-checksum = "sha256:02800fafa2753a9f50c38483e2fdf5bc353fd62895eb9e25eec9a5145df3a69e"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_amd64.tar.gz"
-
-[tools.opentofu."platforms.linux-x64-musl"]
-checksum = "sha256:02800fafa2753a9f50c38483e2fdf5bc353fd62895eb9e25eec9a5145df3a69e"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_amd64.tar.gz"
-
-[tools.opentofu."platforms.macos-arm64"]
-checksum = "sha256:62d7fa8539e13b444827aa0a3b90c5972da5c47e8f8882d9dcf2e430e78840c1"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_darwin_arm64.tar.gz"
-
-[tools.opentofu."platforms.macos-x64"]
-checksum = "sha256:1408cdef1c380f914565e6b4bb70794c6b163f195fcb233357f3d6c5745906b6"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_darwin_amd64.tar.gz"
-
-[tools.opentofu."platforms.windows-x64"]
-checksum = "sha256:27323f70c875b8251bfd7e61a4cffc3ebff4e56ed1e611b955016f0c7077367e"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_windows_amd64.tar.gz"
-
-[[tools.terragrunt]]
-version = "1.0.3"
-backend = "aqua:gruntwork-io/terragrunt"
-
-[tools.terragrunt."platforms.linux-arm64"]
-checksum = "sha256:e5b60ab05b5214db694e6bc215d8124fb626e277cdb56b86f6147ae110d510fe"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_arm64.tar.gz"
-
-[tools.terragrunt."platforms.linux-arm64-musl"]
-checksum = "sha256:e5b60ab05b5214db694e6bc215d8124fb626e277cdb56b86f6147ae110d510fe"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_arm64.tar.gz"
-
-[tools.terragrunt."platforms.linux-x64"]
-checksum = "sha256:6d48049baf82e0bf9c804368dc85cbfeadc10955e33777e9e8de3e020b94b073"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_amd64.tar.gz"
-
-[tools.terragrunt."platforms.linux-x64-musl"]
-checksum = "sha256:6d48049baf82e0bf9c804368dc85cbfeadc10955e33777e9e8de3e020b94b073"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_amd64.tar.gz"
-
-[tools.terragrunt."platforms.macos-arm64"]
-checksum = "sha256:aacb5be2ca5475300cbce246dfbd8a45eb47510fbaa70fab8561c49ef5db03aa"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_darwin_arm64.tar.gz"
-
-[tools.terragrunt."platforms.macos-x64"]
-checksum = "sha256:3133c2251e191aede8e3dd2a5b3aee2e91c5f08f88f117aee40eed9a24c8ef6b"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_darwin_amd64.tar.gz"
-
-[tools.terragrunt."platforms.windows-x64"]
-checksum = "sha256:183b2745b4e04980a6bfa4450ff81956a12596ca22d70f7aaa793980f5b036db"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_windows_amd64.exe.tar.gz"
@@ -74,7 +74,7 @@ services:
      - ${UPLOAD_LOCATION}/photos:/data
      - /etc/localtime:/etc/localtime:ro
      - pnpm_store_server:/buildcache/pnpm-store
-      - ../packages/plugin-core:/build/plugins/immich-plugin-core
+      - ../packages/plugins:/build/corePlugin
    env_file:
      - .env
    environment:
@@ -18,7 +18,7 @@ make e2e
 Before you can run the tests, you need to run the following commands _once_:

 - `pnpm install`
- `pnpm --filter @immich/sdk --filter @immich/cli build`
+- `pnpm --filter "@immich/*" build`
 - `mise //:open-api`

 Once the test environment is running, the e2e tests can be run via:
@@ -10,6 +10,7 @@ const config = {
  url: 'https://docs.immich.app',
  baseUrl: '/',
  onBrokenLinks: 'throw',
+  onBrokenMarkdownLinks: 'warn',
  favicon: 'img/favicon.png',

  // GitHub pages deployment config.
@@ -28,9 +29,6 @@ const config = {
  // Mermaid diagrams
  markdown: {
    mermaid: true,
-    hooks: {
-      onBrokenMarkdownLinks: 'warn',
-    },
  },
  themes: ['@docusaurus/theme-mermaid'],

@@ -1,5 +0,0 @@
-# @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
-
-[[tools.wrangler]]
-version = "4.66.0"
-backend = "npm:wrangler"
@@ -32,7 +32,7 @@
    "@playwright/test": "^1.44.1",
    "@socket.io/component-emitter": "^3.1.2",
    "@types/luxon": "^3.4.2",
-    "@types/node": "^24.12.4",
+    "@types/node": "^24.12.2",
    "@types/pg": "^8.15.1",
    "@types/pngjs": "^6.0.4",
    "@types/supertest": "^7.0.0",
@@ -22,12 +22,13 @@
  "add_birthday": "Add a birthday",
  "add_endpoint": "Add endpoint",
  "add_exclusion_pattern": "Add exclusion pattern",
+  "add_filter": "Add filter",
+  "add_filter_description": "Click to add a filter condition",
  "add_location": "Add location",
  "add_more_users": "Add more users",
  "add_partner": "Add partner",
  "add_path": "Add path",
  "add_photos": "Add photos",
-  "add_step": "Add step",
  "add_tag": "Add tag",
  "add_to": "Add to…",
  "add_to_album": "Add to album",
@@ -41,6 +42,7 @@
  "add_to_shared_album": "Add to shared album",
  "add_upload_to_stack": "Add upload to stack",
  "add_url": "Add URL",
+  "add_workflow_step": "Add workflow step",
  "added_to_archive": "Added to archive",
  "added_to_favorites": "Added to favorites",
  "added_to_favorites_count": "Added {count, number} to favorites",
@@ -731,7 +733,6 @@
  "cannot_update_the_description": "Cannot update the description",
  "cast": "Cast",
  "cast_description": "Configure available cast destinations",
-  "change": "Change",
  "change_date": "Change date",
  "change_description": "Change description",
  "change_display_order": "Change display order",
@@ -760,7 +761,6 @@
  "check_corrupt_asset_backup_description": "Run this check only over Wi-Fi and once all assets have been backed-up. The procedure might take a few minutes.",
  "check_logs": "Check Logs",
  "checksum": "Checksum",
-  "choose": "Choose",
  "choose_matching_people_to_merge": "Choose matching people to merge",
  "city": "City",
  "cleanup_confirm_description": "Immich found {count} assets (created before {date}) safely backed up to the server. Remove the local copies from this device?",
@@ -778,7 +778,6 @@
  "clear": "Clear",
  "clear_all": "Clear all",
  "clear_all_recent_searches": "Clear all recent searches",
-  "clear_failed_count": "Clear failed ({count})",
  "clear_file_cache": "Clear File Cache",
  "clear_message": "Clear message",
  "clear_value": "Clear value",
@@ -810,7 +809,6 @@
  "comments_are_disabled": "Comments are disabled",
  "common_create_new_album": "Create new album",
  "completed": "Completed",
-  "configuration": "Configuration",
  "confirm": "Confirm",
  "confirm_admin_password": "Confirm Admin Password",
  "confirm_delete_face": "Are you sure you want to delete {name} face from the asset?",
@@ -825,7 +823,6 @@
  "contain": "Contain",
  "context": "Context",
  "continue": "Continue",
-  "control_bottom_app_bar_add_tags": "Add Tags",
  "control_bottom_app_bar_create_new_album": "Create new album",
  "control_bottom_app_bar_delete_from_immich": "Delete from Immich",
  "control_bottom_app_bar_delete_from_local": "Delete from device",
@@ -897,7 +894,6 @@
  "date_of_birth": "Date of birth",
  "date_of_birth_saved": "Date of birth saved successfully",
  "date_range": "Date range",
-  "date_time_original": "Date/Time Original",
  "day": "Day",
  "days": "Days",
  "deduplicate_all": "Deduplicate All",
@@ -1078,7 +1074,6 @@
    "failed_to_remove_product_key": "Failed to remove product key",
    "failed_to_reset_pin_code": "Failed to reset PIN code",
    "failed_to_stack_assets": "Failed to stack assets",
-    "failed_to_tag_assets": "Failed to tag assets",
    "failed_to_unstack_assets": "Failed to un-stack assets",
    "failed_to_update_notification_status": "Failed to update notification status",
    "incorrect_email_or_password": "Incorrect email or password",
@@ -1198,13 +1193,11 @@
  "export_as_json": "Export as JSON",
  "export_database": "Export Database",
  "export_database_description": "Export the SQLite database",
-  "exposure_time": "Exposure Time",
  "extension": "Extension",
  "external": "External",
  "external_libraries": "External Libraries",
  "external_network": "External network",
  "external_network_sheet_info": "When not on the preferred Wi-Fi network, the app will connect to the server through the first of the below URLs it can reach, starting from top to bottom",
-  "f_number": "F-Number",
  "face_unassigned": "Unassigned",
  "failed": "Failed",
  "failed_count": "Failed: {count}",
@@ -1222,6 +1215,7 @@
  "features_setting_description": "Manage the app features",
  "file_name_or_extension": "File name or extension",
  "file_name_text": "File name",
+  "file_name_with_value": "File name: {file_name}",
  "file_size": "File size",
  "filename": "Filename",
  "filetype": "Filetype",
@@ -1234,7 +1228,6 @@
  "find_them_fast": "Find them fast by name with search",
  "first": "First",
  "fix_incorrect_match": "Fix incorrect match",
-  "focal_length": "Focal Length",
  "folder": "Folder",
  "folder_not_found": "Folder not found",
  "folders": "Folders",
@@ -1355,7 +1348,6 @@
  "ios_debug_info_no_sync_yet": "No background sync job has run yet",
  "ios_debug_info_processes_queued": "{count, plural, one {{count} background process queued} other {{count} background processes queued}}",
  "ios_debug_info_processing_ran_at": "Processing ran {dateTime}",
-  "iso": "ISO",
  "items_count": "{count, plural, one {# item} other {# items}}",
  "jobs": "Jobs",
  "json_editor": "JSON editor",
@@ -1588,7 +1580,6 @@
  "mobile_app": "Mobile App",
  "mobile_app_download_onboarding_note": "Download the companion mobile app using the following options",
  "model": "Model",
-  "modify_date": "Modify Date",
  "month": "Month",
  "more": "More",
  "motion": "Motion",
@@ -1637,6 +1628,7 @@
  "next": "Next",
  "next_memory": "Next memory",
  "no": "No",
+  "no_actions_added": "No actions added yet",
  "no_albums_found": "No albums found",
  "no_albums_message": "Create an album to organize your photos and videos",
  "no_albums_with_name_yet": "It looks like you do not have any albums with this name yet.",
@@ -1653,6 +1645,7 @@
  "no_exif_info_available": "No exif info available",
  "no_explore_results_message": "Upload more photos to explore your collection.",
  "no_favorites_message": "Add favorites to quickly find your best pictures and videos",
+  "no_filters_added": "No filters added yet",
  "no_libraries_message": "Create an external library to view your photos and videos",
  "no_local_assets_found": "No local assets found with this checksum",
  "no_location_set": "No location set",
@@ -1665,7 +1658,6 @@
  "no_results": "No results",
  "no_results_description": "Try a synonym or more general keyword",
  "no_shared_albums_message": "Create an album to share photos and videos with people in your network",
-  "no_steps": "No steps added yet",
  "no_uploads_in_progress": "No uploads in progress",
  "none": "None",
  "not_allowed": "Not allowed",
@@ -1711,7 +1703,6 @@
  "organize_into_albums": "Organize into albums",
  "organize_into_albums_description": "Put existing photos into albums using current sync settings",
  "organize_your_library": "Organize your library",
-  "orientation": "Orientation",
  "original": "original",
  "other": "Other",
  "other_devices": "Other devices",
@@ -1803,8 +1794,6 @@
  "play_original_video_setting_description": "Prefer playback of original videos rather than transcoded videos. If original asset is not compatible it may not playback correctly.",
  "play_transcoded_video": "Play transcoded video",
  "please_auth_to_access": "Please authenticate to access",
-  "plugin_method_filter_type": "Filter",
-  "plugin_method_filter_type_description": "This method can filter events and conditionally prevent subsequent steps from running",
  "port": "Port",
  "preferences_settings_subtitle": "Manage the app's preferences",
  "preferences_settings_title": "Preferences",
@@ -1826,7 +1815,6 @@
  "profile_drawer_readonly_mode": "Read-only mode enabled. Long-press the user avatar icon to exit.",
  "profile_image_of_user": "Profile image of {user}",
  "profile_picture_set": "Profile picture set.",
-  "projection_type": "Projection Type",
  "public_album": "Public album",
  "public_share": "Public Share",
  "purchase_account_info": "Supporter",
@@ -2196,9 +2184,7 @@
  "show_in_timeline": "Show in timeline",
  "show_in_timeline_setting_description": "Show photos and videos from this user in your timeline",
  "show_keyboard_shortcuts": "Show keyboard shortcuts",
-  "show_less": "Show less",
  "show_metadata": "Show metadata",
-  "show_more_fields": "{count, plural, one {Show # more field} other {Show # more fields}}",
  "show_or_hide_info": "Show or hide info",
  "show_password": "Show password",
  "show_person_options": "Show person options",
@@ -2250,10 +2236,6 @@
  "start_date_before_end_date": "Start date must be before end date",
  "state": "State",
  "status": "Status",
-  "step_delete": "Delete step",
-  "step_delete_confirm": "Are you sure you want to delete this step?",
-  "step_details": "Step details",
-  "steps": "Steps",
  "stop_casting": "Stop casting",
  "stop_motion_photo": "Stop Motion Photo",
  "stop_photo_sharing": "Stop sharing your photos?",
@@ -2347,7 +2329,7 @@
  "trash_page_title": "Trash ({count})",
  "trashed_items_will_be_permanently_deleted_after": "Trashed items will be permanently deleted after {days, plural, one {# day} other {# days}}.",
  "trigger": "Trigger",
-  "trigger_asset_uploaded": "Asset Upload",
+  "trigger_asset_uploaded": "Asset Uploaded",
  "trigger_asset_uploaded_description": "Triggered when a new asset is uploaded",
  "trigger_description": "An event that kicks off the workflow",
  "trigger_person_recognized": "Person Recognized",
@@ -2387,6 +2369,7 @@
  "unsupported_field_type": "Unsupported field type",
  "unsupported_file_type": "File {file} can't be uploaded because its file type {type} is not supported.",
  "untagged": "Untagged",
+  "untitled_workflow": "Untitled workflow",
  "up_next": "Up next",
  "update_location_action_prompt": "Update the location of {count} selected assets with:",
  "updated_at": "Updated",
@@ -2478,7 +2461,6 @@
  "welcome_to_immich": "Welcome to Immich",
  "width": "Width",
  "wifi_name": "Wi-Fi Name",
-  "workflow": "Workflow",
  "workflow_delete_prompt": "Are you sure you want to delete this workflow?",
  "workflow_deleted": "Workflow deleted",
  "workflow_description": "Workflow description",
@@ -1,72 +0,0 @@
-# @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
-
-[[tools.python]]
-version = "3.11.15"
-backend = "core:python"
-
-[tools.python."platforms.linux-arm64"]
-checksum = "sha256:243f794278eff6adba96ed3677ec6877175df84c25f140e17f09f9be82d0f12a"
-url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260510/cpython-3.11.15+20260510-aarch64-unknown-linux-gnu-install_only_stripped.tar.gz"
-provenance = "github-attestations"
-
-[tools.python."platforms.linux-arm64-musl"]
-checksum = "sha256:52b4c52094ff8b383a45c694acf4c5c0e883152be6d5229a35a8186ce907c6eb"
-url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260510/cpython-3.11.15+20260510-aarch64-unknown-linux-musl-install_only_stripped.tar.gz"
-provenance = "github-attestations"
-
-[tools.python."platforms.linux-x64"]
-checksum = "sha256:171dffd8c0f66e8a0725364a7428015b22fc18dd298b24f541392e17dd0e561f"
-url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260510/cpython-3.11.15+20260510-x86_64-unknown-linux-gnu-install_only_stripped.tar.gz"
-provenance = "github-attestations"
-
-[tools.python."platforms.linux-x64-musl"]
-checksum = "sha256:2ac90fef8917ebd14826a6d667593a06cf0ae5f745ba9b1147dc086dd35f5284"
-url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260510/cpython-3.11.15+20260510-x86_64-unknown-linux-musl-install_only_stripped.tar.gz"
-provenance = "github-attestations"
-
-[tools.python."platforms.macos-arm64"]
-checksum = "sha256:fdfc363b538662eb7441a14e06f72c4a992c56af7f401f5730ea5081f8f8ad6e"
-url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260510/cpython-3.11.15+20260510-aarch64-apple-darwin-install_only_stripped.tar.gz"
-provenance = "github-attestations"
-
-[tools.python."platforms.macos-x64"]
-checksum = "sha256:5f1eb247cbca2c0ad5ccbf6d299a4f54b31b5c63b492d74c3531dc4344a42f88"
-url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260510/cpython-3.11.15+20260510-x86_64-apple-darwin-install_only_stripped.tar.gz"
-provenance = "github-attestations"
-
-[tools.python."platforms.windows-x64"]
-checksum = "sha256:756d7f148498b8822f6aedf44a020613576f09983161f346ad36dcef6238cdc3"
-url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260510/cpython-3.11.15+20260510-x86_64-pc-windows-msvc-install_only_stripped.tar.gz"
-provenance = "github-attestations"
-
-[[tools.uv]]
-version = "0.8.15"
-backend = "aqua:astral-sh/uv"
-
-[tools.uv."platforms.linux-arm64"]
-checksum = "sha256:23ea21a05c62c4c307ce691f29bff2f15c94c4f07f2b83d9b356f0664bc8b3a2"
-url = "https://github.com/astral-sh/uv/releases/download/0.8.15/uv-aarch64-unknown-linux-musl.tar.gz"
-
-[tools.uv."platforms.linux-arm64-musl"]
-checksum = "sha256:23ea21a05c62c4c307ce691f29bff2f15c94c4f07f2b83d9b356f0664bc8b3a2"
-url = "https://github.com/astral-sh/uv/releases/download/0.8.15/uv-aarch64-unknown-linux-musl.tar.gz"
-
-[tools.uv."platforms.linux-x64"]
-checksum = "sha256:d0fec58f3124e05e0a1af0f6541abfce4333253cdaf23c7b6bb2e6128bf138ea"
-url = "https://github.com/astral-sh/uv/releases/download/0.8.15/uv-x86_64-unknown-linux-musl.tar.gz"
-
-[tools.uv."platforms.linux-x64-musl"]
-checksum = "sha256:d0fec58f3124e05e0a1af0f6541abfce4333253cdaf23c7b6bb2e6128bf138ea"
-url = "https://github.com/astral-sh/uv/releases/download/0.8.15/uv-x86_64-unknown-linux-musl.tar.gz"
-
-[tools.uv."platforms.macos-arm64"]
-checksum = "sha256:103367962c5cb00bf7370d84cbaa3fec5a9807be9cc833ea9d8eea400c119fa2"
-url = "https://github.com/astral-sh/uv/releases/download/0.8.15/uv-aarch64-apple-darwin.tar.gz"
-
-[tools.uv."platforms.macos-x64"]
-checksum = "sha256:2bbef70982e97dfc36454de173f35ec1a5e83ae11e3885df6a50db3fd76171cb"
-url = "https://github.com/astral-sh/uv/releases/download/0.8.15/uv-x86_64-apple-darwin.tar.gz"
-
-[tools.uv."platforms.windows-x64"]
-checksum = "sha256:459d95892a5cc5c21779532f4f41b9238594b79e312a5142da2148ecfa10e705"
-url = "https://github.com/astral-sh/uv/releases/download/0.8.15/uv-x86_64-pc-windows-msvc.zip"
@@ -1,391 +0,0 @@
-# @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
-
-[[tools.flutter]]
-version = "3.41.9-stable"
-backend = "asdf:flutter"
-
-[[tools."github:CQLabs/homebrew-dcm"]]
-version = "1.37.0"
-backend = "github:CQLabs/homebrew-dcm"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.linux-arm64"]
-checksum = "sha256:253da2512b149913dfe345bf9a62a79acb2d730f66e71162ba4a92dfc4224b82"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-arm-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543838"
-github_attestations = "unavailable"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.linux-arm64-musl"]
-checksum = "sha256:253da2512b149913dfe345bf9a62a79acb2d730f66e71162ba4a92dfc4224b82"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-arm-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543838"
-github_attestations = "unavailable"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.linux-x64"]
-checksum = "sha256:477e086d4099c12f21e5ccd83b005d5fb945dd4cac4fd127fd9a08d7649af1cf"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-x64-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543797"
-github_attestations = "unavailable"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.linux-x64-musl"]
-checksum = "sha256:477e086d4099c12f21e5ccd83b005d5fb945dd4cac4fd127fd9a08d7649af1cf"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-x64-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543797"
-github_attestations = "unavailable"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.macos-arm64"]
-checksum = "sha256:30bede64367d09067093cc57af6ec9496d7717898138ded5cb98a16ac8dd9d93"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-macos-arm-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543757"
-github_attestations = "unavailable"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.macos-x64"]
-checksum = "sha256:e56cb99872be7445a4de1d37e5438ca70e3bcd83be7a2b9b385e3538881f8068"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-macos-x64-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543727"
-github_attestations = "unavailable"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.windows-x64"]
-checksum = "sha256:f133470daa3fb0427f039b424392af7e917d7e7db6b556aa2a968ab0e31587da"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-windows-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543660"
-github_attestations = "unavailable"
-
-[[tools."github:extism/cli"]]
-version = "1.6.3"
-backend = "github:extism/cli"
-
-[tools."github:extism/cli"."platforms.linux-arm64"]
-checksum = "sha256:d92f830c9be39637569feacb04e9750c28848df6d9a219db94152a9b4eb9452b"
-url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-arm64.tar.gz"
-url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694030"
-github_attestations = "unavailable"
-
-[tools."github:extism/cli"."platforms.linux-arm64-musl"]
-checksum = "sha256:d92f830c9be39637569feacb04e9750c28848df6d9a219db94152a9b4eb9452b"
-url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-arm64.tar.gz"
-url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694030"
-github_attestations = "unavailable"
-
-[tools."github:extism/cli"."platforms.linux-x64"]
-checksum = "sha256:34e7ae9bfded6e2c32dee83f70a4e50d34f9d3e80d1762b09625fe82e214d02d"
-url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-amd64.tar.gz"
-url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694025"
-github_attestations = "unavailable"
-
-[tools."github:extism/cli"."platforms.linux-x64-musl"]
-checksum = "sha256:34e7ae9bfded6e2c32dee83f70a4e50d34f9d3e80d1762b09625fe82e214d02d"
-url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-amd64.tar.gz"
-url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694025"
-github_attestations = "unavailable"
-
-[tools."github:extism/cli"."platforms.macos-arm64"]
-checksum = "sha256:b4ddbc575b5ac000115247f781723f9b9f284ed87b29c600539d72161b5b29fc"
-url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-darwin-arm64.tar.gz"
-url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694029"
-github_attestations = "unavailable"
-
-[tools."github:extism/cli"."platforms.macos-x64"]
-checksum = "sha256:9a2f71b6e6009685a622cc3084e52d2a1a8e23c98d29ffa72e666e9dc699855f"
-url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-darwin-amd64.tar.gz"
-url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694026"
-github_attestations = "unavailable"
-
-[tools."github:extism/cli"."platforms.windows-x64"]
-checksum = "sha256:47e4ed2782445b2b08a4d1ac127211588f8b4d1fc25fd6481d4cb65151b5213c"
-url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-windows-amd64.zip"
-url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694035"
-github_attestations = "unavailable"
-
-[[tools."github:extism/js-pdk"]]
-version = "1.6.0"
-backend = "github:extism/js-pdk"
-
-[tools."github:extism/js-pdk"."platforms.linux-arm64"]
-checksum = "sha256:15a186250e68d6bff4ec839fff275d45a90e383a69209dcc1239eb9e3aee6e1b"
-url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-aarch64-linux-v1.6.0.gz"
-url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223214"
-github_attestations = "unavailable"
-
-[tools."github:extism/js-pdk"."platforms.linux-arm64-musl"]
-checksum = "sha256:15a186250e68d6bff4ec839fff275d45a90e383a69209dcc1239eb9e3aee6e1b"
-url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-aarch64-linux-v1.6.0.gz"
-url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223214"
-github_attestations = "unavailable"
-
-[tools."github:extism/js-pdk"."platforms.linux-x64"]
-checksum = "sha256:4ded271ccf465031ccd0dc35e7a140e134d7f30721671cc4a8e1ff805d4aad68"
-url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-linux-v1.6.0.gz"
-url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223119"
-github_attestations = "unavailable"
-
-[tools."github:extism/js-pdk"."platforms.linux-x64-musl"]
-checksum = "sha256:4ded271ccf465031ccd0dc35e7a140e134d7f30721671cc4a8e1ff805d4aad68"
-url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-linux-v1.6.0.gz"
-url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223119"
-github_attestations = "unavailable"
-
-[tools."github:extism/js-pdk"."platforms.macos-arm64"]
-checksum = "sha256:548e25bda3971a07c32d78a249135cf8cb7b3eede101e878e06e53e01ac2e0ce"
-url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-aarch64-macos-v1.6.0.gz"
-url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223215"
-github_attestations = "unavailable"
-
-[tools."github:extism/js-pdk"."platforms.macos-x64"]
-checksum = "sha256:d85a875c2a071f0c29fe572764c52c3a499f157ab7f9efac8939a4364390e29b"
-url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-macos-v1.6.0.gz"
-url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223239"
-github_attestations = "unavailable"
-
-[tools."github:extism/js-pdk"."platforms.windows-x64"]
-checksum = "sha256:97b7b746141e4777e1ca2b76febdeb16dc9d314ff6a4257df05a476b67228acc"
-url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-windows-v1.6.0.gz"
-url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353224133"
-github_attestations = "unavailable"
-
-[[tools."github:jellyfin/jellyfin-ffmpeg"]]
-version = "7.1.3-6"
-backend = "github:jellyfin/jellyfin-ffmpeg"
-
-[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"
-github_attestations = "unavailable"
-
-[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"
-github_attestations = "unavailable"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-x64"]
-checksum = "sha256:39e99a7927468a6abec5f65d00f55010e8ff2ae3c2605294f179c94f6ae21af2"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linux64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048879"
-github_attestations = "unavailable"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-x64-musl"]
-checksum = "sha256:39e99a7927468a6abec5f65d00f55010e8ff2ae3c2605294f179c94f6ae21af2"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linux64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048879"
-github_attestations = "unavailable"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-arm64"]
-checksum = "sha256:e024d5e78d5414e75f0181036cd21373fafb9270c72894dfd7dbda2572439820"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_macarm64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995838"
-github_attestations = "unavailable"
-
-[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"
-github_attestations = "unavailable"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.windows-x64"]
-checksum = "sha256:7b7168149689610296f3a187c717056ce0786cc125a31caf28056737e9ba1cc1"
-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"
-github_attestations = "unavailable"
-
-[[tools."github:webassembly/binaryen"]]
-version = "version_124"
-backend = "github:webassembly/binaryen"
-
-[tools."github:webassembly/binaryen"."platforms.linux-arm64"]
-checksum = "sha256:6291bd9a57d8e046f3bc099a4db386c147433a87f71c783a901c5b1792e38de3"
-url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-aarch64-linux.tar.gz"
-url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288927659"
-github_attestations = "unavailable"
-
-[tools."github:webassembly/binaryen"."platforms.linux-arm64-musl"]
-checksum = "sha256:6291bd9a57d8e046f3bc099a4db386c147433a87f71c783a901c5b1792e38de3"
-url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-aarch64-linux.tar.gz"
-url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288927659"
-github_attestations = "unavailable"
-
-[tools."github:webassembly/binaryen"."platforms.linux-x64"]
-checksum = "sha256:0290c3779fedf592b8da0ded3032ff55c41a2b7bfa2d6bf7b7bac6f0e6e28963"
-url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-linux.tar.gz"
-url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926769"
-github_attestations = "unavailable"
-
-[tools."github:webassembly/binaryen"."platforms.linux-x64-musl"]
-checksum = "sha256:0290c3779fedf592b8da0ded3032ff55c41a2b7bfa2d6bf7b7bac6f0e6e28963"
-url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-linux.tar.gz"
-url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926769"
-github_attestations = "unavailable"
-
-[tools."github:webassembly/binaryen"."platforms.macos-arm64"]
-checksum = "sha256:86a2c960ff62c6d2ea6009d1f89745c22c70100d394a095eab45eb941bdaa24c"
-url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-arm64-macos.tar.gz"
-url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926134"
-github_attestations = "unavailable"
-
-[tools."github:webassembly/binaryen"."platforms.macos-x64"]
-checksum = "sha256:b389bb0731758d86c3cb266d01d28a12725c23bd3cabc3df34faa162af0887e9"
-url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-macos.tar.gz"
-url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926135"
-github_attestations = "unavailable"
-
-[tools."github:webassembly/binaryen"."platforms.windows-x64"]
-checksum = "sha256:b5e1d2a1ad3c03229ddc89823848f4a1c11f9c6402a51fa26f0aaa5f1d7a2203"
-url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-windows.tar.gz"
-url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288925833"
-github_attestations = "unavailable"
-
-[[tools.java]]
-version = "21.0.2"
-backend = "core:java"
-
-[tools.java."platforms.linux-arm64"]
-checksum = "sha256:08db1392a48d4eb5ea5315cf8f18b89dbaf36cda663ba882cf03c704c9257ec2"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-aarch64_bin.tar.gz"
-
-[tools.java."platforms.linux-x64"]
-checksum = "sha256:a2def047a73941e01a73739f92755f86b895811afb1f91243db214cff5bdac3f"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz"
-
-[tools.java."platforms.macos-arm64"]
-checksum = "sha256:b3d588e16ec1e0ef9805d8a696591bd518a5cea62567da8f53b5ce32d11d22e4"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-aarch64_bin.tar.gz"
-
-[tools.java."platforms.macos-x64"]
-checksum = "sha256:8fd09e15dc406387a0aba70bf5d99692874e999bf9cd9208b452b5d76ac922d3"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-x64_bin.tar.gz"
-
-[tools.java."platforms.windows-x64"]
-checksum = "sha256:b6c17e747ae78cdd6de4d7532b3164b277daee97c007d3eaa2b39cca99882664"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip"
-
-[[tools.node]]
-version = "24.15.0"
-backend = "core:node"
-
-[tools.node."platforms.linux-arm64"]
-checksum = "sha256:73afc234d558c24919875f51c2d1ea002a2ada4ea6f83601a383869fefa64eed"
-url = "https://nodejs.org/dist/v24.15.0/node-v24.15.0-linux-arm64.tar.gz"
-
-[tools.node."platforms.linux-arm64-musl"]
-checksum = "sha256:31e98aa960a067da91edffd5d93bc46657b5d2a8029612c359f5f2ac0060152a"
-url = "https://unofficial-builds.nodejs.org/download/release/v24.15.0/node-v24.15.0-linux-arm64-musl.tar.gz"
-
-[tools.node."platforms.linux-x64"]
-checksum = "sha256:44836872d9aec49f1e6b52a9a922872db9a2b02d235a616a5681b6a85fec8d89"
-url = "https://nodejs.org/dist/v24.15.0/node-v24.15.0-linux-x64.tar.gz"
-
-[tools.node."platforms.linux-x64-musl"]
-checksum = "sha256:f55af5bd489c5347b113ca6594cae00a54b30ba57ac5875324311bfc6f4762e3"
-url = "https://unofficial-builds.nodejs.org/download/release/v24.15.0/node-v24.15.0-linux-x64-musl.tar.gz"
-
-[tools.node."platforms.macos-arm64"]
-checksum = "sha256:372331b969779ab5d15b949884fc6eaf88d5afe87bde8ba881d6400b9100ffc4"
-url = "https://nodejs.org/dist/v24.15.0/node-v24.15.0-darwin-arm64.tar.gz"
-
-[tools.node."platforms.macos-x64"]
-checksum = "sha256:ffd5ee293467927f3ee731a553eb88fd1f48cf74eebc2d74a6babe4af228673b"
-url = "https://nodejs.org/dist/v24.15.0/node-v24.15.0-darwin-x64.tar.gz"
-
-[tools.node."platforms.windows-x64"]
-checksum = "sha256:cc5149eabd53779ce1e7bdc5401643622d0c7e6800ade18928a767e940bb0e62"
-url = "https://nodejs.org/dist/v24.15.0/node-v24.15.0-win-x64.zip"
-
-[[tools."npm:oazapfts"]]
-version = "7.5.0"
-backend = "npm:oazapfts"
-
-[[tools.opentofu]]
-version = "1.11.6"
-backend = "aqua:opentofu/opentofu"
-
-[tools.opentofu."platforms.linux-arm64"]
-checksum = "sha256:d4f2ab15776925864b049bb329d69682851de6f5204f256e9fa86d07a0308850"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_arm64.tar.gz"
-
-[tools.opentofu."platforms.linux-arm64-musl"]
-checksum = "sha256:d4f2ab15776925864b049bb329d69682851de6f5204f256e9fa86d07a0308850"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_arm64.tar.gz"
-
-[tools.opentofu."platforms.linux-x64"]
-checksum = "sha256:02800fafa2753a9f50c38483e2fdf5bc353fd62895eb9e25eec9a5145df3a69e"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_amd64.tar.gz"
-
-[tools.opentofu."platforms.linux-x64-musl"]
-checksum = "sha256:02800fafa2753a9f50c38483e2fdf5bc353fd62895eb9e25eec9a5145df3a69e"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_amd64.tar.gz"
-
-[tools.opentofu."platforms.macos-arm64"]
-checksum = "sha256:62d7fa8539e13b444827aa0a3b90c5972da5c47e8f8882d9dcf2e430e78840c1"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_darwin_arm64.tar.gz"
-
-[tools.opentofu."platforms.macos-x64"]
-checksum = "sha256:1408cdef1c380f914565e6b4bb70794c6b163f195fcb233357f3d6c5745906b6"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_darwin_amd64.tar.gz"
-
-[tools.opentofu."platforms.windows-x64"]
-checksum = "sha256:27323f70c875b8251bfd7e61a4cffc3ebff4e56ed1e611b955016f0c7077367e"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_windows_amd64.tar.gz"
-
-[[tools.pnpm]]
-version = "10.33.1"
-backend = "aqua:pnpm/pnpm"
-
-[tools.pnpm."platforms.linux-arm64"]
-checksum = "sha256:ed8aa7901cf325f4cf5019405bdd6bf988426e4b23d08fe9b12ea4df7046f23e"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-arm64"
-
-[tools.pnpm."platforms.linux-arm64-musl"]
-checksum = "sha256:ed8aa7901cf325f4cf5019405bdd6bf988426e4b23d08fe9b12ea4df7046f23e"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-arm64"
-
-[tools.pnpm."platforms.linux-x64"]
-checksum = "sha256:fba950842532edd365e949b74643b64e6311089a45532dbe1e8f909a247fe3e9"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-x64"
-
-[tools.pnpm."platforms.linux-x64-musl"]
-checksum = "sha256:fba950842532edd365e949b74643b64e6311089a45532dbe1e8f909a247fe3e9"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-x64"
-
-[tools.pnpm."platforms.macos-arm64"]
-checksum = "sha256:909ced0038b00881d4d620ba2018c5d9691de373deea8e3c84b722b44324e47c"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-macos-arm64"
-
-[tools.pnpm."platforms.macos-x64"]
-checksum = "sha256:afdad60b83f4f482f4c95cc79325f29aef776d0922a324f023a312f40e0cc7d3"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-macos-x64"
-
-[tools.pnpm."platforms.windows-x64"]
-checksum = "sha256:67b23fd8c6800566b1cc04c446b170ff6e7977250084e4d8df9bfdbd8e6f4d02"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-win-x64.exe"
-
-[[tools.terragrunt]]
-version = "1.0.3"
-backend = "aqua:gruntwork-io/terragrunt"
-
-[tools.terragrunt."platforms.linux-arm64"]
-checksum = "sha256:e5b60ab05b5214db694e6bc215d8124fb626e277cdb56b86f6147ae110d510fe"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_arm64.tar.gz"
-
-[tools.terragrunt."platforms.linux-arm64-musl"]
-checksum = "sha256:e5b60ab05b5214db694e6bc215d8124fb626e277cdb56b86f6147ae110d510fe"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_arm64.tar.gz"
-
-[tools.terragrunt."platforms.linux-x64"]
-checksum = "sha256:6d48049baf82e0bf9c804368dc85cbfeadc10955e33777e9e8de3e020b94b073"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_amd64.tar.gz"
-
-[tools.terragrunt."platforms.linux-x64-musl"]
-checksum = "sha256:6d48049baf82e0bf9c804368dc85cbfeadc10955e33777e9e8de3e020b94b073"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_amd64.tar.gz"
-
-[tools.terragrunt."platforms.macos-arm64"]
-checksum = "sha256:aacb5be2ca5475300cbce246dfbd8a45eb47510fbaa70fab8561c49ef5db03aa"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_darwin_arm64.tar.gz"
-
-[tools.terragrunt."platforms.macos-x64"]
-checksum = "sha256:3133c2251e191aede8e3dd2a5b3aee2e91c5f08f88f117aee40eed9a24c8ef6b"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_darwin_amd64.tar.gz"
-
-[tools.terragrunt."platforms.windows-x64"]
-checksum = "sha256:183b2745b4e04980a6bfa4450ff81956a12596ca22d70f7aaa793980f5b036db"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_windows_amd64.exe.tar.gz"
@@ -2,7 +2,7 @@ experimental_monorepo_root = true

 [monorepo]
 config_roots = [
-  "packages/plugin-core",
+  "packages/plugins",
  "server",
  "packages/cli",
  "deployment",
@@ -16,28 +16,18 @@ config_roots = [

 [tools]
 node = "24.15.0"
-"aqua:flutter/flutter" = "3.41.9"
+flutter = "3.41.9"
 pnpm = "10.33.1"
 terragrunt = "1.0.3"
 opentofu = "1.11.6"
 java = "21.0.2"
 "npm:oazapfts" = "7.5.0"
-"github:extism/cli" = "1.6.3"
-"github:webassembly/binaryen" = "version_124"
-"github:extism/js-pdk" = "1.6.0"

 [tools."github:CQLabs/homebrew-dcm"]
 version = "1.37.0"
 bin = "dcm"
 postinstall = "chmod +x \"$MISE_TOOL_INSTALL_PATH/dcm\" || true"

-[tools."github:CQLabs/homebrew-dcm".platforms]
-linux-x64 = { asset_pattern = "dcm-linux-x64-release.zip" }
-linux-arm64 = { asset_pattern = "dcm-linux-arm-release.zip" }
-macos-x64 = { asset_pattern = "dcm-macos-x64-release.zip" }
-macos-arm64 = { asset_pattern = "dcm-macos-arm-release.zip" }
-windows-x64 = { asset_pattern = "dcm-windows-release.zip" }
-
 [tools."github:jellyfin/jellyfin-ffmpeg"]
 version = "7.1.3-6"

@@ -50,13 +40,6 @@ macos-arm64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_macarm64-gpl.tar.xz"
 [settings]
 experimental = true
 pin = true
-lockfile = true
-
-[tasks.plugins]
-run = [
-  "pnpm --filter @immich/plugin-sdk --filter @immich/plugin-core install --frozen-lockfile",
-  "pnpm --filter @immich/plugin-sdk --filter @immich/plugin-core build",
-]

 [tasks.open-api-typescript]
 run = [
@@ -72,13 +55,11 @@ run = "bash ./bin/generate-dart-sdk.sh"
 [tasks.open-api]
 env = { SHARP_IGNORE_GLOBAL_LIBVIPS = true }
 run = [
-  { task = "//:plugins" },
-  { task = "//server:build" },
  { task = "//server:install" },
  { task = "//server:build" },
  { task = "//server:sync-open-api" },
-  { task = ":open-api-typescript" },
-  { task = ":open-api-dart" },
+  { task = ":open-api-typescript"},
+  { task = ":open-api-dart"},
 ]

 [tasks.sql]
@@ -89,13 +89,6 @@ flutter {
 }

 dependencies {
-  constraints {
-    implementation("androidx.glance:glance-appwidget") {
-      version { strictly libs.versions.glance.get() }
-      because 'home_widget requests 1.+ which can resolve to pre-releases incompatible with our compileSdk/AGP'
-    }
-  }
-
  implementation libs.okhttp
  implementation libs.cronet.embedded
  implementation libs.media3.datasource.okhttp
@@ -23,8 +23,6 @@ import java.io.IOException
 import java.nio.ByteBuffer
 import java.util.concurrent.ConcurrentHashMap

-private const val MAX_PREALLOC_BYTES = 128 * 1024 * 1024
-
 private class RemoteRequest(val cancellationSignal: CancellationSignal)

 class RemoteImagesImpl(context: Context) : RemoteImageApi {
@@ -230,6 +228,7 @@ private class CronetImageFetcher : ImageFetcher {
    private val onComplete: () -> Unit,
  ) : UrlRequest.Callback() {
    private var buffer: NativeByteBuffer? = null
+    private var wrapped: ByteBuffer? = null
    private var error: Exception? = null

    override fun onRedirectReceived(request: UrlRequest, info: UrlResponseInfo, newUrl: String) {
@@ -243,16 +242,15 @@ private class CronetImageFetcher : ImageFetcher {
      }

      try {
-        // Content-Length is a size hint only. With Content-Encoding (gzip/br/...),
-        // Cronet auto-decompresses and writes decompressed bytes to our buffer, which
-        // may exceed the wire/compressed Content-Length. Always use the growable
-        // buffer path so we can't overflow.
        val contentLength = info.allHeaders["content-length"]?.firstOrNull()?.toIntOrNull() ?: 0
-        // Cap the up-front alloc: Content-Length is untrusted and can be huge or near
-        // Int.MAX_VALUE (overflowing `+1`). For larger responses the grow path takes over.
-        val initialSize = if (contentLength in 1..MAX_PREALLOC_BYTES) contentLength + 1 else INITIAL_BUFFER_SIZE
-        buffer = NativeByteBuffer(initialSize)
-        request.read(buffer!!.wrapRemaining())
+        if (contentLength > 0) {
+          buffer = NativeByteBuffer(contentLength + 1)
+          wrapped = NativeBuffer.wrap(buffer!!.pointer, contentLength + 1)
+          request.read(wrapped)
+        } else {
+          buffer = NativeByteBuffer(INITIAL_BUFFER_SIZE)
+          request.read(buffer!!.wrapRemaining())
+        }
      } catch (e: Exception) {
        error = e
        return request.cancel()
@@ -265,14 +263,14 @@ private class CronetImageFetcher : ImageFetcher {
      byteBuffer: ByteBuffer
    ) {
      try {
-        // Always pass a fresh wrap so byteBuffer.position() represents only the
-        // bytes Cronet wrote in this iteration. Reusing the caller-supplied
-        // ByteBuffer breaks advance(): Cronet's position keeps accumulating
-        // across reads, which would double-count previous iterations' bytes.
-        val buf = buffer!!.run {
-          advance(byteBuffer.position())
-          ensureHeadroom()
-          wrapRemaining()
+        val buf = if (wrapped == null) {
+          buffer!!.run {
+            advance(byteBuffer.position())
+            ensureHeadroom()
+            wrapRemaining()
+          }
+        } else {
+          wrapped
        }
        request.read(buf)
      } catch (e: Exception) {
@@ -282,6 +280,7 @@ private class CronetImageFetcher : ImageFetcher {
    }

    override fun onSucceeded(request: UrlRequest, info: UrlResponseInfo) {
+      wrapped?.let { buffer!!.advance(it.position()) }
      onSuccess(buffer!!)
      onComplete()
    }
@@ -207,18 +207,6 @@ enum class PlatformAssetPlaybackStyle(val raw: Int) {
  }
 }

-enum class EditState(val raw: Int) {
-  NOT_EDITED(0),
-  EDITED(1),
-  UNKNOWN(2);
-
-  companion object {
-    fun ofRaw(raw: Int): EditState? {
-      return values().firstOrNull { it.raw == raw }
-    }
-  }
-}
-
 /** Generated class from Pigeon that represents data sent in messages. */
 data class PlatformAsset (
  val id: String,
@@ -484,52 +472,6 @@ data class CloudIdResult (
    return result
  }
 }
-
-/** Generated class from Pigeon that represents data sent in messages. */
-data class BaseResource (
-  val path: String,
-  val sha1: String,
-  val sizeBytes: Long,
-  val mimeType: String
-)
- {
-  companion object {
-    fun fromList(pigeonVar_list: List<Any?>): BaseResource {
-      val path = pigeonVar_list[0] as String
-      val sha1 = pigeonVar_list[1] as String
-      val sizeBytes = pigeonVar_list[2] as Long
-      val mimeType = pigeonVar_list[3] as String
-      return BaseResource(path, sha1, sizeBytes, mimeType)
-    }
-  }
-  fun toList(): List<Any?> {
-    return listOf(
-      path,
-      sha1,
-      sizeBytes,
-      mimeType,
-    )
-  }
-  override fun equals(other: Any?): Boolean {
-    if (other == null || other.javaClass != javaClass) {
-      return false
-    }
-    if (this === other) {
-      return true
-    }
-    val other = other as BaseResource
-    return MessagesPigeonUtils.deepEquals(this.path, other.path) && MessagesPigeonUtils.deepEquals(this.sha1, other.sha1) && MessagesPigeonUtils.deepEquals(this.sizeBytes, other.sizeBytes) && MessagesPigeonUtils.deepEquals(this.mimeType, other.mimeType)
-  }
-
-  override fun hashCode(): Int {
-    var result = javaClass.hashCode()
-    result = 31 * result + MessagesPigeonUtils.deepHash(this.path)
-    result = 31 * result + MessagesPigeonUtils.deepHash(this.sha1)
-    result = 31 * result + MessagesPigeonUtils.deepHash(this.sizeBytes)
-    result = 31 * result + MessagesPigeonUtils.deepHash(this.mimeType)
-    return result
-  }
-}
 private open class MessagesPigeonCodec : StandardMessageCodec() {
  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
    return when (type) {
@@ -539,40 +481,30 @@ private open class MessagesPigeonCodec : StandardMessageCodec() {
        }
      }
      130.toByte() -> {
-        return (readValue(buffer) as Long?)?.let {
-          EditState.ofRaw(it.toInt())
-        }
-      }
-      131.toByte() -> {
        return (readValue(buffer) as? List<Any?>)?.let {
          PlatformAsset.fromList(it)
        }
      }
-      132.toByte() -> {
+      131.toByte() -> {
        return (readValue(buffer) as? List<Any?>)?.let {
          PlatformAlbum.fromList(it)
        }
      }
-      133.toByte() -> {
+      132.toByte() -> {
        return (readValue(buffer) as? List<Any?>)?.let {
          SyncDelta.fromList(it)
        }
      }
-      134.toByte() -> {
+      133.toByte() -> {
        return (readValue(buffer) as? List<Any?>)?.let {
          HashResult.fromList(it)
        }
      }
-      135.toByte() -> {
+      134.toByte() -> {
        return (readValue(buffer) as? List<Any?>)?.let {
          CloudIdResult.fromList(it)
        }
      }
-      136.toByte() -> {
-        return (readValue(buffer) as? List<Any?>)?.let {
-          BaseResource.fromList(it)
-        }
-      }
      else -> super.readValueOfType(type, buffer)
    }
  }
@@ -582,32 +514,24 @@ private open class MessagesPigeonCodec : StandardMessageCodec() {
        stream.write(129)
        writeValue(stream, value.raw.toLong())
      }
-      is EditState -> {
-        stream.write(130)
-        writeValue(stream, value.raw.toLong())
-      }
      is PlatformAsset -> {
-        stream.write(131)
+        stream.write(130)
        writeValue(stream, value.toList())
      }
      is PlatformAlbum -> {
-        stream.write(132)
+        stream.write(131)
        writeValue(stream, value.toList())
      }
      is SyncDelta -> {
-        stream.write(133)
+        stream.write(132)
        writeValue(stream, value.toList())
      }
      is HashResult -> {
-        stream.write(134)
+        stream.write(133)
        writeValue(stream, value.toList())
      }
      is CloudIdResult -> {
-        stream.write(135)
-        writeValue(stream, value.toList())
-      }
-      is BaseResource -> {
-        stream.write(136)
+        stream.write(134)
        writeValue(stream, value.toList())
      }
      else -> super.writeValue(stream, value)
@@ -630,8 +554,6 @@ interface NativeSyncApi {
  fun cancelHashing()
  fun getTrashedAssets(): Map<String, List<PlatformAsset>>
  fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult>
-  fun getBaseResource(assetId: String, allowNetworkAccess: Boolean, callback: (Result<BaseResource?>) -> Unit)
-  fun getEditState(assetId: String, allowNetworkAccess: Boolean, callback: (Result<EditState>) -> Unit)

  companion object {
    /** The codec used by NativeSyncApi. */
@@ -842,48 +764,6 @@ interface NativeSyncApi {
          channel.setMessageHandler(null)
        }
      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getBaseResource$separatedMessageChannelSuffix", codec, taskQueue)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val assetIdArg = args[0] as String
-            val allowNetworkAccessArg = args[1] as Boolean
-            api.getBaseResource(assetIdArg, allowNetworkAccessArg) { result: Result<BaseResource?> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(MessagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(MessagesPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getEditState$separatedMessageChannelSuffix", codec, taskQueue)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val assetIdArg = args[0] as String
-            val allowNetworkAccessArg = args[1] as Boolean
-            api.getEditState(assetIdArg, allowNetworkAccessArg) { result: Result<EditState> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(MessagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(MessagesPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
    }
  }
 }
@@ -453,14 +453,4 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
  fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult> {
    return emptyList()
  }
-
-  // Android has no Photos-style edit original to stack; iOS-only.
-  fun getBaseResource(assetId: String, allowNetworkAccess: Boolean, callback: (Result<BaseResource?>) -> Unit) {
-    callback(Result.success(null))
-  }
-
-  // iOS-only; Android assets never carry a Photos-style edit.
-  fun getEditState(assetId: String, allowNetworkAccess: Boolean, callback: (Result<EditState>) -> Unit) {
-    callback(Result.success(EditState.NOT_EDITED))
-  }
 }
@@ -183,12 +183,6 @@ enum PlatformAssetPlaybackStyle: Int {
  case videoLooping = 5
 }

-enum EditState: Int {
-  case notEdited = 0
-  case edited = 1
-  case unknown = 2
-}
-
 /// Generated class from Pigeon that represents data sent in messages.
 struct PlatformAsset: Hashable {
  var id: String
@@ -464,52 +458,6 @@ struct CloudIdResult: Hashable {
  }
 }

-/// Generated class from Pigeon that represents data sent in messages.
-struct BaseResource: Hashable {
-  var path: String
-  var sha1: String
-  var sizeBytes: Int64
-  var mimeType: String
-
-
-  // swift-format-ignore: AlwaysUseLowerCamelCase
-  static func fromList(_ pigeonVar_list: [Any?]) -> BaseResource? {
-    let path = pigeonVar_list[0] as! String
-    let sha1 = pigeonVar_list[1] as! String
-    let sizeBytes = pigeonVar_list[2] as! Int64
-    let mimeType = pigeonVar_list[3] as! String
-
-    return BaseResource(
-      path: path,
-      sha1: sha1,
-      sizeBytes: sizeBytes,
-      mimeType: mimeType
-    )
-  }
-  func toList() -> [Any?] {
-    return [
-      path,
-      sha1,
-      sizeBytes,
-      mimeType,
-    ]
-  }
-  static func == (lhs: BaseResource, rhs: BaseResource) -> Bool {
-    if Swift.type(of: lhs) != Swift.type(of: rhs) {
-      return false
-    }
-    return deepEqualsMessages(lhs.path, rhs.path) && deepEqualsMessages(lhs.sha1, rhs.sha1) && deepEqualsMessages(lhs.sizeBytes, rhs.sizeBytes) && deepEqualsMessages(lhs.mimeType, rhs.mimeType)
-  }
-
-  func hash(into hasher: inout Hasher) {
-    hasher.combine("BaseResource")
-    deepHashMessages(value: path, hasher: &hasher)
-    deepHashMessages(value: sha1, hasher: &hasher)
-    deepHashMessages(value: sizeBytes, hasher: &hasher)
-    deepHashMessages(value: mimeType, hasher: &hasher)
-  }
-}
-
 private class MessagesPigeonCodecReader: FlutterStandardReader {
  override func readValue(ofType type: UInt8) -> Any? {
    switch type {
@@ -520,23 +468,15 @@ private class MessagesPigeonCodecReader: FlutterStandardReader {
      }
      return nil
    case 130:
-      let enumResultAsInt: Int? = nilOrValue(self.readValue() as! Int?)
-      if let enumResultAsInt = enumResultAsInt {
-        return EditState(rawValue: enumResultAsInt)
-      }
-      return nil
-    case 131:
      return PlatformAsset.fromList(self.readValue() as! [Any?])
-    case 132:
+    case 131:
      return PlatformAlbum.fromList(self.readValue() as! [Any?])
-    case 133:
+    case 132:
      return SyncDelta.fromList(self.readValue() as! [Any?])
-    case 134:
+    case 133:
      return HashResult.fromList(self.readValue() as! [Any?])
-    case 135:
+    case 134:
      return CloudIdResult.fromList(self.readValue() as! [Any?])
-    case 136:
-      return BaseResource.fromList(self.readValue() as! [Any?])
    default:
      return super.readValue(ofType: type)
    }
@@ -548,26 +488,20 @@ private class MessagesPigeonCodecWriter: FlutterStandardWriter {
    if let value = value as? PlatformAssetPlaybackStyle {
      super.writeByte(129)
      super.writeValue(value.rawValue)
-    } else if let value = value as? EditState {
-      super.writeByte(130)
-      super.writeValue(value.rawValue)
    } else if let value = value as? PlatformAsset {
-      super.writeByte(131)
+      super.writeByte(130)
      super.writeValue(value.toList())
    } else if let value = value as? PlatformAlbum {
-      super.writeByte(132)
+      super.writeByte(131)
      super.writeValue(value.toList())
    } else if let value = value as? SyncDelta {
-      super.writeByte(133)
+      super.writeByte(132)
      super.writeValue(value.toList())
    } else if let value = value as? HashResult {
-      super.writeByte(134)
+      super.writeByte(133)
      super.writeValue(value.toList())
    } else if let value = value as? CloudIdResult {
-      super.writeByte(135)
-      super.writeValue(value.toList())
-    } else if let value = value as? BaseResource {
-      super.writeByte(136)
+      super.writeByte(134)
      super.writeValue(value.toList())
    } else {
      super.writeValue(value)
@@ -604,8 +538,6 @@ protocol NativeSyncApi {
  func cancelHashing() throws
  func getTrashedAssets() throws -> [String: [PlatformAsset]]
  func getCloudIdForAssetIds(assetIds: [String]) throws -> [CloudIdResult]
-  func getBaseResource(assetId: String, allowNetworkAccess: Bool, completion: @escaping (Result<BaseResource?, Error>) -> Void)
-  func getEditState(assetId: String, allowNetworkAccess: Bool, completion: @escaping (Result<EditState, Error>) -> Void)
 }

 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
@@ -806,45 +738,5 @@ class NativeSyncApiSetup {
    } else {
      getCloudIdForAssetIdsChannel.setMessageHandler(nil)
    }
-    let getBaseResourceChannel = taskQueue == nil
-      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getBaseResource\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getBaseResource\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
-    if let api = api {
-      getBaseResourceChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let assetIdArg = args[0] as! String
-        let allowNetworkAccessArg = args[1] as! Bool
-        api.getBaseResource(assetId: assetIdArg, allowNetworkAccess: allowNetworkAccessArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      getBaseResourceChannel.setMessageHandler(nil)
-    }
-    let getEditStateChannel = taskQueue == nil
-      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getEditState\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getEditState\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
-    if let api = api {
-      getEditStateChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let assetIdArg = args[0] as! String
-        let allowNetworkAccessArg = args[1] as! Bool
-        api.getEditState(assetId: assetIdArg, allowNetworkAccess: allowNetworkAccessArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      getEditStateChannel.setMessageHandler(nil)
-    }
  }
 }
@@ -1,6 +1,5 @@
 import Photos
 import CryptoKit
-import UniformTypeIdentifiers

 struct AssetWrapper: Hashable, Equatable {
  let asset: PlatformAsset
@@ -111,7 +110,7 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
        
        var domainAlbum = PlatformAlbum(
          id: album.localIdentifier,
-          name: album.localizedTitle ?? album.localIdentifier,
+          name: album.localizedTitle!,
          updatedAt: nil,
          isCloud: isCloud,
          assetCount: Int64(assets.count)
@@ -416,135 +415,4 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
    }
    return mappings;
  }
-
-  func getBaseResource(
-    assetId: String,
-    allowNetworkAccess: Bool,
-    completion: @escaping (Result<BaseResource?, Error>) -> Void
-  ) {
-    Task { [weak self] in
-      guard let self = self else { return }
-
-      guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [assetId], options: nil).firstObject else {
-        return self.completeWhenActive(for: completion, with: .success(nil))
-      }
-
-      let resources = PHAssetResource.assetResources(for: asset)
-      let state = await Self.classifyEdit(resources: resources, allowNetworkAccess: allowNetworkAccess)
-      guard state == .edited, let original = resources.first(where: { $0.type == .photo }) else {
-        return self.completeWhenActive(for: completion, with: .success(nil))
-      }
-
-      do {
-        let result = try await self.streamBaseResource(
-          resource: original,
-          localId: asset.localIdentifier,
-          allowNetworkAccess: allowNetworkAccess
-        )
-        self.completeWhenActive(for: completion, with: .success(result))
-      } catch {
-        self.completeWhenActive(for: completion, with: .failure(error))
-      }
-    }
-  }
-
-  // Returns whether the asset carries a live Photos edit without reading the photo
-  // itself, only the small adjustment metadata. The revert probe relies on this to
-  // tell "not edited" apart from "couldn't read" (offloaded to iCloud), so it never
-  // mistakes an unreadable edit for a revert.
-  func getEditState(
-    assetId: String,
-    allowNetworkAccess: Bool,
-    completion: @escaping (Result<EditState, Error>) -> Void
-  ) {
-    Task { [weak self] in
-      guard let self = self else { return }
-      guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [assetId], options: nil).firstObject else {
-        // Not in the library — don't let the caller act on a "not edited" answer.
-        return self.completeWhenActive(for: completion, with: .success(.unknown))
-      }
-      let state = await Self.classifyEdit(
-        resources: PHAssetResource.assetResources(for: asset),
-        allowNetworkAccess: allowNetworkAccess
-      )
-      self.completeWhenActive(for: completion, with: .success(state))
-    }
-  }
-
-  // adjustmentRenderTypes value of a photo with no live user edit — a plain
-  // capture (incl. Photographic Style) or a reverted edit. Any real edit moves it.
-  private static let kNoEditRenderTypes = 27648
-
-  // Classifies an asset's edit state from its Adjustments.plist, reading only the
-  // adjustment metadata (not the photo). A Photos edit is authored by
-  // com.apple.mobileslideshow (or a third-party editor) and moves the render
-  // pipeline off the no-edit baseline; a capture (including a Photographic Style)
-  // is authored by com.apple.camera, and a revert keeps the Photos editor id but
-  // restores the baseline render types — so requiring both excludes reverts.
-  // Cleanup/object-removal stays camera-attributed but writes
-  // AdjustmentsSecondary.data, the fallback. `.unknown` = the adjustment data
-  // couldn't be read (e.g. offloaded with network disallowed).
-  private static func classifyEdit(resources: [PHAssetResource], allowNetworkAccess: Bool) async -> EditState {
-    if resources.contains(where: { $0.originalFilename == "AdjustmentsSecondary.data" }) {
-      return .edited
-    }
-    guard let adjRes = resources.first(where: { $0.originalFilename == "Adjustments.plist" }) else {
-      return .notEdited
-    }
-    guard let buf = await collectResourceData(adjRes, allowNetworkAccess: allowNetworkAccess),
-      let plist = try? PropertyListSerialization.propertyList(from: buf, options: [], format: nil) as? [String: Any]
-    else {
-      return .unknown
-    }
-    let editor = plist["adjustmentEditorBundleID"] as? String
-    let renderTypes = (plist["adjustmentRenderTypes"] as? NSNumber)?.intValue
-    let isUserEdit = editor != nil && editor != "com.apple.camera" && renderTypes != kNoEditRenderTypes
-    return isUserEdit ? .edited : .notEdited
-  }
-
-  private func streamBaseResource(
-    resource: PHAssetResource,
-    localId: String,
-    allowNetworkAccess: Bool
-  ) async throws -> BaseResource {
-    guard let data = await Self.collectResourceData(resource, allowNetworkAccess: allowNetworkAccess) else {
-      throw NSError(
-        domain: "NativeSyncApi",
-        code: -1,
-        userInfo: [NSLocalizedDescriptionKey: "Failed to read base resource for \(localId)"]
-      )
-    }
-
-    let safeId = localId.replacingOccurrences(of: "/", with: "_")
-    let suffix = UTType(resource.uniformTypeIdentifier)?.preferredFilenameExtension ?? "bin"
-    let tempDir = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
-      .appendingPathComponent("immich_base", isDirectory: true)
-    try FileManager.default.createDirectory(at: tempDir, withIntermediateDirectories: true)
-
-    let unique = UUID().uuidString.prefix(8)
-    let tempUrl = tempDir.appendingPathComponent("\(safeId)_\(unique)_base.\(suffix)")
-    try data.write(to: tempUrl, options: .atomic)
-
-    let sha1 = Data(Insecure.SHA1.hash(data: data)).base64EncodedString()
-    let mime = UTType(resource.uniformTypeIdentifier)?.preferredMIMEType ?? "application/octet-stream"
-    return BaseResource(path: tempUrl.path, sha1: sha1, sizeBytes: Int64(data.count), mimeType: mime)
-  }
-
-  private static func collectResourceData(
-    _ resource: PHAssetResource,
-    allowNetworkAccess: Bool
-  ) async -> Data? {
-    let options = PHAssetResourceRequestOptions()
-    options.isNetworkAccessAllowed = allowNetworkAccess
-    var buffer = Data()
-    return await withCheckedContinuation { (continuation: CheckedContinuation<Data?, Never>) in
-      PHAssetResourceManager.default().requestData(
-        for: resource,
-        options: options,
-        dataReceivedHandler: { data in buffer.append(data) },
-        completionHandler: { error in continuation.resume(returning: error == nil ? buffer : nil) }
-      )
-    }
-  }
-
 }
@@ -20,7 +20,6 @@ const String kSecuredPinCode = "secured_pin_code";
 const String kManualUploadGroup = 'manual_upload_group';
 const String kBackupGroup = 'backup_group';
 const String kBackupLivePhotoGroup = 'backup_live_photo_group';
-const String kBackupEditPairGroup = 'backup_edit_pair_group';
 const String kDownloadGroupImage = 'group_image';
 const String kDownloadGroupVideo = 'group_video';
 const String kDownloadGroupLivePhoto = 'group_livephoto';
@@ -18,7 +18,3 @@ enum CleanupStep { selectDate, scan, delete }
 enum AssetKeepType { none, photosOnly, videosOnly }

 enum AssetDateAggregation { start, end }
-
-enum SlideshowLook { contain, cover, blurredBackground }
-
-enum SlideshowDirection { forward, backward, shuffle }
@@ -12,13 +12,6 @@ class LocalAsset extends BaseAsset {
  final double? latitude;
  final double? longitude;

-  // Remote id of this asset's previous upload; used to stack a new edit under it.
-  final String? priorRemoteId;
-
-  // Local checksum at the last sync action; lets backup skip an already-handled
-  // local whose current render hashes fresh (the iOS revert case).
-  final String? syncedChecksum;
-
  const LocalAsset({
    required this.id,
    String? remoteId,
@@ -39,8 +32,6 @@ class LocalAsset extends BaseAsset {
    this.latitude,
    this.longitude,
    required super.isEdited,
-    this.priorRemoteId,
-    this.syncedChecksum,
  }) : remoteAssetId = remoteId;

  @override
@@ -129,8 +120,6 @@ class LocalAsset extends BaseAsset {
    double? latitude,
    double? longitude,
    bool? isEdited,
-    String? priorRemoteId,
-    String? syncedChecksum,
  }) {
    return LocalAsset(
      id: id ?? this.id,
@@ -151,8 +140,6 @@ class LocalAsset extends BaseAsset {
      latitude: latitude ?? this.latitude,
      longitude: longitude ?? this.longitude,
      isEdited: isEdited ?? this.isEdited,
-      priorRemoteId: priorRemoteId ?? this.priorRemoteId,
-      syncedChecksum: syncedChecksum ?? this.syncedChecksum,
    );
  }
 }
@@ -1,26 +0,0 @@
-import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
-
-class AlbumConfig {
-  final AlbumSortMode sortMode;
-  final bool isReverse;
-  final bool isGrid;
-
-  const AlbumConfig({this.sortMode = AlbumSortMode.mostRecent, this.isReverse = true, this.isGrid = false});
-
-  AlbumConfig copyWith({AlbumSortMode? sortMode, bool? isReverse, bool? isGrid}) => AlbumConfig(
-    sortMode: sortMode ?? this.sortMode,
-    isReverse: isReverse ?? this.isReverse,
-    isGrid: isGrid ?? this.isGrid,
-  );
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is AlbumConfig && other.sortMode == sortMode && other.isReverse == isReverse && other.isGrid == isGrid);
-
-  @override
-  int get hashCode => Object.hash(sortMode, isReverse, isGrid);
-
-  @override
-  String toString() => 'AlbumConfig(sortMode: $sortMode, isReverse: $isReverse, isGrid: $isGrid)';
-}
@@ -1,9 +1,6 @@
-import 'package:immich_mobile/domain/models/config/album_config.dart';
-import 'package:immich_mobile/domain/models/config/backup_config.dart';
 import 'package:immich_mobile/domain/models/config/cleanup_config.dart';
 import 'package:immich_mobile/domain/models/config/image_config.dart';
 import 'package:immich_mobile/domain/models/config/map_config.dart';
-import 'package:immich_mobile/domain/models/config/slideshow_config.dart';
 import 'package:immich_mobile/domain/models/config/theme_config.dart';
 import 'package:immich_mobile/domain/models/config/timeline_config.dart';
 import 'package:immich_mobile/domain/models/config/viewer_config.dart';
@@ -15,9 +12,6 @@ class AppConfig {
  final TimelineConfig timeline;
  final ImageConfig image;
  final ViewerConfig viewer;
-  final SlideshowConfig slideshow;
-  final AlbumConfig album;
-  final BackupConfig backup;

  const AppConfig({
    this.theme = const .new(),
@@ -26,9 +20,6 @@ class AppConfig {
    this.timeline = const .new(),
    this.image = const .new(),
    this.viewer = const .new(),
-    this.slideshow = const .new(),
-    this.album = const .new(),
-    this.backup = const .new(),
  });

  AppConfig copyWith({
@@ -38,9 +29,6 @@ class AppConfig {
    TimelineConfig? timeline,
    ImageConfig? image,
    ViewerConfig? viewer,
-    SlideshowConfig? slideshow,
-    AlbumConfig? album,
-    BackupConfig? backup,
  }) => .new(
    theme: theme ?? this.theme,
    cleanup: cleanup ?? this.cleanup,
@@ -48,9 +36,6 @@ class AppConfig {
    timeline: timeline ?? this.timeline,
    image: image ?? this.image,
    viewer: viewer ?? this.viewer,
-    slideshow: slideshow ?? this.slideshow,
-    album: album ?? this.album,
-    backup: backup ?? this.backup,
  );

  @override
@@ -62,15 +47,12 @@ class AppConfig {
          other.map == map &&
          other.timeline == timeline &&
          other.image == image &&
-          other.viewer == viewer &&
-          other.slideshow == slideshow &&
-          other.album == album &&
-          other.backup == backup);
+          other.viewer == viewer);

  @override
-  int get hashCode => Object.hash(theme, cleanup, map, timeline, image, viewer, slideshow, album, backup);
+  int get hashCode => Object.hash(theme, cleanup, map, timeline, image, viewer);

  @override
  String toString() =>
-      'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup)';
+      'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer)';
 }
@@ -1,52 +0,0 @@
-class BackupConfig {
-  final bool enabled;
-  final bool useCellularForVideos;
-  final bool useCellularForPhotos;
-  final bool requireCharging;
-  final int triggerDelay;
-  final bool syncAlbums;
-
-  const BackupConfig({
-    this.enabled = false,
-    this.useCellularForVideos = false,
-    this.useCellularForPhotos = false,
-    this.requireCharging = false,
-    this.triggerDelay = 30,
-    this.syncAlbums = false,
-  });
-
-  BackupConfig copyWith({
-    bool? enabled,
-    bool? useCellularForVideos,
-    bool? useCellularForPhotos,
-    bool? requireCharging,
-    int? triggerDelay,
-    bool? syncAlbums,
-  }) => BackupConfig(
-    enabled: enabled ?? this.enabled,
-    useCellularForVideos: useCellularForVideos ?? this.useCellularForVideos,
-    useCellularForPhotos: useCellularForPhotos ?? this.useCellularForPhotos,
-    requireCharging: requireCharging ?? this.requireCharging,
-    triggerDelay: triggerDelay ?? this.triggerDelay,
-    syncAlbums: syncAlbums ?? this.syncAlbums,
-  );
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is BackupConfig &&
-          other.enabled == enabled &&
-          other.useCellularForVideos == useCellularForVideos &&
-          other.useCellularForPhotos == useCellularForPhotos &&
-          other.requireCharging == requireCharging &&
-          other.triggerDelay == triggerDelay &&
-          other.syncAlbums == syncAlbums);
-
-  @override
-  int get hashCode =>
-      Object.hash(enabled, useCellularForVideos, useCellularForPhotos, requireCharging, triggerDelay, syncAlbums);
-
-  @override
-  String toString() =>
-      'BackupConfig(enabled: $enabled, useCellularForVideos: $useCellularForVideos, useCellularForPhotos: $useCellularForPhotos, requireCharging: $requireCharging, triggerDelay: $triggerDelay, syncAlbums: $syncAlbums)';
-}
@@ -1,54 +0,0 @@
-import 'package:flutter/foundation.dart';
-
-class NetworkConfig {
-  final bool autoEndpointSwitching;
-  final String? preferredWifiName;
-  final String? localEndpoint;
-  final List<String> externalEndpointList;
-  final Map<String, String> customHeaders;
-
-  const NetworkConfig({
-    this.autoEndpointSwitching = false,
-    this.preferredWifiName,
-    this.localEndpoint,
-    this.externalEndpointList = const [],
-    this.customHeaders = const {},
-  });
-
-  NetworkConfig copyWith({
-    bool? autoEndpointSwitching,
-    String? preferredWifiName,
-    String? localEndpoint,
-    List<String>? externalEndpointList,
-    Map<String, String>? customHeaders,
-  }) => NetworkConfig(
-    autoEndpointSwitching: autoEndpointSwitching ?? this.autoEndpointSwitching,
-    preferredWifiName: preferredWifiName ?? this.preferredWifiName,
-    localEndpoint: localEndpoint ?? this.localEndpoint,
-    externalEndpointList: externalEndpointList ?? this.externalEndpointList,
-    customHeaders: customHeaders ?? this.customHeaders,
-  );
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is NetworkConfig &&
-          other.autoEndpointSwitching == autoEndpointSwitching &&
-          other.preferredWifiName == preferredWifiName &&
-          other.localEndpoint == localEndpoint &&
-          listEquals(other.externalEndpointList, externalEndpointList) &&
-          mapEquals(other.customHeaders, customHeaders));
-
-  @override
-  int get hashCode => Object.hash(
-    autoEndpointSwitching,
-    preferredWifiName,
-    localEndpoint,
-    Object.hashAll(externalEndpointList),
-    Object.hashAllUnordered(customHeaders.entries.map((e) => Object.hash(e.key, e.value))),
-  );
-
-  @override
-  String toString() =>
-      'NetworkConfig(autoEndpointSwitching: $autoEndpointSwitching, preferredWifiName: $preferredWifiName, localEndpoint: $localEndpoint, externalEndpointList: $externalEndpointList, customHeaders: $customHeaders)';
-}
@@ -1,48 +0,0 @@
-import 'package:immich_mobile/constants/enums.dart';
-
-class SlideshowConfig {
-  final bool transition;
-  final bool repeat;
-  final int duration;
-  final SlideshowLook look;
-  final SlideshowDirection direction;
-
-  const SlideshowConfig({
-    this.transition = true,
-    this.repeat = true,
-    this.duration = 5,
-    this.look = SlideshowLook.contain,
-    this.direction = SlideshowDirection.forward,
-  });
-
-  SlideshowConfig copyWith({
-    bool? transition,
-    bool? repeat,
-    int? duration,
-    SlideshowLook? look,
-    SlideshowDirection? direction,
-  }) => SlideshowConfig(
-    transition: transition ?? this.transition,
-    repeat: repeat ?? this.repeat,
-    duration: duration ?? this.duration,
-    look: look ?? this.look,
-    direction: direction ?? this.direction,
-  );
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is SlideshowConfig &&
-          other.transition == transition &&
-          other.repeat == repeat &&
-          other.duration == duration &&
-          other.look == look &&
-          other.direction == direction);
-
-  @override
-  int get hashCode => Object.hash(transition, repeat, duration, look, direction);
-
-  @override
-  String toString() =>
-      'SlideshowConfig(transition: $transition, repeat: $repeat, duration: $duration, look: $look, direction: $direction)';
-}
@@ -1,22 +1,18 @@
-import 'package:immich_mobile/domain/models/config/network_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';

 class SystemConfig {
  final LogLevel logLevel;
-  final NetworkConfig network;

-  const SystemConfig({this.logLevel = .info, this.network = const .new()});
+  const SystemConfig({this.logLevel = .info});

-  SystemConfig copyWith({LogLevel? logLevel, NetworkConfig? network}) =>
-      SystemConfig(logLevel: logLevel ?? this.logLevel, network: network ?? this.network);
+  SystemConfig copyWith({LogLevel? logLevel}) => SystemConfig(logLevel: logLevel ?? this.logLevel);

  @override
-  bool operator ==(Object other) =>
-      identical(this, other) || (other is SystemConfig && other.logLevel == logLevel && other.network == network);
+  bool operator ==(Object other) => identical(this, other) || (other is SystemConfig && other.logLevel == logLevel);

  @override
-  int get hashCode => Object.hash(logLevel, network);
+  int get hashCode => logLevel.hashCode;

  @override
-  String toString() => 'SystemConfig(logLevel: $logLevel, network: $network)';
+  String toString() => 'SystemConfig(logLevel: $logLevel)';
 }
@@ -8,7 +8,6 @@ import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
-import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';

 enum MetadataDomain<T extends Object> {
  appConfig<AppConfig>('config.app'),
@@ -35,41 +34,6 @@ enum MetadataKey<T extends Object> {
  viewerAutoPlayVideo<bool>(.appConfig, 'viewer.autoPlayVideo', true),
  viewerTapToNavigate<bool>(.appConfig, 'viewer.tapToNavigate', false),

-  // Network
-  networkAutoEndpointSwitching<bool>(.systemConfig, 'network.autoEndpointSwitching', false),
-  networkPreferredWifiName<String>(.systemConfig, 'network.preferredWifiName', ''),
-  networkLocalEndpoint<String>(.systemConfig, 'network.localEndpoint', ''),
-  networkExternalEndpointList<List<String>>(
-    .systemConfig,
-    'network.externalEndpointList',
-    [],
-    _ListCodec(_PrimitiveCodec.string),
-  ),
-  networkCustomHeaders<Map<String, String>>(
-    .systemConfig,
-    'network.customHeaders',
-    {},
-    _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string),
-  ),
-
-  // Album
-  albumSortMode<AlbumSortMode>(
-    .appConfig,
-    'album.sortMode',
-    AlbumSortMode.mostRecent,
-    _EnumCodec(AlbumSortMode.values),
-  ),
-  albumIsReverse<bool>(.appConfig, 'album.isReverse', true),
-  albumIsGrid<bool>(.appConfig, 'album.isGrid', false),
-
-  // Backup
-  backupEnabled<bool>(.appConfig, 'backup.enabled', false),
-  backupUseCellularForVideos<bool>(.appConfig, 'backup.useCellularForVideos', false),
-  backupUseCellularForPhotos<bool>(.appConfig, 'backup.useCellularForPhotos', false),
-  backupRequireCharging<bool>(.appConfig, 'backup.requireCharging', false),
-  backupTriggerDelay<int>(.appConfig, 'backup.triggerDelay', 30),
-  backupSyncAlbums<bool>(.appConfig, 'backup.syncAlbums', false),
-
  // Timeline
  timelineTilesPerRow<int>(.appConfig, 'timeline.tilesPerRow', 4),
  timelineGroupAssetsBy<GroupAssetsBy>(
@@ -100,19 +64,7 @@ enum MetadataKey<T extends Object> {
  ),
  cleanupKeepAlbumIds<List<String>>(.appConfig, 'cleanup.keepAlbumIds', [], _ListCodec(_PrimitiveCodec.string)),
  cleanupCutoffDaysAgo<int>(.appConfig, 'cleanup.cutoffDaysAgo', -1),
-  cleanupDefaultsInitialized<bool>(.appConfig, 'cleanup.defaultsInitialized', false),
-
-  // Slideshow
-  slideshowTransition<bool>(.appConfig, 'slideshow.transition', true),
-  slideshowRepeat<bool>(.appConfig, 'slideshow.repeat', true),
-  slideshowDuration<int>(.appConfig, 'slideshow.duration', 5),
-  slideshowLook<SlideshowLook>(.appConfig, 'slideshow.look', SlideshowLook.contain, _EnumCodec(SlideshowLook.values)),
-  slideshowDirection<SlideshowDirection>(
-    .appConfig,
-    'slideshow.direction',
-    SlideshowDirection.forward,
-    _EnumCodec(SlideshowDirection.values),
-  );
+  cleanupDefaultsInitialized<bool>(.appConfig, 'cleanup.defaultsInitialized', false);

  final MetadataDomain domain;
  final String name;
@@ -179,47 +131,6 @@ final class _DateTimeCodec extends _MetadataCodec<DateTime> {
  DateTime? decode(String raw) => DateTime.tryParse(raw);
 }

-final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec<Map<K, V>> {
-  final _MetadataCodec<K> _keyCodec;
-  final _MetadataCodec<V> _valueCodec;
-
-  const _MapCodec(this._keyCodec, this._valueCodec);
-
-  @override
-  String encode(Map<K, V> value) {
-    final entries = <String, String>{};
-    value.forEach((k, v) => entries[_keyCodec.encode(k)] = _valueCodec.encode(v));
-    return jsonEncode(entries);
-  }
-
-  @override
-  Map<K, V>? decode(String raw) {
-    try {
-      final decoded = jsonDecode(raw);
-      if (decoded is! Map) {
-        return null;
-      }
-      final result = <K, V>{};
-      for (final entry in decoded.entries) {
-        final rawKey = entry.key;
-        final rawValue = entry.value;
-        if (rawKey is! String || rawValue is! String) {
-          return null;
-        }
-        final k = _keyCodec.decode(rawKey);
-        final v = _valueCodec.decode(rawValue);
-        if (k == null || v == null) {
-          return null;
-        }
-        result[k] = v;
-      }
-      return result;
-    } on FormatException {
-      return null;
-    }
-  }
-}
-
 final class _ListCodec<T extends Object> extends _MetadataCodec<List<T>> {
  final _MetadataCodec<T> _elementCodec;

@@ -1,7 +1,8 @@
 import 'package:immich_mobile/domain/models/store.model.dart';

 enum Setting<T> {
-  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false);
+  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),
+  enableBackup<bool>(StoreKey.enableBackup, false);

  const Setting(this.storeKey, this.defaultValue);

@@ -6,33 +6,36 @@ enum StoreKey<T> {
  version<int>._(0),
  currentUser<UserDto>._(2),
  deviceId<String>._(4),
+  backupRequireCharging<bool>._(7),
+  backupTriggerDelay<int>._(8),
  serverUrl<String>._(10),
  accessToken<String>._(11),
  serverEndpoint<String>._(12),
+  selectedAlbumSortOrder<int>._(113),
  advancedTroubleshooting<bool>._(114),
+  selectedAlbumSortReverse<bool>._(123),
  enableHapticFeedback<bool>._(126),
+  customHeaders<String>._(127),
+  syncAlbums<bool>._(131),
+
+  // Auto endpoint switching
+  autoEndpointSwitching<bool>._(132),
+  preferredWifiName<String>._(133),
+  localEndpoint<String>._(134),
+  externalEndpointList<String>._(135),

  manageLocalMediaAndroid<bool>._(137),
  // Read-only Mode settings
  readonlyModeEnabled<bool>._(138),
+  albumGridView<bool>._(140),

+  // Experimental stuff
+  enableBackup<bool>._(1003),
+  useWifiForUploadVideos<bool>._(1004),
+  useWifiForUploadPhotos<bool>._(1005),
  syncMigrationStatus<String>._(1013),

  // Legacy keys that have been migrated to the new metadata store
-  legacyBackupRequireCharging<bool>._(7),
-  legacyBackupTriggerDelay<int>._(8),
-  legacySyncAlbums<bool>._(131),
-  legacyEnableBackup<bool>._(1003),
-  legacyUseWifiForUploadVideos<bool>._(1004),
-  legacyUseWifiForUploadPhotos<bool>._(1005),
-  legacySelectedAlbumSortOrder<int>._(113),
-  legacySelectedAlbumSortReverse<bool>._(123),
-  legacyAlbumGridView<bool>._(140),
-  legacyAutoEndpointSwitching<bool>._(132),
-  legacyPreferredWifiName<String>._(133),
-  legacyLocalEndpoint<String>._(134),
-  legacyExternalEndpointList<String>._(135),
-  legacyCustomHeaders<String>._(127),
  legacyLoopVideo<bool>._(117),
  legacyLoadOriginalVideo<bool>._(136),
  legacyAutoPlayVideo<bool>._(139),
@@ -11,14 +11,15 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
+import 'package:immich_mobile/providers/app_settings.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/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart' show nativeSyncApiProvider;
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/services/localization.service.dart';
@@ -38,15 +39,16 @@ class BackgroundWorkerFgService {
  Future<void> saveNotificationMessage(String title, String body) =>
      _foregroundHostApi.saveNotificationMessage(title, body);

-  Future<void> configure({int? minimumDelaySeconds, bool? requireCharging}) {
-    final backup = MetadataRepository.instance.appConfig.backup;
-    return _foregroundHostApi.configure(
-      BackgroundWorkerSettings(
-        minimumDelaySeconds: minimumDelaySeconds ?? backup.triggerDelay,
-        requiresCharging: requireCharging ?? backup.requireCharging,
-      ),
-    );
-  }
+  Future<void> configure({int? minimumDelaySeconds, bool? requireCharging}) => _foregroundHostApi.configure(
+    BackgroundWorkerSettings(
+      minimumDelaySeconds:
+          minimumDelaySeconds ??
+          Store.get(AppSettingsEnum.backupTriggerDelay.storeKey, AppSettingsEnum.backupTriggerDelay.defaultValue),
+      requiresCharging:
+          requireCharging ??
+          Store.get(AppSettingsEnum.backupRequireCharging.storeKey, AppSettingsEnum.backupRequireCharging.defaultValue),
+    ),
+  );

  Future<void> disable() => _foregroundHostApi.disable();
 }
@@ -69,7 +71,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
    BackgroundWorkerFlutterApi.setUp(this);
  }

-  bool get _isBackupEnabled => MetadataRepository.instance.appConfig.backup.enabled;
+  bool get _isBackupEnabled => _ref?.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup) ?? false;

  Future<void> init() async {
    try {
@@ -1,130 +0,0 @@
-import 'dart:async';
-
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/stack.repository.dart';
-import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/repositories/asset_api.repository.dart';
-import 'package:logging/logging.dart';
-
-/// Handles the iOS revert case: the user reverted an edit in Photos, so the local
-/// is no longer an edit but was already uploaded as one. Flips the stack primary
-/// back to the original base (found via prior_remote_id), deletes the edit members,
-/// and marks the local handled so it isn't re-uploaded.
-class EditRevertService {
-  final NativeSyncApi _nativeSyncApi;
-  final DriftStackRepository _stackRepository;
-  final DriftLocalAssetRepository _localAssetRepository;
-  final AssetApiRepository _assetApiRepository;
-  final _log = Logger('EditRevertService');
-
-  EditRevertService({
-    required NativeSyncApi nativeSyncApi,
-    required DriftStackRepository stackRepository,
-    required DriftLocalAssetRepository localAssetRepository,
-    required AssetApiRepository assetApiRepository,
-  }) : _nativeSyncApi = nativeSyncApi,
-       _stackRepository = stackRepository,
-       _localAssetRepository = localAssetRepository,
-       _assetApiRepository = assetApiRepository;
-
-  /// Returns true if the asset was a revert and was handled (caller skips the
-  /// upload); false to fall through to the normal upload path.
-  Future<bool> tryDedupRevert(LocalAsset asset) async {
-    if (asset.priorRemoteId == null) {
-      return false;
-    }
-
-    // Only a confirmed "no live edit" counts as a revert. `edited` means a fresh
-    // edit, so bail and let the pair flow handle it. `unknown` means the native
-    // side couldn't read the adjustment (e.g. the asset is offloaded to iCloud and
-    // we didn't allow network); bail there too rather than risk treating an edit we
-    // simply couldn't read as a revert and deleting it. allowNetworkAccess=false
-    // keeps this a cheap, offline metadata read.
-    try {
-      final editState = await _nativeSyncApi.getEditState(asset.id, allowNetworkAccess: false);
-      if (editState != EditState.notEdited) {
-        return false;
-      }
-    } catch (error, stack) {
-      _log.warning("edit-state probe failed for ${asset.id}", error, stack);
-      return false;
-    }
-
-    // No live edit, but this local was uploaded as an edit before → revert. iOS
-    // re-encodes a reverted render to fresh bytes that match nothing remote, so we
-    // never try to checksum-match. Flip the stack by structure: prior_remote_id is
-    // the latest edit (the stack primary); flip back to the stack's original base.
-    final String stackId;
-    final String baseId;
-    try {
-      final foundStack = await _stackRepository.findStackIdByRemoteId(asset.priorRemoteId!);
-      if (foundStack == null) {
-        return false;
-      }
-      final base = await _stackRepository.findStackBaseId(foundStack, excludeId: asset.priorRemoteId!);
-      if (base == null) {
-        return false;
-      }
-      stackId = foundStack;
-      baseId = base;
-    } catch (error, stack) {
-      _log.warning("revert stack lookup failed for ${asset.id}", error, stack);
-      return false;
-    }
-
-    try {
-      await _assetApiRepository.setStackPrimary(stackId, baseId);
-      await _stackRepository.setPrimary(stackId, baseId);
-      await _localAssetRepository.markSynced(asset.id, priorRemoteId: baseId, syncedChecksum: asset.checksum ?? '');
-    } catch (error, stack) {
-      _log.warning("revert primary flip failed for ${asset.id}", error, stack);
-      return false;
-    }
-
-    await _tearDownStackAfterFlip(stackId, baseId);
-    return true;
-  }
-
-  /// Finishes what [HashService] started: when a local checksum directly matched
-  /// a non-primary stack member and the primary was already flipped, drop the
-  /// other (now-stale) members.
-  Future<void> finishReconcile({required String stackId, required String newPrimaryId}) async {
-    await _tearDownStackAfterFlip(stackId, newPrimaryId);
-  }
-
-  // Trash the other stack members on the server, unstack, and mirror the result
-  // locally. Each step is best-effort — the flipped primary is the load-bearing
-  // change; the cleanup just tidies up.
-  Future<void> _tearDownStackAfterFlip(String stackId, String keepId) async {
-    final List<String> toDelete;
-    try {
-      toDelete = await _stackRepository.getOtherMemberIds(stackId, keepId);
-    } catch (error, stack) {
-      _log.warning("getOtherMemberIds failed for $stackId", error, stack);
-      return;
-    }
-
-    if (toDelete.isNotEmpty) {
-      try {
-        // Move the stale edit members to the trash rather than deleting outright,
-        // so a revert stays recoverable on the server (force: false = trash).
-        await _assetApiRepository.delete(toDelete, false);
-      } catch (error, stack) {
-        _log.warning("trashing reverted edit members failed for $toDelete", error, stack);
-      }
-    }
-
-    try {
-      await _assetApiRepository.unStack([stackId]);
-    } catch (error, stack) {
-      _log.warning("unstack failed for $stackId", error, stack);
-    }
-
-    try {
-      await _stackRepository.applyRevertCleanup(stackId, toDelete);
-    } catch (error, stack) {
-      _log.warning("local cleanup failed for $stackId", error, stack);
-    }
-  }
-}
@@ -2,14 +2,11 @@ import 'package:flutter/services.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/services/edit_revert.service.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/stack.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:logging/logging.dart';

 const String _kHashCancelledCode = "HASH_CANCELLED";
@@ -20,9 +17,6 @@ class HashService {
  final DriftLocalAssetRepository _localAssetRepository;
  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
  final NativeSyncApi _nativeSyncApi;
-  final DriftStackRepository _stackRepository;
-  final AssetApiRepository _assetApiRepository;
-  final EditRevertService _editRevertService;
  final bool Function()? _cancelChecker;
  final _log = Logger('HashService');

@@ -31,9 +25,6 @@ class HashService {
    required DriftLocalAssetRepository localAssetRepository,
    required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
    required NativeSyncApi nativeSyncApi,
-    required DriftStackRepository stackRepository,
-    required AssetApiRepository assetApiRepository,
-    required EditRevertService editRevertService,
    bool Function()? cancelChecker,
    int? batchSize,
  }) : _localAlbumRepository = localAlbumRepository,
@@ -41,9 +32,6 @@ class HashService {
       _trashedLocalAssetRepository = trashedLocalAssetRepository,
       _cancelChecker = cancelChecker,
       _nativeSyncApi = nativeSyncApi,
-       _stackRepository = stackRepository,
-       _assetApiRepository = assetApiRepository,
-       _editRevertService = editRevertService,
       _batchSize = batchSize ?? kBatchHashFileLimit;

  bool get isCancelled => _cancelChecker?.call() ?? false;
@@ -57,7 +45,6 @@ class HashService {

      // Sorted by backupSelection followed by isCloud
      final localAlbums = await _localAlbumRepository.getBackupAlbums();
-      final hashedIds = <String>{};

      for (final album in localAlbums) {
        if (isCancelled) {
@@ -67,7 +54,7 @@ class HashService {

        final assetsToHash = await _localAlbumRepository.getAssetsToHash(album.id);
        if (assetsToHash.isNotEmpty) {
-          await _hashAssets(album, assetsToHash, hashedIds: hashedIds);
+          await _hashAssets(album, assetsToHash);
        }
      }
      if (CurrentPlatform.isAndroid && localAlbums.isNotEmpty) {
@@ -75,15 +62,9 @@ class HashService {
        final trashedToHash = await _trashedLocalAssetRepository.getAssetsToHash(backupAlbumIds);
        if (trashedToHash.isNotEmpty) {
          final pseudoAlbum = LocalAlbum(id: '-pseudoAlbum', name: 'Trash', updatedAt: DateTime.now());
-          await _hashAssets(pseudoAlbum, trashedToHash, isTrashed: true, hashedIds: hashedIds);
+          await _hashAssets(pseudoAlbum, trashedToHash, isTrashed: true);
        }
      }
-
-      // iOS revert reconcile: a reverted edit re-hashes back to the original's
-      // bytes, which already exist as the stack base — flip the primary to it.
-      if (CurrentPlatform.isIOS && hashedIds.isNotEmpty && !isCancelled) {
-        await _reconcileReverts(hashedIds);
-      }
    } on PlatformException catch (e) {
      if (e.code == _kHashCancelledCode) {
        _log.warning("Hashing cancelled by platform");
@@ -100,12 +81,7 @@ class HashService {
  /// Processes a list of [LocalAsset]s, storing their hash and updating the assets in the DB
  /// with hash for those that were successfully hashed. Hashes are looked up in a table
  /// [LocalAssetHashEntity] by local id. Only missing entries are newly hashed and added to the DB.
-  Future<void> _hashAssets(
-    LocalAlbum album,
-    List<LocalAsset> assetsToHash, {
-    bool isTrashed = false,
-    required Set<String> hashedIds,
-  }) async {
+  Future<void> _hashAssets(LocalAlbum album, List<LocalAsset> assetsToHash, {bool isTrashed = false}) async {
    final toHash = <String, LocalAsset>{};

    for (final asset in assetsToHash) {
@@ -116,21 +92,16 @@ class HashService {

      toHash[asset.id] = asset;
      if (toHash.length == _batchSize) {
-        await _processBatch(album, toHash, isTrashed, hashedIds);
+        await _processBatch(album, toHash, isTrashed);
        toHash.clear();
      }
    }

-    await _processBatch(album, toHash, isTrashed, hashedIds);
+    await _processBatch(album, toHash, isTrashed);
  }

  /// Processes a batch of assets.
-  Future<void> _processBatch(
-    LocalAlbum album,
-    Map<String, LocalAsset> toHash,
-    bool isTrashed,
-    Set<String> hashedIds,
-  ) async {
+  Future<void> _processBatch(LocalAlbum album, Map<String, LocalAsset> toHash, bool isTrashed) async {
    if (toHash.isEmpty) {
      return;
    }
@@ -170,34 +141,5 @@ class HashService {
    } else {
      await _localAssetRepository.updateHashes(hashed);
    }
-    hashedIds.addAll(hashed.keys);
-  }
-
-  Future<void> _reconcileReverts(Set<String> localIds) async {
-    final List<StackReconcileTarget> targets;
-    try {
-      targets = await _stackRepository.findRevertReconcileTargets(localIds);
-    } catch (error, stack) {
-      _log.warning("findRevertReconcileTargets failed", error, stack);
-      return;
-    }
-
-    for (final target in targets) {
-      try {
-        await _assetApiRepository.setStackPrimary(target.stackId, target.newPrimaryId);
-        await _stackRepository.setPrimary(target.stackId, target.newPrimaryId);
-        // Roll priorRemoteId forward to the new primary (the matched member) so a
-        // later edit stacks onto THAT instead of the soon-deleted old primary.
-        await _localAssetRepository.markSynced(
-          target.localAssetId,
-          priorRemoteId: target.newPrimaryId,
-          syncedChecksum: target.localAssetChecksum,
-        );
-      } catch (error, stack) {
-        _log.warning("revert reconcile flip failed for stack ${target.stackId}", error, stack);
-        continue;
-      }
-      await _editRevertService.finishReconcile(stackId: target.stackId, newPrimaryId: target.newPrimaryId);
-    }
  }
 }
@@ -9,47 +9,12 @@ import 'package:immich_mobile/infrastructure/repositories/remote_album.repositor
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
-import 'package:immich_mobile/services/foreground_upload.service.dart';
-import 'package:logging/logging.dart';
-
-/// Categorizes a heterogeneous asset selection into the candidates that can
-/// be added to an album immediately (already on the server) and the local-only
-/// candidates that must be uploaded first.
-class AlbumAssetCandidates {
-  final List<String> remoteAssetIds;
-  final List<LocalAsset> localAssetsToUpload;
-
-  const AlbumAssetCandidates({required this.remoteAssetIds, required this.localAssetsToUpload});
-}

 class RemoteAlbumService {
-  static final _logger = Logger('RemoteAlbumService');
-
  final DriftRemoteAlbumRepository _repository;
  final DriftAlbumApiRepository _albumApiRepository;
-  final ForegroundUploadService _uploadService;

-  const RemoteAlbumService(this._repository, this._albumApiRepository, this._uploadService);
-
-  /// Categorizes a heterogeneous asset selection into already-on-server IDs
-  /// and local assets that still need to be uploaded.
-  static AlbumAssetCandidates categorizeCandidates(Iterable<BaseAsset> assets) {
-    final remoteIds = <String>[];
-    final localToUpload = <LocalAsset>[];
-    for (final asset in assets) {
-      if (asset is RemoteAsset) {
-        remoteIds.add(asset.id);
-      } else if (asset is LocalAsset) {
-        final remoteId = asset.remoteId;
-        if (remoteId != null) {
-          remoteIds.add(remoteId);
-        } else {
-          localToUpload.add(asset);
-        }
-      }
-    }
-    return AlbumAssetCandidates(remoteAssetIds: remoteIds, localAssetsToUpload: localToUpload);
-  }
+  const RemoteAlbumService(this._repository, this._albumApiRepository);

  Stream<RemoteAlbum?> watchAlbum(String albumId) {
    return _repository.watchAlbum(albumId);
@@ -183,122 +148,6 @@ class RemoteAlbumService {
    return album.added.length;
  }

-  /// !TODO The name here is not clear as we have addAssets method above,
-  /// which is only add remote assets to album, for the next PR, we will allow
-  /// adding local assets from album from the timeline as well with this flow.
-  /// So saving that for the next refactor
-  Future<int> addAssetsToAlbum({
-    required String albumId,
-    required UserDto uploader,
-    required AlbumAssetCandidates candidates,
-    UploadCallbacks uploadCallbacks = const UploadCallbacks(),
-  }) async {
-    int addedCount = 0;
-    if (candidates.remoteAssetIds.isNotEmpty) {
-      addedCount += await addAssets(albumId: albumId, assetIds: candidates.remoteAssetIds);
-    }
-    if (candidates.localAssetsToUpload.isNotEmpty) {
-      addedCount += await _uploadAndAddLocals(albumId, uploader, candidates.localAssetsToUpload, uploadCallbacks);
-    }
-    return addedCount;
-  }
-
-  /// Creates an album, seeding it with already-remote asset IDs, then uploads
-  /// local-only assets and links each one as it finishes.
-  Future<RemoteAlbum> createAlbumWithAssets({
-    required String title,
-    required UserDto owner,
-    String? description,
-    AlbumAssetCandidates candidates = const AlbumAssetCandidates(remoteAssetIds: [], localAssetsToUpload: []),
-    UploadCallbacks uploadCallbacks = const UploadCallbacks(),
-  }) async {
-    final album = await createAlbum(
-      title: title,
-      owner: owner,
-      description: description,
-      assetIds: candidates.remoteAssetIds,
-    );
-    if (candidates.localAssetsToUpload.isNotEmpty) {
-      await _uploadAndAddLocals(album.id, owner, candidates.localAssetsToUpload, uploadCallbacks);
-    }
-    return album;
-  }
-
-  Future<int> _uploadAndAddLocals(
-    String albumId,
-    UserDto uploader,
-    List<LocalAsset> localAssets,
-    UploadCallbacks userCallbacks,
-  ) async {
-    int addedCount = 0;
-    final pendingAdds = <Future<void>>[];
-    final localById = {for (final a in localAssets) a.id: a};
-
-    final wrappedCallbacks = UploadCallbacks(
-      onProgress: (localId, filename, bytes, totalBytes) => _runUploadCallback(
-        'Upload progress callback failed for $localId',
-        () => userCallbacks.onProgress?.call(localId, filename, bytes, totalBytes),
-      ),
-      onICloudProgress: (localId, progress) => _runUploadCallback(
-        'iCloud progress callback failed for $localId',
-        () => userCallbacks.onICloudProgress?.call(localId, progress),
-      ),
-      onError: (localId, errorMessage) => _runUploadCallback(
-        'Upload error callback failed for $localId',
-        () => userCallbacks.onError?.call(localId, errorMessage),
-      ),
-      onSuccess: (localId, remoteId) {
-        _runUploadCallback(
-          'Upload success callback failed for $localId',
-          () => userCallbacks.onSuccess?.call(localId, remoteId),
-        );
-        final source = localById[localId];
-        if (source == null) {
-          _logger.warning('Upload success for $localId but source LocalAsset missing; skipping album link');
-          return;
-        }
-        pendingAdds.add(
-          _linkUploadedAssetToAlbum(albumId, remoteId, uploader, source)
-              .then<void>((added) {
-                addedCount += added;
-              })
-              .catchError((Object error, StackTrace stack) {
-                _logger.warning('Failed to add uploaded asset $remoteId to album $albumId', error, stack);
-              }),
-        );
-      },
-    );
-
-    await _uploadService.uploadManual(localAssets, callbacks: wrappedCallbacks);
-    await Future.wait(pendingAdds);
-    return addedCount;
-  }
-
-  void _runUploadCallback(String message, void Function() callback) {
-    try {
-      callback();
-    } catch (error, stack) {
-      _logger.warning(message, error, stack);
-    }
-  }
-
-  /// Links a freshly-uploaded asset to an album, ensuring the local DB
-  /// reflects the change without waiting for the next sync. We call the API
-  /// (server is the source of truth), then upsert a placeholder
-  /// `remote_asset_entity` row from the local source so the FK-protected
-  /// junction insert succeeds. Sync overwrites the placeholder later with
-  /// the authoritative server data.
-  Future<int> _linkUploadedAssetToAlbum(String albumId, String remoteId, UserDto uploader, LocalAsset source) async {
-    final result = await _albumApiRepository.addAssets(albumId, [remoteId]);
-    if (result.added.isEmpty) {
-      return 0;
-    }
-
-    await _repository.upsertRemoteAssetStub(remoteId: remoteId, ownerId: uploader.id, source: source);
-    await _repository.addAssets(albumId, result.added);
-    return result.added.length;
-  }
-
  Future<void> deleteAlbum(String albumId) async {
    await _albumApiRepository.deleteAlbum(albumId);

@@ -1,31 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/tag.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/tags_api.repository.dart';
-
-final tagServiceProvider = Provider<TagService>((ref) => TagService(ref.watch(tagsApiRepositoryProvider)));
-
-class TagService {
-  final TagsApiRepository _repository;
-
-  const TagService(this._repository);
-
-  Future<int> bulkTagAssets(List<String> assetIds, List<String> tagIds) async {
-    return _repository.bulkTagAssets(assetIds, tagIds);
-  }
-
-  Future<Set<Tag>> getAllTags() async {
-    final dtos = await _repository.getAllTags();
-    if (dtos == null) {
-      return {};
-    }
-    return dtos.map((dto) => Tag.fromDto(dto)).toSet();
-  }
-
-  Future<List<Tag>> upsertTags(List<String> tags) async {
-    final dtos = await _repository.upsertTags(tags);
-    if (dtos == null) {
-      return [];
-    }
-    return dtos.map((dto) => Tag.fromDto(dto)).toList();
-  }
-}
@@ -186,22 +186,6 @@ class BackgroundSyncManager {
        });
  }

-  /// Runs a remote sync guaranteed to observe changes up to now. [syncRemote]
-  /// joins an in-flight sync whose snapshot can pre-date a just-received change
-  /// (e.g. a stack update) and miss it, so wait for any in-flight sync to finish
-  /// first, then run a fresh one.
-  Future<void> runFreshRemoteSync() async {
-    final inflight = _syncTask;
-    if (inflight != null) {
-      try {
-        await inflight.future;
-      } catch (_) {
-        // The in-flight sync's outcome doesn't matter; we only need a fresh one after it.
-      }
-    }
-    await syncRemote();
-  }
-
  Future<void> syncWebsocketBatchV1(List<dynamic> batchData) {
    if (_syncWebsocketTask != null) {
      return _syncWebsocketTask!.future;
@@ -4,8 +4,6 @@ extension StringExtension on String {
  String capitalize() {
    return split(" ").map((str) => str.isEmpty ? str : str[0].toUpperCase() + str.substring(1)).join(" ");
  }
-
-  String? get nullIfEmpty => isEmpty ? null : this;
 }

 extension DurationExtension on String {
@@ -27,14 +27,6 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {

  IntColumn get playbackStyle => intEnum<AssetPlaybackStyle>().withDefault(const Constant(0))();

-  // remote id of the previous upload (iOS edit-pair stacking)
-  TextColumn get priorRemoteId => text().nullable()();
-
-  // local checksum at the last sync action. Lets the backup query skip a local
-  // whose current hash matches nothing remote but is still "handled" — the iOS
-  // revert case, where the reverted render hashes fresh but is already reconciled.
-  TextColumn get syncedChecksum => text().nullable()();
-
  @override
  Set<Column> get primaryKey => {id};
 }
@@ -59,7 +51,5 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
    longitude: longitude,
    cloudId: iCloudId,
    isEdited: false,
-    priorRemoteId: priorRemoteId,
-    syncedChecksum: syncedChecksum,
  );
 }
@@ -26,8 +26,6 @@ typedef $$LocalAssetEntityTableCreateCompanionBuilder =
      i0.Value<double?> latitude,
      i0.Value<double?> longitude,
      i0.Value<i2.AssetPlaybackStyle> playbackStyle,
-      i0.Value<String?> priorRemoteId,
-      i0.Value<String?> syncedChecksum,
    });
 typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
    i1.LocalAssetEntityCompanion Function({
@@ -47,8 +45,6 @@ typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
      i0.Value<double?> latitude,
      i0.Value<double?> longitude,
      i0.Value<i2.AssetPlaybackStyle> playbackStyle,
-      i0.Value<String?> priorRemoteId,
-      i0.Value<String?> syncedChecksum,
    });

 class $$LocalAssetEntityTableFilterComposer
@@ -145,16 +141,6 @@ class $$LocalAssetEntityTableFilterComposer
    column: $table.playbackStyle,
    builder: (column) => i0.ColumnWithTypeConverterFilters(column),
  );
-
-  i0.ColumnFilters<String> get priorRemoteId => $composableBuilder(
-    column: $table.priorRemoteId,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<String> get syncedChecksum => $composableBuilder(
-    column: $table.syncedChecksum,
-    builder: (column) => i0.ColumnFilters(column),
-  );
 }

 class $$LocalAssetEntityTableOrderingComposer
@@ -245,16 +231,6 @@ class $$LocalAssetEntityTableOrderingComposer
    column: $table.playbackStyle,
    builder: (column) => i0.ColumnOrderings(column),
  );
-
-  i0.ColumnOrderings<String> get priorRemoteId => $composableBuilder(
-    column: $table.priorRemoteId,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<String> get syncedChecksum => $composableBuilder(
-    column: $table.syncedChecksum,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
 }

 class $$LocalAssetEntityTableAnnotationComposer
@@ -324,16 +300,6 @@ class $$LocalAssetEntityTableAnnotationComposer
    column: $table.playbackStyle,
    builder: (column) => column,
  );
-
-  i0.GeneratedColumn<String> get priorRemoteId => $composableBuilder(
-    column: $table.priorRemoteId,
-    builder: (column) => column,
-  );
-
-  i0.GeneratedColumn<String> get syncedChecksum => $composableBuilder(
-    column: $table.syncedChecksum,
-    builder: (column) => column,
-  );
 }

 class $$LocalAssetEntityTableTableManager
@@ -393,8 +359,6 @@ class $$LocalAssetEntityTableTableManager
                i0.Value<double?> longitude = const i0.Value.absent(),
                i0.Value<i2.AssetPlaybackStyle> playbackStyle =
                    const i0.Value.absent(),
-                i0.Value<String?> priorRemoteId = const i0.Value.absent(),
-                i0.Value<String?> syncedChecksum = const i0.Value.absent(),
              }) => i1.LocalAssetEntityCompanion(
                name: name,
                type: type,
@@ -412,8 +376,6 @@ class $$LocalAssetEntityTableTableManager
                latitude: latitude,
                longitude: longitude,
                playbackStyle: playbackStyle,
-                priorRemoteId: priorRemoteId,
-                syncedChecksum: syncedChecksum,
              ),
          createCompanionCallback:
              ({
@@ -434,8 +396,6 @@ class $$LocalAssetEntityTableTableManager
                i0.Value<double?> longitude = const i0.Value.absent(),
                i0.Value<i2.AssetPlaybackStyle> playbackStyle =
                    const i0.Value.absent(),
-                i0.Value<String?> priorRemoteId = const i0.Value.absent(),
-                i0.Value<String?> syncedChecksum = const i0.Value.absent(),
              }) => i1.LocalAssetEntityCompanion.insert(
                name: name,
                type: type,
@@ -453,8 +413,6 @@ class $$LocalAssetEntityTableTableManager
                latitude: latitude,
                longitude: longitude,
                playbackStyle: playbackStyle,
-                priorRemoteId: priorRemoteId,
-                syncedChecksum: syncedChecksum,
              ),
          withReferenceMapper: (p0) => p0
              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
@@ -679,28 +637,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
      ).withConverter<i2.AssetPlaybackStyle>(
        i1.$LocalAssetEntityTable.$converterplaybackStyle,
      );
-  static const i0.VerificationMeta _priorRemoteIdMeta =
-      const i0.VerificationMeta('priorRemoteId');
-  @override
-  late final i0.GeneratedColumn<String> priorRemoteId =
-      i0.GeneratedColumn<String>(
-        'prior_remote_id',
-        aliasedName,
-        true,
-        type: i0.DriftSqlType.string,
-        requiredDuringInsert: false,
-      );
-  static const i0.VerificationMeta _syncedChecksumMeta =
-      const i0.VerificationMeta('syncedChecksum');
-  @override
-  late final i0.GeneratedColumn<String> syncedChecksum =
-      i0.GeneratedColumn<String>(
-        'synced_checksum',
-        aliasedName,
-        true,
-        type: i0.DriftSqlType.string,
-        requiredDuringInsert: false,
-      );
  @override
  List<i0.GeneratedColumn> get $columns => [
    name,
@@ -719,8 +655,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
    latitude,
    longitude,
    playbackStyle,
-    priorRemoteId,
-    syncedChecksum,
  ];
  @override
  String get aliasedName => _alias ?? actualTableName;
@@ -825,24 +759,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
        longitude.isAcceptableOrUnknown(data['longitude']!, _longitudeMeta),
      );
    }
-    if (data.containsKey('prior_remote_id')) {
-      context.handle(
-        _priorRemoteIdMeta,
-        priorRemoteId.isAcceptableOrUnknown(
-          data['prior_remote_id']!,
-          _priorRemoteIdMeta,
-        ),
-      );
-    }
-    if (data.containsKey('synced_checksum')) {
-      context.handle(
-        _syncedChecksumMeta,
-        syncedChecksum.isAcceptableOrUnknown(
-          data['synced_checksum']!,
-          _syncedChecksumMeta,
-        ),
-      );
-    }
    return context;
  }

@@ -923,14 +839,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
          data['${effectivePrefix}playback_style'],
        )!,
      ),
-      priorRemoteId: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}prior_remote_id'],
-      ),
-      syncedChecksum: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}synced_checksum'],
-      ),
    );
  }

@@ -969,8 +877,6 @@ class LocalAssetEntityData extends i0.DataClass
  final double? latitude;
  final double? longitude;
  final i2.AssetPlaybackStyle playbackStyle;
-  final String? priorRemoteId;
-  final String? syncedChecksum;
  const LocalAssetEntityData({
    required this.name,
    required this.type,
@@ -988,8 +894,6 @@ class LocalAssetEntityData extends i0.DataClass
    this.latitude,
    this.longitude,
    required this.playbackStyle,
-    this.priorRemoteId,
-    this.syncedChecksum,
  });
  @override
  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -1034,12 +938,6 @@ class LocalAssetEntityData extends i0.DataClass
        i1.$LocalAssetEntityTable.$converterplaybackStyle.toSql(playbackStyle),
      );
    }
-    if (!nullToAbsent || priorRemoteId != null) {
-      map['prior_remote_id'] = i0.Variable<String>(priorRemoteId);
-    }
-    if (!nullToAbsent || syncedChecksum != null) {
-      map['synced_checksum'] = i0.Variable<String>(syncedChecksum);
-    }
    return map;
  }

@@ -1069,8 +967,6 @@ class LocalAssetEntityData extends i0.DataClass
      playbackStyle: i1.$LocalAssetEntityTable.$converterplaybackStyle.fromJson(
        serializer.fromJson<int>(json['playbackStyle']),
      ),
-      priorRemoteId: serializer.fromJson<String?>(json['priorRemoteId']),
-      syncedChecksum: serializer.fromJson<String?>(json['syncedChecksum']),
    );
  }
  @override
@@ -1097,8 +993,6 @@ class LocalAssetEntityData extends i0.DataClass
      'playbackStyle': serializer.toJson<int>(
        i1.$LocalAssetEntityTable.$converterplaybackStyle.toJson(playbackStyle),
      ),
-      'priorRemoteId': serializer.toJson<String?>(priorRemoteId),
-      'syncedChecksum': serializer.toJson<String?>(syncedChecksum),
    };
  }

@@ -1119,8 +1013,6 @@ class LocalAssetEntityData extends i0.DataClass
    i0.Value<double?> latitude = const i0.Value.absent(),
    i0.Value<double?> longitude = const i0.Value.absent(),
    i2.AssetPlaybackStyle? playbackStyle,
-    i0.Value<String?> priorRemoteId = const i0.Value.absent(),
-    i0.Value<String?> syncedChecksum = const i0.Value.absent(),
  }) => i1.LocalAssetEntityData(
    name: name ?? this.name,
    type: type ?? this.type,
@@ -1140,12 +1032,6 @@ class LocalAssetEntityData extends i0.DataClass
    latitude: latitude.present ? latitude.value : this.latitude,
    longitude: longitude.present ? longitude.value : this.longitude,
    playbackStyle: playbackStyle ?? this.playbackStyle,
-    priorRemoteId: priorRemoteId.present
-        ? priorRemoteId.value
-        : this.priorRemoteId,
-    syncedChecksum: syncedChecksum.present
-        ? syncedChecksum.value
-        : this.syncedChecksum,
  );
  LocalAssetEntityData copyWithCompanion(i1.LocalAssetEntityCompanion data) {
    return LocalAssetEntityData(
@@ -1175,12 +1061,6 @@ class LocalAssetEntityData extends i0.DataClass
      playbackStyle: data.playbackStyle.present
          ? data.playbackStyle.value
          : this.playbackStyle,
-      priorRemoteId: data.priorRemoteId.present
-          ? data.priorRemoteId.value
-          : this.priorRemoteId,
-      syncedChecksum: data.syncedChecksum.present
-          ? data.syncedChecksum.value
-          : this.syncedChecksum,
    );
  }

@@ -1202,9 +1082,7 @@ class LocalAssetEntityData extends i0.DataClass
          ..write('adjustmentTime: $adjustmentTime, ')
          ..write('latitude: $latitude, ')
          ..write('longitude: $longitude, ')
-          ..write('playbackStyle: $playbackStyle, ')
-          ..write('priorRemoteId: $priorRemoteId, ')
-          ..write('syncedChecksum: $syncedChecksum')
+          ..write('playbackStyle: $playbackStyle')
          ..write(')'))
        .toString();
  }
@@ -1227,8 +1105,6 @@ class LocalAssetEntityData extends i0.DataClass
    latitude,
    longitude,
    playbackStyle,
-    priorRemoteId,
-    syncedChecksum,
  );
  @override
  bool operator ==(Object other) =>
@@ -1249,9 +1125,7 @@ class LocalAssetEntityData extends i0.DataClass
          other.adjustmentTime == this.adjustmentTime &&
          other.latitude == this.latitude &&
          other.longitude == this.longitude &&
-          other.playbackStyle == this.playbackStyle &&
-          other.priorRemoteId == this.priorRemoteId &&
-          other.syncedChecksum == this.syncedChecksum);
+          other.playbackStyle == this.playbackStyle);
 }

 class LocalAssetEntityCompanion
@@ -1272,8 +1146,6 @@ class LocalAssetEntityCompanion
  final i0.Value<double?> latitude;
  final i0.Value<double?> longitude;
  final i0.Value<i2.AssetPlaybackStyle> playbackStyle;
-  final i0.Value<String?> priorRemoteId;
-  final i0.Value<String?> syncedChecksum;
  const LocalAssetEntityCompanion({
    this.name = const i0.Value.absent(),
    this.type = const i0.Value.absent(),
@@ -1291,8 +1163,6 @@ class LocalAssetEntityCompanion
    this.latitude = const i0.Value.absent(),
    this.longitude = const i0.Value.absent(),
    this.playbackStyle = const i0.Value.absent(),
-    this.priorRemoteId = const i0.Value.absent(),
-    this.syncedChecksum = const i0.Value.absent(),
  });
  LocalAssetEntityCompanion.insert({
    required String name,
@@ -1311,8 +1181,6 @@ class LocalAssetEntityCompanion
    this.latitude = const i0.Value.absent(),
    this.longitude = const i0.Value.absent(),
    this.playbackStyle = const i0.Value.absent(),
-    this.priorRemoteId = const i0.Value.absent(),
-    this.syncedChecksum = const i0.Value.absent(),
  }) : name = i0.Value(name),
       type = i0.Value(type),
       id = i0.Value(id);
@@ -1333,8 +1201,6 @@ class LocalAssetEntityCompanion
    i0.Expression<double>? latitude,
    i0.Expression<double>? longitude,
    i0.Expression<int>? playbackStyle,
-    i0.Expression<String>? priorRemoteId,
-    i0.Expression<String>? syncedChecksum,
  }) {
    return i0.RawValuesInsertable({
      if (name != null) 'name': name,
@@ -1353,8 +1219,6 @@ class LocalAssetEntityCompanion
      if (latitude != null) 'latitude': latitude,
      if (longitude != null) 'longitude': longitude,
      if (playbackStyle != null) 'playback_style': playbackStyle,
-      if (priorRemoteId != null) 'prior_remote_id': priorRemoteId,
-      if (syncedChecksum != null) 'synced_checksum': syncedChecksum,
    });
  }

@@ -1375,8 +1239,6 @@ class LocalAssetEntityCompanion
    i0.Value<double?>? latitude,
    i0.Value<double?>? longitude,
    i0.Value<i2.AssetPlaybackStyle>? playbackStyle,
-    i0.Value<String?>? priorRemoteId,
-    i0.Value<String?>? syncedChecksum,
  }) {
    return i1.LocalAssetEntityCompanion(
      name: name ?? this.name,
@@ -1395,8 +1257,6 @@ class LocalAssetEntityCompanion
      latitude: latitude ?? this.latitude,
      longitude: longitude ?? this.longitude,
      playbackStyle: playbackStyle ?? this.playbackStyle,
-      priorRemoteId: priorRemoteId ?? this.priorRemoteId,
-      syncedChecksum: syncedChecksum ?? this.syncedChecksum,
    );
  }

@@ -1457,12 +1317,6 @@ class LocalAssetEntityCompanion
        ),
      );
    }
-    if (priorRemoteId.present) {
-      map['prior_remote_id'] = i0.Variable<String>(priorRemoteId.value);
-    }
-    if (syncedChecksum.present) {
-      map['synced_checksum'] = i0.Variable<String>(syncedChecksum.value);
-    }
    return map;
  }

@@ -1484,9 +1338,7 @@ class LocalAssetEntityCompanion
          ..write('adjustmentTime: $adjustmentTime, ')
          ..write('latitude: $latitude, ')
          ..write('longitude: $longitude, ')
-          ..write('playbackStyle: $playbackStyle, ')
-          ..write('priorRemoteId: $priorRemoteId, ')
-          ..write('syncedChecksum: $syncedChecksum')
+          ..write('playbackStyle: $playbackStyle')
          ..write(')'))
        .toString();
  }
@@ -83,13 +83,6 @@ AND NOT EXISTS (
    INNER JOIN local_album_entity la on laa.album_id = la.id
    WHERE laa.asset_id = lae.id AND la.backup_selection = 2 -- excluded
 )
-- iOS edit-in-progress / revert: if this local was already uploaded (its
-- prior_remote_id resolves to a live remote), hide the local tile so the remote
-- (the edit, or the flipped-back original) is the single source of truth. Kills
-- the transient 2-tile flicker and stops a reverted local from re-appearing.
-AND NOT EXISTS (
-	SELECT 1 FROM remote_asset_entity rae WHERE rae.id = lae.prior_remote_id AND rae.owner_id IN :user_ids
-)
 ORDER BY created_at DESC
 LIMIT $limit;

@@ -143,10 +136,6 @@ FROM
 		INNER JOIN local_album_entity la on laa.album_id = la.id
 		WHERE laa.asset_id = lae.id AND la.backup_selection = 2 -- excluded
 	)
-	-- iOS edit-in-progress / revert: hide a local already represented by a live remote.
-	AND NOT EXISTS (
-		SELECT 1 FROM remote_asset_entity rae WHERE rae.id = lae.prior_remote_id AND rae.owner_id IN :user_ids
-	)
 )
 GROUP BY bucket_date
 ORDER BY bucket_date DESC;
@@ -29,7 +29,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
    );
    $arrayStartIndex += generatedlimit.amountOfVariables;
    return customSelect(
-      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_ms, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime, rae.is_edited, 0 AS playback_style, rae.uploaded_at FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_ms, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time, 0 AS is_edited, lae.playback_style, NULL AS uploaded_at FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) AND NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.id = lae.prior_remote_id AND rae.owner_id IN ($expandeduserIds)) ORDER BY created_at DESC ${generatedlimit.sql}',
+      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_ms, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime, rae.is_edited, 0 AS playback_style, rae.uploaded_at FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_ms, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time, 0 AS is_edited, lae.playback_style, NULL AS uploaded_at FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
      variables: [
        for (var $ in userIds) i0.Variable<String>($),
        ...generatedlimit.introducedVariables,
@@ -81,7 +81,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
    final expandeduserIds = $expandVar($arrayStartIndex, userIds.length);
    $arrayStartIndex += userIds.length;
    return customSelect(
-      'SELECT COUNT(*) AS asset_count, bucket_date FROM (SELECT CASE WHEN ?1 = 0 THEN COALESCE(STRFTIME(\'%Y-%m-%d\', rae.local_date_time), STRFTIME(\'%Y-%m-%d\', rae.created_at, \'localtime\')) WHEN ?1 = 1 THEN COALESCE(STRFTIME(\'%Y-%m\', rae.local_date_time), STRFTIME(\'%Y-%m\', rae.created_at, \'localtime\')) END AS bucket_date FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', lae.created_at, \'localtime\') WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', lae.created_at, \'localtime\') END AS bucket_date FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) AND NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.id = lae.prior_remote_id AND rae.owner_id IN ($expandeduserIds))) GROUP BY bucket_date ORDER BY bucket_date DESC',
+      'SELECT COUNT(*) AS asset_count, bucket_date FROM (SELECT CASE WHEN ?1 = 0 THEN COALESCE(STRFTIME(\'%Y-%m-%d\', rae.local_date_time), STRFTIME(\'%Y-%m-%d\', rae.created_at, \'localtime\')) WHEN ?1 = 1 THEN COALESCE(STRFTIME(\'%Y-%m\', rae.local_date_time), STRFTIME(\'%Y-%m\', rae.created_at, \'localtime\')) END AS bucket_date FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', lae.created_at, \'localtime\') WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', lae.created_at, \'localtime\') END AS bucket_date FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2)) GROUP BY bucket_date ORDER BY bucket_date DESC',
      variables: [
        i0.Variable<int>(groupBy),
        for (var $ in userIds) i0.Variable<String>($),
@@ -58,8 +58,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
            INNER JOIN main.local_album_entity la on laa.album_id = la.id
            WHERE laa.asset_id = lae.id
                AND la.backup_selection = ?3
-        )
-        AND (lae.synced_checksum IS NULL OR lae.synced_checksum != lae.checksum);
+        );
      ''';

    final row = await _db
@@ -105,10 +104,6 @@ class DriftBackupRepository extends DriftDatabaseRepository {
                  _db.remoteAssetEntity.checksum.equalsExp(lae.checksum) & _db.remoteAssetEntity.ownerId.equals(userId),
                ),
            ) &
-            // iOS revert: a reverted local hashes fresh (matches nothing remote),
-            // but if it was already reconciled (syncedChecksum == current checksum)
-            // it's handled — don't re-queue it as a fresh upload.
-            (lae.syncedChecksum.isNull() | lae.syncedChecksum.equalsExp(lae.checksum).not()) &
            lae.id.isNotInQuery(_getExcludedSubquery()),
      )
      ..orderBy([(localAsset) => OrderingTerm.desc(localAsset.createdAt)]);
@@ -98,7 +98,7 @@ class Drift extends $Drift {
  }

  @override
-  int get schemaVersion => 28;
+  int get schemaVersion => 26;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -276,12 +276,6 @@ class Drift extends $Drift {
          from25To26: (m, v26) async {
            await m.addColumn(v26.remoteAssetEntity, v26.remoteAssetEntity.uploadedAt);
          },
-          from26To27: (m, v27) async {
-            await m.addColumn(v27.localAssetEntity, v27.localAssetEntity.priorRemoteId);
-          },
-          from27To28: (m, v28) async {
-            await m.addColumn(v28.localAssetEntity, v28.localAssetEntity.syncedChecksum);
-          },
        ),
      );

@@ -64,12 +64,6 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
    });
  }

-  Future<void> markSynced(String localId, {required String priorRemoteId, required String syncedChecksum}) {
-    return (_db.localAssetEntity.update()..where((e) => e.id.equals(localId))).write(
-      LocalAssetEntityCompanion(priorRemoteId: Value(priorRemoteId), syncedChecksum: Value(syncedChecksum)),
-    );
-  }
-
  Future<void> delete(List<String> ids) {
    if (ids.isEmpty) {
      return Future.value();
@@ -2,7 +2,6 @@ import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/domain/models/metadata_key.dart';
-import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';

@@ -140,38 +139,9 @@ extension<T extends Object> on MetadataDomain<T> {
            autoPlayVideo: repo._read(.viewerAutoPlayVideo),
            tapToNavigate: repo._read(.viewerTapToNavigate),
          ),
-          slideshow: .new(
-            transition: repo._read(.slideshowTransition),
-            repeat: repo._read(.slideshowRepeat),
-            duration: repo._read(.slideshowDuration),
-            look: repo._read(.slideshowLook),
-            direction: repo._read(.slideshowDirection),
-          ),
-          album: .new(
-            sortMode: repo._read(.albumSortMode),
-            isReverse: repo._read(.albumIsReverse),
-            isGrid: repo._read(.albumIsGrid),
-          ),
-          backup: .new(
-            enabled: repo._read(.backupEnabled),
-            useCellularForVideos: repo._read(.backupUseCellularForVideos),
-            useCellularForPhotos: repo._read(.backupUseCellularForPhotos),
-            requireCharging: repo._read(.backupRequireCharging),
-            triggerDelay: repo._read(.backupTriggerDelay),
-            syncAlbums: repo._read(.backupSyncAlbums),
-          ),
        );
      case .systemConfig:
-        repo._systemConfig = .new(
-          logLevel: repo._read(.logLevel),
-          network: .new(
-            autoEndpointSwitching: repo._read(.networkAutoEndpointSwitching),
-            preferredWifiName: repo._read(.networkPreferredWifiName).nullIfEmpty,
-            localEndpoint: repo._read(.networkLocalEndpoint).nullIfEmpty,
-            externalEndpointList: repo._read(.networkExternalEndpointList),
-            customHeaders: repo._read(.networkCustomHeaders),
-          ),
-        );
+        repo._systemConfig = .new(logLevel: repo._read(.logLevel));
    }
  }
 }
@@ -10,7 +10,6 @@ import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
 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/repositories/db.repository.dart';

 enum SortRemoteAlbumsBy { id, updatedAt }
@@ -160,7 +159,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
        createdAt: Value(album.createdAt),
        updatedAt: Value(album.updatedAt),
        description: Value(album.description),
-        thumbnailAssetId: Value(album.thumbnailAssetId ?? (assetIds.isNotEmpty ? assetIds.first : null)),
+        thumbnailAssetId: Value(album.thumbnailAssetId),
        isActivityEnabled: Value(album.isActivityEnabled),
        order: Value(album.order),
      );
@@ -275,59 +274,17 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
  }

  Future<int> addAssets(String albumId, List<String> assetIds) async {
-    if (assetIds.isEmpty) {
-      return 0;
-    }
-
    final albumAssets = assetIds.map(
      (assetId) => RemoteAlbumAssetEntityCompanion(albumId: Value(albumId), assetId: Value(assetId)),
    );

-    await _db.transaction(() async {
-      await _db.batch((batch) {
-        batch.insertAll(_db.remoteAlbumAssetEntity, albumAssets);
-      });
-
-      final album = _db.update(_db.remoteAlbumEntity)
-        ..where((row) => row.id.equals(albumId) & row.thumbnailAssetId.isNull());
-
-      await album.write(RemoteAlbumEntityCompanion(thumbnailAssetId: Value(assetIds.first)));
+    await _db.batch((batch) {
+      batch.insertAll(_db.remoteAlbumAssetEntity, albumAssets);
    });

    return assetIds.length;
  }

-  /// Inserts a placeholder `remote_asset_entity` row from a freshly-uploaded
-  /// local asset. Skips silently if a row with the same id or
-  /// (owner_id, checksum) already exists — sync will overwrite with the
-  /// authoritative server data once the AssetUploadReadyV1 event is processed.
-  Future<void> upsertRemoteAssetStub({
-    required String remoteId,
-    required String ownerId,
-    required LocalAsset source,
-  }) async {
-    await _db
-        .into(_db.remoteAssetEntity)
-        .insert(
-          RemoteAssetEntityCompanion(
-            id: Value(remoteId),
-            ownerId: Value(ownerId),
-            checksum: Value(source.checksum ?? remoteId),
-            name: Value(source.name),
-            type: Value(source.type),
-            createdAt: Value(source.createdAt),
-            updatedAt: Value(source.updatedAt),
-            width: Value(source.width),
-            height: Value(source.height),
-            durationMs: Value(source.durationMs),
-            isFavorite: Value(source.isFavorite),
-            visibility: const Value(AssetVisibility.timeline),
-            isEdited: Value(source.isEdited),
-          ),
-          mode: InsertMode.insertOrIgnore,
-        );
-  }
-
  Future<void> addUsers(String albumId, List<String> userIds) {
    final albumUsers = userIds.map(
      (assetId) => RemoteAlbumUserEntityCompanion(
@@ -1,25 +1,8 @@
-import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
-import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/stack.model.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';

-class StackReconcileTarget {
-  final String stackId;
-  final String newPrimaryId;
-  final String localAssetId;
-  final String localAssetChecksum;
-
-  const StackReconcileTarget({
-    required this.stackId,
-    required this.newPrimaryId,
-    required this.localAssetId,
-    required this.localAssetChecksum,
-  });
-}
-
 class DriftStackRepository extends DriftDatabaseRepository {
  final Drift _db;
  const DriftStackRepository(this._db) : super(_db);
@@ -31,123 +14,6 @@ class DriftStackRepository extends DriftDatabaseRepository {
      return stack.toDto();
    }).get();
  }
-
-  // Per local id, find a stack member whose checksum matches the local's current
-  // checksum but isn't the stack primary — the iOS revert case where the local
-  // hashed back to the base while the primary still points at the edit.
-  Future<List<StackReconcileTarget>> findRevertReconcileTargets(Iterable<String> localAssetIds) async {
-    final ids = localAssetIds.toSet();
-    if (ids.isEmpty) {
-      return const [];
-    }
-
-    final targets = <StackReconcileTarget>[];
-    for (final slice in ids.slices(kDriftMaxChunk)) {
-      final placeholders = List.filled(slice.length, '?').join(',');
-      final rows = await _db
-          .customSelect(
-            '''
-        SELECT
-          s.id AS stack_id,
-          member.id AS new_primary,
-          local.id AS local_id,
-          local.checksum AS local_checksum
-        FROM local_asset_entity local
-        INNER JOIN remote_asset_entity prior ON prior.id = local.prior_remote_id
-        INNER JOIN stack_entity s ON s.id = prior.stack_id
-        INNER JOIN remote_asset_entity member
-          ON member.stack_id = s.id
-          AND member.checksum = local.checksum
-          AND member.deleted_at IS NULL
-        WHERE local.id IN ($placeholders)
-          AND s.primary_asset_id != member.id
-        ''',
-            variables: slice.map((id) => Variable<String>(id)).toList(),
-            readsFrom: {_db.localAssetEntity, _db.remoteAssetEntity, _db.stackEntity},
-          )
-          .get();
-
-      for (final row in rows) {
-        targets.add(
-          StackReconcileTarget(
-            stackId: row.read<String>('stack_id'),
-            newPrimaryId: row.read<String>('new_primary'),
-            localAssetId: row.read<String>('local_id'),
-            localAssetChecksum: row.read<String>('local_checksum'),
-          ),
-        );
-      }
-    }
-    return targets;
-  }
-
-  // The stack a remote asset belongs to, if any. Used by the revert path to find
-  // the stack from prior_remote_id when the reverted bytes can't be checksum-matched.
-  Future<String?> findStackIdByRemoteId(String remoteId) async {
-    final row = await _db
-        .customSelect(
-          'SELECT stack_id FROM remote_asset_entity WHERE id = ? AND stack_id IS NOT NULL AND deleted_at IS NULL',
-          variables: [Variable<String>(remoteId)],
-          readsFrom: {_db.remoteAssetEntity},
-        )
-        .getSingleOrNull();
-    return row?.read<String?>('stack_id');
-  }
-
-  // The stack's original base member to flip back to on revert: the earliest-
-  // uploaded member that isn't the (latest-edit) prior. The base is uploaded
-  // before its edits, so oldest uploaded_at = the original.
-  Future<String?> findStackBaseId(String stackId, {required String excludeId}) async {
-    final row = await _db
-        .customSelect(
-          '''
-          SELECT id FROM remote_asset_entity
-          WHERE stack_id = ? AND id != ? AND deleted_at IS NULL
-          ORDER BY uploaded_at IS NULL, uploaded_at ASC, id ASC
-          LIMIT 1
-          ''',
-          variables: [Variable<String>(stackId), Variable<String>(excludeId)],
-          readsFrom: {_db.remoteAssetEntity},
-        )
-        .getSingleOrNull();
-    return row?.read<String?>('id');
-  }
-
-  // Optimistic local primary flip so the timeline updates immediately; the
-  // server's stack-update websocket rewrites it shortly after.
-  Future<void> setPrimary(String stackId, String primaryAssetId) {
-    return (_db.stackEntity.update()..where((e) => e.id.equals(stackId))).write(
-      StackEntityCompanion(primaryAssetId: Value(primaryAssetId)),
-    );
-  }
-
-  // Optimistic local cleanup after a revert: detach every member, drop the stack,
-  // and delete the edit assets — atomically, so the timeline never shows members
-  // pointing at a deleted stack.
-  Future<void> applyRevertCleanup(String stackId, List<String> deletedAssetIds) {
-    return _db.batch((batch) {
-      batch.update(
-        _db.remoteAssetEntity,
-        const RemoteAssetEntityCompanion(stackId: Value(null)),
-        where: (e) => e.stackId.equals(stackId),
-      );
-      batch.deleteWhere(_db.stackEntity, (e) => e.id.equals(stackId));
-      for (final id in deletedAssetIds) {
-        batch.deleteWhere(_db.remoteAssetEntity, (e) => e.id.equals(id));
-      }
-    });
-  }
-
-  Future<List<String>> getOtherMemberIds(String stackId, String keepId) async {
-    final rows = await _db
-        .customSelect(
-          'SELECT id FROM remote_asset_entity WHERE stack_id = ? AND id != ? AND deleted_at IS NULL',
-          variables: [Variable<String>(stackId), Variable<String>(keepId)],
-          readsFrom: {_db.remoteAssetEntity},
-        )
-        .get();
-    return rows.map((r) => r.read<String>('id')).toList(growable: false);
-  }
 }

 extension on StackEntityData {
@@ -197,6 +197,16 @@ class SyncStreamRepository extends DriftDatabaseRepository {
    try {
      await _db.batch((batch) {
        for (final asset in data) {
+          // Avoid SqliteException(2067) when server re-issues a new id for
+          // the same (ownerId, checksum). #22522 #27186
+          _enqueueRemoteAssetDedupe(
+            batch,
+            id: asset.id,
+            ownerId: asset.ownerId,
+            checksum: asset.checksum,
+            libraryId: asset.libraryId,
+          );
+
          final companion = RemoteAssetEntityCompanion(
            name: Value(asset.originalFileName),
            type: Value(asset.type.toAssetType()),
@@ -236,6 +246,15 @@ class SyncStreamRepository extends DriftDatabaseRepository {
    try {
      await _db.batch((batch) {
        for (final asset in data) {
+          // See updateAssetsV1 for why this dedupe is required. #22522 #27186
+          _enqueueRemoteAssetDedupe(
+            batch,
+            id: asset.id,
+            ownerId: asset.ownerId,
+            checksum: asset.checksum,
+            libraryId: asset.libraryId,
+          );
+
          final companion = RemoteAssetEntityCompanion(
            name: Value(asset.originalFileName),
            type: Value(asset.type.toAssetType()),
@@ -271,6 +290,39 @@ class SyncStreamRepository extends DriftDatabaseRepository {
    }
  }

+  /// Queues a DELETE that prunes any stale remote_asset row matching the
+  /// partial UNIQUE index for the incoming asset:
+  ///   - libraryId IS NULL  -> (owner_id, checksum)
+  ///   - libraryId NOT NULL -> (owner_id, library_id, checksum)
+  /// The current id is excluded so a same-id update does not delete itself.
+  void _enqueueRemoteAssetDedupe(
+    Batch batch, {
+    required String id,
+    required String ownerId,
+    required String checksum,
+    required String? libraryId,
+  }) {
+    if (libraryId == null) {
+      batch.deleteWhere(
+        _db.remoteAssetEntity,
+        (row) =>
+            row.ownerId.equals(ownerId) &
+            row.checksum.equals(checksum) &
+            row.libraryId.isNull() &
+            row.id.equals(id).not(),
+      );
+    } else {
+      batch.deleteWhere(
+        _db.remoteAssetEntity,
+        (row) =>
+            row.ownerId.equals(ownerId) &
+            row.checksum.equals(checksum) &
+            row.libraryId.equals(libraryId) &
+            row.id.equals(id).not(),
+      );
+    }
+  }
+
  Future<void> updateAssetsExifV1(Iterable<SyncAssetExifV1> data, {String debugLabel = 'user'}) async {
    try {
      await _db.batch((batch) {
@@ -14,13 +14,4 @@ class TagsApiRepository extends ApiRepository {
  Future<List<TagResponseDto>?> getAllTags() async {
    return await _api.getAllTags();
  }
-
-  Future<int> bulkTagAssets(List<String> assetIds, List<String> tagIds) async {
-    final response = await _api.bulkTagAssets(TagBulkAssetsDto(assetIds: assetIds, tagIds: tagIds));
-    return response?.count ?? 0;
-  }
-
-  Future<List<TagResponseDto>?> upsertTags(List<String> tags) async {
-    return _api.upsertTags(TagUpsertDto(tags: tags));
-  }
 }
@@ -8,13 +8,13 @@ import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';
 import 'package:immich_mobile/widgets/common/search_field.dart';
 import 'package:logging/logging.dart';
@@ -43,7 +43,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
    _searchController = TextEditingController();
    _searchFocusNode = FocusNode();

-    _enableSyncUploadAlbum.value = ref.read(metadataProvider).appConfig.backup.syncAlbums;
+    _enableSyncUploadAlbum.value = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
    ref.read(backupAlbumProvider.notifier).getAll();

    _initialTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
@@ -55,7 +55,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
      return;
    }

-    final enableSyncUploadAlbum = ref.read(metadataProvider).appConfig.backup.syncAlbums;
+    final enableSyncUploadAlbum = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
    final selectedAlbums = ref
        .read(backupAlbumProvider)
        .where((a) => a.backupSelection == BackupSelection.selected)
@@ -103,7 +103,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
            return;
          }

-          final isBackupEnabled = MetadataRepository.instance.appConfig.backup.enabled;
+          final isBackupEnabled = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
          await ref.read(driftBackupProvider.notifier).getBackupStatus(user.id);
          final currentTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
          final totalChanged = currentTotalAssetCount != _initialTotalAssetCount;
@@ -3,12 +3,14 @@ import 'dart:async';
 import 'package:auto_route/auto_route.dart';
 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/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
+import 'package:immich_mobile/providers/app_settings.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/metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/backup_settings/drift_backup_settings.dart';
 import 'package:logging/logging.dart';

@@ -19,20 +21,18 @@ class DriftBackupOptionsPage extends ConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    bool hasPopped = false;
-    final previousBackup = ref.read(metadataProvider).appConfig.backup;
-    final previousCellularForVideos = previousBackup.useCellularForVideos;
-    final previousCellularForPhotos = previousBackup.useCellularForPhotos;
+    final previousWifiReqForVideos = Store.tryGet(StoreKey.useWifiForUploadVideos) ?? false;
+    final previousWifiReqForPhotos = Store.tryGet(StoreKey.useWifiForUploadPhotos) ?? false;
    return PopScope(
      onPopInvokedWithResult: (didPop, result) async {
        // There is an issue with Flutter where the pop event
        // can be triggered multiple times, so we guard it with _hasPopped

-        final currentBackup = ref.read(metadataProvider).appConfig.backup;
-        final currentCellularForVideos = currentBackup.useCellularForVideos;
-        final currentCellularForPhotos = currentBackup.useCellularForPhotos;
+        final currentWifiReqForVideos = Store.tryGet(StoreKey.useWifiForUploadVideos) ?? false;
+        final currentWifiReqForPhotos = Store.tryGet(StoreKey.useWifiForUploadPhotos) ?? false;

-        if (currentCellularForVideos == previousCellularForVideos &&
-            currentCellularForPhotos == previousCellularForPhotos) {
+        if (currentWifiReqForVideos == previousWifiReqForVideos &&
+            currentWifiReqForPhotos == previousWifiReqForPhotos) {
          return;
        }

@@ -45,7 +45,7 @@ class DriftBackupOptionsPage extends ConsumerWidget {
          }

          await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-          final isBackupEnabled = MetadataRepository.instance.appConfig.backup.enabled;
+          final isBackupEnabled = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
          if (!isBackupEnabled) {
            return;
          }
@@ -1,12 +1,14 @@
+import 'dart:convert';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/metadata_key.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';

 class SettingsHeader {
  String key = "";
@@ -22,14 +24,17 @@ class HeaderSettingsPage extends HookConsumerWidget {
    final headers = useState<List<SettingsHeader>>([]);
    final setInitialHeaders = useState(false);

-    final storedHeaders = ref.read(metadataProvider).systemConfig.network.customHeaders;
+    var headersStr = Store.get(StoreKey.customHeaders, "");
    if (!setInitialHeaders.value) {
-      storedHeaders.forEach((k, v) {
-        final header = SettingsHeader();
-        header.key = k;
-        header.value = v;
-        headers.value.add(header);
-      });
+      if (headersStr.isNotEmpty) {
+        var customHeaders = jsonDecode(headersStr) as Map;
+        customHeaders.forEach((k, v) {
+          final header = SettingsHeader();
+          header.key = k;
+          header.value = v;
+          headers.value.add(header);
+        });
+      }

      // add first one to help the user
      if (headers.value.isEmpty) {
@@ -83,8 +88,8 @@ class HeaderSettingsPage extends HookConsumerWidget {
  }

  saveHeaders(WidgetRef ref, List<SettingsHeader> headers) async {
-    final headersMap = <String, String>{};
-    for (final header in headers) {
+    final headersMap = {};
+    for (var header in headers) {
      final key = header.key.trim();
      final value = header.value.trim();

@@ -94,7 +99,8 @@ class HeaderSettingsPage extends HookConsumerWidget {
      headersMap[key] = value;
    }

-    await ref.read(metadataProvider).write(MetadataKey.networkCustomHeaders, headersMap);
+    var encoded = jsonEncode(headersMap);
+    await Store.put(StoreKey.customHeaders, encoded);
    await ref.read(apiServiceProvider).updateHeaders();
  }
 }
@@ -12,7 +12,6 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 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';
@@ -341,7 +340,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
                await backgroundManager.hashAssets();
              }

-              if (MetadataRepository.instance.appConfig.backup.syncAlbums) {
+              if (Store.get(StoreKey.syncAlbums, false)) {
                await backgroundManager.syncLinkedAlbum();
              }
            } catch (e) {
@@ -370,7 +369,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
  }

  Future<void> _resumeBackup(DriftBackupNotifier notifier) async {
-    final isEnableBackup = MetadataRepository.instance.appConfig.backup.enabled;
+    final isEnableBackup = Store.get(StoreKey.enableBackup, false);

    if (isEnableBackup) {
      final currentUser = Store.tryGet(StoreKey.currentUser);
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/shared_link/shared_link.model.dart';
 import 'package:immich_mobile/providers/shared_link.provider.dart';
 import 'package:immich_mobile/widgets/shared_link/shared_link_item.dart';
@@ -27,41 +28,71 @@ class SharedLinkPage extends HookConsumerWidget {
    }, []);

    Widget buildNoShares() {
-      return Center(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.center,
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Icon(Icons.link_off, size: 100, color: Theme.of(context).colorScheme.onSurface.withAlpha(128)),
-            const SizedBox(height: 20),
-            const Text("you_dont_have_any_shared_links", style: TextStyle(fontSize: 14)).tr(),
-          ],
-        ),
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(left: 16.0, top: 16.0),
+            child: const Text(
+              "shared_link_manage_links",
+              style: TextStyle(fontSize: 14, color: Colors.grey, fontWeight: FontWeight.bold),
+            ).tr(),
+          ),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+            child: Padding(
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              child: const Text("you_dont_have_any_shared_links", style: TextStyle(fontSize: 14)).tr(),
+            ),
+          ),
+          Expanded(
+            child: Center(
+              child: Icon(Icons.link_off, size: 100, color: context.themeData.iconTheme.color?.withValues(alpha: 0.5)),
+            ),
+          ),
+        ],
      );
    }

    Widget buildSharesList(List<SharedLink> links) {
-      return LayoutBuilder(
-        builder: (context, constraints) => constraints.maxWidth > 600
-            ? GridView.builder(
-                key: const PageStorageKey('shared-links-grid'),
-                gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                  crossAxisCount: 2,
-                  mainAxisExtent: 180,
-                  crossAxisSpacing: 12,
-                  mainAxisSpacing: 12,
-                ),
-                padding: const EdgeInsets.all(12),
-                itemCount: links.length,
-                itemBuilder: (context, index) => SharedLinkItem(links[index]),
-              )
-            : ListView.separated(
-                key: const PageStorageKey('shared-links-list'),
-                padding: const EdgeInsets.symmetric(vertical: 8),
-                itemCount: links.length,
-                itemBuilder: (context, index) => SharedLinkItem(links[index]),
-                separatorBuilder: (context, index) => const Divider(height: 1),
-              ),
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(left: 16.0, top: 16.0, bottom: 30.0),
+            child: Text(
+              "shared_link_manage_links",
+              style: context.textTheme.labelLarge?.copyWith(color: context.textTheme.labelLarge?.color?.withAlpha(200)),
+            ).tr(),
+          ),
+          Expanded(
+            child: LayoutBuilder(
+              builder: (context, constraints) {
+                if (constraints.maxWidth > 600) {
+                  // Two column
+                  return GridView.builder(
+                    gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                      crossAxisCount: 2,
+                      mainAxisExtent: 180,
+                    ),
+                    itemCount: links.length,
+                    itemBuilder: (context, index) {
+                      return SharedLinkItem(links.elementAt(index));
+                    },
+                  );
+                }
+
+                // Single column
+                return ListView.builder(
+                  itemCount: links.length,
+                  itemBuilder: (context, index) {
+                    return SharedLinkItem(links.elementAt(index));
+                  },
+                );
+              },
+            ),
+          ),
+        ],
      );
    }

@@ -6,20 +6,15 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/models/shared_link/shared_link.model.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/shared_link.provider.dart';
 import 'package:immich_mobile/services/shared_link.service.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
-import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
-import 'package:share_plus/share_plus.dart';

@RoutePage()
 class SharedLinkEditPage extends HookConsumerWidget {
-  static const int maxFutureDate = 365 * 2;
-
  final SharedLink? existingLink;
  final List<String>? assetsList;
  final String? albumId;
@@ -28,82 +23,71 @@ class SharedLinkEditPage extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
+    const padding = 20.0;
    final themeData = context.themeData;
    final colorScheme = context.colorScheme;
-    final externalDomain = ref.watch(serverInfoProvider.select((s) => s.serverConfig.externalDomain));
-    final displayServerUrl = externalDomain.isNotEmpty ? externalDomain : getServerUrl();
-    final expiryPresets = <(Duration, String)>[
-      (Duration.zero, context.t.never),
-      (const Duration(minutes: 30), context.t.shared_link_edit_expire_after_option_minutes(count: 30)),
-      (const Duration(hours: 1), context.t.shared_link_edit_expire_after_option_hour),
-      (const Duration(hours: 6), context.t.shared_link_edit_expire_after_option_hours(count: 6)),
-      (const Duration(days: 1), context.t.shared_link_edit_expire_after_option_day),
-      (const Duration(days: 7), context.t.shared_link_edit_expire_after_option_days(count: 7)),
-      (const Duration(days: 30), context.t.shared_link_edit_expire_after_option_days(count: 30)),
-      (const Duration(days: 90), context.t.shared_link_edit_expire_after_option_months(count: 3)),
-      (const Duration(days: 365), context.t.shared_link_edit_expire_after_option_year(count: 1)),
-    ];
    final descriptionController = useTextEditingController(text: existingLink?.description ?? "");
    final descriptionFocusNode = useFocusNode();
    final passwordController = useTextEditingController(text: existingLink?.password ?? "");
    final slugController = useTextEditingController(text: existingLink?.slug ?? "");
    final slugFocusNode = useFocusNode();
-    useListenable(slugController);
    final showMetadata = useState(existingLink?.showMetadata ?? true);
    final allowDownload = useState(existingLink?.allowDownload ?? true);
    final allowUpload = useState(existingLink?.allowUpload ?? false);
-    final expiryAfter = useState<DateTime?>(existingLink?.expiresAt?.toLocal());
-    final selectedPresetIndex = useState<int?>(existingLink?.expiresAt == null ? 0 : null);
+    final editExpiry = useState(false);
+    final expiryAfter = useState(0);
    final newShareLink = useState("");

-    Widget buildSharedLinkRow({required String leading, required String content}) {
-      return Row(
-        children: [
-          Expanded(
-            child: SingleChildScrollView(
-              scrollDirection: Axis.horizontal,
-              child: Text(
-                content,
-                style: TextStyle(color: colorScheme.primary, fontWeight: FontWeight.bold),
-              ),
-            ),
-          ),
-          const SizedBox(width: 8),
-          Text(leading, style: const TextStyle(fontWeight: FontWeight.bold)),
-        ],
-      );
-    }
-
    Widget buildLinkTitle() {
      if (existingLink != null) {
        if (existingLink!.type == SharedLinkSource.album) {
-          return buildSharedLinkRow(leading: context.t.public_album, content: existingLink!.title);
+          return Row(
+            children: [
+              const Text('public_album', style: TextStyle(fontWeight: FontWeight.bold)).tr(),
+              const Text(" | ", style: TextStyle(fontWeight: FontWeight.bold)),
+              Text(
+                existingLink!.title,
+                style: TextStyle(color: colorScheme.primary, fontWeight: FontWeight.bold),
+              ),
+            ],
+          );
        }

        if (existingLink!.type == SharedLinkSource.individual) {
-          return buildSharedLinkRow(
-            leading: context.t.shared_link_individual_shared,
-            content: existingLink!.description ?? "--",
+          return Row(
+            children: [
+              const Text('shared_link_individual_shared', style: TextStyle(fontWeight: FontWeight.bold)).tr(),
+              const Text(" | ", style: TextStyle(fontWeight: FontWeight.bold)),
+              Expanded(
+                child: Text(
+                  existingLink!.description ?? "--",
+                  style: TextStyle(color: colorScheme.primary, fontWeight: FontWeight.bold),
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ),
+            ],
          );
        }
      }

-      return Text(context.t.create_link_to_share_description, style: const TextStyle(fontWeight: FontWeight.bold));
+      return const Text("create_link_to_share_description", style: TextStyle(fontWeight: FontWeight.bold)).tr();
    }

    Widget buildDescriptionField() {
      return TextField(
        controller: descriptionController,
+        enabled: newShareLink.value.isEmpty,
        focusNode: descriptionFocusNode,
        textInputAction: TextInputAction.done,
        autofocus: false,
        decoration: InputDecoration(
-          labelText: context.t.description,
-          labelStyle: const TextStyle(fontWeight: FontWeight.bold),
+          labelText: 'description'.tr(),
+          labelStyle: TextStyle(fontWeight: FontWeight.bold, color: colorScheme.primary),
          floatingLabelBehavior: FloatingLabelBehavior.always,
          border: const OutlineInputBorder(),
-          hintText: context.t.shared_link_edit_description_hint,
+          hintText: 'shared_link_edit_description_hint'.tr(),
          hintStyle: const TextStyle(fontWeight: FontWeight.normal, fontSize: 14),
+          disabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey.withValues(alpha: 0.5))),
        ),
        onTapOutside: (_) => descriptionFocusNode.unfocus(),
      );
@@ -112,14 +96,16 @@ class SharedLinkEditPage extends HookConsumerWidget {
    Widget buildPasswordField() {
      return TextField(
        controller: passwordController,
+        enabled: newShareLink.value.isEmpty,
        autofocus: false,
        decoration: InputDecoration(
-          labelText: context.t.password,
-          labelStyle: const TextStyle(fontWeight: FontWeight.bold),
+          labelText: 'password'.tr(),
+          labelStyle: TextStyle(fontWeight: FontWeight.bold, color: colorScheme.primary),
          floatingLabelBehavior: FloatingLabelBehavior.always,
          border: const OutlineInputBorder(),
-          hintText: context.t.shared_link_edit_password_hint,
+          hintText: 'shared_link_edit_password_hint'.tr(),
          hintStyle: const TextStyle(fontWeight: FontWeight.normal, fontSize: 14),
+          disabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey.withValues(alpha: 0.5))),
        ),
      );
    }
@@ -127,16 +113,18 @@ class SharedLinkEditPage extends HookConsumerWidget {
    Widget buildSlugField() {
      return TextField(
        controller: slugController,
+        enabled: newShareLink.value.isEmpty,
        focusNode: slugFocusNode,
        textInputAction: TextInputAction.done,
        autofocus: false,
        decoration: InputDecoration(
-          labelText: slugController.text.isNotEmpty ? context.t.custom_url : null,
-          labelStyle: const TextStyle(fontWeight: FontWeight.bold),
+          labelText: 'custom_url'.tr(),
+          labelStyle: TextStyle(fontWeight: FontWeight.bold, color: colorScheme.primary),
+          floatingLabelBehavior: FloatingLabelBehavior.always,
          border: const OutlineInputBorder(),
-          hintText: context.t.custom_url,
-          prefixText: slugController.text.isNotEmpty ? '/s/' : null,
-          prefixStyle: const TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
+          hintText: 'custom_url'.tr(),
+          hintStyle: const TextStyle(fontWeight: FontWeight.normal, fontSize: 14),
+          disabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey.withValues(alpha: 0.5))),
        ),
        onTapOutside: (_) => slugFocusNode.unfocus(),
      );
@@ -145,182 +133,145 @@ class SharedLinkEditPage extends HookConsumerWidget {
    Widget buildShowMetaButton() {
      return SwitchListTile.adaptive(
        value: showMetadata.value,
-        onChanged: (value) => showMetadata.value = value,
+        onChanged: newShareLink.value.isEmpty ? (value) => showMetadata.value = value : null,
+        activeThumbColor: colorScheme.primary,
        dense: true,
-        title: Text(
-          context.t.show_metadata,
-          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
-        ),
+        title: Text("show_metadata", style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold)).tr(),
      );
    }

    Widget buildAllowDownloadButton() {
      return SwitchListTile.adaptive(
        value: allowDownload.value,
-        onChanged: (value) => allowDownload.value = value,
+        onChanged: newShareLink.value.isEmpty ? (value) => allowDownload.value = value : null,
+        activeThumbColor: colorScheme.primary,
        dense: true,
        title: Text(
-          context.t.allow_public_user_to_download,
+          "allow_public_user_to_download",
          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
-        ),
+        ).tr(),
      );
    }

    Widget buildAllowUploadButton() {
      return SwitchListTile.adaptive(
        value: allowUpload.value,
-        onChanged: (value) => allowUpload.value = value,
+        onChanged: newShareLink.value.isEmpty ? (value) => allowUpload.value = value : null,
+        activeThumbColor: colorScheme.primary,
        dense: true,
        title: Text(
-          context.t.allow_public_user_to_upload,
+          "allow_public_user_to_upload",
          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
-        ),
+        ).tr(),
      );
    }

-    String formatDateTime(DateTime dateTime) => DateFormat.yMMMd(context.locale.toString()).add_Hm().format(dateTime);
-
-    DateTime? getExpiresAtFromPreset(Duration preset) => preset == Duration.zero ? null : DateTime.now().add(preset);
-
-    Future<void> selectDate() async {
-      final today = DateTime.now();
-      final safeInitialDate = expiryAfter.value ?? today.add(const Duration(days: 7));
-      final initialDate = safeInitialDate.isBefore(today) ? today : safeInitialDate;
-
-      final selectedDate = await showDatePicker(
-        context: context,
-        initialDate: initialDate,
-        firstDate: today,
-        lastDate: today.add(const Duration(days: maxFutureDate)),
+    Widget buildEditExpiryButton() {
+      return SwitchListTile.adaptive(
+        value: editExpiry.value,
+        onChanged: newShareLink.value.isEmpty ? (value) => editExpiry.value = value : null,
+        activeThumbColor: colorScheme.primary,
+        dense: true,
+        title: Text(
+          "change_expiration_time",
+          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
+        ).tr(),
      );
-
-      if (selectedDate != null && context.mounted) {
-        final isToday =
-            selectedDate.year == today.year && selectedDate.month == today.month && selectedDate.day == today.day;
-        final initialTime = isToday ? TimeOfDay.fromDateTime(today) : const TimeOfDay(hour: 12, minute: 0);
-
-        final selectedTime = await showTimePicker(context: context, initialTime: initialTime);
-
-        if (selectedTime != null) {
-          final now = DateTime.now();
-          var finalDateTime = DateTime(
-            selectedDate.year,
-            selectedDate.month,
-            selectedDate.day,
-            selectedTime.hour,
-            selectedTime.minute,
-          );
-
-          if (finalDateTime.isBefore(now) && isToday) {
-            finalDateTime = now;
-          }
-
-          selectedPresetIndex.value = null;
-          expiryAfter.value = finalDateTime;
-        }
-      }
    }

    Widget buildExpiryAfterButton() {
-      return ExpansionTile(
-        title: Text(
-          context.t.expire_after,
-          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
-        ),
-        subtitle: Text(
-          expiryAfter.value == null ? context.t.shared_link_expires_never : formatDateTime(expiryAfter.value!),
-          style: TextStyle(color: themeData.colorScheme.primary),
-        ),
+      return DropdownMenu(
+        label: Text(
+          "expire_after",
+          style: TextStyle(fontWeight: FontWeight.bold, color: colorScheme.primary),
+        ).tr(),
+        enableSearch: false,
+        enableFilter: false,
+        width: context.width - 40,
+        initialSelection: expiryAfter.value,
+        enabled: newShareLink.value.isEmpty && (existingLink == null || editExpiry.value),
+        onSelected: (value) {
+          expiryAfter.value = value!;
+        },
+        dropdownMenuEntries: [
+          DropdownMenuEntry(value: 0, label: "never".tr()),
+          DropdownMenuEntry(
+            value: 30,
+            label: "shared_link_edit_expire_after_option_minutes".tr(namedArgs: {'count': "30"}),
+          ),
+          DropdownMenuEntry(value: 60, label: "shared_link_edit_expire_after_option_hour".tr()),
+          DropdownMenuEntry(
+            value: 60 * 6,
+            label: "shared_link_edit_expire_after_option_hours".tr(namedArgs: {'count': "6"}),
+          ),
+          DropdownMenuEntry(value: 60 * 24, label: "shared_link_edit_expire_after_option_day".tr()),
+          DropdownMenuEntry(
+            value: 60 * 24 * 7,
+            label: "shared_link_edit_expire_after_option_days".tr(namedArgs: {'count': "7"}),
+          ),
+          DropdownMenuEntry(
+            value: 60 * 24 * 30,
+            label: "shared_link_edit_expire_after_option_days".tr(namedArgs: {'count': "30"}),
+          ),
+          DropdownMenuEntry(
+            value: 60 * 24 * 30 * 3,
+            label: "shared_link_edit_expire_after_option_months".tr(namedArgs: {'count': "3"}),
+          ),
+          DropdownMenuEntry(
+            value: 60 * 24 * 30 * 12,
+            label: "shared_link_edit_expire_after_option_year".tr(namedArgs: {'count': "1"}),
+          ),
+        ],
+      );
+    }
+
+    void copyLinkToClipboard() {
+      Clipboard.setData(ClipboardData(text: newShareLink.value)).then((_) {
+        context.scaffoldMessenger.showSnackBar(
+          SnackBar(
+            content: Text(
+              "shared_link_clipboard_copied_massage",
+              style: context.textTheme.bodyLarge?.copyWith(color: context.primaryColor),
+            ).tr(),
+            duration: const Duration(seconds: 2),
+          ),
+        );
+      });
+    }
+
+    Widget buildNewLinkField() {
+      return Column(
        children: [
+          const Padding(padding: EdgeInsets.only(top: 20, bottom: 20), child: Divider()),
+          TextFormField(
+            readOnly: true,
+            initialValue: newShareLink.value,
+            decoration: InputDecoration(
+              border: const OutlineInputBorder(),
+              enabledBorder: themeData.inputDecorationTheme.focusedBorder,
+              suffixIcon: IconButton(onPressed: copyLinkToClipboard, icon: const Icon(Icons.copy)),
+            ),
+          ),
          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Wrap(
-                  spacing: 8,
-                  runSpacing: 8,
-                  children: List.generate(expiryPresets.length, (index) {
-                    final preset = expiryPresets[index];
-                    return ChoiceChip(
-                      label: Text(preset.$2),
-                      selected: selectedPresetIndex.value == index,
-                      onSelected: (_) {
-                        selectedPresetIndex.value = index;
-                        expiryAfter.value = getExpiresAtFromPreset(preset.$1);
-                      },
-                    );
-                  }),
-                ),
-                if (expiryAfter.value != null) ...[
-                  const SizedBox(height: 16),
-                  SizedBox(
-                    width: double.infinity,
-                    child: OutlinedButton.icon(
-                      onPressed: selectDate,
-                      icon: const Icon(Icons.edit_calendar),
-                      label: Text(context.t.edit_date_and_time),
-                    ),
-                  ),
-                ],
-              ],
+            padding: const EdgeInsets.only(top: 16.0),
+            child: Align(
+              alignment: Alignment.bottomRight,
+              child: ElevatedButton(
+                onPressed: () {
+                  context.maybePop();
+                },
+                child: const Text("done", style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)).tr(),
+              ),
            ),
          ),
        ],
      );
    }

-    Future<void> copyToClipboard(String link) async {
-      await Clipboard.setData(ClipboardData(text: link));
-      if (!context.mounted) {
-        return;
-      }
-      context.scaffoldMessenger.showSnackBar(
-        SnackBar(
-          content: Text(
-            context.t.shared_link_clipboard_copied_massage,
-            style: context.textTheme.bodyLarge?.copyWith(color: context.primaryColor),
-          ),
-          duration: const Duration(seconds: 2),
-        ),
-      );
+    DateTime calculateExpiry() {
+      return DateTime.now().add(Duration(minutes: expiryAfter.value));
    }

-    Widget buildLinkCopyField(String link) {
-      return TextFormField(
-        readOnly: true,
-        onTap: () => copyToClipboard(link),
-        initialValue: link,
-        decoration: InputDecoration(
-          border: const OutlineInputBorder(),
-          enabledBorder: themeData.inputDecorationTheme.focusedBorder,
-          suffixIcon: IconButton(onPressed: () => Share.share(link), icon: const Icon(Icons.share)),
-        ),
-      );
-    }
-
-    Widget buildNewLinkReadyScreen() {
-      return Padding(
-        padding: const EdgeInsets.all(20),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Icon(Icons.add_link, size: 100, color: themeData.colorScheme.primary),
-            const SizedBox(height: 20),
-            buildLinkCopyField(newShareLink.value),
-            const SizedBox(height: 20),
-            ElevatedButton.icon(
-              onPressed: () => context.maybePop(),
-              icon: const Icon(Icons.check),
-              label: Text(context.t.done, style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
-            ),
-          ],
-        ),
-      );
-    }
-
-    DateTime? calculateExpiry() => expiryAfter.value;
-
    Future<void> handleNewLink() async {
      final newLink = await ref
          .read(sharedLinkServiceProvider)
@@ -333,30 +284,30 @@ class SharedLinkEditPage extends HookConsumerWidget {
            description: descriptionController.text.isEmpty ? null : descriptionController.text,
            password: passwordController.text.isEmpty ? null : passwordController.text,
            slug: slugController.text.isEmpty ? null : slugController.text,
-            expiresAt: calculateExpiry()?.toUtc(),
+            expiresAt: expiryAfter.value == 0 ? null : calculateExpiry(),
          );
-      if (!context.mounted) {
-        return;
-      }
      ref.invalidate(sharedLinksStateProvider);

      await ref.read(serverInfoProvider.notifier).getServerConfig();
-      if (!context.mounted) {
-        return;
-      }
      final externalDomain = ref.read(serverInfoProvider.select((s) => s.serverConfig.externalDomain));

-      final serverUrl = externalDomain.isNotEmpty ? externalDomain : getServerUrl();
+      var serverUrl = externalDomain.isNotEmpty ? externalDomain : getServerUrl();
+      if (serverUrl != null && !serverUrl.endsWith('/')) {
+        serverUrl += '/';
+      }

-      if (newLink != null) {
-        newShareLink.value = buildSharedLinkUrl(baseUrl: serverUrl, slug: newLink.slug, key: newLink.key) ?? '';
-        await copyToClipboard(newShareLink.value);
-      } else {
+      if (newLink != null && serverUrl != null) {
+        final hasSlug = newLink.slug?.isNotEmpty == true;
+        final urlPath = hasSlug ? newLink.slug : newLink.key;
+        final basePath = hasSlug ? 's' : 'share';
+        newShareLink.value = "$serverUrl$basePath/$urlPath";
+        copyLinkToClipboard();
+      } else if (newLink == null) {
        ImmichToast.show(
          context: context,
          gravity: ToastGravity.BOTTOM,
          toastType: ToastType.error,
-          msg: context.t.shared_link_create_error,
+          msg: 'shared_link_create_error'.tr(),
        );
      }
    }
@@ -397,9 +348,8 @@ class SharedLinkEditPage extends HookConsumerWidget {
        slug = existingLink!.slug;
      }

-      final newExpiry = expiryAfter.value;
-      if (newExpiry?.toUtc() != existingLink!.expiresAt?.toUtc()) {
-        expiry = newExpiry;
+      if (editExpiry.value) {
+        expiry = expiryAfter.value == 0 ? null : calculateExpiry();
        changeExpiry = true;
      }

@@ -413,115 +363,69 @@ class SharedLinkEditPage extends HookConsumerWidget {
            description: desc,
            password: password,
            slug: slug,
-            expiresAt: expiry?.toUtc(),
+            expiresAt: expiry,
            changeExpiry: changeExpiry,
          );
-      if (!context.mounted) {
-        return;
-      }
      ref.invalidate(sharedLinksStateProvider);
      await context.maybePop();
    }

-    Future<void> handleDeleteLink() async {
-      return showDialog(
-        context: context,
-        builder: (BuildContext context) => ConfirmDialog(
-          title: "delete_shared_link_dialog_title",
-          content: "confirm_delete_shared_link",
-          onOk: () async {
-            await ref.read(sharedLinkServiceProvider).deleteSharedLink(existingLink!.id);
-            ref.invalidate(sharedLinksStateProvider);
-            if (context.mounted) {
-              await context.maybePop();
-            }
-          },
-        ),
-      );
-    }
-
    return Scaffold(
      appBar: AppBar(
-        title: Text(existingLink == null ? context.t.create_link_to_share : context.t.edit_link),
+        title: Text(existingLink == null ? "create_link_to_share" : "edit_link").tr(),
        elevation: 0,
        leading: const CloseButton(),
        centerTitle: false,
      ),
      body: SafeArea(
-        child: newShareLink.value.isEmpty
-            ? Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 20),
-                child: ListView(
-                  children: [
-                    const SizedBox(height: 20),
-                    buildLinkTitle(),
-                    if (existingLink != null)
-                      Column(
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
-                          const SizedBox(height: 16),
-                          buildLinkCopyField(
-                            buildSharedLinkUrl(
-                                  baseUrl: displayServerUrl,
-                                  slug: existingLink!.slug,
-                                  key: existingLink!.key,
-                                ) ??
-                                '',
-                          ),
-                          const SizedBox(height: 24),
-                          const Divider(),
-                        ],
-                      ),
-                    const SizedBox(height: 24),
-                    buildDescriptionField(),
-                    const SizedBox(height: 16),
-                    buildPasswordField(),
-                    const SizedBox(height: 16),
-                    buildSlugField(),
-                    const SizedBox(height: 16),
-                    buildShowMetaButton(),
-                    const SizedBox(height: 16),
-                    buildAllowDownloadButton(),
-                    const SizedBox(height: 16),
-                    buildAllowUploadButton(),
-                    const SizedBox(height: 16),
-                    buildExpiryAfterButton(),
-                    const SizedBox(height: 24),
-                    Align(
-                      alignment: Alignment.centerRight,
-                      child: Row(
-                        mainAxisSize: MainAxisSize.min,
-                        spacing: 8,
-                        children: [
-                          if (existingLink != null)
-                            OutlinedButton.icon(
-                              style: OutlinedButton.styleFrom(
-                                foregroundColor: themeData.colorScheme.error,
-                                side: BorderSide(color: themeData.colorScheme.error),
-                              ),
-                              onPressed: handleDeleteLink,
-                              icon: const Icon(Icons.delete_outline),
-                              label: Text(
-                                context.t.delete,
-                                style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
-                              ),
-                            ),
-                          ElevatedButton.icon(
-                            icon: const Icon(Icons.check),
-                            onPressed: existingLink != null ? handleEditLink : handleNewLink,
-                            label: Text(
-                              existingLink != null ? context.t.shared_link_edit_submit_button : context.t.create_link,
-                              style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                    const SizedBox(height: 40),
-                  ],
+        child: ListView(
+          children: [
+            Padding(padding: const EdgeInsets.all(padding), child: buildLinkTitle()),
+            Padding(padding: const EdgeInsets.all(padding), child: buildDescriptionField()),
+            Padding(padding: const EdgeInsets.all(padding), child: buildPasswordField()),
+            Padding(padding: const EdgeInsets.all(padding), child: buildSlugField()),
+            Padding(
+              padding: const EdgeInsets.only(left: padding, right: padding, bottom: padding),
+              child: buildShowMetaButton(),
+            ),
+            Padding(
+              padding: const EdgeInsets.only(left: padding, right: padding, bottom: padding),
+              child: buildAllowDownloadButton(),
+            ),
+            Padding(
+              padding: const EdgeInsets.only(left: padding, right: 20, bottom: 20),
+              child: buildAllowUploadButton(),
+            ),
+            if (existingLink != null)
+              Padding(
+                padding: const EdgeInsets.only(left: padding, right: padding, bottom: padding),
+                child: buildEditExpiryButton(),
+              ),
+            Padding(
+              padding: const EdgeInsets.only(left: padding, right: padding, bottom: padding),
+              child: buildExpiryAfterButton(),
+            ),
+            if (newShareLink.value.isEmpty)
+              Align(
+                alignment: Alignment.bottomRight,
+                child: Padding(
+                  padding: const EdgeInsets.only(right: padding + 10, bottom: padding),
+                  child: ElevatedButton(
+                    onPressed: existingLink != null ? handleEditLink : handleNewLink,
+                    child: Text(
+                      existingLink != null ? "shared_link_edit_submit_button" : "create_link",
+                      style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
+                    ).tr(),
+                  ),
                ),
-              )
-            : Center(child: buildNewLinkReadyScreen()),
+              ),
+            if (newShareLink.value.isNotEmpty)
+              Padding(
+                padding: const EdgeInsets.only(left: padding, right: padding, bottom: padding),
+                child: buildNewLinkField(),
+              ),
+          ],
+        ),
      ),
    );
  }
@@ -88,8 +88,6 @@ int _deepHash(Object? value) {

 enum PlatformAssetPlaybackStyle { unknown, image, video, imageAnimated, livePhoto, videoLooping }

-enum EditState { notEdited, edited, unknown }
-
 class PlatformAsset {
  PlatformAsset({
    required this.id,
@@ -397,55 +395,6 @@ class CloudIdResult {
  int get hashCode => _deepHash(<Object?>[runtimeType, ..._toList()]);
 }

-class BaseResource {
-  BaseResource({required this.path, required this.sha1, required this.sizeBytes, required this.mimeType});
-
-  String path;
-
-  String sha1;
-
-  int sizeBytes;
-
-  String mimeType;
-
-  List<Object?> _toList() {
-    return <Object?>[path, sha1, sizeBytes, mimeType];
-  }
-
-  Object encode() {
-    return _toList();
-  }
-
-  static BaseResource decode(Object result) {
-    result as List<Object?>;
-    return BaseResource(
-      path: result[0]! as String,
-      sha1: result[1]! as String,
-      sizeBytes: result[2]! as int,
-      mimeType: result[3]! as String,
-    );
-  }
-
-  @override
-  // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  bool operator ==(Object other) {
-    if (other is! BaseResource || other.runtimeType != runtimeType) {
-      return false;
-    }
-    if (identical(this, other)) {
-      return true;
-    }
-    return _deepEquals(path, other.path) &&
-        _deepEquals(sha1, other.sha1) &&
-        _deepEquals(sizeBytes, other.sizeBytes) &&
-        _deepEquals(mimeType, other.mimeType);
-  }
-
-  @override
-  // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => _deepHash(<Object?>[runtimeType, ..._toList()]);
-}
-
 class _PigeonCodec extends StandardMessageCodec {
  const _PigeonCodec();
  @override
@@ -456,26 +405,20 @@ class _PigeonCodec extends StandardMessageCodec {
    } else if (value is PlatformAssetPlaybackStyle) {
      buffer.putUint8(129);
      writeValue(buffer, value.index);
-    } else if (value is EditState) {
-      buffer.putUint8(130);
-      writeValue(buffer, value.index);
    } else if (value is PlatformAsset) {
-      buffer.putUint8(131);
+      buffer.putUint8(130);
      writeValue(buffer, value.encode());
    } else if (value is PlatformAlbum) {
-      buffer.putUint8(132);
+      buffer.putUint8(131);
      writeValue(buffer, value.encode());
    } else if (value is SyncDelta) {
-      buffer.putUint8(133);
+      buffer.putUint8(132);
      writeValue(buffer, value.encode());
    } else if (value is HashResult) {
-      buffer.putUint8(134);
+      buffer.putUint8(133);
      writeValue(buffer, value.encode());
    } else if (value is CloudIdResult) {
-      buffer.putUint8(135);
-      writeValue(buffer, value.encode());
-    } else if (value is BaseResource) {
-      buffer.putUint8(136);
+      buffer.putUint8(134);
      writeValue(buffer, value.encode());
    } else {
      super.writeValue(buffer, value);
@@ -489,20 +432,15 @@ class _PigeonCodec extends StandardMessageCodec {
        final value = readValue(buffer) as int?;
        return value == null ? null : PlatformAssetPlaybackStyle.values[value];
      case 130:
-        final value = readValue(buffer) as int?;
-        return value == null ? null : EditState.values[value];
-      case 131:
        return PlatformAsset.decode(readValue(buffer)!);
-      case 132:
+      case 131:
        return PlatformAlbum.decode(readValue(buffer)!);
-      case 133:
+      case 132:
        return SyncDelta.decode(readValue(buffer)!);
-      case 134:
+      case 133:
        return HashResult.decode(readValue(buffer)!);
-      case 135:
+      case 134:
        return CloudIdResult.decode(readValue(buffer)!);
-      case 136:
-        return BaseResource.decode(readValue(buffer)!);
      default:
        return super.readValueOfType(type, buffer);
    }
@@ -734,42 +672,4 @@ class NativeSyncApi {
    );
    return (pigeonVar_replyValue! as List<Object?>).cast<CloudIdResult>();
  }
-
-  Future<BaseResource?> getBaseResource(String assetId, {bool allowNetworkAccess = false}) async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getBaseResource$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[assetId, allowNetworkAccess]);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: true,
-    );
-    return pigeonVar_replyValue as BaseResource?;
-  }
-
-  Future<EditState> getEditState(String assetId, {bool allowNetworkAccess = false}) async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getEditState$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[assetId, allowNetworkAccess]);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return pigeonVar_replyValue! as EditState;
-  }
 }
@@ -37,7 +37,6 @@ class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {

    final scrollView = CustomScrollView(
      controller: _scrollController,
-      physics: const AlwaysScrollableScrollPhysics(),
      slivers: [
        ImmichSliverAppBar(
          snap: false,
@@ -5,6 +5,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';

@RoutePage()
 class DriftAssetSelectionTimelinePage extends ConsumerWidget {
@@ -21,13 +22,17 @@ class DriftAssetSelectionTimelinePage extends ConsumerWidget {
          ),
        ),
        timelineServiceProvider.overrideWith((ref) {
-          final timelineUsers = ref.watch(timelineUsersProvider).valueOrNull ?? [];
-          final timelineService = ref.watch(timelineFactoryProvider).main(timelineUsers);
+          final user = ref.watch(currentUserProvider);
+          if (user == null) {
+            throw Exception('User must be logged in to access asset selection timeline');
+          }
+
+          final timelineService = ref.watch(timelineFactoryProvider).remoteAssets(user.id);
          ref.onDispose(timelineService.dispose);
          return timelineService;
        }),
      ],
-      child: const Timeline(showStorageIndicator: true),
+      child: const Timeline(),
    );
  }
 }
@@ -179,14 +179,17 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
    }

    final album = await ref
-        .read(remoteAlbumProvider.notifier)
-        .createAlbumWithAssets(
+        .watch(remoteAlbumProvider.notifier)
+        .createAlbum(
          title: title,
          description: albumDescriptionController.text.trim(),
-          assets: selectedAssets,
+          assetIds: selectedAssets.map((asset) {
+            final remoteAsset = asset as RemoteAsset;
+            return remoteAsset.id;
+          }).toList(),
        );

-    if (album != null && context.mounted) {
+    if (album != null) {
      unawaited(context.replaceRoute(RemoteAlbumRoute(album: album)));
    }
  }
@@ -8,7 +8,6 @@ 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/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/album/pending_uploads_banner.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/remote_album/drift_album_option.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
@@ -40,8 +39,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
  }

  Future<void> addAssets(BuildContext context) async {
-    final notifier = ref.read(remoteAlbumProvider.notifier);
-    final albumAssets = await notifier.getAssets(_album.id);
+    final albumAssets = await ref.read(remoteAlbumProvider.notifier).getAssets(_album.id);

    final newAssets = await context.pushRoute<Set<BaseAsset>>(
      DriftAssetSelectionTimelineRoute(lockedSelectionAssets: albumAssets.toSet()),
@@ -51,9 +49,17 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
      return;
    }

-    final added = await notifier.addAssetsToAlbum(_album.id, newAssets);
+    final added = await ref
+        .read(remoteAlbumProvider.notifier)
+        .addAssets(
+          _album.id,
+          newAssets.map((asset) {
+            final remoteAsset = asset as RemoteAsset;
+            return remoteAsset.id;
+          }).toList(),
+        );

-    if (added > 0 && context.mounted) {
+    if (added > 0) {
      ImmichToast.show(
        context: context,
        msg: "assets_added_to_album_count".t(context: context, args: {'count': added.toString()}),
@@ -180,7 +186,6 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
        currentRemoteAlbumScopedProvider.overrideWithValue(_album),
      ],
      child: Timeline(
-        topSliverWidget: PendingUploadsBanner(albumId: _album.id),
        appBar: RemoteAlbumSliverAppBar(
          icon: Icons.photo_album_outlined,
          kebabMenu: _AlbumKebabMenu(
@@ -1,376 +0,0 @@
-import 'dart:async';
-import 'dart:math';
-import 'dart:ui';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/config/slideshow_config.dart';
-import 'package:immich_mobile/domain/services/timeline.service.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/scroll_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/pages/common/settings.page.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
-import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';
-import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
-import 'package:wakelock_plus/wakelock_plus.dart';
-
-@RoutePage()
-class DriftSlideshowPage extends ConsumerStatefulWidget {
-  final TimelineService timeline;
-
-  const DriftSlideshowPage({super.key, required this.timeline});
-
-  @override
-  ConsumerState<DriftSlideshowPage> createState() => _DriftSlideshowPageState();
-}
-
-class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> {
-  late SlideshowConfig _config;
-  late final PageController _pageController;
-  late final Stopwatch _stopwatch;
-  late Timer _timer;
-  late int _index;
-  late int _nextIndex;
-  bool _paused = false;
-  bool _showAppBar = false;
-
-  @override
-  initState() {
-    super.initState();
-    _config = ref.read(appConfigProvider.select((s) => s.slideshow));
-    final asset = ref.read(assetViewerProvider).currentAsset;
-    _index = asset == null ? 0 : widget.timeline.getIndex(asset.heroTag) ?? 0;
-    _pageController = PageController(initialPage: _index);
-    _stopwatch = Stopwatch();
-    _createTimer();
-    _updateNextIndex();
-    ref.listenManual(appConfigProvider.select((s) => s.slideshow), _onConfigChanged);
-
-    SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-    unawaited(WakelockPlus.enable());
-  }
-
-  @override
-  dispose() {
-    _timer.cancel();
-    _stopwatch.stop();
-    _pageController.dispose();
-    unawaited(WakelockPlus.disable());
-    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-    super.dispose();
-  }
-
-  void _play() {
-    final asset = widget.timeline.getAssetSafe(_index)!;
-
-    if (asset.isImage) {
-      _createTimer();
-    } else if (ref.read(videoPlayerProvider(asset.heroTag)).status == VideoPlaybackStatus.paused) {
-      ref.read(videoPlayerProvider(asset.heroTag).notifier).play();
-    } else {
-      _nextPage();
-    }
-
-    _updateNextIndex();
-
-    setState(() {
-      _paused = false;
-    });
-  }
-
-  void _pause() {
-    _timer.cancel();
-    _stopwatch.stop();
-
-    final asset = widget.timeline.getAssetSafe(_index)!;
-
-    if (!asset.isImage) {
-      ref.read(videoPlayerProvider(asset.heroTag).notifier).pause();
-    }
-
-    setState(() {
-      _paused = true;
-    });
-  }
-
-  void _onConfigChanged(SlideshowConfig? previous, SlideshowConfig next) {
-    if (_config == next) {
-      return;
-    }
-
-    final durationChanged = _config.duration != next.duration;
-    _config = next;
-    _updateNextIndex();
-
-    final asset = widget.timeline.getAssetSafe(_index);
-    if (durationChanged && !_paused && asset?.isImage == true) {
-      _timer.cancel();
-      _createTimer();
-    }
-
-    setState(() {});
-  }
-
-  void _updateNextIndex() {
-    _nextIndex = switch (_config.direction) {
-      SlideshowDirection.forward => _index + 1,
-      SlideshowDirection.backward => _index - 1,
-      SlideshowDirection.shuffle => widget.timeline.getIndex(widget.timeline.getRandomAsset().heroTag)!,
-    };
-
-    if (!widget.timeline.hasRange(_nextIndex, 1)) {
-      widget.timeline.preloadAssets(_nextIndex);
-    }
-  }
-
-  void _nextPage() async {
-    if (_nextIndex < 0 || _nextIndex >= widget.timeline.totalAssets) {
-      if (_config.repeat) {
-        final wrapped = _config.direction == SlideshowDirection.forward ? 0 : widget.timeline.totalAssets - 1;
-        await widget.timeline.preloadAssets(wrapped);
-        _pageController.jumpToPage(wrapped);
-      } else {
-        setState(() {
-          _paused = true;
-        });
-      }
-      return;
-    }
-
-    if (!widget.timeline.hasRange(_nextIndex, 1)) {
-      await widget.timeline.preloadAssets(_nextIndex);
-    }
-
-    if (_config.direction == SlideshowDirection.shuffle || !_config.transition) {
-      _pageController.jumpToPage(_nextIndex);
-    } else {
-      unawaited(_pageController.animateToPage(_nextIndex, duration: Durations.long2, curve: Curves.easeIn));
-    }
-  }
-
-  void _createTimer() {
-    _timer = Timer(Duration(milliseconds: _config.duration * 1000 - _stopwatch.elapsedMilliseconds), () {
-      _stopwatch.stop();
-      _stopwatch.reset();
-      _nextPage();
-    });
-
-    _stopwatch.start();
-  }
-
-  void _pageChanged(int page) {
-    final asset = widget.timeline.getAssetSafe(page)!;
-
-    setState(() {
-      _index = page;
-
-      if (!asset.isImage) {
-        _paused = false;
-      }
-    });
-
-    _timer.cancel();
-    _stopwatch.stop();
-    _stopwatch.reset();
-
-    if (!_paused && asset.isImage) {
-      _createTimer();
-    }
-
-    _updateNextIndex();
-  }
-
-  void _onTapUp() async {
-    await SystemChrome.setEnabledSystemUIMode(_showAppBar ? SystemUiMode.immersive : SystemUiMode.edgeToEdge);
-
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      setState(() {
-        _showAppBar = !_showAppBar;
-      });
-    });
-  }
-
-  Widget _getProgressBar(BuildContext context) {
-    final asset = widget.timeline.getAssetSafe(_index);
-
-    if (asset == null) {
-      return Container();
-    }
-
-    if (asset.isImage) {
-      final elapsed = _stopwatch.elapsedMilliseconds;
-      final duration = _config.duration * 1000;
-
-      return TweenAnimationBuilder(
-        key: Key(_index.toString()),
-        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(
-        color: context.colorScheme.primary,
-        borderRadius: const BorderRadius.all(Radius.zero),
-        minHeight: 5,
-        value:
-            ref.watch(videoPlayerProvider(asset.heroTag).select((s) => s.position)).inMilliseconds /
-            asset.duration.inMilliseconds,
-      );
-    }
-  }
-
-  Widget _getBlur(BuildContext context, int index) {
-    final asset = widget.timeline.getAssetSafe(index);
-
-    if (asset == null) {
-      return Container();
-    }
-
-    return ImageFiltered(
-      imageFilter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
-      child: Container(
-        decoration: BoxDecoration(
-          image: DecorationImage(
-            image: getFullImageProvider(asset, size: Size(context.width, context.height)),
-            fit: BoxFit.cover,
-          ),
-        ),
-        child: Container(color: Colors.black.withValues(alpha: 0.2)),
-      ),
-    );
-  }
-
-  Widget _getPhotoView(BuildContext context, int index) {
-    final asset = widget.timeline.getAssetSafe(index);
-
-    if (asset == null) {
-      return const Center(child: ImmichLoadingIndicator());
-    }
-
-    final scale = _config.look == SlideshowLook.cover
-        ? PhotoViewComputedScale.covered
-        : PhotoViewComputedScale.contained;
-    final isCurrent = _index == index;
-    final imageProvider = getFullImageProvider(asset, size: context.sizeData);
-
-    if (asset.isImage) {
-      final zoomOut = index % 2 == 1;
-      final elapsed = _stopwatch.elapsedMilliseconds;
-      final duration = _config.duration * 1000;
-      final progress = zoomOut ? 1.0 - elapsed / duration.toDouble() : elapsed / duration.toDouble();
-
-      return TweenAnimationBuilder(
-        tween: Tween<double>(
-          begin: progress,
-          end: _paused
-              ? progress
-              : zoomOut
-              ? 0.0
-              : 1.0,
-        ),
-        duration: Duration(milliseconds: _paused ? 1 : max(duration - elapsed, 1)),
-        builder: (context, value, _) => PhotoView(
-          imageProvider: imageProvider,
-          index: index,
-          disableScaleGestures: true,
-          gaplessPlayback: true,
-          filterQuality: FilterQuality.high,
-          initialScale: scale * (1.0 + value / 10.0),
-          controller: PhotoViewController(),
-          onTapUp: (_, _, _) => _onTapUp(),
-        ),
-      );
-    } else {
-      final status = ref.watch(videoPlayerProvider(asset.heroTag).select((s) => s.status));
-      final position = ref.read(videoPlayerProvider(asset.heroTag)).position;
-
-      if (status == VideoPlaybackStatus.completed && isCurrent && position.inMicroseconds > 0) {
-        _nextPage();
-      } else if (status == VideoPlaybackStatus.playing) {
-        ref.read(videoPlayerProvider(asset.heroTag).notifier).setLoop(false);
-      }
-
-      return PhotoView.customChild(
-        onTapUp: (_, _, _) => _onTapUp(),
-        disableScaleGestures: true,
-        filterQuality: FilterQuality.high,
-        initialScale: scale,
-        child: NativeVideoViewer(
-          asset: asset,
-          isCurrent: isCurrent,
-          image: Image(image: imageProvider, fit: BoxFit.contain, alignment: Alignment.center),
-        ),
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: PreferredSize(
-        preferredSize: Size(AppBar().preferredSize.width, AppBar().preferredSize.height + 5),
-        child: IgnorePointer(
-          ignoring: !_showAppBar,
-          child: AnimatedOpacity(
-            opacity: _showAppBar ? 1.0 : 0.0,
-            duration: Durations.short2,
-            child: Column(
-              children: [
-                AppBar(
-                  backgroundColor: context.scaffoldBackgroundColor,
-                  title: Text("slideshow".t(context: context)),
-                  actions: [
-                    IconButton(
-                      onPressed: _paused ? _play : _pause,
-                      icon: Icon(_paused ? Icons.play_arrow : Icons.pause),
-                    ),
-                    IconButton(
-                      onPressed: () {
-                        _pause();
-                        context.pushRoute(SettingsSubRoute(section: SettingSection.assetViewer));
-                      },
-                      icon: const Icon(Icons.settings),
-                    ),
-                  ],
-                ),
-                _getProgressBar(context),
-              ],
-            ),
-          ),
-        ),
-      ),
-      extendBody: true,
-      extendBodyBehindAppBar: true,
-      backgroundColor: Colors.black,
-      body: PhotoViewGestureDetectorScope(
-        axis: Axis.horizontal,
-        child: PageView.builder(
-          controller: _pageController,
-          physics: const FastClampingScrollPhysics(),
-          itemCount: widget.timeline.totalAssets,
-          onPageChanged: _pageChanged,
-          itemBuilder: (context, index) => Stack(
-            children: [
-              if (_config.look == SlideshowLook.blurredBackground) _getBlur(context, index),
-              _getPhotoView(context, index),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
@@ -186,7 +186,7 @@ class DriftSearchPage extends HookConsumerWidget {
            expanded: true,
            onSearch: handleApply,
            onClear: handleClear,
-            child: TagPicker(onSelectExistingTag: handleOnSelect, filter: (filter.value.tagIds ?? []).toSet()),
+            child: TagPicker(onSelect: handleOnSelect, filter: (filter.value.tagIds ?? []).toSet()),
          ),
        ),
      );
@@ -50,13 +50,10 @@ class BaseActionButton extends ConsumerWidget {
      final iconColor = this.iconColor;

      return MenuItemButton(
-        style: MenuItemButton.styleFrom(
-          alignment: Alignment.centerLeft,
-          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
-        ),
-        leadingIcon: Icon(iconData, color: iconColor, size: 20),
+        style: MenuItemButton.styleFrom(alignment: Alignment.centerLeft, padding: const EdgeInsets.all(16)),
+        leadingIcon: Icon(iconData, color: iconColor),
        onPressed: onPressed,
-        child: Text(label, style: TextStyle(fontSize: 15, color: iconColor)),
+        child: Text(label, style: TextStyle(fontSize: 16, color: iconColor)),
      );
    }

@@ -1,46 +0,0 @@
-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/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.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';
-
-class BulkTagAssetsActionButton extends ConsumerWidget {
-  final ActionSource source;
-
-  const BulkTagAssetsActionButton({super.key, required this.source});
-
-  Future<void> _onTap(BuildContext context, WidgetRef ref) async {
-    final result = await ref.read(actionProvider.notifier).tagAssets(source, context);
-    if (result == null) {
-      return;
-    }
-
-    ref.read(multiSelectProvider.notifier).reset();
-
-    if (!context.mounted) {
-      return;
-    }
-
-    ImmichToast.show(
-      context: context,
-      msg: result.success
-          ? 'tagged_assets'.t(context: context, args: {'count': result.count.toString()})
-          : 'errors.failed_to_tag_assets'.t(context: context),
-      gravity: ToastGravity.BOTTOM,
-      toastType: result.success ? ToastType.success : ToastType.error,
-    );
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.sell_outlined,
-      label: "control_bottom_app_bar_add_tags".t(context: context),
-      onPressed: () => _onTap(context, ref),
-    );
-  }
-}
@@ -1,34 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.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/infrastructure/timeline.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-
-class SlideshowActionButton extends ConsumerWidget {
-  final bool iconOnly;
-  final bool menuItem;
-
-  const SlideshowActionButton({super.key, this.iconOnly = false, this.menuItem = false});
-
-  void _onTap(BuildContext context, WidgetRef ref) {
-    if (!context.mounted) {
-      return;
-    }
-
-    context.pushRoute(DriftSlideshowRoute(timeline: ref.read(timelineServiceProvider)));
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.slideshow,
-      label: "slideshow".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-      onPressed: () => _onTap(context, ref),
-      maxWidth: 100,
-    );
-  }
-}
@@ -15,15 +15,15 @@ import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/album/new_album_name_modal.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
-import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/album_filter.utils.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -58,11 +58,19 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
    super.initState();

    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final albumConfig = ref.read(metadataProvider).appConfig.album;
+      final appSettings = ref.read(appSettingsServiceProvider);
+      final savedSortMode = appSettings.getSetting(AppSettingsEnum.selectedAlbumSortOrder);
+      final savedIsReverse = appSettings.getSetting(AppSettingsEnum.selectedAlbumSortReverse);
+      final savedIsGrid = appSettings.getSetting(AppSettingsEnum.albumGridView);
+
+      final albumSortMode = AlbumSortMode.values.firstWhere(
+        (e) => e.storeIndex == savedSortMode,
+        orElse: () => AlbumSortMode.lastModified,
+      );

      setState(() {
-        sort = AlbumSort(mode: albumConfig.sortMode, isReverse: albumConfig.isReverse);
-        isGrid = albumConfig.isGrid;
+        sort = AlbumSort(mode: albumSortMode, isReverse: savedIsReverse);
+        isGrid = savedIsGrid;
      });

      ref.read(remoteAlbumProvider.notifier).refresh();
@@ -94,7 +102,7 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
    setState(() {
      isGrid = !isGrid;
    });
-    ref.read(metadataProvider).write(MetadataKey.albumIsGrid, isGrid);
+    ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.albumGridView, isGrid);
  }

  void changeFilter(QuickFilterMode mode) {
@@ -110,9 +118,9 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
      this.sort = sort;
    });

-    final metadata = ref.read(metadataProvider);
-    await metadata.write(MetadataKey.albumSortMode, sort.mode);
-    await metadata.write(MetadataKey.albumIsReverse, sort.isReverse);
+    final appSettings = ref.read(appSettingsServiceProvider);
+    await appSettings.setSetting(AppSettingsEnum.selectedAlbumSortOrder, sort.mode.storeIndex);
+    await appSettings.setSetting(AppSettingsEnum.selectedAlbumSortReverse, sort.isReverse);

    await sortAlbums();
  }
@@ -1,252 +0,0 @@
-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/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
-import 'package:immich_mobile/providers/album/pending_album_uploads.provider.dart';
-
-/// Pinned banner sliver that surfaces in-flight album uploads directly under
-/// the album app bar. Renders nothing while the queue is empty. Tapping the
-/// banner opens a bottom sheet with per-asset progress.
-class PendingUploadsBanner extends ConsumerWidget {
-  static const double _height = 52;
-
-  final String albumId;
-
-  const PendingUploadsBanner({super.key, required this.albumId});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final pending = ref.watch(pendingAlbumUploadsProvider(albumId));
-    if (pending.isEmpty) {
-      return const SliverToBoxAdapter(child: SizedBox.shrink());
-    }
-
-    final hasFailures = pending.any((p) => p.failed);
-    final clamped = pending.map((p) => p.progress.clamp(0.0, 1.0)).toList(growable: false);
-    final overallProgress = clamped.isEmpty ? 0.0 : clamped.reduce((a, b) => a + b) / clamped.length;
-    final isIndeterminate = overallProgress <= 0.0;
-
-    return SliverPersistentHeader(
-      pinned: true,
-      delegate: _PendingUploadsBannerDelegate(
-        height: _height,
-        child: _PendingUploadsBannerContent(
-          albumId: albumId,
-          previewAsset: pending.first.asset,
-          count: pending.length,
-          overallProgress: overallProgress,
-          isIndeterminate: isIndeterminate,
-          hasFailures: hasFailures,
-        ),
-      ),
-    );
-  }
-
-  static void _openSheet(BuildContext context, String albumId) {
-    showModalBottomSheet(
-      context: context,
-      showDragHandle: true,
-      builder: (_) => _PendingUploadsSheet(albumId: albumId),
-    );
-  }
-}
-
-class _PendingUploadsBannerDelegate extends SliverPersistentHeaderDelegate {
-  final double height;
-  final Widget child;
-
-  const _PendingUploadsBannerDelegate({required this.height, required this.child});
-
-  @override
-  double get minExtent => height;
-
-  @override
-  double get maxExtent => height;
-
-  @override
-  Widget build(BuildContext context, double shrinkOffset, bool overlapsContent) => child;
-
-  @override
-  bool shouldRebuild(covariant _PendingUploadsBannerDelegate oldDelegate) =>
-      height != oldDelegate.height || child != oldDelegate.child;
-}
-
-class _PendingUploadsBannerContent extends StatelessWidget {
-  final String albumId;
-  final BaseAsset previewAsset;
-  final int count;
-  final double overallProgress;
-  final bool isIndeterminate;
-  final bool hasFailures;
-
-  const _PendingUploadsBannerContent({
-    required this.albumId,
-    required this.previewAsset,
-    required this.count,
-    required this.overallProgress,
-    required this.isIndeterminate,
-    required this.hasFailures,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final percentLabel = isIndeterminate ? '' : ' · ${(overallProgress * 100).toInt()}%';
-    return Material(
-      color: hasFailures ? context.colorScheme.errorContainer : context.colorScheme.surfaceContainerHigh,
-      child: InkWell(
-        onTap: () => PendingUploadsBanner._openSheet(context, albumId),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Expanded(
-              child: Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 16),
-                child: Row(
-                  children: [
-                    ClipRRect(
-                      borderRadius: const BorderRadius.all(Radius.circular(4)),
-                      child: SizedBox(width: 32, height: 32, child: Thumbnail.fromAsset(asset: previewAsset)),
-                    ),
-                    const SizedBox(width: 12),
-                    Expanded(
-                      child: Text(
-                        '${'uploading'.t(context: context)} $count$percentLabel',
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                        style: context.textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w500),
-                      ),
-                    ),
-                    if (hasFailures)
-                      Padding(
-                        padding: const EdgeInsets.only(left: 8),
-                        child: Icon(Icons.error_outline, color: context.colorScheme.error, size: 20),
-                      ),
-                    Icon(Icons.chevron_right_rounded, color: context.colorScheme.onSurfaceVariant),
-                  ],
-                ),
-              ),
-            ),
-            SizedBox(
-              height: 3,
-              child: LinearProgressIndicator(
-                value: isIndeterminate ? null : overallProgress,
-                backgroundColor: context.colorScheme.surfaceContainerHighest,
-                valueColor: AlwaysStoppedAnimation<Color>(
-                  hasFailures ? context.colorScheme.error : context.colorScheme.primary,
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _PendingUploadsSheet extends ConsumerWidget {
-  final String albumId;
-
-  const _PendingUploadsSheet({required this.albumId});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final pending = ref.watch(pendingAlbumUploadsProvider(albumId));
-
-    // Auto-dismiss when the queue empties.
-    if (pending.isEmpty) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (Navigator.of(context).canPop()) {
-          Navigator.of(context).pop();
-        }
-      });
-      return const SizedBox.shrink();
-    }
-
-    final failedCount = pending.where((p) => p.failed).length;
-
-    return SafeArea(
-      child: Padding(
-        padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(bottom: 12),
-              child: Row(
-                children: [
-                  Expanded(
-                    child: Text(
-                      '${'uploading'.t(context: context)} (${pending.length})',
-                      style: context.textTheme.titleMedium,
-                    ),
-                  ),
-                  if (failedCount > 0)
-                    TextButton.icon(
-                      onPressed: () => ref.read(pendingAlbumUploadsProvider(albumId).notifier).clearFailed(),
-                      icon: const Icon(Icons.clear_rounded, size: 18),
-                      label: Text('clear_failed_count'.t(context: context, args: {'count': failedCount})),
-                      style: TextButton.styleFrom(foregroundColor: context.colorScheme.error),
-                    ),
-                ],
-              ),
-            ),
-            SizedBox(
-              height: 96,
-              child: ListView.separated(
-                scrollDirection: Axis.horizontal,
-                itemCount: pending.length,
-                separatorBuilder: (_, __) => const SizedBox(width: 8),
-                itemBuilder: (_, index) => _PendingUploadTile(entry: pending[index]),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _PendingUploadTile extends StatelessWidget {
-  final PendingAlbumUpload entry;
-
-  const _PendingUploadTile({required this.entry});
-
-  @override
-  Widget build(BuildContext context) {
-    return ClipRRect(
-      borderRadius: const BorderRadius.all(Radius.circular(8)),
-      child: SizedBox(
-        width: 96,
-        height: 96,
-        child: Stack(
-          fit: StackFit.expand,
-          children: [
-            Thumbnail.fromAsset(asset: entry.asset),
-            Positioned.fill(
-              child: ColoredBox(
-                color: entry.failed ? Colors.red.withValues(alpha: 0.6) : Colors.black54,
-                child: Center(
-                  child: entry.failed
-                      ? const Icon(Icons.error_outline, color: Colors.white, size: 28)
-                      : SizedBox(
-                          width: 32,
-                          height: 32,
-                          child: CircularProgressIndicator(
-                            value: entry.progress > 0 ? entry.progress : null,
-                            strokeWidth: 2.5,
-                            backgroundColor: Colors.white24,
-                            valueColor: const AlwaysStoppedAnimation<Color>(Colors.white),
-                          ),
-                        ),
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
@@ -56,13 +56,10 @@ class _AssetPageState extends ConsumerState<AssetPage> {
  _DragIntent _dragIntent = _DragIntent.none;
  Drag? _drag;

-  BaseAsset? _asset;
-
  @override
  void initState() {
    super.initState();
    _eventSubscription = EventStream.shared.listen(_onEvent);
-    _asset = ref.read(timelineServiceProvider).getAssetSafe(widget.index);
    WidgetsBinding.instance.addPostFrameCallback((_) {
      if (!mounted || !_scrollController.hasClients) {
        return;
@@ -74,14 +71,6 @@ class _AssetPageState extends ConsumerState<AssetPage> {
    });
  }

-  @override
-  void didUpdateWidget(AssetPage oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.index != widget.index) {
-      _asset = ref.read(timelineServiceProvider).getAssetSafe(widget.index);
-    }
-  }
-
  @override
  void dispose() {
    _scrollController.dispose();
@@ -394,7 +383,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
    final stackIndex = ref.watch(assetViewerProvider.select((s) => s.stackIndex));
    final isPlayingMotionVideo = ref.watch(isPlayingMotionVideoProvider);

-    final asset = _asset;
+    final asset = ref.read(timelineServiceProvider).getAssetSafe(widget.index);
    if (asset == null) {
      return const Center(child: ImmichLoadingIndicator());
    }
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';

 class BackupToggleButton extends ConsumerStatefulWidget {
  final VoidCallback onStart;
@@ -31,7 +31,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton> with Sin
      end: 1,
    ).animate(CurvedAnimation(parent: _animationController, curve: Curves.easeInOut));

-    _isEnabled = ref.read(metadataProvider).appConfig.backup.enabled;
+    _isEnabled = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
  }

  @override
@@ -41,7 +41,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton> with Sin
  }

  Future<void> _onToggle(bool value) async {
-    await ref.read(metadataProvider).write(MetadataKey.backupEnabled, value);
+    await ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.enableBackup, value);

    setState(() {
      _isEnabled = value;
@@ -8,7 +8,6 @@ import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/advanced_info_action_button.widget.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';
 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';
@@ -27,7 +26,6 @@ import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.d
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user_metadata.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -59,9 +57,6 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
    final multiselect = ref.watch(multiSelectProvider);
    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(Setting.advancedTroubleshooting);
-    final tagsEnabled = ref.watch(
-      userMetadataPreferencesProvider.select((value) => value.valueOrNull?.tagsEnabled ?? false),
-    );

    Future<void> addAssetsToAlbum(RemoteAlbum album) async {
      final selectedAssets = multiselect.selectedAssets;
@@ -119,7 +114,6 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
              : const DeletePermanentActionButton(source: ActionSource.timeline),
          const FavoriteActionButton(source: ActionSource.timeline),
          const ArchiveActionButton(source: ActionSource.timeline),
-          if (tagsEnabled) const BulkTagAssetsActionButton(source: ActionSource.timeline),
          const EditDateTimeActionButton(source: ActionSource.timeline),
          const EditLocationActionButton(source: ActionSource.timeline),
          const MoveToLockFolderActionButton(source: ActionSource.timeline),
@@ -120,9 +120,6 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
                    },
                    flightShuttleBuilder: (context, animation, direction, from, to) {
                      void animationStatusListener(AnimationStatus status) {
-                        if (!mounted) {
-                          return;
-                        }
                        final heroInFlight = status == AnimationStatus.forward || status == AnimationStatus.reverse;
                        if (_hideIndicators != heroInFlight) {
                          setState(() => _hideIndicators = heroInFlight);
@@ -242,11 +242,7 @@ class _AssetTileWidget extends ConsumerWidget {
      return false;
    }

-    // Iterate with `==` instead of `Set.contains` because `RemoteAsset.hashCode`
-    // includes `localId` while `==` does not — so the same server asset can
-    // hash to a different bucket when its `localId` differs (e.g., album-fetched
-    // copy has localId=null, merged-timeline copy has it populated).
-    return lockSelectionAssets.any((a) => a == asset);
+    return lockSelectionAssets.contains(asset);
  }

  @override
@@ -64,32 +64,36 @@ class Timeline extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return LayoutBuilder(
-      builder: (_, constraints) => ProviderScope(
-        overrides: [
-          timelineArgsProvider.overrideWith(
-            (ref) => TimelineArgs(
-              maxWidth: constraints.maxWidth,
-              maxHeight: constraints.maxHeight,
-              columnCount: ref.watch(appConfigProvider.select((config) => config.timeline.tilesPerRow)),
-              showStorageIndicator: showStorageIndicator,
-              withStack: withStack,
-              groupBy: groupBy,
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      floatingActionButton: const DownloadStatusFloatingButton(),
+      body: LayoutBuilder(
+        builder: (_, constraints) => ProviderScope(
+          overrides: [
+            timelineArgsProvider.overrideWith(
+              (ref) => TimelineArgs(
+                maxWidth: constraints.maxWidth,
+                maxHeight: constraints.maxHeight,
+                columnCount: ref.watch(appConfigProvider.select((config) => config.timeline.tilesPerRow)),
+                showStorageIndicator: showStorageIndicator,
+                withStack: withStack,
+                groupBy: groupBy,
+              ),
            ),
+            if (readOnly) readonlyModeProvider.overrideWith(() => _AlwaysReadOnlyNotifier()),
+          ],
+          child: _SliverTimeline(
+            topSliverWidget: topSliverWidget,
+            topSliverWidgetHeight: topSliverWidgetHeight,
+            bottomSliverWidget: bottomSliverWidget,
+            appBar: appBar,
+            bottomSheet: bottomSheet,
+            withScrubber: withScrubber,
+            persistentBottomBar: persistentBottomBar,
+            snapToMonth: snapToMonth,
+            maxWidth: constraints.maxWidth,
+            loadingWidget: loadingWidget,
          ),
-          if (readOnly) readonlyModeProvider.overrideWith(() => _AlwaysReadOnlyNotifier()),
-        ],
-        child: _SliverTimeline(
-          topSliverWidget: topSliverWidget,
-          topSliverWidgetHeight: topSliverWidgetHeight,
-          bottomSliverWidget: bottomSliverWidget,
-          appBar: appBar,
-          bottomSheet: bottomSheet,
-          withScrubber: withScrubber,
-          persistentBottomBar: persistentBottomBar,
-          snapToMonth: snapToMonth,
-          maxWidth: constraints.maxWidth,
-          loadingWidget: loadingWidget,
        ),
      ),
    );
@@ -375,126 +379,121 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
          ref.read(multiSelectProvider.notifier).reset();
        }
      },
-      child: PrimaryScrollController(
-        controller: _scrollController,
-        child: Scaffold(
-          resizeToAvoidBottomInset: false,
-          floatingActionButton: const DownloadStatusFloatingButton(),
-          body: asyncSegments.widgetWhen(
-            onLoading: widget.loadingWidget != null ? () => widget.loadingWidget! : null,
-            onData: (segments) {
-              final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
-              final double appBarExpandedHeight = widget.appBar != null && widget.appBar is MesmerizingSliverAppBar
-                  ? 200
-                  : 0;
-              final topPadding = context.padding.top + (widget.appBar == null ? 0 : kToolbarHeight) + 10;
+      child: asyncSegments.widgetWhen(
+        onLoading: widget.loadingWidget != null ? () => widget.loadingWidget! : null,
+        onData: (segments) {
+          final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
+          final double appBarExpandedHeight = widget.appBar != null && widget.appBar is MesmerizingSliverAppBar
+              ? 200
+              : 0;
+          final topPadding = context.padding.top + (widget.appBar == null ? 0 : kToolbarHeight) + 10;

-              const bottomSheetOpenModifier = 120.0;
-              final contentBottomPadding =
-                  context.padding.bottom + (isMultiSelectEnabled ? bottomSheetOpenModifier : 0);
-              final scrubberBottomPadding = contentBottomPadding + kScrubberThumbHeight;
+          const bottomSheetOpenModifier = 120.0;
+          final contentBottomPadding = context.padding.bottom + (isMultiSelectEnabled ? bottomSheetOpenModifier : 0);
+          final scrubberBottomPadding = contentBottomPadding + kScrubberThumbHeight;

-              final grid = CustomScrollView(
-                primary: true,
-                physics: _scrollPhysics,
-                cacheExtent: maxHeight * 2,
-                slivers: [
-                  if (isSelectionMode) const SelectionSliverAppBar() else if (widget.appBar != null) widget.appBar!,
-                  if (widget.topSliverWidget != null) widget.topSliverWidget!,
-                  _SliverSegmentedList(
-                    segments: segments,
-                    delegate: SliverChildBuilderDelegate(
-                      (ctx, index) {
-                        if (index >= childCount) {
-                          return null;
-                        }
-                        final segment = segments.findByIndex(index);
-                        return segment?.builder(ctx, index) ?? const SizedBox.shrink();
-                      },
-                      childCount: childCount,
-                      addAutomaticKeepAlives: false,
-                      // We add repaint boundary around tiles, so skip the auto boundaries
-                      addRepaintBoundaries: false,
-                    ),
-                  ),
-                  if (widget.bottomSliverWidget != null) widget.bottomSliverWidget!,
-                  SliverPadding(padding: EdgeInsets.only(bottom: contentBottomPadding)),
-                ],
-              );
-
-              final Widget timeline;
-              if (widget.withScrubber) {
-                timeline = Scrubber(
-                  snapToMonth: widget.snapToMonth,
-                  layoutSegments: segments,
-                  timelineHeight: maxHeight,
-                  topPadding: topPadding,
-                  bottomPadding: scrubberBottomPadding,
-                  monthSegmentSnappingOffset: widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
-                  hasAppBar: widget.appBar != null,
-                  child: grid,
-                );
-              } else {
-                timeline = grid;
-              }
-
-              return RawGestureDetector(
-                gestures: {
-                  CustomScaleGestureRecognizer: GestureRecognizerFactoryWithHandlers<CustomScaleGestureRecognizer>(
-                    () => CustomScaleGestureRecognizer(),
-                    (CustomScaleGestureRecognizer scale) {
-                      scale.onStart = (details) {
-                        _baseScaleFactor = _scaleFactor;
-                      };
-
-                      scale.onUpdate = (details) {
-                        final newScaleFactor = math.max(math.min(5.0, _baseScaleFactor * details.scale), 1.0);
-                        final newPerRow = 7 - newScaleFactor.toInt();
-
-                        if (newPerRow != _perRow) {
-                          final targetAssetIndex = _getCurrentAssetIndex(segments);
-                          setState(() {
-                            _scaleFactor = newScaleFactor;
-                            _perRow = newPerRow;
-                            _restoreAssetIndex = targetAssetIndex;
-                          });
-
-                          ref.read(metadataProvider).write(MetadataKey.timelineTilesPerRow, _perRow);
-                        }
-                      };
-                    },
-                  ),
-                },
-                child: TimelineDragRegion(
-                  onStart: !isReadonlyModeEnabled ? _setDragStartIndex : null,
-                  onAssetEnter: _handleDragAssetEnter,
-                  onEnd: !isReadonlyModeEnabled ? _stopDrag : null,
-                  onScroll: _dragScroll,
-                  onScrollStart: () {
-                    // Minimize the bottom sheet when drag selection starts
-                    ref.read(timelineStateProvider.notifier).setScrolling(true);
+          final grid = CustomScrollView(
+            primary: true,
+            physics: _scrollPhysics,
+            cacheExtent: maxHeight * 2,
+            slivers: [
+              if (isSelectionMode) const SelectionSliverAppBar() else if (widget.appBar != null) widget.appBar!,
+              if (widget.topSliverWidget != null) widget.topSliverWidget!,
+              _SliverSegmentedList(
+                segments: segments,
+                delegate: SliverChildBuilderDelegate(
+                  (ctx, index) {
+                    if (index >= childCount) {
+                      return null;
+                    }
+                    final segment = segments.findByIndex(index);
+                    return segment?.builder(ctx, index) ?? const SizedBox.shrink();
                  },
-                  child: Stack(
-                    clipBehavior: Clip.none,
-                    children: [
-                      timeline,
-                      if (isBottomWidgetVisible)
-                        Positioned(
-                          top: MediaQuery.paddingOf(context).top,
-                          left: 25,
-                          child: const SizedBox(
-                            height: kToolbarHeight,
-                            child: Center(child: _MultiSelectStatusButton()),
-                          ),
-                        ),
-                      if (isBottomWidgetVisible) widget.bottomSheet!,
-                    ],
-                  ),
+                  childCount: childCount,
+                  addAutomaticKeepAlives: false,
+                  // We add repaint boundary around tiles, so skip the auto boundaries
+                  addRepaintBoundaries: false,
                ),
-              );
-            },
-          ),
-        ),
+              ),
+              if (widget.bottomSliverWidget != null) widget.bottomSliverWidget!,
+              SliverPadding(padding: EdgeInsets.only(bottom: contentBottomPadding)),
+            ],
+          );
+
+          final Widget timeline;
+          if (widget.withScrubber) {
+            timeline = Scrubber(
+              snapToMonth: widget.snapToMonth,
+              layoutSegments: segments,
+              timelineHeight: maxHeight,
+              topPadding: topPadding,
+              bottomPadding: scrubberBottomPadding,
+              monthSegmentSnappingOffset: widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
+              hasAppBar: widget.appBar != null,
+              child: grid,
+            );
+          } else {
+            timeline = grid;
+          }
+
+          return PrimaryScrollController(
+            controller: _scrollController,
+            child: RawGestureDetector(
+              gestures: {
+                CustomScaleGestureRecognizer: GestureRecognizerFactoryWithHandlers<CustomScaleGestureRecognizer>(
+                  () => CustomScaleGestureRecognizer(),
+                  (CustomScaleGestureRecognizer scale) {
+                    scale.onStart = (details) {
+                      _baseScaleFactor = _scaleFactor;
+                    };
+
+                    scale.onUpdate = (details) {
+                      final newScaleFactor = math.max(math.min(5.0, _baseScaleFactor * details.scale), 1.0);
+                      final newPerRow = 7 - newScaleFactor.toInt();
+
+                      if (newPerRow != _perRow) {
+                        final targetAssetIndex = _getCurrentAssetIndex(segments);
+                        setState(() {
+                          _scaleFactor = newScaleFactor;
+                          _perRow = newPerRow;
+                          _restoreAssetIndex = targetAssetIndex;
+                        });
+
+                        ref.read(metadataProvider).write(MetadataKey.timelineTilesPerRow, _perRow);
+                      }
+                    };
+                  },
+                ),
+              },
+              child: TimelineDragRegion(
+                onStart: !isReadonlyModeEnabled ? _setDragStartIndex : null,
+                onAssetEnter: _handleDragAssetEnter,
+                onEnd: !isReadonlyModeEnabled ? _stopDrag : null,
+                onScroll: _dragScroll,
+                onScrollStart: () {
+                  // Minimize the bottom sheet when drag selection starts
+                  ref.read(timelineStateProvider.notifier).setScrolling(true);
+                },
+                child: Stack(
+                  clipBehavior: Clip.none,
+                  children: [
+                    timeline,
+                    if (isBottomWidgetVisible)
+                      Positioned(
+                        top: MediaQuery.paddingOf(context).top,
+                        left: 25,
+                        child: const SizedBox(
+                          height: kToolbarHeight,
+                          child: Center(child: _MultiSelectStatusButton()),
+                        ),
+                      ),
+                    if (isBottomWidgetVisible) widget.bottomSheet!,
+                  ],
+                ),
+              ),
+            ),
+          );
+        },
      ),
    );
  }
@@ -1,81 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-
-class PendingAlbumUpload {
-  final LocalAsset asset;
-  final double progress;
-  final bool failed;
-
-  const PendingAlbumUpload({required this.asset, this.progress = 0.0, this.failed = false});
-
-  PendingAlbumUpload copyWith({double? progress, bool? failed}) =>
-      PendingAlbumUpload(asset: asset, progress: progress ?? this.progress, failed: failed ?? this.failed);
-}
-
-class AlbumPendingUploadsNotifier extends AutoDisposeFamilyNotifier<List<PendingAlbumUpload>, String> {
-  KeepAliveLink? _keepAliveLink;
-
-  @override
-  List<PendingAlbumUpload> build(String albumId) {
-    ref.onDispose(() {
-      _keepAliveLink?.close();
-      _keepAliveLink = null;
-    });
-
-    return const [];
-  }
-
-  void enqueue(Iterable<LocalAsset> assets) {
-    if (assets.isEmpty) {
-      return;
-    }
-
-    final existingIds = state.map((e) => e.asset.id).toSet();
-    final additions = assets.where((a) => !existingIds.contains(a.id)).map((a) => PendingAlbumUpload(asset: a));
-    state = [...state, ...additions];
-    _syncKeepAlive();
-  }
-
-  void updateProgress(String localAssetId, double progress) {
-    state = [
-      for (final entry in state)
-        if (entry.asset.id == localAssetId) entry.copyWith(progress: progress, failed: false) else entry,
-    ];
-    _syncKeepAlive();
-  }
-
-  void markFailed(String localAssetId) {
-    state = [
-      for (final entry in state)
-        if (entry.asset.id == localAssetId) entry.copyWith(failed: true) else entry,
-    ];
-    _syncKeepAlive();
-  }
-
-  void markAllFailed() {
-    state = [for (final entry in state) entry.copyWith(failed: true)];
-    _syncKeepAlive();
-  }
-
-  void remove(String localAssetId) {
-    state = state.where((e) => e.asset.id != localAssetId).toList();
-    _syncKeepAlive();
-  }
-
-  void clearFailed() {
-    state = state.where((e) => !e.failed).toList();
-    _syncKeepAlive();
-  }
-
-  void _syncKeepAlive() {
-    if (state.isEmpty) {
-      _keepAliveLink?.close();
-      _keepAliveLink = null;
-    } else {
-      _keepAliveLink ??= ref.keepAlive();
-    }
-  }
-}
-
-final pendingAlbumUploadsProvider = NotifierProvider.autoDispose
-    .family<AlbumPendingUploadsNotifier, List<PendingAlbumUpload>, String>(AlbumPendingUploadsNotifier.new);
@@ -5,15 +5,16 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 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/gallery_permission.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/notification_permission.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:logging/logging.dart';

 enum AppLifeCycleEnum { active, inactive, paused, resumed, detached, hidden }
@@ -107,7 +108,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
    await Future.delayed(const Duration(milliseconds: 500));

    final backgroundManager = _ref.read(backgroundSyncProvider);
-    final isAlbumLinkedSyncEnable = _ref.read(metadataProvider).appConfig.backup.syncAlbums;
+    final isAlbumLinkedSyncEnable = _ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);

    try {
      bool syncSuccess = false;
@@ -137,7 +138,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
  }

  Future<void> _resumeBackup() async {
-    final isEnableBackup = _ref.read(metadataProvider).appConfig.backup.enabled;
+    final isEnableBackup = _ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);

    if (isEnableBackup) {
      final currentUser = Store.tryGet(StoreKey.currentUser);
@@ -1,9 +1,6 @@
-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/metadata_key.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';
@@ -11,7 +8,6 @@ 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/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
@@ -130,8 +126,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
    await _apiService.updateHeaders();

    final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-    final headerMap = _ref.read(metadataProvider).systemConfig.network.customHeaders;
-    final customHeaders = headerMap.isEmpty ? null : jsonEncode(headerMap);
+    final customHeaders = Store.tryGet(StoreKey.customHeaders);
    await _widgetService.writeCredentials(serverEndpoint, accessToken, customHeaders);

    // Get the deviceid from the store if it exists, otherwise generate a new one
@@ -179,19 +174,19 @@ class AuthNotifier extends StateNotifier<AuthState> {
  }

  Future<void> saveWifiName(String wifiName) async {
-    await _ref.read(metadataProvider).write(MetadataKey.networkPreferredWifiName, wifiName);
+    await Store.put(StoreKey.preferredWifiName, wifiName);
  }

  Future<void> saveLocalEndpoint(String url) async {
-    await _ref.read(metadataProvider).write(MetadataKey.networkLocalEndpoint, url);
+    await Store.put(StoreKey.localEndpoint, url);
  }

  String? getSavedWifiName() {
-    return _ref.read(metadataProvider).systemConfig.network.preferredWifiName;
+    return Store.tryGet(StoreKey.preferredWifiName);
  }

  String? getSavedLocalEndpoint() {
-    return _ref.read(metadataProvider).systemConfig.network.localEndpoint;
+    return Store.tryGet(StoreKey.localEndpoint);
  }

  /// Returns the current server endpoint (with /api) URL from the store
@@ -13,7 +13,6 @@ 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/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provider.dart' show assetExifProvider;
-import 'package:immich_mobile/providers/infrastructure/tag.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
@@ -354,23 +353,6 @@ class ActionNotifier extends Notifier<void> {
    }
  }

-  Future<ActionResult?> tagAssets(ActionSource source, BuildContext context) async {
-    final ids = _getOwnedRemoteIdsForSource(source);
-    try {
-      final count = await _service.tagAssets(ids, context);
-      if (count == null) {
-        return null;
-      }
-
-      ref.invalidate(tagProvider);
-      return ActionResult(count: count, success: true);
-    } catch (error, stack) {
-      _logger.severe('Failed to tag assets', error, stack);
-      ref.invalidate(tagProvider);
-      return ActionResult(count: ids.length, success: false, error: error.toString());
-    }
-  }
-
  Future<ActionResult> removeFromAlbum(ActionSource source, String albumId) async {
    final ids = _getRemoteIdsForSource(source);
    try {
@@ -9,7 +9,6 @@ import 'package:immich_mobile/infrastructure/repositories/remote_album.repositor
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
-import 'package:immich_mobile/services/foreground_upload.service.dart';

 final localAlbumRepository = Provider<DriftLocalAlbumRepository>(
  (ref) => DriftLocalAlbumRepository(ref.watch(driftProvider)),
@@ -34,11 +33,7 @@ final remoteAlbumRepository = Provider<DriftRemoteAlbumRepository>(
 );

 final remoteAlbumServiceProvider = Provider<RemoteAlbumService>(
-  (ref) => RemoteAlbumService(
-    ref.watch(remoteAlbumRepository),
-    ref.watch(driftAlbumApiRepositoryProvider),
-    ref.watch(foregroundUploadServiceProvider),
-  ),
+  (ref) => RemoteAlbumService(ref.watch(remoteAlbumRepository), ref.watch(driftAlbumApiRepositoryProvider)),
  dependencies: [remoteAlbumRepository],
 );

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
@@ -8,10 +6,8 @@ import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/remote_album.service.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
-import 'package:immich_mobile/providers/album/pending_album_uploads.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:logging/logging.dart';

 class RemoteAlbumState {
@@ -109,46 +105,6 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
    }
  }

-  /// Creates an album from a heterogeneous asset selection. Already-remote
-  /// assets seed the album immediately; local-only assets are uploaded in the
-  /// background and linked one-by-one as each upload completes.
-  Future<RemoteAlbum?> createAlbumWithAssets({
-    required String title,
-    String? description,
-    Iterable<BaseAsset> assets = const [],
-  }) async {
-    try {
-      final currentUser = ref.read(currentUserProvider);
-      if (currentUser == null) {
-        throw Exception('User not logged in');
-      }
-
-      final candidates = RemoteAlbumService.categorizeCandidates(assets);
-      final album = await _remoteAlbumService.createAlbum(
-        title: title,
-        owner: currentUser,
-        description: description,
-        assetIds: candidates.remoteAssetIds,
-      );
-
-      state = state.copyWith(albums: [...state.albums, album]);
-
-      if (candidates.localAssetsToUpload.isNotEmpty) {
-        unawaited(
-          addAssetsToAlbum(
-            album.id,
-            candidates.localAssetsToUpload,
-          ).then<void>((_) {}).catchError((Object _, StackTrace _) {}),
-        );
-      }
-
-      return album;
-    } catch (error, stack) {
-      _logger.severe('Failed to create album with assets', error, stack);
-      rethrow;
-    }
-  }
-
  Future<RemoteAlbum?> updateAlbum(
    String albumId, {
    String? name,
@@ -199,65 +155,8 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
    return _remoteAlbumService.getAssets(albumId);
  }

-  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 added;
-  }
-
-  /// Adds a heterogeneous asset selection to an album. Already-remote assets
-  /// are linked immediately; local-only assets are queued in
-  /// [pendingAlbumUploadsProvider] (so the album page can show them with
-  /// progress indicators), uploaded, and linked one-by-one as each finishes.
-  Future<int> addAssetsToAlbum(String albumId, Iterable<BaseAsset> assets) async {
-    final currentUser = ref.read(currentUserProvider);
-    if (currentUser == null) {
-      throw Exception('User not logged in');
-    }
-
-    final candidates = RemoteAlbumService.categorizeCandidates(assets);
-    final pendingNotifier = ref.read(pendingAlbumUploadsProvider(albumId).notifier);
-    pendingNotifier.enqueue(candidates.localAssetsToUpload);
-
-    try {
-      final added = await _remoteAlbumService.addAssetsToAlbum(
-        albumId: albumId,
-        uploader: currentUser,
-        candidates: candidates,
-        uploadCallbacks: UploadCallbacks(
-          onProgress: (localAssetId, _, bytes, totalBytes) {
-            final progress = totalBytes > 0 ? bytes / totalBytes : 0.0;
-            pendingNotifier.updateProgress(localAssetId, progress);
-          },
-          onSuccess: (localAssetId, _) => pendingNotifier.remove(localAssetId),
-          onError: (localAssetId, _) => pendingNotifier.markFailed(localAssetId),
-        ),
-      );
-      if (added > 0) {
-        await _refreshAlbumInState(albumId);
-      }
-      return added;
-    } catch (error, stack) {
-      if (candidates.localAssetsToUpload.isNotEmpty) {
-        pendingNotifier.markAllFailed();
-      }
-      _logger.severe('Failed to add assets to album $albumId', error, stack);
-      rethrow;
-    }
-  }
-
-  /// Re-reads a single album from the local DB and replaces it in [state] so
-  /// that views bound to the album list (counts, thumbnails) reflect the
-  /// latest junction-table changes without a full `refresh()`.
-  Future<void> _refreshAlbumInState(String albumId) async {
-    final updated = await _remoteAlbumService.get(albumId);
-    if (updated == null) {
-      return;
-    }
-
-    state = state.copyWith(albums: state.albums.map((album) => album.id == albumId ? updated : album).toList());
+  Future<int> addAssets(String albumId, List<String> assetIds) {
+    return _remoteAlbumService.addAssets(albumId: albumId, assetIds: assetIds);
  }

  Future<void> addUsers(String albumId, List<String> userIds) {
@@ -1,5 +1,4 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/services/edit_revert.service.dart';
 import 'package:immich_mobile/domain/services/hash.service.dart';
 import 'package:immich_mobile/domain/services/local_sync.service.dart';
 import 'package:immich_mobile/domain/services/sync_stream.service.dart';
@@ -12,9 +11,7 @@ import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/stack.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
-import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:immich_mobile/repositories/local_files_manager.repository.dart';

 final syncMigrationRepositoryProvider = Provider((ref) => SyncMigrationRepository(ref.watch(driftProvider)));
@@ -48,23 +45,11 @@ final localSyncServiceProvider = Provider(
  ),
 );

-final editRevertServiceProvider = Provider(
-  (ref) => EditRevertService(
-    nativeSyncApi: ref.watch(nativeSyncApiProvider),
-    stackRepository: ref.watch(driftStackProvider),
-    localAssetRepository: ref.watch(localAssetRepository),
-    assetApiRepository: ref.watch(assetApiRepositoryProvider),
-  ),
-);
-
 final hashServiceProvider = Provider(
  (ref) => HashService(
    localAlbumRepository: ref.watch(localAlbumRepository),
    localAssetRepository: ref.watch(localAssetRepository),
    nativeSyncApi: ref.watch(nativeSyncApiProvider),
    trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
-    stackRepository: ref.watch(driftStackProvider),
-    assetApiRepository: ref.watch(assetApiRepositoryProvider),
-    editRevertService: ref.watch(editRevertServiceProvider),
  ),
 );
@@ -1,22 +1,16 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/tag.model.dart';
-import 'package:immich_mobile/domain/services/tag.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/tags_api.repository.dart';

 class TagNotifier extends AsyncNotifier<Set<Tag>> {
  @override
  Future<Set<Tag>> build() async {
-    return ref.watch(tagServiceProvider).getAllTags();
-  }
-
-  Future<int> bulkTagAssets(List<String> assetIds, List<String> tagIds) async {
-    return ref.read(tagServiceProvider).bulkTagAssets(assetIds, tagIds);
-  }
-
-  Future<List<Tag>> upsertTags(List<String> tags) async {
-    final upsertedTags = await ref.read(tagServiceProvider).upsertTags(tags);
-
-    state = AsyncValue.data({...?state.valueOrNull, ...upsertedTags});
-    return upsertedTags;
+    final repo = ref.read(tagsApiRepositoryProvider);
+    final allTags = await repo.getAllTags();
+    if (allTags == null) {
+      return {};
+    }
+    return allTags.map((t) => Tag.fromDto(t)).toSet();
  }
 }

@@ -7,7 +7,6 @@ import 'package:immich_mobile/infrastructure/repositories/network.repository.dar
 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/metadata.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/utils/debounce.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
@@ -105,7 +104,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
        socket.on('AssetEditReadyV2', _handleSyncAssetEditReadyV2);
        socket.on('on_config_update', _handleOnConfigUpdate);
        socket.on('on_new_release', _handleReleaseUpdates);
-        socket.on('on_asset_stack_update', _handleAssetStackUpdate);
      } catch (e) {
        dPrint(() => "[WEBSOCKET] Catch Websocket Error - ${e.toString()}");
      }
@@ -189,19 +187,12 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV2(data));
  }

-  // Server stacked/restacked assets (e.g. an edit stacked onto its original).
-  // Pull a fresh remote sync so the stack_entity lands and the timeline shows
-  // the stacked primary instead of briefly hiding the asset.
-  void _handleAssetStackUpdate(dynamic _) {
-    unawaited(_ref.read(backgroundSyncProvider).runFreshRemoteSync());
-  }
-
  void _processBatchedAssetUploadReadyV1() {
    if (_batchedAssetUploadReady.isEmpty) {
      return;
    }

-    final isSyncAlbumEnabled = _ref.read(metadataProvider).appConfig.backup.syncAlbums;
+    final isSyncAlbumEnabled = Store.get(StoreKey.syncAlbums, false);
    try {
      unawaited(
        _ref.read(backgroundSyncProvider).syncWebsocketBatchV1(_batchedAssetUploadReady.toList()).then((_) {
@@ -222,7 +213,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
      return;
    }

-    final isSyncAlbumEnabled = _ref.read(metadataProvider).appConfig.backup.syncAlbums;
+    final isSyncAlbumEnabled = Store.get(StoreKey.syncAlbums, false);
    try {
      unawaited(
        _ref.read(backgroundSyncProvider).syncWebsocketBatchV2(_batchedAssetUploadReady.toList()).then((_) {
@@ -67,10 +67,6 @@ class AssetApiRepository extends ApiRepository {
    return _stacksApi.deleteStacks(BulkIdsDto(ids: ids));
  }

-  Future<void> setStackPrimary(String stackId, String primaryAssetId) async {
-    await _stacksApi.updateStack(stackId, StackUpdateDto(primaryAssetId: primaryAssetId));
-  }
-
  Future<Response> downloadAsset(String id, {required bool edited}) {
    return _api.downloadAssetWithHttpInfo(id, edited: edited);
  }
--- a/Show More
+++ b/Show More