From 25b910e567243c5246ee09957bff447d97ac517b Mon Sep 17 00:00:00 2001
From: Lakshmi Tanmay <lakshmi@voltcrash.com>
Date: Fri, 2 Oct 2026 09:21:05 +0530
Subject: [PATCH 1/7] fix: retry original images when optimization fails

---
 src/lib/images.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/lib/images.ts b/src/lib/images.ts
index 2e00400..8e6e581 100644
--- a/src/lib/images.ts
+++ b/src/lib/images.ts
@@ -11,3 +11,13 @@ export function imageSrcset(url: string, widths: readonly ImageWidth[]): string
   if (!__VERCEL_IMAGES__) return undefined;
   return widths.map((w) => `${optimizedImage(url, w)} ${w}w`).join(", ");
 }
+
+export function retryOriginalImage(
+  image: Pick<HTMLImageElement, "src" | "srcset">,
+  url: string,
+): boolean {
+  if (image.src === url) return false;
+  image.srcset = "";
+  image.src = url;
+  return true;
+}

From f0476865027aec5febd3b9098ebd67f3e2a81758 Mon Sep 17 00:00:00 2001
From: Lakshmi Tanmay <lakshmi@voltcrash.com>
Date: Fri, 2 Oct 2026 09:21:05 +0530
Subject: [PATCH 2/7] test: cover image fallback and retry limits

---
 src/lib/images.test.ts | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/lib/images.test.ts

diff --git a/src/lib/images.test.ts b/src/lib/images.test.ts
new file mode 100644
index 0000000..bf25ed5
--- /dev/null
+++ b/src/lib/images.test.ts
@@ -0,0 +1,26 @@
+import { describe, expect, it } from "vite-plus/test";
+import { retryOriginalImage } from "./images.js";
+
+const url = "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/25.png";
+
+describe("retryOriginalImage", () => {
+  it("retries the original when the optimizer fails and clears responsive candidates", () => {
+    const image = {
+      src: "https://dexa.voltcrash.com/_vercel/image?url=artwork",
+      srcset: "optimized 384w",
+    };
+    expect(retryOriginalImage(image, url)).toBe(true);
+    expect(image).toEqual({ src: url, srcset: "" });
+  });
+
+  it("stops retrying when the original also fails", () => {
+    const image = { src: "/_vercel/image?url=artwork", srcset: "" };
+    retryOriginalImage(image, url);
+    expect(retryOriginalImage(image, url)).toBe(false);
+  });
+
+  it("does not retry an image already served directly", () => {
+    const image = { src: url, srcset: "" };
+    expect(retryOriginalImage(image, url)).toBe(false);
+  });
+});

From a3dc9e5fbaf64ba7bdb4707b31b74904e49576a2 Mon Sep 17 00:00:00 2001
From: Lakshmi Tanmay <lakshmi@voltcrash.com>
Date: Fri, 2 Oct 2026 09:21:05 +0530
Subject: [PATCH 3/7] fix: recover Pokemon artwork when optimization fails

---
 src/lib/components/pokemon/pokemon-art.svelte | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/pokemon/pokemon-art.svelte b/src/lib/components/pokemon/pokemon-art.svelte
index 9139b3e..d85fc64 100644
--- a/src/lib/components/pokemon/pokemon-art.svelte
+++ b/src/lib/components/pokemon/pokemon-art.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { imageSrcset, optimizedImage, type ImageWidth } from "#lib/images.js";
+	import { imageSrcset, optimizedImage, retryOriginalImage, type ImageWidth } from "#lib/images.js";
 	import { artworkUrl } from "#lib/pokemon/sprites.js";
 	import { cn } from "#lib/utils.js";
 
@@ -55,7 +55,9 @@
 		loading={eager ? "eager" : "lazy"}
 		fetchpriority={eager ? "high" : undefined}
 		decoding="async"
-		onerror={() => (failed = true)}
+		onerror={(event) => {
+			if (!retryOriginalImage(event.currentTarget as HTMLImageElement, url)) failed = true;
+		}}
 		class={cn("aspect-square h-auto w-full object-contain", className)}
 	/>
 {/if}

From 4b2b631e1c3939dc1c9f9fcc36340ff96b30151d Mon Sep 17 00:00:00 2001
From: Lakshmi Tanmay <lakshmi@voltcrash.com>
Date: Fri, 2 Oct 2026 09:21:05 +0530
Subject: [PATCH 4/7] fix: recover images in the Pokemon picker

---
 src/lib/components/pokemon/pokemon-picker.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/pokemon/pokemon-picker.svelte b/src/lib/components/pokemon/pokemon-picker.svelte
index 83680fa..47b2c65 100644
--- a/src/lib/components/pokemon/pokemon-picker.svelte
+++ b/src/lib/components/pokemon/pokemon-picker.svelte
@@ -2,7 +2,7 @@
 	import * as Command from "#lib/components/ui/command/index.js";
 	import { loadDexList } from "#lib/dex/client.js";
 	import { DEFAULT_QUERY, queryDex, type DexListEntry } from "#lib/dex/list.js";
-	import { optimizedImage } from "#lib/images.js";
+	import { optimizedImage, retryOriginalImage } from "#lib/images.js";
 	import { dexNumber } from "#lib/pokemon/format.js";
 	import { artworkUrl } from "#lib/pokemon/sprites.js";
 	import TypeBadge from "./type-badge.svelte";
@@ -37,7 +37,7 @@
 		<Command.Empty>{entries.length ? "No Pokémon match that search." : "Loading the Pokédex…"}</Command.Empty>
 		{#each results as entry (entry.id)}
 			<Command.Item value="pick-{entry.slug}" onSelect={() => pick(entry)} class="gap-3">
-				<img src={optimizedImage(artworkUrl(entry.id), 96)} alt="" width="36" height="36" loading="lazy" class="size-9 object-contain" />
+			<img src={optimizedImage(artworkUrl(entry.id), 96)} onerror={(event) => retryOriginalImage(event.currentTarget as HTMLImageElement, artworkUrl(entry.id))} alt="" width="36" height="36" loading="lazy" class="size-9 object-contain" />
 				<span class="flex min-w-0 flex-1 flex-col">
 					<span class="truncate font-medium">{entry.name}</span>
 					<span class="text-xs text-muted-foreground tabular">{dexNumber(entry.speciesId)}</span>

From 5e13dff41bb605f52357871a8dd7ff3ad37fcc56 Mon Sep 17 00:00:00 2001
From: Lakshmi Tanmay <lakshmi@voltcrash.com>
Date: Fri, 2 Oct 2026 09:21:06 +0530
Subject: [PATCH 5/7] fix: recover command palette thumbnails

---
 src/lib/components/site/command-palette.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/site/command-palette.svelte b/src/lib/components/site/command-palette.svelte
index 385857f..455c858 100644
--- a/src/lib/components/site/command-palette.svelte
+++ b/src/lib/components/site/command-palette.svelte
@@ -9,7 +9,7 @@
 	import { parseSearch } from "#lib/dex/filters.js";
 	import { DEFAULT_QUERY, queryDex, type DexListEntry } from "#lib/dex/list.js";
 	import { matchScore } from "#lib/dex/search.js";
-	import { optimizedImage } from "#lib/images.js";
+	import { optimizedImage, retryOriginalImage } from "#lib/images.js";
 	import { navItems } from "#lib/nav.js";
 	import { dexNumber, titleCase } from "#lib/pokemon/format.js";
 	import { artworkUrl } from "#lib/pokemon/sprites.js";
@@ -84,6 +84,7 @@
 					<Command.Item value="pokemon-{entry.slug}" onSelect={() => open(`/pokemon/${entry.slug}`)} class="gap-3">
 						<img
 							src={optimizedImage(artworkUrl(entry.id), 96)}
+							onerror={(event) => retryOriginalImage(event.currentTarget as HTMLImageElement, artworkUrl(entry.id))}
 							alt=""
 							width="36"
 							height="36"

From 5e949964523708e31821b1d31be8c1068c7f6c7d Mon Sep 17 00:00:00 2001
From: Lakshmi Tanmay <lakshmi@voltcrash.com>
Date: Fri, 2 Oct 2026 09:21:06 +0530
Subject: [PATCH 6/7] fix: recover saved team thumbnails

---
 src/lib/components/team/saved-teams.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/team/saved-teams.svelte b/src/lib/components/team/saved-teams.svelte
index ea69776..1df1a01 100644
--- a/src/lib/components/team/saved-teams.svelte
+++ b/src/lib/components/team/saved-teams.svelte
@@ -9,7 +9,7 @@
 	import * as Dialog from "#lib/components/ui/dialog/index.js";
 	import { Input } from "#lib/components/ui/input/index.js";
 	import { Label } from "#lib/components/ui/label/index.js";
-	import { optimizedImage } from "#lib/images.js";
+	import { optimizedImage, retryOriginalImage } from "#lib/images.js";
 	import { artworkUrl } from "#lib/pokemon/sprites.js";
 	import type { TeamMember } from "#lib/team/analysis.js";
 	import { MAX_TEAM_NAME } from "#lib/team/validate.js";
@@ -139,6 +139,7 @@
 									{#if id}
 										<img
 											src={optimizedImage(artworkUrl(id), 96)}
+											onerror={(event) => retryOriginalImage(event.currentTarget as HTMLImageElement, artworkUrl(id))}
 											alt=""
 											width="32"
 											height="32"

From 1d28a7b5e48642cdb80001eec5e5ca7fcc073b6f Mon Sep 17 00:00:00 2001
From: Lakshmi Tanmay <lakshmi@voltcrash.com>
Date: Fri, 2 Oct 2026 09:21:06 +0530
Subject: [PATCH 7/7] fix: recover collection artwork

---
 src/routes/collection/+page.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/routes/collection/+page.svelte b/src/routes/collection/+page.svelte
index 65c0412..d083774 100644
--- a/src/routes/collection/+page.svelte
+++ b/src/routes/collection/+page.svelte
@@ -9,7 +9,7 @@
 	import { Skeleton } from "#lib/components/ui/skeleton/index.js";
 	import { loadDexList } from "#lib/dex/client.js";
 	import type { DexListEntry } from "#lib/dex/list.js";
-	import { optimizedImage } from "#lib/images.js";
+	import { optimizedImage, retryOriginalImage } from "#lib/images.js";
 	import { dexNumber } from "#lib/pokemon/format.js";
 	import { GENERATIONS } from "#lib/pokemon/generations.js";
 	import { artworkUrl } from "#lib/pokemon/sprites.js";
@@ -148,6 +148,7 @@
 						>
 							<img
 								src={optimizedImage(artworkUrl(entry.id), 96)}
+								onerror={(event) => retryOriginalImage(event.currentTarget as HTMLImageElement, artworkUrl(entry.id))}
 								alt=""
 								width="72"
 								height="72"