fix(deps): update mobile

2026-05-29 11:02:38 -04:00 · 2026-05-27 16:17:34 +00:00
90 changed files with 744 additions and 1179 deletions
@@ -8,8 +8,6 @@ log "Preparing Immich Web Frontend"
 log ""
 run_cmd pnpm --filter @immich/sdk install
 run_cmd pnpm --filter @immich/sdk build
-run_cmd pnpm --filter @immich/plugin-sdk install
-run_cmd pnpm --filter @immich/plugin-sdk build
 run_cmd pnpm --filter immich-web install

 log "Starting Immich Web Frontend"
@@ -1,46 +1,46 @@
 dev:
-	@printf "This command has been removed. Please use:\n\n    mise dev          # or mise //:dev from another directory\n\n" >&2 && exit 1
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans

 dev-down:
-	@printf "This command has been removed. Please use:\n\n    mise dev-down          # or mise //:dev-down from another directory\n\n" >&2 && exit 1
+	docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans

 dev-update:
-	@printf "This command has been removed. Please use:\n\n    mise dev-update          # or mise //:dev-update from another directory\n\n" >&2 && exit 1
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans

 dev-scale:
-	@printf "This command has been removed. Please use:\n\n    mise dev-scale          # or mise //:dev-scale from another directory\n\n" >&2 && exit 1
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --scale immich-server=3 --remove-orphans

 dev-docs:
 	npm --prefix docs run start

 .PHONY: e2e
 e2e:
-	@printf "This command has been removed. Please use:\n\n    mise e2e          # or mise //:e2e from another directory\n\n" >&2 && exit 1
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --remove-orphans

 e2e-dev:
-	@printf "This command has been removed. Please use:\n\n    mise e2e-dev          # or mise //:e2e-dev from another directory\n\n" >&2 && exit 1
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.dev.yml up --remove-orphans

 e2e-update:
-	@printf "This command has been removed. Please use:\n\n    mise e2e-update          # or mise //:e2e-update from another directory\n\n" >&2 && exit 1
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans

 e2e-down:
-	@printf "This command has been removed. Please use:\n\n    mise e2e-down          # or mise //:e2e-down from another directory\n\n" >&2 && exit 1
+	docker compose -f ./e2e/docker-compose.yml down --remove-orphans

 prod:
-	@printf "This command has been removed. Please use:\n\n    mise prod          # or mise //:prod from another directory\n\n" >&2 && exit 1
+	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans

 prod-down:
-	@printf "This command has been removed. Please use:\n\n    mise prod-down          # or mise //:prod-down from another directory\n\n" >&2 && exit 1
+	docker compose -f ./docker/docker-compose.prod.yml down --remove-orphans

 prod-scale:
-	@printf "This command has been removed. Please use:\n\n    mise prod-scale          # or mise //:prod-scale from another directory\n\n" >&2 && exit 1
+	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans

 .PHONY: open-api
 open-api:
-	@printf "This command has been removed. Please use:\n\n    mise open-api          # or mise //:open-api from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise open-api          # or mise //:open-api from another directory\n\n"\n\n >&2 && exit 1

 sql:
-	@printf "This command has been removed. Please use:\n\n    mise sql               # or mise //:sql from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise sql               # or mise //:sql from another directory\n\n"\n\n >&2 && exit 1


 renovate:
@@ -52,7 +52,16 @@ renovate:
 MODULES = e2e server web cli sdk docs .github

 test-e2e:
-	@printf "This command has been removed. Please use:\n\n    mise //e2e:test               # or mise //e2e:test-web for web tests, respectively\n\n" >&2 && exit 1
+	docker compose -f ./e2e/docker-compose.yml build
+	pnpm --filter immich-e2e run test
+	pnpm --filter immich-e2e run test:web

 clean:
-	@printf "This command has been removed. Please use:\n\n    mise clean               # or mise //:clean from another directory\n\n" >&2 && exit 1
+	find . -name "node_modules" -type d -prune -exec rm -rf {} +
+	find . -name "dist" -type d -prune -exec rm -rf '{}' +
+	find . -name "build" -type d -prune -exec rm -rf '{}' +
+	find . -name ".svelte-kit" -type d -prune -exec rm -rf '{}' +
+	find . -name "coverage" -type d -prune -exec rm -rf '{}' +
+	find . -name ".pnpm-store" -type d -prune -exec rm -rf '{}' +
+	command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml down -v --remove-orphans || true
+	command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml down -v --remove-orphans || true
@@ -1,21 +1,11 @@
 [tasks.install]
 run = "pnpm install --filter immich-e2e --frozen-lockfile"

-[tasks.build]
-dir = "{{ config_root }}"
-run = "docker compose build"
-
 [tasks.test]
-depends = ["//e2e:build", "//e2e:ci-setup"]
 env._.path = "./node_modules/.bin"
 run = "vitest --run"

-[tasks.playwright-install]
-env._.path = "./node_modules/.bin"
-run = "playwright install"
-
 [tasks."test-web"]
-depends = ["//e2e:build", "//e2e:ci-setup", "//e2e:playwright-install"]
 env._.path = "./node_modules/.bin"
 run = "playwright test"

@@ -40,12 +30,7 @@ run = "tsc --noEmit"


 [tasks.ci-setup]
-depends = [
-  "//:sdk:install",
-  "//:sdk:build",
-  "//packages/cli:install",
-  "//packages/cli:build",
-]
+depends = ["//:sdk:install", "//:sdk:build", "//cli:install", "//cli:build"]
 run = { task = ":install" }


@@ -55,8 +55,8 @@ export function toColumnarFormat(assets: MockTimelineAsset[]): TimeBucketAssetRe
    result.duration.push(asset.duration);
    result.projectionType.push(asset.projectionType);
    result.livePhotoVideoId.push(asset.livePhotoVideoId);
-    result.city?.push(asset.city);
-    result.country?.push(asset.country);
+    result.city.push(asset.city);
+    result.country.push(asset.country);
    result.visibility.push(asset.visibility);
  }

@@ -2233,7 +2233,6 @@
  "slideshow_repeat": "Repeat slideshow",
  "slideshow_repeat_description": "Loop back to beginning when slideshow ends",
  "slideshow_settings": "Slideshow settings",
-  "smart_album": "Smart album",
  "sort_albums_by": "Sort albums by...",
  "sort_created": "Date created",
  "sort_items": "Number of items",
@@ -64,7 +64,6 @@ class TextRecognizer(InferenceModel):
                rec_batch_num=max_batch_size if max_batch_size else 6,
                rec_img_shape=(3, 48, 320),
                lang_type=self.language,
-                model_root_dir=self.cache_dir,
            )
        )
        return session
@@ -1028,12 +1028,7 @@ class TestOcr:
        text_recognizer.load()

        rapid_recognizer.assert_called_once_with(
-            OcrOptions(
-              session=ort_session.return_value,
-              rec_batch_num=6,
-              rec_img_shape=(3, 48, 320),
-              model_root_dir=text_recognizer.cache_dir,
-            )
+            OcrOptions(session=ort_session.return_value, rec_batch_num=6, rec_img_shape=(3, 48, 320))
        )

    def test_set_custom_max_batch_size(self, ort_session: mock.Mock, path: mock.Mock, mocker: MockerFixture) -> None:
@@ -1046,12 +1041,7 @@ class TestOcr:
        text_recognizer.load()

        rapid_recognizer.assert_called_once_with(
-            OcrOptions(
-              session=ort_session.return_value,
-              rec_batch_num=4,
-              rec_img_shape=(3, 48, 320),
-              model_root_dir=text_recognizer.cache_dir,
-            )
+            OcrOptions(session=ort_session.return_value, rec_batch_num=4, rec_img_shape=(3, 48, 320))
        )

    def test_ignore_other_custom_max_batch_size(
@@ -1066,12 +1056,7 @@ class TestOcr:
        text_recognizer.load()

        rapid_recognizer.assert_called_once_with(
-            OcrOptions(
-              session=ort_session.return_value,
-              rec_batch_num=6,
-              rec_img_shape=(3, 48, 320),
-              model_root_dir=text_recognizer.cache_dir,
-            )
+            OcrOptions(session=ort_session.return_value, rec_batch_num=6, rec_img_shape=(3, 48, 320))
        )


@@ -54,8 +54,8 @@ lockfile = true

 [tasks.plugins]
 run = [
-  "pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter @immich/plugin-core install --frozen-lockfile",
-  "pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter @immich/plugin-core build",
+  "pnpm --filter @immich/plugin-sdk --filter @immich/plugin-core install --frozen-lockfile",
+  "pnpm --filter @immich/plugin-sdk --filter @immich/plugin-core build",
 ]

 [tasks.open-api-typescript]
@@ -84,72 +84,6 @@ run = [
 dir = "server"
 run = "node ./dist/bin/sync-sql.js"

-# TODO dev, prod, and e2e should be de-duplicated by using env but for some reason I ran into issues
-[tasks.dev]
-depends = "//:plugins"
-dir = "docker"
-interactive = true
-env = { COMPOSE_BAKE = true }
-run = "docker compose -f ./docker-compose.dev.yml up --remove-orphans"
-depends_post = "//:dev-down"
-
-[tasks.dev-update]
-run = { task = "//:dev", args = ["--build", "-V"] }
-
-[tasks.dev-scale]
-run = { task = "//:dev", args = ["--build", "-V", "--scale immich-server=3"] }
-
-[tasks.dev-down]
-dir = "docker"
-run = "docker compose -f ./docker-compose.dev.yml down --remove-orphans"
-
-[tasks.prod]
-depends = "//:plugins"
-dir = "docker"
-interactive = true
-env = { COMPOSE_BAKE = true }
-run = "docker compose -f ./docker-compose.prod.yml up --build --remove-orphans"
-depends_post = "//:prod-down"
-
-[tasks.prod-scale]
-run = { task = "//:prod", args = [
-  "--build",
-  "-V",
-  "--scale immich-server=3",
-  "--scale immich-microservices",
-] }
-
-[tasks.prod-down]
-dir = "docker"
-run = "docker compose -f ./docker-compose.prod.yml down --remove-orphans"
-
-[tasks.e2e]
-depends = "//:plugins"
-dir = "e2e"
-interactive = true
-env = { COMPOSE_BAKE = true }
-run = "docker compose -f ./docker-compose.yml up --remove-orphans"
-depends_post = "//:e2e-down"
-
-[tasks.e2e-dev]
-depends = "//:plugins"
-dir = "e2e"
-interactive = true
-env = { COMPOSE_BAKE = true }
-run = "docker compose -f ./docker-compose.dev.yml up --remove-orphans"
-depends_post = "//:e2e-dev-down"
-
-[tasks.e2e-update]
-run = { task = "//:e2e", args = ["--build", '-V'] }
-
-[tasks.e2e-down]
-dir = "e2e"
-run = "docker compose -f ./docker-compose.yml down --remove-orphans"
-
-[tasks.e2e-dev-down]
-dir = "e2e"
-run = "docker compose -f ./docker-compose.dev.yml down --remove-orphans"
-
 # SDK tasks
 [tasks."sdk:install"]
 dir = "packages/sdk"
@@ -165,14 +99,3 @@ run = "pnpm format"

 [tasks."i18n:format-fix"]
 run = "pnpm format:fix"
-
-[tasks.clean]
-run = [
-  "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +",
-  "find . -name 'dist' -type d -prune -exec rm -rf '{}' +",
-  "find . -name 'build' -type d -prune -exec rm -rf '{}' +",
-  "find . -name '.svelte-kit' -type d -prune -exec rm -rf '{}' +",
-  "find . -name 'coverage' -type d -prune -exec rm -rf '{}' +",
-  "find . -name '.pnpm-store' -type d -prune -exec rm -rf '{}' +",
-  { task = "//:*-down" },
-]
@@ -23,7 +23,6 @@ const String kBackupLivePhotoGroup = 'backup_live_photo_group';
 const String kDownloadGroupImage = 'group_image';
 const String kDownloadGroupVideo = 'group_video';
 const String kDownloadGroupLivePhoto = 'group_livephoto';
-const String kShareDownloadGroup = 'group_share';

 // Timeline constants
 const int kTimelineNoneSegmentSize = 120;
@@ -1,25 +1,14 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/constants/colors.dart';
-import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/config/album_config.dart';
 import 'package:immich_mobile/domain/models/config/backup_config.dart';
 import 'package:immich_mobile/domain/models/config/cleanup_config.dart';
 import 'package:immich_mobile/domain/models/config/image_config.dart';
 import 'package:immich_mobile/domain/models/config/map_config.dart';
-import 'package:immich_mobile/domain/models/config/network_config.dart';
 import 'package:immich_mobile/domain/models/config/slideshow_config.dart';
 import 'package:immich_mobile/domain/models/config/theme_config.dart';
 import 'package:immich_mobile/domain/models/config/timeline_config.dart';
 import 'package:immich_mobile/domain/models/config/viewer_config.dart';
-import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/metadata_key.dart';
-import 'package:immich_mobile/domain/models/timeline.model.dart';
-import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
-
-const defaultConfig = AppConfig();

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

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

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

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

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

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

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

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

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

+enum MetadataDomain<T extends Object> {
+  appConfig<AppConfig>('config.app'),
+  systemConfig<SystemConfig>('config.system');
+
+  final String prefix;
+  const MetadataDomain(this.prefix);
+}
+
 enum MetadataKey<T extends Object> {
  // Theme
-  themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
-  themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
-  themeDynamic<bool>(),
-  themeColorfulInterface<bool>(),
+  themePrimaryColor<ImmichColorPreset>(.appConfig, 'theme.primaryColor', .indigo, _EnumCodec(ImmichColorPreset.values)),
+  themeMode<ThemeMode>(.appConfig, 'theme.mode', .system, _EnumCodec(ThemeMode.values)),
+  themeDynamic<bool>(.appConfig, 'theme.dynamic', false),
+  themeColorfulInterface<bool>(.appConfig, 'theme.colorfulInterface', true),

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  const _PrimitiveCodec._(this._parse);

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

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

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

-  static String _identity(String s) => s;
+  static String? _identity(String s) => s;
 }
@@ -56,7 +56,7 @@ class LogService {
  }) async {
    final instance = LogService._(logRepository, metadataRepository, shouldBuffer);
    await logRepository.truncate(limit: kLogTruncateLimit);
-    final level = instance._metadataRepository.appConfig.logLevel;
+    final level = instance._metadataRepository.systemConfig.logLevel;
    Logger.root.level = Level.LEVELS.elementAtOrNull(level.index) ?? Level.INFO;
    return instance;
  }
@@ -1,12 +1,14 @@
-import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/domain/models/metadata_key.dart';
+import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';

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

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

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

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

-  Future<void> refresh() async => _applyOverrides(await _db.select(_db.metadataEntity).get());
-
-  Future<void> clear(Iterable<MetadataKey> keys) async {
-    if (keys.isEmpty) {
-      return;
-    }
-
-    final names = keys.map((key) => key.name).toList();
-    await (_db.delete(_db.metadataEntity)..where((row) => row.key.isIn(names))).go();
-
-    for (final key in keys) {
-      _appConfig = _appConfig.write(key, defaultConfig.read(key));
-    }
+  static Future<void> refresh() async {
+    instance._cache.clear();
+    instance._appConfig = const .new();
+    instance._systemConfig = const .new();
+    await instance._hydrate();
  }

-  Future<void> write<T extends Object, U extends T>(MetadataKey<T> key, U value) async {
-    if (value == _appConfig.read(key)) {
-      return;
-    }
+  Future<void> _hydrate() async => _hydrateCache(await _db.select(_db.metadataEntity).get());

-    if (value == defaultConfig.read(key)) {
-      return clear([key]);
+  T _read<T extends Object>(MetadataKey<T> key) => (_cache[key] as T?) ?? key.defaultValue;
+
+  Future<void> write<T extends Object, U extends T>(MetadataKey<T> key, U value) async {
+    if (_read(key) == value) {
+      return;
    }

    await _db
        .into(_db.metadataEntity)
        .insertOnConflictUpdate(
-          MetadataEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
+          MetadataEntityCompanion.insert(key: key.key, value: key.encode(value), updatedAt: Value(DateTime.now())),
        );
-    _appConfig = _appConfig.write(key, value);
+    _updateCache(key, value);
  }

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

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

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

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

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

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

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

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

    return EasyLocalization(
      supportedLocales: locales.values.toList(),
@@ -9,7 +9,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_bu
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
-import 'package:immich_mobile/providers/infrastructure/album.provider.dart';

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

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

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

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

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

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

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

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

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

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

@@ -130,7 +130,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
    await _apiService.updateHeaders();

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

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

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

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

  /// Returns the current server endpoint (with /api) URL from the store
@@ -465,17 +465,11 @@ class ActionNotifier extends Notifier<void> {
    ActionSource source,
    BuildContext context, {
    Completer<void>? cancelCompleter,
-    void Function(double progress)? onAssetDownloadProgress,
  }) async {
    final ids = _getAssets(source).toList(growable: false);

    try {
-      await _service.shareAssets(
-        ids,
-        context,
-        cancelCompleter: cancelCompleter,
-        onAssetDownloadProgress: onAssetDownloadProgress,
-      );
+      await _service.shareAssets(ids, context, cancelCompleter: cancelCompleter);
      return ActionResult(count: ids.length, success: true);
    } catch (error, stack) {
      _logger.severe('Failed to share assets', error, stack);
@@ -1,12 +1,20 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';

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

 final appConfigProvider = Provider.autoDispose<AppConfig>((ref) {
  final repo = ref.watch(metadataProvider);
-  final subscription = repo.watchConfig().listen((event) => ref.state = event);
+  final subscription = repo.watchAppConfig().listen((event) => ref.state = event);
  ref.onDispose(subscription.cancel);
  return repo.appConfig;
 });
+
+final systemConfigProvider = Provider.autoDispose<SystemConfig>((ref) {
+  final repo = ref.watch(metadataProvider);
+  final subscription = repo.watchSystemConfig().listen((event) => ref.state = event);
+  ref.onDispose(subscription.cancel);
+  return repo.systemConfig;
+});
@@ -1,29 +1,31 @@
 import 'dart:async';
 import 'dart:io';

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  List<AuxilaryEndpoint> getExternalEndpointList() {
-    return _config.network.externalEndpointList.map((url) => AuxilaryEndpoint(url: url, status: .valid)).toList();
+    return _metadata.systemConfig.network.externalEndpointList
+        .map((url) => AuxilaryEndpoint(url: url, status: .valid))
+        .toList();
  }
 }
@@ -269,18 +269,8 @@ class ActionService {
    await _assetApiRepository.unStack(stackIds);
  }

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

  Future<List<bool>> downloadAll(List<RemoteAsset> assets) {
@@ -13,7 +13,7 @@ import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';

 class ApiService {
-  final ApiClient _apiClient = ApiClient(basePath: '');
+  late ApiClient _apiClient;

  late UsersApi usersApi;
  late AuthenticationApi authenticationApi;
@@ -54,7 +54,7 @@ class ApiService {
  }

  setEndpoint(String endpoint) {
-    _apiClient.basePath = endpoint;
+    _apiClient = ApiClient(basePath: endpoint);
    _apiClient.client = NetworkRepository.client;
    usersApi = UsersApi(_apiClient);
    authenticationApi = AuthenticationApi(_apiClient);
@@ -177,9 +177,9 @@ class ApiService {
    if (serverEndpoint != null && serverEndpoint.isNotEmpty) {
      urls.add(serverEndpoint);
    }
-    final network = MetadataRepository.instance.appConfig.network;
+    final network = MetadataRepository.instance.systemConfig.network;
    final localEndpoint = network.localEndpoint;
-    if (localEndpoint.isNotEmpty) {
+    if (localEndpoint != null) {
      urls.add(localEndpoint);
    }
    for (final url in network.externalEndpointList) {
@@ -191,7 +191,7 @@ class ApiService {
  }

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

  ApiClient get apiClient => _apiClient;
@@ -110,7 +110,7 @@ class AuthService {
  /// - Authentication repository data
  /// - Current user information
  /// - Access token
-  /// - Server-specific endpoint configuration
+  /// - Asset ETag
  ///
  /// All deletions are executed in parallel using [Future.wait].
  Future<void> clearLocalData() async {
@@ -120,12 +120,6 @@ class AuthService {
      _authRepository.clearLocalData(),
      Store.delete(StoreKey.currentUser),
      Store.delete(StoreKey.accessToken),
-      MetadataRepository.instance.clear(const [
-        .networkAutoEndpointSwitching,
-        .networkPreferredWifiName,
-        .networkLocalEndpoint,
-        .networkExternalEndpointList,
-      ]),
    ]);
  }

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

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

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

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

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

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

-    final enumValue = values.firstWhereOrNull((e) => e.name == name);
-    if (enumValue == null) {
-      return;
-    }
-
+    final enumValue = values.firstWhere((e) => e.name == name, orElse: () => newKey.defaultValue);
    _cache[newKey] = enumValue;
    _migratedStoreIds.add(legacyKey.id);
  }
@@ -273,12 +267,9 @@ class _StoreMigrator {
  Future<void> complete() async {
    await _db.batch((batch) {
      for (final entry in _cache.entries) {
-        if (entry.value == defaultConfig.read(entry.key)) {
-          continue;
-        }
        batch.insert(
          _db.metadataEntity,
-          MetadataEntityCompanion(key: Value(entry.key.name), value: Value(entry.key.encode(entry.value))),
+          MetadataEntityCompanion(key: Value(entry.key.key), value: Value(entry.key.encode(entry.value))),
          mode: InsertMode.insertOrReplace,
        );
      }
@@ -31,7 +31,7 @@ class AdvancedSettings extends HookConsumerWidget {
    final manageLocalMediaAndroid = useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
    final isManageMediaSupported = useState(false);
    final manageMediaAndroidPermission = useState(false);
-    final levelId = useState<int>(ref.read(appConfigProvider).logLevel.index);
+    final levelId = useState<int>(ref.read(systemConfigProvider).logLevel.index);
    final preferRemote = useState(ref.read(appConfigProvider).image.preferRemote);
    useValueChanged(
      preferRemote.value,
@@ -64,7 +64,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
    }

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

      if (urls.isEmpty) {
        return null;
@@ -19,7 +19,7 @@ class NetworkingSettings extends HookConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final currentEndpoint = getServerUrl();
-    final featureEnabled = useState(ref.read(appConfigProvider).network.autoEndpointSwitching);
+    final featureEnabled = useState(ref.read(systemConfigProvider).network.autoEndpointSwitching);
    useValueChanged<bool, void>(featureEnabled.value, (_, __) {
      ref.read(metadataProvider).write(.networkAutoEndpointSwitching, featureEnabled.value);
    });
@@ -508,18 +508,12 @@ class AlbumsApi {
  /// * [String] assetId:
  ///   Filter albums containing this asset ID (ignores other parameters)
  ///
-  /// * [String] id:
-  ///   Album ID
-  ///
  /// * [bool] isOwned:
  ///   Filter by ownership: true = only owned, false = only shared-with-me, undefined = no filter
  ///
  /// * [bool] isShared:
  ///   Filter by shared status: true = only shared, false = not shared, undefined = no filter
-  ///
-  /// * [String] name:
-  ///   Album name (exact match)
-  Future<Response> getAllAlbumsWithHttpInfo({ String? assetId, String? id, bool? isOwned, bool? isShared, String? name, }) async {
+  Future<Response> getAllAlbumsWithHttpInfo({ String? assetId, bool? isOwned, bool? isShared, }) async {
    // ignore: prefer_const_declarations
    final apiPath = r'/albums';

@@ -533,18 +527,12 @@ class AlbumsApi {
    if (assetId != null) {
      queryParams.addAll(_queryParams('', 'assetId', assetId));
    }
-    if (id != null) {
-      queryParams.addAll(_queryParams('', 'id', id));
-    }
    if (isOwned != null) {
      queryParams.addAll(_queryParams('', 'isOwned', isOwned));
    }
    if (isShared != null) {
      queryParams.addAll(_queryParams('', 'isShared', isShared));
    }
-    if (name != null) {
-      queryParams.addAll(_queryParams('', 'name', name));
-    }

    const contentTypes = <String>[];

@@ -569,19 +557,13 @@ class AlbumsApi {
  /// * [String] assetId:
  ///   Filter albums containing this asset ID (ignores other parameters)
  ///
-  /// * [String] id:
-  ///   Album ID
-  ///
  /// * [bool] isOwned:
  ///   Filter by ownership: true = only owned, false = only shared-with-me, undefined = no filter
  ///
  /// * [bool] isShared:
  ///   Filter by shared status: true = only shared, false = not shared, undefined = no filter
-  ///
-  /// * [String] name:
-  ///   Album name (exact match)
-  Future<List<AlbumResponseDto>?> getAllAlbums({ String? assetId, String? id, bool? isOwned, bool? isShared, String? name, }) async {
-    final response = await getAllAlbumsWithHttpInfo( assetId: assetId, id: id, isOwned: isOwned, isShared: isShared, name: name, );
+  Future<List<AlbumResponseDto>?> getAllAlbums({ String? assetId, bool? isOwned, bool? isShared, }) async {
+    final response = await getAllAlbumsWithHttpInfo( assetId: assetId, isOwned: isOwned, isShared: isShared, );
    if (response.statusCode >= HttpStatus.badRequest) {
      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
    }
@@ -13,7 +13,7 @@ part of openapi.api;
 class ApiClient {
  ApiClient({this.basePath = '/api', this.authentication,});

-  String basePath;
+  final String basePath;
  final Authentication? authentication;

  var _client = Client();
@@ -77,7 +77,7 @@ class JobName {
  static const versionCheck = JobName._(r'VersionCheck');
  static const ocrQueueAll = JobName._(r'OcrQueueAll');
  static const ocr = JobName._(r'Ocr');
-  static const workflowAssetTrigger = JobName._(r'WorkflowAssetTrigger');
+  static const workflowAssetCreate = JobName._(r'WorkflowAssetCreate');

  /// List of all possible values in this [enum][JobName].
  static const values = <JobName>[
@@ -135,7 +135,7 @@ class JobName {
    versionCheck,
    ocrQueueAll,
    ocr,
-    workflowAssetTrigger,
+    workflowAssetCreate,
  ];

  static JobName? fromJson(dynamic value) => JobNameTypeTransformer().decode(value);
@@ -228,7 +228,7 @@ class JobNameTypeTransformer {
        case r'VersionCheck': return JobName.versionCheck;
        case r'OcrQueueAll': return JobName.ocrQueueAll;
        case r'Ocr': return JobName.ocr;
-        case r'WorkflowAssetTrigger': return JobName.workflowAssetTrigger;
+        case r'WorkflowAssetCreate': return JobName.workflowAssetCreate;
        default:
          if (!allowNull) {
            throw ArgumentError('Unknown enum value to decode: $data');
@@ -18,7 +18,6 @@ class PluginTemplateResponseDto {
    this.steps = const [],
    required this.title,
    required this.trigger,
-    this.uiHints = const [],
  });

  /// Template description
@@ -35,17 +34,13 @@ class PluginTemplateResponseDto {

  WorkflowTrigger trigger;

-  /// Ui hints, for example \"smart-album\"
-  List<String> uiHints;
-
  @override
  bool operator ==(Object other) => identical(this, other) || other is PluginTemplateResponseDto &&
    other.description == description &&
    other.key == key &&
    _deepEquality.equals(other.steps, steps) &&
    other.title == title &&
-    other.trigger == trigger &&
-    _deepEquality.equals(other.uiHints, uiHints);
+    other.trigger == trigger;

  @override
  int get hashCode =>
@@ -54,11 +49,10 @@ class PluginTemplateResponseDto {
    (key.hashCode) +
    (steps.hashCode) +
    (title.hashCode) +
-    (trigger.hashCode) +
-    (uiHints.hashCode);
+    (trigger.hashCode);

  @override
-  String toString() => 'PluginTemplateResponseDto[description=$description, key=$key, steps=$steps, title=$title, trigger=$trigger, uiHints=$uiHints]';
+  String toString() => 'PluginTemplateResponseDto[description=$description, key=$key, steps=$steps, title=$title, trigger=$trigger]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
@@ -67,7 +61,6 @@ class PluginTemplateResponseDto {
      json[r'steps'] = this.steps;
      json[r'title'] = this.title;
      json[r'trigger'] = this.trigger;
-      json[r'uiHints'] = this.uiHints;
    return json;
  }

@@ -85,9 +78,6 @@ class PluginTemplateResponseDto {
        steps: PluginTemplateStepResponseDto.listFromJson(json[r'steps']),
        title: mapValueOfType<String>(json, r'title')!,
        trigger: WorkflowTrigger.fromJson(json[r'trigger'])!,
-        uiHints: json[r'uiHints'] is Iterable
-            ? (json[r'uiHints'] as Iterable).cast<String>().toList(growable: false)
-            : const [],
      );
    }
    return null;
@@ -140,7 +130,6 @@ class PluginTemplateResponseDto {
    'steps',
    'title',
    'trigger',
-    'uiHints',
  };
 }

@@ -10,16 +10,9 @@ class ImmichFormController extends ChangeNotifier {
  FutureOr<void> Function()? onSubmit;
  final formKey = GlobalKey<FormState>();

-  bool _isDisposed = false;
  bool _isLoading = false;
  bool get isLoading => _isLoading;

-  @override
-  void dispose() {
-    _isDisposed = true;
-    super.dispose();
-  }
-
  Future<void> submit() async {
    if (_isLoading) {
      return;
@@ -34,9 +27,7 @@ class ImmichFormController extends ChangeNotifier {
      await onSubmit?.call();
    } finally {
      _isLoading = false;
-      if (!_isDisposed) {
-        notifyListeners();
-      }
+      notifyListeners();
    }
  }
 }
@@ -47,7 +38,13 @@ class ImmichForm extends StatefulWidget {
  final String? submitText;
  final IconData? submitIcon;

-  const ImmichForm({super.key, this.onSubmit, this.submitText, this.submitIcon, required this.builder});
+  const ImmichForm({
+    super.key,
+    this.onSubmit,
+    this.submitText,
+    this.submitIcon,
+    required this.builder,
+  });

  @override
  State<ImmichForm> createState() => _ImmichFormState();
@@ -34,7 +34,7 @@ dependencies:
  flutter_web_auth_2: ^5.0.2
  fluttertoast: ^8.2.14
  geolocator: ^14.0.2
-  home_widget: ^0.8.1
+  home_widget: ^0.9.0
  hooks_riverpod: ^2.6.1
  http: ^1.6.0
  image_picker: ^1.2.1
@@ -43,7 +43,7 @@ dependencies:
  intl: ^0.20.2
  local_auth: ^2.3.0
  logging: ^1.3.0
-  maplibre_gl: ^0.22.0
+  maplibre_gl: ^0.26.0
  native_video_player:
    git:
      url: https://github.com/immich-app/native_video_player
@@ -67,7 +67,7 @@ dependencies:
  sliver_tools: ^0.2.12
  stream_transform: ^2.1.1
  thumbhash: 0.1.0+1
-  timezone: ^0.9.4
+  timezone: ^0.11.0
  url_launcher: ^6.3.2
  uuid: ^4.5.3
  wakelock_plus: ^1.3.3
@@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
@@ -39,7 +39,7 @@ void main() {
    registerFallbackValue(LogLevel.info);

    when(() => mockLogRepo.truncate(limit: any(named: 'limit'))).thenAnswer((_) async => {});
-    when(() => mockMetadataRepository.appConfig).thenReturn(const AppConfig(logLevel: LogLevel.fine));
+    when(() => mockMetadataRepository.systemConfig).thenReturn(const SystemConfig(logLevel: LogLevel.fine));
    when(() => mockMetadataRepository.write<LogLevel, LogLevel>(MetadataKey.logLevel, any())).thenAnswer((_) async {});
    when(() => mockLogRepo.getAll()).thenAnswer((_) async => []);
    when(() => mockLogRepo.insert(any())).thenAnswer((_) async => true);
@@ -59,7 +59,7 @@ void main() {
    });

    test('Sets log level based on the metadata repository', () {
-      verify(() => mockMetadataRepository.appConfig).called(1);
+      verify(() => mockMetadataRepository.systemConfig).called(1);
      expect(Logger.root.level, Level.FINE);
    });
  });
@@ -23,7 +23,7 @@ void main() {

  setUp(() async {
    await ctx.db.delete(ctx.db.metadataEntity).go();
-    await MetadataRepository.instance.refresh();
+    await MetadataRepository.refresh();
  });

  group('defaults', () {
@@ -31,8 +31,8 @@ void main() {
      expect(sut.appConfig.theme.mode, ThemeMode.system);
    });

-    test('appConfig returns key defaults when DB is empty', () {
-      expect(sut.appConfig.logLevel, LogLevel.info);
+    test('systemConfig returns key defaults when DB is empty', () {
+      expect(sut.systemConfig.logLevel, LogLevel.info);
    });
  });

@@ -46,14 +46,16 @@ void main() {
      await sut.write(.themeMode, ThemeMode.light);
      await sut.write(.logLevel, LogLevel.severe);
      expect(sut.appConfig.theme.mode, ThemeMode.light);
-      expect(sut.appConfig.logLevel, LogLevel.severe);
+      expect(sut.systemConfig.logLevel, LogLevel.severe);
    });
+  });

+  group('delete', () {
    test('removes the row and reverts to default', () async {
      await sut.write(.themeMode, ThemeMode.dark);
      expect(sut.appConfig.theme.mode, ThemeMode.dark);

-      await sut.write(.themeMode, ThemeMode.system);
+      await sut.delete(.themeMode);
      expect(sut.appConfig.theme.mode, ThemeMode.system);

      final rows = await ctx.db.select(ctx.db.metadataEntity).get();
@@ -61,15 +63,13 @@ void main() {
    });
  });

-  group('delete', () {});
-
-  group('sync', () {
+  group('refresh', () {
    test('picks up rows that were inserted directly into the DB', () async {
      await ctx.db
          .into(ctx.db.metadataEntity)
          .insert(
            MetadataEntityCompanion.insert(
-              key: MetadataKey.themeMode.name,
+              key: MetadataKey.themeMode.key,
              value: ThemeMode.dark.name,
              updatedAt: Value(DateTime.now()),
            ),
@@ -78,7 +78,7 @@ void main() {
      // Cache hasn't seen this row yet — view still returns the default.
      expect(sut.appConfig.theme.mode, ThemeMode.system);

-      await MetadataRepository.instance.refresh();
+      await MetadataRepository.refresh();
      expect(sut.appConfig.theme.mode, ThemeMode.dark);
    });

@@ -88,7 +88,7 @@ void main() {
      await ctx.db.delete(ctx.db.metadataEntity).go();
      expect(sut.appConfig.theme.mode, ThemeMode.dark);

-      await MetadataRepository.instance.refresh();
+      await MetadataRepository.refresh();
      expect(sut.appConfig.theme.mode, ThemeMode.system);
    });

@@ -103,20 +103,32 @@ void main() {
            ),
          );

-      await MetadataRepository.instance.refresh();
+      await MetadataRepository.refresh();
      expect(sut.appConfig.theme.mode, ThemeMode.system);
    });
  });

  group('watch', () {
    test('watchAppConfig emits the new value after a write', () async {
-      final expectation = expectLater(sut.watchConfig().map((c) => c.theme.mode), emitsThrough(ThemeMode.dark));
+      final expectation = expectLater(sut.watchAppConfig().map((c) => c.theme.mode), emitsThrough(ThemeMode.dark));
      await sut.write(MetadataKey.themeMode, ThemeMode.dark);
      await expectation;
    });

-    test('watchConfig emits the new value after a write', () async {
-      final expectation = expectLater(sut.watchConfig().map((c) => c.logLevel), emitsThrough(LogLevel.warning));
+    test('watchAppConfig does not emit when only system-config rows change', () async {
+      final emissions = <ThemeMode>[];
+      // skip(1) drops the on-subscribe replay so we only capture emissions caused by the write below.
+      final sub = sut.watchAppConfig().skip(1).listen((c) => emissions.add(c.theme.mode));
+
+      await sut.write(MetadataKey.logLevel, LogLevel.severe);
+      await pumpEventQueue();
+      await sub.cancel();
+
+      expect(emissions, isEmpty);
+    });
+
+    test('watchSystemConfig emits the new value after a write', () async {
+      final expectation = expectLater(sut.watchSystemConfig().map((c) => c.logLevel), emitsThrough(LogLevel.warning));
      await sut.write(MetadataKey.logLevel, LogLevel.warning);
      await expectation;
    });
@@ -1,16 +1,28 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/metadata_key.dart';

 void main() {
  group('MetadataKey', () {
-    for (final key in MetadataKey.values) {
-      test('verify codec for $key', () {
-        final defaultValue = defaultConfig.read(key);
-        final encoded = key.encode(defaultValue);
+    test('every key round-trips its default value losslessly', () {
+      for (final key in MetadataKey.values) {
+        final encoded = key.encode(key.defaultValue);
        final decoded = key.decode(encoded);
-        expect(decoded, defaultValue, reason: 'round-trip failed for ${key.name}');
-      });
-    }
+        expect(decoded, key.defaultValue, reason: 'round-trip failed for ${key.name}');
+      }
+    });
+
+    test('decode falls back to the default value when the raw input is unparseable', () {
+      for (final key in MetadataKey.values) {
+        // String keys can decode any string. So skip them
+        if (key.defaultValue is String) {
+          continue;
+        }
+        expect(
+          key.decode('not a valid encoding for any key'),
+          key.defaultValue,
+          reason: 'fallback failed for ${key.name}',
+        );
+      }
+    });
  });
 }
@@ -1627,17 +1627,6 @@
              "type": "string"
            }
          },
-          {
-            "name": "id",
-            "required": false,
-            "in": "query",
-            "description": "Album ID",
-            "schema": {
-              "format": "uuid",
-              "pattern": "^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$",
-              "type": "string"
-            }
-          },
          {
            "name": "isOwned",
            "required": false,
@@ -1655,15 +1644,6 @@
            "schema": {
              "type": "boolean"
            }
-          },
-          {
-            "name": "name",
-            "required": false,
-            "in": "query",
-            "description": "Album name (exact match)",
-            "schema": {
-              "type": "string"
-            }
          }
        ],
        "responses": {
@@ -18171,7 +18151,7 @@
          "VersionCheck",
          "OcrQueueAll",
          "Ocr",
-          "WorkflowAssetTrigger"
+          "WorkflowAssetCreate"
        ],
        "type": "string"
      },
@@ -20219,13 +20199,6 @@
          "trigger": {
            "$ref": "#/components/schemas/WorkflowTrigger",
            "description": "Workflow trigger"
-          },
-          "uiHints": {
-            "description": "Ui hints, for example \"smart-album\"",
-            "items": {
-              "type": "string"
-            },
-            "type": "array"
          }
        },
        "required": [
@@ -20233,8 +20206,7 @@
          "key",
          "steps",
          "title",
-          "trigger",
-          "uiHints"
+          "trigger"
        ],
        "type": "object"
      },
@@ -1,12 +1,3 @@
-@@ -13,7 +13,7 @@
- class ApiClient {
-   ApiClient({this.basePath = '/api', this.authentication,});
-
-  final String basePath;
-+  String basePath;
-   final Authentication? authentication;
-
-   var _client = Client();
@@ -143,19 +143,19 @@
     );
   }
@@ -20,20 +20,19 @@
            "caseSensitive": false
          }
        },
-        {
-          "method": "immich-plugin-core#assetArchive",
-          "config": {
-            "inverse": false
-          }
-        },
        {
          "method": "immich-plugin-core#assetAddToAlbums",
          "config": {
            "albumIds": []
          }
+        },
+        {
+          "method": "immich-plugin-core#assetArchive",
+          "config": {
+            "inverse": false
+          }
        }
-      ],
-      "uiHints": ["SmartAlbum"]
+      ]
    }
  ],
  "methods": [
@@ -66,7 +65,7 @@
        },
        "required": ["pattern"]
      },
-      "uiHints": ["Filter"]
+      "uiHints": ["filter"]
    },
    {
      "name": "filterFileType",
@@ -86,7 +85,7 @@
        },
        "required": ["fileTypes"]
      },
-      "uiHints": ["Filter"]
+      "uiHints": ["filter"]
    },
    {
      "name": "filterPerson",
@@ -100,7 +99,7 @@
            "array": true,
            "title": "Person IDs",
            "description": "List of person to match",
-            "uiHint": "personId"
+            "uiHint": "personI"
          },
          "matchAny": {
            "type": "boolean",
@@ -111,7 +110,7 @@
        },
        "required": ["personIds"]
      },
-      "uiHints": ["Filter"]
+      "uiHints": ["filter"]
    },
    {
      "name": "assetArchive",
@@ -188,7 +187,7 @@
            "title": "Album IDs",
            "array": true,
            "description": "Target album IDs",
-            "uiHint": "AlbumId"
+            "uiHint": "albumId"
          }
        },
        "required": ["albumIds"]
@@ -273,14 +272,14 @@
            "type": "string",
            "title": "Album ID",
            "description": "Target album ID",
-            "uiHint": "AlbumId"
+            "uiHint": "albumId"
          },
          "albumIds": {
            "type": "string",
            "title": "Album IDs",
            "description": "Target album IDs",
            "array": true,
-            "uiHint": "AlbumId"
+            "uiHint": "albumId"
          }
        }
      }
@@ -93,7 +93,7 @@ export const assetTrash = () => {
    changes: {
      asset: config.inverse
        ? { deletedAt: null, status: AssetStatus.Active }
-        : { deletedAt: new Date().toISOString(), status: AssetStatus.Trashed },
+        : { deletedAt: new Date(), status: AssetStatus.Trashed },
    },
  }));
 };
@@ -27,7 +27,6 @@
  "packageManager": "pnpm@10.33.4",
  "devDependencies": {
    "@extism/js-pdk": "^1.1.1",
-    "@immich/sdk": "workspace:*",
    "@types/node": "^24.12.4",
    "esbuild": "^0.28.0",
    "tsc-alias": "^1.8.16",
@@ -1,6 +1,3 @@
-import { type BulkIdResponseDto, type BulkIdsDto } from '@immich/sdk';
-
-// keep in sync with plugin-core/src/index.d.ts';
 declare module 'extism:host' {
  interface user {
    albumAddAssets(ptr: PTR): I64;
@@ -48,11 +45,7 @@ type AlbumsToAssets = {

 export const hostFunctions = (authToken: string) => ({
  albumAddAssets: (albumId: string, assetIds: string[]) =>
-    call<[string, BulkIdsDto], BulkIdResponseDto[]>(
-      'albumAddAssets',
-      authToken,
-      [albumId, { ids: assetIds }],
-    ),
+    call('albumAddAssets', authToken, [albumId, { ids: assetIds }]),
  addAssetsToAlbums: ({ assetIds, albumIds }: AlbumsToAssets) =>
    call('addAssetsToAlbums', authToken, [{ albumIds, assetIds }]),
 });
@@ -68,19 +68,19 @@ export type AssetV1 = {
    ownerId: string;
    type: AssetType;
    originalPath: string;
-    fileCreatedAt: string;
-    fileModifiedAt: string;
+    fileCreatedAt: Date;
+    fileModifiedAt: Date;
    isFavorite: boolean;
    checksum: Buffer; // sha1 checksum
    livePhotoVideoId: string | null;
-    updatedAt: string;
-    createdAt: string;
+    updatedAt: Date;
+    createdAt: Date;
    originalFileName: string;
    isOffline: boolean;
    libraryId: string | null;
    isExternal: boolean;
-    deletedAt: string | null;
-    localDateTime: string;
+    deletedAt: Date | null;
+    localDateTime: Date;
    stackId: string | null;
    duplicateId: string | null;
    status: AssetStatus;
@@ -93,8 +93,8 @@ export type AssetV1 = {
      exifImageHeight: number | null;
      fileSizeInByte: number | null;
      orientation: string | null;
-      dateTimeOriginal: string | null;
-      modifyDate: string | null;
+      dateTimeOriginal: Date | null;
+      modifyDate: Date | null;
      lensModel: string | null;
      fNumber: number | null;
      focalLength: number | null;
@@ -116,7 +116,7 @@ export type AssetV1 = {
      autoStackId: string | null;
      rating: number | null;
      tags: string[] | null;
-      updatedAt: string | null;
+      updatedAt: Date | null;
    } | null;
  };
 };
@@ -1535,8 +1535,6 @@ export type PluginTemplateResponseDto = {
    title: string;
    /** Workflow trigger */
    trigger: WorkflowTrigger;
-    /** Ui hints, for example "smart-album" */
-    uiHints: string[];
 };
 export type QueueResponseDto = {
    /** Whether the queue is paused */
@@ -3599,22 +3597,18 @@ export function getUserStatisticsAdmin({ id, isFavorite, isTrashed, visibility }
 /**
 * List all albums
 */
-export function getAllAlbums({ assetId, id, isOwned, isShared, name }: {
+export function getAllAlbums({ assetId, isOwned, isShared }: {
    assetId?: string;
-    id?: string;
    isOwned?: boolean;
    isShared?: boolean;
-    name?: string;
 }, opts?: Oazapfts.RequestOpts) {
    return oazapfts.ok(oazapfts.fetchJson<{
        status: 200;
        data: AlbumResponseDto[];
    }>(`/albums${QS.query(QS.explode({
        assetId,
-        id,
        isOwned,
-        isShared,
-        name
+        isShared
    }))}`, {
        ...opts
    }));
@@ -7146,7 +7140,7 @@ export enum JobName {
    VersionCheck = "VersionCheck",
    OcrQueueAll = "OcrQueueAll",
    Ocr = "Ocr",
-    WorkflowAssetTrigger = "WorkflowAssetTrigger"
+    WorkflowAssetCreate = "WorkflowAssetCreate"
 }
 export enum SearchSuggestionType {
    Country = "country",
@@ -10,7 +10,7 @@ overrides:
  sharp: ^0.34.5
  webpackbar: ^7.0.0

-packageExtensionsChecksum: sha256-W6pFzyf+6QXnV91iA6oob0OGVkergPXDN1afLgoF53k=
+packageExtensionsChecksum: sha256-3l4AQg4iuprBDup+q+2JaPvbPg/7XodWCE0ZteH+s54=

 pnpmfileChecksum: sha256-un98do36L0wZyqsjcLozQ3YUadCAn2yz5bXcBbOuyDA=

@@ -332,9 +332,6 @@ importers:
      '@extism/js-pdk':
        specifier: ^1.1.1
        version: 1.1.1
-      '@immich/sdk':
-        specifier: workspace:*
-        version: link:../sdk
      '@types/node':
        specifier: ^24.12.4
        version: 24.12.4
@@ -392,7 +389,7 @@ importers:
        version: 6.1.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)
      '@nestjs/swagger':
        specifier: ^11.4.2
-        version: 11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)(typescript@6.0.3)
+        version: 11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)
      '@nestjs/websockets':
        specifier: ^11.0.4
        version: 11.1.21(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(@nestjs/platform-socket.io@11.1.21)(reflect-metadata@0.2.2)(rxjs@7.8.2)
@@ -539,7 +536,7 @@ importers:
        version: 8.0.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)
      nestjs-zod:
        specifier: ^5.3.0
-        version: 5.4.0(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)(typescript@6.0.3))(rxjs@7.8.2)(zod@4.3.6)
+        version: 5.4.0(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2))(rxjs@7.8.2)(zod@4.3.6)
      nodemailer:
        specifier: ^8.0.0
        version: 8.0.7
@@ -3798,7 +3795,6 @@ packages:
      class-transformer: '*'
      class-validator: '*'
      reflect-metadata: ^0.1.12 || ^0.2.0
-      typescript: '*'
    peerDependenciesMeta:
      '@fastify/static':
        optional: true
@@ -16574,7 +16570,7 @@ snapshots:
    transitivePeerDependencies:
      - chokidar

-  '@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)(typescript@6.0.3)':
+  '@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)':
    dependencies:
      '@microsoft/tsdoc': 0.16.0
      '@nestjs/common': 11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2)
@@ -16585,7 +16581,6 @@ snapshots:
      path-to-regexp: 8.4.2
      reflect-metadata: 0.2.2
      swagger-ui-dist: 5.32.6
-      typescript: 6.0.3

  '@nestjs/testing@11.1.21(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(@nestjs/platform-express@11.1.21)':
    dependencies:
@@ -23234,14 +23229,14 @@ snapshots:
      '@opentelemetry/host-metrics': 0.38.3(@opentelemetry/api@1.9.1)
      tslib: 2.8.1

-  nestjs-zod@5.4.0(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)(typescript@6.0.3))(rxjs@7.8.2)(zod@4.3.6):
+  nestjs-zod@5.4.0(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2))(rxjs@7.8.2)(zod@4.3.6):
    dependencies:
      '@nestjs/common': 11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2)
      deepmerge: 4.3.1
      rxjs: 7.8.2
      zod: 4.3.6
    optionalDependencies:
-      '@nestjs/swagger': 11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)(typescript@6.0.3)
+      '@nestjs/swagger': 11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)

  next-tick@1.1.0: {}

@@ -60,9 +60,6 @@ packageExtensions:
    dependencies:
      node-addon-api: '*'
      node-gyp: '*'
-  '@nestjs/swagger':
-    peerDependencies:
-      typescript: '*'
 dedupePeerDependents: false
 preferWorkspacePackages: true
 injectWorkspacePackages: true
@@ -13,15 +13,14 @@ FROM builder AS server

 WORKDIR /usr/src/app
 COPY ./server ./server/
-COPY ./packages/sdk ./packages/sdk/
 COPY ./packages/plugin-sdk ./packages/plugin-sdk/
 RUN --mount=type=cache,id=pnpm-server,target=/buildcache/pnpm-store \
  --mount=type=bind,source=package.json,target=package.json \
  --mount=type=bind,source=.pnpmfile.cjs,target=.pnpmfile.cjs \
  --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
  --mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml \
-  SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter immich --frozen-lockfile build && \
-  SHARP_FORCE_GLOBAL_LIBVIPS=true  pnpm --filter immich --frozen-lockfile --prod --no-optional deploy /output/server-pruned
+  SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter immich --filter @immich/plugin-sdk --frozen-lockfile build && \
+  SHARP_FORCE_GLOBAL_LIBVIPS=true pnpm --filter immich --frozen-lockfile --prod --no-optional deploy /output/server-pruned

 FROM builder AS web

@@ -67,7 +66,6 @@ ENV MISE_DISABLE_TOOLS=flutter
 RUN --mount=type=cache,id=mise-tools-${TARGETPLATFORM},target=/buildcache/mise \
  mise install

-COPY ./packages/sdk ./packages/sdk/
 COPY ./packages/plugin-core ./packages/plugin-core/
 COPY ./packages/plugin-sdk ./packages/plugin-sdk/

@@ -68,7 +68,6 @@ run = [
 [tasks.ci-medium]
 run = [
  { task = ":install" },
-  { task = "//:plugins" },
  { task = "//packages/plugin-core:build" },
  { task = ":test-medium --run" },
 ]
@@ -65,8 +65,6 @@ const UpdateAlbumSchema = z

 const GetAlbumsSchema = z
  .object({
-    id: z.uuidv4().optional().describe('Album ID'),
-    name: z.string().optional().describe('Album name (exact match)'),
    isOwned: stringToBool
      .optional()
      .describe('Filter by ownership: true = only owned, false = only shared-with-me, undefined = no filter'),
@@ -38,7 +38,6 @@ const PluginManifestTemplateSchema = z
    description: z.string().min(1).describe('Template description'),
    trigger: WorkflowTriggerSchema.describe('Workflow trigger'),
    steps: z.array(PluginManifestTemplateStepSchema).describe('Workflow steps'),
-    uiHints: z.array(z.string()).optional().default([]).describe('Ui hints, for example "smart-album"'),
  })
  .meta({ id: 'PluginManifestTemplateDto' });

@@ -58,7 +58,6 @@ const PluginTemplateResponseSchema = z
    description: z.string().describe('Template description'),
    trigger: WorkflowTriggerSchema.describe('Workflow trigger'),
    steps: z.array(PluginTemplateStepResponseSchema).describe('Workflow steps'),
-    uiHints: z.array(z.string()).describe('Ui hints, for example "smart-album"'),
  })
  .meta({ id: 'PluginTemplateResponseDto' });

@@ -92,7 +91,6 @@ export type PluginTemplate = {
    config?: Record<string, unknown> | null;
    enabled?: boolean;
  }>;
-  uiHints: string[];
 };

 export const mapTemplate = (plugin: { name: string }, template: PluginTemplate): PluginTemplateResponseDto => {
@@ -106,7 +104,6 @@ export const mapTemplate = (plugin: { name: string }, template: PluginTemplate):
      config: step.config ?? null,
      enabled: step.enabled,
    })),
-    uiHints: template.uiHints ?? [],
  };
 };

@@ -866,7 +866,7 @@ export enum JobName {
  Ocr = 'Ocr',

  // Workflow
-  WorkflowAssetTrigger = 'WorkflowAssetTrigger',
+  WorkflowAssetCreate = 'WorkflowAssetCreate',
 }

 export const JobNameSchema = z.enum(JobName).describe('Job name').meta({ id: 'JobName' });
@@ -209,16 +209,11 @@ export class AlbumRepository {
  }

  @GenerateSql({ params: [DummyValue.UUID, { isOwned: true, isShared: true }] })
-  getAll(
-    ownerId: string,
-    options: { id?: string; isOwned?: boolean; isShared?: boolean; name?: string } = {},
-  ): Promise<MapAlbumDto[]> {
+  getAll(ownerId: string, options: { isOwned?: boolean; isShared?: boolean } = {}): Promise<MapAlbumDto[]> {
    return this.buildAlbumBaseQuery(ownerId, options)
      .selectAll('album')
      .select(withAlbumUsers(ownerId))
      .select(withSharedLink)
-      .$if(!!options.id, (qb) => qb.where('album.id', '=', options.id!))
-      .$if(!!options.name, (qb) => qb.where('album.albumName', '=', options.name!))
      .orderBy('album.createdAt', 'desc')
      .execute();
  }
@@ -45,10 +45,10 @@ export class WorkflowRepository {
  }

  @GenerateSql({ params: [DummyValue.UUID] })
-  search(dto: WorkflowSearchDto & { userId?: string }) {
+  search(dto: WorkflowSearchDto & { ownerId?: string }) {
    return this.queryBuilder()
      .$if(!!dto.id, (qb) => qb.where('id', '=', dto.id!))
-      .$if(!!dto.userId, (qb) => qb.where('ownerId', '=', dto.userId!))
+      .$if(!!dto.ownerId, (qb) => qb.where('ownerId', '=', dto.ownerId!))
      .$if(!!dto.trigger, (qb) => qb.where('trigger', '=', dto.trigger!))
      .$if(dto.enabled !== undefined, (qb) => qb.where('enabled', '=', dto.enabled!))
      .orderBy('createdAt', 'desc')
@@ -37,12 +37,15 @@ export class AlbumService extends BaseService {
    };
  }

-  async getAll({ user: { id: ownerId } }: AuthDto, { assetId, ...rest }: GetAlbumsDto): Promise<AlbumResponseDto[]> {
+  async getAll(
+    { user: { id: ownerId } }: AuthDto,
+    { assetId, isOwned, isShared }: GetAlbumsDto,
+  ): Promise<AlbumResponseDto[]> {
    await this.albumRepository.updateThumbnails();

    const albums = assetId
      ? await this.albumRepository.getByAssetId(ownerId, assetId)
-      : await this.albumRepository.getAll(ownerId, rest);
+      : await this.albumRepository.getAll(ownerId, { isOwned, isShared });

    if (albums.length === 0) {
      return [];
@@ -75,7 +75,7 @@ export class SearchService extends BaseService {

    const page = dto.page ?? 1;
    const size = dto.size || 250;
-    const userIds = await this.getUserIdsToSearch(auth, dto.visibility);
+    const userIds = await this.getUserIdsToSearch(auth);
    const { hasNextPage, items } = await this.searchRepository.searchMetadata(
      { page, size },
      {
@@ -103,7 +103,7 @@ export class SearchService extends BaseService {
      requireElevatedPermission(auth);
    }

-    const userIds = await this.getUserIdsToSearch(auth, dto.visibility);
+    const userIds = await this.getUserIdsToSearch(auth);
    const items = await this.searchRepository.searchRandom(dto.size || 250, { ...dto, userIds });
    return items.map((item) => mapAsset(item, { auth }));
  }
@@ -113,7 +113,7 @@ export class SearchService extends BaseService {
      requireElevatedPermission(auth);
    }

-    const userIds = await this.getUserIdsToSearch(auth, dto.visibility);
+    const userIds = await this.getUserIdsToSearch(auth);
    const items = await this.searchRepository.searchLargeAssets(dto.size || 250, { ...dto, userIds });
    return items.map((item) => mapAsset(item, { auth }));
  }
@@ -128,7 +128,7 @@ export class SearchService extends BaseService {
      throw new BadRequestException('Smart search is not enabled');
    }

-    const userIds = this.getUserIdsToSearch(auth, dto.visibility);
+    const userIds = this.getUserIdsToSearch(auth);
    let embedding;
    if (dto.query) {
      const key = machineLearning.clip.modelName + dto.query + dto.language;
@@ -202,11 +202,7 @@ export class SearchService extends BaseService {
    }
  }

-  private async getUserIdsToSearch(auth: AuthDto, visibility?: AssetVisibility): Promise<string[]> {
-    // Locked assets are personal. Never include partner IDs, regardless of A's elevated session.
-    if (visibility === AssetVisibility.Locked) {
-      return [auth.user.id];
-    }
+  private async getUserIdsToSearch(auth: AuthDto): Promise<string[]> {
    const partnerIds = await getMyPartnerIds({
      userId: auth.user.id,
      repository: this.partnerRepository,
@@ -204,16 +204,5 @@ describe(TimelineService.name, () => {
        }),
      ).rejects.toThrow(BadRequestException);
    });
-
-    it('should throw an error if withPartners is true and visibility is locked', async () => {
-      await expect(
-        sut.getTimeBucket(authStub.adminWithElevatedPermission, {
-          timeBucket: 'bucket',
-          visibility: AssetVisibility.Locked,
-          withPartners: true,
-          userId: authStub.adminWithElevatedPermission.user.id,
-        }),
-      ).rejects.toThrow(BadRequestException);
-    });
  });
 });
@@ -71,14 +71,13 @@ export class TimelineService extends BaseService {
    }

    if (dto.withPartners) {
-      const requestedLocked = dto.visibility === AssetVisibility.Locked;
      const requestedArchived = dto.visibility === AssetVisibility.Archive || dto.visibility === undefined;
      const requestedFavorite = dto.isFavorite === true || dto.isFavorite === false;
      const requestedTrash = dto.isTrashed === true;

-      if (requestedLocked || requestedArchived || requestedFavorite || requestedTrash) {
+      if (requestedArchived || requestedFavorite || requestedTrash) {
        throw new BadRequestException(
-          'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
+          'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
        );
      }
    }
@@ -1,8 +1,9 @@
 import { CurrentPlugin } from '@extism/extism';
 import { WorkflowChanges, WorkflowEventData, WorkflowEventPayload, WorkflowResponse } from '@immich/plugin-sdk';
 import { HttpException, UnauthorizedException } from '@nestjs/common';
+import _ from 'lodash';
 import { join } from 'node:path';
-import { DummyValue, OnEvent, OnJob } from 'src/decorators';
+import { OnEvent, OnJob } from 'src/decorators';
 import { AlbumsAddAssetsDto } from 'src/dtos/album.dto';
 import { BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
@@ -20,7 +21,6 @@ import {
 } from 'src/enum';
 import { ArgOf } from 'src/repositories/event.repository';
 import { AlbumService } from 'src/services/album.service';
-import { AssetService } from 'src/services/asset.service';
 import { BaseService } from 'src/services/base.service';
 import { JobOf } from 'src/types';

@@ -32,11 +32,9 @@ const dummy = () => {

 type ExecuteOptions<T extends WorkflowType> = {
  read: (type: T) => Promise<{ authUserId: string; data: WorkflowEventData<T> }>;
-  write: (auth: AuthDto, changes: WorkflowChanges<T>) => Promise<void>;
+  write: (changes: WorkflowChanges<T>) => Promise<void>;
 };

-type AssetTrigger = { userId: string; assetId: string; trigger: WorkflowTrigger };
-
 export class WorkflowExecutionService extends BaseService {
  private jwtSecret!: string;

@@ -64,6 +62,7 @@ export class WorkflowExecutionService extends BaseService {
    const albumAddAssets = this.wrap<[id: string, dto: BulkIdsDto]>((authDto, args) =>
      albumService.addAssets(authDto, ...args),
    );
+
    const addAssetsToAlbums = this.wrap<[dto: AlbumsAddAssetsDto]>((authDto, args) =>
      albumService.addAssetsToAlbums(authDto, ...args),
    );
@@ -248,25 +247,20 @@ export class WorkflowExecutionService extends BaseService {
  }

  @OnEvent({ name: 'AssetCreate' })
-  onAssetCreate({ asset: { ownerId: userId, id: assetId } }: ArgOf<'AssetCreate'>) {
-    return this.onAssetTrigger({ userId, assetId, trigger: WorkflowTrigger.AssetCreate });
-  }
-
-  private async onAssetTrigger({ userId, assetId, trigger }: AssetTrigger) {
-    const items = await this.workflowRepository.search({ userId, trigger });
+  async onAssetCreate({ asset }: ArgOf<'AssetCreate'>) {
+    const dto = { ownerId: asset.ownerId, trigger: WorkflowTrigger.AssetCreate };
+    const items = await this.workflowRepository.search(dto);
    await this.jobRepository.queueAll(
      items.map((workflow) => ({
-        name: JobName.WorkflowAssetTrigger,
-        data: { workflowId: workflow.id, assetId, trigger },
+        name: JobName.WorkflowAssetCreate,
+        data: { workflowId: workflow.id, assetId: asset.id },
      })),
    );
  }

-  @OnJob({ name: JobName.WorkflowAssetTrigger, queue: QueueName.Workflow })
-  handleAssetTrigger({ workflowId, assetId }: JobOf<JobName.WorkflowAssetTrigger>) {
+  @OnJob({ name: JobName.WorkflowAssetCreate, queue: QueueName.Workflow })
+  handleAssetCreate({ workflowId, assetId }: JobOf<JobName.WorkflowAssetCreate>) {
    return this.execute(workflowId, (type) => {
-      const assetService = BaseService.create(AssetService, this);
-
      switch (type) {
        case WorkflowType.AssetV1: {
          return {
@@ -277,16 +271,19 @@ export class WorkflowExecutionService extends BaseService {
                authUserId: asset.ownerId,
              };
            },
-            write: async (auth, changes) => {
-              const asset = changes.asset;
-              if (!asset) {
-                return;
+            write: async (changes) => {
+              if (changes.asset) {
+                await this.assetRepository.update({
+                  id: assetId,
+                  ..._.omitBy(
+                    {
+                      isFavorite: changes.asset?.isFavorite,
+                      visibility: changes.asset?.visibility,
+                    },
+                    _.isUndefined,
+                  ),
+                });
              }
-
-              await assetService.update(auth, assetId, {
-                isFavorite: asset.isFavorite,
-                visibility: asset.visibility,
-              });
            },
          } satisfies ExecuteOptions<typeof type>;
        }
@@ -304,19 +301,7 @@ export class WorkflowExecutionService extends BaseService {
    }

    // TODO infer from steps
-    let type: T | undefined;
-    for (const targetType of Object.values(WorkflowType)) {
-      const missing = workflow.steps.some((step) => !step.types.includes(targetType));
-      if (!missing) {
-        type = targetType as unknown as T;
-        break;
-      }
-    }
-
-    if (!type) {
-      throw new Error('Unable to infer workflow event type from steps');
-    }
-
+    const type = 'AssetV1' as T;
    const handler = getHandler(type);
    if (!handler) {
      this.logger.error(`Misconfigured workflow ${workflowId}: no handler for type ${type}`);
@@ -352,18 +337,7 @@ export class WorkflowExecutionService extends BaseService {
          payload,
        );
        if (result?.changes) {
-          await write(
-            {
-              user: {
-                id: readResult.authUserId,
-              },
-              session: {
-                id: DummyValue.UUID,
-                hasElevatedPermission: true,
-              },
-            } as AuthDto,
-            result.changes,
-          );
+          await write(result.changes);
          ({ data } = await read(type));
        }

@@ -23,7 +23,7 @@ export class WorkflowService extends BaseService {
  }

  async search(auth: AuthDto, dto: WorkflowSearchDto): Promise<WorkflowResponseDto[]> {
-    const workflows = await this.workflowRepository.search({ ...dto, userId: auth.user.id });
+    const workflows = await this.workflowRepository.search({ ...dto, ownerId: auth.user.id });
    return workflows.map((workflow) => mapWorkflow(workflow));
  }

@@ -404,7 +404,7 @@ export type JobItem =
  | { name: JobName.Ocr; data: IEntityJob }

  // Workflow
-  | { name: JobName.WorkflowAssetTrigger; data: { workflowId: string; assetId: string } }
+  | { name: JobName.WorkflowAssetCreate; data: { workflowId: string; assetId: string } }

  // Editor
  | { name: JobName.AssetEditThumbnailGeneration; data: IEntityJob };
@@ -41,13 +41,6 @@ export const authStub = {
      id: 'token-id',
    } as AuthSession,
  }),
-  adminWithElevatedPermission: Object.freeze<AuthDto>({
-    user: authUser.admin,
-    session: {
-      id: 'token-id-elevated',
-      hasElevatedPermission: true,
-    } as AuthSession,
-  }),
  adminSharedLink: Object.freeze({
    user: authUser.admin,
    sharedLink: {
@@ -51,13 +51,13 @@ describe(TimelineService.name, () => {
      const response1 = sut.getTimeBuckets(auth, { withPartners: true, visibility: AssetVisibility.Archive });
      await expect(response1).rejects.toBeInstanceOf(BadRequestException);
      await expect(response1).rejects.toThrow(
-        'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
+        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
      );

      const response2 = sut.getTimeBuckets(auth, { withPartners: true });
      await expect(response2).rejects.toBeInstanceOf(BadRequestException);
      await expect(response2).rejects.toThrow(
-        'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
+        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
      );
    });

@@ -67,13 +67,13 @@ describe(TimelineService.name, () => {
      const response1 = sut.getTimeBuckets(auth, { withPartners: true, isFavorite: false });
      await expect(response1).rejects.toBeInstanceOf(BadRequestException);
      await expect(response1).rejects.toThrow(
-        'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
+        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
      );

      const response2 = sut.getTimeBuckets(auth, { withPartners: true, isFavorite: true });
      await expect(response2).rejects.toBeInstanceOf(BadRequestException);
      await expect(response2).rejects.toThrow(
-        'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
+        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
      );
    });

@@ -83,7 +83,7 @@ describe(TimelineService.name, () => {
      const response = sut.getTimeBuckets(auth, { withPartners: true, isTrashed: true });
      await expect(response).rejects.toBeInstanceOf(BadRequestException);
      await expect(response).rejects.toThrow(
-        'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
+        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
      );
    });

@@ -137,7 +137,7 @@ describe('core plugin', () => {
        steps: [{ method: 'immich-plugin-core#assetArchive' }],
      });

-      await expect(ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();
+      await expect(ctx.sut.handleAssetCreate({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();

      await expect(ctx.get(AssetRepository).getById(asset.id)).resolves.toMatchObject({
        visibility: AssetVisibility.Archive,
@@ -154,7 +154,7 @@ describe('core plugin', () => {
        steps: [{ method: 'immich-plugin-core#assetArchive', config: { inverse: true } }],
      });

-      await expect(ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();
+      await expect(ctx.sut.handleAssetCreate({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();

      await expect(ctx.get(AssetRepository).getById(asset.id)).resolves.toMatchObject({
        visibility: AssetVisibility.Timeline,
@@ -173,7 +173,7 @@ describe('core plugin', () => {
        steps: [{ method: 'immich-plugin-core#assetLock' }],
      });

-      await expect(ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();
+      await expect(ctx.sut.handleAssetCreate({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();

      await expect(ctx.get(AssetRepository).getById(asset.id)).resolves.toMatchObject({
        visibility: AssetVisibility.Locked,
@@ -190,7 +190,7 @@ describe('core plugin', () => {
        steps: [{ method: 'immich-plugin-core#assetLock', config: { inverse: true } }],
      });

-      await expect(ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();
+      await expect(ctx.sut.handleAssetCreate({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();

      await expect(ctx.get(AssetRepository).getById(asset.id)).resolves.toMatchObject({
        visibility: AssetVisibility.Timeline,
@@ -209,7 +209,7 @@ describe('core plugin', () => {
        steps: [{ method: 'immich-plugin-core#assetFavorite' }],
      });

-      await expect(ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();
+      await expect(ctx.sut.handleAssetCreate({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();

      await expect(ctx.get(AssetRepository).getById(asset.id)).resolves.toMatchObject({ isFavorite: true });
    });
@@ -224,7 +224,7 @@ describe('core plugin', () => {
        steps: [{ method: 'immich-plugin-core#assetFavorite', config: { inverse: true } }],
      });

-      await expect(ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();
+      await expect(ctx.sut.handleAssetCreate({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();

      await expect(ctx.get(AssetRepository).getById(asset.id)).resolves.toMatchObject({ isFavorite: false });
    });
@@ -242,7 +242,7 @@ describe('core plugin', () => {
        steps: [{ method: 'immich-plugin-core#assetAddToAlbums', config: { albumIds: [album.id] } }],
      });

-      await expect(ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();
+      await expect(ctx.sut.handleAssetCreate({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();

      await expect(ctx.get(AlbumRepository).getAssetIds(album.id, [asset.id])).resolves.toContain(asset.id);
    });
@@ -261,7 +261,7 @@ describe('core plugin', () => {
        steps: [{ method: 'immich-plugin-core#assetAddToAlbums', config: { albumIds: [album1.id, album2.id] } }],
      });

-      await expect(ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();
+      await expect(ctx.sut.handleAssetCreate({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeUndefined();

      await expect(ctx.get(AlbumRepository).getAssetIds(album1.id, [asset.id])).resolves.toContain(asset.id);
      await expect(ctx.get(AlbumRepository).getAssetIds(album2.id, [asset.id])).resolves.toContain(asset.id);
@@ -279,7 +279,7 @@ describe('core plugin', () => {
        steps: [{ method: 'immich-plugin-core#assetAddToAlbums', config: { albumIds: [album.id] } }],
      });

-      await expect(ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeTruthy();
+      await expect(ctx.sut.handleAssetCreate({ workflowId: workflow.id, assetId: asset.id })).resolves.toBeTruthy();

      await expect(ctx.get(AlbumRepository).getAssetIds(album.id, [asset.id])).resolves.not.toContain(asset.id);
    });
@@ -1,65 +0,0 @@
-import type { Attachment } from 'svelte/attachments';
-
-const EDGE_ZONE = 72;
-const MAX_SCROLL_SPEED = 22;
-
-const findScrollContainer = (element: HTMLElement): HTMLElement | null => {
-  let node = element.parentElement;
-  while (node) {
-    const overflowY = getComputedStyle(node).overflowY;
-    if (/(auto|scroll|overlay)/.test(overflowY) && node.scrollHeight > node.clientHeight) {
-      return node;
-    }
-    node = node.parentElement;
-  }
-  return null;
-};
-
-export function dragAutoScroll(isActive: () => boolean): Attachment {
-  return (node) => {
-    const element = node as HTMLElement;
-    let scrollContainer: HTMLElement | null = null;
-    let pointerY = -1;
-    let frame: number | null = null;
-
-    const trackPointer = (event: DragEvent) => {
-      pointerY = event.clientY;
-    };
-
-    const tick = () => {
-      if (scrollContainer && pointerY >= 0) {
-        const { top, bottom } = scrollContainer.getBoundingClientRect();
-        let delta = 0;
-        if (pointerY < top + EDGE_ZONE) {
-          delta = -MAX_SCROLL_SPEED * Math.min(1, (top + EDGE_ZONE - pointerY) / EDGE_ZONE);
-        } else if (pointerY > bottom - EDGE_ZONE) {
-          delta = MAX_SCROLL_SPEED * Math.min(1, (pointerY - (bottom - EDGE_ZONE)) / EDGE_ZONE);
-        }
-        if (delta !== 0) {
-          scrollContainer.scrollBy(0, delta);
-        }
-      }
-      frame = requestAnimationFrame(tick);
-    };
-
-    $effect(() => {
-      if (!isActive()) {
-        return;
-      }
-
-      scrollContainer = findScrollContainer(element);
-      pointerY = -1;
-      globalThis.addEventListener('dragover', trackPointer);
-      frame = requestAnimationFrame(tick);
-
-      return () => {
-        globalThis.removeEventListener('dragover', trackPointer);
-        if (frame !== null) {
-          cancelAnimationFrame(frame);
-          frame = null;
-        }
-        scrollContainer = null;
-      };
-    });
-  };
-}
@@ -64,7 +64,7 @@
      <Self schema={childSchema} key={childKey} bind:config={getValue, setValue} />
    {/each}
  </div>
-{:else if schema.uiHint === 'AlbumId'}
+{:else if schema.uiHint === 'albumId'}
  <SchemaAlbumPicker {label} {description} array={schema.array} bind:albumIds={getUiHintValue, setUiHintValue} />
 {:else if schema.enum && schema.array}
  <Field {label} {description}>
@@ -205,7 +205,11 @@
 </script>

 <div
-  class={['group flex overflow-hidden focus-visible:outline-none', backgroundColorClass, { 'rounded-xl': selected }]}
+  class={[
+    'group flex overflow-hidden transition-[background-color,border-radius] focus-visible:outline-none',
+    backgroundColorClass,
+    { 'rounded-xl': selected },
+  ]}
  style:width="{width}px"
  style:height="{height}px"
  onmouseenter={onMouseEnter}
@@ -245,8 +249,16 @@
      ]}
    >
      <ImageThumbnail
-        class={['absolute group-focus-visible:rounded-lg', { 'rounded-xl': selected }, imageClass]}
-        brokenAssetClass={['z-1 absolute group-focus-visible:rounded-lg', { 'rounded-xl': selected }, brokenAssetClass]}
+        class={[
+          'absolute transition-[border-radius] group-focus-visible:rounded-lg',
+          { 'rounded-xl': selected },
+          imageClass,
+        ]}
+        brokenAssetClass={[
+          'z-1 absolute group-focus-visible:rounded-lg transition-[border-radius]',
+          { 'rounded-xl': selected },
+          brokenAssetClass,
+        ]}
        url={getAssetMediaUrl({ id: asset.id, size: AssetMediaSize.Thumbnail, cacheKey: asset.thumbhash })}
        altText={$getAltText(asset)}
        widthStyle="{width}px"
@@ -30,11 +30,14 @@

  const transitionDuration = $derived(manager.suspendTransitions && !$isUploading ? 0 : 150);
  const scaleDuration = $derived(transitionDuration === 0 ? 0 : transitionDuration + 100);
+
+  const firstInOrNearViewport = $derived(viewerAssets.findIndex((a) => a.isInOrNearViewport));
+  const lastInOrNearViewport = $derived(viewerAssets.findLastIndex((a) => a.isInOrNearViewport));
 </script>

 <!-- Image grid -->
 <div data-image-grid class="relative overflow-clip" style:height={height + 'px'} style:width={width + 'px'}>
-  {#each viewerAssets as viewerAsset (viewerAsset.id)}
+  {#each viewerAssets.slice(firstInOrNearViewport, lastInOrNearViewport + 1) as viewerAsset (viewerAsset.id)}
    {@const position = viewerAsset.position!}
    {@const asset = viewerAsset.asset!}

@@ -100,7 +100,7 @@

    <AssetLayout
      {manager}
-      viewerAssets={timelineDay.activeViewerAssets}
+      viewerAssets={timelineDay.viewerAssets}
      height={timelineDay.height}
      width={timelineDay.width}
      {customThumbnailLayout}
@@ -53,3 +53,17 @@ export function updateTimelineMonthViewportProximity(timelineManager: TimelineMa
    timelineManager.clearDeferredLayout(month);
  }
 }
+
+export function calculateViewerAssetViewportProximity(
+  timelineManager: TimelineManager,
+  positionTop: number,
+  positionHeight: number,
+) {
+  const headerHeight = timelineManager.headerHeight;
+  return calculateViewportProximity(
+    positionTop,
+    positionTop + positionHeight,
+    timelineManager.visibleWindow.top - headerHeight,
+    timelineManager.visibleWindow.bottom + headerHeight,
+  );
+}
@@ -1,31 +1,12 @@
 import { AssetOrder, AssetOrderBy } from '@immich/sdk';
 import { SvelteSet } from 'svelte/reactivity';
-import type { CommonLayoutOptions, CommonPosition } from '$lib/utils/layout-utils';
+import type { CommonLayoutOptions } from '$lib/utils/layout-utils';
 import { getJustifiedLayoutFromAssets } from '$lib/utils/layout-utils';
 import { getOrderingDate, plainDateTimeCompare } from '$lib/utils/timeline-util';
-import { TUNABLES } from '$lib/utils/tunables';
 import type { TimelineMonth } from './timeline-month.svelte';
 import type { Direction, MoveAsset, TimelineAsset } from './types';
 import { ViewerAsset } from './viewer-asset.svelte';

-const {
-  TIMELINE: { INTERSECTION_EXPAND_TOP, INTERSECTION_EXPAND_BOTTOM },
-} = TUNABLES;
-
-function lowerBound(assets: ViewerAsset[], target: number, key: (pos: CommonPosition) => number): number {
-  let lo = 0;
-  let hi = assets.length;
-  while (lo < hi) {
-    const mid = Math.floor((lo + hi) / 2);
-    if (key(assets[mid].position!) < target) {
-      lo = mid + 1;
-    } else {
-      hi = mid;
-    }
-  }
-  return lo;
-}
-
 export class TimelineDay {
  readonly timelineMonth: TimelineMonth;
  readonly index: number;
@@ -37,15 +18,12 @@ export class TimelineDay {
  height = $state(0);
  width = $state(0);

-  // Assets in or near the viewport; active assets should be added to the DOM.
-  activeViewerAssets: ViewerAsset[] = $state([]);
-  isInOrNearViewport = $state(false);
-
  #top: number = $state(0);
  #start: number = $state(0);
  #row = $state(0);
  #col = $state(0);
  #deferredLayout = false;
+  #lastInOrNearViewport = -1;

  constructor(timelineMonth: TimelineMonth, index: number, day: number, groupTitle: string, orderBy: AssetOrderBy) {
    this.index = index;
@@ -171,32 +149,18 @@ export class TimelineDay {
    for (let i = 0; i < this.viewerAssets.length; i++) {
      this.viewerAssets[i].position = geometry.getPosition(i);
    }
-    this.updateAssetBoundaries();
-  }
-
-  updateAssetBoundaries() {
-    const manager = this.timelineMonth.timelineManager;
-    const visibleWindow = manager.visibleWindow;
-    if (this.viewerAssets.length === 0 || !this.viewerAssets[0].position) {
-      this.activeViewerAssets = [];
-      this.isInOrNearViewport = false;
-      return;
-    }
-
-    const dayOffset = this.absoluteTimelineDayTop;
-    const headerHeight = manager.headerHeight;
-    const expandedTop = visibleWindow.top - headerHeight - INTERSECTION_EXPAND_TOP - dayOffset;
-    const expandedBottom = visibleWindow.bottom + headerHeight + INTERSECTION_EXPAND_BOTTOM - dayOffset;
-
-    const first = lowerBound(this.viewerAssets, expandedTop, (p) => p.top + p.height);
-    const last = lowerBound(this.viewerAssets, expandedBottom, (p) => p.top) - 1;
-
-    const hasActive = last >= first && first < this.viewerAssets.length;
-    this.activeViewerAssets = hasActive ? this.viewerAssets.slice(first, last + 1) : [];
-    this.isInOrNearViewport = hasActive;
  }

  get absoluteTimelineDayTop() {
    return this.timelineMonth.top + this.#top;
  }
+
+  get isInOrNearViewport() {
+    if (this.#lastInOrNearViewport !== -1 && this.viewerAssets[this.#lastInOrNearViewport].isInOrNearViewport) {
+      return true;
+    }
+
+    this.#lastInOrNearViewport = this.viewerAssets.findIndex((viewAsset) => viewAsset.isInOrNearViewport);
+    return this.#lastInOrNearViewport !== -1;
+  }
 }
@@ -214,11 +214,6 @@ export class TimelineManager extends VirtualScrollManager {

    for (const month of this.months) {
      updateTimelineMonthViewportProximity(this, month);
-      if (month.isInOrNearViewport && month.isLoaded) {
-        for (const day of month.timelineDays) {
-          day.updateAssetBoundaries();
-        }
-      }
    }

    const month = this.months.find((month) => month.isInViewport);
@@ -254,7 +254,7 @@ export class TimelineMonth {
      addContext.newTimelineDays.add(timelineDay);
    }

-    const viewerAsset = new ViewerAsset(timelineAsset);
+    const viewerAsset = new ViewerAsset(timelineDay, timelineAsset);
    timelineDay.viewerAssets.push(viewerAsset);
    addContext.changedTimelineDays.add(timelineDay);
  }
@@ -1,12 +1,36 @@
 import type { CommonPosition } from '$lib/utils/layout-utils';
+import {
+  ViewportProximity,
+  calculateViewerAssetViewportProximity,
+  isInOrNearViewport,
+} from './internal/intersection-support.svelte';
+import type { TimelineDay } from './timeline-day.svelte';
 import type { TimelineAsset } from './types';

 export class ViewerAsset {
+  readonly #group: TimelineDay;
+
+  #viewportProximity = $derived.by(() => {
+    if (!this.position) {
+      return ViewportProximity.FarFromViewport;
+    }
+
+    const store = this.#group.timelineMonth.timelineManager;
+    const positionTop = this.#group.absoluteTimelineDayTop + this.position.top;
+
+    return calculateViewerAssetViewportProximity(store, positionTop, this.position.height);
+  });
+
+  get isInOrNearViewport() {
+    return isInOrNearViewport(this.#viewportProximity);
+  }
+
  position: CommonPosition | undefined = $state.raw();
  asset: TimelineAsset = $state() as TimelineAsset;
  id: string = $derived(this.asset.id);

-  constructor(asset: TimelineAsset) {
+  constructor(group: TimelineDay, asset: TimelineAsset) {
+    this.#group = group;
    this.asset = asset;
  }
 }
@@ -24,7 +24,7 @@
          <div class="grow text-start">
            <Text fontWeight="medium" class="flex items-center gap-1"
              >{method.title}
-              {#if method.uiHints.includes('Filter')}
+              {#if method.uiHints.includes('filter')}
                <Badge size="tiny" color="info" title={$t('plugin_method_filter_type_description')}
                  >{$t('plugin_method_filter_type')}</Badge
                >
@@ -0,0 +1,37 @@
+<script lang="ts">
+  import { pluginManager } from '$lib/managers/plugin-manager.svelte';
+  import { handleUpdateWorkflow } from '$lib/services/workflow.service';
+  import { getTriggerDescription, getTriggerName } from '$lib/utils/workflow';
+  import { type WorkflowResponseDto } from '@immich/sdk';
+  import { FormModal, ListButton, Text } from '@immich/ui';
+  import { t } from 'svelte-i18n';
+
+  type Props = {
+    workflow: WorkflowResponseDto;
+    onClose: () => void;
+  };
+
+  const { workflow, onClose }: Props = $props();
+
+  let selected = $state(pluginManager.getTrigger(workflow.trigger));
+
+  const onSubmit = async () => {
+    const success = await handleUpdateWorkflow(workflow.id, { trigger: selected.trigger });
+    if (success) {
+      onClose();
+    }
+  };
+</script>
+
+<FormModal title={$t('trigger')} {onClose} {onSubmit} size="small">
+  <div class="flex flex-col gap-2">
+    {#each pluginManager.triggers as item (item.trigger)}
+      <ListButton selected={item.trigger === selected.trigger} onclick={() => (selected = item)}>
+        <div class="grow text-start">
+          <Text fontWeight="medium">{getTriggerName($t, item.trigger)}</Text>
+          <Text size="tiny" color="muted">{getTriggerDescription($t, item.trigger)}</Text>
+        </div>
+      </ListButton>
+    {/each}
+  </div>
+</FormModal>
@@ -2,7 +2,7 @@
  import { pluginManager } from '$lib/managers/plugin-manager.svelte';
  import { handleCreateWorkflow } from '$lib/services/workflow.service';
  import { type PluginTemplateResponseDto } from '@immich/sdk';
-  import { Badge, FormModal, Icon, ListButton, Text } from '@immich/ui';
+  import { FormModal, Icon, ListButton, Text } from '@immich/ui';
  import { mdiFlashOutline } from '@mdi/js';
  import { t } from 'svelte-i18n';

@@ -59,11 +59,6 @@
            <Text fontWeight="medium">{template.title}</Text>
            <Text size="tiny" color="muted">{template.description}</Text>
          </div>
-          {#if template.uiHints.includes('SmartAlbum')}
-            <div class="shrink-0">
-              <Badge size="small">{$t('smart_album')}</Badge>
-            </div>
-          {/if}
        </div>
      </ListButton>
    {/each}
@@ -26,7 +26,7 @@ import type { MessageFormatter } from 'svelte-i18n';
 import { goto } from '$app/navigation';
 import { eventManager } from '$lib/managers/event-manager.svelte';
 import WorkflowDuplicateModal from '$lib/modals/WorkflowDuplicateModal.svelte';
-import WorkflowTemplatePickerModal from '$lib/modals/WorkflowTemplatePickerModal.svelte';
+import WorkflowTemplatePicker from '$lib/modals/WorkflowTemplatePicker.svelte';
 import { Route } from '$lib/route';
 import { copyToClipboard, downloadJson } from '$lib/utils';
 import { handleError } from '$lib/utils/handle-error';
@@ -50,7 +50,7 @@ export const getWorkflowsActions = ($t: MessageFormatter) => {
  const UseTemplate: ActionItem = {
    title: $t('browse_templates'),
    icon: mdiFileDocumentMultipleOutline,
-    onAction: () => modalManager.show(WorkflowTemplatePickerModal, {}),
+    onAction: () => modalManager.show(WorkflowTemplatePicker, {}),
  };

  return { Create, UseTemplate };
@@ -104,7 +104,7 @@ export type JSONSchemaProperty = {
  array?: boolean;
  properties?: Record<string, JSONSchemaProperty>;
  required?: string[];
-  uiHint?: 'AlbumId' | 'AssetId' | 'PersonId';
+  uiHint?: 'albumId' | 'assetId' | 'personId';
 };

 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1,6 +1,5 @@
 <script lang="ts">
  import { beforeNavigate, goto, invalidate } from '$app/navigation';
-  import { dragAutoScroll } from '$lib/attachments/drag-auto-scroll.svelte';
  import OnEvents from '$lib/components/OnEvents.svelte';
  import WorkflowAddStepModal from '$lib/modals/WorkflowAddStepModal.svelte';
  import WorkflowEditStepModal from '$lib/modals/WorkflowEditStepModal.svelte';
@@ -8,7 +7,7 @@
  import { Route } from '$lib/route';
  import { getWorkflowActions, handleUpdateWorkflow } from '$lib/services/workflow.service';
  import { getTriggerDescription, getTriggerName } from '$lib/utils/workflow';
-  import type { WorkflowResponseDto, WorkflowStepDto, WorkflowUpdateDto } from '@immich/sdk';
+  import type { WorkflowResponseDto, WorkflowUpdateDto } from '@immich/sdk';
  import {
    ActionBar,
    AppShell,
@@ -44,10 +43,7 @@
    mdiPlus,
  } from '@mdi/js';
  import { cloneDeep, isEqual } from 'lodash-es';
-  import { flip } from 'svelte/animate';
-  import { fade } from 'svelte/transition';
  import { t } from 'svelte-i18n';
-  import { createListReorder, GHOST_KEY, type ReorderEntry } from './list-reorder.svelte';
  import type { PageData } from './$types';
  import WorkflowJsonEditor from './WorkflowJsonEditor.svelte';
  import WorkflowStepCard from './WorkflowStepCard.svelte';
@@ -73,11 +69,6 @@
  let isSaving = $state(false);
  let editMode = $state<EditMode>('visual');

-  const reorder = createListReorder(
-    () => steps,
-    (next) => (steps = next),
-  );
-
  const workflowSummary = $derived({ name, description, trigger, steps });
  const workflowJsonContent = $derived<WorkflowJsonContent>({ name, description, enabled, trigger, steps });

@@ -115,6 +106,19 @@
    }
  };

+  const handleDrop = (index: number, event: DragEvent) => {
+    if (!event.dataTransfer) {
+      return;
+    }
+
+    const from = Number(event.dataTransfer.getData('text/plain'));
+
+    const next = [...steps];
+    const [moved] = next.splice(from, 1);
+    next.splice(index, 0, moved);
+    steps = next;
+  };
+
  const handleDeleteStep = async (index: number) => {
    const confirmed = await modalManager.showDialog({ title: $t('step_delete'), prompt: $t('step_delete_confirm') });
    if (confirmed) {
@@ -340,51 +344,17 @@
          </CardHeader>
        </Card>

-        <div class="hidden" aria-hidden="true" {@attach dragAutoScroll(() => reorder.isDragging)}></div>
-
-        {#snippet stepCard(entry: ReorderEntry<WorkflowStepDto>)}
+        {#each steps as step, index (step.method + index)}
          <WorkflowStepCard
-            step={entry.item}
-            index={entry.index}
-            position={entry.index + 1}
-            isGhost={entry.isGhost}
-            isSource={entry.isSource}
-            isDragging={reorder.isDragging}
+            {step}
+            {index}
            onEdit={handleEditStep}
            onDelete={handleDeleteStep}
            onInsertBefore={handleInsertStep}
-            onDragStart={reorder.start}
-            onDragOver={reorder.over}
-            onDragEnd={reorder.end}
-            onDrop={reorder.drop}
+            onDrop={handleDrop}
          />
-        {/snippet}
-
-        {#each reorder.entries as entry (entry.isGhost ? GHOST_KEY : entry.item)}
-          <div class="w-full" animate:flip={{ duration: 200 }}>
-            {#if entry.isGhost}
-              <div transition:fade={{ duration: 120 }}>{@render stepCard(entry)}</div>
-            {:else}
-              {@render stepCard(entry)}
-            {/if}
-          </div>
        {/each}

-        {#if reorder.isDragging}
-          <div
-            class="-mt-4 min-h-12 w-full"
-            role="listitem"
-            ondragover={(event) => {
-              event.preventDefault();
-              reorder.toEnd();
-            }}
-            ondrop={(event) => {
-              event.preventDefault();
-              reorder.drop();
-            }}
-          ></div>
-        {/if}
-
        <Button
          size="small"
          fullWidth
@@ -10,66 +10,30 @@
    mdiPlus,
    mdiTrashCanOutline,
  } from '@mdi/js';
-  import { mount } from 'svelte';
+  import { flushSync, mount } from 'svelte';
  import { t } from 'svelte-i18n';
  import WorkflowStepDragImage from './WorkflowStepDragImage.svelte';

  type Props = {
    step: WorkflowStepDto;
    index: number;
-    position: number;
-    isGhost: boolean;
-    isSource: boolean;
-    isDragging: boolean;
    onEdit: (index: number) => void;
    onDelete: (index: number) => void;
    onInsertBefore: (index: number) => void;
-    onDragStart: (index: number) => void;
-    onDragOver: (index: number, after: boolean) => void;
-    onDragEnd: () => void;
-    onDrop: () => void;
+    onDrop: (index: number, event: DragEvent) => void;
  };

-  let {
-    step,
-    index,
-    position,
-    isGhost,
-    isSource,
-    isDragging,
-    onEdit,
-    onDelete,
-    onInsertBefore,
-    onDragStart,
-    onDragOver,
-    onDragEnd,
-    onDrop,
-  }: Props = $props();
+  let { step, index, onEdit, onDelete, onInsertBefore, onDrop }: Props = $props();

  const method = $derived(pluginManager.getMethod(step.method));
-  const isFilter = $derived(method?.uiHints?.includes('Filter') ?? false);
+  const isFilter = $derived(method?.uiHints?.includes('filter') ?? false);
  const configEntries = $derived(
    Object.entries(step.config ?? {}).filter(([, value]) => value !== null && value !== undefined && value !== ''),
  );
-  let dragImage = $state<Element>();
+  let isDragging = $state(false);
+  let isDropTarget = $state(false);
  let hoverDrag = $state(false);

-  const cardStateClass = $derived.by(() => {
-    if (isGhost) {
-      return 'pointer-events-none border-2 border-dashed border-primary bg-primary-50/40 shadow-lg';
-    }
-
-    if (isSource) {
-      return 'border-dashed border-primary-300 bg-primary-50/20';
-    }
-
-    if (hoverDrag) {
-      return 'border-dashed border-primary';
-    }
-
-    return '';
-  });
-
  const truncate = (input: string, max = 24) => (input.length > max ? input.slice(0, max - 1) + '…' : input);

  const formatConfigValue = (value: unknown): string => {
@@ -104,46 +68,49 @@
      return;
    }

+    isDragging = true;
    event.dataTransfer.effectAllowed = 'move';
    event.dataTransfer.setData('text/plain', String(index));

+    const dragElement = document.createElement('div');
+    document.body.append(dragElement);
+
    mount(WorkflowStepDragImage, {
-      target: document.body,
+      target: dragElement,
      props: {
        description: method?.description,
-        isFilter: method?.uiHints?.includes('Filter') ?? false,
+        isFilter: method?.uiHints?.includes('filter') ?? false,
        label: step ? pluginManager.getMethodLabel(step.method) : '',
        stepNumber: index + 1,
      },
    });
+    flushSync();

-    dragImage = document.body.querySelector('#workflow-step-drag-image')!;
-    event.dataTransfer.setDragImage(dragImage, 16, 22);
-
-    onDragStart(index);
+    event.dataTransfer.setDragImage(dragElement, 16, 22);
  };

-  const handleDrop = (event: DragEvent) => {
+  const handleDrop = (index: number, event: DragEvent) => {
+    if (!event.dataTransfer) {
+      return;
+    }
    event.preventDefault();
-    onDrop();
-  };

-  const handleDragOver = (event: DragEvent & { currentTarget: HTMLElement }) => {
-    event.preventDefault();
-    if (isGhost) {
+    const from = Number(event.dataTransfer.getData('text/plain'));
+    if (from === index) {
      return;
    }

-    const rect = event.currentTarget.getBoundingClientRect();
-    const after = event.clientY > rect.top + rect.height / 2;
-    onDragOver(index, after);
+    onDrop(index, event);
+  };
+
+  const handleDragOver = (event: DragEvent) => {
+    event.preventDefault();
+    isDropTarget = true;
  };

  const handleDragEnd = () => {
-    dragImage?.remove();
-    dragImage = undefined;
-    hoverDrag = false;
-    onDragEnd();
+    isDragging = false;
+    isDropTarget = false;
  };
 </script>

@@ -154,7 +121,6 @@
      <button
        type="button"
        class="absolute top-1/2 left-1/2 z-10 -translate-1/2 cursor-pointer rounded-full border border-dashed border-primary-200 bg-light p-0.5 text-primary opacity-0 transition-opacity group-hover/step-row:opacity-100 hover:bg-primary-50"
-        class:hidden={isDragging}
        aria-label={$t('add_step')}
        title={$t('add_step')}
        onclick={() => onInsertBefore(index)}
@@ -166,12 +132,20 @@

  <div
    class="w-full transition-all"
-    class:opacity-50={isSource}
+    class:opacity-40={isDragging}
+    class:scale-[0.99]={isDragging}
    ondragover={handleDragOver}
-    ondrop={handleDrop}
+    ondragleave={() => (isDropTarget = false)}
+    ondrop={(event) => handleDrop(index, event)}
    role="listitem"
  >
-    <Card class="shadow-none transition-colors {cardStateClass}">
+    <Card
+      class="shadow-none transition-colors {isDropTarget
+        ? 'border-primary ring-2 ring-primary-200'
+        : hoverDrag
+          ? 'border-dashed border-primary'
+          : ''}"
+    >
      <CardHeader>
        <div class="flex items-center gap-2">
          <!-- svelte-ignore a11y_no_static_element_interactions -->
@@ -200,9 +174,7 @@
          </div>
          <div class="flex min-w-0 flex-1 flex-col">
            <CardTitle class="truncate">
-              {#if !isGhost}
-                <span class="mr-1 font-bold text-light-500">{position}</span>
-              {/if}
+              <span class="mr-1 font-bold text-light-500">{index + 1}</span>
              {pluginManager.getMethodLabel(step.method)}
            </CardTitle>
            {#if method?.description}
@@ -13,7 +13,6 @@
 </script>

 <div
-  id="workflow-step-drag-image"
  aria-hidden="true"
  class="pointer-events-none fixed top-[-1000px] left-0 flex w-80 items-center gap-2.5 rounded-lg border border-light-200 bg-light px-3 py-2.5 text-sm/5 text-dark shadow-2xl"
 >
@@ -67,7 +67,7 @@

    for (const [i, step] of workflow.steps.entries()) {
      const method = pluginManager.getMethod(step.method);
-      const isFilter = method?.uiHints?.includes('Filter') ?? false;
+      const isFilter = method?.uiHints?.includes('filter') ?? false;
      const type = isFilter ? $t('filter') : $t('action');
      const label = pluginManager.getMethodLabel(step.method);
      lines.push(`    [${i + 1}] ${type.toUpperCase()} · ${label}`);
@@ -1,78 +0,0 @@
-export const GHOST_KEY = 'reorder-ghost';
-
-export type ReorderEntry<T> = {
-  item: T;
-  index: number;
-  isGhost: boolean;
-  isSource: boolean;
-};
-
-export function createListReorder<T>(getItems: () => T[], setItems: (items: T[]) => void) {
-  let draggingIndex = $state<number | null>(null);
-  let dropIndex = $state<number | null>(null);
-
-  const entries = $derived.by<ReorderEntry<T>[]>(() => {
-    const items = getItems();
-    const list: ReorderEntry<T>[] = items.map((item, index) => ({
-      item,
-      index,
-      isGhost: false,
-      isSource: index === draggingIndex,
-    }));
-
-    if (
-      draggingIndex !== null &&
-      dropIndex !== null &&
-      dropIndex !== draggingIndex &&
-      dropIndex !== draggingIndex + 1
-    ) {
-      list.splice(dropIndex, 0, { item: items[draggingIndex], index: draggingIndex, isGhost: true, isSource: false });
-    }
-
-    return list;
-  });
-
-  return {
-    get isDragging() {
-      return draggingIndex !== null;
-    },
-    get entries() {
-      return entries;
-    },
-    start(index: number) {
-      draggingIndex = index;
-      dropIndex = index;
-    },
-    over(index: number, after: boolean) {
-      if (draggingIndex === null) {
-        return;
-      }
-      dropIndex = Math.max(0, Math.min(index + (after ? 1 : 0), getItems().length));
-    },
-    toEnd() {
-      if (draggingIndex !== null) {
-        dropIndex = getItems().length;
-      }
-    },
-    end() {
-      draggingIndex = null;
-      dropIndex = null;
-    },
-    drop() {
-      if (draggingIndex === null || dropIndex === null) {
-        return;
-      }
-
-      const target = dropIndex > draggingIndex ? dropIndex - 1 : dropIndex;
-      if (target !== draggingIndex) {
-        const next = [...getItems()];
-        const [moved] = next.splice(draggingIndex, 1);
-        next.splice(target, 0, moved);
-        setItems(next);
-      }
-
-      draggingIndex = null;
-      dropIndex = null;
-    },
-  };
-}