strapi-plugin-bulk-updater 1.4.3 → 1.4.9

package/dist/server/index.js

@@ -214,6 +214,30 @@ const routes = {
         config: {
           policies: []
         }
+      },
+      {
+        method: "POST",
+        path: "/csv/import-chunk",
+        handler: "csv.importChunk",
+        config: {
+          policies: []
+        }
+      },
+      {
+        method: "POST",
+        path: "/csv/validate-preflight",
+        handler: "csv.validatePreflight",
+        config: {
+          policies: []
+        }
+      },
+      {
+        method: "POST",
+        path: "/csv/submit-batch",
+        handler: "csv.submitBatch",
+        config: {
+          policies: []
+        }
       }
     ]
   }
@@ -644,7 +668,7 @@ const csvController = ({ strapi }) => ({
   },
   async importCsv(ctx) {
     try {
-      const { uid, csvText, mode, publish } = ctx.request.body;
+      const { uid, csvText, mode, publish, publishStrategy, unreviewedConsent } = ctx.request.body;
       if (!uid) {
         ctx.status = 400;
         ctx.body = { success: false, error: "Target collection UID is required." };
@@ -659,6 +683,93 @@ const csvController = ({ strapi }) => ({
       const result = await csvService2.importCsv(uid, csvText, {
         mode: mode === "update" ? "update" : mode === "create_or_override" ? "create_or_override" : "auto",
         publish: publish !== false,
+        publishStrategy: publishStrategy === "all" ? "all" : "safe",
+        unreviewedConsent: Boolean(unreviewedConsent),
+        user: ctx.state.user
+      });
+      ctx.body = result;
+    } catch (err) {
+      ctx.status = 500;
+      ctx.body = { success: false, error: err.message };
+    }
+  },
+  async importChunk(ctx) {
+    try {
+      const { uid, rows, batchId, isFirstChunk, isLastChunk, startRowNumber, mode, publish, publishStrategy, unreviewedConsent } = ctx.request.body;
+      if (!uid) {
+        ctx.status = 400;
+        ctx.body = { success: false, error: "Target collection UID is required." };
+        return;
+      }
+      if (!Array.isArray(rows)) {
+        ctx.status = 400;
+        ctx.body = { success: false, error: "Rows array is required." };
+        return;
+      }
+      const csvService2 = strapi.plugin("bulk-updater").service("csv");
+      const result = await csvService2.importChunk(uid, rows, {
+        batchId: batchId ? String(batchId) : void 0,
+        isFirstChunk: Boolean(isFirstChunk),
+        isLastChunk: Boolean(isLastChunk),
+        startRowNumber: typeof startRowNumber === "number" ? startRowNumber : void 0,
+        mode: mode === "update" ? "update" : mode === "create_or_override" ? "create_or_override" : "auto",
+        publish: publish !== false,
+        publishStrategy: publishStrategy === "all" ? "all" : "safe",
+        unreviewedConsent: Boolean(unreviewedConsent),
+        user: ctx.state.user
+      });
+      ctx.body = result;
+    } catch (err) {
+      ctx.status = 500;
+      ctx.body = { success: false, error: err.message };
+    }
+  },
+  async validatePreflight(ctx) {
+    try {
+      const { uid, rows, mode } = ctx.request.body;
+      if (!uid) {
+        ctx.status = 400;
+        ctx.body = { success: false, error: "Target collection UID is required." };
+        return;
+      }
+      if (!Array.isArray(rows)) {
+        ctx.status = 400;
+        ctx.body = { success: false, error: "Rows array is required." };
+        return;
+      }
+      const csvService2 = strapi.plugin("bulk-updater").service("csv");
+      const result = await csvService2.validatePreflight(uid, rows, {
+        mode: mode === "update" ? "update" : mode === "create_or_override" ? "create_or_override" : "auto"
+      });
+      ctx.body = result;
+    } catch (err) {
+      ctx.status = 500;
+      ctx.body = { success: false, error: err.message };
+    }
+  },
+  async submitBatch(ctx) {
+    try {
+      const { uid, rows, executionMode, makerNotes, forceImmediate, mode, publish, publishStrategy, unreviewedConsent, unreviewedCount } = ctx.request.body;
+      if (!uid) {
+        ctx.status = 400;
+        ctx.body = { success: false, error: "Target collection UID is required." };
+        return;
+      }
+      if (!Array.isArray(rows)) {
+        ctx.status = 400;
+        ctx.body = { success: false, error: "Rows array is required." };
+        return;
+      }
+      const csvService2 = strapi.plugin("bulk-updater").service("csv");
+      const result = await csvService2.submitBatch(uid, rows, {
+        executionMode,
+        makerNotes,
+        forceImmediate: Boolean(forceImmediate),
+        mode: mode === "update" ? "update" : mode === "create_or_override" ? "create_or_override" : "auto",
+        publish: publish !== false,
+        publishStrategy: publishStrategy === "all" ? "all" : "safe",
+        unreviewedConsent: Boolean(unreviewedConsent),
+        unreviewedCount: typeof unreviewedCount === "number" ? unreviewedCount : 0,
         user: ctx.state.user
       });
       ctx.body = result;
@@ -816,6 +927,60 @@ const modelsCache = /* @__PURE__ */ new Map();
 const MAX_QUERY_CACHE_SIZE = 500;
 const CACHE_TTL_MS = 60 * 1e3;
 let staticSchemaCache = null;
+function formatEntryRecord(entry) {
+  if (!entry || typeof entry !== "object") return entry;
+  const formatted = {
+    id: entry.id,
+    documentId: entry.documentId,
+    ...entry
+  };
+  if (entry.updatedAt !== void 0 && formatted.updated_at === void 0) {
+    formatted.updated_at = entry.updatedAt;
+  }
+  if (entry.updated_at !== void 0 && formatted.updatedAt === void 0) {
+    formatted.updatedAt = entry.updated_at;
+  }
+  if (entry.createdAt !== void 0 && formatted.created_at === void 0) {
+    formatted.created_at = entry.createdAt;
+  }
+  if (entry.created_at !== void 0 && formatted.createdAt === void 0) {
+    formatted.createdAt = entry.created_at;
+  }
+  if (entry.publishedAt !== void 0 && formatted.published_at === void 0) {
+    formatted.published_at = entry.publishedAt;
+  }
+  if (entry.published_at !== void 0 && formatted.publishedAt === void 0) {
+    formatted.publishedAt = entry.published_at;
+  }
+  return formatted;
+}
+function resolveContentTypeField(contentType, field) {
+  if (!field) return null;
+  const attrs = contentType?.attributes || {};
+  if (attrs[field]) return field;
+  if (field === "updated_at" || field === "updatedAt") {
+    return attrs["updated_at"] ? "updated_at" : "updatedAt";
+  }
+  if (field === "created_at" || field === "createdAt") {
+    return attrs["created_at"] ? "created_at" : "createdAt";
+  }
+  if (field === "published_at" || field === "publishedAt") {
+    return attrs["published_at"] ? "published_at" : "publishedAt";
+  }
+  if (field === "id" || field === "documentId") {
+    return field;
+  }
+  const camel = field.replace(/_([a-z0-9])/g, (_, l) => l.toUpperCase());
+  if (attrs[camel]) return camel;
+  const snake = field.replace(/([A-Z])/g, "_$1").toLowerCase();
+  if (attrs[snake]) return snake;
+  const lower = field.toLowerCase().replace(/_/g, "");
+  const matched = Object.keys(attrs).find(
+    (k) => k.toLowerCase().replace(/_/g, "") === lower
+  );
+  if (matched) return matched;
+  return null;
+}
 function buildDeepPopulate$1(attributes, allComponents, depth = 0) {
   if (depth > 5) return void 0;
   const populate = {};
@@ -948,13 +1113,15 @@ function getAllNestedValues(obj, path) {
       if (!item || typeof item !== "object") return;
       if (parsed.targetIndex !== void 0 && idx !== parsed.targetIndex) return;
       if (parsed.targetComponentUid && item.__component !== parsed.targetComponentUid) return;
+      const compSchema = global.strapi?.components?.[item.__component];
+      const fieldInSchema = tail.length > 0 && compSchema?.attributes ? tail[0] in compSchema.attributes : false;
       const subVal = tail.length > 0 ? getDeepProperty(item, tail.join(".")) : item;
-      if (subVal !== void 0) {
+      if (subVal !== void 0 || fieldInSchema) {
         results.push({
           index: idx,
           componentUid: item.__component,
           componentName: formatComponentName(item.__component),
-          value: subVal,
+          value: subVal !== void 0 ? subVal : null,
           path: `${head}[#${idx}${item.__component ? ` ${formatComponentName(item.__component)}` : ""}].${tail.join(".")}`
         });
       }
@@ -1053,7 +1220,9 @@ function setDeepProperty(obj, pathParts, value, options) {
       if (options?.targetComponentUid) {
         if (item.__component !== options.targetComponentUid) return item;
       }
-      if (head in item || tail.length > 0 && typeof item[head] === "object") {
+      const compSchema = global.strapi?.components?.[item.__component];
+      const fieldExistsInSchema = compSchema?.attributes ? head in compSchema.attributes : true;
+      if (head in item || fieldExistsInSchema || tail.length === 0) {
         return {
           ...item,
           [head]: setDeepProperty(item[head], tail, value, options)
@@ -1167,6 +1336,12 @@ const pendingBatches = /* @__PURE__ */ new Map();
 const batchJobsMap = /* @__PURE__ */ new Map();
 let isRunnerRunning = false;
 let runnerInterval = null;
+function registerPendingBatch(batch, jobState) {
+  pendingBatches.set(batch.id, batch);
+  if (jobState) {
+    batchJobsMap.set(batch.id, jobState);
+  }
+}
 function invalidateCollectionCache(uid) {
   modelsCache.delete(uid);
   for (const key of queryCache.keys()) {
@@ -1238,7 +1413,9 @@ async function executeBatchInternal(strapi, {
   selectedCollections = [],
   isRegex = false,
   regexPattern = "",
-  publishOnApproval = true
+  publishOnApproval = true,
+  publishStrategy = "safe",
+  unreviewedConsent = false
 }, currentUser, existingBatchId) {
   if (!attribute) {
     throw new Error("Attribute name is required.");
@@ -1291,6 +1468,8 @@ async function executeBatchInternal(strapi, {
     failedCount: 0,
     isLive: false,
     publishOnApproval: Boolean(publishOnApproval),
+    publishStrategy,
+    unreviewedConsent,
     results: []
   };
   batchJobsMap.set(batchId, jobState);
@@ -1364,7 +1543,9 @@ async function executeBatchInternal(strapi, {
               }
             });
             const isDraftAndPublishComp = Boolean(contentType?.options?.draftAndPublish);
-            if (publishOnApproval && isDraftAndPublishComp) {
+            const isApprovedComp = isDraftAndPublishComp && Boolean(currentEntry?.publishedAt) && currentEntry?.status !== "modified";
+            const shouldPublishComp = isDraftAndPublishComp && Boolean(publishOnApproval) && (publishStrategy === "all" ? true : isApprovedComp);
+            if (shouldPublishComp) {
               try {
                 await strapi.documents(target.uid).publish({
                   documentId: target.documentId
@@ -1378,7 +1559,7 @@ async function executeBatchInternal(strapi, {
               uid: target.uid,
               documentId: target.documentId,
               userId: currentUser?.id,
-              statusOverride: publishOnApproval && isDraftAndPublishComp ? "published" : void 0
+              statusOverride: shouldPublishComp ? "published" : isDraftAndPublishComp ? "draft" : void 0
             });
             const dzDiffs = isRootDz && affectedMatches.length > 0 ? affectedMatches.map((m) => ({
               index: m.index,
@@ -1461,7 +1642,9 @@ async function executeBatchInternal(strapi, {
               }
             });
             const isDraftAndPublishRel = Boolean(contentType?.options?.draftAndPublish);
-            if (publishOnApproval && isDraftAndPublishRel) {
+            const isApprovedRel = isDraftAndPublishRel && Boolean(currentEntry?.publishedAt) && currentEntry?.status !== "modified";
+            const shouldPublishRel = isDraftAndPublishRel && Boolean(publishOnApproval) && (publishStrategy === "all" ? true : isApprovedRel);
+            if (shouldPublishRel) {
               try {
                 await strapi.documents(target.uid).publish({
                   documentId: target.documentId
@@ -1478,7 +1661,7 @@ async function executeBatchInternal(strapi, {
               uid: target.uid,
               documentId: target.documentId,
               userId: currentUser?.id,
-              statusOverride: publishOnApproval && isDraftAndPublishRel ? "published" : void 0
+              statusOverride: shouldPublishRel ? "published" : isDraftAndPublishRel ? "draft" : void 0
             });
             return {
               uid: target.uid,
@@ -1504,7 +1687,9 @@ async function executeBatchInternal(strapi, {
             }
           });
           const isDraftAndPublishScalar = Boolean(contentType?.options?.draftAndPublish);
-          if (publishOnApproval && isDraftAndPublishScalar) {
+          const isApprovedScalar = isDraftAndPublishScalar && Boolean(currentEntry?.publishedAt) && currentEntry?.status !== "modified";
+          const shouldPublishScalar = isDraftAndPublishScalar && Boolean(publishOnApproval) && (publishStrategy === "all" ? true : isApprovedScalar);
+          if (shouldPublishScalar) {
             try {
               await strapi.documents(target.uid).publish({
                 documentId: target.documentId
@@ -1517,7 +1702,7 @@ async function executeBatchInternal(strapi, {
             uid: target.uid,
             documentId: target.documentId,
             userId: currentUser?.id,
-            statusOverride: publishOnApproval && isDraftAndPublishScalar ? "published" : void 0
+            statusOverride: shouldPublishScalar ? "published" : isDraftAndPublishScalar ? "draft" : void 0
           });
           return {
             uid: target.uid,
@@ -1604,7 +1789,9 @@ async function executeBatchInternal(strapi, {
     updatedCount,
     skippedCount,
     totalTargets: targetsMap.size,
-    publishOnApproval
+    publishOnApproval,
+    publishStrategy,
+    unreviewedConsent
   };
   await strapi.plugin("bulk-updater").service("audit").recordBatch(
     batchSummary,
@@ -1627,7 +1814,8 @@ async function executeBatchInternal(strapi, {
 }
 async function executePublishBatchInternal(strapi, {
   selectedEntries = [],
-  selectedCollections = []
+  selectedCollections = [],
+  unreviewedConsent = false
 }, currentUser, existingBatchId) {
   const targetsMap = /* @__PURE__ */ new Map();
   for (const colUid of selectedCollections) {
@@ -1672,6 +1860,7 @@ async function executePublishBatchInternal(strapi, {
     failedCount: 0,
     isLive: false,
     publishOnApproval: true,
+    unreviewedConsent,
     results: []
   };
   batchJobsMap.set(batchId, jobState);
@@ -1769,7 +1958,8 @@ async function executePublishBatchInternal(strapi, {
     updatedCount: publishedCount,
     skippedCount,
     totalTargets: targetsMap.size,
-    publishOnApproval: true
+    publishOnApproval: true,
+    unreviewedConsent
   };
   await strapi.plugin("bulk-updater").service("audit").recordBatch(
     batchSummary,
@@ -1789,6 +1979,22 @@ async function executePublishBatchInternal(strapi, {
     results
   };
 }
+async function executeBatchByPayload(strapi, batch, currentUser) {
+  if (batch.payload?.action === "csv_import") {
+    const csvService2 = strapi.plugin("bulk-updater").service("csv");
+    return await csvService2.executeCsvPendingBatch(
+      batch.payload.uid,
+      batch.payload.rows,
+      batch.id,
+      batch.payload.options,
+      currentUser
+    );
+  } else if (batch.payload?.action === "publish") {
+    return await executePublishBatchInternal(strapi, batch.payload, currentUser, batch.id);
+  } else {
+    return await executeBatchInternal(strapi, batch.payload, currentUser, batch.id);
+  }
+}
 const bulkUpdaterService = ({ strapi }) => {
   if (!runnerInterval) {
     runnerInterval = setInterval(async () => {
@@ -1800,7 +2006,7 @@ const bulkUpdaterService = ({ strapi }) => {
         for (const [id, batch] of pendingBatches.entries()) {
           if (batch.status === "queued_offpeak" && !isBusinessHours) {
             strapi.log.info(`[bulk-updater] Executing off-peak queued batch: ${id}`);
-            const result = batch.payload?.action === "publish" ? await executePublishBatchInternal(strapi, batch.payload, batch.createdBy, id) : await executeBatchInternal(strapi, batch.payload, batch.createdBy, id);
+            const result = await executeBatchByPayload(strapi, batch, batch.createdBy);
             batch.status = "executed";
             batch.executionResult = result;
           }
@@ -2012,11 +2218,7 @@ const bulkUpdaterService = ({ strapi }) => {
               entries = [];
               totalCount = 0;
             }
-            const formattedEntries = (entries || []).map((entry) => ({
-              id: entry.id,
-              documentId: entry.documentId,
-              ...entry
-            }));
+            const formattedEntries = (entries || []).map(formatEntryRecord);
             modelsCache.set(uid, {
               signature,
               totalCount,
@@ -2105,21 +2307,26 @@ const bulkUpdaterService = ({ strapi }) => {
       let isNestedAttr = false;
       let isRootDz = false;
       let parts = [];
+      let resolvedFilterAttr = targetFilterAttr;
       if (targetFilterAttr) {
-        const parsed = parseDynamicZonePath(targetFilterAttr);
-        if (parsed.rootKey && contentType.attributes?.[parsed.rootKey]?.type === "dynamiczone") {
-          isRootDz = true;
+        const resolvedField = resolveContentTypeField(contentType, targetFilterAttr);
+        if (resolvedField) {
+          resolvedFilterAttr = resolvedField;
           colHasAttribute = true;
-          isNestedAttr = true;
-          parts = parsed.cleanPath.split(".");
-        } else if (targetFilterAttr.includes(".") || targetFilterAttr.includes("[")) {
-          isNestedAttr = isDeepComponentField(contentType, strapi.components, targetFilterAttr);
-          if (isNestedAttr) {
+        } else {
+          const parsed = parseDynamicZonePath(targetFilterAttr);
+          if (parsed.rootKey && contentType.attributes?.[parsed.rootKey]?.type === "dynamiczone") {
+            isRootDz = true;
             colHasAttribute = true;
+            isNestedAttr = true;
             parts = parsed.cleanPath.split(".");
+          } else if (targetFilterAttr.includes(".") || targetFilterAttr.includes("[")) {
+            isNestedAttr = isDeepComponentField(contentType, strapi.components, targetFilterAttr);
+            if (isNestedAttr) {
+              colHasAttribute = true;
+              parts = parsed.cleanPath.split(".");
+            }
           }
-        } else if (attrs[targetFilterAttr]) {
-          colHasAttribute = true;
         }
       }
       const normOp = (filterOperator || "").toLowerCase().replace(/_/g, "");
@@ -2143,9 +2350,44 @@ const bulkUpdaterService = ({ strapi }) => {
         }
         let condition = void 0;
         const q = (filterQuery || "").trim();
-        const targetAttrSchema = isNestedAttr ? getLeafAttributeSchema(contentType, strapi.components, targetFilterAttr) : attrs[targetFilterAttr];
+        const targetAttrSchema = isNestedAttr ? getLeafAttributeSchema(contentType, strapi.components, targetFilterAttr) : attrs[resolvedFilterAttr];
+        const isRelation = targetAttrSchema?.type === "relation";
         const isStringLike = ["string", "text", "email", "richtext", "uid"].includes(targetAttrSchema?.type);
-        if (normOp === "empty") {
+        if (isRelation) {
+          const targetUid = targetAttrSchema?.target;
+          const targetContentType = targetUid ? strapi.contentTypes[targetUid] : void 0;
+          const targetAttrs = targetContentType?.attributes || {};
+          const targetStringAttrs = Object.keys(targetAttrs).filter(
+            (k) => ["string", "text", "email", "uid"].includes(targetAttrs[k]?.type)
+          );
+          if (normOp === "empty") {
+            condition = { documentId: { $null: true } };
+          } else if (normOp === "notempty") {
+            condition = { documentId: { $notNull: true } };
+          } else if (q !== "") {
+            const orConditions = [];
+            targetStringAttrs.slice(0, 5).forEach((k) => {
+              if (normOp === "equals") {
+                orConditions.push({ [k]: { $eqi: q } });
+              } else if (normOp === "startswith") {
+                orConditions.push({ [k]: { $startsWithi: q } });
+              } else if (normOp === "endswith") {
+                orConditions.push({ [k]: { $endsWithi: q } });
+              } else if (normOp === "notequals") {
+                orConditions.push({ [k]: { $ne: q } });
+              } else if (normOp === "notcontains") {
+                orConditions.push({ [k]: { $notContainsi: q } });
+              } else {
+                orConditions.push({ [k]: { $containsi: q } });
+              }
+            });
+            orConditions.push({ documentId: { $eq: q } });
+            if (/^\d+$/.test(q)) {
+              orConditions.push({ id: { $eq: Number(q) } });
+            }
+            condition = orConditions.length === 1 ? orConditions[0] : { $or: orConditions };
+          }
+        } else if (normOp === "empty") {
           condition = isStringLike ? { $or: [{ $null: true }, { $eq: "" }] } : { $null: true };
         } else if (normOp === "notempty") {
           condition = isStringLike ? { $and: [{ $notNull: true }, { $ne: "" }] } : { $notNull: true };
@@ -2181,13 +2423,13 @@ const bulkUpdaterService = ({ strapi }) => {
           } else {
             if (normOp === "empty" && isStringLike) {
               filters.$or = [
-                { [targetFilterAttr]: { $null: true } },
-                { [targetFilterAttr]: { $eq: "" } }
+                { [resolvedFilterAttr]: { $null: true } },
+                { [resolvedFilterAttr]: { $eq: "" } }
               ];
             } else if (normOp === "notempty" && isStringLike) {
-              filters[targetFilterAttr] = { $notNull: true, $ne: "" };
+              filters[resolvedFilterAttr] = { $notNull: true, $ne: "" };
             } else {
-              filters[targetFilterAttr] = condition;
+              filters[resolvedFilterAttr] = condition;
             }
           }
         }
@@ -2229,7 +2471,7 @@ const bulkUpdaterService = ({ strapi }) => {
           displayName: contentType.info?.displayName || uid,
           isSingleType: true,
           draftAndPublish: Boolean(contentType.options?.draftAndPublish),
-          entries: singleDoc ? [singleDoc] : [],
+          entries: singleDoc ? [formatEntryRecord(singleDoc)] : [],
           pagination: {
             page: 1,
             pageSize: 1,
@@ -2246,8 +2488,13 @@ const bulkUpdaterService = ({ strapi }) => {
           } else {
             sortClause["createdAt"] = "desc";
           }
-        } else if (sortField && contentType.attributes?.[sortField]) {
-          sortClause[sortField] = sortOrder;
+        } else if (sortField) {
+          const resolvedField = resolveContentTypeField(contentType, sortField);
+          if (resolvedField) {
+            sortClause[resolvedField] = sortOrder;
+          } else {
+            sortClause["createdAt"] = "desc";
+          }
         } else {
           sortClause["createdAt"] = "desc";
         }
@@ -2265,14 +2512,30 @@ const bulkUpdaterService = ({ strapi }) => {
           const passesDzFilter = (entry) => {
             const matches = getAllNestedValues(entry, targetFilterAttr);
             if (normOp === "empty") {
-              return matches.length === 0 || matches.every((m) => m.value === void 0 || m.value === null || String(m.value).trim() === "");
+              return matches.length === 0 || matches.every((m) => {
+                const v = m.value;
+                if (v === void 0 || v === null) return true;
+                if (Array.isArray(v)) return v.length === 0;
+                if (typeof v === "object") return Object.keys(v).length === 0;
+                return String(v).trim() === "";
+              });
             }
             if (normOp === "notempty") {
-              return matches.some((m) => m.value !== void 0 && m.value !== null && String(m.value).trim() !== "");
+              return matches.some((m) => {
+                const v = m.value;
+                if (v === void 0 || v === null) return false;
+                if (Array.isArray(v)) return v.length > 0;
+                if (typeof v === "object") return Object.keys(v).length > 0;
+                return String(v).trim() !== "";
+              });
             }
-            return matches.some((m) => {
-              if (m.value === void 0 || m.value === null) return false;
-              const valStr = String(m.value).toLowerCase();
+            const testSingleValue = (v) => {
+              if (v === void 0 || v === null) return false;
+              if (Array.isArray(v)) return v.some(testSingleValue);
+              if (typeof v === "object") {
+                return testSingleValue(v.name) || testSingleValue(v.title) || testSingleValue(v.email) || testSingleValue(v.username) || testSingleValue(v.documentId) || testSingleValue(v.id) || testSingleValue(v.slug);
+              }
+              const valStr = String(v).toLowerCase();
               switch (normOp) {
                 case "equals":
                   return valStr === qVal;
@@ -2289,7 +2552,8 @@ const bulkUpdaterService = ({ strapi }) => {
                 default:
                   return true;
               }
-            });
+            };
+            return matches.some((m) => testSingleValue(m.value));
           };
           const matchedEntries = (rawEntries || []).filter(passesDzFilter);
           const totalEntries = matchedEntries.length;
@@ -2299,11 +2563,7 @@ const bulkUpdaterService = ({ strapi }) => {
             displayName: contentType.info?.displayName || uid,
             isSingleType: false,
             draftAndPublish: Boolean(contentType.options?.draftAndPublish),
-            entries: paginatedEntries.map((entry) => ({
-              id: entry.id,
-              documentId: entry.documentId,
-              ...entry
-            })),
+            entries: paginatedEntries.map(formatEntryRecord),
             pagination: {
               page: currentPage,
               pageSize: limit,
@@ -2332,11 +2592,7 @@ const bulkUpdaterService = ({ strapi }) => {
             displayName: contentType.info?.displayName || uid,
             isSingleType: false,
             draftAndPublish: Boolean(contentType.options?.draftAndPublish),
-            entries: (entries || []).map((entry) => ({
-              id: entry.id,
-              documentId: entry.documentId,
-              ...entry
-            })),
+            entries: (entries || []).map(formatEntryRecord),
             pagination: {
               page: currentPage,
               pageSize: limit,
@@ -2413,7 +2669,12 @@ const bulkUpdaterService = ({ strapi }) => {
       for (const item of selectedEntries) {
         if (!item.uid || !item.documentId) continue;
         const key = `${item.uid}@@@${item.documentId}`;
-        targetsMap.set(key, { uid: item.uid, documentId: item.documentId });
+        targetsMap.set(key, {
+          uid: item.uid,
+          documentId: item.documentId,
+          dynamicZoneIndexes: item.dynamicZoneIndexes,
+          targetComponentUid: item.targetComponentUid
+        });
       }
       if (targetsMap.size === 0) {
         throw new Error("No collections or entries were selected for preview.");
@@ -2477,6 +2738,49 @@ const bulkUpdaterService = ({ strapi }) => {
           }
           const entryLabel = currentEntry?.name || currentEntry?.title || currentEntry?.email || `Entry #${target.documentId}`;
           if (isComponentNested) {
+            const parsed = parseDynamicZonePath(attribute);
+            const rootKey = parsed.rootKey;
+            const isRootDz = contentType?.attributes?.[rootKey]?.type === "dynamiczone";
+            const targetIndexes = target.dynamicZoneIndexes;
+            const targetComponentUid = target.targetComponentUid || parsed.targetComponentUid;
+            if (isRootDz && currentEntry?.[rootKey] && Array.isArray(currentEntry[rootKey])) {
+              let affectedMatches = getAllNestedValues({ [rootKey]: currentEntry[rootKey] }, attribute);
+              if (targetIndexes && targetIndexes.length > 0) {
+                affectedMatches = affectedMatches.filter((m) => targetIndexes.includes(m.index));
+              }
+              if (targetComponentUid) {
+                affectedMatches = affectedMatches.filter((m) => m.componentUid === targetComponentUid);
+              }
+              if (affectedMatches.length > 0) {
+                for (const match of affectedMatches) {
+                  let blockNewVal = value;
+                  if (regexObj && typeof match.value === "string") {
+                    blockNewVal = match.value.replace(regexObj, value);
+                  }
+                  const hasChange3 = String(match.value ?? "") !== String(blockNewVal ?? "");
+                  if (hasChange3) {
+                    willUpdateCount++;
+                  } else {
+                    unchangedCount++;
+                  }
+                  diffs.push({
+                    uid: target.uid,
+                    collectionName: displayName,
+                    documentId: target.documentId,
+                    label: `${entryLabel} [Block #${match.index} (${match.componentName})]`,
+                    attribute: `${rootKey}[#${match.index} ${match.componentName}].${parsed.subPath}`,
+                    oldValue: match.value ?? null,
+                    newValue: blockNewVal,
+                    oldDisplay: match.value !== void 0 && match.value !== null && String(match.value).trim() !== "" ? String(match.value) : "(empty)",
+                    newDisplay: String(blockNewVal ?? ""),
+                    hasChange: hasChange3,
+                    status: hasChange3 ? "will_update" : "unchanged",
+                    message: hasChange3 ? "Block value will be updated" : "Block already has target value"
+                  });
+                }
+                continue;
+              }
+            }
             const currentVal2 = getDeepProperty(currentEntry, attribute);
             let newValue2 = value;
             if (regexObj && typeof currentVal2 === "string") {
@@ -2632,7 +2936,10 @@ const bulkUpdaterService = ({ strapi }) => {
       executionMode = "immediate",
       makerNotes = "",
       forceImmediate = false,
-      publishOnApproval = true
+      publishOnApproval = true,
+      publishStrategy = "safe",
+      unreviewedConsent = false,
+      unreviewedCount = 0
     }, currentUser) {
       if (!attribute) {
         throw new Error("Attribute name is required.");
@@ -2655,13 +2962,16 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval },
+          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval, publishStrategy, unreviewedConsent, unreviewedCount },
           summary: {
             attribute,
             value,
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval
+            publishOnApproval,
+            publishStrategy,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "pending_approval",
           executionMode: "maker_checker",
@@ -2683,6 +2993,9 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: Boolean(publishOnApproval),
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount,
           makerNotes,
           results: []
         });
@@ -2711,13 +3024,16 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval },
+          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval, publishStrategy, unreviewedConsent, unreviewedCount },
           summary: {
             attribute,
             value,
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval
+            publishOnApproval,
+            publishStrategy,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "queued_offpeak",
           executionMode: "queue_offpeak",
@@ -2741,6 +3057,9 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: Boolean(publishOnApproval),
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount,
           makerNotes,
           results: []
         });
@@ -2770,13 +3089,16 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval },
+          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval, publishStrategy, unreviewedConsent, unreviewedCount },
           summary: {
             attribute,
             value,
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval
+            publishOnApproval,
+            publishStrategy,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "queued_offpeak",
           executionMode: "queue_offpeak",
@@ -2800,6 +3122,9 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: Boolean(publishOnApproval),
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount,
           policyMessage,
           makerNotes: "Automatically queued due to peak business hours restriction.",
           results: []
@@ -2816,7 +3141,7 @@ const bulkUpdaterService = ({ strapi }) => {
       }
       return await executeBatchInternal(
         strapi,
-        { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval },
+        { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval, publishStrategy, unreviewedConsent },
         currentUser
       );
     },
@@ -2828,7 +3153,9 @@ const bulkUpdaterService = ({ strapi }) => {
       selectedCollections = [],
       executionMode = "immediate",
       makerNotes = "",
-      forceImmediate = false
+      forceImmediate = false,
+      unreviewedConsent = false,
+      unreviewedCount = 0
     }, currentUser) {
       const executionConfig = getExecutionWindowConfig(strapi);
       const { isBusinessHours, policyMessage } = checkBusinessHours(executionConfig);
@@ -2848,13 +3175,15 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true },
+          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true, unreviewedConsent, unreviewedCount },
           summary: {
             attribute: "(publish)",
             value: "published",
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval: true
+            publishOnApproval: true,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "pending_approval",
           executionMode: "maker_checker",
@@ -2876,6 +3205,8 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: true,
+          unreviewedConsent,
+          unreviewedCount,
           makerNotes,
           results: []
         });
@@ -2904,13 +3235,15 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true },
+          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true, unreviewedConsent, unreviewedCount },
           summary: {
             attribute: "(publish)",
             value: "published",
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval: true
+            publishOnApproval: true,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "queued_offpeak",
           executionMode: "queue_offpeak",
@@ -2934,6 +3267,8 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: true,
+          unreviewedConsent,
+          unreviewedCount,
           makerNotes,
           results: []
         });
@@ -2963,13 +3298,15 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true },
+          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true, unreviewedConsent, unreviewedCount },
           summary: {
             attribute: "(publish)",
             value: "published",
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval: true
+            publishOnApproval: true,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "queued_offpeak",
           executionMode: "queue_offpeak",
@@ -2993,6 +3330,8 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: true,
+          unreviewedConsent,
+          unreviewedCount,
           policyMessage,
           makerNotes: "Automatically queued due to peak business hours restriction.",
           results: []
@@ -3009,7 +3348,7 @@ const bulkUpdaterService = ({ strapi }) => {
       }
       return await executePublishBatchInternal(
         strapi,
-        { selectedEntries, selectedCollections },
+        { selectedEntries, selectedCollections, unreviewedConsent },
         currentUser
       );
     },
@@ -3056,7 +3395,7 @@ const bulkUpdaterService = ({ strapi }) => {
       const { isBusinessHours } = checkBusinessHours(config);
       if (options.executeImmediately || !isBusinessHours) {
         batch.status = "approved";
-        const result = batch.payload?.action === "publish" ? await executePublishBatchInternal(strapi, batch.payload, checkerUser, batch.id) : await executeBatchInternal(strapi, batch.payload, checkerUser, batch.id);
+        const result = await executeBatchByPayload(strapi, batch, checkerUser);
         batch.status = "executed";
         batch.executionResult = result;
         return {
@@ -3117,7 +3456,7 @@ const bulkUpdaterService = ({ strapi }) => {
       if (batch.status === "executed") {
         throw new Error(`Batch ${batchId} has already been executed.`);
       }
-      const result = batch.payload?.action === "publish" ? await executePublishBatchInternal(strapi, batch.payload, currentUser, batch.id) : await executeBatchInternal(strapi, batch.payload, currentUser, batch.id);
+      const result = await executeBatchByPayload(strapi, batch, currentUser);
       batch.status = "executed";
       batch.executionResult = result;
       return {
@@ -3364,6 +3703,20 @@ const bulkUpdaterService = ({ strapi }) => {
     },
     invalidateCollectionCache(uid) {
       invalidateCollectionCache(uid);
+    },
+    registerPendingBatch(batch, jobState) {
+      pendingBatches.set(batch.id, batch);
+      if (jobState) {
+        batchJobsMap.set(batch.id, jobState);
+      }
+      return batch;
+    },
+    getExecutionWindowConfig() {
+      return getExecutionWindowConfig(strapi);
+    },
+    checkBusinessHours(config) {
+      const cfg = config || getExecutionWindowConfig(strapi);
+      return checkBusinessHours(cfg);
     }
   };
 };
@@ -3529,7 +3882,9 @@ const auditService = ({ strapi }) => ({
         value: batchSummary.value,
         updatedCount: batchSummary.updatedCount,
         skippedCount: batchSummary.skippedCount,
-        totalTargets: batchSummary.totalTargets
+        totalTargets: batchSummary.totalTargets,
+        publishStrategy: batchSummary.publishStrategy,
+        unreviewedConsent: batchSummary.unreviewedConsent
       },
       user
     );
@@ -3552,6 +3907,9 @@ const auditService = ({ strapi }) => ({
           updatedCount: batchSummary.updatedCount,
           skippedCount: batchSummary.skippedCount,
           totalTargets: batchSummary.totalTargets,
+          publishOnApproval: batchSummary.publishOnApproval,
+          publishStrategy: batchSummary.publishStrategy,
+          unreviewedConsent: batchSummary.unreviewedConsent,
           diffs: results,
           isRolledBack: false,
           rolledBackAt: null,
@@ -4548,7 +4906,23 @@ function getNestedExportValue(entry, path) {
         return String(item);
       }).filter(Boolean).join("; ");
     }
-    current = current[part];
+    if (current && typeof current === "object") {
+      if (current[part] !== void 0) {
+        current = current[part];
+      } else {
+        const camel = part.replace(/_([a-z0-9])/g, (_, l) => l.toUpperCase());
+        const snake = part.replace(/([A-Z])/g, "_$1").toLowerCase();
+        if (current[camel] !== void 0) {
+          current = current[camel];
+        } else if (current[snake] !== void 0) {
+          current = current[snake];
+        } else {
+          current = void 0;
+        }
+      }
+    } else {
+      current = void 0;
+    }
   }
   if (current === null || current === void 0) return "";
   if (typeof current === "object" && current.url) {
@@ -4570,69 +4944,638 @@ function getNestedExportValue(entry, path) {
   }
   return current;
 }
-const csvService = ({ strapi }) => ({
-  /**
-   * Generates a sample template CSV with schema attribute headers and sample values
-   */
-  async getTemplateCsv(uid) {
-    const ct = strapi.contentTypes[uid];
-    if (!ct) {
-      throw new Error(`Content type ${uid} not found`);
+const csvImportSessions = /* @__PURE__ */ new Map();
+function cleanupStaleSessions() {
+  const oneHourAgo = Date.now() - 36e5;
+  for (const [id, session] of csvImportSessions.entries()) {
+    if (session.createdAt < oneHourAgo) {
+      csvImportSessions.delete(id);
     }
-    const attrs = ct.attributes || {};
-    const excluded = ["createdAt", "updatedAt", "publishedAt", "createdBy", "updatedBy", "localizations"];
-    const headers = ["documentId"];
-    const sampleRow = ["(Leave empty to create new, or enter existing docId)"];
-    for (const [attrName, attrDef] of Object.entries(attrs)) {
-      if (excluded.includes(attrName)) continue;
-      if (attrDef.type === "relation") continue;
-      if (attrDef.type === "component" || attrDef.type === "dynamiczone") continue;
-      headers.push(attrName);
-      let sampleVal = "";
+  }
+}
+const SYSTEM_FIELD_KEYS = /* @__PURE__ */ new Set([
+  "documentid",
+  "document_id",
+  "docid",
+  "id",
+  "createdat",
+  "updatedat",
+  "publishedat",
+  "createdby",
+  "updatedby",
+  "localizations",
+  "locale",
+  "status"
+]);
+async function findExistingDocument(strapi, uid, targetDocId, docLocale) {
+  if (!targetDocId) return null;
+  try {
+    const queryArgs = { documentId: targetDocId };
+    if (docLocale) queryArgs.locale = docLocale;
+    const found = await strapi.documents(uid).findOne(queryArgs);
+    if (found) return found;
+  } catch {
+  }
+  if (/^\d+$/.test(targetDocId)) {
+    try {
+      const queryArgs = {
+        filters: { id: parseInt(targetDocId, 10) },
+        limit: 1
+      };
+      if (docLocale) queryArgs.locale = docLocale;
+      const list = await strapi.documents(uid).findMany(queryArgs);
+      if (list && list.length > 0) return list[0];
+    } catch {
+    }
+  }
+  return null;
+}
+async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
+  const attrs = ct.attributes || {};
+  const { mode = "auto", publish = true, publishStrategy = "safe", user } = options;
+  const isDraftAndPublish = Boolean(ct.options?.draftAndPublish);
+  const stats = {
+    total: rows.length,
+    created: 0,
+    updated: 0,
+    skipped: 0,
+    newWithoutDocId: 0,
+    errors: [],
+    diffs: []
+  };
+  for (let i = 0; i < rows.length; i++) {
+    const rowNumber = startRowNumber + i;
+    const row = rows[i];
+    let docId = extractDocId(row);
+    const rowLocale = extractLocale(row);
+    if (ct.kind === "singleType" && !docId) {
+      try {
+        const findSingleArgs = {};
+        if (rowLocale) findSingleArgs.locale = rowLocale;
+        const singleDoc = await strapi.documents(uid).findFirst(findSingleArgs);
+        if (singleDoc?.documentId) {
+          docId = singleDoc.documentId;
+        }
+      } catch {
+      }
+    }
+    const payload = {};
+    for (const [key, rawVal] of Object.entries(row)) {
+      const normalizedKey = key.toLowerCase().replace(/[\s_-]/g, "");
+      if (SYSTEM_FIELD_KEYS.has(normalizedKey)) continue;
+      if (key.includes(".")) {
+        const [parent, child] = key.split(".");
+        const parentDef = attrs[parent];
+        if (parentDef?.type === "component" && !parentDef.repeatable && parentDef.component) {
+          const comp = strapi.components[parentDef.component];
+          const childDef = comp?.attributes?.[child];
+          if (childDef) {
+            if (!payload[parent]) payload[parent] = {};
+            let val = rawVal;
+            if (rawVal === "" || rawVal === null || rawVal === void 0) {
+              val = null;
+            } else if (childDef.type === "integer" || childDef.type === "biginteger") {
+              const parsedInt = parseInt(rawVal, 10);
+              val = isNaN(parsedInt) ? null : parsedInt;
+            } else if (childDef.type === "float" || childDef.type === "decimal") {
+              const parsedFloat = parseFloat(rawVal);
+              val = isNaN(parsedFloat) ? null : parsedFloat;
+            } else if (childDef.type === "boolean") {
+              val = rawVal.toLowerCase() === "true" || rawVal === "1";
+            } else if (childDef.type === "json") {
+              try {
+                val = JSON.parse(rawVal);
+              } catch {
+                val = rawVal;
+              }
+            }
+            payload[parent][child] = val;
+          }
+        }
+        continue;
+      }
+      let attrDef = attrs[key];
+      if (!attrDef) {
+        const matchKey = Object.keys(attrs).find(
+          (k) => k.toLowerCase() === key.toLowerCase() || k.toLowerCase() === key.toLowerCase().replace(/\s+/g, "")
+        );
+        if (matchKey) {
+          attrDef = attrs[matchKey];
+        }
+      }
+      if (!attrDef) continue;
+      if (rawVal === "" || rawVal === null || rawVal === void 0) {
+        if (attrDef.type !== "dynamiczone" && !(attrDef.type === "component" && attrDef.repeatable)) {
+          payload[key] = null;
+        }
+        continue;
+      }
       switch (attrDef.type) {
-        case "string":
-        case "text":
-        case "richtext":
-          sampleVal = `Sample ${attrName}`;
-          break;
         case "integer":
-        case "biginteger":
+        case "biginteger": {
+          const parsedInt = parseInt(rawVal, 10);
+          payload[key] = isNaN(parsedInt) ? null : parsedInt;
+          break;
+        }
         case "float":
-        case "decimal":
-          sampleVal = "10";
+        case "decimal": {
+          const parsedFloat = parseFloat(rawVal);
+          payload[key] = isNaN(parsedFloat) ? null : parsedFloat;
           break;
+        }
         case "boolean":
-          sampleVal = "true";
+          payload[key] = rawVal.toLowerCase() === "true" || rawVal === "1";
           break;
-        case "email":
-          sampleVal = "sample@example.com";
+        case "json":
+          try {
+            payload[key] = JSON.parse(rawVal);
+          } catch {
+            payload[key] = rawVal;
+          }
           break;
-        case "enumeration":
-          sampleVal = attrDef.enum?.[0] || "option1";
+        case "dynamiczone": {
+          try {
+            const parsed = JSON.parse(rawVal);
+            if (Array.isArray(parsed) && parsed.every((item) => item && typeof item === "object" && typeof item.__component === "string")) {
+              payload[key] = parsed;
+            }
+          } catch {
+          }
           break;
-        case "customField":
-          sampleVal = "value";
+        }
+        case "component": {
+          if (attrDef.repeatable) {
+            try {
+              const parsed = JSON.parse(rawVal);
+              if (Array.isArray(parsed) && parsed.every((item) => item && typeof item === "object")) {
+                payload[key] = parsed;
+              }
+            } catch {
+            }
+          } else {
+            try {
+              const parsed = JSON.parse(rawVal);
+              if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+                payload[key] = parsed;
+              }
+            } catch {
+            }
+          }
           break;
-        default:
-          sampleVal = "sample";
-      }
-      sampleRow.push(sampleVal);
-    }
-    const csvContent = "\uFEFF" + headers.map(escapeCsvValue).join(",") + "\r\n" + sampleRow.map(escapeCsvValue).join(",") + "\r\n";
-    return {
-      filename: `${ct.info?.singularName || "template"}_template.csv`,
-      csvContent,
-      headers
-    };
-  },
-  /**
-   * Exports entries of a collection to CSV with deep nested component support,
-   * RFC-4180 CRLF line endings, and UTF-8 BOM for 100% Microsoft Excel compatibility.
-   */
-  async exportCollectionCsv(uid, options = {}) {
-    const ct = strapi.contentTypes[uid];
-    if (!ct) {
-      throw new Error(`Content type ${uid} not found`);
+        }
+        case "relation": {
+          try {
+            const parsed = JSON.parse(rawVal);
+            if (Array.isArray(parsed) || typeof parsed === "object" && parsed !== null) {
+              payload[key] = parsed;
+              break;
+            }
+          } catch {
+          }
+          if (isValidDocId(rawVal)) {
+            payload[key] = rawVal;
+          } else if (rawVal.includes(";") || rawVal.includes(",")) {
+            const parts = rawVal.split(/[;,]/).map((s) => s.trim()).filter(Boolean);
+            if (parts.length > 0 && parts.every((p) => isValidDocId(p))) {
+              payload[key] = parts;
+            }
+          }
+          break;
+        }
+        case "media": {
+          if (/^\d+$/.test(rawVal.trim())) {
+            payload[key] = parseInt(rawVal.trim(), 10);
+          } else {
+            try {
+              const parsed = JSON.parse(rawVal);
+              if (typeof parsed === "number" || typeof parsed === "object") {
+                payload[key] = parsed;
+              }
+            } catch {
+            }
+          }
+          break;
+        }
+        default:
+          payload[key] = rawVal;
+      }
+    }
+    try {
+      if (mode === "update") {
+        if (!docId) {
+          stats.skipped++;
+          stats.errors.push({
+            row: rowNumber,
+            error: "Missing or invalid documentId for Update mode. (Tip: Use Smart Auto-Detect mode to auto-add entries without document IDs)."
+          });
+          continue;
+        }
+        const existing = await findExistingDocument(strapi, uid, docId, rowLocale);
+        if (!existing) {
+          stats.skipped++;
+          stats.errors.push({
+            row: rowNumber,
+            documentId: docId,
+            error: `Document with ID "${docId}" not found in database.`
+          });
+          continue;
+        }
+        const resolvedDocId = existing.documentId || docId;
+        const mergedPayload = { ...payload };
+        for (const key of Object.keys(payload)) {
+          if (attrs[key]?.type === "component" && typeof payload[key] === "object" && payload[key] !== null) {
+            mergedPayload[key] = { ...existing[key] || {}, ...payload[key] };
+          }
+        }
+        if (Object.keys(mergedPayload).length === 0) {
+          stats.skipped++;
+          stats.diffs.push({
+            uid,
+            collectionName: ct.info?.displayName || uid,
+            documentId: resolvedDocId,
+            label: existing.title || existing.name || `Entry #${resolvedDocId}`,
+            attribute: "",
+            oldValue: existing,
+            newValue: {},
+            status: "skipped",
+            message: `Skipped (no editable attributes in row ${rowNumber})`
+          });
+          continue;
+        }
+        const updateArgs = {
+          documentId: resolvedDocId,
+          data: mergedPayload
+        };
+        if (rowLocale) updateArgs.locale = rowLocale;
+        await strapi.documents(uid).update(updateArgs);
+        const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
+        const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : isApproved);
+        if (shouldPublish) {
+          try {
+            const pubArgs = { documentId: resolvedDocId };
+            if (rowLocale) pubArgs.locale = rowLocale;
+            await strapi.documents(uid).publish(pubArgs);
+          } catch (pubErr) {
+            strapi.log.warn(`[bulk-updater] Auto-publish failed for ${resolvedDocId}:`, pubErr);
+          }
+        }
+        try {
+          await recordContentHistoryVersion(strapi, {
+            uid,
+            documentId: resolvedDocId,
+            userId: user?.id,
+            statusOverride: shouldPublish ? "published" : isDraftAndPublish ? "draft" : void 0
+          });
+        } catch {
+        }
+        stats.updated++;
+        for (const attrKey of Object.keys(payload)) {
+          const oldVal = existing?.[attrKey] ?? null;
+          const newVal = payload[attrKey];
+          stats.diffs.push({
+            uid,
+            collectionName: ct.info?.displayName || uid,
+            documentId: resolvedDocId,
+            label: existing.title || existing.name || `Entry #${resolvedDocId}`,
+            attribute: attrKey,
+            oldValue: oldVal,
+            newValue: newVal,
+            status: "updated",
+            message: `Updated "${attrKey}" via CSV import (row ${rowNumber})`
+          });
+        }
+      } else if (mode === "create_or_override") {
+        let existing = null;
+        if (docId) {
+          existing = await findExistingDocument(strapi, uid, docId, rowLocale);
+        }
+        if (existing) {
+          const resolvedDocId = existing.documentId || docId;
+          const mergedPayload = { ...payload };
+          for (const key of Object.keys(payload)) {
+            if (attrs[key]?.type === "component" && typeof payload[key] === "object" && payload[key] !== null) {
+              mergedPayload[key] = { ...existing[key] || {}, ...payload[key] };
+            }
+          }
+          const updateArgs = {
+            documentId: resolvedDocId,
+            data: mergedPayload
+          };
+          if (rowLocale) updateArgs.locale = rowLocale;
+          await strapi.documents(uid).update(updateArgs);
+          const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
+          const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : isApproved);
+          if (shouldPublish) {
+            try {
+              const pubArgs = { documentId: resolvedDocId };
+              if (rowLocale) pubArgs.locale = rowLocale;
+              await strapi.documents(uid).publish(pubArgs);
+            } catch (pubErr) {
+              strapi.log.warn(`[bulk-updater] Auto-publish failed for ${resolvedDocId}:`, pubErr);
+            }
+          }
+          try {
+            await recordContentHistoryVersion(strapi, {
+              uid,
+              documentId: resolvedDocId,
+              userId: user?.id,
+              statusOverride: shouldPublish ? "published" : isDraftAndPublish ? "draft" : void 0
+            });
+          } catch {
+          }
+          stats.updated++;
+          for (const attrKey of Object.keys(payload)) {
+            const oldVal = existing?.[attrKey] ?? null;
+            const newVal = payload[attrKey];
+            stats.diffs.push({
+              uid,
+              collectionName: ct.info?.displayName || uid,
+              documentId: resolvedDocId,
+              label: existing.title || existing.name || `Entry #${resolvedDocId}`,
+              attribute: attrKey,
+              oldValue: oldVal,
+              newValue: newVal,
+              status: "updated",
+              message: `Overridden "${attrKey}" via CSV import (row ${rowNumber})`
+            });
+          }
+          continue;
+        }
+        const createArgs = { data: payload };
+        if (rowLocale) createArgs.locale = rowLocale;
+        const created = await strapi.documents(uid).create(createArgs);
+        const newDocId = created?.documentId || docId;
+        const shouldPublishNew = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : false);
+        if (shouldPublishNew && newDocId) {
+          try {
+            const pubArgs = { documentId: newDocId };
+            if (rowLocale) pubArgs.locale = rowLocale;
+            await strapi.documents(uid).publish(pubArgs);
+          } catch (pubErr) {
+            strapi.log.warn(`[bulk-updater] Auto-publish failed for ${newDocId}:`, pubErr);
+          }
+        }
+        try {
+          await recordContentHistoryVersion(strapi, {
+            uid,
+            documentId: newDocId,
+            userId: user?.id,
+            statusOverride: shouldPublishNew ? "published" : isDraftAndPublish ? "draft" : void 0
+          });
+        } catch {
+        }
+        stats.created++;
+        if (!docId) {
+          stats.newWithoutDocId++;
+        }
+        for (const attrKey of Object.keys(payload)) {
+          stats.diffs.push({
+            uid,
+            collectionName: ct.info?.displayName || uid,
+            documentId: newDocId,
+            label: created?.title || created?.name || `New Entry #${newDocId}`,
+            attribute: attrKey,
+            oldValue: null,
+            newValue: payload[attrKey],
+            status: "created",
+            message: docId ? `Created "${attrKey}" via CSV import (row ${rowNumber})` : `Created "${attrKey}" as new entry (row ${rowNumber})`
+          });
+        }
+      } else {
+        let existing = null;
+        if (docId) {
+          existing = await findExistingDocument(strapi, uid, docId, rowLocale);
+        }
+        if (existing) {
+          const resolvedDocId = existing.documentId || docId;
+          const mergedPayload = { ...payload };
+          for (const key of Object.keys(payload)) {
+            if (attrs[key]?.type === "component" && typeof payload[key] === "object" && payload[key] !== null) {
+              mergedPayload[key] = { ...existing[key] || {}, ...payload[key] };
+            }
+          }
+          const updateArgs = {
+            documentId: resolvedDocId,
+            data: mergedPayload
+          };
+          if (rowLocale) updateArgs.locale = rowLocale;
+          await strapi.documents(uid).update(updateArgs);
+          const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
+          const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : isApproved);
+          if (shouldPublish) {
+            try {
+              const pubArgs = { documentId: resolvedDocId };
+              if (rowLocale) pubArgs.locale = rowLocale;
+              await strapi.documents(uid).publish(pubArgs);
+            } catch (pubErr) {
+              strapi.log.warn(`[bulk-updater] Auto-publish failed for ${resolvedDocId}:`, pubErr);
+            }
+          }
+          try {
+            await recordContentHistoryVersion(strapi, {
+              uid,
+              documentId: resolvedDocId,
+              userId: user?.id,
+              statusOverride: shouldPublish ? "published" : isDraftAndPublish ? "draft" : void 0
+            });
+          } catch {
+          }
+          stats.updated++;
+          for (const attrKey of Object.keys(payload)) {
+            const oldVal = existing?.[attrKey] ?? null;
+            const newVal = payload[attrKey];
+            stats.diffs.push({
+              uid,
+              collectionName: ct.info?.displayName || uid,
+              documentId: resolvedDocId,
+              label: existing.title || existing.name || `Entry #${resolvedDocId}`,
+              attribute: attrKey,
+              oldValue: oldVal,
+              newValue: newVal,
+              status: "updated",
+              message: `Updated "${attrKey}" via CSV import (row ${rowNumber})`
+            });
+          }
+          continue;
+        }
+        const createArgs = { data: payload };
+        if (rowLocale) createArgs.locale = rowLocale;
+        const created = await strapi.documents(uid).create(createArgs);
+        const newDocId = created?.documentId || docId;
+        const shouldPublishNew = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : false);
+        if (shouldPublishNew && newDocId) {
+          try {
+            const pubArgs = { documentId: newDocId };
+            if (rowLocale) pubArgs.locale = rowLocale;
+            await strapi.documents(uid).publish(pubArgs);
+          } catch (pubErr) {
+            strapi.log.warn(`[bulk-updater] Auto-publish failed for ${newDocId}:`, pubErr);
+          }
+        }
+        try {
+          await recordContentHistoryVersion(strapi, {
+            uid,
+            documentId: newDocId,
+            userId: user?.id,
+            statusOverride: shouldPublishNew ? "published" : isDraftAndPublish ? "draft" : void 0
+          });
+        } catch {
+        }
+        stats.created++;
+        if (!docId) {
+          stats.newWithoutDocId++;
+        }
+        for (const attrKey of Object.keys(payload)) {
+          stats.diffs.push({
+            uid,
+            collectionName: ct.info?.displayName || uid,
+            documentId: newDocId,
+            label: created?.title || created?.name || `New Entry #${newDocId}`,
+            attribute: attrKey,
+            oldValue: null,
+            newValue: payload[attrKey],
+            status: "created",
+            message: docId ? `Created "${attrKey}" as new entry (documentId "${docId}" not found in database - row ${rowNumber})` : `Created "${attrKey}" as new entry (no documentId provided in CSV - row ${rowNumber})`
+          });
+        }
+      }
+    } catch (err) {
+      stats.errors.push({
+        row: rowNumber,
+        documentId: docId || void 0,
+        error: extractDetailedErrorMessage(err)
+      });
+    }
+  }
+  return stats;
+}
+async function recordCsvAuditLog(strapi, ct, uid, batchId, stats, user, publishOnApproval, publishStrategy, unreviewedConsent) {
+  if (stats.updated === 0 && stats.created === 0) return;
+  try {
+    const auditService2 = strapi.plugin("bulk-updater").service("audit");
+    if (!auditService2) return;
+    const isEnabled = typeof auditService2.isAuditEnabled === "function" ? auditService2.isAuditEnabled() : Boolean(auditService2.getAuditConfig?.().enabled ?? true);
+    if (!isEnabled) return;
+    const userEmail = user?.email || "admin@strapi.io";
+    const userName = user ? `${user.firstname || ""} ${user.lastname || ""}`.trim() : "CSV Importer";
+    const collectionDisplayName = ct.info?.displayName || uid;
+    const updatedDiffs = stats.diffs.filter(
+      (d) => d.status === "updated" || d.status === "created"
+    );
+    const uniqueAttributes = Array.from(
+      new Set(updatedDiffs.map((d) => d.attribute))
+    ).filter(Boolean);
+    const attrListStr = uniqueAttributes.length > 0 ? uniqueAttributes.join(", ") : "fields";
+    const batchAttribute = `CSV [${collectionDisplayName}]: ${attrListStr}`;
+    let batchValue = "";
+    if (updatedDiffs.length === 1) {
+      const d = updatedDiffs[0];
+      const newStr = d.newValue !== null && d.newValue !== void 0 ? String(d.newValue) : "(empty)";
+      batchValue = `"${d.label}": ${d.attribute} → "${newStr}"`;
+    } else if (updatedDiffs.length > 1 && stats.updated === 1 && stats.created === 0) {
+      const d = updatedDiffs[0];
+      const changes = updatedDiffs.map((ud) => `${ud.attribute}: "${ud.newValue ?? ""}"`).join(", ");
+      batchValue = `"${d.label}": ${changes}`;
+    } else {
+      const sampleVal = updatedDiffs[0] ? ` (e.g. ${updatedDiffs[0].attribute}: "${updatedDiffs[0].newValue ?? ""}")` : "";
+      batchValue = `${stats.updated} updated, ${stats.created} created in ${collectionDisplayName}${sampleVal}`;
+    }
+    const batchSummary = {
+      batchId,
+      attribute: batchAttribute,
+      value: batchValue,
+      updatedCount: stats.updated + stats.created,
+      skippedCount: stats.skipped,
+      totalTargets: stats.total
+    };
+    const userObj = {
+      email: userEmail || "admin@strapi.io",
+      firstname: userName || "Admin"
+    };
+    if (typeof auditService2.recordBatch === "function") {
+      await auditService2.recordBatch(
+        batchSummary,
+        stats.diffs,
+        userObj,
+        publishOnApproval,
+        publishStrategy,
+        unreviewedConsent
+      );
+    } else if (typeof auditService2.logOperation === "function") {
+      await auditService2.logOperation({
+        ...batchSummary,
+        userEmail,
+        userName,
+        diffs: stats.diffs
+      });
+    }
+  } catch (auditErr) {
+    strapi.log.warn("[bulk-updater] Failed logging CSV import audit:", auditErr);
+  }
+}
+const csvService = ({ strapi }) => ({
+  /**
+   * Generates a sample template CSV with schema attribute headers and sample values
+   */
+  async getTemplateCsv(uid) {
+    const ct = strapi.contentTypes[uid];
+    if (!ct) {
+      throw new Error(`Content type ${uid} not found`);
+    }
+    const attrs = ct.attributes || {};
+    const excluded = ["createdAt", "updatedAt", "publishedAt", "createdBy", "updatedBy", "localizations"];
+    const headers = ["documentId"];
+    const sampleRow = ["(Leave empty to create new, or enter existing docId)"];
+    for (const [attrName, attrDef] of Object.entries(attrs)) {
+      if (excluded.includes(attrName)) continue;
+      if (attrDef.type === "relation") continue;
+      if (attrDef.type === "component" || attrDef.type === "dynamiczone") continue;
+      headers.push(attrName);
+      let sampleVal = "";
+      switch (attrDef.type) {
+        case "string":
+        case "text":
+        case "richtext":
+          sampleVal = `Sample ${attrName}`;
+          break;
+        case "integer":
+        case "biginteger":
+        case "float":
+        case "decimal":
+          sampleVal = "10";
+          break;
+        case "boolean":
+          sampleVal = "true";
+          break;
+        case "email":
+          sampleVal = "sample@example.com";
+          break;
+        case "enumeration":
+          sampleVal = attrDef.enum?.[0] || "option1";
+          break;
+        case "customField":
+          sampleVal = "value";
+          break;
+        default:
+          sampleVal = "sample";
+      }
+      sampleRow.push(sampleVal);
+    }
+    const csvContent = "\uFEFF" + headers.map(escapeCsvValue).join(",") + "\r\n" + sampleRow.map(escapeCsvValue).join(",") + "\r\n";
+    return {
+      filename: `${ct.info?.singularName || "template"}_template.csv`,
+      csvContent,
+      headers
+    };
+  },
+  /**
+   * Exports entries of a collection to CSV with deep nested component support,
+   * RFC-4180 CRLF line endings, and UTF-8 BOM for 100% Microsoft Excel compatibility.
+   */
+  async exportCollectionCsv(uid, options = {}) {
+    const ct = strapi.contentTypes[uid];
+    if (!ct) {
+      throw new Error(`Content type ${uid} not found`);
     }
     const allComponents = strapi.components || {};
     const fields = discoverExportFields(ct, allComponents);
@@ -4693,40 +5636,64 @@ const csvService = ({ strapi }) => ({
       }
     }
     const deepPopulate = buildDeepPopulate(ct.attributes || {}, allComponents);
-    let entries = [];
+    const lines = [];
+    lines.push(fields.map((f) => escapeCsvValue(f.key)).join(","));
+    let totalExported = 0;
+    const maxLimit = options.limit && options.limit > 0 ? options.limit : Infinity;
+    const CHUNK_SIZE = 1e3;
     if (ct.kind === "singleType") {
       const findFirstArgs = {};
       if (deepPopulate) {
         findFirstArgs.populate = deepPopulate;
       }
       const doc = await strapi.documents(uid).findFirst(findFirstArgs);
-      entries = doc ? [doc] : [];
+      if (doc) {
+        const rowValues = fields.map((f) => escapeCsvValue(getNestedExportValue(doc, f.key)));
+        lines.push(rowValues.join(","));
+        totalExported = 1;
+      }
     } else {
-      const findManyArgs = {
-        filters: Object.keys(filters).length > 0 ? filters : void 0,
-        limit: options.limit || 5e3,
-        sort: { createdAt: "desc" }
-      };
-      if (deepPopulate) {
-        findManyArgs.populate = deepPopulate;
+      let currentPage = 1;
+      let hasMore = true;
+      while (hasMore && totalExported < maxLimit) {
+        const remaining = maxLimit - totalExported;
+        const currentBatchLimit = Math.min(CHUNK_SIZE, remaining);
+        const findPageArgs = {
+          filters: Object.keys(filters).length > 0 ? filters : void 0,
+          page: currentPage,
+          pageSize: currentBatchLimit,
+          sort: { createdAt: "desc" }
+        };
+        if (deepPopulate) {
+          findPageArgs.populate = deepPopulate;
+        }
+        const chunkEntries = await strapi.documents(uid).findMany(findPageArgs);
+        if (!chunkEntries || chunkEntries.length === 0) {
+          hasMore = false;
+          break;
+        }
+        for (const entry of chunkEntries) {
+          const rowValues = fields.map((f) => escapeCsvValue(getNestedExportValue(entry, f.key)));
+          lines.push(rowValues.join(","));
+          totalExported++;
+          if (totalExported >= maxLimit) {
+            hasMore = false;
+            break;
+          }
+        }
+        if (chunkEntries.length < currentBatchLimit) {
+          hasMore = false;
+        } else {
+          currentPage++;
+        }
       }
-      entries = await strapi.documents(uid).findMany(findManyArgs);
-    }
-    const lines = [];
-    lines.push(fields.map((f) => escapeCsvValue(f.key)).join(","));
-    for (const entry of entries || []) {
-      const rowValues = fields.map((f) => {
-        const val = getNestedExportValue(entry, f.key);
-        return escapeCsvValue(val);
-      });
-      lines.push(rowValues.join(","));
     }
     const csvContent = "\uFEFF" + lines.join("\r\n") + "\r\n";
     const filename = `${ct.info?.singularName || uid}_export_${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10)}.csv`;
     return {
       filename,
       csvContent,
-      count: entries ? entries.length : 0,
+      count: totalExported,
       fields: fields.map((f) => f.key)
     };
   },
@@ -4787,7 +5754,7 @@ const csvService = ({ strapi }) => ({
     const uids = Object.keys(byUid);
     if (uids.length === 1) {
       const uid = uids[0];
-      return await this.exportCollectionCsv(uid, { documentIds: byUid[uid] });
+      return await this.exportCollectionCsv(uid, { documentIds: byUid[uid], limit: 0 });
     }
     const rows = [];
     const headers = [
@@ -4838,7 +5805,89 @@ const csvService = ({ strapi }) => ({
     };
   },
   /**
-   * Imports CSV records to update existing records or insert/override records
+   * Imports a single chunk of CSV rows (for large dataset streaming/batching).
+   * Aggregates stats across chunks and writes unified audit trail on the final chunk.
+   */
+  async importChunk(uid, rows, options) {
+    const ct = strapi.contentTypes[uid];
+    if (!ct) {
+      throw new Error(`Content type ${uid} not found`);
+    }
+    cleanupStaleSessions();
+    const batchId = options.batchId || `csv_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`;
+    let session = csvImportSessions.get(batchId);
+    if (!session || options.isFirstChunk) {
+      session = {
+        batchId,
+        uid,
+        createdAt: Date.now(),
+        total: 0,
+        created: 0,
+        updated: 0,
+        skipped: 0,
+        newWithoutDocId: 0,
+        errors: [],
+        diffs: [],
+        publishStrategy: options.publishStrategy,
+        unreviewedConsent: options.unreviewedConsent
+      };
+      csvImportSessions.set(batchId, session);
+    }
+    const startRowNumber = options.startRowNumber || session.total + 2;
+    const chunkStats = await processCsvRows(strapi, ct, uid, rows || [], startRowNumber, options);
+    session.total += chunkStats.total;
+    session.created += chunkStats.created;
+    session.updated += chunkStats.updated;
+    session.skipped += chunkStats.skipped;
+    session.newWithoutDocId += chunkStats.newWithoutDocId;
+    session.errors.push(...chunkStats.errors);
+    session.diffs.push(...chunkStats.diffs);
+    if (options.isLastChunk) {
+      await recordCsvAuditLog(
+        strapi,
+        ct,
+        uid,
+        batchId,
+        session,
+        options.user,
+        options.publish !== false,
+        session.publishStrategy || options.publishStrategy,
+        session.unreviewedConsent ?? options.unreviewedConsent
+      );
+      try {
+        const bulkService = strapi.plugin("bulk-updater").service("bulkUpdater");
+        if (bulkService && bulkService.invalidateCollectionCache) {
+          bulkService.invalidateCollectionCache(uid);
+        }
+      } catch {
+      }
+      const aggregateStats = {
+        total: session.total,
+        created: session.created,
+        updated: session.updated,
+        skipped: session.skipped,
+        newWithoutDocId: session.newWithoutDocId,
+        errors: session.errors,
+        diffs: session.diffs
+      };
+      csvImportSessions.delete(batchId);
+      return {
+        success: true,
+        batchId,
+        chunkStats,
+        stats: aggregateStats,
+        isFinished: true
+      };
+    }
+    return {
+      success: true,
+      batchId,
+      chunkStats,
+      isFinished: false
+    };
+  },
+  /**
+   * Imports CSV records to update existing records or insert/override records (single payload).
    */
   async importCsv(uid, csvText, options) {
     const ct = strapi.contentTypes[uid];
@@ -4849,560 +5898,521 @@ const csvService = ({ strapi }) => ({
     if (!parsedRows || parsedRows.length === 0) {
       throw new Error("CSV is empty or could not be parsed.");
     }
-    const attrs = ct.attributes || {};
-    const { mode = "auto", publish = true, user } = options;
-    const stats = {
-      total: parsedRows.length,
-      created: 0,
-      updated: 0,
-      skipped: 0,
-      newWithoutDocId: 0,
-      errors: [],
-      diffs: []
-    };
     const batchId = `csv_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`;
-    const userEmail = user?.email || "admin@strapi.io";
-    const userName = user ? `${user.firstname || ""} ${user.lastname || ""}`.trim() : "CSV Importer";
-    const findExistingDocument = async (targetDocId, docLocale) => {
-      if (!targetDocId) return null;
-      try {
-        const queryArgs = { documentId: targetDocId };
-        if (docLocale) queryArgs.locale = docLocale;
-        const found = await strapi.documents(uid).findOne(queryArgs);
-        if (found) return found;
-      } catch {
-      }
-      if (/^\d+$/.test(targetDocId)) {
-        try {
-          const queryArgs = {
-            filters: { id: parseInt(targetDocId, 10) },
-            limit: 1
-          };
-          if (docLocale) queryArgs.locale = docLocale;
-          const list = await strapi.documents(uid).findMany(queryArgs);
-          if (list && list.length > 0) return list[0];
-        } catch {
-        }
+    const stats = await processCsvRows(strapi, ct, uid, parsedRows, 2, options);
+    try {
+      const bulkService = strapi.plugin("bulk-updater").service("bulkUpdater");
+      if (bulkService && bulkService.invalidateCollectionCache) {
+        bulkService.invalidateCollectionCache(uid);
       }
-      return null;
+    } catch {
+    }
+    await recordCsvAuditLog(
+      strapi,
+      ct,
+      uid,
+      batchId,
+      stats,
+      options.user,
+      options.publish !== false,
+      options.publishStrategy,
+      options.unreviewedConsent
+    );
+    return {
+      success: true,
+      batchId,
+      stats
     };
-    const SYSTEM_FIELD_KEYS = /* @__PURE__ */ new Set([
-      "documentid",
-      "document_id",
-      "docid",
-      "id",
-      "createdat",
-      "updatedat",
-      "publishedat",
-      "createdby",
-      "updatedby",
-      "localizations",
-      "locale",
-      "status"
-    ]);
-    for (let i = 0; i < parsedRows.length; i++) {
-      const rowNumber = i + 2;
-      const row = parsedRows[i];
-      let docId = extractDocId(row);
-      const rowLocale = extractLocale(row);
-      if (ct.kind === "singleType" && !docId) {
-        try {
-          const findSingleArgs = {};
-          if (rowLocale) findSingleArgs.locale = rowLocale;
-          const singleDoc = await strapi.documents(uid).findFirst(findSingleArgs);
-          if (singleDoc?.documentId) {
-            docId = singleDoc.documentId;
-          }
-        } catch {
-        }
-      }
-      const payload = {};
-      for (const [key, rawVal] of Object.entries(row)) {
-        const normalizedKey = key.toLowerCase().replace(/[\s_-]/g, "");
-        if (SYSTEM_FIELD_KEYS.has(normalizedKey)) continue;
-        if (key.includes(".")) {
-          const [parent, child] = key.split(".");
-          const parentDef = attrs[parent];
-          if (parentDef?.type === "component" && !parentDef.repeatable && parentDef.component) {
-            const comp = strapi.components[parentDef.component];
-            const childDef = comp?.attributes?.[child];
-            if (childDef) {
-              if (!payload[parent]) payload[parent] = {};
-              let val = rawVal;
-              if (rawVal === "" || rawVal === null || rawVal === void 0) {
-                val = null;
-              } else if (childDef.type === "integer" || childDef.type === "biginteger") {
-                const parsedInt = parseInt(rawVal, 10);
-                val = isNaN(parsedInt) ? null : parsedInt;
-              } else if (childDef.type === "float" || childDef.type === "decimal") {
-                const parsedFloat = parseFloat(rawVal);
-                val = isNaN(parsedFloat) ? null : parsedFloat;
-              } else if (childDef.type === "boolean") {
-                val = rawVal.toLowerCase() === "true" || rawVal === "1";
-              } else if (childDef.type === "json") {
-                try {
-                  val = JSON.parse(rawVal);
-                } catch {
-                  val = rawVal;
-                }
-              }
-              payload[parent][child] = val;
-            }
-          }
-          continue;
-        }
-        let attrDef = attrs[key];
-        if (!attrDef) {
-          const matchKey = Object.keys(attrs).find(
-            (k) => k.toLowerCase() === key.toLowerCase() || k.toLowerCase() === key.toLowerCase().replace(/\s+/g, "")
-          );
-          if (matchKey) {
-            attrDef = attrs[matchKey];
-          }
-        }
-        if (!attrDef) continue;
-        if (rawVal === "" || rawVal === null || rawVal === void 0) {
-          if (attrDef.type !== "dynamiczone" && !(attrDef.type === "component" && attrDef.repeatable)) {
-            payload[key] = null;
-          }
-          continue;
-        }
-        switch (attrDef.type) {
-          case "integer":
-          case "biginteger": {
-            const parsedInt = parseInt(rawVal, 10);
-            payload[key] = isNaN(parsedInt) ? null : parsedInt;
-            break;
-          }
-          case "float":
-          case "decimal": {
-            const parsedFloat = parseFloat(rawVal);
-            payload[key] = isNaN(parsedFloat) ? null : parsedFloat;
-            break;
-          }
-          case "boolean":
-            payload[key] = rawVal.toLowerCase() === "true" || rawVal === "1";
-            break;
-          case "json":
-            try {
-              payload[key] = JSON.parse(rawVal);
-            } catch {
-              payload[key] = rawVal;
-            }
-            break;
-          case "dynamiczone": {
-            try {
-              const parsed = JSON.parse(rawVal);
-              if (Array.isArray(parsed) && parsed.every((item) => item && typeof item === "object" && typeof item.__component === "string")) {
-                payload[key] = parsed;
-              }
-            } catch {
-            }
-            break;
-          }
-          case "component": {
-            if (attrDef.repeatable) {
-              try {
-                const parsed = JSON.parse(rawVal);
-                if (Array.isArray(parsed) && parsed.every((item) => item && typeof item === "object")) {
-                  payload[key] = parsed;
-                }
-              } catch {
-              }
-            } else {
-              try {
-                const parsed = JSON.parse(rawVal);
-                if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
-                  payload[key] = parsed;
-                }
-              } catch {
-              }
-            }
-            break;
-          }
-          case "relation": {
-            try {
-              const parsed = JSON.parse(rawVal);
-              if (Array.isArray(parsed) || typeof parsed === "object" && parsed !== null) {
-                payload[key] = parsed;
-                break;
-              }
-            } catch {
-            }
-            if (isValidDocId(rawVal)) {
-              payload[key] = rawVal;
-            } else if (rawVal.includes(";") || rawVal.includes(",")) {
-              const parts = rawVal.split(/[;,]/).map((s) => s.trim()).filter(Boolean);
-              if (parts.length > 0 && parts.every((p) => isValidDocId(p))) {
-                payload[key] = parts;
-              }
-            }
-            break;
-          }
-          case "media": {
-            if (/^\d+$/.test(rawVal.trim())) {
-              payload[key] = parseInt(rawVal.trim(), 10);
-            } else {
-              try {
-                const parsed = JSON.parse(rawVal);
-                if (typeof parsed === "number" || typeof parsed === "object") {
-                  payload[key] = parsed;
-                }
-              } catch {
-              }
-            }
-            break;
-          }
-          default:
-            payload[key] = rawVal;
+  },
+  /**
+   * Executes a pending CSV batch approved by Checker or queued for off-peak execution
+   */
+  async executeCsvPendingBatch(uid, rows, batchId, options = {}, checkerUser) {
+    const ct = strapi.contentTypes[uid];
+    if (!ct) {
+      throw new Error(`Content type ${uid} not found`);
+    }
+    const effectiveUser = checkerUser || options.user;
+    const stats = await processCsvRows(strapi, ct, uid, rows || [], 2, {
+      ...options,
+      user: effectiveUser
+    });
+    await recordCsvAuditLog(
+      strapi,
+      ct,
+      uid,
+      batchId,
+      stats,
+      effectiveUser,
+      options.publish !== false,
+      options.publishStrategy,
+      options.unreviewedConsent
+    );
+    try {
+      const bulkService = strapi.plugin("bulk-updater").service("bulkUpdater");
+      if (bulkService && bulkService.invalidateCollectionCache) {
+        bulkService.invalidateCollectionCache(uid);
+      }
+    } catch {
+    }
+    return {
+      success: true,
+      batchId,
+      stats
+    };
+  },
+  /**
+   * Pre-Flight Dry-Run Validation: Non-mutating analysis verifying document existence,
+   * data types, schema integrity, and quota rule violations before execution.
+   */
+  async validatePreflight(uid, rows, options = {}) {
+    const ct = strapi.contentTypes[uid];
+    if (!ct) {
+      throw new Error(`Content type ${uid} not found`);
+    }
+    const { mode = "auto" } = options;
+    const attrs = ct.attributes || {};
+    let validationRulesService2 = null;
+    let activeRules = [];
+    try {
+      validationRulesService2 = strapi.plugin("bulk-updater").service("validationRules");
+      if (validationRulesService2) {
+        const rulesRes = await validationRulesService2.getRules();
+        activeRules = (rulesRes || []).filter((r) => r.enabled);
+      }
+    } catch {
+    }
+    let validRows = 0;
+    let estimatedUpdates = 0;
+    let estimatedCreates = 0;
+    const isDraftAndPublish = Boolean(ct.options?.draftAndPublish);
+    const lifecycleStats = {
+      isDraftAndPublish,
+      totalChecked: 0,
+      published: 0,
+      modified: 0,
+      draft: 0,
+      unreviewedCount: 0
+    };
+    const errors = [];
+    const warnings = [];
+    for (let i = 0; i < rows.length; i++) {
+      const rowNumber = i + 2;
+      const row = rows[i];
+      const docId = extractDocId(row);
+      const rowLocale = extractLocale(row);
+      let rowHasError = false;
+      let existing = null;
+      if (docId) {
+        existing = await findExistingDocument(strapi, uid, docId, rowLocale);
+      }
+      if (existing && isDraftAndPublish) {
+        lifecycleStats.totalChecked++;
+        const isApproved = Boolean(existing.publishedAt) && existing.status !== "modified";
+        if (isApproved) {
+          lifecycleStats.published++;
+        } else if (existing.status === "modified") {
+          lifecycleStats.modified++;
+          lifecycleStats.unreviewedCount++;
+        } else {
+          lifecycleStats.draft++;
+          lifecycleStats.unreviewedCount++;
         }
       }
-      try {
-        if (mode === "update") {
-          if (!docId) {
-            stats.skipped++;
-            stats.errors.push({
-              row: rowNumber,
-              error: "Missing or invalid documentId for Update mode. (Tip: Use Smart Auto-Detect mode to auto-add entries without document IDs)."
-            });
-            continue;
-          }
-          const existing = await findExistingDocument(docId, rowLocale);
-          if (!existing) {
-            stats.skipped++;
-            stats.errors.push({
+      if (mode === "update") {
+        if (!docId) {
+          errors.push({
+            row: rowNumber,
+            error: "Missing or invalid documentId for Update Only mode."
+          });
+          rowHasError = true;
+        } else if (!existing) {
+          errors.push({
+            row: rowNumber,
+            documentId: docId,
+            error: `Document with ID "${docId}" not found in database.`
+          });
+          rowHasError = true;
+        } else {
+          estimatedUpdates++;
+        }
+      } else if (mode === "create_or_override") {
+        if (existing) {
+          estimatedUpdates++;
+        } else {
+          estimatedCreates++;
+        }
+      } else {
+        if (existing) {
+          estimatedUpdates++;
+        } else {
+          estimatedCreates++;
+          if (docId) {
+            warnings.push({
               row: rowNumber,
               documentId: docId,
-              error: `Document with ID "${docId}" not found in database.`
-            });
-            continue;
-          }
-          const resolvedDocId = existing.documentId || docId;
-          const mergedPayload = { ...payload };
-          for (const key of Object.keys(payload)) {
-            if (attrs[key]?.type === "component" && typeof payload[key] === "object" && payload[key] !== null) {
-              mergedPayload[key] = { ...existing[key] || {}, ...payload[key] };
-            }
-          }
-          if (Object.keys(mergedPayload).length === 0) {
-            stats.skipped++;
-            stats.diffs.push({
-              uid,
-              collectionName: ct.info?.displayName || uid,
-              documentId: resolvedDocId,
-              label: existing.title || existing.name || `Entry #${resolvedDocId}`,
-              attribute: "",
-              oldValue: existing,
-              newValue: {},
-              status: "skipped",
-              message: `Skipped (no editable attributes in row ${rowNumber})`
-            });
-            continue;
-          }
-          const updateArgs = {
-            documentId: resolvedDocId,
-            data: mergedPayload
-          };
-          if (rowLocale) updateArgs.locale = rowLocale;
-          await strapi.documents(uid).update(updateArgs);
-          if (publish && ct.options?.draftAndPublish) {
-            try {
-              const pubArgs = { documentId: resolvedDocId };
-              if (rowLocale) pubArgs.locale = rowLocale;
-              await strapi.documents(uid).publish(pubArgs);
-            } catch (pubErr) {
-              strapi.log.warn(`[bulk-updater] Auto-publish failed for ${resolvedDocId}:`, pubErr);
-            }
-          }
-          try {
-            await recordContentHistoryVersion(strapi, {
-              uid,
-              documentId: resolvedDocId,
-              userId: user?.id,
-              statusOverride: publish && ct.options?.draftAndPublish ? "published" : void 0
-            });
-          } catch {
-          }
-          stats.updated++;
-          for (const attrKey of Object.keys(payload)) {
-            const oldVal = existing?.[attrKey] ?? null;
-            const newVal = payload[attrKey];
-            stats.diffs.push({
-              uid,
-              collectionName: ct.info?.displayName || uid,
-              documentId: resolvedDocId,
-              label: existing.title || existing.name || `Entry #${resolvedDocId}`,
-              attribute: attrKey,
-              oldValue: oldVal,
-              newValue: newVal,
-              status: "updated",
-              message: `Updated "${attrKey}" via CSV import (row ${rowNumber})`
+              warning: `Document ID "${docId}" not found in DB; will create as a new entry.`
             });
           }
-        } else if (mode === "create_or_override") {
-          let existing = null;
-          if (docId) {
-            existing = await findExistingDocument(docId, rowLocale);
-          }
-          if (existing) {
-            const resolvedDocId = existing.documentId || docId;
-            const mergedPayload = { ...payload };
-            for (const key of Object.keys(payload)) {
-              if (attrs[key]?.type === "component" && typeof payload[key] === "object" && payload[key] !== null) {
-                mergedPayload[key] = { ...existing[key] || {}, ...payload[key] };
-              }
-            }
-            const updateArgs = {
-              documentId: resolvedDocId,
-              data: mergedPayload
-            };
-            if (rowLocale) updateArgs.locale = rowLocale;
-            await strapi.documents(uid).update(updateArgs);
-            if (publish && ct.options?.draftAndPublish) {
-              try {
-                const pubArgs = { documentId: resolvedDocId };
-                if (rowLocale) pubArgs.locale = rowLocale;
-                await strapi.documents(uid).publish(pubArgs);
-              } catch (pubErr) {
-                strapi.log.warn(`[bulk-updater] Auto-publish failed for ${resolvedDocId}:`, pubErr);
-              }
-            }
-            try {
-              await recordContentHistoryVersion(strapi, {
-                uid,
-                documentId: resolvedDocId,
-                userId: user?.id,
-                statusOverride: publish && ct.options?.draftAndPublish ? "published" : void 0
+        }
+      }
+      for (const [colKey, rawVal] of Object.entries(row)) {
+        if (!rawVal || rawVal.trim() === "") continue;
+        const normalizedKey = colKey.toLowerCase().replace(/[\s_-]/g, "");
+        if (SYSTEM_FIELD_KEYS.has(normalizedKey)) continue;
+        let attrDef = attrs[colKey];
+        if (!attrDef && !colKey.includes(".")) {
+          const matchKey = Object.keys(attrs).find(
+            (k) => k.toLowerCase() === colKey.toLowerCase() || k.toLowerCase() === colKey.toLowerCase().replace(/\s+/g, "")
+          );
+          if (matchKey) attrDef = attrs[matchKey];
+        }
+        if (attrDef) {
+          if (attrDef.type === "integer" || attrDef.type === "biginteger") {
+            const num = parseInt(rawVal, 10);
+            if (isNaN(num)) {
+              errors.push({
+                row: rowNumber,
+                documentId: docId || void 0,
+                error: `Column "${colKey}" expects an integer, received: "${rawVal}"`
               });
-            } catch {
+              rowHasError = true;
             }
-            stats.updated++;
-            for (const attrKey of Object.keys(payload)) {
-              const oldVal = existing?.[attrKey] ?? null;
-              const newVal = payload[attrKey];
-              stats.diffs.push({
-                uid,
-                collectionName: ct.info?.displayName || uid,
-                documentId: resolvedDocId,
-                label: existing.title || existing.name || `Entry #${resolvedDocId}`,
-                attribute: attrKey,
-                oldValue: oldVal,
-                newValue: newVal,
-                status: "updated",
-                message: `Overridden "${attrKey}" via CSV import (row ${rowNumber})`
+          } else if (attrDef.type === "float" || attrDef.type === "decimal") {
+            const num = parseFloat(rawVal);
+            if (isNaN(num)) {
+              errors.push({
+                row: rowNumber,
+                documentId: docId || void 0,
+                error: `Column "${colKey}" expects a numeric float/decimal, received: "${rawVal}"`
               });
+              rowHasError = true;
             }
-            continue;
-          }
-          const createArgs = { data: payload };
-          if (rowLocale) createArgs.locale = rowLocale;
-          const created = await strapi.documents(uid).create(createArgs);
-          const newDocId = created?.documentId || docId;
-          if (publish && ct.options?.draftAndPublish && newDocId) {
-            try {
-              const pubArgs = { documentId: newDocId };
-              if (rowLocale) pubArgs.locale = rowLocale;
-              await strapi.documents(uid).publish(pubArgs);
-            } catch (pubErr) {
-              strapi.log.warn(`[bulk-updater] Auto-publish failed for ${newDocId}:`, pubErr);
-            }
-          }
-          try {
-            await recordContentHistoryVersion(strapi, {
-              uid,
-              documentId: newDocId,
-              userId: user?.id,
-              statusOverride: publish && ct.options?.draftAndPublish ? "published" : void 0
-            });
-          } catch {
-          }
-          stats.created++;
-          if (!docId) {
-            stats.newWithoutDocId++;
-          }
-          for (const attrKey of Object.keys(payload)) {
-            stats.diffs.push({
-              uid,
-              collectionName: ct.info?.displayName || uid,
-              documentId: newDocId,
-              label: created?.title || created?.name || `New Entry #${newDocId}`,
-              attribute: attrKey,
-              oldValue: null,
-              newValue: payload[attrKey],
-              status: "created",
-              message: docId ? `Created "${attrKey}" via CSV import (row ${rowNumber})` : `Created "${attrKey}" as new entry (row ${rowNumber})`
-            });
-          }
-        } else {
-          let existing = null;
-          if (docId) {
-            existing = await findExistingDocument(docId, rowLocale);
-          }
-          if (existing) {
-            const resolvedDocId = existing.documentId || docId;
-            const mergedPayload = { ...payload };
-            for (const key of Object.keys(payload)) {
-              if (attrs[key]?.type === "component" && typeof payload[key] === "object" && payload[key] !== null) {
-                mergedPayload[key] = { ...existing[key] || {}, ...payload[key] };
-              }
-            }
-            const updateArgs = {
-              documentId: resolvedDocId,
-              data: mergedPayload
-            };
-            if (rowLocale) updateArgs.locale = rowLocale;
-            await strapi.documents(uid).update(updateArgs);
-            if (publish && ct.options?.draftAndPublish) {
-              try {
-                const pubArgs = { documentId: resolvedDocId };
-                if (rowLocale) pubArgs.locale = rowLocale;
-                await strapi.documents(uid).publish(pubArgs);
-              } catch (pubErr) {
-                strapi.log.warn(`[bulk-updater] Auto-publish failed for ${resolvedDocId}:`, pubErr);
-              }
+          } else if (attrDef.type === "enumeration" && Array.isArray(attrDef.enum)) {
+            if (!attrDef.enum.includes(rawVal.trim())) {
+              warnings.push({
+                row: rowNumber,
+                documentId: docId || void 0,
+                warning: `Column "${colKey}" value "${rawVal}" is not in defined enum options: [${attrDef.enum.join(", ")}]`
+              });
             }
+          } else if (attrDef.type === "json") {
             try {
-              await recordContentHistoryVersion(strapi, {
-                uid,
-                documentId: resolvedDocId,
-                userId: user?.id,
-                statusOverride: publish && ct.options?.draftAndPublish ? "published" : void 0
-              });
+              JSON.parse(rawVal);
             } catch {
-            }
-            stats.updated++;
-            for (const attrKey of Object.keys(payload)) {
-              const oldVal = existing?.[attrKey] ?? null;
-              const newVal = payload[attrKey];
-              stats.diffs.push({
-                uid,
-                collectionName: ct.info?.displayName || uid,
-                documentId: resolvedDocId,
-                label: existing.title || existing.name || `Entry #${resolvedDocId}`,
-                attribute: attrKey,
-                oldValue: oldVal,
-                newValue: newVal,
-                status: "updated",
-                message: `Updated "${attrKey}" via CSV import (row ${rowNumber})`
+              warnings.push({
+                row: rowNumber,
+                documentId: docId || void 0,
+                warning: `Column "${colKey}" is type JSON but contains non-JSON text.`
               });
             }
-            continue;
           }
-          const createArgs = { data: payload };
-          if (rowLocale) createArgs.locale = rowLocale;
-          const created = await strapi.documents(uid).create(createArgs);
-          const newDocId = created?.documentId || docId;
-          if (publish && ct.options?.draftAndPublish && newDocId) {
-            try {
-              const pubArgs = { documentId: newDocId };
-              if (rowLocale) pubArgs.locale = rowLocale;
-              await strapi.documents(uid).publish(pubArgs);
-            } catch (pubErr) {
-              strapi.log.warn(`[bulk-updater] Auto-publish failed for ${newDocId}:`, pubErr);
+        }
+        if (activeRules.length > 0) {
+          for (const rule of activeRules) {
+            if (rule.collectionUid && rule.collectionUid !== "*" && rule.collectionUid !== uid) continue;
+            if (rule.includeRichTextHtml && (rawVal.includes("<h") || rawVal.includes("# "))) {
+              const headings = extractHeadingsFromRichText(rawVal);
+              for (const [tag, count] of Object.entries(headings)) {
+                const max = rule.quotas?.[tag.toLowerCase()];
+                if (max !== void 0 && count > max) {
+                  warnings.push({
+                    row: rowNumber,
+                    documentId: docId || void 0,
+                    warning: `Rule "${rule.name}" quota warning: column "${colKey}" contains ${count} "${tag.toUpperCase()}" headings (maximum allowed: ${max}).`
+                  });
+                }
+              }
             }
           }
-          try {
-            await recordContentHistoryVersion(strapi, {
-              uid,
-              documentId: newDocId,
-              userId: user?.id,
-              statusOverride: publish && ct.options?.draftAndPublish ? "published" : void 0
-            });
-          } catch {
-          }
-          stats.created++;
-          if (!docId) {
-            stats.newWithoutDocId++;
-          }
-          for (const attrKey of Object.keys(payload)) {
-            stats.diffs.push({
-              uid,
-              collectionName: ct.info?.displayName || uid,
-              documentId: newDocId,
-              label: created?.title || created?.name || `New Entry #${newDocId}`,
-              attribute: attrKey,
-              oldValue: null,
-              newValue: payload[attrKey],
-              status: "created",
-              message: docId ? `Created "${attrKey}" as new entry (documentId "${docId}" not found in database - row ${rowNumber})` : `Created "${attrKey}" as new entry (no documentId provided in CSV - row ${rowNumber})`
-            });
-          }
         }
-      } catch (err) {
-        stats.errors.push({
-          row: rowNumber,
-          documentId: docId || void 0,
-          error: extractDetailedErrorMessage(err)
-        });
       }
-    }
-    try {
-      const bulkService = strapi.plugin("bulk-updater").service("bulkUpdater");
-      if (bulkService && bulkService.invalidateCollectionCache) {
-        bulkService.invalidateCollectionCache(uid);
+      if (!rowHasError) {
+        validRows++;
       }
-    } catch {
     }
-    if (stats.updated > 0 || stats.created > 0) {
-      try {
-        const auditService2 = strapi.plugin("bulk-updater").service("audit");
-        if (auditService2) {
-          const isEnabled = typeof auditService2.isAuditEnabled === "function" ? auditService2.isAuditEnabled() : Boolean(auditService2.getAuditConfig?.().enabled ?? true);
-          if (isEnabled) {
-            const collectionDisplayName = ct.info?.displayName || uid;
-            const updatedDiffs = stats.diffs.filter(
-              (d) => d.status === "updated" || d.status === "created"
-            );
-            const uniqueAttributes = Array.from(
-              new Set(updatedDiffs.map((d) => d.attribute))
-            ).filter(Boolean);
-            const attrListStr = uniqueAttributes.length > 0 ? uniqueAttributes.join(", ") : "fields";
-            const batchAttribute = `CSV [${collectionDisplayName}]: ${attrListStr}`;
-            let batchValue = "";
-            if (updatedDiffs.length === 1) {
-              const d = updatedDiffs[0];
-              const newStr = d.newValue !== null && d.newValue !== void 0 ? String(d.newValue) : "(empty)";
-              batchValue = `"${d.label}": ${d.attribute} → "${newStr}"`;
-            } else if (updatedDiffs.length > 1 && stats.updated === 1 && stats.created === 0) {
-              const d = updatedDiffs[0];
-              const changes = updatedDiffs.map((ud) => `${ud.attribute}: "${ud.newValue ?? ""}"`).join(", ");
-              batchValue = `"${d.label}": ${changes}`;
-            } else {
-              const sampleVal = updatedDiffs[0] ? ` (e.g. ${updatedDiffs[0].attribute}: "${updatedDiffs[0].newValue ?? ""}")` : "";
-              batchValue = `${stats.updated} updated, ${stats.created} created in ${collectionDisplayName}${sampleVal}`;
-            }
-            const batchSummary = {
-              batchId,
-              attribute: batchAttribute,
-              value: batchValue,
-              updatedCount: stats.updated + stats.created,
-              skippedCount: stats.skipped,
-              totalTargets: stats.total
-            };
-            const userObj = {
-              email: userEmail || "admin@strapi.io",
-              firstname: userName || "Admin"
-            };
-            if (typeof auditService2.recordBatch === "function") {
-              await auditService2.recordBatch(batchSummary, stats.diffs, userObj);
-            } else if (typeof auditService2.logOperation === "function") {
-              await auditService2.logOperation({
-                ...batchSummary,
-                userEmail,
-                userName,
-                diffs: stats.diffs
-              });
-            }
-          }
-        }
-      } catch (auditErr) {
-        strapi.log.warn("[bulk-updater] Failed logging CSV import audit:", auditErr);
-      }
+    return {
+      success: true,
+      totalRows: rows.length,
+      validRows,
+      estimatedUpdates,
+      estimatedCreates,
+      lifecycleStats,
+      hasErrors: errors.length > 0,
+      hasWarnings: warnings.length > 0,
+      errors: errors.slice(0, 100),
+      warnings: warnings.slice(0, 100),
+      totalErrorCount: errors.length,
+      totalWarningCount: warnings.length
+    };
+  },
+  /**
+   * Submits a CSV batch with Guardrails: Maker-Checker (4-Eyes), Execution Windows, Off-Peak Scheduling
+   */
+  async submitBatch(uid, rows, options = {}) {
+    const ct = strapi.contentTypes[uid];
+    if (!ct) {
+      throw new Error(`Content type ${uid} not found`);
+    }
+    if (!rows || rows.length === 0) {
+      throw new Error("No CSV records provided for batch submission.");
+    }
+    const {
+      executionMode = "immediate",
+      makerNotes = "",
+      forceImmediate = false,
+      mode = "auto",
+      publish = true,
+      publishStrategy = "safe",
+      unreviewedConsent = false,
+      unreviewedCount = 0,
+      user
+    } = options;
+    const executionConfig = getExecutionWindowConfig(strapi);
+    const { isBusinessHours, policyMessage } = checkBusinessHours(executionConfig);
+    const collectionDisplayName = ct.info?.displayName || uid;
+    if (executionMode === "maker_checker") {
+      const batchId = `csv_batch_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`;
+      const batch = {
+        id: batchId,
+        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        createdBy: user ? {
+          id: user.id,
+          email: user.email,
+          firstname: user.firstname,
+          lastname: user.lastname,
+          username: user.username
+        } : { email: "admin@system.local" },
+        payload: {
+          action: "csv_import",
+          uid,
+          rows,
+          options: {
+            mode,
+            publish,
+            publishStrategy,
+            unreviewedConsent,
+            user
+          },
+          attribute: `CSV Import: ${collectionDisplayName}`,
+          value: `${rows.length} rows (${mode} mode)`,
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
+        },
+        summary: {
+          attribute: `CSV Import: ${collectionDisplayName}`,
+          value: `${rows.length} rows (${mode} mode)`,
+          totalTargets: rows.length,
+          collectionBreakdown: { [collectionDisplayName]: rows.length },
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
+        },
+        status: "pending_approval",
+        executionMode: "maker_checker",
+        makerNotes,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount
+      };
+      registerPendingBatch(batch, {
+        id: batchId,
+        createdAt: batch.createdAt,
+        createdBy: batch.createdBy,
+        status: "pending_approval",
+        executionMode: "maker_checker",
+        attribute: `CSV Import: ${collectionDisplayName}`,
+        value: `${rows.length} rows (${mode} mode)`,
+        totalTargets: rows.length,
+        processedCount: 0,
+        updatedCount: 0,
+        skippedCount: 0,
+        failedCount: 0,
+        isLive: false,
+        publishOnApproval: publish,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount,
+        makerNotes,
+        results: []
+      });
+      return {
+        success: true,
+        pending: true,
+        batchId,
+        status: "pending_approval",
+        message: "CSV batch submitted for Checker authorization (4-Eyes Maker-Checker Workflow).",
+        batch
+      };
+    }
+    if (executionMode === "queue_offpeak") {
+      const batchId = `csv_batch_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`;
+      const batch = {
+        id: batchId,
+        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        createdBy: user ? {
+          id: user.id,
+          email: user.email,
+          firstname: user.firstname,
+          lastname: user.lastname,
+          username: user.username
+        } : { email: "admin@system.local" },
+        payload: {
+          action: "csv_import",
+          uid,
+          rows,
+          options: {
+            mode,
+            publish,
+            publishStrategy,
+            unreviewedConsent,
+            user
+          },
+          attribute: `CSV Import: ${collectionDisplayName}`,
+          value: `${rows.length} rows (${mode} mode)`,
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
+        },
+        summary: {
+          attribute: `CSV Import: ${collectionDisplayName}`,
+          value: `${rows.length} rows (${mode} mode)`,
+          totalTargets: rows.length,
+          collectionBreakdown: { [collectionDisplayName]: rows.length },
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
+        },
+        status: "queued_offpeak",
+        executionMode: "queue_offpeak",
+        scheduledFor: executionConfig.offPeakStartTime,
+        makerNotes,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount
+      };
+      registerPendingBatch(batch, {
+        id: batchId,
+        createdAt: batch.createdAt,
+        createdBy: batch.createdBy,
+        status: "queued_offpeak",
+        executionMode: "queue_offpeak",
+        scheduledFor: executionConfig.offPeakStartTime,
+        attribute: `CSV Import: ${collectionDisplayName}`,
+        value: `${rows.length} rows (${mode} mode)`,
+        totalTargets: rows.length,
+        processedCount: 0,
+        updatedCount: 0,
+        skippedCount: 0,
+        failedCount: 0,
+        isLive: false,
+        publishOnApproval: publish,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount,
+        makerNotes,
+        results: []
+      });
+      return {
+        success: true,
+        pending: true,
+        batchId,
+        status: "queued_offpeak",
+        scheduledFor: executionConfig.offPeakStartTime,
+        message: `CSV batch queued for server off-peak maintenance window (${executionConfig.offPeakStartTime}).`,
+        batch
+      };
+    }
+    if (executionConfig.enabled && executionConfig.autoQueueDuringBusinessHours && isBusinessHours && !forceImmediate) {
+      const batchId = `csv_batch_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`;
+      const batch = {
+        id: batchId,
+        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        createdBy: user ? {
+          id: user.id,
+          email: user.email,
+          firstname: user.firstname,
+          lastname: user.lastname,
+          username: user.username
+        } : { email: "admin@system.local" },
+        payload: {
+          action: "csv_import",
+          uid,
+          rows,
+          options: {
+            mode,
+            publish,
+            publishStrategy,
+            unreviewedConsent,
+            user
+          },
+          attribute: `CSV Import: ${collectionDisplayName}`,
+          value: `${rows.length} rows (${mode} mode)`,
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
+        },
+        summary: {
+          attribute: `CSV Import: ${collectionDisplayName}`,
+          value: `${rows.length} rows (${mode} mode)`,
+          totalTargets: rows.length,
+          collectionBreakdown: { [collectionDisplayName]: rows.length },
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
+        },
+        status: "queued_offpeak",
+        executionMode: "queue_offpeak",
+        scheduledFor: executionConfig.offPeakStartTime,
+        makerNotes: "Automatically queued due to peak business hours restriction.",
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount
+      };
+      registerPendingBatch(batch, {
+        id: batchId,
+        createdAt: batch.createdAt,
+        createdBy: batch.createdBy,
+        status: "queued_offpeak",
+        executionMode: "queue_offpeak",
+        scheduledFor: executionConfig.offPeakStartTime,
+        attribute: `CSV Import: ${collectionDisplayName}`,
+        value: `${rows.length} rows (${mode} mode)`,
+        totalTargets: rows.length,
+        processedCount: 0,
+        updatedCount: 0,
+        skippedCount: 0,
+        failedCount: 0,
+        isLive: false,
+        publishOnApproval: publish,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount,
+        policyMessage,
+        makerNotes: "Automatically queued due to peak business hours restriction.",
+        results: []
+      });
+      return {
+        success: true,
+        pending: true,
+        batchId,
+        status: "queued_offpeak",
+        scheduledFor: executionConfig.offPeakStartTime,
+        message: policyMessage,
+        batch
+      };
     }
     return {
       success: true,
-      batchId,
-      stats
+      pending: false,
+      executeNow: true
     };
   }
 });