fix chain resume over deleted remotes and revert reporting

feat(mobile): stack original + edited photo on ios
2026-06-16 20:02:15 -07:00 · 2026-06-11 20:31:58 +06:00 · 2026-06-11 03:15:17 +06:00
322 changed files with 9558 additions and 26049 deletions
@@ -15,7 +15,7 @@ jobs:
    outputs:
      uses_template: ${{ steps.check.outputs.uses_template }}
    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          sparse-checkout: .github/pull_request_template.md
          sparse-checkout-cone-mode: false
@@ -84,7 +84,7 @@ jobs:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ inputs.ref }}
          persist-credentials: false
@@ -211,7 +211,7 @@ jobs:
        run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ inputs.ref || github.sha }}
          persist-credentials: false
@@ -25,7 +25,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Check out code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -20,12 +20,12 @@ jobs:
      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false

      - name: Check for breaking API changes
-        uses: oasdiff/oasdiff-action/breaking@a8c7f0e5649d20d623edb5b38446d3ab3d82d43c # v0.0.53
+        uses: oasdiff/oasdiff-action/breaking@50e6a3413e5aa9c3ae4d8393c34745be44288b46 # v0.0.48
        with:
          base: https://raw.githubusercontent.com/${{ github.repository }}/main/open-api/immich-openapi-specs.json
          revision: open-api/immich-openapi-specs.json
@@ -37,7 +37,7 @@ jobs:
      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false

@@ -37,7 +37,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -69,7 +69,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -50,14 +50,14 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

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

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
        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@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/autobuild@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0

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

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
        with:
          category: '/language:${{matrix.language}}'
@@ -60,7 +60,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -132,7 +132,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -23,7 +23,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -21,7 +21,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.pull_request.head.ref }}
          persist-credentials: true
@@ -45,7 +45,7 @@ jobs:
        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        if: always()
        with:
-          github-token: ${{ steps.token.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            github.rest.issues.removeLabel({
              issue_number: context.payload.pull_request.number,
@@ -10,13 +10,9 @@ on:
        type: choice
        options:
          - 'false'
+          - major
          - minor
          - patch
-          - premajor
-          - preminor
-          - prepatch
-          - prerelease
-          - release
      mobileBump:
        description: 'Bump mobile build number'
        required: false
@@ -59,7 +55,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          token: ${{ steps.token.outputs.token }}
          persist-credentials: true
@@ -72,13 +68,13 @@ jobs:

      # TODO move to mise
      - name: Install uv
-        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0

      - name: Bump version
        env:
          SERVER_BUMP: ${{ inputs.serverBump }}
          MOBILE_BUMP: ${{ inputs.mobileBump }}
-        run: pnpm --silent release -s "${SERVER_BUMP}" -m "${MOBILE_BUMP}"
+        run: misc/release/pump-version.sh -s "${SERVER_BUMP}" -m "${MOBILE_BUMP}"

      - id: output
        run: echo "version=$IMMICH_VERSION" >> $GITHUB_OUTPUT
@@ -129,7 +125,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          token: ${{ steps.generate-token.outputs.token }}
          persist-credentials: false
@@ -22,7 +22,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -55,7 +55,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -90,8 +90,6 @@ jobs:
            mobile/**/*.g.dart
            mobile/**/*.gr.dart
            mobile/**/*.drift.dart
-            mobile/**/*.g.swift
-            mobile/**/*.g.kt

      - name: Verify files have not changed
        if: steps.verify-changed-files.outputs.files_changed == 'true'
@@ -28,10 +28,6 @@ jobs:
        with:
          github-token: ${{ steps.token.outputs.token }}
          filters: |
-            root:
-              - 'misc/**'
-              - 'pnpm-lock.yaml'
-              - 'mise.toml'
            i18n:
              - 'i18n/**'
              - 'mise.toml'
@@ -66,34 +62,6 @@ jobs:
            - '.github/workflows/test.yml'
          force-events: 'workflow_dispatch'

-  root-unit-tests:
-    name: Test the root workspace
-    needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).root == true }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
-        with:
-          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
-          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
-
-      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-        with:
-          persist-credentials: false
-          token: ${{ steps.token.outputs.token }}
-
-      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
-        with:
-          github_token: ${{ steps.token.outputs.token }}
-
-      - name: Run unit tests
-        run: pnpm test
-
  server-unit-tests:
    name: Test & Lint Server
    needs: pre-job
@@ -109,7 +77,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -140,7 +108,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -171,7 +139,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -215,7 +183,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -253,7 +221,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -281,7 +249,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -331,7 +299,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -363,7 +331,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          submodules: 'recursive'
@@ -399,7 +367,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          submodules: 'recursive'
@@ -476,7 +444,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          submodules: 'recursive'
@@ -583,7 +551,7 @@ jobs:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -621,7 +589,7 @@ jobs:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -652,7 +620,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -681,7 +649,7 @@ jobs:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -703,7 +671,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -761,7 +729,7 @@ jobs:
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
@@ -60,7 +60,6 @@
  "explorer.fileNesting.patterns": {
    "*.dart": "${capture}.g.dart,${capture}.gr.dart,${capture}.drift.dart",
    "*.ts": "${capture}.spec.ts,${capture}.mock.ts",
-    "*.js": "${capture}.spec.js,${capture}.mock.js",
    "package.json": "package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb, bun.lock, pnpm-workspace.yaml, .pnpmfile.cjs"
  },
  "search.exclude": {
@@ -97,7 +97,7 @@ services:
    command: ['./run.sh', '-disable-reporting']
    ports:
      - 3000:3000
-    image: grafana/grafana:12.4.4-ubuntu@sha256:df2e7ef5f32f771794cf76bad5f2bceac227036460a2cc269a9045e5662abc58
+    image: grafana/grafana:12.4.3-ubuntu@sha256:ca3f764fdc48cebdf22dd206f33ecb0795a9a7210eacd1b5c02204aebd78b223
    volumes:
      - grafana-data:/var/lib/grafana

@@ -7,7 +7,7 @@ Immich uses the [OpenAPI](https://swagger.io/specification/) standard to generat
 OpenAPI is used to generate the client (Typescript, Dart) SDK. `openapi-generator-cli` can be installed [here](https://openapi-generator.tech/docs/installation/). The generated SDK is based on the `immich-openapi-specs.json` file, which is autogenerated by the server **when running in development mode**. The `immich-openapi-specs.json` file can be modified with `@nestjs/swagger` decorators used or referenced by controller endpoints. See the [NestJS OpenAPI docs](https://docs.nestjs.com/openapi/types-and-parameters) for more info. When you add a new endpoint or modify an existing one, you must run the server in development mode and run the command below to update the client SDK.

 ```bash
-mise open-api
+make open-api
 ```

 You can find the generated client SDK in the `packages/sdk/client` for Typescript SDK and `mobile/openapi` for Dart SDK.
@@ -218,7 +218,7 @@ When the Dev Container starts, it automatically:
   - Debug ports: 9230 (workers), 9231 (API)

 :::info
-The Dev Container setup replaces the `mise dev` command from the traditional setup. All services start automatically when you open the container.
+The Dev Container setup replaces the `make dev` command from the traditional setup. All services start automatically when you open the container.
 :::

 ### Accessing Services
@@ -2,7 +2,7 @@

 A minimal devcontainer is supplied with this repository. All commands can be executed directly inside this container to avoid tedious installation of the environment.
 :::warning
-The provided devcontainer isn't complete at the moment. At least all dockerized steps in the Makefile won't work (`mise dev`, ....). Feel free to contribute!
+The provided devcontainer isn't complete at the moment. At least all dockerized steps in the Makefile won't work (`make dev`, ....). Feel free to contribute!
 :::
 When contributing code through a pull request, please check the following:

@@ -45,7 +45,7 @@ All the services are packaged to run as with single Docker Compose command.
 5. From the root directory, run:

 ```bash title="Start development server"
-mise dev
+make dev # required Makefile installed on the system.
 ```

 5. Access the dev instance in your browser at http://localhost:3000, or connect via the mobile app.
@@ -88,7 +88,7 @@ To see local changes to `@immich/ui` in Immich, do the following:
 3. Uncomment the corresponding volume in web service of the `docker/docker-compose.dev.yml` file (`../../ui:/usr/src/ui`)
 4. Uncomment the corresponding alias in the `web/vite.config.ts` file (`'@immich/ui': path.resolve(\_\_dirname, '../../ui/packages/ui')`)
 5. Uncomment the import statement in `web/src/app.css` file `@import '../../../ui/packages/ui/dist/theme/default.css';` and comment out `@import '@immich/ui/theme/default.css';`
-6. Start up the stack via `mise dev`
+6. Start up the stack via `make dev`
 7. After making changes in `@immich/ui`, rebuild it (`pnpm run build`)

 ### Mobile app
@@ -12,7 +12,7 @@ You need to run `mise //server:install` before _once_.
 The e2e tests can be run by first starting up a test production environment via:

 ```bash
-mise e2e
+make e2e
 ```

 Before you can run the tests, you need to run the following commands _once_:
@@ -4,8 +4,7 @@ services:
  e2e-auth-server:
    container_name: immich-e2e-auth-server
    build:
-      context: ../
-      dockerfile: packages/e2e-auth-server/Dockerfile
+      context: ../packages/e2e-auth-server
    ports:
      - 2286:2286

@@ -99,7 +99,7 @@ describe('/admin/maintenance', () => {
          },
          {
            interval: 500,
-            timeout: 60_000,
+            timeout: 10_000,
          },
        )
        .toBeTruthy();
@@ -190,7 +190,7 @@ describe('/admin/maintenance', () => {
          },
          {
            interval: 500,
-            timeout: 60_000,
+            timeout: 10_000,
          },
        )
        .toBeFalsy();
@@ -504,14 +504,13 @@ describe('/albums', () => {
      });
    });

-    it('should deduplicate owner from albumUsers on create', async () => {
+    it('should not be able to share album with owner', async () => {
      const { status, body } = await request(app)
        .post('/albums')
        .send({ albumName: 'New album', albumUsers: [{ role: AlbumUserRole.Editor, userId: user1.userId }] })
        .set('Authorization', `Bearer ${user1.accessToken}`);
-      expect(status).toBe(201);
-      expect(body.albumUsers).toHaveLength(1);
-      expect(body.albumUsers[0]).toMatchObject({ role: AlbumUserRole.Owner, user: { id: user1.userId } });
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest('Cannot share album with owner'));
    });
  });

@@ -492,20 +492,6 @@ describe('/asset', () => {
      expect(status).toEqual(200);
    });

-    it('should set the negative rating', async () => {
-      const { status, body } = await request(app)
-        .put(`/assets/${user1Assets[0].id}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .send({ rating: -1 });
-      expect(body).toMatchObject({
-        id: user1Assets[0].id,
-        exifInfo: expect.objectContaining({
-          rating: -1,
-        }),
-      });
-      expect(status).toEqual(200);
-    });
-
    it('should return tagged people', async () => {
      const { status, body } = await request(app)
        .put(`/assets/${user1Assets[0].id}`)
@@ -1,669 +0,0 @@
-import {
-  AssetMediaResponseDto,
-  IntegrityReportResponseDto,
-  LoginResponseDto,
-  ManualJobName,
-  QueueCommand,
-  QueueName,
-} from '@immich/sdk';
-import { readFile } from 'node:fs/promises';
-import { app, testAssetDir, utils } from 'src/utils';
-import request from 'supertest';
-import { afterEach, beforeAll, describe, expect, it } from 'vitest';
-
-const assetFilepath = `${testAssetDir}/metadata/gps-position/thompson-springs.jpg`;
-const asset1Filepath = `${testAssetDir}/albums/nature/el_torcal_rocks.jpg`;
-const asset2Filepath = `${testAssetDir}/albums/nature/wood_anemones.jpg`;
-
-describe('/admin/integrity', () => {
-  let admin: LoginResponseDto;
-  let asset: AssetMediaResponseDto;
-
-  let user1: LoginResponseDto;
-  let asset1: AssetMediaResponseDto;
-
-  let user2: LoginResponseDto;
-  let asset2: AssetMediaResponseDto;
-
-  beforeAll(async () => {
-    await utils.resetDatabase();
-    admin = await utils.adminSetup();
-
-    user1 = await utils.userSetup(admin.accessToken, {
-      email: '1@example.com',
-      name: '1',
-      password: '1',
-    });
-
-    user2 = await utils.userSetup(admin.accessToken, {
-      email: '2@example.com',
-      name: '2',
-      password: '2',
-    });
-
-    for (const queue of Object.values(QueueName)) {
-      if (queue === QueueName.IntegrityCheck) {
-        continue;
-      }
-
-      await utils.queueCommand(admin.accessToken, queue, {
-        command: QueueCommand.Pause,
-      });
-    }
-
-    asset = await utils.createAsset(admin.accessToken, {
-      assetData: {
-        filename: 'asset.jpg',
-        bytes: await readFile(assetFilepath),
-      },
-    });
-
-    asset1 = await utils.createAsset(user1.accessToken, {
-      assetData: {
-        filename: 'asset.jpg',
-        bytes: await readFile(asset1Filepath),
-      },
-    });
-
-    asset2 = await utils.createAsset(user2.accessToken, {
-      assetData: {
-        filename: 'asset.jpg',
-        bytes: await readFile(asset2Filepath),
-      },
-    });
-
-    await utils.mkFolder('/data/bak');
-    await utils.copyFolder(`/data/upload/${admin.userId}`, `/data/bak/${admin.userId}`);
-
-    for (const queue of Object.values(QueueName)) {
-      if (queue === QueueName.IntegrityCheck) {
-        continue;
-      }
-
-      await utils.queueCommand(admin.accessToken, queue, {
-        command: QueueCommand.Empty,
-      });
-
-      await utils.queueCommand(admin.accessToken, queue, {
-        command: QueueCommand.Resume,
-      });
-    }
-  });
-
-  afterEach(async () => {
-    await utils.deleteFolder(`/data/upload/${admin.userId}`);
-    await utils.copyFolder(`/data/bak/${admin.userId}`, `/data/upload/${admin.userId}`);
-  });
-
-  describe('POST /summary (& jobs)', async () => {
-    it.sequential('reports no issues', async () => {
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityUntrackedFiles,
-      });
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityMissingFiles,
-      });
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityChecksumMismatch,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityUntrackedFilesDeleteAll,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/summary')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        missing_file: 0,
-        untracked_file: 0,
-        checksum_mismatch: 0,
-      });
-    });
-
-    it.sequential('should detect an untracked file (job: check untracked files)', async () => {
-      await utils.putTextFile('untracked', `/data/upload/${admin.userId}/untracked1.png`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityUntrackedFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/summary')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          untracked_file: 1,
-        }),
-      );
-    });
-
-    it.sequential('should detect outdated untracked file reports (job: refresh untracked files)', async () => {
-      // these should not be detected:
-      await utils.putTextFile('untracked', `/data/upload/${admin.userId}/untracked2.png`);
-      await utils.putTextFile('untracked', `/data/upload/${admin.userId}/untracked3.png`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityUntrackedFilesRefresh,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/summary')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          untracked_file: 0,
-        }),
-      );
-    });
-
-    it.sequential('should delete untracked files (job: delete all untracked file reports)', async () => {
-      await utils.putTextFile('untracked', `/data/upload/${admin.userId}/untracked1.png`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityUntrackedFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityUntrackedFilesDeleteAll,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/summary')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          untracked_file: 0,
-        }),
-      );
-    });
-
-    it.sequential('should detect a missing file and not a checksum mismatch (job: check missing files)', async () => {
-      await utils.deleteFolder(`/data/upload/${admin.userId}`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityMissingFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/summary')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          missing_file: 1,
-          checksum_mismatch: 0,
-        }),
-      );
-    });
-
-    it.sequential('should detect outdated missing file reports (job: refresh missing files)', async () => {
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityMissingFilesRefresh,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/summary')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          missing_file: 0,
-          checksum_mismatch: 0,
-        }),
-      );
-    });
-
-    it.sequential('should delete assets with missing files (job: delete all missing file reports)', async () => {
-      await utils.deleteFolder(`/data/upload/${user1.userId}`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityMissingFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status: listStatus, body: listBody } = await request(app)
-        .get('/admin/integrity/summary')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(listStatus).toBe(200);
-      expect(listBody).toEqual(
-        expect.objectContaining({
-          missing_file: 1,
-        }),
-      );
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityMissingFilesDeleteAll,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/summary')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          missing_file: 0,
-        }),
-      );
-
-      await expect(utils.getAssetInfo(user1.accessToken, asset1.id)).resolves.toEqual(
-        expect.objectContaining({
-          isTrashed: true,
-        }),
-      );
-    });
-
-    it.sequential('should detect a checksum mismatch (job: check file checksums)', async () => {
-      await utils.truncateFolder(`/data/upload/${admin.userId}`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityChecksumMismatch,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/summary')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          checksum_mismatch: 1,
-        }),
-      );
-    });
-
-    it.sequential('should detect outdated checksum mismatch reports (job: refresh file checksums)', async () => {
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityChecksumMismatchRefresh,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/summary')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          checksum_mismatch: 0,
-        }),
-      );
-    });
-
-    it.sequential(
-      'should delete assets with mismatched checksum (job: delete all checksum mismatch reports)',
-      async () => {
-        await utils.truncateFolder(`/data/upload/${user2.userId}`);
-
-        await utils.createJob(admin.accessToken, {
-          name: ManualJobName.IntegrityChecksumMismatch,
-        });
-
-        await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-        const { status: listStatus, body: listBody } = await request(app)
-          .get('/admin/integrity/summary')
-          .set('Authorization', `Bearer ${admin.accessToken}`)
-          .send();
-
-        expect(listStatus).toBe(200);
-        expect(listBody).toEqual(
-          expect.objectContaining({
-            checksum_mismatch: 1,
-          }),
-        );
-
-        await utils.createJob(admin.accessToken, {
-          name: ManualJobName.IntegrityChecksumMismatchDeleteAll,
-        });
-
-        await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-        const { status, body } = await request(app)
-          .get('/admin/integrity/summary')
-          .set('Authorization', `Bearer ${admin.accessToken}`)
-          .send();
-
-        expect(status).toBe(200);
-        expect(body).toEqual(
-          expect.objectContaining({
-            checksum_mismatch: 0,
-          }),
-        );
-
-        await expect(utils.getAssetInfo(user2.accessToken, asset2.id)).resolves.toEqual(
-          expect.objectContaining({
-            isTrashed: true,
-          }),
-        );
-      },
-    );
-  });
-
-  describe('POST /report', async () => {
-    it.sequential('reports untracked files', async () => {
-      await utils.putTextFile('untracked', `/data/upload/${admin.userId}/untracked1.png`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityUntrackedFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/report?type=untracked_file')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        nextCursor: undefined,
-        items: expect.arrayContaining([
-          {
-            id: expect.any(String),
-            type: 'untracked_file',
-            path: `/data/upload/${admin.userId}/untracked1.png`,
-            assetId: null,
-            fileAssetId: null,
-            createdAt: expect.any(String),
-          },
-        ]),
-      });
-    });
-
-    it.sequential('reports missing files', async () => {
-      await utils.deleteFolder(`/data/upload/${admin.userId}`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityMissingFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/report?type=missing_file')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        nextCursor: undefined,
-        items: expect.arrayContaining([
-          {
-            id: expect.any(String),
-            type: 'missing_file',
-            path: expect.any(String),
-            assetId: asset.id,
-            fileAssetId: null,
-            createdAt: expect.any(String),
-          },
-        ]),
-      });
-    });
-
-    it.sequential('reports checksum mismatched files', async () => {
-      await utils.truncateFolder(`/data/upload/${admin.userId}`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityChecksumMismatch,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, body } = await request(app)
-        .get('/admin/integrity/report?type=checksum_mismatch')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        nextCursor: undefined,
-        items: expect.arrayContaining([
-          {
-            id: expect.any(String),
-            type: 'checksum_mismatch',
-            path: expect.any(String),
-            assetId: asset.id,
-            fileAssetId: null,
-            createdAt: expect.any(String),
-          },
-        ]),
-      });
-    });
-  });
-
-  describe('DELETE /report/:id', async () => {
-    it.sequential('delete untracked files', async () => {
-      await utils.putTextFile('untracked', `/data/upload/${admin.userId}/untracked1.png`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityUntrackedFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status: listStatus, body: listBody } = await request(app)
-        .get('/admin/integrity/report?type=untracked_file')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(listStatus).toBe(200);
-
-      const report = (listBody as IntegrityReportResponseDto).items.find(
-        (item) => item.path === `/data/upload/${admin.userId}/untracked1.png`,
-      )!;
-
-      const { status } = await request(app)
-        .delete(`/admin/integrity/report/${report.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityUntrackedFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status: listStatus2, body: listBody2 } = await request(app)
-        .get('/admin/integrity/report?type=untracked_file')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(listStatus2).toBe(200);
-      expect(listBody2).not.toBe(
-        expect.objectContaining({
-          items: expect.arrayContaining([
-            expect.objectContaining({
-              id: report.id,
-            }),
-          ]),
-        }),
-      );
-    });
-
-    it.sequential('delete assets missing files', async () => {
-      await utils.deleteFolder(`/data/upload/${admin.userId}`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityMissingFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status: listStatus, body: listBody } = await request(app)
-        .get('/admin/integrity/report?type=missing_file')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(listStatus).toBe(200);
-      expect(listBody.items.length).toBe(1);
-
-      const report = (listBody as IntegrityReportResponseDto).items[0];
-
-      const { status } = await request(app)
-        .delete(`/admin/integrity/report/${report.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityMissingFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status: listStatus2, body: listBody2 } = await request(app)
-        .get('/admin/integrity/report?type=missing_file')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(listStatus2).toBe(200);
-      expect(listBody2.items.length).toBe(0);
-    });
-
-    it.sequential('delete assets with failing checksum', async () => {
-      await utils.truncateFolder(`/data/upload/${admin.userId}`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityChecksumMismatch,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status: listStatus, body: listBody } = await request(app)
-        .get('/admin/integrity/report?type=checksum_mismatch')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(listStatus).toBe(200);
-      expect(listBody.items.length).toBe(1);
-
-      const report = (listBody as IntegrityReportResponseDto).items[0];
-
-      const { status } = await request(app)
-        .delete(`/admin/integrity/report/${report.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityChecksumMismatch,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status: listStatus2, body: listBody2 } = await request(app)
-        .get('/admin/integrity/report?type=checksum_mismatch')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(listStatus2).toBe(200);
-      expect(listBody2.items.length).toBe(0);
-    });
-  });
-
-  describe('GET /report/:type/csv', () => {
-    it.sequential('exports untracked files as csv', async () => {
-      await utils.putTextFile('untracked', `/data/upload/${admin.userId}/untracked1.png`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityUntrackedFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { status, headers, text } = await request(app)
-        .get('/admin/integrity/report/untracked_file/csv')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      expect(status).toBe(200);
-      expect(headers['content-type']).toContain('text/csv');
-      expect(headers['content-disposition']).toContain('.csv');
-      expect(text).toContain('id,type,assetId,fileAssetId,path');
-      expect(text).toContain(`untracked_file`);
-      expect(text).toContain(`/data/upload/${admin.userId}/untracked1.png`);
-    });
-  });
-
-  describe('GET /report/:id/file', () => {
-    it.sequential('downloads untracked file', async () => {
-      await utils.putTextFile('untracked-content', `/data/upload/${admin.userId}/untracked1.png`);
-
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.IntegrityUntrackedFiles,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-      const { body: listBody } = await request(app)
-        .get('/admin/integrity/report?type=untracked_file')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-
-      const report = (listBody as IntegrityReportResponseDto).items.find(
-        (item) => item.path === `/data/upload/${admin.userId}/untracked1.png`,
-      )!;
-
-      const { status, headers, body } = await request(app)
-        .get(`/admin/integrity/report/${report.id}/file`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .buffer(true)
-        .send();
-
-      expect(status).toBe(200);
-      expect(headers['content-type']).toContain('application/octet-stream');
-      expect(body.toString()).toBe('untracked-content');
-    });
-  });
-});
@@ -1,41 +0,0 @@
-import { LoginResponseDto, ManualJobName, QueueName } from '@immich/sdk';
-import { expect, test } from '@playwright/test';
-import { utils } from 'src/utils';
-
-test.describe.configure({ mode: 'serial' });
-
-test.describe.skip('Integrity', () => {
-  let admin: LoginResponseDto;
-
-  test.beforeAll(async () => {
-    utils.initSdk();
-    await utils.resetDatabase();
-    admin = await utils.adminSetup();
-  });
-
-  test('run integrity jobs to update stats', async ({ context, page }) => {
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    await utils.createJob(admin.accessToken, {
-      name: ManualJobName.IntegrityUntrackedFiles,
-    });
-
-    await utils.waitForQueueFinish(admin.accessToken, QueueName.IntegrityCheck);
-
-    await page.goto('/admin/maintenance');
-
-    const count = page.getByText('Untracked Files').locator('..').locator('..').locator('div').nth(1);
-
-    const previousCount = Number.parseInt((await count.textContent()) ?? '');
-
-    await utils.mkFolder(`/data/upload/${admin.userId}`);
-    await utils.putTextFile('untracked', `/data/upload/${admin.userId}/untracked1.png`);
-
-    const checkButton = page.getByText('Integrity Report').locator('..').getByRole('button', { name: 'Check All' });
-
-    await checkButton.click();
-    await expect(checkButton).toBeEnabled();
-
-    await expect(count).toContainText((previousCount + 1).toString());
-  });
-});
@@ -192,7 +192,6 @@ export const utils = {
      'user',
      'system_metadata',
      'tag',
-      'integrity_report',
    ];

    const truncateTables = tables.filter((table) => table !== 'system_metadata');
@@ -560,54 +559,10 @@ export const utils = {
    mkdirSync(`${testAssetDir}/temp`, { recursive: true });
  },

-  putFile(source: string, dest: string) {
-    return executeCommand('docker', ['cp', source, `immich-e2e-server:${dest}`]).promise;
-  },
-
-  async putTextFile(contents: string, dest: string) {
-    const dir = await mkdtemp(join(tmpdir(), 'test-'));
-    const fn = join(dir, 'file');
-    await pipeline(Readable.from(contents), createWriteStream(fn));
-    return executeCommand('docker', ['cp', fn, `immich-e2e-server:${dest}`]).promise;
-  },
-
  async move(source: string, dest: string) {
    return executeCommand('docker', ['exec', 'immich-e2e-server', 'mv', source, dest]).promise;
  },

-  async copyFolder(source: string, dest: string) {
-    return executeCommand('docker', ['exec', 'immich-e2e-server', 'cp', '-r', source, dest]).promise;
-  },
-
-  async deleteFile(path: string) {
-    return executeCommand('docker', ['exec', 'immich-e2e-server', 'rm', path]).promise;
-  },
-
-  async deleteFolder(path: string) {
-    return executeCommand('docker', ['exec', 'immich-e2e-server', 'rm', '-r', path]).promise;
-  },
-
-  async truncateFolder(path: string) {
-    return executeCommand('docker', [
-      'exec',
-      'immich-e2e-server',
-      'find',
-      path,
-      '-type',
-      'f',
-      '-exec',
-      'truncate',
-      '-s',
-      '1',
-      '{}',
-      ';',
-    ]).promise;
-  },
-
-  async mkFolder(path: string) {
-    return executeCommand('docker', ['exec', 'immich-e2e-server', 'mkdir', '-p', path]).promise;
-  },
-
  createBackup: async (accessToken: string) => {
    await utils.createJob(accessToken, {
      name: ManualJobName.BackupDatabase,
@@ -624,8 +579,10 @@ export const utils = {

  resetBackups: async (accessToken: string) => {
    const { backups } = await listDatabaseBackups({ headers: asBearerAuth(accessToken) });
+
+    const backupFiles = backups.map((b) => b.filename);
    await deleteDatabaseBackup(
-      { databaseBackupDeleteDto: { backups: backups.map((dto) => dto.filename) } },
+      { databaseBackupDeleteDto: { backups: backupFiles } },
      { headers: asBearerAuth(accessToken) },
    );
  },
@@ -79,7 +79,6 @@
    "cron_expression_description": "Set the scanning interval using the cron format. For more information please refer to e.g. <link>Crontab Guru</link>",
    "cron_expression_presets": "Cron expression presets",
    "disable_login": "Disable login",
-    "download_csv": "Download CSV",
    "duplicate_detection_job_description": "Run machine learning on assets to detect similar images. Relies on Smart Search",
    "exclusion_pattern_description": "Exclusion patterns lets you ignore files and folders when scanning your library. This is useful if you have folders that contain files you don't want to import, such as RAW files.",
    "export_config_as_json_description": "Download the current system config as a JSON file",
@@ -192,17 +191,6 @@
    "maintenance_delete_backup": "Delete Backup",
    "maintenance_delete_backup_description": "This file will be irrevocably deleted.",
    "maintenance_delete_error": "Failed to delete backup.",
-    "maintenance_integrity_check_all": "Check All",
-    "maintenance_integrity_checksum_mismatch": "Checksum Mismatch",
-    "maintenance_integrity_checksum_mismatch_job": "Check for checksum mismatches",
-    "maintenance_integrity_checksum_mismatch_refresh_job": "Refresh checksum mismatch reports",
-    "maintenance_integrity_missing_file": "Missing Files",
-    "maintenance_integrity_missing_file_job": "Check for missing files",
-    "maintenance_integrity_missing_file_refresh_job": "Refresh missing file reports",
-    "maintenance_integrity_report": "Integrity Report",
-    "maintenance_integrity_untracked_file": "Untracked Files",
-    "maintenance_integrity_untracked_file_job": "Check for untracked files",
-    "maintenance_integrity_untracked_file_refresh_job": "Refresh untracked file reports",
    "maintenance_restore_backup": "Restore Backup",
    "maintenance_restore_backup_description": "Immich will be wiped and restored from the chosen backup. A backup will be created before continuing.",
    "maintenance_restore_backup_different_version": "This backup was created with a different version of Immich!",
@@ -927,8 +915,6 @@
  "deduplicate_all": "Deduplicate All",
  "default_locale": "Default Locale",
  "default_locale_description": "Format dates and numbers based on your browser locale",
-  "default_quality_subtitle": "Quality used when tapping share. Long press the share button to choose each time.",
-  "default_share_quality": "Default share quality",
  "delete": "Delete",
  "delete_action_confirmation_message": "Are you sure you want to delete this asset? This action will move the asset to the server's trash and will prompt if you want to delete it locally",
  "delete_action_prompt": "{count} deleted",
@@ -1238,7 +1224,6 @@
  "failed": "Failed",
  "failed_count": "Failed: {count}",
  "failed_to_authenticate": "Failed to authenticate",
-  "failed_to_delete_file": "Failed to delete file",
  "failed_to_load_assets": "Failed to load assets",
  "failed_to_load_folder": "Failed to load folder",
  "favorite": "Favorite",
@@ -1369,7 +1354,6 @@
  "individual_share": "Individual share",
  "individual_shares": "Individual shares",
  "info": "Info",
-  "integrity_checks": "Integrity Checks",
  "interval": {
    "day_at_onepm": "Every day at 1pm",
    "hours": "Every {hours, plural, one {hour} other {{hours, number} hours}}",
@@ -1442,7 +1426,6 @@
  "linked_oauth_account": "Linked OAuth account",
  "list": "List",
  "live": "Live",
-  "load_more": "Load More",
  "loading": "Loading",
  "loading_search_results_failed": "Loading search results failed",
  "local": "Local",
@@ -2101,7 +2084,6 @@
  "select_person": "Select person",
  "select_person_to_tag": "Select a person to tag",
  "select_photos": "Select photos",
-  "select_quality": "Select quality",
  "select_trash_all": "Select trash all",
  "select_user_for_sharing_page_err_album": "Failed to create album",
  "selected": "Selected",
@@ -2165,8 +2147,6 @@
  "share_assets_selected": "{count} selected",
  "share_dialog_preparing": "Preparing...",
  "share_link": "Share Link",
-  "share_original": "Use original (large)",
-  "share_preview": "Use thumbnail (small)",
  "shared": "Shared",
  "shared_album_activities_input_disable": "Comment is disabled",
  "shared_album_activity_remove_content": "Do you want to delete this activity?",
@@ -2268,7 +2248,6 @@
  "slideshow_repeat_description": "Loop back to beginning when slideshow ends",
  "slideshow_settings": "Slideshow settings",
  "smart_album": "Smart album",
-  "some_assets_already_have_a_location_warning": "Some of the selected assets already have a location",
  "sort_albums_by": "Sort albums by...",
  "sort_created": "Date created",
  "sort_items": "Number of items",
@@ -2436,6 +2415,7 @@
  "upload": "Upload",
  "upload_concurrency": "Upload concurrency",
  "upload_day_count": "{date}: {count, plural, one {# upload} other {# uploads}}",
+  "upload_deferred_edit_pair": "Waiting for the original photo, will retry automatically",
  "upload_details": "Upload Details",
  "upload_dialog_info": "Do you want to backup the selected Asset(s) to the server?",
  "upload_dialog_title": "Upload Asset",
@@ -48,14 +48,14 @@ FROM python:3.13-slim-trixie@sha256:b04b5d7233d2ad9c379e22ea8927cd1378cd15c60d4e

 RUN apt-get update && \
    apt-get install --no-install-recommends -yqq ocl-icd-libopencl1 wget && \
-    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.34.4/intel-igc-core-2_2.34.4+21428_amd64.deb && \
-    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.34.4/intel-igc-opencl-2_2.34.4+21428_amd64.deb && \
-    wget -nv https://github.com/intel/compute-runtime/releases/download/26.18.38308.1/intel-opencl-icd_26.18.38308.1-0_amd64.deb &&  \
+    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.32.7/intel-igc-core-2_2.32.7+21184_amd64.deb && \
+    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.32.7/intel-igc-opencl-2_2.32.7+21184_amd64.deb && \
+    wget -nv https://github.com/intel/compute-runtime/releases/download/26.14.37833.4/intel-opencl-icd_26.14.37833.4-0_amd64.deb &&  \
    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-core_1.0.17537.24_amd64.deb && \
    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-opencl_1.0.17537.24_amd64.deb && \
    wget -nv https://github.com/intel/compute-runtime/releases/download/24.35.30872.36/intel-opencl-icd-legacy1_24.35.30872.36_amd64.deb && \
    # TODO: Figure out how to get renovate to manage this differently versioned libigdgmm file
-    wget -nv https://github.com/intel/compute-runtime/releases/download/26.18.38308.1/libigdgmm12_22.10.0_amd64.deb && \
+    wget -nv https://github.com/intel/compute-runtime/releases/download/26.14.37833.4/libigdgmm12_22.9.0_amd64.deb && \
    dpkg -i *.deb && \
    rm *.deb && \
    apt-get remove wget -yqq && \
@@ -1,10 +1,9 @@
 #! /usr/bin/env node
-import { readFileSync, writeFileSync } from 'node:fs';
+const { readFileSync, writeFileSync } = require('node:fs');

 const asVersion = (item) => {
  const { label, url } = item;
-  const [version] = label.substring(1).split('-');
-  const [major, minor, patch] = version.split('.').map(Number);
+  const [major, minor, patch] = label.substring(1).split('.').map(Number);
  return { major, minor, patch, label, url };
 };

@@ -32,7 +31,7 @@ for (const item of versions) {
  ) {
    versions = versions.filter((item) => item.label !== version.label);
    console.log(
-      `Removed ${version.label} (replaced with ${lastVersion.label})`,
+      `Removed ${version.label} (replaced with ${lastVersion.label})`
    );
    continue;
  }
@@ -42,5 +41,5 @@ for (const item of versions) {

 writeFileSync(
  filename,
-  JSON.stringify([newVersion, ...versions], null, 2) + '\n',
+  JSON.stringify([newVersion, ...versions], null, 2) + '\n'
 );
@@ -3,14 +3,12 @@
 #
 # Pump one or both of the server/mobile versions in appropriate files
 #
-# usage: './scripts/pump-version.sh -s <minor|patch|premajor|preminor|prepatch|prerelease> <-m> <true|false>
+# usage: './scripts/pump-version.sh -s <major|minor|patch> <-m> <true|false>
 #
 # examples:
-#    ./scripts/pump-version.sh -s major            # 1.0.0+50 => 2.0.0+50
-#    ./scripts/pump-version.sh -s minor -m true    # 1.0.0+50 => 1.1.0+51
-#    ./scripts/pump-version.sh -s premajor         # 1.0.0+50 => 2.0.0-rc.0+50
-#    ./scripts/pump-version.sh -s prerelease       # 2.0.0-rc.0+50 => 2.0.0-rc.1+50
-#    ./scripts/pump-version.sh -m true             # 1.0.0+50 => 1.0.0+51
+#    ./scripts/pump-version.sh -s major         # 1.0.0+50 => 2.0.0+50
+#    ./scripts/pump-version.sh -s minor -m true # 1.0.0+50 => 1.1.0+51
+#    ./scripts/pump-version.sh -m true          # 1.0.0+50 => 1.0.0+51
 #

 SERVER_PUMP="false"
@@ -27,15 +25,31 @@ while getopts 's:m:' flag; do
  esac
 done

-CURRENT_SERVER=$(jq -r '.version' package.json)
-if ! NEXT_SERVER=$(pnpm --silent pump "$CURRENT_SERVER" "$SERVER_PUMP"); then
-  echo "Fatal: failed to pump server version: $NEXT_SERVER" >&2
+CURRENT_SERVER=$(jq -r '.version' server/package.json)
+MAJOR=$(echo "$CURRENT_SERVER" | cut -d '.' -f1)
+MINOR=$(echo "$CURRENT_SERVER" | cut -d '.' -f2)
+PATCH=$(echo "$CURRENT_SERVER" | cut -d '.' -f3)
+
+if [[ $SERVER_PUMP == "major" ]]; then
+  MAJOR=$((MAJOR + 1))
+  MINOR=0
+  PATCH=0
+elif [[ $SERVER_PUMP == "minor" ]]; then
+  MINOR=$((MINOR + 1))
+  PATCH=0
+elif [[ $SERVER_PUMP == "patch" ]]; then
+  PATCH=$((PATCH + 1))
+elif [[ $SERVER_PUMP == "false" ]]; then
+  echo 'Skipping Server Pump'
+else
+  echo 'Expected <major|minor|patch|false> for the server argument'
  exit 1
 fi

+NEXT_SERVER=$MAJOR.$MINOR.$PATCH
+
 CURRENT_MOBILE=$(grep "^version: .*+[0-9]\+$" mobile/pubspec.yaml | cut -d "+" -f2)
 NEXT_MOBILE=$CURRENT_MOBILE
-
 if [[ $MOBILE_PUMP == "true" ]]; then
  set $((NEXT_MOBILE++))
 elif [[ $MOBILE_PUMP == "false" ]]; then
@@ -45,17 +59,15 @@ else
  exit 1
 fi

-
-
 if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; then
  echo "Pumping Server: $CURRENT_SERVER => $NEXT_SERVER"

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

  # copy version to open-api spec
  mise run //:open-api
@@ -1,7 +0,0 @@
-import { pump } from './pump.js';
-
-const [versionRaw, type] = process.argv.slice(2);
-const { message, exitCode } = pump(versionRaw, type);
-
-console.log(message);
-process.exit(exitCode);
@@ -1,105 +0,0 @@
-import semver, { SemVer } from 'semver';
-
-const printUsage = () => {
-  return {
-    message:
-      'Usage: ./pump_cli.js <semver> <minor|patch|premajor|preminor|prepatch|prerelease|release>',
-    exitCode: 1,
-  };
-};
-
-const isPrerelease = (version) => version.prerelease.length > 0;
-
-/**
- * @param {SemVer} version
- * @returns {boolean}
- */
-const inc = (version, type) => `v${semver.inc(version, type, {}, 'rc')}`;
-
-/** @param {string} version */
-const normalize = (version) => {
-  if (version.startsWith('v')) {
-    version = version.slice(1);
-  }
-
-  return version;
-};
-
-/**
- * @param {string} versionRaw
- * @param {string} type
- */
-export const pump = (versionRaw, type) => {
-  if (!versionRaw) {
-    return printUsage();
-  }
-
-  versionRaw = normalize(versionRaw);
-
-  const version = semver.parse(versionRaw);
-  if (!version) {
-    return printUsage();
-  }
-
-  let newVersionRaw;
-  let valid = true;
-
-  switch (type) {
-    case 'patch':
-    case 'prepatch':
-    case 'minor':
-    case 'preminor':
-    case 'premajor': {
-      newVersionRaw = inc(version, type);
-      // can only use while not in a prerelease
-      valid = !isPrerelease(version);
-      break;
-    }
-
-    case 'prerelease': {
-      newVersionRaw = inc(version, type);
-      // can only use while in a prerelease
-      valid = isPrerelease(version);
-      break;
-    }
-
-    case 'release': {
-      // drop prerelease part
-      newVersionRaw = `${version.major}.${version.minor}.${version.patch}`;
-      // can only use to promote a prerelease to a release (no version change)
-      valid = isPrerelease(version);
-      break;
-    }
-
-    default: {
-      return printUsage();
-    }
-  }
-
-  if (!newVersionRaw) {
-    return printUsage();
-  }
-
-  newVersionRaw = normalize(newVersionRaw);
-
-  const newVersion = semver.parse(newVersionRaw);
-  if (!newVersion) {
-    return printUsage();
-  }
-
-  const invalidUpgrade =
-    isPrerelease(version) &&
-    !isPrerelease(newVersion) &&
-    (version.major !== newVersion.major ||
-      version.minor !== newVersion.minor ||
-      version.patch !== newVersion.patch);
-
-  if (!valid || invalidUpgrade) {
-    return {
-      message: `Invalid pump: ${type}. Pumping from ${versionRaw} to ${newVersionRaw} is not allowed.`,
-      exitCode: 1,
-    };
-  }
-
-  return { message: newVersionRaw, exitCode: 0 };
-};
@@ -1,87 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { pump } from './pump';
-
-describe(pump.name, () => {
-  describe('usage', () => {
-    it.each([
-      [],
-      ['2.7.5'],
-      ['2.7.5', 'invalid'],
-      ['invalid', 'patch'],
-      ['2.7.5', 'major'],
-    ])('should not accept $0, $1 as inputs', (version, type) => {
-      expect(pump(version, type)).toEqual({
-        message: expect.stringContaining('Usage: '),
-        exitCode: 1,
-      });
-    });
-  });
-
-  describe('transitions', () => {
-    const valid = [
-      {
-        name: 'patch',
-        items: [['patch', '2.7.5', '2.7.6']],
-      },
-      {
-        name: 'prepatch',
-        items: [
-          ['prepatch', '2.7.5', '2.7.6-rc.0'],
-          ['prerelease', '2.7.6-rc.0', '2.7.6-rc.1'],
-          ['release', '2.7.6-rc.1', '2.7.6'],
-        ],
-      },
-      {
-        name: 'minor',
-        items: [['minor', '2.7.5', '2.8.0']],
-      },
-      {
-        name: 'preminor',
-        items: [
-          ['preminor', '2.7.5', '2.8.0-rc.0'],
-          ['prerelease', '2.8.0-rc.0', '2.8.0-rc.1'],
-          ['release', '2.8.0-rc.1', '2.8.0'],
-        ],
-      },
-      {
-        name: 'premajor',
-        items: [
-          ['premajor', '2.7.5', '3.0.0-rc.0'],
-          ['prerelease', '3.0.0-rc.0', '3.0.0-rc.1'],
-          ['release', '3.0.0-rc.1', '3.0.0'],
-        ],
-      },
-    ];
-
-    for (const group of valid) {
-      describe(group.name, () => {
-        it.each(group.items)(
-          'should allow a $0 from $1 to $2',
-          (type, version, next) => {
-            expect(pump(version, type)).toEqual({
-              message: next,
-              exitCode: 0,
-            });
-          },
-        );
-      });
-    }
-
-    describe('invalid', () => {
-      it.each([
-        ['patch', 'v3.0.0-rc.0'],
-        ['prepatch', 'v3.0.0-rc.0'],
-        ['minor', 'v3.0.0-rc.0'],
-        ['preminor', 'v3.0.0-rc.0'],
-        ['premajor', 'v3.0.0-rc.0'],
-        ['prerelease', 'v3.0.0'],
-        ['release', 'v3.0.0'],
-      ])('should not allow a $0 on $1', (type, version) => {
-        expect(pump(version, type)).toEqual({
-          message: expect.stringContaining('Invalid pump'),
-          exitCode: 1,
-        });
-      });
-    });
-  });
-});
@@ -82,8 +82,40 @@ url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353224133"
 version = "7.1.3-6"
 backend = "github:jellyfin/jellyfin-ffmpeg"

-[tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_linuxarm64-gpl.tar.xz"
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64"]
+checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64-musl"]
+checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-x64"]
+checksum = "sha256:39e99a7927468a6abec5f65d00f55010e8ff2ae3c2605294f179c94f6ae21af2"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linux64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048879"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-x64-musl"]
+checksum = "sha256:39e99a7927468a6abec5f65d00f55010e8ff2ae3c2605294f179c94f6ae21af2"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linux64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048879"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-arm64"]
+checksum = "sha256:e024d5e78d5414e75f0181036cd21373fafb9270c72894dfd7dbda2572439820"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_macarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995838"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-x64"]
+checksum = "sha256:066ede9774aaae97a18098aaeea8b7e0d286653eb8618f640476e99c59a536c2"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_mac64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995889"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.windows-x64"]
+checksum = "sha256:7b7168149689610296f3a187c717056ce0786cc125a31caf28056737e9ba1cc1"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_win64-clang-gpl.zip"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409036094"

 [[tools."github:webassembly/binaryen"]]
 version = "version_124"
@@ -124,30 +156,6 @@ checksum = "sha256:b5e1d2a1ad3c03229ddc89823848f4a1c11f9c6402a51fa26f0aaa5f1d7a2
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-windows.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288925833"

-[[tools.java]]
-version = "21.0.2"
-backend = "core:java"
-
-[tools.java."platforms.linux-arm64"]
-checksum = "sha256:08db1392a48d4eb5ea5315cf8f18b89dbaf36cda663ba882cf03c704c9257ec2"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-aarch64_bin.tar.gz"
-
-[tools.java."platforms.linux-x64"]
-checksum = "sha256:a2def047a73941e01a73739f92755f86b895811afb1f91243db214cff5bdac3f"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz"
-
-[tools.java."platforms.macos-arm64"]
-checksum = "sha256:b3d588e16ec1e0ef9805d8a696591bd518a5cea62567da8f53b5ce32d11d22e4"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-aarch64_bin.tar.gz"
-
-[tools.java."platforms.macos-x64"]
-checksum = "sha256:8fd09e15dc406387a0aba70bf5d99692874e999bf9cd9208b452b5d76ac922d3"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-x64_bin.tar.gz"
-
-[tools.java."platforms.windows-x64"]
-checksum = "sha256:b6c17e747ae78cdd6de4d7532b3164b277daee97c007d3eaa2b39cca99882664"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip"
-
 [[tools.node]]
 version = "24.15.0"
 backend = "core:node"
@@ -217,38 +225,36 @@ checksum = "sha256:27323f70c875b8251bfd7e61a4cffc3ebff4e56ed1e611b955016f0c70773
 url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_windows_amd64.tar.gz"

 [[tools.pnpm]]
-version = "11.4.0"
+version = "10.33.4"
 backend = "aqua:pnpm/pnpm"

 [tools.pnpm."platforms.linux-arm64"]
-checksum = "sha256:cc38ebd5b2610a5744f84576b963c49e6609a8df5aed714ae3de749998d4478c"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-arm64.tar.gz"
-provenance = "github-attestations"
+checksum = "sha256:d29649c7380b5cd522f574208fbd35335846686498f45004604d3f5b8658b5cb"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-linux-arm64"

 [tools.pnpm."platforms.linux-arm64-musl"]
-checksum = "sha256:a1e2ec9123c709fd04b704227cfcf3b50cd2bbbc1bd39d2df414530b5697eb75"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-arm64-musl.tar.gz"
-provenance = "github-attestations"
+checksum = "sha256:d29649c7380b5cd522f574208fbd35335846686498f45004604d3f5b8658b5cb"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-linux-arm64"

 [tools.pnpm."platforms.linux-x64"]
-checksum = "sha256:f3f8d1217eef013bbc71a24d52efb1f1041e4aff55edd80e0b08e25f409305a4"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-x64.tar.gz"
-provenance = "github-attestations"
+checksum = "sha256:ff1795595535a10d0dfe327303f3dd02377be141190b1f5756de68edde2cf813"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-linux-x64"

 [tools.pnpm."platforms.linux-x64-musl"]
-checksum = "sha256:60010ad00a96b71e20d1618acaca7a71395e710cbd5e88946c030a1d07c56916"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-x64-musl.tar.gz"
-provenance = "github-attestations"
+checksum = "sha256:ff1795595535a10d0dfe327303f3dd02377be141190b1f5756de68edde2cf813"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-linux-x64"

 [tools.pnpm."platforms.macos-arm64"]
-checksum = "sha256:ba59014c2c1ce8b76af9f559385206a2623de4ff2b694b5c91598a8f44abb4e2"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-darwin-arm64.tar.gz"
-provenance = "github-attestations"
+checksum = "sha256:7aae186a04e1ffaa0047d43cd07d68a98dec303304f28be52234ba955d26c671"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-macos-arm64"
+
+[tools.pnpm."platforms.macos-x64"]
+checksum = "sha256:3b0c97b9f794cdda293949a8ee0e0151ca08f512f4a832408386221c7c73eec6"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-macos-x64"

 [tools.pnpm."platforms.windows-x64"]
-checksum = "sha256:84ce90e38bc0b1164173eb853a0fbffc7edcb050cb0d5c8ce4ca609f5c808e0a"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-win32-x64.zip"
-provenance = "github-attestations"
+checksum = "sha256:3268b2f29defe0dce8a3a26c0ef01488f0d4aa4872923173186ef618ab7d68ef"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-win-x64.exe"

 [[tools.terragrunt]]
 version = "1.0.3"
@@ -16,14 +16,13 @@ config_roots = [

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

 [tools."github:jellyfin/jellyfin-ffmpeg"]
 version = "7.1.3-6"
@@ -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,82 @@ data class CloudIdResult (
    return result
  }
 }
+
+/** Generated class from Pigeon that represents data sent in messages. */
+data class BaseResource (
+  val path: String,
+  val sha1: String
+)
+ {
+  companion object {
+    fun fromList(pigeonVar_list: List<Any?>): BaseResource {
+      val path = pigeonVar_list[0] as String
+      val sha1 = pigeonVar_list[1] as String
+      return BaseResource(path, sha1)
+    }
+  }
+  fun toList(): List<Any?> {
+    return listOf(
+      path,
+      sha1,
+    )
+  }
+  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)
+  }
+
+  override fun hashCode(): Int {
+    var result = javaClass.hashCode()
+    result = 31 * result + MessagesPigeonUtils.deepHash(this.path)
+    result = 31 * result + MessagesPigeonUtils.deepHash(this.sha1)
+    return result
+  }
+}
+
+/** Generated class from Pigeon that represents data sent in messages. */
+data class BaseLivePhoto (
+  val still: BaseResource,
+  val video: BaseResource? = null
+)
+ {
+  companion object {
+    fun fromList(pigeonVar_list: List<Any?>): BaseLivePhoto {
+      val still = pigeonVar_list[0] as BaseResource
+      val video = pigeonVar_list[1] as BaseResource?
+      return BaseLivePhoto(still, video)
+    }
+  }
+  fun toList(): List<Any?> {
+    return listOf(
+      still,
+      video,
+    )
+  }
+  override fun equals(other: Any?): Boolean {
+    if (other == null || other.javaClass != javaClass) {
+      return false
+    }
+    if (this === other) {
+      return true
+    }
+    val other = other as BaseLivePhoto
+    return MessagesPigeonUtils.deepEquals(this.still, other.still) && MessagesPigeonUtils.deepEquals(this.video, other.video)
+  }
+
+  override fun hashCode(): Int {
+    var result = javaClass.hashCode()
+    result = 31 * result + MessagesPigeonUtils.deepHash(this.still)
+    result = 31 * result + MessagesPigeonUtils.deepHash(this.video)
+    return result
+  }
+}
 private open class MessagesPigeonCodec : StandardMessageCodec() {
  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
    return when (type) {
@@ -481,30 +569,45 @@ 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)
+        }
+      }
+      137.toByte() -> {
+        return (readValue(buffer) as? List<Any?>)?.let {
+          BaseLivePhoto.fromList(it)
+        }
+      }
      else -> super.readValueOfType(type, buffer)
    }
  }
@@ -514,26 +617,38 @@ 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())
+      }
+      is BaseLivePhoto -> {
+        stream.write(137)
+        writeValue(stream, value.toList())
+      }
      else -> super.writeValue(stream, value)
    }
  }
@@ -556,6 +671,9 @@ 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)
+  fun getBaseLivePhoto(assetId: String, allowNetworkAccess: Boolean, callback: (Result<BaseLivePhoto?>) -> Unit)

  companion object {
    /** The codec used by NativeSyncApi. */
@@ -818,6 +936,69 @@ 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)
+        }
+      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getBaseLivePhoto$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.getBaseLivePhoto(assetIdArg, allowNetworkAccessArg) { result: Result<BaseLivePhoto?> ->
+              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)
+        }
+      }
    }
  }
 }
@@ -509,4 +509,19 @@ 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) {
+    completeWhenActive(callback, Result.success(null))
+  }
+
+  // iOS-only; Android assets never carry a Photos-style edit.
+  fun getEditState(assetId: String, allowNetworkAccess: Boolean, callback: (Result<EditState>) -> Unit) {
+    completeWhenActive(callback, Result.success(EditState.NOT_EDITED))
+  }
+
+  // iOS-only; Android assets never carry a Photos-style live edit.
+  fun getBaseLivePhoto(assetId: String, allowNetworkAccess: Boolean, callback: (Result<BaseLivePhoto?>) -> Unit) {
+    completeWhenActive(callback, Result.success(null))
+  }
 }
@@ -610,6 +610,26 @@
              "dart_expr": "const EnumIndexConverter<AssetPlaybackStyle>(AssetPlaybackStyle.values)",
              "dart_type_name": "AssetPlaybackStyle"
            }
+          },
+          {
+            "name": "prior_remote_id",
+            "getter_name": "priorRemoteId",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "synced_checksum",
+            "getter_name": "syncedChecksum",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
          }
        ],
        "is_virtual": false,
@@ -1009,6 +1029,20 @@
    },
    {
      "id": 11,
+      "references": [
+        3
+      ],
+      "type": "index",
+      "data": {
+        "on": 3,
+        "name": "idx_local_asset_prior_remote_id",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_local_asset_prior_remote_id ON local_asset_entity (prior_remote_id)",
+        "unique": false,
+        "columns": []
+      }
+    },
+    {
+      "id": 12,
      "references": [
        2
      ],
@@ -1022,7 +1056,7 @@
      }
    },
    {
-      "id": 12,
+      "id": 13,
      "references": [
        1
      ],
@@ -1036,7 +1070,7 @@
      }
    },
    {
-      "id": 13,
+      "id": 14,
      "references": [
        1
      ],
@@ -1050,7 +1084,7 @@
      }
    },
    {
-      "id": 14,
+      "id": 15,
      "references": [
        1
      ],
@@ -1064,7 +1098,7 @@
      }
    },
    {
-      "id": 15,
+      "id": 16,
      "references": [
        1
      ],
@@ -1078,7 +1112,7 @@
      }
    },
    {
-      "id": 16,
+      "id": 17,
      "references": [
        1
      ],
@@ -1092,7 +1126,7 @@
      }
    },
    {
-      "id": 17,
+      "id": 18,
      "references": [],
      "type": "table",
      "data": {
@@ -1222,7 +1256,7 @@
      }
    },
    {
-      "id": 18,
+      "id": 19,
      "references": [
        0
      ],
@@ -1297,7 +1331,7 @@
      }
    },
    {
-      "id": 19,
+      "id": 20,
      "references": [
        0
      ],
@@ -1384,7 +1418,7 @@
      }
    },
    {
-      "id": 20,
+      "id": 21,
      "references": [
        1
      ],
@@ -1640,7 +1674,7 @@
      }
    },
    {
-      "id": 21,
+      "id": 22,
      "references": [
        1,
        4
@@ -1714,7 +1748,7 @@
      }
    },
    {
-      "id": 22,
+      "id": 23,
      "references": [
        4,
        0
@@ -1802,7 +1836,7 @@
      }
    },
    {
-      "id": 23,
+      "id": 24,
      "references": [
        1
      ],
@@ -1898,7 +1932,7 @@
      }
    },
    {
-      "id": 24,
+      "id": 25,
      "references": [
        0
      ],
@@ -2062,10 +2096,10 @@
      }
    },
    {
-      "id": 25,
+      "id": 26,
      "references": [
        1,
-        24
+        25
      ],
      "type": "table",
      "data": {
@@ -2136,7 +2170,7 @@
      }
    },
    {
-      "id": 26,
+      "id": 27,
      "references": [
        0
      ],
@@ -2280,10 +2314,10 @@
      }
    },
    {
-      "id": 27,
+      "id": 28,
      "references": [
        1,
-        26
+        27
      ],
      "type": "table",
      "data": {
@@ -2457,7 +2491,7 @@
      }
    },
    {
-      "id": 28,
+      "id": 29,
      "references": [],
      "type": "table",
      "data": {
@@ -2505,7 +2539,7 @@
      }
    },
    {
-      "id": 29,
+      "id": 30,
      "references": [],
      "type": "table",
      "data": {
@@ -2680,7 +2714,7 @@
      }
    },
    {
-      "id": 30,
+      "id": 31,
      "references": [
        1
      ],
@@ -2774,7 +2808,7 @@
      }
    },
    {
-      "id": 31,
+      "id": 32,
      "references": [],
      "type": "table",
      "data": {
@@ -2795,7 +2829,7 @@
            "name": "value",
            "getter_name": "value",
            "moor_type": "string",
-            "nullable": true,
+            "nullable": false,
            "customConstraints": null,
            "default_dart": null,
            "default_client_dart": null,
@@ -2822,7 +2856,7 @@
      }
    },
    {
-      "id": 32,
+      "id": 33,
      "references": [
        1
      ],
@@ -3001,20 +3035,6 @@
        ]
      }
    },
-    {
-      "id": 33,
-      "references": [
-        19
-      ],
-      "type": "index",
-      "data": {
-        "on": 19,
-        "name": "idx_partner_shared_with_id",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)",
-        "unique": false,
-        "columns": []
-      }
-    },
    {
      "id": 34,
      "references": [
@@ -3023,8 +3043,8 @@
      "type": "index",
      "data": {
        "on": 20,
-        "name": "idx_lat_lng",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)",
+        "name": "idx_partner_shared_with_id",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)",
        "unique": false,
        "columns": []
      }
@@ -3032,13 +3052,13 @@
    {
      "id": 35,
      "references": [
-        20
+        21
      ],
      "type": "index",
      "data": {
-        "on": 20,
-        "name": "idx_remote_exif_city",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_exif_city\nON remote_exif_entity (city) WHERE city IS NOT NULL\n",
+        "on": 21,
+        "name": "idx_lat_lng",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)",
        "unique": false,
        "columns": []
      }
@@ -3051,8 +3071,8 @@
      "type": "index",
      "data": {
        "on": 21,
-        "name": "idx_remote_album_asset_album_asset",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)",
+        "name": "idx_remote_exif_city",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_exif_city\nON remote_exif_entity (city) WHERE city IS NOT NULL\n",
        "unique": false,
        "columns": []
      }
@@ -3060,13 +3080,13 @@
    {
      "id": 37,
      "references": [
-        23
+        22
      ],
      "type": "index",
      "data": {
-        "on": 23,
-        "name": "idx_remote_asset_cloud_id",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)",
+        "on": 22,
+        "name": "idx_remote_album_asset_album_asset",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)",
        "unique": false,
        "columns": []
      }
@@ -3074,13 +3094,13 @@
    {
      "id": 38,
      "references": [
-        26
+        24
      ],
      "type": "index",
      "data": {
-        "on": 26,
-        "name": "idx_person_owner_id",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)",
+        "on": 24,
+        "name": "idx_remote_asset_cloud_id",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)",
        "unique": false,
        "columns": []
      }
@@ -3093,8 +3113,8 @@
      "type": "index",
      "data": {
        "on": 27,
-        "name": "idx_asset_face_person_id",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)",
+        "name": "idx_person_owner_id",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)",
        "unique": false,
        "columns": []
      }
@@ -3102,13 +3122,13 @@
    {
      "id": 40,
      "references": [
-        27
+        28
      ],
      "type": "index",
      "data": {
-        "on": 27,
-        "name": "idx_asset_face_asset_id",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)",
+        "on": 28,
+        "name": "idx_asset_face_person_id",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)",
        "unique": false,
        "columns": []
      }
@@ -3116,13 +3136,13 @@
    {
      "id": 41,
      "references": [
-        27
+        28
      ],
      "type": "index",
      "data": {
-        "on": 27,
-        "name": "idx_asset_face_visible_person",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person\nON asset_face_entity (person_id, asset_id)\nWHERE is_visible = 1 AND deleted_at IS NULL\n",
+        "on": 28,
+        "name": "idx_asset_face_asset_id",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)",
        "unique": false,
        "columns": []
      }
@@ -3130,13 +3150,13 @@
    {
      "id": 42,
      "references": [
-        29
+        28
      ],
      "type": "index",
      "data": {
-        "on": 29,
-        "name": "idx_trashed_local_asset_checksum",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)",
+        "on": 28,
+        "name": "idx_asset_face_visible_person",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person\nON asset_face_entity (person_id, asset_id)\nWHERE is_visible = 1 AND deleted_at IS NULL\n",
        "unique": false,
        "columns": []
      }
@@ -3144,13 +3164,13 @@
    {
      "id": 43,
      "references": [
-        29
+        30
      ],
      "type": "index",
      "data": {
-        "on": 29,
-        "name": "idx_trashed_local_asset_album",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)",
+        "on": 30,
+        "name": "idx_trashed_local_asset_checksum",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)",
        "unique": false,
        "columns": []
      }
@@ -3163,8 +3183,8 @@
      "type": "index",
      "data": {
        "on": 30,
-        "name": "idx_asset_edit_asset_id",
-        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)",
+        "name": "idx_trashed_local_asset_album",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)",
        "unique": false,
        "columns": []
      }
@@ -3172,11 +3192,25 @@
    {
      "id": 45,
      "references": [
-        32
+        31
      ],
      "type": "index",
      "data": {
-        "on": 32,
+        "on": 31,
+        "name": "idx_asset_edit_asset_id",
+        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)",
+        "unique": false,
+        "columns": []
+      }
+    },
+    {
+      "id": 46,
+      "references": [
+        33
+      ],
+      "type": "index",
+      "data": {
+        "on": 33,
        "name": "idx_asset_ocr_asset_id",
        "sql": "CREATE INDEX IF NOT EXISTS idx_asset_ocr_asset_id ON asset_ocr_entity (asset_id)",
        "unique": false,
@@ -3217,7 +3251,7 @@
      "sql": [
        {
          "dialect": "sqlite",
-          "sql": "CREATE TABLE IF NOT EXISTS \"local_asset_entity\" (\"name\" TEXT NOT NULL, \"type\" INTEGER NOT NULL, \"created_at\" TEXT NOT NULL DEFAULT (CURRENT_TIMESTAMP), \"updated_at\" TEXT NOT NULL DEFAULT (CURRENT_TIMESTAMP), \"width\" INTEGER NULL, \"height\" INTEGER NULL, \"duration_ms\" INTEGER NULL, \"id\" TEXT NOT NULL, \"checksum\" TEXT NULL, \"is_favorite\" INTEGER NOT NULL DEFAULT 0 CHECK (\"is_favorite\" IN (0, 1)), \"orientation\" INTEGER NOT NULL DEFAULT 0, \"i_cloud_id\" TEXT NULL, \"adjustment_time\" TEXT NULL, \"latitude\" REAL NULL, \"longitude\" REAL NULL, \"playback_style\" INTEGER NOT NULL DEFAULT 0, PRIMARY KEY (\"id\")) WITHOUT ROWID, STRICT;"
+          "sql": "CREATE TABLE IF NOT EXISTS \"local_asset_entity\" (\"name\" TEXT NOT NULL, \"type\" INTEGER NOT NULL, \"created_at\" TEXT NOT NULL DEFAULT (CURRENT_TIMESTAMP), \"updated_at\" TEXT NOT NULL DEFAULT (CURRENT_TIMESTAMP), \"width\" INTEGER NULL, \"height\" INTEGER NULL, \"duration_ms\" INTEGER NULL, \"id\" TEXT NOT NULL, \"checksum\" TEXT NULL, \"is_favorite\" INTEGER NOT NULL DEFAULT 0 CHECK (\"is_favorite\" IN (0, 1)), \"orientation\" INTEGER NOT NULL DEFAULT 0, \"i_cloud_id\" TEXT NULL, \"adjustment_time\" TEXT NULL, \"latitude\" REAL NULL, \"longitude\" REAL NULL, \"playback_style\" INTEGER NOT NULL DEFAULT 0, \"prior_remote_id\" TEXT NULL, \"synced_checksum\" TEXT NULL, PRIMARY KEY (\"id\")) WITHOUT ROWID, STRICT;"
        }
      ]
    },
@@ -3284,6 +3318,15 @@
        }
      ]
    },
+    {
+      "name": "idx_local_asset_prior_remote_id",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE INDEX IF NOT EXISTS idx_local_asset_prior_remote_id ON local_asset_entity (prior_remote_id)"
+        }
+      ]
+    },
    {
      "name": "idx_stack_primary_asset_id",
      "sql": [
@@ -3469,7 +3512,7 @@
      "sql": [
        {
          "dialect": "sqlite",
-          "sql": "CREATE TABLE IF NOT EXISTS \"settings\" (\"key\" TEXT NOT NULL, \"value\" TEXT NULL, \"updated_at\" TEXT NOT NULL DEFAULT (CURRENT_TIMESTAMP), PRIMARY KEY (\"key\")) WITHOUT ROWID, STRICT;"
+          "sql": "CREATE TABLE IF NOT EXISTS \"settings\" (\"key\" TEXT NOT NULL, \"value\" TEXT NOT NULL, \"updated_at\" TEXT NOT NULL DEFAULT (CURRENT_TIMESTAMP), PRIMARY KEY (\"key\")) WITHOUT ROWID, STRICT;"
        }
      ]
    },
@@ -40,7 +40,7 @@ void main() {
  tearDown(() async {
    await workerManagerPatch.dispose();
    await server.close();
-    await Store.delete(StoreKey.legacyServerEndpoint);
+    await Store.delete(StoreKey.serverEndpoint);
    await Store.delete(StoreKey.syncMigrationStatus);
  });

@@ -119,9 +119,7 @@ void main() {
    final releaseTxn = Completer<void>();
    final txnHeld = Completer<void>();
    final txn = drift.transaction(() async {
-      await drift
-          .into(drift.userEntity)
-          .insert(
+      await drift.into(drift.userEntity).insert(
            UserEntityCompanion.insert(
              id: 'holder',
              name: 'holder',
@@ -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,78 @@ struct CloudIdResult: Hashable {
  }
 }

+/// Generated class from Pigeon that represents data sent in messages.
+struct BaseResource: Hashable {
+  var path: String
+  var sha1: 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
+
+    return BaseResource(
+      path: path,
+      sha1: sha1
+    )
+  }
+  func toList() -> [Any?] {
+    return [
+      path,
+      sha1,
+    ]
+  }
+  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)
+  }
+
+  func hash(into hasher: inout Hasher) {
+    hasher.combine("BaseResource")
+    deepHashMessages(value: path, hasher: &hasher)
+    deepHashMessages(value: sha1, hasher: &hasher)
+  }
+}
+
+/// Generated class from Pigeon that represents data sent in messages.
+struct BaseLivePhoto: Hashable {
+  var still: BaseResource
+  var video: BaseResource? = nil
+
+
+  // swift-format-ignore: AlwaysUseLowerCamelCase
+  static func fromList(_ pigeonVar_list: [Any?]) -> BaseLivePhoto? {
+    let still = pigeonVar_list[0] as! BaseResource
+    let video: BaseResource? = nilOrValue(pigeonVar_list[1])
+
+    return BaseLivePhoto(
+      still: still,
+      video: video
+    )
+  }
+  func toList() -> [Any?] {
+    return [
+      still,
+      video,
+    ]
+  }
+  static func == (lhs: BaseLivePhoto, rhs: BaseLivePhoto) -> Bool {
+    if Swift.type(of: lhs) != Swift.type(of: rhs) {
+      return false
+    }
+    return deepEqualsMessages(lhs.still, rhs.still) && deepEqualsMessages(lhs.video, rhs.video)
+  }
+
+  func hash(into hasher: inout Hasher) {
+    hasher.combine("BaseLivePhoto")
+    deepHashMessages(value: still, hasher: &hasher)
+    deepHashMessages(value: video, hasher: &hasher)
+  }
+}
+
 private class MessagesPigeonCodecReader: FlutterStandardReader {
  override func readValue(ofType type: UInt8) -> Any? {
    switch type {
@@ -468,15 +546,25 @@ 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?])
+    case 137:
+      return BaseLivePhoto.fromList(self.readValue() as! [Any?])
    default:
      return super.readValue(ofType: type)
    }
@@ -488,21 +576,30 @@ 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 if let value = value as? BaseLivePhoto {
+      super.writeByte(137)
+      super.writeValue(value.toList())
    } else {
      super.writeValue(value)
    }
@@ -540,6 +637,9 @@ 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)
+  func getBaseLivePhoto(assetId: String, allowNetworkAccess: Bool, completion: @escaping (Result<BaseLivePhoto?, Error>) -> Void)
 }

 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
@@ -773,5 +873,65 @@ 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)
+    }
+    let getBaseLivePhotoChannel = taskQueue == nil
+      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getBaseLivePhoto\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getBaseLivePhoto\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
+    if let api = api {
+      getBaseLivePhotoChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let assetIdArg = args[0] as! String
+        let allowNetworkAccessArg = args[1] as! Bool
+        api.getBaseLivePhoto(assetId: assetIdArg, allowNetworkAccess: allowNetworkAccessArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      getBaseLivePhotoChannel.setMessageHandler(nil)
+    }
  }
 }
@@ -1,5 +1,6 @@
 import Photos
 import CryptoKit
+import UniformTypeIdentifiers

 struct AssetWrapper: Hashable, Equatable {
  let asset: PlatformAsset
@@ -476,4 +477,302 @@ 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 }
+
+      do {
+        guard let originals = try await Self.originalsForEditedAsset(assetId, allowNetworkAccess: allowNetworkAccess)
+        else {
+          return self.completeWhenActive(for: completion, with: .success(nil))
+        }
+        let result = try await self.streamBaseResource(
+          resource: originals.still,
+          localId: assetId,
+          allowNetworkAccess: allowNetworkAccess
+        )
+        self.completeWhenActive(for: completion, with: .success(result))
+      } catch {
+        self.completeWhenActive(for: completion, with: .failure(error))
+      }
+    }
+  }
+
+  // Reads both readable originals of an edited live photo (still + paired video) so the
+  // backup can upload the unedited pair and stack the edit onto it. Same edited-only gate
+  // as getBaseResource. video is nil when the asset has no paired video left to recover
+  // (e.g. the edit turned Live off); the still temp is removed if the video read fails.
+  func getBaseLivePhoto(
+    assetId: String,
+    allowNetworkAccess: Bool,
+    completion: @escaping (Result<BaseLivePhoto?, Error>) -> Void
+  ) {
+    Task { [weak self] in
+      guard let self = self else { return }
+
+      do {
+        guard let originals = try await Self.originalsForEditedAsset(assetId, allowNetworkAccess: allowNetworkAccess)
+        else {
+          return self.completeWhenActive(for: completion, with: .success(nil))
+        }
+        let still = try await self.streamBaseResource(
+          resource: originals.still,
+          localId: assetId,
+          allowNetworkAccess: allowNetworkAccess
+        )
+        var video: BaseResource? = nil
+        if let videoRes = originals.video {
+          do {
+            video = try await self.streamBaseResource(
+              resource: videoRes,
+              localId: assetId,
+              allowNetworkAccess: allowNetworkAccess
+            )
+          } catch {
+            try? FileManager.default.removeItem(atPath: still.path)
+            throw error
+          }
+        }
+        self.completeWhenActive(for: completion, with: .success(BaseLivePhoto(still: still, video: video)))
+      } 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
+
+  // Idle deadline for the base-resource reads: cancel only after this long with no
+  // data received, so a stalled iCloud fetch can't hang the backup forever but a
+  // big original on a slow link keeps downloading as long as chunks flow.
+  private static let kBaseReadTimeoutSeconds: Double = 120
+
+  private final class ResourceRequestRef {
+    var id: PHAssetResourceDataRequestID?
+    // Written from the resource callback queue, read from the deadline timer;
+    // unsynchronized on purpose — the read below clamps, so the worst case is
+    // the timer re-arming one extra round.
+    var lastActivity = DispatchTime.now()
+  }
+
+  // Re-arming watchdog: fires after `delay`, cancels if nothing arrived for a full
+  // timeout window, otherwise re-arms for the remainder of the window.
+  private static func armIdleDeadline(_ ref: ResourceRequestRef, after delay: Double = kBaseReadTimeoutSeconds) {
+    DispatchQueue.global().asyncAfter(deadline: .now() + delay) {
+      guard let id = ref.id else { return }
+      let nowNs = DispatchTime.now().uptimeNanoseconds
+      let lastNs = ref.lastActivity.uptimeNanoseconds
+      // lastActivity can race ahead of the captured now; treat that as activity.
+      let idle = nowNs > lastNs ? Double(nowNs - lastNs) / 1_000_000_000 : 0
+      if idle >= kBaseReadTimeoutSeconds {
+        PHAssetResourceManager.default().cancelDataRequest(id)
+      } else {
+        armIdleDeadline(ref, after: kBaseReadTimeoutSeconds - idle)
+      }
+    }
+  }
+
+  // Shared gate for the base readers: fetch the asset, classify the edit from its
+  // adjustment metadata, and pick the original resources. nil = positively nothing
+  // to recover (missing asset, not edited, or no readable original still). An
+  // unreadable plist throws instead — that's "can't tell right now", and Dart
+  // defers the asset rather than uploading the edit standalone for good.
+  private static func originalsForEditedAsset(
+    _ assetId: String,
+    allowNetworkAccess: Bool
+  ) async throws -> (still: PHAssetResource, video: PHAssetResource?)? {
+    guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [assetId], options: nil).firstObject else {
+      return nil
+    }
+    let resources = PHAssetResource.assetResources(for: asset)
+    let state = await classifyEdit(resources: resources, allowNetworkAccess: allowNetworkAccess)
+    if state == .unknown {
+      throw PigeonError(
+        code: "unknownEditState",
+        message: "Could not read adjustment metadata for \(assetId)",
+        details: nil
+      )
+    }
+    guard state == .edited, let still = originalStillResource(resources) else {
+      return nil
+    }
+    return (still, originalPairedVideoResource(resources))
+  }
+
+  // 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
+  }
+
+  // The unedited original still, told apart from the edited "current" render by isCurrent.
+  // Prefer the non-current .photo; fall back to the .adjustmentBasePhoto flavor some
+  // creation-API / third-party-editor layouts use for the unaltered source (their .photo
+  // IS the edited render, so this must come before the bare .photo net); last, a lone
+  // .photo for single-resource assets or a failed isCurrent read.
+  private static func originalStillResource(_ resources: [PHAssetResource]) -> PHAssetResource? {
+    return resources.first(where: { $0.type == .photo && !$0.isCurrent })
+      ?? resources.first(where: { $0.type == .adjustmentBasePhoto })
+      ?? resources.first(where: { $0.type == .photo })
+  }
+
+  // The unedited original paired video, same isCurrent / adjustment-base ordering as the
+  // still. nil when the asset carries no paired video (not live, or Live turned off).
+  private static func originalPairedVideoResource(_ resources: [PHAssetResource]) -> PHAssetResource? {
+    return resources.first(where: { $0.type == .pairedVideo && !$0.isCurrent })
+      ?? resources.first(where: { $0.type == .adjustmentBasePairedVideo })
+      ?? resources.first(where: { $0.type == .pairedVideo })
+  }
+
+  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"
+    // Library/Caches, not tmp: the chain can span launches and clearCache wipes
+    // tmp at the start of every upload run. Swept by clearEditBaseCache instead.
+    let cacheRoot =
+      FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first
+      ?? URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
+    let tempDir = cacheRoot.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 {
+      try? FileManager.default.removeItem(at: tempUrl)
+      throw PigeonError(
+        code: "baseResourceWriteFailed",
+        message: "Failed to open temp file for base resource \(localId)",
+        details: nil
+      )
+    }
+
+    var hasher = Insecure.SHA1()
+    let options = PHAssetResourceRequestOptions()
+    options.isNetworkAccessAllowed = allowNetworkAccess
+
+    // Deadline + cancellation so a stalled iCloud read can't hang the backup forever;
+    // a write failure also cancels right away instead of draining the download for nothing.
+    let requestRef = ResourceRequestRef()
+    let succeeded = await withCheckedContinuation { (continuation: CheckedContinuation<Bool, Never>) in
+      var writeFailed = false
+      requestRef.id = PHAssetResourceManager.default().requestData(
+        for: resource,
+        options: options,
+        dataReceivedHandler: { chunk in
+          requestRef.lastActivity = DispatchTime.now()
+          if writeFailed { return }
+          do {
+            try handle.write(contentsOf: chunk)
+            hasher.update(data: chunk)
+          } catch {
+            writeFailed = true
+            if let id = requestRef.id {
+              PHAssetResourceManager.default().cancelDataRequest(id)
+            }
+          }
+        },
+        completionHandler: { error in
+          requestRef.id = nil
+          continuation.resume(returning: error == nil && !writeFailed)
+        }
+      )
+      Self.armIdleDeadline(requestRef)
+    }
+
+    try? handle.close()
+
+    guard succeeded else {
+      try? FileManager.default.removeItem(at: tempUrl)
+      throw PigeonError(
+        code: "baseResourceReadFailed",
+        message: "Failed to read base resource for \(localId)",
+        details: nil
+      )
+    }
+
+    let sha1 = Data(hasher.finalize()).base64EncodedString()
+    return BaseResource(path: tempUrl.path, sha1: sha1)
+  }
+
+  private static func collectResourceData(
+    _ resource: PHAssetResource,
+    allowNetworkAccess: Bool
+  ) async -> Data? {
+    let options = PHAssetResourceRequestOptions()
+    options.isNetworkAccessAllowed = allowNetworkAccess
+    var buffer = Data()
+    let requestRef = ResourceRequestRef()
+    return await withCheckedContinuation { (continuation: CheckedContinuation<Data?, Never>) in
+      requestRef.id = PHAssetResourceManager.default().requestData(
+        for: resource,
+        options: options,
+        dataReceivedHandler: { data in
+          requestRef.lastActivity = DispatchTime.now()
+          buffer.append(data)
+        },
+        completionHandler: { error in
+          requestRef.id = nil
+          continuation.resume(returning: error == nil ? buffer : nil)
+        }
+      )
+      armIdleDeadline(requestRef)
+    }
+  }
+
 }
@@ -20,6 +20,16 @@ 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';
+
+// Upload multipart 'visibility' value for motion videos (server AssetVisibility.Hidden)
+// so they never flash onto the timeline before their still links them.
+const String kHiddenVisibility = 'hidden';
+
+// Server's 400 message when stackParentId points at a trashed/deleted asset
+// (asset-media.service.ts). Matching it clears the stale prior stamps so the
+// next backup cycle re-resolves instead of looping on the same dead id.
+const String kDeadStackParentError = 'Cannot stack onto a trashed or missing asset';
 const String kDownloadGroupImage = 'group_image';
 const String kDownloadGroupVideo = 'group_video';
 const String kDownloadGroupLivePhoto = 'group_livephoto';
@@ -13,8 +13,6 @@ enum AssetVisibilityEnum { timeline, hidden, archive, locked }

 enum ActionSource { timeline, viewer }

-enum ShareAssetType { original, preview }
-
 enum CleanupStep { selectDate, scan, delete }

 enum AssetKeepType { none, photosOnly, videosOnly }
@@ -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,
    );
  }
 }
@@ -13,6 +13,11 @@ class RemoteAsset extends BaseAsset {
  final DateTime? uploadedAt;
  final DateTime? deletedAt;

+  // The linked local's current checksum. Differs from [checksum] when the link
+  // came via priorRemoteId (the local re-encoded on device, e.g. a revert); local
+  // renders are cache-keyed by this so on-device changes aren't shown stale.
+  final String? localChecksum;
+
  const RemoteAsset({
    required this.id,
    String? localId,
@@ -33,6 +38,7 @@ class RemoteAsset extends BaseAsset {
    this.stackId,
    required super.isEdited,
    this.deletedAt,
+    this.localChecksum,
  }) : localAssetId = localId;

  @override
@@ -91,7 +97,8 @@ class RemoteAsset extends BaseAsset {
        visibility == other.visibility &&
        stackId == other.stackId &&
        uploadedAt == other.uploadedAt &&
-        deletedAt == other.deletedAt;
+        deletedAt == other.deletedAt &&
+        localChecksum == other.localChecksum;
  }

  @override
@@ -104,7 +111,8 @@ class RemoteAsset extends BaseAsset {
      visibility.hashCode ^
      stackId.hashCode ^
      uploadedAt.hashCode ^
-      deletedAt.hashCode;
+      deletedAt.hashCode ^
+      localChecksum.hashCode;

  RemoteAsset copyWith({
    String? id,
@@ -126,6 +134,7 @@ class RemoteAsset extends BaseAsset {
    String? stackId,
    bool? isEdited,
    DateTime? deletedAt,
+    String? localChecksum,
  }) {
    return RemoteAsset(
      id: id ?? this.id,
@@ -147,6 +156,7 @@ class RemoteAsset extends BaseAsset {
      stackId: stackId ?? this.stackId,
      isEdited: isEdited ?? this.isEdited,
      deletedAt: deletedAt ?? this.deletedAt,
+      localChecksum: localChecksum ?? this.localChecksum,
    );
  }
 }
@@ -174,6 +184,7 @@ class RemoteAssetExif extends RemoteAsset {
    super.livePhotoVideoId,
    super.stackId,
    super.isEdited = false,
+    super.localChecksum,
    this.exifInfo = const ExifInfo(),
  });

@@ -212,6 +223,7 @@ class RemoteAssetExif extends RemoteAsset {
    String? livePhotoVideoId,
    String? stackId,
    bool? isEdited,
+    String? localChecksum,
    ExifInfo? exifInfo,
  }) {
    return RemoteAssetExif(
@@ -234,6 +246,7 @@ class RemoteAssetExif extends RemoteAsset {
      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
      stackId: stackId ?? this.stackId,
      isEdited: isEdited ?? this.isEdited,
+      localChecksum: localChecksum ?? this.localChecksum,
      exifInfo: exifInfo ?? this.exifInfo, // Use the new parameter
    );
  }
@@ -7,7 +7,6 @@ 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/share_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';
@@ -31,7 +30,6 @@ class AppConfig {
  final AlbumConfig album;
  final BackupConfig backup;
  final NetworkConfig network;
-  final ShareConfig share;

  const AppConfig({
    this.logLevel = .info,
@@ -45,7 +43,6 @@ class AppConfig {
    this.album = const .new(),
    this.backup = const .new(),
    this.network = const .new(),
-    this.share = const .new(),
  });

  AppConfig copyWith({
@@ -60,7 +57,6 @@ class AppConfig {
    AlbumConfig? album,
    BackupConfig? backup,
    NetworkConfig? network,
-    ShareConfig? share,
  }) => .new(
    logLevel: logLevel ?? this.logLevel,
    theme: theme ?? this.theme,
@@ -73,7 +69,6 @@ class AppConfig {
    album: album ?? this.album,
    backup: backup ?? this.backup,
    network: network ?? this.network,
-    share: share ?? this.share,
  );

  @override
@@ -90,18 +85,17 @@ class AppConfig {
          other.slideshow == slideshow &&
          other.album == album &&
          other.backup == backup &&
-          other.network == network &&
-          other.share == share);
+          other.network == network);

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

  @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, share: $share)';
+      '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>(SettingsKey<T> key) =>
+  T read<T extends Object>(SettingsKey<T> key) =>
      (switch (key) {
            .logLevel => logLevel,
            .themePrimaryColor => theme.primaryColor,
@@ -141,7 +135,6 @@ class AppConfig {
            .cleanupKeepAlbumIds => cleanup.keepAlbumIds,
            .cleanupCutoffDaysAgo => cleanup.cutoffDaysAgo,
            .cleanupDefaultsInitialized => cleanup.defaultsInitialized,
-            .shareFileType => share.fileType,
            .slideshowTransition => slideshow.transition,
            .slideshowRepeat => slideshow.repeat,
            .slideshowDuration => slideshow.duration,
@@ -150,10 +143,10 @@ class AppConfig {
          })
          as T;

-  factory AppConfig.fromEntries(Map<SettingsKey, Object?> overrides) =>
+  factory AppConfig.fromEntries(Map<SettingsKey<Object>, Object> overrides) =>
      overrides.entries.fold(const AppConfig(), (config, entry) => config.write(entry.key, entry.value));

-  AppConfig write<T, U extends T>(SettingsKey<T> key, U value) {
+  AppConfig write<T extends Object>(SettingsKey<T> key, T value) {
    return switch (key) {
      .logLevel => copyWith(logLevel: value as LogLevel),
      .themePrimaryColor => copyWith(theme: theme.copyWith(primaryColor: value as ImmichColorPreset)),
@@ -167,10 +160,8 @@ class AppConfig {
      .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: .fromNullable((value as String?))),
-      ),
-      .networkLocalEndpoint => copyWith(network: network.copyWith(localEndpoint: .fromNullable((value as String?)))),
+      .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)),
@@ -195,7 +186,6 @@ class AppConfig {
      .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)),
-      .shareFileType => copyWith(share: share.copyWith(fileType: value as ShareAssetType)),
      .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)),
@@ -1,31 +1,30 @@
 import 'package:flutter/foundation.dart';
-import 'package:immich_mobile/utils/option.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 {},
  });

  NetworkConfig copyWith({
    bool? autoEndpointSwitching,
-    Option<String>? preferredWifiName,
-    Option<String>? localEndpoint,
+    String? preferredWifiName,
+    String? localEndpoint,
    List<String>? externalEndpointList,
    Map<String, String>? customHeaders,
  }) => NetworkConfig(
    autoEndpointSwitching: autoEndpointSwitching ?? this.autoEndpointSwitching,
-    preferredWifiName: preferredWifiName.patch(this.preferredWifiName),
-    localEndpoint: localEndpoint.patch(this.localEndpoint),
+    preferredWifiName: preferredWifiName ?? this.preferredWifiName,
+    localEndpoint: localEndpoint ?? this.localEndpoint,
    externalEndpointList: externalEndpointList ?? this.externalEndpointList,
    customHeaders: customHeaders ?? this.customHeaders,
  );
@@ -1,18 +0,0 @@
-import 'package:immich_mobile/constants/enums.dart';
-
-class ShareConfig {
-  final ShareAssetType fileType;
-
-  const ShareConfig({this.fileType = ShareAssetType.original});
-
-  ShareConfig copyWith({ShareAssetType? fileType}) => ShareConfig(fileType: fileType ?? this.fileType);
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || (other is ShareConfig && other.fileType == fileType);
-
-  @override
-  int get hashCode => fileType.hashCode;
-
-  @override
-  String toString() => 'ShareConfig(fileType: $fileType)';
-}
@@ -1,63 +0,0 @@
-import 'package:immich_mobile/domain/models/value_codec.dart';
-import 'package:immich_mobile/utils/option.dart';
-
-enum SessionKey<T> {
-  serverUrl<String?>(),
-  accessToken<String?>(),
-  serverEndpoint<String?>();
-
-  ValueCodec<T> get _codec => ValueCodec.forType(T);
-
-  String encode(T value) => _codec.encode(value);
-
-  T decode(String raw) => _codec.decode(raw);
-}
-
-const defaultSession = Session();
-
-class Session {
-  final String? serverUrl;
-  final String? accessToken;
-  final String? serverEndpoint;
-
-  const Session({this.serverUrl, this.accessToken, this.serverEndpoint});
-
-  Session copyWith({Option<String>? serverUrl, Option<String>? accessToken, Option<String>? serverEndpoint}) => .new(
-    serverUrl: serverUrl.patch(this.serverUrl),
-    accessToken: accessToken.patch(this.accessToken),
-    serverEndpoint: serverEndpoint.patch(this.serverEndpoint),
-  );
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is Session &&
-          other.serverUrl == serverUrl &&
-          other.accessToken == accessToken &&
-          other.serverEndpoint == serverEndpoint);
-
-  @override
-  int get hashCode => Object.hash(serverUrl, accessToken, serverEndpoint);
-
-  @override
-  String toString() => 'Session(serverUrl: $serverUrl, accessToken: $accessToken, serverEndpoint: $serverEndpoint)';
-
-  T read<T>(SessionKey<T> key) =>
-      (switch (key) {
-            .serverUrl => serverUrl,
-            .accessToken => accessToken,
-            .serverEndpoint => serverEndpoint,
-          })
-          as T;
-
-  factory Session.fromEntries(Map<SessionKey, Object?> overrides) =>
-      overrides.entries.fold(const Session(), (session, entry) => session.write(entry.key, entry.value));
-
-  Session write<T, U extends T>(SessionKey<T> key, U value) {
-    return switch (key) {
-      .serverUrl => copyWith(serverUrl: .fromNullable(value as String?)),
-      .accessToken => copyWith(accessToken: .fromNullable(value as String?)),
-      .serverEndpoint => copyWith(serverEndpoint: .fromNullable(value as String?)),
-    };
-  }
-}
@@ -1,15 +1,16 @@
+import 'dart:convert';
+
 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/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
-import 'package:immich_mobile/domain/models/value_codec.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';

-enum SettingsKey<T> {
+enum SettingsKey<T extends Object> {
  // Theme
-  themePrimaryColor<ImmichColorPreset>(codec: EnumCodec(ImmichColorPreset.values)),
-  themeMode<ThemeMode>(codec: EnumCodec(ThemeMode.values)),
+  themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
+  themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
  themeDynamic<bool>(),
  themeColorfulInterface<bool>(),

@@ -25,13 +26,13 @@ enum SettingsKey<T> {

  // Network
  networkAutoEndpointSwitching<bool>(),
-  networkExternalEndpointList<List<String>>(codec: ListCodec(PrimitiveCodec.string)),
-  networkCustomHeaders<Map<String, String>>(codec: MapCodec(PrimitiveCodec.string, PrimitiveCodec.string)),
-  networkPreferredWifiName<String?>(),
-  networkLocalEndpoint<String?>(),
+  networkPreferredWifiName<String>(),
+  networkLocalEndpoint<String>(),
+  networkExternalEndpointList<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
+  networkCustomHeaders<Map<String, String>>(codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string)),

  // Album
-  albumSortMode<AlbumSortMode>(codec: EnumCodec(AlbumSortMode.values)),
+  albumSortMode<AlbumSortMode>(codec: _EnumCodec(AlbumSortMode.values)),
  albumIsReverse<bool>(),
  albumIsGrid<bool>(),

@@ -45,43 +46,172 @@ enum SettingsKey<T> {

  // Timeline
  timelineTilesPerRow<int>(),
-  timelineGroupAssetsBy<GroupAssetsBy>(codec: EnumCodec(GroupAssetsBy.values)),
+  timelineGroupAssetsBy<GroupAssetsBy>(codec: _EnumCodec(GroupAssetsBy.values)),
  timelineStorageIndicator<bool>(),

  // Log
-  logLevel<LogLevel>(codec: EnumCodec(LogLevel.values)),
+  logLevel<LogLevel>(codec: _EnumCodec(LogLevel.values)),

  // Map
  mapShowFavoriteOnly<bool>(),
  mapRelativeDate<int>(),
  mapIncludeArchived<bool>(),
-  mapThemeMode<ThemeMode>(codec: EnumCodec(ThemeMode.values)),
+  mapThemeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
  mapWithPartners<bool>(),

  // Cleanup
  cleanupKeepFavorites<bool>(),
-  cleanupKeepMediaType<AssetKeepType>(codec: EnumCodec(AssetKeepType.values)),
-  cleanupKeepAlbumIds<List<String>>(codec: ListCodec(PrimitiveCodec.string)),
+  cleanupKeepMediaType<AssetKeepType>(codec: _EnumCodec(AssetKeepType.values)),
+  cleanupKeepAlbumIds<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
  cleanupCutoffDaysAgo<int>(),
  cleanupDefaultsInitialized<bool>(),

-  // Share
-  shareFileType<ShareAssetType>(codec: EnumCodec(ShareAssetType.values)),
-
  // Slideshow
  slideshowTransition<bool>(),
  slideshowRepeat<bool>(),
  slideshowDuration<int>(),
-  slideshowLook<SlideshowLook>(codec: EnumCodec(SlideshowLook.values)),
-  slideshowDirection<SlideshowDirection>(codec: EnumCodec(SlideshowDirection.values));
+  slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
+  slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values));

-  final ValueCodec<T>? _codecOverride;
+  final _SettingsCodec<T>? _codecOverride;

-  const SettingsKey({ValueCodec<T>? codec}) : _codecOverride = codec;
+  const SettingsKey({_SettingsCodec<T>? codec}) : _codecOverride = codec;

-  ValueCodec<T> get _codec => _codecOverride ?? ValueCodec.forType(T);
+  _SettingsCodec<T> get _codec => _codecOverride ?? _SettingsCodec.forType(T);

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

  T decode(String raw) => _codec.decode(raw);
 }
+
+sealed class _SettingsCodec<T extends Object> {
+  const _SettingsCodec();
+
+  String encode(T value);
+  T decode(String raw);
+
+  static const Map<Type, _SettingsCodec<Object>> _primitives = {
+    int: _PrimitiveCodec.integer,
+    double: _PrimitiveCodec.real,
+    bool: _PrimitiveCodec.boolean,
+    String: _PrimitiveCodec.string,
+    DateTime: _DateTimeCodec(),
+  };
+
+  static _SettingsCodec<T> forType<T extends Object>(Type runtimeType) {
+    final codec = _primitives[runtimeType];
+    if (codec == null) {
+      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the SettingsKey.');
+    }
+    return codec as _SettingsCodec<T>;
+  }
+}
+
+final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
+  final List<T> values;
+
+  const _EnumCodec(this.values);
+
+  @override
+  String encode(T value) => value.name;
+
+  @override
+  T decode(String raw) => values.firstWhere((v) => v.name == raw);
+}
+
+final class _DateTimeCodec extends _SettingsCodec<DateTime> {
+  const _DateTimeCodec();
+
+  @override
+  String encode(DateTime value) => value.toIso8601String();
+
+  @override
+  DateTime decode(String raw) => DateTime.parse(raw);
+}
+
+final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec<Map<K, V>> {
+  final _SettingsCodec<K> _keyCodec;
+  final _SettingsCodec<V> _valueCodec;
+
+  const _MapCodec(this._keyCodec, this._valueCodec);
+
+  @override
+  String encode(Map<K, V> value) {
+    final entries = <String, String>{};
+    value.forEach((k, v) => entries[_keyCodec.encode(k)] = _valueCodec.encode(v));
+    return jsonEncode(entries);
+  }
+
+  @override
+  Map<K, V> decode(String raw) {
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! Map) {
+        return {};
+      }
+      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 {};
+        }
+        final k = _keyCodec.decode(rawKey);
+        final v = _valueCodec.decode(rawValue);
+        result[k] = v;
+      }
+      return result;
+    } on FormatException {
+      return {};
+    }
+  }
+}
+
+final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
+  final _SettingsCodec<T> _elementCodec;
+
+  const _ListCodec(this._elementCodec);
+
+  @override
+  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
+
+  @override
+  List<T> decode(String raw) {
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! List) {
+        return [];
+      }
+      final result = <T>[];
+      for (final item in decoded) {
+        if (item is! String) {
+          return [];
+        }
+        final element = _elementCodec.decode(item);
+        result.add(element);
+      }
+      return result;
+    } on FormatException {
+      return [];
+    }
+  }
+}
+
+final class _PrimitiveCodec<T extends Object> extends _SettingsCodec<T> {
+  final T Function(String) _parse;
+
+  const _PrimitiveCodec._(this._parse);
+
+  @override
+  String encode(T value) => value.toString();
+
+  @override
+  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 string = _PrimitiveCodec<String>._(_identity);
+
+  static String _identity(String s) => s;
+}
@@ -1,8 +1,14 @@
+import 'package:immich_mobile/domain/models/user.model.dart';
+
 /// Key for each possible value in the `Store`.
 /// Defines the data type for each value
 enum StoreKey<T> {
  version<int>._(0),
+  currentUser<UserDto>._(2),
  deviceId<String>._(4),
+  serverUrl<String>._(10),
+  accessToken<String>._(11),
+  serverEndpoint<String>._(12),
  advancedTroubleshooting<bool>._(114),
  enableHapticFeedback<bool>._(126),

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

  // Legacy keys that have been migrated to the new metadata store
-  legacyServerUrl<String>._(10),
-  legacyAccessToken<String>._(11),
-  legacyServerEndpoint<String>._(12),
  legacyBackupRequireCharging<bool>._(7),
  legacyBackupTriggerDelay<int>._(8),
  legacySyncAlbums<bool>._(131),
@@ -1,141 +0,0 @@
-import 'dart:convert';
-
-sealed class ValueCodec<T> {
-  const ValueCodec();
-
-  String encode(T value);
-  T decode(String raw);
-
-  static final Map<Type, ValueCodec<Object>> _primitives = {
-    ..._register<int>(PrimitiveCodec.integer),
-    ..._register<double>(PrimitiveCodec.real),
-    ..._register<bool>(PrimitiveCodec.boolean),
-    ..._register<String>(PrimitiveCodec.string),
-    ..._register<DateTime>(const DateTimeCodec()),
-  };
-
-  static Map<Type, ValueCodec<Object>> _register<T>(ValueCodec<Object> codec) => {
-    T: codec,
-    // Reifies the nullable type T so it can be used as a key in the _primitives map
-    _typeOf<T?>(): codec,
-  };
-
-  static Type _typeOf<T>() => T;
-
-  static ValueCodec<T> forType<T>(Type runtimeType) {
-    final codec = _primitives[runtimeType];
-    if (codec == null) {
-      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the key.');
-    }
-    return codec as ValueCodec<T>;
-  }
-}
-
-final class EnumCodec<T extends Enum> extends ValueCodec<T> {
-  final List<T> values;
-
-  const EnumCodec(this.values);
-
-  @override
-  String encode(T value) => value.name;
-
-  @override
-  T decode(String raw) => values.firstWhere((v) => v.name == raw);
-}
-
-final class DateTimeCodec extends ValueCodec<DateTime> {
-  const DateTimeCodec();
-
-  @override
-  String encode(DateTime value) => value.toIso8601String();
-
-  @override
-  DateTime decode(String raw) => DateTime.parse(raw);
-}
-
-final class MapCodec<K extends Object, V extends Object> extends ValueCodec<Map<K, V>> {
-  final ValueCodec<K> _keyCodec;
-  final ValueCodec<V> _valueCodec;
-
-  const MapCodec(this._keyCodec, this._valueCodec);
-
-  @override
-  String encode(Map<K, V> value) {
-    final entries = <String, String>{};
-    value.forEach((k, v) => entries[_keyCodec.encode(k)] = _valueCodec.encode(v));
-    return jsonEncode(entries);
-  }
-
-  @override
-  Map<K, V> decode(String raw) {
-    try {
-      final decoded = jsonDecode(raw);
-      if (decoded is! Map) {
-        return {};
-      }
-      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) {
-          continue;
-        }
-        final k = _keyCodec.decode(rawKey);
-        final v = _valueCodec.decode(rawValue);
-        result[k] = v;
-      }
-      return result;
-    } on FormatException {
-      return {};
-    }
-  }
-}
-
-final class ListCodec<T extends Object> extends ValueCodec<List<T>> {
-  final ValueCodec<T> _elementCodec;
-
-  const ListCodec(this._elementCodec);
-
-  @override
-  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
-
-  @override
-  List<T> decode(String raw) {
-    try {
-      final decoded = jsonDecode(raw);
-      if (decoded is! List) {
-        return [];
-      }
-      final result = <T>[];
-      for (final item in decoded) {
-        if (item is! String) {
-          return [];
-        }
-        final element = _elementCodec.decode(item);
-        result.add(element);
-      }
-      return result;
-    } on FormatException {
-      return [];
-    }
-  }
-}
-
-final class PrimitiveCodec<T extends Object> extends ValueCodec<T> {
-  final T Function(String) _parse;
-
-  const PrimitiveCodec._(this._parse);
-
-  @override
-  String encode(T value) => value.toString();
-
-  @override
-  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 string = PrimitiveCodec<String>._(_identity);
-
-  static String _identity(String s) => s;
-}
@@ -0,0 +1,95 @@
+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 this._nativeSyncApi,
+    required this._stackRepository,
+    required this._localAssetRepository,
+    required this._assetApiRepository,
+  });
+
+  /// Returns the remote id the stack cover was flipped back to when the asset
+  /// was a revert and was handled (caller skips the upload and can report that
+  /// id); null to fall through to the normal upload path.
+  Future<String?> tryHandleRevert(LocalAsset asset) async {
+    if (asset.priorRemoteId == null) {
+      return null;
+    }
+
+    // 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)
+          .timeout(const Duration(seconds: 30));
+      if (editState != EditState.notEdited) {
+        return null;
+      }
+    } catch (error, stack) {
+      _log.warning("edit-state probe failed for ${asset.id}", error, stack);
+      return null;
+    }
+
+    // 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 null;
+      }
+      final base = await _stackRepository.findStackBaseId(foundStack, excludeId: asset.priorRemoteId!);
+      if (base == null) {
+        return null;
+      }
+      stackId = foundStack;
+      baseId = base;
+    } catch (error, stack) {
+      _log.warning("revert stack lookup failed for ${asset.id}", error, stack);
+      return null;
+    }
+
+    try {
+      await _assetApiRepository.setStackPrimary(stackId, baseId);
+    } catch (error, stack) {
+      _log.warning("revert primary flip failed for ${asset.id}", error, stack);
+      return null;
+    }
+
+    // The server flip is what makes the revert handled. If the local writes fail,
+    // falling through would upload the reverted render as a brand-new edit — the
+    // opposite of the user's action — so log and let checkpoint sync heal local state.
+    try {
+      await _stackRepository.setPrimary(stackId, baseId);
+      await _localAssetRepository.markSynced(asset.id, priorRemoteId: baseId, syncedChecksum: asset.checksum);
+    } catch (error, stack) {
+      _log.warning("revert local reconcile failed for ${asset.id}", error, stack);
+    }
+
+    return baseId;
+  }
+}
@@ -7,8 +7,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";
@@ -20,6 +22,8 @@ class HashService {
  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
  final NativeSyncApi _nativeSyncApi;
  final Completer<void>? _cancellation;
+  final DriftStackRepository _stackRepository;
+  final AssetApiRepository _assetApiRepository;
  final _log = Logger('HashService');

  HashService({
@@ -28,6 +32,8 @@ class HashService {
    required this._trashedLocalAssetRepository,
    required this._nativeSyncApi,
    this._cancellation,
+    required this._stackRepository,
+    required this._assetApiRepository,
    int? batchSize,
  }) : _batchSize = batchSize ?? kBatchHashFileLimit {
    // Stop the in-flight native hash call promptly on cancellation; the loops
@@ -66,6 +72,17 @@ class HashService {
          await _hashAssets(pseudoAlbum, trashedToHash, isTrashed: true);
        }
      }
+
+      // 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). Runs every cycle, not just when something
+      // hashed: a flip that failed (offline at hash time) has no second hash to ride,
+      // and the stack-driven target query is cheap and self-limiting.
+      if (CurrentPlatform.isIOS && !isCancelled) {
+        await _reconcileReverts();
+      }
    } on PlatformException catch (e) {
      if (e.code == _kHashCancelledCode) {
        _log.warning("Hashing cancelled by platform");
@@ -143,4 +160,30 @@ class HashService {
      await _localAssetRepository.updateHashes(hashed);
    }
  }
+
+  Future<void> _reconcileReverts() async {
+    final List<StackReconcileTarget> targets;
+    try {
+      targets = await _stackRepository.findRevertReconcileTargets();
+    } 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);
+      }
+    }
+  }
 }
@@ -8,6 +8,7 @@ import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
+import 'package:immich_mobile/utils/option.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:logging/logging.dart';
@@ -137,7 +138,7 @@ class RemoteAlbumService {
  Future<RemoteAlbum> updateAlbum(
    String albumId, {
    String? name,
-    String? description,
+    Option<String?> description = const Option.none(),
    String? thumbnailAssetId,
    bool? isActivityEnabled,
    AlbumAssetOrder? order,
@@ -2,12 +2,13 @@ import 'dart:async';

 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:logging/logging.dart';
@@ -17,7 +18,7 @@ final syncLinkedAlbumServiceProvider = Provider(
    ref.watch(localAlbumRepository),
    ref.watch(remoteAlbumRepository),
    ref.watch(driftAlbumApiRepositoryProvider),
-    ref.watch(authUserRepositoryProvider),
+    ref.watch(storeServiceProvider),
    cancellation: ref.watch(cancellationProvider),
  ),
 );
@@ -26,14 +27,14 @@ class SyncLinkedAlbumService {
  final DriftLocalAlbumRepository _localAlbumRepository;
  final DriftRemoteAlbumRepository _remoteAlbumRepository;
  final DriftAlbumApiRepository _albumApiRepository;
-  final DriftAuthUserRepository _authUserRepository;
+  final StoreService _storeService;
  final Completer<void>? _cancellation;

  SyncLinkedAlbumService(
    this._localAlbumRepository,
    this._remoteAlbumRepository,
    this._albumApiRepository,
-    this._authUserRepository, {
+    this._storeService, {
    this._cancellation,
  });

@@ -122,12 +123,11 @@ class SyncLinkedAlbumService {
  /// Creates a new remote album and links it to the local album
  Future<void> _createAndLinkNewRemoteAlbum(LocalAlbum localAlbum) async {
    dPrint(() => "Creating new remote album for local album: ${localAlbum.name}");
-    final currentUser = await _authUserRepository.get();
-    if (currentUser == null) {
-      _log.warning("No user logged in, skipping remote album creation for local album: ${localAlbum.name}");
-      return;
-    }
-    final newRemoteAlbum = await _albumApiRepository.createDriftAlbum(localAlbum.name, currentUser, assetIds: []);
+    final newRemoteAlbum = await _albumApiRepository.createDriftAlbum(
+      localAlbum.name,
+      _storeService.get(StoreKey.currentUser),
+      assetIds: [],
+    );
    await _remoteAlbumRepository.create(newRemoteAlbum, []);
    return _localAlbumRepository.linkRemoteAlbum(localAlbum.id, newRemoteAlbum.id);
  }
@@ -360,7 +360,7 @@ class SyncStreamService {
      }

      if (assets.isNotEmpty && exifs.isNotEmpty) {
-        await _syncStreamRepository.updateAssetsV1(assets, debugLabel: 'websocket-batch');
+        await _syncStreamRepository.updateAssetsV1(assets, debugLabel: 'websocket-batch', fromWebsocket: true);
        await _syncStreamRepository.updateAssetsExifV1(exifs, debugLabel: 'websocket-batch');
        _logger.info('Successfully processed ${assets.length} assets in batch');
      }
@@ -403,7 +403,7 @@ class SyncStreamService {
      }

      if (assets.isNotEmpty && exifs.isNotEmpty) {
-        await _syncStreamRepository.updateAssetsV2(assets, debugLabel: 'websocket-batch');
+        await _syncStreamRepository.updateAssetsV2(assets, debugLabel: 'websocket-batch', fromWebsocket: true);
        await _syncStreamRepository.updateAssetsExifV1(exifs, debugLabel: 'websocket-batch');
        _logger.info('Successfully processed ${assets.length} assets in batch');
      }
@@ -444,7 +444,7 @@ class SyncStreamService {
            .toList();
      }

-      await _syncStreamRepository.updateAssetsV1([asset], debugLabel: 'websocket-edit');
+      await _syncStreamRepository.updateAssetsV1([asset], debugLabel: 'websocket-edit', fromWebsocket: true);
      await _syncStreamRepository.replaceAssetEditsV1(asset.id, assetEdits, debugLabel: 'websocket-edit');

      _logger.info(
@@ -482,7 +482,7 @@ class SyncStreamService {
          .whereType<SyncAssetEditV1>()
          .toList();

-      await _syncStreamRepository.updateAssetsV2([asset], debugLabel: 'websocket-edit');
+      await _syncStreamRepository.updateAssetsV2([asset], debugLabel: 'websocket-edit', fromWebsocket: true);
      await _syncStreamRepository.replaceAssetEditsV1(asset.id, assetEdits, debugLabel: 'websocket-edit');

      _logger.info(
@@ -1,24 +1,29 @@
 import 'dart:async';
 import 'dart:typed_data';

+import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
+import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
 import 'package:logging/logging.dart';

 class UserService {
  final Logger _log = Logger("UserService");
  final UserApiRepository _userApiRepository;
-  final DriftAuthUserRepository _authUserRepository;
+  final StoreService _storeService;

-  UserService({required this._userApiRepository, required this._authUserRepository});
+  UserService({required this._userApiRepository, required this._storeService});

-  Future<UserDto?> tryGetMyUser() {
-    return _authUserRepository.get();
+  UserDto getMyUser() {
+    return _storeService.get(StoreKey.currentUser);
+  }
+
+  UserDto? tryGetMyUser() {
+    return _storeService.tryGet(StoreKey.currentUser);
  }

  Stream<UserDto?> watchMyUser() {
-    return _authUserRepository.watch();
+    return _storeService.watch(StoreKey.currentUser);
  }

  Future<UserDto?> refreshMyUser() async {
@@ -26,17 +31,15 @@ class UserService {
    if (user == null) {
      return null;
    }
-    await _authUserRepository.upsert(user);
+    await _storeService.put(StoreKey.currentUser, user);
    return user;
  }

  Future<String?> createProfileImage(String name, Uint8List image) async {
    try {
      final path = await _userApiRepository.createProfileImage(name: name, data: image);
-      final updatedUser = await tryGetMyUser();
-      if (updatedUser != null) {
-        await _authUserRepository.upsert(updatedUser);
-      }
+      final updatedUser = getMyUser();
+      await _storeService.put(StoreKey.currentUser, updatedUser);
      return path;
    } catch (e) {
      _log.warning("Failed to upload profile image", e);
@@ -160,6 +160,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;
@@ -1,13 +1,14 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
-import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:logging/logging.dart';

-Future<void> syncLinkedAlbumsIsolated(ProviderContainer ref) async {
-  final user = await ref.read(authUserRepositoryProvider).get();
+Future<void> syncLinkedAlbumsIsolated(ProviderContainer ref) {
+  final user = Store.tryGet(StoreKey.currentUser);
  if (user == null) {
    Logger("SyncLinkedAlbum").warning("No user logged in, skipping linked album sync");
-    return;
+    return Future.value();
  }
  return ref.read(syncLinkedAlbumServiceProvider).syncLinkedAlbums(user.id);
 }
@@ -1,15 +1,11 @@
 import 'dart:convert';

-import 'package:diacritic/diacritic.dart' as diacritic;
-
 extension StringExtension on String {
  String capitalize() {
    return split(" ").map((str) => str.isEmpty ? str : str[0].toUpperCase() + str.substring(1)).join(" ");
  }

  String? get nullIfEmpty => isEmpty ? null : this;
-
-  String removeDiacritics() => diacritic.removeDiacritics(this);
 }

 extension DurationExtension on String {
@@ -7,6 +7,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_created_at ON local_asset_entity (created_at)')
+@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();

@@ -28,6 +29,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};
 }
@@ -52,5 +61,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();
  }
@@ -1352,3 +1500,7 @@ i0.Index get idxLocalAssetCreatedAt => i0.Index(
  'idx_local_asset_created_at',
  'CREATE INDEX IF NOT EXISTS idx_local_asset_created_at ON local_asset_entity (created_at)',
 );
+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,
@@ -18,6 +24,12 @@ SELECT
 	rae.is_favorite,
 	rae.thumb_hash,
 	rae.checksum,
+	-- the linked local's current checksum (same row local_id picks), so local
+	-- renders are cache-keyed by the bytes on device, not the server value.
+	COALESCE(
+		(SELECT lae.checksum FROM local_asset_entity lae WHERE lae.checksum = rae.checksum LIMIT 1),
+		(SELECT lae.checksum FROM local_asset_entity lae WHERE lae.prior_remote_id = rae.id LIMIT 1)
+	) as local_checksum,
 	rae.owner_id,
 	rae.live_photo_video_id,
 	0 as orientation,
@@ -57,6 +69,7 @@ SELECT
 	lae.is_favorite,
 	NULL as thumb_hash,
 	lae.checksum,
+	lae.checksum as local_checksum,
 	NULL as owner_id,
 	NULL as live_photo_video_id,
 	lae.orientation,
@@ -83,6 +96,15 @@ 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 remote row), 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.
+-- A trashed prior still hides it — trashing on the server shouldn't pop the
+-- photo back onto the local timeline; only a hard delete (row gone) does.
+AND NOT EXISTS (
+	SELECT 1 FROM remote_asset_entity rae WHERE rae.id = lae.prior_remote_id AND rae.owner_id IN :user_ids
+)
 ORDER BY created_at DESC
 LIMIT $limit;

@@ -136,6 +158,11 @@ 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 remote
+	-- row (trashed included, same as the tile query above).
+	AND NOT EXISTS (
+		SELECT 1 FROM remote_asset_entity rae WHERE rae.id = lae.prior_remote_id AND rae.owner_id IN :user_ids
+	)
 )
 GROUP BY bucket_date
 ORDER BY bucket_date DESC;
@@ -29,7 +29,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
    );
    $arrayStartIndex += generatedlimit.amountOfVariables;
    return customSelect(
-      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_ms, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime, rae.is_edited, 0 AS playback_style, rae.uploaded_at FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_ms, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time, 0 AS is_edited, lae.playback_style, NULL AS uploaded_at FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) 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, COALESCE((SELECT lae.checksum FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1), (SELECT lae.checksum FROM local_asset_entity AS lae WHERE lae.prior_remote_id = rae.id LIMIT 1)) AS local_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, lae.checksum AS local_checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time, 0 AS is_edited, lae.playback_style, NULL AS uploaded_at FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) AND NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.id = lae.prior_remote_id AND rae.owner_id IN ($expandeduserIds)) ORDER BY created_at DESC ${generatedlimit.sql}',
      variables: [
        for (var $ in userIds) i0.Variable<String>($),
        ...generatedlimit.introducedVariables,
@@ -58,6 +58,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
        isFavorite: row.read<bool>('is_favorite'),
        thumbHash: row.readNullable<String>('thumb_hash'),
        checksum: row.readNullable<String>('checksum'),
+        localChecksum: row.readNullable<String>('local_checksum'),
        ownerId: row.readNullable<String>('owner_id'),
        livePhotoVideoId: row.readNullable<String>('live_photo_video_id'),
        orientation: row.read<int>('orientation'),
@@ -81,7 +82,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))) GROUP BY bucket_date ORDER BY bucket_date DESC',
      variables: [
        i0.Variable<int>(groupBy),
        for (var $ in userIds) i0.Variable<String>($),
@@ -132,6 +133,7 @@ class MergedAssetResult {
  final bool isFavorite;
  final String? thumbHash;
  final String? checksum;
+  final String? localChecksum;
  final String? ownerId;
  final String? livePhotoVideoId;
  final int orientation;
@@ -156,6 +158,7 @@ class MergedAssetResult {
    required this.isFavorite,
    this.thumbHash,
    this.checksum,
+    this.localChecksum,
    this.ownerId,
    this.livePhotoVideoId,
    required this.orientation,
@@ -55,6 +55,8 @@ class RemoteAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin
 }

 extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
+  // localId callers attach it via a checksum-equality join, so the local's
+  // bytes are the remote's — key local renders by the same checksum.
  RemoteAsset toDto({String? localId}) => RemoteAsset(
    id: id,
    name: name,
@@ -72,6 +74,7 @@ extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
    visibility: visibility,
    livePhotoVideoId: livePhotoVideoId,
    localId: localId,
+    localChecksum: localId == null ? null : checksum,
    stackId: stackId,
    isEdited: isEdited,
    deletedAt: deletedAt,
@@ -1,18 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
-
-class SessionEntity extends Table with DriftDefaultsMixin {
-  const SessionEntity();
-
-  TextColumn get key => text()();
-
-  TextColumn get value => text().nullable()();
-
-  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
-
-  @override
-  Set<Column> get primaryKey => {key};
-
-  @override
-  String get tableName => "session";
-}
@@ -1,427 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart'
-    as i1;
-import 'package:immich_mobile/infrastructure/entities/session.entity.dart'
-    as i2;
-import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
-
-typedef $$SessionEntityTableCreateCompanionBuilder =
-    i1.SessionEntityCompanion Function({
-      required String key,
-      i0.Value<String?> value,
-      i0.Value<DateTime> updatedAt,
-    });
-typedef $$SessionEntityTableUpdateCompanionBuilder =
-    i1.SessionEntityCompanion Function({
-      i0.Value<String> key,
-      i0.Value<String?> value,
-      i0.Value<DateTime> updatedAt,
-    });
-
-class $$SessionEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SessionEntityTable> {
-  $$SessionEntityTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnFilters<String> get key => $composableBuilder(
-    column: $table.key,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<String> get value => $composableBuilder(
-    column: $table.value,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
-    column: $table.updatedAt,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-}
-
-class $$SessionEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SessionEntityTable> {
-  $$SessionEntityTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnOrderings<String> get key => $composableBuilder(
-    column: $table.key,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<String> get value => $composableBuilder(
-    column: $table.value,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
-    column: $table.updatedAt,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-}
-
-class $$SessionEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SessionEntityTable> {
-  $$SessionEntityTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.GeneratedColumn<String> get key =>
-      $composableBuilder(column: $table.key, builder: (column) => column);
-
-  i0.GeneratedColumn<String> get value =>
-      $composableBuilder(column: $table.value, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get updatedAt =>
-      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
-}
-
-class $$SessionEntityTableTableManager
-    extends
-        i0.RootTableManager<
-          i0.GeneratedDatabase,
-          i1.$SessionEntityTable,
-          i1.SessionEntityData,
-          i1.$$SessionEntityTableFilterComposer,
-          i1.$$SessionEntityTableOrderingComposer,
-          i1.$$SessionEntityTableAnnotationComposer,
-          $$SessionEntityTableCreateCompanionBuilder,
-          $$SessionEntityTableUpdateCompanionBuilder,
-          (
-            i1.SessionEntityData,
-            i0.BaseReferences<
-              i0.GeneratedDatabase,
-              i1.$SessionEntityTable,
-              i1.SessionEntityData
-            >,
-          ),
-          i1.SessionEntityData,
-          i0.PrefetchHooks Function()
-        > {
-  $$SessionEntityTableTableManager(
-    i0.GeneratedDatabase db,
-    i1.$SessionEntityTable table,
-  ) : super(
-        i0.TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () =>
-              i1.$$SessionEntityTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () =>
-              i1.$$SessionEntityTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () =>
-              i1.$$SessionEntityTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback:
-              ({
-                i0.Value<String> key = const i0.Value.absent(),
-                i0.Value<String?> value = const i0.Value.absent(),
-                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-              }) => i1.SessionEntityCompanion(
-                key: key,
-                value: value,
-                updatedAt: updatedAt,
-              ),
-          createCompanionCallback:
-              ({
-                required String key,
-                i0.Value<String?> value = const i0.Value.absent(),
-                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-              }) => i1.SessionEntityCompanion.insert(
-                key: key,
-                value: value,
-                updatedAt: updatedAt,
-              ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
-              .toList(),
-          prefetchHooksCallback: null,
-        ),
-      );
-}
-
-typedef $$SessionEntityTableProcessedTableManager =
-    i0.ProcessedTableManager<
-      i0.GeneratedDatabase,
-      i1.$SessionEntityTable,
-      i1.SessionEntityData,
-      i1.$$SessionEntityTableFilterComposer,
-      i1.$$SessionEntityTableOrderingComposer,
-      i1.$$SessionEntityTableAnnotationComposer,
-      $$SessionEntityTableCreateCompanionBuilder,
-      $$SessionEntityTableUpdateCompanionBuilder,
-      (
-        i1.SessionEntityData,
-        i0.BaseReferences<
-          i0.GeneratedDatabase,
-          i1.$SessionEntityTable,
-          i1.SessionEntityData
-        >,
-      ),
-      i1.SessionEntityData,
-      i0.PrefetchHooks Function()
-    >;
-
-class $SessionEntityTable extends i2.SessionEntity
-    with i0.TableInfo<$SessionEntityTable, i1.SessionEntityData> {
-  @override
-  final i0.GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $SessionEntityTable(this.attachedDatabase, [this._alias]);
-  static const i0.VerificationMeta _keyMeta = const i0.VerificationMeta('key');
-  @override
-  late final i0.GeneratedColumn<String> key = i0.GeneratedColumn<String>(
-    'key',
-    aliasedName,
-    false,
-    type: i0.DriftSqlType.string,
-    requiredDuringInsert: true,
-  );
-  static const i0.VerificationMeta _valueMeta = const i0.VerificationMeta(
-    'value',
-  );
-  @override
-  late final i0.GeneratedColumn<String> value = i0.GeneratedColumn<String>(
-    'value',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.string,
-    requiredDuringInsert: false,
-  );
-  static const i0.VerificationMeta _updatedAtMeta = const i0.VerificationMeta(
-    'updatedAt',
-  );
-  @override
-  late final i0.GeneratedColumn<DateTime> updatedAt =
-      i0.GeneratedColumn<DateTime>(
-        'updated_at',
-        aliasedName,
-        false,
-        type: i0.DriftSqlType.dateTime,
-        requiredDuringInsert: false,
-        defaultValue: i3.currentDateAndTime,
-      );
-  @override
-  List<i0.GeneratedColumn> get $columns => [key, value, updatedAt];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'session';
-  @override
-  i0.VerificationContext validateIntegrity(
-    i0.Insertable<i1.SessionEntityData> instance, {
-    bool isInserting = false,
-  }) {
-    final context = i0.VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('key')) {
-      context.handle(
-        _keyMeta,
-        key.isAcceptableOrUnknown(data['key']!, _keyMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_keyMeta);
-    }
-    if (data.containsKey('value')) {
-      context.handle(
-        _valueMeta,
-        value.isAcceptableOrUnknown(data['value']!, _valueMeta),
-      );
-    }
-    if (data.containsKey('updated_at')) {
-      context.handle(
-        _updatedAtMeta,
-        updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
-      );
-    }
-    return context;
-  }
-
-  @override
-  Set<i0.GeneratedColumn> get $primaryKey => {key};
-  @override
-  i1.SessionEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.SessionEntityData(
-      key: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}key'],
-      )!,
-      value: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}value'],
-      ),
-      updatedAt: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.dateTime,
-        data['${effectivePrefix}updated_at'],
-      )!,
-    );
-  }
-
-  @override
-  $SessionEntityTable createAlias(String alias) {
-    return $SessionEntityTable(attachedDatabase, alias);
-  }
-
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class SessionEntityData extends i0.DataClass
-    implements i0.Insertable<i1.SessionEntityData> {
-  final String key;
-  final String? value;
-  final DateTime updatedAt;
-  const SessionEntityData({
-    required this.key,
-    this.value,
-    required this.updatedAt,
-  });
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    map['key'] = i0.Variable<String>(key);
-    if (!nullToAbsent || value != null) {
-      map['value'] = i0.Variable<String>(value);
-    }
-    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
-    return map;
-  }
-
-  factory SessionEntityData.fromJson(
-    Map<String, dynamic> json, {
-    i0.ValueSerializer? serializer,
-  }) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return SessionEntityData(
-      key: serializer.fromJson<String>(json['key']),
-      value: serializer.fromJson<String?>(json['value']),
-      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{
-      'key': serializer.toJson<String>(key),
-      'value': serializer.toJson<String?>(value),
-      'updatedAt': serializer.toJson<DateTime>(updatedAt),
-    };
-  }
-
-  i1.SessionEntityData copyWith({
-    String? key,
-    i0.Value<String?> value = const i0.Value.absent(),
-    DateTime? updatedAt,
-  }) => i1.SessionEntityData(
-    key: key ?? this.key,
-    value: value.present ? value.value : this.value,
-    updatedAt: updatedAt ?? this.updatedAt,
-  );
-  SessionEntityData copyWithCompanion(i1.SessionEntityCompanion data) {
-    return SessionEntityData(
-      key: data.key.present ? data.key.value : this.key,
-      value: data.value.present ? data.value.value : this.value,
-      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('SessionEntityData(')
-          ..write('key: $key, ')
-          ..write('value: $value, ')
-          ..write('updatedAt: $updatedAt')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode => Object.hash(key, value, updatedAt);
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.SessionEntityData &&
-          other.key == this.key &&
-          other.value == this.value &&
-          other.updatedAt == this.updatedAt);
-}
-
-class SessionEntityCompanion extends i0.UpdateCompanion<i1.SessionEntityData> {
-  final i0.Value<String> key;
-  final i0.Value<String?> value;
-  final i0.Value<DateTime> updatedAt;
-  const SessionEntityCompanion({
-    this.key = const i0.Value.absent(),
-    this.value = const i0.Value.absent(),
-    this.updatedAt = const i0.Value.absent(),
-  });
-  SessionEntityCompanion.insert({
-    required String key,
-    this.value = const i0.Value.absent(),
-    this.updatedAt = const i0.Value.absent(),
-  }) : key = i0.Value(key);
-  static i0.Insertable<i1.SessionEntityData> custom({
-    i0.Expression<String>? key,
-    i0.Expression<String>? value,
-    i0.Expression<DateTime>? updatedAt,
-  }) {
-    return i0.RawValuesInsertable({
-      if (key != null) 'key': key,
-      if (value != null) 'value': value,
-      if (updatedAt != null) 'updated_at': updatedAt,
-    });
-  }
-
-  i1.SessionEntityCompanion copyWith({
-    i0.Value<String>? key,
-    i0.Value<String?>? value,
-    i0.Value<DateTime>? updatedAt,
-  }) {
-    return i1.SessionEntityCompanion(
-      key: key ?? this.key,
-      value: value ?? this.value,
-      updatedAt: updatedAt ?? this.updatedAt,
-    );
-  }
-
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    if (key.present) {
-      map['key'] = i0.Variable<String>(key.value);
-    }
-    if (value.present) {
-      map['value'] = i0.Variable<String>(value.value);
-    }
-    if (updatedAt.present) {
-      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('SessionEntityCompanion(')
-          ..write('key: $key, ')
-          ..write('value: $value, ')
-          ..write('updatedAt: $updatedAt')
-          ..write(')'))
-        .toString();
-  }
-}
@@ -6,7 +6,7 @@ class SettingsEntity extends Table with DriftDefaultsMixin {

  TextColumn get key => text()();

-  TextColumn get value => text().nullable()();
+  TextColumn get value => text()();

  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();

@@ -10,13 +10,13 @@ import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
 typedef $$SettingsEntityTableCreateCompanionBuilder =
    i1.SettingsEntityCompanion Function({
      required String key,
-      i0.Value<String?> value,
+      required String value,
      i0.Value<DateTime> updatedAt,
    });
 typedef $$SettingsEntityTableUpdateCompanionBuilder =
    i1.SettingsEntityCompanion Function({
      i0.Value<String> key,
-      i0.Value<String?> value,
+      i0.Value<String> value,
      i0.Value<DateTime> updatedAt,
    });

@@ -127,7 +127,7 @@ class $$SettingsEntityTableTableManager
          updateCompanionCallback:
              ({
                i0.Value<String> key = const i0.Value.absent(),
-                i0.Value<String?> value = const i0.Value.absent(),
+                i0.Value<String> value = const i0.Value.absent(),
                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
              }) => i1.SettingsEntityCompanion(
                key: key,
@@ -137,7 +137,7 @@ class $$SettingsEntityTableTableManager
          createCompanionCallback:
              ({
                required String key,
-                i0.Value<String?> value = const i0.Value.absent(),
+                required String value,
                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
              }) => i1.SettingsEntityCompanion.insert(
                key: key,
@@ -196,9 +196,9 @@ class $SettingsEntityTable extends i2.SettingsEntity
  late final i0.GeneratedColumn<String> value = i0.GeneratedColumn<String>(
    'value',
    aliasedName,
-    true,
+    false,
    type: i0.DriftSqlType.string,
-    requiredDuringInsert: false,
+    requiredDuringInsert: true,
  );
  static const i0.VerificationMeta _updatedAtMeta = const i0.VerificationMeta(
    'updatedAt',
@@ -240,6 +240,8 @@ class $SettingsEntityTable extends i2.SettingsEntity
        _valueMeta,
        value.isAcceptableOrUnknown(data['value']!, _valueMeta),
      );
+    } else if (isInserting) {
+      context.missing(_valueMeta);
    }
    if (data.containsKey('updated_at')) {
      context.handle(
@@ -263,7 +265,7 @@ class $SettingsEntityTable extends i2.SettingsEntity
      value: attachedDatabase.typeMapping.read(
        i0.DriftSqlType.string,
        data['${effectivePrefix}value'],
-      ),
+      )!,
      updatedAt: attachedDatabase.typeMapping.read(
        i0.DriftSqlType.dateTime,
        data['${effectivePrefix}updated_at'],
@@ -285,20 +287,18 @@ class $SettingsEntityTable extends i2.SettingsEntity
 class SettingsEntityData extends i0.DataClass
    implements i0.Insertable<i1.SettingsEntityData> {
  final String key;
-  final String? value;
+  final String value;
  final DateTime updatedAt;
  const SettingsEntityData({
    required this.key,
-    this.value,
+    required this.value,
    required this.updatedAt,
  });
  @override
  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
    final map = <String, i0.Expression>{};
    map['key'] = i0.Variable<String>(key);
-    if (!nullToAbsent || value != null) {
-      map['value'] = i0.Variable<String>(value);
-    }
+    map['value'] = i0.Variable<String>(value);
    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
    return map;
  }
@@ -310,7 +310,7 @@ class SettingsEntityData extends i0.DataClass
    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
    return SettingsEntityData(
      key: serializer.fromJson<String>(json['key']),
-      value: serializer.fromJson<String?>(json['value']),
+      value: serializer.fromJson<String>(json['value']),
      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
    );
  }
@@ -319,18 +319,18 @@ class SettingsEntityData extends i0.DataClass
    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
    return <String, dynamic>{
      'key': serializer.toJson<String>(key),
-      'value': serializer.toJson<String?>(value),
+      'value': serializer.toJson<String>(value),
      'updatedAt': serializer.toJson<DateTime>(updatedAt),
    };
  }

  i1.SettingsEntityData copyWith({
    String? key,
-    i0.Value<String?> value = const i0.Value.absent(),
+    String? value,
    DateTime? updatedAt,
  }) => i1.SettingsEntityData(
    key: key ?? this.key,
-    value: value.present ? value.value : this.value,
+    value: value ?? this.value,
    updatedAt: updatedAt ?? this.updatedAt,
  );
  SettingsEntityData copyWithCompanion(i1.SettingsEntityCompanion data) {
@@ -365,7 +365,7 @@ class SettingsEntityData extends i0.DataClass
 class SettingsEntityCompanion
    extends i0.UpdateCompanion<i1.SettingsEntityData> {
  final i0.Value<String> key;
-  final i0.Value<String?> value;
+  final i0.Value<String> value;
  final i0.Value<DateTime> updatedAt;
  const SettingsEntityCompanion({
    this.key = const i0.Value.absent(),
@@ -374,9 +374,10 @@ class SettingsEntityCompanion
  });
  SettingsEntityCompanion.insert({
    required String key,
-    this.value = const i0.Value.absent(),
+    required String value,
    this.updatedAt = const i0.Value.absent(),
-  }) : key = i0.Value(key);
+  }) : key = i0.Value(key),
+       value = i0.Value(value);
  static i0.Insertable<i1.SettingsEntityData> custom({
    i0.Expression<String>? key,
    i0.Expression<String>? value,
@@ -391,7 +392,7 @@ class SettingsEntityCompanion

  i1.SettingsEntityCompanion copyWith({
    i0.Value<String>? key,
-    i0.Value<String?>? value,
+    i0.Value<String>? value,
    i0.Value<DateTime>? updatedAt,
  }) {
    return i1.SettingsEntityCompanion(
@@ -34,14 +34,27 @@ class DriftBackupRepository extends DriftDatabaseRepository {
  /// - total:     number of distinct assets in selected albums, excluding those that are also in excluded albums
  /// - backup:    number of those assets that already exist on the server for [userId]
  /// - remainder: number of those assets that do not yet exist on the server for [userId]
-  ///              (includes processing)
+  ///              (includes processing), excluding handled iOS reverts (syncedChecksum == checksum
+  ///              with the prior upload still on the server — trashed counts, like the
+  ///              checksum arm; only a hard delete re-opens the asset)
  /// - processing: number of those assets that are still preparing/have a null checksum
  Future<({int total, int remainder, int processing})> getAllCounts(String userId) async {
    const sql = '''
        SELECT
        COUNT(*) AS total_count,
        COUNT(*) FILTER (WHERE lae.checksum IS NULL) AS processing_count,
-        COUNT(*) FILTER (WHERE rae.id IS NULL) AS remainder_count
+        COUNT(*) FILTER (
+            WHERE rae.id IS NULL
+            AND (
+                lae.checksum IS NULL
+                OR lae.synced_checksum IS NULL
+                OR lae.synced_checksum != lae.checksum
+                OR NOT EXISTS (
+                    SELECT 1 FROM main.remote_asset_entity pr
+                    WHERE pr.id = lae.prior_remote_id
+                )
+            )
+        ) AS remainder_count
        FROM local_asset_entity lae
        LEFT JOIN main.remote_asset_entity rae
            ON lae.checksum = rae.checksum AND rae.owner_id = ?1
@@ -104,6 +117,20 @@ 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. Suppress while
+            // the prior row exists at all — trashed stays suppressed (same
+            // convention as the checksum arm above); only a hard-deleted remote
+            // must become a candidate again.
+            (lae.checksum.isNull() |
+                lae.syncedChecksum.isNull() |
+                lae.syncedChecksum.equalsExp(lae.checksum).not() |
+                notExistsQuery(
+                  _db.remoteAssetEntity.selectOnly()
+                    ..addColumns([_db.remoteAssetEntity.id])
+                    ..where(_db.remoteAssetEntity.id.equalsExp(lae.priorRemoteId)),
+                )) &
            lae.id.isNotInQuery(_getExcludedSubquery()),
      )
      ..orderBy([(localAsset) => OrderingTerm.desc(localAsset.createdAt)]);
@@ -1,42 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:drift/drift.dart';
-// ignore: depend_on_referenced_packages
-import 'package:meta/meta.dart';
-
-abstract class CachedKeyValueRepository<K extends Enum, S> {
-  CachedKeyValueRepository(this._snapshot);
-
-  S _snapshot;
-  S get snapshot => _snapshot;
-  @protected
-  set snapshot(S value) => _snapshot = value;
-
-  List<K> get keys;
-
-  Object decodeValue(K key, String raw);
-
-  S buildSnapshot(Map<K, Object?> overrides);
-
-  Selectable<({String key, String? value})> selectable();
-
-  Future<void> refresh() async => _snapshot = _build(await selectable().get());
-
-  @protected
-  Stream<S> watchSnapshot() => selectable().watch().map((rows) => _snapshot = _build(rows));
-
-  S _build(List<({String key, String? value})> rows) => buildSnapshot(
-    rows.fold({}, (overrides, row) {
-      final key = keys.firstWhereOrNull((key) => key.name == row.key);
-      if (key == null) {
-        return overrides;
-      }
-
-      Object? decodedValue;
-      if (row.value != null) {
-        decodedValue = decodeValue(key, row.value!);
-      }
-
-      return {...overrides, key: decodedValue};
-    }),
-  );
-}
@@ -25,7 +25,6 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.d
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/session.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
@@ -68,7 +67,6 @@ import 'package:sqlite_async/sqlite_async.dart';
    AssetEditEntity,
    SettingsEntity,
    AssetOcrEntity,
-    SessionEntity,
  ],
  include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -122,7 +120,7 @@ class Drift extends $Drift {
  }

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

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -311,10 +309,9 @@ class Drift extends $Drift {
            await m.createIndex(v29.idxAssetOcrAssetId);
          },
          from29To30: (m, v30) async {
-            await m.alterTable(TableMigration(v30.settings));
-          },
-          from30To31: (m, v31) async {
-            await m.createTable(v31.session);
+            await m.addColumn(v30.localAssetEntity, v30.localAssetEntity.priorRemoteId);
+            await m.addColumn(v30.localAssetEntity, v30.localAssetEntity.syncedChecksum);
+            await m.createIndex(v30.idxLocalAssetPriorRemoteId);
          },
        ),
      );
@@ -47,11 +47,9 @@ import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart
    as i22;
 import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart'
    as i23;
-import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart'
-    as i24;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
-    as i25;
-import 'package:drift/internal/modular.dart' as i26;
+    as i24;
+import 'package:drift/internal/modular.dart' as i25;

 abstract class $Drift extends i0.GeneratedDatabase {
  $Drift(i0.QueryExecutor e) : super(e);
@@ -101,12 +99,9 @@ abstract class $Drift extends i0.GeneratedDatabase {
  late final i23.$AssetOcrEntityTable assetOcrEntity = i23.$AssetOcrEntityTable(
    this,
  );
-  late final i24.$SessionEntityTable sessionEntity = i24.$SessionEntityTable(
+  i24.MergedAssetDrift get mergedAssetDrift => i25.ReadDatabaseContainer(
    this,
-  );
-  i25.MergedAssetDrift get mergedAssetDrift => i26.ReadDatabaseContainer(
-    this,
-  ).accessor<i25.MergedAssetDrift>(i25.MergedAssetDrift.new);
+  ).accessor<i24.MergedAssetDrift>(i24.MergedAssetDrift.new);
  @override
  Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
      allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -123,6 +118,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
    i4.idxLocalAssetChecksum,
    i4.idxLocalAssetCloudId,
    i4.idxLocalAssetCreatedAt,
+    i4.idxLocalAssetPriorRemoteId,
    i3.idxStackPrimaryAssetId,
    i2.uQRemoteAssetsOwnerChecksum,
    i2.uQRemoteAssetsOwnerLibraryChecksum,
@@ -145,7 +141,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
    assetEditEntity,
    settingsEntity,
    assetOcrEntity,
-    sessionEntity,
    i10.idxPartnerSharedWithId,
    i11.idxLatLng,
    i11.idxRemoteExifCity,
@@ -420,6 +415,4 @@ class $DriftManager {
      i22.$$SettingsEntityTableTableManager(_db, _db.settingsEntity);
  i23.$$AssetOcrEntityTableTableManager get assetOcrEntity =>
      i23.$$AssetOcrEntityTableTableManager(_db, _db.assetOcrEntity);
-  i24.$$SessionEntityTableTableManager get sessionEntity =>
-      i24.$$SessionEntityTableTableManager(_db, _db.sessionEntity);
 }
@@ -15347,6 +15347,7 @@ final class Schema30 extends i0.VersionedSchema {
    idxLocalAssetChecksum,
    idxLocalAssetCloudId,
    idxLocalAssetCreatedAt,
+    idxLocalAssetPriorRemoteId,
    idxStackPrimaryAssetId,
    uQRemoteAssetsOwnerChecksum,
    uQRemoteAssetsOwnerLibraryChecksum,
@@ -15450,7 +15451,7 @@ final class Schema30 extends i0.VersionedSchema {
    ),
    alias: null,
  );
-  late final Shape36 localAssetEntity = Shape36(
+  late final Shape52 localAssetEntity = Shape52(
    source: i0.VersionedTable(
      entityName: 'local_asset_entity',
      withoutRowId: true,
@@ -15473,6 +15474,8 @@ final class Schema30 extends i0.VersionedSchema {
        _column_135,
        _column_136,
        _column_137,
+        _column_224,
+        _column_225,
      ],
      attachedDatabase: database,
    ),
@@ -15544,6 +15547,10 @@ final class Schema30 extends i0.VersionedSchema {
    'idx_local_asset_created_at',
    'CREATE INDEX IF NOT EXISTS idx_local_asset_created_at ON local_asset_entity (created_at)',
  );
+  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)',
@@ -15827,7 +15834,7 @@ final class Schema30 extends i0.VersionedSchema {
      withoutRowId: true,
      isStrict: true,
      tableConstraints: ['PRIMARY KEY("key")'],
-      columns: [_column_210, _column_224, _column_115],
+      columns: [_column_210, _column_211, _column_115],
      attachedDatabase: database,
    ),
    alias: null,
@@ -15912,607 +15919,62 @@ final class Schema30 extends i0.VersionedSchema {
  );
 }

+class Shape52 extends i0.VersionedTable {
+  Shape52({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_224(String aliasedName) =>
    i1.GeneratedColumn<String>(
-      'value',
+      'prior_remote_id',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.string,
+      $customConstraints: 'NULL',
+    );
+i1.GeneratedColumn<String> _column_225(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'synced_checksum',
      aliasedName,
      true,
      type: i1.DriftSqlType.string,
      $customConstraints: 'NULL',
    );
-
-final class Schema31 extends i0.VersionedSchema {
-  Schema31({required super.database}) : super(version: 31);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAlbumAssetAlbumAsset,
-    idxLocalAssetChecksum,
-    idxLocalAssetCloudId,
-    idxLocalAssetCreatedAt,
-    idxStackPrimaryAssetId,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    idxRemoteAssetStackId,
-    idxRemoteAssetOwnerVisibilityDeletedCreated,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    trashedLocalAssetEntity,
-    assetEditEntity,
-    settings,
-    assetOcrEntity,
-    session,
-    idxPartnerSharedWithId,
-    idxLatLng,
-    idxRemoteExifCity,
-    idxRemoteAlbumAssetAlbumAsset,
-    idxRemoteAssetCloudId,
-    idxPersonOwnerId,
-    idxAssetFacePersonId,
-    idxAssetFaceAssetId,
-    idxAssetFaceVisiblePerson,
-    idxTrashedLocalAssetChecksum,
-    idxTrashedLocalAssetAlbum,
-    idxAssetEditAssetId,
-    idxAssetOcrAssetId,
-  ];
-  late final Shape33 userEntity = Shape33(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_110,
-        _column_111,
-        _column_112,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape50 remoteAssetEntity = Shape50(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_119,
-        _column_120,
-        _column_121,
-        _column_122,
-        _column_123,
-        _column_124,
-        _column_212,
-        _column_125,
-        _column_126,
-        _column_127,
-        _column_128,
-        _column_129,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape35 stackEntity = Shape35(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_130,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape36 localAssetEntity = Shape36(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_133,
-        _column_134,
-        _column_135,
-        _column_136,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape48 remoteAlbumEntity = Shape48(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_138,
-        _column_114,
-        _column_115,
-        _column_139,
-        _column_140,
-        _column_141,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape38 localAlbumEntity = Shape38(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_115,
-        _column_142,
-        _column_143,
-        _column_144,
-        _column_145,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape39 localAlbumAssetEntity = Shape39(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_146, _column_147, _column_145],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
-    'idx_local_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxLocalAssetChecksum = i1.Index(
-    'idx_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
-  );
-  final i1.Index idxLocalAssetCloudId = i1.Index(
-    'idx_local_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
-  );
-  final i1.Index idxLocalAssetCreatedAt = i1.Index(
-    'idx_local_asset_created_at',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_created_at ON local_asset_entity (created_at)',
-  );
-  final i1.Index idxStackPrimaryAssetId = i1.Index(
-    'idx_stack_primary_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
-  );
-  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
-    'UQ_remote_assets_owner_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-  );
-  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
-    'UQ_remote_assets_owner_library_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
-  );
-  final i1.Index idxRemoteAssetChecksum = i1.Index(
-    'idx_remote_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
-  );
-  final i1.Index idxRemoteAssetStackId = i1.Index(
-    'idx_remote_asset_stack_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
-  );
-  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
-    'idx_remote_asset_owner_visibility_deleted_created',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
-  );
-  late final Shape40 authUserEntity = Shape40(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_148,
-        _column_110,
-        _column_111,
-        _column_149,
-        _column_150,
-        _column_151,
-        _column_152,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_153, _column_154, _column_155],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape41 partnerEntity = Shape41(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_156, _column_157, _column_158],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape42 remoteExifEntity = Shape42(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_160,
-        _column_161,
-        _column_162,
-        _column_163,
-        _column_164,
-        _column_117,
-        _column_116,
-        _column_165,
-        _column_166,
-        _column_167,
-        _column_168,
-        _column_135,
-        _column_136,
-        _column_169,
-        _column_170,
-        _column_171,
-        _column_172,
-        _column_173,
-        _column_174,
-        _column_175,
-        _column_176,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 remoteAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_159, _column_177],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape10 remoteAlbumUserEntity = Shape10(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
-      columns: [_column_177, _column_153, _column_178],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape43 remoteAssetCloudIdEntity = Shape43(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_cloud_id_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_179,
-        _column_180,
-        _column_134,
-        _column_135,
-        _column_136,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape44 memoryEntity = Shape44(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_124,
-        _column_121,
-        _column_113,
-        _column_181,
-        _column_182,
-        _column_183,
-        _column_184,
-        _column_185,
-        _column_186,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape12 memoryAssetEntity = Shape12(
-    source: i0.VersionedTable(
-      entityName: 'memory_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
-      columns: [_column_159, _column_187],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape45 personEntity = Shape45(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_108,
-        _column_188,
-        _column_189,
-        _column_190,
-        _column_191,
-        _column_192,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape46 assetFaceEntity = Shape46(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_193,
-        _column_194,
-        _column_195,
-        _column_196,
-        _column_197,
-        _column_198,
-        _column_199,
-        _column_200,
-        _column_201,
-        _column_124,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape18 storeEntity = Shape18(
-    source: i0.VersionedTable(
-      entityName: 'store_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_202, _column_203, _column_204],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape47 trashedLocalAssetEntity = Shape47(
-    source: i0.VersionedTable(
-      entityName: 'trashed_local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id, album_id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_205,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_206,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape32 assetEditEntity = Shape32(
-    source: i0.VersionedTable(
-      entityName: 'asset_edit_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_207,
-        _column_208,
-        _column_209,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape49 settings = Shape49(
-    source: i0.VersionedTable(
-      entityName: 'settings',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY("key")'],
-      columns: [_column_210, _column_224, _column_115],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape51 assetOcrEntity = Shape51(
-    source: i0.VersionedTable(
-      entityName: 'asset_ocr_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_213,
-        _column_214,
-        _column_215,
-        _column_216,
-        _column_217,
-        _column_218,
-        _column_219,
-        _column_220,
-        _column_221,
-        _column_222,
-        _column_223,
-        _column_201,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape49 session = Shape49(
-    source: i0.VersionedTable(
-      entityName: 'session',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY("key")'],
-      columns: [_column_210, _column_224, _column_115],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxPartnerSharedWithId = i1.Index(
-    'idx_partner_shared_with_id',
-    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-  final i1.Index idxRemoteExifCity = i1.Index(
-    'idx_remote_exif_city',
-    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
-  );
-  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
-    'idx_remote_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxRemoteAssetCloudId = i1.Index(
-    'idx_remote_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
-  );
-  final i1.Index idxPersonOwnerId = i1.Index(
-    'idx_person_owner_id',
-    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
-  );
-  final i1.Index idxAssetFacePersonId = i1.Index(
-    'idx_asset_face_person_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
-  );
-  final i1.Index idxAssetFaceAssetId = i1.Index(
-    'idx_asset_face_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
-  );
-  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
-    'idx_asset_face_visible_person',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
-  );
-  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
-    'idx_trashed_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
-  );
-  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
-    'idx_trashed_local_asset_album',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
-  );
-  final i1.Index idxAssetEditAssetId = i1.Index(
-    'idx_asset_edit_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
-  );
-  final i1.Index idxAssetOcrAssetId = i1.Index(
-    'idx_asset_ocr_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_ocr_asset_id ON asset_ocr_entity (asset_id)',
-  );
-}
-
 i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
  required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -16543,7 +16005,6 @@ i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema28 schema) from27To28,
  required Future<void> Function(i1.Migrator m, Schema29 schema) from28To29,
  required Future<void> Function(i1.Migrator m, Schema30 schema) from29To30,
-  required Future<void> Function(i1.Migrator m, Schema31 schema) from30To31,
 }) {
  return (currentVersion, database) async {
    switch (currentVersion) {
@@ -16692,11 +16153,6 @@ i0.MigrationStepWithVersion migrationSteps({
        final migrator = i1.Migrator(database, schema);
        await from29To30(migrator, schema);
        return 30;
-      case 30:
-        final schema = Schema31(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from30To31(migrator, schema);
-        return 31;
      default:
        throw ArgumentError.value('Unknown migration from $currentVersion');
    }
@@ -16733,7 +16189,6 @@ i1.OnUpgrade stepByStep({
  required Future<void> Function(i1.Migrator m, Schema28 schema) from27To28,
  required Future<void> Function(i1.Migrator m, Schema29 schema) from28To29,
  required Future<void> Function(i1.Migrator m, Schema30 schema) from29To30,
-  required Future<void> Function(i1.Migrator m, Schema31 schema) from30To31,
 }) => i0.VersionedSchema.stepByStepHelper(
  step: migrationSteps(
    from1To2: from1To2,
@@ -16765,6 +16220,5 @@ i1.OnUpgrade stepByStep({
    from27To28: from27To28,
    from28To29: from28To29,
    from29To30: from29To30,
-    from30To31: from30To31,
  ),
 );
@@ -64,6 +64,20 @@ 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)),
+    );
+  }
+
+  /// Drops the edit-stacking stamps so the next backup cycle re-resolves the
+  /// asset from scratch (used when the server says the stamped prior is gone).
+  Future<void> clearSyncStamps(String localId) {
+    return (_db.localAssetEntity.update()..where((e) => e.id.equals(localId))).write(
+      const LocalAssetEntityCompanion(priorRemoteId: Value(null), syncedChecksum: Value(null)),
+    );
+  }
+
  Future<void> delete(List<String> ids) {
    if (ids.isEmpty) {
      return Future.value();
@@ -16,21 +16,20 @@ class DriftPeopleRepository extends DriftDatabaseRepository {
  }

  Future<List<DriftPerson>> getAssetPeople(String assetId) async {
-    // An asset can have multiple face records for the same person (e.g., metadata
-    // imports alongside ML detections). Use a subquery instead of a join so each
-    // person is returned once, regardless of how many of their faces are on the asset
-    final faceQuery = _db.assetFaceEntity.selectOnly()
-      ..addColumns([_db.assetFaceEntity.personId])
-      ..where(
-        _db.assetFaceEntity.assetId.equals(assetId) &
-            _db.assetFaceEntity.isVisible.equals(true) &
-            _db.assetFaceEntity.deletedAt.isNull(),
-      );
+    final query =
+        _db.select(_db.assetFaceEntity).join([
+          innerJoin(_db.personEntity, _db.personEntity.id.equalsExp(_db.assetFaceEntity.personId)),
+        ])..where(
+          _db.assetFaceEntity.assetId.equals(assetId) &
+              _db.assetFaceEntity.isVisible.equals(true) &
+              _db.assetFaceEntity.deletedAt.isNull() &
+              _db.personEntity.isHidden.equals(false),
+        );

-    final query = _db.select(_db.personEntity)
-      ..where((row) => row.id.isInQuery(faceQuery) & row.isHidden.equals(false));
-
-    return query.map((row) => row.toDto()).get();
+    return query.map((row) {
+      final person = row.readTable(_db.personEntity);
+      return person.toDto();
+    }).get();
  }

  Future<List<DriftPerson>> getAllPeople({int minFaces = 3}) async {
@@ -46,7 +46,9 @@ class RemoteAssetRepository extends DriftDatabaseRepository {

    return query.map((row) {
      final asset = row.readTable(_db.remoteAssetEntity).toDto();
-      return asset.copyWith(localId: row.read(_db.localAssetEntity.id));
+      final localId = row.read(_db.localAssetEntity.id);
+      // checksum-equality join: the local's bytes are the remote's
+      return asset.copyWith(localId: localId, localChecksum: localId == null ? null : asset.checksum);
    });
  }

@@ -194,15 +196,12 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
    });
  }

-  Future<void> updateDateTime(List<String> ids, DateTime dateTime, {String? timeZone}) {
+  Future<void> updateDateTime(List<String> ids, DateTime dateTime) {
    return _db.batch((batch) async {
      for (final id in ids) {
        batch.update(
          _db.remoteExifEntity,
-          RemoteExifEntityCompanion(
-            dateTimeOriginal: Value(dateTime),
-            timeZone: timeZone == null ? const Value.absent() : Value(timeZone),
-          ),
+          RemoteExifEntityCompanion(dateTimeOriginal: Value(dateTime)),
          where: (e) => e.assetId.equals(id),
        );
        batch.update(
@@ -1,82 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/session.model.dart';
-import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/cached_key_value_repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-
-class SessionRepository extends CachedKeyValueRepository<SessionKey, Session> {
-  final Drift _db;
-
-  SessionRepository._(this._db) : super(const .new());
-
-  static SessionRepository? _instance;
-
-  static SessionRepository get instance {
-    final instance = _instance;
-    if (instance == null) {
-      throw StateError('SessionRepository not initialized. Call ensureInitialized() first');
-    }
-    return instance;
-  }
-
-  static Future<SessionRepository> ensureInitialized(Drift db) async {
-    if (_instance == null) {
-      final instance = SessionRepository._(db);
-      await instance.refresh();
-      _instance = instance;
-    }
-    return _instance!;
-  }
-
-  @override
-  List<SessionKey> get keys => SessionKey.values;
-
-  @override
-  Object decodeValue(SessionKey key, String raw) => key.decode(raw);
-
-  @override
-  Session buildSnapshot(Map<SessionKey, Object?> overrides) => Session.fromEntries(overrides);
-
-  @override
-  @protected
-  Selectable<({String key, String? value})> selectable() =>
-      _db.select(_db.sessionEntity).map((row) => (key: row.key, value: row.value));
-
-  Session get session => snapshot;
-
-  Future<void> clear(Iterable<SessionKey> keys) async {
-    if (keys.isEmpty) {
-      return;
-    }
-
-    final names = keys.map((key) => key.name).toList();
-    await (_db.delete(_db.sessionEntity)..where((row) => row.key.isIn(names))).go();
-
-    var session = snapshot;
-    for (final key in keys) {
-      session = session.write(key, defaultSession.read(key));
-    }
-    snapshot = session;
-  }
-
-  Future<void> write<T, U extends T>(SessionKey<T> key, U value) async {
-    if (value == snapshot.read(key)) {
-      return;
-    }
-
-    String? resolvedValue;
-    if (value != null) {
-      resolvedValue = key.encode(value);
-    }
-
-    await _db
-        .into(_db.sessionEntity)
-        .insertOnConflictUpdate(
-          SessionEntityCompanion.insert(key: key.name, value: .new(resolvedValue), updatedAt: .new(DateTime.now())),
-        );
-    snapshot = snapshot.write(key, value);
-  }
-
-  Stream<Session> watch() => watchSnapshot();
-}
@@ -1,15 +1,14 @@
+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
-import 'package:flutter/material.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/cached_key_value_repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';

-class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig> {
+class SettingsRepository extends DriftDatabaseRepository {
  final Drift _db;

-  SettingsRepository._(this._db) : super(const .new());
+  SettingsRepository._(this._db) : super(_db);

  static SettingsRepository? _instance;

@@ -21,6 +20,9 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
    return instance;
  }

+  AppConfig _appConfig = const .new();
+  AppConfig get appConfig => _appConfig;
+
  static Future<SettingsRepository> ensureInitialized(Drift db) async {
    if (_instance == null) {
      final instance = SettingsRepository._(db);
@@ -30,21 +32,7 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
    return _instance!;
  }

-  @override
-  List<SettingsKey> get keys => SettingsKey.values;
-
-  @override
-  Object decodeValue(SettingsKey key, String raw) => key.decode(raw);
-
-  @override
-  AppConfig buildSnapshot(Map<SettingsKey, Object?> overrides) => AppConfig.fromEntries(overrides);
-
-  @override
-  @protected
-  Selectable<({String key, String? value})> selectable() =>
-      _db.select(_db.settingsEntity).map((row) => (key: row.key, value: row.value));
-
-  AppConfig get appConfig => snapshot;
+  Future<void> refresh() async => _applyOverrides(await _db.select(_db.settingsEntity).get());

  Future<void> clear(Iterable<SettingsKey> keys) async {
    if (keys.isEmpty) {
@@ -54,15 +42,13 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
    final names = keys.map((key) => key.name).toList();
    await (_db.delete(_db.settingsEntity)..where((row) => row.key.isIn(names))).go();

-    var config = snapshot;
    for (final key in keys) {
-      config = config.write(key, defaultConfig.read(key));
+      _appConfig = _appConfig.write(key, defaultConfig.read(key));
    }
-    snapshot = config;
  }

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

@@ -70,18 +56,29 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
      return clear([key]);
    }

-    String? resolvedValue;
-    if (value != null) {
-      resolvedValue = key.encode(value);
-    }
-
    await _db
        .into(_db.settingsEntity)
        .insertOnConflictUpdate(
-          SettingsEntityCompanion.insert(key: key.name, value: .new(resolvedValue), updatedAt: .new(DateTime.now())),
+          SettingsEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
        );
-    snapshot = snapshot.write(key, value);
+    _appConfig = _appConfig.write(key, value);
  }

-  Stream<AppConfig> watch() => watchSnapshot();
+  Stream<AppConfig> watchConfig() => _db.select(_db.settingsEntity).watch().map((rows) {
+    _applyOverrides(rows);
+    return _appConfig;
+  });
+
+  void _applyOverrides(List<SettingsEntityData> rows) {
+    _appConfig = AppConfig.fromEntries(
+      rows.fold({}, (overrides, row) {
+        final metadataKey = SettingsKey.values.firstWhereOrNull((key) => key.name == row.key);
+        if (metadataKey == null) {
+          return overrides;
+        }
+
+        return {...overrides, metadataKey: metadataKey.decode(row.value)};
+      }),
+    );
+  }
 }
@@ -3,6 +3,22 @@ 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,
+  });
+}
+
+enum PriorState { live, trashed, missing }
+
 class DriftStackRepository extends DriftDatabaseRepository {
  final Drift _db;
  const DriftStackRepository(this._db) : super(_db);
@@ -14,6 +30,134 @@ class DriftStackRepository extends DriftDatabaseRepository {
      return stack.toDto();
    }).get();
  }
+
+  // Find stacks whose primary should flip back after a revert: a local that was
+  // uploaded as an edit (prior in the stack) now hashes to a DIFFERENT member
+  // that isn't the primary. Two discriminators keep this from fighting stacks
+  // the user arranged by hand: the matched member must not be the local's own
+  // prior (a true revert has prior = the edit, member = the base), and the
+  // local must be unreconciled (synced_checksum != checksum — the flip below
+  // writes synced = checksum, which is what makes this self-limiting). Driven
+  // from stack_entity so the work scales with the number of stacks (few), and
+  // runs every hash cycle so a flip that failed offline gets retried.
+  Future<List<StackReconcileTarget>> findRevertReconcileTargets() async {
+    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 stack_entity s
+        INNER JOIN remote_asset_entity member
+          ON member.stack_id = s.id
+          AND member.deleted_at IS NULL
+        INNER JOIN local_asset_entity local
+          ON local.checksum = member.checksum
+          AND local.prior_remote_id IS NOT NULL
+          AND local.prior_remote_id != member.id
+          AND local.synced_checksum IS NOT local.checksum
+        INNER JOIN remote_asset_entity prior
+          ON prior.id = local.prior_remote_id
+          AND prior.stack_id = s.id
+          AND prior.deleted_at IS NULL
+        WHERE s.primary_asset_id != member.id
+        ''',
+          readsFrom: {_db.localAssetEntity, _db.remoteAssetEntity, _db.stackEntity},
+        )
+        .get();
+
+    return rows
+        .map(
+          (row) => 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'),
+          ),
+        )
+        .toList();
+  }
+
+  // What the synced remote table knows about a stamped prior. missing is
+  // ambiguous: either just uploaded and not synced back yet, or hard-deleted on
+  // the server — the caller tells them apart via syncedChecksum (null = a chain
+  // is still mid-flight, so the row simply hasn't synced yet). A locked-folder
+  // row counts as trashed: the server refuses to stack onto it (and with a
+  // message the dead-parent belt doesn't match), so defer until it's unlocked.
+  Future<PriorState> priorState(String remoteId) async {
+    final row = await _db
+        .customSelect(
+          // 3 = locked
+          'SELECT (deleted_at IS NOT NULL OR visibility = 3) AS blocked FROM remote_asset_entity WHERE id = ? LIMIT 1',
+          variables: [Variable<String>(remoteId)],
+          readsFrom: {_db.remoteAssetEntity},
+        )
+        .getSingleOrNull();
+    if (row == null) {
+      return PriorState.missing;
+    }
+    return row.read<bool>('blocked') ? PriorState.trashed : PriorState.live;
+  }
+
+  // The synced remote owned by [ownerId] with these exact bytes, if any. The
+  // server keys assets by (owner, checksum), so at most one row matches.
+  // Locked rows count as trashed here too, same reasoning as [priorState].
+  Future<({PriorState state, String? remoteId})> remoteByChecksum(String checksum, String ownerId) async {
+    final row = await _db
+        .customSelect(
+          // 3 = locked
+          'SELECT id, (deleted_at IS NOT NULL OR visibility = 3) AS blocked FROM remote_asset_entity WHERE checksum = ? AND owner_id = ? LIMIT 1',
+          variables: [Variable<String>(checksum), Variable<String>(ownerId)],
+          readsFrom: {_db.remoteAssetEntity},
+        )
+        .getSingleOrNull();
+    if (row == null) {
+      return (state: PriorState.missing, remoteId: null);
+    }
+    return (state: row.read<bool>('blocked') ? PriorState.trashed : PriorState.live, remoteId: row.read<String>('id'));
+  }
+
+  // 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 {
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:logging/logging.dart';
+import 'package:path_provider/path_provider.dart';
 import 'package:photo_manager/photo_manager.dart';

 class StorageRepository {
@@ -150,4 +151,34 @@ class StorageRepository {
      log.warning("Error deleting temporary directory", error, stackTrace);
    }
  }
+
+  /// Base originals for the edit chain live under Library/Caches (immich_base),
+  /// not tmp, so [clearCache] can't wipe a chain still in flight across
+  /// launches. Sweeps only files older than a day: live chains and concurrent
+  /// foreground pair uploads keep their temps; orphans from dead chains go.
+  Future<void> clearEditBaseCache() async {
+    if (!CurrentPlatform.isIOS) {
+      return;
+    }
+    try {
+      final cache = await getApplicationCacheDirectory();
+      final dir = Directory('${cache.path}/immich_base');
+      if (!await dir.exists()) {
+        return;
+      }
+      final cutoff = DateTime.now().subtract(const Duration(days: 1));
+      await for (final entry in dir.list()) {
+        try {
+          final stat = await entry.stat();
+          if (stat.modified.isBefore(cutoff)) {
+            await entry.delete(recursive: true);
+          }
+        } catch (error, stackTrace) {
+          log.warning("Error sweeping ${entry.path}", error, stackTrace);
+        }
+      }
+    } catch (error, stackTrace) {
+      log.warning("Error sweeping edit base cache", error, stackTrace);
+    }
+  }
 }
@@ -1,7 +1,9 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';

 class DriftStoreRepository extends DriftDatabaseRepository {
  final Drift _db;
@@ -61,6 +63,8 @@ class DriftStoreRepository extends DriftDatabaseRepository {
            const (String) => entity.stringValue,
            const (bool) => entity.intValue == 1,
            const (DateTime) => entity.intValue == null ? null : DateTime.fromMillisecondsSinceEpoch(entity.intValue!),
+            const (UserDto) =>
+              entity.stringValue == null ? null : await DriftAuthUserRepository(_db).get(entity.stringValue!),
            _ => null,
          }
          as T?;
@@ -71,6 +75,7 @@ class DriftStoreRepository extends DriftDatabaseRepository {
      const (String) => (null, value as String),
      const (bool) => ((value as bool) ? 1 : 0, null),
      const (DateTime) => ((value as DateTime).millisecondsSinceEpoch, null),
+      const (UserDto) => (null, (await DriftAuthUserRepository(_db).upsert(value as UserDto)).id),
      _ => throw UnsupportedError("Unsupported primitive type: ${key.type} for key: ${key.name}"),
    };
    return StoreEntityCompanion(id: Value(key.id), intValue: Value(intValue), stringValue: Value(strValue));
@@ -16,6 +16,7 @@ import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dar
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
@@ -71,6 +72,12 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            await _db.remoteAssetCloudIdEntity.deleteAll();
            await _db.assetEditEntity.deleteAll();
            await _db.assetOcrEntity.deleteAll();
+            // The edit-stacking stamps point at remote rows wiped above; left in
+            // place they'd make the next backup (possibly a different account or
+            // server) stack onto ids that no longer exist.
+            await _db.localAssetEntity.update().write(
+              const LocalAssetEntityCompanion(priorRemoteId: Value(null), syncedChecksum: Value(null)),
+            );
          });
        } finally {
          // re-enable FK even if the transaction throws, otherwise the connection
@@ -195,7 +202,27 @@ class SyncStreamRepository extends DriftDatabaseRepository {
    }
  }

-  Future<void> updateAssetsV1(Iterable<SyncAssetV1> data, {String debugLabel = 'user'}) async {
+  // websocket events are a point-in-time snapshot, so on the fast path don't overwrite
+  // link state the checkpoint sync owns (a motion video uploads visible then gets hidden).
+  RemoteAssetEntityCompanion _conflictUpdate(RemoteAssetEntityCompanion companion, bool fromWebsocket) {
+    if (!fromWebsocket) {
+      return companion;
+    }
+    // deletedAt is checkpoint-owned too: a debounced upload-ready snapshot always
+    // carries null and must not resurrect an asset trashed in the meantime.
+    return companion.copyWith(
+      visibility: const Value.absent(),
+      livePhotoVideoId: const Value.absent(),
+      stackId: const Value.absent(),
+      deletedAt: const Value.absent(),
+    );
+  }
+
+  Future<void> updateAssetsV1(
+    Iterable<SyncAssetV1> data, {
+    String debugLabel = 'user',
+    bool fromWebsocket = false,
+  }) async {
    try {
      await _db.batch((batch) {
        for (final asset in data) {
@@ -224,7 +251,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          batch.insert(
            _db.remoteAssetEntity,
            companion.copyWith(id: Value(asset.id)),
-            onConflict: DoUpdate((_) => companion),
+            onConflict: DoUpdate((_) => _conflictUpdate(companion, fromWebsocket)),
          );
        }
      });
@@ -234,7 +261,11 @@ class SyncStreamRepository extends DriftDatabaseRepository {
    }
  }

-  Future<void> updateAssetsV2(Iterable<SyncAssetV2> data, {String debugLabel = 'user'}) async {
+  Future<void> updateAssetsV2(
+    Iterable<SyncAssetV2> data, {
+    String debugLabel = 'user',
+    bool fromWebsocket = false,
+  }) async {
    try {
      await _db.batch((batch) {
        for (final asset in data) {
@@ -263,7 +294,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          batch.insert(
            _db.remoteAssetEntity,
            companion.copyWith(id: Value(asset.id)),
-            onConflict: DoUpdate((_) => companion),
+            onConflict: DoUpdate((_) => _conflictUpdate(companion, fromWebsocket)),
          );
        }
      });
@@ -88,6 +88,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                  livePhotoVideoId: row.livePhotoVideoId,
                  stackId: row.stackId,
                  isEdited: row.isEdited,
+                  localChecksum: row.localChecksum,
                )
              : LocalAsset(
                  id: row.localId!,
@@ -17,15 +17,16 @@ class DriftAuthUserRepository extends DriftDatabaseRepository {
  final Drift _db;
  const DriftAuthUserRepository(super.db) : _db = db;

-  Selectable<UserDto?> get _authUserQuery => (_db.authUserEntity.select()..limit(1)).asyncMap(_toDto);
+  Future<UserDto?> get(String id) async {
+    final user = await _db.managers.authUserEntity.filter((user) => user.id.equals(id)).getSingleOrNull();

-  Future<UserDto?> get() => _authUserQuery.getSingleOrNull();
+    if (user == null) {
+      return null;
+    }

-  Stream<UserDto?> watch() => _authUserQuery.watchSingleOrNull();
-
-  Future<UserDto> _toDto(AuthUserEntityData user) async {
-    final query = _db.userMetadataEntity.select()..where((e) => e.userId.equals(user.id));
+    final query = _db.userMetadataEntity.select()..where((e) => e.userId.equals(id));
    final metadata = await query.map((row) => row.toDto()).get();
+
    return user.toDto(metadata);
  }

@@ -5,6 +5,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
@@ -83,7 +85,7 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
    final backupSyncManager = ref.read(backgroundSyncProvider);

    Future<void> startBackup() async {
-      final currentUser = ref.read(currentUserProvider);
+      final currentUser = Store.tryGet(StoreKey.currentUser);
      if (currentUser == null) {
        return;
      }
@@ -8,15 +8,14 @@ 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/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/session.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/view_intent/view_intent_handler.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
@@ -307,10 +306,9 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
  }

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

    if (accessToken != null && serverUrl != null && endpoint != null) {
      final infoProvider = ref.read(serverInfoProvider.notifier);
@@ -318,7 +316,6 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
      final backgroundManager = ref.read(backgroundSyncProvider);
      final backupProvider = ref.read(driftBackupProvider.notifier);
      final viewIntentHandler = ref.read(viewIntentHandlerProvider);
-      final authUserRepository = ref.read(authUserRepositoryProvider);

      unawaited(
        ref.read(authProvider.notifier).saveAuthInfo(accessToken: accessToken).then(
@@ -338,9 +335,9 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
              if (syncSuccess) {
                await Future.wait([
                  backgroundManager.hashAssets().then((_) {
-                    _resumeBackup(backupProvider, authUserRepository);
+                    _resumeBackup(backupProvider);
                  }),
-                  _resumeBackup(backupProvider, authUserRepository),
+                  _resumeBackup(backupProvider),
                  // TODO: Bring back when the soft freeze issue is addressed
                  // backgroundManager.syncCloudIds(),
                ]);
@@ -376,11 +373,11 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
    }
  }

-  Future<void> _resumeBackup(DriftBackupNotifier notifier, DriftAuthUserRepository authUserRepository) async {
+  Future<void> _resumeBackup(DriftBackupNotifier notifier) async {
    final isEnableBackup = SettingsRepository.instance.appConfig.backup.enabled;

    if (isEnableBackup) {
-      final currentUser = await authUserRepository.get();
+      final currentUser = Store.tryGet(StoreKey.currentUser);
      if (currentUser != null) {
        unawaited(notifier.startForegroundBackup(currentUser.id));
      }
@@ -197,7 +197,7 @@ class FolderContent extends HookConsumerWidget {
                          style: context.textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w600),
                        ),
                        subtitle: Text(
-                          "${asset.exifInfo.fileSize != null ? "${formatBytes(asset.exifInfo.fileSize ?? 0)} • " : ""}${DateFormat.yMMMd().format(asset.createdAt.toLocal())}",
+                          "${asset.exifInfo.fileSize != null ? formatBytes(asset.exifInfo.fileSize ?? 0) : ""} • ${DateFormat.yMMMd().format(asset.createdAt)}",
                          style: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
                        ),
                      ),
@@ -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,80 @@ class CloudIdResult {
  int get hashCode => _deepHash(<Object?>[runtimeType, ..._toList()]);
 }

+class BaseResource {
+  BaseResource({required this.path, required this.sha1});
+
+  String path;
+
+  String sha1;
+
+  List<Object?> _toList() {
+    return <Object?>[path, sha1];
+  }
+
+  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);
+  }
+
+  @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);
+  }
+
+  @override
+  // ignore: avoid_equals_and_hash_code_on_mutable_classes
+  int get hashCode => _deepHash(<Object?>[runtimeType, ..._toList()]);
+}
+
+class BaseLivePhoto {
+  BaseLivePhoto({required this.still, this.video});
+
+  BaseResource still;
+
+  BaseResource? video;
+
+  List<Object?> _toList() {
+    return <Object?>[still, video];
+  }
+
+  Object encode() {
+    return _toList();
+  }
+
+  static BaseLivePhoto decode(Object result) {
+    result as List<Object?>;
+    return BaseLivePhoto(still: result[0]! as BaseResource, video: result[1] as BaseResource?);
+  }
+
+  @override
+  // ignore: avoid_equals_and_hash_code_on_mutable_classes
+  bool operator ==(Object other) {
+    if (other is! BaseLivePhoto || other.runtimeType != runtimeType) {
+      return false;
+    }
+    if (identical(this, other)) {
+      return true;
+    }
+    return _deepEquals(still, other.still) && _deepEquals(video, other.video);
+  }
+
+  @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 +481,30 @@ 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 if (value is BaseLivePhoto) {
+      buffer.putUint8(137);
+      writeValue(buffer, value.encode());
    } else {
      super.writeValue(buffer, value);
    }
@@ -432,15 +517,22 @@ 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)!);
+      case 137:
+        return BaseLivePhoto.decode(readValue(buffer)!);
      default:
        return super.readValueOfType(type, buffer);
    }
@@ -705,4 +797,61 @@ 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;
+  }
+
+  Future<BaseLivePhoto?> getBaseLivePhoto(String assetId, {bool allowNetworkAccess = false}) async {
+    final pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getBaseLivePhoto$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 BaseLivePhoto?;
+  }
 }
@@ -10,7 +10,6 @@ import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart'
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/album/album_action_filled_button.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';

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

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

  String _getEffectiveTitle() {
    return albumTitleController.text.isNotEmpty
@@ -170,23 +169,25 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
    onBackgroundTapped();

    final title = _getEffectiveTitle().trim();
-
-    try {
-      final album = await ref
-          .read(remoteAlbumProvider.notifier)
-          .createAlbumWithAssets(
-            title: title,
-            description: albumDescriptionController.text.trim(),
-            assets: selectedAssets,
-          );
-
-      if (album != null && context.mounted) {
-        unawaited(context.replaceRoute(RemoteAlbumRoute(album: album)));
-      }
-    } catch (_) {
+    if (title.isEmpty) {
      if (context.mounted) {
-        ImmichToast.show(context: context, toastType: ToastType.error, msg: 'errors.failed_to_create_album'.t());
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('create_album_title_required'.t()), backgroundColor: context.colorScheme.error),
+        );
      }
+      return;
+    }
+
+    final album = await ref
+        .read(remoteAlbumProvider.notifier)
+        .createAlbumWithAssets(
+          title: title,
+          description: albumDescriptionController.text.trim(),
+          assets: selectedAssets,
+        );
+
+    if (album != null && context.mounted) {
+      unawaited(context.replaceRoute(RemoteAlbumRoute(album: album)));
    }
  }

@@ -3,7 +3,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -65,9 +64,7 @@ class _DriftPeopleCollectionPageState extends ConsumerState<DriftPeopleCollectio
              data: (people) {
                if (_search != null) {
                  people = people.where((person) {
-                    return person.name.toLowerCase().removeDiacritics().contains(
-                      _search!.toLowerCase().removeDiacritics(),
-                    );
+                    return person.name.toLowerCase().contains(_search!.toLowerCase());
                  }).toList();
                }
                return GridView.builder(
@@ -18,6 +18,7 @@ import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dar
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/option.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:immich_mobile/widgets/common/remote_album_sliver_app_bar.dart';

@@ -247,10 +248,13 @@ class _EditAlbumDialogState extends ConsumerState<_EditAlbumDialog> {
    try {
      final newTitle = titleController.text.trim();
      final newDescription = descriptionController.text.trim();
+      final description = newDescription.isEmpty
+          ? const Option<String?>.some(null)
+          : Option<String?>.some(newDescription);

      await ref
          .read(remoteAlbumProvider.notifier)
-          .updateAlbum(widget.album.id, name: newTitle, description: newDescription);
+          .updateAlbum(widget.album.id, name: newTitle, description: description);

      if (mounted) {
        Navigator.of(
@@ -42,7 +42,6 @@ class BaseActionButton extends ConsumerWidget {

      return IconButton(
        onPressed: onPressed,
-        onLongPress: onLongPressed,
        icon: Icon(iconData, size: iconSize, color: iconColor),
      );
    }
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:url_launcher/url_launcher.dart';

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

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

    String originPath = '';
    switch (origin) {
@@ -6,12 +6,10 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';

@@ -50,34 +48,6 @@ class _SharePreparingDialog extends StatelessWidget {
  }
 }

-class _ShareFileTypeDialog extends StatelessWidget {
-  const _ShareFileTypeDialog();
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(context.t.select_quality),
-      contentPadding: const EdgeInsets.symmetric(vertical: 8),
-      content: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          ListTile(
-            leading: const Icon(Icons.high_quality_rounded),
-            title: Text(context.t.share_original),
-            onTap: () => context.pop(ShareAssetType.original),
-          ),
-          ListTile(
-            leading: const Icon(Icons.photo_size_select_large_rounded),
-            title: Text(context.t.share_preview),
-            onTap: () => context.pop(ShareAssetType.preview),
-          ),
-        ],
-      ),
-      actions: [TextButton(onPressed: () => context.pop(), child: Text(context.t.cancel))],
-    );
-  }
-}
-
 class ShareActionButton extends ConsumerWidget {
  final ActionSource source;
  final bool iconOnly;
@@ -90,35 +60,6 @@ class ShareActionButton extends ConsumerWidget {
      return;
    }

-    final fileType = ref.read(appConfigProvider).share.fileType;
-    await _share(context, ref, fileType);
-  }
-
-  void _onLongPress(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final fileType = await showDialog<ShareAssetType>(
-      context: context,
-      builder: (_) => const _ShareFileTypeDialog(),
-      useRootNavigator: false,
-    );
-
-    if (fileType == null || !context.mounted) {
-      return;
-    }
-
-    await ref.read(settingsProvider).write(SettingsKey.shareFileType, fileType);
-
-    if (!context.mounted) {
-      return;
-    }
-
-    await _share(context, ref, fileType);
-  }
-
-  Future<void> _share(BuildContext context, WidgetRef ref, ShareAssetType fileType) async {
    final cancelCompleter = Completer<void>();
    final progress = ValueNotifier<double?>(null);
    final preparingDialog = _SharePreparingDialog(progress: progress);
@@ -130,7 +71,6 @@ class ShareActionButton extends ConsumerWidget {
            .shareAssets(
              source,
              context,
-              fileType: fileType,
              cancelCompleter: cancelCompleter,
              onAssetDownloadProgress: (value) => progress.value = value,
            )
@@ -144,7 +84,7 @@ class ShareActionButton extends ConsumerWidget {
              if (!result.success) {
                ImmichToast.show(
                  context: context,
-                  msg: context.t.scaffold_body_error_occurred,
+                  msg: 'scaffold_body_error_occurred'.t(context: context),
                  gravity: ToastGravity.BOTTOM,
                  toastType: ToastType.error,
                );
@@ -170,11 +110,10 @@ class ShareActionButton extends ConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
    return BaseActionButton(
      iconData: Platform.isAndroid ? Icons.share_rounded : Icons.ios_share_rounded,
-      label: context.t.share,
+      label: 'share'.t(context: context),
      iconOnly: iconOnly,
      menuItem: menuItem,
      onPressed: () => _onTap(context, ref),
-      onLongPressed: () => _onLongPress(context, ref),
    );
  }
 }
@@ -96,11 +96,6 @@ class _AssetPageState extends ConsumerState<AssetPage> {
    switch (event) {
      case ViewerShowDetailsEvent():
        _showDetails();
-      case TimelineReloadEvent():
-        final asset = ref.read(timelineServiceProvider).getAssetSafe(widget.index);
-        if (asset != _asset) {
-          setState(() => _asset = asset);
-        }
      default:
    }
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Santo Shakil	3e6d175735	fix chain resume over deleted remotes and revert reporting	2026-06-11 20:31:58 +06:00
Santo Shakil	9172397b41	feat(mobile): stack original + edited photo on ios	2026-06-11 03:15:17 +06:00