@inoo-ch/payload-image-optimizer 1.3.6 → 1.3.8

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 } 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,\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,\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, 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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inoo-ch/payload-image-optimizer",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "Payload CMS plugin for automatic image optimization — WebP/AVIF conversion, resize, EXIF strip, ThumbHash placeholders, and bulk regeneration",
   "license": "MIT",
   "keywords": [
@@ -24,19 +24,19 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": "./src/index.ts",
+      "import": "./dist/index.js",
       "types": "./src/index.ts",
-      "default": "./src/index.ts"
+      "default": "./dist/index.js"
     },
     "./client": {
-      "import": "./src/exports/client.ts",
+      "import": "./dist/exports/client.js",
       "types": "./src/exports/client.ts",
-      "default": "./src/exports/client.ts"
+      "default": "./dist/exports/client.js"
     },
     "./rsc": {
-      "import": "./src/exports/rsc.ts",
+      "import": "./dist/exports/rsc.js",
       "types": "./src/exports/rsc.ts",
-      "default": "./src/exports/rsc.ts"
+      "default": "./dist/exports/rsc.js"
     }
   },
   "main": "./src/index.ts",

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,6 +1,6 @@
 import fs from 'fs/promises'
 import path from 'path'
-import type { CollectionAfterChangeHook } from 'payload'
+import type { CollectionAfterChangeHook, CollectionSlug } from 'payload'
 
 import type { ResolvedImageOptimizerConfig } from '../types.js'
 import { resolveCollectionConfig } from '../defaults.js'
@@ -51,7 +51,7 @@ export const createAfterChangeHook = (
     // is already converted — skip the async job and mark complete immediately.
     if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1) {
       await req.payload.update({
-        collection: collectionSlug,
+        collection: collectionSlug as CollectionSlug,
         id: doc.id,
         data: {
           imageOptimizer: {
@@ -71,7 +71,7 @@ export const createAfterChangeHook = (
     // serve alternative formats on the fly.
     if (cloudStorage) {
       await req.payload.update({
-        collection: collectionSlug,
+        collection: collectionSlug as CollectionSlug,
         id: doc.id,
         data: {
           imageOptimizer: {