chore(deps): update github-actions

.github/workflows/build-mobile.yml

@@ -51,14 +51,14 @@ jobs:
       should_run: ${{ steps.check.outputs.should_run }}
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@08bac802a312fc89808e0dd589271ca0974087b5 # pre-job-action-v2.0.0
+        uses: immich-app/devtools/actions/pre-job@4effdb9faa3c120fa03f487f0a476d55fc4cd9f2 # pre-job-action-v2.0.1
         with:
           github-token: ${{ steps.token.outputs.token }}
           filters: |
@@ -79,12 +79,12 @@ jobs:
 
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: ${{ inputs.ref || github.sha }}
           persist-credentials: false
@@ -103,7 +103,7 @@ jobs:
 
       - name: Restore Gradle Cache
         id: cache-gradle-restore
-        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/.gradle/caches
@@ -160,7 +160,7 @@ jobs:
 
       - name: Save Gradle Cache
         id: cache-gradle-save
-        uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache/save@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         if: github.ref == 'refs/heads/main'
         with:
           path: |

.github/workflows/cache-cleanup.yml

@@ -19,13 +19,13 @@ jobs:
       actions: write
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Check out code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/cli.yml

@@ -30,12 +30,12 @@ jobs:
 
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -44,7 +44,7 @@ jobs:
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './cli/.nvmrc'
           registry-url: 'https://registry.npmjs.org'
@@ -72,13 +72,13 @@ jobs:
 
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/close-duplicates.yml

@@ -35,7 +35,7 @@ jobs:
     needs: [get_body, should_run]
     if: ${{ needs.should_run.outputs.should_run == 'true' }}
     container:
-      image: ghcr.io/immich-app/mdq:main@sha256:ab9f163cd5d5cec42704a26ca2769ecf3f10aa8e7bae847f1d527cdf075946e6
+      image: ghcr.io/immich-app/mdq:main@sha256:49f1603397bf9496840162b996e12b089d7d78d7e8b1880ba45545173a1104bf
     outputs:
       checked: ${{ steps.get_checkbox.outputs.checked }}
     steps:

.github/workflows/codeql-analysis.yml

@@ -44,20 +44,20 @@ jobs:
 
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        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@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         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@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/autobuild@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
 
       # ℹ️ 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@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/docker.yml

@@ -23,14 +23,14 @@ jobs:
       should_run: ${{ steps.check.outputs.should_run }}
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@08bac802a312fc89808e0dd589271ca0974087b5 # pre-job-action-v2.0.0
+        uses: immich-app/devtools/actions/pre-job@4effdb9faa3c120fa03f487f0a476d55fc4cd9f2 # pre-job-action-v2.0.1
         with:
           github-token: ${{ steps.token.outputs.token }}
           filters: |
@@ -132,7 +132,7 @@ jobs:
             suffixes: '-rocm'
             platforms: linux/amd64
             runner-mapping: '{"linux/amd64": "mich"}'
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@0477486d82313fba68f7c82c034120a4b8981297 # multi-runner-build-workflow-v2.1.0
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@fe13f89d76bce06e0f40ec521b074f77bcf05d12 # multi-runner-build-workflow-v2.2.0
     permissions:
       contents: read
       actions: read
@@ -155,7 +155,7 @@ jobs:
     name: Build and Push Server
     needs: pre-job
     if: ${{ fromJSON(needs.pre-job.outputs.should_run).server == true }}
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@0477486d82313fba68f7c82c034120a4b8981297 # multi-runner-build-workflow-v2.1.0
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@fe13f89d76bce06e0f40ec521b074f77bcf05d12 # multi-runner-build-workflow-v2.2.0
     permissions:
       contents: read
       actions: read

.github/workflows/docs-build.yml

@@ -21,14 +21,14 @@ jobs:
       should_run: ${{ steps.check.outputs.should_run }}
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@08bac802a312fc89808e0dd589271ca0974087b5 # pre-job-action-v2.0.0
+        uses: immich-app/devtools/actions/pre-job@4effdb9faa3c120fa03f487f0a476d55fc4cd9f2 # pre-job-action-v2.0.1
         with:
           github-token: ${{ steps.token.outputs.token }}
           filters: |
@@ -54,13 +54,13 @@ jobs:
 
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -70,7 +70,7 @@ jobs:
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './docs/.nvmrc'
           cache: 'pnpm'

.github/workflows/docs-deploy.yml

@@ -20,7 +20,7 @@ jobs:
       artifact: ${{ steps.get-artifact.outputs.result }}
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -119,19 +119,19 @@ jobs:
     if: ${{ fromJson(needs.checks.outputs.artifact).found && fromJson(needs.checks.outputs.parameters).shouldDeploy }}
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
 
       - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@cd24790a7f5f6439ac32cc94f5523cb2de8bfa8c # use-mise-action-v1.1.0
+        uses: immich-app/devtools/actions/use-mise@b868e6e7c8cc212beec876330b4059e661ee44bb # use-mise-action-v1.1.1
 
       - name: Load parameters
         id: parameters

.github/workflows/docs-destroy.yml

@@ -17,19 +17,19 @@ jobs:
       pull-requests: write
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
 
       - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@cd24790a7f5f6439ac32cc94f5523cb2de8bfa8c # use-mise-action-v1.1.0
+        uses: immich-app/devtools/actions/use-mise@b868e6e7c8cc212beec876330b4059e661ee44bb # use-mise-action-v1.1.1
 
       - name: Destroy Docs Subdomain
         env:

.github/workflows/fix-format.yml

@@ -22,7 +22,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: 'Checkout'
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           token: ${{ steps.generate-token.outputs.token }}
@@ -32,7 +32,7 @@ jobs:
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'

.github/workflows/pr-label-validation.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

.github/workflows/pr-labeler.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

.github/workflows/prepare-release.yml

@@ -56,20 +56,20 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: true
           ref: main
 
       - name: Install uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
 
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -136,7 +136,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: false

.github/workflows/preview-label.yaml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -32,7 +32,7 @@ jobs:
       pull-requests: write
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

.github/workflows/release-pr.yml

@@ -23,20 +23,20 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: true
           ref: main
 
       - name: Install uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
 
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'

.github/workflows/release.yml

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

.github/workflows/sdk.yml

@@ -17,12 +17,12 @@ jobs:
         working-directory: ./open-api/typescript-sdk
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -31,7 +31,7 @@ jobs:
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './open-api/typescript-sdk/.nvmrc'
           registry-url: 'https://registry.npmjs.org'

.github/workflows/static_analysis.yml

@@ -20,14 +20,14 @@ jobs:
       should_run: ${{ steps.check.outputs.should_run }}
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@08bac802a312fc89808e0dd589271ca0974087b5 # pre-job-action-v2.0.0
+        uses: immich-app/devtools/actions/pre-job@4effdb9faa3c120fa03f487f0a476d55fc4cd9f2 # pre-job-action-v2.0.1
         with:
           github-token: ${{ steps.token.outputs.token }}
           filters: |
@@ -49,13 +49,13 @@ jobs:
         working-directory: ./mobile
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/test.yml

@@ -17,14 +17,14 @@ jobs:
       should_run: ${{ steps.check.outputs.should_run }}
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@08bac802a312fc89808e0dd589271ca0974087b5 # pre-job-action-v2.0.0
+        uses: immich-app/devtools/actions/pre-job@4effdb9faa3c120fa03f487f0a476d55fc4cd9f2 # pre-job-action-v2.0.1
         with:
           github-token: ${{ steps.token.outputs.token }}
           filters: |
@@ -63,13 +63,13 @@ jobs:
         working-directory: ./server
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -77,7 +77,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -108,20 +108,20 @@ jobs:
         working-directory: ./cli
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './cli/.nvmrc'
           cache: 'pnpm'
@@ -155,20 +155,20 @@ jobs:
         working-directory: ./cli
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './cli/.nvmrc'
           cache: 'pnpm'
@@ -197,20 +197,20 @@ jobs:
         working-directory: ./web
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './web/.nvmrc'
           cache: 'pnpm'
@@ -241,20 +241,20 @@ jobs:
         working-directory: ./web
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './web/.nvmrc'
           cache: 'pnpm'
@@ -279,20 +279,20 @@ jobs:
       contents: read
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './web/.nvmrc'
           cache: 'pnpm'
@@ -327,20 +327,20 @@ jobs:
         working-directory: ./e2e
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './e2e/.nvmrc'
           cache: 'pnpm'
@@ -373,13 +373,13 @@ jobs:
         working-directory: ./server
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           submodules: 'recursive'
@@ -387,7 +387,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -412,13 +412,13 @@ jobs:
         runner: [ubuntu-latest, ubuntu-24.04-arm]
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           submodules: 'recursive'
@@ -426,7 +426,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './e2e/.nvmrc'
           cache: 'pnpm'
@@ -467,13 +467,13 @@ jobs:
         runner: [ubuntu-latest, ubuntu-24.04-arm]
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           submodules: 'recursive'
@@ -481,7 +481,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './e2e/.nvmrc'
           cache: 'pnpm'
@@ -502,12 +502,7 @@ jobs:
       - name: Run e2e tests (web)
         env:
           CI: true
-        run: npx playwright test --project=chromium
-        if: ${{ !cancelled() }}
-      - name: Run ui tests (web)
-        env:
-          CI: true
-        run: npx playwright test --project=ui
+        run: npx playwright test
         if: ${{ !cancelled() }}
       - name: Archive test results
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
@@ -534,12 +529,12 @@ jobs:
       contents: read
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -566,17 +561,17 @@ jobs:
         working-directory: ./machine-learning
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Install uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
         with:
           python-version: 3.11
       - name: Install dependencies
@@ -606,20 +601,20 @@ jobs:
         working-directory: ./.github
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './.github/.nvmrc'
           cache: 'pnpm'
@@ -636,12 +631,12 @@ jobs:
       contents: read
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -657,20 +652,20 @@ jobs:
       contents: read
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -719,20 +714,20 @@ jobs:
         working-directory: ./server
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'

.github/workflows/weblate-lock.yml

@@ -24,14 +24,14 @@ jobs:
       should_run: ${{ steps.check.outputs.should_run }}
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@08bac802a312fc89808e0dd589271ca0974087b5 # pre-job-action-v2.0.0
+        uses: immich-app/devtools/actions/pre-job@4effdb9faa3c120fa03f487f0a476d55fc4cd9f2 # pre-job-action-v2.0.1
         with:
           github-token: ${{ steps.token.outputs.token }}
           filters: |
@@ -47,7 +47,7 @@ jobs:
     if: ${{ fromJSON(needs.pre-job.outputs.should_run).i18n == true }}
     steps:
       - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

e2e/playwright.config.ts

@@ -39,13 +39,13 @@ const config: PlaywrightTestConfig = {
       testMatch: /.*\.e2e-spec\.ts/,
       workers: 1,
     },
-    {
-      name: 'ui',
-      use: { ...devices['Desktop Chrome'] },
-      testMatch: /.*\.ui-spec\.ts/,
-      fullyParallel: true,
-      workers: process.env.CI ? 3 : Math.max(1, Math.round(cpus().length * 0.75) - 1),
-    },
+    // {
+    //   name: 'parallel tests',
+    //   use: { ...devices['Desktop Chrome'] },
+    //   testMatch: /.*\.parallel-e2e-spec\.ts/,
+    //   fullyParallel: true,
+    //   workers: process.env.CI ? 3 : Math.max(1, Math.round(cpus().length * 0.75) - 1),
+    // },
 
     // {
     //   name: 'firefox',

i18n/en.json

@@ -512,7 +512,6 @@
   "all": "All",
   "all_albums": "All albums",
   "all_people": "All people",
-  "all_photos": "All photos",
   "all_videos": "All videos",
   "allow_dark_mode": "Allow dark mode",
   "allow_edits": "Allow edits",
@@ -520,9 +519,6 @@
   "allow_public_user_to_upload": "Allow public user to upload",
   "allowed": "Allowed",
   "alt_text_qr_code": "QR code image",
-  "always_keep": "Always keep",
-  "always_keep_photos_hint": "Free Up Space will keep all photos on this device.",
-  "always_keep_videos_hint": "Free Up Space will keep all videos on this device.",
   "anti_clockwise": "Anti-clockwise",
   "api_key": "API Key",
   "api_key_description": "This value will only be shown once. Please be sure to copy it before closing the window.",
@@ -755,14 +751,13 @@
   "cleanup_confirm_prompt_title": "Remove from this device?",
   "cleanup_deleted_assets": "Moved {count} assets to device trash",
   "cleanup_deleting": "Moving to trash...",
+  "cleanup_filter_description": "Choose which types of assets to remove in the cleanup",
   "cleanup_found_assets": "Found {count} backed up assets",
-  "cleanup_found_assets_with_size": "Found {count} backed up assets ({size})",
   "cleanup_icloud_shared_albums_excluded": "iCloud Shared Albums are excluded from the scan",
   "cleanup_no_assets_found": "No backed up assets found matching your criteria",
   "cleanup_preview_title": "Assets to remove ({count})",
-  "cleanup_step3_description": "Scan for backed up assets matching your date and keep settings.",
-  "cleanup_step4_summary": "{count} assets created before {date} are queued for removal from your device.",
-  "cleanup_storage_savings": "Free up {size} of storage",
+  "cleanup_step3_description": "Scan for photos and videos that have been backed up to the server with the selected cutoff date and filter options",
+  "cleanup_step4_summary": "{count} assets created before {date} are queued for removal from your device",
   "cleanup_trash_hint": "To fully reclaim storage space, open the system gallery app and empty the trash",
   "clear": "Clear",
   "clear_all": "Clear all",
@@ -1012,7 +1007,6 @@
   "error_change_sort_album": "Failed to change album sort order",
   "error_delete_face": "Error deleting face from asset",
   "error_getting_places": "Error getting places",
-  "error_loading_albums": "Error loading albums",
   "error_loading_image": "Error loading image",
   "error_loading_partners": "Error loading partners: {error}",
   "error_retrieving_asset_information": "Error retrieving asset information",
@@ -1195,6 +1189,7 @@
   "filetype": "Filetype",
   "filter": "Filter",
   "filter_description": "Conditions to filter the target assets",
+  "filter_options": "Filter options",
   "filter_people": "Filter people",
   "filter_places": "Filter places",
   "filters": "Filters",
@@ -1208,7 +1203,7 @@
   "forgot_pin_code_question": "Forgot your PIN?",
   "forward": "Forward",
   "free_up_space": "Free Up Space",
-  "free_up_space_description": "Move backed-up photos and videos to your device's trash to free up space. Your copies on the server remain safe.",
+  "free_up_space_description": "Move backed-up photos and videos to your device's trash to free up space. Your copies on the server remain safe",
   "free_up_space_settings_subtitle": "Free up device storage",
   "full_path": "Full path: {path}",
   "gcast_enabled": "Google Cast",
@@ -1325,15 +1320,10 @@
   "json_editor": "JSON editor",
   "json_error": "JSON error",
   "keep": "Keep",
-  "keep_albums": "Keep albums",
-  "keep_albums_count": "Keeping {count} {count, plural, one {album} other {albums}}",
   "keep_all": "Keep All",
-  "keep_description": "Choose what stays on your device when freeing up space.",
   "keep_favorites": "Keep favorites",
-  "keep_on_device": "Keep on device",
-  "keep_on_device_hint": "Select items to keep on this device",
+  "keep_favorites_description": "Favorite assets will not be deleted from your device",
   "keep_this_delete_others": "Keep this, delete others",
-  "keeping": "Keeping: {items}",
   "kept_this_deleted_others": "Kept this asset and deleted {count, plural, one {# asset} other {# assets}}",
   "keyboard_shortcuts": "Keyboard shortcuts",
   "language": "Language",
@@ -1563,7 +1553,6 @@
   "next_memory": "Next memory",
   "no": "No",
   "no_actions_added": "No actions added yet",
-  "no_albums_found": "No albums found",
   "no_albums_message": "Create an album to organize your photos and videos",
   "no_albums_with_name_yet": "It looks like you do not have any albums with this name yet.",
   "no_albums_yet": "It looks like you do not have any albums yet.",
@@ -1593,7 +1582,6 @@
   "no_results_description": "Try a synonym or more general keyword",
   "no_shared_albums_message": "Create an album to share photos and videos with people in your network",
   "no_uploads_in_progress": "No uploads in progress",
-  "none": "None",
   "not_allowed": "Not allowed",
   "not_available": "N/A",
   "not_in_any_album": "Not in any album",

mobile/lib/constants/enums.dart

@@ -8,6 +8,6 @@ enum SortUserBy { id }
 
 enum ActionSource { timeline, viewer }
 
-enum CleanupStep { selectDate, scan, delete }
+enum CleanupStep { selectDate, filterOptions, scan, delete }
 
-enum AssetKeepType { none, photosOnly, videosOnly }
+enum AssetFilterType { all, photosOnly, videosOnly }

mobile/lib/domain/models/store.model.dart

@@ -82,13 +82,7 @@ enum StoreKey<T> {
   useWifiForUploadPhotos<bool>._(1005),
   needBetaMigration<bool>._(1006),
   // TODO: Remove this after patching open-api
-  shouldResetSync<bool>._(1007),
-
-  // Free up space
-  cleanupKeepFavorites<bool>._(1008),
-  cleanupKeepMediaType<int>._(1009),
-  cleanupKeepAlbumIds<String>._(1010),
-  cleanupCutoffDaysAgo<int>._(1011);
+  shouldResetSync<bool>._(1007);
 
   const StoreKey._(this.id);
   final int id;

mobile/lib/infrastructure/repositories/local_asset.repository.dart

@@ -11,13 +11,6 @@ import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
-class RemovalCandidatesResult {
-  final List<LocalAsset> assets;
-  final int totalBytes;
-
-  const RemovalCandidatesResult({required this.assets, required this.totalBytes});
-}
-
 class DriftLocalAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
 
@@ -137,12 +130,11 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     return result;
   }
 
-  Future<RemovalCandidatesResult> getRemovalCandidates(
+  Future<List<LocalAsset>> getRemovalCandidates(
     String userId,
     DateTime cutoffDate, {
-    AssetKeepType keepMediaType = AssetKeepType.none,
+    AssetFilterType filterType = AssetFilterType.all,
     bool keepFavorites = true,
-    Set<String> keepAlbumIds = const {},
   }) async {
     final iosSharedAlbumAssets = _db.localAlbumAssetEntity.selectOnly()
       ..addColumns([_db.localAlbumAssetEntity.assetId])
@@ -157,7 +149,6 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
 
     final query = _db.localAssetEntity.select().join([
       innerJoin(_db.remoteAssetEntity, _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum)),
-      leftOuterJoin(_db.remoteExifEntity, _db.remoteAssetEntity.id.equalsExp(_db.remoteExifEntity.assetId)),
     ]);
 
     Expression<bool> whereClause =
@@ -168,19 +159,10 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     // Exclude assets that are in iOS shared albums
     whereClause = whereClause & _db.localAssetEntity.id.isNotInQuery(iosSharedAlbumAssets);
 
-    if (keepAlbumIds.isNotEmpty) {
-      final keepAlbumAssets = _db.localAlbumAssetEntity.selectOnly()
-        ..addColumns([_db.localAlbumAssetEntity.assetId])
-        ..where(_db.localAlbumAssetEntity.albumId.isIn(keepAlbumIds));
-      whereClause = whereClause & _db.localAssetEntity.id.isNotInQuery(keepAlbumAssets);
-    }
-
-    if (keepMediaType == AssetKeepType.photosOnly) {
-      // Keep photos = delete only videos
-      whereClause = whereClause & _db.localAssetEntity.type.equalsValue(AssetType.video);
-    } else if (keepMediaType == AssetKeepType.videosOnly) {
-      // Keep videos = delete only photos
+    if (filterType == AssetFilterType.photosOnly) {
       whereClause = whereClause & _db.localAssetEntity.type.equalsValue(AssetType.image);
+    } else if (filterType == AssetFilterType.videosOnly) {
+      whereClause = whereClause & _db.localAssetEntity.type.equalsValue(AssetType.video);
     }
 
     if (keepFavorites) {
@@ -190,13 +172,7 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     query.where(whereClause);
 
     final rows = await query.get();
-    final assets = rows.map((row) => row.readTable(_db.localAssetEntity).toDto()).toList();
-    final totalBytes = rows.fold<int>(0, (sum, row) {
-      final fileSize = row.readTableOrNull(_db.remoteExifEntity)?.fileSize;
-      return sum + (fileSize ?? 0);
-    });
-
-    return RemovalCandidatesResult(assets: assets, totalBytes: totalBytes);
+    return rows.map((row) => row.readTable(_db.localAssetEntity).toDto()).toList();
   }
 
   Future<List<LocalAsset>> getEmptyCloudIdAssets() {

mobile/lib/providers/cleanup.provider.dart

@@ -1,126 +1,65 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/cleanup.service.dart';
 
 class CleanupState {
   final DateTime? selectedDate;
   final List<LocalAsset> assetsToDelete;
-  final int totalBytes;
   final bool isScanning;
   final bool isDeleting;
-  final AssetKeepType keepMediaType;
+  final AssetFilterType filterType;
   final bool keepFavorites;
-  final Set<String> keepAlbumIds;
 
   const CleanupState({
     this.selectedDate,
     this.assetsToDelete = const [],
-    this.totalBytes = 0,
     this.isScanning = false,
     this.isDeleting = false,
-    this.keepMediaType = AssetKeepType.none,
+    this.filterType = AssetFilterType.all,
     this.keepFavorites = true,
-    this.keepAlbumIds = const {},
   });
 
   CleanupState copyWith({
     DateTime? selectedDate,
     List<LocalAsset>? assetsToDelete,
-    int? totalBytes,
     bool? isScanning,
     bool? isDeleting,
-    AssetKeepType? keepMediaType,
+    AssetFilterType? filterType,
     bool? keepFavorites,
-    Set<String>? keepAlbumIds,
   }) {
     return CleanupState(
       selectedDate: selectedDate ?? this.selectedDate,
       assetsToDelete: assetsToDelete ?? this.assetsToDelete,
-      totalBytes: totalBytes ?? this.totalBytes,
       isScanning: isScanning ?? this.isScanning,
       isDeleting: isDeleting ?? this.isDeleting,
-      keepMediaType: keepMediaType ?? this.keepMediaType,
+      filterType: filterType ?? this.filterType,
       keepFavorites: keepFavorites ?? this.keepFavorites,
-      keepAlbumIds: keepAlbumIds ?? this.keepAlbumIds,
     );
   }
 }
 
 final cleanupProvider = StateNotifierProvider<CleanupNotifier, CleanupState>((ref) {
-  return CleanupNotifier(
-    ref.watch(cleanupServiceProvider),
-    ref.watch(currentUserProvider)?.id,
-    ref.watch(appSettingsServiceProvider),
-  );
+  return CleanupNotifier(ref.watch(cleanupServiceProvider), ref.watch(currentUserProvider)?.id);
 });
 
 class CleanupNotifier extends StateNotifier<CleanupState> {
   final CleanupService _cleanupService;
   final String? _userId;
-  final AppSettingsService _appSettingsService;
 
-  CleanupNotifier(this._cleanupService, this._userId, this._appSettingsService) : super(const CleanupState()) {
-    _loadPersistedSettings();
-  }
-
-  void _loadPersistedSettings() {
-    final keepFavorites = _appSettingsService.getSetting(AppSettingsEnum.cleanupKeepFavorites);
-    final keepMediaTypeIndex = _appSettingsService.getSetting(AppSettingsEnum.cleanupKeepMediaType);
-    final keepAlbumIdsString = _appSettingsService.getSetting(AppSettingsEnum.cleanupKeepAlbumIds);
-    final cutoffDaysAgo = _appSettingsService.getSetting(AppSettingsEnum.cleanupCutoffDaysAgo);
-
-    final keepMediaType = AssetKeepType.values[keepMediaTypeIndex.clamp(0, AssetKeepType.values.length - 1)];
-    final keepAlbumIds = keepAlbumIdsString.isEmpty ? <String>{} : keepAlbumIdsString.split(',').toSet();
-    final selectedDate = cutoffDaysAgo >= 0 ? DateTime.now().subtract(Duration(days: cutoffDaysAgo)) : null;
-
-    state = state.copyWith(
-      keepFavorites: keepFavorites,
-      keepMediaType: keepMediaType,
-      keepAlbumIds: keepAlbumIds,
-      selectedDate: selectedDate,
-    );
-  }
+  CleanupNotifier(this._cleanupService, this._userId) : super(const CleanupState());
 
   void setSelectedDate(DateTime? date) {
     state = state.copyWith(selectedDate: date, assetsToDelete: []);
-    if (date != null) {
-      final daysAgo = DateTime.now().difference(date).inDays;
-      _appSettingsService.setSetting(AppSettingsEnum.cleanupCutoffDaysAgo, daysAgo);
-    }
   }
 
-  void setKeepMediaType(AssetKeepType keepMediaType) {
-    state = state.copyWith(keepMediaType: keepMediaType, assetsToDelete: []);
-    _appSettingsService.setSetting(AppSettingsEnum.cleanupKeepMediaType, keepMediaType.index);
+  void setFilterType(AssetFilterType filterType) {
+    state = state.copyWith(filterType: filterType, assetsToDelete: []);
   }
 
   void setKeepFavorites(bool keepFavorites) {
     state = state.copyWith(keepFavorites: keepFavorites, assetsToDelete: []);
-    _appSettingsService.setSetting(AppSettingsEnum.cleanupKeepFavorites, keepFavorites);
-  }
-
-  void toggleKeepAlbum(String albumId) {
-    final newKeepAlbumIds = Set<String>.from(state.keepAlbumIds);
-    if (newKeepAlbumIds.contains(albumId)) {
-      newKeepAlbumIds.remove(albumId);
-    } else {
-      newKeepAlbumIds.add(albumId);
-    }
-    state = state.copyWith(keepAlbumIds: newKeepAlbumIds, assetsToDelete: []);
-    _persistExcludedAlbumIds(newKeepAlbumIds);
-  }
-
-  void setExcludedAlbumIds(Set<String> albumIds) {
-    state = state.copyWith(keepAlbumIds: albumIds, assetsToDelete: []);
-    _persistExcludedAlbumIds(albumIds);
-  }
-
-  void _persistExcludedAlbumIds(Set<String> albumIds) {
-    _appSettingsService.setSetting(AppSettingsEnum.cleanupKeepAlbumIds, albumIds.join(','));
   }
 
   Future<void> scanAssets() async {
@@ -130,15 +69,13 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
 
     state = state.copyWith(isScanning: true);
     try {
-      final result = await _cleanupService.getRemovalCandidates(
+      final assets = await _cleanupService.getRemovalCandidates(
         _userId,
         state.selectedDate!,
-        keepMediaType: state.keepMediaType,
+        filterType: state.filterType,
         keepFavorites: state.keepFavorites,
-        keepAlbumIds: state.keepAlbumIds,
       );
-
-      state = state.copyWith(assetsToDelete: result.assets, totalBytes: result.totalBytes, isScanning: false);
+      state = state.copyWith(assetsToDelete: assets, isScanning: false);
     } catch (e) {
       state = state.copyWith(isScanning: false);
       rethrow;
@@ -164,7 +101,6 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
   }
 
   void reset() {
-    // Only reset transient state, keep the persisted filter settings
-    state = state.copyWith(selectedDate: null, assetsToDelete: [], isScanning: false, isDeleting: false);
+    state = const CleanupState();
   }
 }

mobile/lib/services/app_settings.service.dart

@@ -54,11 +54,7 @@ enum AppSettingsEnum<T> {
   readonlyModeEnabled<bool>(StoreKey.readonlyModeEnabled, "readonlyModeEnabled", false),
   albumGridView<bool>(StoreKey.albumGridView, "albumGridView", false),
   backupRequireCharging<bool>(StoreKey.backupRequireCharging, null, false),
-  backupTriggerDelay<int>(StoreKey.backupTriggerDelay, null, 30),
-  cleanupKeepFavorites<bool>(StoreKey.cleanupKeepFavorites, null, true),
-  cleanupKeepMediaType<int>(StoreKey.cleanupKeepMediaType, null, 0),
-  cleanupKeepAlbumIds<String>(StoreKey.cleanupKeepAlbumIds, null, ""),
-  cleanupCutoffDaysAgo<int>(StoreKey.cleanupCutoffDaysAgo, null, -1);
+  backupTriggerDelay<int>(StoreKey.backupTriggerDelay, null, 30);
 
   const AppSettingsEnum(this.storeKey, this.hiveKey, this.defaultValue);
 

mobile/lib/services/cleanup.service.dart

@@ -1,5 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
@@ -14,19 +15,17 @@ class CleanupService {
 
   const CleanupService(this._localAssetRepository, this._assetMediaRepository);
 
-  Future<RemovalCandidatesResult> getRemovalCandidates(
+  Future<List<LocalAsset>> getRemovalCandidates(
     String userId,
     DateTime cutoffDate, {
-    AssetKeepType keepMediaType = AssetKeepType.none,
+    AssetFilterType filterType = AssetFilterType.all,
     bool keepFavorites = true,
-    Set<String> keepAlbumIds = const {},
   }) {
     return _localAssetRepository.getRemovalCandidates(
       userId,
       cutoffDate,
-      keepMediaType: keepMediaType,
+      filterType: filterType,
       keepFavorites: keepFavorites,
-      keepAlbumIds: keepAlbumIds,
     );
   }
 

mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart

@@ -16,7 +16,6 @@ import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.da
 import 'package:immich_mobile/providers/locale_provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
-import 'package:immich_mobile/pages/common/settings.page.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:immich_mobile/widgets/common/app_bar_dialog/app_bar_profile_info.dart';
@@ -88,14 +87,6 @@ class ImmichAppBarDialog extends HookConsumerWidget {
       return buildActionButton(Icons.settings_outlined, "settings", () => context.pushRoute(const SettingsRoute()));
     }
 
-    buildFreeUpSpaceButton() {
-      return buildActionButton(
-        Icons.cleaning_services_outlined,
-        "free_up_space",
-        () => context.pushRoute(SettingsSubRoute(section: SettingSection.freeUpSpace)),
-      );
-    }
-
     buildAppLogButton() {
       return buildActionButton(
         Icons.assignment_outlined,
@@ -280,7 +271,6 @@ class ImmichAppBarDialog extends HookConsumerWidget {
                 const AppBarServerInfo(),
                 if (Store.isBetaTimelineEnabled && isReadonlyModeEnabled) buildReadonlyMessage(),
                 buildAppLogButton(),
-                buildFreeUpSpaceButton(),
                 buildSettingButton(),
                 buildSignOutButton(),
                 buildFooter(),

mobile/lib/widgets/settings/free_up_space_settings.dart

@@ -3,16 +3,13 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/cleanup.provider.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/utils/bytes_units.dart';
 
 class FreeUpSpaceSettings extends ConsumerStatefulWidget {
   const FreeUpSpaceSettings({super.key});
@@ -24,7 +21,6 @@ class FreeUpSpaceSettings extends ConsumerStatefulWidget {
 class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
   CleanupStep _currentStep = CleanupStep.selectDate;
   bool _hasScanned = false;
-  bool _isKeepSettingsExpanded = false;
 
   void _resetState() {
     ref.read(cleanupProvider.notifier).reset();
@@ -39,12 +35,17 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
     }
 
     if (state.selectedDate != null) {
-      return CleanupStep.scan;
+      return CleanupStep.filterOptions;
     }
 
     return CleanupStep.selectDate;
   }
 
+  void _goToFiltersStep() {
+    ref.read(hapticFeedbackProvider.notifier).mediumImpact();
+    setState(() => _currentStep = CleanupStep.filterOptions);
+  }
+
   void _goToScanStep() {
     ref.read(hapticFeedbackProvider.notifier).mediumImpact();
     setState(() => _currentStep = CleanupStep.scan);
@@ -82,17 +83,9 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
 
     if (picked != null) {
       ref.read(cleanupProvider.notifier).setSelectedDate(picked);
-      setState(() => _hasScanned = false);
     }
   }
 
-  void _onKeepSettingsChanged() {
-    setState(() {
-      _hasScanned = false;
-      _currentStep = CleanupStep.scan;
-    });
-  }
-
   Future<void> _scanAssets() async {
     ref.read(hapticFeedbackProvider.notifier).mediumImpact();
 
@@ -152,7 +145,6 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
     final subtitleStyle = context.textTheme.bodyMedium!.copyWith(
       color: context.textTheme.bodyMedium!.color!.withAlpha(215),
     );
-
     StepStyle styleForState(StepState stepState, {bool isDestructive = false}) {
       switch (stepState) {
         case StepState.complete:
@@ -182,38 +174,28 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
     }
 
     final step1State = hasDate ? StepState.complete : StepState.indexed;
-    final step2State = hasAssets
+    final step2State = hasDate ? StepState.complete : StepState.disabled;
+    final step3State = hasAssets
         ? StepState.complete
         : hasDate
         ? StepState.indexed
         : StepState.disabled;
-    final step3State = hasAssets ? StepState.indexed : StepState.disabled;
+    final step4State = hasAssets ? StepState.indexed : StepState.disabled;
 
-    final hasKeepSettings =
-        state.keepFavorites || state.keepAlbumIds.isNotEmpty || state.keepMediaType != AssetKeepType.none;
-
-    String getKeepSettingsSummary() {
+    String getFilterSubtitle() {
       final parts = <String>[];
-
-      if (state.keepMediaType == AssetKeepType.photosOnly) {
-        parts.add('all_photos'.t(context: context));
-      } else if (state.keepMediaType == AssetKeepType.videosOnly) {
-        parts.add('all_videos'.t(context: context));
+      switch (state.filterType) {
+        case AssetFilterType.all:
+          parts.add('all'.t(context: context));
+        case AssetFilterType.photosOnly:
+          parts.add('photos_only'.t(context: context));
+        case AssetFilterType.videosOnly:
+          parts.add('videos_only'.t(context: context));
       }
-
       if (state.keepFavorites) {
-        parts.add('favorites'.t(context: context).toLowerCase());
+        parts.add('keep_favorites'.t(context: context));
       }
-
-      if (state.keepAlbumIds.isNotEmpty) {
-        parts.add('keep_albums_count'.t(context: context, args: {'count': state.keepAlbumIds.length.toString()}));
-      }
-
-      if (parts.isEmpty) {
-        return 'none'.t(context: context);
-      }
-
-      return parts.join(', ');
+      return parts.join(' • ');
     }
 
     return PopScope(
@@ -238,125 +220,6 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
               ),
             ),
 
-            // Keep on device settings card
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 12.0),
-              child: Card(
-                elevation: 0,
-                shape: RoundedRectangleBorder(
-                  borderRadius: const BorderRadius.all(Radius.circular(12)),
-                  side: BorderSide(
-                    color: hasKeepSettings
-                        ? context.colorScheme.primary.withValues(alpha: 0.5)
-                        : context.colorScheme.outlineVariant,
-                    width: hasKeepSettings ? 1.5 : 1,
-                  ),
-                ),
-                color: hasKeepSettings
-                    ? context.colorScheme.primaryContainer.withValues(alpha: 0.15)
-                    : context.colorScheme.surfaceContainerLow,
-                child: Theme(
-                  data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
-                  child: ExpansionTile(
-                    initiallyExpanded: _isKeepSettingsExpanded,
-                    onExpansionChanged: (expanded) {
-                      setState(() => _isKeepSettingsExpanded = expanded);
-                    },
-                    leading: Icon(
-                      hasKeepSettings ? Icons.bookmark : Icons.bookmark_border,
-                      color: hasKeepSettings ? context.colorScheme.primary : context.colorScheme.onSurfaceVariant,
-                    ),
-                    title: Text(
-                      'keep_on_device'.t(context: context),
-                      style: context.textTheme.titleSmall?.copyWith(
-                        fontWeight: FontWeight.w600,
-                        color: hasKeepSettings ? context.colorScheme.primary : null,
-                      ),
-                    ),
-                    subtitle: Text(
-                      hasKeepSettings
-                          ? 'keeping'.t(context: context, args: {'items': getKeepSettingsSummary()})
-                          : 'keep_on_device_hint'.t(context: context),
-                      style: context.textTheme.bodySmall?.copyWith(
-                        color: hasKeepSettings ? context.colorScheme.primary : context.colorScheme.onSurfaceVariant,
-                      ),
-                    ),
-                    children: [
-                      Padding(
-                        padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.stretch,
-                          children: [
-                            Text('keep_description'.t(context: context), style: subtitleStyle),
-                            const SizedBox(height: 4),
-                            SwitchListTile(
-                              contentPadding: EdgeInsets.zero,
-                              title: Text(
-                                'keep_favorites'.t(context: context),
-                                style: context.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w500, height: 1.5),
-                              ),
-
-                              value: state.keepFavorites,
-                              onChanged: (value) {
-                                ref.read(cleanupProvider.notifier).setKeepFavorites(value);
-                                _onKeepSettingsChanged();
-                              },
-                            ),
-                            const SizedBox(height: 8),
-                            _KeepAlbumsSection(
-                              albumIds: state.keepAlbumIds,
-                              onAlbumToggled: (albumId) {
-                                ref.read(cleanupProvider.notifier).toggleKeepAlbum(albumId);
-                                _onKeepSettingsChanged();
-                              },
-                            ),
-                            const SizedBox(height: 16),
-                            Text(
-                              'always_keep'.t(context: context),
-                              style: context.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w500, height: 1.5),
-                            ),
-                            const SizedBox(height: 4),
-                            SegmentedButton<AssetKeepType>(
-                              segments: [
-                                const ButtonSegment(value: AssetKeepType.none, label: Text('—')),
-                                ButtonSegment(
-                                  value: AssetKeepType.photosOnly,
-                                  label: Text('photos'.t(context: context)),
-                                  icon: const Icon(Icons.photo),
-                                ),
-                                ButtonSegment(
-                                  value: AssetKeepType.videosOnly,
-                                  label: Text('videos'.t(context: context)),
-                                  icon: const Icon(Icons.videocam),
-                                ),
-                              ],
-                              selected: {state.keepMediaType},
-                              onSelectionChanged: (selection) {
-                                ref.read(cleanupProvider.notifier).setKeepMediaType(selection.first);
-                                _onKeepSettingsChanged();
-                              },
-                            ),
-                            if (state.keepMediaType != AssetKeepType.none) ...[
-                              const SizedBox(height: 8),
-                              Text(
-                                state.keepMediaType == AssetKeepType.photosOnly
-                                    ? 'always_keep_photos_hint'.t(context: context)
-                                    : 'always_keep_videos_hint'.t(context: context),
-                                style: context.textTheme.bodySmall?.copyWith(
-                                  color: context.colorScheme.onSurfaceVariant,
-                                ),
-                              ),
-                            ],
-                          ],
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-            const SizedBox(height: 8),
-
             Stepper(
               physics: const NeverScrollableScrollPhysics(),
               currentStep: _currentStep.index,
@@ -451,7 +314,7 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                       ),
                       const SizedBox(height: 16),
                       ElevatedButton.icon(
-                        onPressed: hasDate ? _goToScanStep : null,
+                        onPressed: hasDate ? () => _goToFiltersStep() : null,
                         icon: const Icon(Icons.arrow_forward),
                         label: Text('continue'.t(context: context)),
                         style: ElevatedButton.styleFrom(minimumSize: const Size(double.infinity, 48)),
@@ -462,11 +325,11 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                   state: step1State,
                 ),
 
-                // Step 2: Scan Assets
+                // Step 2: Select Filter Options
                 Step(
                   stepStyle: styleForState(step2State),
                   title: Text(
-                    'scan'.t(context: context),
+                    'filter_options'.t(context: context),
                     style: context.textTheme.titleMedium?.copyWith(
                       fontWeight: FontWeight.w600,
                       color: step2State == StepState.complete
@@ -476,20 +339,96 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                           : context.colorScheme.onSurface,
                     ),
                   ),
+                  subtitle: hasDate
+                      ? Text(
+                          getFilterSubtitle(),
+                          style: context.textTheme.bodyMedium?.copyWith(
+                            color: context.colorScheme.primary,
+                            fontWeight: FontWeight.w500,
+                          ),
+                        )
+                      : null,
+                  content: Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: [
+                      Text('cleanup_filter_description'.t(context: context), style: subtitleStyle),
+                      const SizedBox(height: 16),
+                      SegmentedButton<AssetFilterType>(
+                        segments: [
+                          ButtonSegment(
+                            value: AssetFilterType.all,
+                            label: Text('all'.t(context: context)),
+                            icon: const Icon(Icons.photo_library),
+                          ),
+                          ButtonSegment(
+                            value: AssetFilterType.photosOnly,
+                            label: Text('photos'.t(context: context)),
+                            icon: const Icon(Icons.photo),
+                          ),
+                          ButtonSegment(
+                            value: AssetFilterType.videosOnly,
+                            label: Text('videos'.t(context: context)),
+                            icon: const Icon(Icons.videocam),
+                          ),
+                        ],
+                        selected: {state.filterType},
+                        onSelectionChanged: (selection) {
+                          ref.read(cleanupProvider.notifier).setFilterType(selection.first);
+                          setState(() => _hasScanned = false);
+                        },
+                      ),
+                      const SizedBox(height: 16),
+                      SwitchListTile(
+                        contentPadding: EdgeInsets.zero,
+                        title: Text(
+                          'keep_favorites'.t(context: context),
+                          style: context.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w500, height: 1.5),
+                        ),
+                        subtitle: Text(
+                          'keep_favorites_description'.t(context: context),
+                          style: context.textTheme.bodyMedium!.copyWith(
+                            color: context.textTheme.bodyMedium!.color!.withAlpha(215),
+                          ),
+                        ),
+                        value: state.keepFavorites,
+                        onChanged: (value) {
+                          ref.read(cleanupProvider.notifier).setKeepFavorites(value);
+                          setState(() => _hasScanned = false);
+                        },
+                      ),
+                      const SizedBox(height: 16),
+                      ElevatedButton.icon(
+                        onPressed: _goToScanStep,
+                        icon: const Icon(Icons.arrow_forward),
+                        label: Text('continue'.t(context: context)),
+                        style: ElevatedButton.styleFrom(minimumSize: const Size(double.infinity, 48)),
+                      ),
+                    ],
+                  ),
+                  isActive: hasDate,
+                  state: step2State,
+                ),
+
+                // Step 3: Scan Assets
+                Step(
+                  stepStyle: styleForState(step3State),
+                  title: Text(
+                    'scan'.t(context: context),
+                    style: context.textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w600,
+                      color: step3State == StepState.complete
+                          ? context.colorScheme.primary
+                          : step3State == StepState.disabled
+                          ? context.colorScheme.onSurface.withValues(alpha: 0.38)
+                          : context.colorScheme.onSurface,
+                    ),
+                  ),
                   subtitle: _hasScanned
                       ? Text(
-                          state.totalBytes > 0
-                              ? 'cleanup_found_assets_with_size'.t(
-                                  context: context,
-                                  args: {
-                                    'count': state.assetsToDelete.length.toString(),
-                                    'size': formatBytes(state.totalBytes),
-                                  },
-                                )
-                              : 'cleanup_found_assets'.t(
-                                  context: context,
-                                  args: {'count': state.assetsToDelete.length.toString()},
-                                ),
+                          'cleanup_found_assets'.t(
+                            context: context,
+                            args: {'count': state.assetsToDelete.length.toString()},
+                          ),
                           style: context.textTheme.bodyMedium?.copyWith(
                             color: state.assetsToDelete.isNotEmpty
                                 ? context.colorScheme.primary
@@ -564,17 +503,17 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                     ],
                   ),
                   isActive: hasDate,
-                  state: step2State,
+                  state: step3State,
                 ),
 
-                // Step 3: Delete Assets
+                // Step 4: Delete Assets
                 Step(
-                  stepStyle: styleForState(step3State, isDestructive: true),
+                  stepStyle: styleForState(step4State, isDestructive: true),
                   title: Text(
                     'move_to_device_trash'.t(context: context),
                     style: context.textTheme.titleMedium?.copyWith(
                       fontWeight: FontWeight.w600,
-                      color: step3State == StepState.disabled
+                      color: step4State == StepState.disabled
                           ? context.colorScheme.onSurface.withValues(alpha: 0.38)
                           : context.colorScheme.error,
                     ),
@@ -590,33 +529,18 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                           border: Border.all(color: context.colorScheme.error.withValues(alpha: 0.3)),
                         ),
                         child: hasAssets
-                            ? Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Text(
-                                    'cleanup_step4_summary'.t(
-                                      context: context,
-                                      args: {
-                                        'count': state.assetsToDelete.length.toString(),
-                                        'date': DateFormat.yMMMd().format(state.selectedDate!),
-                                      },
-                                    ),
-                                    style: context.textTheme.labelLarge?.copyWith(fontSize: 15),
-                                  ),
-                                ],
+                            ? Text(
+                                'cleanup_step4_summary'.t(
+                                  context: context,
+                                  args: {
+                                    'count': state.assetsToDelete.length.toString(),
+                                    'date': DateFormat.yMMMd().format(state.selectedDate!),
+                                  },
+                                ),
+                                style: context.textTheme.labelLarge?.copyWith(fontSize: 15),
                               )
                             : null,
                       ),
-                      if (state.totalBytes > 0) ...[
-                        const SizedBox(height: 8),
-                        Text(
-                          'cleanup_storage_savings'.t(context: context, args: {'size': formatBytes(state.totalBytes)}),
-                          style: context.textTheme.titleMedium?.copyWith(
-                            fontWeight: FontWeight.bold,
-                            color: context.colorScheme.primary,
-                          ),
-                        ),
-                      ],
                       const SizedBox(height: 16),
                       OutlinedButton.icon(
                         onPressed: () => _showAssetsPreview(state.assetsToDelete),
@@ -649,7 +573,7 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                     ],
                   ),
                   isActive: hasAssets,
-                  state: step3State,
+                  state: step4State,
                 ),
               ],
             ),
@@ -777,107 +701,3 @@ class _DatePresetCard extends StatelessWidget {
     );
   }
 }
-
-class _KeepAlbumsSection extends ConsumerWidget {
-  final Set<String> albumIds;
-  final ValueChanged<String> onAlbumToggled;
-
-  const _KeepAlbumsSection({required this.albumIds, required this.onAlbumToggled});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final albumsAsync = ref.watch(localAlbumProvider);
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          'keep_albums'.t(context: context),
-          style: context.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w500, height: 1.5),
-        ),
-
-        const SizedBox(height: 8),
-        albumsAsync.when(
-          loading: () => const Center(
-            child: Padding(padding: EdgeInsets.all(16.0), child: CircularProgressIndicator(strokeWidth: 2)),
-          ),
-          error: (error, stack) => Text(
-            'error_loading_albums'.t(context: context),
-            style: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.error),
-          ),
-          data: (albums) {
-            if (albums.isEmpty) {
-              return Text(
-                'no_albums_found'.t(context: context),
-                style: context.textTheme.bodyMedium?.copyWith(
-                  color: context.colorScheme.onSurface.withValues(alpha: 0.6),
-                ),
-              );
-            }
-            return Container(
-              decoration: BoxDecoration(
-                border: Border.all(color: context.colorScheme.outlineVariant),
-                borderRadius: const BorderRadius.all(Radius.circular(12)),
-              ),
-              constraints: const BoxConstraints(maxHeight: 200),
-              child: ClipRRect(
-                borderRadius: const BorderRadius.all(Radius.circular(12)),
-                child: ListView.builder(
-                  shrinkWrap: true,
-                  itemCount: albums.length,
-                  itemBuilder: (context, index) {
-                    final album = albums[index];
-                    final isSelected = albumIds.contains(album.id);
-                    return _AlbumTile(album: album, isSelected: isSelected, onToggle: () => onAlbumToggled(album.id));
-                  },
-                ),
-              ),
-            );
-          },
-        ),
-        if (albumIds.isNotEmpty) ...[
-          const SizedBox(height: 8),
-          Text(
-            'keep_albums_count'.t(context: context, args: {'count': albumIds.length.toString()}),
-            style: context.textTheme.bodySmall?.copyWith(
-              color: context.colorScheme.primary,
-              fontWeight: FontWeight.w500,
-            ),
-          ),
-        ],
-      ],
-    );
-  }
-}
-
-class _AlbumTile extends StatelessWidget {
-  final LocalAlbum album;
-  final bool isSelected;
-  final VoidCallback onToggle;
-
-  const _AlbumTile({required this.album, required this.isSelected, required this.onToggle});
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      dense: true,
-      contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 0),
-      leading: Icon(
-        isSelected ? Icons.check_circle : Icons.circle_outlined,
-        color: isSelected ? context.colorScheme.primary : context.colorScheme.onSurfaceVariant,
-        size: 20,
-      ),
-      title: Text(
-        album.name,
-        style: context.textTheme.bodyMedium?.copyWith(color: isSelected ? context.colorScheme.primary : null),
-        maxLines: 1,
-        overflow: TextOverflow.ellipsis,
-      ),
-      trailing: Text(
-        album.assetCount.toString(),
-        style: context.textTheme.bodySmall?.copyWith(color: context.colorScheme.onSurfaceVariant),
-      ),
-      onTap: onToggle,
-    );
-  }
-}

mobile/test/infrastructure/repositories/local_asset_repository_test.dart

@@ -167,10 +167,10 @@ void main() {
       );
       await insertRemoteAsset(id: 'remote-6', checksum: 'checksum-6', ownerId: userId);
 
-      final result = await repository.getRemovalCandidates(userId, cutoffDate, keepFavorites: true);
+      final candidates = await repository.getRemovalCandidates(userId, cutoffDate, keepFavorites: true);
 
-      expect(result.assets.length, 1);
-      expect(result.assets[0].id, 'local-1');
+      expect(candidates.length, 1);
+      expect(candidates[0].id, 'local-1');
     });
 
     test('includes favorites when keepFavorites is false', () async {
@@ -183,78 +183,14 @@ void main() {
       );
       await insertRemoteAsset(id: 'remote-favorite', checksum: 'checksum-fav', ownerId: userId);
 
-      final result = await repository.getRemovalCandidates(userId, cutoffDate, keepFavorites: false);
+      final candidates = await repository.getRemovalCandidates(userId, cutoffDate, keepFavorites: false);
 
-      expect(result.assets.length, 1);
-      expect(result.assets[0].id, 'local-favorite');
-      expect(result.assets[0].isFavorite, true);
+      expect(candidates.length, 1);
+      expect(candidates[0].id, 'local-favorite');
+      expect(candidates[0].isFavorite, true);
     });
 
-    test('keepMediaType photosOnly returns only videos for deletion', () async {
-      // Photo - should be kept
-      await insertLocalAsset(
-        id: 'local-photo',
-        checksum: 'checksum-photo',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-photo', checksum: 'checksum-photo', ownerId: userId);
-
-      // Video - should be deleted
-      await insertLocalAsset(
-        id: 'local-video',
-        checksum: 'checksum-video',
-        createdAt: beforeCutoff,
-        type: AssetType.video,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-video', checksum: 'checksum-video', ownerId: userId);
-
-      final result = await repository.getRemovalCandidates(
-        userId,
-        cutoffDate,
-        keepMediaType: AssetKeepType.photosOnly,
-      );
-
-      expect(result.assets.length, 1);
-      expect(result.assets[0].id, 'local-video');
-      expect(result.assets[0].type, AssetType.video);
-    });
-
-    test('keepMediaType videosOnly returns only photos for deletion', () async {
-      // Photo - should be deleted
-      await insertLocalAsset(
-        id: 'local-photo',
-        checksum: 'checksum-photo',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-photo', checksum: 'checksum-photo', ownerId: userId);
-
-      // Video - should be kept
-      await insertLocalAsset(
-        id: 'local-video',
-        checksum: 'checksum-video',
-        createdAt: beforeCutoff,
-        type: AssetType.video,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-video', checksum: 'checksum-video', ownerId: userId);
-
-      final result = await repository.getRemovalCandidates(
-        userId,
-        cutoffDate,
-        keepMediaType: AssetKeepType.videosOnly,
-      );
-
-      expect(result.assets.length, 1);
-      expect(result.assets[0].id, 'local-photo');
-      expect(result.assets[0].type, AssetType.image);
-    });
-
-    test('returns both photos and videos with keepMediaType.all', () async {
+    test('filters by photos only', () async {
       // Photo
       await insertLocalAsset(
         id: 'local-photo',
@@ -275,10 +211,74 @@ void main() {
       );
       await insertRemoteAsset(id: 'remote-video', checksum: 'checksum-video', ownerId: userId);
 
-      final result = await repository.getRemovalCandidates(userId, cutoffDate, keepMediaType: AssetKeepType.none);
+      final candidates = await repository.getRemovalCandidates(
+        userId,
+        cutoffDate,
+        filterType: AssetFilterType.photosOnly,
+      );
 
-      expect(result.assets.length, 2);
-      final ids = result.assets.map((a) => a.id).toSet();
+      expect(candidates.length, 1);
+      expect(candidates[0].id, 'local-photo');
+      expect(candidates[0].type, AssetType.image);
+    });
+
+    test('filters by videos only', () async {
+      // Photo
+      await insertLocalAsset(
+        id: 'local-photo',
+        checksum: 'checksum-photo',
+        createdAt: beforeCutoff,
+        type: AssetType.image,
+        isFavorite: false,
+      );
+      await insertRemoteAsset(id: 'remote-photo', checksum: 'checksum-photo', ownerId: userId);
+
+      // Video
+      await insertLocalAsset(
+        id: 'local-video',
+        checksum: 'checksum-video',
+        createdAt: beforeCutoff,
+        type: AssetType.video,
+        isFavorite: false,
+      );
+      await insertRemoteAsset(id: 'remote-video', checksum: 'checksum-video', ownerId: userId);
+
+      final candidates = await repository.getRemovalCandidates(
+        userId,
+        cutoffDate,
+        filterType: AssetFilterType.videosOnly,
+      );
+
+      expect(candidates.length, 1);
+      expect(candidates[0].id, 'local-video');
+      expect(candidates[0].type, AssetType.video);
+    });
+
+    test('returns both photos and videos with filterType.all', () async {
+      // Photo
+      await insertLocalAsset(
+        id: 'local-photo',
+        checksum: 'checksum-photo',
+        createdAt: beforeCutoff,
+        type: AssetType.image,
+        isFavorite: false,
+      );
+      await insertRemoteAsset(id: 'remote-photo', checksum: 'checksum-photo', ownerId: userId);
+
+      // Video
+      await insertLocalAsset(
+        id: 'local-video',
+        checksum: 'checksum-video',
+        createdAt: beforeCutoff,
+        type: AssetType.video,
+        isFavorite: false,
+      );
+      await insertRemoteAsset(id: 'remote-video', checksum: 'checksum-video', ownerId: userId);
+
+      final candidates = await repository.getRemovalCandidates(userId, cutoffDate, filterType: AssetFilterType.all);
+
+      expect(candidates.length, 2);
+      final ids = candidates.map((a) => a.id).toSet();
       expect(ids, containsAll(['local-photo', 'local-video']));
     });
 
@@ -311,10 +311,10 @@ void main() {
       await insertRemoteAsset(id: 'remote-shared', checksum: 'checksum-shared', ownerId: userId);
       await insertLocalAlbumAsset(albumId: 'album-shared', assetId: 'local-shared');
 
-      final result = await repository.getRemovalCandidates(userId, cutoffDate);
+      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
 
-      expect(result.assets.length, 1);
-      expect(result.assets[0].id, 'local-regular');
+      expect(candidates.length, 1);
+      expect(candidates[0].id, 'local-regular');
     });
 
     test('includes assets at exact cutoff date', () async {
@@ -327,10 +327,10 @@ void main() {
       );
       await insertRemoteAsset(id: 'remote-exact', checksum: 'checksum-exact', ownerId: userId);
 
-      final result = await repository.getRemovalCandidates(userId, cutoffDate);
+      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
 
-      expect(result.assets.length, 1);
-      expect(result.assets[0].id, 'local-exact');
+      expect(candidates.length, 1);
+      expect(candidates[0].id, 'local-exact');
     });
 
     test('returns empty list when no assets match criteria', () async {
@@ -344,9 +344,9 @@ void main() {
       );
       await insertRemoteAsset(id: 'remote-after', checksum: 'checksum-after', ownerId: userId);
 
-      final result = await repository.getRemovalCandidates(userId, cutoffDate);
+      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
 
-      expect(result.assets, isEmpty);
+      expect(candidates, isEmpty);
     });
 
     test('handles multiple assets with same checksum', () async {
@@ -367,10 +367,10 @@ void main() {
       );
       await insertRemoteAsset(id: 'remote-dup', checksum: 'checksum-dup', ownerId: userId);
 
-      final result = await repository.getRemovalCandidates(userId, cutoffDate);
+      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
 
-      expect(result.assets.length, 2);
-      expect(result.assets.map((a) => a.checksum).toSet(), equals({'checksum-dup'}));
+      expect(candidates.length, 2);
+      expect(candidates.map((a) => a.checksum).toSet(), equals({'checksum-dup'}));
     });
 
     test('includes assets not in any album', () async {
@@ -384,10 +384,10 @@ void main() {
       );
       await insertRemoteAsset(id: 'remote-no-album', checksum: 'checksum-no-album', ownerId: userId);
 
-      final result = await repository.getRemovalCandidates(userId, cutoffDate);
+      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
 
-      expect(result.assets.length, 1);
-      expect(result.assets[0].id, 'local-no-album');
+      expect(candidates.length, 1);
+      expect(candidates[0].id, 'local-no-album');
     });
 
     test('excludes asset that is in both regular and iOS shared album', () async {
@@ -409,9 +409,9 @@ void main() {
       await insertLocalAlbumAsset(albumId: 'album-regular', assetId: 'local-both');
       await insertLocalAlbumAsset(albumId: 'album-shared', assetId: 'local-both');
 
-      final result = await repository.getRemovalCandidates(userId, cutoffDate);
+      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
 
-      expect(result.assets, isEmpty);
+      expect(candidates, isEmpty);
     });
 
     test('excludes assets with null checksum (not backed up)', () async {
@@ -430,218 +430,9 @@ void main() {
             ),
           );
 
-      final result = await repository.getRemovalCandidates(userId, cutoffDate);
+      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
 
-      expect(result.assets, isEmpty);
-    });
-
-    test('excludes assets in user-excluded albums', () async {
-      // Create two regular albums
-      await insertLocalAlbum(id: 'album-include', name: 'Include Album', isIosSharedAlbum: false);
-      await insertLocalAlbum(id: 'album-exclude', name: 'Exclude Album', isIosSharedAlbum: false);
-
-      // Asset in included album - should be included
-      await insertLocalAsset(
-        id: 'local-in-included',
-        checksum: 'checksum-included',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-included', checksum: 'checksum-included', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-include', assetId: 'local-in-included');
-
-      // Asset in excluded album - should NOT be included
-      await insertLocalAsset(
-        id: 'local-in-excluded',
-        checksum: 'checksum-excluded',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-excluded', checksum: 'checksum-excluded', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-exclude', assetId: 'local-in-excluded');
-
-      final result = await repository.getRemovalCandidates(userId, cutoffDate, keepAlbumIds: {'album-exclude'});
-
-      expect(result.assets.length, 1);
-      expect(result.assets[0].id, 'local-in-included');
-    });
-
-    test('excludes assets that are in any of multiple excluded albums', () async {
-      // Create multiple albums
-      await insertLocalAlbum(id: 'album-1', name: 'Album 1', isIosSharedAlbum: false);
-      await insertLocalAlbum(id: 'album-2', name: 'Album 2', isIosSharedAlbum: false);
-      await insertLocalAlbum(id: 'album-3', name: 'Album 3', isIosSharedAlbum: false);
-
-      // Asset in album-1 (excluded) - should NOT be included
-      await insertLocalAsset(
-        id: 'local-1',
-        checksum: 'checksum-1',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-1', checksum: 'checksum-1', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-1', assetId: 'local-1');
-
-      // Asset in album-2 (excluded) - should NOT be included
-      await insertLocalAsset(
-        id: 'local-2',
-        checksum: 'checksum-2',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-2', checksum: 'checksum-2', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-2', assetId: 'local-2');
-
-      // Asset in album-3 (not excluded) - should be included
-      await insertLocalAsset(
-        id: 'local-3',
-        checksum: 'checksum-3',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-3', checksum: 'checksum-3', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-3', assetId: 'local-3');
-
-      final result = await repository.getRemovalCandidates(
-        userId,
-        cutoffDate,
-        keepAlbumIds: {'album-1', 'album-2'},
-      );
-
-      expect(result.assets.length, 1);
-      expect(result.assets[0].id, 'local-3');
-    });
-
-    test('excludes asset that is in both excluded and non-excluded album', () async {
-      await insertLocalAlbum(id: 'album-included', name: 'Included Album', isIosSharedAlbum: false);
-      await insertLocalAlbum(id: 'album-excluded', name: 'Excluded Album', isIosSharedAlbum: false);
-
-      // Asset in BOTH albums - should be excluded because it's in an excluded album
-      await insertLocalAsset(
-        id: 'local-both',
-        checksum: 'checksum-both',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-both', checksum: 'checksum-both', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-included', assetId: 'local-both');
-      await insertLocalAlbumAsset(albumId: 'album-excluded', assetId: 'local-both');
-
-      final result = await repository.getRemovalCandidates(userId, cutoffDate, keepAlbumIds: {'album-excluded'});
-
-      expect(result.assets, isEmpty);
-    });
-
-    test('includes all assets when excludedAlbumIds is empty', () async {
-      await insertLocalAlbum(id: 'album-1', name: 'Album 1', isIosSharedAlbum: false);
-
-      await insertLocalAsset(
-        id: 'local-1',
-        checksum: 'checksum-1',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-1', checksum: 'checksum-1', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-1', assetId: 'local-1');
-
-      await insertLocalAsset(
-        id: 'local-2',
-        checksum: 'checksum-2',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-2', checksum: 'checksum-2', ownerId: userId);
-
-      // Empty excludedAlbumIds should include all eligible assets
-      final result = await repository.getRemovalCandidates(userId, cutoffDate, keepAlbumIds: {});
-
-      expect(result.assets.length, 2);
-    });
-
-    test('excludes asset not in any album when album is excluded', () async {
-      await insertLocalAlbum(id: 'album-excluded', name: 'Excluded Album', isIosSharedAlbum: false);
-
-      // Asset NOT in any album - should be included
-      await insertLocalAsset(
-        id: 'local-no-album',
-        checksum: 'checksum-no-album',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-no-album', checksum: 'checksum-no-album', ownerId: userId);
-
-      // Asset in excluded album - should NOT be included
-      await insertLocalAsset(
-        id: 'local-in-excluded',
-        checksum: 'checksum-in-excluded',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-in-excluded', checksum: 'checksum-in-excluded', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-excluded', assetId: 'local-in-excluded');
-
-      final result = await repository.getRemovalCandidates(userId, cutoffDate, keepAlbumIds: {'album-excluded'});
-
-      expect(result.assets.length, 1);
-      expect(result.assets[0].id, 'local-no-album');
-    });
-
-    test('combines excludedAlbumIds with keepMediaType correctly', () async {
-      await insertLocalAlbum(id: 'album-excluded', name: 'Excluded Album', isIosSharedAlbum: false);
-      await insertLocalAlbum(id: 'album-regular', name: 'Regular Album', isIosSharedAlbum: false);
-
-      // Photo in excluded album - should NOT be included (album excluded)
-      await insertLocalAsset(
-        id: 'local-photo-excluded',
-        checksum: 'checksum-photo-excluded',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-photo-excluded', checksum: 'checksum-photo-excluded', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-excluded', assetId: 'local-photo-excluded');
-
-      // Video in regular album - should be included (keepMediaType photosOnly = delete videos)
-      await insertLocalAsset(
-        id: 'local-video',
-        checksum: 'checksum-video',
-        createdAt: beforeCutoff,
-        type: AssetType.video,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-video', checksum: 'checksum-video', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-regular', assetId: 'local-video');
-
-      // Photo in regular album - should NOT be included (keepMediaType photosOnly = keep photos)
-      await insertLocalAsset(
-        id: 'local-photo-regular',
-        checksum: 'checksum-photo-regular',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-photo-regular', checksum: 'checksum-photo-regular', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-regular', assetId: 'local-photo-regular');
-
-      final result = await repository.getRemovalCandidates(
-        userId,
-        cutoffDate,
-        keepMediaType: AssetKeepType.photosOnly,
-        keepAlbumIds: {'album-excluded'},
-      );
-
-      expect(result.assets.length, 1);
-      expect(result.assets[0].id, 'local-video');
+      expect(candidates, isEmpty);
     });
   });
 }

pnpm-lock.yaml

@@ -36,7 +36,7 @@ importers:
         version: 1.20.1
       lodash-es:
         specifier: ^4.17.21
-        version: 4.17.23
+        version: 4.17.22
       micromatch:
         specifier: ^4.0.8
         version: 4.0.8
@@ -802,7 +802,7 @@ importers:
         version: 4.1.0
       lodash-es:
         specifier: ^4.17.21
-        version: 4.17.23
+        version: 4.17.22
       luxon:
         specifier: ^3.4.4
         version: 3.7.2
@@ -8916,8 +8916,8 @@ packages:
   lodash-es@4.17.21:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
 
-  lodash-es@4.17.23:
-    resolution: {integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==}
+  lodash-es@4.17.22:
+    resolution: {integrity: sha512-XEawp1t0gxSi9x01glktRZ5HDy0HXqrM0x5pXQM98EaI0NxO6jVM7omDOxsuEo5UIASAnm2bRp1Jt/e0a2XU8Q==}
 
   lodash.camelcase@4.3.0:
     resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
@@ -19332,7 +19332,7 @@ snapshots:
   chevrotain-allstar@0.3.1(chevrotain@11.0.3):
     dependencies:
       chevrotain: 11.0.3
-      lodash-es: 4.17.23
+      lodash-es: 4.17.22
 
   chevrotain@11.0.3:
     dependencies:
@@ -20027,7 +20027,7 @@ snapshots:
   dagre-d3-es@7.0.13:
     dependencies:
       d3: 7.9.0
-      lodash-es: 4.17.23
+      lodash-es: 4.17.22
 
   data-urls@3.0.2:
     dependencies:
@@ -22376,7 +22376,7 @@ snapshots:
 
   lodash-es@4.17.21: {}
 
-  lodash-es@4.17.23: {}
+  lodash-es@4.17.22: {}
 
   lodash.camelcase@4.3.0: {}
 
@@ -22810,7 +22810,7 @@ snapshots:
       dompurify: 3.3.1
       katex: 0.16.27
       khroma: 2.1.0
-      lodash-es: 4.17.23
+      lodash-es: 4.17.22
       marked: 16.4.2
       roughjs: 4.6.6
       stylis: 4.3.6
@@ -25714,7 +25714,7 @@ snapshots:
       json-source-map: 0.6.1
       jsonpath-plus: 10.3.0
       jsonrepair: 3.13.1
-      lodash-es: 4.17.23
+      lodash-es: 4.17.22
       memoize-one: 6.0.0
       natural-compare-lite: 1.4.0
       sass: 1.97.1

server/src/queries/asset.edit.repository.sql

@@ -15,5 +15,3 @@ from
   "asset_edit"
 where
   "assetId" = $1
-order by
-  "sequence" asc

server/src/repositories/asset-edit.repository.ts

@@ -12,14 +12,14 @@ export class AssetEditRepository {
   @GenerateSql({
     params: [DummyValue.UUID],
   })
-  replaceAll(assetId: string, edits: AssetEditActionItem[]): Promise<AssetEditActionItem[]> {
-    return this.db.transaction().execute(async (trx) => {
+  async replaceAll(assetId: string, edits: AssetEditActionItem[]): Promise<AssetEditActionItem[]> {
+    return await this.db.transaction().execute(async (trx) => {
       await trx.deleteFrom('asset_edit').where('assetId', '=', assetId).execute();
 
       if (edits.length > 0) {
         return trx
           .insertInto('asset_edit')
-          .values(edits.map((edit, i) => ({ assetId, sequence: i, ...edit })))
+          .values(edits.map((edit) => ({ assetId, ...edit })))
           .returning(['action', 'parameters'])
           .execute() as Promise<AssetEditActionItem[]>;
       }
@@ -31,12 +31,11 @@ export class AssetEditRepository {
   @GenerateSql({
     params: [DummyValue.UUID],
   })
-  getAll(assetId: string): Promise<AssetEditActionItem[]> {
+  async getAll(assetId: string): Promise<AssetEditActionItem[]> {
     return this.db
       .selectFrom('asset_edit')
       .select(['action', 'parameters'])
       .where('assetId', '=', assetId)
-      .orderBy('sequence', 'asc')
       .execute() as Promise<AssetEditActionItem[]>;
   }
 }

server/src/schema/migrations/1769105700133-AddAssetEditSequence.ts

@@ -1,14 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`DELETE FROM "asset_edit";`.execute(db);
-  await sql`ALTER TABLE "asset_edit" ADD "sequence" integer NOT NULL;`.execute(db);
-  await sql`ALTER TABLE "asset_edit" ADD CONSTRAINT "asset_edit_assetId_sequence_uq" UNIQUE ("assetId", "sequence");`.execute(
-    db,
-  );
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_edit" DROP CONSTRAINT "asset_edit_assetId_sequence_uq";`.execute(db);
-  await sql`ALTER TABLE "asset_edit" DROP COLUMN "sequence";`.execute(db);
-}

server/src/schema/tables/asset-edit.table.ts

@@ -9,7 +9,6 @@ import {
   Generated,
   PrimaryGeneratedColumn,
   Table,
-  Unique,
 } from 'src/sql-tools';
 
 @Table('asset_edit')
@@ -20,7 +19,6 @@ import {
   referencingOldTableAs: 'deleted_edit',
   when: 'pg_trigger_depth() = 0',
 })
-@Unique({ columns: ['assetId', 'sequence'] })
 export class AssetEditTable<T extends AssetEditAction = AssetEditAction> {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;
@@ -33,7 +31,4 @@ export class AssetEditTable<T extends AssetEditAction = AssetEditAction> {
 
   @Column({ type: 'jsonb' })
   parameters!: AssetEditActionParameter[T];
-
-  @Column({ type: 'integer' })
-  sequence!: number;
 }