fix: mise on windows

2026-05-21 15:16:31 -04:00 · 2026-05-11 20:13:55 +02:00
235 changed files with 2495 additions and 16057 deletions
@@ -75,7 +75,7 @@
            {
              "label": "Build Immich CLI",
              "type": "shell",
-              "command": "pnpm --filter @immich/cli build:dev"
+              "command": "pnpm --filter cli build:dev"
            }
          ]
        }
@@ -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/plugins:/build/corePlugin
+      - ../plugins:/build/corePlugin
  immich-web:
    env_file: !reset []
  immich-machine-learning:
@@ -1,7 +1,7 @@
 cli:
  - changed-files:
      - any-glob-to-any-file:
-          - packages/cli/src/**
+          - cli/src/**

 documentation:
  - changed-files:
@@ -7,7 +7,7 @@ on:
        required: false
        type: string
      environment:
-        description: 'Target environment (development, rc, or production)'
+        description: 'Target environment'
        required: true
        default: 'development'
        type: string
@@ -90,11 +90,6 @@ jobs:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}

-      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
-        with:
-          github_token: ${{ steps.token.outputs.token }}
-
      - name: Create the Keystore
        if: ${{ !github.event.pull_request.head.repo.fork }}
        env:
@@ -119,6 +114,13 @@ jobs:
            mobile/.dart_tool
          key: build-mobile-gradle-${{ runner.os }}-main

+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2.23.0
+        with:
+          channel: 'stable'
+          flutter-version-file: ./mobile/pubspec.yaml
+          cache: true
+
      - name: Setup Android SDK
        uses: android-actions/setup-android@40fd30fb8d7440372e1316f5d1809ec01dcd3699 # v4.0.1
        with:
@@ -129,10 +131,11 @@ jobs:
        run: flutter pub get

      - name: Generate translation file
-        run: mise //mobile:codegen:translation
+        run: dart run easy_localization:generate -S ../i18n && dart run bin/generate_keys.dart
+        working-directory: ./mobile

      - name: Generate platform APIs
-        run: mise //mobile:codegen:pigeon
+        run: make pigeon
        working-directory: ./mobile

      - name: Build Android App Bundle
@@ -202,12 +205,6 @@ jobs:
    runs-on: macos-15

    steps:
-      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
-        with:
-          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
-          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
-
      - name: Select Xcode 26
        run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer

@@ -217,20 +214,24 @@ jobs:
          ref: ${{ inputs.ref || github.sha }}
          persist-credentials: false

-      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2.23.0
        with:
-          github_token: ${{ steps.token.outputs.token }}
+          channel: 'stable'
+          flutter-version-file: ./mobile/pubspec.yaml
+          cache: true

      - name: Install Flutter dependencies
        working-directory: ./mobile
        run: flutter pub get

      - name: Generate translation files
-        run: mise //mobile:codegen:translation
+        run: dart run easy_localization:generate -S ../i18n && dart run bin/generate_keys.dart
+        working-directory: ./mobile

      - name: Generate platform APIs
-        run: mise //mobile:codegen:pigeon
+        run: make pigeon
+        working-directory: ./mobile

      - name: Setup Ruby
        uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1.306.0
@@ -298,12 +299,10 @@ jobs:
        run: |
          # Only upload to TestFlight on main branch
          if [[ "$GITHUB_REF" == "refs/heads/main" ]]; then
-            if [[ "$ENVIRONMENT" == "rc" ]]; then
-              bundle exec fastlane gha_testflight_rc
-            elif [[ "$ENVIRONMENT" == "production" ]]; then
-              bundle exec fastlane gha_release_prod
-            elif [[ "$ENVIRONMENT" == "development" ]]; then
+            if [[ "$ENVIRONMENT" == "development" ]]; then
              bundle exec fastlane gha_testflight_dev
+            else
+              bundle exec fastlane gha_release_prod
            fi
          else
            # Build only, no TestFlight upload for non-main branches
@@ -24,7 +24,7 @@ jobs:
          persist-credentials: false

      - name: Check for breaking API changes
-        uses: oasdiff/oasdiff-action/breaking@26ccb332c67a45ca649de9faf60552ef1b8260d9 # v0.0.46
+        uses: oasdiff/oasdiff-action/breaking@37bf9ff785c7315df88216660826e71be4cc03da # v0.0.44
        with:
          base: https://raw.githubusercontent.com/${{ github.repository }}/main/open-api/immich-openapi-specs.json
          revision: open-api/immich-openapi-specs.json
@@ -3,11 +3,11 @@ on:
  push:
    branches: [main]
    paths:
-      - 'packages/cli/**'
+      - 'cli/**'
      - '.github/workflows/cli.yml'
  pull_request:
    paths:
-      - 'packages/cli/**'
+      - 'cli/**'
      - '.github/workflows/cli.yml'
  release:
    types: [published]
@@ -28,7 +28,7 @@ jobs:
      packages: write
    defaults:
      run:
-        working-directory: ./packages/cli
+        working-directory: ./cli
    steps:
      - id: token
        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
@@ -89,7 +89,7 @@ jobs:
      - name: Get package version
        id: package-version
        run: |
-          version=$(jq -r '.version' packages/cli/package.json)
+          version=$(jq -r '.version' cli/package.json)
          echo "version=$version" >> "$GITHUB_OUTPUT"

      - name: Generate docker image tags
@@ -107,7 +107,7 @@ jobs:
      - name: Build and push image
        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
-          file: packages/cli/Dockerfile
+          file: cli/Dockerfile
          platforms: linux/amd64,linux/arm64
          push: ${{ github.event_name == 'release' }}
          cache-from: type=gha
@@ -35,7 +35,7 @@ jobs:
    needs: [get_body, should_run]
    if: ${{ needs.should_run.outputs.should_run == 'true' }}
    container:
-      image: ghcr.io/immich-app/mdq:main@sha256:0a8b8867773a0f8368061f47578603f438349f8f1f28b0e16105f481e5c794e0
+      image: ghcr.io/immich-app/mdq:main@sha256:32abe582452b12dff55055e1d6bc24508a8f17164f9d1831db7bb70953c014c6
    outputs:
      checked: ${{ steps.get_checkbox.outputs.checked }}
    steps:
@@ -57,7 +57,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+        uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
        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@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+        uses: github/codeql-action/autobuild@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2

      # ℹ️ 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@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+        uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
        with:
          category: '/language:${{matrix.language}}'
@@ -17,6 +17,6 @@ jobs:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

-      - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0
+      - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
        with:
          repo-token: ${{ steps.token.outputs.token }}
@@ -60,30 +60,38 @@ jobs:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}

-      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2.23.0
        with:
-          github_token: ${{ steps.token.outputs.token }}
+          channel: 'stable'
+          flutter-version-file: ./mobile/pubspec.yaml

      - name: Install dependencies
-        run: flutter pub get
+        run: dart pub get

      - name: Install dependencies for UI package
-        run: flutter pub get
+        run: dart pub get
        working-directory: ./mobile/packages/ui

      - name: Install dependencies for UI Showcase
-        run: flutter pub get
+        run: dart pub get
        working-directory: ./mobile/packages/ui/showcase

-      - name: Generate translation files
-        run: mise //mobile:codegen:translation
+      - name: Install DCM
+        uses: CQLabs/setup-dcm@8697ae0790c0852e964a6ef1d768d62a6675481a # v2.0.1
+        with:
+          github-token: ${{ steps.token.outputs.token }}
+          version: auto
+          working-directory: ./mobile
+
+      - name: Generate translation file
+        run: dart run easy_localization:generate -S ../i18n && dart run bin/generate_keys.dart

      - name: Run Build Runner
-        run: mise //mobile:codegen:dart
+        run: make build

      - name: Generate platform API
-        run: mise //mobile:codegen:pigeon
+        run: make pigeon

      - name: Find file changes
        uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4
@@ -99,16 +107,20 @@ jobs:
        env:
          CHANGED_FILES: ${{ steps.verify-changed-files.outputs.changed_files }}
        run: |
-          echo "ERROR: Generated files not up to date! Run 'mise //mobile:codegen:dart' and 'mise //mobile:codegen:pigeon'"
+          echo "ERROR: Generated files not up to date! Run 'make build' and 'make pigeon' inside the mobile directory"
          echo "Changed files: ${CHANGED_FILES}"
          exit 1

-      - name: Run analyze
-        run: mise //mobile:analyze
+      - name: Run dart analyze
+        run: dart analyze --fatal-infos

-      - name: Run format
-        run: mise //mobile:format
+      - name: Run dart format
+        run: make format

      # TODO: Re-enable after upgrading custom_lint
      # - name: Run dart custom_lint
      #   run: dart run custom_lint
+
+      # TODO: Use https://github.com/CQLabs/dcm-action
+      - name: Run DCM
+        run: dcm analyze lib --fatal-style --fatal-warnings
@@ -39,7 +39,7 @@ jobs:
              - 'server/**'
              - 'pnpm-lock.yaml'
            cli:
-              - 'packages/cli/**'
+              - 'cli/**'
              - 'packages/sdk/**'
              - 'pnpm-lock.yaml'
            e2e:
@@ -95,7 +95,7 @@ jobs:
      contents: read
    defaults:
      run:
-        working-directory: ./packages/cli
+        working-directory: ./cli
    steps:
      - id: token
        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
@@ -126,7 +126,7 @@ jobs:
      contents: read
    defaults:
      run:
-        working-directory: ./packages/cli
+        working-directory: ./cli
    steps:
      - id: token
        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
@@ -256,10 +256,10 @@ jobs:
          github_token: ${{ steps.token.outputs.token }}

      - name: Install dependencies
-        run: pnpm -w install --frozen-lockfile
+        run: pnpm --filter=immich-i18n install --frozen-lockfile

      - name: Format
-        run: pnpm format:fix
+        run: pnpm --filter=immich-i18n format:fix

      - name: Find file changes
        uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4
@@ -379,14 +379,19 @@ jobs:
          cache: 'pnpm'
          cache-dependency-path: '**/pnpm-lock.yaml'

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

      - name: Run setup web
        run: pnpm install --frozen-lockfile && pnpm exec svelte-kit sync
        working-directory: ./web
        if: ${{ !cancelled() }}

+      - name: Run setup cli
+        run: pnpm install --frozen-lockfile && pnpm build
+        working-directory: ./cli
+        if: ${{ !cancelled() }}
+
      - name: Install dependencies
        run: pnpm install --frozen-lockfile
        if: ${{ !cancelled() }}
@@ -551,22 +556,17 @@ jobs:
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
-
-      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@cf6e190bacde3d7bda59372a786b36ac7d01536a # use-mise-action-v2.0.1
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2.23.0
        with:
-          github_token: ${{ steps.token.outputs.token }}
-
-      - name: Install dependencies
-        run: flutter pub get
+          channel: 'stable'
+          flutter-version-file: ./mobile/pubspec.yaml
+      - name: Generate translation file
+        run: dart run easy_localization:generate -S ../i18n && dart run bin/generate_keys.dart
        working-directory: ./mobile
-
-      - name: Generate translation files
-        run: mise //mobile:codegen:translation
-
      - name: Run tests
-        run: mise //mobile:test
-
+        working-directory: ./mobile
+        run: flutter test -j 1
  ml-unit-tests:
    name: Unit Test ML
    needs: pre-job
@@ -679,8 +679,11 @@ jobs:
      - name: Install server dependencies
        run: SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter immich install --frozen-lockfile

+      - name: Build the app
+        run: pnpm --filter immich build
+
      - name: Run API generation
-        run: mise //:open-api
+        run: ./bin/generate-open-api.sh
        working-directory: open-api

      - name: Find file changes
@@ -772,7 +775,7 @@ jobs:
          exit 1

      - name: Run SQL generation
-        run: mise //:sql
+        run: pnpm sync:sql
        env:
          DB_URL: postgres://postgres:postgres@localhost:5432/immich

@@ -36,7 +36,7 @@ jobs:
          github-token: ${{ steps.token.outputs.token }}
          filters: |
            i18n:
-              - modified: 'i18n/!(en)**\.json'
+              - modified: 'i18n/!(en|package)**\.json'
          skip-force-logic: 'true'

  enforce-lock:
@@ -23,17 +23,15 @@
      "type": "node",
      "request": "launch",
      "name": "Immich CLI",
-      "program": "${workspaceFolder}/packages/cli/dist/index.js",
+      "program": "${workspaceFolder}/cli/dist/index.js",
      "args": ["upload", "--help"],
      "runtimeArgs": ["--enable-source-maps"],
      "console": "integratedTerminal",
-      "resolveSourceMapLocations": [
-        "${workspaceFolder}/packages/cli/dist/**/*.js.map"
-      ],
+      "resolveSourceMapLocations": ["${workspaceFolder}/cli/dist/**/*.js.map"],
      "sourceMaps": true,
-      "outFiles": ["${workspaceFolder}/packages/cli/dist/**/*.js"],
+      "outFiles": ["${workspaceFolder}/cli/dist/**/*.js"],
      "skipFiles": ["<node_internals>/**"],
-      "preLaunchTask": "Build @immich/cli"
+      "preLaunchTask": "Build Immich CLI"
    }
  ]
 }
@@ -37,24 +37,105 @@ prod-scale:

 .PHONY: open-api
 open-api:
-	@printf "This command has been removed. Please use:\n\n    mise open-api          # or mise //:open-api from another directory\n\n"\n\n >&2 && exit 1
+	cd ./open-api && bash ./bin/generate-open-api.sh
+
+open-api-dart:
+	cd ./open-api && bash ./bin/generate-open-api.sh dart
+
+open-api-typescript:
+	cd ./open-api && bash ./bin/generate-open-api.sh typescript

 sql:
-	@printf "This command has been removed. Please use:\n\n    mise sql               # or mise //:sql from another directory\n\n"\n\n >&2 && exit 1
+	pnpm --filter immich run sync:sql

+attach-server:
+	docker exec -it docker_immich-server_1 sh

 renovate:
  LOG_LEVEL=debug pnpm exec renovate --platform=local --repository-cache=reset

+# Directories that need to be created for volumes or build output
+VOLUME_DIRS = \
+	./.pnpm-store \
+	./web/.svelte-kit \
+	./web/node_modules \
+	./web/coverage \
+	./e2e/node_modules \
+	./docs/node_modules \
+	./server/node_modules \
+	./packages/sdk/node_modules \
+	./.github/node_modules \
+	./node_modules \
+	./cli/node_modules
+
 # Include .env file if it exists
 -include docker/.env

 MODULES = e2e server web cli sdk docs .github

+# directory to package name mapping function
+#   cli     = @immich/cli
+#   docs    = documentation
+#   e2e     = immich-e2e
+#   packages/sdk = @immich/sdk
+#   server  = immich
+#   web     = immich-web
+map-package = $(subst sdk,@immich/sdk,$(subst cli,@immich/cli,$(subst docs,documentation,$(subst e2e,immich-e2e,$(subst server,immich,$(subst web,immich-web,$1))))))
+
+audit-%:
+	pnpm --filter $(call map-package,$*) audit fix
+install-%:
+	pnpm --filter $(call map-package,$*) install $(if $(FROZEN),--frozen-lockfile) $(if $(OFFLINE),--offline)
+build-cli: build-sdk
+build-web: build-sdk
+build-%: install-%
+	pnpm --filter $(call map-package,$*) run build
+format-%:
+	pnpm --filter $(call map-package,$*) run format:fix
+lint-%:
+	pnpm --filter $(call map-package,$*) run lint:fix
+check-%:
+	pnpm --filter $(call map-package,$*) run check
+check-web:
+	pnpm --filter immich-web run check:typescript
+	pnpm --filter immich-web run check:svelte
+test-%:
+	pnpm --filter $(call map-package,$*) run test
 test-e2e:
 	docker compose -f ./e2e/docker-compose.yml build
 	pnpm --filter immich-e2e run test
 	pnpm --filter immich-e2e run test:web
+test-medium:
+	docker run \
+    --rm \
+    -v ./server/src:/usr/src/app/src \
+    -v ./server/test:/usr/src/app/test \
+    -v ./server/vitest.config.medium.mjs:/usr/src/app/vitest.config.medium.mjs \
+    -v ./server/tsconfig.json:/usr/src/app/tsconfig.json \
+    -e NODE_ENV=development \
+    immich-server:latest \
+    -c "pnpm test:medium -- --run"
+test-medium-dev:
+	docker exec -it immich_server /bin/sh -c "pnpm run test:medium"
+
+install-all:
+	pnpm -r --filter '!documentation' install
+
+build-all: $(foreach M,$(filter-out e2e docs .github,$(MODULES)),build-$M) ;
+
+check-all:
+	pnpm -r --filter '!documentation' run "/^(check|check\:svelte|check\:typescript)$/"
+lint-all:
+	pnpm -r --filter '!documentation' run lint:fix
+format-all:
+	pnpm -r --filter '!documentation' run format:fix
+audit-all:
+	pnpm -r --filter '!documentation' audit fix
+hygiene-all: audit-all
+	pnpm -r --filter '!documentation' run "/(format:fix|check|check:svelte|check:typescript|sql)/"
+
+test-all:
+	pnpm -r --filter '!documentation' run "/^test/"

 clean:
 	find . -name "node_modules" -type d -prune -exec rm -rf {} +
@@ -65,3 +146,7 @@ clean:
 	find . -name ".pnpm-store" -type d -prune -exec rm -rf '{}' +
 	command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml down -v --remove-orphans || true
 	command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml down -v --remove-orphans || true
+
+
+setup-server-dev: install-server
+setup-web-dev: install-sdk build-sdk install-web
@@ -2,11 +2,13 @@ FROM node:24.1.0-alpine3.20@sha256:8fe019e0d57dbdce5f5c27c0b63d2775cf34b00e3755a

 WORKDIR /usr/src/app
 COPY package* pnpm* .pnpmfile.cjs ./
+COPY ./cli ./cli/
 COPY ./packages ./packages/
 RUN corepack enable pnpm && \
-  pnpm --filter @immich/sdk --filter @immich/cli install --frozen-lockfile && \
-  pnpm --filter @immich/sdk --filter @immich/cli build
+  pnpm install --filter @immich/sdk --filter @immich/cli --frozen-lockfile && \
+  pnpm --filter @immich/sdk build && \
+  pnpm --filter @immich/cli build

 WORKDIR /import

-ENTRYPOINT ["node", "/usr/src/app/packages/cli/dist"]
+ENTRYPOINT ["node", "/usr/src/app/cli/dist"]
@@ -4,9 +4,14 @@ Please see the [Immich CLI documentation](https://docs.immich.app/features/comma

 # For developers

-Before building the CLI, you must build the immich server and the open-api client. You can use the following command:
+Before building the CLI, you must build the immich server and the open-api client. To build the server run the following in the server folder:

-    $ mise //:open-api
+    $ pnpm install
+    $ pnpm run build
+
+Then, to build the open-api client run the following in the open-api folder:
+
+    $ ./bin/generate-open-api.sh

 ## Run from build

@@ -2,11 +2,6 @@
  "name": "@immich/cli",
  "version": "2.7.5",
  "description": "Command Line Interface (CLI) for Immich",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/immich-app/immich.git",
-    "directory": "packages/cli"
-  },
  "type": "module",
  "exports": "./dist/index.js",
  "bin": {
@@ -57,6 +52,11 @@
    "format:fix": "prettier --cache --write --list-different .",
    "check": "tsc --noEmit"
  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/immich-app/immich.git",
+    "directory": "cli"
+  },
  "engines": {
    "node": ">=20.0.0"
  },
@@ -2,37 +2,37 @@
 # Manual edits may be lost in future updates.

 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.7"
-  constraints = "4.52.7"
+  version     = "4.52.5"
+  constraints = "4.52.5"
  hashes = [
-    "h1:+O72J3QYiZtYmYYZM/Eh0f4NNfl1BvjX1eju43qTQsQ=",
-    "h1:0oqjYIPXcXh7XiDiKI085cHDYQQ5mh8kDl9dmBtvtog=",
-    "h1:4b4ESb87MGv5bnadgYe7sK5rEkKMZhbkQcwPubQTsR4=",
-    "h1:6mTr3eA1Ddb348lLmJuyvn98z4KF+ejqaUEJ76D1rzQ=",
-    "h1:9/3YH+9k9HqsvFtbmBf7SO2+xqZeZrXNKzLkjNuhUEA=",
-    "h1:Jcq4tBWgyH4/2JsojNBSRaN0mcItVMchO+lynonrlqc=",
-    "h1:Y4Vv/2RdP0Q+uxqhOxzOdKxuuEMjXPDcU0vPc5bCQzI=",
-    "h1:a0gW8FBKsbP9Fi0HEDoy49WIbEWVHk9+BR4/iwuBdDQ=",
-    "h1:gElv6iqJtg8OKN77gbw+MjrkrQmJHPkkMEi1J+0xkpU=",
-    "h1:oslXUugD/NQ+duJgT4BhKQyfGbuFOANknMvR73fiOeM=",
-    "h1:pPItIWii5oymR+geZB219ROSPuSODPLTlM4S/u8xLvM=",
-    "h1:u67GWw8GwD9NDlDzp9Y5VRnSQGcCrE8rSpkGPaBpDl0=",
-    "h1:uUUa9dY0XQOycI8pxg16PFFtL0WCTi9uEJz8trTQ7pU=",
-    "h1:y3rV8KF2q6GEMANNlf5EkKJurlfbKlIKpjGcdxoy7pQ=",
-    "zh:0c904ce31a4c6c4a5b3bf7ff1560e77c0cc7e2450c8553ded8e8c90398e1418b",
-    "zh:36183d310c36373fe4cb936b83c595c6fd3b0a94bc7827f28e5789ccbf59752e",
-    "zh:556a568a6f0235e8f41647de9e4d3a1e7b1d6502df8b19b54ec441f1c653ea10",
-    "zh:633ebbd5b0245e75e500ef9be4d9e62288f97e8da3baaa51323892a786d90285",
-    "zh:6acfe60cf52a65ba8f044f748548d2119e7f4fd7f8ebcb14698960d87c68f529",
+    "h1:+rfzF+16ZcWZWnTyW/p1HHTzYbPKX8Zt2nIFtR/+f+E=",
+    "h1:18bXaaOSq8MWKuMxo/4y7EB7/i7G90y5QsKHZRmkoDo=",
+    "h1:4vZVOpKeEQZsF2VrARRZFeL37Ed/gD4rRMtfnvWQres=",
+    "h1:BZOsTF83QPKXTAaYqxPKzdl1KRjk/L2qbPpFjM0w28A=",
+    "h1:CDuC+HXLvc1z6wkCRsSDcc/+QENIHEtssYshiWg3opA=",
+    "h1:DE+YFzLnqSe79pI2R4idRGx5QzLdrA7RXvngTkGfZ30=",
+    "h1:DfaJwH3Ml4yrRbdAY4AcDVy0QTQk5T3A622TXzS/u2E=",
+    "h1:EIDXP0W3kgIv2pecrFmqtK/DnlqkyckzBzhxKaXU+4A=",
+    "h1:EV4kYyaOnwGA0bh/3hU6Ezqnt1PFDxopH7i85e48IzY=",
+    "h1:M0iXabfzamU+MPDi0G9XACpbacFKMakmM+Z9HZ8HrsM=",
+    "h1:YWmCbGF/KbsrUzcYVBLscwLizidbp95TDQa0N2qpmVo=",
+    "h1:cxPcCB5gbrpUO1+IXkQYs1YTY50/0IlApCzGea0cwuQ=",
+    "h1:g6DldikTV2HXUu9uoeNY5FuLufgaYWF4ufgZg7wq62s=",
+    "h1:oi/Hrx9pwoQ+Z52CBC+rrowVH387EIj0qvnxQgDeI+0=",
+    "zh:1a3400cb38863b2585968d1876706bcfc67a148e1318a1d325c6c7704adc999b",
+    "zh:4c5062cb9e9da1676f06ae92b8370186d98976cc4c7030d3cd76df12af54282a",
+    "zh:52110f493b5f0587ef77a1cfd1a67001fd4c617b14c6502d732ab47352bdc2f7",
+    "zh:5aa536f9eaeb43823aaf2aa80e7d39b25ef2b383405ed034aa16a28b446a9238",
+    "zh:5cc39459a1c6be8a918f17054e4fbba573825ed5597dcada588fe99614d98a5b",
+    "zh:629ae6a7ba298815131da826474d199312d21cec53a4d5ded4fa56a692e6f072",
+    "zh:719cc7c75dc1d3eb30c22ff5102a017996d9788b948078c7e1c5b3446aeca661",
+    "zh:8698635a3ca04383c1e93b21d6963346bdae54d27177a48e4b1435b7f731731c",
    "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:904acc31ebb9d6ef68c792074b30532ee61bf515f19e0a3c75b46f126cca1f13",
-    "zh:a1d0a81246afc8750286d3f6fe7a8fbe6460dd2662407b28dbfbabb612e5fa9d",
-    "zh:a41a36fe253fc365fe2b7ffc749624688b2693b4634862fda161179ab100029f",
-    "zh:a7ef269e77ffa8715c8945a2c14322c7ff159ea44c15f62505f3cbb2cae3b32d",
-    "zh:b01aa3bed30610633b762df64332b26f8844a68c3960cebcb30f04918efc67fe",
-    "zh:b069cc2cd18cae10757df3ae030508eac8d55de7e49eda7a5e3e11f2f7fe6455",
-    "zh:b2d2c6313729ebb7465dceece374049e2d08bda34473901be9ff46a8836d42b2",
-    "zh:db0e114edaf4bc2f3d4769958807c83022bfbc619a00bdf4c4bd17faa4ab2d8b",
-    "zh:ecc0aa8b9044f664fd2aaf8fa992d976578f78478980555b4b8f6148e8d1a5fe",
+    "zh:8a9993f1dcadf1dd6ca43b23348abe374605d29945a2fafc07fb3457644e6a54",
+    "zh:b1b9a1e6bcc24d5863a664a411d2dc906373ae7a2399d2d65548ce7377057852",
+    "zh:b270184cdeec277218e84b94cb136fead753da717f9b9dc378e51907f3f00bb0",
+    "zh:dff2bc10071210181726ce270f954995fe42c696e61e2e8f874021fed02521e5",
+    "zh:e8e87b40b6a87dc097b0fdc20d3f725cec0d82abc9cc3755c1f89f8f6e8b0036",
+    "zh:ee964a6573d399a5dd22ce328fb38ca1207797a02248f14b2e4913ee390e7803",
  ]
 }
@@ -5,7 +5,7 @@ terraform {
  required_providers {
    cloudflare = {
      source = "cloudflare/cloudflare"
-      version = "4.52.7"
+      version = "4.52.5"
    }
  }
 }
@@ -2,37 +2,37 @@
 # Manual edits may be lost in future updates.

 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.7"
-  constraints = "4.52.7"
+  version     = "4.52.5"
+  constraints = "4.52.5"
  hashes = [
-    "h1:+O72J3QYiZtYmYYZM/Eh0f4NNfl1BvjX1eju43qTQsQ=",
-    "h1:0oqjYIPXcXh7XiDiKI085cHDYQQ5mh8kDl9dmBtvtog=",
-    "h1:4b4ESb87MGv5bnadgYe7sK5rEkKMZhbkQcwPubQTsR4=",
-    "h1:6mTr3eA1Ddb348lLmJuyvn98z4KF+ejqaUEJ76D1rzQ=",
-    "h1:9/3YH+9k9HqsvFtbmBf7SO2+xqZeZrXNKzLkjNuhUEA=",
-    "h1:Jcq4tBWgyH4/2JsojNBSRaN0mcItVMchO+lynonrlqc=",
-    "h1:Y4Vv/2RdP0Q+uxqhOxzOdKxuuEMjXPDcU0vPc5bCQzI=",
-    "h1:a0gW8FBKsbP9Fi0HEDoy49WIbEWVHk9+BR4/iwuBdDQ=",
-    "h1:gElv6iqJtg8OKN77gbw+MjrkrQmJHPkkMEi1J+0xkpU=",
-    "h1:oslXUugD/NQ+duJgT4BhKQyfGbuFOANknMvR73fiOeM=",
-    "h1:pPItIWii5oymR+geZB219ROSPuSODPLTlM4S/u8xLvM=",
-    "h1:u67GWw8GwD9NDlDzp9Y5VRnSQGcCrE8rSpkGPaBpDl0=",
-    "h1:uUUa9dY0XQOycI8pxg16PFFtL0WCTi9uEJz8trTQ7pU=",
-    "h1:y3rV8KF2q6GEMANNlf5EkKJurlfbKlIKpjGcdxoy7pQ=",
-    "zh:0c904ce31a4c6c4a5b3bf7ff1560e77c0cc7e2450c8553ded8e8c90398e1418b",
-    "zh:36183d310c36373fe4cb936b83c595c6fd3b0a94bc7827f28e5789ccbf59752e",
-    "zh:556a568a6f0235e8f41647de9e4d3a1e7b1d6502df8b19b54ec441f1c653ea10",
-    "zh:633ebbd5b0245e75e500ef9be4d9e62288f97e8da3baaa51323892a786d90285",
-    "zh:6acfe60cf52a65ba8f044f748548d2119e7f4fd7f8ebcb14698960d87c68f529",
+    "h1:+rfzF+16ZcWZWnTyW/p1HHTzYbPKX8Zt2nIFtR/+f+E=",
+    "h1:18bXaaOSq8MWKuMxo/4y7EB7/i7G90y5QsKHZRmkoDo=",
+    "h1:4vZVOpKeEQZsF2VrARRZFeL37Ed/gD4rRMtfnvWQres=",
+    "h1:BZOsTF83QPKXTAaYqxPKzdl1KRjk/L2qbPpFjM0w28A=",
+    "h1:CDuC+HXLvc1z6wkCRsSDcc/+QENIHEtssYshiWg3opA=",
+    "h1:DE+YFzLnqSe79pI2R4idRGx5QzLdrA7RXvngTkGfZ30=",
+    "h1:DfaJwH3Ml4yrRbdAY4AcDVy0QTQk5T3A622TXzS/u2E=",
+    "h1:EIDXP0W3kgIv2pecrFmqtK/DnlqkyckzBzhxKaXU+4A=",
+    "h1:EV4kYyaOnwGA0bh/3hU6Ezqnt1PFDxopH7i85e48IzY=",
+    "h1:M0iXabfzamU+MPDi0G9XACpbacFKMakmM+Z9HZ8HrsM=",
+    "h1:YWmCbGF/KbsrUzcYVBLscwLizidbp95TDQa0N2qpmVo=",
+    "h1:cxPcCB5gbrpUO1+IXkQYs1YTY50/0IlApCzGea0cwuQ=",
+    "h1:g6DldikTV2HXUu9uoeNY5FuLufgaYWF4ufgZg7wq62s=",
+    "h1:oi/Hrx9pwoQ+Z52CBC+rrowVH387EIj0qvnxQgDeI+0=",
+    "zh:1a3400cb38863b2585968d1876706bcfc67a148e1318a1d325c6c7704adc999b",
+    "zh:4c5062cb9e9da1676f06ae92b8370186d98976cc4c7030d3cd76df12af54282a",
+    "zh:52110f493b5f0587ef77a1cfd1a67001fd4c617b14c6502d732ab47352bdc2f7",
+    "zh:5aa536f9eaeb43823aaf2aa80e7d39b25ef2b383405ed034aa16a28b446a9238",
+    "zh:5cc39459a1c6be8a918f17054e4fbba573825ed5597dcada588fe99614d98a5b",
+    "zh:629ae6a7ba298815131da826474d199312d21cec53a4d5ded4fa56a692e6f072",
+    "zh:719cc7c75dc1d3eb30c22ff5102a017996d9788b948078c7e1c5b3446aeca661",
+    "zh:8698635a3ca04383c1e93b21d6963346bdae54d27177a48e4b1435b7f731731c",
    "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:904acc31ebb9d6ef68c792074b30532ee61bf515f19e0a3c75b46f126cca1f13",
-    "zh:a1d0a81246afc8750286d3f6fe7a8fbe6460dd2662407b28dbfbabb612e5fa9d",
-    "zh:a41a36fe253fc365fe2b7ffc749624688b2693b4634862fda161179ab100029f",
-    "zh:a7ef269e77ffa8715c8945a2c14322c7ff159ea44c15f62505f3cbb2cae3b32d",
-    "zh:b01aa3bed30610633b762df64332b26f8844a68c3960cebcb30f04918efc67fe",
-    "zh:b069cc2cd18cae10757df3ae030508eac8d55de7e49eda7a5e3e11f2f7fe6455",
-    "zh:b2d2c6313729ebb7465dceece374049e2d08bda34473901be9ff46a8836d42b2",
-    "zh:db0e114edaf4bc2f3d4769958807c83022bfbc619a00bdf4c4bd17faa4ab2d8b",
-    "zh:ecc0aa8b9044f664fd2aaf8fa992d976578f78478980555b4b8f6148e8d1a5fe",
+    "zh:8a9993f1dcadf1dd6ca43b23348abe374605d29945a2fafc07fb3457644e6a54",
+    "zh:b1b9a1e6bcc24d5863a664a411d2dc906373ae7a2399d2d65548ce7377057852",
+    "zh:b270184cdeec277218e84b94cb136fead753da717f9b9dc378e51907f3f00bb0",
+    "zh:dff2bc10071210181726ce270f954995fe42c696e61e2e8f874021fed02521e5",
+    "zh:e8e87b40b6a87dc097b0fdc20d3f725cec0d82abc9cc3755c1f89f8f6e8b0036",
+    "zh:ee964a6573d399a5dd22ce328fb38ca1207797a02248f14b2e4913ee390e7803",
  ]
 }
@@ -5,7 +5,7 @@ terraform {
  required_providers {
    cloudflare = {
      source = "cloudflare/cloudflare"
-      version = "4.52.7"
+      version = "4.52.5"
    }
  }
 }
@@ -25,7 +25,7 @@ services:
      - server_node_modules:/usr/src/app/server/node_modules
      - web_node_modules:/usr/src/app/web/node_modules
      - github_node_modules:/usr/src/app/.github/node_modules
-      - cli_node_modules:/usr/src/app/packages/cli/node_modules
+      - cli_node_modules:/usr/src/app/cli/node_modules
      - docs_node_modules:/usr/src/app/docs/node_modules
      - e2e_node_modules:/usr/src/app/e2e/node_modules
      - sdk_node_modules:/usr/src/app/packages/sdk/node_modules
@@ -74,7 +74,7 @@ services:
      - ${UPLOAD_LOCATION}/photos:/data
      - /etc/localtime:/etc/localtime:ro
      - pnpm_store_server:/buildcache/pnpm-store
-      - ../packages/plugins:/build/corePlugin
+      - ../plugins:/build/corePlugin
    env_file:
      - .env
    environment:
@@ -157,7 +157,7 @@ services:

  redis:
    container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:8436e10bc65c94886a91d4415b6a6dfa9cb5a306fb3b996e5bb67cd2b4854193
+    image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
    healthcheck:
      test: redis-cli ping || exit 1

@@ -56,7 +56,7 @@ services:

  redis:
    container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:8436e10bc65c94886a91d4415b6a6dfa9cb5a306fb3b996e5bb67cd2b4854193
+    image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
    healthcheck:
      test: redis-cli ping || exit 1
    restart: always
@@ -61,7 +61,7 @@ services:

  redis:
    container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:8436e10bc65c94886a91d4415b6a6dfa9cb5a306fb3b996e5bb67cd2b4854193
+    image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
    user: '1000:1000'
    security_opt:
      - no-new-privileges:true
@@ -49,7 +49,7 @@ services:

  redis:
    container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:8436e10bc65c94886a91d4415b6a6dfa9cb5a306fb3b996e5bb67cd2b4854193
+    image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
    healthcheck:
      test: redis-cli ping || exit 1
    restart: always
@@ -13,11 +13,8 @@ The `immich-server` docker image comes preinstalled with an administrative CLI (
 | `enable-oauth-login`       | Enable OAuth login                                            |
 | `disable-oauth-login`      | Disable OAuth login                                           |
 | `list-users`               | List Immich users                                             |
-| `grant-admin`              | Grant admin privileges to a user (by email)                   |
-| `revoke-admin`             | Revoke admin privileges from a user (by email)                |
 | `version`                  | Print Immich version                                          |
 | `change-media-location`    | Change database file paths to align with a new media location |
-| `schema-check`             | Verify database migrations and check for schema drift         |

 ## How to run a command

@@ -105,22 +102,6 @@ immich-admin list-users
 ]
 ```

-Grant Admin
-
-```
-immich-admin grant-admin
-? Please enter the user email:  user@example.com
-Admin access has been granted to user@example.com
-```
-
-Revoke Admin
-
-```
-immich-admin revoke-admin
-? Please enter the user email:  user@example.com
-Admin access has been revoked from user@example.com
-```
-
 Print Immich Version

 ```
@@ -145,12 +126,3 @@ immich-admin change-media-location
 Database file paths updated successfully! 🎉
 ...
 ```
-
-Schema Check
-
-```
-immich-admin schema-check
-Migrations are up to date
-
-No schema drift detected
-```
@@ -243,8 +243,8 @@ To connect the mobile app to your Dev Container:

 - **Server code** (`/server`): Changes trigger automatic restart
 - **Web code** (`/web`): Changes trigger hot module replacement
- **Database migrations**: Run `mise //:sql`
- **API changes**: Regenerate TypeScript SDK with `mise //:open-api`
+- **Database migrations**: Run `pnpm run sync:sql` in the server directory
+- **API changes**: Regenerate TypeScript SDK with `make open-api`

 ## Testing

@@ -252,11 +252,20 @@ To connect the mobile app to your Dev Container:

 The Dev Container supports multiple ways to run tests:

-#### Using Mise Commands (Recommended)
+#### Using Make Commands (Recommended)

 ```bash
 # Run tests for specific components
-mise run checklist      # in `server/`, `web/`, `packages/cli`
+make test-server        # Server unit tests
+make test-web           # Web unit tests
+make test-e2e           # End-to-end tests
+make test-cli           # CLI tests
+
+# Run all tests
+make test-all           # Runs tests for all components
+
+# Medium tests (integration tests)
+make test-medium-dev    # End-to-end tests
 ```

 #### Using PNPM Directly
@@ -280,16 +289,48 @@ pnpm run test           # Run API tests
 pnpm run test:web       # Run web UI tests
 ```

+### Code Quality Commands
+
+```bash
+# Linting
+make lint-server        # Lint server code
+make lint-web           # Lint web code
+make lint-all           # Lint all components
+
+# Formatting
+make format-server      # Format server code
+make format-web         # Format web code
+make format-all         # Format all code
+
+# Type checking
+make check-server       # Type check server
+make check-web          # Type check web
+make check-all          # Check all components
+
+# Complete hygiene check
+make hygiene-all        # Run lint, format, check, SQL sync, and audit
+```
+
 ### Additional Make Commands

 ```bash
+# Build commands
+make build-server       # Build server
+make build-web          # Build web app
+make build-all          # Build everything
+
 # API generation
 make open-api           # Generate OpenAPI specs
 make open-api-typescript # Generate TypeScript SDK
 make open-api-dart      # Generate Dart SDK

 # Database
-mise sql                # Sync database schema
+make sql                # Sync database schema
+
+# Dependencies
+make install-server     # Install server dependencies
+make install-web        # Install web dependencies
+make install-all        # Install all dependencies
 ```

 ### Debugging
@@ -10,8 +10,7 @@ Our [GitHub Repository](https://github.com/immich-app/immich) is a [monorepo](ht
 | :------------------ | :------------------------------------------------------------------- |
 | `.github/`          | Github templates and action workflows                                |
 | `.vscode/`          | VSCode debug launch profiles                                         |
-| `packages/cli`      | Source code for the CLI                                              |
-| `packages/sdk`      | Source code for the generated OpenAPI SDK                            |
+| `cli/`              | Source code for the work-in-progress CLI rewrite                     |
 | `docker/`           | Docker compose resources for dev, test, production                   |
 | `design/`           | Screenshots and logos for the README                                 |
 | `docs/`             | Source code for the [https://immich.app](https://immich.app) website |
@@ -34,23 +34,21 @@ Run all web checks with `pnpm run check:all`
 Run all server checks with `pnpm run check:all`
 :::

-:::tip Auto Fix
+:::info Auto Fix
 You can use `pnpm run __:fix` to potentially correct some issues automatically for `pnpm run format` and `lint`.
 :::

-## Mobile Checklist
+## Mobile Checks

- [ ] `mise //mobile:codegen` (auto-generate files using build_runner)
- [ ] `mise //mobile:lint` (static analysis via Dart Analyzer and DCM)
- [ ] `mise //mobile:format` (formatting via Dart Formatter)
- [ ] `mise //mobile:test` (unit tests)
+The following commands must be executed from within the mobile app directory of the codebase.

-:::tip
-Run all these commands at once with `mise //mobile:checklist`
-:::
+- [ ] `make build` (auto-generate files using build_runner)
+- [ ] `make analyze` (static analysis via Dart Analyzer and DCM)
+- [ ] `make format` (formatting via Dart Formatter)
+- [ ] `make test` (unit tests)

-:::tip Auto Fix
-You can use `mise //mobile:lint-fix` to potentially correct some issues automatically for `mise //mobile:lint`.
+:::info Auto Fix
+You can use `dart fix --apply` and `dcm fix lib` to potentially correct some issues automatically for `make analyze`.
 :::

 ## OpenAPI
@@ -17,14 +17,15 @@ make e2e

 Before you can run the tests, you need to run the following commands _once_:

- `pnpm install`
- `pnpm --filter "@immich/*" build`
- `mise //:open-api`
+- `pnpm install` (in `e2e/`)
+- `pnpm run build` (in `cli/`)
+- `make open-api` (in the project root `/`)

 Once the test environment is running, the e2e tests can be run via:

 ```bash
-mise //e2e:test
+cd e2e/
+pnpm test
 ```

 The tests check various things including:
@@ -1,7 +1,6 @@
 {
  "name": "@immich/e2e-auth-server",
  "version": "0.1.0",
-  "private": true,
  "type": "module",
  "main": "auth-server.ts",
  "scripts": {
@@ -4,7 +4,7 @@ services:
  e2e-auth-server:
    container_name: immich-e2e-auth-server
    build:
-      context: ../packages/e2e-auth-server
+      context: ../e2e-auth-server
    ports:
      - 2286:2286

@@ -44,7 +44,7 @@ services:

  redis:
    container_name: immich-e2e-redis
-    image: docker.io/valkey/valkey:9@sha256:8436e10bc65c94886a91d4415b6a6dfa9cb5a306fb3b996e5bb67cd2b4854193
+    image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
    healthcheck:
      test: redis-cli ping || exit 1

@@ -7,6 +7,7 @@ import {
  getMyUser,
  LoginResponseDto,
  SharedLinkType,
+  updateConfig,
 } from '@immich/sdk';
 import { exiftool } from 'exiftool-vendored';
 import { DateTime } from 'luxon';
@@ -23,6 +24,7 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest';

 const locationAssetFilepath = `${testAssetDir}/metadata/gps-position/thompson-springs.jpg`;
 const ratingAssetFilepath = `${testAssetDir}/metadata/rating/mongolels.jpg`;
+const facesAssetDir = `${testAssetDir}/metadata/faces`;

 const readTags = async (bytes: Buffer, filename: string) => {
  const filepath = join(tempDir, filename);
@@ -183,6 +185,78 @@ describe('/asset', () => {
      });
    });

+    describe('faces', () => {
+      const metadataFaceTests = [
+        {
+          description: 'without orientation',
+          filename: 'portrait.jpg',
+        },
+        {
+          description: 'adjusting face regions to orientation',
+          filename: 'portrait-orientation-6.jpg',
+        },
+      ];
+      // should produce same resulting face region coordinates for any orientation
+      const expectedFaces = [
+        {
+          name: 'Marie Curie',
+          birthDate: null,
+          isHidden: false,
+          faces: [
+            {
+              imageHeight: 700,
+              imageWidth: 840,
+              boundingBoxX1: 261,
+              boundingBoxX2: 356,
+              boundingBoxY1: 146,
+              boundingBoxY2: 284,
+              sourceType: 'exif',
+            },
+          ],
+        },
+        {
+          name: 'Pierre Curie',
+          birthDate: null,
+          isHidden: false,
+          faces: [
+            {
+              imageHeight: 700,
+              imageWidth: 840,
+              boundingBoxX1: 536,
+              boundingBoxX2: 618,
+              boundingBoxY1: 83,
+              boundingBoxY2: 252,
+              sourceType: 'exif',
+            },
+          ],
+        },
+      ];
+
+      it.each(metadataFaceTests)('should get the asset faces from $filename $description', async ({ filename }) => {
+        const config = await utils.getSystemConfig(admin.accessToken);
+        config.metadata.faces.import = true;
+        await updateConfig({ systemConfigDto: config }, { headers: asBearerAuth(admin.accessToken) });
+
+        const facesAsset = await utils.createAsset(admin.accessToken, {
+          assetData: {
+            filename,
+            bytes: await readFile(`${facesAssetDir}/${filename}`),
+          },
+        });
+
+        await utils.waitForWebsocketEvent({ event: 'assetUpload', id: facesAsset.id });
+
+        const { status, body } = await request(app)
+          .get(`/assets/${facesAsset.id}`)
+          .set('Authorization', `Bearer ${admin.accessToken}`);
+
+        expect(status).toBe(200);
+        expect(body.id).toEqual(facesAsset.id);
+        const sortedPeople = body.people.toSorted((a: any, b: any) => a.name.localeCompare(b.name));
+        expect(sortedPeople).toMatchObject(expectedFaces);
+      });
+    });
+
    it('should work with a shared link', async () => {
      const sharedLink = await utils.createSharedLink(user1.accessToken, {
        type: SharedLinkType.Individual,
@@ -441,18 +441,7 @@ describe('/search', () => {
        .get('/search/explore')
        .set('Authorization', `Bearer ${admin.accessToken}`);
      expect(status).toBe(200);
-      expect(Array.isArray(body)).toBe(true);
-      expect(body).toEqual(expect.arrayContaining([{ fieldName: 'exifInfo.city', items: [] }]));
-      expect(body).toEqual(
-        expect.arrayContaining([
-          {
-            fieldName: 'createdAt',
-            items: expect.arrayContaining([
-              expect.objectContaining({ data: expect.objectContaining({ id: assetLast.id }) }),
-            ]),
-          },
-        ]),
-      );
+      expect(body).toEqual([{ fieldName: 'exifInfo.city', items: [] }]);
    });
  });

@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs';
 import { immichCli } from 'src/utils';
 import { describe, expect, it } from 'vitest';

-const pkg = JSON.parse(readFileSync('../packages/cli/package.json', 'utf8'));
+const pkg = JSON.parse(readFileSync('../cli/package.json', 'utf8'));

 describe(`immich --version`, () => {
  describe('immich --version', () => {
@@ -28,7 +28,6 @@ export function toColumnarFormat(assets: MockTimelineAsset[]): TimeBucketAssetRe
    ownerId: [],
    ratio: [],
    thumbhash: [],
-    createdAt: [],
    fileCreatedAt: [],
    localOffsetHours: [],
    isFavorite: [],
@@ -339,6 +338,7 @@ export function toAssetResponseDto(asset: MockTimelineAsset, owner?: UserRespons
    livePhotoVideoId: asset.livePhotoVideoId,
    tags: [],
    people: [],
+    unassignedFaces: [],
    stack: asset.stack,
    isOffline: false,
    hasMetadata: true,
@@ -66,6 +66,7 @@ export const createMockStackAsset = (ownerId: string): AssetResponseDto => {
    livePhotoVideoId: null,
    tags: [],
    people: [],
+    unassignedFaces: [],
    stack: undefined,
    isOffline: false,
    hasMetadata: true,
@@ -90,7 +90,7 @@ export const tempDir = tmpdir();
 export const asBearerAuth = (accessToken: string) => ({ Authorization: `Bearer ${accessToken}` });
 export const asKeyAuth = (key: string) => ({ 'x-api-key': key });
 export const immichCli = (args: string[]) =>
-  executeCommand('pnpm', ['exec', 'immich', '-d', `/${tempDir}/immich/`, ...args], { cwd: '../packages/cli' }).promise;
+  executeCommand('pnpm', ['exec', 'immich', '-d', `/${tempDir}/immich/`, ...args], { cwd: '../cli' }).promise;
 export const dockerExec = (args: string[]) =>
  executeCommand('docker', ['exec', '-i', 'immich-e2e-server', '/bin/bash', '-c', args.join(' ')]);
 export const immichAdmin = (args: string[]) => dockerExec([`immich-admin ${args.join(' ')}`]);
@@ -885,13 +885,15 @@
  "cutoff_date_description": "Keep photos from the last…",
  "cutoff_day": "{count, plural, one {day} other {days}}",
  "cutoff_year": "{count, plural, one {year} other {years}}",
+  "daily_title_text_date": "E, MMM dd",
+  "daily_title_text_date_year": "E, MMM dd, yyyy",
  "dark": "Dark",
  "dark_theme": "Switch to dark theme",
  "date": "Date",
  "date_after": "Date after",
  "date_and_time": "Date and Time",
  "date_before": "Date before",
-  "date_of_birth": "Date of birth",
+  "date_format": "E, LLL d, y • h:mm a",
  "date_of_birth_saved": "Date of birth saved successfully",
  "date_range": "Date range",
  "day": "Day",
@@ -1401,7 +1403,6 @@
  "link_to_oauth": "Link to OAuth",
  "linked_oauth_account": "Linked OAuth account",
  "list": "List",
-  "live": "Live",
  "loading": "Loading",
  "loading_search_results_failed": "Loading search results failed",
  "local": "Local",
@@ -1581,8 +1582,8 @@
  "mobile_app_download_onboarding_note": "Download the companion mobile app using the following options",
  "model": "Model",
  "month": "Month",
+  "monthly_title_text_date_format": "MMMM y",
  "more": "More",
-  "motion": "Motion",
  "move": "Move",
  "move_down": "Move down",
  "move_off_locked_folder": "Move out of locked folder",
@@ -1892,7 +1893,6 @@
  "remove_assets_title": "Remove assets?",
  "remove_custom_date_range": "Remove custom date range",
  "remove_deleted_assets": "Remove Deleted Assets",
-  "remove_filter": "Remove filter",
  "remove_from_album": "Remove from album",
  "remove_from_album_action_prompt": "{count} removed from the album",
  "remove_from_favorites": "Remove from favorites",
@@ -0,0 +1,13 @@
+{
+  "name": "immich-i18n",
+  "version": "2.7.5",
+  "private": true,
+  "scripts": {
+    "format": "prettier --cache --check .",
+    "format:fix": "prettier --cache --write --list-different ."
+  },
+  "devDependencies": {
+    "prettier": "^3.7.4",
+    "prettier-plugin-sort-json": "^4.1.1"
+  }
+}
@@ -64,13 +64,16 @@ if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; then

  pnpm version "$NEXT_SERVER" --no-git-tag-version
  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix server
-  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix packages/cli
+  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix i18n
+  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix cli
  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix web
  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix e2e
  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix packages/sdk

  # copy version to open-api spec
-  mise run //:open-api
+  pnpm install --frozen-lockfile --prefix server
+  pnpm --prefix server run build
+  ( cd ./open-api && bash ./bin/generate-open-api.sh )

  uv version --directory machine-learning "$NEXT_SERVER"

@@ -2,9 +2,9 @@ experimental_monorepo_root = true

 [monorepo]
 config_roots = [
-  "packages/plugins",
+  "plugins",
  "server",
-  "packages/cli",
+  "cli",
  "deployment",
  "mobile",
  "e2e",
@@ -21,12 +21,11 @@ pnpm = "10.33.1"
 terragrunt = "1.0.3"
 opentofu = "1.11.6"
 java = "21.0.2"
-"npm:oazapfts" = "7.5.0"

 [tools."github:CQLabs/homebrew-dcm"]
 version = "1.37.0"
 bin = "dcm"
-postinstall = "chmod +x \"$MISE_TOOL_INSTALL_PATH/dcm\" || true"
+postinstall = "chmod +x {{ get_env(name='MISE_TOOL_INSTALL_PATH',default='') }}/dcm"

 [tools."github:jellyfin/jellyfin-ffmpeg"]
 version = "7.1.3-6"
@@ -41,43 +40,20 @@ macos-arm64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_macarm64-gpl.tar.xz"
 experimental = true
 pin = true

-[tasks.open-api-typescript]
-run = [
-  "oazapfts --optimistic --argumentStyle=object --useEnumType --allSchemas open-api/immich-openapi-specs.json packages/sdk/src/fetch-client.ts",
-  { task = "//:sdk:install" },
-  { task = "//:sdk:build" },
-]
-
-[tasks.open-api-dart]
-dir = "open-api"
-run = "bash ./bin/generate-dart-sdk.sh"
-
-[tasks.open-api]
-env = { SHARP_IGNORE_GLOBAL_LIBVIPS = true }
-run = [
-  { task = "//server:install" },
-  { task = "//server:build" },
-  { task = "//server:sync-open-api" },
-  { task = ":open-api-typescript"},
-  { task = ":open-api-dart"},
-]
-
-[tasks.sql]
-dir = "server"
-run = "node ./dist/bin/sync-sql.js"
-
 # SDK tasks
 [tasks."sdk:install"]
 dir = "packages/sdk"
-run = "pnpm --filter @immich/sdk install --frozen-lockfile"
+run = "pnpm install --filter @immich/sdk --frozen-lockfile"

 [tasks."sdk:build"]
 dir = "packages/sdk"
-run = "pnpm build"
+run = "pnpm run build"

 # i18n tasks
 [tasks."i18n:format"]
-run = "pnpm format"
+dir = "i18n"
+run = "pnpm run format"

 [tasks."i18n:format-fix"]
-run = "pnpm format:fix"
+dir = "i18n"
+run = "pnpm run format:fix"
@@ -416,12 +416,12 @@ class BackgroundWorkerFlutterApi(private val binaryMessenger: BinaryMessenger, p
      } 
    }
  }
-  fun onAndroidUpload(maxMinutesArg: Long?, callback: (Result<Unit>) -> Unit)
+  fun onAndroidUpload(callback: (Result<Unit>) -> Unit)
 {
    val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
    val channelName = "dev.flutter.pigeon.immich_mobile.BackgroundWorkerFlutterApi.onAndroidUpload$separatedMessageChannelSuffix"
    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
-    channel.send(listOf(maxMinutesArg)) {
+    channel.send(null) {
      if (it is List<*>) {
        if (it.size > 1) {
          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
@@ -107,7 +107,7 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :
   * This method acts as a bridge between the native Android background task system and Flutter.
   */
  override fun onInitialized() {
-    flutterApi?.onAndroidUpload(maxMinutesArg = 20) { handleHostResult(it) }
+    flutterApi?.onAndroidUpload { handleHostResult(it) }
  }

  // TODO: Move this to a separate NotificationManager class
@@ -16,8 +16,8 @@
 default_platform(:android)

 platform :android do
-  desc "Build and Release Android RC to Open Testing"
-  lane :rc do
+  desc "Build Android and Release Testing"
+  lane :beta do
    gradle(
      task: 'bundle', 
      build_type: 'Release',
@@ -1003,6 +1003,20 @@
        1
      ],
      "type": "index",
+      "data": {
+        "on": 1,
+        "name": "idx_remote_asset_owner_checksum",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)",
+        "unique": false,
+        "columns": []
+      }
+    },
+    {
+      "id": 12,
+      "references": [
+        1
+      ],
+      "type": "index",
      "data": {
        "on": 1,
        "name": "UQ_remote_assets_owner_checksum",
@@ -1012,7 +1026,7 @@
      }
    },
    {
-      "id": 12,
+      "id": 13,
      "references": [
        1
      ],
@@ -1026,7 +1040,7 @@
      }
    },
    {
-      "id": 13,
+      "id": 14,
      "references": [
        1
      ],
@@ -1040,7 +1054,7 @@
      }
    },
    {
-      "id": 14,
+      "id": 15,
      "references": [
        1
      ],
@@ -1054,21 +1068,35 @@
      }
    },
    {
-      "id": 15,
+      "id": 16,
      "references": [
        1
      ],
      "type": "index",
      "data": {
        "on": 1,
-        "name": "idx_remote_asset_owner_visibility_deleted_created",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created\nON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)\n",
+        "name": "idx_remote_asset_local_date_time_day",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_day ON remote_asset_entity (STRFTIME('%Y-%m-%d', local_date_time))",
        "unique": false,
        "columns": []
      }
    },
    {
-      "id": 16,
+      "id": 17,
+      "references": [
+        1
+      ],
+      "type": "index",
+      "data": {
+        "on": 1,
+        "name": "idx_remote_asset_local_date_time_month",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_month ON remote_asset_entity (STRFTIME('%Y-%m', local_date_time))",
+        "unique": false,
+        "columns": []
+      }
+    },
+    {
+      "id": 18,
      "references": [],
      "type": "table",
      "data": {
@@ -1198,7 +1226,7 @@
      }
    },
    {
-      "id": 17,
+      "id": 19,
      "references": [
        0
      ],
@@ -1273,7 +1301,7 @@
      }
    },
    {
-      "id": 18,
+      "id": 20,
      "references": [
        0
      ],
@@ -1360,7 +1388,7 @@
      }
    },
    {
-      "id": 19,
+      "id": 21,
      "references": [
        1
      ],
@@ -1616,7 +1644,7 @@
      }
    },
    {
-      "id": 20,
+      "id": 22,
      "references": [
        1,
        4
@@ -1690,7 +1718,7 @@
      }
    },
    {
-      "id": 21,
+      "id": 23,
      "references": [
        4,
        0
@@ -1778,7 +1806,7 @@
      }
    },
    {
-      "id": 22,
+      "id": 24,
      "references": [
        1
      ],
@@ -1874,7 +1902,7 @@
      }
    },
    {
-      "id": 23,
+      "id": 25,
      "references": [
        0
      ],
@@ -2038,10 +2066,10 @@
      }
    },
    {
-      "id": 24,
+      "id": 26,
      "references": [
        1,
-        23
+        25
      ],
      "type": "table",
      "data": {
@@ -2112,7 +2140,7 @@
      }
    },
    {
-      "id": 25,
+      "id": 27,
      "references": [
        0
      ],
@@ -2256,10 +2284,10 @@
      }
    },
    {
-      "id": 26,
+      "id": 28,
      "references": [
        1,
-        25
+        27
      ],
      "type": "table",
      "data": {
@@ -2433,7 +2461,7 @@
      }
    },
    {
-      "id": 27,
+      "id": 29,
      "references": [],
      "type": "table",
      "data": {
@@ -2481,7 +2509,7 @@
      }
    },
    {
-      "id": 28,
+      "id": 30,
      "references": [],
      "type": "table",
      "data": {
@@ -2656,7 +2684,7 @@
      }
    },
    {
-      "id": 29,
+      "id": 31,
      "references": [
        1
      ],
@@ -2750,7 +2778,7 @@
      }
    },
    {
-      "id": 30,
+      "id": 32,
      "references": [],
      "type": "table",
      "data": {
@@ -2798,57 +2826,29 @@
      }
    },
    {
-      "id": 31,
+      "id": 33,
      "references": [
-        18
+        20
      ],
      "type": "index",
      "data": {
-        "on": 18,
+        "on": 20,
        "name": "idx_partner_shared_with_id",
        "sql": "CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)",
        "unique": false,
        "columns": []
      }
    },
-    {
-      "id": 32,
-      "references": [
-        19
-      ],
-      "type": "index",
-      "data": {
-        "on": 19,
-        "name": "idx_lat_lng",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)",
-        "unique": false,
-        "columns": []
-      }
-    },
-    {
-      "id": 33,
-      "references": [
-        19
-      ],
-      "type": "index",
-      "data": {
-        "on": 19,
-        "name": "idx_remote_exif_city",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_exif_city\nON remote_exif_entity (city) WHERE city IS NOT NULL\n",
-        "unique": false,
-        "columns": []
-      }
-    },
    {
      "id": 34,
      "references": [
-        20
+        21
      ],
      "type": "index",
      "data": {
-        "on": 20,
-        "name": "idx_remote_album_asset_album_asset",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)",
+        "on": 21,
+        "name": "idx_lat_lng",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)",
        "unique": false,
        "columns": []
      }
@@ -2861,8 +2861,8 @@
      "type": "index",
      "data": {
        "on": 22,
-        "name": "idx_remote_asset_cloud_id",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)",
+        "name": "idx_remote_album_asset_album_asset",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)",
        "unique": false,
        "columns": []
      }
@@ -2870,13 +2870,13 @@
    {
      "id": 36,
      "references": [
-        25
+        24
      ],
      "type": "index",
      "data": {
-        "on": 25,
-        "name": "idx_person_owner_id",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)",
+        "on": 24,
+        "name": "idx_remote_asset_cloud_id",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)",
        "unique": false,
        "columns": []
      }
@@ -2884,13 +2884,13 @@
    {
      "id": 37,
      "references": [
-        26
+        27
      ],
      "type": "index",
      "data": {
-        "on": 26,
-        "name": "idx_asset_face_person_id",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)",
+        "on": 27,
+        "name": "idx_person_owner_id",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)",
        "unique": false,
        "columns": []
      }
@@ -2898,13 +2898,13 @@
    {
      "id": 38,
      "references": [
-        26
+        28
      ],
      "type": "index",
      "data": {
-        "on": 26,
-        "name": "idx_asset_face_asset_id",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)",
+        "on": 28,
+        "name": "idx_asset_face_person_id",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)",
        "unique": false,
        "columns": []
      }
@@ -2912,13 +2912,13 @@
    {
      "id": 39,
      "references": [
-        26
+        28
      ],
      "type": "index",
      "data": {
-        "on": 26,
-        "name": "idx_asset_face_visible_person",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person\nON asset_face_entity (person_id, asset_id)\nWHERE is_visible = 1 AND deleted_at IS NULL\n",
+        "on": 28,
+        "name": "idx_asset_face_asset_id",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)",
        "unique": false,
        "columns": []
      }
@@ -2926,11 +2926,11 @@
    {
      "id": 40,
      "references": [
-        28
+        30
      ],
      "type": "index",
      "data": {
-        "on": 28,
+        "on": 30,
        "name": "idx_trashed_local_asset_checksum",
        "sql": "CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)",
        "unique": false,
@@ -2940,11 +2940,11 @@
    {
      "id": 41,
      "references": [
-        28
+        30
      ],
      "type": "index",
      "data": {
-        "on": 28,
+        "on": 30,
        "name": "idx_trashed_local_asset_album",
        "sql": "CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)",
        "unique": false,
@@ -2954,11 +2954,11 @@
    {
      "id": 42,
      "references": [
-        29
+        31
      ],
      "type": "index",
      "data": {
-        "on": 29,
+        "on": 31,
        "name": "idx_asset_edit_asset_id",
        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)",
        "unique": false,
@@ -3066,6 +3066,15 @@
        }
      ]
    },
+    {
+      "name": "idx_remote_asset_owner_checksum",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)"
+        }
+      ]
+    },
    {
      "name": "UQ_remote_assets_owner_checksum",
      "sql": [
@@ -3103,11 +3112,20 @@
      ]
    },
    {
-      "name": "idx_remote_asset_owner_visibility_deleted_created",
+      "name": "idx_remote_asset_local_date_time_day",
      "sql": [
        {
          "dialect": "sqlite",
-          "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)"
+          "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_day ON remote_asset_entity (STRFTIME('%Y-%m-%d', local_date_time))"
+        }
+      ]
+    },
+    {
+      "name": "idx_remote_asset_local_date_time_month",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_month ON remote_asset_entity (STRFTIME('%Y-%m', local_date_time))"
        }
      ]
    },
@@ -3264,15 +3282,6 @@
        }
      ]
    },
-    {
-      "name": "idx_remote_exif_city",
-      "sql": [
-        {
-          "dialect": "sqlite",
-          "sql": "CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL"
-        }
-      ]
-    },
    {
      "name": "idx_remote_album_asset_album_asset",
      "sql": [
@@ -3318,15 +3327,6 @@
        }
      ]
    },
-    {
-      "name": "idx_asset_face_visible_person",
-      "sql": [
-        {
-          "dialect": "sqlite",
-          "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL"
-        }
-      ]
-    },
    {
      "name": "idx_trashed_local_asset_checksum",
      "sql": [
@@ -348,7 +348,7 @@ class BackgroundWorkerBgHostApiSetup {
 /// Generated protocol from Pigeon that represents Flutter messages that can be called from Swift.
 protocol BackgroundWorkerFlutterApiProtocol {
  func onIosUpload(isRefresh isRefreshArg: Bool, maxSeconds maxSecondsArg: Int64?, completion: @escaping (Result<Void, PigeonError>) -> Void)
-  func onAndroidUpload(maxMinutes maxMinutesArg: Int64?, completion: @escaping (Result<Void, PigeonError>) -> Void)
+  func onAndroidUpload(completion: @escaping (Result<Void, PigeonError>) -> Void)
  func cancel(completion: @escaping (Result<Void, PigeonError>) -> Void)
 }
 class BackgroundWorkerFlutterApi: BackgroundWorkerFlutterApiProtocol {
@@ -379,10 +379,10 @@ class BackgroundWorkerFlutterApi: BackgroundWorkerFlutterApiProtocol {
      }
    }
  }
-  func onAndroidUpload(maxMinutes maxMinutesArg: Int64?, completion: @escaping (Result<Void, PigeonError>) -> Void) {
+  func onAndroidUpload(completion: @escaping (Result<Void, PigeonError>) -> Void) {
    let channelName: String = "dev.flutter.pigeon.immich_mobile.BackgroundWorkerFlutterApi.onAndroidUpload\(messageChannelSuffix)"
    let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec)
-    channel.sendMessage([maxMinutesArg] as [Any?]) { response in
+    channel.sendMessage(nil) { response in
      guard let listResponse = response as? [Any?] else {
        completion(.failure(createConnectionError(withChannelName: channelName)))
        return
@@ -169,37 +169,6 @@ end
    )
  end

-  desc "iOS RC Build to public TestFlight"
-  lane :gha_testflight_rc do
-    api_key = get_api_key
-
-    sigh(api_key: api_key, app_identifier: DEV_BUNDLE_ID, force: true)
-    main_profile_name = lane_context[SharedValues::SIGH_NAME]
-
-    sigh(api_key: api_key, app_identifier: "#{DEV_BUNDLE_ID}.ShareExtension", force: true)
-    share_profile_name = lane_context[SharedValues::SIGH_NAME]
-
-    sigh(api_key: api_key, app_identifier: "#{DEV_BUNDLE_ID}.Widget", force: true)
-    widget_profile_name = lane_context[SharedValues::SIGH_NAME]
-
-    configure_code_signing(
-      base_bundle_id: DEV_BUNDLE_ID,
-      profile_name_main: main_profile_name,
-      profile_name_share: share_profile_name,
-      profile_name_widget: widget_profile_name
-    )
-
-    build_and_upload(
-      api_key: api_key,
-      base_bundle_id: DEV_BUNDLE_ID,
-      version_number: get_version_from_pubspec.split('-').first,
-      distribute_external: true,
-      profile_name_main: main_profile_name,
-      profile_name_share: share_profile_name,
-      profile_name_widget: widget_profile_name
-    )
-  end
-
  desc "iOS Release to TestFlight"
  lane :gha_release_prod do
    api_key = get_api_key
@@ -10,7 +10,6 @@ class RemoteAsset extends BaseAsset {
  final AssetVisibility visibility;
  final String ownerId;
  final String? stackId;
-  final DateTime? uploadedAt;

  const RemoteAsset({
    required this.id,
@@ -21,7 +20,6 @@ class RemoteAsset extends BaseAsset {
    required super.type,
    required super.createdAt,
    required super.updatedAt,
-    this.uploadedAt,
    super.width,
    super.height,
    super.durationMs,
@@ -57,7 +55,6 @@ class RemoteAsset extends BaseAsset {
    type: $type,
    createdAt: $createdAt,
    updatedAt: $updatedAt,
-    uploadedAt: ${uploadedAt ?? "<NA>"},
    width: ${width ?? "<NA>"},
    height: ${height ?? "<NA>"},
    durationMs: ${durationMs ?? "<NA>"},
@@ -85,8 +82,7 @@ class RemoteAsset extends BaseAsset {
        ownerId == other.ownerId &&
        thumbHash == other.thumbHash &&
        visibility == other.visibility &&
-        stackId == other.stackId &&
-        uploadedAt == other.uploadedAt;
+        stackId == other.stackId;
  }

  @override
@@ -97,8 +93,7 @@ class RemoteAsset extends BaseAsset {
      localId.hashCode ^
      thumbHash.hashCode ^
      visibility.hashCode ^
-      stackId.hashCode ^
-      uploadedAt.hashCode;
+      stackId.hashCode;

  RemoteAsset copyWith({
    String? id,
@@ -109,7 +104,6 @@ class RemoteAsset extends BaseAsset {
    AssetType? type,
    DateTime? createdAt,
    DateTime? updatedAt,
-    DateTime? uploadedAt,
    int? width,
    int? height,
    int? durationMs,
@@ -129,7 +123,6 @@ class RemoteAsset extends BaseAsset {
      type: type ?? this.type,
      createdAt: createdAt ?? this.createdAt,
      updatedAt: updatedAt ?? this.updatedAt,
-      uploadedAt: uploadedAt ?? this.uploadedAt,
      width: width ?? this.width,
      height: height ?? this.height,
      durationMs: durationMs ?? this.durationMs,
@@ -155,7 +148,6 @@ class RemoteAssetExif extends RemoteAsset {
    required super.type,
    required super.createdAt,
    required super.updatedAt,
-    super.uploadedAt,
    super.width,
    super.height,
    super.durationMs,
@@ -192,7 +184,6 @@ class RemoteAssetExif extends RemoteAsset {
    AssetType? type,
    DateTime? createdAt,
    DateTime? updatedAt,
-    DateTime? uploadedAt,
    int? width,
    int? height,
    int? durationMs,
@@ -213,7 +204,6 @@ class RemoteAssetExif extends RemoteAsset {
      type: type ?? this.type,
      createdAt: createdAt ?? this.createdAt,
      updatedAt: updatedAt ?? this.updatedAt,
-      uploadedAt: uploadedAt ?? this.uploadedAt,
      width: width ?? this.width,
      height: height ?? this.height,
      durationMs: durationMs ?? this.durationMs,
@@ -1,58 +1,22 @@
 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/theme_config.dart';
-import 'package:immich_mobile/domain/models/config/timeline_config.dart';
-import 'package:immich_mobile/domain/models/config/viewer_config.dart';

 class AppConfig {
  final ThemeConfig theme;
  final CleanupConfig cleanup;
-  final MapConfig map;
-  final TimelineConfig timeline;
-  final ImageConfig image;
-  final ViewerConfig viewer;

-  const AppConfig({
-    this.theme = const .new(),
-    this.cleanup = const .new(),
-    this.map = const .new(),
-    this.timeline = const .new(),
-    this.image = const .new(),
-    this.viewer = const .new(),
-  });
+  const AppConfig({this.theme = const .new(), this.cleanup = const .new()});

-  AppConfig copyWith({
-    ThemeConfig? theme,
-    CleanupConfig? cleanup,
-    MapConfig? map,
-    TimelineConfig? timeline,
-    ImageConfig? image,
-    ViewerConfig? viewer,
-  }) => .new(
-    theme: theme ?? this.theme,
-    cleanup: cleanup ?? this.cleanup,
-    map: map ?? this.map,
-    timeline: timeline ?? this.timeline,
-    image: image ?? this.image,
-    viewer: viewer ?? this.viewer,
-  );
+  AppConfig copyWith({ThemeConfig? theme, CleanupConfig? cleanup}) =>
+      .new(theme: theme ?? this.theme, cleanup: cleanup ?? this.cleanup);

  @override
  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is AppConfig &&
-          other.theme == theme &&
-          other.cleanup == cleanup &&
-          other.map == map &&
-          other.timeline == timeline &&
-          other.image == image &&
-          other.viewer == viewer);
+      identical(this, other) || (other is AppConfig && other.theme == theme && other.cleanup == cleanup);

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

  @override
-  String toString() =>
-      'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer)';
+  String toString() => 'AppConfig(theme: $theme, cleanup: $cleanup)';
 }
@@ -1,20 +0,0 @@
-class ImageConfig {
-  final bool preferRemote;
-  final bool loadOriginal;
-
-  const ImageConfig({this.preferRemote = false, this.loadOriginal = false});
-
-  ImageConfig copyWith({bool? preferRemote, bool? loadOriginal}) =>
-      ImageConfig(preferRemote: preferRemote ?? this.preferRemote, loadOriginal: loadOriginal ?? this.loadOriginal);
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is ImageConfig && other.preferRemote == preferRemote && other.loadOriginal == loadOriginal);
-
-  @override
-  int get hashCode => Object.hash(preferRemote, loadOriginal);
-
-  @override
-  String toString() => 'ImageConfig(preferRemoteImage: $preferRemote, loadOriginal: $loadOriginal)';
-}
@@ -1,48 +0,0 @@
-import 'package:flutter/material.dart';
-
-class MapConfig {
-  final int relativeDays;
-  final bool favoritesOnly;
-  final bool includeArchived;
-  final ThemeMode themeMode;
-  final bool withPartners;
-
-  const MapConfig({
-    this.relativeDays = 0,
-    this.favoritesOnly = false,
-    this.includeArchived = false,
-    this.themeMode = ThemeMode.system,
-    this.withPartners = false,
-  });
-
-  MapConfig copyWith({
-    int? relativeDays,
-    bool? favoritesOnly,
-    bool? includeArchived,
-    ThemeMode? themeMode,
-    bool? withPartners,
-  }) => MapConfig(
-    relativeDays: relativeDays ?? this.relativeDays,
-    favoritesOnly: favoritesOnly ?? this.favoritesOnly,
-    includeArchived: includeArchived ?? this.includeArchived,
-    themeMode: themeMode ?? this.themeMode,
-    withPartners: withPartners ?? this.withPartners,
-  );
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is MapConfig &&
-          other.relativeDays == relativeDays &&
-          other.favoritesOnly == favoritesOnly &&
-          other.includeArchived == includeArchived &&
-          other.themeMode == themeMode &&
-          other.withPartners == withPartners);
-
-  @override
-  int get hashCode => Object.hash(relativeDays, favoritesOnly, includeArchived, themeMode, withPartners);
-
-  @override
-  String toString() =>
-      'MapConfig(relativeDays: $relativeDays, favoritesOnly: $favoritesOnly, includeArchived: $includeArchived, themeMode: $themeMode, withPartners: $withPartners)';
-}
@@ -1,30 +0,0 @@
-import 'package:immich_mobile/domain/models/timeline.model.dart';
-
-class TimelineConfig {
-  final int tilesPerRow;
-  final GroupAssetsBy groupAssetsBy;
-  final bool storageIndicator;
-
-  const TimelineConfig({this.tilesPerRow = 4, this.groupAssetsBy = GroupAssetsBy.day, this.storageIndicator = true});
-
-  TimelineConfig copyWith({int? tilesPerRow, GroupAssetsBy? groupAssetsBy, bool? storageIndicator}) => TimelineConfig(
-    tilesPerRow: tilesPerRow ?? this.tilesPerRow,
-    groupAssetsBy: groupAssetsBy ?? this.groupAssetsBy,
-    storageIndicator: storageIndicator ?? this.storageIndicator,
-  );
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is TimelineConfig &&
-          other.tilesPerRow == tilesPerRow &&
-          other.groupAssetsBy == groupAssetsBy &&
-          other.storageIndicator == storageIndicator);
-
-  @override
-  int get hashCode => Object.hash(tilesPerRow, groupAssetsBy, storageIndicator);
-
-  @override
-  String toString() =>
-      'TimelineConfig(tilesPerRow: $tilesPerRow, groupAssetsBy: $groupAssetsBy, storageIndicator: $storageIndicator)';
-}
@@ -1,37 +0,0 @@
-class ViewerConfig {
-  final bool loopVideo;
-  final bool loadOriginalVideo;
-  final bool autoPlayVideo;
-  final bool tapToNavigate;
-
-  const ViewerConfig({
-    this.loopVideo = true,
-    this.loadOriginalVideo = false,
-    this.autoPlayVideo = true,
-    this.tapToNavigate = false,
-  });
-
-  ViewerConfig copyWith({bool? loopVideo, bool? loadOriginalVideo, bool? autoPlayVideo, bool? tapToNavigate}) =>
-      ViewerConfig(
-        loopVideo: loopVideo ?? this.loopVideo,
-        loadOriginalVideo: loadOriginalVideo ?? this.loadOriginalVideo,
-        autoPlayVideo: autoPlayVideo ?? this.autoPlayVideo,
-        tapToNavigate: tapToNavigate ?? this.tapToNavigate,
-      );
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is ViewerConfig &&
-          other.loopVideo == loopVideo &&
-          other.loadOriginalVideo == loadOriginalVideo &&
-          other.autoPlayVideo == autoPlayVideo &&
-          other.tapToNavigate == tapToNavigate);
-
-  @override
-  int get hashCode => Object.hash(loopVideo, loadOriginalVideo, autoPlayVideo, tapToNavigate);
-
-  @override
-  String toString() =>
-      'ViewerConfig(loopVideo: $loopVideo, loadOriginalVideo: $loadOriginalVideo, autoPlayVideo: $autoPlayVideo, tapToNavigate: $tapToNavigate)';
-}
@@ -7,7 +7,6 @@ import 'package:immich_mobile/constants/enums.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/log.model.dart';
-import 'package:immich_mobile/domain/models/timeline.model.dart';

 enum MetadataDomain<T extends Object> {
  appConfig<AppConfig>('config.app'),
@@ -24,36 +23,9 @@ enum MetadataKey<T extends Object> {
  themeDynamic<bool>(.appConfig, 'theme.dynamic', false),
  themeColorfulInterface<bool>(.appConfig, 'theme.colorfulInterface', true),

-  // Image
-  imagePreferRemote<bool>(.appConfig, 'image.preferRemote', false),
-  imageLoadOriginal<bool>(.appConfig, 'image.loadOriginal', false),
-
-  // Viewer
-  viewerLoopVideo<bool>(.appConfig, 'viewer.loopVideo', true),
-  viewerLoadOriginalVideo<bool>(.appConfig, 'viewer.loadOriginalVideo', false),
-  viewerAutoPlayVideo<bool>(.appConfig, 'viewer.autoPlayVideo', true),
-  viewerTapToNavigate<bool>(.appConfig, 'viewer.tapToNavigate', false),
-
-  // Timeline
-  timelineTilesPerRow<int>(.appConfig, 'timeline.tilesPerRow', 4),
-  timelineGroupAssetsBy<GroupAssetsBy>(
-    .appConfig,
-    'timeline.groupAssetsBy',
-    GroupAssetsBy.day,
-    _EnumCodec(GroupAssetsBy.values),
-  ),
-  timelineStorageIndicator<bool>(.appConfig, 'timeline.storageIndicator', true),
-
  // Log
  logLevel<LogLevel>(.systemConfig, 'log.level', .info, _EnumCodec(LogLevel.values)),

-  // Map
-  mapShowFavoriteOnly<bool>(.appConfig, 'map.showFavoriteOnly', false),
-  mapRelativeDate<int>(.appConfig, 'map.relativeDate', 0),
-  mapIncludeArchived<bool>(.appConfig, 'map.includeArchived', false),
-  mapThemeMode<ThemeMode>(.appConfig, 'map.themeMode', .system, _EnumCodec(ThemeMode.values)),
-  mapWithPartners<bool>(.appConfig, 'map.withPartners', false),
-
  // Cleanup
  cleanupKeepFavorites<bool>(.appConfig, 'cleanup.keepFavorites', true),
  cleanupKeepMediaType<AssetKeepType>(
@@ -1,6 +1,13 @@
 import 'package:immich_mobile/domain/models/store.model.dart';

 enum Setting<T> {
+  tilesPerRow<int>(StoreKey.tilesPerRow, 4),
+  groupAssetsBy<int>(StoreKey.groupAssetsBy, 0),
+  showStorageIndicator<bool>(StoreKey.storageIndicator, true),
+  loadOriginal<bool>(StoreKey.loadOriginal, false),
+  loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, false),
+  autoPlayVideo<bool>(StoreKey.autoPlayVideo, true),
+  preferRemoteImage<bool>(StoreKey.preferRemoteImage, false),
  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),
  enableBackup<bool>(StoreKey.enableBackup, false);

@@ -19,13 +19,35 @@ enum StoreKey<T> {
  backgroundBackup<bool>._(14),
  sslClientCertData<String>._(15),
  sslClientPasswd<String>._(16),
+  // user settings from [AppSettingsEnum] below:
+  loadPreview<bool>._(100),
+  loadOriginal<bool>._(101),
+  tilesPerRow<int>._(103),
+  dynamicLayout<bool>._(104),
+  groupAssetsBy<int>._(105),
  uploadErrorNotificationGracePeriod<int>._(106),
+  backgroundBackupTotalProgress<bool>._(107),
+  backgroundBackupSingleProgress<bool>._(108),
+  storageIndicator<bool>._(109),
+  thumbnailCacheSize<int>._(110),
+  imageCacheSize<int>._(111),
+  albumThumbnailCacheSize<int>._(112),
  selectedAlbumSortOrder<int>._(113),
  advancedTroubleshooting<bool>._(114),
+  preferRemoteImage<bool>._(116),
+  loopVideo<bool>._(117),
+  // map related settings
+  mapShowFavoriteOnly<bool>._(118),
+  mapRelativeDate<int>._(119),
  selfSignedCert<bool>._(120),
+  mapIncludeArchived<bool>._(121),
+  ignoreIcloudAssets<bool>._(122),
  selectedAlbumSortReverse<bool>._(123),
+  mapThemeMode<int>._(124),
+  mapwithPartners<bool>._(125),
  enableHapticFeedback<bool>._(126),
  customHeaders<String>._(127),
+
  syncAlbums<bool>._(131),

  // Auto endpoint switching
@@ -34,25 +56,34 @@ enum StoreKey<T> {
  localEndpoint<String>._(134),
  externalEndpointList<String>._(135),

+  // Video settings
+  loadOriginalVideo<bool>._(136),
  manageLocalMediaAndroid<bool>._(137),
+
  // Read-only Mode settings
  readonlyModeEnabled<bool>._(138),
+
+  autoPlayVideo<bool>._(139),
  albumGridView<bool>._(140),
-  loadOriginal<bool>._(101),
+
+  // Image viewer navigation settings
+  tapToNavigate<bool>._(141),

  // Experimental stuff
+  photoManagerCustomFilter<bool>._(1000),
+  betaPromptShown<bool>._(1001),
+  betaTimeline<bool>._(1002),
  enableBackup<bool>._(1003),
  useWifiForUploadVideos<bool>._(1004),
  useWifiForUploadPhotos<bool>._(1005),
+  needBetaMigration<bool>._(1006),
+  // TODO: Remove this after patching open-api
+  shouldResetSync<bool>._(1007),
+
+  // Free up space
  syncMigrationStatus<String>._(1013),

  // Legacy keys that have been migrated to the new metadata store
-  legacyLoopVideo<bool>._(117),
-  legacyLoadOriginalVideo<bool>._(136),
-  legacyAutoPlayVideo<bool>._(139),
-  legacyTapToNavigate<bool>._(141),
-  legacyPreferRemoteImage<bool>._(116),
-  legacyLoadOriginal<bool>._(101),
  legacyPrimaryColor<String>._(128),
  legacyDynamicTheme<bool>._(129),
  legacyColorfulInterface<bool>._(130),
@@ -62,14 +93,6 @@ enum StoreKey<T> {
  legacyCleanupKeepAlbumIds<String>._(1010),
  legacyCleanupCutoffDaysAgo<int>._(1011),
  legacyCleanupDefaultsInitialized<bool>._(1012),
-  legacyTilesPerRow<int>._(103),
-  legacyGroupAssetsBy<int>._(105),
-  legacyStorageIndicator<bool>._(109),
-  legacyMapRelativeDate<int>._(119),
-  legacyMapShowFavoriteOnly<bool>._(118),
-  legacyMapIncludeArchived<bool>._(121),
-  legacyMapThemeMode<int>._(124),
-  legacyMapwithPartners<bool>._(125),
  legacyLogLevel<int>._(115);

  const StoreKey._(this.id);
@@ -2,8 +2,6 @@ enum GroupAssetsBy { day, month, auto, none }

 enum HeaderType { none, month, day, monthAndDay }

-enum SortAssetsBy { taken, uploaded }
-
 class Bucket {
  final int assetCount;

@@ -105,58 +105,46 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
  }

  @override
-  Future<void> onAndroidUpload(int? maxMinutes) async {
-    final hashTimeout = Duration(minutes: _isBackupEnabled ? 3 : 6);
-    final backupTimeout = maxMinutes != null ? Duration(minutes: maxMinutes - 1) : null;
-    return _backgroundLoop(
-      hashTimeout: hashTimeout,
-      backupTimeout: backupTimeout,
-      debugLabel: 'Android background upload',
-    );
+  Future<void> onAndroidUpload() async {
+    _logger.info('Android background processing started');
+    final sw = Stopwatch()..start();
+    try {
+      if (!await _syncAssets(hashTimeout: Duration(minutes: _isBackupEnabled ? 3 : 6))) {
+        _logger.warning("Remote sync did not complete successfully, skipping backup");
+        return;
+      }
+      await _handleBackup();
+    } catch (error, stack) {
+      _logger.severe("Failed to complete Android background processing", error, stack);
+    } finally {
+      sw.stop();
+      _logger.info("Android background processing completed in ${sw.elapsed.inSeconds}s");
+      await _cleanup();
+    }
  }

  @override
  Future<void> onIosUpload(bool isRefresh, int? maxSeconds) async {
-    final hashTimeout = isRefresh ? const Duration(seconds: 5) : Duration(minutes: _isBackupEnabled ? 3 : 6);
-    final backupTimeout = maxSeconds != null ? Duration(seconds: maxSeconds - 1) : null;
-    return _backgroundLoop(hashTimeout: hashTimeout, backupTimeout: backupTimeout, debugLabel: 'iOS background upload');
-  }
-
-  Future<void> _backgroundLoop({
-    required Duration hashTimeout,
-    required Duration? backupTimeout,
-    required String debugLabel,
-  }) async {
-    _logger.info(
-      '$debugLabel started hashTimeout: ${hashTimeout.inSeconds}s, backupTimeout: ${backupTimeout?.inMinutes ?? '~'}m',
-    );
+    _logger.info('iOS background upload started with maxSeconds: ${maxSeconds}s');
    final sw = Stopwatch()..start();
    try {
-      if (!await _syncAssets(hashTimeout: hashTimeout)) {
+      final timeout = isRefresh ? const Duration(seconds: 5) : Duration(minutes: _isBackupEnabled ? 3 : 6);
+      if (!await _syncAssets(hashTimeout: timeout)) {
        _logger.warning("Remote sync did not complete successfully, skipping backup");
        return;
      }

      final backupFuture = _handleBackup();
-      Timer? cancelTimer;
-      if (backupTimeout != null) {
-        cancelTimer = Timer(backupTimeout, () {
-          if (!_cancellationToken.isCompleted) {
-            _logger.warning("$debugLabel timed out after ${backupTimeout.inMinutes}m, cancelling backup");
-            _cancellationToken.complete();
-          }
-        });
-      }
-      try {
+      if (maxSeconds != null) {
+        await backupFuture.timeout(Duration(seconds: maxSeconds - 1), onTimeout: () {});
+      } else {
        await backupFuture;
-      } finally {
-        cancelTimer?.cancel();
      }
    } catch (error, stack) {
-      _logger.severe("Failed to complete $debugLabel", error, stack);
+      _logger.severe("Failed to complete iOS background upload", error, stack);
    } finally {
      sw.stop();
-      _logger.info("$debugLabel completed in ${sw.elapsed.inSeconds}s");
+      _logger.info("iOS background upload completed in ${sw.elapsed.inSeconds}s");
      await _cleanup();
    }
  }
@@ -189,9 +177,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
      final nativeSyncApi = _ref?.read(nativeSyncApiProvider);

      _logger.info("Cleaning up background worker");
-      if (!_cancellationToken.isCompleted) {
-        _cancellationToken.complete();
-      }
+      _cancellationToken.complete();
      final cleanupFutures = [
        nativeSyncApi?.cancelHashing(),
        workerManagerPatch.dispose().catchError((_) async {
@@ -93,7 +93,8 @@ class LocalSyncService {

      if (CurrentPlatform.isIOS) {
        // On iOS, we need to full sync albums that are marked as cloud as the delta sync
-        // does not include changes for cloud albums.
+        // does not include changes for cloud albums. If ignoreIcloudAssets is enabled,
+        // remove the albums from the local database from the previous sync
        final cloudAlbums = deviceAlbums.where((a) => a.isCloud).toLocalAlbums();
        for (final album in cloudAlbums) {
          final dbAlbum = dbAlbums.firstWhereOrNull((a) => a.id == album.id);
@@ -24,7 +24,6 @@ enum SyncMigrationTask {
  v20260128_ResetExifV1, // EXIF table has incorrect width and height information.
  v20260128_CopyExifWidthHeightToAsset, // Asset table has incorrect width and height for video ratio calculations.
  v20260128_ResetAssetV1, // Asset v2.5.0 has width and height information that were edited assets.
-  v20260597_ResetAssetV1AssetV2, // Assets didn't include the uploadedAt column.
 }

 class SyncStreamService {
@@ -133,13 +132,6 @@ class SyncStreamService {
        migrations.add(SyncMigrationTask.v20260128_CopyExifWidthHeightToAsset.name);
      }
    }
-
-    if (!migrations.contains(SyncMigrationTask.v20260597_ResetAssetV1AssetV2.name) &&
-        semVer > const SemVer(major: 2, minor: 7, patch: 5)) {
-      _logger.info("Running pre-sync task: v20260597_ResetAssetV1AssetV2");
-      await _syncApiRepository.deleteSyncAck([SyncEntityType.assetV1, SyncEntityType.assetV2]);
-      migrations.add(SyncMigrationTask.v20260597_ResetAssetV1AssetV2.name);
-    }
  }

  Future<void> _runPostSyncTasks(List<String> migrations) async {
@@ -5,9 +5,10 @@ import 'package:collection/collection.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/services/setting.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';

@@ -34,21 +35,18 @@ enum TimelineOrigin {
  deepLink,
  albumActivities,
  folder,
-  recentlyAdded,
 }

 class TimelineFactory {
  final DriftTimelineRepository _timelineRepository;
-  final MetadataRepository _metadataRepository;
+  final SettingsService _settingsService;

-  const TimelineFactory({
-    required DriftTimelineRepository timelineRepository,
-    required MetadataRepository metadataRepository,
-  }) : _timelineRepository = timelineRepository,
-       _metadataRepository = metadataRepository;
+  const TimelineFactory({required DriftTimelineRepository timelineRepository, required SettingsService settingsService})
+    : _timelineRepository = timelineRepository,
+      _settingsService = settingsService;

  GroupAssetsBy get groupBy {
-    final group = _metadataRepository.appConfig.timeline.groupAssetsBy;
+    final group = GroupAssetsBy.values[_settingsService.get(Setting.groupAssetsBy)];
    // We do not support auto grouping in the new timeline yet, fallback to day grouping
    return group == GroupAssetsBy.auto ? GroupAssetsBy.day : group;
  }
@@ -63,8 +61,6 @@ class TimelineFactory {

  TimelineService remoteAssets(String userId) => TimelineService(_timelineRepository.remote(userId, groupBy));

-  TimelineService recentlyAdded(String userId) => TimelineService(_timelineRepository.recentlyAdded(userId, groupBy));
-
  TimelineService favorite(String userId) => TimelineService(_timelineRepository.favorite(userId, groupBy));

  TimelineService trash(String userId) => TimelineService(_timelineRepository.trash(userId, groupBy));
@@ -11,7 +11,6 @@ extension DTOToAsset on api.AssetResponseDto {
      checksum: checksum,
      createdAt: fileCreatedAt,
      updatedAt: updatedAt,
-      uploadedAt: createdAt,
      ownerId: ownerId,
      visibility: visibility.toAssetVisibility(),
      durationMs: duration,
@@ -34,7 +33,6 @@ extension DTOToAsset on api.AssetResponseDto {
      checksum: checksum,
      createdAt: fileCreatedAt,
      updatedAt: updatedAt,
-      uploadedAt: createdAt,
      ownerId: ownerId,
      visibility: visibility.toAssetVisibility(),
      durationMs: duration,
@@ -5,11 +5,6 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';

@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)')
@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)')
-@TableIndex.sql('''
-CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person
-ON asset_face_entity (person_id, asset_id)
-WHERE is_visible = 1 AND deleted_at IS NULL
-''')
 class AssetFaceEntity extends Table with DriftDefaultsMixin {
  const AssetFaceEntity();

@@ -1350,7 +1350,3 @@ i0.Index get idxAssetFaceAssetId => i0.Index(
  'idx_asset_face_asset_id',
  'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
 );
-i0.Index get idxAssetFaceVisiblePerson => i0.Index(
-  'idx_asset_face_visible_person',
-  'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
-);
@@ -6,10 +6,6 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';

@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)')
-@TableIndex.sql('''
-CREATE INDEX IF NOT EXISTS idx_remote_exif_city
-ON remote_exif_entity (city) WHERE city IS NOT NULL
-''')
 class RemoteExifEntity extends Table with DriftDefaultsMixin {
  const RemoteExifEntity();

@@ -1883,8 +1883,3 @@ class RemoteExifEntityCompanion
        .toString();
  }
 }
-
-i0.Index get idxRemoteExifCity => i0.Index(
-  'idx_remote_exif_city',
-  'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
-);
@@ -4,7 +4,7 @@ import 'local_asset.entity.dart';
 import 'local_album.entity.dart';
 import 'local_album_asset.entity.dart';

-mergedAsset:
+mergedAsset: 
 SELECT
 	rae.id as remote_id,
 	(SELECT lae.id FROM local_asset_entity lae WHERE lae.checksum = rae.checksum LIMIT 1) as local_id,
@@ -27,8 +27,7 @@ SELECT
 	NULL as longitude,
 	NULL as adjustmentTime,
 	rae.is_edited,
-	0 as playback_style,
-	rae.uploaded_at
+	0 as playback_style
 FROM
 	remote_asset_entity rae
 LEFT JOIN
@@ -66,8 +65,7 @@ SELECT
 	lae.longitude,
 	lae.adjustment_time,
 	0 as is_edited,
-	lae.playback_style,
-	NULL as uploaded_at
+	lae.playback_style
 FROM
 	local_asset_entity lae
 WHERE NOT EXISTS (
@@ -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) 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 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 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,
@@ -68,7 +68,6 @@ class MergedAssetDrift extends i1.ModularAccessor {
        adjustmentTime: row.readNullable<DateTime>('adjustmentTime'),
        isEdited: row.read<bool>('is_edited'),
        playbackStyle: row.read<int>('playback_style'),
-        uploadedAt: row.readNullable<DateTime>('uploaded_at'),
      ),
    );
  }
@@ -142,7 +141,6 @@ class MergedAssetResult {
  final DateTime? adjustmentTime;
  final bool isEdited;
  final int playbackStyle;
-  final DateTime? uploadedAt;
  MergedAssetResult({
    this.remoteId,
    this.localId,
@@ -166,7 +164,6 @@ class MergedAssetResult {
    this.adjustmentTime,
    required this.isEdited,
    required this.playbackStyle,
-    this.uploadedAt,
  });
 }

@@ -5,6 +5,9 @@ import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';

+@TableIndex.sql(
+  'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+)
@TableIndex.sql('''
 CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum
 ON remote_asset_entity (owner_id, checksum)
@@ -17,10 +20,12 @@ WHERE (library_id IS NOT NULL);
 ''')
@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)')
@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)')
-@TableIndex.sql('''
-CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created
-ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)
-''')
+@TableIndex.sql(
+  "CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_day ON remote_asset_entity (STRFTIME('%Y-%m-%d', local_date_time))",
+)
+@TableIndex.sql(
+  "CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_month ON remote_asset_entity (STRFTIME('%Y-%m', local_date_time))",
+)
 class RemoteAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
  const RemoteAssetEntity();

@@ -38,8 +43,6 @@ class RemoteAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin

  DateTimeColumn get deletedAt => dateTime().nullable()();

-  DateTimeColumn get uploadedAt => dateTime().nullable()();
-
  TextColumn get livePhotoVideoId => text().nullable()();

  IntColumn get visibility => intEnum<AssetVisibility>()();
@@ -63,7 +66,6 @@ extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
    type: type,
    createdAt: createdAt,
    updatedAt: updatedAt,
-    uploadedAt: uploadedAt,
    durationMs: durationMs,
    isFavorite: isFavorite,
    height: height,
@@ -27,7 +27,6 @@ typedef $$RemoteAssetEntityTableCreateCompanionBuilder =
      i0.Value<DateTime?> localDateTime,
      i0.Value<String?> thumbHash,
      i0.Value<DateTime?> deletedAt,
-      i0.Value<DateTime?> uploadedAt,
      i0.Value<String?> livePhotoVideoId,
      required i2.AssetVisibility visibility,
      i0.Value<String?> stackId,
@@ -50,7 +49,6 @@ typedef $$RemoteAssetEntityTableUpdateCompanionBuilder =
      i0.Value<DateTime?> localDateTime,
      i0.Value<String?> thumbHash,
      i0.Value<DateTime?> deletedAt,
-      i0.Value<DateTime?> uploadedAt,
      i0.Value<String?> livePhotoVideoId,
      i0.Value<i2.AssetVisibility> visibility,
      i0.Value<String?> stackId,
@@ -179,11 +177,6 @@ class $$RemoteAssetEntityTableFilterComposer
    builder: (column) => i0.ColumnFilters(column),
  );

-  i0.ColumnFilters<DateTime> get uploadedAt => $composableBuilder(
-    column: $table.uploadedAt,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
  i0.ColumnFilters<String> get livePhotoVideoId => $composableBuilder(
    column: $table.livePhotoVideoId,
    builder: (column) => i0.ColumnFilters(column),
@@ -312,11 +305,6 @@ class $$RemoteAssetEntityTableOrderingComposer
    builder: (column) => i0.ColumnOrderings(column),
  );

-  i0.ColumnOrderings<DateTime> get uploadedAt => $composableBuilder(
-    column: $table.uploadedAt,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
  i0.ColumnOrderings<String> get livePhotoVideoId => $composableBuilder(
    column: $table.livePhotoVideoId,
    builder: (column) => i0.ColumnOrderings(column),
@@ -424,11 +412,6 @@ class $$RemoteAssetEntityTableAnnotationComposer
  i0.GeneratedColumn<DateTime> get deletedAt =>
      $composableBuilder(column: $table.deletedAt, builder: (column) => column);

-  i0.GeneratedColumn<DateTime> get uploadedAt => $composableBuilder(
-    column: $table.uploadedAt,
-    builder: (column) => column,
-  );
-
  i0.GeneratedColumn<String> get livePhotoVideoId => $composableBuilder(
    column: $table.livePhotoVideoId,
    builder: (column) => column,
@@ -524,7 +507,6 @@ class $$RemoteAssetEntityTableTableManager
                i0.Value<DateTime?> localDateTime = const i0.Value.absent(),
                i0.Value<String?> thumbHash = const i0.Value.absent(),
                i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
-                i0.Value<DateTime?> uploadedAt = const i0.Value.absent(),
                i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
                i0.Value<i2.AssetVisibility> visibility =
                    const i0.Value.absent(),
@@ -546,7 +528,6 @@ class $$RemoteAssetEntityTableTableManager
                localDateTime: localDateTime,
                thumbHash: thumbHash,
                deletedAt: deletedAt,
-                uploadedAt: uploadedAt,
                livePhotoVideoId: livePhotoVideoId,
                visibility: visibility,
                stackId: stackId,
@@ -569,7 +550,6 @@ class $$RemoteAssetEntityTableTableManager
                i0.Value<DateTime?> localDateTime = const i0.Value.absent(),
                i0.Value<String?> thumbHash = const i0.Value.absent(),
                i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
-                i0.Value<DateTime?> uploadedAt = const i0.Value.absent(),
                i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
                required i2.AssetVisibility visibility,
                i0.Value<String?> stackId = const i0.Value.absent(),
@@ -590,7 +570,6 @@ class $$RemoteAssetEntityTableTableManager
                localDateTime: localDateTime,
                thumbHash: thumbHash,
                deletedAt: deletedAt,
-                uploadedAt: uploadedAt,
                livePhotoVideoId: livePhotoVideoId,
                visibility: visibility,
                stackId: stackId,
@@ -666,9 +645,9 @@ typedef $$RemoteAssetEntityTableProcessedTableManager =
      i1.RemoteAssetEntityData,
      i0.PrefetchHooks Function({bool ownerId})
    >;
-i0.Index get uQRemoteAssetsOwnerChecksum => i0.Index(
-  'UQ_remote_assets_owner_checksum',
-  'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+i0.Index get idxRemoteAssetOwnerChecksum => i0.Index(
+  'idx_remote_asset_owner_checksum',
+  'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
 );

 class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
@@ -839,18 +818,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
        type: i0.DriftSqlType.dateTime,
        requiredDuringInsert: false,
      );
-  static const i0.VerificationMeta _uploadedAtMeta = const i0.VerificationMeta(
-    'uploadedAt',
-  );
-  @override
-  late final i0.GeneratedColumn<DateTime> uploadedAt =
-      i0.GeneratedColumn<DateTime>(
-        'uploaded_at',
-        aliasedName,
-        true,
-        type: i0.DriftSqlType.dateTime,
-        requiredDuringInsert: false,
-      );
  static const i0.VerificationMeta _livePhotoVideoIdMeta =
      const i0.VerificationMeta('livePhotoVideoId');
  @override
@@ -927,7 +894,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
    localDateTime,
    thumbHash,
    deletedAt,
-    uploadedAt,
    livePhotoVideoId,
    visibility,
    stackId,
@@ -1032,12 +998,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
        deletedAt.isAcceptableOrUnknown(data['deleted_at']!, _deletedAtMeta),
      );
    }
-    if (data.containsKey('uploaded_at')) {
-      context.handle(
-        _uploadedAtMeta,
-        uploadedAt.isAcceptableOrUnknown(data['uploaded_at']!, _uploadedAtMeta),
-      );
-    }
    if (data.containsKey('live_photo_video_id')) {
      context.handle(
        _livePhotoVideoIdMeta,
@@ -1135,10 +1095,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
        i0.DriftSqlType.dateTime,
        data['${effectivePrefix}deleted_at'],
      ),
-      uploadedAt: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.dateTime,
-        data['${effectivePrefix}uploaded_at'],
-      ),
      livePhotoVideoId: attachedDatabase.typeMapping.read(
        i0.DriftSqlType.string,
        data['${effectivePrefix}live_photo_video_id'],
@@ -1197,7 +1153,6 @@ class RemoteAssetEntityData extends i0.DataClass
  final DateTime? localDateTime;
  final String? thumbHash;
  final DateTime? deletedAt;
-  final DateTime? uploadedAt;
  final String? livePhotoVideoId;
  final i2.AssetVisibility visibility;
  final String? stackId;
@@ -1218,7 +1173,6 @@ class RemoteAssetEntityData extends i0.DataClass
    this.localDateTime,
    this.thumbHash,
    this.deletedAt,
-    this.uploadedAt,
    this.livePhotoVideoId,
    required this.visibility,
    this.stackId,
@@ -1258,9 +1212,6 @@ class RemoteAssetEntityData extends i0.DataClass
    if (!nullToAbsent || deletedAt != null) {
      map['deleted_at'] = i0.Variable<DateTime>(deletedAt);
    }
-    if (!nullToAbsent || uploadedAt != null) {
-      map['uploaded_at'] = i0.Variable<DateTime>(uploadedAt);
-    }
    if (!nullToAbsent || livePhotoVideoId != null) {
      map['live_photo_video_id'] = i0.Variable<String>(livePhotoVideoId);
    }
@@ -1301,7 +1252,6 @@ class RemoteAssetEntityData extends i0.DataClass
      localDateTime: serializer.fromJson<DateTime?>(json['localDateTime']),
      thumbHash: serializer.fromJson<String?>(json['thumbHash']),
      deletedAt: serializer.fromJson<DateTime?>(json['deletedAt']),
-      uploadedAt: serializer.fromJson<DateTime?>(json['uploadedAt']),
      livePhotoVideoId: serializer.fromJson<String?>(json['livePhotoVideoId']),
      visibility: i1.$RemoteAssetEntityTable.$convertervisibility.fromJson(
        serializer.fromJson<int>(json['visibility']),
@@ -1331,7 +1281,6 @@ class RemoteAssetEntityData extends i0.DataClass
      'localDateTime': serializer.toJson<DateTime?>(localDateTime),
      'thumbHash': serializer.toJson<String?>(thumbHash),
      'deletedAt': serializer.toJson<DateTime?>(deletedAt),
-      'uploadedAt': serializer.toJson<DateTime?>(uploadedAt),
      'livePhotoVideoId': serializer.toJson<String?>(livePhotoVideoId),
      'visibility': serializer.toJson<int>(
        i1.$RemoteAssetEntityTable.$convertervisibility.toJson(visibility),
@@ -1357,7 +1306,6 @@ class RemoteAssetEntityData extends i0.DataClass
    i0.Value<DateTime?> localDateTime = const i0.Value.absent(),
    i0.Value<String?> thumbHash = const i0.Value.absent(),
    i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
-    i0.Value<DateTime?> uploadedAt = const i0.Value.absent(),
    i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
    i2.AssetVisibility? visibility,
    i0.Value<String?> stackId = const i0.Value.absent(),
@@ -1380,7 +1328,6 @@ class RemoteAssetEntityData extends i0.DataClass
        : this.localDateTime,
    thumbHash: thumbHash.present ? thumbHash.value : this.thumbHash,
    deletedAt: deletedAt.present ? deletedAt.value : this.deletedAt,
-    uploadedAt: uploadedAt.present ? uploadedAt.value : this.uploadedAt,
    livePhotoVideoId: livePhotoVideoId.present
        ? livePhotoVideoId.value
        : this.livePhotoVideoId,
@@ -1411,9 +1358,6 @@ class RemoteAssetEntityData extends i0.DataClass
          : this.localDateTime,
      thumbHash: data.thumbHash.present ? data.thumbHash.value : this.thumbHash,
      deletedAt: data.deletedAt.present ? data.deletedAt.value : this.deletedAt,
-      uploadedAt: data.uploadedAt.present
-          ? data.uploadedAt.value
-          : this.uploadedAt,
      livePhotoVideoId: data.livePhotoVideoId.present
          ? data.livePhotoVideoId.value
          : this.livePhotoVideoId,
@@ -1443,7 +1387,6 @@ class RemoteAssetEntityData extends i0.DataClass
          ..write('localDateTime: $localDateTime, ')
          ..write('thumbHash: $thumbHash, ')
          ..write('deletedAt: $deletedAt, ')
-          ..write('uploadedAt: $uploadedAt, ')
          ..write('livePhotoVideoId: $livePhotoVideoId, ')
          ..write('visibility: $visibility, ')
          ..write('stackId: $stackId, ')
@@ -1469,7 +1412,6 @@ class RemoteAssetEntityData extends i0.DataClass
    localDateTime,
    thumbHash,
    deletedAt,
-    uploadedAt,
    livePhotoVideoId,
    visibility,
    stackId,
@@ -1494,7 +1436,6 @@ class RemoteAssetEntityData extends i0.DataClass
          other.localDateTime == this.localDateTime &&
          other.thumbHash == this.thumbHash &&
          other.deletedAt == this.deletedAt &&
-          other.uploadedAt == this.uploadedAt &&
          other.livePhotoVideoId == this.livePhotoVideoId &&
          other.visibility == this.visibility &&
          other.stackId == this.stackId &&
@@ -1518,7 +1459,6 @@ class RemoteAssetEntityCompanion
  final i0.Value<DateTime?> localDateTime;
  final i0.Value<String?> thumbHash;
  final i0.Value<DateTime?> deletedAt;
-  final i0.Value<DateTime?> uploadedAt;
  final i0.Value<String?> livePhotoVideoId;
  final i0.Value<i2.AssetVisibility> visibility;
  final i0.Value<String?> stackId;
@@ -1539,7 +1479,6 @@ class RemoteAssetEntityCompanion
    this.localDateTime = const i0.Value.absent(),
    this.thumbHash = const i0.Value.absent(),
    this.deletedAt = const i0.Value.absent(),
-    this.uploadedAt = const i0.Value.absent(),
    this.livePhotoVideoId = const i0.Value.absent(),
    this.visibility = const i0.Value.absent(),
    this.stackId = const i0.Value.absent(),
@@ -1561,7 +1500,6 @@ class RemoteAssetEntityCompanion
    this.localDateTime = const i0.Value.absent(),
    this.thumbHash = const i0.Value.absent(),
    this.deletedAt = const i0.Value.absent(),
-    this.uploadedAt = const i0.Value.absent(),
    this.livePhotoVideoId = const i0.Value.absent(),
    required i2.AssetVisibility visibility,
    this.stackId = const i0.Value.absent(),
@@ -1588,7 +1526,6 @@ class RemoteAssetEntityCompanion
    i0.Expression<DateTime>? localDateTime,
    i0.Expression<String>? thumbHash,
    i0.Expression<DateTime>? deletedAt,
-    i0.Expression<DateTime>? uploadedAt,
    i0.Expression<String>? livePhotoVideoId,
    i0.Expression<int>? visibility,
    i0.Expression<String>? stackId,
@@ -1610,7 +1547,6 @@ class RemoteAssetEntityCompanion
      if (localDateTime != null) 'local_date_time': localDateTime,
      if (thumbHash != null) 'thumb_hash': thumbHash,
      if (deletedAt != null) 'deleted_at': deletedAt,
-      if (uploadedAt != null) 'uploaded_at': uploadedAt,
      if (livePhotoVideoId != null) 'live_photo_video_id': livePhotoVideoId,
      if (visibility != null) 'visibility': visibility,
      if (stackId != null) 'stack_id': stackId,
@@ -1634,7 +1570,6 @@ class RemoteAssetEntityCompanion
    i0.Value<DateTime?>? localDateTime,
    i0.Value<String?>? thumbHash,
    i0.Value<DateTime?>? deletedAt,
-    i0.Value<DateTime?>? uploadedAt,
    i0.Value<String?>? livePhotoVideoId,
    i0.Value<i2.AssetVisibility>? visibility,
    i0.Value<String?>? stackId,
@@ -1656,7 +1591,6 @@ class RemoteAssetEntityCompanion
      localDateTime: localDateTime ?? this.localDateTime,
      thumbHash: thumbHash ?? this.thumbHash,
      deletedAt: deletedAt ?? this.deletedAt,
-      uploadedAt: uploadedAt ?? this.uploadedAt,
      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
      visibility: visibility ?? this.visibility,
      stackId: stackId ?? this.stackId,
@@ -1712,9 +1646,6 @@ class RemoteAssetEntityCompanion
    if (deletedAt.present) {
      map['deleted_at'] = i0.Variable<DateTime>(deletedAt.value);
    }
-    if (uploadedAt.present) {
-      map['uploaded_at'] = i0.Variable<DateTime>(uploadedAt.value);
-    }
    if (livePhotoVideoId.present) {
      map['live_photo_video_id'] = i0.Variable<String>(livePhotoVideoId.value);
    }
@@ -1752,7 +1683,6 @@ class RemoteAssetEntityCompanion
          ..write('localDateTime: $localDateTime, ')
          ..write('thumbHash: $thumbHash, ')
          ..write('deletedAt: $deletedAt, ')
-          ..write('uploadedAt: $uploadedAt, ')
          ..write('livePhotoVideoId: $livePhotoVideoId, ')
          ..write('visibility: $visibility, ')
          ..write('stackId: $stackId, ')
@@ -1763,6 +1693,10 @@ class RemoteAssetEntityCompanion
  }
 }

+i0.Index get uQRemoteAssetsOwnerChecksum => i0.Index(
+  'UQ_remote_assets_owner_checksum',
+  'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+);
 i0.Index get uQRemoteAssetsOwnerLibraryChecksum => i0.Index(
  'UQ_remote_assets_owner_library_checksum',
  'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
@@ -1775,7 +1709,11 @@ i0.Index get idxRemoteAssetStackId => i0.Index(
  'idx_remote_asset_stack_id',
  'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
 );
-i0.Index get idxRemoteAssetOwnerVisibilityDeletedCreated => i0.Index(
-  'idx_remote_asset_owner_visibility_deleted_created',
-  'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
+i0.Index get idxRemoteAssetLocalDateTimeDay => i0.Index(
+  'idx_remote_asset_local_date_time_day',
+  'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_day ON remote_asset_entity (STRFTIME(\'%Y-%m-%d\', local_date_time))',
+);
+i0.Index get idxRemoteAssetLocalDateTimeMonth => i0.Index(
+  'idx_remote_asset_local_date_time_month',
+  'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_month ON remote_asset_entity (STRFTIME(\'%Y-%m\', local_date_time))',
 );
@@ -98,7 +98,7 @@ class Drift extends $Drift {
  }

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

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -266,15 +266,6 @@ class Drift extends $Drift {
          },
          from24To25: (m, v25) async {
            await m.createTable(v25.metadata);
-            await customStatement('DROP INDEX IF EXISTS idx_remote_asset_owner_checksum');
-            await customStatement('DROP INDEX IF EXISTS idx_remote_asset_local_date_time_day');
-            await customStatement('DROP INDEX IF EXISTS idx_remote_asset_local_date_time_month');
-            await m.createIndex(v25.idxRemoteAssetOwnerVisibilityDeletedCreated);
-            await m.createIndex(v25.idxRemoteExifCity);
-            await m.createIndex(v25.idxAssetFaceVisiblePerson);
-          },
-          from25To26: (m, v26) async {
-            await m.addColumn(v26.remoteAssetEntity, v26.remoteAssetEntity.uploadedAt);
          },
        ),
      );
@@ -113,11 +113,13 @@ abstract class $Drift extends i0.GeneratedDatabase {
    i4.idxLocalAssetChecksum,
    i4.idxLocalAssetCloudId,
    i3.idxStackPrimaryAssetId,
+    i2.idxRemoteAssetOwnerChecksum,
    i2.uQRemoteAssetsOwnerChecksum,
    i2.uQRemoteAssetsOwnerLibraryChecksum,
    i2.idxRemoteAssetChecksum,
    i2.idxRemoteAssetStackId,
-    i2.idxRemoteAssetOwnerVisibilityDeletedCreated,
+    i2.idxRemoteAssetLocalDateTimeDay,
+    i2.idxRemoteAssetLocalDateTimeMonth,
    authUserEntity,
    userMetadataEntity,
    partnerEntity,
@@ -135,13 +137,11 @@ abstract class $Drift extends i0.GeneratedDatabase {
    metadataEntity,
    i10.idxPartnerSharedWithId,
    i11.idxLatLng,
-    i11.idxRemoteExifCity,
    i12.idxRemoteAlbumAssetAlbumAsset,
    i14.idxRemoteAssetCloudId,
    i17.idxPersonOwnerId,
    i18.idxAssetFacePersonId,
    i18.idxAssetFaceAssetId,
-    i18.idxAssetFaceVisiblePerson,
    i20.idxTrashedLocalAssetChecksum,
    i20.idxTrashedLocalAssetAlbum,
    i21.idxAssetEditAssetId,
@@ -12390,11 +12390,13 @@ final class Schema25 extends i0.VersionedSchema {
    idxLocalAssetChecksum,
    idxLocalAssetCloudId,
    idxStackPrimaryAssetId,
+    idxRemoteAssetOwnerChecksum,
    uQRemoteAssetsOwnerChecksum,
    uQRemoteAssetsOwnerLibraryChecksum,
    idxRemoteAssetChecksum,
    idxRemoteAssetStackId,
-    idxRemoteAssetOwnerVisibilityDeletedCreated,
+    idxRemoteAssetLocalDateTimeDay,
+    idxRemoteAssetLocalDateTimeMonth,
    authUserEntity,
    userMetadataEntity,
    partnerEntity,
@@ -12412,13 +12414,11 @@ final class Schema25 extends i0.VersionedSchema {
    metadata,
    idxPartnerSharedWithId,
    idxLatLng,
-    idxRemoteExifCity,
    idxRemoteAlbumAssetAlbumAsset,
    idxRemoteAssetCloudId,
    idxPersonOwnerId,
    idxAssetFacePersonId,
    idxAssetFaceAssetId,
-    idxAssetFaceVisiblePerson,
    idxTrashedLocalAssetChecksum,
    idxTrashedLocalAssetAlbum,
    idxAssetEditAssetId,
@@ -12583,6 +12583,10 @@ final class Schema25 extends i0.VersionedSchema {
    'idx_stack_primary_asset_id',
    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
  );
+  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
+    'idx_remote_asset_owner_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+  );
  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
    'UQ_remote_assets_owner_checksum',
    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
@@ -12599,9 +12603,13 @@ final class Schema25 extends i0.VersionedSchema {
    'idx_remote_asset_stack_id',
    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
  );
-  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
-    'idx_remote_asset_owner_visibility_deleted_created',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
+  final i1.Index idxRemoteAssetLocalDateTimeDay = i1.Index(
+    'idx_remote_asset_local_date_time_day',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_day ON remote_asset_entity (STRFTIME(\'%Y-%m-%d\', local_date_time))',
+  );
+  final i1.Index idxRemoteAssetLocalDateTimeMonth = i1.Index(
+    'idx_remote_asset_local_date_time_month',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_month ON remote_asset_entity (STRFTIME(\'%Y-%m\', local_date_time))',
  );
  late final Shape40 authUserEntity = Shape40(
    source: i0.VersionedTable(
@@ -12875,10 +12883,6 @@ final class Schema25 extends i0.VersionedSchema {
    'idx_lat_lng',
    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
  );
-  final i1.Index idxRemoteExifCity = i1.Index(
-    'idx_remote_exif_city',
-    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
-  );
  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
    'idx_remote_album_asset_album_asset',
    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
@@ -12899,10 +12903,6 @@ final class Schema25 extends i0.VersionedSchema {
    'idx_asset_face_asset_id',
    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
  );
-  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
-    'idx_asset_face_visible_person',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
-  );
  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
    'idx_trashed_local_asset_checksum',
    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
@@ -12943,602 +12943,6 @@ i1.GeneratedColumn<String> _column_211(String aliasedName) =>
      type: i1.DriftSqlType.string,
      $customConstraints: 'NOT NULL',
    );
-
-final class Schema26 extends i0.VersionedSchema {
-  Schema26({required super.database}) : super(version: 26);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAlbumAssetAlbumAsset,
-    idxLocalAssetChecksum,
-    idxLocalAssetCloudId,
-    idxStackPrimaryAssetId,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    idxRemoteAssetStackId,
-    idxRemoteAssetOwnerVisibilityDeletedCreated,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    trashedLocalAssetEntity,
-    assetEditEntity,
-    metadata,
-    idxPartnerSharedWithId,
-    idxLatLng,
-    idxRemoteExifCity,
-    idxRemoteAlbumAssetAlbumAsset,
-    idxRemoteAssetCloudId,
-    idxPersonOwnerId,
-    idxAssetFacePersonId,
-    idxAssetFaceAssetId,
-    idxAssetFaceVisiblePerson,
-    idxTrashedLocalAssetChecksum,
-    idxTrashedLocalAssetAlbum,
-    idxAssetEditAssetId,
-  ];
-  late final Shape33 userEntity = Shape33(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_110,
-        _column_111,
-        _column_112,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape50 remoteAssetEntity = Shape50(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_119,
-        _column_120,
-        _column_121,
-        _column_122,
-        _column_123,
-        _column_124,
-        _column_212,
-        _column_125,
-        _column_126,
-        _column_127,
-        _column_128,
-        _column_129,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape35 stackEntity = Shape35(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_130,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape36 localAssetEntity = Shape36(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_133,
-        _column_134,
-        _column_135,
-        _column_136,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape48 remoteAlbumEntity = Shape48(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_138,
-        _column_114,
-        _column_115,
-        _column_139,
-        _column_140,
-        _column_141,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape38 localAlbumEntity = Shape38(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_115,
-        _column_142,
-        _column_143,
-        _column_144,
-        _column_145,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape39 localAlbumAssetEntity = Shape39(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_146, _column_147, _column_145],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
-    'idx_local_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxLocalAssetChecksum = i1.Index(
-    'idx_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
-  );
-  final i1.Index idxLocalAssetCloudId = i1.Index(
-    'idx_local_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
-  );
-  final i1.Index idxStackPrimaryAssetId = i1.Index(
-    'idx_stack_primary_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
-  );
-  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
-    'UQ_remote_assets_owner_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-  );
-  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
-    'UQ_remote_assets_owner_library_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
-  );
-  final i1.Index idxRemoteAssetChecksum = i1.Index(
-    'idx_remote_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
-  );
-  final i1.Index idxRemoteAssetStackId = i1.Index(
-    'idx_remote_asset_stack_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
-  );
-  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
-    'idx_remote_asset_owner_visibility_deleted_created',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
-  );
-  late final Shape40 authUserEntity = Shape40(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_148,
-        _column_110,
-        _column_111,
-        _column_149,
-        _column_150,
-        _column_151,
-        _column_152,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_153, _column_154, _column_155],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape41 partnerEntity = Shape41(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_156, _column_157, _column_158],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape42 remoteExifEntity = Shape42(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_160,
-        _column_161,
-        _column_162,
-        _column_163,
-        _column_164,
-        _column_117,
-        _column_116,
-        _column_165,
-        _column_166,
-        _column_167,
-        _column_168,
-        _column_135,
-        _column_136,
-        _column_169,
-        _column_170,
-        _column_171,
-        _column_172,
-        _column_173,
-        _column_174,
-        _column_175,
-        _column_176,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 remoteAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_159, _column_177],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape10 remoteAlbumUserEntity = Shape10(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
-      columns: [_column_177, _column_153, _column_178],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape43 remoteAssetCloudIdEntity = Shape43(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_cloud_id_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_179,
-        _column_180,
-        _column_134,
-        _column_135,
-        _column_136,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape44 memoryEntity = Shape44(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_124,
-        _column_121,
-        _column_113,
-        _column_181,
-        _column_182,
-        _column_183,
-        _column_184,
-        _column_185,
-        _column_186,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape12 memoryAssetEntity = Shape12(
-    source: i0.VersionedTable(
-      entityName: 'memory_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
-      columns: [_column_159, _column_187],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape45 personEntity = Shape45(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_108,
-        _column_188,
-        _column_189,
-        _column_190,
-        _column_191,
-        _column_192,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape46 assetFaceEntity = Shape46(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_193,
-        _column_194,
-        _column_195,
-        _column_196,
-        _column_197,
-        _column_198,
-        _column_199,
-        _column_200,
-        _column_201,
-        _column_124,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape18 storeEntity = Shape18(
-    source: i0.VersionedTable(
-      entityName: 'store_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_202, _column_203, _column_204],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape47 trashedLocalAssetEntity = Shape47(
-    source: i0.VersionedTable(
-      entityName: 'trashed_local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id, album_id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_205,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_206,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape32 assetEditEntity = Shape32(
-    source: i0.VersionedTable(
-      entityName: 'asset_edit_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_207,
-        _column_208,
-        _column_209,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape49 metadata = Shape49(
-    source: i0.VersionedTable(
-      entityName: 'metadata',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY("key")'],
-      columns: [_column_210, _column_211, _column_115],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxPartnerSharedWithId = i1.Index(
-    'idx_partner_shared_with_id',
-    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-  final i1.Index idxRemoteExifCity = i1.Index(
-    'idx_remote_exif_city',
-    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
-  );
-  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
-    'idx_remote_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxRemoteAssetCloudId = i1.Index(
-    'idx_remote_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
-  );
-  final i1.Index idxPersonOwnerId = i1.Index(
-    'idx_person_owner_id',
-    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
-  );
-  final i1.Index idxAssetFacePersonId = i1.Index(
-    'idx_asset_face_person_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
-  );
-  final i1.Index idxAssetFaceAssetId = i1.Index(
-    'idx_asset_face_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
-  );
-  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
-    'idx_asset_face_visible_person',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
-  );
-  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
-    'idx_trashed_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
-  );
-  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
-    'idx_trashed_local_asset_album',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
-  );
-  final i1.Index idxAssetEditAssetId = i1.Index(
-    'idx_asset_edit_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
-  );
-}
-
-class Shape50 extends i0.VersionedTable {
-  Shape50({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get name =>
-      columnsByName['name']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get type =>
-      columnsByName['type']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get createdAt =>
-      columnsByName['created_at']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get updatedAt =>
-      columnsByName['updated_at']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get width =>
-      columnsByName['width']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get height =>
-      columnsByName['height']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get durationMs =>
-      columnsByName['duration_ms']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get checksum =>
-      columnsByName['checksum']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get isFavorite =>
-      columnsByName['is_favorite']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get ownerId =>
-      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get localDateTime =>
-      columnsByName['local_date_time']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get thumbHash =>
-      columnsByName['thumb_hash']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get deletedAt =>
-      columnsByName['deleted_at']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get uploadedAt =>
-      columnsByName['uploaded_at']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get livePhotoVideoId =>
-      columnsByName['live_photo_video_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get visibility =>
-      columnsByName['visibility']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get stackId =>
-      columnsByName['stack_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get libraryId =>
-      columnsByName['library_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get isEdited =>
-      columnsByName['is_edited']! as i1.GeneratedColumn<int>;
-}
-
-i1.GeneratedColumn<String> _column_212(String aliasedName) =>
-    i1.GeneratedColumn<String>(
-      'uploaded_at',
-      aliasedName,
-      true,
-      type: i1.DriftSqlType.string,
-      $customConstraints: 'NULL',
-    );
 i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
  required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -13564,7 +12968,6 @@ i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema23 schema) from22To23,
  required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
  required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
-  required Future<void> Function(i1.Migrator m, Schema26 schema) from25To26,
 }) {
  return (currentVersion, database) async {
    switch (currentVersion) {
@@ -13688,11 +13091,6 @@ i0.MigrationStepWithVersion migrationSteps({
        final migrator = i1.Migrator(database, schema);
        await from24To25(migrator, schema);
        return 25;
-      case 25:
-        final schema = Schema26(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from25To26(migrator, schema);
-        return 26;
      default:
        throw ArgumentError.value('Unknown migration from $currentVersion');
    }
@@ -13724,7 +13122,6 @@ i1.OnUpgrade stepByStep({
  required Future<void> Function(i1.Migrator m, Schema23 schema) from22To23,
  required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
  required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
-  required Future<void> Function(i1.Migrator m, Schema26 schema) from25To26,
 }) => i0.VersionedSchema.stepByStepHelper(
  step: migrationSteps(
    from1To2: from1To2,
@@ -13751,6 +13148,5 @@ i1.OnUpgrade stepByStep({
    from22To23: from22To23,
    from23To24: from23To24,
    from24To25: from24To25,
-    from25To26: from25To26,
  ),
 );
@@ -120,25 +120,6 @@ extension<T extends Object> on MetadataDomain<T> {
            cutoffDaysAgo: repo._read(.cleanupCutoffDaysAgo),
            defaultsInitialized: repo._read(.cleanupDefaultsInitialized),
          ),
-          map: .new(
-            relativeDays: repo._read(.mapRelativeDate),
-            favoritesOnly: repo._read(.mapShowFavoriteOnly),
-            includeArchived: repo._read(.mapIncludeArchived),
-            themeMode: repo._read(.mapThemeMode),
-            withPartners: repo._read(.mapWithPartners),
-          ),
-          timeline: .new(
-            tilesPerRow: repo._read(.timelineTilesPerRow),
-            groupAssetsBy: repo._read(.timelineGroupAssetsBy),
-            storageIndicator: repo._read(.timelineStorageIndicator),
-          ),
-          image: .new(preferRemote: repo._read(.imagePreferRemote), loadOriginal: repo._read(.imageLoadOriginal)),
-          viewer: .new(
-            loopVideo: repo._read(.viewerLoopVideo),
-            loadOriginalVideo: repo._read(.viewerLoadOriginalVideo),
-            autoPlayVideo: repo._read(.viewerAutoPlayVideo),
-            tapToNavigate: repo._read(.viewerTapToNavigate),
-          ),
        );
      case .systemConfig:
        repo._systemConfig = .new(logLevel: repo._read(.logLevel));
--- a/Show More
+++ b/Show More