feat(mobile): stack original + edited photo on ios

Detect an iOS edit, upload the unedited original, and stack the edited version on top of it. Reverting in Photos flips the stack cover back to the original and keeps the edits. Adds an optional stackParentId field to the asset upload on the server.
2026-05-28 02:22:34 -04:00 · 2026-05-23 03:47:26 +06:00
200 changed files with 17593 additions and 3475 deletions
@@ -8,8 +8,6 @@ log "Preparing Immich Web Frontend"
 log ""
 run_cmd pnpm --filter @immich/sdk install
 run_cmd pnpm --filter @immich/sdk build
-run_cmd pnpm --filter @immich/plugin-sdk install
-run_cmd pnpm --filter @immich/plugin-sdk build
 run_cmd pnpm --filter immich-web install

 log "Starting Immich Web Frontend"
@@ -230,12 +230,8 @@ jobs:
      - name: Generate platform APIs
        run: mise //mobile:codegen:pigeon

-      - name: Resolve iOS Swift Packages
-        working-directory: ./mobile
-        run: flutter build ios --config-only --no-codesign
-
      - name: Setup Ruby
-        uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
+        uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1.307.0
        with:
          ruby-version: '3.3'
          bundler-cache: true
@@ -57,7 +57,7 @@ jobs:

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

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

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
+        uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
        with:
          category: '/language:${{matrix.language}}'
@@ -21,7 +21,7 @@ services:
    volumes:
      - ..:/usr/src/app
      # - ../../ui:/usr/src/ui
-      - build_cache:/buildcache
+      - pnpm_cache:/buildcache/pnpm_cache
      - server_node_modules:/usr/src/app/server/node_modules
      - web_node_modules:/usr/src/app/web/node_modules
      - github_node_modules:/usr/src/app/.github/node_modules
@@ -45,11 +45,11 @@ services:
      target: dev
    command:
      - |
-        mise install
+        pnpm install
        touch /tmp/init-complete
        exec tail -f /dev/null
    volumes:
-      - build_cache:/buildcache
+      - pnpm_store_server:/buildcache/pnpm-store
    restart: 'no'
    healthcheck:
      test: ['CMD', 'test', '-f', '/tmp/init-complete']
@@ -73,6 +73,7 @@ services:
    volumes:
      - ${UPLOAD_LOCATION}/photos:/data
      - /etc/localtime:/etc/localtime:ro
+      - pnpm_store_server:/buildcache/pnpm-store
      - ../packages/plugin-core:/build/plugins/immich-plugin-core
    env_file:
      - .env
@@ -121,6 +122,8 @@ services:
    ports:
      - 3000:3000
      - 24678:24678
+    volumes:
+      - pnpm_store_web:/buildcache/pnpm-store
    restart: unless-stopped
    depends_on:
      immich-init:
@@ -200,7 +203,9 @@ volumes:
  model_cache:
  prometheus_data:
  grafana_data:
-  build_cache:
+  pnpm_cache:
+  pnpm_store_server:
+  pnpm_store_web:
  server_node_modules:
  web_node_modules:
  github_node_modules:
@@ -26,8 +26,6 @@ For organizations seeking to resell Immich, we have established the following gu

 When in doubt or if you have an edge case scenario, we encourage you to contact us directly via email to discuss the use of our trademark. We can provide clear guidance on what is acceptable and what is not. You can reach out at: questions@immich.app

---
-
 ## User

 ### How can I reset the admin password?
@@ -38,10 +36,6 @@ The admin password can be reset by running the [reset-admin-password](/administr

 You can see the list of all users by running [list-users](/administration/server-commands.md) Command on the Immich-server.

-### How can I change my profile picture?
-
-View a single photo, press the three dots in the top-right to show context menu, and select "Set as profile picture". In the pop-up, use your mouse scroll wheel to zoom in the picture until it completely fills the circle. Click and drag the picture to align it to your liking. Press "Save" to save your changes.
-
 ---

 ## Mobile App
@@ -5,7 +5,7 @@ After making any changes in the `server/src/schema`, a database migration need t
 1. Run the command

 ```bash
-mise //server:migrations generate <migration-name>
+pnpm run migrations:generate <migration-name>
 ```

 2. Check if the migration file makes sense.
@@ -18,7 +18,7 @@ The server will automatically detect `*.ts` file changes and restart. Part of th
 If you need to undo the most recently applied migration—for example, when developing or testing on schema changes—run:

 ```bash
-mise //server:migrations revert
+pnpm run migrations:revert
 ```

 This command rolls back the latest migration and brings the database schema back to its previous state.
@@ -252,33 +252,44 @@ To connect the mobile app to your Dev Container:

 The Dev Container supports multiple ways to run tests:

+#### Using Mise Commands (Recommended)
+
 ```bash
-# Server
-mise //server:test          # unit tests
-mise //server:test-medium   # medium / integration tests
-
-# Web
-mise //web:test             # unit tests
-
-# E2E
-mise //e2e:test             # API tests
-mise //e2e:test-web         # web UI tests (Playwright)
-
-# Run all checks for a component
-mise //server:checklist
-mise //web:checklist
+# Run tests for specific components
+mise run checklist      # in `server/`, `web/`, `packages/cli`
 ```

-### Additional Commands
+#### Using PNPM Directly
+
+```bash
+# Server tests
+cd /workspaces/immich/server
+pnpm test               # Run all tests
+pnpm run test:medium    # Medium tests (integration tests)
+pnpm run test:watch     # Watch mode
+pnpm run test:cov       # Coverage report
+
+# Web tests
+cd /workspaces/immich/web
+pnpm test               # Run all tests
+pnpm run test:watch     # Watch mode
+
+# E2E tests
+cd /workspaces/immich/e2e
+pnpm run test           # Run API tests
+pnpm run test:web       # Run web UI tests
+```
+
+### Additional Make Commands

 ```bash
 # API generation
-mise //:open-api             # Generate OpenAPI specs
-mise //:open-api-typescript  # Generate TypeScript SDK
-mise //:open-api-dart        # Generate Dart SDK
+make open-api           # Generate OpenAPI specs
+make open-api-typescript # Generate TypeScript SDK
+make open-api-dart      # Generate Dart SDK

 # Database
-mise //server:sql            # Sync database schema
+mise sql                # Sync database schema
 ```

 ### Debugging
@@ -8,42 +8,34 @@ When contributing code through a pull request, please check the following:

 ## Web Checks

- [ ] `mise //web:lint` (linting via ESLint)
- [ ] `mise //web:format` (formatting via Prettier)
- [ ] `mise //web:check-svelte` (type checking via SvelteKit)
- [ ] `mise //web:check-typescript` (type checking via `tsc`)
- [ ] `mise //web:test` (unit tests)
+- [ ] `pnpm run lint` (linting via ESLint)
+- [ ] `pnpm run format` (formatting via Prettier)
+- [ ] `pnpm run check:svelte` (Type checking via SvelteKit)
+- [ ] `pnpm run check:typescript` (check typescript)
+- [ ] `pnpm test` (unit tests)

 :::tip AIO
-Run all web checks with `mise //web:checklist`
-:::
-
-:::tip Auto Fix
-Use `mise //web:lint-fix` and `mise //web:format-fix` to automatically correct some issues.
+Run all web checks with `pnpm run check:all`
 :::

 ## Documentation

- [ ] `mise //docs:format` (formatting via Prettier)
+- [ ] `pnpm run format` (formatting via Prettier)
 - [ ] Update the `_redirects` file if you have renamed a page or removed it from the documentation.

-:::tip Auto Fix
-Use `mise //docs:format-fix` to automatically fix formatting.
-:::
-
 ## Server Checks

- [ ] `mise //server:lint` (linting via ESLint)
- [ ] `mise //server:format` (formatting via Prettier)
- [ ] `mise //server:check` (type checking via `tsc`)
- [ ] `mise //server:test` (unit tests)
+- [ ] `pnpm run lint` (linting via ESLint)
+- [ ] `pnpm run format` (formatting via Prettier)
+- [ ] `pnpm run check` (Type checking via `tsc`)
+- [ ] `pnpm test` (unit tests)

 :::tip AIO
-Run all server checks with `mise //server:checklist`
+Run all server checks with `pnpm run check:all`
 :::

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

 ## Mobile Checklist
@@ -61,17 +53,6 @@ Run all these commands at once with `mise //mobile:checklist`
 You can use `mise //mobile:lint-fix` to potentially correct some issues automatically for `mise //mobile:lint`.
 :::

-## Machine Learning Checklist
-
- [ ] `mise //machine-learning:lint` (linting via ruff)
- [ ] `mise //machine-learning:format` (formatting via ruff)
- [ ] `mise //machine-learning:check` (type checking via mypy)
- [ ] `mise //machine-learning:test` (unit tests via pytest)
-
-:::tip AIO
-Run all machine learning checks with `mise //machine-learning:checklist`
-:::
-
 ## OpenAPI

 The OpenAPI client libraries need to be regenerated whenever there are changes to the `immich-openapi-specs.json` file. Note that you should not modify this file directly as it is auto-generated. See [OpenAPI](/api.md) for more details.
@@ -32,10 +32,6 @@ This environment includes the services below. Additional details are available i

 All the services are packaged to run as with single Docker Compose command.

-:::tip mise
-[mise](https://mise.jdx.dev) is used throughout the project to manage tool versions and run tasks. [Install mise](https://mise.jdx.dev/installing-mise.html), then from the repo root run `mise trust` and `mise install` to get all required tools. Tasks for each service can be run from the repo root using `mise //namespace:task` (e.g. `mise //server:lint`). To list all available tasks, run `mise tasks ls --all`.
-:::
-
 ### Server and web apps

 1. Clone the project repo.
@@ -60,23 +56,22 @@ You can access the web from `http://your-machine-ip:3000` or `http://localhost:3

 #### Connect web to a remote backend

-If you only want to do web development connected to an existing, remote backend, run from the repo root:
+If you only want to do web development connected to an existing, remote backend, follow these steps:
+
+1. Build the Immich SDK - `pnpm --filter @immich/sdk install && pnpm --filter @immich/sdk build`
+2. Enter the web directory - `cd web/`
+3. Install web dependencies - `pnpm i`
+4. Start the web development server

 ```bash
-IMMICH_SERVER_URL=https://demo.immich.app/ mise //web:start
-```
-
-This will install all dependencies (including the SDK) and start the dev server in one step. To connect to the hosted demo server specifically, use the shorthand:
-
-```bash
-mise //web:start-demo
+IMMICH_SERVER_URL=https://demo.immich.app/ pnpm run dev
 ```

 If you're using PowerShell on Windows you may need to set the env var separately like so:

 ```powershell
 $env:IMMICH_SERVER_URL = "https://demo.immich.app/"
-mise //web:start
+pnpm run dev
 ```

 #### `@immich/ui`
@@ -95,16 +90,20 @@ To see local changes to `@immich/ui` in Immich, do the following:

 #### Setup

-1. Run `mise //mobile:install` to install Flutter dependencies.
-2. Run `mise //mobile:translation` to generate the translation file.
-3. Change to the `mobile/` directory and run `flutter run` to start the app.
+1. [Install mise](https://mise.jdx.dev/installing-mise.html).
+2. Change to the immich (root) directory and trust the mise config with `mise trust`.
+3. Install tools with mise: `mise install`.
+4. Change to the `mobile/` directory.
+5. Run `flutter pub get` to install the dependencies.
+6. Run `make translation` to generate the translation file.
+7. Run `flutter run` to start the app.

 #### Translation

-To add a new translation text, enter the key-value pair in the `i18n/en.json` in the root of the immich project. Then run:
+To add a new translation text, enter the key-value pair in the `i18n/en.json` in the root of the immich project. Then, from the `mobile/` directory, run

 ```bash
-mise //mobile:translation
+make translation
 ```

 The mobile app asks you what backend to connect to. You can utilize the demo backend (https://demo.immich.app/) if you don't need to change server code or upload photos. Alternatively, you can run the server yourself per the instructions above.
@@ -4,8 +4,8 @@

 ### Unit tests

-Unit tests are run with `mise //server:test`.
-You need to run `mise //server:install` before _once_.
+Unit are run by calling `pnpm run test` from the `server/` directory.
+You need to run `pnpm install` (in `server/`) before _once_.

 ### End to end tests

@@ -17,7 +17,8 @@ make e2e

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

- `mise //e2e:ci-setup` (installs e2e, SDK, and CLI dependencies)
+- `pnpm install`
+- `pnpm --filter @immich/sdk --filter @immich/cli build`
 - `mise //:open-api`

 Once the test environment is running, the e2e tests can be run via:
@@ -154,33 +154,33 @@ Redis (Sentinel) URL example JSON before encoding:

 ## Machine Learning

-| Variable                                                    | Description                                                                                                                                                  |           Default            | Containers       |
-| :---------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------: | :--------------- |
-| `MACHINE_LEARNING_MODEL_TTL`                                | Inactivity time (s) before a model is unloaded (disabled if \<= 0)                                                                                           |            `300`             | machine learning |
-| `MACHINE_LEARNING_MODEL_TTL_POLL_S`                         | Interval (s) between checks for the model TTL (disabled if \<= 0)                                                                                            |             `10`             | machine learning |
-| `MACHINE_LEARNING_CACHE_FOLDER`                             | Directory where models are downloaded                                                                                                                        |           `/cache`           | machine learning |
-| `MACHINE_LEARNING_REQUEST_THREADS`<sup>\*1</sup>            | Thread count of the request thread pool (disabled if \<= 0)                                                                                                  |     number of CPU cores      | machine learning |
-| `MACHINE_LEARNING_MODEL_INTER_OP_THREADS`                   | Number of parallel model operations                                                                                                                          |             `1`              | machine learning |
-| `MACHINE_LEARNING_MODEL_INTRA_OP_THREADS`                   | Number of threads for each model operation                                                                                                                   |             `2`              | machine learning |
-| `MACHINE_LEARNING_WORKERS`<sup>\*2</sup>                    | Number of worker processes to spawn                                                                                                                          |             `1`              | machine learning |
-| `MACHINE_LEARNING_HTTP_KEEPALIVE_TIMEOUT_S`<sup>\*3</sup>   | HTTP Keep-alive time in seconds                                                                                                                              |             `2`              | machine learning |
-| `MACHINE_LEARNING_WORKER_TIMEOUT`                           | Maximum time (s) of unresponsiveness before a worker is killed                                                                                               | `300` (`900` if using ROCm)  | machine learning |
-| `MACHINE_LEARNING_PRELOAD__CLIP__TEXTUAL`                   | Comma-separated list of (textual) CLIP model(s) to preload and cache                                                                                         |                              | machine learning |
-| `MACHINE_LEARNING_PRELOAD__CLIP__VISUAL`                    | Comma-separated list of (visual) CLIP model(s) to preload and cache                                                                                          |                              | machine learning |
-| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__RECOGNITION` | Comma-separated list of (recognition) facial recognition model(s) to preload and cache                                                                       |                              | machine learning |
-| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__DETECTION`   | Comma-separated list of (detection) facial recognition model(s) to preload and cache                                                                         |                              | machine learning |
-| `MACHINE_LEARNING_PRELOAD__OCR__RECOGNITION`                | Comma-separated list of (recognition) OCR model(s) to preload and cache                                                                                      |                              | machine learning |
-| `MACHINE_LEARNING_PRELOAD__OCR__DETECTION`                  | Comma-separated list of (detection) OCR model(s) to preload and cache                                                                                        |                              | machine learning |
-| `MACHINE_LEARNING_ANN`                                      | Enable ARM-NN hardware acceleration if supported                                                                                                             |            `True`            | machine learning |
-| `MACHINE_LEARNING_ANN_FP16_TURBO`                           | Execute operations in FP16 precision: increasing speed, reducing precision (applies only to ARM-NN)                                                          |           `False`            | machine learning |
-| `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_MAX_BATCH_SIZE__OCR`                      | Set the maximum number of boxes that will be processed at once by the OCR model                                                                              |             `6`              | machine learning |
-| `MACHINE_LEARNING_RKNN`                                     | Enable RKNN hardware acceleration if supported                                                                                                               |            `True`            | machine learning |
-| `MACHINE_LEARNING_RKNN_THREADS`                             | How many threads of RKNN runtime should be spun up while inferencing.                                                                                        |             `1`              | machine learning |
-| `MACHINE_LEARNING_MODEL_ARENA`                              | Pre-allocates CPU memory to avoid memory fragmentation                                                                                                       |             true             | machine learning |
-| `MACHINE_LEARNING_OPENVINO_PRECISION`                       | If set to FP16, uses half-precision floating-point operations for faster inference with reduced accuracy (one of [`FP16`, `FP32`], applies only to OpenVINO) |            `FP32`            | machine learning |
+| Variable                                                    | Description                                                                                                                                                  |             Default             | Containers       |
+| :---------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------- | :-----------------------------: | :--------------- |
+| `MACHINE_LEARNING_MODEL_TTL`                                | Inactivity time (s) before a model is unloaded (disabled if \<= 0)                                                                                           |              `300`              | machine learning |
+| `MACHINE_LEARNING_MODEL_TTL_POLL_S`                         | Interval (s) between checks for the model TTL (disabled if \<= 0)                                                                                            |              `10`               | machine learning |
+| `MACHINE_LEARNING_CACHE_FOLDER`                             | Directory where models are downloaded                                                                                                                        |            `/cache`             | machine learning |
+| `MACHINE_LEARNING_REQUEST_THREADS`<sup>\*1</sup>            | Thread count of the request thread pool (disabled if \<= 0)                                                                                                  |       number of CPU cores       | machine learning |
+| `MACHINE_LEARNING_MODEL_INTER_OP_THREADS`                   | Number of parallel model operations                                                                                                                          |               `1`               | machine learning |
+| `MACHINE_LEARNING_MODEL_INTRA_OP_THREADS`                   | Number of threads for each model operation                                                                                                                   |               `2`               | machine learning |
+| `MACHINE_LEARNING_WORKERS`<sup>\*2</sup>                    | Number of worker processes to spawn                                                                                                                          |               `1`               | machine learning |
+| `MACHINE_LEARNING_HTTP_KEEPALIVE_TIMEOUT_S`<sup>\*3</sup>   | HTTP Keep-alive time in seconds                                                                                                                              |               `2`               | machine learning |
+| `MACHINE_LEARNING_WORKER_TIMEOUT`                           | Maximum time (s) of unresponsiveness before a worker is killed                                                                                               | `120` (`300` if using OpenVINO) | machine learning |
+| `MACHINE_LEARNING_PRELOAD__CLIP__TEXTUAL`                   | Comma-separated list of (textual) CLIP model(s) to preload and cache                                                                                         |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__CLIP__VISUAL`                    | Comma-separated list of (visual) CLIP model(s) to preload and cache                                                                                          |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__RECOGNITION` | Comma-separated list of (recognition) facial recognition model(s) to preload and cache                                                                       |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__DETECTION`   | Comma-separated list of (detection) facial recognition model(s) to preload and cache                                                                         |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__OCR__RECOGNITION`                | Comma-separated list of (recognition) OCR model(s) to preload and cache                                                                                      |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__OCR__DETECTION`                  | Comma-separated list of (detection) OCR model(s) to preload and cache                                                                                        |                                 | machine learning |
+| `MACHINE_LEARNING_ANN`                                      | Enable ARM-NN hardware acceleration if supported                                                                                                             |             `True`              | machine learning |
+| `MACHINE_LEARNING_ANN_FP16_TURBO`                           | Execute operations in FP16 precision: increasing speed, reducing precision (applies only to ARM-NN)                                                          |             `False`             | machine learning |
+| `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_MAX_BATCH_SIZE__OCR`                      | Set the maximum number of boxes that will be processed at once by the OCR model                                                                              |               `6`               | machine learning |
+| `MACHINE_LEARNING_RKNN`                                     | Enable RKNN hardware acceleration if supported                                                                                                               |             `True`              | machine learning |
+| `MACHINE_LEARNING_RKNN_THREADS`                             | How many threads of RKNN runtime should be spun up while inferencing.                                                                                        |               `1`               | machine learning |
+| `MACHINE_LEARNING_MODEL_ARENA`                              | Pre-allocates CPU memory to avoid memory fragmentation                                                                                                       |              true               | machine learning |
+| `MACHINE_LEARNING_OPENVINO_PRECISION`                       | If set to FP16, uses half-precision floating-point operations for faster inference with reduced accuracy (one of [`FP16`, `FP32`], applies only to OpenVINO) |             `FP32`              | machine learning |

 \*1: It is recommended to begin with this parameter when changing the concurrency levels of the machine learning service and then tune the other ones.

@@ -3,7 +3,7 @@ run = "pnpm install --filter documentation --frozen-lockfile"

 [tasks.start]
 env._.path = "./node_modules/.bin"
-run = "docusaurus start --port 3005"
+run = "docusaurus --port 3005"

 [tasks.build]
 env._.path = "./node_modules/.bin"
@@ -83,7 +83,9 @@ volumes:
  model_cache:
  prometheus_data:
  grafana_data:
-  build_cache:
+  pnpm_cache:
+  pnpm_store_server:
+  pnpm_store_web:
  server_node_modules:
  web_node_modules:
  github_node_modules:
@@ -536,7 +536,7 @@ test.describe('Timeline', () => {
        force: false,
        ids: [assetToTrash.id],
      });
-      await page.locator('#control-bar').getByLabel('Close').click();
+      await page.locator('#asset-selection-app-bar').getByLabel('Close').click();
      await page.getByText('Trash', { exact: true }).click();
      await timelineUtils.waitForTimelineLoad(page);
      await thumbnailUtils.expectInViewport(page, assetToTrash.id);
@@ -676,7 +676,7 @@ test.describe('Timeline', () => {
        ids: [assetToArchive.id],
      });
      await thumbnailUtils.expectThumbnailIsArchive(page, assetToArchive.id);
-      await page.locator('#control-bar').getByLabel('Close').click();
+      await page.locator('#asset-selection-app-bar').getByLabel('Close').click();
      await page.getByRole('link').getByText('Archive').click();
      await timelineUtils.waitForTimelineLoad(page);
      await thumbnailUtils.expectInViewport(page, assetToArchive.id);
@@ -823,7 +823,7 @@ test.describe('Timeline', () => {
      });
      // ensure thumbnail still exists and has favorite icon
      await thumbnailUtils.expectThumbnailIsFavorite(page, assetToFavorite.id);
-      await page.locator('#control-bar').getByLabel('Close').click();
+      await page.locator('#asset-selection-app-bar').getByLabel('Close').click();
      await page.getByRole('link').getByText('Favorites').click();
      await timelineUtils.waitForTimelineLoad(page);
      await pageUtils.goToAsset(page, assetToFavorite.fileCreatedAt);
@@ -698,7 +698,6 @@
  "birthdate_saved": "Date of birth saved successfully",
  "birthdate_set_description": "Date of birth is used to calculate the age of this person at the time of a photo.",
  "blurred_background": "Blurred background",
-  "browse_templates": "Browse templates",
  "bugs_and_feature_requests": "Bugs & Feature Requests",
  "build": "Build",
  "build_image": "Build Image",
@@ -840,7 +839,6 @@
  "copy_error": "Copy error",
  "copy_file_path": "Copy file path",
  "copy_image": "Copy Image",
-  "copy_json": "Copy JSON",
  "copy_link": "Copy link",
  "copy_link_to_clipboard": "Copy link to clipboard",
  "copy_password": "Copy password",
@@ -978,10 +976,7 @@
  "downloading_asset_filename": "Downloading asset {filename}",
  "downloading_from_icloud": "Downloading from iCloud",
  "downloading_media": "Downloading media",
-  "drag_to_reorder": "Drag to reorder",
  "drop_files_to_upload": "Drop files anywhere to upload",
-  "duplicate": "Duplicate",
-  "duplicate_workflow": "Duplicate workflow",
  "duplicates": "Duplicates",
  "duplicates_description": "Resolve each group by indicating which, if any, are duplicates.",
  "duration": "Duration",
@@ -2259,7 +2254,6 @@
  "step_delete_confirm": "Are you sure you want to delete this step?",
  "step_details": "Step details",
  "steps": "Steps",
-  "steps_count": "{count, plural, one {# step} other {# steps}}",
  "stop_casting": "Stop casting",
  "stop_motion_photo": "Stop Motion Photo",
  "stop_photo_sharing": "Stop sharing your photos?",
@@ -2421,7 +2415,6 @@
  "use_browser_locale_description": "Format dates, times, and numbers based on your browser locale",
  "use_current_connection": "Use current connection",
  "use_custom_date_range": "Use custom date range instead",
-  "use_template": "Use template",
  "user": "User",
  "user_has_been_deleted": "This user has been deleted.",
  "user_id": "User ID",
@@ -2483,7 +2476,6 @@
  "week": "Week",
  "welcome": "Welcome",
  "welcome_to_immich": "Welcome to Immich",
-  "when": "When",
  "width": "Width",
  "wifi_name": "Wi-Fi Name",
  "workflow": "Workflow",
@@ -2496,7 +2488,6 @@
  "workflow_name": "Workflow name",
  "workflow_navigation_prompt": "Are you sure you want to leave without saving your changes?",
  "workflow_summary": "Workflow summary",
-  "workflow_templates": "Workflow templates",
  "workflow_update_success": "Workflow updated successfully",
  "workflow_updated": "Workflow updated",
  "workflows": "Workflows",
@@ -6,7 +6,7 @@ from pathlib import Path
 from socket import socket

 from gunicorn.arbiter import Arbiter
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from rich.console import Console
 from rich.logging import RichHandler
@@ -42,10 +42,6 @@ class MaxBatchSize(BaseModel):
    ocr: int | None = None


-def default_worker_timeout() -> int:
-    return 900 if os.environ.get("DEVICE") == "rocm" else 300
-
-
 class Settings(BaseSettings):
    model_config = SettingsConfigDict(
        env_prefix="MACHINE_LEARNING_",
@@ -58,7 +54,7 @@ class Settings(BaseSettings):
    model_ttl: int = 300
    model_ttl_poll_s: int = 10
    workers: int = 1
-    worker_timeout: int = Field(default_factory=default_worker_timeout)
+    worker_timeout: int = 300
    http_keepalive_timeout_s: int = 2
    test_full: bool = False
    request_threads: int = os.cpu_count() or 4
@@ -89,10 +89,4 @@ class FaceRecognizer(InferenceModel):
    @property
    def _batch_size_default(self) -> int | None:
        providers = ort.get_available_providers()
-        if (
-            self.model_format == ModelFormat.ONNX
-            and "MIGraphXExecutionProvider" not in providers
-            and "OpenVINOExecutionProvider" not in providers
-        ):
-            return None
-        return 1
+        return None if self.model_format == ModelFormat.ONNX and "OpenVINOExecutionProvider" not in providers else 1
@@ -1,7 +1,6 @@
 from __future__ import annotations

 from pathlib import Path
-from threading import Lock
 from typing import Any

 import numpy as np
@@ -13,37 +12,6 @@ from immich_ml.schemas import ModelPrecision, SessionNode

 from ..config import log, settings

-MigraphxInputSignature = tuple[tuple[str, str, tuple[int, ...]], ...]
-
-_migraphx_registry_lock = Lock()
-_migraphx_model_locks: dict[str, Lock] = {}
-_migraphx_compiled_inputs: set[tuple[str, MigraphxInputSignature]] = set()
-
-
-def _migraphx_get_model_lock(model_key: str) -> Lock:
-    with _migraphx_registry_lock:
-        lock = _migraphx_model_locks.get(model_key)
-        if lock is None:
-            lock = Lock()
-            _migraphx_model_locks[model_key] = lock
-        return lock
-
-
-def _migraphx_has_compiled_input(key: tuple[str, MigraphxInputSignature]) -> bool:
-    with _migraphx_registry_lock:
-        return key in _migraphx_compiled_inputs
-
-
-def _migraphx_mark_compiled_input(key: tuple[str, MigraphxInputSignature]) -> None:
-    with _migraphx_registry_lock:
-        _migraphx_compiled_inputs.add(key)
-
-
-def _migraphx_input_signature(
-    input_feed: dict[str, NDArray[np.float32]] | dict[str, NDArray[np.int32]],
-) -> MigraphxInputSignature:
-    return tuple((name, str(value.dtype), tuple(value.shape)) for name, value in sorted(input_feed.items()))
-

 class OrtSession:
    session: ort.InferenceSession
@@ -80,21 +48,7 @@ class OrtSession:
        input_feed: dict[str, NDArray[np.float32]] | dict[str, NDArray[np.int32]],
        run_options: Any = None,
    ) -> list[NDArray[np.float32]]:
-        if "MIGraphXExecutionProvider" in self.providers:
-            model_key = self.model_path.resolve().as_posix()
-            input_key = (model_key, _migraphx_input_signature(input_feed))
-            if not _migraphx_has_compiled_input(input_key):
-                model_lock = _migraphx_get_model_lock(model_key)
-                with model_lock:
-                    if not _migraphx_has_compiled_input(input_key):
-                        outputs: list[NDArray[np.float32]] = self.session.run(output_names, input_feed, run_options)
-                        _migraphx_mark_compiled_input(input_key)
-                        return outputs
-
-            outputs = self.session.run(output_names, input_feed, run_options)
-            return outputs
-
-        outputs = self.session.run(output_names, input_feed, run_options)
+        outputs: list[NDArray[np.float32]] = self.session.run(output_names, input_feed, run_options)
        return outputs

    @property
@@ -10,7 +10,7 @@ dependencies = [
    "fastapi>=0.95.2,<1.0",
    "gunicorn>=21.1.0",
    "huggingface-hub>=1.0,<2.0",
-    "insightface>=0.7.3,<2.0",
+    "insightface>=0.7.3,<1.0",
    "numpy>=2.4.0,<3.0",
    "opencv-python-headless>=4.7.0.72,<5.0",
    "orjson>=3.9.5",
@@ -35,37 +35,7 @@ from immich_ml.sessions.ort import OrtSession
 from immich_ml.sessions.rknn import RknnSession, run_inference


-class FakeLock:
-    def __init__(self) -> None:
-        self.enter = mock.Mock()
-        self.exit = mock.Mock()
-
-    def __enter__(self) -> None:
-        self.enter()
-
-    def __exit__(self, *args: object) -> None:
-        self.exit(*args)
-
-
 class TestBase:
-    def test_sets_default_worker_timeout(self, monkeypatch: MonkeyPatch) -> None:
-        monkeypatch.delenv("DEVICE", raising=False)
-        monkeypatch.delenv("MACHINE_LEARNING_WORKER_TIMEOUT", raising=False)
-
-        assert Settings().worker_timeout == 300
-
-    def test_sets_rocm_default_worker_timeout(self, monkeypatch: MonkeyPatch) -> None:
-        monkeypatch.setenv("DEVICE", "rocm")
-        monkeypatch.delenv("MACHINE_LEARNING_WORKER_TIMEOUT", raising=False)
-
-        assert Settings().worker_timeout == 900
-
-    def test_worker_timeout_env_override(self, monkeypatch: MonkeyPatch) -> None:
-        monkeypatch.setenv("DEVICE", "rocm")
-        monkeypatch.setenv("MACHINE_LEARNING_WORKER_TIMEOUT", "1200")
-
-        assert Settings().worker_timeout == 1200
-
    def test_sets_default_cache_dir(self) -> None:
        encoder = OpenClipTextualEncoder("ViT-B-32__openai")

@@ -443,52 +413,6 @@ class TestOrtSession:

        assert sess_options is session.sess_options

-    def test_serializes_rocm_first_run_for_new_input_signature(self, mocker: MockerFixture) -> None:
-        lock = FakeLock()
-        get_model_lock = mocker.patch("immich_ml.sessions.ort._migraphx_get_model_lock", return_value=lock)
-        mocker.patch("immich_ml.sessions.ort._migraphx_compiled_inputs", set())
-        mocker.patch("immich_ml.sessions.ort.Path.mkdir")
-        session = OrtSession("/cache/ViT-B-32__openai/model.onnx", providers=["MIGraphXExecutionProvider"])
-        input_feed = {"input": np.random.rand(1, 3, 224, 224).astype(np.float32)}
-
-        session.run(None, input_feed)
-        session.run(None, input_feed)
-
-        lock.enter.assert_called_once()
-        lock.exit.assert_called_once()
-        get_model_lock.assert_called_once()
-        session.session.run.assert_has_calls([mock.call(None, input_feed, None), mock.call(None, input_feed, None)])
-
-    def test_serializes_rocm_run_for_each_new_input_signature(self, mocker: MockerFixture) -> None:
-        lock = FakeLock()
-        mocker.patch("immich_ml.sessions.ort._migraphx_get_model_lock", return_value=lock)
-        mocker.patch("immich_ml.sessions.ort._migraphx_compiled_inputs", set())
-        mocker.patch("immich_ml.sessions.ort.Path.mkdir")
-        session = OrtSession("/cache/ViT-B-32__openai/model.onnx", providers=["MIGraphXExecutionProvider"])
-        input_feed = {"input": np.random.rand(1, 3, 224, 224).astype(np.float32)}
-        new_shape_input_feed = {"input": np.random.rand(2, 3, 224, 224).astype(np.float32)}
-
-        session.run(None, input_feed)
-        session.run(None, new_shape_input_feed)
-
-        assert lock.enter.call_count == 2
-        assert lock.exit.call_count == 2
-        session.session.run.assert_has_calls(
-            [mock.call(None, input_feed, None), mock.call(None, new_shape_input_feed, None)]
-        )
-
-    def test_does_not_serialize_non_rocm_run(self, mocker: MockerFixture) -> None:
-        lock = FakeLock()
-        get_model_lock = mocker.patch("immich_ml.sessions.ort._migraphx_get_model_lock", return_value=lock)
-        session = OrtSession("/cache/ViT-B-32__openai/model.onnx", providers=["CPUExecutionProvider"])
-        input_feed = {"input": np.random.rand(1, 3, 224, 224).astype(np.float32)}
-
-        session.run(None, input_feed)
-
-        get_model_lock.assert_not_called()
-        lock.enter.assert_not_called()
-        session.session.run.assert_called_once_with(None, input_feed, None)
-

 class TestAnnSession:
    def test_creates_ann_session(self, ann_session: mock.Mock, info: mock.Mock) -> None:
@@ -959,34 +883,6 @@ class TestFaceRecognition:
        onnx.load.assert_not_called()
        onnx.save.assert_not_called()

-    def test_recognition_does_not_add_batch_axis_for_migraphx(
-        self, ort_session: mock.Mock, path: mock.Mock, mocker: MockerFixture
-    ) -> None:
-        onnx = mocker.patch("immich_ml.models.facial_recognition.recognition.onnx", autospec=True)
-        update_dims = mocker.patch(
-            "immich_ml.models.facial_recognition.recognition.update_inputs_outputs_dims", autospec=True
-        )
-        mocker.patch("immich_ml.models.base.InferenceModel.download")
-        mocker.patch("immich_ml.models.facial_recognition.recognition.ArcFaceONNX")
-        mocker.patch(
-            "immich_ml.models.facial_recognition.recognition.ort.get_available_providers",
-            return_value=["MIGraphXExecutionProvider", "CPUExecutionProvider"],
-        )
-        path.return_value.__truediv__.return_value.__truediv__.return_value.suffix = ".onnx"
-
-        inputs = [SimpleNamespace(name="input.1", shape=(1, 3, 224, 224))]
-        outputs = [SimpleNamespace(name="output.1", shape=(1, 800))]
-        ort_session.return_value.get_inputs.return_value = inputs
-        ort_session.return_value.get_outputs.return_value = outputs
-
-        face_recognizer = FaceRecognizer("buffalo_s", cache_dir=path)
-        face_recognizer.load()
-
-        assert face_recognizer.batch_size == 1
-        update_dims.assert_not_called()
-        onnx.load.assert_not_called()
-        onnx.save.assert_not_called()
-
    def test_set_custom_max_batch_size(self, mocker: MockerFixture) -> None:
        mocker.patch.object(settings, "max_batch_size", MaxBatchSize(facial_recognition=2))

@@ -1004,7 +1004,7 @@ requires-dist = [
    { name = "fastapi", specifier = ">=0.95.2,<1.0" },
    { name = "gunicorn", specifier = ">=21.1.0" },
    { name = "huggingface-hub", specifier = ">=1.0,<2.0" },
-    { name = "insightface", specifier = ">=0.7.3,<2.0" },
+    { name = "insightface", specifier = ">=0.7.3,<1.0" },
    { name = "numpy", specifier = ">=2.4.0,<3.0" },
    { name = "onnxruntime", marker = "extra == 'armnn'", specifier = ">=1.23.2,<2" },
    { name = "onnxruntime", marker = "extra == 'cpu'", specifier = ">=1.23.2,<2" },
@@ -1,31 +1,9 @@
 # @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html

 [[tools."aqua:flutter/flutter"]]
-version = "3.44.0"
+version = "3.41.9"
 backend = "aqua:flutter/flutter"

-[tools."aqua:flutter/flutter"."platforms.linux-arm64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
-
-[tools."aqua:flutter/flutter"."platforms.linux-arm64-musl"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
-
-[tools."aqua:flutter/flutter"."platforms.linux-x64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
-
-[tools."aqua:flutter/flutter"."platforms.linux-x64-musl"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
-
-[tools."aqua:flutter/flutter"."platforms.macos-arm64"]
-checksum = "blake3:fb03aa5d9790205c948922ec3f0751c16e4575b09d6ae9dd4fbeb664a69f0e00"
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_3.44.0-stable.zip"
-
-[tools."aqua:flutter/flutter"."platforms.macos-x64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_3.44.0-stable.zip"
-
-[tools."aqua:flutter/flutter"."platforms.windows-x64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/windows/flutter_windows_3.44.0-stable.zip"
-
 [[tools.flutter]]
 version = "3.41.9-stable"
 backend = "asdf:flutter"
@@ -16,7 +16,7 @@ config_roots = [

 [tools]
 node = "24.15.0"
-"aqua:flutter/flutter" = "3.44.0"
+"aqua:flutter/flutter" = "3.41.9"
 pnpm = "10.33.4"
 terragrunt = "1.0.3"
 opentofu = "1.11.6"
@@ -73,6 +73,7 @@ run = "bash ./bin/generate-dart-sdk.sh"
 env = { SHARP_IGNORE_GLOBAL_LIBVIPS = true }
 run = [
  { task = "//:plugins" },
+  { task = "//server:build" },
  { task = "//server:install" },
  { task = "//server:build" },
  { task = "//server:sync-open-api" },
@@ -1,4 +1,5 @@
 {
+  "dart.flutterSdkPath": ".fvm/versions/3.41.9",
  "dart.lineLength": 120,
  "[dart]": {
    "editor.rulers": [
@@ -207,6 +207,18 @@ enum class PlatformAssetPlaybackStyle(val raw: Int) {
  }
 }

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

  companion object {
    /** The codec used by NativeSyncApi. */
@@ -786,6 +864,48 @@ interface NativeSyncApi {
          channel.setMessageHandler(null)
        }
      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getBaseResource$separatedMessageChannelSuffix", codec, taskQueue)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val assetIdArg = args[0] as String
+            val allowNetworkAccessArg = args[1] as Boolean
+            api.getBaseResource(assetIdArg, allowNetworkAccessArg) { result: Result<BaseResource?> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(MessagesPigeonUtils.wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(MessagesPigeonUtils.wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getEditState$separatedMessageChannelSuffix", codec, taskQueue)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val assetIdArg = args[0] as String
+            val allowNetworkAccessArg = args[1] as Boolean
+            api.getEditState(assetIdArg, allowNetworkAccessArg) { result: Result<EditState> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(MessagesPigeonUtils.wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(MessagesPigeonUtils.wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
    }
  }
 }
@@ -476,4 +476,14 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
  fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult> {
    return emptyList()
  }
+
+  // Android has no Photos-style edit original to stack; iOS-only.
+  fun getBaseResource(assetId: String, allowNetworkAccess: Boolean, callback: (Result<BaseResource?>) -> Unit) {
+    callback(Result.success(null))
+  }
+
+  // iOS-only; Android assets never carry a Photos-style edit.
+  fun getEditState(assetId: String, allowNetworkAccess: Boolean, callback: (Result<EditState>) -> Unit) {
+    callback(Result.success(EditState.NOT_EDITED))
+  }
 }
@@ -5,7 +5,3 @@ android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 org.gradle.caching=true
 org.gradle.parallel=true
-# This builtInKotlin flag was added automatically by Flutter migrator
-android.builtInKotlin=false
-# This newDsl flag was added automatically by Flutter migrator
-android.newDsl=false
@@ -1,23 +1,58 @@
 PODS:
+  - background_downloader (0.0.1):
+    - Flutter
  - bonsoir_darwin (0.0.1):
    - Flutter
    - FlutterMacOS
+  - connectivity_plus (0.0.1):
+    - Flutter
  - cupertino_http (0.0.1):
    - Flutter
    - FlutterMacOS
+  - device_info_plus (0.0.1):
+    - Flutter
  - Flutter (1.0.0)
  - flutter_local_notifications (0.0.1):
    - Flutter
+  - flutter_native_splash (2.4.3):
+    - Flutter
  - flutter_secure_storage (6.0.0):
    - Flutter
+  - flutter_udid (0.0.1):
+    - Flutter
+    - KeychainAccess
+  - flutter_web_auth_2 (5.0.0):
+    - Flutter
  - fluttertoast (0.0.2):
    - Flutter
+  - geolocator_apple (1.2.0):
+    - Flutter
+    - FlutterMacOS
  - home_widget (0.0.1):
    - Flutter
+  - image_picker_ios (0.0.1):
+    - Flutter
+  - integration_test (0.0.1):
+    - Flutter
+  - KeychainAccess (4.2.2)
+  - local_auth_darwin (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - MapLibre (6.14.0)
+  - maplibre_gl (0.0.1):
+    - Flutter
+    - MapLibre (= 6.14.0)
  - native_video_player (1.0.0):
    - Flutter
+  - network_info_plus (0.0.1):
+    - Flutter
+  - package_info_plus (0.4.5):
+    - Flutter
  - permission_handler_apple (9.3.0):
    - Flutter
+  - photo_manager (3.9.0):
+    - Flutter
+    - FlutterMacOS
  - share_handler_ios (0.0.14):
    - Flutter
    - share_handler_ios/share_handler_ios_models (= 0.0.14)
@@ -26,56 +61,144 @@ PODS:
    - Flutter
    - share_handler_ios_models
  - share_handler_ios_models (0.0.9)
+  - share_plus (0.0.1):
+    - Flutter
+  - shared_preferences_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - url_launcher_ios (0.0.1):
+    - Flutter
+  - wakelock_plus (0.0.1):
+    - Flutter

 DEPENDENCIES:
+  - background_downloader (from `.symlinks/plugins/background_downloader/ios`)
  - bonsoir_darwin (from `.symlinks/plugins/bonsoir_darwin/darwin`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
  - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
+  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
  - Flutter (from `Flutter`)
  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
+  - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
+  - flutter_udid (from `.symlinks/plugins/flutter_udid/ios`)
+  - flutter_web_auth_2 (from `.symlinks/plugins/flutter_web_auth_2/ios`)
  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
+  - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
  - home_widget (from `.symlinks/plugins/home_widget/ios`)
+  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+  - integration_test (from `.symlinks/plugins/integration_test/ios`)
+  - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
+  - maplibre_gl (from `.symlinks/plugins/maplibre_gl/ios`)
  - native_video_player (from `.symlinks/plugins/native_video_player/ios`)
+  - network_info_plus (from `.symlinks/plugins/network_info_plus/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - photo_manager (from `.symlinks/plugins/photo_manager/darwin`)
  - share_handler_ios (from `.symlinks/plugins/share_handler_ios/ios`)
  - share_handler_ios_models (from `.symlinks/plugins/share_handler_ios/ios/Models`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+  - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
+
+SPEC REPOS:
+  trunk:
+    - KeychainAccess
+    - MapLibre

 EXTERNAL SOURCES:
+  background_downloader:
+    :path: ".symlinks/plugins/background_downloader/ios"
  bonsoir_darwin:
    :path: ".symlinks/plugins/bonsoir_darwin/darwin"
+  connectivity_plus:
+    :path: ".symlinks/plugins/connectivity_plus/ios"
  cupertino_http:
    :path: ".symlinks/plugins/cupertino_http/darwin"
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
  Flutter:
    :path: Flutter
  flutter_local_notifications:
    :path: ".symlinks/plugins/flutter_local_notifications/ios"
+  flutter_native_splash:
+    :path: ".symlinks/plugins/flutter_native_splash/ios"
  flutter_secure_storage:
    :path: ".symlinks/plugins/flutter_secure_storage/ios"
+  flutter_udid:
+    :path: ".symlinks/plugins/flutter_udid/ios"
+  flutter_web_auth_2:
+    :path: ".symlinks/plugins/flutter_web_auth_2/ios"
  fluttertoast:
    :path: ".symlinks/plugins/fluttertoast/ios"
+  geolocator_apple:
+    :path: ".symlinks/plugins/geolocator_apple/darwin"
  home_widget:
    :path: ".symlinks/plugins/home_widget/ios"
+  image_picker_ios:
+    :path: ".symlinks/plugins/image_picker_ios/ios"
+  integration_test:
+    :path: ".symlinks/plugins/integration_test/ios"
+  local_auth_darwin:
+    :path: ".symlinks/plugins/local_auth_darwin/darwin"
+  maplibre_gl:
+    :path: ".symlinks/plugins/maplibre_gl/ios"
  native_video_player:
    :path: ".symlinks/plugins/native_video_player/ios"
+  network_info_plus:
+    :path: ".symlinks/plugins/network_info_plus/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
  permission_handler_apple:
    :path: ".symlinks/plugins/permission_handler_apple/ios"
+  photo_manager:
+    :path: ".symlinks/plugins/photo_manager/darwin"
  share_handler_ios:
    :path: ".symlinks/plugins/share_handler_ios/ios"
  share_handler_ios_models:
    :path: ".symlinks/plugins/share_handler_ios/ios/Models"
+  share_plus:
+    :path: ".symlinks/plugins/share_plus/ios"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
+  wakelock_plus:
+    :path: ".symlinks/plugins/wakelock_plus/ios"

 SPEC CHECKSUMS:
+  background_downloader: 50e91d979067b82081aba359d7d916b3ba5fadad
  bonsoir_darwin: 29c7ccf356646118844721f36e1de4b61f6cbd0e
+  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
+  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
  flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  flutter_udid: 92a5d31fe0526b7b6002a2318df702e12e7eb300
+  flutter_web_auth_2: 646fc9df97a01c59e5eea99b237da2c6360f8439
  fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
+  geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
+  image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
+  local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
+  MapLibre: 69e572367f4ef6287e18246cfafc39c80cdcabcd
+  maplibre_gl: 3c924e44725147b03dda33430ad216005b40555f
  native_video_player: b65c58951ede2f93d103a25366bdebca95081265
+  network_info_plus: cf61925ab5205dce05a4f0895989afdb6aade5fc
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  photo_manager: 25fd77df14f4f0ba5ef99e2c61814dde77e2bceb
  share_handler_ios: e2244e990f826b2c8eaa291ac3831569438ba0fb
  share_handler_ios_models: fc638c9b4330dc7f082586c92aee9dfa0b87b871
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
+  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
+  wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556

 PODFILE CHECKSUM: 938abbae4114b9c2140c550a2a0d8f7c674f5dfe

@@ -39,7 +39,6 @@
 		FEE084F82EC172460045228E /* SQLiteData in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084F72EC172460045228E /* SQLiteData */; };
 		FEE084FB2EC1725A0045228E /* RawStructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FA2EC1725A0045228E /* RawStructuredFieldValues */; };
 		FEE084FD2EC1725A0045228E /* StructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FC2EC1725A0045228E /* StructuredFieldValues */; };
-		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -130,7 +129,6 @@
 		FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteImagesImpl.swift; sourceTree = "<group>"; };
 		FE5FE4AD2F30FBC000A71243 /* ImageProcessing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageProcessing.swift; sourceTree = "<group>"; };
 		FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thumbhash.swift; sourceTree = "<group>"; };
-		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -195,7 +193,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 				FEE084F82EC172460045228E /* SQLiteData in Frameworks */,
 				FEE084FB2EC1725A0045228E /* RawStructuredFieldValues in Frameworks */,
 				FEE084FD2EC1725A0045228E /* StructuredFieldValues in Frameworks */,
@@ -250,7 +247,6 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -364,9 +360,6 @@

 /* Begin PBXNativeTarget section */
 		97C146ED1CF9000F007C117D /* Runner */ = {
-			packageProductDependencies = (
-				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
-			);
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
@@ -470,7 +463,6 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
 				FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */,
 				FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */,
 			);
@@ -1293,17 +1285,7 @@
 			package = FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */;
 			productName = StructuredFieldValues;
 		};
-		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = FlutterGeneratedPluginSwiftPackage;
-		};
 /* End XCSwiftPackageProductDependency section */
-/* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
-		};
-/* End XCLocalSwiftPackageReference section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }
@@ -1,4 +1,5 @@
 {
+  "originHash" : "9be33bfaa68721646604aefff3cabbdaf9a193da192aae024c265065671f6c49",
  "pins" : [
    {
      "identity" : "combine-schedulers",
@@ -18,24 +19,6 @@
        "version" : "7.8.0"
      }
    },
-    {
-      "identity" : "keychainaccess",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kishikawakatsumi/KeychainAccess",
-      "state" : {
-        "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7",
-        "version" : "4.2.2"
-      }
-    },
-    {
-      "identity" : "maplibre-gl-native-distribution",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/maplibre/maplibre-gl-native-distribution.git",
-      "state" : {
-        "revision" : "60d9bb85c94ce6e7fc4406cd32529fd12bdb7809",
-        "version" : "6.14.0"
-      }
-    },
    {
      "identity" : "sqlite-data",
      "kind" : "remoteSourceControl",
@@ -163,5 +146,5 @@
      }
    }
  ],
-  "version" : 2
+  "version" : 3
 }
@@ -5,24 +5,6 @@
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
-      <PreActions>
-         <ExecutionAction
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-            <ActionContent
-               title = "Run Prepare Flutter Framework Script"
-               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
-               <EnvironmentBuildable>
-                  <BuildableReference
-                     BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-                     BuildableName = "Immich.app"
-                     BlueprintName = "Runner"
-                     ReferencedContainer = "container:Runner.xcodeproj">
-                  </BuildableReference>
-               </EnvironmentBuildable>
-            </ActionContent>
-         </ExecutionAction>
-      </PreActions>
      <BuildActionEntries>
         <BuildActionEntry
            buildForTesting = "YES"
@@ -1,4 +1,5 @@
 {
+  "originHash" : "9be33bfaa68721646604aefff3cabbdaf9a193da192aae024c265065671f6c49",
  "pins" : [
    {
      "identity" : "combine-schedulers",
@@ -18,24 +19,6 @@
        "version" : "7.9.0"
      }
    },
-    {
-      "identity" : "keychainaccess",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kishikawakatsumi/KeychainAccess",
-      "state" : {
-        "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7",
-        "version" : "4.2.2"
-      }
-    },
-    {
-      "identity" : "maplibre-gl-native-distribution",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/maplibre/maplibre-gl-native-distribution.git",
-      "state" : {
-        "revision" : "60d9bb85c94ce6e7fc4406cd32529fd12bdb7809",
-        "version" : "6.14.0"
-      }
-    },
    {
      "identity" : "sqlite-data",
      "kind" : "remoteSourceControl",
@@ -163,5 +146,5 @@
      }
    }
  ],
-  "version" : 2
+  "version" : 3
 }
@@ -183,6 +183,12 @@ enum PlatformAssetPlaybackStyle: Int {
  case videoLooping = 5
 }

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

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

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

 struct AssetWrapper: Hashable, Equatable {
  let asset: PlatformAsset
@@ -419,4 +420,169 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
    }
    return mappings;
  }
+
+  func getBaseResource(
+    assetId: String,
+    allowNetworkAccess: Bool,
+    completion: @escaping (Result<BaseResource?, Error>) -> Void
+  ) {
+    Task { [weak self] in
+      guard let self = self else { return }
+
+      guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [assetId], options: nil).firstObject else {
+        return self.completeWhenActive(for: completion, with: .success(nil))
+      }
+
+      let resources = PHAssetResource.assetResources(for: asset)
+      let state = await Self.classifyEdit(resources: resources, allowNetworkAccess: allowNetworkAccess)
+      guard state == .edited, let original = resources.first(where: { $0.type == .photo }) else {
+        return self.completeWhenActive(for: completion, with: .success(nil))
+      }
+
+      do {
+        let result = try await self.streamBaseResource(
+          resource: original,
+          localId: asset.localIdentifier,
+          allowNetworkAccess: allowNetworkAccess
+        )
+        self.completeWhenActive(for: completion, with: .success(result))
+      } catch {
+        self.completeWhenActive(for: completion, with: .failure(error))
+      }
+    }
+  }
+
+  // Returns whether the asset carries a live Photos edit without reading the photo
+  // itself, only the small adjustment metadata. The revert probe relies on this to
+  // tell "not edited" apart from "couldn't read" (offloaded to iCloud), so it never
+  // mistakes an unreadable edit for a revert.
+  func getEditState(
+    assetId: String,
+    allowNetworkAccess: Bool,
+    completion: @escaping (Result<EditState, Error>) -> Void
+  ) {
+    Task { [weak self] in
+      guard let self = self else { return }
+      guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [assetId], options: nil).firstObject else {
+        // Not in the library, so don't answer "not edited" (the caller acts on that).
+        return self.completeWhenActive(for: completion, with: .success(.unknown))
+      }
+      let state = await Self.classifyEdit(
+        resources: PHAssetResource.assetResources(for: asset),
+        allowNetworkAccess: allowNetworkAccess
+      )
+      self.completeWhenActive(for: completion, with: .success(state))
+    }
+  }
+
+  // adjustmentRenderTypes for a photo with no real edit: a plain capture, a
+  // Photographic Style, or a reverted edit. A real edit changes this value.
+  private static let kNoEditRenderTypes = 27648
+
+  // Works out the edit state from Adjustments.plist only (never reads the photo).
+  // adjustmentRenderTypes is the signal: a real edit moves it off the baseline, while a
+  // plain capture, a Photographic Style, and a reverted edit all sit at the baseline. The
+  // editor id is NOT reliable: com.apple.camera authors both styles and some real edits
+  // (e.g. changing the Photographic Style after capture), so we key off the render types
+  // alone. Cleanup and object-removal write AdjustmentsSecondary.data, which we count as
+  // edited. unknown = couldn't read the plist (offloaded, no network).
+  private static func classifyEdit(resources: [PHAssetResource], allowNetworkAccess: Bool) async -> EditState {
+    if resources.contains(where: { $0.originalFilename == "AdjustmentsSecondary.data" }) {
+      return .edited
+    }
+    guard let adjRes = resources.first(where: { $0.originalFilename == "Adjustments.plist" }) else {
+      return .notEdited
+    }
+    guard let buf = await collectResourceData(adjRes, allowNetworkAccess: allowNetworkAccess),
+      let plist = try? PropertyListSerialization.propertyList(from: buf, options: [], format: nil) as? [String: Any]
+    else {
+      return .unknown
+    }
+    let renderTypes = (plist["adjustmentRenderTypes"] as? NSNumber)?.intValue
+    let isUserEdit = renderTypes != nil && renderTypes != kNoEditRenderTypes
+    return isUserEdit ? .edited : .notEdited
+  }
+
+  private func streamBaseResource(
+    resource: PHAssetResource,
+    localId: String,
+    allowNetworkAccess: Bool
+  ) async throws -> BaseResource {
+    let safeId = localId.replacingOccurrences(of: "/", with: "_")
+    let suffix = UTType(resource.uniformTypeIdentifier)?.preferredFilenameExtension ?? "bin"
+    let tempDir = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
+      .appendingPathComponent("immich_base", isDirectory: true)
+    try FileManager.default.createDirectory(at: tempDir, withIntermediateDirectories: true)
+
+    let unique = UUID().uuidString.prefix(8)
+    let tempUrl = tempDir.appendingPathComponent("\(safeId)_\(unique)_base.\(suffix)")
+
+    // Write the resource to disk and hash it chunk by chunk, so a big original (e.g.
+    // ProRAW) never sits fully in memory on the upload thread.
+    FileManager.default.createFile(atPath: tempUrl.path, contents: nil)
+    guard let handle = try? FileHandle(forWritingTo: tempUrl) else {
+      throw NSError(
+        domain: "NativeSyncApi",
+        code: -1,
+        userInfo: [NSLocalizedDescriptionKey: "Failed to open temp file for base resource \(localId)"]
+      )
+    }
+
+    var hasher = Insecure.SHA1()
+    var totalBytes: Int64 = 0
+    let options = PHAssetResourceRequestOptions()
+    options.isNetworkAccessAllowed = allowNetworkAccess
+
+    let succeeded = await withCheckedContinuation { (continuation: CheckedContinuation<Bool, Never>) in
+      var writeFailed = false
+      PHAssetResourceManager.default().requestData(
+        for: resource,
+        options: options,
+        dataReceivedHandler: { chunk in
+          if writeFailed { return }
+          do {
+            try handle.write(contentsOf: chunk)
+            hasher.update(data: chunk)
+            totalBytes += Int64(chunk.count)
+          } catch {
+            writeFailed = true
+          }
+        },
+        completionHandler: { error in continuation.resume(returning: error == nil && !writeFailed) }
+      )
+    }
+
+    try? handle.close()
+
+    guard succeeded else {
+      try? FileManager.default.removeItem(at: tempUrl)
+      throw NSError(
+        domain: "NativeSyncApi",
+        code: -1,
+        userInfo: [NSLocalizedDescriptionKey: "Failed to read base resource for \(localId)"]
+      )
+    }
+
+    let sha1 = Data(hasher.finalize()).base64EncodedString()
+    let mime = UTType(resource.uniformTypeIdentifier)?.preferredMIMEType ?? "application/octet-stream"
+    return BaseResource(path: tempUrl.path, sha1: sha1, sizeBytes: totalBytes, mimeType: mime)
+  }
+
+  private static func collectResourceData(
+    _ resource: PHAssetResource,
+    allowNetworkAccess: Bool
+  ) async -> Data? {
+    let options = PHAssetResourceRequestOptions()
+    options.isNetworkAccessAllowed = allowNetworkAccess
+    var buffer = Data()
+    return await withCheckedContinuation { (continuation: CheckedContinuation<Data?, Never>) in
+      PHAssetResourceManager.default().requestData(
+        for: resource,
+        options: options,
+        dataReceivedHandler: { data in buffer.append(data) },
+        completionHandler: { error in continuation.resume(returning: error == nil ? buffer : nil) }
+      )
+    }
+  }
+
 }
@@ -20,10 +20,10 @@ const String kSecuredPinCode = "secured_pin_code";
 const String kManualUploadGroup = 'manual_upload_group';
 const String kBackupGroup = 'backup_group';
 const String kBackupLivePhotoGroup = 'backup_live_photo_group';
+const String kBackupEditPairGroup = 'backup_edit_pair_group';
 const String kDownloadGroupImage = 'group_image';
 const String kDownloadGroupVideo = 'group_video';
 const String kDownloadGroupLivePhoto = 'group_livephoto';
-const String kShareDownloadGroup = 'group_share';

 // Timeline constants
 const int kTimelineNoneSegmentSize = 120;
@@ -12,6 +12,13 @@ class LocalAsset extends BaseAsset {
  final double? latitude;
  final double? longitude;

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

  @override
@@ -120,6 +129,8 @@ class LocalAsset extends BaseAsset {
    double? latitude,
    double? longitude,
    bool? isEdited,
+    String? priorRemoteId,
+    String? syncedChecksum,
  }) {
    return LocalAsset(
      id: id ?? this.id,
@@ -140,6 +151,8 @@ class LocalAsset extends BaseAsset {
      latitude: latitude ?? this.latitude,
      longitude: longitude ?? this.longitude,
      isEdited: isEdited ?? this.isEdited,
+      priorRemoteId: priorRemoteId ?? this.priorRemoteId,
+      syncedChecksum: syncedChecksum ?? this.syncedChecksum,
    );
  }
 }
@@ -1,25 +1,14 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/constants/colors.dart';
-import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/config/album_config.dart';
 import 'package:immich_mobile/domain/models/config/backup_config.dart';
 import 'package:immich_mobile/domain/models/config/cleanup_config.dart';
 import 'package:immich_mobile/domain/models/config/image_config.dart';
 import 'package:immich_mobile/domain/models/config/map_config.dart';
-import 'package:immich_mobile/domain/models/config/network_config.dart';
 import 'package:immich_mobile/domain/models/config/slideshow_config.dart';
 import 'package:immich_mobile/domain/models/config/theme_config.dart';
 import 'package:immich_mobile/domain/models/config/timeline_config.dart';
 import 'package:immich_mobile/domain/models/config/viewer_config.dart';
-import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/metadata_key.dart';
-import 'package:immich_mobile/domain/models/timeline.model.dart';
-import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
-
-const defaultConfig = AppConfig();

 class AppConfig {
-  final LogLevel logLevel;
  final ThemeConfig theme;
  final CleanupConfig cleanup;
  final MapConfig map;
@@ -29,10 +18,8 @@ class AppConfig {
  final SlideshowConfig slideshow;
  final AlbumConfig album;
  final BackupConfig backup;
-  final NetworkConfig network;

  const AppConfig({
-    this.logLevel = .info,
    this.theme = const .new(),
    this.cleanup = const .new(),
    this.map = const .new(),
@@ -42,11 +29,9 @@ class AppConfig {
    this.slideshow = const .new(),
    this.album = const .new(),
    this.backup = const .new(),
-    this.network = const .new(),
  });

  AppConfig copyWith({
-    LogLevel? logLevel,
    ThemeConfig? theme,
    CleanupConfig? cleanup,
    MapConfig? map,
@@ -56,9 +41,7 @@ class AppConfig {
    SlideshowConfig? slideshow,
    AlbumConfig? album,
    BackupConfig? backup,
-    NetworkConfig? network,
  }) => .new(
-    logLevel: logLevel ?? this.logLevel,
    theme: theme ?? this.theme,
    cleanup: cleanup ?? this.cleanup,
    map: map ?? this.map,
@@ -68,14 +51,12 @@ class AppConfig {
    slideshow: slideshow ?? this.slideshow,
    album: album ?? this.album,
    backup: backup ?? this.backup,
-    network: network ?? this.network,
  );

  @override
  bool operator ==(Object other) =>
      identical(this, other) ||
      (other is AppConfig &&
-          other.logLevel == logLevel &&
          other.theme == theme &&
          other.cleanup == cleanup &&
          other.map == map &&
@@ -84,118 +65,12 @@ class AppConfig {
          other.viewer == viewer &&
          other.slideshow == slideshow &&
          other.album == album &&
-          other.backup == backup &&
-          other.network == network);
+          other.backup == backup);

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

  @override
  String toString() =>
-      'AppConfig(logLevel: $logLevel, theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup, network: $network)';
-
-  T read<T extends Object>(MetadataKey<T> key) =>
-      (switch (key) {
-            .logLevel => logLevel,
-            .themePrimaryColor => theme.primaryColor,
-            .themeMode => theme.mode,
-            .themeDynamic => theme.dynamicTheme,
-            .themeColorfulInterface => theme.colorfulInterface,
-            .imagePreferRemote => image.preferRemote,
-            .imageLoadOriginal => image.loadOriginal,
-            .viewerLoopVideo => viewer.loopVideo,
-            .viewerLoadOriginalVideo => viewer.loadOriginalVideo,
-            .viewerAutoPlayVideo => viewer.autoPlayVideo,
-            .viewerTapToNavigate => viewer.tapToNavigate,
-            .networkAutoEndpointSwitching => network.autoEndpointSwitching,
-            .networkPreferredWifiName => network.preferredWifiName,
-            .networkLocalEndpoint => network.localEndpoint,
-            .networkExternalEndpointList => network.externalEndpointList,
-            .networkCustomHeaders => network.customHeaders,
-            .albumSortMode => album.sortMode,
-            .albumIsReverse => album.isReverse,
-            .albumIsGrid => album.isGrid,
-            .backupEnabled => backup.enabled,
-            .backupUseCellularForVideos => backup.useCellularForVideos,
-            .backupUseCellularForPhotos => backup.useCellularForPhotos,
-            .backupRequireCharging => backup.requireCharging,
-            .backupTriggerDelay => backup.triggerDelay,
-            .backupSyncAlbums => backup.syncAlbums,
-            .timelineTilesPerRow => timeline.tilesPerRow,
-            .timelineGroupAssetsBy => timeline.groupAssetsBy,
-            .timelineStorageIndicator => timeline.storageIndicator,
-            .mapShowFavoriteOnly => map.favoritesOnly,
-            .mapRelativeDate => map.relativeDays,
-            .mapIncludeArchived => map.includeArchived,
-            .mapThemeMode => map.themeMode,
-            .mapWithPartners => map.withPartners,
-            .cleanupKeepFavorites => cleanup.keepFavorites,
-            .cleanupKeepMediaType => cleanup.keepMediaType,
-            .cleanupKeepAlbumIds => cleanup.keepAlbumIds,
-            .cleanupCutoffDaysAgo => cleanup.cutoffDaysAgo,
-            .cleanupDefaultsInitialized => cleanup.defaultsInitialized,
-            .slideshowTransition => slideshow.transition,
-            .slideshowRepeat => slideshow.repeat,
-            .slideshowDuration => slideshow.duration,
-            .slideshowLook => slideshow.look,
-            .slideshowDirection => slideshow.direction,
-          })
-          as T;
-
-  factory AppConfig.fromEntries(Map<MetadataKey<Object>, Object> entries) {
-    var config = const AppConfig();
-    for (final MapEntry(key: key, value: value) in entries.entries) {
-      config = config.write(key, value);
-    }
-    return config;
-  }
-
-  AppConfig write<T extends Object>(MetadataKey<T> key, T value) {
-    return switch (key) {
-      .logLevel => copyWith(logLevel: value as LogLevel),
-      .themePrimaryColor => copyWith(theme: theme.copyWith(primaryColor: value as ImmichColorPreset)),
-      .themeMode => copyWith(theme: theme.copyWith(mode: value as ThemeMode)),
-      .themeDynamic => copyWith(theme: theme.copyWith(dynamicTheme: value as bool)),
-      .themeColorfulInterface => copyWith(theme: theme.copyWith(colorfulInterface: value as bool)),
-      .imagePreferRemote => copyWith(image: image.copyWith(preferRemote: value as bool)),
-      .imageLoadOriginal => copyWith(image: image.copyWith(loadOriginal: value as bool)),
-      .viewerLoopVideo => copyWith(viewer: viewer.copyWith(loopVideo: value as bool)),
-      .viewerLoadOriginalVideo => copyWith(viewer: viewer.copyWith(loadOriginalVideo: value as bool)),
-      .viewerAutoPlayVideo => copyWith(viewer: viewer.copyWith(autoPlayVideo: value as bool)),
-      .viewerTapToNavigate => copyWith(viewer: viewer.copyWith(tapToNavigate: value as bool)),
-      .networkAutoEndpointSwitching => copyWith(network: network.copyWith(autoEndpointSwitching: value as bool)),
-      .networkPreferredWifiName => copyWith(network: network.copyWith(preferredWifiName: (value as String))),
-      .networkLocalEndpoint => copyWith(network: network.copyWith(localEndpoint: (value as String))),
-      .networkExternalEndpointList => copyWith(network: network.copyWith(externalEndpointList: value as List<String>)),
-      .networkCustomHeaders => copyWith(network: network.copyWith(customHeaders: value as Map<String, String>)),
-      .albumSortMode => copyWith(album: album.copyWith(sortMode: value as AlbumSortMode)),
-      .albumIsReverse => copyWith(album: album.copyWith(isReverse: value as bool)),
-      .albumIsGrid => copyWith(album: album.copyWith(isGrid: value as bool)),
-      .backupEnabled => copyWith(backup: backup.copyWith(enabled: value as bool)),
-      .backupUseCellularForVideos => copyWith(backup: backup.copyWith(useCellularForVideos: value as bool)),
-      .backupUseCellularForPhotos => copyWith(backup: backup.copyWith(useCellularForPhotos: value as bool)),
-      .backupRequireCharging => copyWith(backup: backup.copyWith(requireCharging: value as bool)),
-      .backupTriggerDelay => copyWith(backup: backup.copyWith(triggerDelay: value as int)),
-      .backupSyncAlbums => copyWith(backup: backup.copyWith(syncAlbums: value as bool)),
-      .timelineTilesPerRow => copyWith(timeline: timeline.copyWith(tilesPerRow: value as int)),
-      .timelineGroupAssetsBy => copyWith(timeline: timeline.copyWith(groupAssetsBy: value as GroupAssetsBy)),
-      .timelineStorageIndicator => copyWith(timeline: timeline.copyWith(storageIndicator: value as bool)),
-      .mapShowFavoriteOnly => copyWith(map: map.copyWith(favoritesOnly: value as bool)),
-      .mapRelativeDate => copyWith(map: map.copyWith(relativeDays: value as int)),
-      .mapIncludeArchived => copyWith(map: map.copyWith(includeArchived: value as bool)),
-      .mapThemeMode => copyWith(map: map.copyWith(themeMode: value as ThemeMode)),
-      .mapWithPartners => copyWith(map: map.copyWith(withPartners: value as bool)),
-      .cleanupKeepFavorites => copyWith(cleanup: cleanup.copyWith(keepFavorites: value as bool)),
-      .cleanupKeepMediaType => copyWith(cleanup: cleanup.copyWith(keepMediaType: value as AssetKeepType)),
-      .cleanupKeepAlbumIds => copyWith(cleanup: cleanup.copyWith(keepAlbumIds: value as List<String>)),
-      .cleanupCutoffDaysAgo => copyWith(cleanup: cleanup.copyWith(cutoffDaysAgo: value as int)),
-      .cleanupDefaultsInitialized => copyWith(cleanup: cleanup.copyWith(defaultsInitialized: value as bool)),
-      .slideshowTransition => copyWith(slideshow: slideshow.copyWith(transition: value as bool)),
-      .slideshowRepeat => copyWith(slideshow: slideshow.copyWith(repeat: value as bool)),
-      .slideshowDuration => copyWith(slideshow: slideshow.copyWith(duration: value as int)),
-      .slideshowLook => copyWith(slideshow: slideshow.copyWith(look: value as SlideshowLook)),
-      .slideshowDirection => copyWith(slideshow: slideshow.copyWith(direction: value as SlideshowDirection)),
-    };
-  }
+      'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup)';
 }
@@ -2,15 +2,15 @@ import 'package:flutter/foundation.dart';

 class NetworkConfig {
  final bool autoEndpointSwitching;
-  final String preferredWifiName;
-  final String localEndpoint;
+  final String? preferredWifiName;
+  final String? localEndpoint;
  final List<String> externalEndpointList;
  final Map<String, String> customHeaders;

  const NetworkConfig({
    this.autoEndpointSwitching = false,
-    this.preferredWifiName = '',
-    this.localEndpoint = '',
+    this.preferredWifiName,
+    this.localEndpoint,
    this.externalEndpointList = const [],
    this.customHeaders = const {},
  });
@@ -0,0 +1,22 @@
+import 'package:immich_mobile/domain/models/config/network_config.dart';
+import 'package:immich_mobile/domain/models/log.model.dart';
+
+class SystemConfig {
+  final LogLevel logLevel;
+  final NetworkConfig network;
+
+  const SystemConfig({this.logLevel = .info, this.network = const .new()});
+
+  SystemConfig copyWith({LogLevel? logLevel, NetworkConfig? network}) =>
+      SystemConfig(logLevel: logLevel ?? this.logLevel, network: network ?? this.network);
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) || (other is SystemConfig && other.logLevel == logLevel && other.network == network);
+
+  @override
+  int get hashCode => Object.hash(logLevel, network);
+
+  @override
+  String toString() => 'SystemConfig(logLevel: $logLevel, network: $network)';
+}
@@ -1,105 +1,142 @@
 import 'dart:convert';

+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';

-enum MetadataScope {
-  user, // keys with this scope are deleted on logout
-  system;
+enum MetadataDomain<T extends Object> {
+  appConfig<AppConfig>('config.app'),
+  systemConfig<SystemConfig>('config.system');

-  const MetadataScope();
+  final String prefix;
+  const MetadataDomain(this.prefix);
 }

 enum MetadataKey<T extends Object> {
  // Theme
-  themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
-  themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
-  themeDynamic<bool>(),
-  themeColorfulInterface<bool>(),
+  themePrimaryColor<ImmichColorPreset>(.appConfig, 'theme.primaryColor', .indigo, _EnumCodec(ImmichColorPreset.values)),
+  themeMode<ThemeMode>(.appConfig, 'theme.mode', .system, _EnumCodec(ThemeMode.values)),
+  themeDynamic<bool>(.appConfig, 'theme.dynamic', false),
+  themeColorfulInterface<bool>(.appConfig, 'theme.colorfulInterface', true),

  // Image
-  imagePreferRemote<bool>(),
-  imageLoadOriginal<bool>(),
+  imagePreferRemote<bool>(.appConfig, 'image.preferRemote', false),
+  imageLoadOriginal<bool>(.appConfig, 'image.loadOriginal', false),

  // Viewer
-  viewerLoopVideo<bool>(),
-  viewerLoadOriginalVideo<bool>(),
-  viewerAutoPlayVideo<bool>(),
-  viewerTapToNavigate<bool>(),
+  viewerLoopVideo<bool>(.appConfig, 'viewer.loopVideo', true),
+  viewerLoadOriginalVideo<bool>(.appConfig, 'viewer.loadOriginalVideo', false),
+  viewerAutoPlayVideo<bool>(.appConfig, 'viewer.autoPlayVideo', true),
+  viewerTapToNavigate<bool>(.appConfig, 'viewer.tapToNavigate', false),

  // Network
-  networkAutoEndpointSwitching<bool>(scope: .system),
-  networkPreferredWifiName<String>(scope: .system),
-  networkLocalEndpoint<String>(scope: .system),
-  networkExternalEndpointList<List<String>>(scope: .system, codec: _ListCodec(_PrimitiveCodec.string)),
+  networkAutoEndpointSwitching<bool>(.systemConfig, 'network.autoEndpointSwitching', false),
+  networkPreferredWifiName<String>(.systemConfig, 'network.preferredWifiName', ''),
+  networkLocalEndpoint<String>(.systemConfig, 'network.localEndpoint', ''),
+  networkExternalEndpointList<List<String>>(
+    .systemConfig,
+    'network.externalEndpointList',
+    [],
+    _ListCodec(_PrimitiveCodec.string),
+  ),
  networkCustomHeaders<Map<String, String>>(
-    scope: .system,
-    codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string),
+    .systemConfig,
+    'network.customHeaders',
+    {},
+    _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string),
  ),

  // Album
-  albumSortMode<AlbumSortMode>(codec: _EnumCodec(AlbumSortMode.values)),
-  albumIsReverse<bool>(),
-  albumIsGrid<bool>(),
+  albumSortMode<AlbumSortMode>(
+    .appConfig,
+    'album.sortMode',
+    AlbumSortMode.mostRecent,
+    _EnumCodec(AlbumSortMode.values),
+  ),
+  albumIsReverse<bool>(.appConfig, 'album.isReverse', true),
+  albumIsGrid<bool>(.appConfig, 'album.isGrid', false),

  // Backup
-  backupEnabled<bool>(),
-  backupUseCellularForVideos<bool>(),
-  backupUseCellularForPhotos<bool>(),
-  backupRequireCharging<bool>(),
-  backupTriggerDelay<int>(),
-  backupSyncAlbums<bool>(),
+  backupEnabled<bool>(.appConfig, 'backup.enabled', false),
+  backupUseCellularForVideos<bool>(.appConfig, 'backup.useCellularForVideos', false),
+  backupUseCellularForPhotos<bool>(.appConfig, 'backup.useCellularForPhotos', false),
+  backupRequireCharging<bool>(.appConfig, 'backup.requireCharging', false),
+  backupTriggerDelay<int>(.appConfig, 'backup.triggerDelay', 30),
+  backupSyncAlbums<bool>(.appConfig, 'backup.syncAlbums', false),

  // Timeline
-  timelineTilesPerRow<int>(),
-  timelineGroupAssetsBy<GroupAssetsBy>(codec: _EnumCodec(GroupAssetsBy.values)),
-  timelineStorageIndicator<bool>(),
+  timelineTilesPerRow<int>(.appConfig, 'timeline.tilesPerRow', 4),
+  timelineGroupAssetsBy<GroupAssetsBy>(
+    .appConfig,
+    'timeline.groupAssetsBy',
+    GroupAssetsBy.day,
+    _EnumCodec(GroupAssetsBy.values),
+  ),
+  timelineStorageIndicator<bool>(.appConfig, 'timeline.storageIndicator', true),

  // Log
-  logLevel<LogLevel>(scope: .system, codec: _EnumCodec(LogLevel.values)),
+  logLevel<LogLevel>(.systemConfig, 'log.level', .info, _EnumCodec(LogLevel.values)),

  // Map
-  mapShowFavoriteOnly<bool>(),
-  mapRelativeDate<int>(),
-  mapIncludeArchived<bool>(),
-  mapThemeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
-  mapWithPartners<bool>(),
+  mapShowFavoriteOnly<bool>(.appConfig, 'map.showFavoriteOnly', false),
+  mapRelativeDate<int>(.appConfig, 'map.relativeDate', 0),
+  mapIncludeArchived<bool>(.appConfig, 'map.includeArchived', false),
+  mapThemeMode<ThemeMode>(.appConfig, 'map.themeMode', .system, _EnumCodec(ThemeMode.values)),
+  mapWithPartners<bool>(.appConfig, 'map.withPartners', false),

  // Cleanup
-  cleanupKeepFavorites<bool>(),
-  cleanupKeepMediaType<AssetKeepType>(codec: _EnumCodec(AssetKeepType.values)),
-  cleanupKeepAlbumIds<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
-  cleanupCutoffDaysAgo<int>(),
-  cleanupDefaultsInitialized<bool>(),
+  cleanupKeepFavorites<bool>(.appConfig, 'cleanup.keepFavorites', true),
+  cleanupKeepMediaType<AssetKeepType>(
+    .appConfig,
+    'cleanup.keepMediaType',
+    AssetKeepType.none,
+    _EnumCodec(AssetKeepType.values),
+  ),
+  cleanupKeepAlbumIds<List<String>>(.appConfig, 'cleanup.keepAlbumIds', [], _ListCodec(_PrimitiveCodec.string)),
+  cleanupCutoffDaysAgo<int>(.appConfig, 'cleanup.cutoffDaysAgo', -1),
+  cleanupDefaultsInitialized<bool>(.appConfig, 'cleanup.defaultsInitialized', false),

  // Slideshow
-  slideshowTransition<bool>(),
-  slideshowRepeat<bool>(),
-  slideshowDuration<int>(),
-  slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
-  slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values));
+  slideshowTransition<bool>(.appConfig, 'slideshow.transition', true),
+  slideshowRepeat<bool>(.appConfig, 'slideshow.repeat', true),
+  slideshowDuration<int>(.appConfig, 'slideshow.duration', 5),
+  slideshowLook<SlideshowLook>(.appConfig, 'slideshow.look', SlideshowLook.contain, _EnumCodec(SlideshowLook.values)),
+  slideshowDirection<SlideshowDirection>(
+    .appConfig,
+    'slideshow.direction',
+    SlideshowDirection.forward,
+    _EnumCodec(SlideshowDirection.values),
+  );

-  final MetadataScope scope;
+  final MetadataDomain domain;
+  final String name;
+  final T defaultValue;
  final _MetadataCodec<T>? _codecOverride;

-  const MetadataKey({this.scope = .user, _MetadataCodec<T>? codec}) : _codecOverride = codec;
+  const MetadataKey(this.domain, this.name, this.defaultValue, [this._codecOverride]);

-  _MetadataCodec<T> get _codec => _codecOverride ?? _MetadataCodec.forType(T);
+  String get key => '${domain.prefix}.$name';
+
+  _MetadataCodec<T> get _codec => _codecOverride ?? _MetadataCodec.forPrimitive(defaultValue);

  String encode(T value) => _codec.encode(value);

-  T decode(String raw) => _codec.decode(raw);
+  T decode(String raw) => _codec.decode(raw) ?? defaultValue;
+
+  static Map<String, MetadataKey<Object>> asKeyMap() => {for (var value in MetadataKey.values) value.key: value};
 }

 sealed class _MetadataCodec<T extends Object> {
  const _MetadataCodec();

  String encode(T value);
-  T decode(String raw);
+  T? decode(String raw);

  static const Map<Type, _MetadataCodec<Object>> _primitives = {
    int: _PrimitiveCodec.integer,
@@ -109,10 +146,12 @@ sealed class _MetadataCodec<T extends Object> {
    DateTime: _DateTimeCodec(),
  };

-  static _MetadataCodec<T> forType<T extends Object>(Type runtimeType) {
-    final codec = _primitives[runtimeType];
+  static _MetadataCodec<T> forPrimitive<T extends Object>(T sample) {
+    final codec = _primitives[sample.runtimeType];
    if (codec == null) {
-      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the MetadataKey.');
+      throw StateError(
+        'No primitive codec for ${sample.runtimeType}. Provide an explicit codec when defining the MetadataKey.',
+      );
    }
    return codec as _MetadataCodec<T>;
  }
@@ -127,7 +166,7 @@ final class _EnumCodec<T extends Enum> extends _MetadataCodec<T> {
  String encode(T value) => value.name;

  @override
-  T decode(String raw) => values.firstWhere((v) => v.name == raw);
+  T? decode(String raw) => values.firstWhereOrNull((v) => v.name == raw);
 }

 final class _DateTimeCodec extends _MetadataCodec<DateTime> {
@@ -137,7 +176,7 @@ final class _DateTimeCodec extends _MetadataCodec<DateTime> {
  String encode(DateTime value) => value.toIso8601String();

  @override
-  DateTime decode(String raw) => DateTime.parse(raw);
+  DateTime? decode(String raw) => DateTime.tryParse(raw);
 }

 final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec<Map<K, V>> {
@@ -154,26 +193,29 @@ final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec
  }

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

  @override
-  List<T> decode(String raw) {
+  List<T>? decode(String raw) {
    try {
      final decoded = jsonDecode(raw);
      if (decoded is! List) {
-        return [];
+        return null;
      }
      final result = <T>[];
      for (final item in decoded) {
        if (item is! String) {
-          return [];
+          return null;
        }
        final element = _elementCodec.decode(item);
+        if (element == null) {
+          return null;
+        }
        result.add(element);
      }
      return result;
    } on FormatException {
-      return [];
+      return null;
    }
  }
 }

 final class _PrimitiveCodec<T extends Object> extends _MetadataCodec<T> {
-  final T Function(String) _parse;
+  final T? Function(String) _parse;

  const _PrimitiveCodec._(this._parse);

@@ -217,12 +262,12 @@ final class _PrimitiveCodec<T extends Object> extends _MetadataCodec<T> {
  String encode(T value) => value.toString();

  @override
-  T decode(String raw) => _parse(raw);
+  T? decode(String raw) => _parse(raw);

-  static const integer = _PrimitiveCodec<int>._(int.parse);
-  static const real = _PrimitiveCodec<double>._(double.parse);
-  static const boolean = _PrimitiveCodec<bool>._(bool.parse);
+  static const integer = _PrimitiveCodec<int>._(int.tryParse);
+  static const real = _PrimitiveCodec<double>._(double.tryParse);
+  static const boolean = _PrimitiveCodec<bool>._(bool.tryParse);
  static const string = _PrimitiveCodec<String>._(_identity);

-  static String _identity(String s) => s;
+  static String? _identity(String s) => s;
 }
@@ -8,7 +8,11 @@ class AssetService {
  final RemoteAssetRepository _remoteAssetRepository;
  final DriftLocalAssetRepository _localAssetRepository;

-  const AssetService({required this._remoteAssetRepository, required this._localAssetRepository});
+  const AssetService({
+    required RemoteAssetRepository remoteAssetRepository,
+    required DriftLocalAssetRepository localAssetRepository,
+  }) : _remoteAssetRepository = remoteAssetRepository,
+       _localAssetRepository = localAssetRepository;

  Future<BaseAsset?> getAsset(BaseAsset asset) {
    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;
@@ -61,9 +61,11 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {

  bool _isCleanedUp = false;

-  BackgroundWorkerBgService({required this._drift, required this._driftLogger})
-    : _backgroundHostApi = BackgroundWorkerBgHostApi() {
-    _ref = ProviderContainer(overrides: [driftProvider.overrideWith(driftOverride(_drift))]);
+  BackgroundWorkerBgService({required Drift drift, required DriftLogger driftLogger})
+    : _drift = drift,
+      _driftLogger = driftLogger,
+      _backgroundHostApi = BackgroundWorkerBgHostApi() {
+    _ref = ProviderContainer(overrides: [driftProvider.overrideWith(driftOverride(drift))]);
    BackgroundWorkerFlutterApi.setUp(this);
  }

@@ -0,0 +1,87 @@
+import 'dart:async';
+
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/stack.repository.dart';
+import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/repositories/asset_api.repository.dart';
+import 'package:logging/logging.dart';
+
+/// Handles an edit that was reverted in Photos. The local was uploaded as an edit
+/// before but isn't edited now, so flip the stack primary back to the original (via
+/// prior_remote_id) and mark it handled so we don't re-upload the reverted render.
+/// Nothing is trashed; all the edits stay in the stack.
+class EditRevertService {
+  final NativeSyncApi _nativeSyncApi;
+  final DriftStackRepository _stackRepository;
+  final DriftLocalAssetRepository _localAssetRepository;
+  final AssetApiRepository _assetApiRepository;
+  final _log = Logger('EditRevertService');
+
+  EditRevertService({
+    required NativeSyncApi nativeSyncApi,
+    required DriftStackRepository stackRepository,
+    required DriftLocalAssetRepository localAssetRepository,
+    required AssetApiRepository assetApiRepository,
+  }) : _nativeSyncApi = nativeSyncApi,
+       _stackRepository = stackRepository,
+       _localAssetRepository = localAssetRepository,
+       _assetApiRepository = assetApiRepository;
+
+  /// Returns true if the asset was a revert and was handled (caller skips the
+  /// upload); false to fall through to the normal upload path.
+  Future<bool> tryHandleRevert(LocalAsset asset) async {
+    if (asset.priorRemoteId == null) {
+      return false;
+    }
+
+    // Only "not edited" is a revert. `edited` is a fresh edit, so let the pair flow
+    // take it. `unknown` means we couldn't read the adjustment (offloaded to iCloud,
+    // network off); bail there too instead of mistaking an unreadable edit for a
+    // revert and flipping the stack. Network off keeps this a cheap offline read.
+    try {
+      final editState = await _nativeSyncApi.getEditState(asset.id, allowNetworkAccess: false);
+      if (editState != EditState.notEdited) {
+        return false;
+      }
+    } catch (error, stack) {
+      _log.warning("edit-state probe failed for ${asset.id}", error, stack);
+      return false;
+    }
+
+    // It's a revert. Styled photos hit this path because iOS re-encodes the revert to
+    // fresh bytes, so it looks like a new backup candidate and reaches upload.
+    // Non-styled reverts hash back to the base instead, aren't candidates, and get
+    // flipped at hash time in HashService._reconcileReverts. Fresh bytes match nothing
+    // remote, so flip by structure: prior_remote_id is the current primary (the latest
+    // edit), flip it back to the base.
+    final String stackId;
+    final String baseId;
+    try {
+      final foundStack = await _stackRepository.findStackIdByRemoteId(asset.priorRemoteId!);
+      if (foundStack == null) {
+        return false;
+      }
+      final base = await _stackRepository.findStackBaseId(foundStack, excludeId: asset.priorRemoteId!);
+      if (base == null) {
+        return false;
+      }
+      stackId = foundStack;
+      baseId = base;
+    } catch (error, stack) {
+      _log.warning("revert stack lookup failed for ${asset.id}", error, stack);
+      return false;
+    }
+
+    try {
+      await _assetApiRepository.setStackPrimary(stackId, baseId);
+      await _stackRepository.setPrimary(stackId, baseId);
+      await _localAssetRepository.markSynced(asset.id, priorRemoteId: baseId, syncedChecksum: asset.checksum ?? '');
+    } catch (error, stack) {
+      _log.warning("revert primary flip failed for ${asset.id}", error, stack);
+      return false;
+    }
+
+    return true;
+  }
+}
@@ -5,8 +5,10 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/stack.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:logging/logging.dart';

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

  HashService({
-    required this._localAlbumRepository,
-    required this._localAssetRepository,
-    required this._trashedLocalAssetRepository,
-    required this._nativeSyncApi,
-    this._cancelChecker,
+    required DriftLocalAlbumRepository localAlbumRepository,
+    required DriftLocalAssetRepository localAssetRepository,
+    required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
+    required NativeSyncApi nativeSyncApi,
+    required DriftStackRepository stackRepository,
+    required AssetApiRepository assetApiRepository,
+    bool Function()? cancelChecker,
    int? batchSize,
-  }) : _batchSize = batchSize ?? kBatchHashFileLimit;
+  }) : _localAlbumRepository = localAlbumRepository,
+       _localAssetRepository = localAssetRepository,
+       _trashedLocalAssetRepository = trashedLocalAssetRepository,
+       _cancelChecker = cancelChecker,
+       _nativeSyncApi = nativeSyncApi,
+       _stackRepository = stackRepository,
+       _assetApiRepository = assetApiRepository,
+       _batchSize = batchSize ?? kBatchHashFileLimit;

  bool get isCancelled => _cancelChecker?.call() ?? false;

@@ -40,6 +53,7 @@ class HashService {

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

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

        final assetsToHash = await _localAlbumRepository.getAssetsToHash(album.id);
        if (assetsToHash.isNotEmpty) {
-          await _hashAssets(album, assetsToHash);
+          await _hashAssets(album, assetsToHash, hashedIds: hashedIds);
        }
      }
      if (CurrentPlatform.isAndroid && localAlbums.isNotEmpty) {
@@ -57,9 +71,18 @@ class HashService {
        final trashedToHash = await _trashedLocalAssetRepository.getAssetsToHash(backupAlbumIds);
        if (trashedToHash.isNotEmpty) {
          final pseudoAlbum = LocalAlbum(id: '-pseudoAlbum', name: 'Trash', updatedAt: DateTime.now());
-          await _hashAssets(pseudoAlbum, trashedToHash, isTrashed: true);
+          await _hashAssets(pseudoAlbum, trashedToHash, isTrashed: true, hashedIds: hashedIds);
        }
      }
+
+      // Revert reconcile for non-styled photos: the reverted edit hashes back to the
+      // original's exact bytes, which are already the stack base, so it's not a backup
+      // candidate and never reaches upload. Flip the primary here. Styled photos
+      // re-encode to fresh bytes and get flipped on the upload path instead
+      // (EditRevertService.tryHandleRevert).
+      if (CurrentPlatform.isIOS && hashedIds.isNotEmpty && !isCancelled) {
+        await _reconcileReverts(hashedIds);
+      }
    } on PlatformException catch (e) {
      if (e.code == _kHashCancelledCode) {
        _log.warning("Hashing cancelled by platform");
@@ -76,7 +99,12 @@ class HashService {
  /// Processes a list of [LocalAsset]s, storing their hash and updating the assets in the DB
  /// with hash for those that were successfully hashed. Hashes are looked up in a table
  /// [LocalAssetHashEntity] by local id. Only missing entries are newly hashed and added to the DB.
-  Future<void> _hashAssets(LocalAlbum album, List<LocalAsset> assetsToHash, {bool isTrashed = false}) async {
+  Future<void> _hashAssets(
+    LocalAlbum album,
+    List<LocalAsset> assetsToHash, {
+    bool isTrashed = false,
+    required Set<String> hashedIds,
+  }) async {
    final toHash = <String, LocalAsset>{};

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

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

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

  /// Processes a batch of assets.
-  Future<void> _processBatch(LocalAlbum album, Map<String, LocalAsset> toHash, bool isTrashed) async {
+  Future<void> _processBatch(
+    LocalAlbum album,
+    Map<String, LocalAsset> toHash,
+    bool isTrashed,
+    Set<String> hashedIds,
+  ) async {
    if (toHash.isEmpty) {
      return;
    }
@@ -136,5 +169,33 @@ class HashService {
    } else {
      await _localAssetRepository.updateHashes(hashed);
    }
+    hashedIds.addAll(hashed.keys);
+  }
+
+  Future<void> _reconcileReverts(Set<String> localIds) async {
+    final List<StackReconcileTarget> targets;
+    try {
+      targets = await _stackRepository.findRevertReconcileTargets(localIds);
+    } catch (error, stack) {
+      _log.warning("findRevertReconcileTargets failed", error, stack);
+      return;
+    }
+
+    for (final target in targets) {
+      try {
+        await _assetApiRepository.setStackPrimary(target.stackId, target.newPrimaryId);
+        await _stackRepository.setPrimary(target.stackId, target.newPrimaryId);
+        // Roll priorRemoteId forward to the matched member (now the primary) so a
+        // later edit stacks onto THAT (the current render), not the old edit.
+        await _localAssetRepository.markSynced(
+          target.localAssetId,
+          priorRemoteId: target.newPrimaryId,
+          syncedChecksum: target.localAssetChecksum,
+        );
+      } catch (error, stack) {
+        _log.warning("revert reconcile flip failed for stack ${target.stackId}", error, stack);
+        continue;
+      }
+    }
  }
 }
@@ -28,13 +28,18 @@ class LocalSyncService {
  final Logger _log = Logger("DeviceSyncService");

  LocalSyncService({
-    required this._localAlbumRepository,
-    required this._localAssetRepository,
-    required this._nativeSyncApi,
-    required this._trashedLocalAssetRepository,
-    required this._assetMediaRepository,
-    required this._permissionRepository,
-  });
+    required DriftLocalAlbumRepository localAlbumRepository,
+    required DriftLocalAssetRepository localAssetRepository,
+    required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
+    required AssetMediaRepository assetMediaRepository,
+    required IPermissionRepository permissionRepository,
+    required NativeSyncApi nativeSyncApi,
+  }) : _localAlbumRepository = localAlbumRepository,
+       _localAssetRepository = localAssetRepository,
+       _trashedLocalAssetRepository = trashedLocalAssetRepository,
+       _assetMediaRepository = assetMediaRepository,
+       _permissionRepository = permissionRepository,
+       _nativeSyncApi = nativeSyncApi;

  Future<void> sync({bool full = false}) async {
    final Stopwatch stopwatch = Stopwatch()..start();
@@ -56,7 +56,7 @@ class LogService {
  }) async {
    final instance = LogService._(logRepository, metadataRepository, shouldBuffer);
    await logRepository.truncate(limit: kLogTruncateLimit);
-    final level = instance._metadataRepository.appConfig.logLevel;
+    final level = instance._metadataRepository.systemConfig.logLevel;
    Logger.root.level = Level.LEVELS.elementAtOrNull(level.index) ?? Level.INFO;
    return instance;
  }
@@ -10,7 +10,7 @@ typedef MapQuery = ({MapMarkerSource markerSource});
 class MapFactory {
  final DriftMapRepository _mapRepository;

-  const MapFactory({required this._mapRepository});
+  const MapFactory({required DriftMapRepository mapRepository}) : _mapRepository = mapRepository;

  MapService remote(List<String> ownerIds, TimelineMapOptions options) =>
      MapService(_mapRepository.remote(ownerIds, options));
@@ -234,13 +234,24 @@ class RemoteAlbumService {
    final pendingAdds = <Future<void>>[];
    final localById = {for (final a in localAssets) a.id: a};

-    final UploadCallbacks(:onProgress, :onSuccess, :onError, :onICloudProgress) = userCallbacks;
    final wrappedCallbacks = UploadCallbacks(
-      onProgress: onProgress,
-      onICloudProgress: onICloudProgress,
-      onError: onError,
+      onProgress: (localId, filename, bytes, totalBytes) => _runUploadCallback(
+        'Upload progress callback failed for $localId',
+        () => userCallbacks.onProgress?.call(localId, filename, bytes, totalBytes),
+      ),
+      onICloudProgress: (localId, progress) => _runUploadCallback(
+        'iCloud progress callback failed for $localId',
+        () => userCallbacks.onICloudProgress?.call(localId, progress),
+      ),
+      onError: (localId, errorMessage) => _runUploadCallback(
+        'Upload error callback failed for $localId',
+        () => userCallbacks.onError?.call(localId, errorMessage),
+      ),
      onSuccess: (localId, remoteId) {
-        onSuccess?.call(localId, remoteId);
+        _runUploadCallback(
+          'Upload success callback failed for $localId',
+          () => userCallbacks.onSuccess?.call(localId, remoteId),
+        );
        final source = localById[localId];
        if (source == null) {
          _logger.warning('Upload success for $localId but source LocalAsset missing; skipping album link');
@@ -248,22 +259,29 @@ class RemoteAlbumService {
        }
        pendingAdds.add(
          _linkUploadedAssetToAlbum(albumId, remoteId, uploader, source)
-              .then<void>((added) => addedCount += added)
-              .onError(
-                (error, stack) =>
-                    _logger.warning('Failed to add uploaded asset $remoteId to album $albumId', error, stack),
-              ),
+              .then<void>((added) {
+                addedCount += added;
+              })
+              .catchError((Object error, StackTrace stack) {
+                _logger.warning('Failed to add uploaded asset $remoteId to album $albumId', error, stack);
+              }),
        );
      },
    );

-    await _uploadService.uploadManual(localAssets, cancelToken: null, callbacks: wrappedCallbacks);
+    await _uploadService.uploadManual(localAssets, callbacks: wrappedCallbacks);
    await Future.wait(pendingAdds);
    return addedCount;
  }

-  // TODO: this is a poorly designed flow; adding a "stub" just to satisfy FK constraints is hacky,
-  // it goes out of its way to insert one at a time, and it swallows errors that should be surfaced to the user.
+  void _runUploadCallback(String message, void Function() callback) {
+    try {
+      callback();
+    } catch (error, stack) {
+      _logger.warning(message, error, stack);
+    }
+  }
+
  /// Links a freshly-uploaded asset to an album, ensuring the local DB
  /// reflects the change without waiting for the next sync. We call the API
  /// (server is the source of truth), then upsert a placeholder
@@ -9,7 +9,7 @@ final AppSetting = SettingsService(storeService: StoreService.I);
 class SettingsService {
  final StoreService _storeService;

-  const SettingsService({required this._storeService});
+  const SettingsService({required StoreService storeService}) : _storeService = storeService;

  T get<T>(Setting<T> setting) => _storeService.get(setting.storeKey, setting.defaultValue);

@@ -41,16 +41,24 @@ class SyncStreamService {
  final bool Function()? _cancelChecker;

  SyncStreamService({
-    required this._syncApiRepository,
-    required this._syncStreamRepository,
-    required this._localAssetRepository,
-    required this._trashedLocalAssetRepository,
-    required this._assetMediaRepository,
-    required this._permissionRepository,
-    required this._syncMigrationRepository,
-    required this._api,
-    this._cancelChecker,
-  });
+    required SyncApiRepository syncApiRepository,
+    required SyncStreamRepository syncStreamRepository,
+    required DriftLocalAssetRepository localAssetRepository,
+    required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
+    required AssetMediaRepository assetMediaRepository,
+    required IPermissionRepository permissionRepository,
+    required SyncMigrationRepository syncMigrationRepository,
+    required ApiService api,
+    bool Function()? cancelChecker,
+  }) : _syncApiRepository = syncApiRepository,
+       _syncStreamRepository = syncStreamRepository,
+       _localAssetRepository = localAssetRepository,
+       _trashedLocalAssetRepository = trashedLocalAssetRepository,
+       _assetMediaRepository = assetMediaRepository,
+       _permissionRepository = permissionRepository,
+       _syncMigrationRepository = syncMigrationRepository,
+       _api = api,
+       _cancelChecker = cancelChecker;

  bool get isCancelled => _cancelChecker?.call() ?? false;

@@ -41,7 +41,11 @@ class TimelineFactory {
  final DriftTimelineRepository _timelineRepository;
  final MetadataRepository _metadataRepository;

-  const TimelineFactory({required this._timelineRepository, required this._metadataRepository});
+  const TimelineFactory({
+    required DriftTimelineRepository timelineRepository,
+    required MetadataRepository metadataRepository,
+  }) : _timelineRepository = timelineRepository,
+       _metadataRepository = metadataRepository;

  GroupAssetsBy get groupBy {
    final group = _metadataRepository.appConfig.timeline.groupAssetsBy;
@@ -104,7 +108,12 @@ class TimelineService {
  TimelineService(TimelineQuery query)
    : this._(assetSource: query.assetSource, bucketSource: query.bucketSource, origin: query.origin);

-  TimelineService._({required this._assetSource, required this._bucketSource, required this.origin}) {
+  TimelineService._({
+    required TimelineAssetSource assetSource,
+    required TimelineBucketSource bucketSource,
+    required this.origin,
+  }) : _assetSource = assetSource,
+       _bucketSource = bucketSource {
    _bucketSubscription = _bucketSource().listen((buckets) {
      _mutex.run(() async {
        final totalAssets = buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
@@ -12,7 +12,9 @@ class UserService {
  final UserApiRepository _userApiRepository;
  final StoreService _storeService;

-  UserService({required this._userApiRepository, required this._storeService});
+  UserService({required UserApiRepository userApiRepository, required StoreService storeService})
+    : _userApiRepository = userApiRepository,
+      _storeService = storeService;

  UserDto getMyUser() {
    return _storeService.get(StoreKey.currentUser);
@@ -81,6 +81,10 @@ class BackgroundSyncManager {
    } on CanceledError {
      // Ignore cancellation errors
    }
+
+    // Stop the local-sync and hash slots too. The revert reconcile runs in the hash
+    // task and shouldn't outlive the session.
+    await cancelLocal();
  }

  Future<void> cancelLocal() async {
@@ -186,6 +190,22 @@ class BackgroundSyncManager {
        });
  }

+  /// Runs a remote sync guaranteed to observe changes up to now. [syncRemote]
+  /// joins an in-flight sync whose snapshot can pre-date a just-received change
+  /// (e.g. a stack update) and miss it, so wait for any in-flight sync to finish
+  /// first, then run a fresh one.
+  Future<void> runFreshRemoteSync() async {
+    final inflight = _syncTask;
+    if (inflight != null) {
+      try {
+        await inflight.future;
+      } catch (_) {
+        // The in-flight sync's outcome doesn't matter; we only need a fresh one after it.
+      }
+    }
+    await syncRemote();
+  }
+
  Future<void> syncWebsocketBatchV1(List<dynamic> batchData) {
    if (_syncWebsocketTask != null) {
      return _syncWebsocketTask!.future;
@@ -6,6 +6,7 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';

@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)')
@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)')
+@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_prior_remote_id ON local_asset_entity (prior_remote_id)')
 class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
  const LocalAssetEntity();

@@ -27,6 +28,14 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1338,7 +1484,9 @@ class LocalAssetEntityCompanion
          ..write('adjustmentTime: $adjustmentTime, ')
          ..write('latitude: $latitude, ')
          ..write('longitude: $longitude, ')
-          ..write('playbackStyle: $playbackStyle')
+          ..write('playbackStyle: $playbackStyle, ')
+          ..write('priorRemoteId: $priorRemoteId, ')
+          ..write('syncedChecksum: $syncedChecksum')
          ..write(')'))
        .toString();
  }
@@ -1348,3 +1496,7 @@ i0.Index get idxLocalAssetCloudId => i0.Index(
  'idx_local_asset_cloud_id',
  'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
 );
+i0.Index get idxLocalAssetPriorRemoteId => i0.Index(
+  'idx_local_asset_prior_remote_id',
+  'CREATE INDEX IF NOT EXISTS idx_local_asset_prior_remote_id ON local_asset_entity (prior_remote_id)',
+);
@@ -7,7 +7,13 @@ import 'local_album_asset.entity.dart';
 mergedAsset:
 SELECT
 	rae.id as remote_id,
-	(SELECT lae.id FROM local_asset_entity lae WHERE lae.checksum = rae.checksum LIMIT 1) as local_id,
+	-- local_id links a remote to its on-device copy, normally by checksum. A reverted iOS
+	-- edit re-encodes to fresh bytes so the checksum no longer matches, but its
+	-- prior_remote_id still points at this remote, so fall back to that.
+	COALESCE(
+		(SELECT lae.id FROM local_asset_entity lae WHERE lae.checksum = rae.checksum LIMIT 1),
+		(SELECT lae.id FROM local_asset_entity lae WHERE lae.prior_remote_id = rae.id LIMIT 1)
+	) as local_id,
 	rae.name,
 	rae."type",
 	rae.created_at as created_at,
@@ -83,6 +89,13 @@ AND NOT EXISTS (
    INNER JOIN local_album_entity la on laa.album_id = la.id
    WHERE laa.asset_id = lae.id AND la.backup_selection = 2 -- excluded
 )
+-- iOS edit-in-progress / revert: if this local was already uploaded (its
+-- prior_remote_id resolves to a live remote), hide the local tile so the remote
+-- (the edit, or the flipped-back original) is the single source of truth. Kills
+-- the transient 2-tile flicker and stops a reverted local from re-appearing.
+AND NOT EXISTS (
+	SELECT 1 FROM remote_asset_entity rae WHERE rae.id = lae.prior_remote_id AND rae.owner_id IN :user_ids AND rae.deleted_at IS NULL
+)
 ORDER BY created_at DESC
 LIMIT $limit;

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

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

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

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

@@ -112,6 +112,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
    i7.idxLocalAlbumAssetAlbumAsset,
    i4.idxLocalAssetChecksum,
    i4.idxLocalAssetCloudId,
+    i4.idxLocalAssetPriorRemoteId,
    i3.idxStackPrimaryAssetId,
    i2.uQRemoteAssetsOwnerChecksum,
    i2.uQRemoteAssetsOwnerLibraryChecksum,
@@ -13539,6 +13539,613 @@ i1.GeneratedColumn<String> _column_212(String aliasedName) =>
      type: i1.DriftSqlType.string,
      $customConstraints: 'NULL',
    );
+
+final class Schema27 extends i0.VersionedSchema {
+  Schema27({required super.database}) : super(version: 27);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAlbumAssetAlbumAsset,
+    idxLocalAssetChecksum,
+    idxLocalAssetCloudId,
+    idxLocalAssetPriorRemoteId,
+    idxStackPrimaryAssetId,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    idxRemoteAssetStackId,
+    idxRemoteAssetOwnerVisibilityDeletedCreated,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    remoteAssetCloudIdEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    trashedLocalAssetEntity,
+    assetEditEntity,
+    metadata,
+    idxPartnerSharedWithId,
+    idxLatLng,
+    idxRemoteExifCity,
+    idxRemoteAlbumAssetAlbumAsset,
+    idxRemoteAssetCloudId,
+    idxPersonOwnerId,
+    idxAssetFacePersonId,
+    idxAssetFaceAssetId,
+    idxAssetFaceVisiblePerson,
+    idxTrashedLocalAssetChecksum,
+    idxTrashedLocalAssetAlbum,
+    idxAssetEditAssetId,
+  ];
+  late final Shape33 userEntity = Shape33(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_109,
+        _column_110,
+        _column_111,
+        _column_112,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape50 remoteAssetEntity = Shape50(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_119,
+        _column_120,
+        _column_121,
+        _column_122,
+        _column_123,
+        _column_124,
+        _column_212,
+        _column_125,
+        _column_126,
+        _column_127,
+        _column_128,
+        _column_129,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape35 stackEntity = Shape35(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_121,
+        _column_130,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape51 localAssetEntity = Shape51(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_131,
+        _column_120,
+        _column_132,
+        _column_133,
+        _column_134,
+        _column_135,
+        _column_136,
+        _column_137,
+        _column_213,
+        _column_214,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape48 remoteAlbumEntity = Shape48(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_138,
+        _column_114,
+        _column_115,
+        _column_139,
+        _column_140,
+        _column_141,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape38 localAlbumEntity = Shape38(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_115,
+        _column_142,
+        _column_143,
+        _column_144,
+        _column_145,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape39 localAlbumAssetEntity = Shape39(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_146, _column_147, _column_145],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
+    'idx_local_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxLocalAssetChecksum = i1.Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  final i1.Index idxLocalAssetCloudId = i1.Index(
+    'idx_local_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
+  );
+  final i1.Index idxLocalAssetPriorRemoteId = i1.Index(
+    'idx_local_asset_prior_remote_id',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_prior_remote_id ON local_asset_entity (prior_remote_id)',
+  );
+  final i1.Index idxStackPrimaryAssetId = i1.Index(
+    'idx_stack_primary_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
+  );
+  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  final i1.Index idxRemoteAssetChecksum = i1.Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  final i1.Index idxRemoteAssetStackId = i1.Index(
+    'idx_remote_asset_stack_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
+  );
+  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
+    'idx_remote_asset_owner_visibility_deleted_created',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
+  );
+  late final Shape40 authUserEntity = Shape40(
+    source: i0.VersionedTable(
+      entityName: 'auth_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_109,
+        _column_148,
+        _column_110,
+        _column_111,
+        _column_149,
+        _column_150,
+        _column_151,
+        _column_152,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape4 userMetadataEntity = Shape4(
+    source: i0.VersionedTable(
+      entityName: 'user_metadata_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
+      columns: [_column_153, _column_154, _column_155],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape41 partnerEntity = Shape41(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_156, _column_157, _column_158],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape42 remoteExifEntity = Shape42(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_159,
+        _column_160,
+        _column_161,
+        _column_162,
+        _column_163,
+        _column_164,
+        _column_117,
+        _column_116,
+        _column_165,
+        _column_166,
+        _column_167,
+        _column_168,
+        _column_135,
+        _column_136,
+        _column_169,
+        _column_170,
+        _column_171,
+        _column_172,
+        _column_173,
+        _column_174,
+        _column_175,
+        _column_176,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_159, _column_177],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape10 remoteAlbumUserEntity = Shape10(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
+      columns: [_column_177, _column_153, _column_178],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape43 remoteAssetCloudIdEntity = Shape43(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_cloud_id_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_159,
+        _column_179,
+        _column_180,
+        _column_134,
+        _column_135,
+        _column_136,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape44 memoryEntity = Shape44(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_124,
+        _column_121,
+        _column_113,
+        _column_181,
+        _column_182,
+        _column_183,
+        _column_184,
+        _column_185,
+        _column_186,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape12 memoryAssetEntity = Shape12(
+    source: i0.VersionedTable(
+      entityName: 'memory_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
+      columns: [_column_159, _column_187],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape45 personEntity = Shape45(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_121,
+        _column_108,
+        _column_188,
+        _column_189,
+        _column_190,
+        _column_191,
+        _column_192,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape46 assetFaceEntity = Shape46(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_193,
+        _column_194,
+        _column_195,
+        _column_196,
+        _column_197,
+        _column_198,
+        _column_199,
+        _column_200,
+        _column_201,
+        _column_124,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape18 storeEntity = Shape18(
+    source: i0.VersionedTable(
+      entityName: 'store_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_202, _column_203, _column_204],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape47 trashedLocalAssetEntity = Shape47(
+    source: i0.VersionedTable(
+      entityName: 'trashed_local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id, album_id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_205,
+        _column_131,
+        _column_120,
+        _column_132,
+        _column_206,
+        _column_137,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape32 assetEditEntity = Shape32(
+    source: i0.VersionedTable(
+      entityName: 'asset_edit_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_207,
+        _column_208,
+        _column_209,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape49 metadata = Shape49(
+    source: i0.VersionedTable(
+      entityName: 'metadata',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY("key")'],
+      columns: [_column_210, _column_211, _column_115],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxPartnerSharedWithId = i1.Index(
+    'idx_partner_shared_with_id',
+    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
+  );
+  final i1.Index idxLatLng = i1.Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+  final i1.Index idxRemoteExifCity = i1.Index(
+    'idx_remote_exif_city',
+    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
+  );
+  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
+    'idx_remote_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxRemoteAssetCloudId = i1.Index(
+    'idx_remote_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
+  );
+  final i1.Index idxPersonOwnerId = i1.Index(
+    'idx_person_owner_id',
+    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
+  );
+  final i1.Index idxAssetFacePersonId = i1.Index(
+    'idx_asset_face_person_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
+  );
+  final i1.Index idxAssetFaceAssetId = i1.Index(
+    'idx_asset_face_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
+  );
+  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
+    'idx_asset_face_visible_person',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
+  );
+  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
+    'idx_trashed_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
+  );
+  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
+    'idx_trashed_local_asset_album',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
+  );
+  final i1.Index idxAssetEditAssetId = i1.Index(
+    'idx_asset_edit_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
+  );
+}
+
+class Shape51 extends i0.VersionedTable {
+  Shape51({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get type =>
+      columnsByName['type']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get updatedAt =>
+      columnsByName['updated_at']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get width =>
+      columnsByName['width']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get height =>
+      columnsByName['height']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get durationMs =>
+      columnsByName['duration_ms']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get checksum =>
+      columnsByName['checksum']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get isFavorite =>
+      columnsByName['is_favorite']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get orientation =>
+      columnsByName['orientation']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get iCloudId =>
+      columnsByName['i_cloud_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get adjustmentTime =>
+      columnsByName['adjustment_time']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<double> get latitude =>
+      columnsByName['latitude']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get longitude =>
+      columnsByName['longitude']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<int> get playbackStyle =>
+      columnsByName['playback_style']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get priorRemoteId =>
+      columnsByName['prior_remote_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get syncedChecksum =>
+      columnsByName['synced_checksum']! as i1.GeneratedColumn<String>;
+}
+
+i1.GeneratedColumn<String> _column_213(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'prior_remote_id',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.string,
+      $customConstraints: 'NULL',
+    );
+i1.GeneratedColumn<String> _column_214(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'synced_checksum',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.string,
+      $customConstraints: 'NULL',
+    );
 i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
  required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -13565,6 +14172,7 @@ i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
  required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
  required Future<void> Function(i1.Migrator m, Schema26 schema) from25To26,
+  required Future<void> Function(i1.Migrator m, Schema27 schema) from26To27,
 }) {
  return (currentVersion, database) async {
    switch (currentVersion) {
@@ -13693,6 +14301,11 @@ i0.MigrationStepWithVersion migrationSteps({
        final migrator = i1.Migrator(database, schema);
        await from25To26(migrator, schema);
        return 26;
+      case 26:
+        final schema = Schema27(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from26To27(migrator, schema);
+        return 27;
      default:
        throw ArgumentError.value('Unknown migration from $currentVersion');
    }
@@ -13725,6 +14338,7 @@ i1.OnUpgrade stepByStep({
  required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
  required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
  required Future<void> Function(i1.Migrator m, Schema26 schema) from25To26,
+  required Future<void> Function(i1.Migrator m, Schema27 schema) from26To27,
 }) => i0.VersionedSchema.stepByStepHelper(
  step: migrationSteps(
    from1To2: from1To2,
@@ -13752,5 +14366,6 @@ i1.OnUpgrade stepByStep({
    from23To24: from23To24,
    from24To25: from24To25,
    from25To26: from25To26,
+    from26To27: from26To27,
  ),
 );
@@ -64,6 +64,12 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
    });
  }

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

 class MetadataRepository extends DriftDatabaseRepository {
  final Drift _db;
+  final Map<MetadataKey, Object> _cache = {};

  MetadataRepository._(this._db) : super(_db);

@@ -23,50 +25,153 @@ class MetadataRepository extends DriftDatabaseRepository {
  AppConfig _appConfig = const .new();
  AppConfig get appConfig => _appConfig;

+  SystemConfig _systemConfig = const .new();
+  SystemConfig get systemConfig => _systemConfig;
+
  static Future<MetadataRepository> ensureInitialized(Drift db) async {
    if (_instance == null) {
      final instance = MetadataRepository._(db);
-      await instance.refresh();
+      await instance._hydrate();
      _instance = instance;
    }
    return _instance!;
  }

-  Future<void> refresh() async => _applyOverrides(await _db.select(_db.metadataEntity).get());
+  static Future<void> refresh() async {
+    instance._cache.clear();
+    instance._appConfig = const .new();
+    instance._systemConfig = const .new();
+    await instance._hydrate();
+  }
+
+  Future<void> _hydrate() async => _hydrateCache(await _db.select(_db.metadataEntity).get());
+
+  T _read<T extends Object>(MetadataKey<T> key) => (_cache[key] as T?) ?? key.defaultValue;

  Future<void> write<T extends Object, U extends T>(MetadataKey<T> key, U value) async {
-    if (value == _appConfig.read(key)) {
+    if (_read(key) == value) {
      return;
    }

-    if (value == defaultConfig.read(key)) {
-      await (_db.delete(_db.metadataEntity)..where((t) => t.key.equals(key.name))).go();
-    } else {
-      await _db
-          .into(_db.metadataEntity)
-          .insertOnConflictUpdate(
-            MetadataEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
-          );
-    }
-
-    _appConfig = _appConfig.write(key, value);
+    await _db
+        .into(_db.metadataEntity)
+        .insertOnConflictUpdate(
+          MetadataEntityCompanion.insert(key: key.key, value: key.encode(value), updatedAt: Value(DateTime.now())),
+        );
+    _updateCache(key, value);
  }

-  Stream<AppConfig> watchConfig() => _db.select(_db.metadataEntity).watch().map((rows) {
-    _applyOverrides(rows);
-    return _appConfig;
-  });
+  Future<void> delete<T extends Object>(MetadataKey<T> key) async {
+    await (_db.delete(_db.metadataEntity)..where((t) => t.key.equals(key.key))).go();
+    _updateCache(key, key.defaultValue);
+  }

-  void _applyOverrides(List<MetadataEntityData> rows) {
-    _appConfig = AppConfig.fromEntries(
-      rows.fold({}, (overrides, row) {
-        final metadataKey = MetadataKey.values.firstWhereOrNull((key) => key.name == row.key);
-        if (metadataKey == null) {
-          return overrides;
-        }
+  Stream<AppConfig> watchAppConfig() => _watchDomain(.appConfig).distinct();

-        return {...overrides, metadataKey: metadataKey.decode(row.value)};
-      }),
-    );
+  Stream<SystemConfig> watchSystemConfig() => _watchDomain(.systemConfig).distinct();
+
+  Stream<T> _watchDomain<T extends Object>(MetadataDomain<T> domain) {
+    final query = _db.select(_db.metadataEntity)..where((t) => t.key.like('${domain.prefix}.%'));
+    return query.watch().map((rows) {
+      _hydrateCache(rows);
+      return domain.config(this);
+    });
+  }
+
+  void _hydrateCache(List<MetadataEntityData> rows) {
+    final keyMap = MetadataKey.asKeyMap();
+    for (final row in rows) {
+      final key = keyMap[row.key];
+      if (key == null) {
+        continue;
+      }
+      _updateCache(key, key.decode(row.value));
+    }
+  }
+
+  void _updateCache<T extends Object>(MetadataKey<T> key, T value) {
+    if (_cache[key] == value) {
+      return;
+    }
+    _cache[key] = value;
+    key.domain.rebuild(this);
+  }
+}
+
+extension<T extends Object> on MetadataDomain<T> {
+  T config(MetadataRepository repo) => switch (this) {
+    .appConfig => repo._appConfig as T,
+    .systemConfig => repo._systemConfig as T,
+  };
+
+  void rebuild(MetadataRepository repo) {
+    switch (this) {
+      case .appConfig:
+        repo._appConfig = .new(
+          theme: .new(
+            mode: repo._read(.themeMode),
+            primaryColor: repo._read(.themePrimaryColor),
+            dynamicTheme: repo._read(.themeDynamic),
+            colorfulInterface: repo._read(.themeColorfulInterface),
+          ),
+          cleanup: .new(
+            keepFavorites: repo._read(.cleanupKeepFavorites),
+            keepMediaType: repo._read(.cleanupKeepMediaType),
+            keepAlbumIds: repo._read(.cleanupKeepAlbumIds),
+            cutoffDaysAgo: repo._read(.cleanupCutoffDaysAgo),
+            defaultsInitialized: repo._read(.cleanupDefaultsInitialized),
+          ),
+          map: .new(
+            relativeDays: repo._read(.mapRelativeDate),
+            favoritesOnly: repo._read(.mapShowFavoriteOnly),
+            includeArchived: repo._read(.mapIncludeArchived),
+            themeMode: repo._read(.mapThemeMode),
+            withPartners: repo._read(.mapWithPartners),
+          ),
+          timeline: .new(
+            tilesPerRow: repo._read(.timelineTilesPerRow),
+            groupAssetsBy: repo._read(.timelineGroupAssetsBy),
+            storageIndicator: repo._read(.timelineStorageIndicator),
+          ),
+          image: .new(preferRemote: repo._read(.imagePreferRemote), loadOriginal: repo._read(.imageLoadOriginal)),
+          viewer: .new(
+            loopVideo: repo._read(.viewerLoopVideo),
+            loadOriginalVideo: repo._read(.viewerLoadOriginalVideo),
+            autoPlayVideo: repo._read(.viewerAutoPlayVideo),
+            tapToNavigate: repo._read(.viewerTapToNavigate),
+          ),
+          slideshow: .new(
+            transition: repo._read(.slideshowTransition),
+            repeat: repo._read(.slideshowRepeat),
+            duration: repo._read(.slideshowDuration),
+            look: repo._read(.slideshowLook),
+            direction: repo._read(.slideshowDirection),
+          ),
+          album: .new(
+            sortMode: repo._read(.albumSortMode),
+            isReverse: repo._read(.albumIsReverse),
+            isGrid: repo._read(.albumIsGrid),
+          ),
+          backup: .new(
+            enabled: repo._read(.backupEnabled),
+            useCellularForVideos: repo._read(.backupUseCellularForVideos),
+            useCellularForPhotos: repo._read(.backupUseCellularForPhotos),
+            requireCharging: repo._read(.backupRequireCharging),
+            triggerDelay: repo._read(.backupTriggerDelay),
+            syncAlbums: repo._read(.backupSyncAlbums),
+          ),
+        );
+      case .systemConfig:
+        repo._systemConfig = .new(
+          logLevel: repo._read(.logLevel),
+          network: .new(
+            autoEndpointSwitching: repo._read(.networkAutoEndpointSwitching),
+            preferredWifiName: repo._read(.networkPreferredWifiName).nullIfEmpty,
+            localEndpoint: repo._read(.networkLocalEndpoint).nullIfEmpty,
+            externalEndpointList: repo._read(.networkExternalEndpointList),
+            customHeaders: repo._read(.networkCustomHeaders),
+          ),
+        );
+    }
  }
 }
@@ -1,8 +1,24 @@
+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
+import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/stack.model.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';

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

 extension on StackEntityData {
@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:io';

 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -6,54 +5,66 @@ import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';

-typedef OnProgress = void Function(String id, double progress);
-
 class StorageRepository {
-  static final log = Logger('StorageRepository');
+  final log = Logger('StorageRepository');

-  const StorageRepository();
+  StorageRepository();

-  Future<File?> getAssetFile(String assetId, {OnProgress? onProgress, Completer<void>? cancelToken}) {
-    return _getFileForAsset(assetId, isMotion: false, onProgress: onProgress, cancelToken: cancelToken);
-  }
-
-  Future<File?> getMotionFile(String assetId, {OnProgress? onProgress, Completer<void>? cancelToken}) {
-    return _getFileForAsset(assetId, isMotion: true, onProgress: onProgress, cancelToken: cancelToken);
-  }
-
-  Future<File?> _getFileForAsset(
-    String assetId, {
-    bool isMotion = false,
-    OnProgress? onProgress,
-    Completer<void>? cancelToken,
-  }) async {
-    final entity = await AssetEntity.fromId(assetId);
-    if (entity == null) {
-      log.warning("Cannot get AssetEntity for asset $assetId");
-      return null;
-    }
-
-    PMProgressHandler? progressHandler;
-    StreamSubscription<PMProgressState>? progressSubscription;
-    PMCancelToken? pmCancelToken;
-    if (cancelToken != null) {
-      progressHandler = PMProgressHandler();
-      progressSubscription = progressHandler.stream.listen((event) => onProgress?.call(assetId, event.progress));
-      pmCancelToken = PMCancelToken();
-      unawaited(cancelToken.future.then((_) => pmCancelToken!.cancelRequest()));
-    }
+  Future<File?> getFileForAsset(String assetId) async {
+    File? file;
+    final log = Logger('StorageRepository');

    try {
-      return await entity.loadFile(withSubtype: isMotion, progressHandler: progressHandler, cancelToken: pmCancelToken);
+      final entity = await AssetEntity.fromId(assetId);
+      file = await entity?.originFile;
+      if (file == null) {
+        log.warning("Cannot get file for asset $assetId");
+        return null;
+      }
+
+      final exists = await file.exists();
+      if (!exists) {
+        log.warning("File for asset $assetId does not exist");
+        return null;
+      }
    } catch (error, stackTrace) {
-      log.warning("Error loading file for asset $assetId", error, stackTrace);
-      return null;
-    } finally {
-      unawaited(progressSubscription?.cancel());
+      log.warning("Error getting file for asset $assetId", error, stackTrace);
    }
+    return file;
+  }
+
+  Future<File?> getMotionFileForAsset(LocalAsset asset) async {
+    File? file;
+    final log = Logger('StorageRepository');
+
+    try {
+      final entity = await AssetEntity.fromId(asset.id);
+      file = await entity?.originFileWithSubtype;
+      if (file == null) {
+        log.warning(
+          "Cannot get motion file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
+        );
+        return null;
+      }
+
+      final exists = await file.exists();
+      if (!exists) {
+        log.warning("Motion file for asset ${asset.id} does not exist");
+        return null;
+      }
+    } catch (error, stackTrace) {
+      log.warning(
+        "Error getting motion file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
+        error,
+        stackTrace,
+      );
+    }
+    return file;
  }

  Future<AssetEntity?> getAssetEntityForAsset(LocalAsset asset) async {
+    final log = Logger('StorageRepository');
+
    AssetEntity? entity;

    try {
@@ -88,7 +99,39 @@ class StorageRepository {
    }
  }

+  Future<File?> loadFileFromCloud(String assetId, {PMProgressHandler? progressHandler}) async {
+    try {
+      final entity = await AssetEntity.fromId(assetId);
+      if (entity == null) {
+        log.warning("Cannot get AssetEntity for asset $assetId");
+        return null;
+      }
+
+      return await entity.loadFile(progressHandler: progressHandler);
+    } catch (error, stackTrace) {
+      log.warning("Error loading file from cloud for asset $assetId", error, stackTrace);
+      return null;
+    }
+  }
+
+  Future<File?> loadMotionFileFromCloud(String assetId, {PMProgressHandler? progressHandler}) async {
+    try {
+      final entity = await AssetEntity.fromId(assetId);
+      if (entity == null) {
+        log.warning("Cannot get AssetEntity for asset $assetId");
+        return null;
+      }
+
+      return await entity.loadFile(withSubtype: true, progressHandler: progressHandler);
+    } catch (error, stackTrace) {
+      log.warning("Error loading motion file from cloud for asset $assetId", error, stackTrace);
+      return null;
+    }
+  }
+
  Future<void> clearCache() async {
+    final log = Logger('StorageRepository');
+
    try {
      await PhotoManager.clearFileCache();
    } catch (error, stackTrace) {
@@ -43,7 +43,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
    _searchController = TextEditingController();
    _searchFocusNode = FocusNode();

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

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

-    final enableSyncUploadAlbum = ref.read(appConfigProvider).backup.syncAlbums;
+    final enableSyncUploadAlbum = ref.read(metadataProvider).appConfig.backup.syncAlbums;
    final selectedAlbums = ref
        .read(backupAlbumProvider)
        .where((a) => a.backupSelection == BackupSelection.selected)
@@ -19,7 +19,7 @@ class DriftBackupOptionsPage extends ConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    bool hasPopped = false;
-    final previousBackup = ref.read(appConfigProvider).backup;
+    final previousBackup = ref.read(metadataProvider).appConfig.backup;
    final previousCellularForVideos = previousBackup.useCellularForVideos;
    final previousCellularForPhotos = previousBackup.useCellularForPhotos;
    return PopScope(
@@ -22,7 +22,7 @@ class HeaderSettingsPage extends HookConsumerWidget {
    final headers = useState<List<SettingsHeader>>([]);
    final setInitialHeaders = useState(false);

-    final storedHeaders = ref.read(metadataProvider).appConfig.network.customHeaders;
+    final storedHeaders = ref.read(metadataProvider).systemConfig.network.customHeaders;
    if (!setInitialHeaders.value) {
      storedHeaders.forEach((k, v) {
        final header = SettingsHeader();
@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/locales.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
@@ -36,7 +36,7 @@ class BootstrapErrorWidget extends StatelessWidget {

  @override
  Widget build(BuildContext _) {
-    final immichTheme = defaultConfig.theme.primaryColor.themeOfPreset;
+    final immichTheme = MetadataKey.themePrimaryColor.defaultValue.themeOfPreset;

    return EasyLocalization(
      supportedLocales: locales.values.toList(),
@@ -88,6 +88,8 @@ int _deepHash(Object? value) {

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

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

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

 /// This delete action has the following behavior:
 /// - Prompt to delete the asset locally
@@ -40,8 +39,6 @@ class DeleteLocalActionButton extends ConsumerWidget {
      return;
    }

-    ref.invalidate(localAlbumProvider);
-
    final successMessage = 'delete_local_action_prompt'.t(context: context, args: {'count': result.count.toString()});

    if (context.mounted) {
@@ -14,9 +14,7 @@ import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class _SharePreparingDialog extends StatelessWidget {
-  final ValueNotifier<double?> progress;
-
-  const _SharePreparingDialog({required this.progress});
+  const _SharePreparingDialog();

  @override
  Widget build(BuildContext context) {
@@ -24,24 +22,8 @@ class _SharePreparingDialog extends StatelessWidget {
      content: Column(
        mainAxisSize: MainAxisSize.min,
        children: [
-          Container(margin: const EdgeInsets.only(bottom: 12), child: const Text('share_dialog_preparing').tr()),
-          SizedBox(
-            width: 240,
-            child: ValueListenableBuilder<double?>(
-              valueListenable: progress,
-              builder: (context, value, _) {
-                final percent = value == null ? null : (value * 100).clamp(0, 100);
-                return Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    LinearProgressIndicator(value: value, minHeight: 8.0),
-                    if (percent != null)
-                      Container(margin: const EdgeInsets.only(top: 8), child: Text('${percent.toStringAsFixed(0)}%')),
-                  ],
-                );
-              },
-            ),
-          ),
+          const CircularProgressIndicator(),
+          Container(margin: const EdgeInsets.only(top: 12), child: const Text('share_dialog_preparing').tr()),
        ],
      ),
    );
@@ -61,39 +43,32 @@ class ShareActionButton extends ConsumerWidget {
    }

    final cancelCompleter = Completer<void>();
-    final progress = ValueNotifier<double?>(null);
-    final preparingDialog = _SharePreparingDialog(progress: progress);
+    const preparingDialog = _SharePreparingDialog();
    await showDialog(
      context: context,
      builder: (BuildContext buildContext) {
-        ref
-            .read(actionProvider.notifier)
-            .shareAssets(
-              source,
-              context,
-              cancelCompleter: cancelCompleter,
-              onAssetDownloadProgress: (value) => progress.value = value,
-            )
-            .then((ActionResult result) {
-              if (cancelCompleter.isCompleted || !context.mounted) {
-                return;
-              }
+        ref.read(actionProvider.notifier).shareAssets(source, context, cancelCompleter: cancelCompleter).then((
+          ActionResult result,
+        ) {
+          if (cancelCompleter.isCompleted || !context.mounted) {
+            return;
+          }

-              ref.read(multiSelectProvider.notifier).reset();
+          ref.read(multiSelectProvider.notifier).reset();

-              if (!result.success) {
-                ImmichToast.show(
-                  context: context,
-                  msg: 'scaffold_body_error_occurred'.t(context: context),
-                  gravity: ToastGravity.BOTTOM,
-                  toastType: ToastType.error,
-                );
-              }
+          if (!result.success) {
+            ImmichToast.show(
+              context: context,
+              msg: 'scaffold_body_error_occurred'.t(context: context),
+              gravity: ToastGravity.BOTTOM,
+              toastType: ToastType.error,
+            );
+          }

-              buildContext.pop();
-            });
+          buildContext.pop();
+        });

-        // Show download progress with a "Preparing" message
+        // show a loading spinner with a "Preparing" message
        return preparingDialog;
      },
      barrierDismissible: false,
@@ -102,7 +77,6 @@ class ShareActionButton extends ConsumerWidget {
      if (!cancelCompleter.isCompleted) {
        cancelCompleter.complete();
      }
-      progress.dispose();
    });
  }

@@ -6,13 +6,13 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:logging/logging.dart';
 import 'package:native_video_player/native_video_player.dart';
@@ -108,7 +108,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
    try {
      if (videoAsset.hasLocal && videoAsset.livePhotoVideoId == null) {
        final id = videoAsset is LocalAsset ? videoAsset.id : (videoAsset as RemoteAsset).localId!;
-        final file = await ref.read(storageRepositoryProvider).getAssetFile(id);
+        final file = await StorageRepository().getFileForAsset(id);
        if (!mounted) {
          return null;
        }
@@ -296,12 +296,16 @@ class _ThumbnailRenderBox extends RenderBox {
  bool isRepaintBoundary = true;

  _ThumbnailRenderBox({
-    required this._image,
-    required this._previousImage,
-    required this._fadeValue,
-    required this._fit,
-    required this._placeholderGradient,
-  });
+    required ui.Image? image,
+    required ui.Image? previousImage,
+    required double fadeValue,
+    required BoxFit fit,
+    required Gradient placeholderGradient,
+  }) : _image = image,
+       _previousImage = previousImage,
+       _fadeValue = fadeValue,
+       _fit = fit,
+       _placeholderGradient = placeholderGradient;

  @override
  void paint(PaintingContext context, Offset offset) {
@@ -62,11 +62,14 @@ class RenderFixedRow extends RenderBox
        RenderBoxContainerDefaultsMixin<RenderBox, _RowParentData> {
  RenderFixedRow({
    List<RenderBox>? children,
-    required this._height,
-    required this._widths,
-    required this._spacing,
-    required this._textDirection,
-  }) {
+    required double height,
+    required List<double> widths,
+    required double spacing,
+    required TextDirection textDirection,
+  }) : _height = height,
+       _widths = widths,
+       _spacing = spacing,
+       _textDirection = textDirection {
    addAll(children);
  }

@@ -578,7 +578,9 @@ class _SlideFadeTransition extends StatelessWidget {
  final Animation<double> _animation;
  final Widget _child;

-  const _SlideFadeTransition({required this._animation, required this._child});
+  const _SlideFadeTransition({required Animation<double> animation, required Widget child})
+    : _animation = animation,
+      _child = child;

  @override
  Widget build(BuildContext context) {
@@ -397,7 +397,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
              final grid = CustomScrollView(
                primary: true,
                physics: _scrollPhysics,
-                scrollCacheExtent: .pixels(maxHeight * 2),
+                cacheExtent: maxHeight * 2,
                slivers: [
                  if (isSelectionMode) const SelectionSliverAppBar() else if (widget.appBar != null) widget.appBar!,
                  if (widget.topSliverWidget != null) widget.topSliverWidget!,
@@ -503,7 +503,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
 class _SliverSegmentedList extends SliverMultiBoxAdaptorWidget {
  final List<Segment> _segments;

-  const _SliverSegmentedList({required this._segments, required super.delegate});
+  const _SliverSegmentedList({required List<Segment> segments, required super.delegate}) : _segments = segments;

  @override
  _RenderSliverTimelineBoxAdaptor createRenderObject(BuildContext context) =>
@@ -527,7 +527,8 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
    markNeedsLayout();
  }

-  _RenderSliverTimelineBoxAdaptor({required super.childManager, required this._segments});
+  _RenderSliverTimelineBoxAdaptor({required super.childManager, required List<Segment> segments})
+    : _segments = segments;

  int getMinChildIndexForScrollOffset(double offset) =>
      _segments.findByOffset(offset)?.getMinChildIndexForScrollOffset(offset) ?? 0;
@@ -130,7 +130,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
    await _apiService.updateHeaders();

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

@@ -187,11 +187,11 @@ class AuthNotifier extends StateNotifier<AuthState> {
  }

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

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

  /// Returns the current server endpoint (with /api) URL from the store
@@ -2,7 +2,6 @@ import 'dart:async';

 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:logging/logging.dart';

 import 'package:immich_mobile/constants/constants.dart';
@@ -274,7 +273,7 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
        onProgress: _handleForegroundBackupProgress,
        onSuccess: _handleForegroundBackupSuccess,
        onError: _handleForegroundBackupError,
-        onICloudProgress: CurrentPlatform.isIOS ? _handleICloudProgress : null,
+        onICloudProgress: _handleICloudProgress,
      ),
    );
  }
@@ -283,7 +282,7 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
    _cancelToken?.complete();
    _cancelToken = null;
    _uploadSpeedManager.clear();
-    state = state.copyWith(uploadItems: const {}, iCloudDownloadProgress: const {});
+    state = state.copyWith(uploadItems: {}, iCloudDownloadProgress: {});
  }

  void _handleICloudProgress(String localAssetId, double progress) {
@@ -14,7 +14,6 @@ import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.da
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provider.dart' show assetExifProvider;
 import 'package:immich_mobile/providers/infrastructure/tag.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
@@ -22,7 +21,6 @@ import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/action.service.dart';
 import 'package:immich_mobile/services/download.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
-import 'package:immich_mobile/utils/semver.dart';
 import 'package:immich_mobile/widgets/asset_grid/delete_dialog.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
@@ -465,17 +463,11 @@ class ActionNotifier extends Notifier<void> {
    ActionSource source,
    BuildContext context, {
    Completer<void>? cancelCompleter,
-    void Function(double progress)? onAssetDownloadProgress,
  }) async {
    final ids = _getAssets(source).toList(growable: false);

    try {
-      await _service.shareAssets(
-        ids,
-        context,
-        cancelCompleter: cancelCompleter,
-        onAssetDownloadProgress: onAssetDownloadProgress,
-      );
+      await _service.shareAssets(ids, context, cancelCompleter: cancelCompleter);
      return ActionResult(count: ids.length, success: true);
    } catch (error, stack) {
      _logger.severe('Failed to share assets', error, stack);
@@ -544,22 +536,14 @@ class ActionNotifier extends Notifier<void> {
      return ActionResult(count: ids.length, success: false, error: 'Expected single asset for applying edits');
    }

-    Future<void> editReady;
-    if (ref.read(serverInfoProvider).serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)) {
-      editReady = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV2", (dynamic data) {
-        final eventAsset = SyncAssetV2.fromJson(data["asset"]);
-        return eventAsset?.id == ids.first;
-      }, const Duration(seconds: 10));
-    } else {
-      editReady = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV1", (dynamic data) {
-        final eventAsset = SyncAssetV1.fromJson(data["asset"]);
-        return eventAsset?.id == ids.first;
-      }, const Duration(seconds: 10));
-    }
+    final completer = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV1", (dynamic data) {
+      final eventAsset = SyncAssetV1.fromJson(data["asset"]);
+      return eventAsset?.id == ids.first;
+    }, const Duration(seconds: 10));

    try {
      await _service.applyEdits(ids.first, edits);
-      await editReady;
+      await completer;
      return const ActionResult(count: 1, success: true);
    } catch (error, stack) {
      _logger.severe('Failed to apply edits to assets', error, stack);
@@ -1,12 +1,20 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';

 final metadataProvider = Provider.autoDispose<MetadataRepository>((_) => MetadataRepository.instance);

 final appConfigProvider = Provider.autoDispose<AppConfig>((ref) {
  final repo = ref.watch(metadataProvider);
-  final subscription = repo.watchConfig().listen((event) => ref.state = event);
+  final subscription = repo.watchAppConfig().listen((event) => ref.state = event);
  ref.onDispose(subscription.cancel);
  return repo.appConfig;
 });
+
+final systemConfigProvider = Provider.autoDispose<SystemConfig>((ref) {
+  final repo = ref.watch(metadataProvider);
+  final subscription = repo.watchSystemConfig().listen((event) => ref.state = event);
+  ref.onDispose(subscription.cancel);
+  return repo.systemConfig;
+});
@@ -1,4 +1,4 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';

-final storageRepositoryProvider = Provider<StorageRepository>((ref) => const StorageRepository());
+final storageRepositoryProvider = Provider<StorageRepository>((ref) => StorageRepository());
@@ -1,4 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/services/edit_revert.service.dart';
 import 'package:immich_mobile/domain/services/hash.service.dart';
 import 'package:immich_mobile/domain/services/local_sync.service.dart';
 import 'package:immich_mobile/domain/services/sync_stream.service.dart';
@@ -11,6 +12,8 @@ import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/stack.provider.dart';
+import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/permission.repository.dart';

@@ -45,11 +48,22 @@ final localSyncServiceProvider = Provider(
  ),
 );

+final editRevertServiceProvider = Provider(
+  (ref) => EditRevertService(
+    nativeSyncApi: ref.watch(nativeSyncApiProvider),
+    stackRepository: ref.watch(driftStackProvider),
+    localAssetRepository: ref.watch(localAssetRepository),
+    assetApiRepository: ref.watch(assetApiRepositoryProvider),
+  ),
+);
+
 final hashServiceProvider = Provider(
  (ref) => HashService(
    localAlbumRepository: ref.watch(localAlbumRepository),
    localAssetRepository: ref.watch(localAssetRepository),
    nativeSyncApi: ref.watch(nativeSyncApiProvider),
    trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
+    stackRepository: ref.watch(driftStackProvider),
+    assetApiRepository: ref.watch(assetApiRepositoryProvider),
  ),
 );
@@ -105,6 +105,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
        socket.on('AssetEditReadyV2', _handleSyncAssetEditReadyV2);
        socket.on('on_config_update', _handleOnConfigUpdate);
        socket.on('on_new_release', _handleReleaseUpdates);
+        socket.on('on_asset_stack_update', _handleAssetStackUpdate);
      } catch (e) {
        dPrint(() => "[WEBSOCKET] Catch Websocket Error - ${e.toString()}");
      }
@@ -188,6 +189,13 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV2(data));
  }

+  // Server stacked/restacked assets (e.g. an edit stacked onto its original).
+  // Pull a fresh remote sync so the stack_entity lands and the timeline shows
+  // the stacked primary instead of briefly hiding the asset.
+  void _handleAssetStackUpdate(dynamic _) {
+    unawaited(_ref.read(backgroundSyncProvider).runFreshRemoteSync());
+  }
+
  void _processBatchedAssetUploadReadyV1() {
    if (_batchedAssetUploadReady.isEmpty) {
      return;
@@ -67,6 +67,10 @@ class AssetApiRepository extends ApiRepository {
    return _stacksApi.deleteStacks(BulkIdsDto(ids: ids));
  }

+  Future<void> setStackPrimary(String stackId, String primaryAssetId) async {
+    await _stacksApi.updateStack(stackId, StackUpdateDto(primaryAssetId: primaryAssetId));
+  }
+
  Future<Response> downloadAsset(String id, {required bool edited}) {
    return _api.downloadAssetWithHttpInfo(id, edited: edited);
  }
@@ -1,29 +1,31 @@
 import 'dart:async';
 import 'dart:io';

-import 'package:background_downloader/background_downloader.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
+import 'package:immich_mobile/extensions/response_extensions.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/utils/image_url_builder.dart';
+import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:logging/logging.dart';
+import 'package:path_provider/path_provider.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:share_plus/share_plus.dart';

-final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository(ref.watch(nativeSyncApiProvider)));
+final assetMediaRepositoryProvider = Provider(
+  (ref) => AssetMediaRepository(ref.watch(assetApiRepositoryProvider), ref.watch(nativeSyncApiProvider)),
+);

 class AssetMediaRepository {
+  final AssetApiRepository _assetApiRepository;
  final NativeSyncApi _nativeSyncApi;
  static final Logger _log = Logger("AssetMediaRepository");

-  const AssetMediaRepository(this._nativeSyncApi);
+  const AssetMediaRepository(this._assetApiRepository, this._nativeSyncApi);

  Future<bool> _androidSupportsTrash() async {
    if (Platform.isAndroid) {
@@ -105,29 +107,10 @@ class AssetMediaRepository {
    );
  }

-  Future<int> shareAssets(
-    List<BaseAsset> assets,
-    BuildContext context, {
-    Completer<void>? cancelCompleter,
-    void Function(double progress)? onAssetDownloadProgress,
-  }) async {
+  // TODO: make this more efficient
+  Future<int> shareAssets(List<BaseAsset> assets, BuildContext context, {Completer<void>? cancelCompleter}) async {
    final downloadedXFiles = <XFile>[];
    final tempFiles = <File>[];
-    final totalAssets = assets.length;
-    var processedAssets = 0;
-
-    void updateProgress([double currentAssetProgress = 0.0]) {
-      if (totalAssets <= 0) {
-        onAssetDownloadProgress?.call(1.0);
-        return;
-      }
-
-      final normalizedAssetProgress = currentAssetProgress.clamp(0.0, 1.0);
-      final overallProgress = ((processedAssets + normalizedAssetProgress) / totalAssets).clamp(0.0, 1.0);
-      onAssetDownloadProgress?.call(overallProgress);
-    }
-
-    updateProgress();

    for (var asset in assets) {
      if (cancelCompleter != null && cancelCompleter.isCompleted) {
@@ -144,8 +127,6 @@ class AssetMediaRepository {
      if (localId != null && !asset.isEdited) {
        File? f = await AssetEntity(id: localId, width: 1, height: 1, typeInt: 0).originFile;
        downloadedXFiles.add(XFile(f!.path));
-        processedAssets++;
-        updateProgress();
        if (CurrentPlatform.isIOS) {
          tempFiles.add(f);
        }
@@ -153,50 +134,22 @@ class AssetMediaRepository {
        final remoteId = (asset is RemoteAsset) ? asset.id : asset.remoteId;
        if (remoteId == null) {
          _log.warning("Asset has no remote ID for sharing: $asset");
-          processedAssets++;
-          updateProgress();
          continue;
        }

-        final taskId = 'share-$remoteId-${DateTime.now().microsecondsSinceEpoch}';
-        final sanitizedFilename = asset.name.replaceAll(RegExp(r'[\\/]'), '_');
-        final task = DownloadTask(
-          taskId: taskId,
-          url: getOriginalUrlForRemoteId(remoteId, edited: asset.isEdited),
-          headers: ApiService.getRequestHeaders(),
-          filename: sanitizedFilename,
-          baseDirectory: BaseDirectory.temporary,
-          group: kShareDownloadGroup,
-          updates: Updates.statusAndProgress,
-        );
-        final statusUpdate = await FileDownloader().download(
-          task,
-          onProgress: (value) {
-            if (cancelCompleter != null && cancelCompleter.isCompleted) {
-              unawaited(FileDownloader().cancelTaskWithId(taskId));
-              return;
-            }
-            updateProgress(value);
-          },
-        );
+        final tempDir = await getTemporaryDirectory();
+        final name = asset.name;
+        final tempFile = await File('${tempDir.path}/$name').create();
+        final res = await _assetApiRepository.downloadAsset(remoteId, edited: true);

-        if (cancelCompleter != null && cancelCompleter.isCompleted) {
-          await _cleanupTempFiles(tempFiles);
-          return 0;
-        }
-
-        if (statusUpdate.status == TaskStatus.complete) {
-          final filePath = await task.filePath();
-          final file = File(filePath);
-          tempFiles.add(file);
-          downloadedXFiles.add(XFile(filePath));
-          processedAssets++;
-          updateProgress();
+        if (res.statusCode != 200) {
+          _log.severe("Download for $name failed", res.toLoggerString());
          continue;
        }
-        _log.severe("Download for ${asset.name} failed with status ${statusUpdate.status}", statusUpdate.exception);
-        processedAssets++;
-        updateProgress();
+
+        await tempFile.writeAsBytes(res.bodyBytes);
+        downloadedXFiles.add(XFile(tempFile.path));
+        tempFiles.add(tempFile);
      }
    }

@@ -1,38 +1,40 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';

 final authRepositoryProvider = Provider<AuthRepository>(
-  (ref) => AuthRepository(ref.watch(driftProvider), ref.watch(appConfigProvider)),
+  (ref) => AuthRepository(ref.watch(driftProvider), ref.watch(metadataProvider)),
 );

 class AuthRepository {
  final Drift _drift;
-  final AppConfig _config;
+  final MetadataRepository _metadata;

-  const AuthRepository(this._drift, this._config);
+  const AuthRepository(this._drift, this._metadata);

  Future<void> clearLocalData() async {
    await SyncStreamRepository(_drift).reset();
  }

  bool getEndpointSwitchingFeature() {
-    return _config.network.autoEndpointSwitching;
+    return _metadata.systemConfig.network.autoEndpointSwitching;
  }

  String? getPreferredWifiName() {
-    return _config.network.preferredWifiName;
+    return _metadata.systemConfig.network.preferredWifiName;
  }

  String? getLocalEndpoint() {
-    return _config.network.localEndpoint;
+    return _metadata.systemConfig.network.localEndpoint;
  }

  List<AuxilaryEndpoint> getExternalEndpointList() {
-    return _config.network.externalEndpointList.map((url) => AuxilaryEndpoint(url: url, status: .valid)).toList();
+    return _metadata.systemConfig.network.externalEndpointList
+        .map((url) => AuxilaryEndpoint(url: url, status: .valid))
+        .toList();
  }
 }
@@ -10,6 +10,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:http/http.dart';
+import 'package:immich_mobile/utils/debug_print.dart';

 final uploadRepositoryProvider = Provider((ref) => UploadRepository());

@@ -19,14 +20,26 @@ class UploadRepository {
  void Function(TaskProgressUpdate)? onTaskProgress;

  UploadRepository() {
-    final downloader = FileDownloader();
-    for (final group in const [kBackupGroup, kBackupLivePhotoGroup, kManualUploadGroup]) {
-      downloader.registerCallbacks(
-        group: group,
-        taskStatusCallback: onUploadStatus,
-        taskProgressCallback: onTaskProgress,
-      );
-    }
+    FileDownloader().registerCallbacks(
+      group: kBackupGroup,
+      taskStatusCallback: (update) => onUploadStatus?.call(update),
+      taskProgressCallback: (update) => onTaskProgress?.call(update),
+    );
+    FileDownloader().registerCallbacks(
+      group: kBackupLivePhotoGroup,
+      taskStatusCallback: (update) => onUploadStatus?.call(update),
+      taskProgressCallback: (update) => onTaskProgress?.call(update),
+    );
+    FileDownloader().registerCallbacks(
+      group: kBackupEditPairGroup,
+      taskStatusCallback: (update) => onUploadStatus?.call(update),
+      taskProgressCallback: (update) => onTaskProgress?.call(update),
+    );
+    FileDownloader().registerCallbacks(
+      group: kManualUploadGroup,
+      taskStatusCallback: (update) => onUploadStatus?.call(update),
+      taskProgressCallback: (update) => onTaskProgress?.call(update),
+    );
  }

  Future<void> enqueueBackground(UploadTask task) {
@@ -58,6 +71,28 @@ class UploadRepository {
    return FileDownloader().start();
  }

+  Future<void> getUploadInfo() async {
+    final [enqueuedTasks, runningTasks, canceledTasks, waitingTasks, pausedTasks] = await Future.wait([
+      FileDownloader().database.allRecordsWithStatus(TaskStatus.enqueued, group: kBackupGroup),
+      FileDownloader().database.allRecordsWithStatus(TaskStatus.running, group: kBackupGroup),
+      FileDownloader().database.allRecordsWithStatus(TaskStatus.canceled, group: kBackupGroup),
+      FileDownloader().database.allRecordsWithStatus(TaskStatus.waitingToRetry, group: kBackupGroup),
+      FileDownloader().database.allRecordsWithStatus(TaskStatus.paused, group: kBackupGroup),
+    ]);
+
+    dPrint(
+      () =>
+          """
+      Upload Info:
+      Enqueued: ${enqueuedTasks.length}
+      Running: ${runningTasks.length}
+      Canceled: ${canceledTasks.length}
+      Waiting: ${waitingTasks.length}
+      Paused: ${pausedTasks.length}
+    """,
+    );
+  }
+
  Future<UploadResult> uploadFile({
    required File file,
    required String originalFileName,
@@ -81,30 +116,41 @@ class UploadRepository {
      baseRequest.fields.addAll(fields);
      baseRequest.files.add(assetRawUploadData);

-      final StreamedResponse(:statusCode, :stream) = await NetworkRepository.client.send(baseRequest);
-      final responseBodyString = await stream.bytesToString();
+      final response = await NetworkRepository.client.send(baseRequest);
+      final responseBodyString = await response.stream.bytesToString();

-      return switch ((statusCode, _tryJsonDecode(responseBodyString))) {
-        (200 || 201, {'id': String id}) => UploadSuccess(remoteAssetId: id),
-        (413, _) => const UploadError(statusCode: 413, message: 'File is too large to upload'),
-        (_, {'message': String message}) => UploadError(statusCode: statusCode, message: message),
-        _ => UploadError(statusCode: statusCode, message: 'Upload failed with status $statusCode'),
-      };
+      if (![200, 201].contains(response.statusCode)) {
+        String? errorMessage;
+
+        if (response.statusCode == 413) {
+          errorMessage = 'Error(413) File is too large to upload';
+          return UploadResult.error(statusCode: response.statusCode, errorMessage: errorMessage);
+        }
+
+        try {
+          final error = jsonDecode(responseBodyString);
+          errorMessage = error['message'] ?? error['error'];
+        } catch (_) {
+          errorMessage = responseBodyString.isNotEmpty
+              ? responseBodyString
+              : 'Upload failed with status ${response.statusCode}';
+        }
+
+        return UploadResult.error(statusCode: response.statusCode, errorMessage: errorMessage);
+      }
+
+      try {
+        final responseBody = jsonDecode(responseBodyString);
+        return UploadResult.success(remoteAssetId: responseBody['id'] as String);
+      } catch (e) {
+        return UploadResult.error(errorMessage: 'Failed to parse server response');
+      }
    } on RequestAbortedException {
      logger.warning("Upload $logContext was cancelled");
-      return const UploadCancelled();
+      return UploadResult.cancelled();
    } catch (error, stackTrace) {
      logger.warning("Error uploading $logContext: ${error.toString()}: $stackTrace");
-      return UploadError(message: error.toString());
-    }
-  }
-
-  @pragma('vm:prefer-inline')
-  Map? _tryJsonDecode(String s) {
-    try {
-      return (jsonDecode(s) as Map);
-    } catch (_) {
-      return null;
+      return UploadResult.error(errorMessage: error.toString());
    }
  }
 }
@@ -139,23 +185,30 @@ class ProgressMultipartRequest extends MultipartRequest with Abortable {
  }
 }

-sealed class UploadResult {
-  const UploadResult();
-}
-
-final class UploadSuccess extends UploadResult {
-  final String remoteAssetId;
-
-  const UploadSuccess({required this.remoteAssetId});
-}
-
-final class UploadError extends UploadResult {
-  final String message;
+class UploadResult {
+  final bool isSuccess;
+  final bool isCancelled;
+  final String? remoteAssetId;
+  final String? errorMessage;
  final int? statusCode;

-  const UploadError({required this.message, this.statusCode});
-}
+  const UploadResult({
+    required this.isSuccess,
+    required this.isCancelled,
+    this.remoteAssetId,
+    this.errorMessage,
+    this.statusCode,
+  });

-final class UploadCancelled extends UploadResult {
-  const UploadCancelled();
+  factory UploadResult.success({required String remoteAssetId}) {
+    return UploadResult(isSuccess: true, isCancelled: false, remoteAssetId: remoteAssetId);
+  }
+
+  factory UploadResult.error({String? errorMessage, int? statusCode}) {
+    return UploadResult(isSuccess: false, isCancelled: false, errorMessage: errorMessage, statusCode: statusCode);
+  }
+
+  factory UploadResult.cancelled() {
+    return const UploadResult(isSuccess: false, isCancelled: true);
+  }
 }
@@ -269,18 +269,8 @@ class ActionService {
    await _assetApiRepository.unStack(stackIds);
  }

-  Future<int> shareAssets(
-    List<BaseAsset> assets,
-    BuildContext context, {
-    Completer<void>? cancelCompleter,
-    void Function(double progress)? onAssetDownloadProgress,
-  }) {
-    return _assetMediaRepository.shareAssets(
-      assets,
-      context,
-      cancelCompleter: cancelCompleter,
-      onAssetDownloadProgress: onAssetDownloadProgress,
-    );
+  Future<int> shareAssets(List<BaseAsset> assets, BuildContext context, {Completer<void>? cancelCompleter}) {
+    return _assetMediaRepository.shareAssets(assets, context, cancelCompleter: cancelCompleter);
  }

  Future<List<bool>> downloadAll(List<RemoteAsset> assets) {
@@ -177,9 +177,9 @@ class ApiService {
    if (serverEndpoint != null && serverEndpoint.isNotEmpty) {
      urls.add(serverEndpoint);
    }
-    final network = MetadataRepository.instance.appConfig.network;
+    final network = MetadataRepository.instance.systemConfig.network;
    final localEndpoint = network.localEndpoint;
-    if (localEndpoint.isNotEmpty) {
+    if (localEndpoint != null) {
      urls.add(localEndpoint);
    }
    for (final url in network.externalEndpointList) {
@@ -191,7 +191,7 @@ class ApiService {
  }

  static Map<String, String> getRequestHeaders() {
-    return MetadataRepository.instance.appConfig.network.customHeaders;
+    return MetadataRepository.instance.systemConfig.network.customHeaders;
  }

  ApiClient get apiClient => _apiClient;
@@ -9,17 +9,22 @@ import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/services/edit_revert.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
+import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
+import 'package:immich_mobile/services/edit_pair.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
@@ -31,6 +36,8 @@ final backgroundUploadServiceProvider = Provider((ref) {
    ref.watch(localAssetRepository),
    ref.watch(backupRepositoryProvider),
    ref.watch(assetMediaRepositoryProvider),
+    ref.watch(nativeSyncApiProvider),
+    ref.watch(editRevertServiceProvider),
  );

  ref.onDispose(service.dispose);
@@ -43,13 +50,35 @@ class UploadTaskMetadata {
  final bool isLivePhotos;
  final String livePhotoVideoId;

-  const UploadTaskMetadata({required this.localAssetId, required this.isLivePhotos, required this.livePhotoVideoId});
+  // Marks the base upload of an edit pair. On completion the chained edit
+  // upload is enqueued with stackParentId = this base's remote id.
+  final bool isEditPair;

-  UploadTaskMetadata copyWith({String? localAssetId, bool? isLivePhotos, String? livePhotoVideoId}) {
+  // Path of the native temp file backing this task (the edit base), so it can
+  // be cleaned up on terminal status.
+  final String basePath;
+
+  const UploadTaskMetadata({
+    required this.localAssetId,
+    required this.isLivePhotos,
+    required this.livePhotoVideoId,
+    this.isEditPair = false,
+    this.basePath = '',
+  });
+
+  UploadTaskMetadata copyWith({
+    String? localAssetId,
+    bool? isLivePhotos,
+    String? livePhotoVideoId,
+    bool? isEditPair,
+    String? basePath,
+  }) {
    return UploadTaskMetadata(
      localAssetId: localAssetId ?? this.localAssetId,
      isLivePhotos: isLivePhotos ?? this.isLivePhotos,
      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
+      isEditPair: isEditPair ?? this.isEditPair,
+      basePath: basePath ?? this.basePath,
    );
  }

@@ -58,6 +87,8 @@ class UploadTaskMetadata {
      'localAssetId': localAssetId,
      'isLivePhotos': isLivePhotos,
      'livePhotoVideoId': livePhotoVideoId,
+      'isEditPair': isEditPair,
+      'basePath': basePath,
    };
  }

@@ -66,6 +97,8 @@ class UploadTaskMetadata {
      localAssetId: map['localAssetId'] as String,
      isLivePhotos: map['isLivePhotos'] as bool,
      livePhotoVideoId: map['livePhotoVideoId'] as String,
+      isEditPair: (map['isEditPair'] as bool?) ?? false,
+      basePath: (map['basePath'] as String?) ?? '',
    );
  }

@@ -76,7 +109,7 @@ class UploadTaskMetadata {

  @override
  String toString() =>
-      'UploadTaskMetadata(localAssetId: $localAssetId, isLivePhotos: $isLivePhotos, livePhotoVideoId: $livePhotoVideoId)';
+      'UploadTaskMetadata(localAssetId: $localAssetId, isLivePhotos: $isLivePhotos, livePhotoVideoId: $livePhotoVideoId, isEditPair: $isEditPair, basePath: $basePath)';

  @override
  bool operator ==(covariant UploadTaskMetadata other) {
@@ -86,11 +119,18 @@ class UploadTaskMetadata {

    return other.localAssetId == localAssetId &&
        other.isLivePhotos == isLivePhotos &&
-        other.livePhotoVideoId == livePhotoVideoId;
+        other.livePhotoVideoId == livePhotoVideoId &&
+        other.isEditPair == isEditPair &&
+        other.basePath == basePath;
  }

  @override
-  int get hashCode => localAssetId.hashCode ^ isLivePhotos.hashCode ^ livePhotoVideoId.hashCode;
+  int get hashCode =>
+      localAssetId.hashCode ^
+      isLivePhotos.hashCode ^
+      livePhotoVideoId.hashCode ^
+      isEditPair.hashCode ^
+      basePath.hashCode;
 }

 /// Service for handling background uploads using iOS URLSession (background_downloader)
@@ -104,6 +144,8 @@ class BackgroundUploadService {
    this._localAssetRepository,
    this._backupRepository,
    this._assetMediaRepository,
+    this._nativeSyncApi,
+    this._editRevertService,
  ) {
    _uploadRepository.onUploadStatus = _onUploadCallback;
    _uploadRepository.onTaskProgress = _onTaskProgressCallback;
@@ -114,6 +156,8 @@ class BackgroundUploadService {
  final DriftLocalAssetRepository _localAssetRepository;
  final DriftBackupRepository _backupRepository;
  final AssetMediaRepository _assetMediaRepository;
+  final NativeSyncApi _nativeSyncApi;
+  final EditRevertService _editRevertService;
  final Logger _logger = Logger('BackgroundUploadService');

  final StreamController<TaskStatusUpdate> _taskStatusController = StreamController<TaskStatusUpdate>.broadcast();
@@ -193,10 +237,13 @@ class BackgroundUploadService {

    await _storageRepository.clearCache();
    await _uploadRepository.reset(kBackupGroup);
+    await _uploadRepository.reset(kBackupEditPairGroup);
    await _uploadRepository.deleteDatabaseRecords(kBackupGroup);
+    await _uploadRepository.deleteDatabaseRecords(kBackupEditPairGroup);

    final activeTasks = await _uploadRepository.getActiveTasks(kBackupGroup);
-    return activeTasks.length;
+    final activeEditTasks = await _uploadRepository.getActiveTasks(kBackupEditPairGroup);
+    return activeTasks.length + activeEditTasks.length;
  }

  /// Resume background backup processing
@@ -205,9 +252,20 @@ class BackgroundUploadService {
  }

  void _handleTaskStatusUpdate(TaskStatusUpdate update) async {
+    UploadTaskMetadata? metadata;
+    if (update.task.metaData.isNotEmpty) {
+      try {
+        metadata = UploadTaskMetadata.fromJson(update.task.metaData);
+      } catch (_) {
+        metadata = null;
+      }
+    }
+
    switch (update.status) {
      case TaskStatus.complete:
-        unawaited(_handleLivePhoto(update));
+        unawaited(_handleLivePhoto(update, metadata));
+        unawaited(handleEditPair(update, metadata));
+        unawaited(recordPriorRemoteIdOnSuccess(update, metadata));

        if (CurrentPlatform.isIOS) {
          try {
@@ -220,19 +278,20 @@ class BackgroundUploadService {

        break;

+      case TaskStatus.failed:
+      case TaskStatus.canceled:
+      case TaskStatus.notFound:
+        unawaited(_cleanupTempResourceOnFailure(metadata));
+        break;
+
      default:
        break;
    }
  }

-  Future<void> _handleLivePhoto(TaskStatusUpdate update) async {
+  Future<void> _handleLivePhoto(TaskStatusUpdate update, UploadTaskMetadata? metadata) async {
    try {
-      if (update.task.metaData.isEmpty || update.task.metaData == '') {
-        return;
-      }
-
-      final metadata = UploadTaskMetadata.fromJson(update.task.metaData);
-      if (!metadata.isLivePhotos) {
+      if (metadata == null || !metadata.isLivePhotos) {
        return;
      }

@@ -258,6 +317,143 @@ class BackgroundUploadService {
    }
  }

+  /// When an edit-pair base upload finishes, enqueue the edit on top of it
+  /// (stackParentId = the base's new remote id).
+  @visibleForTesting
+  Future<void> handleEditPair(TaskStatusUpdate update, UploadTaskMetadata? metadata) async {
+    try {
+      if (metadata == null || !metadata.isEditPair) {
+        return;
+      }
+      if (metadata.basePath.isNotEmpty) {
+        try {
+          await File(metadata.basePath).delete();
+        } catch (_) {}
+      }
+      final baseRemoteId = _remoteIdFromResponse(update);
+      if (baseRemoteId == null) {
+        return;
+      }
+      final localAsset = await _localAssetRepository.getById(metadata.localAssetId);
+      if (localAsset == null) {
+        return;
+      }
+      final editTask = await getEditUploadTask(localAsset, baseRemoteId);
+      if (editTask != null) {
+        await enqueueTasks([editTask]);
+      }
+    } catch (error, stackTrace) {
+      dPrint(() => "Error handling edit pair task: $error $stackTrace");
+    }
+  }
+
+  /// Saves the uploaded remote id as the asset's priorRemoteId so a later edit
+  /// stacks onto it. Skipped for edit-pair base uploads; the chained edit records it.
+  @visibleForTesting
+  Future<void> recordPriorRemoteIdOnSuccess(TaskStatusUpdate update, UploadTaskMetadata? metadata) async {
+    try {
+      if (metadata == null || metadata.isEditPair || metadata.isLivePhotos || metadata.localAssetId.isEmpty) {
+        return;
+      }
+      final remoteId = _remoteIdFromResponse(update);
+      if (remoteId == null) {
+        return;
+      }
+      final localAsset = await _localAssetRepository.getById(metadata.localAssetId);
+      await _localAssetRepository.markSynced(
+        metadata.localAssetId,
+        priorRemoteId: remoteId,
+        syncedChecksum: localAsset?.checksum ?? '',
+      );
+    } catch (error, stackTrace) {
+      dPrint(() => "Error recording priorRemoteId: $error $stackTrace");
+    }
+  }
+
+  Future<void> _cleanupTempResourceOnFailure(UploadTaskMetadata? metadata) async {
+    if (metadata == null || metadata.basePath.isEmpty) {
+      return;
+    }
+    try {
+      await File(metadata.basePath).delete();
+    } catch (_) {}
+  }
+
+  /// The new asset's remote id from an upload's response body, or null if the
+  /// body is missing/malformed.
+  String? _remoteIdFromResponse(TaskStatusUpdate update) {
+    final body = update.responseBody;
+    if (body == null || body.isEmpty) {
+      return null;
+    }
+    try {
+      return jsonDecode(body)['id'] as String?;
+    } catch (_) {
+      return null;
+    }
+  }
+
+  Future<UploadTask> _buildBaseUploadTask(LocalAsset asset, BaseResource base) async {
+    final metadata = UploadTaskMetadata(
+      localAssetId: asset.id,
+      isLivePhotos: false,
+      livePhotoVideoId: '',
+      isEditPair: true,
+      basePath: base.path,
+    ).toJson();
+
+    // The base is the unedited original (no adjustmentTime); the `_base`
+    // deviceAssetId keeps it distinct from the chained edit task.
+    return buildUploadTask(
+      File(base.path),
+      createdAt: asset.createdAt,
+      modifiedAt: asset.updatedAt,
+      originalFileName: p.setExtension(asset.name, p.extension(base.path)),
+      deviceAssetId: '${asset.id}_base',
+      metadata: metadata,
+      group: kBackupGroup,
+      isFavorite: asset.isFavorite,
+      requiresWiFi: _shouldRequireWiFi(asset),
+      cloudId: asset.cloudId,
+      latitude: asset.latitude?.toString(),
+      longitude: asset.longitude?.toString(),
+    );
+  }
+
+  @visibleForTesting
+  Future<UploadTask?> getEditUploadTask(LocalAsset asset, String stackParentId) async {
+    final entity = await _storageRepository.getAssetEntityForAsset(asset);
+    if (entity == null) {
+      return null;
+    }
+    final file = await _storageRepository.getFileForAsset(asset.id);
+    if (file == null) {
+      return null;
+    }
+
+    final fields = {'stackParentId': stackParentId};
+    final originalFileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
+    final metadata = UploadTaskMetadata(localAssetId: asset.id, isLivePhotos: false, livePhotoVideoId: '').toJson();
+
+    return buildUploadTask(
+      file,
+      createdAt: asset.createdAt,
+      modifiedAt: asset.updatedAt,
+      originalFileName: originalFileName,
+      deviceAssetId: asset.id,
+      metadata: metadata,
+      fields: fields,
+      group: kBackupEditPairGroup,
+      priority: 0,
+      isFavorite: asset.isFavorite,
+      requiresWiFi: _shouldRequireWiFi(asset),
+      cloudId: asset.cloudId,
+      adjustmentTime: asset.adjustmentTime?.toIso8601String(),
+      latitude: asset.latitude?.toString(),
+      longitude: asset.longitude?.toString(),
+    );
+  }
+
  @visibleForTesting
  Future<UploadTask?> getUploadTask(LocalAsset asset, {String group = kBackupGroup, int? priority}) async {
    final entity = await _storageRepository.getAssetEntityForAsset(asset);
@@ -266,6 +462,26 @@ class BackgroundUploadService {
      return null;
    }

+    // iOS edit pair: stack a user edit onto its original. resolveEditPair decides
+    // whether to reuse a prior upload or upload the base first. Live photos skip this.
+    if (!entity.isLivePhoto && CurrentPlatform.isIOS) {
+      // A reverted edit flips the stack back to the original and skips the upload.
+      if (asset.priorRemoteId != null && await _editRevertService.tryHandleRevert(asset)) {
+        return null;
+      }
+      final plan = await resolveEditPair(_nativeSyncApi, asset, log: _logger);
+      switch (plan) {
+        case UploadBaseFirst(:final base):
+          return _buildBaseUploadTask(asset, base);
+        case AbsorbIntoPrior(:final parentId):
+          return getEditUploadTask(asset, parentId);
+        case NoEditPair():
+          break;
+      }
+    }
+
+    File? file;
+
    /// iOS LivePhoto has two files: a photo and a video.
    /// They are uploaded separately, with video file being upload first, then returned with the assetId
    /// The assetId is then used as a metadata for the photo file upload task.
@@ -276,9 +492,11 @@ class BackgroundUploadService {
    /// The cancel operation will only cancel the video group (normal group), the photo group will not
    /// be touched, as the video file is already uploaded.

-    final file = await (entity.isLivePhoto
-        ? _storageRepository.getMotionFile(asset.id)
-        : _storageRepository.getAssetFile(asset.id));
+    if (entity.isLivePhoto) {
+      file = await _storageRepository.getMotionFileForAsset(asset);
+    } else {
+      file = await _storageRepository.getFileForAsset(asset.id);
+    }

    if (file == null) {
      _logger.warning("Failed to get file for asset ${asset.id} - ${asset.name}");
@@ -326,7 +544,7 @@ class BackgroundUploadService {
      return null;
    }

-    final file = await _storageRepository.getAssetFile(asset.id);
+    final file = await _storageRepository.getFileForAsset(asset.id);
    if (file == null) {
      return null;
    }
@@ -0,0 +1,81 @@
+import 'dart:io';
+
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:logging/logging.dart';
+
+/// What to do with an edited iOS photo when backing it up.
+sealed class EditPairPlan {
+  const EditPairPlan();
+}
+
+/// Not something we stack: not edited, identical bytes, or couldn't read it.
+class NoEditPair extends EditPairPlan {
+  const NoEditPair();
+}
+
+/// Already uploaded before; stack the edit onto that remote id.
+class AbsorbIntoPrior extends EditPairPlan {
+  final String parentId;
+  const AbsorbIntoPrior(this.parentId);
+}
+
+/// Upload the original first; [base] is its temp file.
+class UploadBaseFirst extends EditPairPlan {
+  final BaseResource base;
+  const UploadBaseFirst(this.base);
+}
+
+/// Works out how an edited photo should stack: reuse a prior upload, upload the
+/// original first, or do nothing. Shared by the foreground and background upload
+/// paths. The caller already checked it's iOS and not a live photo.
+///
+/// A photo that was never edited only carries the capture-time Photographic Style,
+/// which iOS stamps at [LocalAsset.createdAt]; a real edit moves [LocalAsset.adjustmentTime]
+/// later. When they match (or there's no adjustment at all) there's nothing to stack, so
+/// we skip the native read. Anything that moved the timestamp (edit, retime, revert) falls
+/// through to [NativeSyncApi.getBaseResource], which reads the adjustment plist and decides.
+Future<EditPairPlan> resolveEditPair(NativeSyncApi nativeSyncApi, LocalAsset asset, {Logger? log}) async {
+  if (asset.priorRemoteId != null) {
+    return AbsorbIntoPrior(asset.priorRemoteId!);
+  }
+
+  if (!_mightBeEdited(asset)) {
+    return const NoEditPair();
+  }
+
+  BaseResource? base;
+  try {
+    base = await nativeSyncApi.getBaseResource(asset.id, allowNetworkAccess: true);
+  } catch (error, stack) {
+    log?.warning(() => "Failed to read base resource for ${asset.id}", error, stack);
+    return const NoEditPair();
+  }
+  if (base == null) {
+    return const NoEditPair();
+  }
+
+  // Identical bytes (e.g. auto-HDR), nothing real to stack. Drop the temp copy.
+  if (base.sha1 == asset.checksum) {
+    try {
+      await File(base.path).delete();
+    } catch (_) {}
+    return const NoEditPair();
+  }
+
+  return UploadBaseFirst(base);
+}
+
+/// iOS stamps the capture-time Photographic Style at the creation time and moves the
+/// adjustment timestamp on any later change. A gap past a small tolerance (capture jitter
+/// is sub-second, real edits are seconds apart) is worth a native check; no adjustment at
+/// all means the photo was never touched.
+bool _mightBeEdited(LocalAsset asset) {
+  final adjustedAt = asset.adjustmentTime;
+  if (adjustedAt == null) {
+    return false;
+  }
+  return adjustedAt.difference(asset.createdAt).inSeconds.abs() > _editTimestampToleranceSeconds;
+}
+
+const _editTimestampToleranceSeconds = 2;
@@ -6,20 +6,27 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/services/edit_revert.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/infrastructure/repositories/backup.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/platform/connectivity_api.g.dart';
+import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
+import 'package:immich_mobile/services/edit_pair.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
+import 'package:photo_manager/photo_manager.dart' show PMProgressHandler;

 /// Callbacks for upload progress and status updates
 class UploadCallbacks {
@@ -38,6 +45,9 @@ final foregroundUploadServiceProvider = Provider((ref) {
    ref.watch(backupRepositoryProvider),
    ref.watch(connectivityApiProvider),
    ref.watch(assetMediaRepositoryProvider),
+    ref.watch(nativeSyncApiProvider),
+    ref.watch(localAssetRepository),
+    ref.watch(editRevertServiceProvider),
  );
 });

@@ -53,6 +63,9 @@ class ForegroundUploadService {
    this._backupRepository,
    this._connectivityApi,
    this._assetMediaRepository,
+    this._nativeSyncApi,
+    this._localAssetRepository,
+    this._editRevertService,
  );

  final UploadRepository _uploadRepository;
@@ -60,6 +73,9 @@ class ForegroundUploadService {
  final DriftBackupRepository _backupRepository;
  final ConnectivityApi _connectivityApi;
  final AssetMediaRepository _assetMediaRepository;
+  final NativeSyncApi _nativeSyncApi;
+  final DriftLocalAssetRepository _localAssetRepository;
+  final EditRevertService _editRevertService;
  final Logger _logger = Logger('ForegroundUploadService');

  bool shouldAbortUpload = false;
@@ -98,7 +114,7 @@ class ForegroundUploadService {
          final requireWifi = _shouldRequireWiFi(asset);
          return requireWifi && !hasWifi;
        },
-        processItem: (asset) => _uploadSingleAsset(asset, cancelToken: cancelToken, callbacks: callbacks),
+        processItem: (asset) => _uploadSingleAsset(asset, cancelToken, callbacks: callbacks),
      );
    }
  }
@@ -124,14 +140,14 @@ class ForegroundUploadService {
        continue;
      }

-      await _uploadSingleAsset(asset, cancelToken: cancelToken, callbacks: callbacks);
+      await _uploadSingleAsset(asset, cancelToken, callbacks: callbacks);
    }
  }

  /// Manually upload picked local assets
  Future<void> uploadManual(
    List<LocalAsset> localAssets, {
-    required Completer<void>? cancelToken,
+    Completer<void>? cancelToken,
    UploadCallbacks callbacks = const UploadCallbacks(),
  }) async {
    if (localAssets.isEmpty) {
@@ -141,7 +157,7 @@ class ForegroundUploadService {
    await _executeWithWorkerPool<LocalAsset>(
      items: localAssets,
      cancelToken: cancelToken,
-      processItem: (asset) => _uploadSingleAsset(asset, cancelToken: cancelToken, callbacks: callbacks),
+      processItem: (asset) => _uploadSingleAsset(asset, cancelToken, callbacks: callbacks),
    );
  }

@@ -169,11 +185,11 @@ class ForegroundUploadService {
          onProgress: (bytes, totalBytes) => onProgress?.call(fileId, bytes, totalBytes),
        );

-        return switch (result) {
-          UploadSuccess() => onSuccess?.call(fileId),
-          UploadError(:final message) => onError?.call(fileId, message),
-          UploadCancelled() => null,
-        };
+        if (result.isSuccess) {
+          onSuccess?.call(fileId);
+        } else if (!result.isCancelled && result.errorMessage != null) {
+          onError?.call(fileId, result.errorMessage!);
+        }
      },
    );
  }
@@ -215,7 +231,7 @@ class ForegroundUploadService {

        final item = items[index];

-        if (shouldSkip != null && shouldSkip(item)) {
+        if (shouldSkip?.call(item) ?? false) {
          continue;
        }

@@ -232,48 +248,84 @@ class ForegroundUploadService {
  }

  Future<void> _uploadSingleAsset(
-    LocalAsset asset, {
-    required Completer<void>? cancelToken,
+    LocalAsset asset,
+    Completer<void>? cancelToken, {
    required UploadCallbacks callbacks,
  }) async {
-    final UploadCallbacks(:onProgress, :onSuccess, :onError, :onICloudProgress) = callbacks;
-    File? assetFile;
+    File? file;
    File? livePhotoFile;

    try {
      final entity = await _storageRepository.getAssetEntityForAsset(asset);
      if (entity == null) {
-        onError?.call(
+        callbacks.onError?.call(
          asset.localId!,
          CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
        );
        return;
      }

-      File? file;
-      if (entity.isLivePhoto) {
-        file = await _storageRepository.getMotionFile(asset.id, cancelToken: cancelToken, onProgress: onICloudProgress);
+      // A reverted iOS edit flips the stack back to the original and skips the upload.
+      if (CurrentPlatform.isIOS && asset.priorRemoteId != null && await _editRevertService.tryHandleRevert(asset)) {
+        callbacks.onSuccess?.call(asset.localId!, asset.priorRemoteId!);
+        return;
+      }
+
+      final isAvailableLocally = await _storageRepository.isAssetAvailableLocally(asset.id);
+
+      if (!isAvailableLocally && CurrentPlatform.isIOS) {
+        _logger.info("Loading iCloud asset ${asset.id} - ${asset.name}");
+
+        // Create progress handler for iCloud download
+        PMProgressHandler? progressHandler;
+        StreamSubscription? progressSubscription;
+
+        progressHandler = PMProgressHandler();
+        progressSubscription = progressHandler.stream.listen((event) {
+          callbacks.onICloudProgress?.call(asset.localId!, event.progress);
+        });
+
+        try {
+          file = await _storageRepository.loadFileFromCloud(asset.id, progressHandler: progressHandler);
+          if (entity.isLivePhoto) {
+            livePhotoFile = await _storageRepository.loadMotionFileFromCloud(
+              asset.id,
+              progressHandler: progressHandler,
+            );
+          }
+        } finally {
+          await progressSubscription.cancel();
+        }
+      } else {
+        // Get files locally
+        file = await _storageRepository.getFileForAsset(asset.id);
        if (file == null) {
-          _logger.warning("Failed to obtain motion part of the livePhoto - ${asset.name}");
-          onError?.call(
+          _logger.warning("Failed to get file ${asset.id} - ${asset.name}");
+          callbacks.onError?.call(
            asset.localId!,
            CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
          );
          return;
        }
-        livePhotoFile = file;
+
+        // For live photos, get the motion video file
+        if (entity.isLivePhoto) {
+          livePhotoFile = await _storageRepository.getMotionFileForAsset(asset);
+          if (livePhotoFile == null) {
+            _logger.warning("Failed to obtain motion part of the livePhoto - ${asset.name}");
+            callbacks.onError?.call(
+              asset.localId!,
+              CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
+            );
+          }
+        }
      }

-      file = await _storageRepository.getAssetFile(asset.id, cancelToken: cancelToken, onProgress: onICloudProgress);
      if (file == null) {
-        _logger.warning("Failed to get file ${asset.id} - ${asset.name}");
-        onError?.call(
-          asset.localId!,
-          CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
-        );
+        _logger.warning("Failed to obtain file from iCloud for asset ${asset.id} - ${asset.name}");
+        callbacks.onError?.call(asset.localId!, "asset_not_found_on_icloud".t());
        return;
      }
-      assetFile = file;

      String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;

@@ -299,9 +351,11 @@ class ForegroundUploadService {
      };

      // Upload live photo video first if available
+      String? livePhotoVideoId;
      if (entity.isLivePhoto && livePhotoFile != null) {
        final livePhotoTitle = p.setExtension(originalFileName, p.extension(livePhotoFile.path));

+        final onProgress = callbacks.onProgress;
        final livePhotoResult = await _uploadRepository.uploadFile(
          file: livePhotoFile,
          originalFileName: livePhotoTitle,
@@ -313,16 +367,15 @@ class ForegroundUploadService {
          logContext: 'livePhotoVideo[${asset.localId}]',
        );

-        switch (livePhotoResult) {
-          case UploadSuccess(:final remoteAssetId):
-            fields['livePhotoVideoId'] = remoteAssetId;
-          case UploadError(:final message):
-            onError?.call(asset.localId!, "Failed to upload live photo video: $message");
-            return;
-          case UploadCancelled():
+        if (livePhotoResult.isSuccess && livePhotoResult.remoteAssetId != null) {
+          livePhotoVideoId = livePhotoResult.remoteAssetId;
        }
      }

+      if (livePhotoVideoId != null) {
+        fields['livePhotoVideoId'] = livePhotoVideoId;
+      }
+
      // Add cloudId metadata only to the still image, not the motion video, becasue when the sync id happens, the motion video can get associated with the wrong still image.
      if (CurrentPlatform.isIOS && asset.cloudId != null) {
        fields['metadata'] = jsonEncode([
@@ -339,6 +392,14 @@ class ForegroundUploadService {
        ]);
      }

+      final stackParentId = entity.isLivePhoto
+          ? null
+          : await _maybeUploadBaseResource(asset, Map.of(fields), cancelToken);
+      if (stackParentId != null) {
+        fields['stackParentId'] = stackParentId;
+      }
+
+      final onProgress = callbacks.onProgress;
      final result = await _uploadRepository.uploadFile(
        file: file,
        originalFileName: originalFileName,
@@ -350,37 +411,82 @@ class ForegroundUploadService {
        logContext: 'asset[${asset.localId}]',
      );

-      switch (result) {
-        case UploadSuccess(:final remoteAssetId):
-          onSuccess?.call(asset.localId!, remoteAssetId);
-        case UploadCancelled():
+      if (result.isSuccess && result.remoteAssetId != null) {
+        unawaited(
+          _localAssetRepository.markSynced(
+            asset.localId!,
+            priorRemoteId: result.remoteAssetId!,
+            syncedChecksum: asset.checksum ?? '',
+          ),
+        );
+        callbacks.onSuccess?.call(asset.localId!, result.remoteAssetId!);
+      } else if (result.isCancelled) {
+        _logger.warning(() => "Backup was cancelled by the user");
+        shouldAbortUpload = true;
+      } else if (result.errorMessage != null) {
+        _logger.severe(
+          () =>
+              "Error(${result.statusCode}) uploading ${asset.localId} | $originalFileName | Created on ${asset.createdAt} | ${result.errorMessage}",
+        );
+
+        callbacks.onError?.call(asset.localId!, result.errorMessage!);
+
+        if (result.errorMessage == "Quota has been exceeded!") {
          shouldAbortUpload = true;
-          _logger.warning("Upload was cancelled by the user for asset ${asset.localId}");
-        case UploadError(:final message, :final statusCode):
-          shouldAbortUpload |= message == "Quota has been exceeded!";
-          _logger.severe(
-            "Error(${statusCode ?? 'unknown'}) uploading ${asset.localId} | $originalFileName | Created on ${asset.createdAt} | $message",
-          );
-          onError?.call(asset.localId!, message);
+        }
      }
    } catch (error, stackTrace) {
-      _logger.severe("Asset backup failed", error, stackTrace);
-      onError?.call(asset.localId!, error.toString());
+      _logger.severe(() => "Error backup asset: ${error.toString()}", stackTrace);
+      callbacks.onError?.call(asset.localId!, error.toString());
    } finally {
      if (Platform.isIOS) {
-        unawaited(
-          Future.wait([
-            if (assetFile != null) assetFile.delete(),
-            if (livePhotoFile != null) livePhotoFile.delete(),
-          ]).onError((error, stackTrace) {
-            _logger.severe("Post-upload file cleanup failed", error, stackTrace);
-            return const [];
-          }),
-        );
+        try {
+          await file?.delete();
+          await livePhotoFile?.delete();
+        } catch (error, stackTrace) {
+          _logger.severe(() => "ERROR deleting file: ${error.toString()}", stackTrace);
+        }
      }
    }
  }

+  /// For an edited iOS photo, uploads the original camera bytes and returns its
+  /// remote id to use as the edit's stackParentId. Returns null for non-edits.
+  Future<String?> _maybeUploadBaseResource(
+    LocalAsset asset,
+    Map<String, String> baseFields,
+    Completer<void>? cancelToken,
+  ) async {
+    if (!CurrentPlatform.isIOS) {
+      return null;
+    }
+
+    final plan = await resolveEditPair(_nativeSyncApi, asset, log: _logger);
+    switch (plan) {
+      case NoEditPair():
+        return null;
+      case AbsorbIntoPrior(:final parentId):
+        return parentId;
+      case UploadBaseFirst(:final base):
+        final baseFile = File(base.path);
+        try {
+          final baseName = p.setExtension(asset.name, p.extension(base.path));
+          final result = await _uploadRepository.uploadFile(
+            file: baseFile,
+            originalFileName: baseName,
+            fields: baseFields,
+            cancelToken: cancelToken,
+            logContext: 'baseResource[${asset.localId}]',
+          );
+          return result.isSuccess ? result.remoteAssetId : null;
+        } finally {
+          try {
+            await baseFile.delete();
+          } catch (_) {}
+        }
+    }
+  }
+
  Future<UploadResult> _uploadSingleFile(
    File file, {
    required String deviceAssetId,
@@ -412,7 +518,7 @@ class ForegroundUploadService {
        logContext: 'shareIntent[$deviceAssetId]',
      );
    } catch (e) {
-      return UploadError(message: e.toString());
+      return UploadResult.error(errorMessage: e.toString());
    }
  }

@@ -1,12 +1,10 @@
 import 'dart:async';
 import 'dart:convert';

-import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
@@ -138,11 +136,15 @@ Future<void> _migrateTo26(Drift drift) async {

 Future<void> _migrateAlbumSortMode(_StoreMigrator migrator) async {
  final raw = await migrator.readLegacyStoreInt(StoreKey.legacySelectedAlbumSortOrder.id);
-  final mode = AlbumSortMode.values.firstWhereOrNull((e) => raw != null && e.storeIndex == raw);
-  if (mode == null) {
+  if (raw == null) {
    return;
  }

+  final mode = AlbumSortMode.values.firstWhere(
+    (e) => e.storeIndex == raw,
+    orElse: () => MetadataKey.albumSortMode.defaultValue,
+  );
+
  migrator.stage(StoreKey.legacySelectedAlbumSortOrder, MetadataKey.albumSortMode, mode);
 }

@@ -206,11 +208,7 @@ class _StoreMigrator {
      return;
    }

-    final enumValue = values.elementAtOrNull(index);
-    if (enumValue == null) {
-      return;
-    }
-
+    final enumValue = values.elementAtOrNull(index) ?? newKey.defaultValue;
    _cache[newKey] = enumValue;
    _migratedStoreIds.add(legacyKey.id);
  }
@@ -225,11 +223,7 @@ class _StoreMigrator {
      return;
    }

-    final enumValue = values.firstWhereOrNull((e) => e.name == name);
-    if (enumValue == null) {
-      return;
-    }
-
+    final enumValue = values.firstWhere((e) => e.name == name, orElse: () => newKey.defaultValue);
    _cache[newKey] = enumValue;
    _migratedStoreIds.add(legacyKey.id);
  }
@@ -273,12 +267,9 @@ class _StoreMigrator {
  Future<void> complete() async {
    await _db.batch((batch) {
      for (final entry in _cache.entries) {
-        if (entry.value == defaultConfig.read(entry.key)) {
-          continue;
-        }
        batch.insert(
          _db.metadataEntity,
-          MetadataEntityCompanion(key: Value(entry.key.name), value: Value(entry.key.encode(entry.value))),
+          MetadataEntityCompanion(key: Value(entry.key.key), value: Value(entry.key.encode(entry.value))),
          mode: InsertMode.insertOrReplace,
        );
      }
@@ -139,6 +139,8 @@ class PhotoViewCoreState extends State<PhotoViewCore>

  PhotoViewHeroAttributes? get heroAttributes => widget.heroAttributes;

+  late ScaleBoundaries cachedScaleBoundaries = widget.scaleBoundaries;
+
  void handleScaleAnimation() {
    scale = _scaleAnimation!.value;
  }
@@ -301,7 +303,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
    controller.scaleAnimationBuilder(_animateControllerScale);
    controller.rotationAnimationBuilder(_animateControllerRotation);

-    _updateScaleBoundaries();
+    cachedScaleBoundaries = widget.scaleBoundaries;

    _scaleAnimationController = AnimationController(vsync: this)
      ..addListener(handleScaleAnimation)
@@ -332,29 +334,14 @@ class PhotoViewCoreState extends State<PhotoViewCore>
    widget.onTapDown?.call(context, details, controller.value);
  }

-  void _updateScaleBoundaries() {
-    final prev = controller.scaleBoundaries;
-    if (prev == widget.scaleBoundaries) {
-      return;
-    }
-
-    if (prev != null && controller.scale != null && prev.initialScale > 0) {
-      final ratio = widget.scaleBoundaries.initialScale / prev.initialScale;
-      controller.setScaleInvisibly(controller.scale! * ratio);
-    } else {
-      markNeedsScaleRecalc = true;
-    }
-    controller.scaleBoundaries = widget.scaleBoundaries;
-  }
-
-  @override
-  void didUpdateWidget(PhotoViewCore oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    _updateScaleBoundaries();
-  }
-
  @override
  Widget build(BuildContext context) {
+    // Check if we need a recalc on the scale
+    if (widget.scaleBoundaries != cachedScaleBoundaries) {
+      markNeedsScaleRecalc = true;
+      cachedScaleBoundaries = widget.scaleBoundaries;
+    }
+
    return StreamBuilder(
      stream: controller.outputStateStream,
      initialData: controller.prevValue,
@@ -145,6 +145,7 @@ class _ImageWrapperState extends State<ImageWrapper> {
        _lastStack = null;

        _didLoadSynchronously = synchronousCall;
+        widget.controller.scaleBoundaries = scaleBoundaries;
      }

      synchronousCall && !_didLoadSynchronously ? setupCB() : setState(setupCB);
@@ -31,7 +31,7 @@ class AdvancedSettings extends HookConsumerWidget {
    final manageLocalMediaAndroid = useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
    final isManageMediaSupported = useState(false);
    final manageMediaAndroidPermission = useState(false);
-    final levelId = useState<int>(ref.read(appConfigProvider).logLevel.index);
+    final levelId = useState<int>(ref.read(systemConfigProvider).logLevel.index);
    final preferRemote = useState(ref.read(appConfigProvider).image.preferRemote);
    useValueChanged(
      preferRemote.value,
@@ -1,13 +1,12 @@
 import 'dart:async';
-
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:immich_mobile/constants/locales.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/services/localization.service.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/widgets/common/search_field.dart';

 class LanguageSettings extends HookConsumerWidget {
@@ -85,7 +84,7 @@ class LanguageSettings extends HookConsumerWidget {
                    padding: const EdgeInsets.all(8),
                    itemCount: filteredLocaleEntries.value.length,
                    itemExtent: 64.0,
-                    scrollCacheExtent: const .pixels(100),
+                    cacheExtent: 100,
                    itemBuilder: (context, index) {
                      final countryName = filteredLocaleEntries.value[index].key;
                      final localeValue = filteredLocaleEntries.value[index].value;
@@ -36,6 +36,10 @@ class ExternalNetworkPreference extends HookConsumerWidget {
    }

    handleReorder(int oldIndex, int newIndex) {
+      if (oldIndex < newIndex) {
+        newIndex -= 1;
+      }
+
      final entry = entries.value.removeAt(oldIndex);
      entries.value.insert(newIndex, entry);
      entries.value = [...entries.value];
@@ -64,7 +68,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
    }

    useEffect(() {
-      final urls = ref.read(appConfigProvider).network.externalEndpointList;
+      final urls = ref.read(metadataProvider).systemConfig.network.externalEndpointList;

      if (urls.isEmpty) {
        return null;
@@ -109,7 +113,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
                    shrinkWrap: true,
                    physics: const NeverScrollableScrollPhysics(),
                    itemCount: entries.value.length,
-                    onReorderItem: handleReorder,
+                    onReorder: handleReorder,
                    itemBuilder: (context, index) {
                      return EndpointInput(
                        key: Key(index.toString()),
--- a/Show More
+++ b/Show More