@inoo-ch/payload-image-optimizer 1.3.7 → 1.3.9

package/dist/components/ImageBox.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import { type ImageProps } from 'next/image';
+import type { MediaResource } from '../types.js';
+export interface ImageBoxProps extends Omit<ImageProps, 'src' | 'alt'> {
+    media: MediaResource | string;
+    alt?: string;
+}
+export declare const ImageBox: React.FC<ImageBoxProps>;

package/dist/components/OptimizationStatus.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const OptimizationStatus: React.FC<{
+    path?: string;
+}>;

package/dist/components/RegenerationButton.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const RegenerationButton: React.FC;

package/dist/components/RegenerationButton.js

@@ -11,6 +11,7 @@ export const RegenerationButton = ()=>{
     const [stalled, setStalled] = useState(false);
     const [collectionSlug, setCollectionSlug] = useState(null);
     const [stats, setStats] = useState(null);
+    const [confirming, setConfirming] = useState(false);
     const intervalRef = useRef(null);
     const stallRef = useRef({
         lastProcessed: 0,
@@ -121,9 +122,22 @@ export const RegenerationButton = ()=>{
         isRunning,
         fetchStats
     ]);
-    const handleRegenerate = async ()=>{
+    // Phase 1: Show confirmation with counts
+    const handlePreflight = async ()=>{
         if (!collectionSlug) return;
         setError(null);
+        // Refresh stats to get the latest counts before confirming
+        await fetchStats();
+        setConfirming(true);
+    };
+    const handleCancel = ()=>{
+        setConfirming(false);
+    };
+    // Phase 2: Actually start regeneration (after user confirms)
+    const handleConfirm = async ()=>{
+        if (!collectionSlug) return;
+        setConfirming(false);
+        setError(null);
         setStalled(false);
         setIsRunning(true);
         setQueued(null);
@@ -182,8 +196,8 @@ export const RegenerationButton = ()=>{
             flexWrap: 'wrap'
         },
         children: [
-            /*#__PURE__*/ _jsx("button", {
-                onClick: handleRegenerate,
+            !confirming && /*#__PURE__*/ _jsx("button", {
+                onClick: handlePreflight,
                 disabled: isRunning,
                 style: {
                     backgroundColor: isRunning ? '#9ca3af' : '#4f46e5',
@@ -195,9 +209,53 @@ export const RegenerationButton = ()=>{
                     fontWeight: 500,
                     cursor: isRunning ? 'not-allowed' : 'pointer'
                 },
-                children: isRunning ? 'Regenerating...' : 'Regenerate Images'
+                children: isRunning ? 'Processing all images...' : 'Regenerate All Images'
             }),
-            /*#__PURE__*/ _jsxs("label", {
+            confirming && stats && /*#__PURE__*/ _jsxs("div", {
+                style: {
+                    display: 'flex',
+                    alignItems: 'center',
+                    gap: '10px'
+                },
+                children: [
+                    /*#__PURE__*/ _jsx("span", {
+                        style: {
+                            fontSize: '13px',
+                            color: '#374151'
+                        },
+                        children: force ? `Re-process all ${stats.total} images across the entire collection?` : `Regenerate ${stats.pending} unoptimized image${stats.pending !== 1 ? 's' : ''} across the entire collection?`
+                    }),
+                    /*#__PURE__*/ _jsx("button", {
+                        onClick: handleConfirm,
+                        style: {
+                            backgroundColor: '#4f46e5',
+                            color: '#fff',
+                            border: 'none',
+                            borderRadius: '6px',
+                            padding: '6px 14px',
+                            fontSize: '13px',
+                            fontWeight: 500,
+                            cursor: 'pointer'
+                        },
+                        children: "Confirm"
+                    }),
+                    /*#__PURE__*/ _jsx("button", {
+                        onClick: handleCancel,
+                        style: {
+                            backgroundColor: 'transparent',
+                            color: '#6b7280',
+                            border: '1px solid #d1d5db',
+                            borderRadius: '6px',
+                            padding: '6px 14px',
+                            fontSize: '13px',
+                            fontWeight: 500,
+                            cursor: 'pointer'
+                        },
+                        children: "Cancel"
+                    })
+                ]
+            }),
+            !confirming && /*#__PURE__*/ _jsxs("label", {
                 style: {
                     display: 'flex',
                     alignItems: 'center',
@@ -221,7 +279,20 @@ export const RegenerationButton = ()=>{
                 },
                 children: error
             }),
-            queued === 0 && !isRunning && !stalled && /*#__PURE__*/ _jsx("span", {
+            queued !== null && queued > 0 && isRunning && !confirming && /*#__PURE__*/ _jsxs("span", {
+                style: {
+                    color: '#4f46e5',
+                    fontSize: '13px'
+                },
+                children: [
+                    "Queued ",
+                    queued,
+                    " image",
+                    queued !== 1 ? 's' : '',
+                    " for processing across the entire collection"
+                ]
+            }),
+            queued === 0 && !isRunning && !stalled && !confirming && /*#__PURE__*/ _jsx("span", {
                 style: {
                     color: '#10b981',
                     fontSize: '13px'
@@ -311,7 +382,7 @@ export const RegenerationButton = ()=>{
                     })
                 ]
             }),
-            !isRunning && progress && progress.complete > 0 && queued !== 0 && /*#__PURE__*/ _jsxs("span", {
+            !isRunning && progress && progress.complete > 0 && queued !== 0 && !confirming && /*#__PURE__*/ _jsxs("span", {
                 style: {
                     fontSize: '13px'
                 },
@@ -325,7 +396,7 @@ export const RegenerationButton = ()=>{
                             progress.complete,
                             "/",
                             progress.total,
-                            " optimized."
+                            " optimized (across entire collection)."
                         ]
                     }),
                     (progress.errored > 0 || stalled && progress.pending > 0) && /*#__PURE__*/ _jsxs("span", {

package/dist/components/RegenerationButton.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/components/RegenerationButton.tsx"],"sourcesContent":["'use client'\n\nimport React, { useState, useEffect, useCallback, useRef } from 'react'\n\ntype RegenerationProgress = {\n  total: number\n  complete: number\n  errored: number\n  pending: number\n}\n\nconst STALL_THRESHOLD = 5\n\nexport const RegenerationButton: React.FC = () => {\n  const [isRunning, setIsRunning] = useState(false)\n  const [progress, setProgress] = useState<RegenerationProgress | null>(null)\n  const [queued, setQueued] = useState<number | null>(null)\n  const [force, setForce] = useState(false)\n  const [error, setError] = useState<string | null>(null)\n  const [stalled, setStalled] = useState(false)\n  const [collectionSlug, setCollectionSlug] = useState<string | null>(null)\n  const [stats, setStats] = useState<RegenerationProgress | null>(null)\n  const intervalRef = useRef<ReturnType<typeof setInterval> | null>(null)\n  const stallRef = useRef({ lastProcessed: 0, stallCount: 0 })\n  const prevIsRunningRef = useRef(false)\n\n  // Extract collection slug from URL after mount to avoid hydration mismatch\n  useEffect(() => {\n    const slug = window.location.pathname.split('/collections/')[1]?.split('/')[0] ?? null\n    setCollectionSlug(slug)\n  }, [])\n\n  // Fetch optimization stats (independent of regeneration)\n  const fetchStats = useCallback(async () => {\n    if (!collectionSlug) return\n    try {\n      const res = await fetch(\n        `/api/image-optimizer/regenerate?collection=${collectionSlug}`,\n      )\n      if (res.ok) {\n        const data: RegenerationProgress = await res.json()\n        setStats(data)\n      }\n    } catch {\n      // ignore stats fetch errors\n    }\n  }, [collectionSlug])\n\n  const stopPolling = useCallback(() => {\n    if (intervalRef.current) {\n      clearInterval(intervalRef.current)\n      intervalRef.current = null\n    }\n  }, [])\n\n  const pollProgress = useCallback(async () => {\n    if (!collectionSlug) return\n    try {\n      const res = await fetch(\n        `/api/image-optimizer/regenerate?collection=${collectionSlug}`,\n      )\n      if (res.ok) {\n        const data: RegenerationProgress = await res.json()\n        setProgress(data)\n\n        // Stop polling when no more pending\n        if (data.pending <= 0) {\n          setIsRunning(false)\n          stopPolling()\n          return\n        }\n\n        // Stall detection\n        const processed = data.complete + data.errored\n        if (processed === stallRef.current.lastProcessed) {\n          stallRef.current.stallCount += 1\n        } else {\n          stallRef.current.stallCount = 0\n          stallRef.current.lastProcessed = processed\n        }\n\n        if (stallRef.current.stallCount >= STALL_THRESHOLD) {\n          stopPolling()\n          setIsRunning(false)\n          setStalled(true)\n        }\n      }\n    } catch {\n      // ignore polling errors\n    }\n  }, [collectionSlug, stopPolling])\n\n  // On mount (once collectionSlug is known), check if there's an ongoing job and resume polling\n  useEffect(() => {\n    if (!collectionSlug) return\n    let cancelled = false\n    const checkOngoing = async () => {\n      try {\n        const res = await fetch(\n          `/api/image-optimizer/regenerate?collection=${collectionSlug}`,\n        )\n        if (!res.ok || cancelled) return\n        const data: RegenerationProgress = await res.json()\n        // Always store stats on mount\n        setStats(data)\n        if (data.pending > 0) {\n          setProgress(data)\n          setIsRunning(true)\n          setStalled(false)\n          setQueued(null)\n          stallRef.current = { lastProcessed: data.complete + data.errored, stallCount: 0 }\n          intervalRef.current = setInterval(pollProgress, 2000)\n        }\n      } catch {\n        // ignore\n      }\n    }\n    checkOngoing()\n    return () => {\n      cancelled = true\n    }\n  }, [collectionSlug, pollProgress])\n\n  // Refresh stats when regeneration finishes (isRunning transitions from true to false)\n  useEffect(() => {\n    if (prevIsRunningRef.current && !isRunning) {\n      fetchStats()\n    }\n    prevIsRunningRef.current = isRunning\n  }, [isRunning, fetchStats])\n\n  const handleRegenerate = async () => {\n    if (!collectionSlug) return\n    setError(null)\n    setStalled(false)\n    setIsRunning(true)\n    setQueued(null)\n    setProgress(null)\n    stallRef.current = { lastProcessed: 0, stallCount: 0 }\n\n    try {\n      const res = await fetch('/api/image-optimizer/regenerate', {\n        method: 'POST',\n        headers: { 'Content-Type': 'application/json' },\n        body: JSON.stringify({ collectionSlug, force }),\n      })\n\n      if (!res.ok) {\n        const data = await res.json()\n        throw new Error(data.error || 'Failed to start regeneration')\n      }\n\n      const data = await res.json()\n      setQueued(data.queued)\n\n      if (data.queued === 0) {\n        setIsRunning(false)\n        return\n      }\n\n      // Start polling\n      intervalRef.current = setInterval(pollProgress, 2000)\n    } catch (err) {\n      setError(err instanceof Error ? err.message : String(err))\n      setIsRunning(false)\n    }\n  }\n\n  // Cleanup interval on unmount\n  useEffect(() => {\n    return () => {\n      if (intervalRef.current) clearInterval(intervalRef.current)\n    }\n  }, [])\n\n  if (!collectionSlug) return null\n\n  const progressPercent =\n    progress && progress.total > 0\n      ? Math.round(((progress.complete + progress.errored) / progress.total) * 100)\n      : 0\n\n  const showProgressBar = (isRunning && progress) || (stalled && progress)\n\n  // Stats computations\n  const statsPercent =\n    stats && stats.total > 0\n      ? Math.round((stats.complete / stats.total) * 100)\n      : 0\n  const allOptimized = stats && stats.total > 0 && stats.complete === stats.total\n\n  return (\n    <div\n      style={{\n        padding: '16px 24px',\n        borderBottom: '1px solid #e5e7eb',\n        display: 'flex',\n        alignItems: 'center',\n        gap: '16px',\n        flexWrap: 'wrap',\n      }}\n    >\n      <button\n        onClick={handleRegenerate}\n        disabled={isRunning}\n        style={{\n          backgroundColor: isRunning ? '#9ca3af' : '#4f46e5',\n          color: '#fff',\n          border: 'none',\n          borderRadius: '6px',\n          padding: '8px 16px',\n          fontSize: '14px',\n          fontWeight: 500,\n          cursor: isRunning ? 'not-allowed' : 'pointer',\n        }}\n      >\n        {isRunning ? 'Regenerating...' : 'Regenerate Images'}\n      </button>\n\n      <label\n        style={{ display: 'flex', alignItems: 'center', gap: '6px', fontSize: '13px' }}\n      >\n        <input\n          type=\"checkbox\"\n          checked={force}\n          onChange={(e) => setForce(e.target.checked)}\n          disabled={isRunning}\n        />\n        Force re-process all\n      </label>\n\n      {error && (\n        <span style={{ color: '#ef4444', fontSize: '13px' }}>{error}</span>\n      )}\n\n      {queued === 0 && !isRunning && !stalled && (\n        <span style={{ color: '#10b981', fontSize: '13px' }}>\n          All images already optimized.\n        </span>\n      )}\n\n      {stalled && progress && (\n        <span style={{ color: '#f59e0b', fontSize: '13px' }}>\n          Processing finished with issues. {progress.errored + progress.pending} image\n          {progress.errored + progress.pending !== 1 ? 's' : ''} failed\n          {progress.pending > 0 ? ` (${progress.pending} stuck)` : ''}.\n          Re-run to retry.\n        </span>\n      )}\n\n      {showProgressBar && (\n        <div style={{ flex: 1, minWidth: '200px' }}>\n          <div\n            style={{\n              display: 'flex',\n              justifyContent: 'space-between',\n              fontSize: '12px',\n              marginBottom: '4px',\n            }}\n          >\n            <span>\n              {progress.complete} / {progress.total} complete\n            </span>\n            {progress.errored > 0 && (\n              <span style={{ color: '#ef4444' }}>{progress.errored} errors</span>\n            )}\n            <span>{progressPercent}%</span>\n          </div>\n          <div\n            style={{\n              height: '6px',\n              backgroundColor: '#e5e7eb',\n              borderRadius: '3px',\n              overflow: 'hidden',\n              display: 'flex',\n            }}\n          >\n            <div\n              style={{\n                height: '100%',\n                width: `${progress.total > 0 ? Math.round((progress.complete / progress.total) * 100) : 0}%`,\n                backgroundColor: '#10b981',\n                transition: 'width 0.3s ease',\n              }}\n            />\n            {progress.errored > 0 && (\n              <div\n                style={{\n                  height: '100%',\n                  width: `${progress.total > 0 ? Math.round((progress.errored / progress.total) * 100) : 0}%`,\n                  backgroundColor: '#ef4444',\n                  transition: 'width 0.3s ease',\n                }}\n              />\n            )}\n          </div>\n        </div>\n      )}\n\n      {!isRunning && progress && progress.complete > 0 && queued !== 0 && (\n        <span style={{ fontSize: '13px' }}>\n          <span style={{ color: progress.errored > 0 || stalled ? '#f59e0b' : '#10b981' }}>\n            Done! {progress.complete}/{progress.total} optimized.\n          </span>\n          {(progress.errored > 0 || (stalled && progress.pending > 0)) && (\n            <span style={{ color: '#ef4444' }}>\n              {' '}{progress.errored + (stalled ? progress.pending : 0)} failed.\n            </span>\n          )}\n        </span>\n      )}\n\n      {/* Persistent optimization stats — always visible when not actively regenerating */}\n      {!isRunning && stats && stats.total > 0 && (\n        <div\n          style={{\n            marginLeft: 'auto',\n            display: 'flex',\n            flexDirection: 'column',\n            alignItems: 'flex-end',\n            gap: '4px',\n            minWidth: '180px',\n          }}\n        >\n          <div style={{ display: 'flex', alignItems: 'center', gap: '8px', fontSize: '13px' }}>\n            {allOptimized ? (\n              <span style={{ color: '#10b981' }}>\n                &#10003; All {stats.total} images optimized\n              </span>\n            ) : (\n              <>\n                <span style={{ color: '#6b7280' }}>\n                  {stats.complete}/{stats.total} optimized\n                </span>\n                {stats.errored > 0 && (\n                  <>\n                    <span style={{ color: '#d1d5db' }}>&middot;</span>\n                    <span style={{ color: '#ef4444' }}>{stats.errored} errors</span>\n                  </>\n                )}\n              </>\n            )}\n          </div>\n          {!allOptimized && (\n            <div\n              style={{\n                width: '100%',\n                height: '3px',\n                backgroundColor: '#e5e7eb',\n                borderRadius: '2px',\n                overflow: 'hidden',\n              }}\n            >\n              <div\n                style={{\n                  height: '100%',\n                  width: `${statsPercent}%`,\n                  backgroundColor: stats.errored > 0 ? '#f59e0b' : '#10b981',\n                  borderRadius: '2px',\n                  transition: 'width 0.3s ease',\n                }}\n              />\n            </div>\n          )}\n        </div>\n      )}\n    </div>\n  )\n}\n"],"names":["React","useState","useEffect","useCallback","useRef","STALL_THRESHOLD","RegenerationButton","isRunning","setIsRunning","progress","setProgress","queued","setQueued","force","setForce","error","setError","stalled","setStalled","collectionSlug","setCollectionSlug","stats","setStats","intervalRef","stallRef","lastProcessed","stallCount","prevIsRunningRef","slug","window","location","pathname","split","fetchStats","res","fetch","ok","data","json","stopPolling","current","clearInterval","pollProgress","pending","processed","complete","errored","cancelled","checkOngoing","setInterval","handleRegenerate","method","headers","body","JSON","stringify","Error","err","message","String","progressPercent","total","Math","round","showProgressBar","statsPercent","allOptimized","div","style","padding","borderBottom","display","alignItems","gap","flexWrap","button","onClick","disabled","backgroundColor","color","border","borderRadius","fontSize","fontWeight","cursor","label","input","type","checked","onChange","e","target","span","flex","minWidth","justifyContent","marginBottom","height","overflow","width","transition","marginLeft","flexDirection"],"mappings":"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"}
+{"version":3,"sources":["../../src/components/RegenerationButton.tsx"],"sourcesContent":["'use client'\n\nimport React, { useState, useEffect, useCallback, useRef } from 'react'\n\ntype RegenerationProgress = {\n  total: number\n  complete: number\n  errored: number\n  pending: number\n}\n\nconst STALL_THRESHOLD = 5\n\nexport const RegenerationButton: React.FC = () => {\n  const [isRunning, setIsRunning] = useState(false)\n  const [progress, setProgress] = useState<RegenerationProgress | null>(null)\n  const [queued, setQueued] = useState<number | null>(null)\n  const [force, setForce] = useState(false)\n  const [error, setError] = useState<string | null>(null)\n  const [stalled, setStalled] = useState(false)\n  const [collectionSlug, setCollectionSlug] = useState<string | null>(null)\n  const [stats, setStats] = useState<RegenerationProgress | null>(null)\n  const [confirming, setConfirming] = useState(false)\n  const intervalRef = useRef<ReturnType<typeof setInterval> | null>(null)\n  const stallRef = useRef({ lastProcessed: 0, stallCount: 0 })\n  const prevIsRunningRef = useRef(false)\n\n  // Extract collection slug from URL after mount to avoid hydration mismatch\n  useEffect(() => {\n    const slug = window.location.pathname.split('/collections/')[1]?.split('/')[0] ?? null\n    setCollectionSlug(slug)\n  }, [])\n\n  // Fetch optimization stats (independent of regeneration)\n  const fetchStats = useCallback(async () => {\n    if (!collectionSlug) return\n    try {\n      const res = await fetch(\n        `/api/image-optimizer/regenerate?collection=${collectionSlug}`,\n      )\n      if (res.ok) {\n        const data: RegenerationProgress = await res.json()\n        setStats(data)\n      }\n    } catch {\n      // ignore stats fetch errors\n    }\n  }, [collectionSlug])\n\n  const stopPolling = useCallback(() => {\n    if (intervalRef.current) {\n      clearInterval(intervalRef.current)\n      intervalRef.current = null\n    }\n  }, [])\n\n  const pollProgress = useCallback(async () => {\n    if (!collectionSlug) return\n    try {\n      const res = await fetch(\n        `/api/image-optimizer/regenerate?collection=${collectionSlug}`,\n      )\n      if (res.ok) {\n        const data: RegenerationProgress = await res.json()\n        setProgress(data)\n\n        // Stop polling when no more pending\n        if (data.pending <= 0) {\n          setIsRunning(false)\n          stopPolling()\n          return\n        }\n\n        // Stall detection\n        const processed = data.complete + data.errored\n        if (processed === stallRef.current.lastProcessed) {\n          stallRef.current.stallCount += 1\n        } else {\n          stallRef.current.stallCount = 0\n          stallRef.current.lastProcessed = processed\n        }\n\n        if (stallRef.current.stallCount >= STALL_THRESHOLD) {\n          stopPolling()\n          setIsRunning(false)\n          setStalled(true)\n        }\n      }\n    } catch {\n      // ignore polling errors\n    }\n  }, [collectionSlug, stopPolling])\n\n  // On mount (once collectionSlug is known), check if there's an ongoing job and resume polling\n  useEffect(() => {\n    if (!collectionSlug) return\n    let cancelled = false\n    const checkOngoing = async () => {\n      try {\n        const res = await fetch(\n          `/api/image-optimizer/regenerate?collection=${collectionSlug}`,\n        )\n        if (!res.ok || cancelled) return\n        const data: RegenerationProgress = await res.json()\n        // Always store stats on mount\n        setStats(data)\n        if (data.pending > 0) {\n          setProgress(data)\n          setIsRunning(true)\n          setStalled(false)\n          setQueued(null)\n          stallRef.current = { lastProcessed: data.complete + data.errored, stallCount: 0 }\n          intervalRef.current = setInterval(pollProgress, 2000)\n        }\n      } catch {\n        // ignore\n      }\n    }\n    checkOngoing()\n    return () => {\n      cancelled = true\n    }\n  }, [collectionSlug, pollProgress])\n\n  // Refresh stats when regeneration finishes (isRunning transitions from true to false)\n  useEffect(() => {\n    if (prevIsRunningRef.current && !isRunning) {\n      fetchStats()\n    }\n    prevIsRunningRef.current = isRunning\n  }, [isRunning, fetchStats])\n\n  // Phase 1: Show confirmation with counts\n  const handlePreflight = async () => {\n    if (!collectionSlug) return\n    setError(null)\n    // Refresh stats to get the latest counts before confirming\n    await fetchStats()\n    setConfirming(true)\n  }\n\n  const handleCancel = () => {\n    setConfirming(false)\n  }\n\n  // Phase 2: Actually start regeneration (after user confirms)\n  const handleConfirm = async () => {\n    if (!collectionSlug) return\n    setConfirming(false)\n    setError(null)\n    setStalled(false)\n    setIsRunning(true)\n    setQueued(null)\n    setProgress(null)\n    stallRef.current = { lastProcessed: 0, stallCount: 0 }\n\n    try {\n      const res = await fetch('/api/image-optimizer/regenerate', {\n        method: 'POST',\n        headers: { 'Content-Type': 'application/json' },\n        body: JSON.stringify({ collectionSlug, force }),\n      })\n\n      if (!res.ok) {\n        const data = await res.json()\n        throw new Error(data.error || 'Failed to start regeneration')\n      }\n\n      const data = await res.json()\n      setQueued(data.queued)\n\n      if (data.queued === 0) {\n        setIsRunning(false)\n        return\n      }\n\n      // Start polling\n      intervalRef.current = setInterval(pollProgress, 2000)\n    } catch (err) {\n      setError(err instanceof Error ? err.message : String(err))\n      setIsRunning(false)\n    }\n  }\n\n  // Cleanup interval on unmount\n  useEffect(() => {\n    return () => {\n      if (intervalRef.current) clearInterval(intervalRef.current)\n    }\n  }, [])\n\n  if (!collectionSlug) return null\n\n  const progressPercent =\n    progress && progress.total > 0\n      ? Math.round(((progress.complete + progress.errored) / progress.total) * 100)\n      : 0\n\n  const showProgressBar = (isRunning && progress) || (stalled && progress)\n\n  // Stats computations\n  const statsPercent =\n    stats && stats.total > 0\n      ? Math.round((stats.complete / stats.total) * 100)\n      : 0\n  const allOptimized = stats && stats.total > 0 && stats.complete === stats.total\n\n  return (\n    <div\n      style={{\n        padding: '16px 24px',\n        borderBottom: '1px solid #e5e7eb',\n        display: 'flex',\n        alignItems: 'center',\n        gap: '16px',\n        flexWrap: 'wrap',\n      }}\n    >\n      {!confirming && (\n        <button\n          onClick={handlePreflight}\n          disabled={isRunning}\n          style={{\n            backgroundColor: isRunning ? '#9ca3af' : '#4f46e5',\n            color: '#fff',\n            border: 'none',\n            borderRadius: '6px',\n            padding: '8px 16px',\n            fontSize: '14px',\n            fontWeight: 500,\n            cursor: isRunning ? 'not-allowed' : 'pointer',\n          }}\n        >\n          {isRunning ? 'Processing all images...' : 'Regenerate All Images'}\n        </button>\n      )}\n\n      {confirming && stats && (\n        <div style={{ display: 'flex', alignItems: 'center', gap: '10px' }}>\n          <span style={{ fontSize: '13px', color: '#374151' }}>\n            {force\n              ? `Re-process all ${stats.total} images across the entire collection?`\n              : `Regenerate ${stats.pending} unoptimized image${stats.pending !== 1 ? 's' : ''} across the entire collection?`}\n          </span>\n          <button\n            onClick={handleConfirm}\n            style={{\n              backgroundColor: '#4f46e5',\n              color: '#fff',\n              border: 'none',\n              borderRadius: '6px',\n              padding: '6px 14px',\n              fontSize: '13px',\n              fontWeight: 500,\n              cursor: 'pointer',\n            }}\n          >\n            Confirm\n          </button>\n          <button\n            onClick={handleCancel}\n            style={{\n              backgroundColor: 'transparent',\n              color: '#6b7280',\n              border: '1px solid #d1d5db',\n              borderRadius: '6px',\n              padding: '6px 14px',\n              fontSize: '13px',\n              fontWeight: 500,\n              cursor: 'pointer',\n            }}\n          >\n            Cancel\n          </button>\n        </div>\n      )}\n\n      {!confirming && (\n        <label\n          style={{ display: 'flex', alignItems: 'center', gap: '6px', fontSize: '13px' }}\n        >\n          <input\n            type=\"checkbox\"\n            checked={force}\n            onChange={(e) => setForce(e.target.checked)}\n            disabled={isRunning}\n          />\n          Force re-process all\n        </label>\n      )}\n\n      {error && (\n        <span style={{ color: '#ef4444', fontSize: '13px' }}>{error}</span>\n      )}\n\n      {queued !== null && queued > 0 && isRunning && !confirming && (\n        <span style={{ color: '#4f46e5', fontSize: '13px' }}>\n          Queued {queued} image{queued !== 1 ? 's' : ''} for processing across the entire collection\n        </span>\n      )}\n\n      {queued === 0 && !isRunning && !stalled && !confirming && (\n        <span style={{ color: '#10b981', fontSize: '13px' }}>\n          All images already optimized.\n        </span>\n      )}\n\n      {stalled && progress && (\n        <span style={{ color: '#f59e0b', fontSize: '13px' }}>\n          Processing finished with issues. {progress.errored + progress.pending} image\n          {progress.errored + progress.pending !== 1 ? 's' : ''} failed\n          {progress.pending > 0 ? ` (${progress.pending} stuck)` : ''}.\n          Re-run to retry.\n        </span>\n      )}\n\n      {showProgressBar && (\n        <div style={{ flex: 1, minWidth: '200px' }}>\n          <div\n            style={{\n              display: 'flex',\n              justifyContent: 'space-between',\n              fontSize: '12px',\n              marginBottom: '4px',\n            }}\n          >\n            <span>\n              {progress.complete} / {progress.total} complete\n            </span>\n            {progress.errored > 0 && (\n              <span style={{ color: '#ef4444' }}>{progress.errored} errors</span>\n            )}\n            <span>{progressPercent}%</span>\n          </div>\n          <div\n            style={{\n              height: '6px',\n              backgroundColor: '#e5e7eb',\n              borderRadius: '3px',\n              overflow: 'hidden',\n              display: 'flex',\n            }}\n          >\n            <div\n              style={{\n                height: '100%',\n                width: `${progress.total > 0 ? Math.round((progress.complete / progress.total) * 100) : 0}%`,\n                backgroundColor: '#10b981',\n                transition: 'width 0.3s ease',\n              }}\n            />\n            {progress.errored > 0 && (\n              <div\n                style={{\n                  height: '100%',\n                  width: `${progress.total > 0 ? Math.round((progress.errored / progress.total) * 100) : 0}%`,\n                  backgroundColor: '#ef4444',\n                  transition: 'width 0.3s ease',\n                }}\n              />\n            )}\n          </div>\n        </div>\n      )}\n\n      {!isRunning && progress && progress.complete > 0 && queued !== 0 && !confirming && (\n        <span style={{ fontSize: '13px' }}>\n          <span style={{ color: progress.errored > 0 || stalled ? '#f59e0b' : '#10b981' }}>\n            Done! {progress.complete}/{progress.total} optimized (across entire collection).\n          </span>\n          {(progress.errored > 0 || (stalled && progress.pending > 0)) && (\n            <span style={{ color: '#ef4444' }}>\n              {' '}{progress.errored + (stalled ? progress.pending : 0)} failed.\n            </span>\n          )}\n        </span>\n      )}\n\n      {/* Persistent optimization stats — always visible when not actively regenerating */}\n      {!isRunning && stats && stats.total > 0 && (\n        <div\n          style={{\n            marginLeft: 'auto',\n            display: 'flex',\n            flexDirection: 'column',\n            alignItems: 'flex-end',\n            gap: '4px',\n            minWidth: '180px',\n          }}\n        >\n          <div style={{ display: 'flex', alignItems: 'center', gap: '8px', fontSize: '13px' }}>\n            {allOptimized ? (\n              <span style={{ color: '#10b981' }}>\n                &#10003; All {stats.total} images optimized\n              </span>\n            ) : (\n              <>\n                <span style={{ color: '#6b7280' }}>\n                  {stats.complete}/{stats.total} optimized\n                </span>\n                {stats.errored > 0 && (\n                  <>\n                    <span style={{ color: '#d1d5db' }}>&middot;</span>\n                    <span style={{ color: '#ef4444' }}>{stats.errored} errors</span>\n                  </>\n                )}\n              </>\n            )}\n          </div>\n          {!allOptimized && (\n            <div\n              style={{\n                width: '100%',\n                height: '3px',\n                backgroundColor: '#e5e7eb',\n                borderRadius: '2px',\n                overflow: 'hidden',\n              }}\n            >\n              <div\n                style={{\n                  height: '100%',\n                  width: `${statsPercent}%`,\n                  backgroundColor: stats.errored > 0 ? '#f59e0b' : '#10b981',\n                  borderRadius: '2px',\n                  transition: 'width 0.3s ease',\n                }}\n              />\n            </div>\n          )}\n        </div>\n      )}\n    </div>\n  )\n}\n"],"names":["React","useState","useEffect","useCallback","useRef","STALL_THRESHOLD","RegenerationButton","isRunning","setIsRunning","progress","setProgress","queued","setQueued","force","setForce","error","setError","stalled","setStalled","collectionSlug","setCollectionSlug","stats","setStats","confirming","setConfirming","intervalRef","stallRef","lastProcessed","stallCount","prevIsRunningRef","slug","window","location","pathname","split","fetchStats","res","fetch","ok","data","json","stopPolling","current","clearInterval","pollProgress","pending","processed","complete","errored","cancelled","checkOngoing","setInterval","handlePreflight","handleCancel","handleConfirm","method","headers","body","JSON","stringify","Error","err","message","String","progressPercent","total","Math","round","showProgressBar","statsPercent","allOptimized","div","style","padding","borderBottom","display","alignItems","gap","flexWrap","button","onClick","disabled","backgroundColor","color","border","borderRadius","fontSize","fontWeight","cursor","span","label","input","type","checked","onChange","e","target","flex","minWidth","justifyContent","marginBottom","height","overflow","width","transition","marginLeft","flexDirection"],"mappings":"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"}

package/dist/defaults.d.ts

@@ -0,0 +1,3 @@
+import type { ImageOptimizerConfig, ResolvedCollectionOptimizerConfig, ResolvedImageOptimizerConfig } from './types.js';
+export declare const resolveConfig: (config: ImageOptimizerConfig) => ResolvedImageOptimizerConfig;
+export declare const resolveCollectionConfig: (resolvedConfig: ResolvedImageOptimizerConfig, collectionSlug: string) => ResolvedCollectionOptimizerConfig;

package/dist/endpoints/regenerate.d.ts

@@ -0,0 +1,4 @@
+import type { PayloadHandler } from 'payload';
+import type { ResolvedImageOptimizerConfig } from '../types.js';
+export declare const createRegenerateHandler: (resolvedConfig: ResolvedImageOptimizerConfig) => PayloadHandler;
+export declare const createRegenerateStatusHandler: (resolvedConfig: ResolvedImageOptimizerConfig) => PayloadHandler;

package/dist/endpoints/regenerate.js

@@ -22,26 +22,34 @@ export const createRegenerateHandler = (resolvedConfig)=>{
             });
         }
         // Find all image documents in the collection
-        const where = {
+        // Unless force=true, skip already-processed docs
+        const where = body.force ? {
             mimeType: {
                 contains: 'image/'
             }
-        };
-        // Unless force=true, skip already-processed docs
-        if (!body.force) {
-            where.or = [
+        } : {
+            and: [
                 {
-                    'imageOptimizer.status': {
-                        not_equals: 'complete'
+                    mimeType: {
+                        contains: 'image/'
                     }
                 },
                 {
-                    'imageOptimizer.status': {
-                        exists: false
-                    }
+                    or: [
+                        {
+                            'imageOptimizer.status': {
+                                not_equals: 'complete'
+                            }
+                        },
+                        {
+                            'imageOptimizer.status': {
+                                exists: false
+                            }
+                        }
+                    ]
                 }
-            ];
-        }
+            ]
+        };
         let queued = 0;
         let page = 1;
         let hasMore = true;
@@ -67,9 +75,12 @@ export const createRegenerateHandler = (resolvedConfig)=>{
             hasMore = result.hasNextPage;
             page++;
         }
+        req.payload.logger.info(`Image optimizer: queued ${queued} images from '${collectionSlug}' for regeneration`);
         // Fire the job runner (non-blocking)
         if (queued > 0) {
-            req.payload.jobs.run().catch((err)=>{
+            req.payload.jobs.run({
+                limit: queued
+            }).catch((err)=>{
                 req.payload.logger.error({
                     err
                 }, 'Regeneration job runner failed');

package/dist/endpoints/regenerate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/endpoints/regenerate.ts"],"sourcesContent":["import type { PayloadHandler } from 'payload'\nimport type { CollectionSlug } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\n\nexport const createRegenerateHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  const handler: PayloadHandler = async (req) => {\n    if (!req.user) {\n      return Response.json({ error: 'Unauthorized' }, { status: 401 })\n    }\n\n    let body: { collectionSlug?: string; force?: boolean }\n    try {\n      body = await req.json!()\n    } catch {\n      body = {}\n    }\n\n    const collectionSlug = body.collectionSlug\n    if (!collectionSlug || !resolvedConfig.collections[collectionSlug as CollectionSlug]) {\n      return Response.json(\n        { error: 'Invalid or unconfigured collection slug' },\n        { status: 400 },\n      )\n    }\n\n    // Find all image documents in the collection\n    const where: any = {\n      mimeType: { contains: 'image/' },\n    }\n    // Unless force=true, skip already-processed docs\n    if (!body.force) {\n      where.or = [\n        { 'imageOptimizer.status': { not_equals: 'complete' } },\n        { 'imageOptimizer.status': { exists: false } },\n      ]\n    }\n\n    let queued = 0\n    let page = 1\n    let hasMore = true\n\n    while (hasMore) {\n      const result = await req.payload.find({\n        collection: collectionSlug as CollectionSlug,\n        limit: 50,\n        page,\n        depth: 0,\n        where,\n        sort: 'createdAt',\n      })\n\n      for (const doc of result.docs) {\n        await req.payload.jobs.queue({\n          task: 'imageOptimizer_regenerateDocument',\n          input: {\n            collectionSlug,\n            docId: String(doc.id),\n          },\n        })\n        queued++\n      }\n\n      hasMore = result.hasNextPage\n      page++\n    }\n\n    // Fire the job runner (non-blocking)\n    if (queued > 0) {\n      req.payload.jobs.run().catch((err: unknown) => {\n        req.payload.logger.error({ err }, 'Regeneration job runner failed')\n      })\n    }\n\n    return Response.json({ queued, collectionSlug })\n  }\n\n  return handler\n}\n\nexport const createRegenerateStatusHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  const handler: PayloadHandler = async (req) => {\n    if (!req.user) {\n      return Response.json({ error: 'Unauthorized' }, { status: 401 })\n    }\n\n    const url = new URL(req.url!)\n    const collectionSlug = url.searchParams.get('collection')\n\n    if (!collectionSlug || !resolvedConfig.collections[collectionSlug as CollectionSlug]) {\n      return Response.json({ error: 'Invalid collection slug' }, { status: 400 })\n    }\n\n    const total = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: { mimeType: { contains: 'image/' } },\n    })\n\n    const complete = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: {\n        mimeType: { contains: 'image/' },\n        'imageOptimizer.status': { equals: 'complete' },\n      },\n    })\n\n    const errored = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: {\n        mimeType: { contains: 'image/' },\n        'imageOptimizer.status': { equals: 'error' },\n      },\n    })\n\n    return Response.json({\n      collectionSlug,\n      total: total.totalDocs,\n      complete: complete.totalDocs,\n      errored: errored.totalDocs,\n      pending: total.totalDocs - complete.totalDocs - errored.totalDocs,\n    })\n  }\n\n  return handler\n}\n"],"names":["createRegenerateHandler","resolvedConfig","handler","req","user","Response","json","error","status","body","collectionSlug","collections","where","mimeType","contains","force","or","not_equals","exists","queued","page","hasMore","result","payload","find","collection","limit","depth","sort","doc","docs","jobs","queue","task","input","docId","String","id","hasNextPage","run","catch","err","logger","createRegenerateStatusHandler","url","URL","searchParams","get","total","count","complete","equals","errored","totalDocs","pending"],"mappings":"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"}
+{"version":3,"sources":["../../src/endpoints/regenerate.ts"],"sourcesContent":["import type { PayloadHandler } from 'payload'\nimport type { CollectionSlug, Where } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\n\nexport const createRegenerateHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  const handler: PayloadHandler = async (req) => {\n    if (!req.user) {\n      return Response.json({ error: 'Unauthorized' }, { status: 401 })\n    }\n\n    let body: { collectionSlug?: string; force?: boolean }\n    try {\n      body = await req.json!()\n    } catch {\n      body = {}\n    }\n\n    const collectionSlug = body.collectionSlug\n    if (!collectionSlug || !resolvedConfig.collections[collectionSlug as CollectionSlug]) {\n      return Response.json(\n        { error: 'Invalid or unconfigured collection slug' },\n        { status: 400 },\n      )\n    }\n\n    // Find all image documents in the collection\n    // Unless force=true, skip already-processed docs\n    const where: Where = body.force\n      ? { mimeType: { contains: 'image/' } }\n      : {\n          and: [\n            { mimeType: { contains: 'image/' } },\n            {\n              or: [\n                { 'imageOptimizer.status': { not_equals: 'complete' } },\n                { 'imageOptimizer.status': { exists: false } },\n              ],\n            },\n          ],\n        }\n\n    let queued = 0\n    let page = 1\n    let hasMore = true\n\n    while (hasMore) {\n      const result = await req.payload.find({\n        collection: collectionSlug as CollectionSlug,\n        limit: 50,\n        page,\n        depth: 0,\n        where,\n        sort: 'createdAt',\n      })\n\n      for (const doc of result.docs) {\n        await req.payload.jobs.queue({\n          task: 'imageOptimizer_regenerateDocument',\n          input: {\n            collectionSlug,\n            docId: String(doc.id),\n          },\n        })\n        queued++\n      }\n\n      hasMore = result.hasNextPage\n      page++\n    }\n\n    req.payload.logger.info(`Image optimizer: queued ${queued} images from '${collectionSlug}' for regeneration`)\n\n    // Fire the job runner (non-blocking)\n    if (queued > 0) {\n      req.payload.jobs.run({ limit: queued }).catch((err: unknown) => {\n        req.payload.logger.error({ err }, 'Regeneration job runner failed')\n      })\n    }\n\n    return Response.json({ queued, collectionSlug })\n  }\n\n  return handler\n}\n\nexport const createRegenerateStatusHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  const handler: PayloadHandler = async (req) => {\n    if (!req.user) {\n      return Response.json({ error: 'Unauthorized' }, { status: 401 })\n    }\n\n    const url = new URL(req.url!)\n    const collectionSlug = url.searchParams.get('collection')\n\n    if (!collectionSlug || !resolvedConfig.collections[collectionSlug as CollectionSlug]) {\n      return Response.json({ error: 'Invalid collection slug' }, { status: 400 })\n    }\n\n    const total = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: { mimeType: { contains: 'image/' } },\n    })\n\n    const complete = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: {\n        mimeType: { contains: 'image/' },\n        'imageOptimizer.status': { equals: 'complete' },\n      },\n    })\n\n    const errored = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: {\n        mimeType: { contains: 'image/' },\n        'imageOptimizer.status': { equals: 'error' },\n      },\n    })\n\n    return Response.json({\n      collectionSlug,\n      total: total.totalDocs,\n      complete: complete.totalDocs,\n      errored: errored.totalDocs,\n      pending: total.totalDocs - complete.totalDocs - errored.totalDocs,\n    })\n  }\n\n  return handler\n}\n"],"names":["createRegenerateHandler","resolvedConfig","handler","req","user","Response","json","error","status","body","collectionSlug","collections","where","force","mimeType","contains","and","or","not_equals","exists","queued","page","hasMore","result","payload","find","collection","limit","depth","sort","doc","docs","jobs","queue","task","input","docId","String","id","hasNextPage","logger","info","run","catch","err","createRegenerateStatusHandler","url","URL","searchParams","get","total","count","complete","equals","errored","totalDocs","pending"],"mappings":"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"}

package/dist/exports/client.d.ts

@@ -0,0 +1,6 @@
+export { OptimizationStatus } from '../components/OptimizationStatus.js';
+export { ImageBox } from '../components/ImageBox.js';
+export type { ImageBoxProps } from '../components/ImageBox.js';
+export { getImageOptimizerProps } from '../utilities/getImageOptimizerProps.js';
+export type { ImageOptimizerProps } from '../utilities/getImageOptimizerProps.js';
+export { RegenerationButton } from '../components/RegenerationButton.js';

package/dist/exports/rsc.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/fields/imageOptimizerField.d.ts

@@ -0,0 +1,4 @@
+import type { Field, GroupField } from 'payload';
+import type { FieldsOverride } from '../types.js';
+export declare const defaultImageOptimizerFields: Field[];
+export declare const getImageOptimizerField: (fieldsOverride?: FieldsOverride) => GroupField;

package/dist/hooks/afterChange.d.ts

@@ -0,0 +1,3 @@
+import type { CollectionAfterChangeHook } from 'payload';
+import type { ResolvedImageOptimizerConfig } from '../types.js';
+export declare const createAfterChangeHook: (resolvedConfig: ResolvedImageOptimizerConfig, collectionSlug: string) => CollectionAfterChangeHook;

package/dist/hooks/afterChange.js

@@ -1,6 +1,5 @@
 import fs from 'fs/promises';
 import path from 'path';
-import { resolveCollectionConfig } from '../defaults.js';
 import { resolveStaticDir } from '../utilities/resolveStaticDir.js';
 import { isCloudStorage } from '../utilities/storage.js';
 export const createAfterChangeHook = (resolvedConfig, collectionSlug)=>{
@@ -33,46 +32,11 @@ export const createAfterChangeHook = (resolvedConfig, collectionSlug)=>{
                 }
             }
         }
-        const perCollectionConfig = resolveCollectionConfig(resolvedConfig, collectionSlug);
-        // When replaceOriginal is on and only one format is configured, the main file
-        // is already converted — skip the async job and mark complete immediately.
-        if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1) {
-            await req.payload.update({
-                collection: collectionSlug,
-                id: doc.id,
-                data: {
-                    imageOptimizer: {
-                        ...doc.imageOptimizer,
-                        status: 'complete',
-                        variants: [],
-                        error: null
-                    }
-                },
-                context: {
-                    imageOptimizer_skip: true
-                }
-            });
-            return doc;
-        }
-        // With cloud storage, variant files cannot be written — skip the async job
-        // and mark complete. CDN-level image optimization (e.g. Next.js Image) can
-        // serve alternative formats on the fly.
-        if (cloudStorage) {
-            await req.payload.update({
-                collection: collectionSlug,
-                id: doc.id,
-                data: {
-                    imageOptimizer: {
-                        ...doc.imageOptimizer,
-                        status: 'complete',
-                        variants: [],
-                        error: null
-                    }
-                },
-                context: {
-                    imageOptimizer_skip: true
-                }
-            });
+        // When status was already resolved in beforeChange (cloud storage, or
+        // replaceOriginal with a single format), no async job or update is needed.
+        // This avoids a separate update() call that fails with 404 on MongoDB due to
+        // transaction isolation when cloud storage adapters are involved.
+        if (context?.imageOptimizer_statusResolved) {
             return doc;
         }
         // Queue async format conversion job for remaining variants (local storage only)

package/dist/hooks/afterChange.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/afterChange.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\nimport type { CollectionAfterChangeHook, CollectionSlug } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveCollectionConfig } from '../defaults.js'\nimport { resolveStaticDir } from '../utilities/resolveStaticDir.js'\nimport { isCloudStorage } from '../utilities/storage.js'\n\nexport const createAfterChangeHook = (\n  resolvedConfig: ResolvedImageOptimizerConfig,\n  collectionSlug: string,\n): CollectionAfterChangeHook => {\n  return async ({ context, doc, req }) => {\n    if (context?.imageOptimizer_skip) return doc\n\n    // Use context flag from beforeChange instead of checking req.file.data directly.\n    // Cloud storage adapters may consume req.file.data in their own afterChange hook\n    // before ours runs, which would cause this guard to bail out and leave status as 'pending'.\n    if (!context?.imageOptimizer_hasUpload) return doc\n\n    const collectionConfig = req.payload.collections[collectionSlug as keyof typeof req.payload.collections].config\n    const cloudStorage = isCloudStorage(collectionConfig)\n\n    // When using local storage, overwrite the file on disk with the processed buffer.\n    // Payload's uploadFiles step writes the original buffer; we replace it here.\n    // When using cloud storage, skip — the cloud adapter's afterChange hook already\n    // uploads the correct buffer from req.file.data (set in our beforeChange hook).\n    if (!cloudStorage) {\n      const staticDir = resolveStaticDir(collectionConfig)\n      const processedBuffer = context.imageOptimizer_processedBuffer as Buffer | undefined\n      if (processedBuffer && doc.filename && staticDir) {\n        const safeFilename = path.basename(doc.filename as string)\n        const filePath = path.join(staticDir, safeFilename)\n        await fs.writeFile(filePath, processedBuffer)\n\n        // If replaceOriginal changed the filename, clean up the old file Payload wrote\n        const originalFilename = context.imageOptimizer_originalFilename as string | undefined\n        if (originalFilename && originalFilename !== safeFilename) {\n          const oldFilePath = path.join(staticDir, path.basename(originalFilename))\n          await fs.unlink(oldFilePath).catch(() => {\n            // Old file may not exist if Payload used the new filename\n          })\n        }\n      }\n    }\n\n    const perCollectionConfig = resolveCollectionConfig(resolvedConfig, collectionSlug)\n\n    // When replaceOriginal is on and only one format is configured, the main file\n    // is already converted — skip the async job and mark complete immediately.\n    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1) {\n      await req.payload.update({\n        collection: collectionSlug as CollectionSlug,\n        id: doc.id,\n        data: {\n          imageOptimizer: {\n            ...doc.imageOptimizer,\n            status: 'complete',\n            variants: [],\n            error: null,\n          },\n        },\n        context: { imageOptimizer_skip: true },\n      })\n      return doc\n    }\n\n    // With cloud storage, variant files cannot be written — skip the async job\n    // and mark complete. CDN-level image optimization (e.g. Next.js Image) can\n    // serve alternative formats on the fly.\n    if (cloudStorage) {\n      await req.payload.update({\n        collection: collectionSlug as CollectionSlug,\n        id: doc.id,\n        data: {\n          imageOptimizer: {\n            ...doc.imageOptimizer,\n            status: 'complete',\n            variants: [],\n            error: null,\n          },\n        },\n        context: { imageOptimizer_skip: true },\n      })\n      return doc\n    }\n\n    // Queue async format conversion job for remaining variants (local storage only)\n    await req.payload.jobs.queue({\n      task: 'imageOptimizer_convertFormats',\n      input: {\n        collectionSlug,\n        docId: String(doc.id),\n      },\n    })\n\n    req.payload.jobs.run().catch((err: unknown) => {\n      req.payload.logger.error({ err }, 'Image optimizer job runner failed')\n    })\n\n    return doc\n  }\n}\n"],"names":["fs","path","resolveCollectionConfig","resolveStaticDir","isCloudStorage","createAfterChangeHook","resolvedConfig","collectionSlug","context","doc","req","imageOptimizer_skip","imageOptimizer_hasUpload","collectionConfig","payload","collections","config","cloudStorage","staticDir","processedBuffer","imageOptimizer_processedBuffer","filename","safeFilename","basename","filePath","join","writeFile","originalFilename","imageOptimizer_originalFilename","oldFilePath","unlink","catch","perCollectionConfig","replaceOriginal","formats","length","update","collection","id","data","imageOptimizer","status","variants","error","jobs","queue","task","input","docId","String","run","err","logger"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAC5B,OAAOC,UAAU,OAAM;AAIvB,SAASC,uBAAuB,QAAQ,iBAAgB;AACxD,SAASC,gBAAgB,QAAQ,mCAAkC;AACnE,SAASC,cAAc,QAAQ,0BAAyB;AAExD,OAAO,MAAMC,wBAAwB,CACnCC,gBACAC;IAEA,OAAO,OAAO,EAAEC,OAAO,EAAEC,GAAG,EAAEC,GAAG,EAAE;QACjC,IAAIF,SAASG,qBAAqB,OAAOF;QAEzC,iFAAiF;QACjF,iFAAiF;QACjF,4FAA4F;QAC5F,IAAI,CAACD,SAASI,0BAA0B,OAAOH;QAE/C,MAAMI,mBAAmBH,IAAII,OAAO,CAACC,WAAW,CAACR,eAAuD,CAACS,MAAM;QAC/G,MAAMC,eAAeb,eAAeS;QAEpC,kFAAkF;QAClF,6EAA6E;QAC7E,gFAAgF;QAChF,gFAAgF;QAChF,IAAI,CAACI,cAAc;YACjB,MAAMC,YAAYf,iBAAiBU;YACnC,MAAMM,kBAAkBX,QAAQY,8BAA8B;YAC9D,IAAID,mBAAmBV,IAAIY,QAAQ,IAAIH,WAAW;gBAChD,MAAMI,eAAerB,KAAKsB,QAAQ,CAACd,IAAIY,QAAQ;gBAC/C,MAAMG,WAAWvB,KAAKwB,IAAI,CAACP,WAAWI;gBACtC,MAAMtB,GAAG0B,SAAS,CAACF,UAAUL;gBAE7B,+EAA+E;gBAC/E,MAAMQ,mBAAmBnB,QAAQoB,+BAA+B;gBAChE,IAAID,oBAAoBA,qBAAqBL,cAAc;oBACzD,MAAMO,cAAc5B,KAAKwB,IAAI,CAACP,WAAWjB,KAAKsB,QAAQ,CAACI;oBACvD,MAAM3B,GAAG8B,MAAM,CAACD,aAAaE,KAAK,CAAC;oBACjC,0DAA0D;oBAC5D;gBACF;YACF;QACF;QAEA,MAAMC,sBAAsB9B,wBAAwBI,gBAAgBC;QAEpE,8EAA8E;QAC9E,2EAA2E;QAC3E,IAAIyB,oBAAoBC,eAAe,IAAID,oBAAoBE,OAAO,CAACC,MAAM,IAAI,GAAG;YAClF,MAAMzB,IAAII,OAAO,CAACsB,MAAM,CAAC;gBACvBC,YAAY9B;gBACZ+B,IAAI7B,IAAI6B,EAAE;gBACVC,MAAM;oBACJC,gBAAgB;wBACd,GAAG/B,IAAI+B,cAAc;wBACrBC,QAAQ;wBACRC,UAAU,EAAE;wBACZC,OAAO;oBACT;gBACF;gBACAnC,SAAS;oBAAEG,qBAAqB;gBAAK;YACvC;YACA,OAAOF;QACT;QAEA,2EAA2E;QAC3E,2EAA2E;QAC3E,wCAAwC;QACxC,IAAIQ,cAAc;YAChB,MAAMP,IAAII,OAAO,CAACsB,MAAM,CAAC;gBACvBC,YAAY9B;gBACZ+B,IAAI7B,IAAI6B,EAAE;gBACVC,MAAM;oBACJC,gBAAgB;wBACd,GAAG/B,IAAI+B,cAAc;wBACrBC,QAAQ;wBACRC,UAAU,EAAE;wBACZC,OAAO;oBACT;gBACF;gBACAnC,SAAS;oBAAEG,qBAAqB;gBAAK;YACvC;YACA,OAAOF;QACT;QAEA,gFAAgF;QAChF,MAAMC,IAAII,OAAO,CAAC8B,IAAI,CAACC,KAAK,CAAC;YAC3BC,MAAM;YACNC,OAAO;gBACLxC;gBACAyC,OAAOC,OAAOxC,IAAI6B,EAAE;YACtB;QACF;QAEA5B,IAAII,OAAO,CAAC8B,IAAI,CAACM,GAAG,GAAGnB,KAAK,CAAC,CAACoB;YAC5BzC,IAAII,OAAO,CAACsC,MAAM,CAACT,KAAK,CAAC;gBAAEQ;YAAI,GAAG;QACpC;QAEA,OAAO1C;IACT;AACF,EAAC"}
+{"version":3,"sources":["../../src/hooks/afterChange.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\nimport type { CollectionAfterChangeHook } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveStaticDir } from '../utilities/resolveStaticDir.js'\nimport { isCloudStorage } from '../utilities/storage.js'\n\nexport const createAfterChangeHook = (\n  resolvedConfig: ResolvedImageOptimizerConfig,\n  collectionSlug: string,\n): CollectionAfterChangeHook => {\n  return async ({ context, doc, req }) => {\n    if (context?.imageOptimizer_skip) return doc\n\n    // Use context flag from beforeChange instead of checking req.file.data directly.\n    // Cloud storage adapters may consume req.file.data in their own afterChange hook\n    // before ours runs, which would cause this guard to bail out and leave status as 'pending'.\n    if (!context?.imageOptimizer_hasUpload) return doc\n\n    const collectionConfig = req.payload.collections[collectionSlug as keyof typeof req.payload.collections].config\n    const cloudStorage = isCloudStorage(collectionConfig)\n\n    // When using local storage, overwrite the file on disk with the processed buffer.\n    // Payload's uploadFiles step writes the original buffer; we replace it here.\n    // When using cloud storage, skip — the cloud adapter's afterChange hook already\n    // uploads the correct buffer from req.file.data (set in our beforeChange hook).\n    if (!cloudStorage) {\n      const staticDir = resolveStaticDir(collectionConfig)\n      const processedBuffer = context.imageOptimizer_processedBuffer as Buffer | undefined\n      if (processedBuffer && doc.filename && staticDir) {\n        const safeFilename = path.basename(doc.filename as string)\n        const filePath = path.join(staticDir, safeFilename)\n        await fs.writeFile(filePath, processedBuffer)\n\n        // If replaceOriginal changed the filename, clean up the old file Payload wrote\n        const originalFilename = context.imageOptimizer_originalFilename as string | undefined\n        if (originalFilename && originalFilename !== safeFilename) {\n          const oldFilePath = path.join(staticDir, path.basename(originalFilename))\n          await fs.unlink(oldFilePath).catch(() => {\n            // Old file may not exist if Payload used the new filename\n          })\n        }\n      }\n    }\n\n    // When status was already resolved in beforeChange (cloud storage, or\n    // replaceOriginal with a single format), no async job or update is needed.\n    // This avoids a separate update() call that fails with 404 on MongoDB due to\n    // transaction isolation when cloud storage adapters are involved.\n    if (context?.imageOptimizer_statusResolved) {\n      return doc\n    }\n\n    // Queue async format conversion job for remaining variants (local storage only)\n    await req.payload.jobs.queue({\n      task: 'imageOptimizer_convertFormats',\n      input: {\n        collectionSlug,\n        docId: String(doc.id),\n      },\n    })\n\n    req.payload.jobs.run().catch((err: unknown) => {\n      req.payload.logger.error({ err }, 'Image optimizer job runner failed')\n    })\n\n    return doc\n  }\n}\n"],"names":["fs","path","resolveStaticDir","isCloudStorage","createAfterChangeHook","resolvedConfig","collectionSlug","context","doc","req","imageOptimizer_skip","imageOptimizer_hasUpload","collectionConfig","payload","collections","config","cloudStorage","staticDir","processedBuffer","imageOptimizer_processedBuffer","filename","safeFilename","basename","filePath","join","writeFile","originalFilename","imageOptimizer_originalFilename","oldFilePath","unlink","catch","imageOptimizer_statusResolved","jobs","queue","task","input","docId","String","id","run","err","logger","error"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAC5B,OAAOC,UAAU,OAAM;AAIvB,SAASC,gBAAgB,QAAQ,mCAAkC;AACnE,SAASC,cAAc,QAAQ,0BAAyB;AAExD,OAAO,MAAMC,wBAAwB,CACnCC,gBACAC;IAEA,OAAO,OAAO,EAAEC,OAAO,EAAEC,GAAG,EAAEC,GAAG,EAAE;QACjC,IAAIF,SAASG,qBAAqB,OAAOF;QAEzC,iFAAiF;QACjF,iFAAiF;QACjF,4FAA4F;QAC5F,IAAI,CAACD,SAASI,0BAA0B,OAAOH;QAE/C,MAAMI,mBAAmBH,IAAII,OAAO,CAACC,WAAW,CAACR,eAAuD,CAACS,MAAM;QAC/G,MAAMC,eAAeb,eAAeS;QAEpC,kFAAkF;QAClF,6EAA6E;QAC7E,gFAAgF;QAChF,gFAAgF;QAChF,IAAI,CAACI,cAAc;YACjB,MAAMC,YAAYf,iBAAiBU;YACnC,MAAMM,kBAAkBX,QAAQY,8BAA8B;YAC9D,IAAID,mBAAmBV,IAAIY,QAAQ,IAAIH,WAAW;gBAChD,MAAMI,eAAepB,KAAKqB,QAAQ,CAACd,IAAIY,QAAQ;gBAC/C,MAAMG,WAAWtB,KAAKuB,IAAI,CAACP,WAAWI;gBACtC,MAAMrB,GAAGyB,SAAS,CAACF,UAAUL;gBAE7B,+EAA+E;gBAC/E,MAAMQ,mBAAmBnB,QAAQoB,+BAA+B;gBAChE,IAAID,oBAAoBA,qBAAqBL,cAAc;oBACzD,MAAMO,cAAc3B,KAAKuB,IAAI,CAACP,WAAWhB,KAAKqB,QAAQ,CAACI;oBACvD,MAAM1B,GAAG6B,MAAM,CAACD,aAAaE,KAAK,CAAC;oBACjC,0DAA0D;oBAC5D;gBACF;YACF;QACF;QAEA,sEAAsE;QACtE,2EAA2E;QAC3E,6EAA6E;QAC7E,kEAAkE;QAClE,IAAIvB,SAASwB,+BAA+B;YAC1C,OAAOvB;QACT;QAEA,gFAAgF;QAChF,MAAMC,IAAII,OAAO,CAACmB,IAAI,CAACC,KAAK,CAAC;YAC3BC,MAAM;YACNC,OAAO;gBACL7B;gBACA8B,OAAOC,OAAO7B,IAAI8B,EAAE;YACtB;QACF;QAEA7B,IAAII,OAAO,CAACmB,IAAI,CAACO,GAAG,GAAGT,KAAK,CAAC,CAACU;YAC5B/B,IAAII,OAAO,CAAC4B,MAAM,CAACC,KAAK,CAAC;gBAAEF;YAAI,GAAG;QACpC;QAEA,OAAOhC;IACT;AACF,EAAC"}

package/dist/hooks/beforeChange.d.ts

@@ -0,0 +1,3 @@
+import type { CollectionBeforeChangeHook } from 'payload';
+import type { ResolvedImageOptimizerConfig } from '../types.js';
+export declare const createBeforeChangeHook: (resolvedConfig: ResolvedImageOptimizerConfig, collectionSlug: string) => CollectionBeforeChangeHook;

package/dist/hooks/beforeChange.js

@@ -1,6 +1,7 @@
 import path from 'path';
 import { resolveCollectionConfig } from '../defaults.js';
 import { convertFormat, generateThumbHash, stripAndResize } from '../processing/index.js';
+import { isCloudStorage } from '../utilities/storage.js';
 export const createBeforeChangeHook = (resolvedConfig, collectionSlug)=>{
     return async ({ context, data, req })=>{
         if (context?.imageOptimizer_skip) return data;
@@ -25,11 +26,23 @@ export const createBeforeChangeHook = (resolvedConfig, collectionSlug)=>{
             data.mimeType = converted.mimeType;
             data.filesize = finalSize;
         }
+        // Determine if async work (variant generation job) is needed after create.
+        // If not, set status to 'complete' now so afterChange doesn't need a separate
+        // update() call — which fails with 404 on MongoDB due to transaction isolation
+        // when cloud storage adapters are involved.
+        const collectionConfig = req.payload.collections[collectionSlug].config;
+        const cloudStorage = isCloudStorage(collectionConfig);
+        const needsAsyncJob = !cloudStorage && !(perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1);
         data.imageOptimizer = {
             originalSize,
             optimizedSize: finalSize,
-            status: 'pending'
+            status: needsAsyncJob ? 'pending' : 'complete',
+            variants: needsAsyncJob ? undefined : [],
+            error: null
         };
+        if (!needsAsyncJob) {
+            context.imageOptimizer_statusResolved = true;
+        }
         if (resolvedConfig.generateThumbHash) {
             data.imageOptimizer.thumbHash = await generateThumbHash(finalBuffer);
         }

package/dist/hooks/beforeChange.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/beforeChange.ts"],"sourcesContent":["import path from 'path'\nimport type { CollectionBeforeChangeHook } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveCollectionConfig } from '../defaults.js'\nimport { convertFormat, generateThumbHash, stripAndResize } from '../processing/index.js'\n\nexport const createBeforeChangeHook = (\n  resolvedConfig: ResolvedImageOptimizerConfig,\n  collectionSlug: string,\n): CollectionBeforeChangeHook => {\n  return async ({ context, data, req }) => {\n    if (context?.imageOptimizer_skip) return data\n\n    if (!req.file || !req.file.data || !req.file.mimetype?.startsWith('image/')) return data\n\n    const originalSize = req.file.data.length\n\n    const perCollectionConfig = resolveCollectionConfig(resolvedConfig, collectionSlug)\n\n    // Process in memory: strip EXIF, resize, generate blur\n    const processed = await stripAndResize(\n      req.file.data,\n      perCollectionConfig.maxDimensions,\n      resolvedConfig.stripMetadata,\n    )\n\n    let finalBuffer = processed.buffer\n    let finalSize = processed.size\n\n    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0) {\n      // Convert to primary format (first in the formats array)\n      const primaryFormat = perCollectionConfig.formats[0]\n      const converted = await convertFormat(processed.buffer, primaryFormat.format, primaryFormat.quality)\n\n      finalBuffer = converted.buffer\n      finalSize = converted.size\n\n      // Update filename and mimeType so Payload stores the correct metadata\n      const originalFilename = data.filename || req.file.name || ''\n      const newFilename = `${path.parse(originalFilename).name}.${primaryFormat.format}`\n      context.imageOptimizer_originalFilename = originalFilename\n      data.filename = newFilename\n      data.mimeType = converted.mimeType\n      data.filesize = finalSize\n    }\n\n    data.imageOptimizer = {\n      originalSize,\n      optimizedSize: finalSize,\n      status: 'pending',\n    }\n\n    if (resolvedConfig.generateThumbHash) {\n      data.imageOptimizer.thumbHash = await generateThumbHash(finalBuffer)\n    }\n\n    // Write processed buffer back to req.file so cloud storage adapters\n    // (which read req.file in their afterChange hook) upload the optimized version.\n    // Payload's own uploadFiles step does NOT re-read req.file.data for its local\n    // disk write, so we also store the buffer in context for our afterChange hook\n    // to overwrite the local file when local storage is enabled.\n    req.file.data = finalBuffer\n    req.file.size = finalSize\n    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0) {\n      req.file.name = data.filename\n      req.file.mimetype = data.mimeType\n    }\n    context.imageOptimizer_processedBuffer = finalBuffer\n    context.imageOptimizer_hasUpload = true\n\n    return data\n  }\n}\n"],"names":["path","resolveCollectionConfig","convertFormat","generateThumbHash","stripAndResize","createBeforeChangeHook","resolvedConfig","collectionSlug","context","data","req","imageOptimizer_skip","file","mimetype","startsWith","originalSize","length","perCollectionConfig","processed","maxDimensions","stripMetadata","finalBuffer","buffer","finalSize","size","replaceOriginal","formats","primaryFormat","converted","format","quality","originalFilename","filename","name","newFilename","parse","imageOptimizer_originalFilename","mimeType","filesize","imageOptimizer","optimizedSize","status","thumbHash","imageOptimizer_processedBuffer","imageOptimizer_hasUpload"],"mappings":"AAAA,OAAOA,UAAU,OAAM;AAIvB,SAASC,uBAAuB,QAAQ,iBAAgB;AACxD,SAASC,aAAa,EAAEC,iBAAiB,EAAEC,cAAc,QAAQ,yBAAwB;AAEzF,OAAO,MAAMC,yBAAyB,CACpCC,gBACAC;IAEA,OAAO,OAAO,EAAEC,OAAO,EAAEC,IAAI,EAAEC,GAAG,EAAE;QAClC,IAAIF,SAASG,qBAAqB,OAAOF;QAEzC,IAAI,CAACC,IAAIE,IAAI,IAAI,CAACF,IAAIE,IAAI,CAACH,IAAI,IAAI,CAACC,IAAIE,IAAI,CAACC,QAAQ,EAAEC,WAAW,WAAW,OAAOL;QAEpF,MAAMM,eAAeL,IAAIE,IAAI,CAACH,IAAI,CAACO,MAAM;QAEzC,MAAMC,sBAAsBhB,wBAAwBK,gBAAgBC;QAEpE,uDAAuD;QACvD,MAAMW,YAAY,MAAMd,eACtBM,IAAIE,IAAI,CAACH,IAAI,EACbQ,oBAAoBE,aAAa,EACjCb,eAAec,aAAa;QAG9B,IAAIC,cAAcH,UAAUI,MAAM;QAClC,IAAIC,YAAYL,UAAUM,IAAI;QAE9B,IAAIP,oBAAoBQ,eAAe,IAAIR,oBAAoBS,OAAO,CAACV,MAAM,GAAG,GAAG;YACjF,yDAAyD;YACzD,MAAMW,gBAAgBV,oBAAoBS,OAAO,CAAC,EAAE;YACpD,MAAME,YAAY,MAAM1B,cAAcgB,UAAUI,MAAM,EAAEK,cAAcE,MAAM,EAAEF,cAAcG,OAAO;YAEnGT,cAAcO,UAAUN,MAAM;YAC9BC,YAAYK,UAAUJ,IAAI;YAE1B,sEAAsE;YACtE,MAAMO,mBAAmBtB,KAAKuB,QAAQ,IAAItB,IAAIE,IAAI,CAACqB,IAAI,IAAI;YAC3D,MAAMC,cAAc,GAAGlC,KAAKmC,KAAK,CAACJ,kBAAkBE,IAAI,CAAC,CAAC,EAAEN,cAAcE,MAAM,EAAE;YAClFrB,QAAQ4B,+BAA+B,GAAGL;YAC1CtB,KAAKuB,QAAQ,GAAGE;YAChBzB,KAAK4B,QAAQ,GAAGT,UAAUS,QAAQ;YAClC5B,KAAK6B,QAAQ,GAAGf;QAClB;QAEAd,KAAK8B,cAAc,GAAG;YACpBxB;YACAyB,eAAejB;YACfkB,QAAQ;QACV;QAEA,IAAInC,eAAeH,iBAAiB,EAAE;YACpCM,KAAK8B,cAAc,CAACG,SAAS,GAAG,MAAMvC,kBAAkBkB;QAC1D;QAEA,oEAAoE;QACpE,gFAAgF;QAChF,8EAA8E;QAC9E,8EAA8E;QAC9E,6DAA6D;QAC7DX,IAAIE,IAAI,CAACH,IAAI,GAAGY;QAChBX,IAAIE,IAAI,CAACY,IAAI,GAAGD;QAChB,IAAIN,oBAAoBQ,eAAe,IAAIR,oBAAoBS,OAAO,CAACV,MAAM,GAAG,GAAG;YACjFN,IAAIE,IAAI,CAACqB,IAAI,GAAGxB,KAAKuB,QAAQ;YAC7BtB,IAAIE,IAAI,CAACC,QAAQ,GAAGJ,KAAK4B,QAAQ;QACnC;QACA7B,QAAQmC,8BAA8B,GAAGtB;QACzCb,QAAQoC,wBAAwB,GAAG;QAEnC,OAAOnC;IACT;AACF,EAAC"}
+{"version":3,"sources":["../../src/hooks/beforeChange.ts"],"sourcesContent":["import path from 'path'\nimport type { CollectionBeforeChangeHook } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveCollectionConfig } from '../defaults.js'\nimport { convertFormat, generateThumbHash, stripAndResize } from '../processing/index.js'\nimport { isCloudStorage } from '../utilities/storage.js'\n\nexport const createBeforeChangeHook = (\n  resolvedConfig: ResolvedImageOptimizerConfig,\n  collectionSlug: string,\n): CollectionBeforeChangeHook => {\n  return async ({ context, data, req }) => {\n    if (context?.imageOptimizer_skip) return data\n\n    if (!req.file || !req.file.data || !req.file.mimetype?.startsWith('image/')) return data\n\n    const originalSize = req.file.data.length\n\n    const perCollectionConfig = resolveCollectionConfig(resolvedConfig, collectionSlug)\n\n    // Process in memory: strip EXIF, resize, generate blur\n    const processed = await stripAndResize(\n      req.file.data,\n      perCollectionConfig.maxDimensions,\n      resolvedConfig.stripMetadata,\n    )\n\n    let finalBuffer = processed.buffer\n    let finalSize = processed.size\n\n    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0) {\n      // Convert to primary format (first in the formats array)\n      const primaryFormat = perCollectionConfig.formats[0]\n      const converted = await convertFormat(processed.buffer, primaryFormat.format, primaryFormat.quality)\n\n      finalBuffer = converted.buffer\n      finalSize = converted.size\n\n      // Update filename and mimeType so Payload stores the correct metadata\n      const originalFilename = data.filename || req.file.name || ''\n      const newFilename = `${path.parse(originalFilename).name}.${primaryFormat.format}`\n      context.imageOptimizer_originalFilename = originalFilename\n      data.filename = newFilename\n      data.mimeType = converted.mimeType\n      data.filesize = finalSize\n    }\n\n    // Determine if async work (variant generation job) is needed after create.\n    // If not, set status to 'complete' now so afterChange doesn't need a separate\n    // update() call — which fails with 404 on MongoDB due to transaction isolation\n    // when cloud storage adapters are involved.\n    const collectionConfig = req.payload.collections[collectionSlug as keyof typeof req.payload.collections].config\n    const cloudStorage = isCloudStorage(collectionConfig)\n    const needsAsyncJob = !cloudStorage && !(perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1)\n\n    data.imageOptimizer = {\n      originalSize,\n      optimizedSize: finalSize,\n      status: needsAsyncJob ? 'pending' : 'complete',\n      variants: needsAsyncJob ? undefined : [],\n      error: null,\n    }\n\n    if (!needsAsyncJob) {\n      context.imageOptimizer_statusResolved = true\n    }\n\n    if (resolvedConfig.generateThumbHash) {\n      data.imageOptimizer.thumbHash = await generateThumbHash(finalBuffer)\n    }\n\n    // Write processed buffer back to req.file so cloud storage adapters\n    // (which read req.file in their afterChange hook) upload the optimized version.\n    // Payload's own uploadFiles step does NOT re-read req.file.data for its local\n    // disk write, so we also store the buffer in context for our afterChange hook\n    // to overwrite the local file when local storage is enabled.\n    req.file.data = finalBuffer\n    req.file.size = finalSize\n    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0) {\n      req.file.name = data.filename\n      req.file.mimetype = data.mimeType\n    }\n    context.imageOptimizer_processedBuffer = finalBuffer\n    context.imageOptimizer_hasUpload = true\n\n    return data\n  }\n}\n"],"names":["path","resolveCollectionConfig","convertFormat","generateThumbHash","stripAndResize","isCloudStorage","createBeforeChangeHook","resolvedConfig","collectionSlug","context","data","req","imageOptimizer_skip","file","mimetype","startsWith","originalSize","length","perCollectionConfig","processed","maxDimensions","stripMetadata","finalBuffer","buffer","finalSize","size","replaceOriginal","formats","primaryFormat","converted","format","quality","originalFilename","filename","name","newFilename","parse","imageOptimizer_originalFilename","mimeType","filesize","collectionConfig","payload","collections","config","cloudStorage","needsAsyncJob","imageOptimizer","optimizedSize","status","variants","undefined","error","imageOptimizer_statusResolved","thumbHash","imageOptimizer_processedBuffer","imageOptimizer_hasUpload"],"mappings":"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"}

package/dist/index.d.ts

@@ -0,0 +1,6 @@
+import type { Config } from 'payload';
+import type { ImageOptimizerConfig } from './types.js';
+export type { ImageOptimizerConfig, ImageFormat, FormatQuality, CollectionOptimizerConfig, ImageOptimizerData, MediaResource, FieldsOverride } from './types.js';
+export { defaultImageOptimizerFields } from './fields/imageOptimizerField.js';
+export { encodeImageToThumbHash, decodeThumbHashToDataURL } from './utilities/thumbhash.js';
+export declare const imageOptimizer: (pluginOptions: ImageOptimizerConfig) => (config: Config) => Config;

package/dist/processing/index.d.ts

@@ -0,0 +1,17 @@
+export declare function stripAndResize(buffer: Buffer, maxDimensions: {
+    width: number;
+    height: number;
+}, stripMetadata: boolean): Promise<{
+    buffer: Buffer;
+    width: number;
+    height: number;
+    size: number;
+}>;
+export declare function generateThumbHash(buffer: Buffer): Promise<string>;
+export declare function convertFormat(buffer: Buffer, format: 'webp' | 'avif', quality: number): Promise<{
+    buffer: Buffer;
+    width: number;
+    height: number;
+    size: number;
+    mimeType: string;
+}>;

package/dist/tasks/convertFormats.d.ts

@@ -0,0 +1,12 @@
+import type { ResolvedImageOptimizerConfig } from '../types.js';
+export declare const createConvertFormatsHandler: (resolvedConfig: ResolvedImageOptimizerConfig) => ({ input, req }: {
+    input: {
+        collectionSlug: string;
+        docId: string;
+    };
+    req: any;
+}) => Promise<{
+    output: {
+        variantsGenerated: number;
+    };
+}>;

package/dist/tasks/regenerateDocument.d.ts

@@ -0,0 +1,18 @@
+import type { ResolvedImageOptimizerConfig } from '../types.js';
+export declare const createRegenerateDocumentHandler: (resolvedConfig: ResolvedImageOptimizerConfig) => ({ input, req }: {
+    input: {
+        collectionSlug: string;
+        docId: string;
+    };
+    req: any;
+}) => Promise<{
+    output: {
+        status: string;
+        reason: string;
+    };
+} | {
+    output: {
+        status: string;
+        reason?: undefined;
+    };
+}>;

package/dist/translations/index.d.ts

@@ -0,0 +1 @@
+export declare const translations: Record<string, Record<string, Record<string, string>>>;

package/dist/types.d.ts

@@ -0,0 +1,57 @@
+import type { CollectionSlug, Field } from 'payload';
+export type ImageFormat = 'webp' | 'avif';
+export type FormatQuality = {
+    format: ImageFormat;
+    quality: number;
+};
+export type CollectionOptimizerConfig = {
+    formats?: FormatQuality[];
+    maxDimensions?: {
+        width: number;
+        height: number;
+    };
+    replaceOriginal?: boolean;
+};
+export type FieldsOverride = (args: {
+    defaultFields: Field[];
+}) => Field[];
+export type ImageOptimizerConfig = {
+    collections: Partial<Record<CollectionSlug, true | CollectionOptimizerConfig>>;
+    disabled?: boolean;
+    fieldsOverride?: FieldsOverride;
+    formats?: FormatQuality[];
+    generateThumbHash?: boolean;
+    maxDimensions?: {
+        width: number;
+        height: number;
+    };
+    replaceOriginal?: boolean;
+    stripMetadata?: boolean;
+};
+export type ResolvedCollectionOptimizerConfig = {
+    formats: FormatQuality[];
+    maxDimensions: {
+        width: number;
+        height: number;
+    };
+    replaceOriginal: boolean;
+};
+export type ResolvedImageOptimizerConfig = Required<Pick<ImageOptimizerConfig, 'formats' | 'generateThumbHash' | 'maxDimensions' | 'stripMetadata'>> & {
+    collections: ImageOptimizerConfig['collections'];
+    disabled: boolean;
+    replaceOriginal: boolean;
+};
+export type ImageOptimizerData = {
+    thumbHash?: string | null;
+};
+export type MediaResource = {
+    url?: string | null;
+    alt?: string | null;
+    width?: number | null;
+    height?: number | null;
+    filename?: string | null;
+    focalX?: number | null;
+    focalY?: number | null;
+    imageOptimizer?: ImageOptimizerData | null;
+    updatedAt?: string;
+};

package/dist/utilities/getImageOptimizerProps.d.ts

@@ -0,0 +1,24 @@
+import type { MediaResource } from '../types.js';
+export type ImageOptimizerProps = {
+    placeholder: 'blur' | 'empty';
+    blurDataURL?: string;
+    style: {
+        objectPosition: string;
+    };
+};
+/**
+ * Extracts image optimization props from a Payload media resource.
+ *
+ * Returns props that can be spread onto a Next.js `<Image>` component to add
+ * ThumbHash blur placeholders and focal-point-based object positioning.
+ *
+ * Works with any component — including the Payload website template's `ImageMedia`:
+ *
+ * ```tsx
+ * import { getImageOptimizerProps } from '@inoo-ch/payload-image-optimizer/client'
+ *
+ * const optimizerProps = getImageOptimizerProps(resource)
+ * <NextImage {...existingProps} {...optimizerProps} />
+ * ```
+ */
+export declare function getImageOptimizerProps(resource: MediaResource | null | undefined): ImageOptimizerProps;

package/dist/utilities/resolveStaticDir.d.ts

@@ -0,0 +1,3 @@
+export declare function resolveStaticDir(collectionConfig: {
+    upload?: boolean | Record<string, any>;
+}): string;

package/dist/utilities/storage.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Returns true when the collection uses cloud/external storage (disableLocalStorage: true).
+ * When true, files are uploaded by external adapter hooks — no local FS writes should happen.
+ */
+export declare function isCloudStorage(collectionConfig: {
+    upload?: boolean | Record<string, any>;
+}): boolean;
+/**
+ * Reads a file buffer from local disk or fetches it from URL.
+ * Tries local disk first (when available), falls back to URL fetch.
+ * This makes the plugin storage-agnostic — works with local FS and cloud storage alike.
+ */
+export declare function fetchFileBuffer(doc: {
+    filename?: string;
+    url?: string;
+}, collectionConfig: {
+    upload?: boolean | Record<string, any>;
+}): Promise<Buffer>;

package/dist/utilities/thumbhash.d.ts

@@ -0,0 +1,2 @@
+export declare function encodeImageToThumbHash(buffer: Buffer, width: number, height: number): string;
+export declare function decodeThumbHashToDataURL(thumbHash: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inoo-ch/payload-image-optimizer",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "description": "Payload CMS plugin for automatic image optimization — WebP/AVIF conversion, resize, EXIF strip, ThumbHash placeholders, and bulk regeneration",
   "license": "MIT",
   "keywords": [

package/src/components/RegenerationButton.tsx

@@ -20,6 +20,7 @@ export const RegenerationButton: React.FC = () => {
   const [stalled, setStalled] = useState(false)
   const [collectionSlug, setCollectionSlug] = useState<string | null>(null)
   const [stats, setStats] = useState<RegenerationProgress | null>(null)
+  const [confirming, setConfirming] = useState(false)
   const intervalRef = useRef<ReturnType<typeof setInterval> | null>(null)
   const stallRef = useRef({ lastProcessed: 0, stallCount: 0 })
   const prevIsRunningRef = useRef(false)
@@ -129,9 +130,24 @@ export const RegenerationButton: React.FC = () => {
     prevIsRunningRef.current = isRunning
   }, [isRunning, fetchStats])
 
-  const handleRegenerate = async () => {
+  // Phase 1: Show confirmation with counts
+  const handlePreflight = async () => {
     if (!collectionSlug) return
     setError(null)
+    // Refresh stats to get the latest counts before confirming
+    await fetchStats()
+    setConfirming(true)
+  }
+
+  const handleCancel = () => {
+    setConfirming(false)
+  }
+
+  // Phase 2: Actually start regeneration (after user confirms)
+  const handleConfirm = async () => {
+    if (!collectionSlug) return
+    setConfirming(false)
+    setError(null)
     setStalled(false)
     setIsRunning(true)
     setQueued(null)
@@ -200,40 +216,90 @@ export const RegenerationButton: React.FC = () => {
         flexWrap: 'wrap',
       }}
     >
-      <button
-        onClick={handleRegenerate}
-        disabled={isRunning}
-        style={{
-          backgroundColor: isRunning ? '#9ca3af' : '#4f46e5',
-          color: '#fff',
-          border: 'none',
-          borderRadius: '6px',
-          padding: '8px 16px',
-          fontSize: '14px',
-          fontWeight: 500,
-          cursor: isRunning ? 'not-allowed' : 'pointer',
-        }}
-      >
-        {isRunning ? 'Regenerating...' : 'Regenerate Images'}
-      </button>
-
-      <label
-        style={{ display: 'flex', alignItems: 'center', gap: '6px', fontSize: '13px' }}
-      >
-        <input
-          type="checkbox"
-          checked={force}
-          onChange={(e) => setForce(e.target.checked)}
+      {!confirming && (
+        <button
+          onClick={handlePreflight}
           disabled={isRunning}
-        />
-        Force re-process all
-      </label>
+          style={{
+            backgroundColor: isRunning ? '#9ca3af' : '#4f46e5',
+            color: '#fff',
+            border: 'none',
+            borderRadius: '6px',
+            padding: '8px 16px',
+            fontSize: '14px',
+            fontWeight: 500,
+            cursor: isRunning ? 'not-allowed' : 'pointer',
+          }}
+        >
+          {isRunning ? 'Processing all images...' : 'Regenerate All Images'}
+        </button>
+      )}
+
+      {confirming && stats && (
+        <div style={{ display: 'flex', alignItems: 'center', gap: '10px' }}>
+          <span style={{ fontSize: '13px', color: '#374151' }}>
+            {force
+              ? `Re-process all ${stats.total} images across the entire collection?`
+              : `Regenerate ${stats.pending} unoptimized image${stats.pending !== 1 ? 's' : ''} across the entire collection?`}
+          </span>
+          <button
+            onClick={handleConfirm}
+            style={{
+              backgroundColor: '#4f46e5',
+              color: '#fff',
+              border: 'none',
+              borderRadius: '6px',
+              padding: '6px 14px',
+              fontSize: '13px',
+              fontWeight: 500,
+              cursor: 'pointer',
+            }}
+          >
+            Confirm
+          </button>
+          <button
+            onClick={handleCancel}
+            style={{
+              backgroundColor: 'transparent',
+              color: '#6b7280',
+              border: '1px solid #d1d5db',
+              borderRadius: '6px',
+              padding: '6px 14px',
+              fontSize: '13px',
+              fontWeight: 500,
+              cursor: 'pointer',
+            }}
+          >
+            Cancel
+          </button>
+        </div>
+      )}
+
+      {!confirming && (
+        <label
+          style={{ display: 'flex', alignItems: 'center', gap: '6px', fontSize: '13px' }}
+        >
+          <input
+            type="checkbox"
+            checked={force}
+            onChange={(e) => setForce(e.target.checked)}
+            disabled={isRunning}
+          />
+          Force re-process all
+        </label>
+      )}
 
       {error && (
         <span style={{ color: '#ef4444', fontSize: '13px' }}>{error}</span>
       )}
 
-      {queued === 0 && !isRunning && !stalled && (
+      {queued !== null && queued > 0 && isRunning && !confirming && (
+        <span style={{ color: '#4f46e5', fontSize: '13px' }}>
+          Queued {queued} image{queued !== 1 ? 's' : ''} for processing across the entire collection
+        </span>
+      )}
+
+      {queued === 0 && !isRunning && !stalled && !confirming && (
         <span style={{ color: '#10b981', fontSize: '13px' }}>
           All images already optimized.
         </span>
@@ -297,10 +363,10 @@ export const RegenerationButton: React.FC = () => {
         </div>
       )}
 
-      {!isRunning && progress && progress.complete > 0 && queued !== 0 && (
+      {!isRunning && progress && progress.complete > 0 && queued !== 0 && !confirming && (
         <span style={{ fontSize: '13px' }}>
           <span style={{ color: progress.errored > 0 || stalled ? '#f59e0b' : '#10b981' }}>
-            Done! {progress.complete}/{progress.total} optimized.
+            Done! {progress.complete}/{progress.total} optimized (across entire collection).
           </span>
           {(progress.errored > 0 || (stalled && progress.pending > 0)) && (
             <span style={{ color: '#ef4444' }}>

package/src/endpoints/regenerate.ts

@@ -1,5 +1,5 @@
 import type { PayloadHandler } from 'payload'
-import type { CollectionSlug } from 'payload'
+import type { CollectionSlug, Where } from 'payload'
 
 import type { ResolvedImageOptimizerConfig } from '../types.js'
 
@@ -25,16 +25,20 @@ export const createRegenerateHandler = (resolvedConfig: ResolvedImageOptimizerCo
     }
 
     // Find all image documents in the collection
-    const where: any = {
-      mimeType: { contains: 'image/' },
-    }
     // Unless force=true, skip already-processed docs
-    if (!body.force) {
-      where.or = [
-        { 'imageOptimizer.status': { not_equals: 'complete' } },
-        { 'imageOptimizer.status': { exists: false } },
-      ]
-    }
+    const where: Where = body.force
+      ? { mimeType: { contains: 'image/' } }
+      : {
+          and: [
+            { mimeType: { contains: 'image/' } },
+            {
+              or: [
+                { 'imageOptimizer.status': { not_equals: 'complete' } },
+                { 'imageOptimizer.status': { exists: false } },
+              ],
+            },
+          ],
+        }
 
     let queued = 0
     let page = 1
@@ -65,9 +69,11 @@ export const createRegenerateHandler = (resolvedConfig: ResolvedImageOptimizerCo
       page++
     }
 
+    req.payload.logger.info(`Image optimizer: queued ${queued} images from '${collectionSlug}' for regeneration`)
+
     // Fire the job runner (non-blocking)
     if (queued > 0) {
-      req.payload.jobs.run().catch((err: unknown) => {
+      req.payload.jobs.run({ limit: queued }).catch((err: unknown) => {
         req.payload.logger.error({ err }, 'Regeneration job runner failed')
       })
     }

package/src/hooks/afterChange.ts

@@ -1,9 +1,8 @@
 import fs from 'fs/promises'
 import path from 'path'
-import type { CollectionAfterChangeHook, CollectionSlug } from 'payload'
+import type { CollectionAfterChangeHook } from 'payload'
 
 import type { ResolvedImageOptimizerConfig } from '../types.js'
-import { resolveCollectionConfig } from '../defaults.js'
 import { resolveStaticDir } from '../utilities/resolveStaticDir.js'
 import { isCloudStorage } from '../utilities/storage.js'
 
@@ -45,44 +44,11 @@ export const createAfterChangeHook = (
       }
     }
 
-    const perCollectionConfig = resolveCollectionConfig(resolvedConfig, collectionSlug)
-
-    // When replaceOriginal is on and only one format is configured, the main file
-    // is already converted — skip the async job and mark complete immediately.
-    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1) {
-      await req.payload.update({
-        collection: collectionSlug as CollectionSlug,
-        id: doc.id,
-        data: {
-          imageOptimizer: {
-            ...doc.imageOptimizer,
-            status: 'complete',
-            variants: [],
-            error: null,
-          },
-        },
-        context: { imageOptimizer_skip: true },
-      })
-      return doc
-    }
-
-    // With cloud storage, variant files cannot be written — skip the async job
-    // and mark complete. CDN-level image optimization (e.g. Next.js Image) can
-    // serve alternative formats on the fly.
-    if (cloudStorage) {
-      await req.payload.update({
-        collection: collectionSlug as CollectionSlug,
-        id: doc.id,
-        data: {
-          imageOptimizer: {
-            ...doc.imageOptimizer,
-            status: 'complete',
-            variants: [],
-            error: null,
-          },
-        },
-        context: { imageOptimizer_skip: true },
-      })
+    // When status was already resolved in beforeChange (cloud storage, or
+    // replaceOriginal with a single format), no async job or update is needed.
+    // This avoids a separate update() call that fails with 404 on MongoDB due to
+    // transaction isolation when cloud storage adapters are involved.
+    if (context?.imageOptimizer_statusResolved) {
       return doc
     }
 

package/src/hooks/beforeChange.ts

@@ -4,6 +4,7 @@ import type { CollectionBeforeChangeHook } from 'payload'
 import type { ResolvedImageOptimizerConfig } from '../types.js'
 import { resolveCollectionConfig } from '../defaults.js'
 import { convertFormat, generateThumbHash, stripAndResize } from '../processing/index.js'
+import { isCloudStorage } from '../utilities/storage.js'
 
 export const createBeforeChangeHook = (
   resolvedConfig: ResolvedImageOptimizerConfig,
@@ -45,10 +46,24 @@ export const createBeforeChangeHook = (
       data.filesize = finalSize
     }
 
+    // Determine if async work (variant generation job) is needed after create.
+    // If not, set status to 'complete' now so afterChange doesn't need a separate
+    // update() call — which fails with 404 on MongoDB due to transaction isolation
+    // when cloud storage adapters are involved.
+    const collectionConfig = req.payload.collections[collectionSlug as keyof typeof req.payload.collections].config
+    const cloudStorage = isCloudStorage(collectionConfig)
+    const needsAsyncJob = !cloudStorage && !(perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1)
+
     data.imageOptimizer = {
       originalSize,
       optimizedSize: finalSize,
-      status: 'pending',
+      status: needsAsyncJob ? 'pending' : 'complete',
+      variants: needsAsyncJob ? undefined : [],
+      error: null,
+    }
+
+    if (!needsAsyncJob) {
+      context.imageOptimizer_statusResolved = true
     }
 
     if (resolvedConfig.generateThumbHash) {