test(server): duplicate path case

.github/workflows/build-mobile.yml

@@ -237,7 +237,7 @@ jobs:
         run: flutter build ios --config-only --no-codesign
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1.312.0
+        uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
         with:
           ruby-version: '3.3'
           bundler-cache: true

.github/workflows/check-openapi.yml

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

e2e/package.json

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

e2e/vitest.config.ts

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

e2e/vitest.maintenance.config.ts

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

i18n/en.json

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

mise.lock

@@ -82,19 +82,6 @@ url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353224133"
 version = "7.1.3-6"
 backend = "github:jellyfin/jellyfin-ffmpeg"
 
-[tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_linuxarm64-gpl.tar.xz"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64"]
-checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64-musl"]
-checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
-
 [[tools."github:webassembly/binaryen"]]
 version = "version_124"
 backend = "github:webassembly/binaryen"

mobile/lib/constants/locales.dart

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

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

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

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

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

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

@@ -10,7 +10,6 @@ import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
-import 'package:logging/logging.dart';
 
 typedef TimelineAssetSource = Future<List<BaseAsset>> Function(int index, int count);
 
@@ -91,7 +90,6 @@ class TimelineFactory {
 }
 
 class TimelineService {
-  static final Logger _log = Logger('TimelineService');
   final TimelineAssetSource _assetSource;
   final TimelineBucketSource _bucketSource;
   final TimelineOrigin origin;
@@ -107,49 +105,34 @@ class TimelineService {
     : this._(assetSource: query.assetSource, bucketSource: query.bucketSource, origin: query.origin);
 
   TimelineService._({required this._assetSource, required this._bucketSource, required this.origin}) {
-    _bucketSubscription = _bucketSource().listen(
-      (buckets) {
-        _mutex.run(() async {
-          try {
-            final totalAssets = buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
+    _bucketSubscription = _bucketSource().listen((buckets) {
+      _mutex.run(() async {
+        final totalAssets = buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
 
-            _log.info(
-              '[$origin] bucket emission: ${buckets.length} buckets / $totalAssets assets '
-              '(current _totalAssets=$_totalAssets, _bufferOffset=$_bufferOffset, _buffer=${_buffer.length})',
-            );
-
-            if (totalAssets == 0) {
-              _bufferOffset = 0;
-              _buffer = [];
-            } else {
-              final int offset;
-              final int count;
-              // When the buffer is empty or the old bufferOffset is greater than the new total assets,
-              // we need to reset the buffer and load the first batch of assets.
-              if (_bufferOffset >= totalAssets || _buffer.isEmpty) {
-                offset = 0;
-                count = kTimelineAssetLoadBatchSize;
-              } else {
-                offset = _bufferOffset;
-                count = math.min(_buffer.length, totalAssets - _bufferOffset);
-              }
-              _buffer = await _assetSource(offset, count);
-              _bufferOffset = offset;
-              _log.info('[$origin] buffer reloaded: offset=$offset requested=$count got=${_buffer.length}');
-            }
-
-            _totalAssets = totalAssets;
-            EventStream.shared.emit(const TimelineReloadEvent());
-          } catch (error, stack) {
-            _log.severe('[$origin] bucket reload FAILED — _totalAssets stuck at $_totalAssets', error, stack);
-            rethrow;
+        if (totalAssets == 0) {
+          _bufferOffset = 0;
+          _buffer = [];
+        } else {
+          final int offset;
+          final int count;
+          // When the buffer is empty or the old bufferOffset is greater than the new total assets,
+          // we need to reset the buffer and load the first batch of assets.
+          if (_bufferOffset >= totalAssets || _buffer.isEmpty) {
+            offset = 0;
+            count = kTimelineAssetLoadBatchSize;
+          } else {
+            offset = _bufferOffset;
+            count = math.min(_buffer.length, totalAssets - _bufferOffset);
           }
-        });
-      },
-      onError: (Object error, StackTrace stack) {
-        _log.severe('[$origin] bucket stream errored', error, stack);
-      },
-    );
+          _buffer = await _assetSource(offset, count);
+          _bufferOffset = offset;
+        }
+
+        // change the state's total assets count only after the buffer is reloaded
+        _totalAssets = totalAssets;
+        EventStream.shared.emit(const TimelineReloadEvent());
+      });
+    });
   }
 
   Stream<List<Bucket>> Function() get watchBuckets => _bucketSource;
@@ -181,13 +164,6 @@ class TimelineService {
     _buffer = await _assetSource(start, len);
     _bufferOffset = start;
 
-    if (!hasRange(index, count)) {
-      _log.warning(
-        '[$origin] _loadAssets($index, $count): buffer loaded (offset=$start, got=${_buffer.length}) but still '
-        'out of range — _totalAssets=$_totalAssets. getAssets is about to throw RangeError.',
-      );
-    }
-
     return getAssets(index, count);
   }
 

mobile/lib/domain/utils/sync_linked_album.dart

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

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

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

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

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

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

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

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

@@ -23,7 +23,6 @@ import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.da
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:logging/logging.dart';
 
 class FixedSegment extends Segment {
   final double tileHeight;
@@ -91,7 +90,6 @@ class FixedSegment extends Segment {
 }
 
 class _FixedSegmentRow extends ConsumerWidget {
-  static final Logger _log = Logger('TimelineRow');
   final int assetIndex;
   final int assetCount;
   final double tileHeight;
@@ -111,20 +109,11 @@ class _FixedSegmentRow extends ConsumerWidget {
     final isScrubbing = ref.watch(timelineStateProvider.select((s) => s.isScrubbing));
     final timelineService = ref.read(timelineServiceProvider);
     final isDynamicLayout = columnCount <= (context.isMobile ? 2 : 3);
-    final inRange = timelineService.hasRange(assetIndex, assetCount);
 
-    if (assetIndex == 0) {
-      _log.info(
-        'row[0] inRange=$inRange isScrubbing=$isScrubbing totalAssets=${timelineService.totalAssets} '
-        'branch=${inRange
-            ? "assets"
-            : isScrubbing
-            ? "placeholder(scrubbing)"
-            : "future(load)"}',
-      );
+    if (isScrubbing) {
+      return _buildPlaceholder(context);
     }
-
-    if (inRange) {
+    if (timelineService.hasRange(assetIndex, assetCount)) {
       return _buildAssetRow(
         context,
         timelineService.getAssets(assetIndex, assetCount),
@@ -133,23 +122,12 @@ class _FixedSegmentRow extends ConsumerWidget {
       );
     }
 
-    if (isScrubbing) {
-      return _buildPlaceholder(context);
-    }
-
     return FutureBuilder<List<BaseAsset>>(
       future: timelineService.loadAssets(assetIndex, assetCount),
       builder: (context, snapshot) {
         if (snapshot.connectionState != ConnectionState.done) {
           return _buildPlaceholder(context);
         }
-        if (snapshot.hasError) {
-          _log.warning(
-            'render row loadAssets($assetIndex, $assetCount) failed (totalAssets=${timelineService.totalAssets})',
-            snapshot.error,
-            snapshot.stackTrace,
-          );
-        }
         return _buildAssetRow(context, snapshot.requireData, timelineService, isDynamicLayout);
       },
     );

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

@@ -13,7 +13,6 @@ import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart'
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/utils/debounce.dart';
 import 'package:intl/intl.dart' hide TextDirection;
-import 'package:logging/logging.dart';
 
 /// A widget that will display a BoxScrollView with a ScrollThumb that can be dragged
 /// for quick navigation of the BoxScrollView.
@@ -85,7 +84,6 @@ List<_Segment> _buildSegments({required List<Segment> layoutSegments, required d
 }
 
 class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixin {
-  static final Logger _log = Logger('Scrubber');
   String? _lastLabel;
   double _thumbTopOffset = 0.0;
   bool _isDragging = false;
@@ -116,7 +114,6 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
   @override
   void initState() {
     super.initState();
-    _log.info('Scrubber initState');
     _isDragging = false;
     _segments = _buildSegments(layoutSegments: widget.layoutSegments, timelineHeight: _scrubberHeight);
     _thumbAnimationController = AnimationController(vsync: this, duration: kTimelineScrubberFadeInDuration);
@@ -137,10 +134,7 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
   void didUpdateWidget(covariant Scrubber oldWidget) {
     super.didUpdateWidget(oldWidget);
 
-    final oldEnd = oldWidget.layoutSegments.lastOrNull?.endOffset;
-    final newEnd = widget.layoutSegments.lastOrNull?.endOffset;
-    if (oldEnd != newEnd) {
-      _log.info('Scrubber layoutSegments endOffset $oldEnd -> $newEnd (isDragging=$_isDragging)');
+    if (oldWidget.layoutSegments.lastOrNull?.endOffset != widget.layoutSegments.lastOrNull?.endOffset) {
       _segments = _buildSegments(layoutSegments: widget.layoutSegments, timelineHeight: _scrubberHeight);
       _monthCount = getMonthCount();
     }
@@ -148,15 +142,6 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
 
   @override
   void dispose() {
-    if (_isDragging || _currentScrubberDate != null || _scrubberDebouncer != null) {
-      _log.warning(
-        'Scrubber dispose mid-scrub '
-        '(isDragging=$_isDragging, pendingDate=$_currentScrubberDate, '
-        'debouncerPending=${_scrubberDebouncer != null}) — scrubbing reset may be orphaned',
-      );
-    } else {
-      _log.info('Scrubber dispose');
-    }
     _thumbAnimationController.dispose();
     _labelAnimationController.dispose();
     _fadeOutTimer?.cancel();
@@ -223,7 +208,6 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
   }
 
   void _onDragStart(DragStartDetails _) {
-    _log.info('scrub dragStart');
     setState(() {
       _isDragging = true;
       _labelAnimationController.forward();
@@ -238,15 +222,9 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
     }
 
     if (_scrubberHeight <= 0) {
-      _log.warning('drag ignored: scrubberHeight=$_scrubberHeight <= 0');
       return;
     }
 
-    final maxScrollExtent = _scrollController.hasClients ? _scrollController.position.maxScrollExtent : -1;
-    if (maxScrollExtent <= 0) {
-      _log.warning('drag ineffective: hasClients=${_scrollController.hasClients} maxScrollExtent=$maxScrollExtent');
-    }
-
     if (_thumbAnimationController.status != AnimationStatus.forward) {
       _thumbAnimationController.forward();
     }
@@ -366,7 +344,6 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
   }
 
   void _onDragEnd(DragEndDetails _) {
-    _log.info('scrub dragEnd -> setScrubbing(false)');
     _labelAnimationController.reverse();
     setState(() {
       _isDragging = false;

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

@@ -7,7 +7,6 @@ import 'package:immich_mobile/presentation/widgets/timeline/fixed/segment_builde
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-import 'package:logging/logging.dart';
 
 class TimelineArgs {
   final double maxWidth;
@@ -72,27 +71,14 @@ class TimelineState {
 }
 
 class TimelineStateNotifier extends Notifier<TimelineState> {
-  static final Logger _log = Logger('TimelineState');
-
   void setScrubbing(bool isScrubbing) {
-    if (state.isScrubbing != isScrubbing) {
-      _log.info('isScrubbing ${state.isScrubbing} -> $isScrubbing  (from ${_callSite()})');
-    }
     state = state.copyWith(isScrubbing: isScrubbing);
   }
 
   void setScrolling(bool isScrolling) {
-    if (state.isScrolling != isScrolling) {
-      _log.info('isScrolling ${state.isScrolling} -> $isScrolling  (from ${_callSite()})');
-    }
     state = state.copyWith(isScrolling: isScrolling);
   }
 
-  static String _callSite() {
-    final frames = StackTrace.current.toString().split('\n');
-    return frames.length > 2 ? frames[2].trim() : 'unknown';
-  }
-
   @override
   TimelineState build() => const TimelineState(isScrubbing: false, isScrolling: false);
 }
@@ -110,11 +96,6 @@ final timelineSegmentProvider = StreamProvider.autoDispose<List<Segment>>((ref)
 
   final timelineService = ref.watch(timelineServiceProvider);
   yield* timelineService.watchBuckets().map((buckets) {
-    final layoutTotal = buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
-    Logger('TimelineService').info(
-      '[${timelineService.origin}] segment layout: '
-      '${buckets.length} buckets / $layoutTotal assets (service.totalAssets=${timelineService.totalAssets})',
-    );
     return FixedSegmentBuilder(
       buckets: buckets,
       tileHeight: tileExtent,

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

@@ -21,14 +21,13 @@ import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.dart
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline_drag_region.dart';
-import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
 import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 import 'package:immich_mobile/widgets/common/selection_sliver_app_bar.dart';
-import 'package:logging/logging.dart';
 
 class Timeline extends StatelessWidget {
   const Timeline({
@@ -137,7 +136,6 @@ class _SliverTimeline extends ConsumerStatefulWidget {
 }
 
 class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
-  static final Logger _log = Logger('Timeline');
   late final ScrollController _scrollController;
   StreamSubscription? _eventSubscription;
 
@@ -155,7 +153,6 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   @override
   void initState() {
     super.initState();
-    _log.info('SliverTimeline initState');
     _scrollController = ScrollController(onAttach: _restoreAssetPosition);
     _eventSubscription = EventStream.shared.listen(_onEvent);
 
@@ -182,19 +179,12 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   }
 
   void _onEvent(Event event) {
-    _log.info('event ${event.runtimeType}');
     switch (event) {
       case ScrollToTopEvent():
-        {
-          final timelineState = ref.read(timelineStateProvider.notifier);
-          timelineState.setScrubbing(true);
-          _scrollController
-              .animateTo(0, duration: const Duration(milliseconds: 250), curve: Curves.easeInOut)
-              .whenComplete(() {
-                _log.info('ScrollToTop animation done -> setScrubbing(false)');
-                timelineState.setScrubbing(false);
-              });
-        }
+        ref.read(timelineStateProvider.notifier).setScrubbing(true);
+        _scrollController
+            .animateTo(0, duration: const Duration(milliseconds: 250), curve: Curves.easeInOut)
+            .whenComplete(() => ref.read(timelineStateProvider.notifier).setScrubbing(false));
 
       case ScrollToDateEvent scrollToDateEvent:
         _scrollToDate(scrollToDateEvent.date);
@@ -253,14 +243,12 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
 
   @override
   void dispose() {
-    _log.info('SliverTimeline dispose');
     _scrollController.dispose();
     _eventSubscription?.cancel();
     super.dispose();
   }
 
   void _scrollToDate(DateTime date) {
-    final timelineState = ref.read(timelineStateProvider.notifier);
     final asyncSegments = ref.read(timelineSegmentProvider);
     asyncSegments.whenData((segments) {
       // Find the segment that contains assets from the target date
@@ -287,20 +275,16 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
       if (fallbackSegment != null) {
         // Scroll to the segment with a small offset to show the header
         final targetOffset = fallbackSegment.startOffset - 50;
-        timelineState.setScrubbing(true);
+        ref.read(timelineStateProvider.notifier).setScrubbing(true);
         _scrollController
             .animateTo(
               targetOffset.clamp(0.0, _scrollController.position.maxScrollExtent),
               duration: const Duration(milliseconds: 500),
               curve: Curves.easeInOut,
             )
-            .whenComplete(() {
-              _log.info('ScrollToDate animation done -> setScrubbing(false)');
-              timelineState.setScrubbing(false);
-            });
+            .whenComplete(() => ref.read(timelineStateProvider.notifier).setScrubbing(false));
       } else {
-        _log.info('ScrollToDate: no matching segment for $date -> setScrubbing(false)');
-        timelineState.setScrubbing(false);
+        ref.read(timelineStateProvider.notifier).setScrubbing(false);
       }
     });
   }
@@ -317,19 +301,19 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   void _stopDrag() {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       // Update the physics post frame to prevent sudden change in physics on iOS.
-      if (mounted) {
-        setState(() {
-          _scrollPhysics = null;
-        });
-      }
+      setState(() {
+        _scrollPhysics = null;
+      });
     });
     setState(() {
       _dragging = false;
       _draggedAssets.clear();
     });
-    final timelineState = ref.read(timelineStateProvider.notifier);
+    // Reset the scrolling state after a small delay to allow bottom sheet to expand again
     Future.delayed(const Duration(milliseconds: 300), () {
-      timelineState.setScrolling(false);
+      if (mounted) {
+        ref.read(timelineStateProvider.notifier).setScrolling(false);
+      }
     });
   }
 

mobile/lib/providers/infrastructure/timeline.provider.dart

@@ -5,9 +5,6 @@ import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart'
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:logging/logging.dart';
-
-final _log = Logger('TimelineProvider');
 
 final timelineRepositoryProvider = Provider<DriftTimelineRepository>(
   (ref) => DriftTimelineRepository(ref.watch(driftProvider)),
@@ -21,11 +18,7 @@ final timelineServiceProvider = Provider<TimelineService>(
   (ref) {
     final timelineUsers = ref.watch(timelineUsersProvider).valueOrNull ?? [];
     final timelineService = ref.watch(timelineFactoryProvider).main(timelineUsers);
-    _log.info('main TimelineService built users=$timelineUsers');
-    ref.onDispose(() {
-      _log.info('main TimelineService disposed');
-      timelineService.dispose();
-    });
+    ref.onDispose(timelineService.dispose);
     return timelineService;
   },
   // Empty dependencies to inform the framework that this provider
@@ -43,12 +36,8 @@ final timelineFactoryProvider = Provider<TimelineFactory>(
 final timelineUsersProvider = StreamProvider<List<String>>((ref) {
   final currentUserId = ref.watch(currentUserProvider.select((u) => u?.id));
   if (currentUserId == null) {
-    _log.info('timelineUsers: currentUserId=null -> []');
     return Stream.value([]);
   }
 
-  return ref.watch(timelineRepositoryProvider).watchTimelineUserIds(currentUserId).map((users) {
-    _log.info('timelineUsers emission: $users');
-    return users;
-  });
+  return ref.watch(timelineRepositoryProvider).watchTimelineUserIds(currentUserId);
 });

mobile/lib/repositories/asset_media.repository.dart

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

mobile/openapi/lib/model/asset_bulk_update_dto.dart

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

mobile/openapi/lib/model/asset_bulk_upload_check_item.dart

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

mobile/test/domain/services/sync_linked_album_service_test.dart

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

open-api/immich-openapi-specs.json

@@ -16868,7 +16868,7 @@
             "type": "string"
           },
           "dateTimeRelative": {
-            "description": "Relative time offset in minutes",
+            "description": "Relative time offset in seconds",
             "maximum": 9007199254740991,
             "minimum": -9007199254740991,
             "type": "integer"
@@ -16965,7 +16965,7 @@
             "type": "string"
           },
           "id": {
-            "description": "Client-side identifier echoed in the response to match results to inputs (e.g. filename)",
+            "description": "Asset ID",
             "type": "string"
           }
         },
@@ -18490,6 +18490,7 @@
         "properties": {
           "cronExpression": {
             "description": "Cron expression",
+            "pattern": "(((\\d+,)+\\d+|(\\d+(\\/|-)\\d+)|\\d+|\\*) ?){5,7}",
             "type": "string"
           },
           "enabled": {
@@ -25676,6 +25677,7 @@
         "properties": {
           "cronExpression": {
             "description": "Cron expression for when the integrity check should run",
+            "pattern": "(((\\d+,)+\\d+|(\\d+(\\/|-)\\d+)|\\d+|\\*) ?){5,7}",
             "type": "string"
           },
           "enabled": {
@@ -25708,6 +25710,7 @@
         "properties": {
           "cronExpression": {
             "description": "Cron expression for when the integrity check should run",
+            "pattern": "(((\\d+,)+\\d+|(\\d+(\\/|-)\\d+)|\\d+|\\*) ?){5,7}",
             "type": "string"
           },
           "enabled": {
@@ -25807,6 +25810,7 @@
         "properties": {
           "cronExpression": {
             "description": "Cron expression",
+            "pattern": "(((\\d+,)+\\d+|(\\d+(\\/|-)\\d+)|\\d+|\\*) ?){5,7}",
             "type": "string"
           },
           "enabled": {

package.json

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

packages/cli/package.json

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

packages/plugin-sdk/package.json

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

packages/sdk/package.json

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

packages/sdk/src/fetch-client.ts

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

pnpm-workspace.yaml

@@ -65,5 +65,3 @@ preferWorkspacePackages: true
 injectWorkspacePackages: true
 shamefullyHoist: false
 verifyDepsBeforeRun: install
-minimumReleaseAgeExclude:
-  - '@immich/ui@0.81.1'

server/package.json

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

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

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

server/src/dtos/asset.dto.ts

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

server/src/dtos/system-config.dto.ts

@@ -1,4 +1,3 @@
-import { validateCronExpression } from 'cron';
 import { createZodDto } from 'nestjs-zod';
 import { SystemConfig } from 'src/config';
 import {
@@ -44,16 +43,7 @@ const JobSettingsSchema = z
 
 const cronExpressionSchema = z
   .string()
-  .superRefine((value, ctx) => {
-    const validated = validateCronExpression(value);
-    if (!validated.valid) {
-      ctx.addIssue({
-        code: 'custom',
-        message: `Invalid cron expression. ${validated.error?.message ?? ''}`,
-        input: value,
-      });
-    }
-  })
+  .regex(/(((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*) ?){5,7}/, 'Invalid cron expression')
   .describe('Cron expression');
 
 const DatabaseBackupSchema = z

server/src/queries/integrity.repository.sql

@@ -129,10 +129,10 @@ from
   and "integrity_report"."type" = $1
 where
   "asset"."deletedAt" is null
-  and "integrity_report"."createdAt" >= $2
-  and "integrity_report"."createdAt" <= $3
+  and "createdAt" >= $2
+  and "createdAt" <= $3
 order by
-  "integrity_report"."createdAt" asc
+  "createdAt" asc
 
 -- IntegrityRepository.streamIntegrityReports
 select

server/src/repositories/integrity.repository.ts

@@ -177,9 +177,9 @@ export class IntegrityRepository {
         'asset.id as assetId',
         'integrity_report.id as reportId',
       ])
-      .$if(startMarker !== undefined, (qb) => qb.where('integrity_report.createdAt', '>=', startMarker!))
-      .$if(endMarker !== undefined, (qb) => qb.where('integrity_report.createdAt', '<=', endMarker!))
-      .orderBy('integrity_report.createdAt', 'asc')
+      .$if(startMarker !== undefined, (qb) => qb.where('createdAt', '>=', startMarker!))
+      .$if(endMarker !== undefined, (qb) => qb.where('createdAt', '<=', endMarker!))
+      .orderBy('createdAt', 'asc')
       .stream();
   }
 

server/src/services/duplicate.service.spec.ts

@@ -369,26 +369,6 @@ describe(DuplicateService.name, () => {
       expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.SidecarWrite, data: { id: asset1.id } }]);
     });
 
-    it('should not merge metadata when multiple assets are kept', async () => {
-      const asset1 = AssetFactory.create({ isFavorite: true });
-      const asset2 = AssetFactory.create();
-      mocks.access.duplicate.checkOwnerAccess.mockResolvedValue(new Set(['group-1']));
-      mocks.duplicateRepository.get.mockResolvedValue({
-        duplicateId: 'group-1',
-        assets: [asset1 as unknown as MapAsset, asset2 as unknown as MapAsset],
-      });
-
-      const result = await sut.resolve(authStub.admin, {
-        groups: [{ duplicateId: 'group-1', keepAssetIds: [asset1.id, asset2.id], trashAssetIds: [] }],
-      });
-
-      expect(result[0].success).toBe(true);
-      expect(mocks.album.addAssetIdsToAlbums).not.toHaveBeenCalled();
-      expect(mocks.tag.replaceAssetTags).not.toHaveBeenCalled();
-      expect(mocks.asset.updateAllExif).not.toHaveBeenCalled();
-      expect(mocks.asset.updateAll).toHaveBeenCalledWith([asset1.id, asset2.id], { duplicateId: null });
-    });
-
     // NOTE: The following integration-style tests are covered by E2E tests instead
     // to avoid complex mock setup. The validation and error-handling logic above
     // is thoroughly unit tested.

server/src/services/duplicate.service.ts

@@ -156,51 +156,51 @@ export class DuplicateService extends BaseService {
       }
     }
 
-    // Only merge metadata into the keeper when exactly one asset can absorb trashed duplicates.
-    if (idsToKeep.length === 1 && idsToTrash.length > 0) {
-      const assetAlbumMap = await this.albumRepository.getByAssetIds(auth.user.id, [...groupAssetIds]);
+    const assetAlbumMap = await this.albumRepository.getByAssetIds(auth.user.id, [...groupAssetIds]);
 
-      const { assetUpdate, exifUpdate, mergedAlbumIds, mergedTagIds, mergedTagValues } = this.getSyncMergeResult(
-        duplicateGroup.assets,
-        assetAlbumMap,
-      );
+    const { assetUpdate, exifUpdate, mergedAlbumIds, mergedTagIds, mergedTagValues } = this.getSyncMergeResult(
+      duplicateGroup.assets,
+      assetAlbumMap,
+    );
 
-      if (mergedAlbumIds.length > 0) {
-        const allowedAlbumIds = await this.checkAccess({
-          auth,
-          permission: Permission.AlbumAssetCreate,
-          ids: mergedAlbumIds,
-        });
+    if (mergedAlbumIds.length > 0) {
+      const allowedAlbumIds = await this.checkAccess({
+        auth,
+        permission: Permission.AlbumAssetCreate,
+        ids: mergedAlbumIds,
+      });
 
-        const allowedShareIds = await this.checkAccess({
-          auth,
-          permission: Permission.AssetShare,
-          ids: idsToKeep,
-        });
+      const allowedShareIds = await this.checkAccess({
+        auth,
+        permission: Permission.AssetShare,
+        ids: idsToKeep,
+      });
 
-        if (allowedAlbumIds.size > 0 && allowedShareIds.size > 0) {
-          await this.albumRepository.addAssetIdsToAlbums(
-            [...allowedAlbumIds].flatMap((albumId) => [...allowedShareIds].map((assetId) => ({ albumId, assetId }))),
-          );
-        }
+      if (allowedAlbumIds.size > 0 && allowedShareIds.size > 0) {
+        await this.albumRepository.addAssetIdsToAlbums(
+          [...allowedAlbumIds].flatMap((albumId) => [...allowedShareIds].map((assetId) => ({ albumId, assetId }))),
+        );
       }
+    }
 
-      if (mergedTagIds.length > 0) {
-        const allowedTagIds = await this.checkAccess({
-          auth,
-          permission: Permission.TagAsset,
-          ids: mergedTagIds,
-        });
+    if (mergedTagIds.length > 0) {
+      const allowedTagIds = await this.checkAccess({
+        auth,
+        permission: Permission.TagAsset,
+        ids: mergedTagIds,
+      });
 
-        if (allowedTagIds.size > 0) {
-          await Promise.all(
-            idsToKeep.map((assetId) => this.tagRepository.replaceAssetTags(assetId, [...allowedTagIds])),
-          );
+      if (allowedTagIds.size > 0) {
+        // Replace tags for each keeper asset to ensure all merged tags are applied
+        await Promise.all(idsToKeep.map((assetId) => this.tagRepository.replaceAssetTags(assetId, [...allowedTagIds])));
 
-          await this.assetRepository.updateAllExif(idsToKeep, { tags: mergedTagValues });
-        }
+        // Update asset_exif.tags so the subsequent SidecarWrite + MetadataExtraction
+        // cycle preserves the merged tags (updateAllExif locks the property automatically)
+        await this.assetRepository.updateAllExif(idsToKeep, { tags: mergedTagValues });
       }
+    }
 
+    if (idsToKeep.length > 0) {
       const hasExifUpdate = Object.keys(exifUpdate).length > 0;
       const hasTagUpdate = mergedTagIds.length > 0;
 
@@ -213,8 +213,6 @@ export class DuplicateService extends BaseService {
       }
 
       await this.assetRepository.updateAll(idsToKeep, { duplicateId: null, ...assetUpdate });
-    } else if (idsToKeep.length > 0) {
-      await this.assetRepository.updateAll(idsToKeep, { duplicateId: null });
     }
 
     if (idsToTrash.length > 0) {

server/src/services/integrity.service.ts

@@ -399,7 +399,10 @@ export class IntegrityService extends BaseService {
       await this.integrityRepository.deleteByIds(outdatedReports);
     }
 
-    const missingFiles = results.filter(({ exists }) => !exists);
+    const missingFiles = Object.values(
+      Object.fromEntries(results.filter(({ exists }) => !exists).map((file) => [file.path, file])),
+    );
+
     if (missingFiles.length > 0) {
       await this.integrityRepository.create(
         missingFiles.map(({ path, assetId, fileAssetId }) => ({

server/src/services/system-config.service.spec.ts

@@ -319,14 +319,14 @@ describe(SystemConfigService.name, () => {
     it('should accept valid cron expressions', async () => {
       mocks.config.getEnv.mockReturnValue(mockEnvData({ configFile: 'immich-config.json' }));
       mocks.systemMetadata.readFile.mockResolvedValue(
-        JSON.stringify({ library: { scan: { cronExpression: '0 0 */3 * *' } } }),
+        JSON.stringify({ library: { scan: { cronExpression: '0 0 * * *' } } }),
       );
 
       await expect(sut.getSystemConfig()).resolves.toMatchObject({
         library: {
           scan: {
             enabled: true,
-            cronExpression: '0 0 */3 * *',
+            cronExpression: '0 0 * * *',
           },
         },
       });

server/test/medium/specs/services/integrity.service.spec.ts

@@ -512,6 +512,82 @@ describe(IntegrityService.name, () => {
         nextCursor: undefined,
       });
     });
+
+    it('should not fail when the same path is duplicated within a batch', async () => {
+      const { sut, ctx } = setup();
+      const storage = ctx.getMock(StorageRepository);
+
+      const {
+        result: { id: ownerId },
+      } = await ctx.newUser();
+
+      const {
+        result: { id: assetId1 },
+      } = await ctx.newAsset({ ownerId, originalPath: '/path/to/duplicate' });
+
+      const {
+        result: { id: assetId2 },
+      } = await ctx.newAsset({ ownerId, originalPath: '/path/to/duplicate' });
+
+      const fileAssetId1 = randomUUID();
+      await ctx.newAssetFile({
+        id: fileAssetId1,
+        assetId: assetId1,
+        type: AssetFileType.Thumbnail,
+        path: '/path/to/duplicate-file',
+      });
+
+      const fileAssetId2 = randomUUID();
+      await ctx.newAssetFile({
+        id: fileAssetId2,
+        assetId: assetId1,
+        type: AssetFileType.Preview,
+        path: '/path/to/duplicate-file',
+      });
+
+      const {
+        result: { id: assetId3 },
+      } = await ctx.newAsset({ ownerId, originalPath: '/path/to/duplicate-cross' });
+
+      const fileAssetId3 = randomUUID();
+      await ctx.newAssetFile({
+        id: fileAssetId3,
+        assetId: assetId3,
+        type: AssetFileType.Thumbnail,
+        path: '/path/to/duplicate-cross',
+      });
+
+      storage.stat.mockRejectedValue(new Error('ENOENT'));
+
+      await expect(
+        sut.handleMissingFiles({
+          items: [
+            { path: '/path/to/duplicate', assetId: assetId1, fileAssetId: null, reportId: null },
+            { path: '/path/to/duplicate', assetId: assetId2, fileAssetId: null, reportId: null },
+            { path: '/path/to/duplicate-file', assetId: null, fileAssetId: fileAssetId1, reportId: null },
+            { path: '/path/to/duplicate-file', assetId: null, fileAssetId: fileAssetId2, reportId: null },
+            { path: '/path/to/duplicate-cross', assetId: assetId3, fileAssetId: null, reportId: null },
+            { path: '/path/to/duplicate-cross', assetId: null, fileAssetId: fileAssetId3, reportId: null },
+          ],
+        }),
+      ).resolves.toBe(JobStatus.Success);
+
+      await expect(
+        ctx.get(IntegrityRepository).getIntegrityReport(
+          {
+            limit: 100,
+          },
+          IntegrityReport.MissingFile,
+        ),
+      ).resolves.toEqual({
+        items: expect.arrayContaining([
+          expect.objectContaining({ path: '/path/to/duplicate' }),
+          expect.objectContaining({ path: '/path/to/duplicate-file' }),
+          expect.objectContaining({ path: '/path/to/duplicate-cross' }),
+        ]),
+        nextCursor: undefined,
+      });
+    });
   });
 
   describe('handleMissingRefresh', () => {
@@ -686,6 +762,40 @@ describe(IntegrityService.name, () => {
         nextCursor: undefined,
       });
     });
+
+    it('should not fail when the same path is duplicated across assets', async () => {
+      const { sut, ctx } = setup();
+      const storage = ctx.getMock(StorageRepository);
+      const job = ctx.getMock(JobRepository);
+      job.queue.mockResolvedValue(void 0);
+
+      const {
+        result: { id: ownerId },
+      } = await ctx.newUser();
+
+      await ctx.newAsset({ ownerId, originalPath: '/path/to/duplicate', checksum: Buffer.from('mismatch-a') });
+      await ctx.newAsset({ ownerId, originalPath: '/path/to/duplicate', checksum: Buffer.from('mismatch-b') });
+
+      storage.createPlainReadStream.mockImplementation(() => Readable.from('garbage data'));
+
+      await expect(sut.handleChecksumFiles({ refreshOnly: false })).resolves.toBe(JobStatus.Success);
+
+      await expect(
+        ctx.get(IntegrityRepository).getIntegrityReport(
+          {
+            limit: 100,
+          },
+          IntegrityReport.ChecksumFail,
+        ),
+      ).resolves.toEqual({
+        items: [
+          expect.objectContaining({
+            path: '/path/to/duplicate',
+          }),
+        ],
+        nextCursor: undefined,
+      });
+    });
   });
 
   describe('handleChecksumRefresh', () => {

web/package.json

@@ -27,7 +27,7 @@
     "@formatjs/icu-messageformat-parser": "^3.0.0",
     "@immich/justified-layout-wasm": "^0.4.3",
     "@immich/sdk": "workspace:*",
-    "@immich/ui": "^0.81.1",
+    "@immich/ui": "^0.80.0",
     "@mapbox/mapbox-gl-rtl-text": "0.4.0",
     "@mdi/js": "^7.4.47",
     "@noble/hashes": "^2.2.0",

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

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

web/src/lib/components/shared-components/map/Map.svelte

@@ -208,13 +208,13 @@
     if (relativeDate) {
       const duration = Duration.fromISO(relativeDate);
       return {
-        fileCreatedAfter: duration.isValid ? DateTime.now().minus(duration).toUTC().toISO() : undefined,
+        fileCreatedAfter: duration.isValid ? DateTime.now().minus(duration).toISO() : undefined,
       };
     }
 
     return {
-      fileCreatedAfter: dateAfter,
-      fileCreatedBefore: dateBefore,
+      fileCreatedAfter: dateAfter?.toUTC().toISO(),
+      fileCreatedBefore: dateBefore?.toUTC().toISO(),
     };
   }
 
@@ -243,7 +243,7 @@
   }
 
   const handleSettingsClick = async () => {
-    const settings = await modalManager.show(MapSettingsModal);
+    const settings = await modalManager.show(MapSettingsModal, { settings: { ...$mapSettings } });
     if (settings) {
       const shouldUpdate = !isEqual(omit(settings, 'allowDarkMode'), omit($mapSettings, 'allowDarkMode'));
       $mapSettings = settings;

web/src/lib/elements/Badge.svelte

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

web/src/lib/modals/MapSettingsModal.svelte

@@ -1,16 +1,17 @@
 <script lang="ts">
-  import { mapSettings, type MapSettings } from '$lib/stores/preferences.store';
+  import type { MapSettings } from '$lib/stores/preferences.store';
   import { Button, DatePicker, Field, FormModal, Select, Stack, Switch } from '@immich/ui';
-  import { DateTime, Duration } from 'luxon';
+  import { Duration } from 'luxon';
   import { t } from 'svelte-i18n';
   import { fly } from 'svelte/transition';
 
   type Props = {
+    settings: MapSettings;
     onClose: (settings?: MapSettings) => void;
   };
 
-  let { onClose }: Props = $props();
-  let settings = $state({ ...$mapSettings });
+  let { settings: initialValues, onClose }: Props = $props();
+  let settings = $state(initialValues);
 
   let customDateRange = $state(!!settings.dateAfter || !!settings.dateBefore);
 
@@ -40,17 +41,10 @@
     {#if customDateRange}
       <div in:fly={{ y: 10, duration: 200 }} class="flex flex-col gap-4">
         <Field label={$t('date_after')}>
-          <DatePicker
-            value={DateTime.fromISO(settings.dateAfter ?? '')}
-            maxDate={DateTime.fromISO(settings.dateBefore ?? '')}
-            onChange={(date) => (settings.dateAfter = date?.toUTC().toISO() ?? undefined)}
-          />
+          <DatePicker bind:value={settings.dateAfter} maxDate={settings.dateBefore} />
         </Field>
         <Field label={$t('date_before')}>
-          <DatePicker
-            value={DateTime.fromISO(settings.dateBefore ?? '')}
-            onChange={(date) => (settings.dateBefore = date?.toUTC().toISO() ?? undefined)}
-          />
+          <DatePicker bind:value={settings.dateBefore} />
         </Field>
         <div class="flex justify-center">
           <Button

web/src/lib/modals/SearchFilterModal.svelte

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

web/src/lib/stores/preferences.store.ts

@@ -1,3 +1,4 @@
+import type { DateTime } from 'luxon';
 import { persisted } from 'svelte-persisted-store';
 import { browser } from '$app/environment';
 import { defaultLang } from '$lib/constants';
@@ -26,8 +27,8 @@ export interface MapSettings {
   withPartners: boolean;
   withSharedAlbums: boolean;
   relativeDate: string;
-  dateAfter?: string;
-  dateBefore?: string;
+  dateAfter?: DateTime<true>;
+  dateBefore?: DateTime<true>;
 }
 
 const defaultMapSettings = {

web/src/lib/utils/i18n.ts

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

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

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

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

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