chore(deps): update dependency java to v25

2026-07-17 13:44:36 +03:00 · 2026-07-16 15:02:44 +00:00
65 changed files with 3549 additions and 3225 deletions
--- a/docs/docs/install/unraid.md
+++ b/docs/docs/install/unraid.md
@@ -121,7 +121,7 @@ alt="Go to Docker Tab and visit the address listed next to immich-web"
        width="90%"
        alt="Go to Docker Tab and visit the address listed next to immich-web"
    />
-
+    
 </details>

 :::tip
--- a/docs/mise.lock
+++ b/docs/mise.lock
@@ -1,7 +1,7 @@
 # @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html

 [[tools.wrangler]]
-version = "4.110.0"
+version = "4.100.0"
 backend = "npm:wrangler"

 [tools.wrangler.options]
--- a/docs/mise.toml
+++ b/docs/mise.toml
@@ -28,4 +28,4 @@ run = "prettier --write ."
 run = "wrangler pages deploy build --project-name=${PROJECT_NAME} --branch=${BRANCH_NAME}"

 [tools]
-wrangler = "4.110.0"
+wrangler = "4.100.0"
--- a/e2e/package.json
+++ b/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.3",
+    "@types/node": "^24.13.2",
    "@types/pg": "^8.15.1",
    "@types/pngjs": "^6.0.4",
    "@types/supertest": "^7.0.0",
--- a/mise.lock
+++ b/mise.lock
@@ -184,33 +184,6 @@ checksum = "sha256:b5e1d2a1ad3c03229ddc89823848f4a1c11f9c6402a51fa26f0aaa5f1d7a2
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-windows.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288925833"

-[[tools.java]]
-version = "21.0.2"
-backend = "core:java"
-
-[tools.java.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"
@@ -287,43 +260,43 @@ url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.
 url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536406"

 [[tools.pnpm]]
-version = "11.11.0"
+version = "11.6.0"
 backend = "aqua:pnpm/pnpm"

 [tools.pnpm."platforms.linux-arm64"]
-checksum = "sha256:4871093439f036b3082df6102255ac119f3b6f4f50c51c5711fc7c358b8b22d7"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-arm64.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734816"
+checksum = "sha256:2fec653ff6dadab340d1c3d2214688a7451cc471f39710839440b293ca7c53b0"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-linux-arm64.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120174"
 provenance = "github-attestations"

 [tools.pnpm."platforms.linux-arm64-musl"]
-checksum = "sha256:f97316cee0deb3ae3fd64e8a09e1c8c88a76da33373a2b465bd6a4c3e85e0690"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-arm64-musl.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734819"
+checksum = "sha256:56a78c08cf22adf29e7dacb6f7f100139731693863d20fb94a7883463a62169e"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-linux-arm64-musl.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120177"
 provenance = "github-attestations"

 [tools.pnpm."platforms.linux-x64"]
-checksum = "sha256:df4699e897012ab14df2cc6eaa942910e830eb7fcaa420a2a1421a9461fd9108"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-x64.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734818"
+checksum = "sha256:74d64c1646385fb21691f32f0ab6aca1a9f5c829ba54d3cda3a24838a228e68c"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-linux-x64.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120176"
 provenance = "github-attestations"

 [tools.pnpm."platforms.linux-x64-musl"]
-checksum = "sha256:aad186f8a8ae72d827d5efe63e99e801456715fb7f2798949405fa33f20260db"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-x64-musl.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734821"
+checksum = "sha256:7a0c463a09d912fba6b7d9eca0a946bc228ea50f3015a05c09a29e7e85a932d7"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-linux-x64-musl.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120175"
 provenance = "github-attestations"

 [tools.pnpm."platforms.macos-arm64"]
-checksum = "sha256:ad46ad16c2376c2b78354ac488c1b166e076aa59bfcbcfd567d55957d755a690"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-darwin-arm64.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734814"
+checksum = "sha256:87c901635a14481fb30566a3749041134ffd4317bc6fe866c345b69fdf9b6b85"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-darwin-arm64.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120180"
 provenance = "github-attestations"

 [tools.pnpm."platforms.windows-x64"]
-checksum = "sha256:13ad8a9b139c4c829fea33462cf04d061d72f0926b2b76a92ac03c9a36e405f9"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-win32-x64.zip"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734820"
+checksum = "sha256:91c753435542b04859c689304fae0dd64eba6b40937cfa426a48485b712e4e9c"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-win32-x64.zip"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120173"
 provenance = "github-attestations"

 [[tools.terragrunt]]
--- a/mise.toml
+++ b/mise.toml
@@ -16,14 +16,14 @@ config_roots = [

 [tools]
 node = "24.15.0"
-pnpm = "11.11.0"
+pnpm = "11.6.0"
 terragrunt = "1.0.3"
 opentofu = "1.11.6"
 "npm:oazapfts" = "7.5.0"
 "github:extism/cli" = "1.6.3"
 "github:webassembly/binaryen" = "version_124"
 "github:extism/js-pdk" = "1.6.0"
-java = "21.0.2"
+java = "25.0.3+9.0.LTS"

 [tools."github:jellyfin/jellyfin-ffmpeg"]
 version = "7.1.3-6"
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -89,6 +89,13 @@ flutter {
 }

 dependencies {
+  constraints {
+    implementation("androidx.glance:glance-appwidget") {
+      version { strictly libs.versions.glance.get() }
+      because 'home_widget requests 1.+ which can resolve to pre-releases incompatible with our compileSdk/AGP'
+    }
+  }
+
  implementation libs.okhttp
  implementation libs.cronet.embedded
  implementation libs.media3.datasource.okhttp
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -12,8 +12,12 @@ PODS:
    - Flutter
  - fluttertoast (0.0.2):
    - Flutter
+  - home_widget (0.0.1):
+    - Flutter
  - native_video_player (1.0.0):
    - Flutter
+  - permission_handler_apple (9.3.0):
+    - Flutter
  - share_handler_ios (0.0.14):
    - Flutter
    - share_handler_ios/share_handler_ios_models (= 0.0.14)
@@ -30,7 +34,9 @@ DEPENDENCIES:
  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
+  - home_widget (from `.symlinks/plugins/home_widget/ios`)
  - native_video_player (from `.symlinks/plugins/native_video_player/ios`)
+  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
  - share_handler_ios (from `.symlinks/plugins/share_handler_ios/ios`)
  - share_handler_ios_models (from `.symlinks/plugins/share_handler_ios/ios/Models`)

@@ -47,8 +53,12 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/flutter_secure_storage/ios"
  fluttertoast:
    :path: ".symlinks/plugins/fluttertoast/ios"
+  home_widget:
+    :path: ".symlinks/plugins/home_widget/ios"
  native_video_player:
    :path: ".symlinks/plugins/native_video_player/ios"
+  permission_handler_apple:
+    :path: ".symlinks/plugins/permission_handler_apple/ios"
  share_handler_ios:
    :path: ".symlinks/plugins/share_handler_ios/ios"
  share_handler_ios_models:
@@ -61,10 +71,12 @@ SPEC CHECKSUMS:
  flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
  fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
+  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
  native_video_player: b65c58951ede2f93d103a25366bdebca95081265
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
  share_handler_ios: e2244e990f826b2c8eaa291ac3831569438ba0fb
  share_handler_ios_models: fc638c9b4330dc7f082586c92aee9dfa0b87b871

-PODFILE CHECKSUM: 3c43a700a4bffb4120bf696cad263aefd4bb3c8c
+PODFILE CHECKSUM: 938abbae4114b9c2140c550a2a0d8f7c674f5dfe

 COCOAPODS: 1.16.2
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -154,15 +154,11 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B231F52D2E93A44A00BC45D1 /* Core */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Core;
 			sourceTree = "<group>";
 		};
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -184,8 +180,6 @@
 		};
 		FEE084F22EC172080045228E /* Schemas */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Schemas;
 			sourceTree = "<group>";
 		};
@@ -378,6 +372,7 @@
 				FAC6F89A2D287C890078CB2F /* Embed Foundation Extensions */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				513DA7292DED6106813332F4 /* [CP] Embed Pods Frameworks */,
+				2FA39DEC809D6D7C4A01EFCB /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -471,7 +466,7 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
 				FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */,
 				FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */,
 			);
@@ -518,6 +513,27 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXShellScriptBuildPhase section */
+		2FA39DEC809D6D7C4A01EFCB /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -542,10 +558,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -1246,7 +1266,7 @@
 /* End XCConfigurationList section */

 /* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -70,10 +70,6 @@ class RemoteAsset extends BaseAsset {

  bool get isTrashed => deletedAt != null;

-  bool get isStacked => stackId != null;
-
-  bool get isArchived => visibility == .archive;
-
  @override
  String toString() {
    return '''Asset {
--- a/mobile/lib/infrastructure/entities/asset_edit.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/asset_edit.entity.drift.dart
@@ -44,7 +44,16 @@ final class $$AssetEditEntityTableReferences
  static i5.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
      i6.ReadDatabaseContainer(db)
          .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias('asset_edit_entity__asset_id__remote_asset_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i1.$AssetEditEntityTable>('asset_edit_entity')
+                  .assetId,
+              i6.ReadDatabaseContainer(
+                db,
+              ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity').id,
+            ),
+          );

  i5.$$RemoteAssetEntityTableProcessedTableManager get assetId {
    final $_column = $_itemColumn<String>('asset_id')!;
--- a/mobile/lib/infrastructure/entities/asset_face.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/asset_face.entity.drift.dart
@@ -59,7 +59,16 @@ final class $$AssetFaceEntityTableReferences
  static i4.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
      i5.ReadDatabaseContainer(db)
          .resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias('asset_face_entity__asset_id__remote_asset_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$AssetFaceEntityTable>('asset_face_entity')
+                  .assetId,
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity').id,
+            ),
+          );

  i4.$$RemoteAssetEntityTableProcessedTableManager get assetId {
    final $_column = $_itemColumn<String>('asset_id')!;
@@ -82,7 +91,16 @@ final class $$AssetFaceEntityTableReferences
  static i6.$PersonEntityTable _personIdTable(i0.GeneratedDatabase db) =>
      i5.ReadDatabaseContainer(db)
          .resultSet<i6.$PersonEntityTable>('person_entity')
-          .createAlias('asset_face_entity__person_id__person_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$AssetFaceEntityTable>('asset_face_entity')
+                  .personId,
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i6.$PersonEntityTable>('person_entity').id,
+            ),
+          );

  i6.$$PersonEntityTableProcessedTableManager? get personId {
    final $_column = $_itemColumn<String>('person_id');
--- a/mobile/lib/infrastructure/entities/asset_ocr.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/asset_ocr.entity.drift.dart
@@ -61,7 +61,16 @@ final class $$AssetOcrEntityTableReferences
  static i4.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
      i5.ReadDatabaseContainer(db)
          .resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias('asset_ocr_entity__asset_id__remote_asset_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i1.$AssetOcrEntityTable>('asset_ocr_entity').assetId,
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity').id,
+            ),
+          );

  i4.$$RemoteAssetEntityTableProcessedTableManager get assetId {
    final $_column = $_itemColumn<String>('asset_id')!;
--- a/mobile/lib/infrastructure/entities/exif.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.drift.dart
@@ -75,7 +75,16 @@ final class $$RemoteExifEntityTableReferences
  static i3.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
      i4.ReadDatabaseContainer(db)
          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias('remote_exif_entity__asset_id__remote_asset_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteExifEntityTable>('remote_exif_entity')
+                  .assetId,
+              i4.ReadDatabaseContainer(
+                db,
+              ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity').id,
+            ),
+          );

  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
    final $_column = $_itemColumn<String>('asset_id')!;
--- a/mobile/lib/infrastructure/entities/local_album.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/local_album.entity.drift.dart
@@ -50,7 +50,14 @@ final class $$LocalAlbumEntityTableReferences
  ) => i6.ReadDatabaseContainer(db)
      .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity')
      .createAlias(
-        'local_album_entity__linked_remote_album_id__remote_album_entity__id',
+        i0.$_aliasNameGenerator(
+          i6.ReadDatabaseContainer(db)
+              .resultSet<i1.$LocalAlbumEntityTable>('local_album_entity')
+              .linkedRemoteAlbumId,
+          i6.ReadDatabaseContainer(
+            db,
+          ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity').id,
+        ),
      );

  i5.$$RemoteAlbumEntityTableProcessedTableManager? get linkedRemoteAlbumId {
--- a/mobile/lib/infrastructure/entities/local_album_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/local_album_asset.entity.drift.dart
@@ -41,7 +41,16 @@ final class $$LocalAlbumAssetEntityTableReferences
      i4.ReadDatabaseContainer(db)
          .resultSet<i3.$LocalAssetEntityTable>('local_asset_entity')
          .createAlias(
-            'local_album_asset_entity__asset_id__local_asset_entity__id',
+            i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$LocalAlbumAssetEntityTable>(
+                    'local_album_asset_entity',
+                  )
+                  .assetId,
+              i4.ReadDatabaseContainer(
+                db,
+              ).resultSet<i3.$LocalAssetEntityTable>('local_asset_entity').id,
+            ),
          );

  i3.$$LocalAssetEntityTableProcessedTableManager get assetId {
@@ -66,7 +75,16 @@ final class $$LocalAlbumAssetEntityTableReferences
      i4.ReadDatabaseContainer(db)
          .resultSet<i5.$LocalAlbumEntityTable>('local_album_entity')
          .createAlias(
-            'local_album_asset_entity__album_id__local_album_entity__id',
+            i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$LocalAlbumAssetEntityTable>(
+                    'local_album_asset_entity',
+                  )
+                  .albumId,
+              i4.ReadDatabaseContainer(
+                db,
+              ).resultSet<i5.$LocalAlbumEntityTable>('local_album_entity').id,
+            ),
          );

  i5.$$LocalAlbumEntityTableProcessedTableManager get albumId {
--- a/mobile/lib/infrastructure/entities/memory.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/memory.entity.drift.dart
@@ -53,7 +53,16 @@ final class $$MemoryEntityTableReferences
  static i5.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
      i6.ReadDatabaseContainer(db)
          .resultSet<i5.$UserEntityTable>('user_entity')
-          .createAlias('memory_entity__owner_id__user_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i6.ReadDatabaseContainer(
+                db,
+              ).resultSet<i1.$MemoryEntityTable>('memory_entity').ownerId,
+              i6.ReadDatabaseContainer(
+                db,
+              ).resultSet<i5.$UserEntityTable>('user_entity').id,
+            ),
+          );

  i5.$$UserEntityTableProcessedTableManager get ownerId {
    final $_column = $_itemColumn<String>('owner_id')!;
--- a/mobile/lib/infrastructure/entities/memory_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/memory_asset.entity.drift.dart
@@ -39,7 +39,14 @@ final class $$MemoryAssetEntityTableReferences
      i4.ReadDatabaseContainer(db)
          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
          .createAlias(
-            'memory_asset_entity__asset_id__remote_asset_entity__id',
+            i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$MemoryAssetEntityTable>('memory_asset_entity')
+                  .assetId,
+              i4.ReadDatabaseContainer(
+                db,
+              ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity').id,
+            ),
          );

  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
@@ -63,7 +70,16 @@ final class $$MemoryAssetEntityTableReferences
  static i5.$MemoryEntityTable _memoryIdTable(i0.GeneratedDatabase db) =>
      i4.ReadDatabaseContainer(db)
          .resultSet<i5.$MemoryEntityTable>('memory_entity')
-          .createAlias('memory_asset_entity__memory_id__memory_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$MemoryAssetEntityTable>('memory_asset_entity')
+                  .memoryId,
+              i4.ReadDatabaseContainer(
+                db,
+              ).resultSet<i5.$MemoryEntityTable>('memory_entity').id,
+            ),
+          );

  i5.$$MemoryEntityTableProcessedTableManager get memoryId {
    final $_column = $_itemColumn<String>('memory_id')!;
--- a/mobile/lib/infrastructure/entities/partner.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/partner.entity.drift.dart
@@ -39,7 +39,16 @@ final class $$PartnerEntityTableReferences
  static i4.$UserEntityTable _sharedByIdTable(i0.GeneratedDatabase db) =>
      i5.ReadDatabaseContainer(db)
          .resultSet<i4.$UserEntityTable>('user_entity')
-          .createAlias('partner_entity__shared_by_id__user_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i1.$PartnerEntityTable>('partner_entity').sharedById,
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i4.$UserEntityTable>('user_entity').id,
+            ),
+          );

  i4.$$UserEntityTableProcessedTableManager get sharedById {
    final $_column = $_itemColumn<String>('shared_by_id')!;
@@ -62,7 +71,16 @@ final class $$PartnerEntityTableReferences
  static i4.$UserEntityTable _sharedWithIdTable(i0.GeneratedDatabase db) =>
      i5.ReadDatabaseContainer(db)
          .resultSet<i4.$UserEntityTable>('user_entity')
-          .createAlias('partner_entity__shared_with_id__user_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$PartnerEntityTable>('partner_entity')
+                  .sharedWithId,
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i4.$UserEntityTable>('user_entity').id,
+            ),
+          );

  i4.$$UserEntityTableProcessedTableManager get sharedWithId {
    final $_column = $_itemColumn<String>('shared_with_id')!;
--- a/mobile/lib/infrastructure/entities/person.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/person.entity.drift.dart
@@ -48,7 +48,16 @@ final class $$PersonEntityTableReferences
  static i4.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
      i5.ReadDatabaseContainer(db)
          .resultSet<i4.$UserEntityTable>('user_entity')
-          .createAlias('person_entity__owner_id__user_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i1.$PersonEntityTable>('person_entity').ownerId,
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i4.$UserEntityTable>('user_entity').id,
+            ),
+          );

  i4.$$UserEntityTableProcessedTableManager get ownerId {
    final $_column = $_itemColumn<String>('owner_id')!;
--- a/mobile/lib/infrastructure/entities/remote_album.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/remote_album.entity.drift.dart
@@ -52,7 +52,14 @@ final class $$RemoteAlbumEntityTableReferences
  ) => i6.ReadDatabaseContainer(db)
      .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity')
      .createAlias(
-        'remote_album_entity__thumbnail_asset_id__remote_asset_entity__id',
+        i0.$_aliasNameGenerator(
+          i6.ReadDatabaseContainer(db)
+              .resultSet<i1.$RemoteAlbumEntityTable>('remote_album_entity')
+              .thumbnailAssetId,
+          i6.ReadDatabaseContainer(
+            db,
+          ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity').id,
+        ),
      );

  i5.$$RemoteAssetEntityTableProcessedTableManager? get thumbnailAssetId {
--- a/mobile/lib/infrastructure/entities/remote_album_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/remote_album_asset.entity.drift.dart
@@ -39,7 +39,16 @@ final class $$RemoteAlbumAssetEntityTableReferences
      i4.ReadDatabaseContainer(db)
          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
          .createAlias(
-            'remote_album_asset_entity__asset_id__remote_asset_entity__id',
+            i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumAssetEntityTable>(
+                    'remote_album_asset_entity',
+                  )
+                  .assetId,
+              i4.ReadDatabaseContainer(
+                db,
+              ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity').id,
+            ),
          );

  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
@@ -64,7 +73,16 @@ final class $$RemoteAlbumAssetEntityTableReferences
      i4.ReadDatabaseContainer(db)
          .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity')
          .createAlias(
-            'remote_album_asset_entity__album_id__remote_album_entity__id',
+            i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumAssetEntityTable>(
+                    'remote_album_asset_entity',
+                  )
+                  .albumId,
+              i4.ReadDatabaseContainer(
+                db,
+              ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity').id,
+            ),
          );

  i5.$$RemoteAlbumEntityTableProcessedTableManager get albumId {
--- a/mobile/lib/infrastructure/entities/remote_album_user.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/remote_album_user.entity.drift.dart
@@ -42,7 +42,16 @@ final class $$RemoteAlbumUserEntityTableReferences
      i5.ReadDatabaseContainer(db)
          .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity')
          .createAlias(
-            'remote_album_user_entity__album_id__remote_album_entity__id',
+            i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumUserEntityTable>(
+                    'remote_album_user_entity',
+                  )
+                  .albumId,
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity').id,
+            ),
          );

  i4.$$RemoteAlbumEntityTableProcessedTableManager get albumId {
@@ -66,7 +75,18 @@ final class $$RemoteAlbumUserEntityTableReferences
  static i6.$UserEntityTable _userIdTable(i0.GeneratedDatabase db) =>
      i5.ReadDatabaseContainer(db)
          .resultSet<i6.$UserEntityTable>('user_entity')
-          .createAlias('remote_album_user_entity__user_id__user_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumUserEntityTable>(
+                    'remote_album_user_entity',
+                  )
+                  .userId,
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i6.$UserEntityTable>('user_entity').id,
+            ),
+          );

  i6.$$UserEntityTableProcessedTableManager get userId {
    final $_column = $_itemColumn<String>('user_id')!;
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
@@ -74,7 +74,16 @@ final class $$RemoteAssetEntityTableReferences
  static i5.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
      i6.ReadDatabaseContainer(db)
          .resultSet<i5.$UserEntityTable>('user_entity')
-          .createAlias('remote_asset_entity__owner_id__user_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAssetEntityTable>('remote_asset_entity')
+                  .ownerId,
+              i6.ReadDatabaseContainer(
+                db,
+              ).resultSet<i5.$UserEntityTable>('user_entity').id,
+            ),
+          );

  i5.$$UserEntityTableProcessedTableManager get ownerId {
    final $_column = $_itemColumn<String>('owner_id')!;
--- a/mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart
@@ -45,7 +45,16 @@ final class $$RemoteAssetCloudIdEntityTableReferences
      i4.ReadDatabaseContainer(db)
          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
          .createAlias(
-            'remote_asset_cloud_id_entity__asset_id__remote_asset_entity__id',
+            i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAssetCloudIdEntityTable>(
+                    'remote_asset_cloud_id_entity',
+                  )
+                  .assetId,
+              i4.ReadDatabaseContainer(
+                db,
+              ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity').id,
+            ),
          );

  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
--- a/mobile/lib/infrastructure/entities/stack.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/stack.entity.drift.dart
@@ -38,7 +38,16 @@ final class $$StackEntityTableReferences
  static i4.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
      i5.ReadDatabaseContainer(db)
          .resultSet<i4.$UserEntityTable>('user_entity')
-          .createAlias('stack_entity__owner_id__user_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i1.$StackEntityTable>('stack_entity').ownerId,
+              i5.ReadDatabaseContainer(
+                db,
+              ).resultSet<i4.$UserEntityTable>('user_entity').id,
+            ),
+          );

  i4.$$UserEntityTableProcessedTableManager get ownerId {
    final $_column = $_itemColumn<String>('owner_id')!;
--- a/mobile/lib/infrastructure/entities/user_metadata.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/user_metadata.entity.drift.dart
@@ -40,7 +40,18 @@ final class $$UserMetadataEntityTableReferences
  static i5.$UserEntityTable _userIdTable(i0.GeneratedDatabase db) =>
      i6.ReadDatabaseContainer(db)
          .resultSet<i5.$UserEntityTable>('user_entity')
-          .createAlias('user_metadata_entity__user_id__user_entity__id');
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i1.$UserMetadataEntityTable>(
+                    'user_metadata_entity',
+                  )
+                  .userId,
+              i6.ReadDatabaseContainer(
+                db,
+              ).resultSet<i5.$UserEntityTable>('user_entity').id,
+            ),
+          );

  i5.$$UserEntityTableProcessedTableManager get userId {
    final $_column = $_itemColumn<String>('user_id')!;
--- a/mobile/lib/presentation/actions/favorite.action.dart
+++ b/mobile/lib/presentation/actions/favorite.action.dart
@@ -3,23 +3,25 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
 import 'package:immich_ui/immich_ui.dart';

 class FavoriteAction extends AssetAction<RemoteAsset> {
-  final bool favorite;
+  final bool shouldFavorite;

-  FavoriteAction({required super.assets}) : favorite = assets.any((asset) => !asset.isFavorite);
+  FavoriteAction({required super.assets}) : shouldFavorite = assets.any((asset) => !asset.isFavorite);

  @override
-  IconData get icon => favorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;
+  IconData get icon => shouldFavorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;

  @override
-  String label(ActionScope scope) => favorite ? scope.context.t.favorite : scope.context.t.unfavorite;
+  String label(ActionScope scope) => shouldFavorite ? scope.context.t.favorite : scope.context.t.unfavorite;

  @override
-  Iterable<RemoteAsset> filter(ActionScope scope) =>
-      AssetFilter(assets).owned(scope.authUser.id).favorite(isFavorite: !favorite);
+  Iterable<RemoteAsset> filter(ActionScope scope) => assets
+      .where(
+        (asset) => asset is RemoteAsset && asset.ownerId == scope.authUser.id && asset.isFavorite == !shouldFavorite,
+      )
+      .cast<RemoteAsset>();

  @override
  bool isVisible(ActionScope scope) => filter(scope).isNotEmpty;
@@ -29,8 +31,8 @@ class FavoriteAction extends AssetAction<RemoteAsset> {
    final ActionScope(:ref) = scope;
    final assets = filter(scope).map((asset) => asset.id).toList(growable: false);

-    await ref.read(assetServiceProvider).updateFavorite(assets, favorite);
-    final message = favorite
+    await ref.read(assetServiceProvider).updateFavorite(assets, shouldFavorite);
+    final message = shouldFavorite
        ? StaticTranslations.instance.favorite_action_prompt(count: assets.length)
        : StaticTranslations.instance.unfavorite_action_prompt(count: assets.length);
    snackbar.success(message);
--- a/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart
@@ -63,7 +63,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {

      ActionIconButtonWidget(action: FavoriteAction(assets: assetForAction)),

-      ImmichColorOverride(color: null, child: ViewerKebabMenu(originalTheme: originalTheme)),
+      ViewerKebabMenu(originalTheme: originalTheme),
    ];

    final lockedViewActions = <Widget>[ViewerKebabMenu(originalTheme: originalTheme)];
--- a/mobile/lib/utils/asset_filter.dart
+++ b/mobile/lib/utils/asset_filter.dart
@@ -1,22 +0,0 @@
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-
-extension type const AssetFilter<T extends BaseAsset>(Iterable<T> assets) implements Iterable<T> {
-  AssetFilter<T> where(bool Function(T asset) test) => AssetFilter(assets.where(test));
-  AssetFilter<T> whereNot(bool Function(T asset) test) => AssetFilter(assets.where((asset) => !test(asset)));
-
-  AssetFilter<T> type(AssetType type) => where((asset) => asset.type == type);
-  AssetFilter<T> favorite({bool isFavorite = true}) => where((asset) => asset.isFavorite == isFavorite);
-
-  AssetFilter<RemoteAsset> remote() => AssetFilter(assets.whereType<RemoteAsset>());
-  AssetFilter<RemoteAsset> owned(String ownerId) => remote().where((asset) => asset.ownerId == ownerId);
-  AssetFilter<RemoteAsset> visibility(AssetVisibility visibility) =>
-      remote().where((asset) => asset.visibility == visibility);
-  AssetFilter<RemoteAsset> notVisibility(AssetVisibility visibility) =>
-      remote().where((asset) => asset.visibility != visibility);
-  AssetFilter<RemoteAsset> archived({bool isArchived = true}) =>
-      remote().where((asset) => asset.isArchived == isArchived);
-  AssetFilter<RemoteAsset> stacked({bool isStacked = true}) => remote().where((asset) => asset.isStacked == isStacked);
-
-  AssetFilter<LocalAsset> local() => AssetFilter(assets.whereType<LocalAsset>());
-  AssetFilter<LocalAsset> backedUp() => local().where((asset) => asset.remoteAssetId != null);
-}
--- a/mobile/mise.lock
+++ b/mobile/mise.lock
@@ -133,54 +133,3 @@ asset_pattern = "dcm-macos-arm-release.zip"
 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"
-
-[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.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"
--- a/mobile/mise.toml
+++ b/mobile/mise.toml
@@ -1,6 +1,6 @@
 [tools]
 "aqua:flutter/flutter" = "3.44.6"
-java = "21.0.2"
+java = "25.0.3+9.0.LTS"

 [tools."github:CQLabs/homebrew-dcm"]
 version = "1.37.0"
--- a/mobile/packages/ui/lib/src/color_override.dart
+++ b/mobile/packages/ui/lib/src/color_override.dart
@@ -3,7 +3,7 @@ import 'package:flutter/widgets.dart';
 class ImmichColorOverride extends InheritedWidget {
  const ImmichColorOverride({super.key, required this.color, required super.child});

-  final Color? color;
+  final Color color;

  static Color? maybeOf(BuildContext context) =>
      context.dependOnInheritedWidgetOfExactType<ImmichColorOverride>()?.color;
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -366,18 +366,18 @@ packages:
    dependency: "direct main"
    description:
      name: drift
-      sha256: "6cc0b623c0e83f7080524d8396e9301b1d78b9c66a4fdceeb0f798211303254c"
+      sha256: "8033500116b24398fba0cca0369cc31678cd627c01e41753a61186911cea743e"
      url: "https://pub.dev"
    source: hosted
-    version: "2.34.0"
+    version: "2.33.0"
  drift_dev:
    dependency: "direct dev"
    description:
      name: drift_dev
-      sha256: "9cfff1576b49725da0d32c040651a41ae195e8c4af8d8da301593e41d7abc2f7"
+      sha256: b3dd5b75e30522a91da8abda9f5bb17230cb038097f6d15fa75d42bb563428aa
      url: "https://pub.dev"
    source: hosted
-    version: "2.34.0"
+    version: "2.33.0"
  drift_sqlite_async:
    dependency: "direct main"
    description:
@@ -772,10 +772,10 @@ packages:
    dependency: "direct main"
    description:
      name: home_widget
-      sha256: fece84c7464099873c3ace38394ad7053509a4b0e36e57a1105a6aa31f47f23c
+      sha256: "908d033514a981f829fd98213909e11a428104327be3b422718aa643ac9d084a"
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.3"
+    version: "0.8.1"
  hooks:
    dependency: transitive
    description:
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
  crypto: ^3.0.7
  device_info_plus: ^12.4.0
  diacritic: ^0.1.6
-  drift: ^2.34.0
+  drift: ^2.32.1
  drift_sqlite_async: 0.3.1
  dynamic_color: ^1.8.1
  easy_localization: ^3.0.8
@@ -35,7 +35,7 @@ dependencies:
  flutter_web_auth_2: ^5.0.2
  fluttertoast: ^8.2.14
  geolocator: ^14.0.2
-  home_widget: ^0.9.3
+  home_widget: ^0.8.1
  hooks_riverpod: ^2.6.1
  http: ^1.6.0
  image_picker: ^1.2.1
@@ -96,7 +96,7 @@ dev_dependencies:
  auto_route_generator: ^10.5.0
  build_runner: ^2.13.1
  # Drift generator
-  drift_dev: ^2.34.0
+  drift_dev: ^2.32.1
  fake_async: ^1.3.3
  file: ^7.0.1 # for MemoryFileSystem
  flutter_launcher_icons: ^0.14.4
--- a/mobile/test/unit/factories/remote_asset_factory.dart
+++ b/mobile/test/unit/factories/remote_asset_factory.dart
@@ -5,14 +5,7 @@ import '../../utils.dart';
 class RemoteAssetFactory {
  const RemoteAssetFactory();

-  static RemoteAsset create({
-    String? id,
-    String? name,
-    String? ownerId,
-    bool isFavorite = false,
-    AssetVisibility visibility = AssetVisibility.timeline,
-    String? stackId,
-  }) {
+  static RemoteAsset create({String? id, String? name, String? ownerId, bool isFavorite = false}) {
    id = TestUtils.uuid(id);

    return RemoteAsset(
@@ -24,8 +17,6 @@ class RemoteAssetFactory {
      createdAt: TestUtils.yesterday(),
      updatedAt: TestUtils.now(),
      isFavorite: isFavorite,
-      visibility: visibility,
-      stackId: stackId,
      isEdited: false,
    );
  }
--- a/mobile/test/unit/utils/asset_filter_test.dart
+++ b/mobile/test/unit/utils/asset_filter_test.dart
@@ -1,200 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
-
-import '../factories/local_asset_factory.dart';
-import '../factories/remote_asset_factory.dart';
-
-void main() {
-  group('AssetFilter', () {
-    group('type promotion', () {
-      test('a bare filter retains every BaseAsset', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<BaseAsset> filter = AssetFilter(<BaseAsset>[remoteAsset, localAsset]);
-
-        expect(filter.toList(), [remoteAsset, localAsset]);
-      });
-
-      test('remote keeps only remote assets', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<RemoteAsset> remoteOnly = AssetFilter(<BaseAsset>[remoteAsset, localAsset]).remote();
-
-        expect(remoteOnly.toList(), [remoteAsset]);
-      });
-
-      test('local keeps only local assets', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<LocalAsset> localOnly = AssetFilter(<BaseAsset>[remoteAsset, localAsset]).local();
-
-        expect(localOnly.toList(), [localAsset]);
-      });
-
-      test('owned promotes to RemoteAsset and drops local assets', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<RemoteAsset> remoteOnly = AssetFilter(<BaseAsset>[
-          remoteAsset,
-          localAsset,
-        ]).owned(remoteAsset.ownerId);
-
-        expect(remoteOnly.toList(), [remoteAsset]);
-      });
-
-      test('backedUp promotes to LocalAsset and drops remote assets', () {
-        final syncedPhoto = LocalAssetFactory.create().copyWith(remoteId: 'remote');
-        final offlinePhoto = LocalAssetFactory.create();
-        final remotePhoto = RemoteAssetFactory.create();
-
-        final AssetFilter<LocalAsset> syncedPhotos = AssetFilter(<BaseAsset>[
-          syncedPhoto,
-          offlinePhoto,
-          remotePhoto,
-        ]).backedUp();
-
-        expect(syncedPhotos.toList(), [syncedPhoto]);
-      });
-    });
-
-    group('named filters', () {
-      test('owned keeps only assets of the given owner', () {
-        final asset1 = RemoteAssetFactory.create();
-        final asset2 = RemoteAssetFactory.create();
-
-        final alexPhotos = AssetFilter([asset1, asset2]).owned(asset1.ownerId);
-
-        expect(alexPhotos.toList(), [asset1]);
-      });
-
-      test('favorites keeps only favorite assets', () {
-        final asset1 = RemoteAssetFactory.create(isFavorite: true);
-        final asset2 = RemoteAssetFactory.create(ownerId: asset1.ownerId);
-
-        final favorites = AssetFilter([asset1, asset2]).favorite();
-
-        expect(favorites.toList(), [asset1]);
-      });
-
-      test('type keeps only assets of the given type', () {
-        final image = RemoteAssetFactory.create();
-        final video = RemoteAssetFactory.create(ownerId: image.ownerId).copyWith(type: .video);
-
-        final videos = AssetFilter([image, video]).type(.video);
-
-        expect(videos.toList(), [video]);
-      });
-
-      test('visibility keeps only assets with the given visibility', () {
-        final locked = RemoteAssetFactory.create(visibility: AssetVisibility.locked);
-        final onTimeline = RemoteAssetFactory.create(ownerId: locked.ownerId);
-
-        final lockedPhotos = AssetFilter([locked, onTimeline]).visibility(.locked);
-
-        expect(lockedPhotos.toList(), [locked]);
-      });
-
-      test('archived keeps only archived assets', () {
-        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
-        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId);
-
-        final archivedPhotos = AssetFilter([archived, onTimeline]).archived();
-
-        expect(archivedPhotos.toList(), [archived]);
-      });
-
-      test('stacked keeps only assets belonging to a stack', () {
-        final stacked = RemoteAssetFactory.create(stackId: 'stack');
-        final loose = RemoteAssetFactory.create(ownerId: stacked.ownerId);
-
-        final stackedPhotos = AssetFilter([stacked, loose]).stacked();
-
-        expect(stackedPhotos.toList(), [stacked]);
-      });
-    });
-
-    group('inversion', () {
-      test('notArchived keeps every non-archived visibility', () {
-        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
-        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.timeline);
-        final hidden = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.hidden);
-        final locked = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.locked);
-
-        final visiblePhotos = AssetFilter([archived, onTimeline, hidden, locked]).archived(isArchived: false);
-
-        expect(visiblePhotos.toSet(), {onTimeline, hidden, locked});
-      });
-
-      test('notVisibility keeps every asset not at the target visibility', () {
-        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
-        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.timeline);
-        final locked = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.locked);
-
-        final toArchive = AssetFilter([archived, onTimeline, locked]).notVisibility(.archive);
-
-        expect(toArchive.toSet(), {onTimeline, locked});
-      });
-
-      test('notStacked keeps only assets without a stack', () {
-        final stacked = RemoteAssetFactory.create(stackId: 'stack');
-        final loose = RemoteAssetFactory.create(ownerId: stacked.ownerId);
-
-        final loosePhotos = AssetFilter([stacked, loose]).stacked(isStacked: false);
-
-        expect(loosePhotos.toList(), [loose]);
-      });
-
-      test('whereNot inverts an arbitrary predicate', () {
-        final favorite = RemoteAssetFactory.create(isFavorite: true);
-        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
-
-        final nonFavorites = AssetFilter([favorite, regular]).whereNot((asset) => asset.isFavorite);
-
-        expect(nonFavorites.toList(), [regular]);
-      });
-
-      test('notFavorites keeps only non-favorite assets', () {
-        final favorite = RemoteAssetFactory.create(isFavorite: true);
-        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
-
-        final nonFavorites = AssetFilter([favorite, regular]).favorite(isFavorite: false);
-
-        expect(nonFavorites.toList(), [regular]);
-      });
-    });
-
-    group('chaining', () {
-      test('combines predicates across owner, visibility and stack', () {
-        final asset = RemoteAssetFactory.create();
-        final wrongOwner = RemoteAssetFactory.create();
-        final archived = RemoteAssetFactory.create(ownerId: asset.ownerId, visibility: AssetVisibility.archive);
-        final stacked = RemoteAssetFactory.create(ownerId: asset.ownerId, stackId: 'stack-1');
-        final localPhoto = LocalAssetFactory.create();
-
-        final result = AssetFilter(<BaseAsset>[
-          asset,
-          wrongOwner,
-          archived,
-          stacked,
-          localPhoto,
-        ]).owned(asset.ownerId).archived(isArchived: false).stacked(isStacked: false);
-
-        expect(result.toList(), [asset]);
-      });
-
-      test('a base filter after a promotion retains the promoted type', () {
-        final favorite = RemoteAssetFactory.create(isFavorite: true);
-        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
-
-        final AssetFilter<RemoteAsset> result = AssetFilter([favorite, regular]).owned(favorite.ownerId).favorite();
-
-        expect(result.toList(), [favorite]);
-      });
-    });
-  });
-}
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
    "format": "prettier --cache --check i18n/",
    "format:fix": "prettier --cache --write --list-different i18n"
  },
-  "packageManager": "pnpm@11.11.0",
+  "packageManager": "pnpm@11.6.0",
  "engines": {
    "pnpm": ">=10.0.0"
  },
--- a/packages/cli/package.json
+++ b/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.3",
+    "@types/node": "^24.13.2",
    "@vitest/coverage-v8": "^4.0.0",
    "byte-size": "^9.0.0",
    "cli-progress": "^3.12.0",
--- a/packages/e2e-auth-server/package.json
+++ b/packages/e2e-auth-server/package.json
@@ -13,5 +13,5 @@
    "oidc-provider": "^9.0.0",
    "tsx": "^4.20.6"
  },
-  "packageManager": "pnpm@11.11.0"
+  "packageManager": "pnpm@11.6.0"
 }
--- a/packages/plugin-core/manifest.json
+++ b/packages/plugin-core/manifest.json
@@ -103,12 +103,6 @@
            "default": false,
            "title": "Case sensitive",
            "description": "Whether matching should be case-sensitive"
-          },
-          "usePath": {
-            "type": "boolean",
-            "default": false,
-            "title": "Use path",
-            "description": "Match the full path on the server instead of the original filename"
          }
        },
        "required": ["pattern"]
--- a/packages/plugin-core/src/index.ts
+++ b/packages/plugin-core/src/index.ts
@@ -54,11 +54,11 @@ const methods = wrapper<Manifest>({
  },

  assetFileFilter: ({ data, config }) => {
-    const { pattern, matchType = 'contains', caseSensitive = false, usePath = false } = config;
+    const { pattern, matchType = 'contains', caseSensitive = false } = config;

    const { asset } = data;

-    const fileName = usePath ? asset.originalPath : asset.originalFileName;
+    const fileName = asset.originalFileName || '';
    const searchName = caseSensitive ? fileName : fileName.toLowerCase();
    const searchPattern = caseSensitive ? pattern : pattern.toLowerCase();

--- a/packages/plugin-sdk/package.json
+++ b/packages/plugin-sdk/package.json
@@ -27,11 +27,11 @@
  "keywords": [],
  "author": "",
  "license": "GNU Affero General Public License version 3",
-  "packageManager": "pnpm@11.11.0",
+  "packageManager": "pnpm@11.6.0",
  "devDependencies": {
    "@extism/js-pdk": "^1.1.1",
    "@immich/sdk": "workspace:*",
-    "@types/node": "^24.13.3",
+    "@types/node": "^24.13.2",
    "esbuild": "^0.28.0",
    "tsc-alias": "^1.8.16",
    "typescript": "^6.0.0"
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -27,10 +27,10 @@
    "semver": "^7.8.1"
  },
  "devDependencies": {
-    "@types/node": "^24.13.3",
+    "@types/node": "^24.13.2",
    "@types/semver": "^7.7.1",
    "vite": "^8.0.16",
    "vitest": "^4.1.8"
  },
-  "packageManager": "pnpm@11.11.0"
+  "packageManager": "pnpm@11.6.0"
 }
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -24,7 +24,7 @@
    "@oazapfts/runtime": "^1.0.2"
  },
  "devDependencies": {
-    "@types/node": "^24.13.3",
+    "@types/node": "^24.13.2",
    "typescript": "^6.0.0"
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -66,4 +66,4 @@ injectWorkspacePackages: true
 shamefullyHoist: false
 verifyDepsBeforeRun: install
 minimumReleaseAgeExclude:
-  - '@immich/ui@0.83.0'
+  - '@immich/ui@0.81.1'
--- a/server/package.json
+++ b/server/package.json
@@ -49,14 +49,14 @@
    "@nestjs/websockets": "^11.0.4",
    "@opentelemetry/api": "^1.9.0",
    "@opentelemetry/context-async-hooks": "^2.0.0",
-    "@opentelemetry/exporter-prometheus": "^0.220.0",
-    "@opentelemetry/instrumentation-http": "^0.220.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.68.0",
-    "@opentelemetry/instrumentation-nestjs-core": "^0.66.0",
-    "@opentelemetry/instrumentation-pg": "^0.72.0",
+    "@opentelemetry/exporter-prometheus": "^0.219.0",
+    "@opentelemetry/instrumentation-http": "^0.219.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.67.0",
+    "@opentelemetry/instrumentation-nestjs-core": "^0.65.0",
+    "@opentelemetry/instrumentation-pg": "^0.71.0",
    "@opentelemetry/resources": "^2.0.1",
    "@opentelemetry/sdk-metrics": "^2.0.1",
-    "@opentelemetry/sdk-node": "^0.220.0",
+    "@opentelemetry/sdk-node": "^0.219.0",
    "@opentelemetry/semantic-conventions": "^1.34.0",
    "@react-email/components": "^1.0.0",
    "@react-email/render": "^2.0.0",
@@ -138,7 +138,7 @@
    "@types/luxon": "^3.6.2",
    "@types/mock-fs": "^4.13.1",
    "@types/multer": "^2.0.0",
-    "@types/node": "^24.13.3",
+    "@types/node": "^24.13.2",
    "@types/nodemailer": "^8.0.0",
    "@types/picomatch": "^4.0.0",
    "@types/pngjs": "^6.0.5",
--- a/server/src/decorators.ts
+++ b/server/src/decorators.ts
@@ -190,11 +190,11 @@ type CustomExtensions = {
 };

 enum ApiState {
-  Stable = 'Stable',
-  Alpha = 'Alpha',
-  Beta = 'Beta',
-  Internal = 'Internal',
-  Deprecated = 'Deprecated',
+  'Stable' = 'Stable',
+  'Alpha' = 'Alpha',
+  'Beta' = 'Beta',
+  'Internal' = 'Internal',
+  'Deprecated' = 'Deprecated',
 }
 export class HistoryBuilder {
  private hasDeprecated = false;
--- a/server/src/queries/workflow.repository.sql
+++ b/server/src/queries/workflow.repository.sql
@@ -25,8 +25,6 @@ select
          inner join "plugin" on "plugin"."id" = "plugin_method"."pluginId"
        where
          "workflow"."id" = "workflow_step"."workflowId"
-        order by
-          "workflow_step"."order" asc
      ) as agg
  ) as "steps"
 from
@@ -59,8 +57,6 @@ select
          inner join "plugin" on "plugin"."id" = "plugin_method"."pluginId"
        where
          "workflow"."id" = "workflow_step"."workflowId"
-        order by
-          "workflow_step"."order" asc
      ) as agg
  ) as "steps"
 from
--- a/server/src/repositories/integrity.repository.ts
+++ b/server/src/repositories/integrity.repository.ts
@@ -154,7 +154,8 @@ export class IntegrityRepository {
      .select(['allPaths.path as path', 'allPaths.assetId', 'allPaths.fileAssetId', 'integrity_report.id as reportId'])
      .stream() as AsyncIterableIterator<
      { path: string; reportId: string | null } & (
-        { assetId: string; fileAssetId: null } | { assetId: null; fileAssetId: string }
+        | { assetId: string; fileAssetId: null }
+        | { assetId: null; fileAssetId: string }
      )
    >;
  }
--- a/server/src/repositories/workflow.repository.ts
+++ b/server/src/repositories/workflow.repository.ts
@@ -39,8 +39,7 @@ export class WorkflowRepository {
              'plugin_method.name as methodName',
              'workflow_step.config',
              'workflow_step.enabled',
-            ])
-            .orderBy('workflow_step.order', 'asc'),
+            ]),
        ).as('steps'),
      ]);
  }
--- a/server/src/types.ts
+++ b/server/src/types.ts
@@ -336,7 +336,8 @@ export interface IIntegrityUntrackedFilesJob {

 export interface IIntegrityMissingFilesJob {
  items: ({ path: string; reportId: string | null } & (
-    { assetId: string; fileAssetId: null } | { assetId: null; fileAssetId: string }
+    | { assetId: string; fileAssetId: null }
+    | { assetId: null; fileAssetId: string }
  ))[];
 }

@@ -552,7 +553,8 @@ export interface MemoryData {
 export type VersionCheckMetadata = { checkedAt: string; releaseVersion: string };
 export type SystemFlags = { mountChecks: Record<StorageFolder, boolean> };
 export type MaintenanceModeState =
-  { isMaintenanceMode: true; secret: string; action?: SetMaintenanceModeDto } | { isMaintenanceMode: false };
+  | { isMaintenanceMode: true; secret: string; action?: SetMaintenanceModeDto }
+  | { isMaintenanceMode: false };
 export type MemoriesState = {
  /** memories have already been created through this date */
  lastOnThisDayDate: string;
--- a/web/package.json
+++ b/web/package.json
@@ -27,7 +27,7 @@
    "@formatjs/icu-messageformat-parser": "^3.0.0",
    "@immich/justified-layout-wasm": "^0.4.3",
    "@immich/sdk": "workspace:*",
-    "@immich/ui": "^0.83.0",
+    "@immich/ui": "^0.81.1",
    "@mapbox/mapbox-gl-rtl-text": "0.4.0",
    "@mdi/js": "^7.4.47",
    "@noble/hashes": "^2.2.0",
@@ -76,9 +76,9 @@
    "@koddsson/eslint-plugin-tscompat": "^0.2.0",
    "@socket.io/component-emitter": "^3.1.0",
    "@sveltejs/adapter-static": "^3.0.8",
-    "@sveltejs/enhanced-img": "^0.11.0",
+    "@sveltejs/enhanced-img": "^0.10.4",
    "@sveltejs/kit": "^2.56.1",
-    "@sveltejs/vite-plugin-svelte": "7.2.0",
+    "@sveltejs/vite-plugin-svelte": "7.1.2",
    "@tailwindcss/vite": "^4.2.4",
    "@testing-library/jest-dom": "^6.4.2",
    "@testing-library/svelte": "^5.2.8",
@@ -105,7 +105,7 @@
    "prettier-plugin-sort-json": "^4.1.1",
    "prettier-plugin-svelte": "^4.0.0",
    "rollup-plugin-visualizer": "^7.0.0",
-    "svelte": "5.56.4",
+    "svelte": "5.56.3",
    "svelte-check": "^4.4.6",
    "svelte-eslint-parser": "^1.3.3",
    "tailwindcss": "^4.2.4",
--- a/web/src/lib/components/asset-viewer/AssetViewer.svelte
+++ b/web/src/lib/components/asset-viewer/AssetViewer.svelte
@@ -14,7 +14,6 @@
  import { authManager } from '$lib/managers/auth-manager.svelte';
  import { editManager, EditToolType } from '$lib/managers/edit/edit-manager.svelte';
  import { eventManager } from '$lib/managers/event-manager.svelte';
-  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
  import { getAssetActions } from '$lib/services/asset.service';
  import { faceManager } from '$lib/stores/face.svelte';
  import { ocrManager } from '$lib/stores/ocr.svelte';
@@ -24,7 +23,6 @@
  import type { OnUndoDelete } from '$lib/utils/actions';
  import { navigateToAsset } from '$lib/utils/asset-utils';
  import { handleError } from '$lib/utils/handle-error';
-  import { navigate } from '$lib/utils/navigation';
  import { InvocationTracker } from '$lib/utils/invocationTracker';
  import { SlideshowHistory } from '$lib/utils/slideshow-history';
  import { toTimelineAsset } from '$lib/utils/timeline-util';
@@ -151,15 +149,6 @@
    }
  };

-  const onAssetsUndoArchive = async (assets: TimelineAsset[]) => {
-    if (assets.length === 0) {
-      return;
-    }
-    const restoredAsset = assets[0];
-    await assetViewerManager.setAssetId(restoredAsset.id);
-    await navigate({ targetRoute: 'current', assetId: restoredAsset.id });
-  };
-
  onMount(() => {
    syncAssetViewerOpenClass(true);
    const slideshowStateUnsubscribe = slideshowState.subscribe((value) => {
@@ -486,7 +475,7 @@
 </script>

 <CommandPaletteDefaultProvider name={$t('assets')} actions={[Tag, TagPeople]} />
-<OnEvents {onAssetUpdate} {onAssetsUndoArchive} />
+<OnEvents {onAssetUpdate} />

 <svelte:document
  bind:fullscreenElement
--- a/web/src/lib/components/shared-components/map/Map.svelte
+++ b/web/src/lib/components/shared-components/map/Map.svelte
@@ -309,12 +309,12 @@
    untrack(() => map?.jumpTo({ center, zoom }));
  });

-  const onAssetsChanged = async () => {
+  const onAssetsDelete = async () => {
    mapMarkers = await loadMapMarkers();
  };
 </script>

-<OnEvents onAssetsDelete={onAssetsChanged} onAssetsArchive={onAssetsChanged} onAssetsUnarchive={onAssetsChanged} />
+<OnEvents {onAssetsDelete} />

 <!--  We handle style loading ourselves so we set style blank here -->
 <MapLibre
--- a/web/src/lib/managers/edit/transform-manager.svelte.ts
+++ b/web/src/lib/managers/edit/transform-manager.svelte.ts
@@ -8,7 +8,17 @@ import { normalizeTransformEdits } from '$lib/utils/editor';
 import { handleError } from '$lib/utils/handle-error';

 export type CropAspectRatio =
-  '1:1' | '16:9' | '4:3' | '3:2' | '7:5' | '9:16' | '3:4' | '2:3' | '5:7' | 'free' | 'reset';
+  | '1:1'
+  | '16:9'
+  | '4:3'
+  | '3:2'
+  | '7:5'
+  | '9:16'
+  | '3:4'
+  | '2:3'
+  | '5:7'
+  | 'free'
+  | 'reset';

 type Region = {
  x: number;
--- a/web/src/lib/managers/event-manager.svelte.ts
+++ b/web/src/lib/managers/event-manager.svelte.ts
@@ -16,7 +16,6 @@ import type {
  UserAdminResponseDto,
  WorkflowResponseDto,
 } from '@immich/sdk';
-import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
 import { BaseEventManager } from '$lib/utils/base-event-manager.svelte';
 import type { TreeNode } from '$lib/utils/tree-utils';

@@ -36,8 +35,6 @@ export type Events = {

  AssetUpdate: [AssetResponseDto];
  AssetsArchive: [string[]];
-  AssetsUnarchive: [TimelineAsset[]];
-  AssetsUndoArchive: [TimelineAsset[]];
  AssetsDelete: [string[]];
  AssetEditsApplied: [string];
  AssetsTag: [string[]];
--- a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
@@ -1,4 +1,4 @@
-import { AssetOrder, AssetOrderBy, getAssetInfo, getTimeBuckets, type AssetResponseDto } from '@immich/sdk';
+import { AssetOrder, getAssetInfo, getTimeBuckets, AssetOrderBy, type AssetResponseDto } from '@immich/sdk';
 import { clamp, isEqual } from 'lodash-es';
 import { SvelteDate, SvelteSet } from 'svelte/reactivity';
 import { VirtualScrollManager } from '$lib/managers/VirtualScrollManager/VirtualScrollManager.svelte';
@@ -114,15 +114,7 @@ export class TimelineManager extends VirtualScrollManager {

    this.#unsubscribes.push(
      eventManager.on({
-        AssetUpdate: (asset: AssetResponseDto) => {
-          const timelineAsset = toTimelineAsset(asset);
-          if (this.#options.albumId || this.#options.personId) {
-            this.#updateAssets([timelineAsset]);
-          } else {
-            this.upsertAssets([timelineAsset]);
-          }
-        },
-        AssetsUnarchive: (assets) => this.upsertAssets(assets),
+        AssetUpdate: (asset: AssetResponseDto) => this.#updateAssets([toTimelineAsset(asset)]),
      }),
    );
  }
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -24,7 +24,6 @@ import { get } from 'svelte/store';
 import type { AssetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
 import { authManager } from '$lib/managers/auth-manager.svelte';
 import { downloadManager } from '$lib/managers/download-manager.svelte';
-import { eventManager } from '$lib/managers/event-manager.svelte';
 import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
 import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
 import { downloadBlob, downloadRequest, withError } from '$lib/utils';
@@ -32,7 +31,6 @@ import { getByteUnitString } from '$lib/utils/byte-units';
 import { getFormatter } from '$lib/utils/i18n';
 import { navigate } from '$lib/utils/navigation';
 import { asQueryString } from '$lib/utils/shared-links';
-import { toTimelineAsset } from '$lib/utils/timeline-util';
 import { handleError } from './handle-error';

 export const tagAssets = async ({
@@ -402,12 +400,7 @@ export const toggleArchive = async (asset: AssetResponseDto) => {
    });

    asset.isArchived = data.isArchived;
-    if (asset.isArchived) {
-      const timelineAsset = toTimelineAsset(asset);
-      showUndoArchiveToast($t('added_to_archive'), [timelineAsset]);
-    } else {
-      toastManager.primary($t('removed_from_archive'));
-    }
+    toastManager.primary(asset.isArchived ? $t(`added_to_archive`) : $t(`removed_from_archive`));
  } catch (error) {
    handleError(error, $t('errors.unable_to_add_remove_archive', { values: { archived: asset.isArchived } }));
  }
@@ -415,45 +408,7 @@ export const toggleArchive = async (asset: AssetResponseDto) => {
  return asset;
 };

-const showUndoArchiveToast = (description: string, assets: TimelineAsset[]) => {
-  const $t = get(t);
-  toastManager.primary({
-    description,
-    button: (close) => ({
-      label: $t('undo'),
-      onclick: () => {
-        close();
-        void undoArchiveAssets(assets);
-      },
-    }),
-  });
-};
-
-const undoArchiveAssets = async (assets: TimelineAsset[]) => {
-  const $t = get(t);
-  try {
-    const ids = assets.map((a) => a.id);
-    if (ids.length > 0) {
-      await updateAssets({
-        assetBulkUpdateDto: {
-          ids,
-          visibility: AssetVisibility.Timeline,
-        },
-      });
-    }
-
-    for (const asset of assets) {
-      asset.visibility = AssetVisibility.Timeline;
-    }
-    eventManager.emit('AssetsUnarchive', assets);
-    eventManager.emit('AssetsUndoArchive', assets);
-    toastManager.success($t('unarchived_count', { values: { count: assets.length } }));
-  } catch (error) {
-    handleError(error, $t('errors.unable_to_archive_unarchive', { values: { archived: false } }));
-  }
-};
-
-export const archiveAssets = async (assets: TimelineAsset[], visibility: AssetVisibility) => {
+export const archiveAssets = async (assets: { id: string }[], visibility: AssetVisibility) => {
  const ids = assets.map(({ id }) => id);
  const $t = get(t);

@@ -464,11 +419,11 @@ export const archiveAssets = async (assets: TimelineAsset[], visibility: AssetVi
      });
    }

-    if (visibility === AssetVisibility.Archive) {
-      showUndoArchiveToast($t('archived_count', { values: { count: ids.length } }), assets);
-    } else {
-      toastManager.primary($t('unarchived_count', { values: { count: ids.length } }));
-    }
+    toastManager.primary(
+      visibility === AssetVisibility.Archive
+        ? $t('archived_count', { values: { count: ids.length } })
+        : $t('unarchived_count', { values: { count: ids.length } }),
+    );
  } catch (error) {
    handleError(
      error,
--- a/web/src/lib/utils/byte-units.ts
+++ b/web/src/lib/utils/byte-units.ts
@@ -1,11 +1,11 @@
 export const enum ByteUnit {
-  B = 'B',
-  KiB = 'KiB',
-  MiB = 'MiB',
-  GiB = 'GiB',
-  TiB = 'TiB',
-  PiB = 'PiB',
-  EiB = 'EiB',
+  'B' = 'B',
+  'KiB' = 'KiB',
+  'MiB' = 'MiB',
+  'GiB' = 'GiB',
+  'TiB' = 'TiB',
+  'PiB' = 'PiB',
+  'EiB' = 'EiB',
 }

 const byteUnits = [ByteUnit.B, ByteUnit.KiB, ByteUnit.MiB, ByteUnit.GiB, ByteUnit.TiB, ByteUnit.PiB, ByteUnit.EiB];
--- a/web/src/lib/utils/sw-messaging.ts
+++ b/web/src/lib/utils/sw-messaging.ts
@@ -1,6 +1,7 @@
 import { ServiceWorkerMessenger } from './sw-messenger';

 const hasServiceWorker = globalThis.isSecureContext && 'serviceWorker' in navigator;
+// eslint-disable-next-line compat/compat
 const messenger = hasServiceWorker ? new ServiceWorkerMessenger(navigator.serviceWorker) : undefined;

 export function cancelImageUrl(url: string | undefined | null) {
--- a/web/src/lib/utils/timeline-util.ts
+++ b/web/src/lib/utils/timeline-util.ts
@@ -165,10 +165,7 @@ export const toTimelineAsset = (unknownAsset: AssetResponseDto | TimelineAsset):
  const people = assetResponse.people?.map((person) => person.name) || [];

  const localDateTime = fromISODateTimeUTCToObject(assetResponse.localDateTime);
-  // Keep this consistent with the bucket loader (getTimes), which stores fileCreatedAt as UTC
-  // components. The timeline sorts assets within a day by fileCreatedAt, so a mismatched
-  // representation here would place re-inserted assets (e.g. undo archive) in the wrong spot.
-  const fileCreatedAt = fromISODateTimeUTCToObject(assetResponse.fileCreatedAt);
+  const fileCreatedAt = fromISODateTimeToObject(assetResponse.fileCreatedAt, assetResponse.exifInfo?.timeZone ?? 'UTC');
  const createdAt = fromISODateTimeUTCToObject(assetResponse.createdAt);

  return {
--- a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -329,7 +329,6 @@
  onPersonAssetDelete={handlePersonAssetDelete}
  onAssetsDelete={updateAssetCount}
  onAssetsArchive={updateAssetCount}
-  onAssetsUnarchive={updateAssetCount}
 />

 <main
--- a/web/src/routes/admin/system-settings/SettingTextarea.svelte
+++ b/web/src/routes/admin/system-settings/SettingTextarea.svelte
@@ -63,5 +63,6 @@
    {required}
    {value}
    oninput={handleInput}
-    {disabled}></textarea>
+    {disabled}
+  ></textarea>
 </div>