@designcrowd/library.brand-page 5.19.1-error-html2canvas-2 → 5.19.1-id-based-items-1

package/lib/src/lib.js

@@ -32,7 +32,7 @@ export { getOptimalLogoSize, calculateOptimizedLogoDimensions, applyLogoImageBas
 export { sanitizeRTEHtml } from './brand-page-maker/utils';
 export { getPageSlugFromPageTitle } from './brand-page-maker/utils/slug.util';
 // stores
-export { useBrandPageMakerStore, useBrandPageMakerUserStore, useUiStore, useBrandPageContainerStore, useEventManagerStore, useLocalisedRouteStore, useVideoStore, useRouteStore, } from './brand-page-maker/stores';
+export { useBrandPageMakerStore, useBrandPageMakerUserStore, useUiStore, useBrandPageContainerStore, useEventManagerStore, useLocalisedRouteStore, useVideoStore, } from './brand-page-maker/stores';
 export { useShopConfigStore } from './shared/ecommerce-settings/store/shop-settings-store';
 // for jest, need to set active pinia in library.brand-page as well
 import { createPinia, setActivePinia } from 'pinia';

package/lib/src/metadata-builder/builders/footer-builder.js

@@ -2,6 +2,7 @@ import {} from '../../brand-page/models';
 import { BaseMetadataBuilder, } from '../models';
 import { FOOTER_CHECKS } from './section-rules/footer.rules';
 import { applyDetachedStyleOverride } from './section-field-utils';
+import { ensureItemIds, generateItemId, removeItemsByIds, repositionItemByAnchor, } from './item-id-utils';
 const normaliseSocialUrl = (url) => {
     for (const prefix of ['mailto:', 'tel:']) {
         if (url.startsWith(prefix))
@@ -9,88 +10,65 @@ const normaliseSocialUrl = (url) => {
     }
     return url;
 };
-const makeSocialLink = (icon, url) => ({
-    imageUrl: icon || '',
-    url: normaliseSocialUrl(url || ''),
-    imageTitle: '',
-    width: 0,
-    height: 0,
-    imageLink: '',
-});
-const hasSocialLinkMutation = (args) => args._replace_social_links === true ||
-    (args._remove_social_link_indices?.length ?? 0) > 0 ||
-    (args._reorder_social_links?.length ?? 0) > 0 ||
-    (args.social_links?.length ?? 0) > 0;
-/**
- * Social links are a GLOBAL footer concern — one logical list that both
- * viewports render identically. Derive the new list ONCE from the current one
- * WITHOUT mutating the input, so the caller can assign an independent copy to
- * each viewport.
- *
- * Why this can't mutate per-viewport in place: footers migrated from the legacy
- * single `footerStyles` model (migration-01) share ONE `socialLinks` array
- * reference across pageFooterDesktop and pageFooterMobile, and `cloneDeep`
- * preserves that shared reference. Running an in-place `splice` once per
- * viewport therefore applies it TWICE to the same array — e.g. one requested
- * removal index drops two links. Compute-once + assign-fresh is correct for
- * both shared (legacy) and independent (new-model) footers.
- */
-const computeSocialLinks = (current, args) => {
-    // _replace_social_links: replace entire list (empty/absent social_links = clear all).
-    // A replacement supersedes every other social link mutation.
-    if (args._replace_social_links) {
-        return (args.social_links ?? []).map((l) => makeSocialLink(l.social_link_icon, l.url));
-    }
-    const links = [...(current ?? [])];
-    // item_index-based updates for existing links — replace the item reference
-    // (never mutate the original object, which may be shared across viewports).
-    for (const link of args.social_links ?? []) {
-        if (link.item_index === undefined)
-            continue;
-        const existing = links[link.item_index];
-        if (!existing)
-            continue;
-        links[link.item_index] = {
-            ...existing,
-            ...(link.social_link_icon !== undefined
-                ? { imageUrl: link.social_link_icon }
-                : {}),
-            ...(link.url !== undefined ? { url: normaliseSocialUrl(link.url) } : {}),
-        };
-    }
-    // Remove by index (descending order to preserve indices during splice).
-    if (args._remove_social_link_indices?.length) {
-        const sorted = [...args._remove_social_link_indices].sort((a, b) => b - a);
-        for (const idx of sorted) {
-            if (idx >= 0 && idx < links.length)
-                links.splice(idx, 1);
-        }
-    }
-    // Insert new links (descending insert_at order to preserve positions).
-    const insertLinks = (args.social_links ?? []).filter((l) => l.insert_at !== undefined && l.item_index === undefined);
-    const sortedInserts = [...insertLinks].sort((a, b) => b.insert_at - a.insert_at);
-    for (const link of sortedInserts) {
-        const pos = Math.max(0, Math.min(link.insert_at, links.length));
-        links.splice(pos, 0, makeSocialLink(link.social_link_icon, link.url));
-    }
-    // Reorder (requires ALL indices — partial reorder is not supported).
-    if (args._reorder_social_links?.length) {
-        const newOrder = args._reorder_social_links;
-        const unique = new Set(newOrder);
-        if (unique.size === newOrder.length &&
-            newOrder.every((idx) => idx >= 0 && idx < links.length)) {
-            const reordered = newOrder.map((idx) => links[idx]);
-            if (reordered.length === links.length)
-                return reordered;
-        }
-    }
-    return links;
-};
 const applyGlobalFooterChanges = (footer, args, textStyleOptions) => {
     if (args.copyright_text !== undefined)
         footer.copyrightText = args.copyright_text;
     if (args.copyright_text_font_family !== undefined)
         footer.copyrightStyle = applyDetachedStyleOverride(footer.copyrightStyle, { fontFamily: args.copyright_text_font_family }, textStyleOptions);
+    const links = args.social_links;
+    // _replace_social_links: replace entire list (empty/absent social_links = clear all).
+    // When replacing, all other social link mutations (remove, insert, reorder) are skipped —
+    // they are superseded by the replacement and running them would cause duplicates.
+    if (args._replace_social_links) {
+        footer.socialLinks = (links ?? []).map((l) => ({
+            id: generateItemId(),
+            imageUrl: l.social_link_icon || '',
+            url: normaliseSocialUrl(l.url || ''),
+            imageTitle: '',
+            width: 0,
+            height: 0,
+            imageLink: '',
+        }));
+    }
+    else {
+        // Targeted mutations — only run when NOT replacing the entire list.
+        // BP-5603: id-based contract (item_id / move_before_item_id / _remove_social_link_ids).
+        // Backfill ids on legacy links so they become referenceable after this call.
+        ensureItemIds(footer.socialLinks);
+        // Remove by id (order-independent — no index shifting needed).
+        footer.socialLinks = removeItemsByIds(footer.socialLinks, args._remove_social_link_ids);
+        // Update existing links (item_id present) or insert new links (no item_id).
+        if (links?.length) {
+            footer.socialLinks = footer.socialLinks ?? [];
+            for (const link of links) {
+                if (link.item_id) {
+                    // Update existing link in place; reposition if move_before_item_id set.
+                    const existing = footer.socialLinks.find((l) => l.id === link.item_id);
+                    // Unknown id — skip rather than guess at a position.
+                    if (!existing)
+                        continue;
+                    if (link.social_link_icon !== undefined)
+                        existing.imageUrl = link.social_link_icon;
+                    if (link.url !== undefined)
+                        existing.url = normaliseSocialUrl(link.url);
+                    repositionItemByAnchor(footer.socialLinks, existing, link.move_before_item_id);
+                }
+                else {
+                    // New link — assign a stable id and position via move_before_item_id.
+                    const newLink = {
+                        id: generateItemId(),
+                        imageUrl: link.social_link_icon || '',
+                        url: normaliseSocialUrl(link.url || ''),
+                        imageTitle: '',
+                        width: 0,
+                        height: 0,
+                        imageLink: '',
+                    };
+                    repositionItemByAnchor(footer.socialLinks, newLink, link.move_before_item_id);
+                }
+            }
+        }
+    }
 };
 const applyViewportFooterChanges = (footer, overrides) => {
     if (overrides.display_style !== undefined)
@@ -148,24 +126,11 @@ export class FooterBuilder extends BaseMetadataBuilder {
         }
         const args = this.request.payload ?? {};
         const textStyleOptions = model.styles?.textStyles?.textStyleOptions;
-        // Global scalar/style fields (copyright text + font) apply to both
-        // viewports. These are idempotent assignments, safe to run per-viewport.
+        // Global fields (copyright_text, social links) always apply to both viewports.
         if (model.pageFooterDesktop)
             applyGlobalFooterChanges(model.pageFooterDesktop, args, textStyleOptions);
         if (model.pageFooterMobile)
             applyGlobalFooterChanges(model.pageFooterMobile, args, textStyleOptions);
-        // Social links are a single global list. Derive the new list ONCE, then
-        // assign an INDEPENDENT copy to each viewport — never mutate a (possibly
-        // shared) viewport array in place. See computeSocialLinks.
-        if (hasSocialLinkMutation(args)) {
-            const current = model.pageFooterDesktop?.socialLinks ??
-                model.pageFooterMobile?.socialLinks;
-            const updated = computeSocialLinks(current, args);
-            if (model.pageFooterDesktop)
-                model.pageFooterDesktop.socialLinks = updated.map((l) => ({ ...l }));
-            if (model.pageFooterMobile)
-                model.pageFooterMobile.socialLinks = updated.map((l) => ({ ...l }));
-        }
         // Viewport-specific styling via explicit sub-objects.
         if (args.desktop && model.pageFooterDesktop)
             applyViewportFooterChanges(model.pageFooterDesktop, args.desktop);

package/lib/src/metadata-builder/builders/item-id-utils.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Sentinel anchor meaning "the end of the list", mirroring the section-level
+ * `move_before_content_id: "__end__"` convention used in base-section-builder.
+ */
+export declare const END_ITEM_ANCHOR = "__end__";
+/** Generate a stable item id. Mirrors section-level `uuid.v4()` id generation. */
+export declare const generateItemId: () => string;
+/**
+ * Backfill ids onto any items missing one. Per BP-5603 this runs in the
+ * metadata builder when a section is processed, so the persisted metadata
+ * returned to the client gains stable ids that subsequent AI tool calls can
+ * reference. Mutates in place.
+ */
+export declare const ensureItemIds: <T extends {
+    id?: string | undefined;
+}>(items: T[] | undefined) => void;
+/**
+ * Remove items whose id appears in `ids`. Order-independent (no descending
+ * index sort needed) — the whole point of the id-based migration. Items
+ * without an id are never removed by id.
+ */
+export declare const removeItemsByIds: <T extends {
+    id?: string | undefined;
+}>(items: T[] | undefined, ids: string[] | undefined) => T[];
+/**
+ * Position `item` within `items` relative to an anchor id — the item-level
+ * mirror of base-section-builder's `moveContent`:
+ *
+ * - `moveBeforeItemId === undefined`  → leave an existing item where it is;
+ *   append a new (not-yet-present) item to the end.
+ * - `moveBeforeItemId === "__end__"`  → move/insert at the very end.
+ * - anchor id found                   → insert immediately before it.
+ * - anchor id not found               → fall through to the end (same
+ *   forgiving behaviour as `moveContent`).
+ *
+ * Mutates `items` in place. `item` may be an existing element of `items`
+ * (a move) or a brand-new object (an insert).
+ */
+export declare const repositionItemByAnchor: <T extends {
+    id?: string | undefined;
+}>(items: T[], item: T, moveBeforeItemId: string | undefined) => void;

package/lib/src/metadata-builder/builders/item-id-utils.js

@@ -0,0 +1,68 @@
+import { v4 as uuidv4 } from 'uuid';
+/**
+ * Sentinel anchor meaning "the end of the list", mirroring the section-level
+ * `move_before_content_id: "__end__"` convention used in base-section-builder.
+ */
+export const END_ITEM_ANCHOR = '__end__';
+/** Generate a stable item id. Mirrors section-level `uuid.v4()` id generation. */
+export const generateItemId = () => uuidv4();
+/**
+ * Backfill ids onto any items missing one. Per BP-5603 this runs in the
+ * metadata builder when a section is processed, so the persisted metadata
+ * returned to the client gains stable ids that subsequent AI tool calls can
+ * reference. Mutates in place.
+ */
+export const ensureItemIds = (items) => {
+    if (!items)
+        return;
+    for (const item of items) {
+        if (!item.id)
+            item.id = generateItemId();
+    }
+};
+/**
+ * Remove items whose id appears in `ids`. Order-independent (no descending
+ * index sort needed) — the whole point of the id-based migration. Items
+ * without an id are never removed by id.
+ */
+export const removeItemsByIds = (items, ids) => {
+    if (!items?.length)
+        return items ?? [];
+    if (!ids?.length)
+        return items;
+    const toRemove = new Set(ids);
+    return items.filter((item) => !item.id || !toRemove.has(item.id));
+};
+/**
+ * Position `item` within `items` relative to an anchor id — the item-level
+ * mirror of base-section-builder's `moveContent`:
+ *
+ * - `moveBeforeItemId === undefined`  → leave an existing item where it is;
+ *   append a new (not-yet-present) item to the end.
+ * - `moveBeforeItemId === "__end__"`  → move/insert at the very end.
+ * - anchor id found                   → insert immediately before it.
+ * - anchor id not found               → fall through to the end (same
+ *   forgiving behaviour as `moveContent`).
+ *
+ * Mutates `items` in place. `item` may be an existing element of `items`
+ * (a move) or a brand-new object (an insert).
+ */
+export const repositionItemByAnchor = (items, item, moveBeforeItemId) => {
+    const currentIndex = items.indexOf(item);
+    if (moveBeforeItemId === undefined) {
+        if (currentIndex === -1)
+            items.push(item);
+        return;
+    }
+    if (currentIndex !== -1)
+        items.splice(currentIndex, 1);
+    const anchorIndex = moveBeforeItemId === END_ITEM_ANCHOR
+        ? -1
+        : items.findIndex((i) => i.id === moveBeforeItemId);
+    if (anchorIndex !== -1) {
+        items.splice(anchorIndex, 0, item);
+    }
+    else {
+        items.push(item);
+    }
+};

package/lib/src/metadata-builder/builders/section-builders/image-gallery-builder.js

@@ -1,14 +1,21 @@
 import { applyScalarFields, isValidUrl } from '../section-field-utils';
 import { BaseSectionBuilder } from './base-section-builder';
 import { validateImageGallery } from '../section-rules/image-gallery.rules';
+import { ensureItemIds, generateItemId, removeItemsByIds, repositionItemByAnchor, } from '../item-id-utils';
 const applyGalleryType = (content, galleryType) => {
     content.galleryStyles = {
         ...(content.galleryStyles || {}),
         galleryType: galleryType,
     };
 };
+/**
+ * Full rebuild: discard existing images and map the payload directly.
+ * Used on create and when `_replace_items` is set. Each item gets a fresh id
+ * (or keeps the caller-supplied `item_id` when provided).
+ */
 const applyGalleryImages = (content, images) => {
     content.images = images.map((img) => ({
+        id: img.item_id || generateItemId(),
         imageUrl: isValidUrl(img.image_url) ? img.image_url : '',
         imageTitle: img.caption || '',
         width: 0,
@@ -17,59 +24,46 @@ const applyGalleryImages = (content, images) => {
         imageLink: '',
     }));
 };
-const mergeGalleryImages = (content, images, replaceAll) => {
-    const itemsToMerge = images.filter((img) => img.insert_at === undefined);
-    const updatedImages = itemsToMerge.map((img, index) => {
-        const existing = content.images?.[index];
-        const imageUrl = isValidUrl(img.image_url)
-            ? img.image_url
-            : (existing?.imageUrl ?? '');
-        return {
-            ...(existing || {}),
-            imageUrl,
-            imageTitle: img.caption ?? existing?.imageTitle ?? '',
-            width: existing?.width ?? 0,
-            height: existing?.height ?? 0,
-            mediaType: existing?.mediaType ?? 'image',
-            imageLink: existing?.imageLink ?? '',
-        };
-    });
-    if (!replaceAll &&
-        content.images &&
-        content.images.length > itemsToMerge.length) {
-        const extras = content.images.slice(itemsToMerge.length).map((img) => ({
-            imageUrl: img.imageUrl ?? '',
-            imageTitle: img.imageTitle ?? '',
-            width: img.width ?? 0,
-            height: img.height ?? 0,
-            mediaType: img.mediaType ?? 'image',
-            imageLink: img.imageLink ?? '',
-        }));
-        updatedImages.push(...extras);
-    }
-    content.images = updatedImages;
-};
-const insertGalleryImages = (content, images) => {
-    const inserts = images.filter((img) => img.insert_at !== undefined);
-    if (!inserts.length)
-        return;
-    const sorted = [...inserts].sort((a, b) => (b.insert_at ?? 0) - (a.insert_at ?? 0));
-    for (const img of sorted) {
-        if (!isValidUrl(img.image_url))
-            continue;
-        if (content.images?.some((existing) => existing.imageUrl === img.image_url))
-            continue;
-        content.images = content.images ?? [];
-        const pos = Math.max(0, Math.min(img.insert_at ?? 0, content.images.length));
-        content.images.splice(pos, 0, {
-            imageUrl: img.image_url,
-            imageTitle: img.caption ?? '',
-            width: 0,
-            height: 0,
-            mediaType: 'image',
-            imageLink: '',
-            colorReplacements: [],
-        });
+/**
+ * Id-based merge (BP-5603), mirroring testimonial-section-builder one level
+ * deeper into `content.images`:
+ *   - `item_id` matches existing item  → update in place; reposition if
+ *     `move_before_item_id` is set.
+ *   - no `item_id`                     → add new item, positioned by
+ *     `move_before_item_id`.
+ *   - `removeIds`                      → delete by id (order-independent).
+ *
+ * Existing items are id-backfilled first so legacy galleries become
+ * referenceable as soon as the metadata builder touches them.
+ */
+const mergeGalleryImages = (content, images, removeIds) => {
+    ensureItemIds(content.images);
+    content.images = removeItemsByIds(content.images, removeIds);
+    for (const img of images) {
+        if (img.item_id) {
+            const existing = content.images.find((i) => i.id === img.item_id);
+            // Unknown id — skip rather than guess at a position.
+            if (!existing)
+                continue;
+            if (img.image_url !== undefined) {
+                existing.imageUrl = isValidUrl(img.image_url) ? img.image_url : '';
+            }
+            if (img.caption !== undefined)
+                existing.imageTitle = img.caption;
+            repositionItemByAnchor(content.images, existing, img.move_before_item_id);
+        }
+        else {
+            const newItem = {
+                id: generateItemId(),
+                imageUrl: isValidUrl(img.image_url) ? img.image_url : '',
+                imageTitle: img.caption ?? '',
+                width: 0,
+                height: 0,
+                mediaType: 'image',
+                imageLink: '',
+            };
+            repositionItemByAnchor(content.images, newItem, img.move_before_item_id);
+        }
     }
 };
 export class ImageGalleryBuilder extends BaseSectionBuilder {
@@ -91,24 +85,19 @@ export class ImageGalleryBuilder extends BaseSectionBuilder {
         if (args.gallery_type) {
             applyGalleryType(content, args.gallery_type);
         }
-        if (args.images && Array.isArray(args.images)) {
-            if (this.mode === 'create') {
-                applyGalleryImages(content, args.images);
-            }
-            else {
-                mergeGalleryImages(content, args.images, !!args._replace_items);
-            }
+        if (args._replace_items && args.images && Array.isArray(args.images)) {
+            // Full replacement: discard existing images and rebuild from the payload.
+            applyGalleryImages(content, args.images);
         }
-        if (args._remove_item_indices?.length && content.images) {
-            const sorted = [...args._remove_item_indices].sort((a, b) => b - a);
-            for (const idx of sorted) {
-                if (idx >= 0 && idx < content.images.length) {
-                    content.images.splice(idx, 1);
-                }
+        else if (this.mode === 'create') {
+            if (args.images && Array.isArray(args.images)) {
+                applyGalleryImages(content, args.images);
             }
         }
-        if (args.images && Array.isArray(args.images) && this.mode === 'update') {
-            insertGalleryImages(content, args.images);
+        else if ((args.images && Array.isArray(args.images)) ||
+            args._remove_item_ids?.length) {
+            // Update: id-based add / edit / move / remove in a single pass.
+            mergeGalleryImages(content, args.images ?? [], args._remove_item_ids);
         }
         return { request: this.request, model };
     }

package/lib/src/metadata-builder/builders/section-builders/images-section-builder.js

@@ -3,8 +3,15 @@ import { isTiptapDocument, } from '../../parsers/section-tool-arguments';
 import { applyScalarFields, applyStyleFields, isValidUrl, resolveGlobalPresetIntoStyle, } from '../section-field-utils';
 import { BaseSectionBuilder } from './base-section-builder';
 import { validateImagesSection } from '../section-rules/images-section.rules';
+import { ensureItemIds, generateItemId, removeItemsByIds, repositionItemByAnchor, } from '../item-id-utils';
+/**
+ * Full replacement: discard existing items and rebuild from the payload.
+ * Assigns a stable `id` to each item; `itemsId` is set positionally here
+ * but will be re-indexed at the end of buildAsync.
+ */
 const applyImageItems = (content, items) => {
     content.items = items.map((item, index) => ({
+        id: item.item_id || generateItemId(),
         imageUrl: isValidUrl(item.image_url) ? item.image_url : '',
         imageTitle: '',
         width: 0,
@@ -18,16 +25,28 @@ const applyImageItems = (content, items) => {
         colorReplacements: [],
     }));
 };
-const mergeImageItems = (content, items, replaceAll) => {
-    const hasIndexedItems = items.some((item) => item.item_index !== undefined);
-    if (hasIndexedItems) {
-        for (const item of items) {
-            const targetIndex = item.item_index;
-            if (targetIndex === undefined ||
-                targetIndex < 0 ||
-                !content.items?.[targetIndex])
+/**
+ * Apply a batch of item operations by id (BP-5603), mirroring the
+ * section-level id-based contract one level deeper:
+ *   - item with `item_id` matching an existing item  → update in place (and
+ *     reposition if `move_before_item_id` is set);
+ *   - item without `item_id`                          → add a new item,
+ *     positioned by `move_before_item_id`;
+ *   - `_remove_item_ids`                              → delete by id.
+ *
+ * Existing items are id-backfilled first so legacy sections become
+ * referenceable the moment the metadata builder touches them.
+ * Order-independent: there are no positional indices to shift between ops.
+ */
+const mergeImageItems = (content, items, removeIds) => {
+    ensureItemIds(content.items);
+    content.items = removeItemsByIds(content.items, removeIds);
+    for (const item of items) {
+        if (item.item_id) {
+            const existing = content.items.find((i) => i.id === item.item_id);
+            // Unknown id — skip rather than guess at a position.
+            if (!existing)
                 continue;
-            const existing = content.items[targetIndex];
             if (isValidUrl(item.image_url))
                 existing.imageUrl = item.image_url;
             if (item.heading !== undefined)
@@ -36,36 +55,26 @@ const mergeImageItems = (content, items, replaceAll) => {
                 existing.paragraph = item.text;
             if (item.button_text !== undefined)
                 existing.buttonText = item.button_text || false;
+            repositionItemByAnchor(content.items, existing, item.move_before_item_id);
+        }
+        else {
+            const newItem = {
+                id: generateItemId(),
+                imageUrl: isValidUrl(item.image_url) ? item.image_url : '',
+                imageTitle: '',
+                width: 0,
+                height: 0,
+                mediaType: 'image',
+                imageLink: '',
+                title: item.heading ?? '',
+                paragraph: item.text ?? '',
+                buttonText: item.button_text || false,
+                itemsId: 0, // re-indexed at the end of buildAsync
+                colorReplacements: [],
+            };
+            repositionItemByAnchor(content.items, newItem, item.move_before_item_id);
         }
-        return;
-    }
-    const itemsToMerge = items.filter((item) => item.insert_at === undefined);
-    const updatedItems = itemsToMerge.map((item, index) => {
-        const existing = content.items?.[index];
-        return {
-            ...(existing || {}),
-            imageUrl: isValidUrl(item.image_url)
-                ? item.image_url
-                : (existing?.imageUrl ?? ''),
-            imageTitle: existing?.imageTitle ?? '',
-            width: existing?.width ?? 0,
-            height: existing?.height ?? 0,
-            mediaType: existing?.mediaType ?? 'image',
-            imageLink: existing?.imageLink ?? '',
-            title: item.heading ?? existing?.title ?? '',
-            paragraph: item.text ?? existing?.paragraph ?? '',
-            buttonText: item.button_text ?? existing?.buttonText ?? '',
-            itemsId: existing?.itemsId ?? index,
-            colorReplacements: existing?.colorReplacements ?? [],
-        };
-    });
-    if (!replaceAll &&
-        content.items &&
-        content.items.length > itemsToMerge.length) {
-        const remaining = content.items.slice(itemsToMerge.length);
-        updatedItems.push(...remaining);
     }
-    content.items = updatedItems;
 };
 export class ImagesSectionBuilder extends BaseSectionBuilder {
     get sectionValidate() {
@@ -123,66 +132,22 @@ export class ImagesSectionBuilder extends BaseSectionBuilder {
                 ])),
             };
         }
-        if (args.items && Array.isArray(args.items)) {
-            if (this.mode === 'create') {
-                applyImageItems(content, args.items);
-            }
-            else {
-                mergeImageItems(content, args.items, !!args._replace_items);
-            }
-        }
-        // Phase 2: Item operations (remove, insert, reorder)
-        if (args._remove_item_indices?.length && content.items) {
-            const sorted = [...args._remove_item_indices].sort((a, b) => b - a);
-            for (const idx of sorted) {
-                if (idx >= 0 && idx < content.items.length) {
-                    content.items.splice(idx, 1);
-                }
-            }
+        if (args._replace_items && args.items && Array.isArray(args.items)) {
+            // Full replacement: discard existing items and rebuild from the payload.
+            applyImageItems(content, args.items);
         }
-        if (args.items && Array.isArray(args.items)) {
-            const insertItems = args.items.filter((item) => item.insert_at !== undefined && item.item_index === undefined);
-            // Process inserts in reverse order of insert_at to preserve indices
-            const sortedInserts = [...insertItems].sort((a, b) => (b.insert_at ?? 0) - (a.insert_at ?? 0));
-            for (const item of sortedInserts) {
-                if (!isValidUrl(item.image_url))
-                    continue;
-                // Skip if this image_url already exists — defensive against duplicate
-                // tool call application
-                if (content.items?.some((existing) => existing.imageUrl === item.image_url)) {
-                    continue;
-                }
-                const pos = Math.max(0, Math.min(item.insert_at ?? 0, content.items?.length ?? 0));
-                const newItem = {
-                    imageUrl: item.image_url,
-                    imageTitle: '',
-                    width: 0,
-                    height: 0,
-                    mediaType: 'image',
-                    imageLink: '',
-                    title: item.heading ?? '',
-                    paragraph: item.text ?? '',
-                    buttonText: item.button_text || '',
-                    itemsId: pos,
-                    colorReplacements: [],
-                };
-                content.items = content.items ?? [];
-                content.items.splice(pos, 0, newItem);
+        else if (this.mode === 'create') {
+            if (args.items && Array.isArray(args.items)) {
+                applyImageItems(content, args.items);
             }
         }
-        if (args._reorder_items?.length && content.items) {
-            const newOrder = args._reorder_items;
-            const unique = new Set(newOrder);
-            if (unique.size === newOrder.length) {
-                const reordered = newOrder
-                    .filter((idx) => idx >= 0 && idx < content.items.length)
-                    .map((idx) => content.items[idx]);
-                if (reordered.length === content.items.length) {
-                    content.items = reordered;
-                }
-            }
+        else if ((args.items && Array.isArray(args.items)) ||
+            args._remove_item_ids?.length) {
+            // Update: id-based add / edit / move / remove in a single pass.
+            mergeImageItems(content, args.items ?? [], args._remove_item_ids);
         }
-        // Re-index itemsId after any item operations
+        // Re-index itemsId after all id-based item operations (render concern —
+        // separate from the stable `id` used for targeting).
         if (content.items) {
             content.items.forEach((item, i) => {
                 item.itemsId = i;