@porulle/plugin-channel-connector 0.11.0 → 0.13.0

package/dist/service.js

@@ -1,10 +1,53 @@
 import { createHash } from "node:crypto";
 import { CommerceInvalidTransitionError, CommerceValidationError, Ok, PluginErr, createTxContext, createSystemActor, } from "@porulle/core";
-import { isValidFieldPath } from "@porulle/core";
-import { and, eq, inArray, isNull } from "@porulle/core/drizzle";
-import { brands, categories, customerAddresses, customers, entityMedia, entityTags, inventoryLevels, mediaAssets, optionTypes, optionValues, orderLineItems, orders, prices, sellableAttributes, sellableCustomFields, sellableEntities, entityFieldDefinitions, tags, variants, variantOptionValues, } from "@porulle/core/schema";
-import { channelEntityMap, channelExportEvents, channelOrderExports, connectedStores, channelRefundEvents, channelRefundRequests, } from "./schema.js";
+import { isValidFieldPath, requireUserId } from "@porulle/core";
+import { CHANNEL_CONVERGENCE_CTX } from "./catalog-push-trigger.js";
+import { and, desc, eq, inArray, isNull, lte } from "@porulle/core/drizzle";
+import { brands, categories, customerAddresses, customers, entityMedia, entityTags, inventoryLevels, mediaAssets, optionTypes, optionValues, orderLineItems, orders, prices, sellableAttributes, sellableCustomFields, sellableEntities, sellableEntityRevisions, entityFieldDefinitions, tags, variants, variantOptionValues, } from "@porulle/core/schema";
+import { channelCatalogPushEvents, channelCatalogPushes, channelCatalogConflicts, channelCatalogConflictEvents, channelEntityMap, channelExportEvents, channelOrderExports, connectedStores, channelRefundEvents, channelRefundRequests, } from "./schema.js";
 import { mergeCatalogFieldMapping, normalizeCatalogFieldMapping, selectCatalogFieldMapping, } from "./catalog-field-mapping.js";
+export const CATALOG_PUSH_BATCH_SIZES = {
+    mock: 100,
+    shopify: 50,
+    woocommerce: 100,
+};
+const DEFAULT_CATALOG_PUSH_BATCH_SIZE = 50;
+const CATALOG_PUSH_BREAKER_RETRY_MS = 60_000;
+export const CATALOG_PUSH_MAX_ATTEMPTS = 8;
+const CATALOG_PUSH_RETRY_BASE_MS = 60_000;
+const CATALOG_PUSH_RETRY_MAX_MS = 60 * 60 * 1000;
+export function catalogPushRetryDelayMs(attempts) {
+    const exponent = Math.max(0, attempts - 1);
+    return Math.min(CATALOG_PUSH_RETRY_BASE_MS * (2 ** exponent), CATALOG_PUSH_RETRY_MAX_MS);
+}
+export function catalogPushConcurrencyKey(input) {
+    const storeId = String(input.storeId);
+    const entityIds = input.entityIds;
+    if (Array.isArray(entityIds) && entityIds.length === 1) {
+        return `push:${String(entityIds[0])}:${storeId}`;
+    }
+    return `push-catalog:${storeId}`;
+}
+export function isCatalogPushBreakerOpen(breakerState) {
+    if (breakerState.open === true) {
+        const openUntil = breakerState.openUntil;
+        if (typeof openUntil === "string" && new Date(openUntil) <= new Date())
+            return false;
+        return true;
+    }
+    const catalogPush = breakerState.catalogPush;
+    if (!catalogPush || typeof catalogPush !== "object")
+        return false;
+    const state = catalogPush;
+    if (state.open !== true)
+        return false;
+    if (typeof state.openUntil === "string" && new Date(state.openUntil) <= new Date())
+        return false;
+    return true;
+}
+function catalogPushBatchSize(provider) {
+    return CATALOG_PUSH_BATCH_SIZES[provider] ?? DEFAULT_CATALOG_PUSH_BATCH_SIZE;
+}
 const exportTransitions = {
     pending: ["exported", "abandoned"],
     exported: ["confirmed", "failed", "abandoned"],
@@ -15,9 +58,107 @@ const exportTransitions = {
 export function canExportTransition(from, to) {
     return exportTransitions[from].includes(to);
 }
+// Catalog pushes recur; confirmed/failed rows re-arm through exported, and rows with nothing to push resolve directly.
+const catalogPushTransitions = {
+    pending: ["exported", "confirmed", "abandoned"],
+    exported: ["confirmed", "failed", "abandoned"],
+    confirmed: ["exported", "abandoned"],
+    failed: ["exported", "confirmed", "abandoned"],
+    abandoned: [],
+};
+export function canCatalogPushTransition(from, to) {
+    return catalogPushTransitions[from].includes(to);
+}
 function hash(value) {
     return createHash("sha256").update(JSON.stringify(value)).digest("hex");
 }
+export const CATALOG_OUTBOUND_SUPPRESSION_WINDOW_MS = 15 * 60 * 1000;
+function normalizeCanonicalValue(value) {
+    if (typeof value === "string")
+        return value.replace(/\r\n?/g, "\n").replace(/\s+/g, " ").trim();
+    if (Array.isArray(value))
+        return value.map(normalizeCanonicalValue).sort((left, right) => (JSON.stringify(left) ?? "").localeCompare(JSON.stringify(right) ?? ""));
+    if (value && typeof value === "object") {
+        return Object.fromEntries(Object.entries(value)
+            .sort(([left], [right]) => left.localeCompare(right))
+            .map(([key, nested]) => [key, normalizeCanonicalValue(nested)]));
+    }
+    return value;
+}
+function normalizedValuesEqual(left, right) {
+    return JSON.stringify(normalizeCanonicalValue(left)) === JSON.stringify(normalizeCanonicalValue(right));
+}
+function snapshotCustomFieldValue(field) {
+    if (field.textValue !== null && field.textValue !== undefined)
+        return field.textValue;
+    if (field.numberValue !== null && field.numberValue !== undefined)
+        return field.numberValue;
+    if (field.booleanValue !== null && field.booleanValue !== undefined)
+        return field.booleanValue;
+    if (field.dateValue !== null && field.dateValue !== undefined)
+        return field.dateValue;
+    return field.jsonValue;
+}
+function snapshotFieldValue(snapshot, path) {
+    const [root, segment, field] = path.split(".");
+    if (root === "entity" && segment === "slug")
+        return { found: true, value: snapshot.entity.slug };
+    if (root === "entity" && segment === "status")
+        return { found: true, value: snapshot.entity.status };
+    if (root === "entity" && segment === "metadata") {
+        const metadata = snapshot.entity.metadata;
+        return {
+            found: true,
+            value: metadata && typeof metadata === "object" ? metadata[field ?? ""] : undefined,
+        };
+    }
+    if (root === "attributes" && segment && field) {
+        const attribute = snapshot.attributes.find((row) => row.locale === segment);
+        return { found: true, value: attribute?.[field] };
+    }
+    if (root === "customFields" && segment && field) {
+        const customField = snapshot.customFields.find((row) => row.fieldName === segment && row.locale === field && row.status === "approved");
+        return { found: true, value: customField ? snapshotCustomFieldValue(customField) : undefined };
+    }
+    if (root === "media" && segment) {
+        return {
+            found: true,
+            value: snapshot.media.filter((row) => row.role === segment).map((row) => row.mediaAssetId),
+        };
+    }
+    return { found: false, value: undefined };
+}
+function canonicalHash(externalId, fieldPaths, valueAtPath) {
+    const fields = fieldPaths.flatMap((fieldPath) => {
+        const value = valueAtPath(fieldPath);
+        return value === undefined ? [] : [{ fieldPath, value: normalizeCanonicalValue(value) }];
+    });
+    return hash({
+        externalId,
+        fields: fields.sort((left, right) => left.fieldPath.localeCompare(right.fieldPath)),
+    });
+}
+function outboundFieldPaths(item) {
+    const paths = new Set(item.fields.flatMap((field) => isValidFieldPath(field.fieldPath) ? [field.fieldPath] : []));
+    for (const image of item.images ?? [])
+        paths.add(`media.${image.role}`);
+    return [...paths].sort();
+}
+function pushFieldValue(item, fieldPath) {
+    if (fieldPath.startsWith("media.")) {
+        const role = fieldPath.slice("media.".length);
+        return (item.images ?? [])
+            .filter((image) => image.role === role)
+            .map((image) => ({ url: image.url, role: image.role }));
+    }
+    return item.fields.find((field) => field.fieldPath === fieldPath)?.value;
+}
+function canonicalOutboundHash(externalId, item, fieldPaths) {
+    return canonicalHash(externalId, fieldPaths, (fieldPath) => pushFieldValue(item, fieldPath));
+}
+function canonicalInboundHash(externalId, fieldPaths, remoteFieldValue) {
+    return canonicalHash(externalId, fieldPaths, remoteFieldValue);
+}
 function mergeMetadata(existing, remote) {
     return { ...(existing ?? {}), ...remote };
 }
@@ -61,6 +202,7 @@ function pushCatalogField(fieldPath, value, mapping) {
         value,
         ...(locale !== undefined ? { locale } : {}),
         remoteKey: mapping.remoteKey,
+        target: mapping.target,
     };
 }
 function pushCatalogImageRole(value) {
@@ -84,6 +226,16 @@ function importedFieldPaths(item) {
                 paths.add(`attributes.${attribute.locale}.${field}`);
         }
     }
+    const customFields = item.customFields;
+    for (const [name, locales] of Object.entries(customFields ?? {})) {
+        if (!locales || typeof locales !== "object" || Array.isArray(locales))
+            continue;
+        for (const locale of Object.keys(locales)) {
+            const path = `customFields.${name}.${locale}`;
+            if (isValidFieldPath(path))
+                paths.add(path);
+        }
+    }
     for (const image of item.images ?? [])
         paths.add(`media.${image.role}`);
     if (item.options?.length)
@@ -271,6 +423,13 @@ export class ChannelConnectorService {
             return item.status;
         if (root === "entity" && segment === "metadata")
             return item.metadata?.[field ?? ""];
+        if (root === "customFields" && segment && field) {
+            const customFields = item.customFields;
+            const customField = customFields?.[segment];
+            if (customField && typeof customField === "object" && !Array.isArray(customField)) {
+                return customField[field];
+            }
+        }
         if (root === "attributes" && segment && field) {
             const attributes = item.attributes?.length
                 ? item.attributes
@@ -278,8 +437,11 @@ export class ChannelConnectorService {
             const attribute = attributes.find((row) => row.locale === segment);
             return attribute?.[field];
         }
-        if (root === "media" && segment)
-            return (item.images ?? []).filter((image) => image.role === segment).map((image) => image.externalId ?? image.url);
+        if (root === "media" && segment) {
+            return (item.images ?? [])
+                .filter((image) => image.role === segment)
+                .map((image) => ({ url: image.url, role: image.role }));
+        }
         if (path === "options")
             return item.options;
         if (path === "variants.sku")
@@ -290,6 +452,15 @@ export class ChannelConnectorService {
             return item.variants.flatMap((variant) => variant.prices ?? []).filter((price) => price.currency === segment);
         return undefined;
     }
+    isOutboundEcho(mapping, item) {
+        if (!mapping.outboundHash || !mapping.outboundPushedAt || mapping.outboundFieldPaths.length === 0)
+            return false;
+        const age = Date.now() - mapping.outboundPushedAt.getTime();
+        if (age < 0 || age > CATALOG_OUTBOUND_SUPPRESSION_WINDOW_MS)
+            return false;
+        const inboundHash = canonicalInboundHash(mapping.externalId, mapping.outboundFieldPaths, (fieldPath) => this.remoteFieldValue(item, fieldPath));
+        return inboundHash === mapping.outboundHash;
+    }
     async localFieldValue(entityId, entity, path) {
         const [root, segment, field] = path.split(".");
         if (root === "entity" && segment === "slug")
@@ -312,6 +483,10 @@ export class ChannelConnectorService {
                 : {};
             return values[field];
         }
+        if (root === "customFields" && segment && field) {
+            const [customField] = await this.db.select().from(sellableCustomFields).where(and(eq(sellableCustomFields.entityId, entityId), eq(sellableCustomFields.fieldName, segment), eq(sellableCustomFields.locale, field), eq(sellableCustomFields.status, "approved")));
+            return customField ? customFieldValue(customField) : undefined;
+        }
         if (root === "media" && segment) {
             const links = await this.db.select({ id: entityMedia.mediaAssetId }).from(entityMedia).where(and(eq(entityMedia.entityId, entityId), eq(entityMedia.role, segment)));
             return links.map((link) => link.id);
@@ -334,24 +509,105 @@ export class ChannelConnectorService {
         }
         return undefined;
     }
-    async detectSharedConflicts(entityId, storeId, entity, mapping, item, owners, fieldPaths = importedFieldPaths(item), remoteHash = hash(item)) {
+    async lastSyncedSnapshot(entityId, lastSyncedAt) {
+        const [revision] = await this.db.select({ snapshot: sellableEntityRevisions.snapshot }).from(sellableEntityRevisions).where(and(eq(sellableEntityRevisions.entityId, entityId), lte(sellableEntityRevisions.createdAt, lastSyncedAt))).orderBy(desc(sellableEntityRevisions.createdAt)).limit(1);
+        return revision?.snapshot;
+    }
+    async detectSharedConflicts(entityId, storeId, entity, mapping, item, owners, fieldPaths = importedFieldPaths(item), remoteHash = hash(item), echo) {
         if (!mapping || mapping.syncHash === remoteHash)
             return { paths: [], conflicts: [] };
         const revisions = await this.catalog.repository.findRevisionMarkers(entityId, mapping.lastSyncedAt);
         const localChanged = revisions.some((revision) => revision.reason !== "import");
-        if (!localChanged)
-            return { paths: [], conflicts: [] };
         const paths = fieldPaths.filter((path) => owners.get(path) === "shared");
-        const conflicts = await Promise.all(paths.map(async (fieldPath) => ({
-            entityId,
-            storeId,
-            fieldPath,
-            localValueSummary: summarizeValue(await this.localFieldValue(entityId, entity, fieldPath)),
-            remoteValueSummary: summarizeValue(this.remoteFieldValue(item, fieldPath)),
-        })));
-        return { paths, conflicts };
-    }
-    async setCatalogAttributes(entityId, item, actor, blockedPaths = new Set()) {
+        const openRows = await this.db.select({
+            fieldPath: channelCatalogConflicts.fieldPath,
+            storeValue: channelCatalogConflicts.storeValue,
+        }).from(channelCatalogConflicts).where(and(eq(channelCatalogConflicts.storeId, storeId), eq(channelCatalogConflicts.entityId, entityId), eq(channelCatalogConflicts.state, "open")));
+        if (!localChanged && openRows.length === 0)
+            return { paths: [], conflicts: [] };
+        const openByPath = new Map(openRows.map((row) => [row.fieldPath, row.storeValue]));
+        const baseline = await this.lastSyncedSnapshot(entityId, mapping.lastSyncedAt);
+        const changed = [];
+        for (const path of paths) {
+            const localValue = await this.localFieldValue(entityId, entity, path);
+            const remoteValue = this.remoteFieldValue(item, path);
+            let diverged = false;
+            if (echo) {
+                // The outbound hash certifies only the pushed paths; a shared path
+                // outside that set carrying a genuinely different remote value is a
+                // real store edit even inside an echo payload.
+                diverged = !echo.certifiedPaths.has(path) && !normalizedValuesEqual(remoteValue, localValue);
+            }
+            else if (openByPath.has(path)) {
+                diverged = !normalizedValuesEqual(remoteValue, openByPath.get(path));
+            }
+            else if (baseline) {
+                const baselineValue = snapshotFieldValue(baseline, path);
+                diverged = baselineValue.found
+                    && !normalizedValuesEqual(localValue, baselineValue.value)
+                    && !normalizedValuesEqual(remoteValue, baselineValue.value)
+                    && !normalizedValuesEqual(localValue, remoteValue);
+            }
+            else {
+                diverged = !normalizedValuesEqual(remoteValue, localValue);
+            }
+            if (diverged)
+                changed.push(path);
+        }
+        const conflicts = await Promise.all(changed.map(async (fieldPath) => {
+            const platformValue = await this.localFieldValue(entityId, entity, fieldPath);
+            const storeValue = this.remoteFieldValue(item, fieldPath);
+            return {
+                entityId,
+                storeId,
+                fieldPath,
+                platformValue: platformValue === undefined ? null : platformValue,
+                storeValue: storeValue === undefined ? null : storeValue,
+                localValueSummary: summarizeValue(platformValue),
+                remoteValueSummary: summarizeValue(storeValue),
+            };
+        }));
+        return { paths: changed, conflicts };
+    }
+    async persistCatalogConflicts(orgId, conflicts, changedBy) {
+        for (const conflict of conflicts) {
+            const [inserted] = await this.db.insert(channelCatalogConflicts).values({
+                organizationId: orgId,
+                storeId: conflict.storeId,
+                entityId: conflict.entityId,
+                fieldPath: conflict.fieldPath,
+                platformValue: conflict.platformValue,
+                storeValue: conflict.storeValue,
+            }).onConflictDoNothing().returning();
+            if (!inserted) {
+                const [existing] = await this.db.select({
+                    id: channelCatalogConflicts.id,
+                    storeValue: channelCatalogConflicts.storeValue,
+                    platformValue: channelCatalogConflicts.platformValue,
+                }).from(channelCatalogConflicts).where(and(eq(channelCatalogConflicts.organizationId, orgId), eq(channelCatalogConflicts.storeId, conflict.storeId), eq(channelCatalogConflicts.entityId, conflict.entityId), eq(channelCatalogConflicts.fieldPath, conflict.fieldPath), eq(channelCatalogConflicts.state, "open")));
+                const storeMoved = existing !== undefined && !normalizedValuesEqual(existing.storeValue, conflict.storeValue);
+                const platformMoved = existing !== undefined && !normalizedValuesEqual(existing.platformValue, conflict.platformValue);
+                if (existing && (storeMoved || platformMoved)) {
+                    await this.db.update(channelCatalogConflicts).set({
+                        storeValue: conflict.storeValue,
+                        platformValue: conflict.platformValue,
+                        updatedAt: new Date(),
+                    }).where(eq(channelCatalogConflicts.id, existing.id));
+                }
+                continue;
+            }
+            await this.db.insert(channelCatalogConflictEvents).values({
+                organizationId: orgId,
+                conflictId: inserted.id,
+                fromState: null,
+                toState: "open",
+                reason: "Shared catalog field changed on both sides.",
+                changedBy,
+            });
+        }
+        return Ok(undefined);
+    }
+    async setCatalogAttributes(entityId, item, actor, blockedPaths = new Set(), catalogCtx) {
         const attributes = item.attributes ?? [{
                 locale: "en",
                 title: item.title,
@@ -383,12 +639,23 @@ export class ChannelConnectorService {
             else if (attributeFields.some((field) => (current[field] == null ? null : current[field]) !== (writeAttribute[field] == null ? null : writeAttribute[field]))) {
                 changed = true;
             }
-            const result = await this.catalog.setAttributes(entityId, attribute.locale, writeAttribute, actor);
+            const result = await this.catalog.setAttributes(entityId, attribute.locale, writeAttribute, actor, catalogCtx);
             if (!result.ok)
                 return PluginErr(result.error.message);
         }
         return Ok({ created, changed });
     }
+    async setCatalogAttributesIfWritable(entityId, item, actor, blockedPaths, catalogCtx) {
+        const attributes = item.attributes ?? [{
+                locale: "en",
+                title: item.title,
+                ...(item.description !== undefined ? { description: item.description } : {}),
+            }];
+        const writable = attributes.some((attribute) => attributeFields.some((field) => (attribute[field] !== undefined && !blockedPaths.has(`attributes.${attribute.locale}.${field}`))));
+        if (!writable)
+            return Ok({ created: 0, changed: false });
+        return this.setCatalogAttributes(entityId, item, actor, blockedPaths, catalogCtx);
+    }
     async upsertOptionAxes(entityId, item, actor) {
         const optionValueIds = new Map();
         const existingTypes = await this.db.select().from(optionTypes).where(eq(optionTypes.entityId, entityId));
@@ -747,17 +1014,45 @@ export class ChannelConnectorService {
             }
             const fieldMapping = this.resolveCatalogFieldMapping(store, filterableCustomFields, warnings);
             const heldPaths = new Set(entityMapping.heldFieldPaths ?? []);
+            const forcedPushPaths = new Set([
+                ...(entityMapping.forcedPushFieldPaths ?? []),
+                ...(options.forceFieldPaths?.[entity.id] ?? []),
+            ]);
             const fields = [];
             const appendField = (fieldPath, value) => {
-                if (value === undefined || owners.get(fieldPath) !== "platform")
+                if (value === undefined)
+                    return;
+                const owner = owners.get(fieldPath);
+                const mapping = selectCatalogFieldMapping(fieldMapping, fieldPath);
+                if (owner === "store") {
+                    skipped.push({
+                        entityId,
+                        fieldPath,
+                        reason: "store_owned",
+                        value,
+                        owner,
+                        ...(mapping ? { target: mapping.target, remoteKey: mapping.remoteKey } : {}),
+                    });
+                    return;
+                }
+                if (owner === undefined)
+                    return;
+                const forced = forcedPushPaths.has(fieldPath);
+                if (owner !== "platform" && !forced)
                     return;
                 if (heldPaths.has(fieldPath)) {
-                    skipped.push({ entityId, fieldPath, reason: "held" });
+                    skipped.push({
+                        entityId,
+                        fieldPath,
+                        reason: "held",
+                        value,
+                        owner,
+                        ...(mapping ? { target: mapping.target, remoteKey: mapping.remoteKey } : {}),
+                    });
                     return;
                 }
-                const mapping = selectCatalogFieldMapping(fieldMapping, fieldPath);
                 if (!mapping) {
-                    skipped.push({ entityId, fieldPath, reason: "no_mapping" });
+                    skipped.push({ entityId, fieldPath, reason: "no_mapping", value, owner });
                     return;
                 }
                 fields.push(pushCatalogField(fieldPath, value, mapping));
@@ -786,17 +1081,44 @@ export class ChannelConnectorService {
                 if (!role)
                     continue;
                 const fieldPath = `media.${role}`;
-                if (owners.get(fieldPath) !== "platform")
+                const owner = owners.get(fieldPath);
+                const mapping = selectCatalogFieldMapping(fieldMapping, fieldPath);
+                const imageValue = [{ url: attached.url, role }];
+                if (owner === "store") {
+                    skipped.push({
+                        entityId,
+                        fieldPath,
+                        reason: "store_owned",
+                        value: imageValue,
+                        owner,
+                        ...(mapping ? { target: mapping.target, remoteKey: mapping.remoteKey } : {}),
+                    });
+                    continue;
+                }
+                if (owner === undefined)
+                    continue;
+                const forced = forcedPushPaths.has(fieldPath);
+                if (owner !== "platform" && !forced)
                     continue;
                 if (heldPaths.has(fieldPath)) {
-                    skipped.push({ entityId, fieldPath, reason: "held" });
+                    skipped.push({
+                        entityId,
+                        fieldPath,
+                        reason: "held",
+                        value: imageValue,
+                        owner,
+                        ...(mapping ? { target: mapping.target, remoteKey: mapping.remoteKey } : {}),
+                    });
                     continue;
                 }
-                if (!selectCatalogFieldMapping(fieldMapping, fieldPath)) {
-                    skipped.push({ entityId, fieldPath, reason: "no_mapping" });
+                if (!mapping) {
+                    skipped.push({ entityId, fieldPath, reason: "no_mapping", value: imageValue, owner });
                     continue;
                 }
                 images.push({
+                    fieldPath,
+                    target: mapping.target,
+                    remoteKey: mapping.remoteKey,
                     url: attached.url,
                     role,
                     sortOrder: attached.sortOrder,
@@ -831,6 +1153,201 @@ export class ChannelConnectorService {
         }
         return Ok({ items, skipped, warnings: [...new Set(warnings)] });
     }
+    async recordOutboundPush(orgId, storeId, outcomes, items, phase = "settle") {
+        const outcomeByExternalId = new Map(outcomes.map((outcome) => [outcome.externalId, outcome]));
+        const now = new Date();
+        for (const item of items) {
+            const outcome = outcomeByExternalId.get(item.externalId);
+            const mapping = await this.db.select({
+                id: channelEntityMap.id,
+                externalId: channelEntityMap.externalId,
+                forcedPushFieldPaths: channelEntityMap.forcedPushFieldPaths,
+            }).from(channelEntityMap).where(and(eq(channelEntityMap.organizationId, orgId), eq(channelEntityMap.storeId, storeId), eq(channelEntityMap.kind, "entity"), eq(channelEntityMap.externalId, item.externalId)));
+            if (!mapping[0])
+                continue;
+            if (outcome?.ok === true) {
+                const fieldPaths = outboundFieldPaths(item);
+                await this.db.update(channelEntityMap).set({
+                    outboundHash: canonicalOutboundHash(mapping[0].externalId, item, fieldPaths),
+                    outboundPushedAt: now,
+                    outboundFieldPaths: fieldPaths,
+                    // A force is an operator's conflict resolution. The write-ahead runs
+                    // before the connector is called and its outcomes are optimistic, so
+                    // consuming the force there would discard the resolution on a failed
+                    // push and the retry would silently omit the field.
+                    ...(phase === "settle"
+                        ? { forcedPushFieldPaths: (mapping[0].forcedPushFieldPaths ?? []).filter((path) => !fieldPaths.includes(path)) }
+                        : {}),
+                }).where(eq(channelEntityMap.id, mapping[0].id));
+            }
+            else {
+                await this.db.update(channelEntityMap).set({
+                    outboundHash: null,
+                    outboundPushedAt: null,
+                    outboundFieldPaths: [],
+                    syncHash: "",
+                }).where(eq(channelEntityMap.id, mapping[0].id));
+            }
+        }
+        return Ok(undefined);
+    }
+    async pushCatalogToStore(orgId, storeId, entityIds) {
+        const assembled = await this.buildCatalogPushItems(orgId, storeId, entityIds);
+        if (!assembled.ok)
+            return assembled;
+        const store = await this.getStoreRecord(orgId, storeId);
+        if (!store || store.status !== "connected")
+            return PluginErr("Connected store not found.", "NOT_FOUND");
+        const connector = this.connectors.get(store.provider);
+        if (!connector?.pushCatalog)
+            return PluginErr(`Catalog push is not supported by provider "${store.provider}".`);
+        if (assembled.value.items.length === 0)
+            return Ok({
+                outcomes: [],
+                skipped: assembled.value.skipped,
+                warnings: assembled.value.warnings,
+            });
+        const writeAhead = await this.recordOutboundPush(orgId, storeId, assembled.value.items.map((item) => ({ externalId: item.externalId, ok: true })), assembled.value.items, "write-ahead");
+        if (!writeAhead.ok)
+            return writeAhead;
+        let result;
+        try {
+            result = await connector.pushCatalog(store, assembled.value.items);
+        }
+        catch (error) {
+            const connectorError = {
+                code: "CATALOG_PUSH_THROWN",
+                message: error instanceof Error ? error.message : "Catalog push failed.",
+            };
+            const cleared = await this.recordOutboundPush(orgId, storeId, assembled.value.items.map((item) => ({ externalId: item.externalId, ok: false, error: connectorError })), assembled.value.items);
+            if (!cleared.ok)
+                return cleared;
+            return PluginErr(connectorError.message, connectorError.code);
+        }
+        if (!result.ok) {
+            const cleared = await this.recordOutboundPush(orgId, storeId, assembled.value.items.map((item) => ({ externalId: item.externalId, ok: false, error: result.error })), assembled.value.items);
+            if (!cleared.ok)
+                return cleared;
+            return PluginErr(result.error.message, result.error.code);
+        }
+        const recorded = await this.recordOutboundPush(orgId, storeId, result.value.outcomes, assembled.value.items);
+        if (!recorded.ok)
+            return recorded;
+        const successfulEntityIds = assembled.value.items
+            .filter((item) => result.value.outcomes.some((outcome) => outcome.externalId === item.externalId && outcome.ok))
+            .map((item) => item.externalId);
+        if (successfulEntityIds.length > 0) {
+            const mappings = await this.db.select({ entityId: channelEntityMap.entityId }).from(channelEntityMap).where(and(eq(channelEntityMap.organizationId, orgId), eq(channelEntityMap.storeId, storeId), eq(channelEntityMap.kind, "entity"), inArray(channelEntityMap.externalId, successfulEntityIds)));
+            const actor = createSystemActor(orgId);
+            try {
+                await this.transact(async (tx) => {
+                    const txContext = createTxContext(tx, { actor });
+                    for (const entityId of [...new Set(mappings.map((mapping) => mapping.entityId))]) {
+                        const revision = await this.catalog.recordEntityRevision(entityId, actor, "push", txContext);
+                        if (!revision.ok)
+                            throw new Error(revision.error.message);
+                    }
+                });
+            }
+            catch (error) {
+                return PluginErr(error instanceof Error ? error.message : "Failed to record catalog push revisions.");
+            }
+        }
+        return Ok({
+            ...result.value,
+            skipped: assembled.value.skipped,
+            warnings: assembled.value.warnings,
+        });
+    }
+    async previewCatalogPush(orgId, storeId, entityIds) {
+        const assembledEntityIds = await this.resolveCatalogPushEntityIds(orgId, storeId, entityIds);
+        const assembled = await this.buildCatalogPushItems(orgId, storeId, assembledEntityIds);
+        if (!assembled.ok)
+            return assembled;
+        const store = await this.getStoreRecord(orgId, storeId);
+        if (!store || store.status !== "connected")
+            return PluginErr("Connected store not found.", "NOT_FOUND");
+        const connector = this.connectors.get(store.provider);
+        if (!connector?.pushCatalog)
+            return PluginErr(`Catalog push is not supported by provider "${store.provider}".`);
+        if (assembled.value.items.length === 0) {
+            return Ok({ items: [], skipped: assembled.value.skipped, warnings: assembled.value.warnings });
+        }
+        let result;
+        try {
+            result = await connector.pushCatalog(store, assembled.value.items, { dryRun: true });
+        }
+        catch (error) {
+            return PluginErr(error instanceof Error ? error.message : "Catalog push preview failed.", "CATALOG_PREVIEW_THROWN");
+        }
+        if (!result.ok)
+            return PluginErr(result.error.message, result.error.code);
+        const failed = result.value.outcomes.find((outcome) => !outcome.ok);
+        if (failed)
+            return PluginErr(failed.error?.message ?? `Catalog push preview failed for item "${failed.externalId}".`, failed.error?.code ?? "CATALOG_PREVIEW_FAILED");
+        const mappings = assembledEntityIds.length === 0
+            ? []
+            : await this.db.select({ entityId: channelEntityMap.entityId, externalId: channelEntityMap.externalId }).from(channelEntityMap).where(and(eq(channelEntityMap.organizationId, orgId), eq(channelEntityMap.storeId, storeId), eq(channelEntityMap.kind, "entity"), inArray(channelEntityMap.entityId, assembledEntityIds)));
+        const externalByEntity = new Map(mappings.map((mapping) => [mapping.entityId, mapping.externalId]));
+        const skippedByExternal = new Map();
+        for (const skipped of assembled.value.skipped) {
+            const externalId = externalByEntity.get(skipped.entityId);
+            if (!externalId)
+                continue;
+            const existing = skippedByExternal.get(externalId) ?? [];
+            existing.push(skipped);
+            skippedByExternal.set(externalId, existing);
+        }
+        const outcomeByExternalId = new Map(result.value.outcomes.map((outcome) => [outcome.externalId, outcome]));
+        const beforeFor = (externalId, fieldPath) => {
+            const previousFields = outcomeByExternalId.get(externalId)?.previousFields;
+            if (previousFields === undefined) {
+                return { before: { status: "unavailable" }, beforeStatus: "unavailable" };
+            }
+            const previous = previousFields.find((field) => field.fieldPath === fieldPath);
+            if (!previous)
+                return { before: null, beforeStatus: "missing" };
+            return { before: previous.value, beforeStatus: "value" };
+        };
+        const items = assembled.value.items.map((item) => {
+            const diffs = item.fields.map((field) => ({
+                fieldPath: field.fieldPath,
+                target: field.target,
+                remoteKey: field.remoteKey ?? null,
+                ...beforeFor(item.externalId, field.fieldPath),
+                after: field.value,
+                owner: "platform",
+                willWrite: true,
+            }));
+            for (const image of item.images ?? []) {
+                diffs.push({
+                    fieldPath: image.fieldPath,
+                    target: image.target,
+                    remoteKey: image.remoteKey,
+                    ...beforeFor(item.externalId, image.fieldPath),
+                    after: pushFieldValue(item, image.fieldPath),
+                    owner: "platform",
+                    willWrite: true,
+                });
+            }
+            for (const skipped of skippedByExternal.get(item.externalId) ?? []) {
+                if (skipped.value === undefined || skipped.owner === undefined)
+                    continue;
+                diffs.push({
+                    fieldPath: skipped.fieldPath,
+                    target: skipped.target ?? null,
+                    remoteKey: skipped.remoteKey ?? null,
+                    ...beforeFor(item.externalId, skipped.fieldPath),
+                    after: skipped.value,
+                    owner: skipped.owner,
+                    willWrite: false,
+                    reason: skipped.reason,
+                });
+            }
+            return { externalId: item.externalId, diffs };
+        });
+        return Ok({ items, skipped: assembled.value.skipped, warnings: assembled.value.warnings });
+    }
     async getCatalogWriteSettings(orgId, storeId) {
         const store = await this.getStoreRecord(orgId, storeId);
         if (!store)
@@ -1074,7 +1591,7 @@ export class ChannelConnectorService {
             const promoted = await this.catalog.setAttributes(entity.id, "en", {
                 title: metadata.title,
                 ...(typeof metadata.description === "string" ? { description: metadata.description } : {}),
-            }, actor);
+            }, actor, CHANNEL_CONVERGENCE_CTX);
             if (!promoted.ok)
                 return PluginErr(promoted.error.message);
             const [confirmed] = await this.db.select({ id: sellableAttributes.id, title: sellableAttributes.title, description: sellableAttributes.description }).from(sellableAttributes).where(and(eq(sellableAttributes.entityId, entity.id), eq(sellableAttributes.locale, "en")));
@@ -1385,6 +1902,7 @@ export class ChannelConnectorService {
             for (const path of seedPaths)
                 ownershipBeforeSeed.set(path, "store");
             const owners = ownershipBeforeSeed;
+            const outboundEcho = entityMapping ? this.isOutboundEcho(entityMapping, item) : false;
             const remoteChanged = entityMapping === undefined || entityMapping.syncHash !== remoteHash;
             // An unchanged remote item writes nothing and advances no baseline:
             // converging a stale replay would revert local edits to shared and
@@ -1393,15 +1911,22 @@ export class ChannelConnectorService {
                 continue;
             }
             const shared = existingEntity
-                ? await this.detectSharedConflicts(entityId, storeId, existingEntity, entityMapping, item, owners)
+                ? await this.detectSharedConflicts(entityId, storeId, existingEntity, entityMapping, item, owners, importedFieldPaths(item), remoteHash, outboundEcho ? { certifiedPaths: new Set(entityMapping?.outboundFieldPaths ?? []) } : undefined)
                 : { paths: [], conflicts: [] };
+            const persistedConflicts = await this.persistCatalogConflicts(orgId, shared.conflicts, requireUserId(actor));
+            if (!persistedConflicts.ok)
+                return persistedConflicts;
             const owned = this.filterOwnedFields(item, owners);
             const heldSharedPaths = [...new Set([...(entityMapping?.heldFieldPaths ?? []), ...shared.paths])];
+            // A newly held path revokes any force left from an earlier resolution of
+            // that same path: the force was the operator's answer to a question that
+            // has since been asked again, and it must not pre-empt the new one.
+            const survivingForcedPaths = (entityMapping?.forcedPushFieldPaths ?? []).filter((path) => !heldSharedPaths.includes(path));
             const held = this.filterConflictingFields(owned.writable, heldSharedPaths);
             const writable = held.writable;
             const blockedPaths = new Set([...owned.skipped, ...heldSharedPaths]);
             skipped.push(...owned.skipped.map((fieldPath) => ({ entityId, fieldPath })));
-            conflicts.push(...shared.conflicts);
+            conflicts.push(...shared.conflicts.map(({ platformValue: _platformValue, storeValue: _storeValue, ...conflict }) => conflict));
             for (const conflict of shared.conflicts) {
                 warnings.push(`Held shared field conflict for entity "${conflict.entityId}", store "${conflict.storeId}", field "${conflict.fieldPath}" (local ${conflict.localValueSummary}, remote ${conflict.remoteValueSummary}).`);
             }
@@ -1426,7 +1951,7 @@ export class ChannelConnectorService {
                 if (shouldUpdate) {
                     converged += 1;
                     if (Object.keys(updateInput).length > 0) {
-                        const updated = await this.catalog.update(entityMapping.entityId, updateInput, actor);
+                        const updated = await this.catalog.update(entityMapping.entityId, updateInput, actor, CHANNEL_CONVERGENCE_CTX);
                         if (!updated.ok)
                             return PluginErr(updated.error.message);
                         entityTouched = true;
@@ -1436,7 +1961,7 @@ export class ChannelConnectorService {
             const optionAxes = await this.upsertOptionAxes(entityId, writable, actor);
             if (!optionAxes.ok)
                 return optionAxes;
-            const attributes = await this.setCatalogAttributes(entityId, writable, actor, blockedPaths);
+            const attributes = await this.setCatalogAttributesIfWritable(entityId, writable, actor, blockedPaths, CHANNEL_CONVERGENCE_CTX);
             if (!attributes.ok)
                 return attributes;
             const variantIds = await this.upsertVariants(orgId, storeId, entityId, writable, optionAxes.value.value, actor, warnings, !heldSharedPaths.includes("options") && owners.get("options") !== "platform", item);
@@ -1473,6 +1998,7 @@ export class ChannelConnectorService {
                     syncHash: remoteHash,
                     lastSyncedAt,
                     heldFieldPaths: heldSharedPaths,
+                    forcedPushFieldPaths: survivingForcedPaths,
                 });
             }
             else if (entityMapping) {
@@ -1480,6 +2006,7 @@ export class ChannelConnectorService {
                     syncHash: remoteHash,
                     lastSyncedAt,
                     heldFieldPaths: heldSharedPaths,
+                    forcedPushFieldPaths: survivingForcedPaths,
                 }).where(eq(channelEntityMap.id, entityMapping.id));
             }
             await this.db.update(channelEntityMap).set({ lastSyncedAt }).where(and(eq(channelEntityMap.organizationId, orgId), eq(channelEntityMap.storeId, storeId), eq(channelEntityMap.entityId, entityId), eq(channelEntityMap.kind, "variant")));
@@ -1560,11 +2087,13 @@ export class ChannelConnectorService {
             inventoryUpdated += 1;
         }
         const threshold = this.options.driftAlertThreshold ?? 25;
+        const openConflictRows = await this.db.select({ id: channelCatalogConflicts.id }).from(channelCatalogConflicts).where(and(eq(channelCatalogConflicts.organizationId, orgId), eq(channelCatalogConflicts.storeId, storeId), eq(channelCatalogConflicts.state, "open")));
         const report = {
             imported: converged.value.imported,
             converged: converged.value.converged,
             archived,
             inventoryUpdated,
+            openConflicts: openConflictRows.length,
             driftAlert: converged.value.imported + converged.value.converged + archived > threshold,
             ...(skipped.length > 0 ? { skipped: uniqueSkipped(skipped) } : {}),
             ...(converged.value.conflicts.length > 0 ? { conflicts: converged.value.conflicts } : {}),
@@ -1585,6 +2114,134 @@ export class ChannelConnectorService {
         const report = store.lastReconcileReport;
         return Ok({ lastReconcileAt: store.lastReconcileAt, report, driftAlert: report?.driftAlert ?? false });
     }
+    async listCatalogConflicts(orgId, storeId, state = "open") {
+        const conditions = [eq(channelCatalogConflicts.organizationId, orgId), eq(channelCatalogConflicts.state, state)];
+        if (storeId !== undefined)
+            conditions.push(eq(channelCatalogConflicts.storeId, storeId));
+        return Ok(await this.db.select().from(channelCatalogConflicts).where(and(...conditions)));
+    }
+    async resolveCatalogConflict(orgId, id, choose, actor) {
+        const [conflict] = await this.db.select().from(channelCatalogConflicts).where(and(eq(channelCatalogConflicts.organizationId, orgId), eq(channelCatalogConflicts.id, id), eq(channelCatalogConflicts.state, "open")));
+        if (!conflict)
+            return PluginErr("Catalog conflict not found or already resolved.", "NOT_FOUND");
+        if (choose === "platform" && !this.jobs)
+            return PluginErr("Jobs are not configured.", "JOBS_UNAVAILABLE");
+        const [mapping] = await this.db.select().from(channelEntityMap).where(and(eq(channelEntityMap.organizationId, orgId), eq(channelEntityMap.storeId, conflict.storeId), eq(channelEntityMap.kind, "entity"), eq(channelEntityMap.entityId, conflict.entityId)));
+        if (!mapping)
+            return PluginErr("Catalog conflict mapping not found.", "NOT_FOUND");
+        const systemActor = createSystemActor(orgId);
+        let resolutionBaselineAt;
+        if (choose === "store") {
+            const applied = await this.applyStoreConflictValue(orgId, conflict, systemActor);
+            if (!applied.ok)
+                return PluginErr(applied.error, applied.code);
+            const revisions = await this.catalog.repository.findRevisionMarkers(conflict.entityId);
+            resolutionBaselineAt = revisions.at(-1)?.createdAt;
+        }
+        const heldFieldPaths = (mapping.heldFieldPaths ?? []).filter((path) => path !== conflict.fieldPath);
+        const forcedPushFieldPaths = choose === "platform"
+            ? [...new Set([...(mapping.forcedPushFieldPaths ?? []), conflict.fieldPath])]
+            : mapping.forcedPushFieldPaths ?? [];
+        const [resolved] = await this.db.update(channelCatalogConflicts).set({
+            state: "resolved",
+            resolvedBy: requireUserId(actor),
+            updatedAt: new Date(),
+        }).where(and(eq(channelCatalogConflicts.organizationId, orgId), eq(channelCatalogConflicts.id, id), eq(channelCatalogConflicts.state, "open"))).returning();
+        if (!resolved)
+            return PluginErr("Catalog conflict not found or already resolved.", "NOT_FOUND");
+        await this.db.update(channelEntityMap).set({
+            heldFieldPaths,
+            forcedPushFieldPaths,
+            ...(resolutionBaselineAt ? { lastSyncedAt: resolutionBaselineAt } : {}),
+        }).where(and(eq(channelEntityMap.organizationId, orgId), eq(channelEntityMap.id, mapping.id)));
+        await this.db.insert(channelCatalogConflictEvents).values({
+            organizationId: orgId,
+            conflictId: conflict.id,
+            fromState: "open",
+            toState: "resolved",
+            reason: `Operator chose the ${choose} value.`,
+            changedBy: requireUserId(actor),
+        });
+        if (choose === "platform") {
+            await this.jobs.enqueue("channel/push-catalog", {
+                organizationId: orgId,
+                storeId: conflict.storeId,
+                entityIds: [conflict.entityId],
+            }, {
+                organizationId: orgId,
+                concurrencyKey: catalogPushConcurrencyKey({ storeId: conflict.storeId, entityIds: [conflict.entityId] }),
+                supersedes: true,
+            });
+        }
+        return Ok(resolved);
+    }
+    async applyStoreConflictValue(orgId, conflict, actor) {
+        const [root, segment, field] = conflict.fieldPath.split(".");
+        if (root === "entity" && segment === "slug") {
+            if (typeof conflict.storeValue !== "string")
+                return PluginErr("The stored catalog value is not a valid slug.", "INVALID_CONFLICT_VALUE");
+            const updated = await this.catalog.update(conflict.entityId, { slug: conflict.storeValue }, actor, CHANNEL_CONVERGENCE_CTX);
+            return updated.ok ? Ok(undefined) : PluginErr(updated.error.message);
+        }
+        if (root === "entity" && segment === "status") {
+            if (typeof conflict.storeValue !== "string")
+                return PluginErr("The stored catalog value is not a valid status.", "INVALID_CONFLICT_VALUE");
+            const status = ["draft", "active", "archived", "discontinued"].find((value) => value === conflict.storeValue);
+            if (!status)
+                return PluginErr("The stored catalog value is not a valid status.", "INVALID_CONFLICT_VALUE");
+            const updated = await this.catalog.update(conflict.entityId, { status, isVisible: status === "active" }, actor, CHANNEL_CONVERGENCE_CTX);
+            return updated.ok ? Ok(undefined) : PluginErr(updated.error.message);
+        }
+        if (root === "entity" && segment === "metadata" && field) {
+            const [entity] = await this.db.select().from(sellableEntities).where(and(eq(sellableEntities.organizationId, orgId), eq(sellableEntities.id, conflict.entityId)));
+            if (!entity)
+                return PluginErr("Catalog entity not found.", "NOT_FOUND");
+            const updated = await this.catalog.update(conflict.entityId, {
+                metadata: { ...(entity.metadata ?? {}), [field]: conflict.storeValue },
+            }, actor, CHANNEL_CONVERGENCE_CTX);
+            return updated.ok ? Ok(undefined) : PluginErr(updated.error.message);
+        }
+        if (root === "attributes" && segment && field && attributeFields.some((attributeField) => attributeField === field)) {
+            const [attribute] = await this.db.select().from(sellableAttributes).where(and(eq(sellableAttributes.entityId, conflict.entityId), eq(sellableAttributes.locale, segment)));
+            const title = attribute?.title ?? "";
+            const attrs = { title };
+            if (field === "title") {
+                if (typeof conflict.storeValue !== "string")
+                    return PluginErr("The stored catalog value is not valid text.", "INVALID_CONFLICT_VALUE");
+                attrs.title = conflict.storeValue;
+            }
+            else if (field === "subtitle") {
+                if (typeof conflict.storeValue !== "string")
+                    return PluginErr("The stored catalog value is not valid text.", "INVALID_CONFLICT_VALUE");
+                attrs.subtitle = conflict.storeValue;
+            }
+            else if (field === "description") {
+                if (typeof conflict.storeValue !== "string")
+                    return PluginErr("The stored catalog value is not valid text.", "INVALID_CONFLICT_VALUE");
+                attrs.description = conflict.storeValue;
+            }
+            else if (field === "richDescription") {
+                attrs.richDescription = conflict.storeValue;
+            }
+            else if (field === "seoTitle") {
+                if (typeof conflict.storeValue !== "string")
+                    return PluginErr("The stored catalog value is not valid text.", "INVALID_CONFLICT_VALUE");
+                attrs.seoTitle = conflict.storeValue;
+            }
+            else if (field === "seoDescription") {
+                if (typeof conflict.storeValue !== "string")
+                    return PluginErr("The stored catalog value is not valid text.", "INVALID_CONFLICT_VALUE");
+                attrs.seoDescription = conflict.storeValue;
+            }
+            const updated = await this.catalog.setAttributes(conflict.entityId, segment, attrs, actor, CHANNEL_CONVERGENCE_CTX);
+            return updated.ok ? Ok(undefined) : PluginErr(updated.error.message);
+        }
+        if (root === "customFields" && segment && field === "en") {
+            const updated = await this.catalog.update(conflict.entityId, { customFields: { [segment]: conflict.storeValue } }, actor, CHANNEL_CONVERGENCE_CTX);
+            return updated.ok ? Ok(undefined) : PluginErr(updated.error.message);
+        }
+        return PluginErr(`Conflict field path "${conflict.fieldPath}" cannot be resolved to the store value.`, "UNSUPPORTED_CONFLICT_FIELD");
+    }
     async syncInventory(orgId, storeId, actor) {
         const store = await this.getStoreRecord(orgId, storeId);
         if (!store || store.status !== "connected")
@@ -1784,6 +2441,19 @@ export class ChannelConnectorService {
         const status = typeof product.status === "string" && ["draft", "active", "archived", "discontinued"].includes(product.status)
             ? product.status
             : undefined;
+        const customFields = product.customFields && typeof product.customFields === "object" && !Array.isArray(product.customFields)
+            ? product.customFields
+            : undefined;
+        const images = Array.isArray(product.images)
+            ? product.images.flatMap((raw) => {
+                if (!raw || typeof raw !== "object" || Array.isArray(raw))
+                    return [];
+                const image = raw;
+                const role = typeof image.role === "string" ? pushCatalogImageRole(image.role) : undefined;
+                const url = typeof image.url === "string" ? image.url : typeof image.src === "string" ? image.src : undefined;
+                return role && url ? [{ role, url }] : [];
+            })
+            : [];
         const remoteItem = {
             externalId: mapping.externalId,
             slug: typeof product.slug === "string" ? product.slug : entity.slug,
@@ -1792,6 +2462,8 @@ export class ChannelConnectorService {
             ...(status !== undefined ? { status } : {}),
             attributes: [{ locale: "en", title, ...(description !== undefined ? { description } : {}) }],
             ...(Object.keys(remoteMetadata).length > 0 ? { metadata: remoteMetadata } : {}),
+            ...(customFields !== undefined ? { customFields } : {}),
+            ...(images.length > 0 ? { images } : {}),
             variants: [],
         };
         const fieldPaths = [];
@@ -1808,6 +2480,17 @@ export class ChannelConnectorService {
             fieldPaths.push("attributes.en.title");
         if (product.description !== undefined)
             fieldPaths.push("attributes.en.description");
+        for (const [name, locales] of Object.entries(customFields ?? {})) {
+            if (!locales || typeof locales !== "object" || Array.isArray(locales))
+                continue;
+            for (const locale of Object.keys(locales)) {
+                const path = `customFields.${name}.${locale}`;
+                if (isValidFieldPath(path))
+                    fieldPaths.push(path);
+            }
+        }
+        for (const image of images)
+            fieldPaths.push(`media.${image.role}`);
         const ownershipBeforeSeed = await this.catalog.resolveFieldOwners(entityId, storeId);
         const seedPaths = fieldPaths.filter((path) => !ownershipBeforeSeed.has(path));
         const seeded = await this.catalog.seedImportedFieldOwnership(entityId, storeId, seedPaths);
@@ -1817,9 +2500,17 @@ export class ChannelConnectorService {
             ownershipBeforeSeed.set(path, "store");
         const owners = ownershipBeforeSeed;
         const remoteHash = hash(product);
-        const shared = await this.detectSharedConflicts(entityId, storeId, entity, mapping, remoteItem, owners, fieldPaths, remoteHash);
+        const outboundEcho = this.isOutboundEcho(mapping, remoteItem);
+        const shared = await this.detectSharedConflicts(entityId, storeId, entity, mapping, remoteItem, owners, fieldPaths, remoteHash, outboundEcho ? { certifiedPaths: new Set(mapping.outboundFieldPaths ?? []) } : undefined);
+        const persistedConflicts = await this.persistCatalogConflicts(orgId, shared.conflicts, requireUserId(actor));
+        if (!persistedConflicts.ok)
+            return persistedConflicts;
         const owned = this.filterOwnedFieldsAtPaths(remoteItem, owners, fieldPaths);
         const heldPaths = [...new Set([...(mapping.heldFieldPaths ?? []), ...shared.paths])];
+        // Same revocation as the reconcile path: a newly held path cancels any force
+        // left from an earlier resolution, so a webhook-raised conflict cannot be
+        // pre-empted by an operator's answer to a previous one.
+        const survivingForcedPaths = (mapping.forcedPushFieldPaths ?? []).filter((path) => !heldPaths.includes(path));
         const held = this.filterConflictingFields(owned.writable, heldPaths);
         const blockedPaths = new Set([
             ...owned.skipped,
@@ -1827,7 +2518,7 @@ export class ChannelConnectorService {
             ...(!fieldPaths.includes("attributes.en.title") ? ["attributes.en.title"] : []),
         ]);
         const skipped = owned.skipped.map((fieldPath) => ({ entityId, fieldPath }));
-        const conflicts = shared.conflicts;
+        const conflicts = shared.conflicts.map(({ platformValue: _platformValue, storeValue: _storeValue, ...conflict }) => conflict);
         const warnings = conflicts.map((conflict) => `Held shared field conflict for entity "${conflict.entityId}", store "${conflict.storeId}", field "${conflict.fieldPath}" (local ${conflict.localValueSummary}, remote ${conflict.remoteValueSummary}).`);
         const writable = held.writable;
         const updateInput = {};
@@ -1844,11 +2535,11 @@ export class ChannelConnectorService {
             updateInput.isVisible = writable.status === "active";
         }
         if (Object.keys(updateInput).length > 0) {
-            const updated = await this.catalog.update(entityId, updateInput, actor);
+            const updated = await this.catalog.update(entityId, updateInput, actor, CHANNEL_CONVERGENCE_CTX);
             if (!updated.ok)
                 return PluginErr(updated.error.message);
         }
-        const attributes = await this.setCatalogAttributes(entityId, writable, actor, blockedPaths);
+        const attributes = await this.setCatalogAttributesIfWritable(entityId, writable, actor, blockedPaths, CHANNEL_CONVERGENCE_CTX);
         if (!attributes.ok)
             return attributes;
         const levels = Array.isArray(product.variants) ? product.variants : [];
@@ -1864,6 +2555,7 @@ export class ChannelConnectorService {
             syncHash: remoteHash,
             lastSyncedAt,
             heldFieldPaths: heldPaths,
+            forcedPushFieldPaths: survivingForcedPaths,
         }).where(eq(channelEntityMap.id, mapping.id));
         return Ok({ skipped, conflicts, warnings });
     }
@@ -1901,9 +2593,9 @@ export class ChannelConnectorService {
         const max = this.options.refundAutoMax ?? order.amountCaptured ?? order.grandTotal;
         const ageOk = Date.now() - store.createdAt.getTime() >= (this.options.newStoreDays ?? 7) * 86_400_000;
         const auto = clean && amount > 0 && ageOk && amount <= max;
-        const rows = await this.db.insert(channelRefundRequests).values({ organizationId: orgId, storeId: store.id, orderId, remoteRefundId, amount, state: auto ? "approved" : "requested", approvedBy: auto ? actor.userId : null }).returning();
+        const rows = await this.db.insert(channelRefundRequests).values({ organizationId: orgId, storeId: store.id, orderId, remoteRefundId, amount, state: auto ? "approved" : "requested", approvedBy: auto ? requireUserId(actor) : null }).returning();
         const request = rows[0];
-        await this.db.insert(channelRefundEvents).values({ organizationId: orgId, requestId: request.id, fromState: null, toState: request.state, reason: auto ? "Automatic guarded refund" : "Operator approval required", changedBy: actor.userId });
+        await this.db.insert(channelRefundEvents).values({ organizationId: orgId, requestId: request.id, fromState: null, toState: request.state, reason: auto ? "Automatic guarded refund" : "Operator approval required", changedBy: requireUserId(actor) });
         if (auto) {
             const result = await this.executeRefund(request, refundLines, actor);
             if (!result.ok)
@@ -1917,7 +2609,7 @@ export class ChannelConnectorService {
         if (!result.ok)
             return PluginErr(result.error?.message ?? "Refund execution failed.");
         const [updated] = await this.db.update(channelRefundRequests).set({ state: "executed", updatedAt: new Date() }).where(and(eq(channelRefundRequests.organizationId, request.organizationId), eq(channelRefundRequests.id, request.id), eq(channelRefundRequests.state, "approved"))).returning();
-        await this.db.insert(channelRefundEvents).values({ organizationId: request.organizationId, requestId: request.id, fromState: "approved", toState: "executed", reason: "Platform refund executed", changedBy: actor.userId });
+        await this.db.insert(channelRefundEvents).values({ organizationId: request.organizationId, requestId: request.id, fromState: "approved", toState: "executed", reason: "Platform refund executed", changedBy: requireUserId(actor) });
         return Ok(updated);
     }
     async listRefundRequests(orgId) {
@@ -2016,7 +2708,7 @@ export class ChannelConnectorService {
         if (created.value.state === "confirmed")
             return created;
         if (created.value.state !== "exported") {
-            const exported = await this.transitionExport(orgId, created.value.id, "exported", actor.userId, "Export attempt started.");
+            const exported = await this.transitionExport(orgId, created.value.id, "exported", requireUserId(actor), "Export attempt started.");
             if (!exported.ok)
                 return exported;
         }
@@ -2026,7 +2718,7 @@ export class ChannelConnectorService {
             .where(and(eq(channelOrderExports.organizationId, orgId), eq(channelOrderExports.id, created.value.id)));
         const pushed = await connector.pushOrder(store, slice);
         if (!pushed.ok) {
-            return this.transitionExport(orgId, created.value.id, "failed", actor.userId, pushed.error.message, pushed.error.retriable === true ? "transient" : "definitive");
+            return this.transitionExport(orgId, created.value.id, "failed", requireUserId(actor), pushed.error.message, pushed.error.retriable === true ? "transient" : "definitive");
         }
         await this.db
             .update(channelOrderExports)
@@ -2038,13 +2730,13 @@ export class ChannelConnectorService {
             .where(and(eq(channelOrderExports.organizationId, orgId), eq(channelOrderExports.id, created.value.id)));
         const remoteStatus = await connector.fetchOrderStatus(store, pushed.value.remoteOrderId);
         if (!remoteStatus.ok) {
-            return this.transitionExport(orgId, created.value.id, "failed", actor.userId, remoteStatus.error.message, remoteStatus.error.retriable === true ? "transient" : "definitive");
+            return this.transitionExport(orgId, created.value.id, "failed", requireUserId(actor), remoteStatus.error.message, remoteStatus.error.retriable === true ? "transient" : "definitive");
         }
         if (remoteStatus.value.status === "confirmed") {
-            return this.transitionExport(orgId, created.value.id, "confirmed", actor.userId, "Remote order confirmed.");
+            return this.transitionExport(orgId, created.value.id, "confirmed", requireUserId(actor), "Remote order confirmed.");
         }
         if (remoteStatus.value.status === "failed" || remoteStatus.value.status === "cancelled") {
-            return this.transitionExport(orgId, created.value.id, "failed", actor.userId, `Remote order status: ${remoteStatus.value.status}.`);
+            return this.transitionExport(orgId, created.value.id, "failed", requireUserId(actor), `Remote order status: ${remoteStatus.value.status}.`);
         }
         const refreshed = await this.getExport(orgId, created.value.id);
         return refreshed;
@@ -2133,4 +2825,347 @@ export class ChannelConnectorService {
     abandonExport(orgId, exportId, changedBy, reason) {
         return this.transitionExport(orgId, exportId, "abandoned", changedBy, reason);
     }
+    async resolveCatalogPushEntityIds(orgId, storeId, entityIds) {
+        if (entityIds !== undefined)
+            return [...new Set(entityIds)].sort();
+        const mappings = await this.db.select({ entityId: channelEntityMap.entityId }).from(channelEntityMap).where(and(eq(channelEntityMap.organizationId, orgId), eq(channelEntityMap.storeId, storeId), eq(channelEntityMap.kind, "entity")));
+        return [...new Set(mappings.map((mapping) => mapping.entityId))].sort();
+    }
+    async createCatalogPush(orgId, storeId, entityId) {
+        const store = await this.getStoreRecord(orgId, storeId);
+        if (!store || store.status !== "connected") {
+            return PluginErr("Connected store not found.", "NOT_FOUND");
+        }
+        const rows = await this.db
+            .insert(channelCatalogPushes)
+            .values({ organizationId: orgId, storeId, entityId })
+            .onConflictDoNothing({ target: [channelCatalogPushes.storeId, channelCatalogPushes.entityId] })
+            .returning();
+        if (rows[0])
+            return Ok(rows[0]);
+        const existing = await this.db
+            .select()
+            .from(channelCatalogPushes)
+            .where(and(eq(channelCatalogPushes.organizationId, orgId), eq(channelCatalogPushes.storeId, storeId), eq(channelCatalogPushes.entityId, entityId)));
+        if (!existing[0])
+            return PluginErr("Failed to create channel catalog push.");
+        return Ok(existing[0]);
+    }
+    async transitionCatalogPush(orgId, pushId, toState, changedBy, reason, failureKind, payloadSnapshot) {
+        return this.transact(async (tx) => {
+            const currentRows = await tx
+                .select()
+                .from(channelCatalogPushes)
+                .where(and(eq(channelCatalogPushes.organizationId, orgId), eq(channelCatalogPushes.id, pushId)));
+            const current = currentRows[0];
+            if (!current)
+                return PluginErr("Channel catalog push not found.", "NOT_FOUND");
+            if (!canCatalogPushTransition(current.state, toState)) {
+                const error = new CommerceInvalidTransitionError(`Cannot transition channel catalog push from ${current.state} to ${toState}.`);
+                return PluginErr(error.message, error.code);
+            }
+            const updatedRows = await tx
+                .update(channelCatalogPushes)
+                .set({
+                state: toState,
+                updatedAt: new Date(),
+                ...(payloadSnapshot !== undefined ? { payloadSnapshot } : {}),
+                ...(toState === "exported" ? { attempts: current.attempts + 1, lastError: null, failureKind: null } : {}),
+                ...(toState === "failed" ? { lastError: reason ?? "Catalog push failed." } : {}),
+                ...(toState === "failed" ? { failureKind: failureKind ?? "definitive" } : {}),
+                ...(toState === "confirmed" ? { lastError: null, failureKind: null } : {}),
+            })
+                .where(and(eq(channelCatalogPushes.organizationId, orgId), eq(channelCatalogPushes.id, pushId), eq(channelCatalogPushes.state, current.state)))
+                .returning();
+            const updated = updatedRows[0];
+            if (!updated)
+                return PluginErr("Channel catalog push changed concurrently.", "CONFLICT");
+            await tx.insert(channelCatalogPushEvents).values({
+                organizationId: orgId,
+                pushId,
+                fromState: current.state,
+                toState,
+                reason: reason ?? null,
+                changedBy,
+            });
+            return Ok(updated);
+        });
+    }
+    async recordCatalogPushRevisions(orgId, entityIds, actor) {
+        if (entityIds.length === 0)
+            return Ok(undefined);
+        try {
+            await this.transact(async (tx) => {
+                const txContext = createTxContext(tx, { actor });
+                for (const entityId of [...new Set(entityIds)]) {
+                    const revision = await this.catalog.recordEntityRevision(entityId, actor, "push", txContext);
+                    if (!revision.ok)
+                        throw new Error(revision.error.message);
+                }
+            });
+        }
+        catch (error) {
+            return PluginErr(error instanceof Error ? error.message : "Failed to record catalog push revisions.");
+        }
+        return Ok(undefined);
+    }
+    async executeCatalogPushJob(orgId, storeId, options, actor, runtime) {
+        const store = await this.getStoreRecord(orgId, storeId);
+        if (!store || store.status !== "connected")
+            return PluginErr("Connected store not found.", "NOT_FOUND");
+        if (!store.catalogWriteEnabled)
+            return Ok({ noop: true });
+        const connector = this.connectors.get(store.provider);
+        if (!connector?.pushCatalog)
+            return Ok({ noop: true });
+        if (isCatalogPushBreakerOpen(store.breakerState)) {
+            await runtime.jobs.enqueue("channel/push-catalog", {
+                organizationId: orgId,
+                storeId,
+                ...(options.entityIds ? { entityIds: options.entityIds } : {}),
+                ...(options.forceFieldPaths ? { forceFieldPaths: options.forceFieldPaths } : {}),
+                ...(options.cursor ? { cursor: options.cursor } : {}),
+            }, {
+                organizationId: orgId,
+                concurrencyKey: catalogPushConcurrencyKey({ storeId, entityIds: options.entityIds }),
+                supersedes: false,
+                delayMs: CATALOG_PUSH_BREAKER_RETRY_MS,
+            });
+            return Ok({ rescheduled: true });
+        }
+        const allEntityIds = await this.resolveCatalogPushEntityIds(orgId, storeId, options.entityIds);
+        const batchSize = catalogPushBatchSize(store.provider);
+        const pageEntityIds = options.cursor
+            ? allEntityIds.filter((entityId) => entityId > options.cursor).slice(0, batchSize)
+            : allEntityIds.slice(0, batchSize);
+        if (pageEntityIds.length === 0)
+            return Ok({ complete: true, pushed: 0, failed: 0 });
+        // Abandoned is terminal: a row that exhausted its attempts stays out of
+        // every later sweep until an operator re-arms it.
+        const abandonedRows = await this.db.select({ entityId: channelCatalogPushes.entityId }).from(channelCatalogPushes).where(and(eq(channelCatalogPushes.organizationId, orgId), eq(channelCatalogPushes.storeId, storeId), eq(channelCatalogPushes.state, "abandoned"), inArray(channelCatalogPushes.entityId, pageEntityIds)));
+        const abandonedEntityIds = new Set(abandonedRows.map((row) => row.entityId));
+        const batchEntityIds = pageEntityIds.filter((entityId) => !abandonedEntityIds.has(entityId));
+        if (batchEntityIds.length === 0) {
+            const batchCursor = pageEntityIds[pageEntityIds.length - 1];
+            const hasMore = allEntityIds.some((entityId) => entityId > batchCursor);
+            if (!hasMore)
+                return Ok({ complete: true, pushed: 0, failed: 0 });
+            await runtime.jobs.enqueue("channel/push-catalog", {
+                organizationId: orgId,
+                storeId,
+                ...(options.entityIds ? { entityIds: options.entityIds } : {}),
+                ...(options.forceFieldPaths ? { forceFieldPaths: options.forceFieldPaths } : {}),
+                cursor: batchCursor,
+            }, {
+                organizationId: orgId,
+                concurrencyKey: catalogPushConcurrencyKey({ storeId, entityIds: options.entityIds }),
+                supersedes: false,
+            });
+            return Ok({ complete: false, cursor: batchCursor, pushed: 0, failed: 0 });
+        }
+        const assembled = await this.buildCatalogPushItems(orgId, storeId, batchEntityIds, {
+            ...(options.forceFieldPaths ? { forceFieldPaths: options.forceFieldPaths } : {}),
+        });
+        if (!assembled.ok)
+            return assembled;
+        const mappings = await this.db.select({
+            entityId: channelEntityMap.entityId,
+            externalId: channelEntityMap.externalId,
+        }).from(channelEntityMap).where(and(eq(channelEntityMap.organizationId, orgId), eq(channelEntityMap.storeId, storeId), eq(channelEntityMap.kind, "entity"), inArray(channelEntityMap.entityId, batchEntityIds)));
+        const externalByEntity = new Map(mappings.map((mapping) => [mapping.entityId, mapping.externalId]));
+        const entityByExternal = new Map(mappings.map((mapping) => [mapping.externalId, mapping.entityId]));
+        const itemByExternal = new Map(assembled.value.items.map((item) => [item.externalId, item]));
+        let pushed = 0;
+        let failed = 0;
+        if (assembled.value.items.length === 0) {
+            for (const entityId of batchEntityIds) {
+                const created = await this.createCatalogPush(orgId, storeId, entityId);
+                if (!created.ok)
+                    return created;
+                if (created.value.state === "confirmed" || created.value.state === "abandoned") {
+                    if (created.value.state === "confirmed")
+                        pushed += 1;
+                    continue;
+                }
+                const confirmed = await this.transitionCatalogPush(orgId, created.value.id, "confirmed", requireUserId(actor), "No platform-owned fields to push.", undefined, null);
+                if (!confirmed.ok)
+                    return confirmed;
+                pushed += 1;
+            }
+        }
+        else {
+            const pushIds = new Map();
+            const pushAttempts = new Map();
+            for (const entityId of batchEntityIds) {
+                const externalId = externalByEntity.get(entityId);
+                const item = externalId ? itemByExternal.get(externalId) : undefined;
+                if (!item)
+                    continue;
+                const created = await this.createCatalogPush(orgId, storeId, entityId);
+                if (!created.ok)
+                    return created;
+                pushIds.set(item.externalId, created.value.id);
+                pushAttempts.set(item.externalId, created.value.attempts);
+                if (created.value.state === "pending" || created.value.state === "confirmed" || created.value.state === "failed") {
+                    const exported = await this.transitionCatalogPush(orgId, created.value.id, "exported", requireUserId(actor), "Catalog push attempt started.", undefined, item);
+                    if (!exported.ok)
+                        return exported;
+                    pushAttempts.set(item.externalId, exported.value.attempts);
+                }
+            }
+            const items = assembled.value.items;
+            const writeAhead = await this.recordOutboundPush(orgId, storeId, items.map((item) => ({ externalId: item.externalId, ok: true })), items, "write-ahead");
+            if (!writeAhead.ok)
+                return writeAhead;
+            let result;
+            try {
+                result = await connector.pushCatalog(store, items);
+            }
+            catch (error) {
+                const connectorError = {
+                    code: "CATALOG_PUSH_THROWN",
+                    message: error instanceof Error ? error.message : "Catalog push failed.",
+                };
+                const cleared = await this.recordOutboundPush(orgId, storeId, items.map((item) => ({ externalId: item.externalId, ok: false, error: connectorError })), items);
+                if (!cleared.ok)
+                    return cleared;
+                for (const item of items) {
+                    const pushId = pushIds.get(item.externalId);
+                    if (!pushId)
+                        continue;
+                    const attempts = pushAttempts.get(item.externalId) ?? 0;
+                    if (attempts >= CATALOG_PUSH_MAX_ATTEMPTS) {
+                        await this.transitionCatalogPush(orgId, pushId, "abandoned", requireUserId(actor), connectorError.message);
+                    }
+                    else {
+                        await this.transitionCatalogPush(orgId, pushId, "failed", requireUserId(actor), connectorError.message, "transient");
+                    }
+                    failed += 1;
+                }
+                const maxAttempts = Math.max(0, ...items.map((item) => pushAttempts.get(item.externalId) ?? 0));
+                if (maxAttempts < CATALOG_PUSH_MAX_ATTEMPTS) {
+                    await runtime.jobs.enqueue("channel/push-catalog", {
+                        organizationId: orgId,
+                        storeId,
+                        ...(options.entityIds ? { entityIds: options.entityIds } : {}),
+                        ...(options.forceFieldPaths ? { forceFieldPaths: options.forceFieldPaths } : {}),
+                        ...(options.cursor ? { cursor: options.cursor } : {}),
+                    }, {
+                        organizationId: orgId,
+                        concurrencyKey: catalogPushConcurrencyKey({ storeId, entityIds: options.entityIds }),
+                        supersedes: false,
+                        delayMs: catalogPushRetryDelayMs(maxAttempts),
+                    });
+                }
+                return Ok({ rescheduled: true, pushed, failed });
+            }
+            if (!result.ok) {
+                const cleared = await this.recordOutboundPush(orgId, storeId, items.map((item) => ({ externalId: item.externalId, ok: false, error: result.error })), items);
+                if (!cleared.ok)
+                    return cleared;
+                for (const item of items) {
+                    const pushId = pushIds.get(item.externalId);
+                    if (!pushId)
+                        continue;
+                    const attempts = pushAttempts.get(item.externalId) ?? 0;
+                    const failureKind = result.error.retriable === true ? "transient" : "definitive";
+                    if (failureKind === "transient" && attempts >= CATALOG_PUSH_MAX_ATTEMPTS) {
+                        await this.transitionCatalogPush(orgId, pushId, "abandoned", requireUserId(actor), result.error.message);
+                    }
+                    else {
+                        await this.transitionCatalogPush(orgId, pushId, "failed", requireUserId(actor), result.error.message, failureKind);
+                    }
+                    failed += 1;
+                }
+                if (result.error.retriable === true) {
+                    const maxAttempts = Math.max(0, ...items.map((item) => pushAttempts.get(item.externalId) ?? 0));
+                    if (maxAttempts < CATALOG_PUSH_MAX_ATTEMPTS) {
+                        await runtime.jobs.enqueue("channel/push-catalog", {
+                            organizationId: orgId,
+                            storeId,
+                            ...(options.entityIds ? { entityIds: options.entityIds } : {}),
+                            ...(options.forceFieldPaths ? { forceFieldPaths: options.forceFieldPaths } : {}),
+                            ...(options.cursor ? { cursor: options.cursor } : {}),
+                        }, {
+                            organizationId: orgId,
+                            concurrencyKey: catalogPushConcurrencyKey({ storeId, entityIds: options.entityIds }),
+                            supersedes: false,
+                            delayMs: catalogPushRetryDelayMs(maxAttempts),
+                        });
+                    }
+                    return Ok({ rescheduled: true, pushed, failed });
+                }
+                const batchCursor = pageEntityIds[pageEntityIds.length - 1];
+                const hasMore = allEntityIds.some((entityId) => entityId > batchCursor);
+                return Ok({ complete: !hasMore, pushed, failed });
+            }
+            const recorded = await this.recordOutboundPush(orgId, storeId, result.value.outcomes, items);
+            if (!recorded.ok)
+                return recorded;
+            const successfulEntityIds = [];
+            for (const outcome of result.value.outcomes) {
+                const pushId = pushIds.get(outcome.externalId);
+                const entityId = entityByExternal.get(outcome.externalId);
+                if (!pushId || !entityId)
+                    continue;
+                const item = itemByExternal.get(outcome.externalId);
+                if (outcome.ok) {
+                    const confirmed = await this.transitionCatalogPush(orgId, pushId, "confirmed", requireUserId(actor), "Remote catalog confirmed item.", undefined, item ?? null);
+                    if (!confirmed.ok)
+                        return confirmed;
+                    successfulEntityIds.push(entityId);
+                    pushed += 1;
+                    continue;
+                }
+                const failureKind = outcome.error?.retriable === true ? "transient" : "definitive";
+                const attempts = pushAttempts.get(outcome.externalId) ?? 0;
+                if (failureKind === "transient" && attempts >= CATALOG_PUSH_MAX_ATTEMPTS) {
+                    const abandoned = await this.transitionCatalogPush(orgId, pushId, "abandoned", requireUserId(actor), outcome.error?.message ?? "Catalog push failed.", undefined, item ?? null);
+                    if (!abandoned.ok)
+                        return abandoned;
+                }
+                else {
+                    const failedPush = await this.transitionCatalogPush(orgId, pushId, "failed", requireUserId(actor), outcome.error?.message ?? "Catalog push failed.", failureKind, item ?? null);
+                    if (!failedPush.ok)
+                        return failedPush;
+                    if (failureKind === "transient") {
+                        await runtime.jobs.enqueue("channel/push-catalog", {
+                            organizationId: orgId,
+                            storeId,
+                            entityIds: [entityId],
+                            ...(options.forceFieldPaths?.[entityId]
+                                ? { forceFieldPaths: { [entityId]: options.forceFieldPaths[entityId] } }
+                                : {}),
+                        }, {
+                            organizationId: orgId,
+                            concurrencyKey: catalogPushConcurrencyKey({ storeId, entityIds: [entityId] }),
+                            supersedes: true,
+                            delayMs: catalogPushRetryDelayMs(attempts),
+                        });
+                    }
+                }
+                failed += 1;
+            }
+            const revisions = await this.recordCatalogPushRevisions(orgId, successfulEntityIds, actor);
+            if (!revisions.ok)
+                return revisions;
+        }
+        const batchCursor = pageEntityIds[pageEntityIds.length - 1];
+        const hasMore = allEntityIds.some((entityId) => entityId > batchCursor);
+        if (hasMore) {
+            await runtime.jobs.enqueue("channel/push-catalog", {
+                organizationId: orgId,
+                storeId,
+                ...(options.entityIds ? { entityIds: options.entityIds } : {}),
+                ...(options.forceFieldPaths ? { forceFieldPaths: options.forceFieldPaths } : {}),
+                cursor: batchCursor,
+            }, {
+                organizationId: orgId,
+                concurrencyKey: catalogPushConcurrencyKey({ storeId, entityIds: options.entityIds }),
+                supersedes: false,
+            });
+            return Ok({ complete: false, cursor: batchCursor, pushed, failed });
+        }
+        return Ok({ complete: true, pushed, failed });
+    }
 }