fix: disable editing

oops

mobile/lib/domain/models/asset/base_asset.model.dart

@@ -22,6 +22,7 @@ sealed class BaseAsset {
   final int? durationInSeconds;
   final bool isFavorite;
   final String? livePhotoVideoId;
+  final bool isEdited;
 
   const BaseAsset({
     required this.name,
@@ -34,6 +35,7 @@ sealed class BaseAsset {
     this.durationInSeconds,
     this.isFavorite = false,
     this.livePhotoVideoId,
+    required this.isEdited,
   });
 
   bool get isImage => type == AssetType.image;
@@ -71,6 +73,7 @@ sealed class BaseAsset {
   height: ${height ?? "<NA>"},
   durationInSeconds: ${durationInSeconds ?? "<NA>"},
   isFavorite: $isFavorite,
+  isEdited: $isEdited,
 }''';
   }
 
@@ -85,7 +88,8 @@ sealed class BaseAsset {
           width == other.width &&
           height == other.height &&
           durationInSeconds == other.durationInSeconds &&
-          isFavorite == other.isFavorite;
+          isFavorite == other.isFavorite &&
+          isEdited == other.isEdited;
     }
     return false;
   }
@@ -99,6 +103,7 @@ sealed class BaseAsset {
         width.hashCode ^
         height.hashCode ^
         durationInSeconds.hashCode ^
-        isFavorite.hashCode;
+        isFavorite.hashCode ^
+        isEdited.hashCode;
   }
 }

mobile/lib/domain/models/asset/local_asset.model.dart

@@ -28,6 +28,7 @@ class LocalAsset extends BaseAsset {
     this.adjustmentTime,
     this.latitude,
     this.longitude,
+    required super.isEdited,
   }) : remoteAssetId = remoteId;
 
   @override
@@ -107,6 +108,7 @@ class LocalAsset extends BaseAsset {
     DateTime? adjustmentTime,
     double? latitude,
     double? longitude,
+    bool? isEdited,
   }) {
     return LocalAsset(
       id: id ?? this.id,
@@ -125,6 +127,7 @@ class LocalAsset extends BaseAsset {
       adjustmentTime: adjustmentTime ?? this.adjustmentTime,
       latitude: latitude ?? this.latitude,
       longitude: longitude ?? this.longitude,
+      isEdited: isEdited ?? this.isEdited,
     );
   }
 }

mobile/lib/domain/models/asset/remote_asset.model.dart

@@ -28,6 +28,7 @@ class RemoteAsset extends BaseAsset {
     this.visibility = AssetVisibility.timeline,
     super.livePhotoVideoId,
     this.stackId,
+    required super.isEdited,
   }) : localAssetId = localId;
 
   @override
@@ -104,6 +105,7 @@ class RemoteAsset extends BaseAsset {
     AssetVisibility? visibility,
     String? livePhotoVideoId,
     String? stackId,
+    bool? isEdited,
   }) {
     return RemoteAsset(
       id: id ?? this.id,
@@ -122,6 +124,7 @@ class RemoteAsset extends BaseAsset {
       visibility: visibility ?? this.visibility,
       livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
       stackId: stackId ?? this.stackId,
+      isEdited: isEdited ?? this.isEdited,
     );
   }
 }

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

@@ -436,5 +436,6 @@ extension PlatformToLocalAsset on PlatformAsset {
     adjustmentTime: tryFromSecondsSinceEpoch(adjustmentTime, isUtc: true),
     latitude: latitude,
     longitude: longitude,
+    isEdited: false,
   );
 }

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

@@ -77,6 +77,7 @@ extension on AssetResponseDto {
       thumbHash: thumbhash,
       localId: null,
       type: type.toAssetType(),
+      isEdited: isEdited,
     );
   }
 }

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

@@ -247,6 +247,42 @@ class SyncStreamService {
     }
   }
 
+  Future<void> handleWsAssetEditReadyV1Batch(List<dynamic> batchData) async {
+    if (batchData.isEmpty) return;
+
+    _logger.info('Processing batch of ${batchData.length} AssetEditReadyV1 events');
+
+    final List<SyncAssetV1> assets = [];
+
+    try {
+      for (final data in batchData) {
+        if (data is! Map<String, dynamic>) {
+          continue;
+        }
+
+        final payload = data;
+        final assetData = payload['asset'];
+
+        if (assetData == null) {
+          continue;
+        }
+
+        final asset = SyncAssetV1.fromJson(assetData);
+
+        if (asset != null) {
+          assets.add(asset);
+        }
+      }
+
+      if (assets.isNotEmpty) {
+        await _syncStreamRepository.updateAssetsV1(assets, debugLabel: 'websocket-edit');
+        _logger.info('Successfully processed ${assets.length} edited assets');
+      }
+    } catch (error, stackTrace) {
+      _logger.severe("Error processing AssetEditReadyV1 websocket batch events", error, stackTrace);
+    }
+  }
+
   Future<void> _handleRemoteTrashed(Iterable<String> checksums) async {
     if (checksums.isEmpty) {
       return Future.value();

mobile/lib/domain/utils/background_sync.dart

@@ -196,6 +196,16 @@ class BackgroundSyncManager {
     });
   }
 
+  Future<void> syncWebsocketEditBatch(List<dynamic> batchData) {
+    if (_syncWebsocketTask != null) {
+      return _syncWebsocketTask!.future;
+    }
+    _syncWebsocketTask = _handleWsAssetEditReadyV1Batch(batchData);
+    return _syncWebsocketTask!.whenComplete(() {
+      _syncWebsocketTask = null;
+    });
+  }
+
   Future<void> syncLinkedAlbum() {
     if (_linkedAlbumSyncTask != null) {
       return _linkedAlbumSyncTask!.future;
@@ -231,3 +241,8 @@ Cancelable<void> _handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) => ru
   computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetUploadReadyV1Batch(batchData),
   debugLabel: 'websocket-batch',
 );
+
+Cancelable<void> _handleWsAssetEditReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(
+  computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetEditReadyV1Batch(batchData),
+  debugLabel: 'websocket-edit',
+);

mobile/lib/infrastructure/entities/local_asset.entity.dart

@@ -47,5 +47,6 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
     latitude: latitude,
     longitude: longitude,
     cloudId: iCloudId,
+    isEdited: false,
   );
 }

mobile/lib/infrastructure/entities/merged_asset.drift

@@ -25,7 +25,8 @@ SELECT
 	NULL as i_cloud_id,
 	NULL as latitude,
 	NULL as longitude,
-	NULL as adjustmentTime
+	NULL as adjustmentTime,
+	rae.is_edited
 FROM
 	remote_asset_entity rae
 LEFT JOIN
@@ -61,7 +62,8 @@ SELECT
 	lae.i_cloud_id,
 	lae.latitude,
 	lae.longitude,
-	lae.adjustment_time
+	lae.adjustment_time,
+	0 as is_edited
 FROM
 	local_asset_entity lae
 WHERE NOT EXISTS (

mobile/lib/infrastructure/entities/merged_asset.drift.dart

@@ -29,7 +29,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
     );
     $arrayStartIndex += generatedlimit.amountOfVariables;
     return customSelect(
-      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
+      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime, rae.is_edited FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time, 0 AS is_edited FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
       variables: [
         for (var $ in userIds) i0.Variable<String>($),
         ...generatedlimit.introducedVariables,
@@ -66,6 +66,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
         latitude: row.readNullable<double>('latitude'),
         longitude: row.readNullable<double>('longitude'),
         adjustmentTime: row.readNullable<DateTime>('adjustmentTime'),
+        isEdited: row.read<bool>('is_edited'),
       ),
     );
   }
@@ -137,6 +138,7 @@ class MergedAssetResult {
   final double? latitude;
   final double? longitude;
   final DateTime? adjustmentTime;
+  final bool isEdited;
   MergedAssetResult({
     this.remoteId,
     this.localId,
@@ -158,6 +160,7 @@ class MergedAssetResult {
     this.latitude,
     this.longitude,
     this.adjustmentTime,
+    required this.isEdited,
   });
 }
 

mobile/lib/infrastructure/entities/remote_asset.entity.dart

@@ -44,6 +44,8 @@ class RemoteAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin
 
   TextColumn get libraryId => text().nullable()();
 
+  BoolColumn get isEdited => boolean().withDefault(const Constant(false))();
+
   @override
   Set<Column> get primaryKey => {id};
 }
@@ -66,5 +68,6 @@ extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
     livePhotoVideoId: livePhotoVideoId,
     localId: localId,
     stackId: stackId,
+    isEdited: isEdited,
   );
 }

mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart

@@ -31,6 +31,7 @@ typedef $$RemoteAssetEntityTableCreateCompanionBuilder =
       required i2.AssetVisibility visibility,
       i0.Value<String?> stackId,
       i0.Value<String?> libraryId,
+      i0.Value<bool> isEdited,
     });
 typedef $$RemoteAssetEntityTableUpdateCompanionBuilder =
     i1.RemoteAssetEntityCompanion Function({
@@ -52,6 +53,7 @@ typedef $$RemoteAssetEntityTableUpdateCompanionBuilder =
       i0.Value<i2.AssetVisibility> visibility,
       i0.Value<String?> stackId,
       i0.Value<String?> libraryId,
+      i0.Value<bool> isEdited,
     });
 
 final class $$RemoteAssetEntityTableReferences
@@ -196,6 +198,11 @@ class $$RemoteAssetEntityTableFilterComposer
     builder: (column) => i0.ColumnFilters(column),
   );
 
+  i0.ColumnFilters<bool> get isEdited => $composableBuilder(
+    column: $table.isEdited,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
   i5.$$UserEntityTableFilterComposer get ownerId {
     final i5.$$UserEntityTableFilterComposer composer = $composerBuilder(
       composer: this,
@@ -318,6 +325,11 @@ class $$RemoteAssetEntityTableOrderingComposer
     builder: (column) => i0.ColumnOrderings(column),
   );
 
+  i0.ColumnOrderings<bool> get isEdited => $composableBuilder(
+    column: $table.isEdited,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
   i5.$$UserEntityTableOrderingComposer get ownerId {
     final i5.$$UserEntityTableOrderingComposer composer = $composerBuilder(
       composer: this,
@@ -417,6 +429,9 @@ class $$RemoteAssetEntityTableAnnotationComposer
   i0.GeneratedColumn<String> get libraryId =>
       $composableBuilder(column: $table.libraryId, builder: (column) => column);
 
+  i0.GeneratedColumn<bool> get isEdited =>
+      $composableBuilder(column: $table.isEdited, builder: (column) => column);
+
   i5.$$UserEntityTableAnnotationComposer get ownerId {
     final i5.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
       composer: this,
@@ -497,6 +512,7 @@ class $$RemoteAssetEntityTableTableManager
                     const i0.Value.absent(),
                 i0.Value<String?> stackId = const i0.Value.absent(),
                 i0.Value<String?> libraryId = const i0.Value.absent(),
+                i0.Value<bool> isEdited = const i0.Value.absent(),
               }) => i1.RemoteAssetEntityCompanion(
                 name: name,
                 type: type,
@@ -516,6 +532,7 @@ class $$RemoteAssetEntityTableTableManager
                 visibility: visibility,
                 stackId: stackId,
                 libraryId: libraryId,
+                isEdited: isEdited,
               ),
           createCompanionCallback:
               ({
@@ -537,6 +554,7 @@ class $$RemoteAssetEntityTableTableManager
                 required i2.AssetVisibility visibility,
                 i0.Value<String?> stackId = const i0.Value.absent(),
                 i0.Value<String?> libraryId = const i0.Value.absent(),
+                i0.Value<bool> isEdited = const i0.Value.absent(),
               }) => i1.RemoteAssetEntityCompanion.insert(
                 name: name,
                 type: type,
@@ -556,6 +574,7 @@ class $$RemoteAssetEntityTableTableManager
                 visibility: visibility,
                 stackId: stackId,
                 libraryId: libraryId,
+                isEdited: isEdited,
               ),
           withReferenceMapper: (p0) => p0
               .map(
@@ -844,6 +863,21 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
     type: i0.DriftSqlType.string,
     requiredDuringInsert: false,
   );
+  static const i0.VerificationMeta _isEditedMeta = const i0.VerificationMeta(
+    'isEdited',
+  );
+  @override
+  late final i0.GeneratedColumn<bool> isEdited = i0.GeneratedColumn<bool>(
+    'is_edited',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_edited" IN (0, 1))',
+    ),
+    defaultValue: const i4.Constant(false),
+  );
   @override
   List<i0.GeneratedColumn> get $columns => [
     name,
@@ -864,6 +898,7 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
     visibility,
     stackId,
     libraryId,
+    isEdited,
   ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -987,6 +1022,12 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
         libraryId.isAcceptableOrUnknown(data['library_id']!, _libraryIdMeta),
       );
     }
+    if (data.containsKey('is_edited')) {
+      context.handle(
+        _isEditedMeta,
+        isEdited.isAcceptableOrUnknown(data['is_edited']!, _isEditedMeta),
+      );
+    }
     return context;
   }
 
@@ -1075,6 +1116,10 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
         i0.DriftSqlType.string,
         data['${effectivePrefix}library_id'],
       ),
+      isEdited: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.bool,
+        data['${effectivePrefix}is_edited'],
+      )!,
     );
   }
 
@@ -1115,6 +1160,7 @@ class RemoteAssetEntityData extends i0.DataClass
   final i2.AssetVisibility visibility;
   final String? stackId;
   final String? libraryId;
+  final bool isEdited;
   const RemoteAssetEntityData({
     required this.name,
     required this.type,
@@ -1134,6 +1180,7 @@ class RemoteAssetEntityData extends i0.DataClass
     required this.visibility,
     this.stackId,
     this.libraryId,
+    required this.isEdited,
   });
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -1182,6 +1229,7 @@ class RemoteAssetEntityData extends i0.DataClass
     if (!nullToAbsent || libraryId != null) {
       map['library_id'] = i0.Variable<String>(libraryId);
     }
+    map['is_edited'] = i0.Variable<bool>(isEdited);
     return map;
   }
 
@@ -1213,6 +1261,7 @@ class RemoteAssetEntityData extends i0.DataClass
       ),
       stackId: serializer.fromJson<String?>(json['stackId']),
       libraryId: serializer.fromJson<String?>(json['libraryId']),
+      isEdited: serializer.fromJson<bool>(json['isEdited']),
     );
   }
   @override
@@ -1241,6 +1290,7 @@ class RemoteAssetEntityData extends i0.DataClass
       ),
       'stackId': serializer.toJson<String?>(stackId),
       'libraryId': serializer.toJson<String?>(libraryId),
+      'isEdited': serializer.toJson<bool>(isEdited),
     };
   }
 
@@ -1263,6 +1313,7 @@ class RemoteAssetEntityData extends i0.DataClass
     i2.AssetVisibility? visibility,
     i0.Value<String?> stackId = const i0.Value.absent(),
     i0.Value<String?> libraryId = const i0.Value.absent(),
+    bool? isEdited,
   }) => i1.RemoteAssetEntityData(
     name: name ?? this.name,
     type: type ?? this.type,
@@ -1288,6 +1339,7 @@ class RemoteAssetEntityData extends i0.DataClass
     visibility: visibility ?? this.visibility,
     stackId: stackId.present ? stackId.value : this.stackId,
     libraryId: libraryId.present ? libraryId.value : this.libraryId,
+    isEdited: isEdited ?? this.isEdited,
   );
   RemoteAssetEntityData copyWithCompanion(i1.RemoteAssetEntityCompanion data) {
     return RemoteAssetEntityData(
@@ -1319,6 +1371,7 @@ class RemoteAssetEntityData extends i0.DataClass
           : this.visibility,
       stackId: data.stackId.present ? data.stackId.value : this.stackId,
       libraryId: data.libraryId.present ? data.libraryId.value : this.libraryId,
+      isEdited: data.isEdited.present ? data.isEdited.value : this.isEdited,
     );
   }
 
@@ -1342,7 +1395,8 @@ class RemoteAssetEntityData extends i0.DataClass
           ..write('livePhotoVideoId: $livePhotoVideoId, ')
           ..write('visibility: $visibility, ')
           ..write('stackId: $stackId, ')
-          ..write('libraryId: $libraryId')
+          ..write('libraryId: $libraryId, ')
+          ..write('isEdited: $isEdited')
           ..write(')'))
         .toString();
   }
@@ -1367,6 +1421,7 @@ class RemoteAssetEntityData extends i0.DataClass
     visibility,
     stackId,
     libraryId,
+    isEdited,
   );
   @override
   bool operator ==(Object other) =>
@@ -1389,7 +1444,8 @@ class RemoteAssetEntityData extends i0.DataClass
           other.livePhotoVideoId == this.livePhotoVideoId &&
           other.visibility == this.visibility &&
           other.stackId == this.stackId &&
-          other.libraryId == this.libraryId);
+          other.libraryId == this.libraryId &&
+          other.isEdited == this.isEdited);
 }
 
 class RemoteAssetEntityCompanion
@@ -1412,6 +1468,7 @@ class RemoteAssetEntityCompanion
   final i0.Value<i2.AssetVisibility> visibility;
   final i0.Value<String?> stackId;
   final i0.Value<String?> libraryId;
+  final i0.Value<bool> isEdited;
   const RemoteAssetEntityCompanion({
     this.name = const i0.Value.absent(),
     this.type = const i0.Value.absent(),
@@ -1431,6 +1488,7 @@ class RemoteAssetEntityCompanion
     this.visibility = const i0.Value.absent(),
     this.stackId = const i0.Value.absent(),
     this.libraryId = const i0.Value.absent(),
+    this.isEdited = const i0.Value.absent(),
   });
   RemoteAssetEntityCompanion.insert({
     required String name,
@@ -1451,6 +1509,7 @@ class RemoteAssetEntityCompanion
     required i2.AssetVisibility visibility,
     this.stackId = const i0.Value.absent(),
     this.libraryId = const i0.Value.absent(),
+    this.isEdited = const i0.Value.absent(),
   }) : name = i0.Value(name),
        type = i0.Value(type),
        id = i0.Value(id),
@@ -1476,6 +1535,7 @@ class RemoteAssetEntityCompanion
     i0.Expression<int>? visibility,
     i0.Expression<String>? stackId,
     i0.Expression<String>? libraryId,
+    i0.Expression<bool>? isEdited,
   }) {
     return i0.RawValuesInsertable({
       if (name != null) 'name': name,
@@ -1496,6 +1556,7 @@ class RemoteAssetEntityCompanion
       if (visibility != null) 'visibility': visibility,
       if (stackId != null) 'stack_id': stackId,
       if (libraryId != null) 'library_id': libraryId,
+      if (isEdited != null) 'is_edited': isEdited,
     });
   }
 
@@ -1518,6 +1579,7 @@ class RemoteAssetEntityCompanion
     i0.Value<i2.AssetVisibility>? visibility,
     i0.Value<String?>? stackId,
     i0.Value<String?>? libraryId,
+    i0.Value<bool>? isEdited,
   }) {
     return i1.RemoteAssetEntityCompanion(
       name: name ?? this.name,
@@ -1538,6 +1600,7 @@ class RemoteAssetEntityCompanion
       visibility: visibility ?? this.visibility,
       stackId: stackId ?? this.stackId,
       libraryId: libraryId ?? this.libraryId,
+      isEdited: isEdited ?? this.isEdited,
     );
   }
 
@@ -1602,6 +1665,9 @@ class RemoteAssetEntityCompanion
     if (libraryId.present) {
       map['library_id'] = i0.Variable<String>(libraryId.value);
     }
+    if (isEdited.present) {
+      map['is_edited'] = i0.Variable<bool>(isEdited.value);
+    }
     return map;
   }
 
@@ -1625,7 +1691,8 @@ class RemoteAssetEntityCompanion
           ..write('livePhotoVideoId: $livePhotoVideoId, ')
           ..write('visibility: $visibility, ')
           ..write('stackId: $stackId, ')
-          ..write('libraryId: $libraryId')
+          ..write('libraryId: $libraryId, ')
+          ..write('isEdited: $isEdited')
           ..write(')'))
         .toString();
   }

mobile/lib/infrastructure/entities/trashed_local_asset.entity.dart

@@ -45,5 +45,6 @@ extension TrashedLocalAssetEntityDataDomainExtension on TrashedLocalAssetEntityD
     height: height,
     width: width,
     orientation: orientation,
+    isEdited: false,
   );
 }

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

@@ -97,7 +97,7 @@ class Drift extends $Drift implements IDatabaseRepository {
   }
 
   @override
-  int get schemaVersion => 16;
+  int get schemaVersion => 17;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -201,6 +201,9 @@ class Drift extends $Drift implements IDatabaseRepository {
             await m.createIndex(v16.idxLocalAssetCloudId);
             await m.createTable(v16.remoteAssetCloudIdEntity);
           },
+          from16To17: (m, v17) async {
+            await m.addColumn(v17.remoteAssetEntity, v17.remoteAssetEntity.isEdited);
+          },
         ),
       );
 

mobile/lib/infrastructure/repositories/db.repository.steps.dart

@@ -6911,6 +6911,503 @@ i1.GeneratedColumn<DateTime> _column_100(String aliasedName) =>
       true,
       type: i1.DriftSqlType.dateTime,
     );
+
+final class Schema17 extends i0.VersionedSchema {
+  Schema17({required super.database}) : super(version: 17);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAssetChecksum,
+    idxLocalAssetCloudId,
+    idxRemoteAssetOwnerChecksum,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    remoteAssetCloudIdEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    trashedLocalAssetEntity,
+    idxLatLng,
+    idxTrashedLocalAssetChecksum,
+    idxTrashedLocalAssetAlbum,
+  ];
+  late final Shape20 userEntity = Shape20(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_84,
+        _column_85,
+        _column_91,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape28 remoteAssetEntity = Shape28(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_13,
+        _column_14,
+        _column_15,
+        _column_16,
+        _column_17,
+        _column_18,
+        _column_19,
+        _column_20,
+        _column_21,
+        _column_86,
+        _column_101,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape3 stackEntity = Shape3(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape26 localAssetEntity = Shape26(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_22,
+        _column_14,
+        _column_23,
+        _column_98,
+        _column_96,
+        _column_46,
+        _column_47,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape9 remoteAlbumEntity = Shape9(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_56,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_57,
+        _column_58,
+        _column_59,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape19 localAlbumEntity = Shape19(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_5,
+        _column_31,
+        _column_32,
+        _column_90,
+        _column_33,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape22 localAlbumAssetEntity = Shape22(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_34, _column_35, _column_33],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLocalAssetChecksum = i1.Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  final i1.Index idxLocalAssetCloudId = i1.Index(
+    'idx_local_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
+  );
+  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
+    'idx_remote_asset_owner_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+  );
+  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  final i1.Index idxRemoteAssetChecksum = i1.Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  late final Shape21 authUserEntity = Shape21(
+    source: i0.VersionedTable(
+      entityName: 'auth_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_2,
+        _column_84,
+        _column_85,
+        _column_92,
+        _column_93,
+        _column_7,
+        _column_94,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape4 userMetadataEntity = Shape4(
+    source: i0.VersionedTable(
+      entityName: 'user_metadata_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
+      columns: [_column_25, _column_26, _column_27],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape5 partnerEntity = Shape5(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_28, _column_29, _column_30],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape8 remoteExifEntity = Shape8(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_36,
+        _column_37,
+        _column_38,
+        _column_39,
+        _column_40,
+        _column_41,
+        _column_11,
+        _column_10,
+        _column_42,
+        _column_43,
+        _column_44,
+        _column_45,
+        _column_46,
+        _column_47,
+        _column_48,
+        _column_49,
+        _column_50,
+        _column_51,
+        _column_52,
+        _column_53,
+        _column_54,
+        _column_55,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_36, _column_60],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape10 remoteAlbumUserEntity = Shape10(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
+      columns: [_column_60, _column_25, _column_61],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape27 remoteAssetCloudIdEntity = Shape27(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_cloud_id_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_36,
+        _column_99,
+        _column_100,
+        _column_96,
+        _column_46,
+        _column_47,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape11 memoryEntity = Shape11(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_18,
+        _column_15,
+        _column_8,
+        _column_62,
+        _column_63,
+        _column_64,
+        _column_65,
+        _column_66,
+        _column_67,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape12 memoryAssetEntity = Shape12(
+    source: i0.VersionedTable(
+      entityName: 'memory_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
+      columns: [_column_36, _column_68],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape14 personEntity = Shape14(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_1,
+        _column_69,
+        _column_71,
+        _column_72,
+        _column_73,
+        _column_74,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape15 assetFaceEntity = Shape15(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_36,
+        _column_76,
+        _column_77,
+        _column_78,
+        _column_79,
+        _column_80,
+        _column_81,
+        _column_82,
+        _column_83,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape18 storeEntity = Shape18(
+    source: i0.VersionedTable(
+      entityName: 'store_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_87, _column_88, _column_89],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape25 trashedLocalAssetEntity = Shape25(
+    source: i0.VersionedTable(
+      entityName: 'trashed_local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id, album_id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_95,
+        _column_22,
+        _column_14,
+        _column_23,
+        _column_97,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLatLng = i1.Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
+    'idx_trashed_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
+  );
+  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
+    'idx_trashed_local_asset_album',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
+  );
+}
+
+class Shape28 extends i0.VersionedTable {
+  Shape28({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get type =>
+      columnsByName['type']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<DateTime> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get updatedAt =>
+      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<int> get width =>
+      columnsByName['width']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get height =>
+      columnsByName['height']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get durationInSeconds =>
+      columnsByName['duration_in_seconds']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get checksum =>
+      columnsByName['checksum']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isFavorite =>
+      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get ownerId =>
+      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get localDateTime =>
+      columnsByName['local_date_time']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<String> get thumbHash =>
+      columnsByName['thumb_hash']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get deletedAt =>
+      columnsByName['deleted_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<String> get livePhotoVideoId =>
+      columnsByName['live_photo_video_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get visibility =>
+      columnsByName['visibility']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get stackId =>
+      columnsByName['stack_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get libraryId =>
+      columnsByName['library_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isEdited =>
+      columnsByName['is_edited']! as i1.GeneratedColumn<bool>;
+}
+
+i1.GeneratedColumn<bool> _column_101(String aliasedName) =>
+    i1.GeneratedColumn<bool>(
+      'is_edited',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.bool,
+      defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+        'CHECK ("is_edited" IN (0, 1))',
+      ),
+      defaultValue: const CustomExpression('0'),
+    );
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -6927,6 +7424,7 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
   required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
   required Future<void> Function(i1.Migrator m, Schema16 schema) from15To16,
+  required Future<void> Function(i1.Migrator m, Schema17 schema) from16To17,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -7005,6 +7503,11 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from15To16(migrator, schema);
         return 16;
+      case 16:
+        final schema = Schema17(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from16To17(migrator, schema);
+        return 17;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -7027,6 +7530,7 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
   required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
   required Future<void> Function(i1.Migrator m, Schema16 schema) from15To16,
+  required Future<void> Function(i1.Migrator m, Schema17 schema) from16To17,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -7044,5 +7548,6 @@ i1.OnUpgrade stepByStep({
     from13To14: from13To14,
     from14To15: from14To15,
     from15To16: from15To16,
+    from16To17: from16To17,
   ),
 );

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

@@ -200,6 +200,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             libraryId: Value(asset.libraryId),
             width: Value(asset.width),
             height: Value(asset.height),
+            isEdited: Value(asset.isEdited),
           );
 
           batch.insert(

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

@@ -70,6 +70,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                   durationInSeconds: row.durationInSeconds,
                   livePhotoVideoId: row.livePhotoVideoId,
                   stackId: row.stackId,
+                  isEdited: row.isEdited,
                 )
               : LocalAsset(
                   id: row.localId!,
@@ -88,6 +89,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                   latitude: row.latitude,
                   longitude: row.longitude,
                   adjustmentTime: row.adjustmentTime,
+                  isEdited: row.isEdited,
                 ),
         )
         .get();

mobile/lib/presentation/pages/drift_asset_troubleshoot.page.dart

@@ -118,6 +118,7 @@ class _AssetPropertiesSectionState extends ConsumerState<_AssetPropertiesSection
       ),
       _PropertyItem(label: 'Is Favorite', value: asset.isFavorite.toString()),
       _PropertyItem(label: 'Live Photo Video ID', value: asset.livePhotoVideoId),
+      _PropertyItem(label: 'Is Edited', value: asset.isEdited.toString()),
     ]);
   }
 

mobile/lib/presentation/pages/drift_place.page.dart

@@ -167,7 +167,7 @@ class _PlaceTile extends StatelessWidget {
         child: SizedBox(
           width: 80,
           height: 80,
-          child: Thumbnail.remote(remoteId: place.$2, fit: BoxFit.cover),
+          child: Thumbnail.remote(remoteId: place.$2, fit: BoxFit.cover, thumbhash: ""),
         ),
       ),
     );

mobile/lib/presentation/widgets/album/album_selector.widget.dart

@@ -14,14 +14,15 @@ import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/album/new_album_name_modal.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/album_filter.utils.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -344,8 +345,8 @@ class _SortButtonState extends ConsumerState<_SortButton> {
               Padding(
                 padding: const EdgeInsets.only(right: 5),
                 child: albumSortIsReverse
-                    ? const Icon(Icons.keyboard_arrow_down)
-                    : const Icon(Icons.keyboard_arrow_up_rounded),
+                    ? Icon(Icons.keyboard_arrow_down, color: context.colorScheme.onSurface)
+                    : Icon(Icons.keyboard_arrow_up_rounded, color: context.colorScheme.onSurface),
               ),
               Text(
                 albumSortOption.label.t(context: context),
@@ -542,7 +543,11 @@ class _QuickSortAndViewMode extends StatelessWidget {
               initialIsReverse: currentIsReverse,
             ),
             IconButton(
-              icon: Icon(isGrid ? Icons.view_list_outlined : Icons.grid_view_outlined, size: 24),
+              icon: Icon(
+                isGrid ? Icons.view_list_outlined : Icons.grid_view_outlined,
+                size: 24,
+                color: context.colorScheme.onSurface,
+              ),
               onPressed: onToggleViewMode,
             ),
           ],
@@ -662,6 +667,8 @@ class _GridAlbumCard extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final albumThumbnailAsset = ref.read(assetServiceProvider).getRemoteAsset(album.thumbnailAssetId ?? "");
+
     return GestureDetector(
       onTap: () => onAlbumSelected(album),
       child: Card(
@@ -680,12 +687,22 @@ class _GridAlbumCard extends ConsumerWidget {
                 borderRadius: const BorderRadius.vertical(top: Radius.circular(15)),
                 child: SizedBox(
                   width: double.infinity,
-                  child: album.thumbnailAssetId != null
-                      ? Thumbnail.remote(remoteId: album.thumbnailAssetId!)
-                      : Container(
-                          color: context.colorScheme.surfaceContainerHighest,
-                          child: const Icon(Icons.photo_album_rounded, size: 40, color: Colors.grey),
-                        ),
+                  child: FutureBuilder(
+                    future: albumThumbnailAsset,
+                    builder: (context, snapshot) {
+                      if (snapshot.hasData && snapshot.data != null) {
+                        return Thumbnail.remote(
+                          remoteId: album.thumbnailAssetId!,
+                          thumbhash: snapshot.data!.thumbHash ?? "",
+                        );
+                      }
+
+                      return Container(
+                        color: context.colorScheme.surfaceContainerHighest,
+                        child: const Icon(Icons.photo_album_rounded, size: 40, color: Colors.grey),
+                      );
+                    },
+                  ),
                 ),
               ),
             ),

mobile/lib/presentation/widgets/album/album_tile.dart

@@ -1,12 +1,14 @@
 import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/pages/common/large_leading_tile.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 
-class AlbumTile extends StatelessWidget {
+class AlbumTile extends ConsumerWidget {
   const AlbumTile({super.key, required this.album, required this.isOwner, this.onAlbumSelected});
 
   final RemoteAlbum album;
@@ -14,7 +16,9 @@ class AlbumTile extends StatelessWidget {
   final Function(RemoteAlbum)? onAlbumSelected;
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final albumThumbnailAsset = ref.read(assetServiceProvider).getRemoteAsset(album.thumbnailAssetId ?? "");
+
     return LargeLeadingTile(
       title: Text(
         album.name,
@@ -29,23 +33,35 @@ class AlbumTile extends StatelessWidget {
       ),
       onTap: () => onAlbumSelected?.call(album),
       leadingPadding: const EdgeInsets.only(right: 16),
-      leading: album.thumbnailAssetId != null
-          ? ClipRRect(
-              borderRadius: const BorderRadius.all(Radius.circular(15)),
-              child: SizedBox(width: 80, height: 80, child: Thumbnail.remote(remoteId: album.thumbnailAssetId!)),
-            )
-          : SizedBox(
-              width: 80,
-              height: 80,
-              child: Container(
-                decoration: BoxDecoration(
-                  color: context.colorScheme.surfaceContainer,
-                  borderRadius: const BorderRadius.all(Radius.circular(16)),
-                  border: Border.all(color: context.colorScheme.outline.withAlpha(50), width: 1),
-                ),
-                child: const Icon(Icons.photo_album_rounded, size: 24, color: Colors.grey),
-              ),
-            ),
+      leading: FutureBuilder(
+        future: albumThumbnailAsset,
+        builder: (context, snapshot) {
+          return snapshot.hasData && snapshot.data != null
+              ? ClipRRect(
+                  borderRadius: const BorderRadius.all(Radius.circular(15)),
+                  child: SizedBox(
+                    width: 80,
+                    height: 80,
+                    child: Thumbnail.remote(
+                      remoteId: album.thumbnailAssetId!,
+                      thumbhash: snapshot.data!.thumbHash ?? "",
+                    ),
+                  ),
+                )
+              : SizedBox(
+                  width: 80,
+                  height: 80,
+                  child: Container(
+                    decoration: BoxDecoration(
+                      color: context.colorScheme.surfaceContainer,
+                      borderRadius: const BorderRadius.all(Radius.circular(16)),
+                      border: Border.all(color: context.colorScheme.outline.withAlpha(50), width: 1),
+                    ),
+                    child: const Icon(Icons.photo_album_rounded, size: 24, color: Colors.grey),
+                  ),
+                );
+        },
+      ),
     );
   }
 }

mobile/lib/presentation/widgets/images/image_provider.dart

@@ -112,14 +112,17 @@ ImageProvider getFullImageProvider(BaseAsset asset, {Size size = const Size(1080
     provider = LocalFullImageProvider(id: id, size: size, assetType: asset.type);
   } else {
     final String assetId;
+    final String thumbhash;
     if (asset is LocalAsset && asset.hasRemote) {
       assetId = asset.remoteId!;
+      thumbhash = "";
     } else if (asset is RemoteAsset) {
       assetId = asset.id;
+      thumbhash = asset.thumbHash ?? "";
     } else {
       throw ArgumentError("Unsupported asset type: ${asset.runtimeType}");
     }
-    provider = RemoteFullImageProvider(assetId: assetId);
+    provider = RemoteFullImageProvider(assetId: assetId, thumbhash: thumbhash);
   }
 
   return provider;
@@ -132,8 +135,9 @@ ImageProvider? getThumbnailImageProvider(BaseAsset asset, {Size size = kThumbnai
   }
 
   final assetId = asset is RemoteAsset ? asset.id : (asset as LocalAsset).remoteId;
-  return assetId != null ? RemoteThumbProvider(assetId: assetId) : null;
+  final thumbhash = asset is RemoteAsset ? asset.thumbHash ?? "" : "";
+  return assetId != null ? RemoteThumbProvider(assetId: assetId, thumbhash: thumbhash) : null;
 }
 
 bool _shouldUseLocalAsset(BaseAsset asset) =>
-    asset.hasLocal && (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage));
+    asset.hasLocal && (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage)) && !asset.isEdited;

mobile/lib/presentation/widgets/images/remote_image_provider.dart

@@ -16,8 +16,9 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
     with CancellableImageProviderMixin<RemoteThumbProvider> {
   static final cacheManager = RemoteThumbnailCacheManager();
   final String assetId;
+  final String thumbhash;
 
-  RemoteThumbProvider({required this.assetId});
+  RemoteThumbProvider({required this.assetId, required this.thumbhash});
 
   @override
   Future<RemoteThumbProvider> obtainKey(ImageConfiguration configuration) {
@@ -38,7 +39,7 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
 
   Stream<ImageInfo> _codec(RemoteThumbProvider key, ImageDecoderCallback decode) {
     final request = this.request = RemoteImageRequest(
-      uri: getThumbnailUrlForRemoteId(key.assetId),
+      uri: getThumbnailUrlForRemoteId(key.assetId, thumbhash: key.thumbhash),
       headers: ApiService.getRequestHeaders(),
       cacheManager: cacheManager,
     );
@@ -49,22 +50,23 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is RemoteThumbProvider) {
-      return assetId == other.assetId;
+      return assetId == other.assetId && thumbhash == other.thumbhash;
     }
 
     return false;
   }
 
   @override
-  int get hashCode => assetId.hashCode;
+  int get hashCode => assetId.hashCode ^ thumbhash.hashCode;
 }
 
 class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImageProvider>
     with CancellableImageProviderMixin<RemoteFullImageProvider> {
   static final cacheManager = RemoteThumbnailCacheManager();
   final String assetId;
+  final String thumbhash;
 
-  RemoteFullImageProvider({required this.assetId});
+  RemoteFullImageProvider({required this.assetId, required this.thumbhash});
 
   @override
   Future<RemoteFullImageProvider> obtainKey(ImageConfiguration configuration) {
@@ -75,7 +77,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
   ImageStreamCompleter loadImage(RemoteFullImageProvider key, ImageDecoderCallback decode) {
     return OneFramePlaceholderImageStreamCompleter(
       _codec(key, decode),
-      initialImage: getInitialImage(RemoteThumbProvider(assetId: key.assetId)),
+      initialImage: getInitialImage(RemoteThumbProvider(assetId: key.assetId, thumbhash: key.thumbhash)),
       informationCollector: () => <DiagnosticsNode>[
         DiagnosticsProperty<ImageProvider>('Image provider', this),
         DiagnosticsProperty<String>('Asset Id', key.assetId),
@@ -94,7 +96,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
 
     final headers = ApiService.getRequestHeaders();
     final request = this.request = RemoteImageRequest(
-      uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview),
+      uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview, thumbhash: key.thumbhash),
       headers: headers,
       cacheManager: cacheManager,
     );
@@ -115,12 +117,12 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is RemoteFullImageProvider) {
-      return assetId == other.assetId;
+      return assetId == other.assetId && thumbhash == other.thumbhash;
     }
 
     return false;
   }
 
   @override
-  int get hashCode => assetId.hashCode;
+  int get hashCode => assetId.hashCode ^ thumbhash.hashCode;
 }

mobile/lib/presentation/widgets/images/thumbnail.widget.dart

@@ -21,9 +21,14 @@ class Thumbnail extends StatefulWidget {
 
   const Thumbnail({this.imageProvider, this.fit = BoxFit.cover, this.thumbhashProvider, super.key});
 
-  Thumbnail.remote({required String remoteId, this.fit = BoxFit.cover, Size size = kThumbnailResolution, super.key})
-    : imageProvider = RemoteThumbProvider(assetId: remoteId),
-      thumbhashProvider = null;
+  Thumbnail.remote({
+    required String remoteId,
+    required String thumbhash,
+    this.fit = BoxFit.cover,
+    Size size = kThumbnailResolution,
+    super.key,
+  }) : imageProvider = RemoteThumbProvider(assetId: remoteId, thumbhash: thumbhash),
+       thumbhashProvider = null;
 
   Thumbnail.fromAsset({
     required BaseAsset? asset,

mobile/lib/presentation/widgets/memory/memory_lane.widget.dart

@@ -60,7 +60,11 @@ class DriftMemoryCard extends ConsumerWidget {
             child: SizedBox(
               width: 205,
               height: 200,
-              child: Thumbnail.remote(remoteId: memory.assets[0].id, fit: BoxFit.cover),
+              child: Thumbnail.remote(
+                remoteId: memory.assets[0].id,
+                thumbhash: memory.assets[0].thumbHash ?? "",
+                fit: BoxFit.cover,
+              ),
             ),
           ),
           Positioned(

mobile/lib/providers/cast.provider.dart

@@ -69,6 +69,7 @@ class CastNotifier extends StateNotifier<CastManagerState> {
           : AssetType.other,
       createdAt: asset.fileCreatedAt,
       updatedAt: asset.updatedAt,
+      isEdited: false,
     );
 
     _gCastService.loadMedia(remoteAsset, reload);

mobile/lib/providers/websocket.provider.dart

@@ -144,6 +144,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
           socket.on('on_asset_hidden', _handleOnAssetHidden);
         } else {
           socket.on('AssetUploadReadyV1', _handleSyncAssetUploadReady);
+          socket.on('AssetEditReadyV1', _handleSyncAssetEditReady);
         }
 
         socket.on('on_config_update', _handleOnConfigUpdate);
@@ -192,10 +193,12 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
 
   void stopListeningToBetaEvents() {
     state.socket?.off('AssetUploadReadyV1');
+    state.socket?.off('AssetEditReadyV1');
   }
 
   void startListeningToBetaEvents() {
     state.socket?.on('AssetUploadReadyV1', _handleSyncAssetUploadReady);
+    state.socket?.on('AssetEditReadyV1', _handleSyncAssetEditReady);
   }
 
   void listenUploadEvent() {
@@ -315,6 +318,10 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     _batchDebouncer.run(_processBatchedAssetUploadReady);
   }
 
+  void _handleSyncAssetEditReady(dynamic data) {
+    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditBatch([data]));
+  }
+
   void _processBatchedAssetUploadReady() {
     if (_batchedAssetUploadReady.isEmpty) {
       return;

mobile/lib/repositories/file_media.repository.dart

@@ -25,6 +25,7 @@ class FileMediaRepository {
       type: AssetType.image,
       createdAt: entity.createDateTime,
       updatedAt: entity.modifiedDateTime,
+      isEdited: false,
     );
   }
 

mobile/lib/utils/action_button.utils.dart

@@ -149,6 +149,7 @@ enum ActionButtonType {
       ActionButtonType.openInfo => true,
       ActionButtonType.viewInTimeline =>
         context.timelineOrigin != TimelineOrigin.main &&
+            context.timelineOrigin != TimelineOrigin.deepLink &&
             context.timelineOrigin != TimelineOrigin.trash &&
             context.timelineOrigin != TimelineOrigin.lockedFolder &&
             context.timelineOrigin != TimelineOrigin.archive &&

mobile/lib/utils/image_url_builder.dart

@@ -50,8 +50,10 @@ String getThumbnailUrlForRemoteId(
   final String id, {
   AssetMediaSize type = AssetMediaSize.thumbnail,
   bool edited = true,
+  String? thumbhash,
 }) {
-  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.value}&edited=$edited';
+  final url = '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.value}&edited=$edited';
+  return thumbhash != null ? '$url&c=${Uri.encodeComponent(thumbhash)}' : url;
 }
 
 String getPlaybackUrlForRemoteId(final String id) {

mobile/lib/utils/openapi_patching.dart

@@ -49,7 +49,7 @@ dynamic upgradeDto(dynamic value, String targetType) {
       }
     case 'SyncAssetV1':
       if (value is Map) {
-        addDefault(value, 'editCount', 0);
+        addDefault(value, 'isEdited', false);
       }
     case 'ServerFeaturesDto':
       if (value is Map) {

mobile/openapi/lib/model/sync_asset_v1.dart

@@ -16,11 +16,11 @@ class SyncAssetV1 {
     required this.checksum,
     required this.deletedAt,
     required this.duration,
-    required this.editCount,
     required this.fileCreatedAt,
     required this.fileModifiedAt,
     required this.height,
     required this.id,
+    required this.isEdited,
     required this.isFavorite,
     required this.libraryId,
     required this.livePhotoVideoId,
@@ -40,8 +40,6 @@ class SyncAssetV1 {
 
   String? duration;
 
-  int editCount;
-
   DateTime? fileCreatedAt;
 
   DateTime? fileModifiedAt;
@@ -50,6 +48,8 @@ class SyncAssetV1 {
 
   String id;
 
+  bool isEdited;
+
   bool isFavorite;
 
   String? libraryId;
@@ -77,11 +77,11 @@ class SyncAssetV1 {
     other.checksum == checksum &&
     other.deletedAt == deletedAt &&
     other.duration == duration &&
-    other.editCount == editCount &&
     other.fileCreatedAt == fileCreatedAt &&
     other.fileModifiedAt == fileModifiedAt &&
     other.height == height &&
     other.id == id &&
+    other.isEdited == isEdited &&
     other.isFavorite == isFavorite &&
     other.libraryId == libraryId &&
     other.livePhotoVideoId == livePhotoVideoId &&
@@ -100,11 +100,11 @@ class SyncAssetV1 {
     (checksum.hashCode) +
     (deletedAt == null ? 0 : deletedAt!.hashCode) +
     (duration == null ? 0 : duration!.hashCode) +
-    (editCount.hashCode) +
     (fileCreatedAt == null ? 0 : fileCreatedAt!.hashCode) +
     (fileModifiedAt == null ? 0 : fileModifiedAt!.hashCode) +
     (height == null ? 0 : height!.hashCode) +
     (id.hashCode) +
+    (isEdited.hashCode) +
     (isFavorite.hashCode) +
     (libraryId == null ? 0 : libraryId!.hashCode) +
     (livePhotoVideoId == null ? 0 : livePhotoVideoId!.hashCode) +
@@ -118,7 +118,7 @@ class SyncAssetV1 {
     (width == null ? 0 : width!.hashCode);
 
   @override
-  String toString() => 'SyncAssetV1[checksum=$checksum, deletedAt=$deletedAt, duration=$duration, editCount=$editCount, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, height=$height, id=$id, isFavorite=$isFavorite, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, ownerId=$ownerId, stackId=$stackId, thumbhash=$thumbhash, type=$type, visibility=$visibility, width=$width]';
+  String toString() => 'SyncAssetV1[checksum=$checksum, deletedAt=$deletedAt, duration=$duration, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, height=$height, id=$id, isEdited=$isEdited, isFavorite=$isFavorite, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, ownerId=$ownerId, stackId=$stackId, thumbhash=$thumbhash, type=$type, visibility=$visibility, width=$width]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -133,7 +133,6 @@ class SyncAssetV1 {
     } else {
     //  json[r'duration'] = null;
     }
-      json[r'editCount'] = this.editCount;
     if (this.fileCreatedAt != null) {
       json[r'fileCreatedAt'] = this.fileCreatedAt!.toUtc().toIso8601String();
     } else {
@@ -150,6 +149,7 @@ class SyncAssetV1 {
     //  json[r'height'] = null;
     }
       json[r'id'] = this.id;
+      json[r'isEdited'] = this.isEdited;
       json[r'isFavorite'] = this.isFavorite;
     if (this.libraryId != null) {
       json[r'libraryId'] = this.libraryId;
@@ -200,11 +200,11 @@ class SyncAssetV1 {
         checksum: mapValueOfType<String>(json, r'checksum')!,
         deletedAt: mapDateTime(json, r'deletedAt', r''),
         duration: mapValueOfType<String>(json, r'duration'),
-        editCount: mapValueOfType<int>(json, r'editCount')!,
         fileCreatedAt: mapDateTime(json, r'fileCreatedAt', r''),
         fileModifiedAt: mapDateTime(json, r'fileModifiedAt', r''),
         height: mapValueOfType<int>(json, r'height'),
         id: mapValueOfType<String>(json, r'id')!,
+        isEdited: mapValueOfType<bool>(json, r'isEdited')!,
         isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
         libraryId: mapValueOfType<String>(json, r'libraryId'),
         livePhotoVideoId: mapValueOfType<String>(json, r'livePhotoVideoId'),
@@ -266,11 +266,11 @@ class SyncAssetV1 {
     'checksum',
     'deletedAt',
     'duration',
-    'editCount',
     'fileCreatedAt',
     'fileModifiedAt',
     'height',
     'id',
+    'isEdited',
     'isFavorite',
     'libraryId',
     'livePhotoVideoId',

mobile/test/domain/repositories/sync_stream_repository_test.dart

@@ -44,7 +44,7 @@ SyncAssetV1 _createAsset({
     livePhotoVideoId: null,
     stackId: null,
     thumbhash: null,
-    editCount: 0,
+    isEdited: false,
   );
 }
 

mobile/test/drift/main/generated/schema.dart

@@ -19,6 +19,7 @@ import 'schema_v13.dart' as v13;
 import 'schema_v14.dart' as v14;
 import 'schema_v15.dart' as v15;
 import 'schema_v16.dart' as v16;
+import 'schema_v17.dart' as v17;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -56,6 +57,8 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v15.DatabaseAtV15(db);
       case 16:
         return v16.DatabaseAtV16(db);
+      case 17:
+        return v17.DatabaseAtV17(db);
       default:
         throw MissingSchemaException(version, versions);
     }
@@ -78,5 +81,6 @@ class GeneratedHelper implements SchemaInstantiationHelper {
     14,
     15,
     16,
+    17,
   ];
 }

mobile/test/fixtures/asset.stub.dart

@@ -64,6 +64,7 @@ abstract final class LocalAssetStub {
     type: AssetType.image,
     createdAt: DateTime(2025),
     updatedAt: DateTime(2025, 2),
+    isEdited: false,
   );
 
   static final image2 = LocalAsset(
@@ -72,5 +73,6 @@ abstract final class LocalAssetStub {
     type: AssetType.image,
     createdAt: DateTime(2000),
     updatedAt: DateTime(20021),
+    isEdited: false,
   );
 }

mobile/test/fixtures/sync_stream.stub.dart

@@ -128,7 +128,7 @@ abstract final class SyncStreamStub {
         visibility: AssetVisibility.timeline,
         width: null,
         height: null,
-        editCount: 0,
+        isEdited: false,
       ),
       ack: ack,
     );

mobile/test/services/background_upload.service_test.dart

@@ -194,6 +194,7 @@ void main() {
         latitude: 37.7749,
         longitude: -122.4194,
         adjustmentTime: DateTime(2026, 1, 2),
+        isEdited: false,
       );
 
       final mockEntity = MockAssetEntity();
@@ -242,6 +243,7 @@ void main() {
         cloudId: 'cloud-id-123',
         latitude: 37.7749,
         longitude: -122.4194,
+        isEdited: false,
       );
 
       final mockEntity = MockAssetEntity();
@@ -279,6 +281,7 @@ void main() {
         createdAt: DateTime(2025, 1, 1),
         updatedAt: DateTime(2025, 1, 2),
         cloudId: null, // No cloudId
+        isEdited: false,
       );
 
       final mockEntity = MockAssetEntity();
@@ -320,6 +323,7 @@ void main() {
         cloudId: 'cloud-id-livephoto',
         latitude: 37.7749,
         longitude: -122.4194,
+        isEdited: false,
       );
 
       final mockEntity = MockAssetEntity();

mobile/test/test_utils.dart

@@ -131,6 +131,7 @@ abstract final class TestUtils {
       isFavorite: false,
       width: width,
       height: height,
+      isEdited: false,
     );
   }
 
@@ -154,6 +155,7 @@ abstract final class TestUtils {
       width: width,
       height: height,
       orientation: orientation,
+      isEdited: false,
     );
   }
 }

mobile/test/test_utils/medium_factory.dart

@@ -27,6 +27,7 @@ class MediumFactory {
       type: type ?? AssetType.image,
       createdAt: createdAt ?? DateTime.fromMillisecondsSinceEpoch(random.nextInt(1000000000)),
       updatedAt: updatedAt ?? DateTime.fromMillisecondsSinceEpoch(random.nextInt(1000000000)),
+      isEdited: false,
     );
   }
 

mobile/test/utils/action_button_utils_test.dart

@@ -23,6 +23,7 @@ LocalAsset createLocalAsset({
     createdAt: createdAt ?? DateTime.now(),
     updatedAt: updatedAt ?? DateTime.now(),
     isFavorite: isFavorite,
+    isEdited: false,
   );
 }
 
@@ -45,6 +46,7 @@ RemoteAsset createRemoteAsset({
     createdAt: createdAt ?? DateTime.now(),
     updatedAt: updatedAt ?? DateTime.now(),
     isFavorite: isFavorite,
+    isEdited: false,
   );
 }
 

open-api/immich-openapi-specs.json

@@ -21291,9 +21291,6 @@
             "nullable": true,
             "type": "string"
           },
-          "editCount": {
-            "type": "integer"
-          },
           "fileCreatedAt": {
             "format": "date-time",
             "nullable": true,
@@ -21311,6 +21308,9 @@
           "id": {
             "type": "string"
           },
+          "isEdited": {
+            "type": "boolean"
+          },
           "isFavorite": {
             "type": "boolean"
           },
@@ -21364,11 +21364,11 @@
           "checksum",
           "deletedAt",
           "duration",
-          "editCount",
           "fileCreatedAt",
           "fileModifiedAt",
           "height",
           "id",
+          "isEdited",
           "isFavorite",
           "libraryId",
           "livePhotoVideoId",

server/src/database.ts

@@ -395,7 +395,7 @@ export const columns = {
     'asset.libraryId',
     'asset.width',
     'asset.height',
-    'asset.editCount',
+    'asset.isEdited',
   ],
   syncAlbumUser: ['album_user.albumId as albumId', 'album_user.userId as userId', 'album_user.role'],
   syncStack: ['stack.id', 'stack.createdAt', 'stack.updatedAt', 'stack.primaryAssetId', 'stack.ownerId'],

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

@@ -139,7 +139,7 @@ export type MapAsset = {
   type: AssetType;
   width: number | null;
   height: number | null;
-  editCount: number;
+  isEdited: boolean;
 };
 
 export class AssetStackResponseDto {
@@ -248,6 +248,6 @@ export function mapAsset(entity: MapAsset, options: AssetMapOptions = {}): Asset
     resized: true,
     width: entity.width,
     height: entity.height,
-    isEdited: entity.editCount > 0,
+    isEdited: entity.isEdited,
   };
 }

server/src/dtos/sync.dto.ts

@@ -121,8 +121,8 @@ export class SyncAssetV1 {
   width!: number | null;
   @ApiProperty({ type: 'integer' })
   height!: number | null;
-  @ApiProperty({ type: 'integer' })
-  editCount!: number;
+  @ApiProperty({ type: 'boolean' })
+  isEdited!: boolean;
 }
 
 @ExtraModel()

server/src/queries/sync.repository.sql

@@ -71,7 +71,7 @@ select
   "asset"."libraryId",
   "asset"."width",
   "asset"."height",
-  "asset"."editCount",
+  "asset"."isEdited",
   "album_asset"."updateId"
 from
   "album_asset" as "album_asset"
@@ -104,7 +104,7 @@ select
   "asset"."libraryId",
   "asset"."width",
   "asset"."height",
-  "asset"."editCount",
+  "asset"."isEdited",
   "asset"."updateId"
 from
   "asset" as "asset"
@@ -143,7 +143,7 @@ select
   "asset"."libraryId",
   "asset"."width",
   "asset"."height",
-  "asset"."editCount"
+  "asset"."isEdited"
 from
   "album_asset" as "album_asset"
   inner join "asset" on "asset"."id" = "album_asset"."assetId"
@@ -459,7 +459,7 @@ select
   "asset"."libraryId",
   "asset"."width",
   "asset"."height",
-  "asset"."editCount",
+  "asset"."isEdited",
   "asset"."updateId"
 from
   "asset" as "asset"
@@ -755,7 +755,7 @@ select
   "asset"."libraryId",
   "asset"."width",
   "asset"."height",
-  "asset"."editCount",
+  "asset"."isEdited",
   "asset"."updateId"
 from
   "asset" as "asset"
@@ -807,7 +807,7 @@ select
   "asset"."libraryId",
   "asset"."width",
   "asset"."height",
-  "asset"."editCount",
+  "asset"."isEdited",
   "asset"."updateId"
 from
   "asset" as "asset"

server/src/repositories/websocket.repository.ts

@@ -37,7 +37,7 @@ export interface ClientEventMap {
 
   AssetUploadReadyV1: [{ asset: SyncAssetV1; exif: SyncAssetExifV1 }];
   AppRestartV1: [AppRestartEvent];
-  AssetEditReadyV1: [{ assetId: string }];
+  AssetEditReadyV1: [{ asset: SyncAssetV1 }];
 }
 
 export type AuthFn = (client: Socket) => Promise<AuthDto>;

server/src/schema/functions.ts

@@ -263,8 +263,9 @@ export const asset_edit_insert = registerFunction({
   body: `
     BEGIN
       UPDATE asset
-      SET "editCount" = "editCount" + 1
-      WHERE "id" = NEW."assetId";
+      SET "isEdited" = true
+      FROM inserted_edit
+      WHERE asset.id = inserted_edit."assetId" AND NOT asset."isEdited";
       RETURN NULL;
     END
   `,
@@ -277,8 +278,10 @@ export const asset_edit_delete = registerFunction({
   body: `
     BEGIN
       UPDATE asset
-      SET "editCount" = "editCount" - 1
-      WHERE "id" = OLD."assetId";
+      SET "isEdited" = false
+      FROM deleted_edit
+      WHERE asset.id = deleted_edit."assetId" AND asset."isEdited" 
+        AND NOT EXISTS (SELECT FROM asset_edit edit WHERE edit."assetId" = asset.id);
       RETURN NULL;
     END
   `,

server/src/schema/migrations/1768757482271-SwitchToIsEdited.ts

@@ -0,0 +1,89 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`CREATE OR REPLACE FUNCTION asset_edit_insert()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      UPDATE asset
+      SET "isEdited" = true
+      FROM inserted_edit
+      WHERE asset.id = inserted_edit."assetId" AND NOT asset."isEdited";
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION asset_edit_delete()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      UPDATE asset
+      SET "isEdited" = false
+      FROM deleted_edit
+      WHERE asset.id = deleted_edit."assetId" AND asset."isEdited" 
+        AND NOT EXISTS (SELECT FROM asset_edit edit WHERE edit."assetId" = asset.id);
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`ALTER TABLE "asset" ADD "isEdited" boolean NOT NULL DEFAULT false;`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_edit_delete"
+  AFTER DELETE ON "asset_edit"
+  REFERENCING OLD TABLE AS "deleted_edit"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION asset_edit_delete();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_edit_insert"
+  AFTER INSERT ON "asset_edit"
+  REFERENCING NEW TABLE AS "inserted_edit"
+  FOR EACH STATEMENT
+  EXECUTE FUNCTION asset_edit_insert();`.execute(db);
+  await sql`ALTER TABLE "asset" DROP COLUMN "editCount";`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"function","name":"asset_edit_insert","sql":"CREATE OR REPLACE FUNCTION asset_edit_insert()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      UPDATE asset\\n      SET \\"isEdited\\" = true\\n      FROM inserted_edit\\n      WHERE asset.id = inserted_edit.\\"assetId\\" AND NOT asset.\\"isEdited\\";\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb WHERE "name" = 'function_asset_edit_insert';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"function","name":"asset_edit_delete","sql":"CREATE OR REPLACE FUNCTION asset_edit_delete()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      UPDATE asset\\n      SET \\"isEdited\\" = false\\n      FROM deleted_edit\\n      WHERE asset.id = deleted_edit.\\"assetId\\" AND asset.\\"isEdited\\" \\n        AND NOT EXISTS (SELECT FROM asset_edit edit WHERE edit.\\"assetId\\" = asset.id);\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb WHERE "name" = 'function_asset_edit_delete';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"trigger","name":"asset_edit_delete","sql":"CREATE OR REPLACE TRIGGER \\"asset_edit_delete\\"\\n  AFTER DELETE ON \\"asset_edit\\"\\n  REFERENCING OLD TABLE AS \\"deleted_edit\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION asset_edit_delete();"}'::jsonb WHERE "name" = 'trigger_asset_edit_delete';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"trigger","name":"asset_edit_insert","sql":"CREATE OR REPLACE TRIGGER \\"asset_edit_insert\\"\\n  AFTER INSERT ON \\"asset_edit\\"\\n  REFERENCING NEW TABLE AS \\"inserted_edit\\"\\n  FOR EACH STATEMENT\\n  EXECUTE FUNCTION asset_edit_insert();"}'::jsonb WHERE "name" = 'trigger_asset_edit_insert';`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`CREATE OR REPLACE FUNCTION public.asset_edit_insert()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      UPDATE asset
+      SET "editCount" = "editCount" + 1
+      WHERE "id" = NEW."assetId";
+      RETURN NULL;
+    END
+  $function$
+`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION public.asset_edit_delete()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      UPDATE asset
+      SET "editCount" = "editCount" - 1
+      WHERE "id" = OLD."assetId";
+      RETURN NULL;
+    END
+  $function$
+`.execute(db);
+  await sql`ALTER TABLE "asset" ADD "editCount" integer NOT NULL DEFAULT 0;`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_edit_delete"
+  AFTER DELETE ON "asset_edit"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH ROW
+  WHEN ((pg_trigger_depth() = 0))
+  EXECUTE FUNCTION asset_edit_delete();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_edit_insert"
+  AFTER INSERT ON "asset_edit"
+  FOR EACH ROW
+  EXECUTE FUNCTION asset_edit_insert();`.execute(db);
+  await sql`ALTER TABLE "asset" DROP COLUMN "isEdited";`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE OR REPLACE FUNCTION asset_edit_insert()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      UPDATE asset\\n      SET \\"editCount\\" = \\"editCount\\" + 1\\n      WHERE \\"id\\" = NEW.\\"assetId\\";\\n      RETURN NULL;\\n    END\\n  $$;","name":"asset_edit_insert","type":"function"}'::jsonb WHERE "name" = 'function_asset_edit_insert';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE OR REPLACE FUNCTION asset_edit_delete()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      UPDATE asset\\n      SET \\"editCount\\" = \\"editCount\\" - 1\\n      WHERE \\"id\\" = OLD.\\"assetId\\";\\n      RETURN NULL;\\n    END\\n  $$;","name":"asset_edit_delete","type":"function"}'::jsonb WHERE "name" = 'function_asset_edit_delete';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE OR REPLACE TRIGGER \\"asset_edit_delete\\"\\n  AFTER DELETE ON \\"asset_edit\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH ROW\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION asset_edit_delete();","name":"asset_edit_delete","type":"trigger"}'::jsonb WHERE "name" = 'trigger_asset_edit_delete';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE OR REPLACE TRIGGER \\"asset_edit_insert\\"\\n  AFTER INSERT ON \\"asset_edit\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION asset_edit_insert();","name":"asset_edit_insert","type":"trigger"}'::jsonb WHERE "name" = 'trigger_asset_edit_insert';`.execute(db);
+}

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

@@ -12,11 +12,11 @@ import {
 } from 'src/sql-tools';
 
 @Table('asset_edit')
-@AfterInsertTrigger({ scope: 'row', function: asset_edit_insert })
+@AfterInsertTrigger({ scope: 'statement', function: asset_edit_insert, referencingNewTableAs: 'inserted_edit' })
 @AfterDeleteTrigger({
-  scope: 'row',
+  scope: 'statement',
   function: asset_edit_delete,
-  referencingOldTableAs: 'old',
+  referencingOldTableAs: 'deleted_edit',
   when: 'pg_trigger_depth() = 0',
 })
 export class AssetEditTable<T extends AssetEditAction = AssetEditAction> {

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

@@ -144,6 +144,6 @@ export class AssetTable {
   @Column({ type: 'integer', nullable: true })
   height!: number | null;
 
-  @Column({ type: 'integer', default: 0 })
-  editCount!: Generated<number>;
+  @Column({ type: 'boolean', default: false })
+  isEdited!: Generated<boolean>;
 }

server/src/services/job.service.ts

@@ -100,7 +100,29 @@ export class JobService extends BaseService {
         const asset = await this.assetRepository.getById(item.data.id);
 
         if (asset) {
-          this.websocketRepository.clientSend('AssetEditReadyV1', asset.ownerId, { assetId: item.data.id });
+          this.websocketRepository.clientSend('AssetEditReadyV1', asset.ownerId, {
+            asset: {
+              id: asset.id,
+              ownerId: asset.ownerId,
+              originalFileName: asset.originalFileName,
+              thumbhash: asset.thumbhash ? hexOrBufferToBase64(asset.thumbhash) : null,
+              checksum: hexOrBufferToBase64(asset.checksum),
+              fileCreatedAt: asset.fileCreatedAt,
+              fileModifiedAt: asset.fileModifiedAt,
+              localDateTime: asset.localDateTime,
+              duration: asset.duration,
+              type: asset.type,
+              deletedAt: asset.deletedAt,
+              isFavorite: asset.isFavorite,
+              visibility: asset.visibility,
+              livePhotoVideoId: asset.livePhotoVideoId,
+              stackId: asset.stackId,
+              libraryId: asset.libraryId,
+              width: asset.width,
+              height: asset.height,
+              isEdited: asset.isEdited,
+            },
+          });
         }
 
         break;
@@ -153,7 +175,7 @@ export class JobService extends BaseService {
                 libraryId: asset.libraryId,
                 width: asset.width,
                 height: asset.height,
-                editCount: asset.editCount,
+                isEdited: asset.isEdited,
               },
               exif: {
                 assetId: exif.assetId,

server/test/fixtures/asset.stub.ts

@@ -86,7 +86,7 @@ export const assetStub = {
     make: 'FUJIFILM',
     model: 'X-T50',
     lensModel: 'XF27mm F2.8 R WR',
-    editCount: 0,
+    isEdited: false,
     ...asset,
   }),
   noResizePath: Object.freeze({
@@ -126,7 +126,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   noWebpPath: Object.freeze({
@@ -168,7 +168,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   noThumbhash: Object.freeze({
@@ -207,7 +207,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   primaryImage: Object.freeze({
@@ -256,7 +256,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   image: Object.freeze({
@@ -303,7 +303,7 @@ export const assetStub = {
     width: null,
     visibility: AssetVisibility.Timeline,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   trashed: Object.freeze({
@@ -347,7 +347,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   trashedOffline: Object.freeze({
@@ -391,7 +391,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
   archived: Object.freeze({
     id: 'asset-id',
@@ -434,7 +434,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   external: Object.freeze({
@@ -477,7 +477,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   image1: Object.freeze({
@@ -520,7 +520,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   imageFrom2015: Object.freeze({
@@ -562,7 +562,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   video: Object.freeze({
@@ -606,7 +606,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   livePhotoMotionAsset: Object.freeze({
@@ -627,7 +627,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [] as AssetEditActionItem[],
-    editCount: 0,
+    isEdited: false,
   } as MapAsset & { faces: AssetFace[]; files: AssetFile[]; exifInfo: Exif; edits: AssetEditActionItem[] }),
 
   livePhotoStillAsset: Object.freeze({
@@ -649,7 +649,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [] as AssetEditActionItem[],
-    editCount: 0,
+    isEdited: false,
   } as MapAsset & { faces: AssetFace[]; files: AssetFile[]; edits: AssetEditActionItem[] }),
 
   livePhotoWithOriginalFileName: Object.freeze({
@@ -673,7 +673,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [] as AssetEditActionItem[],
-    editCount: 0,
+    isEdited: false,
   } as MapAsset & { faces: AssetFace[]; files: AssetFile[]; edits: AssetEditActionItem[] }),
 
   withLocation: Object.freeze({
@@ -721,7 +721,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   sidecar: Object.freeze({
@@ -760,7 +760,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   sidecarWithoutExt: Object.freeze({
@@ -796,7 +796,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   hasEncodedVideo: Object.freeze({
@@ -839,7 +839,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   hasFileExtension: Object.freeze({
@@ -879,7 +879,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   imageDng: Object.freeze({
@@ -923,7 +923,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   imageHif: Object.freeze({
@@ -967,7 +967,7 @@ export const assetStub = {
     width: null,
     height: null,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 
   panoramaTif: Object.freeze({
@@ -1068,7 +1068,7 @@ export const assetStub = {
         },
       },
     ] as AssetEditActionItem[],
-    editCount: 1,
+    isEdited: true,
   }),
 
   withoutEdits: Object.freeze({
@@ -1116,6 +1116,6 @@ export const assetStub = {
     width: 2160,
     visibility: AssetVisibility.Timeline,
     edits: [],
-    editCount: 0,
+    isEdited: false,
   }),
 };

server/test/fixtures/shared-link.stub.ts

@@ -159,7 +159,7 @@ export const sharedLinkStub = {
         visibility: AssetVisibility.Timeline,
         width: 500,
         height: 500,
-        editCount: 0,
+        isEdited: false,
       },
     ],
     albumId: null,

server/test/medium.factory.ts

@@ -537,7 +537,7 @@ const assetInsert = (asset: Partial<Insertable<AssetTable>> = {}) => {
     fileModifiedAt: now,
     localDateTime: now,
     visibility: AssetVisibility.Timeline,
-    editCount: 0,
+    isEdited: false,
   };
 
   return {

server/test/medium/specs/repositories/asset-edit.repository.spec.ts

@@ -24,32 +24,32 @@ beforeAll(async () => {
 
 describe(AssetEditRepository.name, () => {
   describe('replaceAll', () => {
-    it('should increment editCount on insert', async () => {
+    it('should set isEdited on insert', async () => {
       const { ctx, sut } = setup();
       const { user } = await ctx.newUser();
       const { asset } = await ctx.newAsset({ ownerId: user.id });
 
       await expect(
-        ctx.database.selectFrom('asset').select('editCount').where('id', '=', asset.id).executeTakeFirstOrThrow(),
-      ).resolves.toEqual({ editCount: 0 });
+        ctx.database.selectFrom('asset').select('isEdited').where('id', '=', asset.id).executeTakeFirstOrThrow(),
+      ).resolves.toEqual({ isEdited: false });
 
       await sut.replaceAll(asset.id, [
         { action: AssetEditAction.Crop, parameters: { height: 1, width: 1, x: 1, y: 1 } },
       ]);
 
       await expect(
-        ctx.database.selectFrom('asset').select('editCount').where('id', '=', asset.id).executeTakeFirstOrThrow(),
-      ).resolves.toEqual({ editCount: 1 });
+        ctx.database.selectFrom('asset').select('isEdited').where('id', '=', asset.id).executeTakeFirstOrThrow(),
+      ).resolves.toEqual({ isEdited: true });
     });
 
-    it('should increment editCount when inserting multiple edits', async () => {
+    it('should set isEdited when inserting multiple edits', async () => {
       const { ctx, sut } = setup();
       const { user } = await ctx.newUser();
       const { asset } = await ctx.newAsset({ ownerId: user.id });
 
       await expect(
-        ctx.database.selectFrom('asset').select('editCount').where('id', '=', asset.id).executeTakeFirstOrThrow(),
-      ).resolves.toEqual({ editCount: 0 });
+        ctx.database.selectFrom('asset').select('isEdited').where('id', '=', asset.id).executeTakeFirstOrThrow(),
+      ).resolves.toEqual({ isEdited: false });
 
       await sut.replaceAll(asset.id, [
         { action: AssetEditAction.Crop, parameters: { height: 1, width: 1, x: 1, y: 1 } },
@@ -58,18 +58,18 @@ describe(AssetEditRepository.name, () => {
       ]);
 
       await expect(
-        ctx.database.selectFrom('asset').select('editCount').where('id', '=', asset.id).executeTakeFirstOrThrow(),
-      ).resolves.toEqual({ editCount: 3 });
+        ctx.database.selectFrom('asset').select('isEdited').where('id', '=', asset.id).executeTakeFirstOrThrow(),
+      ).resolves.toEqual({ isEdited: true });
     });
 
-    it('should decrement editCount', async () => {
+    it('should keep isEdited when removing some edits', async () => {
       const { ctx, sut } = setup();
       const { user } = await ctx.newUser();
       const { asset } = await ctx.newAsset({ ownerId: user.id });
 
       await expect(
-        ctx.database.selectFrom('asset').select('editCount').where('id', '=', asset.id).executeTakeFirstOrThrow(),
-      ).resolves.toEqual({ editCount: 0 });
+        ctx.database.selectFrom('asset').select('isEdited').where('id', '=', asset.id).executeTakeFirstOrThrow(),
+      ).resolves.toEqual({ isEdited: false });
 
       await sut.replaceAll(asset.id, [
         { action: AssetEditAction.Crop, parameters: { height: 1, width: 1, x: 1, y: 1 } },
@@ -77,23 +77,27 @@ describe(AssetEditRepository.name, () => {
         { action: AssetEditAction.Rotate, parameters: { angle: 90 } },
       ]);
 
+      await expect(
+        ctx.database.selectFrom('asset').select('isEdited').where('id', '=', asset.id).executeTakeFirstOrThrow(),
+      ).resolves.toEqual({ isEdited: true });
+
       await sut.replaceAll(asset.id, [
         { action: AssetEditAction.Crop, parameters: { height: 1, width: 1, x: 1, y: 1 } },
       ]);
 
       await expect(
-        ctx.database.selectFrom('asset').select('editCount').where('id', '=', asset.id).executeTakeFirstOrThrow(),
-      ).resolves.toEqual({ editCount: 1 });
+        ctx.database.selectFrom('asset').select('isEdited').where('id', '=', asset.id).executeTakeFirstOrThrow(),
+      ).resolves.toEqual({ isEdited: true });
     });
 
-    it('should set editCount to 0 if all edits are deleted', async () => {
+    it('should set isEdited to false if all edits are deleted', async () => {
       const { ctx, sut } = setup();
       const { user } = await ctx.newUser();
       const { asset } = await ctx.newAsset({ ownerId: user.id });
 
       await expect(
-        ctx.database.selectFrom('asset').select('editCount').where('id', '=', asset.id).executeTakeFirstOrThrow(),
-      ).resolves.toEqual({ editCount: 0 });
+        ctx.database.selectFrom('asset').select('isEdited').where('id', '=', asset.id).executeTakeFirstOrThrow(),
+      ).resolves.toEqual({ isEdited: false });
 
       await sut.replaceAll(asset.id, [
         { action: AssetEditAction.Crop, parameters: { height: 1, width: 1, x: 1, y: 1 } },
@@ -104,8 +108,8 @@ describe(AssetEditRepository.name, () => {
       await sut.replaceAll(asset.id, []);
 
       await expect(
-        ctx.database.selectFrom('asset').select('editCount').where('id', '=', asset.id).executeTakeFirstOrThrow(),
-      ).resolves.toEqual({ editCount: 0 });
+        ctx.database.selectFrom('asset').select('isEdited').where('id', '=', asset.id).executeTakeFirstOrThrow(),
+      ).resolves.toEqual({ isEdited: false });
     });
   });
 });

server/test/medium/specs/sync/sync-album-asset.spec.ts

@@ -83,7 +83,7 @@ describe(SyncRequestType.AlbumAssetsV1, () => {
           libraryId: asset.libraryId,
           width: asset.width,
           height: asset.height,
-          editCount: asset.editCount,
+          isEdited: asset.isEdited,
         },
         type: SyncEntityType.AlbumAssetCreateV1,
       },

server/test/medium/specs/sync/sync-asset.spec.ts

@@ -64,7 +64,7 @@ describe(SyncEntityType.AssetV1, () => {
           libraryId: asset.libraryId,
           width: asset.width,
           height: asset.height,
-          editCount: asset.editCount,
+          isEdited: asset.isEdited,
         },
         type: 'AssetV1',
       },

server/test/medium/specs/sync/sync-partner-asset.spec.ts

@@ -63,7 +63,7 @@ describe(SyncRequestType.PartnerAssetsV1, () => {
           type: asset.type,
           visibility: asset.visibility,
           duration: asset.duration,
-          editCount: asset.editCount,
+          isEdited: asset.isEdited,
           stackId: null,
           livePhotoVideoId: null,
           libraryId: asset.libraryId,

server/test/small.factory.ts

@@ -253,7 +253,7 @@ const assetFactory = (asset: Partial<MapAsset> = {}) => ({
   visibility: AssetVisibility.Timeline,
   width: null,
   height: null,
-  editCount: 0,
+  isEdited: false,
   ...asset,
 });
 

web/src/lib/components/asset-viewer/detail-panel-tags.svelte

@@ -1,9 +1,8 @@
 <script lang="ts">
-  import { resolve } from '$app/paths';
   import { shortcut } from '$lib/actions/shortcut';
-  import { AppRoute } from '$lib/constants';
   import { authManager } from '$lib/managers/auth-manager.svelte';
   import AssetTagModal from '$lib/modals/AssetTagModal.svelte';
+  import { Route } from '$lib/route';
   import { removeTag } from '$lib/utils/asset-utils';
   import { getAssetInfo, type AssetResponseDto } from '@immich/sdk';
   import { Icon, modalManager } from '@immich/ui';
@@ -46,7 +45,7 @@
         <div class="flex group transition-all">
           <a
             class="inline-block h-min whitespace-nowrap ps-3 pe-1 group-hover:ps-3 py-1 text-center align-baseline leading-none text-gray-100 dark:text-immich-dark-gray bg-primary rounded-s-full hover:bg-immich-primary/80 dark:hover:bg-immich-dark-primary/80 transition-all"
-            href={resolve(`${AppRoute.TAGS}/?path=${encodeURI(tag.value)}`)}
+            href={Route.tags({ path: tag.value })}
           >
             <p class="text-sm">
               {tag.value}

web/src/lib/components/asset-viewer/detail-panel.svelte

@@ -1,11 +1,10 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
-  import { resolve } from '$app/paths';
   import DetailPanelDescription from '$lib/components/asset-viewer/detail-panel-description.svelte';
   import DetailPanelLocation from '$lib/components/asset-viewer/detail-panel-location.svelte';
   import DetailPanelRating from '$lib/components/asset-viewer/detail-panel-star-rating.svelte';
   import DetailPanelTags from '$lib/components/asset-viewer/detail-panel-tags.svelte';
-  import { AppRoute, QueryParameter, timeToLoadTheMap } from '$lib/constants';
+  import { timeToLoadTheMap } from '$lib/constants';
   import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
   import { authManager } from '$lib/managers/auth-manager.svelte';
   import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
@@ -73,6 +72,7 @@
     })(),
   );
   let previousId: string | undefined = $state();
+  let previousRoute = $derived(currentAlbum?.id ? Route.viewAlbum(currentAlbum) : Route.photos());
 
   $effect(() => {
     if (!previousId) {
@@ -100,11 +100,8 @@
   };
 
   const getAssetFolderHref = (asset: AssetResponseDto) => {
-    const folderUrl = new URL(AppRoute.FOLDERS, globalThis.location.href);
     // Remove the last part of the path to get the parent path
-    const assetParentPath = getParentPath(asset.originalPath);
-    folderUrl.searchParams.set(QueryParameter.PATH, assetParentPath);
-    return folderUrl.href;
+    return Route.folders({ path: getParentPath(asset.originalPath) });
   };
 
   const toggleAssetPath = () => (showAssetPath = !showAssetPath);
@@ -205,11 +202,7 @@
           {#if showingHiddenPeople || !person.isHidden}
             <a
               class="w-22"
-              href={resolve(
-                `${AppRoute.PEOPLE}/${person.id}?${QueryParameter.PREVIOUS_ROUTE}=${
-                  currentAlbum?.id ? Route.viewAlbum(currentAlbum) : Route.photos()
-                }`,
-              )}
+              href={Route.viewPerson(person, { previousRoute })}
               onfocus={() => ($boundingBoxesArray = people[index].faces)}
               onblur={() => ($boundingBoxesArray = [])}
               onmouseover={() => ($boundingBoxesArray = people[index].faces)}
@@ -472,7 +465,7 @@
         simplified
         useLocationPin
         showSimpleControls={!showEditFaces}
-        onOpenInMapView={() => goto(resolve(`${AppRoute.MAP}#12.5/${latlng.lat}/${latlng.lng}`))}
+        onOpenInMapView={() => goto(Route.map({ ...latlng, zoom: 12.5 }))}
       >
         {#snippet popup({ marker })}
           {@const { lat, lon } = marker}

web/src/lib/components/faces-page/merge-face-selector.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
-  import { page } from '$app/state';
-  import { ActionQueryParameterValue, AppRoute, QueryParameter } from '$lib/constants';
+  import { Route } from '$lib/route';
   import { handleError } from '$lib/utils/handle-error';
   import { getAllPeople, getPerson, mergePerson, type PersonResponseDto } from '@immich/sdk';
   import { Button, Icon, IconButton, modalManager, toastManager } from '@immich/ui';
@@ -39,8 +38,7 @@
 
   const handleSwapPeople = async () => {
     [person, selectedPeople[0]] = [selectedPeople[0], person];
-    page.url.searchParams.set(QueryParameter.ACTION, ActionQueryParameterValue.MERGE);
-    await goto(`${AppRoute.PEOPLE}/${person.id}?${page.url.searchParams.toString()}`);
+    await goto(Route.viewPerson(person, { previousRoute: Route.people(), action: 'merge' }));
   };
 
   const onSelect = async (selected: PersonResponseDto) => {

web/src/lib/components/faces-page/people-card.svelte

@@ -2,7 +2,7 @@
   import { focusOutside } from '$lib/actions/focus-outside';
   import ActionMenuItem from '$lib/components/ActionMenuItem.svelte';
   import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
-  import { AppRoute, QueryParameter } from '$lib/constants';
+  import { Route } from '$lib/route';
   import { getPersonActions } from '$lib/services/person.service';
   import { getPeopleThumbnailUrl } from '$lib/utils';
   import { type PersonResponseDto } from '@immich/sdk';
@@ -42,7 +42,7 @@
   use:focusOutside={{ onFocusOut: () => (showVerticalDots = false) }}
 >
   <a
-    href="{AppRoute.PEOPLE}/{person.id}?{QueryParameter.PREVIOUS_ROUTE}={AppRoute.PEOPLE}"
+    href={Route.viewPerson(person, { previousRoute: Route.people() })}
     draggable="false"
     onfocus={() => (showVerticalDots = true)}
   >

web/src/lib/components/shared-components/side-bar/user-sidebar.svelte

@@ -2,7 +2,6 @@
   import BottomInfo from '$lib/components/shared-components/side-bar/bottom-info.svelte';
   import RecentAlbums from '$lib/components/shared-components/side-bar/recent-albums.svelte';
   import Sidebar from '$lib/components/sidebar/sidebar.svelte';
-  import { AppRoute } from '$lib/constants';
   import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
   import { Route } from '$lib/route';
   import { recentAlbumsDropdown } from '$lib/stores/preferences.store';
@@ -45,11 +44,11 @@
   {/if}
 
   {#if featureFlagsManager.value.map}
-    <NavbarItem title={$t('map')} href={AppRoute.MAP} icon={mdiMapOutline} activeIcon={mdiMap} />
+    <NavbarItem title={$t('map')} href={Route.map()} icon={mdiMapOutline} activeIcon={mdiMap} />
   {/if}
 
   {#if $preferences.people.enabled && $preferences.people.sidebarWeb}
-    <NavbarItem title={$t('people')} href={AppRoute.PEOPLE} icon={mdiAccountOutline} activeIcon={mdiAccount} />
+    <NavbarItem title={$t('people')} href={Route.people()} icon={mdiAccountOutline} activeIcon={mdiAccount} />
   {/if}
 
   {#if $preferences.sharedLinks.enabled && $preferences.sharedLinks.sidebarWeb}
@@ -81,11 +80,11 @@
   </NavbarItem>
 
   {#if $preferences.tags.enabled && $preferences.tags.sidebarWeb}
-    <NavbarItem title={$t('tags')} href={AppRoute.TAGS} icon={{ icon: mdiTagMultipleOutline, flipped: true }} />
+    <NavbarItem title={$t('tags')} href={Route.tags()} icon={{ icon: mdiTagMultipleOutline, flipped: true }} />
   {/if}
 
   {#if $preferences.folders.enabled && $preferences.folders.sidebarWeb}
-    <NavbarItem title={$t('folders')} href={AppRoute.FOLDERS} icon={{ icon: mdiFolderOutline, flipped: true }} />
+    <NavbarItem title={$t('folders')} href={Route.folders()} icon={{ icon: mdiFolderOutline, flipped: true }} />
   {/if}
 
   <NavbarItem title={$t('utilities')} href={Route.utilities()} icon={mdiToolboxOutline} activeIcon={mdiToolbox} />

web/src/lib/constants.ts

@@ -19,16 +19,6 @@ export enum AssetAction {
   RATING = 'rating',
 }
 
-export enum AppRoute {
-  PEOPLE = '/people',
-  SEARCH = '/search',
-  MAP = '/map',
-  BUY = '/buy',
-  FOLDERS = '/folders',
-  TAGS = '/tags',
-  MAINTENANCE = '/maintenance',
-}
-
 export type SharedLinkTab = 'all' | 'album' | 'individual';
 
 export enum ProjectionType {
@@ -82,10 +72,6 @@ export enum OpenQueryParam {
   PURCHASE_SETTINGS = 'user-purchase-settings',
 }
 
-export enum ActionQueryParameterValue {
-  MERGE = 'merge',
-}
-
 export const maximumLengthSearchPeople = 1000;
 
 // time to load the map before displaying the loading spinner

web/src/lib/managers/edit/edit-manager.svelte.ts

@@ -115,7 +115,7 @@ export class EditManager {
       // Setup the websocket listener before sending the edit request
       const editCompleted = waitForWebsocketEvent(
         'AssetEditReadyV1',
-        (event) => event.assetId === this.currentAsset!.id,
+        (event) => event.asset.id === this.currentAsset!.id,
         10_000,
       );
 

web/src/lib/managers/event-manager.svelte.ts

@@ -65,12 +65,15 @@ export type Events = {
   // confirmed permanently deleted from server
   UserAdminDeleted: [{ id: string }];
 
+  SessionLocked: [];
+
   SystemConfigUpdate: [SystemConfigDto];
 
   LibraryCreate: [LibraryResponseDto];
   LibraryUpdate: [LibraryResponseDto];
   LibraryDelete: [{ id: string }];
 
+  WorkflowCreate: [WorkflowResponseDto];
   WorkflowUpdate: [WorkflowResponseDto];
   WorkflowDelete: [WorkflowResponseDto];
 

web/src/lib/route.spec.ts

@@ -24,6 +24,20 @@ describe('Route', () => {
     });
   });
 
+  describe(Route.tags.name, () => {
+    it('should work', () => {
+      expect(Route.tags()).toBe('/tags');
+    });
+
+    it('should support query parameters', () => {
+      expect(Route.tags({ path: '/some/path' })).toBe('/tags?path=%2Fsome%2Fpath');
+    });
+
+    it('should ignore an empty path', () => {
+      expect(Route.tags({ path: '' })).toBe('/tags');
+    });
+  });
+
   describe(Route.systemSettings.name, () => {
     it('should work', () => {
       expect(Route.systemSettings()).toBe('/admin/system-settings');

web/src/lib/route.ts

@@ -14,9 +14,29 @@ export const fromQueueSlug = (slug: string): QueueName | undefined => {
 };
 
 type QueryValue = number | string;
-const asQueryString = (params?: Record<string, QueryValue | undefined>) => {
+const asQueryString = (
+  params?: Record<string, QueryValue | undefined>,
+  options?: { skipEmptyStrings?: boolean; skipNullValues?: boolean },
+) => {
+  const { skipEmptyStrings = true, skipNullValues = true } = options ?? {};
   const items = Object.entries(params ?? {})
-    .filter((item): item is [string, QueryValue] => item[1] !== undefined)
+    .filter((item): item is [string, QueryValue] => {
+      const value = item[1];
+
+      if (value === undefined) {
+        return false;
+      }
+
+      if (skipNullValues && value === null) {
+        return false;
+      }
+
+      if (skipEmptyStrings && value === '') {
+        return false;
+      }
+
+      return true;
+    })
     .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
 
   return items.length === 0 ? '' : `?${items.join('&')}`;
@@ -36,22 +56,40 @@ export const Route = {
   viewAlbumAsset: ({ albumId, assetId }: { albumId: string; assetId: string }) =>
     `/albums/${albumId}/photos/${assetId}`,
 
+  // buy
+  buy: () => '/buy',
+
   // explore
   explore: () => '/explore',
   places: () => '/places',
 
+  // folders
+  folders: (params?: { path?: string }) => '/folders' + asQueryString(params),
+
   // libraries
   libraries: () => '/admin/library-management',
   newLibrary: () => '/admin/library-management/new',
   viewLibrary: ({ id }: { id: string }) => `/admin/library-management/${id}`,
   editLibrary: ({ id }: { id: string }) => `/admin/library-management/${id}/edit`,
 
+  // maintenance
+  maintenanceMode: (params?: { continue?: string }) => '/maintenance' + asQueryString(params),
+
+  // map
+  map: (point?: { zoom: number; lat: number; lng: number }) =>
+    '/map' + (point ? `#${point.zoom}/${point.lat}/${point.lng}` : ''),
+
   // memories
   memories: (params?: { id?: string }) => '/memory' + asQueryString(params),
 
   // partners
   viewPartner: ({ id }: { id: string }) => `/partners/${id}`,
 
+  // people
+  people: () => '/people',
+  viewPerson: ({ id }: { id: string }, params?: { previousRoute?: string; action?: 'merge' }) =>
+    `/people/${id}` + asQueryString(params),
+
   // photos
   photos: (params?: { at?: string }) => '/photos' + asQueryString(params),
   viewAsset: ({ id }: { id: string }) => `/photos/${id}`,
@@ -82,6 +120,10 @@ export const Route = {
   // system
   systemSettings: (params?: { isOpen?: OpenQueryParam }) => '/admin/system-settings' + asQueryString(params),
   systemStatistics: () => '/admin/server-status',
+  systemMaintenance: (params?: { continue?: string }) => '/admin/maintenance' + asQueryString(params),
+
+  // tags
+  tags: (params?: { path?: string }) => '/tags' + asQueryString(params),
 
   // users
   users: () => '/admin/users',

web/src/lib/services/album.service.ts

@@ -7,6 +7,7 @@ import AlbumOptionsModal from '$lib/modals/AlbumOptionsModal.svelte';
 import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
 import { Route } from '$lib/route';
 import { user } from '$lib/stores/user.store';
+import { createAlbumAndRedirect } from '$lib/utils/album-utils';
 import { downloadArchive } from '$lib/utils/asset-utils';
 import { openFileUploadDialog } from '$lib/utils/file-uploader';
 import { handleError } from '$lib/utils/handle-error';
@@ -28,6 +29,16 @@ import { mdiLink, mdiPlus, mdiPlusBoxOutline, mdiShareVariantOutline, mdiUpload
 import { type MessageFormatter } from 'svelte-i18n';
 import { get } from 'svelte/store';
 
+export const getAlbumsActions = ($t: MessageFormatter) => {
+  const Create: ActionItem = {
+    title: $t('create_album'),
+    icon: mdiPlusBoxOutline,
+    onAction: () => createAlbumAndRedirect(),
+  };
+
+  return { Create };
+};
+
 export const getAlbumActions = ($t: MessageFormatter, album: AlbumResponseDto) => {
   const isOwned = get(user).id === album.ownerId;
 

web/src/lib/services/shared-link.service.ts

@@ -18,9 +18,19 @@ import {
   type SharedLinkResponseDto,
 } from '@immich/sdk';
 import { modalManager, toastManager, type ActionItem } from '@immich/ui';
-import { mdiContentCopy, mdiPencilOutline, mdiQrcode, mdiTrashCanOutline } from '@mdi/js';
+import { mdiContentCopy, mdiLink, mdiPencilOutline, mdiQrcode, mdiTrashCanOutline } from '@mdi/js';
 import type { MessageFormatter } from 'svelte-i18n';
 
+export const getSharedLinksActions = ($t: MessageFormatter) => {
+  const ViewAll: ActionItem = {
+    title: $t('shared_links'),
+    icon: mdiLink,
+    onAction: () => goto(Route.sharedLinks()),
+  };
+
+  return { ViewAll };
+};
+
 export const getSharedLinkActions = ($t: MessageFormatter, sharedLink: SharedLinkResponseDto) => {
   const Edit: ActionItem = {
     title: $t('edit_link'),

web/src/lib/services/user.service.ts

@@ -1,8 +1,38 @@
 import { eventManager } from '$lib/managers/event-manager.svelte';
 import { handleError } from '$lib/utils/handle-error';
 import { getFormatter } from '$lib/utils/i18n';
-import { changePassword, resetPinCode, type ChangePasswordDto, type PinCodeResetDto } from '@immich/sdk';
-import { toastManager } from '@immich/ui';
+import {
+  changePassword,
+  lockAuthSession,
+  resetPinCode,
+  type ChangePasswordDto,
+  type PinCodeResetDto,
+} from '@immich/sdk';
+import { toastManager, type ActionItem } from '@immich/ui';
+import { mdiLockOutline } from '@mdi/js';
+import type { MessageFormatter } from 'svelte-i18n';
+
+export const getUserActions = ($t: MessageFormatter) => {
+  const LockSession: ActionItem = {
+    title: $t('lock'),
+    color: 'primary',
+    icon: mdiLockOutline,
+    onAction: () => handleLockSession(),
+  };
+
+  return { LockSession };
+};
+
+const handleLockSession = async () => {
+  const $t = await getFormatter();
+
+  try {
+    await lockAuthSession();
+    eventManager.emit('SessionLocked');
+  } catch (error) {
+    handleError(error, $t('errors.something_went_wrong'));
+  }
+};
 
 export const handleResetPinCode = async (dto: PinCodeResetDto) => {
   const $t = await getFormatter();

web/src/lib/services/workflow.service.ts

@@ -17,12 +17,13 @@ import {
   type PluginFilterResponseDto,
   type PluginTriggerResponseDto,
   type WorkflowActionItemDto,
+  type WorkflowCreateDto,
   type WorkflowFilterItemDto,
   type WorkflowResponseDto,
   type WorkflowUpdateDto,
 } from '@immich/sdk';
 import { modalManager, toastManager, type ActionItem } from '@immich/ui';
-import { mdiCodeJson, mdiDelete, mdiPause, mdiPencil, mdiPlay } from '@mdi/js';
+import { mdiCodeJson, mdiDelete, mdiPause, mdiPencil, mdiPlay, mdiPlus } from '@mdi/js';
 import type { MessageFormatter } from 'svelte-i18n';
 
 export type PickerSubType = 'album-picker' | 'people-picker';
@@ -318,6 +319,23 @@ export const handleUpdateWorkflow = async (
   return updateWorkflow({ id: workflowId, workflowUpdateDto: updateDto });
 };
 
+export const getWorkflowsActions = ($t: MessageFormatter) => {
+  const Create: ActionItem = {
+    title: $t('create_workflow'),
+    icon: mdiPlus,
+    onAction: () =>
+      handleCreateWorkflow({
+        name: $t('untitled_workflow'),
+        triggerType: PluginTriggerType.AssetCreate,
+        filters: [],
+        actions: [],
+        enabled: false,
+      }),
+  };
+
+  return { Create };
+};
+
 export const getWorkflowActions = ($t: MessageFormatter, workflow: WorkflowResponseDto) => {
   const ToggleEnabled: ActionItem = {
     title: workflow.enabled ? $t('disable') : $t('enable'),
@@ -356,22 +374,12 @@ export const getWorkflowShowSchemaAction = (
   onAction: onToggle,
 });
 
-export const handleCreateWorkflow = async (): Promise<WorkflowResponseDto | undefined> => {
+const handleCreateWorkflow = async (dto: WorkflowCreateDto) => {
   const $t = await getFormatter();
 
   try {
-    const workflow = await createWorkflow({
-      workflowCreateDto: {
-        name: $t('untitled_workflow'),
-        triggerType: PluginTriggerType.AssetCreate,
-        filters: [],
-        actions: [],
-        enabled: false,
-      },
-    });
-
-    await goto(Route.viewWorkflow(workflow));
-    return workflow;
+    const response = await createWorkflow({ workflowCreateDto: dto });
+    eventManager.emit('WorkflowCreate', response);
   } catch (error) {
     handleError(error, $t('errors.unable_to_create'));
   }

web/src/lib/stores/websocket.ts

@@ -1,7 +1,7 @@
 import { page } from '$app/state';
-import { AppRoute } from '$lib/constants';
 import { authManager } from '$lib/managers/auth-manager.svelte';
 import { eventManager } from '$lib/managers/event-manager.svelte';
+import { Route } from '$lib/route';
 import { notificationManager } from '$lib/stores/notification-manager.svelte';
 import type { ReleaseEvent } from '$lib/types';
 import { createEventEmitter } from '$lib/utils/eventemitter';
@@ -31,7 +31,7 @@ export interface Events {
   on_notification: (notification: NotificationDto) => void;
 
   AppRestartV1: (event: AppRestartEvent) => void;
-  AssetEditReadyV1: (data: { assetId: string }) => void;
+  AssetEditReadyV1: (data: { asset: { id: string } }) => void;
 }
 
 const websocket: Socket<Events> = io({
@@ -63,7 +63,7 @@ websocket
 
 export const openWebsocketConnection = () => {
   try {
-    if (get(user) || page.url.pathname.startsWith(AppRoute.MAINTENANCE)) {
+    if (get(user) || page.url.pathname.startsWith(Route.maintenanceMode())) {
       websocket.connect();
     }
   } catch (error) {

web/src/lib/utils/maintenance.ts

@@ -1,11 +1,9 @@
-import { AppRoute } from '$lib/constants';
+import { Route } from '$lib/route';
 import { maintenanceAuth as maintenanceAuth$ } from '$lib/stores/maintenance.store';
 import { maintenanceLogin } from '@immich/sdk';
 
 export function maintenanceCreateUrl(url: URL) {
-  const target = new URL(AppRoute.MAINTENANCE, url.origin);
-  target.searchParams.set('continue', url.pathname + url.search);
-  return target.href;
+  return new URL(Route.maintenanceMode({ continue: url.pathname + url.search }), url.origin).href;
 }
 
 export function maintenanceReturnUrl(searchParams: URLSearchParams) {
@@ -13,7 +11,7 @@ export function maintenanceReturnUrl(searchParams: URLSearchParams) {
 }
 
 export function maintenanceShouldRedirect(maintenanceMode: boolean, currentUrl: URL | Location) {
-  return maintenanceMode !== currentUrl.pathname.startsWith(AppRoute.MAINTENANCE);
+  return maintenanceMode !== currentUrl.pathname.startsWith(Route.maintenanceMode());
 }
 
 export const loadMaintenanceAuth = async () => {

web/src/routes/(user)/explore/+page.svelte

@@ -3,7 +3,6 @@
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
   import SingleGridRow from '$lib/components/shared-components/single-grid-row.svelte';
-  import { AppRoute } from '$lib/constants';
   import { Route } from '$lib/route';
   import { websocketEvents } from '$lib/stores/websocket';
   import { getAssetThumbnailUrl, getPeopleThumbnailUrl } from '$lib/utils';
@@ -47,7 +46,7 @@
       <div class="flex justify-between">
         <p class="mb-4 font-medium dark:text-immich-dark-fg">{$t('people')}</p>
         <a
-          href={AppRoute.PEOPLE}
+          href={Route.people()}
           class="pe-4 text-sm font-medium hover:text-immich-primary dark:text-immich-dark-fg dark:hover:text-immich-dark-primary"
           draggable="false">{$t('view_all')}</a
         >
@@ -55,7 +54,7 @@
       <SingleGridRow class="grid grid-flow-col md:grid-auto-fill-28 grid-auto-fill-20 gap-x-4">
         {#snippet children({ itemCount })}
           {#each people.slice(0, itemCount) as person (person.id)}
-            <a href="{AppRoute.PEOPLE}/{person.id}" class="text-center relative">
+            <a href={Route.viewPerson(person)} class="text-center relative">
               <ImageThumbnail
                 circle
                 shadow

web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -19,9 +19,9 @@
   import FavoriteAction from '$lib/components/timeline/actions/FavoriteAction.svelte';
   import TagAction from '$lib/components/timeline/actions/TagAction.svelte';
   import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte';
-  import { AppRoute, QueryParameter } from '$lib/constants';
   import SkipLink from '$lib/elements/SkipLink.svelte';
   import type { Viewport } from '$lib/managers/timeline-manager/types';
+  import { Route } from '$lib/route';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { foldersStore } from '$lib/stores/folders.svelte';
   import { preferences } from '$lib/stores/user.store';
@@ -44,11 +44,7 @@
 
   const handleNavigateToFolder = (folderName: string) => navigateToView(joinPaths(data.tree.path, folderName));
 
-  function getLinkForPath(path: string) {
-    const url = new URL(AppRoute.FOLDERS, globalThis.location.href);
-    url.searchParams.set(QueryParameter.PATH, path);
-    return url.href;
-  }
+  const getLinkForPath = (path: string) => Route.folders({ path });
 
   afterNavigate(function clearAssetSelection() {
     // Clear the asset selection when we navigate (like going to another folder)

web/src/routes/(user)/locked/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
+  import OnEvents from '$lib/components/OnEvents.svelte';
   import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
   import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
   import ChangeDate from '$lib/components/timeline/actions/ChangeDateAction.svelte';
@@ -14,10 +15,10 @@
   import { AssetAction } from '$lib/constants';
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
   import { Route } from '$lib/route';
+  import { getUserActions } from '$lib/services/user.service';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
-  import { AssetVisibility, lockAuthSession } from '@immich/sdk';
-  import { Button } from '@immich/ui';
-  import { mdiDotsVertical, mdiLockOutline } from '@mdi/js';
+  import { AssetVisibility } from '@immich/sdk';
+  import { mdiDotsVertical } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { PageData } from './$types';
 
@@ -44,19 +45,21 @@
     timelineManager.removeAssets(assetIds);
   };
 
-  const handleLock = async () => {
-    await lockAuthSession();
+  const { LockSession } = $derived(getUserActions($t));
+
+  const onSessionLocked = async () => {
     await goto(Route.photos());
   };
 </script>
 
-<UserPageLayout hideNavbar={assetInteraction.selectionActive} title={data.meta.title} scrollbar={false}>
-  {#snippet buttons()}
-    <Button size="small" variant="ghost" color="primary" leadingIcon={mdiLockOutline} onclick={handleLock}>
-      {$t('lock')}
-    </Button>
-  {/snippet}
+<OnEvents {onSessionLocked} />
 
+<UserPageLayout
+  title={data.meta.title}
+  actions={[LockSession]}
+  hideNavbar={assetInteraction.selectionActive}
+  scrollbar={false}
+>
   <Timeline
     enableRouting={true}
     bind:timelineManager

web/src/routes/(user)/people/+page.svelte

@@ -10,8 +10,9 @@
   import SearchPeople from '$lib/components/faces-page/people-search.svelte';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
-  import { ActionQueryParameterValue, AppRoute, QueryParameter, SessionStorageKey } from '$lib/constants';
+  import { QueryParameter, SessionStorageKey } from '$lib/constants';
   import PersonMergeSuggestionModal from '$lib/modals/PersonMergeSuggestionModal.svelte';
+  import { Route } from '$lib/route';
   import { locale } from '$lib/stores/preferences.store';
   import { websocketEvents } from '$lib/stores/websocket';
   import { handlePromiseError } from '$lib/utils';
@@ -205,9 +206,7 @@
   };
 
   const handleMergePeople = async (detail: PersonResponseDto) => {
-    await goto(
-      `${AppRoute.PEOPLE}/${detail.id}?${QueryParameter.ACTION}=${ActionQueryParameterValue.MERGE}&${QueryParameter.PREVIOUS_ROUTE}=${AppRoute.PEOPLE}`,
-    );
+    await goto(Route.viewPerson(detail, { previousRoute: Route.people(), action: 'merge' }));
   };
 
   const onResetSearchBar = async () => {
@@ -300,7 +299,7 @@
     [
       scrollMemory,
       {
-        routeStartsWith: AppRoute.PEOPLE,
+        routeStartsWith: Route.people(),
         beforeSave: () => {
           if (currentPage) {
             sessionStorage.setItem(SessionStorageKey.INFINITE_SCROLL_PAGE, currentPage.toString());

web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -27,7 +27,7 @@
   import TagAction from '$lib/components/timeline/actions/TagAction.svelte';
   import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte';
   import Timeline from '$lib/components/timeline/Timeline.svelte';
-  import { AppRoute, PersonPageViewMode, QueryParameter, SessionStorageKey } from '$lib/constants';
+  import { PersonPageViewMode, QueryParameter, SessionStorageKey } from '$lib/constants';
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
   import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
   import PersonMergeSuggestionModal from '$lib/modals/PersonMergeSuggestionModal.svelte';
@@ -219,7 +219,7 @@
       await updateAssetCount();
       return { merged: true };
     }
-    await goto(`${AppRoute.PEOPLE}/${personToBeMergedInto.id}`, { replaceState: true });
+    await goto(Route.viewPerson(personToBeMergedInto), { replaceState: true });
     return { merged: true };
   };
 
@@ -339,7 +339,7 @@
 <main
   class="relative z-0 h-dvh overflow-hidden px-2 md:px-6 md:pt-(--navbar-height-md) pt-(--navbar-height)"
   use:scrollMemoryClearer={{
-    routeStartsWith: AppRoute.PEOPLE,
+    routeStartsWith: Route.people(),
     beforeClear: () => {
       sessionStorage.removeItem(SessionStorageKey.INFINITE_SCROLL_PAGE);
     },

web/src/routes/(user)/sharing/+page.svelte

@@ -5,6 +5,8 @@
   import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
   import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
   import { Route } from '$lib/route';
+  import { getAlbumsActions } from '$lib/services/album.service';
+  import { getSharedLinksActions } from '$lib/services/shared-link.service';
   import {
     AlbumFilter,
     AlbumGroupBy,
@@ -13,15 +15,12 @@
     SortOrder,
     type AlbumViewSettings,
   } from '$lib/stores/preferences.store';
-  import { createAlbumAndRedirect } from '$lib/utils/album-utils';
-  import { Button, HStack, Text } from '@immich/ui';
-  import { mdiLink, mdiPlusBoxOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { PageData } from './$types';
 
-  interface Props {
+  type Props = {
     data: PageData;
-  }
+  };
 
   let { data }: Props = $props();
 
@@ -34,26 +33,12 @@
     sortOrder: SortOrder.Desc,
     collapsedGroups: {},
   };
+
+  const { Create: CreateAlbum } = $derived(getAlbumsActions($t));
+  const { ViewAll: ViewSharedLinks } = $derived(getSharedLinksActions($t));
 </script>
 
-<UserPageLayout title={data.meta.title}>
-  {#snippet buttons()}
-    <HStack gap={0}>
-      <Button
-        leadingIcon={mdiPlusBoxOutline}
-        onclick={() => createAlbumAndRedirect()}
-        size="small"
-        variant="ghost"
-        color="secondary"
-      >
-        <Text class="hidden md:block">{$t('create_album')}</Text>
-      </Button>
-      <Button leadingIcon={mdiLink} href={Route.sharedLinks()} size="small" variant="ghost" color="secondary">
-        <Text class="hidden md:block">{$t('shared_links')}</Text>
-      </Button>
-    </HStack>
-  {/snippet}
-
+<UserPageLayout title={data.meta.title} actions={[ViewSharedLinks, CreateAlbum]}>
   <div class="flex flex-col">
     {#if data.partners.length > 0}
       <div class="mb-6 mt-2">

web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -21,9 +21,10 @@
   import SelectAllAssets from '$lib/components/timeline/actions/SelectAllAction.svelte';
   import SetVisibilityAction from '$lib/components/timeline/actions/SetVisibilityAction.svelte';
   import TagAction from '$lib/components/timeline/actions/TagAction.svelte';
-  import { AppRoute, AssetAction, QueryParameter } from '$lib/constants';
+  import { AssetAction } from '$lib/constants';
   import SkipLink from '$lib/elements/SkipLink.svelte';
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
+  import { Route } from '$lib/route';
   import { getTagActions } from '$lib/services/tag.service';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { preferences, user } from '$lib/stores/user.store';
@@ -50,11 +51,7 @@
 
   const handleNavigation = (tag: string) => navigateToView(joinPaths(data.path, tag));
 
-  const getLink = (path: string) => {
-    const url = new URL(AppRoute.TAGS, globalThis.location.href);
-    url.searchParams.set(QueryParameter.PATH, path);
-    return url.href;
-  };
+  const getLink = (path: string) => Route.tags({ path });
 
   const navigateToView = (path: string) => goto(getLink(path));
 

web/src/routes/(user)/utilities/workflows/+page.svelte

@@ -1,15 +1,17 @@
 <script lang="ts">
+  import { goto } from '$app/navigation';
   import emptyWorkflows from '$lib/assets/empty-workflows.svg';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
   import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
+  import { Route } from '$lib/route';
   import {
     getWorkflowActions,
+    getWorkflowsActions,
     getWorkflowShowSchemaAction,
-    handleCreateWorkflow,
     type WorkflowPayload,
   } from '$lib/services/workflow.service';
-  import type { PluginFilterResponseDto, WorkflowResponseDto } from '@immich/sdk';
+  import { type PluginFilterResponseDto, type WorkflowResponseDto } from '@immich/sdk';
   import {
     Button,
     Card,
@@ -18,15 +20,13 @@
     CardHeader,
     CardTitle,
     CodeBlock,
-    HStack,
-    Icon,
     IconButton,
     MenuItemType,
     menuManager,
     Text,
     VStack,
   } from '@immich/ui';
-  import { mdiClose, mdiDotsVertical, mdiPlus } from '@mdi/js';
+  import { mdiClose, mdiDotsVertical } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import { SvelteMap, SvelteSet } from 'svelte/reactivity';
   import type { PageData } from './$types';
@@ -40,7 +40,6 @@
   let workflows = $state<WorkflowResponseDto[]>(data.workflows);
 
   const expandedWorkflows = new SvelteSet<string>();
-
   const pluginFilterLookup = new SvelteMap<string, PluginFilterResponseDto>();
   const pluginActionLookup = new SvelteMap<string, PluginFilterResponseDto>();
 
@@ -90,16 +89,6 @@
 
   const getJson = (workflow: WorkflowResponseDto) => JSON.stringify(constructPayload(workflow), null, 2);
 
-  const onWorkflowUpdate = (updatedWorkflow: WorkflowResponseDto) => {
-    workflows = workflows.map((currentWorkflow) =>
-      currentWorkflow.id === updatedWorkflow.id ? updatedWorkflow : currentWorkflow,
-    );
-  };
-
-  const onWorkflowDelete = (deletedWorkflow: WorkflowResponseDto) => {
-    workflows = workflows.filter((currentWorkflow) => currentWorkflow.id !== deletedWorkflow.id);
-  };
-
   const getFilterLabel = (filterId: string) => {
     const meta = pluginFilterLookup.get(filterId);
     return meta?.title ?? $t('filter');
@@ -138,9 +127,23 @@
       ],
     });
   };
+
+  const { Create } = $derived(getWorkflowsActions($t));
+
+  const onWorkflowCreate = async (response: WorkflowResponseDto) => {
+    await goto(Route.viewWorkflow(response));
+  };
+
+  const onWorkflowUpdate = (response: WorkflowResponseDto) => {
+    workflows = workflows.map((workflow) => (workflow.id === response.id ? response : workflow));
+  };
+
+  const onWorkflowDelete = (response: WorkflowResponseDto) => {
+    workflows = workflows.filter(({ id }) => id !== response.id);
+  };
 </script>
 
-<OnEvents {onWorkflowUpdate} {onWorkflowDelete} />
+<OnEvents {onWorkflowCreate} {onWorkflowUpdate} {onWorkflowDelete} />
 
 {#snippet chipItem(title: string)}
   <span class="rounded-xl border border-gray-200/80 px-3 py-1.5 text-sm dark:border-gray-600 bg-light">
@@ -148,23 +151,14 @@
   </span>
 {/snippet}
 
-<UserPageLayout title={data.meta.title} scrollbar={false}>
-  {#snippet buttons()}
-    <HStack gap={1}>
-      <Button size="small" variant="ghost" color="secondary" onclick={handleCreateWorkflow}>
-        <Icon icon={mdiPlus} size="18" />
-        {$t('create_workflow')}
-      </Button>
-    </HStack>
-  {/snippet}
-
+<UserPageLayout title={data.meta.title} actions={[Create]} scrollbar={false}>
   <section class="flex place-content-center sm:mx-4">
     <section class="w-full pb-28 sm:w-5/6 md:w-4xl">
       {#if workflows.length === 0}
         <EmptyPlaceholder
           title={$t('create_first_workflow')}
           text={$t('workflows_help_text')}
-          onClick={handleCreateWorkflow}
+          onClick={() => Create.onAction(Create)}
           src={emptyWorkflows}
           class="mt-10 mx-auto"
         />

web/src/routes/+layout.svelte

@@ -8,7 +8,6 @@
   import AppleHeader from '$lib/components/shared-components/apple-header.svelte';
   import NavigationLoadingBar from '$lib/components/shared-components/navigation-loading-bar.svelte';
   import UploadPanel from '$lib/components/shared-components/upload-panel.svelte';
-  import { AppRoute } from '$lib/constants';
   import { eventManager } from '$lib/managers/event-manager.svelte';
   import { serverConfigManager } from '$lib/managers/server-config-manager.svelte';
   import { themeManager } from '$lib/managers/theme-manager.svelte';
@@ -89,7 +88,7 @@
   });
 
   $effect.pre(() => {
-    if ($user || page.url.pathname.startsWith(AppRoute.MAINTENANCE)) {
+    if ($user || page.url.pathname.startsWith(Route.maintenanceMode())) {
       openWebsocketConnection();
     } else {
       closeWebsocketConnection();

web/src/routes/+page.ts

@@ -1,4 +1,3 @@
-import { AppRoute } from '$lib/constants';
 import { serverConfigManager } from '$lib/managers/server-config-manager.svelte';
 import { Route } from '$lib/route';
 import { getFormatter } from '$lib/utils/i18n';
@@ -15,7 +14,7 @@ export const load = (async ({ fetch }) => {
     await init(fetch);
 
     if (serverConfigManager.value.maintenanceMode) {
-      redirect(307, AppRoute.MAINTENANCE);
+      redirect(307, Route.maintenanceMode());
     }
 
     const authenticated = await loadUser();

web/src/routes/link/+page.ts

@@ -1,4 +1,4 @@
-import { AppRoute, OpenQueryParam } from '$lib/constants';
+import { OpenQueryParam } from '$lib/constants';
 import { Route } from '$lib/route';
 import { redirect } from '@sveltejs/kit';
 import type { PageLoad } from './$types';
@@ -34,7 +34,7 @@ export const load = (({ url }) => {
       // https://my.immich.app/link?target=activate_license&licenseKey=IMCL-9XC3-T4S3-37BU-GGJ5-8MWP-F2Y1-BGEX-AQTF
       const licenseKey = queryParams.get('licenseKey');
       const activationKey = queryParams.get('activationKey');
-      const redirectUrl = new URL(AppRoute.BUY, url.origin);
+      const redirectUrl = new URL(Route.buy(), url.origin);
 
       if (licenseKey) {
         redirectUrl.searchParams.append('licenseKey', licenseKey);