Merge branch 'main' into apk-build-deployment

.github/workflows/build-mobile.yml

@@ -73,6 +73,7 @@ jobs:
     needs: pre-job
     permissions:
       contents: read
+      deployments: write
       pull-requests: write
     if: ${{ github.actor != 'dependabot[bot]' && fromJSON(needs.pre-job.outputs.should_run).mobile == true }}
     runs-on: mich
@@ -142,9 +143,18 @@ jobs:
           ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
           ANDROID_STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }}
           IS_MAIN: ${{ github.ref == 'refs/heads/main' }}
+          IS_MAIN_DEPLOYMENT: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+          IS_DEPLOYMENT_BUILD: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork) }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
         run: |
+          if [[ $IS_DEPLOYMENT_BUILD == 'true' ]]; then
+            export ANDROID_APP_LABEL='Immich Staging'
+          fi
+
           if [[ $IS_MAIN == 'true' ]]; then
+            if [[ $IS_MAIN_DEPLOYMENT == 'true' ]]; then
+              export ANDROID_APPLICATION_ID=app.immich.main
+            fi
             flutter build apk --release
             flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64
           else
@@ -158,6 +168,50 @@ jobs:
           name: release-apk-signed
           path: mobile/build/app/outputs/flutter-apk/*.apk
 
+      - name: Publish Android APK deployment
+        if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork) }}
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          APK_URL: ${{ steps.upload-apk.outputs.artifact-url }}
+        with:
+          script: |
+            const artifactUrl = process.env.APK_URL;
+            const isPullRequest = context.eventName === "pull_request";
+            const pullNumber = context.payload.pull_request?.number;
+            const environment = isPullRequest ? `mobile-android-apk-pr-${pullNumber}` : "mobile-android-apk";
+            const description = isPullRequest
+              ? `Signed Android APK for PR #${pullNumber}`
+              : "Latest signed Android APK from main";
+            const ref = isPullRequest ? context.payload.pull_request.head.sha : context.sha;
+
+            if (!artifactUrl) {
+              throw new Error("The Android APK artifact URL was not generated");
+            }
+
+            const runUrl = `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
+            const deployment = await github.rest.repos.createDeployment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref,
+              environment,
+              description,
+              auto_merge: false,
+              required_contexts: [],
+              production_environment: false,
+              transient_environment: isPullRequest,
+            });
+
+            await github.rest.repos.createDeploymentStatus({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              deployment_id: deployment.data.id,
+              state: "success",
+              environment,
+              environment_url: artifactUrl,
+              log_url: runUrl,
+              description: "Signed APK artifact is ready for testing",
+            });
+
       - name: Comment APK download link on PR
         if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork }}
         uses: immich-app/devtools/actions/sticky-comment@0135acd12ad9f3369b94a2aa3c0ae8c835a4e926 # sticky-comment-action-v1.0.0
@@ -237,7 +291,7 @@ jobs:
         run: flutter build ios --config-only --no-codesign
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@89f90524b88a01fe6e0b732220432cc6142926af # v1.313.0
+        uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
         with:
           ruby-version: '3.3'
           bundler-cache: true

.github/workflows/check-openapi.yml

@@ -25,7 +25,7 @@ jobs:
           persist-credentials: false
 
       - name: Check for breaking API changes
-        uses: oasdiff/oasdiff-action/breaking@3530478ec30f84adedbfeb28f0d9527a290f50a9 # v0.0.57
+        uses: oasdiff/oasdiff-action/breaking@a8c7f0e5649d20d623edb5b38446d3ab3d82d43c # v0.0.53
         with:
           base: https://raw.githubusercontent.com/${{ github.repository }}/main/open-api/immich-openapi-specs.json
           revision: open-api/immich-openapi-specs.json

.github/workflows/close-duplicates.yml

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

.github/workflows/docker.yml

@@ -132,7 +132,7 @@ jobs:
             suffixes: '-rocm'
             platforms: linux/amd64
             runner-mapping: '{"linux/amd64": "pokedex-large"}'
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@50dc3a14f0606ecd8fc28d78d3a3c655115ab695 # multi-runner-build-workflow-v3.1.0
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@db54dcf16fbb12c43479a23749ceea0ad1b4a704 # multi-runner-build-workflow-v3.0.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@50dc3a14f0606ecd8fc28d78d3a3c655115ab695 # multi-runner-build-workflow-v3.1.0
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@db54dcf16fbb12c43479a23749ceea0ad1b4a704 # multi-runner-build-workflow-v3.0.0
     permissions:
       contents: read
       actions: read

docs/mise.lock

@@ -1,8 +1,5 @@
 # @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
 
 [[tools.wrangler]]
-version = "4.98.0"
+version = "4.66.0"
 backend = "npm:wrangler"
-
-[tools.wrangler.options]
-allow_builds = '["esbuild", "sharp", "workerd"]'

e2e/package.json

@@ -32,7 +32,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.12.4",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
     "@types/supertest": "^7.0.0",
@@ -54,6 +54,7 @@
     "typescript": "^6.0.0",
     "typescript-eslint": "^8.28.0",
     "utimes": "^5.2.1",
+    "vite-tsconfig-paths": "^6.1.1",
     "vitest": "^4.0.0"
   }
 }

e2e/vitest.config.ts

@@ -1,3 +1,4 @@
+import tsconfigPaths from 'vite-tsconfig-paths';
 import { defineConfig } from 'vitest/config';
 
 const skipDockerSetup = process.env.VITEST_DISABLE_DOCKER_SETUP === 'true';
@@ -23,7 +24,5 @@ export default defineConfig({
     maxWorkers: 1,
     isolate: false,
   },
-  resolve: {
-    tsconfigPaths: true,
-  },
+  plugins: [tsconfigPaths()],
 });

e2e/vitest.maintenance.config.ts

@@ -1,3 +1,4 @@
+import tsconfigPaths from 'vite-tsconfig-paths';
 import { defineConfig } from 'vitest/config';
 
 const skipDockerSetup = process.env.VITEST_DISABLE_DOCKER_SETUP === 'true';
@@ -23,7 +24,5 @@ export default defineConfig({
     maxWorkers: 1,
     isolate: false,
   },
-  resolve: {
-    tsconfigPaths: true,
-  },
+  plugins: [tsconfigPaths()],
 });

i18n/en.json

@@ -189,23 +189,18 @@
     "machine_learning_smart_search_enabled": "Enable smart search",
     "machine_learning_smart_search_enabled_description": "If disabled, images will not be encoded for smart search.",
     "machine_learning_url_description": "The URL of the machine learning server. If more than one URL is provided, each server will be attempted one-at-a-time until one responds successfully, in order from first to last. Servers that don't respond will be temporarily ignored until they come back online.",
-    "maintenance_backup_management": "Backup management",
     "maintenance_delete_backup": "Delete Backup",
     "maintenance_delete_backup_description": "This file will be irrevocably deleted.",
     "maintenance_delete_error": "Failed to delete backup.",
-    "maintenance_integrity_check": "Check",
     "maintenance_integrity_check_all": "Check All",
     "maintenance_integrity_checksum_mismatch": "Checksum Mismatch",
-    "maintenance_integrity_checksum_mismatch_description": "Files whose on-disk checksum mismatches the checksum Immich has stored in its database.",
     "maintenance_integrity_checksum_mismatch_job": "Check for checksum mismatches",
     "maintenance_integrity_checksum_mismatch_refresh_job": "Refresh checksum mismatch reports",
     "maintenance_integrity_missing_file": "Missing Files",
-    "maintenance_integrity_missing_file_description": "Files that Immich has tracked in its database but do not exist on the file system.",
     "maintenance_integrity_missing_file_job": "Check for missing files",
     "maintenance_integrity_missing_file_refresh_job": "Refresh missing file reports",
     "maintenance_integrity_report": "Integrity Report",
     "maintenance_integrity_untracked_file": "Untracked Files",
-    "maintenance_integrity_untracked_file_description": "Files in Immich's directories that Immich does not have any record of.",
     "maintenance_integrity_untracked_file_job": "Check for untracked files",
     "maintenance_integrity_untracked_file_refresh_job": "Refresh untracked file reports",
     "maintenance_restore_backup": "Restore Backup",

mise.lock

@@ -95,56 +95,6 @@ checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952
 url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
 url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
 
-[[tools."github:jellyfin/jellyfin-ffmpeg"]]
-version = "7.1.3-6"
-backend = "github:jellyfin/jellyfin-ffmpeg"
-
-[tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_linux64-gpl.tar.xz"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-x64"]
-checksum = "sha256:39e99a7927468a6abec5f65d00f55010e8ff2ae3c2605294f179c94f6ae21af2"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linux64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048879"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-x64-musl"]
-checksum = "sha256:39e99a7927468a6abec5f65d00f55010e8ff2ae3c2605294f179c94f6ae21af2"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linux64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048879"
-
-[[tools."github:jellyfin/jellyfin-ffmpeg"]]
-version = "7.1.3-6"
-backend = "github:jellyfin/jellyfin-ffmpeg"
-
-[tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_macarm64-gpl.tar.xz"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-arm64"]
-checksum = "sha256:e024d5e78d5414e75f0181036cd21373fafb9270c72894dfd7dbda2572439820"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_macarm64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995838"
-
-[[tools."github:jellyfin/jellyfin-ffmpeg"]]
-version = "7.1.3-6"
-backend = "github:jellyfin/jellyfin-ffmpeg"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.windows-x64"]
-checksum = "sha256:7b7168149689610296f3a187c717056ce0786cc125a31caf28056737e9ba1cc1"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_win64-clang-gpl.zip"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409036094"
-
-[[tools."github:jellyfin/jellyfin-ffmpeg"]]
-version = "7.1.3-6"
-backend = "github:jellyfin/jellyfin-ffmpeg"
-
-[tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_mac64-gpl.tar.xz"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-x64"]
-checksum = "sha256:066ede9774aaae97a18098aaeea8b7e0d286653eb8618f640476e99c59a536c2"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_mac64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995889"
-
 [[tools."github:webassembly/binaryen"]]
 version = "version_124"
 backend = "github:webassembly/binaryen"
@@ -208,33 +158,6 @@ url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c55847602
 checksum = "sha256:b6c17e747ae78cdd6de4d7532b3164b277daee97c007d3eaa2b39cca99882664"
 url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip"
 
-[[tools.java]]
-version = "21.0.2"
-backend = "core:java"
-
-[tools.java.options]
-shorthand_vendor = "openjdk"
-
-[tools.java."platforms.linux-arm64"]
-checksum = "sha256:08db1392a48d4eb5ea5315cf8f18b89dbaf36cda663ba882cf03c704c9257ec2"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-aarch64_bin.tar.gz"
-
-[tools.java."platforms.linux-x64"]
-checksum = "sha256:a2def047a73941e01a73739f92755f86b895811afb1f91243db214cff5bdac3f"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz"
-
-[tools.java."platforms.macos-arm64"]
-checksum = "sha256:b3d588e16ec1e0ef9805d8a696591bd518a5cea62567da8f53b5ce32d11d22e4"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-aarch64_bin.tar.gz"
-
-[tools.java."platforms.macos-x64"]
-checksum = "sha256:8fd09e15dc406387a0aba70bf5d99692874e999bf9cd9208b452b5d76ac922d3"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-x64_bin.tar.gz"
-
-[tools.java."platforms.windows-x64"]
-checksum = "sha256:b6c17e747ae78cdd6de4d7532b3164b277daee97c007d3eaa2b39cca99882664"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip"
-
 [[tools.node]]
 version = "24.15.0"
 backend = "core:node"

mobile/android/app/build.gradle

@@ -13,6 +13,16 @@ if (keystorePropertiesFile.exists()) {
   keystorePropertiesFile.withInputStream { keystoreProperties.load(it) }
 }
 
+def androidApplicationId = System.getenv("ANDROID_APPLICATION_ID")?.trim()
+if (!androidApplicationId) {
+  androidApplicationId = "app.alextran.immich"
+}
+
+def androidAppLabel = System.getenv("ANDROID_APP_LABEL")?.trim()
+if (!androidAppLabel) {
+  androidAppLabel = "Immich"
+}
+
 android {
   compileSdk = flutter.compileSdkVersion
   ndkVersion = flutter.ndkVersion
@@ -37,11 +47,12 @@ android {
   }
 
   defaultConfig {
-    applicationId "app.alextran.immich"
+    applicationId androidApplicationId
     minSdk = 26
     targetSdk = flutter.targetSdkVersion
     versionCode flutter.versionCode
     versionName flutter.versionName
+    manifestPlaceholders = [appLabel: androidAppLabel]
   }
 
   signingConfigs {

mobile/android/app/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
 
-  <application android:label="Immich" android:name=".ImmichApp" android:usesCleartextTraffic="true"
+  <application android:label="${appLabel}" android:name=".ImmichApp" android:usesCleartextTraffic="true"
     android:icon="@mipmap/ic_launcher" android:requestLegacyExternalStorage="true"
     android:largeHeap="true" android:enableOnBackInvokedCallback="false" android:allowBackup="false"
     android:networkSecurityConfig="@xml/network_security_config">

mobile/lib/constants/locales.dart

@@ -17,8 +17,7 @@ const Map<String, Locale> locales = {
   'Dutch (nl)': Locale('nl'),
   'English (United Kingdom) (en_GB)': Locale('en', 'GB'),
   'Estonian (et)': Locale('et'),
-  'Filipino (fil)': Locale('fil'),
-  'Filipino (Tagalog) (tl)': Locale('tl'),
+  'Filipino (tl)': Locale('tl'),
   'Finnish (fi)': Locale('fi'),
   'French (fr)': Locale('fr'),
   'Galician (gl)': Locale('gl'),

mobile/lib/domain/services/background_worker.service.dart

@@ -104,7 +104,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
   Future<void> onAndroidUpload(int? maxMinutes) async {
     final hashTimeout = Duration(minutes: _isBackupEnabled ? 3 : 6);
     final backupTimeout = maxMinutes != null ? Duration(minutes: maxMinutes - 1) : null;
-    await _optimizeDB();
     return _backgroundLoop(
       hashTimeout: hashTimeout,
       backupTimeout: backupTimeout,
@@ -124,11 +123,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
         return;
       }
 
-      // Only for Background Processing tasks
-      if (maxSeconds == null) {
-        await _optimizeDB();
-      }
-
       // Run sync local, sync remote, hash and backup concurrently so the bg
       // refresh task (20s budget) can make progress on all four instead of
       // racing them sequentially. Phases are independent at the data layer:
@@ -199,14 +193,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
     }
   }
 
-  Future<void> _optimizeDB() async {
-    try {
-      await (_drift.optimize(allTables: true), _driftLogger.optimize()).wait;
-    } catch (error, stack) {
-      dPrint(() => "Error during background worker optimize: $error, $stack");
-    }
-  }
-
   Future<void> _cleanup() async {
     await runZonedGuarded(_handleCleanup, (error, stack) {
       dPrint(() => "Error during background worker cleanup: $error, $stack");
@@ -235,7 +221,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
         if (nativeSyncApi != null) nativeSyncApi.cancelHashing(),
       ]);
       await workerManagerPatch.dispose().catchError((_) async {});
-      await Future.wait([LogService.I.dispose(), Store.dispose()]);
+      await Future.wait([LogService.I.dispose(), Store.dispose(), _drift.optimize(allTables: true)]);
       await _drift.close();
       await _driftLogger.close();
 

mobile/lib/domain/services/sync_linked_album.service.dart

@@ -7,6 +7,7 @@ import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
@@ -18,6 +19,7 @@ final syncLinkedAlbumServiceProvider = Provider(
     ref.watch(remoteAlbumRepository),
     ref.watch(driftAlbumApiRepositoryProvider),
     ref.watch(storeServiceProvider),
+    cancellation: ref.watch(cancellationProvider),
   ),
 );
 
@@ -26,17 +28,19 @@ class SyncLinkedAlbumService {
   final DriftRemoteAlbumRepository _remoteAlbumRepository;
   final DriftAlbumApiRepository _albumApiRepository;
   final StoreService _storeService;
+  final Completer<void>? _cancellation;
 
   SyncLinkedAlbumService(
     this._localAlbumRepository,
     this._remoteAlbumRepository,
     this._albumApiRepository,
-    this._storeService,
-  );
+    this._storeService, {
+    this._cancellation,
+  });
 
   final _log = Logger("SyncLinkedAlbumService");
 
-  Future<void> syncLinkedAlbums(String userId, {Completer<void>? cancellation}) async {
+  Future<void> syncLinkedAlbums(String userId) async {
     final selectedAlbums = await _localAlbumRepository.getBackupAlbums();
 
     await Future.wait(
@@ -60,7 +64,7 @@ class SyncLinkedAlbumService {
           final album = await _albumApiRepository.addAssets(
             remoteAlbum.id,
             assetIds,
-            abortTrigger: cancellation?.future,
+            abortTrigger: _cancellation?.future,
           );
           await _remoteAlbumRepository.addAssets(remoteAlbum.id, album.added);
         }

mobile/lib/domain/utils/sync_linked_album.dart

@@ -2,7 +2,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:logging/logging.dart';
 
 Future<void> syncLinkedAlbumsIsolated(ProviderContainer ref) {
@@ -11,7 +10,5 @@ Future<void> syncLinkedAlbumsIsolated(ProviderContainer ref) {
     Logger("SyncLinkedAlbum").warning("No user logged in, skipping linked album sync");
     return Future.value();
   }
-  return ref
-      .read(syncLinkedAlbumServiceProvider)
-      .syncLinkedAlbums(user.id, cancellation: ref.read(cancellationProvider));
+  return ref.read(syncLinkedAlbumServiceProvider).syncLinkedAlbums(user.id);
 }

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

@@ -2,7 +2,6 @@ import 'package:drift/drift.dart';
 import 'package:drift_sqlite_async/drift_sqlite_async.dart';
 import 'package:immich_mobile/infrastructure/entities/log.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.drift.dart';
-import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:sqlite_async/sqlite_async.dart';
 
 @DriftDatabase(tables: [LogMessageEntity])
@@ -14,14 +13,6 @@ class DriftLogger extends $DriftLogger {
   @override
   int get schemaVersion => 1;
 
-  Future<void> optimize() async {
-    try {
-      await customStatement('PRAGMA optimize=0x10002');
-    } catch (error) {
-      dPrint(() => 'Failed to optimize logger database: $error');
-    }
-  }
-
   @override
   MigrationStrategy get migration => MigrationStrategy(
     beforeOpen: (details) async {

mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart

@@ -6,12 +6,10 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -53,9 +51,7 @@ class _SharePreparingDialog extends StatelessWidget {
 }
 
 class _ShareFileTypeDialog extends StatelessWidget {
-  final bool showPreview;
-
-  const _ShareFileTypeDialog({this.showPreview = true});
+  const _ShareFileTypeDialog();
 
   @override
   Widget build(BuildContext context) {
@@ -70,12 +66,11 @@ class _ShareFileTypeDialog extends StatelessWidget {
             title: Text(context.t.share_original),
             onTap: () => context.pop(ShareAssetType.original),
           ),
-          if (showPreview)
-            ListTile(
-              leading: const Icon(Icons.photo_size_select_large_rounded),
-              title: Text(context.t.share_preview),
-              onTap: () => context.pop(ShareAssetType.preview),
-            ),
+          ListTile(
+            leading: const Icon(Icons.photo_size_select_large_rounded),
+            title: Text(context.t.share_preview),
+            onTap: () => context.pop(ShareAssetType.preview),
+          ),
         ],
       ),
       actions: [TextButton(onPressed: () => context.pop(), child: Text(context.t.cancel))],
@@ -90,16 +85,6 @@ class ShareActionButton extends ConsumerWidget {
 
   const ShareActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
 
-  Set<BaseAsset> _getSelectedAssets(WidgetRef ref) {
-    return switch (source) {
-      ActionSource.timeline => ref.read(multiSelectProvider).selectedAssets,
-      ActionSource.viewer => switch (ref.read(assetViewerProvider).currentAsset) {
-        BaseAsset asset => {asset},
-        null => const {},
-      },
-    };
-  }
-
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
       return;
@@ -114,14 +99,9 @@ class ShareActionButton extends ConsumerWidget {
       return;
     }
 
-    // only show preview option when at least one of the assets is not a video
-    // we cant share previews of videos
-    final assets = _getSelectedAssets(ref);
-    final showPreview = assets.isEmpty || assets.any((asset) => !asset.isVideo);
-
     final fileType = await showDialog<ShareAssetType>(
       context: context,
-      builder: (_) => _ShareFileTypeDialog(showPreview: showPreview),
+      builder: (_) => const _ShareFileTypeDialog(),
       useRootNavigator: false,
     );
 

mobile/lib/presentation/widgets/bottom_sheet/map_bottom_sheet.widget.dart

@@ -23,9 +23,7 @@ class MapBottomSheet extends StatelessWidget {
       resizeOnScroll: false,
       actions: [],
       backgroundColor: context.themeData.colorScheme.surface,
-      slivers: [
-        const SliverFillRemaining(hasScrollBody: false, child: SizedBox(height: 0, child: _ScopedMapTimeline())),
-      ],
+      slivers: [const SliverFillRemaining(hasScrollBody: true, child: _ScopedMapTimeline())],
     );
   }
 }

mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart

@@ -110,6 +110,9 @@ class _FixedSegmentRow extends ConsumerWidget {
     final timelineService = ref.read(timelineServiceProvider);
     final isDynamicLayout = columnCount <= (context.isMobile ? 2 : 3);
 
+    if (isScrubbing) {
+      return _buildPlaceholder(context);
+    }
     if (timelineService.hasRange(assetIndex, assetCount)) {
       return _buildAssetRow(
         context,
@@ -119,10 +122,6 @@ class _FixedSegmentRow extends ConsumerWidget {
       );
     }
 
-    if (isScrubbing) {
-      return _buildPlaceholder(context);
-    }
-
     return FutureBuilder<List<BaseAsset>>(
       future: timelineService.loadAssets(assetIndex, assetCount),
       builder: (context, snapshot) {

mobile/lib/presentation/widgets/timeline/timeline.widget.dart

@@ -21,8 +21,8 @@ import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.dart
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline_drag_region.dart';
-import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
@@ -181,13 +181,10 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   void _onEvent(Event event) {
     switch (event) {
       case ScrollToTopEvent():
-        {
-          final timelineState = ref.read(timelineStateProvider.notifier);
-          timelineState.setScrubbing(true);
-          _scrollController
-              .animateTo(0, duration: const Duration(milliseconds: 250), curve: Curves.easeInOut)
-              .whenComplete(() => timelineState.setScrubbing(false));
-        }
+        ref.read(timelineStateProvider.notifier).setScrubbing(true);
+        _scrollController
+            .animateTo(0, duration: const Duration(milliseconds: 250), curve: Curves.easeInOut)
+            .whenComplete(() => ref.read(timelineStateProvider.notifier).setScrubbing(false));
 
       case ScrollToDateEvent scrollToDateEvent:
         _scrollToDate(scrollToDateEvent.date);
@@ -252,7 +249,6 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   }
 
   void _scrollToDate(DateTime date) {
-    final timelineState = ref.read(timelineStateProvider.notifier);
     final asyncSegments = ref.read(timelineSegmentProvider);
     asyncSegments.whenData((segments) {
       // Find the segment that contains assets from the target date
@@ -279,16 +275,16 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
       if (fallbackSegment != null) {
         // Scroll to the segment with a small offset to show the header
         final targetOffset = fallbackSegment.startOffset - 50;
-        timelineState.setScrubbing(true);
+        ref.read(timelineStateProvider.notifier).setScrubbing(true);
         _scrollController
             .animateTo(
               targetOffset.clamp(0.0, _scrollController.position.maxScrollExtent),
               duration: const Duration(milliseconds: 500),
               curve: Curves.easeInOut,
             )
-            .whenComplete(() => timelineState.setScrubbing(false));
+            .whenComplete(() => ref.read(timelineStateProvider.notifier).setScrubbing(false));
       } else {
-        timelineState.setScrubbing(false);
+        ref.read(timelineStateProvider.notifier).setScrubbing(false);
       }
     });
   }
@@ -305,19 +301,19 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   void _stopDrag() {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       // Update the physics post frame to prevent sudden change in physics on iOS.
-      if (mounted) {
-        setState(() {
-          _scrollPhysics = null;
-        });
-      }
+      setState(() {
+        _scrollPhysics = null;
+      });
     });
     setState(() {
       _dragging = false;
       _draggedAssets.clear();
     });
-    final timelineState = ref.read(timelineStateProvider.notifier);
+    // Reset the scrolling state after a small delay to allow bottom sheet to expand again
     Future.delayed(const Duration(milliseconds: 300), () {
-      timelineState.setScrolling(false);
+      if (mounted) {
+        ref.read(timelineStateProvider.notifier).setScrolling(false);
+      }
     });
   }
 

mobile/lib/repositories/asset_media.repository.dart

@@ -285,9 +285,7 @@ class AssetMediaRepository {
         return 0;
       }
 
-      final effectiveFileType = asset.isVideo ? ShareAssetType.original : fileType;
-
-      final shareFile = switch (effectiveFileType) {
+      final shareFile = switch (fileType) {
         ShareAssetType.original => await _getOriginalShareFile(
           asset,
           cancelCompleter: cancelCompleter,

mobile/mise.lock

@@ -64,76 +64,6 @@ checksum = "sha256:f133470daa3fb0427f039b424392af7e917d7e7db6b556aa2a968ab0e3158
 url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-windows-release.zip"
 url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543660"
 
-[[tools."github:CQLabs/homebrew-dcm"]]
-version = "1.37.0"
-backend = "github:CQLabs/homebrew-dcm"
-
-[tools."github:CQLabs/homebrew-dcm".options]
-asset_pattern = "dcm-linux-arm-release.zip"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.linux-arm64"]
-checksum = "sha256:253da2512b149913dfe345bf9a62a79acb2d730f66e71162ba4a92dfc4224b82"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-arm-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543838"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.linux-arm64-musl"]
-checksum = "sha256:253da2512b149913dfe345bf9a62a79acb2d730f66e71162ba4a92dfc4224b82"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-arm-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543838"
-
-[[tools."github:CQLabs/homebrew-dcm"]]
-version = "1.37.0"
-backend = "github:CQLabs/homebrew-dcm"
-
-[tools."github:CQLabs/homebrew-dcm".options]
-asset_pattern = "dcm-linux-x64-release.zip"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.linux-x64"]
-checksum = "sha256:477e086d4099c12f21e5ccd83b005d5fb945dd4cac4fd127fd9a08d7649af1cf"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-x64-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543797"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.linux-x64-musl"]
-checksum = "sha256:477e086d4099c12f21e5ccd83b005d5fb945dd4cac4fd127fd9a08d7649af1cf"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-x64-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543797"
-
-[[tools."github:CQLabs/homebrew-dcm"]]
-version = "1.37.0"
-backend = "github:CQLabs/homebrew-dcm"
-
-[tools."github:CQLabs/homebrew-dcm".options]
-asset_pattern = "dcm-macos-x64-release.zip"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.macos-x64"]
-checksum = "sha256:e56cb99872be7445a4de1d37e5438ca70e3bcd83be7a2b9b385e3538881f8068"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-macos-x64-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543727"
-
-[[tools."github:CQLabs/homebrew-dcm"]]
-version = "1.37.0"
-backend = "github:CQLabs/homebrew-dcm"
-
-[tools."github:CQLabs/homebrew-dcm".options]
-asset_pattern = "dcm-windows-release.zip"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.windows-x64"]
-checksum = "sha256:f133470daa3fb0427f039b424392af7e917d7e7db6b556aa2a968ab0e31587da"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-windows-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543660"
-
-[[tools."github:CQLabs/homebrew-dcm"]]
-version = "1.37.0"
-backend = "github:CQLabs/homebrew-dcm"
-
-[tools."github:CQLabs/homebrew-dcm".options]
-asset_pattern = "dcm-macos-arm-release.zip"
-
-[tools."github:CQLabs/homebrew-dcm"."platforms.macos-arm64"]
-checksum = "sha256:30bede64367d09067093cc57af6ec9496d7717898138ded5cb98a16ac8dd9d93"
-url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-macos-arm-release.zip"
-url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543757"
-
 [[tools.java]]
 version = "21.0.2"
 backend = "core:java"
@@ -157,30 +87,3 @@ url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c55847602
 [tools.java."platforms.windows-x64"]
 checksum = "sha256:b6c17e747ae78cdd6de4d7532b3164b277daee97c007d3eaa2b39cca99882664"
 url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip"
-
-[[tools.java]]
-version = "21.0.2"
-backend = "core:java"
-
-[tools.java.options]
-shorthand_vendor = "openjdk"
-
-[tools.java."platforms.linux-arm64"]
-checksum = "sha256:08db1392a48d4eb5ea5315cf8f18b89dbaf36cda663ba882cf03c704c9257ec2"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-aarch64_bin.tar.gz"
-
-[tools.java."platforms.linux-x64"]
-checksum = "sha256:a2def047a73941e01a73739f92755f86b895811afb1f91243db214cff5bdac3f"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz"
-
-[tools.java."platforms.macos-arm64"]
-checksum = "sha256:b3d588e16ec1e0ef9805d8a696591bd518a5cea62567da8f53b5ce32d11d22e4"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-aarch64_bin.tar.gz"
-
-[tools.java."platforms.macos-x64"]
-checksum = "sha256:8fd09e15dc406387a0aba70bf5d99692874e999bf9cd9208b452b5d76ac922d3"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-x64_bin.tar.gz"
-
-[tools.java."platforms.windows-x64"]
-checksum = "sha256:b6c17e747ae78cdd6de4d7532b3164b277daee97c007d3eaa2b39cca99882664"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip"

mobile/openapi/lib/model/asset_bulk_update_dto.dart

@@ -35,7 +35,7 @@ class AssetBulkUpdateDto {
   ///
   Optional<String?> dateTimeOriginal;
 
-  /// Relative time offset in minutes
+  /// Relative time offset in seconds
   ///
   /// Minimum value: -9007199254740991
   /// Maximum value: 9007199254740991

mobile/openapi/lib/model/asset_bulk_upload_check_item.dart

@@ -20,7 +20,7 @@ class AssetBulkUploadCheckItem {
   /// Base64 or hex encoded SHA1 hash
   String checksum;
 
-  /// Client-side identifier echoed in the response to match results to inputs (e.g. filename)
+  /// Asset ID
   String id;
 
   @override

mobile/test/domain/services/sync_linked_album_service_test.dart

@@ -1,44 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
-import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
-import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
-
-import '../../infrastructure/repository.mock.dart';
-import '../service.mock.dart';
-
-void main() {
-  // A container with the service's deps overridden but cancellationProvider left
-  // alone, i.e. the root (main) isolate, where cancellationProvider has no
-  // override and throws if read. The UI reads this provider here.
-  ProviderContainer rootContainer() {
-    final container = ProviderContainer(
-      overrides: [
-        localAlbumRepository.overrideWithValue(MockLocalAlbumRepository()),
-        remoteAlbumRepository.overrideWithValue(MockRemoteAlbumRepository()),
-        driftAlbumApiRepositoryProvider.overrideWithValue(MockDriftAlbumApiRepository()),
-        storeServiceProvider.overrideWithValue(MockStoreService()),
-      ],
-    );
-    addTearDown(container.dispose);
-    return container;
-  }
-
-  // Regression for #29125 (Sync Albums toggle) and #29119 (can't leave the album
-  // selection screen): #28694 made the provider watch cancellationProvider, so
-  // reading it off the isolate threw. The cancellation now lives on the isolate
-  // call path, not the provider, so the UI can build it.
-  test('builds on the root isolate without a cancellationProvider override', () {
-    final container = rootContainer();
-
-    expect(() => container.read(syncLinkedAlbumServiceProvider), returnsNormally);
-    expect(container.read(syncLinkedAlbumServiceProvider), isA<SyncLinkedAlbumService>());
-  });
-
-  test('manageLinkedAlbums runs from the UI without a cancellation signal', () {
-    final service = rootContainer().read(syncLinkedAlbumServiceProvider);
-
-    expect(service.manageLinkedAlbums(const [], 'user-1'), completes);
-  });
-}

open-api/immich-openapi-specs.json

@@ -16868,7 +16868,7 @@
             "type": "string"
           },
           "dateTimeRelative": {
-            "description": "Relative time offset in minutes",
+            "description": "Relative time offset in seconds",
             "maximum": 9007199254740991,
             "minimum": -9007199254740991,
             "type": "integer"
@@ -16965,7 +16965,7 @@
             "type": "string"
           },
           "id": {
-            "description": "Client-side identifier echoed in the response to match results to inputs (e.g. filename)",
+            "description": "Asset ID",
             "type": "string"
           }
         },

package.json

@@ -16,7 +16,7 @@
     "pnpm": ">=10.0.0"
   },
   "devDependencies": {
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.12.4",
     "prettier": "^3.8.3",
     "prettier-plugin-sort-json": "^4.2.0",
     "semver": "^7.8.1",

packages/cli/package.json

@@ -25,7 +25,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.12.4",
     "@vitest/coverage-v8": "^4.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",

packages/plugin-sdk/package.json

@@ -28,7 +28,7 @@
   "devDependencies": {
     "@extism/js-pdk": "^1.1.1",
     "@immich/sdk": "workspace:*",
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.12.4",
     "esbuild": "^0.28.0",
     "tsc-alias": "^1.8.16",
     "typescript": "^5.9.3"

packages/sdk/package.json

@@ -24,7 +24,7 @@
     "@oazapfts/runtime": "^1.0.2"
   },
   "devDependencies": {
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.12.4",
     "typescript": "^6.0.0"
   }
 }

packages/sdk/src/fetch-client.ts

@@ -673,7 +673,7 @@ export type AssetMediaResponseDto = {
 export type AssetBulkUpdateDto = {
     /** Original date and time */
     dateTimeOriginal?: string;
-    /** Relative time offset in minutes */
+    /** Relative time offset in seconds */
     dateTimeRelative?: number;
     /** Asset description */
     description?: string;
@@ -696,7 +696,7 @@ export type AssetBulkUpdateDto = {
 export type AssetBulkUploadCheckItem = {
     /** Base64 or hex encoded SHA1 hash */
     checksum: string;
-    /** Client-side identifier echoed in the response to match results to inputs (e.g. filename) */
+    /** Asset ID */
     id: string;
 };
 export type AssetBulkUploadCheckDto = {

pnpm-lock.yaml

@@ -18,7 +18,7 @@ importers:
   .:
     devDependencies:
       '@types/node':
-        specifier: ^24.13.2
+        specifier: ^24.12.4
         version: 24.13.2
       prettier:
         specifier: ^3.8.3
@@ -136,7 +136,7 @@ importers:
         specifier: ^3.4.2
         version: 3.7.1
       '@types/node':
-        specifier: ^24.13.2
+        specifier: ^24.12.4
         version: 24.13.2
       '@types/pg':
         specifier: ^8.15.1
@@ -201,6 +201,9 @@ importers:
       utimes:
         specifier: ^5.2.1
         version: 5.2.1
+      vite-tsconfig-paths:
+        specifier: ^6.1.1
+        version: 6.1.1(typescript@6.0.3)(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0))
       vitest:
         specifier: ^4.0.0
         version: 4.1.9(@opentelemetry/api@1.9.1)(@types/node@24.13.2)(@vitest/coverage-v8@4.1.9)(happy-dom@20.10.3)(jsdom@26.1.0(canvas@3.2.3))(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0))
@@ -245,7 +248,7 @@ importers:
         specifier: ^4.13.1
         version: 4.13.4
       '@types/node':
-        specifier: ^24.13.2
+        specifier: ^24.12.4
         version: 24.13.2
       '@vitest/coverage-v8':
         specifier: ^4.0.0
@@ -344,7 +347,7 @@ importers:
         specifier: workspace:*
         version: link:../sdk
       '@types/node':
-        specifier: ^24.13.2
+        specifier: ^24.12.4
         version: 24.13.2
       esbuild:
         specifier: ^0.28.0
@@ -363,7 +366,7 @@ importers:
         version: 1.2.0
     devDependencies:
       '@types/node':
-        specifier: ^24.13.2
+        specifier: ^24.12.4
         version: 24.13.2
       typescript:
         specifier: ^6.0.0
@@ -673,7 +676,7 @@ importers:
         specifier: ^2.0.0
         version: 2.1.0
       '@types/node':
-        specifier: ^24.13.2
+        specifier: ^24.12.4
         version: 24.13.2
       '@types/nodemailer':
         specifier: ^8.0.0
@@ -13919,7 +13922,7 @@ snapshots:
     dependencies:
       '@babel/code-frame': 7.29.7
       '@babel/generator': 7.29.7
-      '@babel/parser': 7.29.7
+      '@babel/parser': 7.27.0
       '@babel/template': 7.29.7
       '@babel/types': 7.29.7
       debug: 4.4.3
@@ -18029,7 +18032,7 @@ snapshots:
 
   '@types/connect-history-api-fallback@1.5.4':
     dependencies:
-      '@types/express-serve-static-core': 5.1.1
+      '@types/express-serve-static-core': 4.19.8
       '@types/node': 24.13.2
 
   '@types/connect@3.4.38':
@@ -18379,7 +18382,7 @@ snapshots:
 
   '@types/pg-pool@2.0.7':
     dependencies:
-      '@types/pg': 8.20.0
+      '@types/pg': 8.15.6
 
   '@types/pg@8.15.6':
     dependencies:

server/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/immich-app/base-server-dev:202606161235@sha256:9f88b07acc8b7bf37a1dd3d5a19193f664443eaaab4e08e9f9341414c5e4b23f AS builder
+FROM ghcr.io/immich-app/base-server-dev:202606021219@sha256:63fa91aa011f6f2921dd32fe6d1be8d637e9bd7f3e3dd0c8e446afb31b282af4 AS builder
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
   CI=1 \
   COREPACK_HOME=/tmp \
@@ -80,7 +80,7 @@ RUN --mount=type=cache,id=pnpm-packages,target=/buildcache/pnpm-store \
   --mount=type=cache,id=mise-tools-${TARGETPLATFORM},target=/buildcache/mise \
   mise //:plugins
 
-FROM ghcr.io/immich-app/base-server-prod:202606161235@sha256:c6d59e3923f548d29a212b4dc51b6281a722cfa1da7972a009c0f3830f5762d6
+FROM ghcr.io/immich-app/base-server-prod:202606021219@sha256:6ef9ef5859492149af770a6c884b5e2ddbaeef99f8885ea5f2d9f73625a3d9ec
 
 WORKDIR /usr/src/app
 ENV NODE_ENV=production \

server/Dockerfile.dev

@@ -1,5 +1,5 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:202606161235@sha256:9f88b07acc8b7bf37a1dd3d5a19193f664443eaaab4e08e9f9341414c5e4b23f AS dev
+FROM ghcr.io/immich-app/base-server-dev:202606021219@sha256:63fa91aa011f6f2921dd32fe6d1be8d637e9bd7f3e3dd0c8e446afb31b282af4 AS dev
 
 
 COPY --from=ghcr.io/jdx/mise:2026.5.18@sha256:5bb3311994fa78cef307ca3077cdb18f9551da0886371fc26ea91ab56220ffc5 /usr/local/bin/mise /usr/local/bin/mise

server/package.json

@@ -138,7 +138,7 @@
     "@types/luxon": "^3.6.2",
     "@types/mock-fs": "^4.13.1",
     "@types/multer": "^2.0.0",
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.12.4",
     "@types/nodemailer": "^8.0.0",
     "@types/picomatch": "^4.0.0",
     "@types/pngjs": "^6.0.5",

server/src/dtos/asset-media.dto.ts

@@ -58,7 +58,7 @@ const AssetMediaCreateSchema = AssetMediaBaseSchema.extend({
 
 const AssetBulkUploadCheckItemSchema = z
   .object({
-    id: z.string().describe('Client-side identifier echoed in the response to match results to inputs (e.g. filename)'),
+    id: z.string().describe('Asset ID'),
     checksum: z.string().describe('Base64 or hex encoded SHA1 hash'),
   })
   .meta({ id: 'AssetBulkUploadCheckItem' });

server/src/dtos/asset.dto.ts

@@ -41,7 +41,7 @@ const UpdateAssetBaseSchema = z
 const AssetBulkUpdateBaseSchema = UpdateAssetBaseSchema.extend({
   ids: z.array(z.uuidv4()).describe('Asset IDs to update'),
   duplicateId: z.string().nullish().describe('Duplicate ID'),
-  dateTimeRelative: z.int().optional().describe('Relative time offset in minutes'),
+  dateTimeRelative: z.int().optional().describe('Relative time offset in seconds'),
   timeZone: z.string().optional().describe('Time zone (IANA timezone)'),
 });
 

web/src/lib/components/server-statistics/ServerStatisticsCard.svelte

@@ -12,11 +12,10 @@
     icon?: string;
     title: string;
     valuePromise: MaybePromise<ValueData>;
-    tooltip?: string;
     footer?: Snippet;
   }
 
-  let { icon, title, valuePromise, tooltip, footer }: Props = $props();
+  let { icon, title, valuePromise, footer }: Props = $props();
   const zeros = (data?: ValueData) => {
     let length = 13;
     if (data) {
@@ -33,7 +32,7 @@
     {#if icon}
       <Icon {icon} size="40" />
     {/if}
-    <Text size="giant" fontWeight="medium" title={tooltip}>{title}</Text>
+    <Text size="giant" fontWeight="medium">{title}</Text>
   </div>
 
   {#await valuePromise}

web/src/lib/elements/Badge.svelte

@@ -0,0 +1,18 @@
+<script lang="ts">
+  import type { Snippet } from 'svelte';
+
+  interface Props {
+    rounded?: boolean | 'full';
+    children?: Snippet;
+  }
+
+  let { rounded = true, children }: Props = $props();
+</script>
+
+<span
+  class="inline-block h-min bg-primary px-3 py-1 text-center align-baseline text-xs leading-none whitespace-nowrap text-subtle"
+  class:rounded-md={rounded === true}
+  class:rounded-full={rounded === 'full'}
+>
+  {@render children?.()}
+</span>

web/src/lib/modals/SearchFilterModal.svelte

@@ -11,7 +11,7 @@
   import { MediaType, QueryType, validQueryTypes } from '$lib/constants';
   import { authManager } from '$lib/managers/auth-manager.svelte';
   import type { SearchFilter } from '$lib/types';
-  import { asLocalTimeISO, parseUtcDate } from '$lib/utils/date-time';
+  import { parseUtcDate } from '$lib/utils/date-time';
   import { generateId } from '$lib/utils/generate-id';
   import { AssetTypeEnum, AssetVisibility, type MetadataSearchDto, type SmartSearchDto } from '@immich/sdk';
   import { Button, HStack, Modal, ModalBody, ModalFooter } from '@immich/ui';
@@ -27,6 +27,7 @@
 
   let { searchQuery, onClose }: Props = $props();
 
+  const parseOptionalDate = (dateString?: DateTime) => (dateString ? parseUtcDate(dateString.toString()) : undefined);
   const toStartOfDayDate = (dateString: string) => parseUtcDate(dateString)?.startOf('day') || undefined;
   const formId = generateId();
 
@@ -143,12 +144,8 @@
       make: filter.camera.make,
       model: filter.camera.model,
       lensModel: filter.camera.lensModel,
-      takenAfter: filter.date.takenAfter
-        ? asLocalTimeISO(filter.date.takenAfter.startOf('day') as DateTime<true>)
-        : undefined,
-      takenBefore: filter.date.takenBefore
-        ? asLocalTimeISO(filter.date.takenBefore.endOf('day') as DateTime<true>)
-        : undefined,
+      takenAfter: parseOptionalDate(filter.date.takenAfter)?.startOf('day').toISO() || undefined,
+      takenBefore: parseOptionalDate(filter.date.takenBefore)?.endOf('day').toISO() || undefined,
       visibility: filter.display.isArchive ? AssetVisibility.Archive : undefined,
       isFavorite: filter.display.isFavorite || undefined,
       isNotInAlbum: filter.display.isNotInAlbum || undefined,

web/src/lib/utils/i18n.ts

@@ -116,7 +116,6 @@ const nonIntlNames: Record<string, string> = {
   kxm: 'Khmer Surin',
   mfa: 'Malay (Pattani)',
   swg: 'Schwäbisch',
-  tl: 'Tagalog',
 };
 
 const getLanguageName = (code: string) =>

web/src/routes/admin/maintenance/+page.svelte

@@ -21,7 +21,6 @@
   import { onMount } from 'svelte';
   import { t, type Translations } from 'svelte-i18n';
   import type { PageData } from './$types';
-  import { SvelteSet } from 'svelte/reactivity';
 
   type Props = {
     data: PageData;
@@ -51,7 +50,7 @@
   };
 
   let jobs: QueuesResponseLegacyDto | undefined = $state();
-  const activeJobs = new SvelteSet<ManualJobName>();
+  let expectingUpdate: boolean = $state(false);
 
   const getReportTypeTranslation = (report: IntegrityReport): Translations => {
     switch (report) {
@@ -67,27 +66,13 @@
     }
   };
 
-  const getReportTypeDescriptionKey = (report: IntegrityReport): Translations => {
-    switch (report) {
-      case IntegrityReport.UntrackedFile: {
-        return 'admin.maintenance_integrity_untracked_file_description';
-      }
-      case IntegrityReport.MissingFile: {
-        return 'admin.maintenance_integrity_missing_file_description';
-      }
-      case IntegrityReport.ChecksumMismatch: {
-        return 'admin.maintenance_integrity_checksum_mismatch_description';
-      }
-    }
-  };
-
   const updateReports = async () => {
     jobs = await getQueuesLegacy();
     if (jobs.integrityCheck.queueStatus.isActive) {
-      activeJobs.add(ManualJobName.IntegrityUntrackedFilesRefresh);
-    } else if (activeJobs.size > 0) {
-      activeJobs.clear();
+      expectingUpdate = true;
+    } else if (expectingUpdate) {
       integrityReport = await getIntegrityReportSummary();
+      expectingUpdate = false;
     }
   };
 
@@ -99,7 +84,7 @@
 
   const onJobCreate = ({ dto }: { dto: JobCreateDto }) => {
     if ((Object.values(jobNames).includes(dto.name) || Object.values(refreshJobNames).includes(dto.name)) && jobs) {
-      activeJobs.add(dto.name);
+      expectingUpdate = true;
       jobs.integrityCheck.queueStatus.isActive = true;
     }
   };
@@ -121,7 +106,7 @@
             }
           }}
           class="mt-1 self-end"
-          disabled={activeJobs.size > 0}>{$t('admin.maintenance_integrity_check_all')}</Button
+          disabled={expectingUpdate}>{$t('admin.maintenance_integrity_check_all')}</Button
         >
         <Button
           size="tiny"
@@ -132,7 +117,7 @@
             }
           }}
           class="mt-1 self-end"
-          disabled={activeJobs.size > 0}>{$t('refresh')}</Button
+          disabled={expectingUpdate}>{$t('refresh')}</Button
         ></HStack
       >
 
@@ -140,36 +125,36 @@
         {#each reportTypes as reportType (reportType)}
           <ServerStatisticsCard
             title={$t(getReportTypeTranslation(reportType))}
-            tooltip={$t(getReportTypeDescriptionKey(reportType))}
             valuePromise={{ value: integrityReport[reportType] }}
           >
             {#snippet footer()}
-              <HStack gap={1} class="justify-between">
-                <HStack gap={0}>
-                  <Button
-                    onclick={() =>
-                      handleCreateJob({
-                        name: jobNames[reportType],
-                      })}
-                    size="tiny"
-                    variant="ghost"
-                    disabled={activeJobs.has(jobNames[reportType])}>{$t('admin.maintenance_integrity_check')}</Button
-                  >
-                  <Button
-                    onclick={() =>
-                      handleCreateJob({
-                        name: refreshJobNames[reportType],
-                      })}
-                    size="tiny"
-                    variant="ghost"
-                    disabled={activeJobs.has(refreshJobNames[reportType])}>{$t('refresh')}</Button
-                  >
-                </HStack>
+              <HStack gap={1} class="justify-end">
+                <Button
+                  onclick={() =>
+                    handleCreateJob({
+                      name: jobNames[reportType],
+                    })}
+                  size="tiny"
+                  variant="ghost"
+                  class="mt-1 self-end"
+                  disabled={expectingUpdate}>{$t('admin.maintenance_integrity_check_all')}</Button
+                >
+                <Button
+                  onclick={() =>
+                    handleCreateJob({
+                      name: refreshJobNames[reportType],
+                    })}
+                  size="tiny"
+                  variant="ghost"
+                  class="mt-1 self-end"
+                  disabled={expectingUpdate}>{$t('refresh')}</Button
+                >
                 <Button
                   href={`${Route.systemMaintenanceIntegrityReport({
                     reportType,
                   })}`}
-                  size="tiny">{$t('view')}</Button
+                  size="tiny"
+                  class="mt-1 self-end">{$t('view')}</Button
                 >
               </HStack>
             {/snippet}
@@ -181,7 +166,7 @@
 
   <section id="setting-content" class="flex place-content-center sm:mx-4">
     <section class="w-full pb-28 sm:w-5/6 md:w-212.5">
-      <Text size="small">{$t('admin.maintenance_backup_management')}</Text>
+      <Text size="small">{$t('admin.maintenance_settings')}</Text>
 
       <SettingAccordion
         title={$t('admin.maintenance_restore_database_backup')}

web/src/routes/admin/queues/QueueCard.svelte

@@ -2,12 +2,13 @@
   import { cleanClass } from '$lib';
   import QueueCardBadge from './QueueCardBadge.svelte';
   import QueueCardButton from './QueueCardButton.svelte';
+  import Badge from '$lib/elements/Badge.svelte';
   import { Route } from '$lib/route';
   import { asQueueItem } from '$lib/services/queue.service';
   import { locale } from '$lib/stores/preferences.store';
   import { transformToTitleCase } from '$lib/utils';
   import { QueueCommand, type QueueCommandDto, type QueueResponseDto } from '@immich/sdk';
-  import { Badge, Icon, IconButton, Link } from '@immich/ui';
+  import { Icon, IconButton, Link } from '@immich/ui';
   import {
     mdiAlertCircle,
     mdiAllInclusive,
@@ -66,16 +67,27 @@
         />
         <div class="flex gap-2">
           {#if statistics.failed > 0}
-            <Badge
-              onClose={() => onCommand({ command: QueueCommand.ClearFailed, force: false })}
-              translations={{ close: $t('clear_message') }}
-            >
-              {$t('admin.jobs_failed', { values: { jobCount: statistics.failed.toLocaleString($locale) } })}
+            <Badge>
+              <div class="flex flex-row gap-1">
+                <span class="text-sm">
+                  {$t('admin.jobs_failed', { values: { jobCount: statistics.failed.toLocaleString($locale) } })}
+                </span>
+                <IconButton
+                  color="primary"
+                  icon={mdiClose}
+                  aria-label={$t('clear_message')}
+                  size="tiny"
+                  shape="round"
+                  onclick={() => onCommand({ command: QueueCommand.ClearFailed, force: false })}
+                />
+              </div>
             </Badge>
           {/if}
           {#if statistics.delayed > 0}
             <Badge>
-              {$t('admin.jobs_delayed', { values: { jobCount: statistics.delayed.toLocaleString($locale) } })}
+              <span class="text-sm">
+                {$t('admin.jobs_delayed', { values: { jobCount: statistics.delayed.toLocaleString($locale) } })}
+              </span>
             </Badge>
           {/if}
         </div>