chore(deps): update node.js to v24.16.0

Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>

.nvmrc

@@ -1 +1 @@
-24.15.0
+24.16.0

docs/mise.toml

@@ -28,4 +28,4 @@ run = "prettier --write ."
 run = "wrangler pages deploy build --project-name=${PROJECT_NAME} --branch=${BRANCH_NAME}"
 
 [tools]
-wrangler = "4.91.0"
+wrangler = "4.98.0"

mise.lock

@@ -83,7 +83,7 @@ version = "7.1.3-6"
 backend = "github:jellyfin/jellyfin-ffmpeg"
 
 [tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_linuxarm64-gpl.tar.xz"
+asset_pattern = "jellyfin-ffmpeg_*_portable_macarm64-gpl.tar.xz"
 
 [[tools."github:webassembly/binaryen"]]
 version = "version_124"
@@ -217,37 +217,37 @@ checksum = "sha256:27323f70c875b8251bfd7e61a4cffc3ebff4e56ed1e611b955016f0c70773
 url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_windows_amd64.tar.gz"
 
 [[tools.pnpm]]
-version = "11.4.0"
+version = "11.5.2"
 backend = "aqua:pnpm/pnpm"
 
 [tools.pnpm."platforms.linux-arm64"]
-checksum = "sha256:cc38ebd5b2610a5744f84576b963c49e6609a8df5aed714ae3de749998d4478c"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-arm64.tar.gz"
+checksum = "sha256:7fef0c74081135d777754fccf25272f698e504b26ba0568504846c0cea402f8f"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.5.2/pnpm-linux-arm64.tar.gz"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.linux-arm64-musl"]
-checksum = "sha256:a1e2ec9123c709fd04b704227cfcf3b50cd2bbbc1bd39d2df414530b5697eb75"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-arm64-musl.tar.gz"
+checksum = "sha256:843beed7bca760276d29f8950ca219600995d345dbc93fad8150b3e5f83b74d4"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.5.2/pnpm-linux-arm64-musl.tar.gz"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.linux-x64"]
-checksum = "sha256:f3f8d1217eef013bbc71a24d52efb1f1041e4aff55edd80e0b08e25f409305a4"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-x64.tar.gz"
+checksum = "sha256:2033a702618c8576dc6bb0f6adb3a67ab506031351ddd59ca50d1bcaf5d13dc5"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.5.2/pnpm-linux-x64.tar.gz"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.linux-x64-musl"]
-checksum = "sha256:60010ad00a96b71e20d1618acaca7a71395e710cbd5e88946c030a1d07c56916"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-x64-musl.tar.gz"
+checksum = "sha256:0b794b23461c7475f7ffc29c4945692838b51ddadd857a2ace8edf0018798305"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.5.2/pnpm-linux-x64-musl.tar.gz"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.macos-arm64"]
-checksum = "sha256:ba59014c2c1ce8b76af9f559385206a2623de4ff2b694b5c91598a8f44abb4e2"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-darwin-arm64.tar.gz"
+checksum = "sha256:54993dae26bea0f3c1b0e15f9427f6f6a86827d56f32d1d1554d8cda59a62399"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.5.2/pnpm-darwin-arm64.tar.gz"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.windows-x64"]
-checksum = "sha256:84ce90e38bc0b1164173eb853a0fbffc7edcb050cb0d5c8ce4ca609f5c808e0a"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-win32-x64.zip"
+checksum = "sha256:b3ddff2c2bf87d3996fadf074bac58cd2259f718a17912a04ae930e3775b30e9"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.5.2/pnpm-win32-x64.zip"
 provenance = "github-attestations"
 
 [[tools.terragrunt]]

mise.toml

@@ -15,8 +15,8 @@ config_roots = [
 ]
 
 [tools]
-node = "24.15.0"
-pnpm = "11.4.0"
+node = "24.16.0"
+pnpm = "11.5.2"
 terragrunt = "1.0.3"
 opentofu = "1.11.6"
 "npm:oazapfts" = "7.5.0"

mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorker.kt

@@ -69,7 +69,7 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :
 
     val notificationChannel = NotificationChannel(
       NOTIFICATION_CHANNEL_ID,
-      NOTIFICATION_CHANNEL_ID,
+      ctx.getString(R.string.background_worker_notification_channel_name),
       NotificationManager.IMPORTANCE_LOW
     )
     notificationManager.createNotificationChannel(notificationChannel)

mobile/android/app/src/main/res/values/strings.xml

@@ -5,4 +5,9 @@
 
   <string name="memory_widget_description">See memories from Immich.</string>
   <string name="random_widget_description">View a random image from your library or a specific album.</string>
+
+  <string name="bg_downloader_notification_channel_name">Uploads and downloads</string>
+  <string name="bg_downloader_notification_channel_description">Progress updates for uploads and downloads</string>
+
+  <string name="background_worker_notification_channel_name">Background backup</string>
 </resources>

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

@@ -20,7 +20,10 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
   const DriftRemoteAlbumRepository(this._db) : super(_db);
 
   Future<List<RemoteAlbum>> getAll({Set<SortRemoteAlbumsBy> sortBy = const {SortRemoteAlbumsBy.updatedAt}}) {
-    final assetCount = _db.remoteAlbumAssetEntity.assetId.count(distinct: true);
+    // Count non-trashed assets via the joined asset table. Filtering trashed assets in the
+    // join condition (instead of the where clause) keeps albums whose assets are all trashed
+    // in the result, the same way truly empty albums are kept
+    final assetCount = _db.remoteAssetEntity.id.count(distinct: true);
 
     final query = _db.remoteAlbumEntity.select().join([
       leftOuterJoin(
@@ -30,7 +33,8 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
       ),
       leftOuterJoin(
         _db.remoteAssetEntity,
-        _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId),
+        _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId) &
+            _db.remoteAssetEntity.deletedAt.isNull(),
         useColumns: false,
       ),
       leftOuterJoin(
@@ -47,7 +51,6 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
       ),
     ]);
     query
-      ..where(_db.remoteAssetEntity.deletedAt.isNull())
       ..addColumns([assetCount])
       ..addColumns([_db.userEntity.name, _db.userEntity.id])
       ..addColumns([_db.remoteAlbumUserEntity.userId.count(distinct: true)])
@@ -79,7 +82,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
   }
 
   Future<RemoteAlbum?> get(String albumId) {
-    final assetCount = _db.remoteAlbumAssetEntity.assetId.count(distinct: true);
+    final assetCount = _db.remoteAssetEntity.id.count(distinct: true);
 
     final query =
         _db.remoteAlbumEntity.select().join([
@@ -90,7 +93,8 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
             ),
             leftOuterJoin(
               _db.remoteAssetEntity,
-              _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId),
+              _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId) &
+                  _db.remoteAssetEntity.deletedAt.isNull(),
               useColumns: false,
             ),
             leftOuterJoin(
@@ -106,7 +110,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
               useColumns: false,
             ),
           ])
-          ..where(_db.remoteAlbumEntity.id.equals(albumId) & _db.remoteAssetEntity.deletedAt.isNull())
+          ..where(_db.remoteAlbumEntity.id.equals(albumId))
           ..addColumns([assetCount])
           ..addColumns([_db.userEntity.name, _db.userEntity.id])
           ..addColumns([_db.remoteAlbumUserEntity.userId.count(distinct: true)])
@@ -515,7 +519,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
       return [];
     }
 
-    final assetCount = _db.remoteAlbumAssetEntity.assetId.count(distinct: true);
+    final assetCount = _db.remoteAssetEntity.id.count(distinct: true);
     final query =
         _db.remoteAlbumEntity.select().join([
             leftOuterJoin(
@@ -525,7 +529,8 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
             ),
             leftOuterJoin(
               _db.remoteAssetEntity,
-              _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId),
+              _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId) &
+                  _db.remoteAssetEntity.deletedAt.isNull(),
               useColumns: false,
             ),
             leftOuterJoin(
@@ -541,7 +546,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
               useColumns: false,
             ),
           ])
-          ..where(_db.remoteAlbumEntity.id.isIn(albumIds) & _db.remoteAssetEntity.deletedAt.isNull())
+          ..where(_db.remoteAlbumEntity.id.isIn(albumIds))
           ..addColumns([assetCount])
           ..addColumns([_db.remoteAlbumUserEntity.userId.count(distinct: true)])
           ..addColumns([_db.userEntity.name, _db.userEntity.id])

mobile/test/medium/repositories/remote_album_repository_test.dart

@@ -44,6 +44,94 @@ void main() {
     });
   });
 
+  group('getAll', () {
+    test('returns album when all of its assets are trashed', () async {
+      final user = await ctx.newUser();
+      final album = await ctx.newRemoteAlbum(ownerId: user.id);
+      final asset1 = await ctx.newRemoteAsset(ownerId: user.id, deletedAt: DateTime(2025, 1, 1));
+      final asset2 = await ctx.newRemoteAsset(ownerId: user.id, deletedAt: DateTime(2025, 1, 1));
+      await ctx.newRemoteAlbumAsset(albumId: album.id, assetId: asset1.id);
+      await ctx.newRemoteAlbumAsset(albumId: album.id, assetId: asset2.id);
+
+      final albums = await sut.getAll();
+
+      expect(albums, hasLength(1));
+      expect(albums.first.id, album.id);
+      expect(albums.first.assetCount, 0);
+    });
+
+    test('excludes trashed assets from assetCount', () async {
+      final user = await ctx.newUser();
+      final album = await ctx.newRemoteAlbum(ownerId: user.id);
+      final active1 = await ctx.newRemoteAsset(ownerId: user.id);
+      final active2 = await ctx.newRemoteAsset(ownerId: user.id);
+      final trashed = await ctx.newRemoteAsset(ownerId: user.id, deletedAt: DateTime(2025, 1, 1));
+      await ctx.newRemoteAlbumAsset(albumId: album.id, assetId: active1.id);
+      await ctx.newRemoteAlbumAsset(albumId: album.id, assetId: active2.id);
+      await ctx.newRemoteAlbumAsset(albumId: album.id, assetId: trashed.id);
+
+      final albums = await sut.getAll();
+
+      expect(albums, hasLength(1));
+      expect(albums.first.assetCount, 2);
+    });
+
+    test('returns album without assets', () async {
+      final user = await ctx.newUser();
+      final album = await ctx.newRemoteAlbum(ownerId: user.id);
+
+      final albums = await sut.getAll();
+
+      expect(albums, hasLength(1));
+      expect(albums.first.id, album.id);
+      expect(albums.first.assetCount, 0);
+    });
+  });
+
+  group('get', () {
+    test('returns the album when all of its assets are trashed', () async {
+      final user = await ctx.newUser();
+      final album = await ctx.newRemoteAlbum(ownerId: user.id);
+      final asset = await ctx.newRemoteAsset(ownerId: user.id, deletedAt: DateTime(2025, 1, 1));
+      await ctx.newRemoteAlbumAsset(albumId: album.id, assetId: asset.id);
+
+      final result = await sut.get(album.id);
+
+      expect(result, isNotNull);
+      expect(result?.id, album.id);
+      expect(result?.assetCount, 0);
+    });
+  });
+
+  group('getAlbumsContainingAsset', () {
+    test('excludes trashed assets from assetCount', () async {
+      final user = await ctx.newUser();
+      final album = await ctx.newRemoteAlbum(ownerId: user.id);
+      final asset = await ctx.newRemoteAsset(ownerId: user.id);
+      final trashed = await ctx.newRemoteAsset(ownerId: user.id, deletedAt: DateTime(2025, 1, 1));
+      await ctx.newRemoteAlbumAsset(albumId: album.id, assetId: asset.id);
+      await ctx.newRemoteAlbumAsset(albumId: album.id, assetId: trashed.id);
+
+      final albums = await sut.getAlbumsContainingAsset(asset.id);
+
+      expect(albums, hasLength(1));
+      expect(albums.first.id, album.id);
+      expect(albums.first.assetCount, 1);
+    });
+
+    test('returns albums for a trashed asset', () async {
+      final user = await ctx.newUser();
+      final album = await ctx.newRemoteAlbum(ownerId: user.id);
+      final trashed = await ctx.newRemoteAsset(ownerId: user.id, deletedAt: DateTime(2025, 1, 1));
+      await ctx.newRemoteAlbumAsset(albumId: album.id, assetId: trashed.id);
+
+      final albums = await sut.getAlbumsContainingAsset(trashed.id);
+
+      expect(albums, hasLength(1));
+      expect(albums.first.assetCount, 0);
+    });
+  });
+
   group('getSortedAlbumIds', () {
     late String userId;
 

package.json

@@ -11,7 +11,7 @@
     "release": "./misc/release/pump-version.sh",
     "pump": "node ./misc/release/pump-wrapper.js"
   },
-  "packageManager": "pnpm@11.4.0",
+  "packageManager": "pnpm@11.5.2",
   "engines": {
     "pnpm": ">=10.0.0"
   },

packages/cli/package.json

@@ -29,7 +29,7 @@
     "@vitest/coverage-v8": "^4.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
-    "commander": "^12.0.0",
+    "commander": "^15.0.0",
     "eslint": "^10.0.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.1.3",

packages/e2e-auth-server/package.json

@@ -13,5 +13,5 @@
     "oidc-provider": "^9.0.0",
     "tsx": "^4.20.6"
   },
-  "packageManager": "pnpm@11.4.0"
+  "packageManager": "pnpm@11.5.2"
 }

packages/plugin-sdk/package.json

@@ -24,7 +24,7 @@
   "keywords": [],
   "author": "",
   "license": "GNU Affero General Public License version 3",
-  "packageManager": "pnpm@11.4.0",
+  "packageManager": "pnpm@11.5.2",
   "devDependencies": {
     "@extism/js-pdk": "^1.1.1",
     "@immich/sdk": "workspace:*",

web/package.json

@@ -105,7 +105,7 @@
     "prettier-plugin-sort-json": "^4.1.1",
     "prettier-plugin-svelte": "^4.0.0",
     "rollup-plugin-visualizer": "^7.0.0",
-    "svelte": "5.55.8",
+    "svelte": "5.56.2",
     "svelte-check": "^4.4.6",
     "svelte-eslint-parser": "^1.3.3",
     "tailwindcss": "^4.2.4",

web/src/lib/components/CalendarHeatmap.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import { locale } from '$lib/stores/preferences.store';
   import type { CalendarHeatmapResponseDto } from '@immich/sdk';
-  import { DateTime } from 'luxon';
+  import { Text } from '@immich/ui';
+  import { DateTime, Info } from 'luxon';
   import { t } from 'svelte-i18n';
 
   type Props = {
@@ -12,20 +13,8 @@
 
   const { data, itemLabel, totalLabel }: Props = $props();
 
-  const { rows } = $derived.by(() => {
-    const weeks = Array.from({ length: Math.ceil(data.series.length / 7) }, (_, index) =>
-      data.series.slice(index * 7, index * 7 + 7),
-    );
-
-    const rows = Array.from({ length: 7 }, (_, dayIndex) => weeks.map((week) => week[dayIndex]).filter(Boolean));
-    const endDate = DateTime.fromISO(data.to, { zone: 'utc' });
-
-    const months = Array.from({ length: 4 }, (_, index) =>
-      endDate.minus({ months: 11 - index * 4 }).toLocaleString({ month: 'short' }, { locale: $locale }),
-    );
-
-    return { rows, months };
-  });
+  const startDate = $derived(DateTime.fromISO(data.from, { zone: 'utc' }));
+  const padding = $derived(startDate.diff(startDate.startOf('week', { useLocaleWeeks: true })).as('days'));
 
   const maxCount = $derived(Math.max(...data.series.map((item) => item.count), 0));
 
@@ -49,45 +38,47 @@
     return 'bg-immich-primary';
   };
 
-  // const dayLabels = $derived([
-  //   '',
-  //   dayOfWeek('monday', { locale: $locale, style: 'short' }),
-  //   '',
-  //   dayOfWeek('wednesday', { locale: $locale, style: 'short' }),
-  //   '',
-  //   dayOfWeek('friday', { locale: $locale, style: 'short' }),
-  //   '',
-  // ]);
+  const weekdays = $derived([
+    Info.weekdays('short', { locale: $locale })[0],
+    Info.weekdays('short', { locale: $locale })[2],
+    Info.weekdays('short', { locale: $locale })[4],
+    Info.weekdays('short', { locale: $locale })[6],
+  ]);
 </script>
 
 <div class="mt-4 w-full">
   <div class="relative w-full">
     <!-- TODO -->
-    <!-- <div class="absolute top-4 left-0 flex flex-col gap-0.5">
-      {#each dayLabels as dayLabel, i (i)}
-        <div class="relative flex h-3 w-6 items-center text-xs text-gray-500 dark:text-gray-400">
-          {dayLabel}
-        </div>
-      {/each}
-    </div> -->
-
     <!-- <div class="mb-1 flex justify-between text-xs text-gray-500 dark:text-gray-400">
       {#each getUploadActivityMonths() as month (month)}
         <div>{month}</div>
       {/each}
     </div> -->
 
-    <div class="grid grid-rows-7 gap-0.5">
-      {#each rows as row, dayIndex (dayIndex)}
-        <div class="grid grid-cols-52 gap-0.5">
-          {#each row as day (day.date)}
-            <div
-              class="aspect-square w-full min-w-0 rounded-sm {itemColors(day.count)}"
-              title={itemLabel({ date: day.date, count: day.count })}
-              aria-label={itemLabel({ date: day.date, count: day.count })}
-            ></div>
-          {/each}
-        </div>
+    <div class="grid grid-flow-col grid-rows-7 gap-0.5">
+      <div class="row-span-7 grid grid-rows-subgrid">
+        {#if Info.getStartOfWeek({ locale: $locale }) === 7}
+          <div></div>
+        {/if}
+        <div class="row-span-2 -mt-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[0]}</Text></div>
+        <div class="row-span-2 -mt-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[1]}</Text></div>
+        <div class="row-span-2 -mt-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[2]}</Text></div>
+        {#if Info.getStartOfWeek({ locale: $locale }) === 1}
+          <div class="-my-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[3]}</Text></div>
+        {/if}
+      </div>
+
+      {#each data.series as day, idx (day.date)}
+        {@const date = DateTime.fromISO(day.date, { zone: 'utc' }).toLocaleString(
+          { month: 'short', day: 'numeric' },
+          { locale: $locale },
+        )}
+        <div
+          class="aspect-square size-full rounded-sm {itemColors(day.count)} row-start-(--heatmap-row-start)"
+          style:--heatmap-row-start={idx === 0 ? padding + 1 : undefined}
+          title={itemLabel({ date, count: day.count })}
+          aria-label={itemLabel({ date, count: day.count })}
+        ></div>
       {/each}
     </div>