refactor(web): rename loadMonthGroup to loadSegment API

2025-12-08 22:01:00 -08:00 · 2025-09-18 14:41:41 +00:00
128 changed files with 2133 additions and 10954 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,8 @@
    "immich-server",
    "redis",
    "database",
-    "immich-machine-learning"
+    "immich-machine-learning",
+    "init"
  ],
  "dockerComposeFile": [
    "../docker/docker-compose.dev.yml",
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ mobile/libisar.dylib
 mobile/openapi/test
 mobile/openapi/doc
 mobile/openapi/.openapi-generator/FILES
-mobile/ios/build

 open-api/typescript-sdk/build
 mobile/android/fastlane/report.xml
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/cli",
-  "version": "2.2.91",
+  "version": "2.2.90",
  "description": "Command Line Interface (CLI) for Immich",
  "type": "module",
  "exports": "./dist/index.js",
--- a/docs/docs/install/environment-variables.md
+++ b/docs/docs/install/environment-variables.md
@@ -169,6 +169,8 @@ Redis (Sentinel) URL example JSON before encoding:
 | `MACHINE_LEARNING_ANN_TUNING_LEVEL`                         | ARM-NN GPU tuning level (1: rapid, 2: normal, 3: exhaustive)                                        |               `2`               | machine learning |
 | `MACHINE_LEARNING_DEVICE_IDS`<sup>\*4</sup>                 | Device IDs to use in multi-GPU environments                                                         |               `0`               | machine learning |
 | `MACHINE_LEARNING_MAX_BATCH_SIZE__FACIAL_RECOGNITION`       | Set the maximum number of faces that will be processed at once by the facial recognition model      |  None (`1` if using OpenVINO)   | machine learning |
+| `MACHINE_LEARNING_PING_TIMEOUT`                             | How long (ms) to wait for a PING response when checking if an ML server is available                |             `2000`              | server           |
+| `MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME`                | How long to ignore ML servers that are offline before trying again                                  |             `30000`             | server           |
 | `MACHINE_LEARNING_RKNN`                                     | Enable RKNN hardware acceleration if supported                                                      |             `True`              | machine learning |
 | `MACHINE_LEARNING_RKNN_THREADS`                             | How many threads of RKNN runtime should be spinned up while inferencing.                            |               `1`               | machine learning |

--- a/docs/static/archived-versions.json
+++ b/docs/static/archived-versions.json
@@ -1,8 +1,4 @@
 [
-  {
-    "label": "v1.143.0",
-    "url": "https://v1.143.0.archive.immich.app"
-  },
  {
    "label": "v1.142.1",
    "url": "https://v1.142.1.archive.immich.app"
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-e2e",
-  "version": "1.143.0",
+  "version": "1.142.1",
  "description": "",
  "main": "index.js",
  "type": "module",
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -123,13 +123,6 @@
    "logging_enable_description": "Enable logging",
    "logging_level_description": "When enabled, what log level to use.",
    "logging_settings": "Logging",
-    "machine_learning_availability_checks": "Availability checks",
-    "machine_learning_availability_checks_description": "Automatically detect and prefer available machine learning servers",
-    "machine_learning_availability_checks_enabled": "Enable availability checks",
-    "machine_learning_availability_checks_interval": "Check interval",
-    "machine_learning_availability_checks_interval_description": "Interval in milliseconds between availability checks",
-    "machine_learning_availability_checks_timeout": "Request timeout",
-    "machine_learning_availability_checks_timeout_description": "Timeout in milliseconds for availability checks",
    "machine_learning_clip_model": "CLIP model",
    "machine_learning_clip_model_description": "The name of a CLIP model listed <link>here</link>. Note that you must re-run the 'Smart Search' job for all images upon changing a model.",
    "machine_learning_duplicate_detection": "Duplicate Detection",
@@ -1527,7 +1520,6 @@
  "port": "Port",
  "preferences_settings_subtitle": "Manage the app's preferences",
  "preferences_settings_title": "Preferences",
-  "preparing": "Preparing",
  "preset": "Preset",
  "preview": "Preview",
  "previous": "Previous",
@@ -1593,7 +1585,6 @@
  "read_changelog": "Read Changelog",
  "readonly_mode_disabled": "Read-only mode disabled",
  "readonly_mode_enabled": "Read-only mode enabled",
-  "ready_for_upload": "Ready for upload",
  "reassign": "Reassign",
  "reassigned_assets_to_existing_person": "Re-assigned {count, plural, one {# asset} other {# assets}} to {name, select, null {an existing person} other {{name}}}",
  "reassigned_assets_to_new_person": "Re-assigned {count, plural, one {# asset} other {# assets}} to a new person",
@@ -1925,7 +1916,6 @@
  "stacktrace": "Stacktrace",
  "start": "Start",
  "start_date": "Start date",
-  "start_date_before_end_date": "Start date must be before end date",
  "state": "State",
  "status": "Status",
  "stop_casting": "Stop casting",
--- a/machine-learning/uv.lock
+++ b/machine-learning/uv.lock
@@ -507,87 +507,61 @@ wheels = [

 [[package]]
 name = "coverage"
-version = "7.10.6"
+version = "7.6.4"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/14/70/025b179c993f019105b79575ac6edb5e084fb0f0e63f15cdebef4e454fb5/coverage-7.10.6.tar.gz", hash = "sha256:f644a3ae5933a552a29dbb9aa2f90c677a875f80ebea028e5a52a4f429044b90", size = 823736, upload-time = "2025-08-29T15:35:16.668Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/52/12/3669b6382792783e92046730ad3327f53b2726f0603f4c311c4da4824222/coverage-7.6.4.tar.gz", hash = "sha256:29fc0f17b1d3fea332f8001d4558f8214af7f1d87a345f3a133c901d60347c73", size = 798716, upload-time = "2024-10-20T22:57:39.682Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/a8/1d/2e64b43d978b5bd184e0756a41415597dfef30fcbd90b747474bd749d45f/coverage-7.10.6-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:70e7bfbd57126b5554aa482691145f798d7df77489a177a6bef80de78860a356", size = 217025, upload-time = "2025-08-29T15:32:57.169Z" },
-    { url = "https://files.pythonhosted.org/packages/23/62/b1e0f513417c02cc10ef735c3ee5186df55f190f70498b3702d516aad06f/coverage-7.10.6-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e41be6f0f19da64af13403e52f2dec38bbc2937af54df8ecef10850ff8d35301", size = 217419, upload-time = "2025-08-29T15:32:59.908Z" },
-    { url = "https://files.pythonhosted.org/packages/e7/16/b800640b7a43e7c538429e4d7223e0a94fd72453a1a048f70bf766f12e96/coverage-7.10.6-cp310-cp310-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:c61fc91ab80b23f5fddbee342d19662f3d3328173229caded831aa0bd7595460", size = 244180, upload-time = "2025-08-29T15:33:01.608Z" },
-    { url = "https://files.pythonhosted.org/packages/fb/6f/5e03631c3305cad187eaf76af0b559fff88af9a0b0c180d006fb02413d7a/coverage-7.10.6-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:10356fdd33a7cc06e8051413140bbdc6f972137508a3572e3f59f805cd2832fd", size = 245992, upload-time = "2025-08-29T15:33:03.239Z" },
-    { url = "https://files.pythonhosted.org/packages/eb/a1/f30ea0fb400b080730125b490771ec62b3375789f90af0bb68bfb8a921d7/coverage-7.10.6-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:80b1695cf7c5ebe7b44bf2521221b9bb8cdf69b1f24231149a7e3eb1ae5fa2fb", size = 247851, upload-time = "2025-08-29T15:33:04.603Z" },
-    { url = "https://files.pythonhosted.org/packages/02/8e/cfa8fee8e8ef9a6bb76c7bef039f3302f44e615d2194161a21d3d83ac2e9/coverage-7.10.6-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:2e4c33e6378b9d52d3454bd08847a8651f4ed23ddbb4a0520227bd346382bbc6", size = 245891, upload-time = "2025-08-29T15:33:06.176Z" },
-    { url = "https://files.pythonhosted.org/packages/93/a9/51be09b75c55c4f6c16d8d73a6a1d46ad764acca0eab48fa2ffaef5958fe/coverage-7.10.6-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:c8a3ec16e34ef980a46f60dc6ad86ec60f763c3f2fa0db6d261e6e754f72e945", size = 243909, upload-time = "2025-08-29T15:33:07.74Z" },
-    { url = "https://files.pythonhosted.org/packages/e9/a6/ba188b376529ce36483b2d585ca7bdac64aacbe5aa10da5978029a9c94db/coverage-7.10.6-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:7d79dabc0a56f5af990cc6da9ad1e40766e82773c075f09cc571e2076fef882e", size = 244786, upload-time = "2025-08-29T15:33:08.965Z" },
-    { url = "https://files.pythonhosted.org/packages/d0/4c/37ed872374a21813e0d3215256180c9a382c3f5ced6f2e5da0102fc2fd3e/coverage-7.10.6-cp310-cp310-win32.whl", hash = "sha256:86b9b59f2b16e981906e9d6383eb6446d5b46c278460ae2c36487667717eccf1", size = 219521, upload-time = "2025-08-29T15:33:10.599Z" },
-    { url = "https://files.pythonhosted.org/packages/8e/36/9311352fdc551dec5b973b61f4e453227ce482985a9368305880af4f85dd/coverage-7.10.6-cp310-cp310-win_amd64.whl", hash = "sha256:e132b9152749bd33534e5bd8565c7576f135f157b4029b975e15ee184325f528", size = 220417, upload-time = "2025-08-29T15:33:11.907Z" },
-    { url = "https://files.pythonhosted.org/packages/d4/16/2bea27e212c4980753d6d563a0803c150edeaaddb0771a50d2afc410a261/coverage-7.10.6-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c706db3cabb7ceef779de68270150665e710b46d56372455cd741184f3868d8f", size = 217129, upload-time = "2025-08-29T15:33:13.575Z" },
-    { url = "https://files.pythonhosted.org/packages/2a/51/e7159e068831ab37e31aac0969d47b8c5ee25b7d307b51e310ec34869315/coverage-7.10.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8e0c38dc289e0508ef68ec95834cb5d2e96fdbe792eaccaa1bccac3966bbadcc", size = 217532, upload-time = "2025-08-29T15:33:14.872Z" },
-    { url = "https://files.pythonhosted.org/packages/e7/c0/246ccbea53d6099325d25cd208df94ea435cd55f0db38099dd721efc7a1f/coverage-7.10.6-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:752a3005a1ded28f2f3a6e8787e24f28d6abe176ca64677bcd8d53d6fe2ec08a", size = 247931, upload-time = "2025-08-29T15:33:16.142Z" },
-    { url = "https://files.pythonhosted.org/packages/7d/fb/7435ef8ab9b2594a6e3f58505cc30e98ae8b33265d844007737946c59389/coverage-7.10.6-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:689920ecfd60f992cafca4f5477d55720466ad2c7fa29bb56ac8d44a1ac2b47a", size = 249864, upload-time = "2025-08-29T15:33:17.434Z" },
-    { url = "https://files.pythonhosted.org/packages/51/f8/d9d64e8da7bcddb094d511154824038833c81e3a039020a9d6539bf303e9/coverage-7.10.6-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ec98435796d2624d6905820a42f82149ee9fc4f2d45c2c5bc5a44481cc50db62", size = 251969, upload-time = "2025-08-29T15:33:18.822Z" },
-    { url = "https://files.pythonhosted.org/packages/43/28/c43ba0ef19f446d6463c751315140d8f2a521e04c3e79e5c5fe211bfa430/coverage-7.10.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:b37201ce4a458c7a758ecc4efa92fa8ed783c66e0fa3c42ae19fc454a0792153", size = 249659, upload-time = "2025-08-29T15:33:20.407Z" },
-    { url = "https://files.pythonhosted.org/packages/79/3e/53635bd0b72beaacf265784508a0b386defc9ab7fad99ff95f79ce9db555/coverage-7.10.6-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:2904271c80898663c810a6b067920a61dd8d38341244a3605bd31ab55250dad5", size = 247714, upload-time = "2025-08-29T15:33:21.751Z" },
-    { url = "https://files.pythonhosted.org/packages/4c/55/0964aa87126624e8c159e32b0bc4e84edef78c89a1a4b924d28dd8265625/coverage-7.10.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:5aea98383463d6e1fa4e95416d8de66f2d0cb588774ee20ae1b28df826bcb619", size = 248351, upload-time = "2025-08-29T15:33:23.105Z" },
-    { url = "https://files.pythonhosted.org/packages/eb/ab/6cfa9dc518c6c8e14a691c54e53a9433ba67336c760607e299bfcf520cb1/coverage-7.10.6-cp311-cp311-win32.whl", hash = "sha256:e3fb1fa01d3598002777dd259c0c2e6d9d5e10e7222976fc8e03992f972a2cba", size = 219562, upload-time = "2025-08-29T15:33:24.717Z" },
-    { url = "https://files.pythonhosted.org/packages/5b/18/99b25346690cbc55922e7cfef06d755d4abee803ef335baff0014268eff4/coverage-7.10.6-cp311-cp311-win_amd64.whl", hash = "sha256:f35ed9d945bece26553d5b4c8630453169672bea0050a564456eb88bdffd927e", size = 220453, upload-time = "2025-08-29T15:33:26.482Z" },
-    { url = "https://files.pythonhosted.org/packages/d8/ed/81d86648a07ccb124a5cf1f1a7788712b8d7216b593562683cd5c9b0d2c1/coverage-7.10.6-cp311-cp311-win_arm64.whl", hash = "sha256:99e1a305c7765631d74b98bf7dbf54eeea931f975e80f115437d23848ee8c27c", size = 219127, upload-time = "2025-08-29T15:33:27.777Z" },
-    { url = "https://files.pythonhosted.org/packages/26/06/263f3305c97ad78aab066d116b52250dd316e74fcc20c197b61e07eb391a/coverage-7.10.6-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5b2dd6059938063a2c9fee1af729d4f2af28fd1a545e9b7652861f0d752ebcea", size = 217324, upload-time = "2025-08-29T15:33:29.06Z" },
-    { url = "https://files.pythonhosted.org/packages/e9/60/1e1ded9a4fe80d843d7d53b3e395c1db3ff32d6c301e501f393b2e6c1c1f/coverage-7.10.6-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:388d80e56191bf846c485c14ae2bc8898aa3124d9d35903fef7d907780477634", size = 217560, upload-time = "2025-08-29T15:33:30.748Z" },
-    { url = "https://files.pythonhosted.org/packages/b8/25/52136173c14e26dfed8b106ed725811bb53c30b896d04d28d74cb64318b3/coverage-7.10.6-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:90cb5b1a4670662719591aa92d0095bb41714970c0b065b02a2610172dbf0af6", size = 249053, upload-time = "2025-08-29T15:33:32.041Z" },
-    { url = "https://files.pythonhosted.org/packages/cb/1d/ae25a7dc58fcce8b172d42ffe5313fc267afe61c97fa872b80ee72d9515a/coverage-7.10.6-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:961834e2f2b863a0e14260a9a273aff07ff7818ab6e66d2addf5628590c628f9", size = 251802, upload-time = "2025-08-29T15:33:33.625Z" },
-    { url = "https://files.pythonhosted.org/packages/f5/7a/1f561d47743710fe996957ed7c124b421320f150f1d38523d8d9102d3e2a/coverage-7.10.6-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:bf9a19f5012dab774628491659646335b1928cfc931bf8d97b0d5918dd58033c", size = 252935, upload-time = "2025-08-29T15:33:34.909Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/ad/8b97cd5d28aecdfde792dcbf646bac141167a5cacae2cd775998b45fabb5/coverage-7.10.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:99c4283e2a0e147b9c9cc6bc9c96124de9419d6044837e9799763a0e29a7321a", size = 250855, upload-time = "2025-08-29T15:33:36.922Z" },
-    { url = "https://files.pythonhosted.org/packages/33/6a/95c32b558d9a61858ff9d79580d3877df3eb5bc9eed0941b1f187c89e143/coverage-7.10.6-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:282b1b20f45df57cc508c1e033403f02283adfb67d4c9c35a90281d81e5c52c5", size = 248974, upload-time = "2025-08-29T15:33:38.175Z" },
-    { url = "https://files.pythonhosted.org/packages/0d/9c/8ce95dee640a38e760d5b747c10913e7a06554704d60b41e73fdea6a1ffd/coverage-7.10.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:8cdbe264f11afd69841bd8c0d83ca10b5b32853263ee62e6ac6a0ab63895f972", size = 250409, upload-time = "2025-08-29T15:33:39.447Z" },
-    { url = "https://files.pythonhosted.org/packages/04/12/7a55b0bdde78a98e2eb2356771fd2dcddb96579e8342bb52aa5bc52e96f0/coverage-7.10.6-cp312-cp312-win32.whl", hash = "sha256:a517feaf3a0a3eca1ee985d8373135cfdedfbba3882a5eab4362bda7c7cf518d", size = 219724, upload-time = "2025-08-29T15:33:41.172Z" },
-    { url = "https://files.pythonhosted.org/packages/36/4a/32b185b8b8e327802c9efce3d3108d2fe2d9d31f153a0f7ecfd59c773705/coverage-7.10.6-cp312-cp312-win_amd64.whl", hash = "sha256:856986eadf41f52b214176d894a7de05331117f6035a28ac0016c0f63d887629", size = 220536, upload-time = "2025-08-29T15:33:42.524Z" },
-    { url = "https://files.pythonhosted.org/packages/08/3a/d5d8dc703e4998038c3099eaf77adddb00536a3cec08c8dcd556a36a3eb4/coverage-7.10.6-cp312-cp312-win_arm64.whl", hash = "sha256:acf36b8268785aad739443fa2780c16260ee3fa09d12b3a70f772ef100939d80", size = 219171, upload-time = "2025-08-29T15:33:43.974Z" },
-    { url = "https://files.pythonhosted.org/packages/bd/e7/917e5953ea29a28c1057729c1d5af9084ab6d9c66217523fd0e10f14d8f6/coverage-7.10.6-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ffea0575345e9ee0144dfe5701aa17f3ba546f8c3bb48db62ae101afb740e7d6", size = 217351, upload-time = "2025-08-29T15:33:45.438Z" },
-    { url = "https://files.pythonhosted.org/packages/eb/86/2e161b93a4f11d0ea93f9bebb6a53f113d5d6e416d7561ca41bb0a29996b/coverage-7.10.6-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:95d91d7317cde40a1c249d6b7382750b7e6d86fad9d8eaf4fa3f8f44cf171e80", size = 217600, upload-time = "2025-08-29T15:33:47.269Z" },
-    { url = "https://files.pythonhosted.org/packages/0e/66/d03348fdd8df262b3a7fb4ee5727e6e4936e39e2f3a842e803196946f200/coverage-7.10.6-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3e23dd5408fe71a356b41baa82892772a4cefcf758f2ca3383d2aa39e1b7a003", size = 248600, upload-time = "2025-08-29T15:33:48.953Z" },
-    { url = "https://files.pythonhosted.org/packages/73/dd/508420fb47d09d904d962f123221bc249f64b5e56aa93d5f5f7603be475f/coverage-7.10.6-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0f3f56e4cb573755e96a16501a98bf211f100463d70275759e73f3cbc00d4f27", size = 251206, upload-time = "2025-08-29T15:33:50.697Z" },
-    { url = "https://files.pythonhosted.org/packages/e9/1f/9020135734184f439da85c70ea78194c2730e56c2d18aee6e8ff1719d50d/coverage-7.10.6-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:db4a1d897bbbe7339946ffa2fe60c10cc81c43fab8b062d3fcb84188688174a4", size = 252478, upload-time = "2025-08-29T15:33:52.303Z" },
-    { url = "https://files.pythonhosted.org/packages/a4/a4/3d228f3942bb5a2051fde28c136eea23a761177dc4ff4ef54533164ce255/coverage-7.10.6-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:d8fd7879082953c156d5b13c74aa6cca37f6a6f4747b39538504c3f9c63d043d", size = 250637, upload-time = "2025-08-29T15:33:53.67Z" },
-    { url = "https://files.pythonhosted.org/packages/36/e3/293dce8cdb9a83de971637afc59b7190faad60603b40e32635cbd15fbf61/coverage-7.10.6-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:28395ca3f71cd103b8c116333fa9db867f3a3e1ad6a084aa3725ae002b6583bc", size = 248529, upload-time = "2025-08-29T15:33:55.022Z" },
-    { url = "https://files.pythonhosted.org/packages/90/26/64eecfa214e80dd1d101e420cab2901827de0e49631d666543d0e53cf597/coverage-7.10.6-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:61c950fc33d29c91b9e18540e1aed7d9f6787cc870a3e4032493bbbe641d12fc", size = 250143, upload-time = "2025-08-29T15:33:56.386Z" },
-    { url = "https://files.pythonhosted.org/packages/3e/70/bd80588338f65ea5b0d97e424b820fb4068b9cfb9597fbd91963086e004b/coverage-7.10.6-cp313-cp313-win32.whl", hash = "sha256:160c00a5e6b6bdf4e5984b0ef21fc860bc94416c41b7df4d63f536d17c38902e", size = 219770, upload-time = "2025-08-29T15:33:58.063Z" },
-    { url = "https://files.pythonhosted.org/packages/a7/14/0b831122305abcc1060c008f6c97bbdc0a913ab47d65070a01dc50293c2b/coverage-7.10.6-cp313-cp313-win_amd64.whl", hash = "sha256:628055297f3e2aa181464c3808402887643405573eb3d9de060d81531fa79d32", size = 220566, upload-time = "2025-08-29T15:33:59.766Z" },
-    { url = "https://files.pythonhosted.org/packages/83/c6/81a83778c1f83f1a4a168ed6673eeedc205afb562d8500175292ca64b94e/coverage-7.10.6-cp313-cp313-win_arm64.whl", hash = "sha256:df4ec1f8540b0bcbe26ca7dd0f541847cc8a108b35596f9f91f59f0c060bfdd2", size = 219195, upload-time = "2025-08-29T15:34:01.191Z" },
-    { url = "https://files.pythonhosted.org/packages/d7/1c/ccccf4bf116f9517275fa85047495515add43e41dfe8e0bef6e333c6b344/coverage-7.10.6-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:c9a8b7a34a4de3ed987f636f71881cd3b8339f61118b1aa311fbda12741bff0b", size = 218059, upload-time = "2025-08-29T15:34:02.91Z" },
-    { url = "https://files.pythonhosted.org/packages/92/97/8a3ceff833d27c7492af4f39d5da6761e9ff624831db9e9f25b3886ddbca/coverage-7.10.6-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:8dd5af36092430c2b075cee966719898f2ae87b636cefb85a653f1d0ba5d5393", size = 218287, upload-time = "2025-08-29T15:34:05.106Z" },
-    { url = "https://files.pythonhosted.org/packages/92/d8/50b4a32580cf41ff0423777a2791aaf3269ab60c840b62009aec12d3970d/coverage-7.10.6-cp313-cp313t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:b0353b0f0850d49ada66fdd7d0c7cdb0f86b900bb9e367024fd14a60cecc1e27", size = 259625, upload-time = "2025-08-29T15:34:06.575Z" },
-    { url = "https://files.pythonhosted.org/packages/7e/7e/6a7df5a6fb440a0179d94a348eb6616ed4745e7df26bf2a02bc4db72c421/coverage-7.10.6-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:d6b9ae13d5d3e8aeca9ca94198aa7b3ebbc5acfada557d724f2a1f03d2c0b0df", size = 261801, upload-time = "2025-08-29T15:34:08.006Z" },
-    { url = "https://files.pythonhosted.org/packages/3a/4c/a270a414f4ed5d196b9d3d67922968e768cd971d1b251e1b4f75e9362f75/coverage-7.10.6-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:675824a363cc05781b1527b39dc2587b8984965834a748177ee3c37b64ffeafb", size = 264027, upload-time = "2025-08-29T15:34:09.806Z" },
-    { url = "https://files.pythonhosted.org/packages/9c/8b/3210d663d594926c12f373c5370bf1e7c5c3a427519a8afa65b561b9a55c/coverage-7.10.6-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:692d70ea725f471a547c305f0d0fc6a73480c62fb0da726370c088ab21aed282", size = 261576, upload-time = "2025-08-29T15:34:11.585Z" },
-    { url = "https://files.pythonhosted.org/packages/72/d0/e1961eff67e9e1dba3fc5eb7a4caf726b35a5b03776892da8d79ec895775/coverage-7.10.6-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:851430a9a361c7a8484a36126d1d0ff8d529d97385eacc8dfdc9bfc8c2d2cbe4", size = 259341, upload-time = "2025-08-29T15:34:13.159Z" },
-    { url = "https://files.pythonhosted.org/packages/3a/06/d6478d152cd189b33eac691cba27a40704990ba95de49771285f34a5861e/coverage-7.10.6-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:d9369a23186d189b2fc95cc08b8160ba242057e887d766864f7adf3c46b2df21", size = 260468, upload-time = "2025-08-29T15:34:14.571Z" },
-    { url = "https://files.pythonhosted.org/packages/ed/73/737440247c914a332f0b47f7598535b29965bf305e19bbc22d4c39615d2b/coverage-7.10.6-cp313-cp313t-win32.whl", hash = "sha256:92be86fcb125e9bda0da7806afd29a3fd33fdf58fba5d60318399adf40bf37d0", size = 220429, upload-time = "2025-08-29T15:34:16.394Z" },
-    { url = "https://files.pythonhosted.org/packages/bd/76/b92d3214740f2357ef4a27c75a526eb6c28f79c402e9f20a922c295c05e2/coverage-7.10.6-cp313-cp313t-win_amd64.whl", hash = "sha256:6b3039e2ca459a70c79523d39347d83b73f2f06af5624905eba7ec34d64d80b5", size = 221493, upload-time = "2025-08-29T15:34:17.835Z" },
-    { url = "https://files.pythonhosted.org/packages/fc/8e/6dcb29c599c8a1f654ec6cb68d76644fe635513af16e932d2d4ad1e5ac6e/coverage-7.10.6-cp313-cp313t-win_arm64.whl", hash = "sha256:3fb99d0786fe17b228eab663d16bee2288e8724d26a199c29325aac4b0319b9b", size = 219757, upload-time = "2025-08-29T15:34:19.248Z" },
-    { url = "https://files.pythonhosted.org/packages/d3/aa/76cf0b5ec00619ef208da4689281d48b57f2c7fde883d14bf9441b74d59f/coverage-7.10.6-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:6008a021907be8c4c02f37cdc3ffb258493bdebfeaf9a839f9e71dfdc47b018e", size = 217331, upload-time = "2025-08-29T15:34:20.846Z" },
-    { url = "https://files.pythonhosted.org/packages/65/91/8e41b8c7c505d398d7730206f3cbb4a875a35ca1041efc518051bfce0f6b/coverage-7.10.6-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:5e75e37f23eb144e78940b40395b42f2321951206a4f50e23cfd6e8a198d3ceb", size = 217607, upload-time = "2025-08-29T15:34:22.433Z" },
-    { url = "https://files.pythonhosted.org/packages/87/7f/f718e732a423d442e6616580a951b8d1ec3575ea48bcd0e2228386805e79/coverage-7.10.6-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:0f7cb359a448e043c576f0da00aa8bfd796a01b06aa610ca453d4dde09cc1034", size = 248663, upload-time = "2025-08-29T15:34:24.425Z" },
-    { url = "https://files.pythonhosted.org/packages/e6/52/c1106120e6d801ac03e12b5285e971e758e925b6f82ee9b86db3aa10045d/coverage-7.10.6-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c68018e4fc4e14b5668f1353b41ccf4bc83ba355f0e1b3836861c6f042d89ac1", size = 251197, upload-time = "2025-08-29T15:34:25.906Z" },
-    { url = "https://files.pythonhosted.org/packages/3d/ec/3a8645b1bb40e36acde9c0609f08942852a4af91a937fe2c129a38f2d3f5/coverage-7.10.6-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:cd4b2b0707fc55afa160cd5fc33b27ccbf75ca11d81f4ec9863d5793fc6df56a", size = 252551, upload-time = "2025-08-29T15:34:27.337Z" },
-    { url = "https://files.pythonhosted.org/packages/a1/70/09ecb68eeb1155b28a1d16525fd3a9b65fbe75337311a99830df935d62b6/coverage-7.10.6-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:4cec13817a651f8804a86e4f79d815b3b28472c910e099e4d5a0e8a3b6a1d4cb", size = 250553, upload-time = "2025-08-29T15:34:29.065Z" },
-    { url = "https://files.pythonhosted.org/packages/c6/80/47df374b893fa812e953b5bc93dcb1427a7b3d7a1a7d2db33043d17f74b9/coverage-7.10.6-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:f2a6a8e06bbda06f78739f40bfb56c45d14eb8249d0f0ea6d4b3d48e1f7c695d", size = 248486, upload-time = "2025-08-29T15:34:30.897Z" },
-    { url = "https://files.pythonhosted.org/packages/4a/65/9f98640979ecee1b0d1a7164b589de720ddf8100d1747d9bbdb84be0c0fb/coverage-7.10.6-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:081b98395ced0d9bcf60ada7661a0b75f36b78b9d7e39ea0790bb4ed8da14747", size = 249981, upload-time = "2025-08-29T15:34:32.365Z" },
-    { url = "https://files.pythonhosted.org/packages/1f/55/eeb6603371e6629037f47bd25bef300387257ed53a3c5fdb159b7ac8c651/coverage-7.10.6-cp314-cp314-win32.whl", hash = "sha256:6937347c5d7d069ee776b2bf4e1212f912a9f1f141a429c475e6089462fcecc5", size = 220054, upload-time = "2025-08-29T15:34:34.124Z" },
-    { url = "https://files.pythonhosted.org/packages/15/d1/a0912b7611bc35412e919a2cd59ae98e7ea3b475e562668040a43fb27897/coverage-7.10.6-cp314-cp314-win_amd64.whl", hash = "sha256:adec1d980fa07e60b6ef865f9e5410ba760e4e1d26f60f7e5772c73b9a5b0713", size = 220851, upload-time = "2025-08-29T15:34:35.651Z" },
-    { url = "https://files.pythonhosted.org/packages/ef/2d/11880bb8ef80a45338e0b3e0725e4c2d73ffbb4822c29d987078224fd6a5/coverage-7.10.6-cp314-cp314-win_arm64.whl", hash = "sha256:a80f7aef9535442bdcf562e5a0d5a5538ce8abe6bb209cfbf170c462ac2c2a32", size = 219429, upload-time = "2025-08-29T15:34:37.16Z" },
-    { url = "https://files.pythonhosted.org/packages/83/c0/1f00caad775c03a700146f55536ecd097a881ff08d310a58b353a1421be0/coverage-7.10.6-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:0de434f4fbbe5af4fa7989521c655c8c779afb61c53ab561b64dcee6149e4c65", size = 218080, upload-time = "2025-08-29T15:34:38.919Z" },
-    { url = "https://files.pythonhosted.org/packages/a9/c4/b1c5d2bd7cc412cbeb035e257fd06ed4e3e139ac871d16a07434e145d18d/coverage-7.10.6-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:6e31b8155150c57e5ac43ccd289d079eb3f825187d7c66e755a055d2c85794c6", size = 218293, upload-time = "2025-08-29T15:34:40.425Z" },
-    { url = "https://files.pythonhosted.org/packages/3f/07/4468d37c94724bf6ec354e4ec2f205fda194343e3e85fd2e59cec57e6a54/coverage-7.10.6-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:98cede73eb83c31e2118ae8d379c12e3e42736903a8afcca92a7218e1f2903b0", size = 259800, upload-time = "2025-08-29T15:34:41.996Z" },
-    { url = "https://files.pythonhosted.org/packages/82/d8/f8fb351be5fee31690cd8da768fd62f1cfab33c31d9f7baba6cd8960f6b8/coverage-7.10.6-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f863c08f4ff6b64fa8045b1e3da480f5374779ef187f07b82e0538c68cb4ff8e", size = 261965, upload-time = "2025-08-29T15:34:43.61Z" },
-    { url = "https://files.pythonhosted.org/packages/e8/70/65d4d7cfc75c5c6eb2fed3ee5cdf420fd8ae09c4808723a89a81d5b1b9c3/coverage-7.10.6-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2b38261034fda87be356f2c3f42221fdb4171c3ce7658066ae449241485390d5", size = 264220, upload-time = "2025-08-29T15:34:45.387Z" },
-    { url = "https://files.pythonhosted.org/packages/98/3c/069df106d19024324cde10e4ec379fe2fb978017d25e97ebee23002fbadf/coverage-7.10.6-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:0e93b1476b79eae849dc3872faeb0bf7948fd9ea34869590bc16a2a00b9c82a7", size = 261660, upload-time = "2025-08-29T15:34:47.288Z" },
-    { url = "https://files.pythonhosted.org/packages/fc/8a/2974d53904080c5dc91af798b3a54a4ccb99a45595cc0dcec6eb9616a57d/coverage-7.10.6-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:ff8a991f70f4c0cf53088abf1e3886edcc87d53004c7bb94e78650b4d3dac3b5", size = 259417, upload-time = "2025-08-29T15:34:48.779Z" },
-    { url = "https://files.pythonhosted.org/packages/30/38/9616a6b49c686394b318974d7f6e08f38b8af2270ce7488e879888d1e5db/coverage-7.10.6-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ac765b026c9f33044419cbba1da913cfb82cca1b60598ac1c7a5ed6aac4621a0", size = 260567, upload-time = "2025-08-29T15:34:50.718Z" },
-    { url = "https://files.pythonhosted.org/packages/76/16/3ed2d6312b371a8cf804abf4e14895b70e4c3491c6e53536d63fd0958a8d/coverage-7.10.6-cp314-cp314t-win32.whl", hash = "sha256:441c357d55f4936875636ef2cfb3bee36e466dcf50df9afbd398ce79dba1ebb7", size = 220831, upload-time = "2025-08-29T15:34:52.653Z" },
-    { url = "https://files.pythonhosted.org/packages/d5/e5/d38d0cb830abede2adb8b147770d2a3d0e7fecc7228245b9b1ae6c24930a/coverage-7.10.6-cp314-cp314t-win_amd64.whl", hash = "sha256:073711de3181b2e204e4870ac83a7c4853115b42e9cd4d145f2231e12d670930", size = 221950, upload-time = "2025-08-29T15:34:54.212Z" },
-    { url = "https://files.pythonhosted.org/packages/f4/51/e48e550f6279349895b0ffcd6d2a690e3131ba3a7f4eafccc141966d4dea/coverage-7.10.6-cp314-cp314t-win_arm64.whl", hash = "sha256:137921f2bac5559334ba66122b753db6dc5d1cf01eb7b64eb412bb0d064ef35b", size = 219969, upload-time = "2025-08-29T15:34:55.83Z" },
-    { url = "https://files.pythonhosted.org/packages/44/0c/50db5379b615854b5cf89146f8f5bd1d5a9693d7f3a987e269693521c404/coverage-7.10.6-py3-none-any.whl", hash = "sha256:92c4ecf6bf11b2e85fd4d8204814dc26e6a19f0c9d938c207c5cb0eadfcabbe3", size = 208986, upload-time = "2025-08-29T15:35:14.506Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/93/4ad92f71e28ece5c0326e5f4a6630aa4928a8846654a65cfff69b49b95b9/coverage-7.6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5f8ae553cba74085db385d489c7a792ad66f7f9ba2ee85bfa508aeb84cf0ba07", size = 206713, upload-time = "2024-10-20T22:56:03.877Z" },
+    { url = "https://files.pythonhosted.org/packages/01/ae/747a580b1eda3f2e431d87de48f0604bd7bc92e52a1a95185a4aa585bc47/coverage-7.6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8165b796df0bd42e10527a3f493c592ba494f16ef3c8b531288e3d0d72c1f6f0", size = 207149, upload-time = "2024-10-20T22:56:06.511Z" },
+    { url = "https://files.pythonhosted.org/packages/07/1a/1f573f8a6145f6d4c9130bbc120e0024daf1b24cf2a78d7393fa6eb6aba7/coverage-7.6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7c8b95bf47db6d19096a5e052ffca0a05f335bc63cef281a6e8fe864d450a72", size = 235584, upload-time = "2024-10-20T22:56:07.678Z" },
+    { url = "https://files.pythonhosted.org/packages/40/42/c8523f2e4db34aa9389caee0d3688b6ada7a84fcc782e943a868a7f302bd/coverage-7.6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ed9281d1b52628e81393f5eaee24a45cbd64965f41857559c2b7ff19385df51", size = 233486, upload-time = "2024-10-20T22:56:09.496Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/95/565c310fffa16ede1a042e9ea1ca3962af0d8eb5543bc72df6b91dc0c3d5/coverage-7.6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0809082ee480bb8f7416507538243c8863ac74fd8a5d2485c46f0f7499f2b491", size = 234649, upload-time = "2024-10-20T22:56:11.326Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/81/3b550674d98968ec29c92e3e8650682be6c8b1fa7581a059e7e12e74c431/coverage-7.6.4-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:d541423cdd416b78626b55f123412fcf979d22a2c39fce251b350de38c15c15b", size = 233744, upload-time = "2024-10-20T22:56:12.481Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/70/d66c7f51b3e33aabc5ea9f9624c1c9d9655472962270eb5e7b0d32707224/coverage-7.6.4-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:58809e238a8a12a625c70450b48e8767cff9eb67c62e6154a642b21ddf79baea", size = 232204, upload-time = "2024-10-20T22:56:14.236Z" },
+    { url = "https://files.pythonhosted.org/packages/23/2d/2b3a2dbed7a5f40693404c8a09e779d7c1a5fbed089d3e7224c002129ec8/coverage-7.6.4-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:c9b8e184898ed014884ca84c70562b4a82cbc63b044d366fedc68bc2b2f3394a", size = 233335, upload-time = "2024-10-20T22:56:15.521Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/4f/92d1d2ad720d698a4e71c176eacf531bfb8e0721d5ad560556f2c484a513/coverage-7.6.4-cp310-cp310-win32.whl", hash = "sha256:6bd818b7ea14bc6e1f06e241e8234508b21edf1b242d49831831a9450e2f35fa", size = 209435, upload-time = "2024-10-20T22:56:17.309Z" },
+    { url = "https://files.pythonhosted.org/packages/c7/b9/cdf158e7991e2287bcf9082670928badb73d310047facac203ff8dcd5ff3/coverage-7.6.4-cp310-cp310-win_amd64.whl", hash = "sha256:06babbb8f4e74b063dbaeb74ad68dfce9186c595a15f11f5d5683f748fa1d172", size = 210243, upload-time = "2024-10-20T22:56:18.366Z" },
+    { url = "https://files.pythonhosted.org/packages/87/31/9c0cf84f0dfcbe4215b7eb95c31777cdc0483c13390e69584c8150c85175/coverage-7.6.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:73d2b73584446e66ee633eaad1a56aad577c077f46c35ca3283cd687b7715b0b", size = 206819, upload-time = "2024-10-20T22:56:20.132Z" },
+    { url = "https://files.pythonhosted.org/packages/53/ed/a38401079ad320ad6e054a01ec2b61d270511aeb3c201c80e99c841229d5/coverage-7.6.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:51b44306032045b383a7a8a2c13878de375117946d68dcb54308111f39775a25", size = 207263, upload-time = "2024-10-20T22:56:21.88Z" },
+    { url = "https://files.pythonhosted.org/packages/20/e7/c3ad33b179ab4213f0d70da25a9c214d52464efa11caeab438592eb1d837/coverage-7.6.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b3fb02fe73bed561fa12d279a417b432e5b50fe03e8d663d61b3d5990f29546", size = 239205, upload-time = "2024-10-20T22:56:23.03Z" },
+    { url = "https://files.pythonhosted.org/packages/36/91/fc02e8d8e694f557752120487fd982f654ba1421bbaa5560debf96ddceda/coverage-7.6.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ed8fe9189d2beb6edc14d3ad19800626e1d9f2d975e436f84e19efb7fa19469b", size = 236612, upload-time = "2024-10-20T22:56:24.882Z" },
+    { url = "https://files.pythonhosted.org/packages/cc/57/cb08f0eda0389a9a8aaa4fc1f9fec7ac361c3e2d68efd5890d7042c18aa3/coverage-7.6.4-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b369ead6527d025a0fe7bd3864e46dbee3aa8f652d48df6174f8d0bac9e26e0e", size = 238479, upload-time = "2024-10-20T22:56:26.749Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/c9/2c7681a9b3ca6e6f43d489c2e6653a53278ed857fd6e7010490c307b0a47/coverage-7.6.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ade3ca1e5f0ff46b678b66201f7ff477e8fa11fb537f3b55c3f0568fbfe6e718", size = 237405, upload-time = "2024-10-20T22:56:27.958Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/4e/ebfc6944b96317df8b537ae875d2e57c27b84eb98820bc0a1055f358f056/coverage-7.6.4-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:27fb4a050aaf18772db513091c9c13f6cb94ed40eacdef8dad8411d92d9992db", size = 236038, upload-time = "2024-10-20T22:56:29.816Z" },
+    { url = "https://files.pythonhosted.org/packages/13/f2/3a0bf1841a97c0654905e2ef531170f02c89fad2555879db8fe41a097871/coverage-7.6.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4f704f0998911abf728a7783799444fcbbe8261c4a6c166f667937ae6a8aa522", size = 236812, upload-time = "2024-10-20T22:56:31.654Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/9c/66bf59226b52ce6ed9541b02d33e80a6e816a832558fbdc1111a7bd3abd4/coverage-7.6.4-cp311-cp311-win32.whl", hash = "sha256:29155cd511ee058e260db648b6182c419422a0d2e9a4fa44501898cf918866cf", size = 209400, upload-time = "2024-10-20T22:56:33.569Z" },
+    { url = "https://files.pythonhosted.org/packages/2a/a0/b0790934c04dfc8d658d4a62acb8f7ca0efdf3818456fcad757b11c6479d/coverage-7.6.4-cp311-cp311-win_amd64.whl", hash = "sha256:8902dd6a30173d4ef09954bfcb24b5d7b5190cf14a43170e386979651e09ba19", size = 210243, upload-time = "2024-10-20T22:56:34.863Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/e7/9291de916d084f41adddfd4b82246e68d61d6a75747f075f7e64628998d2/coverage-7.6.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:12394842a3a8affa3ba62b0d4ab7e9e210c5e366fbac3e8b2a68636fb19892c2", size = 207013, upload-time = "2024-10-20T22:56:36.034Z" },
+    { url = "https://files.pythonhosted.org/packages/27/03/932c2c5717a7fa80cd43c6a07d3177076d97b79f12f40f882f9916db0063/coverage-7.6.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2b6b4c83d8e8ea79f27ab80778c19bc037759aea298da4b56621f4474ffeb117", size = 207251, upload-time = "2024-10-20T22:56:38.054Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/3f/0af47dcb9327f65a45455fbca846fe96eb57c153af46c4754a3ba678938a/coverage-7.6.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d5b8007f81b88696d06f7df0cb9af0d3b835fe0c8dbf489bad70b45f0e45613", size = 240268, upload-time = "2024-10-20T22:56:40.051Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/3c/37a9d81bbd4b23bc7d46ca820e16174c613579c66342faa390a271d2e18b/coverage-7.6.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b57b768feb866f44eeed9f46975f3d6406380275c5ddfe22f531a2bf187eda27", size = 237298, upload-time = "2024-10-20T22:56:41.929Z" },
+    { url = "https://files.pythonhosted.org/packages/c0/70/6b0627e5bd68204ee580126ed3513140b2298995c1233bd67404b4e44d0e/coverage-7.6.4-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5915fcdec0e54ee229926868e9b08586376cae1f5faa9bbaf8faf3561b393d52", size = 239367, upload-time = "2024-10-20T22:56:43.141Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/eb/634d7dfab24ac3b790bebaf9da0f4a5352cbc125ce6a9d5c6cf4c6cae3c7/coverage-7.6.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0b58c672d14f16ed92a48db984612f5ce3836ae7d72cdd161001cc54512571f2", size = 238853, upload-time = "2024-10-20T22:56:44.33Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/0d/8e3ed00f1266ef7472a4e33458f42e39492e01a64281084fb3043553d3f1/coverage-7.6.4-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:2fdef0d83a2d08d69b1f2210a93c416d54e14d9eb398f6ab2f0a209433db19e1", size = 237160, upload-time = "2024-10-20T22:56:46.258Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/9c/4337f468ef0ab7a2e0887a9c9da0e58e2eada6fc6cbee637a4acd5dfd8a9/coverage-7.6.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:8cf717ee42012be8c0cb205dbbf18ffa9003c4cbf4ad078db47b95e10748eec5", size = 238824, upload-time = "2024-10-20T22:56:48.666Z" },
+    { url = "https://files.pythonhosted.org/packages/5e/09/3e94912b8dd37251377bb02727a33a67ee96b84bbbe092f132b401ca5dd9/coverage-7.6.4-cp312-cp312-win32.whl", hash = "sha256:7bb92c539a624cf86296dd0c68cd5cc286c9eef2d0c3b8b192b604ce9de20a17", size = 209639, upload-time = "2024-10-20T22:56:50.664Z" },
+    { url = "https://files.pythonhosted.org/packages/01/69/d4f3a4101171f32bc5b3caec8ff94c2c60f700107a6aaef7244b2c166793/coverage-7.6.4-cp312-cp312-win_amd64.whl", hash = "sha256:1032e178b76a4e2b5b32e19d0fd0abbce4b58e77a1ca695820d10e491fa32b08", size = 210428, upload-time = "2024-10-20T22:56:52.468Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/4d/2dede4f7cb5a70fb0bb40a57627fddf1dbdc6b9c1db81f7c4dcdcb19e2f4/coverage-7.6.4-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:023bf8ee3ec6d35af9c1c6ccc1d18fa69afa1cb29eaac57cb064dbb262a517f9", size = 207039, upload-time = "2024-10-20T22:56:53.656Z" },
+    { url = "https://files.pythonhosted.org/packages/3f/f9/d86368ae8c79e28f1fb458ebc76ae9ff3e8bd8069adc24e8f2fed03c58b7/coverage-7.6.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:b0ac3d42cb51c4b12df9c5f0dd2f13a4f24f01943627120ec4d293c9181219ba", size = 207298, upload-time = "2024-10-20T22:56:54.979Z" },
+    { url = "https://files.pythonhosted.org/packages/64/c5/b4cc3c3f64622c58fbfd4d8b9a7a8ce9d355f172f91fcabbba1f026852f6/coverage-7.6.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f8fe4984b431f8621ca53d9380901f62bfb54ff759a1348cd140490ada7b693c", size = 239813, upload-time = "2024-10-20T22:56:56.209Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/86/14c42e60b70a79b26099e4d289ccdfefbc68624d096f4481163085aa614c/coverage-7.6.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5fbd612f8a091954a0c8dd4c0b571b973487277d26476f8480bfa4b2a65b5d06", size = 236959, upload-time = "2024-10-20T22:56:58.06Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/f8/4436a643631a2fbab4b44d54f515028f6099bfb1cd95b13cfbf701e7f2f2/coverage-7.6.4-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dacbc52de979f2823a819571f2e3a350a7e36b8cb7484cdb1e289bceaf35305f", size = 238950, upload-time = "2024-10-20T22:56:59.329Z" },
+    { url = "https://files.pythonhosted.org/packages/49/50/1571810ddd01f99a0a8be464a4ac8b147f322cd1e8e296a1528984fc560b/coverage-7.6.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:dab4d16dfef34b185032580e2f2f89253d302facba093d5fa9dbe04f569c4f4b", size = 238610, upload-time = "2024-10-20T22:57:00.645Z" },
+    { url = "https://files.pythonhosted.org/packages/f3/8c/6312d241fe7cbd1f0cade34a62fea6f333d1a261255d76b9a87074d8703c/coverage-7.6.4-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:862264b12ebb65ad8d863d51f17758b1684560b66ab02770d4f0baf2ff75da21", size = 236697, upload-time = "2024-10-20T22:57:01.944Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/5f/fef33dfd05d87ee9030f614c857deb6df6556b8f6a1c51bbbb41e24ee5ac/coverage-7.6.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:5beb1ee382ad32afe424097de57134175fea3faf847b9af002cc7895be4e2a5a", size = 238541, upload-time = "2024-10-20T22:57:03.848Z" },
+    { url = "https://files.pythonhosted.org/packages/a9/64/6a984b6e92e1ea1353b7ffa08e27f707a5e29b044622445859200f541e8c/coverage-7.6.4-cp313-cp313-win32.whl", hash = "sha256:bf20494da9653f6410213424f5f8ad0ed885e01f7e8e59811f572bdb20b8972e", size = 209707, upload-time = "2024-10-20T22:57:05.123Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/60/ce5a9e942e9543783b3db5d942e0578b391c25cdd5e7f342d854ea83d6b7/coverage-7.6.4-cp313-cp313-win_amd64.whl", hash = "sha256:182e6cd5c040cec0a1c8d415a87b67ed01193ed9ad458ee427741c7d8513d963", size = 210439, upload-time = "2024-10-20T22:57:06.35Z" },
+    { url = "https://files.pythonhosted.org/packages/78/53/6719677e92c308207e7f10561a1b16ab8b5c00e9328efc9af7cfd6fb703e/coverage-7.6.4-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:a181e99301a0ae128493a24cfe5cfb5b488c4e0bf2f8702091473d033494d04f", size = 207784, upload-time = "2024-10-20T22:57:07.857Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/dd/7054928930671fcb39ae6a83bb71d9ab5f0afb733172543ced4b09a115ca/coverage-7.6.4-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:df57bdbeffe694e7842092c5e2e0bc80fff7f43379d465f932ef36f027179806", size = 208058, upload-time = "2024-10-20T22:57:09.845Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/7d/fd656ddc2b38301927b9eb3aae3fe827e7aa82e691923ed43721fd9423c9/coverage-7.6.4-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0bcd1069e710600e8e4cf27f65c90c7843fa8edfb4520fb0ccb88894cad08b11", size = 250772, upload-time = "2024-10-20T22:57:11.147Z" },
+    { url = "https://files.pythonhosted.org/packages/90/d0/eb9a3cc2100b83064bb086f18aedde3afffd7de6ead28f69736c00b7f302/coverage-7.6.4-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:99b41d18e6b2a48ba949418db48159d7a2e81c5cc290fc934b7d2380515bd0e3", size = 246490, upload-time = "2024-10-20T22:57:13.02Z" },
+    { url = "https://files.pythonhosted.org/packages/45/44/3f64f38f6faab8a0cfd2c6bc6eb4c6daead246b97cf5f8fc23bf3788f841/coverage-7.6.4-cp313-cp313t-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a6b1e54712ba3474f34b7ef7a41e65bd9037ad47916ccb1cc78769bae324c01a", size = 248848, upload-time = "2024-10-20T22:57:14.927Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/11/4c465a5f98656821e499f4b4619929bd5a34639c466021740ecdca42aa30/coverage-7.6.4-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:53d202fd109416ce011578f321460795abfe10bb901b883cafd9b3ef851bacfc", size = 248340, upload-time = "2024-10-20T22:57:16.246Z" },
+    { url = "https://files.pythonhosted.org/packages/f1/96/ebecda2d016cce9da812f404f720ca5df83c6b29f65dc80d2000d0078741/coverage-7.6.4-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:c48167910a8f644671de9f2083a23630fbf7a1cb70ce939440cd3328e0919f70", size = 246229, upload-time = "2024-10-20T22:57:17.546Z" },
+    { url = "https://files.pythonhosted.org/packages/16/d9/3d820c00066ae55d69e6d0eae11d6149a5ca7546de469ba9d597f01bf2d7/coverage-7.6.4-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:cc8ff50b50ce532de2fa7a7daae9dd12f0a699bfcd47f20945364e5c31799fef", size = 247510, upload-time = "2024-10-20T22:57:18.925Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/c3/4fa1eb412bb288ff6bfcc163c11700ff06e02c5fad8513817186e460ed43/coverage-7.6.4-cp313-cp313t-win32.whl", hash = "sha256:b8d3a03d9bfcaf5b0141d07a88456bb6a4c3ce55c080712fec8418ef3610230e", size = 210353, upload-time = "2024-10-20T22:57:20.891Z" },
+    { url = "https://files.pythonhosted.org/packages/7e/77/03fc2979d1538884d921c2013075917fc927f41cd8526909852fe4494112/coverage-7.6.4-cp313-cp313t-win_amd64.whl", hash = "sha256:f3ddf056d3ebcf6ce47bdaf56142af51bb7fad09e4af310241e9db7a3a8022e1", size = 211502, upload-time = "2024-10-20T22:57:22.21Z" },
+    { url = "https://files.pythonhosted.org/packages/cc/56/e1d75e8981a2a92c2a777e67c26efa96c66da59d645423146eb9ff3a851b/coverage-7.6.4-pp39.pp310-none-any.whl", hash = "sha256:3c65d37f3a9ebb703e710befdc489a38683a5b152242664b973a7b7b22348a4e", size = 198954, upload-time = "2024-10-20T22:57:38.28Z" },
 ]

 [package.optional-dependencies]
@@ -2262,16 +2236,16 @@ wheels = [

 [[package]]
 name = "pytest-cov"
-version = "7.0.0"
+version = "6.2.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "coverage", extra = ["toml"] },
    { name = "pluggy" },
    { name = "pytest" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/5e/f7/c933acc76f5208b3b00089573cf6a2bc26dc80a8aece8f52bb7d6b1855ca/pytest_cov-7.0.0.tar.gz", hash = "sha256:33c97eda2e049a0c5298e91f519302a1334c26ac65c1a483d6206fd458361af1", size = 54328, upload-time = "2025-09-09T10:57:02.113Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/18/99/668cade231f434aaa59bbfbf49469068d2ddd945000621d3d165d2e7dd7b/pytest_cov-6.2.1.tar.gz", hash = "sha256:25cc6cc0a5358204b8108ecedc51a9b57b34cc6b8c967cc2c01a4e00d8a67da2", size = 69432, upload-time = "2025-06-12T10:47:47.684Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ee/49/1377b49de7d0c1ce41292161ea0f721913fa8722c19fb9c1e3aa0367eecb/pytest_cov-7.0.0-py3-none-any.whl", hash = "sha256:3b8e9558b16cc1479da72058bdecf8073661c7f57f7d3c5f22a1c23507f2d861", size = 22424, upload-time = "2025-09-09T10:57:00.695Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/16/4ea354101abb1287856baa4af2732be351c7bee728065aed451b678153fd/pytest_cov-6.2.1-py3-none-any.whl", hash = "sha256:f5bc4c23f42f1cdd23c70b1dab1bbaef4fc505ba950d53e0081d0730dd7e86d5", size = 24644, upload-time = "2025-06-12T10:47:45.932Z" },
 ]

 [[package]]
--- a/mise.lock
+++ b/mise.lock
@@ -0,0 +1,34 @@
+[tools.dart]
+version = "3.8.2"
+backend = "asdf:dart"
+
+[tools.flutter]
+version = "3.35.3-stable"
+backend = "asdf:flutter"
+
+[tools."github:CQLabs/homebrew-dcm"]
+version = "1.31.4"
+backend = "github:CQLabs/homebrew-dcm"
+
+[tools."github:CQLabs/homebrew-dcm".platforms.linux-x64]
+checksum = "blake3:e9df5b765df327e1248fccf2c6165a89d632a065667f99c01765bf3047b94955"
+size = 8821083
+url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.31.4/dcm-linux-x64-release.zip"
+
+[tools.node]
+version = "22.18.0"
+backend = "core:node"
+
+[tools.node.platforms.linux-x64]
+checksum = "sha256:a2e703725d8683be86bb5da967bf8272f4518bdaf10f21389e2b2c9eaeae8c8a"
+size = 54824343
+url = "https://nodejs.org/dist/v22.18.0/node-v22.18.0-linux-x64.tar.gz"
+
+[tools.pnpm]
+version = "10.14.0"
+backend = "aqua:pnpm/pnpm"
+
+[tools.pnpm.platforms.linux-x64]
+checksum = "blake3:13dfa46b7173d3cad3bad60a756a492ecf0bce48b23eb9f793e7ccec5a09b46d"
+size = 66231525
+url = "https://github.com/pnpm/pnpm/releases/download/v10.14.0/pnpm-linux-x64"
--- a/mise.toml
+++ b/mise.toml
@@ -1,15 +1,17 @@
 [tools]
 node = "22.19.0"
 flutter = "3.35.4"
-pnpm = "10.15.1"
+pnpm = "10.14.0"
+dart = "3.8.2"

 [tools."github:CQLabs/homebrew-dcm"]
-version = "1.30.0"
+version = "1.31.4"
 bin = "dcm"
 postinstall = "chmod +x $MISE_TOOL_INSTALL_PATH/dcm"

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

 # .github
@@ -308,200 +310,3 @@ run = [
  "mise run web:test --run",
  "mise run web:lint",
 ]
-
-
-# mobile
-[tasks."mobile:codegen:dart"]
-alias = "mobile:codegen"
-description = "Execute build_runner to auto-generate dart code"
-dir = "mobile"
-sources = ["pubspec.yaml", "build.yaml", "lib/**/*.dart"]
-outputs = { auto = true }
-run = "dart run build_runner build --delete-conflicting-outputs"
-
-[tasks."mobile:codegen:pigeon"]
-alias = "mobile:pigeon"
-description = "Generate pigeon platform code"
-dir = "mobile"
-depends = [
-  "mobile:pigeon:native-sync",
-  "mobile:pigeon:thumbnail",
-  "mobile:pigeon:background-worker",
-  "mobile:pigeon:background-worker-lock",
-  "mobile:pigeon:connectivity",
-]
-
-[tasks."mobile:codegen:translation"]
-alias = "mobile:translation"
-description = "Generate translations from i18n JSONs"
-dir = "mobile"
-run = [
-  { task = "i18n:format-fix" },
-  { tasks = [
-    "mobile:i18n:loader",
-    "mobile:i18n:keys",
-  ] },
-]
-
-[tasks."mobile:codegen:app-icon"]
-description = "Generate app icons"
-dir = "mobile"
-run = "flutter pub run flutter_launcher_icons:main"
-
-[tasks."mobile:codegen:splash"]
-description = "Generate splash screen"
-dir = "mobile"
-run = "flutter pub run flutter_native_splash:create"
-
-[tasks."mobile:test"]
-description = "Run mobile tests"
-dir = "mobile"
-run = "flutter test"
-
-[tasks."mobile:lint"]
-description = "Analyze Dart code"
-dir = "mobile"
-depends = ["mobile:analyze:dart", "mobile:analyze:dcm"]
-
-[tasks."mobile:lint-fix"]
-description = "Auto-fix Dart code"
-dir = "mobile"
-depends = ["mobile:analyze:fix:dart", "mobile:analyze:fix:dcm"]
-
-[tasks."mobile:format"]
-description = "Format Dart code"
-dir = "mobile"
-run = "dart format --set-exit-if-changed $(find lib -name '*.dart' -not \\( -name '*.g.dart' -o -name '*.drift.dart' -o -name '*.gr.dart' \\))"
-
-[tasks."mobile:build:android"]
-description = "Build Android release"
-dir = "mobile"
-run = "flutter build appbundle"
-
-[tasks."mobile:drift:migration"]
-alias = "mobile:migration"
-description = "Generate database migrations"
-dir = "mobile"
-run = "dart run drift_dev make-migrations"
-
-
-# mobile internal tasks
-[tasks."mobile:pigeon:native-sync"]
-description = "Generate native sync API pigeon code"
-dir = "mobile"
-hide = true
-sources = ["pigeon/native_sync_api.dart"]
-outputs = [
-  "lib/platform/native_sync_api.g.dart",
-  "ios/Runner/Sync/Messages.g.swift",
-  "android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt",
-]
-run = [
-  "dart run pigeon --input pigeon/native_sync_api.dart",
-  "dart format lib/platform/native_sync_api.g.dart",
-]
-
-[tasks."mobile:pigeon:thumbnail"]
-description = "Generate thumbnail API pigeon code"
-dir = "mobile"
-hide = true
-sources = ["pigeon/thumbnail_api.dart"]
-outputs = [
-  "lib/platform/thumbnail_api.g.dart",
-  "ios/Runner/Images/Thumbnails.g.swift",
-  "android/app/src/main/kotlin/app/alextran/immich/images/Thumbnails.g.kt",
-]
-run = [
-  "dart run pigeon --input pigeon/thumbnail_api.dart",
-  "dart format lib/platform/thumbnail_api.g.dart",
-]
-
-[tasks."mobile:pigeon:background-worker"]
-description = "Generate background worker API pigeon code"
-dir = "mobile"
-hide = true
-sources = ["pigeon/background_worker_api.dart"]
-outputs = [
-  "lib/platform/background_worker_api.g.dart",
-  "ios/Runner/Background/BackgroundWorker.g.swift",
-  "android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorker.g.kt",
-]
-run = [
-  "dart run pigeon --input pigeon/background_worker_api.dart",
-  "dart format lib/platform/background_worker_api.g.dart",
-]
-
-[tasks."mobile:pigeon:background-worker-lock"]
-description = "Generate background worker lock API pigeon code"
-dir = "mobile"
-hide = true
-sources = ["pigeon/background_worker_lock_api.dart"]
-outputs = [
-  "lib/platform/background_worker_lock_api.g.dart",
-  "android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorkerLock.g.kt",
-]
-run = [
-  "dart run pigeon --input pigeon/background_worker_lock_api.dart",
-  "dart format lib/platform/background_worker_lock_api.g.dart",
-]
-
-[tasks."mobile:pigeon:connectivity"]
-description = "Generate connectivity API pigeon code"
-dir = "mobile"
-hide = true
-sources = ["pigeon/connectivity_api.dart"]
-outputs = [
-  "lib/platform/connectivity_api.g.dart",
-  "ios/Runner/Connectivity/Connectivity.g.swift",
-  "android/app/src/main/kotlin/app/alextran/immich/connectivity/Connectivity.g.kt",
-]
-run = [
-  "dart run pigeon --input pigeon/connectivity_api.dart",
-  "dart format lib/platform/connectivity_api.g.dart",
-]
-
-[tasks."mobile:i18n:loader"]
-description = "Generate i18n loader"
-dir = "mobile"
-hide = true
-sources = ["i18n/"]
-outputs = "lib/generated/codegen_loader.g.dart"
-run = [
-  "dart run easy_localization:generate -S ../i18n",
-  "dart format lib/generated/codegen_loader.g.dart",
-]
-
-[tasks."mobile:i18n:keys"]
-description = "Generate i18n keys"
-dir = "mobile"
-hide = true
-sources = ["i18n/en.json"]
-outputs = "lib/generated/intl_keys.g.dart"
-run = [
-  "dart run bin/generate_keys.dart",
-  "dart format lib/generated/intl_keys.g.dart",
-]
-
-[tasks."mobile:analyze:dart"]
-description = "Run Dart analysis"
-dir = "mobile"
-hide = true
-run = "dart analyze --fatal-infos"
-
-[tasks."mobile:analyze:dcm"]
-description = "Run Dart Code Metrics"
-dir = "mobile"
-hide = true
-run = "dcm analyze lib --fatal-style --fatal-warnings"
-
-[tasks."mobile:analyze:fix:dart"]
-description = "Auto-fix Dart analysis"
-dir = "mobile"
-hide = true
-run = "dart fix --apply"
-
-[tasks."mobile:analyze:fix:dcm"]
-description = "Auto-fix Dart Code Metrics"
-dir = "mobile"
-hide = true
-run = "dcm fix lib"
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/MainActivity.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/MainActivity.kt
@@ -6,7 +6,6 @@ import android.os.ext.SdkExtensions
 import app.alextran.immich.background.BackgroundEngineLock
 import app.alextran.immich.background.BackgroundWorkerApiImpl
 import app.alextran.immich.background.BackgroundWorkerFgHostApi
-import app.alextran.immich.background.BackgroundWorkerLockApi
 import app.alextran.immich.connectivity.ConnectivityApi
 import app.alextran.immich.connectivity.ConnectivityApiImpl
 import app.alextran.immich.images.ThumbnailApi
@@ -25,9 +24,11 @@ class MainActivity : FlutterFragmentActivity() {

  companion object {
    fun registerPlugins(ctx: Context, flutterEngine: FlutterEngine) {
+      flutterEngine.plugins.add(BackgroundServicePlugin())
+      flutterEngine.plugins.add(HttpSSLOptionsPlugin())
+      flutterEngine.plugins.add(BackgroundEngineLock())
+
      val messenger = flutterEngine.dartExecutor.binaryMessenger
-      val backgroundEngineLockImpl = BackgroundEngineLock(ctx)
-      BackgroundWorkerLockApi.setUp(messenger, backgroundEngineLockImpl)
      val nativeSyncApiImpl =
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R || SdkExtensions.getExtensionVersion(Build.VERSION_CODES.R) < 1) {
          NativeSyncApiImpl26(ctx)
@@ -38,10 +39,6 @@ class MainActivity : FlutterFragmentActivity() {
      ThumbnailApi.setUp(messenger, ThumbnailsImpl(ctx))
      BackgroundWorkerFgHostApi.setUp(messenger, BackgroundWorkerApiImpl(ctx))
      ConnectivityApi.setUp(messenger, ConnectivityApiImpl(ctx))
-
-      flutterEngine.plugins.add(BackgroundServicePlugin())
-      flutterEngine.plugins.add(HttpSSLOptionsPlugin())
-      flutterEngine.plugins.add(backgroundEngineLockImpl)
    }
  }
 }
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundEngineLock.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundEngineLock.kt
@@ -1,50 +1,33 @@
 package app.alextran.immich.background

-import android.content.Context
 import android.util.Log
+import androidx.work.WorkManager
+import io.flutter.embedding.engine.FlutterEngineCache
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import java.util.concurrent.atomic.AtomicInteger

 private const val TAG = "BackgroundEngineLock"

-class BackgroundEngineLock(context: Context) : BackgroundWorkerLockApi, FlutterPlugin {
-    private val ctx: Context = context.applicationContext
+class BackgroundEngineLock : FlutterPlugin {
+  companion object {
+    const val ENGINE_CACHE_KEY = "immich::background_worker::engine"
+    var engineCount = AtomicInteger(0)
+  }

-    companion object {
-
-        private var engineCount = AtomicInteger(0)
-
-        private fun checkAndEnforceBackgroundLock(ctx: Context) {
-            // work manager task is running while the main app is opened, cancel the worker
-            if (BackgroundWorkerPreferences(ctx).isLocked() &&
-                engineCount.get() > 1 &&
-                BackgroundWorkerApiImpl.isBackgroundWorkerRunning()
-            ) {
-                Log.i(TAG, "Background worker is locked, cancelling the background worker")
-                BackgroundWorkerApiImpl.cancelBackgroundWorker(ctx)
-            }
-        }
+  override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+    // work manager task is running while the main app is opened, cancel the worker
+    if (engineCount.incrementAndGet() > 1 && FlutterEngineCache.getInstance()
+        .get(ENGINE_CACHE_KEY) != null
+    ) {
+      WorkManager.getInstance(binding.applicationContext)
+        .cancelUniqueWork(BackgroundWorkerApiImpl.BACKGROUND_WORKER_NAME)
+      FlutterEngineCache.getInstance().remove(ENGINE_CACHE_KEY)
    }
+    Log.i(TAG, "Flutter engine attached. Attached Engines count: $engineCount")
+  }

-    override fun lock() {
-        BackgroundWorkerPreferences(ctx).setLocked(true)
-        checkAndEnforceBackgroundLock(ctx)
-        Log.i(TAG, "Background worker is locked")
-    }
-
-    override fun unlock() {
-        BackgroundWorkerPreferences(ctx).setLocked(false)
-        Log.i(TAG, "Background worker is unlocked")
-    }
-
-    override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-        checkAndEnforceBackgroundLock(binding.applicationContext)
-        engineCount.incrementAndGet()
-        Log.i(TAG, "Flutter engine attached. Attached Engines count: $engineCount")
-    }
-
-    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-        engineCount.decrementAndGet()
-        Log.i(TAG, "Flutter engine detached. Attached Engines count: $engineCount")
-    }
+  override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+    engineCount.decrementAndGet()
+    Log.i(TAG, "Flutter engine detached. Attached Engines count: $engineCount")
+  }
 }
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorker.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorker.kt
@@ -76,7 +76,9 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :

    loader.ensureInitializationCompleteAsync(ctx, null, Handler(Looper.getMainLooper())) {
      engine = FlutterEngine(ctx)
-      FlutterEngineCache.getInstance().put(BackgroundWorkerApiImpl.ENGINE_CACHE_KEY, engine!!)
+      FlutterEngineCache.getInstance().remove(BackgroundEngineLock.ENGINE_CACHE_KEY);
+      FlutterEngineCache.getInstance()
+        .put(BackgroundEngineLock.ENGINE_CACHE_KEY, engine!!)

      // Register custom plugins
      MainActivity.registerPlugins(ctx, engine!!)
@@ -190,9 +192,9 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :
    isComplete = true
    engine?.destroy()
    engine = null
+    FlutterEngineCache.getInstance().remove(BackgroundEngineLock.ENGINE_CACHE_KEY);
    flutterApi = null
    notificationManager.cancel(NOTIFICATION_ID)
-    FlutterEngineCache.getInstance().remove(BackgroundWorkerApiImpl.ENGINE_CACHE_KEY)
    waitForForegroundPromotion()
    completionHandler.set(success)
  }
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorkerApiImpl.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorkerApiImpl.kt
@@ -1,6 +1,7 @@
 package app.alextran.immich.background

 import android.content.Context
+import android.content.SharedPreferences
 import android.provider.MediaStore
 import android.util.Log
 import androidx.work.BackoffPolicy
@@ -8,7 +9,6 @@ import androidx.work.Constraints
 import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkManager
-import io.flutter.embedding.engine.FlutterEngineCache
 import java.util.concurrent.TimeUnit

 private const val TAG = "BackgroundWorkerApiImpl"
@@ -34,10 +34,8 @@ class BackgroundWorkerApiImpl(context: Context) : BackgroundWorkerFgHostApi {
  }

  companion object {
-    private const val BACKGROUND_WORKER_NAME = "immich/BackgroundWorkerV1"
+    const val BACKGROUND_WORKER_NAME = "immich/BackgroundWorkerV1"
    private const val OBSERVER_WORKER_NAME = "immich/MediaObserverV1"
-    const val ENGINE_CACHE_KEY = "immich::background_worker::engine"
-

    fun enqueueMediaObserver(ctx: Context) {
      val settings = BackgroundWorkerPreferences(ctx).getSettings()
@@ -75,18 +73,35 @@ class BackgroundWorkerApiImpl(context: Context) : BackgroundWorkerFgHostApi {

      Log.i(TAG, "Enqueued background worker with name: $BACKGROUND_WORKER_NAME")
    }
-
-    fun isBackgroundWorkerRunning(): Boolean {
-      // Easier to check if the engine is cached as we always cache the engine when starting the worker
-      // and remove it when the worker is finished
-      return FlutterEngineCache.getInstance().get(ENGINE_CACHE_KEY) != null
-    }
-
-    fun cancelBackgroundWorker(ctx: Context) {
-      WorkManager.getInstance(ctx).cancelUniqueWork(BACKGROUND_WORKER_NAME)
-      FlutterEngineCache.getInstance().remove(ENGINE_CACHE_KEY)
-
-      Log.i(TAG, "Cancelled background upload task")
-    }
+  }
+}
+
+private class BackgroundWorkerPreferences(private val ctx: Context) {
+  companion object {
+    private const val SHARED_PREF_NAME = "Immich::BackgroundWorker"
+    private const val SHARED_PREF_MIN_DELAY_KEY = "BackgroundWorker::minDelaySeconds"
+    private const val SHARED_PREF_REQUIRE_CHARGING_KEY = "BackgroundWorker::requireCharging"
+
+    private const val DEFAULT_MIN_DELAY_SECONDS = 30L
+    private const val DEFAULT_REQUIRE_CHARGING = false
+  }
+
+  private val sp: SharedPreferences by lazy {
+    ctx.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
+  }
+
+  fun updateSettings(settings: BackgroundWorkerSettings) {
+    sp.edit().apply {
+      putLong(SHARED_PREF_MIN_DELAY_KEY, settings.minimumDelaySeconds)
+      putBoolean(SHARED_PREF_REQUIRE_CHARGING_KEY, settings.requiresCharging)
+      apply()
+    }
+  }
+
+  fun getSettings(): BackgroundWorkerSettings {
+    return BackgroundWorkerSettings(
+      minimumDelaySeconds = sp.getLong(SHARED_PREF_MIN_DELAY_KEY, DEFAULT_MIN_DELAY_SECONDS),
+      requiresCharging = sp.getBoolean(SHARED_PREF_REQUIRE_CHARGING_KEY, DEFAULT_REQUIRE_CHARGING),
+    )
  }
 }
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorkerLock.g.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorkerLock.g.kt
@@ -1,95 +0,0 @@
-// Autogenerated from Pigeon (v26.0.0), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
-
-package app.alextran.immich.background
-
-import android.util.Log
-import io.flutter.plugin.common.BasicMessageChannel
-import io.flutter.plugin.common.BinaryMessenger
-import io.flutter.plugin.common.EventChannel
-import io.flutter.plugin.common.MessageCodec
-import io.flutter.plugin.common.StandardMethodCodec
-import io.flutter.plugin.common.StandardMessageCodec
-import java.io.ByteArrayOutputStream
-import java.nio.ByteBuffer
-private object BackgroundWorkerLockPigeonUtils {
-
-  fun wrapResult(result: Any?): List<Any?> {
-    return listOf(result)
-  }
-
-  fun wrapError(exception: Throwable): List<Any?> {
-    return if (exception is FlutterError) {
-      listOf(
-        exception.code,
-        exception.message,
-        exception.details
-      )
-    } else {
-      listOf(
-        exception.javaClass.simpleName,
-        exception.toString(),
-        "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
-      )
-    }
-  }
-}
-private open class BackgroundWorkerLockPigeonCodec : StandardMessageCodec() {
-  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
-    return     super.readValueOfType(type, buffer)
-  }
-  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
-    super.writeValue(stream, value)
-  }
-}
-
-/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-interface BackgroundWorkerLockApi {
-  fun lock()
-  fun unlock()
-
-  companion object {
-    /** The codec used by BackgroundWorkerLockApi. */
-    val codec: MessageCodec<Any?> by lazy {
-      BackgroundWorkerLockPigeonCodec()
-    }
-    /** Sets up an instance of `BackgroundWorkerLockApi` to handle messages through the `binaryMessenger`. */
-    @JvmOverloads
-    fun setUp(binaryMessenger: BinaryMessenger, api: BackgroundWorkerLockApi?, messageChannelSuffix: String = "") {
-      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.BackgroundWorkerLockApi.lock$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            val wrapped: List<Any?> = try {
-              api.lock()
-              listOf(null)
-            } catch (exception: Throwable) {
-              BackgroundWorkerLockPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.BackgroundWorkerLockApi.unlock$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            val wrapped: List<Any?> = try {
-              api.unlock()
-              listOf(null)
-            } catch (exception: Throwable) {
-              BackgroundWorkerLockPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-    }
-  }
-}
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorkerPreferences.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorkerPreferences.kt
@@ -1,49 +0,0 @@
-package app.alextran.immich.background
-
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.core.content.edit
-
-class BackgroundWorkerPreferences(private val ctx: Context) {
-    companion object {
-        const val SHARED_PREF_NAME = "Immich::BackgroundWorker"
-        private const val SHARED_PREF_MIN_DELAY_KEY = "BackgroundWorker::minDelaySeconds"
-        private const val SHARED_PREF_REQUIRE_CHARGING_KEY = "BackgroundWorker::requireCharging"
-        private const val SHARED_PREF_LOCK_KEY = "BackgroundWorker::isLocked"
-
-        private const val DEFAULT_MIN_DELAY_SECONDS = 30L
-        private const val DEFAULT_REQUIRE_CHARGING = false
-    }
-
-    private val sp: SharedPreferences by lazy {
-        ctx.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
-    }
-
-    fun updateSettings(settings: BackgroundWorkerSettings) {
-        sp.edit {
-            putLong(SHARED_PREF_MIN_DELAY_KEY, settings.minimumDelaySeconds)
-            putBoolean(SHARED_PREF_REQUIRE_CHARGING_KEY, settings.requiresCharging)
-        }
-    }
-
-    fun getSettings(): BackgroundWorkerSettings {
-        return BackgroundWorkerSettings(
-            minimumDelaySeconds = sp.getLong(SHARED_PREF_MIN_DELAY_KEY, DEFAULT_MIN_DELAY_SECONDS),
-            requiresCharging = sp.getBoolean(
-                SHARED_PREF_REQUIRE_CHARGING_KEY,
-                DEFAULT_REQUIRE_CHARGING
-            ),
-        )
-    }
-
-    fun setLocked(paused: Boolean) {
-        sp.edit {
-            putBoolean(SHARED_PREF_LOCK_KEY, paused)
-        }
-    }
-
-    fun isLocked(): Boolean {
-        return sp.getBoolean(SHARED_PREF_LOCK_KEY, true)
-    }
-}
-
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbnailsImpl.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbnailsImpl.kt
@@ -17,7 +17,6 @@ import java.util.concurrent.Executors
 import com.bumptech.glide.Glide
 import com.bumptech.glide.Priority
 import com.bumptech.glide.load.DecodeFormat
-import com.bumptech.glide.request.target.Target.SIZE_ORIGINAL
 import java.util.Base64
 import java.util.concurrent.CancellationException
 import java.util.concurrent.ConcurrentHashMap
@@ -121,14 +120,15 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {
    signal: CancellationSignal
  ) {
    signal.throwIfCanceled()
-    val size = Size(width.toInt(), height.toInt())
+    val targetWidth = width.toInt()
+    val targetHeight = height.toInt()
    val id = assetId.toLong()

    signal.throwIfCanceled()
    val bitmap = if (isVideo) {
-      decodeVideoThumbnail(id, size, signal)
+      decodeVideoThumbnail(id, targetWidth, targetHeight, signal)
    } else {
-      decodeImage(id, size, signal)
+      decodeImage(id, targetWidth, targetHeight, signal)
    }

    processBitmap(bitmap, callback, signal)
@@ -151,7 +151,9 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {
      bitmap.recycle()
      signal.throwIfCanceled()
      val res = mapOf(
-        "pointer" to pointer, "width" to actualWidth.toLong(), "height" to actualHeight.toLong()
+        "pointer" to pointer,
+        "width" to actualWidth.toLong(),
+        "height" to actualHeight.toLong()
      )
      callback(Result.success(res))
    } catch (e: Exception) {
@@ -160,54 +162,55 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {
    }
  }

-  private fun decodeImage(id: Long, size: Size, signal: CancellationSignal): Bitmap {
+  private fun decodeImage(
+    id: Long, targetWidth: Int, targetHeight: Int, signal: CancellationSignal
+  ): Bitmap {
    signal.throwIfCanceled()
    val uri = ContentUris.withAppendedId(Images.Media.EXTERNAL_CONTENT_URI, id)
-    if (size.width <= 0 || size.height <= 0 || size.width > 768 || size.height > 768) {
-      return decodeSource(uri, size, signal)
+    if (targetHeight > 768 || targetWidth > 768) {
+      return decodeSource(uri, targetWidth, targetHeight, signal)
    }

    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      resolver.loadThumbnail(uri, size, signal)
+      resolver.loadThumbnail(uri, Size(targetWidth, targetHeight), signal)
    } else {
      signal.setOnCancelListener { Images.Thumbnails.cancelThumbnailRequest(resolver, id) }
      Images.Thumbnails.getThumbnail(resolver, id, Images.Thumbnails.MINI_KIND, OPTIONS)
    }
  }

-  private fun decodeVideoThumbnail(id: Long, target: Size, signal: CancellationSignal): Bitmap {
+  private fun decodeVideoThumbnail(
+    id: Long, targetWidth: Int, targetHeight: Int, signal: CancellationSignal
+  ): Bitmap {
    signal.throwIfCanceled()
    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
      val uri = ContentUris.withAppendedId(Video.Media.EXTERNAL_CONTENT_URI, id)
-      // ensure a valid resolution as the thumbnail is used for videos even when no scaling is needed
-      val size = if (target.width > 0 && target.height > 0) target else Size(768, 768)
-      resolver.loadThumbnail(uri, size, signal)
+      resolver.loadThumbnail(uri, Size(targetWidth, targetHeight), signal)
    } else {
      signal.setOnCancelListener { Video.Thumbnails.cancelThumbnailRequest(resolver, id) }
      Video.Thumbnails.getThumbnail(resolver, id, Video.Thumbnails.MINI_KIND, OPTIONS)
    }
  }

-  private fun decodeSource(uri: Uri, target: Size, signal: CancellationSignal): Bitmap {
+  private fun decodeSource(
+    uri: Uri, targetWidth: Int, targetHeight: Int, signal: CancellationSignal
+  ): Bitmap {
    signal.throwIfCanceled()
    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
      val source = ImageDecoder.createSource(resolver, uri)
      signal.throwIfCanceled()
      ImageDecoder.decodeBitmap(source) { decoder, info, _ ->
-        if (target.width > 0 && target.height > 0) {
-          val sample = max(1, min(info.size.width / target.width, info.size.height / target.height))
+        if (targetWidth > 0 && targetHeight > 0) {
+          val sample = max(1, min(info.size.width / targetWidth, info.size.height / targetHeight))
          decoder.setTargetSampleSize(sample)
        }
        decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
        decoder.setTargetColorSpace(ColorSpace.get(ColorSpace.Named.SRGB))
      }
    } else {
-      val ref =
-        Glide.with(ctx).asBitmap().priority(Priority.IMMEDIATE).load(uri).disallowHardwareConfig()
-          .format(DecodeFormat.PREFER_ARGB_8888).submit(
-            if (target.width > 0) target.width else SIZE_ORIGINAL,
-            if (target.height > 0) target.height else SIZE_ORIGINAL,
-          )
+      val ref = Glide.with(ctx).asBitmap().priority(Priority.IMMEDIATE).load(uri)
+        .disallowHardwareConfig().format(DecodeFormat.PREFER_ARGB_8888)
+        .submit(targetWidth, targetHeight)
      signal.setOnCancelListener { Glide.with(ctx).clear(ref) }
      ref.get()
    }
--- a/mobile/android/fastlane/Fastfile
+++ b/mobile/android/fastlane/Fastfile
@@ -35,8 +35,8 @@ platform :android do
      task: 'bundle', 
      build_type: 'Release',
      properties: {
-        "android.injected.version.code" => 3016,
-        "android.injected.version.name" => "1.143.0",
+        "android.injected.version.code" => 3015,
+        "android.injected.version.name" => "1.142.1",
      }
    )
    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')
--- a/mobile/drift_schemas/main/drift_schema_v11.json
+++ b/mobile/drift_schemas/main/drift_schema_v11.json
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 77;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -133,8 +133,6 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -521,10 +519,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -553,10 +555,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -22,7 +22,7 @@ platform :ios do
      path: "./Runner.xcodeproj",
    )
    increment_version_number(
-      version_number: "1.143.0"
+      version_number: "1.142.1"
    )
    increment_build_number(
      build_number: latest_testflight_build_number + 1,
--- a/mobile/lib/domain/services/background_worker.service.dart
+++ b/mobile/lib/domain/services/background_worker.service.dart
@@ -10,13 +10,11 @@ import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/network_capability_extensions.dart';
-import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/generated/intl_keys.g.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
-import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
@@ -60,7 +58,7 @@ class BackgroundWorkerFgService {
 }

 class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
-  ProviderContainer? _ref;
+  late final ProviderContainer _ref;
  final Isar _isar;
  final Drift _drift;
  final DriftLogger _driftLogger;
@@ -85,31 +83,29 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
    BackgroundWorkerFlutterApi.setUp(this);
  }

-  bool get _isBackupEnabled => _ref?.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup) ?? false;
+  bool get _isBackupEnabled => _ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);

  Future<void> init() async {
    try {
      HttpSSLOptions.apply(applyNative: false);

-      await Future.wait(
-        [
-          loadTranslations(),
-          workerManager.init(dynamicSpawning: true),
-          _ref?.read(authServiceProvider).setOpenApiServiceEndpoint(),
-          // Initialize the file downloader
-          FileDownloader().configure(
-            globalConfig: [
-              // maxConcurrent: 6, maxConcurrentByHost(server):6, maxConcurrentByGroup: 3
-              (Config.holdingQueue, (6, 6, 3)),
-              // On Android, if files are larger than 256MB, run in foreground service
-              (Config.runInForegroundIfFileLargerThan, 256),
-            ],
-          ),
-          FileDownloader().trackTasksInGroup(kDownloadGroupLivePhoto, markDownloadedComplete: false),
-          FileDownloader().trackTasks(),
-          _ref?.read(fileMediaRepositoryProvider).enableBackgroundAccess(),
-        ].nonNulls,
-      );
+      await Future.wait([
+        loadTranslations(),
+        workerManager.init(dynamicSpawning: true),
+        _ref.read(authServiceProvider).setOpenApiServiceEndpoint(),
+        // Initialize the file downloader
+        FileDownloader().configure(
+          globalConfig: [
+            // maxConcurrent: 6, maxConcurrentByHost(server):6, maxConcurrentByGroup: 3
+            (Config.holdingQueue, (6, 6, 3)),
+            // On Android, if files are larger than 256MB, run in foreground service
+            (Config.runInForegroundIfFileLargerThan, 256),
+          ],
+        ),
+        FileDownloader().trackTasksInGroup(kDownloadGroupLivePhoto, markDownloadedComplete: false),
+        FileDownloader().trackTasks(),
+        _ref.read(fileMediaRepositoryProvider).enableBackgroundAccess(),
+      ]);

      configureFileDownloaderNotifications();

@@ -182,17 +178,15 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
  }

  Future<void> _cleanup() async {
-    // If ref is null, it means the service was never initialized properly
-    if (_isCleanedUp || _ref == null) {
+    if (_isCleanedUp) {
      return;
    }

    try {
+      final backgroundSyncManager = _ref.read(backgroundSyncProvider);
+      final nativeSyncApi = _ref.read(nativeSyncApiProvider);
      _isCleanedUp = true;
-      final backgroundSyncManager = _ref?.read(backgroundSyncProvider);
-      final nativeSyncApi = _ref?.read(nativeSyncApiProvider);
-      _ref?.dispose();
-      _ref = null;
+      _ref.dispose();

      _cancellationToken.cancel();
      _logger.info("Cleaning up background worker");
@@ -205,14 +199,14 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
        Store.dispose(),
        _drift.close(),
        _driftLogger.close(),
-        backgroundSyncManager?.cancel(),
-        nativeSyncApi?.cancelHashing(),
+        backgroundSyncManager.cancel(),
+        nativeSyncApi.cancelHashing(),
      ];

      if (_isar.isOpen) {
        cleanupFutures.add(_isar.close());
      }
-      await Future.wait(cleanupFutures.nonNulls);
+      await Future.wait(cleanupFutures);
      _logger.info("Background worker resources cleaned up");
    } catch (error, stack) {
      dPrint(() => 'Failed to cleanup background worker: $error with stack: $stack');
@@ -222,18 +216,14 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
  Future<void> _handleBackup() async {
    await runZonedGuarded(
      () async {
-        if (_isCleanedUp) {
-          return;
-        }
-
-        if (!_isBackupEnabled) {
+        if (!_isBackupEnabled || _isCleanedUp) {
          _logger.info("[_handleBackup 1] Backup is disabled. Skipping backup routine");
          return;
        }

        _logger.info("[_handleBackup 2] Enqueuing assets for backup from the background service");

-        final currentUser = _ref?.read(currentUserProvider);
+        final currentUser = _ref.read(currentUserProvider);
        if (currentUser == null) {
          _logger.warning("[_handleBackup 3] No current user found. Skipping backup from background");
          return;
@@ -241,18 +231,19 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {

        _logger.info("[_handleBackup 4] Resume backup from background");
        if (Platform.isIOS) {
-          return _ref?.read(driftBackupProvider.notifier).handleBackupResume(currentUser.id);
+          return _ref.read(driftBackupProvider.notifier).handleBackupResume(currentUser.id);
        }

-        final canPing = await _ref?.read(serverInfoServiceProvider).ping() ?? false;
+        final canPing = await _ref.read(serverInfoServiceProvider).ping();
        if (!canPing) {
          _logger.warning("[_handleBackup 5] Server is not reachable. Skipping backup from background");
          return;
        }

-        final networkCapabilities = await _ref?.read(connectivityApiProvider).getCapabilities() ?? [];
+        final networkCapabilities = await _ref.read(connectivityApiProvider).getCapabilities();
+
        return _ref
-            ?.read(uploadServiceProvider)
+            .read(uploadServiceProvider)
            .startBackupWithHttpClient(currentUser.id, networkCapabilities.hasWifi, _cancellationToken);
      },
      (error, stack) {
@@ -262,18 +253,18 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
  }

  Future<void> _syncAssets({Duration? hashTimeout}) async {
-    await _ref?.read(backgroundSyncProvider).syncLocal();
+    await _ref.read(backgroundSyncProvider).syncLocal();
    if (_isCleanedUp) {
      return;
    }

-    await _ref?.read(backgroundSyncProvider).syncRemote();
+    await _ref.read(backgroundSyncProvider).syncRemote();
    if (_isCleanedUp) {
      return;
    }

-    var hashFuture = _ref?.read(backgroundSyncProvider).hashAssets();
-    if (hashTimeout != null && hashFuture != null) {
+    var hashFuture = _ref.read(backgroundSyncProvider).hashAssets();
+    if (hashTimeout != null) {
      hashFuture = hashFuture.timeout(
        hashTimeout,
        onTimeout: () {
@@ -286,23 +277,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
  }
 }

-class BackgroundWorkerLockService {
-  final BackgroundWorkerLockApi _hostApi;
-  const BackgroundWorkerLockService(this._hostApi);
-
-  Future<void> lock() async {
-    if (CurrentPlatform.isAndroid) {
-      return _hostApi.lock();
-    }
-  }
-
-  Future<void> unlock() async {
-    if (CurrentPlatform.isAndroid) {
-      return _hostApi.unlock();
-    }
-  }
-}
-
 /// Native entry invoked from the background worker. If renaming or moving this to a different
 /// library, make sure to update the entry points and URI in native workers as well
@pragma('vm:entry-point')
--- a/mobile/lib/domain/services/sync_linked_album.service.dart
+++ b/mobile/lib/domain/services/sync_linked_album.service.dart
@@ -4,8 +4,8 @@ import 'package:immich_mobile/infrastructure/repositories/local_album.repository
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
-import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:logging/logging.dart';
+import 'package:immich_mobile/utils/debug_print.dart';

 final syncLinkedAlbumServiceProvider = Provider(
  (ref) => SyncLinkedAlbumService(
@@ -31,19 +31,17 @@ class SyncLinkedAlbumService {
      selectedAlbums.map((localAlbum) async {
        final linkedRemoteAlbumId = localAlbum.linkedRemoteAlbumId;
        if (linkedRemoteAlbumId == null) {
-          _log.warning("No linked remote album ID found for local album: ${localAlbum.name}");
          return;
        }

        final remoteAlbum = await _remoteAlbumRepository.get(linkedRemoteAlbumId);
        if (remoteAlbum == null) {
-          _log.warning("Linked remote album not found for ID: $linkedRemoteAlbumId");
          return;
        }

        // get assets that are uploaded but not in the remote album
        final assetIds = await _remoteAlbumRepository.getLinkedAssetIds(userId, localAlbum.id, linkedRemoteAlbumId);
-        _log.fine("Syncing ${assetIds.length} assets to remote album: ${remoteAlbum.name}");
+
        if (assetIds.isNotEmpty) {
          final album = await _albumApiRepository.addAssets(remoteAlbum.id, assetIds);
          await _remoteAlbumRepository.addAssets(remoteAlbum.id, album.added);
--- a/mobile/lib/domain/utils/sync_linked_album.dart
+++ b/mobile/lib/domain/utils/sync_linked_album.dart
@@ -2,12 +2,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:logging/logging.dart';

 Future<void> syncLinkedAlbumsIsolated(ProviderContainer ref) {
  final user = Store.tryGet(StoreKey.currentUser);
  if (user == null) {
-    Logger("SyncLinkedAlbum").warning("No user logged in, skipping linked album sync");
    return Future.value();
  }
  return ref.read(syncLinkedAlbumServiceProvider).syncLinkedAlbums(user.id);
--- a/mobile/lib/infrastructure/entities/local_album_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_album_asset.entity.dart
@@ -10,9 +10,6 @@ class LocalAlbumAssetEntity extends Table with DriftDefaultsMixin {

  TextColumn get albumId => text().references(LocalAlbumEntity, #id, onDelete: KeyAction.cascade)();

-  // Used for mark & sweep
-  BoolColumn get marker_ => boolean().nullable()();
-
  @override
  Set<Column> get primaryKey => {assetId, albumId};
 }
--- a/mobile/lib/infrastructure/entities/local_album_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/local_album_asset.entity.drift.dart
@@ -15,13 +15,11 @@ typedef $$LocalAlbumAssetEntityTableCreateCompanionBuilder =
    i1.LocalAlbumAssetEntityCompanion Function({
      required String assetId,
      required String albumId,
-      i0.Value<bool?> marker_,
    });
 typedef $$LocalAlbumAssetEntityTableUpdateCompanionBuilder =
    i1.LocalAlbumAssetEntityCompanion Function({
      i0.Value<String> assetId,
      i0.Value<String> albumId,
-      i0.Value<bool?> marker_,
    });

 final class $$LocalAlbumAssetEntityTableReferences
@@ -115,11 +113,6 @@ class $$LocalAlbumAssetEntityTableFilterComposer
    super.$addJoinBuilderToRootComposer,
    super.$removeJoinBuilderFromRootComposer,
  });
-  i0.ColumnFilters<bool> get marker_ => $composableBuilder(
-    column: $table.marker_,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
  i3.$$LocalAssetEntityTableFilterComposer get assetId {
    final i3.$$LocalAssetEntityTableFilterComposer composer = $composerBuilder(
      composer: this,
@@ -184,11 +177,6 @@ class $$LocalAlbumAssetEntityTableOrderingComposer
    super.$addJoinBuilderToRootComposer,
    super.$removeJoinBuilderFromRootComposer,
  });
-  i0.ColumnOrderings<bool> get marker_ => $composableBuilder(
-    column: $table.marker_,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
  i3.$$LocalAssetEntityTableOrderingComposer get assetId {
    final i3.$$LocalAssetEntityTableOrderingComposer composer =
        $composerBuilder(
@@ -255,9 +243,6 @@ class $$LocalAlbumAssetEntityTableAnnotationComposer
    super.$addJoinBuilderToRootComposer,
    super.$removeJoinBuilderFromRootComposer,
  });
-  i0.GeneratedColumn<bool> get marker_ =>
-      $composableBuilder(column: $table.marker_, builder: (column) => column);
-
  i3.$$LocalAssetEntityTableAnnotationComposer get assetId {
    final i3.$$LocalAssetEntityTableAnnotationComposer composer =
        $composerBuilder(
@@ -359,22 +344,16 @@ class $$LocalAlbumAssetEntityTableTableManager
              ({
                i0.Value<String> assetId = const i0.Value.absent(),
                i0.Value<String> albumId = const i0.Value.absent(),
-                i0.Value<bool?> marker_ = const i0.Value.absent(),
              }) => i1.LocalAlbumAssetEntityCompanion(
                assetId: assetId,
                albumId: albumId,
-                marker_: marker_,
              ),
          createCompanionCallback:
-              ({
-                required String assetId,
-                required String albumId,
-                i0.Value<bool?> marker_ = const i0.Value.absent(),
-              }) => i1.LocalAlbumAssetEntityCompanion.insert(
-                assetId: assetId,
-                albumId: albumId,
-                marker_: marker_,
-              ),
+              ({required String assetId, required String albumId}) =>
+                  i1.LocalAlbumAssetEntityCompanion.insert(
+                    assetId: assetId,
+                    albumId: albumId,
+                  ),
          withReferenceMapper: (p0) => p0
              .map(
                (e) => (
@@ -498,22 +477,8 @@ class $LocalAlbumAssetEntityTable extends i2.LocalAlbumAssetEntity
      'REFERENCES local_album_entity (id) ON DELETE CASCADE',
    ),
  );
-  static const i0.VerificationMeta _marker_Meta = const i0.VerificationMeta(
-    'marker_',
-  );
  @override
-  late final i0.GeneratedColumn<bool> marker_ = i0.GeneratedColumn<bool>(
-    'marker',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.bool,
-    requiredDuringInsert: false,
-    defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-      'CHECK ("marker" IN (0, 1))',
-    ),
-  );
-  @override
-  List<i0.GeneratedColumn> get $columns => [assetId, albumId, marker_];
+  List<i0.GeneratedColumn> get $columns => [assetId, albumId];
  @override
  String get aliasedName => _alias ?? actualTableName;
  @override
@@ -542,12 +507,6 @@ class $LocalAlbumAssetEntityTable extends i2.LocalAlbumAssetEntity
    } else if (isInserting) {
      context.missing(_albumIdMeta);
    }
-    if (data.containsKey('marker')) {
-      context.handle(
-        _marker_Meta,
-        marker_.isAcceptableOrUnknown(data['marker']!, _marker_Meta),
-      );
-    }
    return context;
  }

@@ -568,10 +527,6 @@ class $LocalAlbumAssetEntityTable extends i2.LocalAlbumAssetEntity
        i0.DriftSqlType.string,
        data['${effectivePrefix}album_id'],
      )!,
-      marker_: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.bool,
-        data['${effectivePrefix}marker'],
-      ),
    );
  }

@@ -590,20 +545,15 @@ class LocalAlbumAssetEntityData extends i0.DataClass
    implements i0.Insertable<i1.LocalAlbumAssetEntityData> {
  final String assetId;
  final String albumId;
-  final bool? marker_;
  const LocalAlbumAssetEntityData({
    required this.assetId,
    required this.albumId,
-    this.marker_,
  });
  @override
  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
    final map = <String, i0.Expression>{};
    map['asset_id'] = i0.Variable<String>(assetId);
    map['album_id'] = i0.Variable<String>(albumId);
-    if (!nullToAbsent || marker_ != null) {
-      map['marker'] = i0.Variable<bool>(marker_);
-    }
    return map;
  }

@@ -615,7 +565,6 @@ class LocalAlbumAssetEntityData extends i0.DataClass
    return LocalAlbumAssetEntityData(
      assetId: serializer.fromJson<String>(json['assetId']),
      albumId: serializer.fromJson<String>(json['albumId']),
-      marker_: serializer.fromJson<bool?>(json['marker_']),
    );
  }
  @override
@@ -624,26 +573,20 @@ class LocalAlbumAssetEntityData extends i0.DataClass
    return <String, dynamic>{
      'assetId': serializer.toJson<String>(assetId),
      'albumId': serializer.toJson<String>(albumId),
-      'marker_': serializer.toJson<bool?>(marker_),
    };
  }

-  i1.LocalAlbumAssetEntityData copyWith({
-    String? assetId,
-    String? albumId,
-    i0.Value<bool?> marker_ = const i0.Value.absent(),
-  }) => i1.LocalAlbumAssetEntityData(
-    assetId: assetId ?? this.assetId,
-    albumId: albumId ?? this.albumId,
-    marker_: marker_.present ? marker_.value : this.marker_,
-  );
+  i1.LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
+      i1.LocalAlbumAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        albumId: albumId ?? this.albumId,
+      );
  LocalAlbumAssetEntityData copyWithCompanion(
    i1.LocalAlbumAssetEntityCompanion data,
  ) {
    return LocalAlbumAssetEntityData(
      assetId: data.assetId.present ? data.assetId.value : this.assetId,
      albumId: data.albumId.present ? data.albumId.value : this.albumId,
-      marker_: data.marker_.present ? data.marker_.value : this.marker_,
    );
  }

@@ -651,60 +594,51 @@ class LocalAlbumAssetEntityData extends i0.DataClass
  String toString() {
    return (StringBuffer('LocalAlbumAssetEntityData(')
          ..write('assetId: $assetId, ')
-          ..write('albumId: $albumId, ')
-          ..write('marker_: $marker_')
+          ..write('albumId: $albumId')
          ..write(')'))
        .toString();
  }

  @override
-  int get hashCode => Object.hash(assetId, albumId, marker_);
+  int get hashCode => Object.hash(assetId, albumId);
  @override
  bool operator ==(Object other) =>
      identical(this, other) ||
      (other is i1.LocalAlbumAssetEntityData &&
          other.assetId == this.assetId &&
-          other.albumId == this.albumId &&
-          other.marker_ == this.marker_);
+          other.albumId == this.albumId);
 }

 class LocalAlbumAssetEntityCompanion
    extends i0.UpdateCompanion<i1.LocalAlbumAssetEntityData> {
  final i0.Value<String> assetId;
  final i0.Value<String> albumId;
-  final i0.Value<bool?> marker_;
  const LocalAlbumAssetEntityCompanion({
    this.assetId = const i0.Value.absent(),
    this.albumId = const i0.Value.absent(),
-    this.marker_ = const i0.Value.absent(),
  });
  LocalAlbumAssetEntityCompanion.insert({
    required String assetId,
    required String albumId,
-    this.marker_ = const i0.Value.absent(),
  }) : assetId = i0.Value(assetId),
       albumId = i0.Value(albumId);
  static i0.Insertable<i1.LocalAlbumAssetEntityData> custom({
    i0.Expression<String>? assetId,
    i0.Expression<String>? albumId,
-    i0.Expression<bool>? marker_,
  }) {
    return i0.RawValuesInsertable({
      if (assetId != null) 'asset_id': assetId,
      if (albumId != null) 'album_id': albumId,
-      if (marker_ != null) 'marker': marker_,
    });
  }

  i1.LocalAlbumAssetEntityCompanion copyWith({
    i0.Value<String>? assetId,
    i0.Value<String>? albumId,
-    i0.Value<bool?>? marker_,
  }) {
    return i1.LocalAlbumAssetEntityCompanion(
      assetId: assetId ?? this.assetId,
      albumId: albumId ?? this.albumId,
-      marker_: marker_ ?? this.marker_,
    );
  }

@@ -717,9 +651,6 @@ class LocalAlbumAssetEntityCompanion
    if (albumId.present) {
      map['album_id'] = i0.Variable<String>(albumId.value);
    }
-    if (marker_.present) {
-      map['marker'] = i0.Variable<bool>(marker_.value);
-    }
    return map;
  }

@@ -727,8 +658,7 @@ class LocalAlbumAssetEntityCompanion
  String toString() {
    return (StringBuffer('LocalAlbumAssetEntityCompanion(')
          ..write('assetId: $assetId, ')
-          ..write('albumId: $albumId, ')
-          ..write('marker_: $marker_')
+          ..write('albumId: $albumId')
          ..write(')'))
        .toString();
  }
--- a/mobile/lib/infrastructure/repositories/backup.repository.dart
+++ b/mobile/lib/infrastructure/repositories/backup.repository.dart
@@ -29,56 +29,82 @@ class DriftBackupRepository extends DriftDatabaseRepository {
      ..where(_db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.excluded));
  }

-  /// Returns all backup-related counts in a single query.
-  ///
-  /// - total:     number of distinct assets in selected albums, excluding those that are also in excluded albums
-  /// - backup:    number of those assets that already exist on the server for [userId]
-  /// - remainder: number of those assets that do not yet exist on the server for [userId]
-  ///              (includes processing)
-  /// - processing: number of those assets that are still preparing/have a null checksum
-  Future<({int total, int remainder, int processing})> getAllCounts(String userId) async {
-    const sql = '''
-        SELECT
-        COUNT(*) AS total_count,
-        COUNT(*) FILTER (WHERE lae.checksum IS NULL) AS processing_count,
-        COUNT(*) FILTER (WHERE rae.id IS NULL) AS remainder_count
-        FROM local_asset_entity lae
-        LEFT JOIN main.remote_asset_entity rae
-            ON lae.checksum = rae.checksum AND rae.owner_id = ?1
-        WHERE EXISTS (
-            SELECT 1
-            FROM local_album_asset_entity laa
-            INNER JOIN main.local_album_entity la on laa.album_id = la.id
-            WHERE laa.asset_id = lae.id
-                AND la.backup_selection = ?2
-        )
-        AND NOT EXISTS (
-            SELECT 1
-            FROM local_album_asset_entity laa
-            INNER JOIN main.local_album_entity la on laa.album_id = la.id
-            WHERE laa.asset_id = lae.id
-                AND la.backup_selection = ?3
-        );
-      ''';
+  Future<int> getTotalCount() async {
+    final query = _db.localAlbumAssetEntity.selectOnly(distinct: true)
+      ..addColumns([_db.localAlbumAssetEntity.assetId])
+      ..join([
+        innerJoin(
+          _db.localAlbumEntity,
+          _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
+          useColumns: false,
+        ),
+      ])
+      ..where(
+        _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
+            _db.localAlbumAssetEntity.assetId.isNotInQuery(_getExcludedSubquery()),
+      );

-    final row = await _db
-        .customSelect(
-          sql,
-          variables: [
-            Variable.withString(userId),
-            Variable.withInt(BackupSelection.selected.index),
-            Variable.withInt(BackupSelection.excluded.index),
-          ],
-          readsFrom: {_db.localAlbumAssetEntity, _db.localAlbumEntity, _db.localAssetEntity, _db.remoteAssetEntity},
-        )
-        .getSingle();
+    return query.get().then((rows) => rows.length);
+  }

-    final data = row.data;
-    return (
-      total: (data['total_count'] as int?) ?? 0,
-      remainder: (data['remainder_count'] as int?) ?? 0,
-      processing: (data['processing_count'] as int?) ?? 0,
-    );
+  Future<int> getRemainderCount(String userId) async {
+    final query = _db.localAlbumAssetEntity.selectOnly(distinct: true)
+      ..addColumns([_db.localAlbumAssetEntity.assetId])
+      ..join([
+        innerJoin(
+          _db.localAlbumEntity,
+          _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
+          useColumns: false,
+        ),
+        innerJoin(
+          _db.localAssetEntity,
+          _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
+          useColumns: false,
+        ),
+        leftOuterJoin(
+          _db.remoteAssetEntity,
+          _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum) &
+              _db.remoteAssetEntity.ownerId.equals(userId),
+          useColumns: false,
+        ),
+      ])
+      ..where(
+        _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
+            _db.remoteAssetEntity.id.isNull() &
+            _db.localAlbumAssetEntity.assetId.isNotInQuery(_getExcludedSubquery()),
+      );
+
+    return query.get().then((rows) => rows.length);
+  }
+
+  Future<int> getBackupCount(String userId) async {
+    final query = _db.localAlbumAssetEntity.selectOnly(distinct: true)
+      ..addColumns([_db.localAlbumAssetEntity.assetId])
+      ..join([
+        innerJoin(
+          _db.localAlbumEntity,
+          _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
+          useColumns: false,
+        ),
+        innerJoin(
+          _db.localAssetEntity,
+          _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
+          useColumns: false,
+        ),
+        innerJoin(
+          _db.remoteAssetEntity,
+          _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
+          useColumns: false,
+        ),
+      ])
+      ..where(
+        _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
+            _db.remoteAssetEntity.id.isNotNull() &
+            _db.remoteAssetEntity.ownerId.equals(userId) &
+            _db.localAlbumAssetEntity.assetId.isNotInQuery(_getExcludedSubquery()),
+      );
+
+    return query.get().then((rows) => rows.length);
  }

  Future<List<LocalAsset>> getCandidates(String userId) async {
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -93,7 +93,7 @@ class Drift extends $Drift implements IDatabaseRepository {
  }

  @override
-  int get schemaVersion => 11;
+  int get schemaVersion => 10;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -156,9 +156,6 @@ class Drift extends $Drift implements IDatabaseRepository {
            await m.addColumn(v10.userEntity, v10.userEntity.avatarColor);
            await m.alterTable(TableMigration(v10.userEntity));
          },
-          from10To11: (m, v11) async {
-            await m.addColumn(v11.localAlbumAssetEntity, v11.localAlbumAssetEntity.marker_);
-          },
        ),
      );

--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -4270,395 +4270,6 @@ i1.GeneratedColumn<String> _column_94(String aliasedName) =>
      true,
      type: i1.DriftSqlType.string,
    );
-
-final class Schema11 extends i0.VersionedSchema {
-  Schema11({required super.database}) : super(version: 11);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAssetChecksum,
-    idxRemoteAssetOwnerChecksum,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    idxLatLng,
-  ];
-  late final Shape20 userEntity = Shape20(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_84,
-        _column_85,
-        _column_91,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape17 remoteAssetEntity = Shape17(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_13,
-        _column_14,
-        _column_15,
-        _column_16,
-        _column_17,
-        _column_18,
-        _column_19,
-        _column_20,
-        _column_21,
-        _column_86,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape3 stackEntity = Shape3(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape2 localAssetEntity = Shape2(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_22,
-        _column_14,
-        _column_23,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape9 remoteAlbumEntity = Shape9(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_56,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_57,
-        _column_58,
-        _column_59,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape19 localAlbumEntity = Shape19(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_5,
-        _column_31,
-        _column_32,
-        _column_90,
-        _column_33,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape22 localAlbumAssetEntity = Shape22(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_34, _column_35, _column_33],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  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 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)',
-  );
-  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)',
-  );
-  late final Shape21 authUserEntity = Shape21(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_2,
-        _column_84,
-        _column_85,
-        _column_92,
-        _column_93,
-        _column_7,
-        _column_94,
-      ],
-      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_25, _column_26, _column_27],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape5 partnerEntity = Shape5(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_28, _column_29, _column_30],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape8 remoteExifEntity = Shape8(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_36,
-        _column_37,
-        _column_38,
-        _column_39,
-        _column_40,
-        _column_41,
-        _column_11,
-        _column_10,
-        _column_42,
-        _column_43,
-        _column_44,
-        _column_45,
-        _column_46,
-        _column_47,
-        _column_48,
-        _column_49,
-        _column_50,
-        _column_51,
-        _column_52,
-        _column_53,
-        _column_54,
-        _column_55,
-      ],
-      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_36, _column_60],
-      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_60, _column_25, _column_61],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape11 memoryEntity = Shape11(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_18,
-        _column_15,
-        _column_8,
-        _column_62,
-        _column_63,
-        _column_64,
-        _column_65,
-        _column_66,
-        _column_67,
-      ],
-      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_36, _column_68],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape14 personEntity = Shape14(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_1,
-        _column_69,
-        _column_71,
-        _column_72,
-        _column_73,
-        _column_74,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape15 assetFaceEntity = Shape15(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_36,
-        _column_76,
-        _column_77,
-        _column_78,
-        _column_79,
-        _column_80,
-        _column_81,
-        _column_82,
-        _column_83,
-      ],
-      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_87, _column_88, _column_89],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-}
-
-class Shape22 extends i0.VersionedTable {
-  Shape22({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get assetId =>
-      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get albumId =>
-      columnsByName['album_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get marker_ =>
-      columnsByName['marker']! as i1.GeneratedColumn<bool>;
-}
-
 i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
  required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -4669,7 +4280,6 @@ i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
  required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
  required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
-  required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
 }) {
  return (currentVersion, database) async {
    switch (currentVersion) {
@@ -4718,11 +4328,6 @@ i0.MigrationStepWithVersion migrationSteps({
        final migrator = i1.Migrator(database, schema);
        await from9To10(migrator, schema);
        return 10;
-      case 10:
-        final schema = Schema11(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from10To11(migrator, schema);
-        return 11;
      default:
        throw ArgumentError.value('Unknown migration from $currentVersion');
    }
@@ -4739,7 +4344,6 @@ i1.OnUpgrade stepByStep({
  required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
  required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
  required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
-  required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
 }) => i0.VersionedSchema.stepByStepHelper(
  step: migrationSteps(
    from1To2: from1To2,
@@ -4751,6 +4355,5 @@ i1.OnUpgrade stepByStep({
    from7To8: from7To8,
    from8To9: from8To9,
    from9To10: from9To10,
-    from10To11: from10To11,
  ),
 );
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -72,33 +72,17 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
      return Future.value();
    }

-    return _db.transaction(() async {
-      await _db.managers.localAlbumAssetEntity
-          .filter((row) => row.albumId.id.equals(albumId))
-          .update((album) => album(marker_: const Value(true)));
-
-      await _db.batch((batch) {
-        for (final assetId in assetIdsToKeep) {
-          batch.update(
-            _db.localAlbumAssetEntity,
-            const LocalAlbumAssetEntityCompanion(marker_: Value(null)),
-            where: (row) => row.assetId.equals(assetId) & row.albumId.equals(albumId),
-          );
-        }
-      });
-
-      final query = _db.localAssetEntity.delete()
-        ..where(
-          (row) => row.id.isInQuery(
-            _db.localAlbumAssetEntity.selectOnly()
-              ..addColumns([_db.localAlbumAssetEntity.assetId])
-              ..where(
-                _db.localAlbumAssetEntity.albumId.equals(albumId) & _db.localAlbumAssetEntity.marker_.isNotNull(),
-              ),
-          ),
-        );
-      await query.go();
+    final deleteSmt = _db.localAssetEntity.delete();
+    deleteSmt.where((localAsset) {
+      final subQuery = _db.localAlbumAssetEntity.selectOnly()
+        ..addColumns([_db.localAlbumAssetEntity.assetId])
+        ..join([innerJoin(_db.localAlbumEntity, _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id))]);
+      subQuery.where(
+        _db.localAlbumEntity.id.equals(albumId) & _db.localAlbumAssetEntity.assetId.isNotIn(assetIdsToKeep),
+      );
+      return localAsset.id.isInQuery(subQuery);
    });
+    await deleteSmt.go();
  }

  Future<void> upsert(
@@ -214,9 +198,10 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
      // List<String>
      await _db.batch((batch) async {
        assetAlbums.cast<String, List<Object?>>().forEach((assetId, albumIds) {
-          for (final albumId in albumIds.cast<String?>().nonNulls) {
-            batch.deleteWhere(_db.localAlbumAssetEntity, (f) => f.albumId.equals(albumId) & f.assetId.equals(assetId));
-          }
+          batch.deleteWhere(
+            _db.localAlbumAssetEntity,
+            (f) => f.albumId.isNotIn(albumIds.cast<String?>().nonNulls) & f.assetId.equals(assetId),
+          );
        });
      });
      await _db.batch((batch) async {
@@ -303,14 +288,12 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {

    return transaction(() async {
      if (assetsToUnLink.isNotEmpty) {
-        await _db.batch((batch) {
-          for (final assetId in assetsToUnLink) {
-            batch.deleteWhere(
-              _db.localAlbumAssetEntity,
-              (row) => row.assetId.equals(assetId) & row.albumId.equals(albumId),
-            );
-          }
-        });
+        await _db.batch(
+          (batch) => batch.deleteWhere(
+            _db.localAlbumAssetEntity,
+            (f) => f.assetId.isIn(assetsToUnLink) & f.albumId.equals(albumId),
+          ),
+        );
      }

      await _deleteAssets(assetsToDelete);
@@ -337,9 +320,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
    }

    return _db.batch((batch) {
-      for (final id in ids) {
-        batch.deleteWhere(_db.localAssetEntity, (row) => row.id.equals(id));
-      }
+      batch.deleteWhere(_db.localAssetEntity, (f) => f.id.isIn(ids));
    });
  }

--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -57,8 +58,8 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
    }

    return _db.batch((batch) {
-      for (final id in ids) {
-        batch.deleteWhere(_db.localAssetEntity, (e) => e.id.equals(id));
+      for (final slice in ids.slices(32000)) {
+        batch.deleteWhere(_db.localAssetEntity, (e) => e.id.isIn(slice));
      }
    });
  }
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -166,15 +166,8 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
    );
  }

-  Future<void> removeAssets(String albumId, List<String> assetIds) {
-    return _db.batch((batch) {
-      for (final assetId in assetIds) {
-        batch.deleteWhere(
-          _db.remoteAlbumAssetEntity,
-          (row) => row.albumId.equals(albumId) & row.assetId.equals(assetId),
-        );
-      }
-    });
+  Future<int> removeAssets(String albumId, List<String> assetIds) {
+    return _db.remoteAlbumAssetEntity.deleteWhere((tbl) => tbl.albumId.equals(albumId) & tbl.assetId.isIn(assetIds));
  }

  FutureOr<(DateTime, DateTime)> getDateRange(String albumId) {
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -160,11 +160,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
  }

  Future<void> delete(List<String> ids) {
-    return _db.batch((batch) {
-      for (final id in ids) {
-        batch.deleteWhere(_db.remoteAssetEntity, (row) => row.id.equals(id));
-      }
-    });
+    return _db.remoteAssetEntity.deleteWhere((row) => row.id.isIn(ids));
  }

  Future<void> updateLocation(List<String> ids, LatLng location) {
@@ -203,11 +199,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
          .map((row) => row.id)
          .get();

-      await _db.batch((batch) {
-        for (final stackId in stackIds) {
-          batch.deleteWhere(_db.stackEntity, (row) => row.id.equals(stackId));
-        }
-      });
+      await _db.stackEntity.deleteWhere((row) => row.id.isIn(stackIds));

      await _db.batch((batch) {
        final companion = StackEntityCompanion(ownerId: Value(userId), primaryAssetId: Value(stack.primaryAssetId));
@@ -227,21 +219,15 @@ class RemoteAssetRepository extends DriftDatabaseRepository {

  Future<void> unStack(List<String> stackIds) {
    return _db.transaction(() async {
-      await _db.batch((batch) {
-        for (final stackId in stackIds) {
-          batch.deleteWhere(_db.stackEntity, (row) => row.id.equals(stackId));
-        }
-      });
+      await _db.stackEntity.deleteWhere((row) => row.id.isIn(stackIds));

      // TODO: delete this after adding foreign key on stackId
      await _db.batch((batch) {
-        for (final stackId in stackIds) {
-          batch.update(
-            _db.remoteAssetEntity,
-            const RemoteAssetEntityCompanion(stackId: Value(null)),
-            where: (e) => e.stackId.equals(stackId),
-          );
-        }
+        batch.update(
+          _db.remoteAssetEntity,
+          const RemoteAssetEntityCompanion(stackId: Value(null)),
+          where: (e) => e.stackId.isIn(stackIds),
+        );
      });
    });
  }
--- a/mobile/lib/infrastructure/repositories/search_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/search_api.repository.dart
@@ -33,7 +33,7 @@ class SearchApiRepository extends ApiRepository {
          personIds: filter.people.map((e) => e.id).toList(),
          type: type,
          page: page,
-          size: 100,
+          size: 1000,
        ),
      );
    }
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -93,11 +93,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {

  Future<void> deleteUsersV1(Iterable<SyncUserDeleteV1> data) async {
    try {
-      await _db.batch((batch) {
-        for (final user in data) {
-          batch.deleteWhere(_db.userEntity, (row) => row.id.equals(user.userId));
-        }
-      });
+      await _db.userEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.userId)));
    } catch (error, stack) {
      _logger.severe('Error: SyncUserDeleteV1', error, stack);
      rethrow;
@@ -162,11 +158,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {

  Future<void> deleteAssetsV1(Iterable<SyncAssetDeleteV1> data, {String debugLabel = 'user'}) async {
    try {
-      await _db.batch((batch) {
-        for (final asset in data) {
-          batch.deleteWhere(_db.remoteAssetEntity, (row) => row.id.equals(asset.assetId));
-        }
-      });
+      await _db.remoteAssetEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.assetId)));
    } catch (error, stack) {
      _logger.severe('Error: deleteAssetsV1 - $debugLabel', error, stack);
      rethrow;
@@ -251,11 +243,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {

  Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async {
    try {
-      await _db.batch((batch) {
-        for (final album in data) {
-          batch.deleteWhere(_db.remoteAlbumEntity, (row) => row.id.equals(album.albumId));
-        }
-      });
+      await _db.remoteAlbumEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.albumId)));
    } catch (error, stack) {
      _logger.severe('Error: deleteAlbumsV1', error, stack);
      rethrow;
@@ -391,11 +379,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {

  Future<void> deleteMemoriesV1(Iterable<SyncMemoryDeleteV1> data) async {
    try {
-      await _db.batch((batch) {
-        for (final memory in data) {
-          batch.deleteWhere(_db.memoryEntity, (row) => row.id.equals(memory.memoryId));
-        }
-      });
+      await _db.memoryEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.memoryId)));
    } catch (error, stack) {
      _logger.severe('Error: deleteMemoriesV1', error, stack);
      rethrow;
@@ -459,11 +443,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {

  Future<void> deleteStacksV1(Iterable<SyncStackDeleteV1> data, {String debugLabel = 'user'}) async {
    try {
-      await _db.batch((batch) {
-        for (final stack in data) {
-          batch.deleteWhere(_db.stackEntity, (row) => row.id.equals(stack.stackId));
-        }
-      });
+      await _db.stackEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.stackId)));
    } catch (error, stack) {
      _logger.severe('Error: deleteStacksV1 - $debugLabel', error, stack);
      rethrow;
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -12,11 +12,9 @@ import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/constants/locales.dart';
-import 'package:immich_mobile/domain/services/background_worker.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
-import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_life_cycle.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
@@ -34,7 +32,6 @@ import 'package:immich_mobile/theme/dynamic_theme.dart';
 import 'package:immich_mobile/theme/theme_data.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/cache/widgets_binding.dart';
-import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/utils/licenses.dart';
 import 'package:immich_mobile/utils/migration.dart';
@@ -42,10 +39,10 @@ import 'package:intl/date_symbol_data_local.dart';
 import 'package:logging/logging.dart';
 import 'package:timezone/data/latest.dart';
 import 'package:worker_manager/worker_manager.dart';
+import 'package:immich_mobile/utils/debug_print.dart';

 void main() async {
  ImmichWidgetsBinding();
-  unawaited(BackgroundWorkerLockService(BackgroundWorkerLockApi()).lock());
  final (isar, drift, logDb) = await Bootstrap.initDB();
  await Bootstrap.initDomain(isar, drift, logDb);
  await initApp();
--- a/mobile/lib/pages/backup/drift_backup.page.dart
+++ b/mobile/lib/pages/backup/drift_backup.page.dart
@@ -12,13 +12,9 @@ import 'package:immich_mobile/presentation/widgets/backup/backup_toggle_button.w
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/sync_status.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/backup/backup_info_card.dart';
-import 'dart:async';
-
-import 'package:wakelock_plus/wakelock_plus.dart';

@RoutePage()
 class DriftBackupPage extends ConsumerStatefulWidget {
@@ -32,28 +28,12 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
  @override
  void initState() {
    super.initState();
-
-    WakelockPlus.enable();
-
    final currentUser = ref.read(currentUserProvider);
    if (currentUser == null) {
      return;
    }

-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-      await ref.read(backgroundSyncProvider).syncRemote();
-
-      if (mounted) {
-        await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-      }
-    });
-  }
-
-  @override
-  dispose() {
-    super.dispose();
-    WakelockPlus.disable();
+    ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
  }

  @override
@@ -64,6 +44,7 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
        .toList();

    final backupNotifier = ref.read(driftBackupProvider.notifier);
+    final backgroundManager = ref.read(backgroundSyncProvider);

    Future<void> startBackup() async {
      final currentUser = Store.tryGet(StoreKey.currentUser);
@@ -71,6 +52,7 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
        return;
      }

+      await backgroundManager.syncRemote();
      await backupNotifier.getBackupStatus(currentUser.id);
      await backupNotifier.startBackup(currentUser.id);
    }
@@ -253,13 +235,11 @@ class _BackupCard extends ConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final backupCount = ref.watch(driftBackupProvider.select((p) => p.backupCount));
-    final syncStatus = ref.watch(syncStatusProvider);

    return BackupInfoCard(
      title: "backup_controller_page_backup".tr(),
      subtitle: "backup_controller_page_backup_sub".tr(),
      info: backupCount.toString(),
-      isLoading: syncStatus.isRemoteSyncing,
    );
  }
 }
@@ -270,207 +250,11 @@ class _RemainderCard extends ConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final remainderCount = ref.watch(driftBackupProvider.select((p) => p.remainderCount));
-    final syncStatus = ref.watch(syncStatusProvider);
-
-    return Card(
-      shape: RoundedRectangleBorder(
-        borderRadius: const BorderRadius.all(Radius.circular(20)),
-        side: BorderSide(color: context.colorScheme.outlineVariant, width: 1),
-      ),
-      elevation: 0,
-      borderOnForeground: false,
-      child: Column(
-        children: [
-          ListTile(
-            minVerticalPadding: 18,
-            isThreeLine: true,
-            title: Text("backup_controller_page_remainder".t(context: context), style: context.textTheme.titleMedium),
-            subtitle: Padding(
-              padding: const EdgeInsets.only(top: 4.0, right: 18.0),
-              child: Text(
-                "backup_controller_page_remainder_sub".t(context: context),
-                style: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
-              ),
-            ),
-            trailing: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Stack(
-                  children: [
-                    Text(
-                      remainderCount.toString(),
-                      style: context.textTheme.titleLarge?.copyWith(
-                        color: context.colorScheme.onSurface.withAlpha(syncStatus.isRemoteSyncing ? 50 : 255),
-                      ),
-                    ),
-                    if (syncStatus.isRemoteSyncing)
-                      Positioned.fill(
-                        child: Align(
-                          alignment: Alignment.center,
-                          child: SizedBox(
-                            width: 16,
-                            height: 16,
-                            child: CircularProgressIndicator(
-                              strokeWidth: 2,
-                              color: context.colorScheme.onSurface.withAlpha(150),
-                            ),
-                          ),
-                        ),
-                      ),
-                  ],
-                ),
-                Text(
-                  "backup_info_card_assets",
-                  style: context.textTheme.labelLarge?.copyWith(
-                    color: context.colorScheme.onSurface.withAlpha(syncStatus.isRemoteSyncing ? 50 : 255),
-                  ),
-                ).tr(),
-              ],
-            ),
-          ),
-          const Divider(height: 0),
-          const _PreparingStatus(),
-          const Divider(height: 0),
-
-          ListTile(
-            enableFeedback: true,
-            visualDensity: VisualDensity.compact,
-            contentPadding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 0.0),
-            shape: const RoundedRectangleBorder(
-              borderRadius: BorderRadius.only(bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20)),
-            ),
-            onTap: () => context.pushRoute(const DriftBackupAssetDetailRoute()),
-            title: Text(
-              "view_details".t(context: context),
-              style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurface.withAlpha(200)),
-            ),
-            trailing: Icon(Icons.arrow_forward_ios, size: 16, color: context.colorScheme.onSurfaceVariant),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class _PreparingStatus extends ConsumerStatefulWidget {
-  const _PreparingStatus();
-
-  @override
-  _PreparingStatusState createState() => _PreparingStatusState();
-}
-
-class _PreparingStatusState extends ConsumerState {
-  Timer? _pollingTimer;
-
-  @override
-  void dispose() {
-    _pollingTimer?.cancel();
-    super.dispose();
-  }
-
-  void _startPollingIfNeeded() {
-    if (_pollingTimer != null) return;
-
-    _pollingTimer = Timer.periodic(const Duration(seconds: 3), (timer) async {
-      final currentUser = ref.read(currentUserProvider);
-      if (currentUser != null && mounted) {
-        await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-
-        // Stop polling if processing count reaches 0
-        final updatedProcessingCount = ref.read(driftBackupProvider.select((p) => p.processingCount));
-        if (updatedProcessingCount == 0) {
-          timer.cancel();
-          _pollingTimer = null;
-        }
-      } else {
-        timer.cancel();
-        _pollingTimer = null;
-      }
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final syncStatus = ref.watch(syncStatusProvider);
-    final remainderCount = ref.watch(driftBackupProvider.select((p) => p.remainderCount));
-    final processingCount = ref.watch(driftBackupProvider.select((p) => p.processingCount));
-    final readyForUploadCount = remainderCount - processingCount;
-
-    ref.listen<int>(driftBackupProvider.select((p) => p.processingCount), (previous, next) {
-      if (next > 0 && _pollingTimer == null) {
-        _startPollingIfNeeded();
-      } else if (next == 0 && _pollingTimer != null) {
-        _pollingTimer?.cancel();
-        _pollingTimer = null;
-      }
-    });
-
-    if (!syncStatus.isHashing) {
-      return const SizedBox.shrink();
-    }
-
-    return Row(
-      children: [
-        Expanded(
-          child: Padding(
-            padding: const EdgeInsets.only(left: 1.0),
-            child: Container(
-              padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
-              decoration: BoxDecoration(
-                color: context.colorScheme.surfaceContainerHigh.withValues(alpha: 0.5),
-                shape: BoxShape.rectangle,
-              ),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    children: [
-                      Text(
-                        "preparing".t(context: context),
-                        style: context.textTheme.labelLarge?.copyWith(
-                          color: context.colorScheme.onSurface.withAlpha(200),
-                        ),
-                      ),
-                      const SizedBox(width: 18, height: 18, child: CircularProgressIndicator(strokeWidth: 1.5)),
-                    ],
-                  ),
-                  const SizedBox(height: 2),
-                  Text(
-                    processingCount.toString(),
-                    style: context.textTheme.titleMedium?.copyWith(
-                      color: context.colorScheme.primary,
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ),
-        Expanded(
-          child: Container(
-            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
-            decoration: BoxDecoration(color: context.colorScheme.primary.withValues(alpha: 0.1)),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text(
-                  "ready_for_upload".t(context: context),
-                  style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurface.withAlpha(200)),
-                ),
-                const SizedBox(height: 2),
-                Text(
-                  readyForUploadCount.toString(),
-                  style: context.textTheme.titleMedium?.copyWith(
-                    color: context.primaryColor,
-                    fontWeight: FontWeight.w600,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      ],
+    return BackupInfoCard(
+      title: "backup_controller_page_remainder".tr(),
+      subtitle: "backup_controller_page_remainder_sub".tr(),
+      info: remainderCount.toString(),
+      onTap: () => context.pushRoute(const DriftBackupAssetDetailRoute()),
    );
  }
 }
--- a/mobile/lib/pages/common/splash_screen.page.dart
+++ b/mobile/lib/pages/common/splash_screen.page.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
--- a/mobile/lib/platform/background_worker_lock_api.g.dart
+++ b/mobile/lib/platform/background_worker_lock_api.g.dart
@@ -1,97 +0,0 @@
-// Autogenerated from Pigeon (v26.0.0), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
-
-import 'dart:async';
-import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;
-
-import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer;
-import 'package:flutter/services.dart';
-
-PlatformException _createConnectionError(String channelName) {
-  return PlatformException(
-    code: 'channel-error',
-    message: 'Unable to establish connection on channel: "$channelName".',
-  );
-}
-
-class _PigeonCodec extends StandardMessageCodec {
-  const _PigeonCodec();
-  @override
-  void writeValue(WriteBuffer buffer, Object? value) {
-    if (value is int) {
-      buffer.putUint8(4);
-      buffer.putInt64(value);
-    } else {
-      super.writeValue(buffer, value);
-    }
-  }
-
-  @override
-  Object? readValueOfType(int type, ReadBuffer buffer) {
-    switch (type) {
-      default:
-        return super.readValueOfType(type, buffer);
-    }
-  }
-}
-
-class BackgroundWorkerLockApi {
-  /// Constructor for [BackgroundWorkerLockApi].  The [binaryMessenger] named argument is
-  /// available for dependency injection.  If it is left null, the default
-  /// BinaryMessenger will be used which routes to the host platform.
-  BackgroundWorkerLockApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
-    : pigeonVar_binaryMessenger = binaryMessenger,
-      pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
-  final BinaryMessenger? pigeonVar_binaryMessenger;
-
-  static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
-
-  final String pigeonVar_messageChannelSuffix;
-
-  Future<void> lock() async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.BackgroundWorkerLockApi.lock$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-    if (pigeonVar_replyList == null) {
-      throw _createConnectionError(pigeonVar_channelName);
-    } else if (pigeonVar_replyList.length > 1) {
-      throw PlatformException(
-        code: pigeonVar_replyList[0]! as String,
-        message: pigeonVar_replyList[1] as String?,
-        details: pigeonVar_replyList[2],
-      );
-    } else {
-      return;
-    }
-  }
-
-  Future<void> unlock() async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.BackgroundWorkerLockApi.unlock$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-    if (pigeonVar_replyList == null) {
-      throw _createConnectionError(pigeonVar_channelName);
-    } else if (pigeonVar_replyList.length > 1) {
-      throw PlatformException(
-        code: pigeonVar_replyList[0]! as String,
-        message: pigeonVar_replyList[1] as String?,
-        details: pigeonVar_replyList[2],
-      );
-    } else {
-      return;
-    }
-  }
-}
--- a/mobile/lib/presentation/pages/download_info.page.dart
+++ b/mobile/lib/presentation/pages/download_info.page.dart
@@ -1,57 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/pages/common/download_panel.dart';
-import 'package:immich_mobile/providers/asset_viewer/download.provider.dart';
-
-@RoutePage()
-class DownloadInfoPage extends ConsumerWidget {
-  const DownloadInfoPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final tasks = ref.watch(downloadStateProvider.select((state) => state.taskProgress)).entries.toList();
-
-    onCancelDownload(String id) {
-      ref.watch(downloadStateProvider.notifier).cancelDownload(id);
-    }
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text("download".t(context: context)),
-        actions: [],
-      ),
-      body: ListView.builder(
-        physics: const ClampingScrollPhysics(),
-        shrinkWrap: true,
-        itemCount: tasks.length,
-        itemBuilder: (context, index) {
-          final task = tasks[index];
-          return Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
-            child: DownloadTaskTile(
-              progress: task.value.progress,
-              fileName: task.value.fileName,
-              status: task.value.status,
-              onCancelDownload: () => onCancelDownload(task.key),
-            ),
-          );
-        },
-      ),
-      persistentFooterButtons: [
-        OutlinedButton(
-          onPressed: () {
-            tasks.map((e) => e.key).forEach(onCancelDownload);
-          },
-          style: OutlinedButton.styleFrom(side: BorderSide(color: context.colorScheme.primary)),
-          child: Text(
-            'clear_all'.t(context: context),
-            style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.primary),
-          ),
-        ),
-      ],
-    );
-  }
-}
--- a/mobile/lib/presentation/pages/search/drift_search.page.dart
+++ b/mobile/lib/presentation/pages/search/drift_search.page.dart
@@ -633,7 +633,7 @@ class _SearchResultGrid extends ConsumerWidget {
            groupBy: GroupAssetsBy.none,
            appBar: null,
            bottomSheet: const GeneralBottomSheet(minChildSize: 0.20),
-            snapToMonth: false,
+            withScrubber: false,
          ),
        ),
      ),
--- a/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
@@ -1,45 +1,54 @@
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class DownloadActionButton extends ConsumerWidget {
  final ActionSource source;
-  final bool menuItem;
-  const DownloadActionButton({super.key, required this.source, this.menuItem = false});

-  void _onTap(BuildContext context, WidgetRef ref, BackgroundSyncManager backgroundSyncManager) async {
+  const DownloadActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
    if (!context.mounted) {
      return;
    }

-    try {
-      await ref.read(actionProvider.notifier).downloadAll(source);
+    final result = await ref.read(actionProvider.notifier).downloadAll(source);
+    ref.read(multiSelectProvider.notifier).reset();

-      Future.delayed(const Duration(seconds: 1), () async {
-        await backgroundSyncManager.syncLocal();
-        await backgroundSyncManager.hashAssets();
-      });
-    } finally {
-      ref.read(multiSelectProvider.notifier).reset();
+    if (!context.mounted) {
+      return;
+    }
+
+    if (!result.success) {
+      ImmichToast.show(
+        context: context,
+        msg: 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: ToastType.error,
+      );
+    } else if (result.count > 0) {
+      ImmichToast.show(
+        context: context,
+        msg: 'download_action_prompt'.t(context: context, args: {'count': result.count.toString()}),
+        gravity: ToastGravity.BOTTOM,
+        toastType: ToastType.success,
+      );
    }
  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final backgroundManager = ref.watch(backgroundSyncProvider);
-
    return BaseActionButton(
      iconData: Icons.download,
      maxWidth: 95,
      label: "download".t(context: context),
-      menuItem: menuItem,
-      onPressed: () => _onTap(context, ref, backgroundManager),
+      onPressed: () => _onTap(context, ref),
    );
  }
 }
--- a/mobile/lib/presentation/widgets/action_buttons/download_status_floating_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/download_status_floating_button.widget.dart
@@ -1,64 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/providers/asset_viewer/download.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-
-class DownloadStatusFloatingButton extends ConsumerWidget {
-  const DownloadStatusFloatingButton({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final shouldShow = ref.watch(downloadStateProvider.select((state) => state.showProgress));
-    final itemCount = ref.watch(downloadStateProvider.select((state) => state.taskProgress.length));
-    final isDownloading = ref
-        .watch(downloadStateProvider.select((state) => state.taskProgress))
-        .values
-        .where((element) => element.progress != 1)
-        .isNotEmpty;
-
-    return shouldShow
-        ? Badge.count(
-            count: itemCount,
-            textColor: context.colorScheme.onPrimary,
-            backgroundColor: context.colorScheme.primary,
-            child: FloatingActionButton(
-              shape: RoundedRectangleBorder(
-                borderRadius: const BorderRadius.all(Radius.circular(20)),
-                side: BorderSide(color: context.colorScheme.outlineVariant, width: 1),
-              ),
-              backgroundColor: context.isDarkTheme
-                  ? context.colorScheme.surfaceContainer
-                  : context.colorScheme.surfaceBright,
-              elevation: 2,
-              onPressed: () {
-                context.pushRoute(const DownloadInfoRoute());
-              },
-              child: Stack(
-                alignment: AlignmentDirectional.center,
-                children: [
-                  isDownloading
-                      ? Icon(Icons.downloading_rounded, color: context.colorScheme.primary, size: 28)
-                      : Icon(
-                          Icons.download_done,
-                          color: context.isDarkTheme ? Colors.green[200] : Colors.green[400],
-                          size: 28,
-                        ),
-                  if (isDownloading)
-                    const SizedBox(
-                      height: 31,
-                      width: 31,
-                      child: CircularProgressIndicator(
-                        strokeWidth: 2,
-                        backgroundColor: Colors.transparent,
-                        value: null, // Indeterminate progress
-                      ),
-                    ),
-                ],
-              ),
-            ),
-          )
-        : const SizedBox.shrink();
-  }
-}
--- a/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
@@ -42,7 +42,7 @@ class ShareActionButton extends ConsumerWidget {
    showDialog(
      context: context,
      builder: (BuildContext buildContext) {
-        ref.read(actionProvider.notifier).shareAssets(source, context).then((ActionResult result) {
+        ref.read(actionProvider.notifier).shareAssets(source).then((ActionResult result) {
          ref.read(multiSelectProvider.notifier).reset();

          if (!context.mounted) {
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -12,7 +12,6 @@ import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/scroll_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/download_status_floating_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.provider.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
@@ -650,25 +649,20 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
        appBar: const ViewerTopAppBar(),
        extendBody: true,
        extendBodyBehindAppBar: true,
-        floatingActionButton: const DownloadStatusFloatingButton(),
-        body: Stack(
-          children: [
-            PhotoViewGallery.builder(
-              gaplessPlayback: true,
-              loadingBuilder: _placeholderBuilder,
-              pageController: pageController,
-              scrollPhysics: CurrentPlatform.isIOS
-                  ? const FastScrollPhysics() // Use bouncing physics for iOS
-                  : const FastClampingScrollPhysics(), // Use heavy physics for Android
-              itemCount: totalAssets,
-              onPageChanged: _onPageChanged,
-              onPageBuild: _onPageBuild,
-              scaleStateChangedCallback: _onScaleStateChanged,
-              builder: _assetBuilder,
-              backgroundDecoration: BoxDecoration(color: backgroundColor),
-              enablePanAlways: true,
-            ),
-          ],
+        body: PhotoViewGallery.builder(
+          gaplessPlayback: true,
+          loadingBuilder: _placeholderBuilder,
+          pageController: pageController,
+          scrollPhysics: CurrentPlatform.isIOS
+              ? const FastScrollPhysics() // Use bouncing physics for iOS
+              : const FastClampingScrollPhysics(), // Use heavy physics for Android
+          itemCount: totalAssets,
+          onPageChanged: _onPageChanged,
+          onPageBuild: _onPageBuild,
+          scaleStateChangedCallback: _onScaleStateChanged,
+          builder: _assetBuilder,
+          backgroundDecoration: BoxDecoration(color: backgroundColor),
+          enablePanAlways: true,
        ),
        bottomNavigationBar: showingBottomSheet
            ? const SizedBox.shrink()
--- a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
@@ -8,7 +8,6 @@ import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/cast_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
@@ -57,7 +56,6 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));

    final actions = <Widget>[
-      if (asset.hasRemote) const DownloadActionButton(source: ActionSource.viewer, menuItem: true),
      if (isCasting || (asset.hasRemote)) const CastActionButton(menuItem: true),
      if (album != null && album.isActivityEnabled && album.isShared)
        IconButton(
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -101,6 +101,7 @@ class _FixedSegmentRow extends ConsumerWidget {
    if (isScrubbing) {
      return _buildPlaceholder(context);
    }
+
    if (timelineService.hasRange(assetIndex, assetCount)) {
      return _buildAssetRow(context, timelineService.getAssets(assetIndex, assetCount), timelineService);
    }
--- a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
@@ -11,7 +11,6 @@ import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
-import 'package:immich_mobile/utils/debounce.dart';
 import 'package:intl/intl.dart' hide TextDirection;

 /// A widget that will display a BoxScrollView with a ScrollThumb that can be dragged
@@ -31,11 +30,6 @@ class Scrubber extends ConsumerStatefulWidget {

  final double? monthSegmentSnappingOffset;

-  final bool snapToMonth;
-
-  /// Whether an app bar is present, affects coordinate calculations
-  final bool hasAppBar;
-
  Scrubber({
    super.key,
    Key? scrollThumbKey,
@@ -44,8 +38,6 @@ class Scrubber extends ConsumerStatefulWidget {
    this.topPadding = 0,
    this.bottomPadding = 0,
    this.monthSegmentSnappingOffset,
-    this.snapToMonth = true,
-    this.hasAppBar = true,
    required this.child,
  }) : assert(child.scrollDirection == Axis.vertical);

@@ -89,8 +81,6 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
  bool _isDragging = false;
  List<_Segment> _segments = [];
  int _monthCount = 0;
-  DateTime? _currentScrubberDate;
-  Debouncer? _scrubberDebouncer;

  late AnimationController _thumbAnimationController;
  Timer? _fadeOutTimer;
@@ -143,7 +133,6 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
    _thumbAnimationController.dispose();
    _labelAnimationController.dispose();
    _fadeOutTimer?.cancel();
-    _scrubberDebouncer?.dispose();
    super.dispose();
  }

@@ -187,25 +176,11 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
    return false;
  }

-  void _onScrubberDateChanged(DateTime date) {
-    if (_currentScrubberDate != date) {
-      // Date changed, immediately set scrubbing to true
-      _currentScrubberDate = date;
-      ref.read(timelineStateProvider.notifier).setScrubbing(true);
-
-      // Initialize debouncer if needed
-      _scrubberDebouncer ??= Debouncer(interval: const Duration(milliseconds: 50));
-
-      // Debounce setting scrubbing to false
-      _scrubberDebouncer!.run(() {
-        if (_currentScrubberDate == date) {
-          ref.read(timelineStateProvider.notifier).setScrubbing(false);
-        }
-      });
-    }
-  }
-
  void _onDragStart(DragStartDetails _) {
+    if (_monthCount >= kMinMonthsToEnableScrubberSnap) {
+      ref.read(timelineStateProvider.notifier).setScrubbing(true);
+    }
+
    setState(() {
      _isDragging = true;
      _labelAnimationController.forward();
@@ -231,15 +206,10 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
      if (_lastLabel != label) {
        ref.read(hapticFeedbackProvider.notifier).selectionClick();
        _lastLabel = label;
-
-        // Notify timeline state of the new scrubber date position
-        if (_monthCount >= kMinMonthsToEnableScrubberSnap) {
-          _onScrubberDateChanged(nearestMonthSegment.date);
-        }
      }
    }

-    if (_monthCount < kMinMonthsToEnableScrubberSnap || !widget.snapToMonth) {
+    if (_monthCount < kMinMonthsToEnableScrubberSnap) {
      // If there are less than kMinMonthsToEnableScrubberSnap months, we don't need to snap to segments
      setState(() {
        _thumbTopOffset = dragPosition;
@@ -266,28 +236,14 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
  /// - If user drags to global Y position that's 100 pixels from the top
  /// - The relative position would be 100 - 50 = 50 (50 pixels into the scrubber area)
  double _calculateDragPosition(DragUpdateDetails details) {
-    if (widget.hasAppBar) {
-      final dragAreaTop = widget.topPadding;
-      final dragAreaBottom = widget.timelineHeight - widget.bottomPadding;
-      final dragAreaHeight = dragAreaBottom - dragAreaTop;
-
-      final relativePosition = details.globalPosition.dy - dragAreaTop;
-
-      // Make sure the position stays within the scrubber's bounds
-      return relativePosition.clamp(0.0, dragAreaHeight);
-    }
-
-    // Get the local position relative to the gesture detector
-    final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
-    if (renderBox != null) {
-      final localPosition = renderBox.globalToLocal(details.globalPosition);
-      return localPosition.dy.clamp(0.0, _scrubberHeight);
-    }
-
-    // Fallback to current logic if render box is not available
    final dragAreaTop = widget.topPadding;
+    final dragAreaBottom = widget.timelineHeight - widget.bottomPadding;
+    final dragAreaHeight = dragAreaBottom - dragAreaTop;
+
    final relativePosition = details.globalPosition.dy - dragAreaTop;
-    return relativePosition.clamp(0.0, _scrubberHeight);
+
+    // Make sure the position stays within the scrubber's bounds
+    return relativePosition.clamp(0.0, dragAreaHeight);
  }

  /// Find the segment closest to the given position
@@ -338,18 +294,12 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
  }

  void _onDragEnd(DragEndDetails _) {
+    ref.read(timelineStateProvider.notifier).setScrubbing(false);
    _labelAnimationController.reverse();
    setState(() {
      _isDragging = false;
    });

-    ref.read(timelineStateProvider.notifier).setScrubbing(false);
-
-    // Reset scrubber tracking when drag ends
-    _currentScrubberDate = null;
-    _scrubberDebouncer?.dispose();
-    _scrubberDebouncer = null;
-
    _resetThumbTimer();
  }

--- a/mobile/lib/presentation/widgets/timeline/timeline.state.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
@@ -72,6 +72,8 @@ class TimelineState {
 }

 class TimelineStateNotifier extends Notifier<TimelineState> {
+  TimelineStateNotifier();
+
  void setScrubbing(bool isScrubbing) {
    state = state.copyWith(isScrubbing: isScrubbing);
  }
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -14,7 +14,6 @@ import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/download_status_floating_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
@@ -39,7 +38,6 @@ class Timeline extends StatelessWidget {
    this.bottomSheet = const GeneralBottomSheet(minChildSize: 0.18),
    this.groupBy,
    this.withScrubber = true,
-    this.snapToMonth = true,
  });

  final Widget? topSliverWidget;
@@ -50,13 +48,11 @@ class Timeline extends StatelessWidget {
  final bool withStack;
  final GroupAssetsBy? groupBy;
  final bool withScrubber;
-  final bool snapToMonth;

  @override
  Widget build(BuildContext context) {
    return Scaffold(
      resizeToAvoidBottomInset: false,
-      floatingActionButton: const DownloadStatusFloatingButton(),
      body: LayoutBuilder(
        builder: (_, constraints) => ProviderScope(
          overrides: [
@@ -77,7 +73,6 @@ class Timeline extends StatelessWidget {
            appBar: appBar,
            bottomSheet: bottomSheet,
            withScrubber: withScrubber,
-            snapToMonth: snapToMonth,
          ),
        ),
      ),
@@ -92,7 +87,6 @@ class _SliverTimeline extends ConsumerStatefulWidget {
    this.appBar,
    this.bottomSheet,
    this.withScrubber = true,
-    this.snapToMonth = true,
  });

  final Widget? topSliverWidget;
@@ -100,14 +94,13 @@ class _SliverTimeline extends ConsumerStatefulWidget {
  final Widget? appBar;
  final Widget? bottomSheet;
  final bool withScrubber;
-  final bool snapToMonth;

  @override
  ConsumerState createState() => _SliverTimelineState();
 }

 class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
-  late final ScrollController _scrollController;
+  final _scrollController = ScrollController();
  StreamSubscription? _eventSubscription;

  // Drag selection state
@@ -119,12 +112,10 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
  int _perRow = 4;
  double _scaleFactor = 3.0;
  double _baseScaleFactor = 3.0;
-  int? _scaleRestoreAssetIndex;

  @override
  void initState() {
    super.initState();
-    _scrollController = ScrollController(onAttach: _restoreScalePosition);
    _eventSubscription = EventStream.shared.listen(_onEvent);

    final currentTilesPerRow = ref.read(settingsProvider).get(Setting.tilesPerRow);
@@ -156,28 +147,6 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
    EventStream.shared.emit(MultiSelectToggleEvent(isEnabled));
  }

-  void _restoreScalePosition(_) {
-    if (_scaleRestoreAssetIndex == null) return;
-
-    final asyncSegments = ref.read(timelineSegmentProvider);
-    asyncSegments.whenData((segments) {
-      final targetSegment = segments.lastWhereOrNull((segment) => segment.firstAssetIndex <= _scaleRestoreAssetIndex!);
-      if (targetSegment != null) {
-        final assetIndexInSegment = _scaleRestoreAssetIndex! - targetSegment.firstAssetIndex;
-        final newColumnCount = ref.read(timelineArgsProvider).columnCount;
-        final rowIndexInSegment = (assetIndexInSegment / newColumnCount).floor();
-        final targetRowIndex = targetSegment.firstIndex + 1 + rowIndexInSegment;
-        final targetOffset = targetSegment.indexToLayoutOffset(targetRowIndex);
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          if (mounted) {
-            _scrollController.jumpTo(targetOffset.clamp(0.0, _scrollController.position.maxScrollExtent));
-          }
-        });
-      }
-    });
-    _scaleRestoreAssetIndex = null;
-  }
-
  @override
  void dispose() {
    _scrollController.dispose();
@@ -340,13 +309,11 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
          final Widget timeline;
          if (widget.withScrubber) {
            timeline = Scrubber(
-              snapToMonth: widget.snapToMonth,
              layoutSegments: segments,
              timelineHeight: maxHeight,
              topPadding: topPadding,
              bottomPadding: bottomPadding,
              monthSegmentSnappingOffset: widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
-              hasAppBar: widget.appBar != null,
              child: grid,
            );
          } else {
@@ -369,28 +336,9 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                      final newPerRow = 7 - newScaleFactor.toInt();

                      if (newPerRow != _perRow) {
-                        final currentOffset = _scrollController.offset.clamp(
-                          0.0,
-                          _scrollController.position.maxScrollExtent,
-                        );
-                        final segment = segments.findByOffset(currentOffset) ?? segments.lastOrNull;
-                        int? targetAssetIndex;
-                        if (segment != null) {
-                          final rowIndex = segment.getMinChildIndexForScrollOffset(currentOffset);
-                          if (rowIndex > segment.firstIndex) {
-                            final rowIndexInSegment = rowIndex - (segment.firstIndex + 1);
-                            final assetsPerRow = ref.read(timelineArgsProvider).columnCount;
-                            final assetIndexInSegment = rowIndexInSegment * assetsPerRow;
-                            targetAssetIndex = segment.firstAssetIndex + assetIndexInSegment;
-                          } else {
-                            targetAssetIndex = segment.firstAssetIndex;
-                          }
-                        }
-
                        setState(() {
                          _scaleFactor = newScaleFactor;
                          _perRow = newPerRow;
-                          _scaleRestoreAssetIndex = targetAssetIndex;
                        });

                        ref.read(settingsProvider.notifier).set(Setting.tilesPerRow, _perRow);
--- a/mobile/lib/providers/app_life_cycle.provider.dart
+++ b/mobile/lib/providers/app_life_cycle.provider.dart
@@ -15,7 +15,6 @@ import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/backup/ios_background_settings.provider.dart';
 import 'package:immich_mobile/providers/backup/manual_upload.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/memory.provider.dart';
 import 'package:immich_mobile/providers/notification_permission.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
@@ -139,7 +138,6 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {

  Future<void> _handleBetaTimelineResume() async {
    _ref.read(backupProvider.notifier).cancelBackup();
-    unawaited(_ref.read(backgroundWorkerLockServiceProvider).lock());

    // Give isolates time to complete any ongoing database transactions
    await Future.delayed(const Duration(milliseconds: 500));
@@ -211,9 +209,6 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
    _pauseOperation = Completer<void>();

    try {
-      if (Store.isBetaTimelineEnabled) {
-        unawaited(_ref.read(backgroundWorkerLockServiceProvider).unlock());
-      }
      await _performPause();
    } catch (e, stackTrace) {
      _log.severe("Error during app pause", e, stackTrace);
@@ -245,10 +240,6 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
  Future<void> handleAppDetached() async {
    state = AppLifeCycleEnum.detached;

-    if (Store.isBetaTimelineEnabled) {
-      unawaited(_ref.read(backgroundWorkerLockServiceProvider).unlock());
-    }
-
    // Flush logs before closing database
    try {
      LogService.I.flush();
--- a/mobile/lib/providers/backup/drift_backup.provider.dart
+++ b/mobile/lib/providers/backup/drift_backup.provider.dart
@@ -123,7 +123,6 @@ class DriftBackupState {
  final int totalCount;
  final int backupCount;
  final int remainderCount;
-  final int processingCount;

  final int enqueueCount;
  final int enqueueTotalCount;
@@ -136,7 +135,6 @@ class DriftBackupState {
    required this.totalCount,
    required this.backupCount,
    required this.remainderCount,
-    required this.processingCount,
    required this.enqueueCount,
    required this.enqueueTotalCount,
    required this.isCanceling,
@@ -147,7 +145,6 @@ class DriftBackupState {
    int? totalCount,
    int? backupCount,
    int? remainderCount,
-    int? processingCount,
    int? enqueueCount,
    int? enqueueTotalCount,
    bool? isCanceling,
@@ -157,7 +154,6 @@ class DriftBackupState {
      totalCount: totalCount ?? this.totalCount,
      backupCount: backupCount ?? this.backupCount,
      remainderCount: remainderCount ?? this.remainderCount,
-      processingCount: processingCount ?? this.processingCount,
      enqueueCount: enqueueCount ?? this.enqueueCount,
      enqueueTotalCount: enqueueTotalCount ?? this.enqueueTotalCount,
      isCanceling: isCanceling ?? this.isCanceling,
@@ -167,7 +163,7 @@ class DriftBackupState {

  @override
  String toString() {
-    return 'DriftBackupState(totalCount: $totalCount, backupCount: $backupCount, remainderCount: $remainderCount, processingCount: $processingCount, enqueueCount: $enqueueCount, enqueueTotalCount: $enqueueTotalCount, isCanceling: $isCanceling, uploadItems: $uploadItems)';
+    return 'DriftBackupState(totalCount: $totalCount, backupCount: $backupCount, remainderCount: $remainderCount, enqueueCount: $enqueueCount, enqueueTotalCount: $enqueueTotalCount, isCanceling: $isCanceling, uploadItems: $uploadItems)';
  }

  @override
@@ -178,7 +174,6 @@ class DriftBackupState {
    return other.totalCount == totalCount &&
        other.backupCount == backupCount &&
        other.remainderCount == remainderCount &&
-        other.processingCount == processingCount &&
        other.enqueueCount == enqueueCount &&
        other.enqueueTotalCount == enqueueTotalCount &&
        other.isCanceling == isCanceling &&
@@ -190,7 +185,6 @@ class DriftBackupState {
    return totalCount.hashCode ^
        backupCount.hashCode ^
        remainderCount.hashCode ^
-        processingCount.hashCode ^
        enqueueCount.hashCode ^
        enqueueTotalCount.hashCode ^
        isCanceling.hashCode ^
@@ -209,7 +203,6 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
          totalCount: 0,
          backupCount: 0,
          remainderCount: 0,
-          processingCount: 0,
          enqueueCount: 0,
          enqueueTotalCount: 0,
          isCanceling: false,
@@ -242,9 +235,7 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
    switch (update.status) {
      case TaskStatus.complete:
        if (update.task.group == kBackupGroup) {
-          if (update.responseStatusCode == 201) {
-            state = state.copyWith(backupCount: state.backupCount + 1, remainderCount: state.remainderCount - 1);
-          }
+          state = state.copyWith(backupCount: state.backupCount + 1, remainderCount: state.remainderCount - 1);
        }

        // Remove the completed task from the upload items
@@ -320,14 +311,13 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
  }

  Future<void> getBackupStatus(String userId) async {
-    final counts = await _uploadService.getBackupCounts(userId);
+    final [totalCount, backupCount, remainderCount] = await Future.wait([
+      _uploadService.getBackupTotalCount(),
+      _uploadService.getBackupFinishedCount(userId),
+      _uploadService.getBackupRemainderCount(userId),
+    ]);

-    state = state.copyWith(
-      totalCount: counts.total,
-      backupCount: counts.total - counts.remainder,
-      remainderCount: counts.remainder,
-      processingCount: counts.processing,
-    );
+    state = state.copyWith(totalCount: totalCount, backupCount: backupCount, remainderCount: remainderCount);
  }

  Future<void> startBackup(String userId) {
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -342,11 +342,11 @@ class ActionNotifier extends Notifier<void> {
    }
  }

-  Future<ActionResult> shareAssets(ActionSource source, BuildContext context) async {
+  Future<ActionResult> shareAssets(ActionSource source) async {
    final ids = _getAssets(source).toList(growable: false);

    try {
-      await _service.shareAssets(ids, context);
+      await _service.shareAssets(ids);
      return ActionResult(count: ids.length, success: true);
    } catch (error, stack) {
      _logger.severe('Failed to share assets', error, stack);
@@ -356,6 +356,7 @@ class ActionNotifier extends Notifier<void> {

  Future<ActionResult> downloadAll(ActionSource source) async {
    final assets = _getAssets(source).whereType<RemoteAsset>().toList(growable: false);
+
    try {
      final didEnqueue = await _service.downloadAll(assets);
      final enqueueCount = didEnqueue.where((e) => e).length;
--- a/mobile/lib/providers/infrastructure/platform.provider.dart
+++ b/mobile/lib/providers/infrastructure/platform.provider.dart
@@ -1,17 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/background_worker.service.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
-import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/platform/connectivity_api.g.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/platform/thumbnail_api.g.dart';

 final backgroundWorkerFgServiceProvider = Provider((_) => BackgroundWorkerFgService(BackgroundWorkerFgHostApi()));

-final backgroundWorkerLockServiceProvider = Provider<BackgroundWorkerLockService>(
-  (_) => BackgroundWorkerLockService(BackgroundWorkerLockApi()),
-);
-
 final nativeSyncApiProvider = Provider<NativeSyncApi>((_) => NativeSyncApi());

 final connectivityApiProvider = Provider<ConnectivityApi>((_) => ConnectivityApi());
--- a/mobile/lib/repositories/asset_media.repository.dart
+++ b/mobile/lib/repositories/asset_media.repository.dart
@@ -1,19 +1,17 @@
 import 'dart:io';

-import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart' as asset_entity;
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/response_extensions.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:immich_mobile/utils/hash.dart';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:photo_manager/photo_manager.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/response_extensions.dart';
 import 'package:share_plus/share_plus.dart';

 final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository(ref.watch(assetApiRepositoryProvider)));
@@ -70,7 +68,7 @@ class AssetMediaRepository {
  }

  // TODO: make this more efficient
-  Future<int> shareAssets(List<BaseAsset> assets, BuildContext context) async {
+  Future<int> shareAssets(List<BaseAsset> assets) async {
    final downloadedXFiles = <XFile>[];

    for (var asset in assets) {
@@ -107,12 +105,8 @@ class AssetMediaRepository {
    }

    // we dont want to await the share result since the
-    // "preparing" dialog will not disappear until
-    final size = context.sizeData;
-    Share.shareXFiles(
-      downloadedXFiles,
-      sharePositionOrigin: Rect.fromPoints(Offset.zero, Offset(size.width / 3, size.height)),
-    ).then((result) async {
+    // "preparing" dialog will not disappear unti
+    Share.shareXFiles(downloadedXFiles).then((result) async {
      for (var file in downloadedXFiles) {
        try {
          await File(file.path).delete();
--- a/mobile/lib/repositories/download.repository.dart
+++ b/mobile/lib/repositories/download.repository.dart
@@ -90,11 +90,7 @@ class DownloadRepository {
      final isVideo = asset.isVideo;
      final url = getOriginalUrlForRemoteId(id);

-      // on iOS it cannot link the image, check if the filename has .MP extension
-      // to avoid downloading the video part
-      final isAndroidMotionPhoto = asset.name.contains(".MP");
-
-      if (Platform.isAndroid || livePhotoVideoId == null || isVideo || isAndroidMotionPhoto) {
+      if (Platform.isAndroid || livePhotoVideoId == null || isVideo) {
        tasks[taskIndex++] = DownloadTask(
          taskId: id,
          url: url,
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -81,7 +81,6 @@ import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
-import 'package:immich_mobile/presentation/pages/download_info.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_activities.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album_options.page.dart';
@@ -346,7 +345,6 @@ class AppRouter extends RootStackRouter {
    AutoRoute(page: DriftActivitiesRoute.page, guards: [_authGuard, _duplicateGuard]),
    AutoRoute(page: DriftBackupAssetDetailRoute.page, guards: [_authGuard, _duplicateGuard]),
    AutoRoute(page: AssetTroubleshootRoute.page, guards: [_authGuard, _duplicateGuard]),
-    AutoRoute(page: DownloadInfoRoute.page, guards: [_authGuard, _duplicateGuard]),
    // required to handle all deeplinks in deep_link.service.dart
    // auto_route_library#1722
    RedirectRoute(path: '*', redirectTo: '/'),
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -688,22 +688,6 @@ class CropImageRouteArgs {
  }
 }

-/// generated route for
-/// [DownloadInfoPage]
-class DownloadInfoRoute extends PageRouteInfo<void> {
-  const DownloadInfoRoute({List<PageRouteInfo>? children})
-    : super(DownloadInfoRoute.name, initialChildren: children);
-
-  static const String name = 'DownloadInfoRoute';
-
-  static PageInfo page = PageInfo(
-    name,
-    builder: (data) {
-      return const DownloadInfoPage();
-    },
-  );
-}
-
 /// generated route for
 /// [DriftActivitiesPage]
 class DriftActivitiesRoute extends PageRouteInfo<void> {
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -1,6 +1,7 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/repositories/download.repository.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
@@ -10,7 +11,6 @@ import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
-import 'package:immich_mobile/repositories/download.repository.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/date_time_picker.dart';
@@ -199,11 +199,14 @@ class ActionService {
  }

  Future<int> removeFromAlbum(List<String> remoteIds, String albumId) async {
+    int removedCount = 0;
    final result = await _albumApiRepository.removeAssets(albumId, remoteIds);
+
    if (result.removed.isNotEmpty) {
-      await _remoteAlbumRepository.removeAssets(albumId, result.removed);
+      removedCount = await _remoteAlbumRepository.removeAssets(albumId, result.removed);
    }
-    return result.removed.length;
+
+    return removedCount;
  }

  Future<bool> updateDescription(String assetId, String description) async {
@@ -224,8 +227,8 @@ class ActionService {
    await _assetApiRepository.unStack(stackIds);
  }

-  Future<int> shareAssets(List<BaseAsset> assets, BuildContext context) {
-    return _assetMediaRepository.shareAssets(assets, context);
+  Future<int> shareAssets(List<BaseAsset> assets) {
+    return _assetMediaRepository.shareAssets(assets);
  }

  Future<List<bool>> downloadAll(List<RemoteAsset> assets) {
--- a/mobile/lib/services/upload.service.dart
+++ b/mobile/lib/services/upload.service.dart
@@ -89,8 +89,16 @@ class UploadService {
    return _uploadRepository.getActiveTasks(group);
  }

-  Future<({int total, int remainder, int processing})> getBackupCounts(String userId) {
-    return _backupRepository.getAllCounts(userId);
+  Future<int> getBackupTotalCount() {
+    return _backupRepository.getTotalCount();
+  }
+
+  Future<int> getBackupRemainderCount(String userId) {
+    return _backupRepository.getRemainderCount(userId);
+  }
+
+  Future<int> getBackupFinishedCount(String userId) {
+    return _backupRepository.getBackupCount(userId);
  }

  Future<void> manualBackup(List<LocalAsset> localAssets) async {
--- a/mobile/lib/widgets/backup/backup_info_card.dart
+++ b/mobile/lib/widgets/backup/backup_info_card.dart
@@ -8,17 +8,8 @@ class BackupInfoCard extends StatelessWidget {
  final String title;
  final String subtitle;
  final String info;
-
  final VoidCallback? onTap;
-  final bool isLoading;
-  const BackupInfoCard({
-    super.key,
-    required this.title,
-    required this.subtitle,
-    required this.info,
-    this.onTap,
-    this.isLoading = false,
-  });
+  const BackupInfoCard({super.key, required this.title, required this.subtitle, required this.info, this.onTap});

  @override
  Widget build(BuildContext context) {
@@ -47,36 +38,8 @@ class BackupInfoCard extends StatelessWidget {
            trailing: Column(
              mainAxisAlignment: MainAxisAlignment.center,
              children: [
-                Stack(
-                  children: [
-                    Text(
-                      info,
-                      style: context.textTheme.titleLarge?.copyWith(
-                        color: context.colorScheme.onSurface.withAlpha(isLoading ? 50 : 255),
-                      ),
-                    ),
-                    if (isLoading)
-                      Positioned.fill(
-                        child: Align(
-                          alignment: Alignment.center,
-                          child: SizedBox(
-                            width: 16,
-                            height: 16,
-                            child: CircularProgressIndicator(
-                              strokeWidth: 2,
-                              color: context.colorScheme.onSurface.withAlpha(150),
-                            ),
-                          ),
-                        ),
-                      ),
-                  ],
-                ),
-                Text(
-                  "backup_info_card_assets",
-                  style: context.textTheme.labelLarge?.copyWith(
-                    color: context.colorScheme.onSurface.withAlpha(isLoading ? 50 : 255),
-                  ),
-                ).tr(),
+                Text(info, style: context.textTheme.titleLarge),
+                Text("backup_info_card_assets", style: context.textTheme.labelLarge).tr(),
              ],
            ),
          ),
--- a/mobile/lib/widgets/forms/login/login_form.dart
+++ b/mobile/lib/widgets/forms/login/login_form.dart
@@ -19,7 +19,6 @@ import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/providers/oauth.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
-import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/provider_utils.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
@@ -194,7 +193,6 @@ class LoginForm extends HookConsumerWidget {
          if (isBeta) {
            await ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission();
            handleSyncFlow();
-            ref.read(websocketProvider.notifier).connect();
            context.replaceRoute(const TabShellRoute());
            return;
          }
--- a/mobile/makefile
+++ b/mobile/makefile
@@ -9,12 +9,10 @@ pigeon:
 	dart run pigeon --input pigeon/native_sync_api.dart
 	dart run pigeon --input pigeon/thumbnail_api.dart
 	dart run pigeon --input pigeon/background_worker_api.dart
-	dart run pigeon --input pigeon/background_worker_lock_api.dart
 	dart run pigeon --input pigeon/connectivity_api.dart
 	dart format lib/platform/native_sync_api.g.dart
 	dart format lib/platform/thumbnail_api.g.dart
 	dart format lib/platform/background_worker_api.g.dart
-	dart format lib/platform/background_worker_lock_api.g.dart
 	dart format lib/platform/connectivity_api.g.dart

 watch:
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -3,7 +3,7 @@ Immich API

 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:

- API version: 1.143.0
+- API version: 1.142.1
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen

@@ -393,7 +393,6 @@ Class | Method | HTTP request | Description
 - [LoginCredentialDto](doc//LoginCredentialDto.md)
 - [LoginResponseDto](doc//LoginResponseDto.md)
 - [LogoutResponseDto](doc//LogoutResponseDto.md)
- - [MachineLearningAvailabilityChecksDto](doc//MachineLearningAvailabilityChecksDto.md)
 - [ManualJobName](doc//ManualJobName.md)
 - [MapMarkerResponseDto](doc//MapMarkerResponseDto.md)
 - [MapReverseGeocodeResponseDto](doc//MapReverseGeocodeResponseDto.md)
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -164,7 +164,6 @@ part 'model/log_level.dart';
 part 'model/login_credential_dto.dart';
 part 'model/login_response_dto.dart';
 part 'model/logout_response_dto.dart';
-part 'model/machine_learning_availability_checks_dto.dart';
 part 'model/manual_job_name.dart';
 part 'model/map_marker_response_dto.dart';
 part 'model/map_reverse_geocode_response_dto.dart';
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -382,8 +382,6 @@ class ApiClient {
          return LoginResponseDto.fromJson(value);
        case 'LogoutResponseDto':
          return LogoutResponseDto.fromJson(value);
-        case 'MachineLearningAvailabilityChecksDto':
-          return MachineLearningAvailabilityChecksDto.fromJson(value);
        case 'ManualJobName':
          return ManualJobNameTypeTransformer().decode(value);
        case 'MapMarkerResponseDto':
--- a/mobile/openapi/lib/model/machine_learning_availability_checks_dto.dart
+++ b/mobile/openapi/lib/model/machine_learning_availability_checks_dto.dart
@@ -1,115 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class MachineLearningAvailabilityChecksDto {
-  /// Returns a new [MachineLearningAvailabilityChecksDto] instance.
-  MachineLearningAvailabilityChecksDto({
-    required this.enabled,
-    required this.interval,
-    required this.timeout,
-  });
-
-  bool enabled;
-
-  num interval;
-
-  num timeout;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is MachineLearningAvailabilityChecksDto &&
-    other.enabled == enabled &&
-    other.interval == interval &&
-    other.timeout == timeout;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (enabled.hashCode) +
-    (interval.hashCode) +
-    (timeout.hashCode);
-
-  @override
-  String toString() => 'MachineLearningAvailabilityChecksDto[enabled=$enabled, interval=$interval, timeout=$timeout]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'enabled'] = this.enabled;
-      json[r'interval'] = this.interval;
-      json[r'timeout'] = this.timeout;
-    return json;
-  }
-
-  /// Returns a new [MachineLearningAvailabilityChecksDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static MachineLearningAvailabilityChecksDto? fromJson(dynamic value) {
-    upgradeDto(value, "MachineLearningAvailabilityChecksDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return MachineLearningAvailabilityChecksDto(
-        enabled: mapValueOfType<bool>(json, r'enabled')!,
-        interval: num.parse('${json[r'interval']}'),
-        timeout: num.parse('${json[r'timeout']}'),
-      );
-    }
-    return null;
-  }
-
-  static List<MachineLearningAvailabilityChecksDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <MachineLearningAvailabilityChecksDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = MachineLearningAvailabilityChecksDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, MachineLearningAvailabilityChecksDto> mapFromJson(dynamic json) {
-    final map = <String, MachineLearningAvailabilityChecksDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = MachineLearningAvailabilityChecksDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of MachineLearningAvailabilityChecksDto-objects as value to a dart map
-  static Map<String, List<MachineLearningAvailabilityChecksDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<MachineLearningAvailabilityChecksDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = MachineLearningAvailabilityChecksDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'enabled',
-    'interval',
-    'timeout',
-  };
-}
-
--- a/mobile/openapi/lib/model/system_config_machine_learning_dto.dart
+++ b/mobile/openapi/lib/model/system_config_machine_learning_dto.dart
@@ -13,16 +13,14 @@ part of openapi.api;
 class SystemConfigMachineLearningDto {
  /// Returns a new [SystemConfigMachineLearningDto] instance.
  SystemConfigMachineLearningDto({
-    required this.availabilityChecks,
    required this.clip,
    required this.duplicateDetection,
    required this.enabled,
    required this.facialRecognition,
+    this.url,
    this.urls = const [],
  });

-  MachineLearningAvailabilityChecksDto availabilityChecks;
-
  CLIPConfig clip;

  DuplicateDetectionConfig duplicateDetection;
@@ -31,37 +29,50 @@ class SystemConfigMachineLearningDto {

  FacialRecognitionConfig facialRecognition;

+  /// This property was deprecated in v1.122.0
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  String? url;
+
  List<String> urls;

  @override
  bool operator ==(Object other) => identical(this, other) || other is SystemConfigMachineLearningDto &&
-    other.availabilityChecks == availabilityChecks &&
    other.clip == clip &&
    other.duplicateDetection == duplicateDetection &&
    other.enabled == enabled &&
    other.facialRecognition == facialRecognition &&
+    other.url == url &&
    _deepEquality.equals(other.urls, urls);

  @override
  int get hashCode =>
    // ignore: unnecessary_parenthesis
-    (availabilityChecks.hashCode) +
    (clip.hashCode) +
    (duplicateDetection.hashCode) +
    (enabled.hashCode) +
    (facialRecognition.hashCode) +
+    (url == null ? 0 : url!.hashCode) +
    (urls.hashCode);

  @override
-  String toString() => 'SystemConfigMachineLearningDto[availabilityChecks=$availabilityChecks, clip=$clip, duplicateDetection=$duplicateDetection, enabled=$enabled, facialRecognition=$facialRecognition, urls=$urls]';
+  String toString() => 'SystemConfigMachineLearningDto[clip=$clip, duplicateDetection=$duplicateDetection, enabled=$enabled, facialRecognition=$facialRecognition, url=$url, urls=$urls]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
-      json[r'availabilityChecks'] = this.availabilityChecks;
      json[r'clip'] = this.clip;
      json[r'duplicateDetection'] = this.duplicateDetection;
      json[r'enabled'] = this.enabled;
      json[r'facialRecognition'] = this.facialRecognition;
+    if (this.url != null) {
+      json[r'url'] = this.url;
+    } else {
+    //  json[r'url'] = null;
+    }
      json[r'urls'] = this.urls;
    return json;
  }
@@ -75,11 +86,11 @@ class SystemConfigMachineLearningDto {
      final json = value.cast<String, dynamic>();

      return SystemConfigMachineLearningDto(
-        availabilityChecks: MachineLearningAvailabilityChecksDto.fromJson(json[r'availabilityChecks'])!,
        clip: CLIPConfig.fromJson(json[r'clip'])!,
        duplicateDetection: DuplicateDetectionConfig.fromJson(json[r'duplicateDetection'])!,
        enabled: mapValueOfType<bool>(json, r'enabled')!,
        facialRecognition: FacialRecognitionConfig.fromJson(json[r'facialRecognition'])!,
+        url: mapValueOfType<String>(json, r'url'),
        urls: json[r'urls'] is Iterable
            ? (json[r'urls'] as Iterable).cast<String>().toList(growable: false)
            : const [],
@@ -130,7 +141,6 @@ class SystemConfigMachineLearningDto {

  /// The list of required keys that must be present in a JSON.
  static const requiredKeys = <String>{
-    'availabilityChecks',
    'clip',
    'duplicateDetection',
    'enabled',
--- a/mobile/pigeon/background_worker_lock_api.dart
+++ b/mobile/pigeon/background_worker_lock_api.dart
@@ -1,17 +0,0 @@
-import 'package:pigeon/pigeon.dart';
-
-@ConfigurePigeon(
-  PigeonOptions(
-    dartOut: 'lib/platform/background_worker_lock_api.g.dart',
-    kotlinOut: 'android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorkerLock.g.kt',
-    kotlinOptions: KotlinOptions(package: 'app.alextran.immich.background', includeErrorClass: false),
-    dartOptions: DartOptions(),
-    dartPackageName: 'immich_mobile',
-  ),
-)
-@HostApi()
-abstract class BackgroundWorkerLockApi {
-  void lock();
-
-  void unlock();
-}
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone

 publish_to: 'none'
-version: 1.143.0+3016
+version: 1.142.1+3015

 environment:
  sdk: '>=3.8.0 <4.0.0'
--- a/mobile/test/drift/main/generated/schema.dart
+++ b/mobile/test/drift/main/generated/schema.dart
@@ -13,7 +13,6 @@ import 'schema_v7.dart' as v7;
 import 'schema_v8.dart' as v8;
 import 'schema_v9.dart' as v9;
 import 'schema_v10.dart' as v10;
-import 'schema_v11.dart' as v11;

 class GeneratedHelper implements SchemaInstantiationHelper {
  @override
@@ -39,12 +38,10 @@ class GeneratedHelper implements SchemaInstantiationHelper {
        return v9.DatabaseAtV9(db);
      case 10:
        return v10.DatabaseAtV10(db);
-      case 11:
-        return v11.DatabaseAtV11(db);
      default:
        throw MissingSchemaException(version, versions);
    }
  }

-  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
+  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 }
--- a/mobile/test/drift/main/generated/schema_v11.dart
+++ b/mobile/test/drift/main/generated/schema_v11.dart
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -9858,7 +9858,7 @@
  "info": {
    "title": "Immich",
    "description": "Immich API",
-    "version": "1.143.0",
+    "version": "1.142.1",
    "contact": {}
  },
  "tags": [],
@@ -12259,25 +12259,6 @@
        ],
        "type": "object"
      },
-      "MachineLearningAvailabilityChecksDto": {
-        "properties": {
-          "enabled": {
-            "type": "boolean"
-          },
-          "interval": {
-            "type": "number"
-          },
-          "timeout": {
-            "type": "number"
-          }
-        },
-        "required": [
-          "enabled",
-          "interval",
-          "timeout"
-        ],
-        "type": "object"
-      },
      "ManualJobName": {
        "enum": [
          "person-cleanup",
@@ -16414,9 +16395,6 @@
      },
      "SystemConfigMachineLearningDto": {
        "properties": {
-          "availabilityChecks": {
-            "$ref": "#/components/schemas/MachineLearningAvailabilityChecksDto"
-          },
          "clip": {
            "$ref": "#/components/schemas/CLIPConfig"
          },
@@ -16429,6 +16407,11 @@
          "facialRecognition": {
            "$ref": "#/components/schemas/FacialRecognitionConfig"
          },
+          "url": {
+            "deprecated": true,
+            "description": "This property was deprecated in v1.122.0",
+            "type": "string"
+          },
          "urls": {
            "format": "uri",
            "items": {
@@ -16440,7 +16423,6 @@
          }
        },
        "required": [
-          "availabilityChecks",
          "clip",
          "duplicateDetection",
          "enabled",
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/sdk",
-  "version": "1.143.0",
+  "version": "1.142.1",
  "description": "Auto-generated TypeScript SDK for the Immich API",
  "type": "module",
  "main": "./build/index.js",
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1,6 +1,6 @@
 /**
 * Immich
- * 1.143.0
+ * 1.142.1
 * DO NOT MODIFY - This file has been generated using oazapfts.
 * See https://www.npmjs.com/package/oazapfts
 */
@@ -1383,11 +1383,6 @@ export type SystemConfigLoggingDto = {
    enabled: boolean;
    level: LogLevel;
 };
-export type MachineLearningAvailabilityChecksDto = {
-    enabled: boolean;
-    interval: number;
-    timeout: number;
-};
 export type ClipConfig = {
    enabled: boolean;
    modelName: string;
@@ -1404,11 +1399,12 @@ export type FacialRecognitionConfig = {
    modelName: string;
 };
 export type SystemConfigMachineLearningDto = {
-    availabilityChecks: MachineLearningAvailabilityChecksDto;
    clip: ClipConfig;
    duplicateDetection: DuplicateDetectionConfig;
    enabled: boolean;
    facialRecognition: FacialRecognitionConfig;
+    /** This property was deprecated in v1.122.0 */
+    url?: string;
    urls: string[];
 };
 export type SystemConfigMapDto = {
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "version": "0.0.1",
  "description": "Monorepo for Immich",
  "private": true,
-  "packageManager": "pnpm@10.15.1+sha512.34e538c329b5553014ca8e8f4535997f96180a1d0f614339357449935350d924e22f8614682191264ec33d1462ac21561aff97f6bb18065351c162c7e8f6de67",
+  "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
  "engines": {
    "pnpm": ">=10.0.0"
  }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/immich-app/base-server-dev:202509210934@sha256:b5ce2d7eaf379d4cf15efd4bab180d8afc8a80d20b36c9800f4091aca6ae267e AS builder
+FROM ghcr.io/immich-app/base-server-dev:202509091104@sha256:4f9275330f1e49e7ce9840758ea91839052fe6ed40972d5bb97a9af857fa956a AS builder
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
  CI=1 \
  COREPACK_HOME=/tmp
@@ -33,7 +33,7 @@ RUN pnpm --filter @immich/sdk --filter @immich/cli --frozen-lockfile install &&
  pnpm --filter @immich/sdk --filter @immich/cli build && \
  pnpm --filter @immich/cli --prod --no-optional deploy /output/cli-pruned

-FROM ghcr.io/immich-app/base-server-prod:202509210934@sha256:0c7eacf0ba88ca52e1a267cfc62d20d07792ea2c604818c2cbd37dc7dcefdac9
+FROM ghcr.io/immich-app/base-server-prod:202509091104@sha256:d1ccbac24c84f2f8277cf85281edfca62d85d7daed6a62b8efd3a81bcd3c5e0e

 WORKDIR /usr/src/app
 ENV NODE_ENV=production \
--- a/server/Dockerfile.dev
+++ b/server/Dockerfile.dev
@@ -1,5 +1,5 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:202509210934@sha256:b5ce2d7eaf379d4cf15efd4bab180d8afc8a80d20b36c9800f4091aca6ae267e AS dev
+FROM ghcr.io/immich-app/base-server-dev:202509091104@sha256:4f9275330f1e49e7ce9840758ea91839052fe6ed40972d5bb97a9af857fa956a AS dev

 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
  CI=1 \
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich",
-  "version": "1.143.0",
+  "version": "1.142.1",
  "description": "",
  "author": "",
  "private": true,
@@ -44,14 +44,14 @@
    "@nestjs/websockets": "^11.0.4",
    "@opentelemetry/api": "^1.9.0",
    "@opentelemetry/context-async-hooks": "^2.0.0",
-    "@opentelemetry/exporter-prometheus": "^0.205.0",
-    "@opentelemetry/instrumentation-http": "^0.205.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.53.0",
-    "@opentelemetry/instrumentation-nestjs-core": "^0.51.0",
-    "@opentelemetry/instrumentation-pg": "^0.58.0",
+    "@opentelemetry/exporter-prometheus": "^0.203.0",
+    "@opentelemetry/instrumentation-http": "^0.203.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.51.0",
+    "@opentelemetry/instrumentation-nestjs-core": "^0.49.0",
+    "@opentelemetry/instrumentation-pg": "^0.56.0",
    "@opentelemetry/resources": "^2.0.1",
    "@opentelemetry/sdk-metrics": "^2.0.1",
-    "@opentelemetry/sdk-node": "^0.205.0",
+    "@opentelemetry/sdk-node": "^0.203.0",
    "@opentelemetry/semantic-conventions": "^1.34.0",
    "@react-email/components": "^0.5.0",
    "@react-email/render": "^1.1.2",
--- a/server/src/bin/sync-sql.ts
+++ b/server/src/bin/sync-sql.ts
@@ -15,7 +15,6 @@ import { repositories } from 'src/repositories';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
-import { MachineLearningRepository } from 'src/repositories/machine-learning.repository';
 import { SyncRepository } from 'src/repositories/sync.repository';
 import { AuthService } from 'src/services/auth.service';
 import { getKyselyConfig } from 'src/utils/database';
@@ -58,7 +57,7 @@ class SqlGenerator {
    try {
      await this.setup();
      for (const Repository of repositories) {
-        if (Repository === LoggingRepository || Repository === MachineLearningRepository) {
+        if (Repository === LoggingRepository) {
          continue;
        }
        await this.process(Repository);
--- a/server/src/config.ts
+++ b/server/src/config.ts
@@ -54,11 +54,6 @@ export interface SystemConfig {
  machineLearning: {
    enabled: boolean;
    urls: string[];
-    availabilityChecks: {
-      enabled: boolean;
-      timeout: number;
-      interval: number;
-    };
    clip: {
      enabled: boolean;
      modelName: string;
@@ -181,8 +176,6 @@ export interface SystemConfig {
  };
 }

-export type MachineLearningConfig = SystemConfig['machineLearning'];
-
 export const defaults = Object.freeze<SystemConfig>({
  backup: {
    database: {
@@ -234,11 +227,6 @@ export const defaults = Object.freeze<SystemConfig>({
  machineLearning: {
    enabled: process.env.IMMICH_MACHINE_LEARNING_ENABLED !== 'false',
    urls: [process.env.IMMICH_MACHINE_LEARNING_URL || 'http://immich-machine-learning:3003'],
-    availabilityChecks: {
-      enabled: true,
-      timeout: Number(process.env.IMMICH_MACHINE_LEARNING_PING_TIMEOUT) || 2000,
-      interval: 30_000,
-    },
    clip: {
      enabled: true,
      modelName: 'ViT-B-32__openai',
--- a/server/src/constants.ts
+++ b/server/src/constants.ts
@@ -51,6 +51,11 @@ export const serverVersion = new SemVer(version);
 export const AUDIT_LOG_MAX_DURATION = Duration.fromObject({ days: 100 });
 export const ONE_HOUR = Duration.fromObject({ hours: 1 });

+export const MACHINE_LEARNING_PING_TIMEOUT = Number(process.env.MACHINE_LEARNING_PING_TIMEOUT || 2000);
+export const MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME = Number(
+  process.env.MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME || 30_000,
+);
+
 export const citiesFile = 'cities500.txt';
 export const reverseGeocodeMaxDistance = 25_000;

--- a/server/src/dtos/search.dto.ts
+++ b/server/src/dtos/search.dto.ts
@@ -6,7 +6,7 @@ import { PropertyLifecycle } from 'src/decorators';
 import { AlbumResponseDto } from 'src/dtos/album.dto';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AssetOrder, AssetType, AssetVisibility } from 'src/enum';
-import { Optional, ValidateBoolean, ValidateDate, ValidateEnum, ValidateString, ValidateUUID } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateDate, ValidateEnum, ValidateUUID } from 'src/validation';

 class BaseSearchDto {
  @ValidateUUID({ optional: true, nullable: true })
@@ -144,7 +144,9 @@ export class MetadataSearchDto extends RandomSearchDto {
  @Optional()
  deviceAssetId?: string;

-  @ValidateString({ optional: true, trim: true })
+  @IsString()
+  @IsNotEmpty()
+  @Optional()
  description?: string;

  @IsString()
@@ -152,7 +154,9 @@ export class MetadataSearchDto extends RandomSearchDto {
  @Optional()
  checksum?: string;

-  @ValidateString({ optional: true, trim: true })
+  @IsString()
+  @IsNotEmpty()
+  @Optional()
  originalFileName?: string;

  @IsString()
@@ -186,12 +190,16 @@ export class MetadataSearchDto extends RandomSearchDto {
 }

 export class StatisticsSearchDto extends BaseSearchDto {
-  @ValidateString({ optional: true, trim: true })
+  @IsString()
+  @IsNotEmpty()
+  @Optional()
  description?: string;
 }

 export class SmartSearchDto extends BaseSearchWithResultsDto {
-  @ValidateString({ optional: true, trim: true })
+  @IsString()
+  @IsNotEmpty()
+  @Optional()
  query?: string;

  @ValidateUUID({ optional: true })
--- a/server/src/dtos/system-config.dto.ts
+++ b/server/src/dtos/system-config.dto.ts
@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
+import { Exclude, Transform, Type } from 'class-transformer';
 import {
  ArrayMinSize,
  IsInt,
@@ -15,6 +15,7 @@ import {
  ValidateNested,
 } from 'class-validator';
 import { SystemConfig } from 'src/config';
+import { PropertyLifecycle } from 'src/decorators';
 import { CLIPConfig, DuplicateDetectionConfig, FacialRecognitionConfig } from 'src/dtos/model-config.dto';
 import {
  AudioCodec,
@@ -256,32 +257,21 @@ class SystemConfigLoggingDto {
  level!: LogLevel;
 }

-class MachineLearningAvailabilityChecksDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @IsInt()
-  timeout!: number;
-
-  @IsInt()
-  interval!: number;
-}
-
 class SystemConfigMachineLearningDto {
  @ValidateBoolean()
  enabled!: boolean;

+  @PropertyLifecycle({ deprecatedAt: 'v1.122.0' })
+  @Exclude()
+  url?: string;
+
  @IsUrl({ require_tld: false, allow_underscores: true }, { each: true })
  @ArrayMinSize(1)
+  @Transform(({ obj, value }) => (obj.url ? [obj.url] : value))
  @ValidateIf((dto) => dto.enabled)
  @ApiProperty({ type: 'array', items: { type: 'string', format: 'uri' }, minItems: 1 })
  urls!: string[];

-  @Type(() => MachineLearningAvailabilityChecksDto)
-  @ValidateNested()
-  @IsObject()
-  availabilityChecks!: MachineLearningAvailabilityChecksDto;
-
  @Type(() => CLIPConfig)
  @ValidateNested()
  @IsObject()
--- a/server/src/repositories/logging.repository.ts
+++ b/server/src/repositories/logging.repository.ts
@@ -142,10 +142,6 @@ export class LoggingRepository {
    this.handleMessage(LogLevel.Fatal, message, details);
  }

-  deprecate(message: string) {
-    this.warn(`[Deprecated] ${message}`);
-  }
-
  private handleFunction(level: LogLevel, message: LogFunction, details: LogDetails[]) {
    if (this.logger.isLevelEnabled(level)) {
      this.handleMessage(level, message(), details);
--- a/server/src/repositories/machine-learning.repository.ts
+++ b/server/src/repositories/machine-learning.repository.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { Duration } from 'luxon';
 import { readFile } from 'node:fs/promises';
-import { MachineLearningConfig } from 'src/config';
+import { MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME, MACHINE_LEARNING_PING_TIMEOUT } from 'src/constants';
 import { CLIPConfig } from 'src/dtos/model-config.dto';
 import { LoggingRepository } from 'src/repositories/logging.repository';

@@ -58,100 +57,82 @@ export type TextEncodingOptions = ModelOptions & { language?: string };

@Injectable()
 export class MachineLearningRepository {
-  private healthyMap: Record<string, boolean> = {};
-  private interval?: ReturnType<typeof setInterval>;
-  private _config?: MachineLearningConfig;
-
-  private get config(): MachineLearningConfig {
-    if (!this._config) {
-      throw new Error('Machine learning repository not been setup');
-    }
-
-    return this._config;
-  }
+  // Note that deleted URL's are not removed from this map (ie: they're leaked)
+  // Cleaning them up is low priority since there should be very few over a
+  // typical server uptime cycle
+  private urlAvailability: {
+    [url: string]:
+      | {
+          active: boolean;
+          lastChecked: number;
+        }
+      | undefined;
+  };

  constructor(private logger: LoggingRepository) {
    this.logger.setContext(MachineLearningRepository.name);
+    this.urlAvailability = {};
  }

-  setup(config: MachineLearningConfig) {
-    this._config = config;
-    this.teardown();
-
-    // delete old servers
-    for (const url of Object.keys(this.healthyMap)) {
-      if (!config.urls.includes(url)) {
-        delete this.healthyMap[url];
-      }
+  private setUrlAvailability(url: string, active: boolean) {
+    const current = this.urlAvailability[url];
+    if (current?.active !== active) {
+      this.logger.verbose(`Setting ${url} ML server to ${active ? 'active' : 'inactive'}.`);
    }
-
-    if (!config.availabilityChecks.enabled) {
-      return;
-    }
-
-    this.tick();
-    this.interval = setInterval(
-      () => this.tick(),
-      Duration.fromObject({ milliseconds: config.availabilityChecks.interval }).as('milliseconds'),
-    );
+    this.urlAvailability[url] = {
+      active,
+      lastChecked: Date.now(),
+    };
  }

-  teardown() {
-    if (this.interval) {
-      clearInterval(this.interval);
-    }
-  }
-
-  private tick() {
-    for (const url of this.config.urls) {
-      void this.check(url);
-    }
-  }
-
-  private async check(url: string) {
-    let healthy = false;
+  private async checkAvailability(url: string) {
+    let active = false;
    try {
      const response = await fetch(new URL('/ping', url), {
-        signal: AbortSignal.timeout(this.config.availabilityChecks.timeout),
+        signal: AbortSignal.timeout(MACHINE_LEARNING_PING_TIMEOUT),
      });
-      if (response.ok) {
-        healthy = true;
-      }
+      active = response.ok;
    } catch {
      // nothing to do here
    }
-
-    this.setHealthy(url, healthy);
+    this.setUrlAvailability(url, active);
+    return active;
  }

-  private setHealthy(url: string, healthy: boolean) {
-    if (this.healthyMap[url] !== healthy) {
-      this.logger.log(`Machine learning server became ${healthy ? 'healthy' : 'unhealthy'} (${url}).`);
+  private async shouldSkipUrl(url: string) {
+    const availability = this.urlAvailability[url];
+    if (availability === undefined) {
+      // If this is a new endpoint, then check inline and skip if it fails
+      if (!(await this.checkAvailability(url))) {
+        return true;
+      }
+      return false;
    }
-
-    this.healthyMap[url] = healthy;
-  }
-
-  private isHealthy(url: string) {
-    if (!this.config.availabilityChecks.enabled) {
+    if (!availability.active && Date.now() - availability.lastChecked < MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME) {
+      // If this is an old inactive endpoint that hasn't been checked in a
+      // while then check but don't wait for the result, just skip it
+      // This avoids delays on every search whilst allowing higher priority
+      // ML servers to recover over time.
+      void this.checkAvailability(url);
      return true;
    }
-
-    return this.healthyMap[url];
+    return false;
  }

-  private async predict<T>(payload: ModelPayload, config: MachineLearningRequest): Promise<T> {
+  private async predict<T>(urls: string[], payload: ModelPayload, config: MachineLearningRequest): Promise<T> {
    const formData = await this.getFormData(payload, config);
+    let urlCounter = 0;
+    for (const url of urls) {
+      urlCounter++;
+      const isLast = urlCounter >= urls.length;
+      if (!isLast && (await this.shouldSkipUrl(url))) {
+        continue;
+      }

-    for (const url of [
-      // try healthy servers first
-      ...this.config.urls.filter((url) => this.isHealthy(url)),
-      ...this.config.urls.filter((url) => !this.isHealthy(url)),
-    ]) {
      try {
        const response = await fetch(new URL('/predict', url), { method: 'POST', body: formData });
        if (response.ok) {
-          this.setHealthy(url, true);
+          this.setUrlAvailability(url, true);
          return response.json();
        }

@@ -163,21 +144,20 @@ export class MachineLearningRepository {
          `Machine learning request to "${url}" failed: ${error instanceof Error ? error.message : error}`,
        );
      }
-
-      this.setHealthy(url, false);
+      this.setUrlAvailability(url, false);
    }

    throw new Error(`Machine learning request '${JSON.stringify(config)}' failed for all URLs`);
  }

-  async detectFaces(imagePath: string, { modelName, minScore }: FaceDetectionOptions) {
+  async detectFaces(urls: string[], imagePath: string, { modelName, minScore }: FaceDetectionOptions) {
    const request = {
      [ModelTask.FACIAL_RECOGNITION]: {
        [ModelType.DETECTION]: { modelName, options: { minScore } },
        [ModelType.RECOGNITION]: { modelName },
      },
    };
-    const response = await this.predict<FacialRecognitionResponse>({ imagePath }, request);
+    const response = await this.predict<FacialRecognitionResponse>(urls, { imagePath }, request);
    return {
      imageHeight: response.imageHeight,
      imageWidth: response.imageWidth,
@@ -185,15 +165,15 @@ export class MachineLearningRepository {
    };
  }

-  async encodeImage(imagePath: string, { modelName }: CLIPConfig) {
+  async encodeImage(urls: string[], imagePath: string, { modelName }: CLIPConfig) {
    const request = { [ModelTask.SEARCH]: { [ModelType.VISUAL]: { modelName } } };
-    const response = await this.predict<ClipVisualResponse>({ imagePath }, request);
+    const response = await this.predict<ClipVisualResponse>(urls, { imagePath }, request);
    return response[ModelTask.SEARCH];
  }

-  async encodeText(text: string, { language, modelName }: TextEncodingOptions) {
+  async encodeText(urls: string[], text: string, { language, modelName }: TextEncodingOptions) {
    const request = { [ModelTask.SEARCH]: { [ModelType.TEXTUAL]: { modelName, options: { language } } } };
-    const response = await this.predict<ClipTextualResponse>({ text }, request);
+    const response = await this.predict<ClipTextualResponse>(urls, { text }, request);
    return response[ModelTask.SEARCH];
  }

--- a/server/src/repositories/media.repository.ts
+++ b/server/src/repositories/media.repository.ts
@@ -57,28 +57,28 @@ export class MediaRepository {
      const buffer = await exiftool.extractBinaryTagToBuffer('JpgFromRaw2', input);
      return { buffer, format: RawExtractedFormat.Jpeg };
    } catch (error: any) {
-      this.logger.debug(`Could not extract JpgFromRaw2 buffer from image, trying JPEG from RAW next: ${error}`);
+      this.logger.debug('Could not extract JpgFromRaw2 buffer from image, trying JPEG from RAW next', error.message);
    }

    try {
      const buffer = await exiftool.extractBinaryTagToBuffer('JpgFromRaw', input);
      return { buffer, format: RawExtractedFormat.Jpeg };
    } catch (error: any) {
-      this.logger.debug(`Could not extract JPEG buffer from image, trying PreviewJXL next: ${error}`);
+      this.logger.debug('Could not extract JPEG buffer from image, trying PreviewJXL next', error.message);
    }

    try {
      const buffer = await exiftool.extractBinaryTagToBuffer('PreviewJXL', input);
      return { buffer, format: RawExtractedFormat.Jxl };
    } catch (error: any) {
-      this.logger.debug(`Could not extract PreviewJXL buffer from image, trying PreviewImage next: ${error}`);
+      this.logger.debug('Could not extract PreviewJXL buffer from image, trying PreviewImage next', error.message);
    }

    try {
      const buffer = await exiftool.extractBinaryTagToBuffer('PreviewImage', input);
      return { buffer, format: RawExtractedFormat.Jpeg };
    } catch (error: any) {
-      this.logger.debug(`Could not extract preview buffer from image: ${error}`);
+      this.logger.debug('Could not extract preview buffer from image', error.message);
      return null;
    }
  }
--- a/server/src/repositories/metadata.repository.ts
+++ b/server/src/repositories/metadata.repository.ts
@@ -103,7 +103,7 @@ export class MetadataRepository {

  readTags(path: string): Promise<ImmichTags> {
    return this.exiftool.read(path).catch((error) => {
-      this.logger.warn(`Error reading exif data (${path}): ${error}\n${error?.stack}`);
+      this.logger.warn(`Error reading exif data (${path}): ${error}`, error?.stack);
      return {};
    }) as Promise<ImmichTags>;
  }
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -344,7 +344,7 @@ export class AuthService extends BaseService {
        await this.jobRepository.queue({ name: JobName.FileDelete, data: { files: [oldPath] } });
      }
    } catch (error: Error | any) {
-      this.logger.warn(`Unable to sync oauth profile picture: ${error}\n${error?.stack}`);
+      this.logger.warn(`Unable to sync oauth profile picture: ${error}`, error?.stack);
    }
  }

--- a/server/src/services/backup.service.ts
+++ b/server/src/services/backup.service.ts
@@ -132,12 +132,12 @@ export class BackupService extends BaseService {
        gzip.stdout.pipe(fileStream);

        pgdump.on('error', (err) => {
-          this.logger.error(`Backup failed with error: ${err}`);
+          this.logger.error('Backup failed with error', err);
          reject(err);
        });

        gzip.on('error', (err) => {
-          this.logger.error(`Gzip failed with error: ${err}`);
+          this.logger.error('Gzip failed with error', err);
          reject(err);
        });

@@ -175,10 +175,10 @@ export class BackupService extends BaseService {
      });
      await this.storageRepository.rename(backupFilePath, backupFilePath.replace('.tmp', ''));
    } catch (error) {
-      this.logger.error(`Database Backup Failure: ${error}`);
+      this.logger.error('Database Backup Failure', error);
      await this.storageRepository
        .unlink(backupFilePath)
-        .catch((error) => this.logger.error(`Failed to delete failed backup file: ${error}`));
+        .catch((error) => this.logger.error('Failed to delete failed backup file', error));
      throw error;
    }

--- a/server/src/services/library.service.ts
+++ b/server/src/services/library.service.ts
@@ -245,7 +245,7 @@ export class LibraryService extends BaseService {
      job.paths.map((path) =>
        this.processEntity(path, library.ownerId, job.libraryId)
          .then((asset) => assetImports.push(asset))
-          .catch((error: any) => this.logger.error(`Error processing ${path} for library ${job.libraryId}: ${error}`)),
+          .catch((error: any) => this.logger.error(`Error processing ${path} for library ${job.libraryId}`, error)),
      ),
    );

--- a/server/src/services/memory.service.ts
+++ b/server/src/services/memory.service.ts
@@ -40,7 +40,7 @@ export class MemoryService extends BaseService {
        try {
          await Promise.all(users.map((owner, i) => this.createOnThisDayMemories(owner.id, usersIds[i], target)));
        } catch (error) {
-          this.logger.error(`Failed to create memories for ${target.toISO()}: ${error}`);
+          this.logger.error(`Failed to create memories for ${target.toISO()}`, error);
        }
        // update system metadata even when there is an error to minimize the chance of duplicates
        await this.systemMetadataRepository.set(SystemMetadataKey.MemoriesState, {
--- a/server/src/services/person.service.spec.ts
+++ b/server/src/services/person.service.spec.ts
@@ -729,6 +729,7 @@ describe(PersonService.name, () => {
      mocks.assetJob.getForDetectFacesJob.mockResolvedValue({ ...assetStub.image, files: [assetStub.image.files[1]] });
      await sut.handleDetectFaces({ id: assetStub.image.id });
      expect(mocks.machineLearning.detectFaces).toHaveBeenCalledWith(
+        ['http://immich-machine-learning:3003'],
        '/uploads/user-id/thumbs/path.jpg',
        expect.objectContaining({ minScore: 0.7, modelName: 'buffalo_l' }),
      );
--- a/server/src/services/person.service.ts
+++ b/server/src/services/person.service.ts
@@ -316,6 +316,7 @@ export class PersonService extends BaseService {
    }

    const { imageHeight, imageWidth, faces } = await this.machineLearningRepository.detectFaces(
+      machineLearning.urls,
      previewFile.path,
      machineLearning.facialRecognition,
    );
--- a/server/src/services/search.service.spec.ts
+++ b/server/src/services/search.service.spec.ts
@@ -211,6 +211,7 @@ describe(SearchService.name, () => {
      await sut.searchSmart(authStub.user1, { query: 'test' });

      expect(mocks.machineLearning.encodeText).toHaveBeenCalledWith(
+        [expect.any(String)],
        'test',
        expect.objectContaining({ modelName: expect.any(String) }),
      );
@@ -224,6 +225,7 @@ describe(SearchService.name, () => {
      await sut.searchSmart(authStub.user1, { query: 'test', page: 2, size: 50 });

      expect(mocks.machineLearning.encodeText).toHaveBeenCalledWith(
+        [expect.any(String)],
        'test',
        expect.objectContaining({ modelName: expect.any(String) }),
      );
@@ -241,6 +243,7 @@ describe(SearchService.name, () => {
      await sut.searchSmart(authStub.user1, { query: 'test' });

      expect(mocks.machineLearning.encodeText).toHaveBeenCalledWith(
+        [expect.any(String)],
        'test',
        expect.objectContaining({ modelName: 'ViT-B-16-SigLIP__webli' }),
      );
@@ -250,6 +253,7 @@ describe(SearchService.name, () => {
      await sut.searchSmart(authStub.user1, { query: 'test', language: 'de' });

      expect(mocks.machineLearning.encodeText).toHaveBeenCalledWith(
+        [expect.any(String)],
        'test',
        expect.objectContaining({ language: 'de' }),
      );
--- a/server/src/services/search.service.ts
+++ b/server/src/services/search.service.ts
@@ -118,7 +118,7 @@ export class SearchService extends BaseService {
      const key = machineLearning.clip.modelName + dto.query + dto.language;
      embedding = this.embeddingCache.get(key);
      if (!embedding) {
-        embedding = await this.machineLearningRepository.encodeText(dto.query, {
+        embedding = await this.machineLearningRepository.encodeText(machineLearning.urls, dto.query, {
          modelName: machineLearning.clip.modelName,
          language: dto.language,
        });
--- a/server/src/services/smart-info.service.spec.ts
+++ b/server/src/services/smart-info.service.spec.ts
@@ -205,6 +205,7 @@ describe(SmartInfoService.name, () => {
      expect(await sut.handleEncodeClip({ id: assetStub.image.id })).toEqual(JobStatus.Success);

      expect(mocks.machineLearning.encodeImage).toHaveBeenCalledWith(
+        ['http://immich-machine-learning:3003'],
        '/uploads/user-id/thumbs/path.jpg',
        expect.objectContaining({ modelName: 'ViT-B-32__openai' }),
      );
@@ -241,6 +242,7 @@ describe(SmartInfoService.name, () => {

      expect(mocks.database.wait).toHaveBeenCalledWith(512);
      expect(mocks.machineLearning.encodeImage).toHaveBeenCalledWith(
+        ['http://immich-machine-learning:3003'],
        '/uploads/user-id/thumbs/path.jpg',
        expect.objectContaining({ modelName: 'ViT-B-32__openai' }),
      );
--- a/server/src/services/smart-info.service.ts
+++ b/server/src/services/smart-info.service.ts
@@ -108,7 +108,11 @@ export class SmartInfoService extends BaseService {
      return JobStatus.Skipped;
    }

-    const embedding = await this.machineLearningRepository.encodeImage(asset.files[0].path, machineLearning.clip);
+    const embedding = await this.machineLearningRepository.encodeImage(
+      machineLearning.urls,
+      asset.files[0].path,
+      machineLearning.clip,
+    );

    if (this.databaseRepository.isBusy(DatabaseLock.CLIPDimSize)) {
      this.logger.verbose(`Waiting for CLIP dimension size to be updated`);
--- a/server/src/services/storage-template.service.ts
+++ b/server/src/services/storage-template.service.ts
@@ -338,7 +338,7 @@ export class StorageTemplateService extends BaseService {

      return destination;
    } catch (error: any) {
-      this.logger.error(`Unable to get template path for ${filename}: ${error}`);
+      this.logger.error(`Unable to get template path for ${filename}`, error);
      return asset.originalPath;
    }
  }
--- a/Show More
+++ b/Show More