@crystaldesign/web-planner-logic 26.12.0-beta.6 → 26.12.0-beta.7

package/build/cjs/{index-34ea53f6.js → index-9358200e.js}

@@ -285,6 +285,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
           data,
           _response$headers,
           _e$response,
+          _e$response2,
           _args = arguments;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -366,8 +367,11 @@ var DivaApiHandler = /*#__PURE__*/function () {
               _context.t5 = _context["catch"](6);
               // Check if this is a rate limiting error (429)
               this.notifyEnricherError(url, dontLogError);
-              throw Error('fetch failed! ' + url + ' Error: ' + _context.t5, {
+              // The status rides along: callers that recover from ONE status (a stale id 404) cannot parse it back out of the message.
+              throw Object.assign(Error('fetch failed! ' + url + ' Error: ' + _context.t5, {
                 cause: _context.t5 === null || _context.t5 === void 0 || (_e$response = _context.t5.response) === null || _e$response === void 0 || (_e$response = _e$response.data) === null || _e$response === void 0 ? void 0 : _e$response.error
+              }), {
+                status: _context.t5 === null || _context.t5 === void 0 || (_e$response2 = _context.t5.response) === null || _e$response2 === void 0 ? void 0 : _e$response2.status
               });
             case 43:
               _context.prev = 43;
@@ -394,6 +398,15 @@ var DivaApiHandler = /*#__PURE__*/function () {
      * feedback instead of a silently broken UI. Optional enricher calls (e.g. the catalog mask) pass
      * `dontLogError` and are skipped. Only one modal is shown at a time to avoid stacking on parallel failures.
      */
+    /**
+     * Same as the failure path of `getDataCache`, for a caller that fetched with `dontLogError` to recover from
+     * ONE status itself (a stale-id 404) and found the failure to be something else.
+     */
+  }, {
+    key: "notifyEnricherErrorForQuery",
+    value: function notifyEnricherErrorForQuery(queryString, useWebServiceApi) {
+      this.notifyEnricherError(this.apiUrl(queryString, useWebServiceApi));
+    }
   }, {
     key: "notifyEnricherError",
     value: function notifyEnricherError(url, dontLogError) {
@@ -1362,6 +1375,13 @@ var DivaApiHandler = /*#__PURE__*/function () {
     value: function getIDMSerieByNo(packageId, serieId, serieNo) {
       return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/series/' + (this.useIDMService ? serieId : serieNo);
     }
+
+    /** Series list of a catalog or package, trimmed to the ids a stale-serieId lookup needs. */
+  }, {
+    key: "getIDMSeriesList",
+    value: function getIDMSeriesList(packageId) {
+      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/series?fields=_id;serieNo';
+    }
   }, {
     key: "getIDMItems",
     value: function getIDMItems(packageId, serieId, serieNo, typeNos) {
@@ -1610,7 +1630,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
     key: "createLeadKey",
     value: function () {
       var _createLeadKey = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(email) {
-        var url, headers, response, _e$response2, _e$response3, status, body, apiMessage;
+        var url, headers, response, _e$response3, _e$response4, status, body, apiMessage;
         return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -1629,8 +1649,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
             case 9:
               _context12.prev = 9;
               _context12.t0 = _context12["catch"](2);
-              status = _context12.t0 === null || _context12.t0 === void 0 || (_e$response2 = _context12.t0.response) === null || _e$response2 === void 0 ? void 0 : _e$response2.status;
-              body = _context12.t0 === null || _context12.t0 === void 0 || (_e$response3 = _context12.t0.response) === null || _e$response3 === void 0 ? void 0 : _e$response3.data;
+              status = _context12.t0 === null || _context12.t0 === void 0 || (_e$response3 = _context12.t0.response) === null || _e$response3 === void 0 ? void 0 : _e$response3.status;
+              body = _context12.t0 === null || _context12.t0 === void 0 || (_e$response4 = _context12.t0.response) === null || _e$response4 === void 0 ? void 0 : _e$response4.data;
               apiMessage = typeof (body === null || body === void 0 ? void 0 : body.error) === 'string' ? body.error : _context12.t0 === null || _context12.t0 === void 0 ? void 0 : _context12.t0.message;
               LOG$q.error(new Error("Failed to create lead key for email ".concat(email, ": ").concat(apiMessage)));
               throw new DivaUtils.DivaError(apiMessage || 'Failed to create lead key', {
@@ -18722,7 +18742,8 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
       var _this$opv$catalogOPV$,
         _this = this;
       if (this.opv.propertyObj.isNotRelevant !== undefined) return this.opv.propertyObj.isNotRelevant;
-      return (_this$opv$catalogOPV$ = this.opv.catalogOPV.isNotRelevant) !== null && _this$opv$catalogOPV$ !== void 0 ? _this$opv$catalogOPV$ : ['OPV_NICHT_RELEVANT', 'OPV_NICHT_RELEVANT', 'OPVNR', 'OPVNRR', 'OPVNR_0'].find(function (codex) {
+      // Legacy codices are OPV-prefixed; IDM optionKeys are bare — NICHT_RELEVANT is the standardized IDM key.
+      return (_this$opv$catalogOPV$ = this.opv.catalogOPV.isNotRelevant) !== null && _this$opv$catalogOPV$ !== void 0 ? _this$opv$catalogOPV$ : ['NICHT_RELEVANT', 'OPVNR'].find(function (codex) {
         var _this$ocd;
         return ((_this$ocd = _this.ocd) !== null && _this$ocd !== void 0 ? _this$ocd : _this.codex).includes(codex);
       });
@@ -20062,7 +20083,14 @@ var LOG$l = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC'
 //a decision enabled by an action may itself enable further ones; the cap keeps a cyclic catalog from looping
 var MAX_DECISION_REFERENCE_ROUNDS = 5;
 
-/** Loads the IDM data these articles need; missing price feature groups, features and decisions are reported, never fatal. */
+/**
+ * Loads the IDM data these articles need; missing price feature groups, features and decisions are reported, never fatal.
+ *
+ * @param catalogData the catalog the articles BELONG to. Everything loaded here (items, decisions,
+ * price feature groups, feature classes, features, options) is stored on AND read from this instance —
+ * a partlist may load components from another serie (serie-0 component library), and those live in
+ * their own catalog data. Defaults to the set's catalog, so same-serie articles behave unchanged.
+ */
 function loadMoreFromIDMArticles(_x, _x2) {
   return _loadMoreFromIDMArticles.apply(this, arguments);
 }
@@ -20070,15 +20098,49 @@ function loadMoreFromIDMArticles(_x, _x2) {
 /** One additional-item reference of an item - the mandatory and optional sides of the same accessory merged. */
 function _loadMoreFromIDMArticles() {
   _loadMoreFromIDMArticles = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(catalogArticleDatas, set) {
-    var items, _loop3, i, toLoadDecisionIds, toLoadPFGroups, toLoadFeatureClassRefNo, promises, _yield$Promise$all, _yield$Promise$all2, featureClasses, priceFeatureGroups, decisions, _i5, _decisions$map, loadedIds, missingIds, _i6, _iterator6, _step6, _loop7, _i7, _catalogArticleData$d2, catalogArticleData, toLoadFeatures, features, _loop4, _i8, _iterator7, _step7, _loop8, _loop6, _i9;
+    var catalogData,
+      items,
+      _loop3,
+      i,
+      toLoadDecisionIds,
+      toLoadPFGroups,
+      toLoadFeatureClassRefNo,
+      promises,
+      _yield$Promise$all,
+      _yield$Promise$all2,
+      featureClasses,
+      priceFeatureGroups,
+      decisions,
+      _i5,
+      _decisions$map,
+      loadedIds,
+      missingIds,
+      _i6,
+      _iterator6,
+      _step6,
+      _loop7,
+      _i7,
+      _catalogArticleData$d2,
+      catalogArticleData,
+      toLoadFeatures,
+      features,
+      _loop4,
+      _i8,
+      _iterator7,
+      _step7,
+      _loop8,
+      _loop6,
+      _i9,
+      _args8 = arguments;
     return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
-          _context8.next = 2;
-          return set.api.getDataCache(set.api.getIDMItems(set.CatalogData.accountGuid, set.CatalogData.serieId, set.CatalogData.catalogCodex, catalogArticleDatas.map(function (a) {
+          catalogData = _args8.length > 2 && _args8[2] !== undefined ? _args8[2] : set.CatalogData;
+          _context8.next = 3;
+          return set.api.getDataCache(set.api.getIDMItems(catalogData.accountGuid, catalogData.serieId, catalogData.catalogCodex, catalogArticleDatas.map(function (a) {
             return a.articleCodex;
           })), undefined, undefined, 'enricher');
-        case 2:
+        case 3:
           items = _context8.sent;
           _loop3 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop3() {
             var catalogArticleData, item;
@@ -20098,7 +20160,7 @@ function _loadMoreFromIDMArticles() {
                   catalogArticleData.decisionsRefs = item.decisionRefs;
                   catalogArticleData.idmPartlist = item.partlist;
                   catalogArticleData.idmPrices = item.prices;
-                  initIDMArticleRelations(item, catalogArticleData, set.CatalogData);
+                  initIDMArticleRelations(item, catalogArticleData, catalogData);
                 case 8:
                 case "end":
                   return _context4.stop();
@@ -20106,28 +20168,28 @@ function _loadMoreFromIDMArticles() {
             }, _loop3);
           });
           i = 0;
-        case 5:
+        case 6:
           if (!(i < catalogArticleDatas.length)) {
-            _context8.next = 10;
+            _context8.next = 11;
             break;
           }
-          return _context8.delegateYield(_loop3(), "t0", 7);
-        case 7:
+          return _context8.delegateYield(_loop3(), "t0", 8);
+        case 8:
           i++;
-          _context8.next = 5;
+          _context8.next = 6;
           break;
-        case 10:
-          toLoadDecisionIds = getToLoadDecisionIds(catalogArticleDatas, set);
-          toLoadPFGroups = getPriceFeatureGroups(catalogArticleDatas, set);
+        case 11:
+          toLoadDecisionIds = getToLoadDecisionIds(catalogArticleDatas, catalogData);
+          toLoadPFGroups = getPriceFeatureGroups(catalogArticleDatas, catalogData);
           toLoadFeatureClassRefNo = _toConsumableArray__default["default"](new Set(catalogArticleDatas.filter(function (a) {
             return a.featureClassRefNo !== undefined;
           }).map(function (a) {
             return a.featureClassRefNo;
           })));
-          promises = [set.api.getDataCache(set.api.getIDMFeatureClass(set.CatalogData.accountGuid, toLoadFeatureClassRefNo), undefined, undefined, 'enricher'), toLoadPFGroups.length ? set.api.getDataCache(set.api.getIDMPriceFeatureGroups(set.CatalogData.accountGuid, toLoadPFGroups), undefined, undefined, 'enricher') : undefined, toLoadDecisionIds.length ? fetchDecisions(set, toLoadDecisionIds) : undefined];
-          _context8.next = 16;
+          promises = [set.api.getDataCache(set.api.getIDMFeatureClass(catalogData.accountGuid, toLoadFeatureClassRefNo), undefined, undefined, 'enricher'), toLoadPFGroups.length ? set.api.getDataCache(set.api.getIDMPriceFeatureGroups(catalogData.accountGuid, toLoadPFGroups), undefined, undefined, 'enricher') : undefined, toLoadDecisionIds.length ? fetchDecisions(set, catalogData, toLoadDecisionIds) : undefined];
+          _context8.next = 17;
           return Promise.all(promises);
-        case 16:
+        case 17:
           _yield$Promise$all = _context8.sent;
           _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 3);
           featureClasses = _yield$Promise$all2[0];
@@ -20135,11 +20197,11 @@ function _loadMoreFromIDMArticles() {
           decisions = _yield$Promise$all2[2];
           if (decisions) {
             for (_i5 = 0; _i5 < decisions.length; _i5++) {
-              set.CatalogData.loadedDecisions.push(initializeDecision(decisions[_i5], set.CatalogData.idmOptionGroups));
+              catalogData.loadedDecisions.push(initializeDecision(decisions[_i5], catalogData.idmOptionGroups));
             }
           }
           if (!(toLoadDecisionIds.length !== 0 && toLoadDecisionIds.length != (decisions === null || decisions === void 0 ? void 0 : decisions.length))) {
-            _context8.next = 26;
+            _context8.next = 27;
             break;
           }
           loadedIds = new Set((_decisions$map = decisions === null || decisions === void 0 ? void 0 : decisions.map(function (d) {
@@ -20149,17 +20211,17 @@ function _loadMoreFromIDMArticles() {
             return !loadedIds.has(id);
           });
           throw new Error("loading decisions failed \u2013 missing: [".concat(missingIds.join(', '), "]"));
-        case 26:
-          _context8.next = 28;
-          return loadDecisionsReferencedByActions(set);
-        case 28:
+        case 27:
+          _context8.next = 29;
+          return loadDecisionsReferencedByActions(set, catalogData);
+        case 29:
           if (priceFeatureGroups) {
             for (_i6 = 0; _i6 < priceFeatureGroups.length; _i6++) {
-              set.CatalogData.loadedPriceFeaturegroups.push(initializePriceFeatureGroups(priceFeatureGroups[_i6], set.CatalogData.idmOptionGroups));
+              catalogData.loadedPriceFeaturegroups.push(initializePriceFeatureGroups(priceFeatureGroups[_i6], catalogData.idmOptionGroups));
             }
           }
           _iterator6 = _createForOfIteratorHelper$j(toLoadPFGroups);
-          _context8.prev = 30;
+          _context8.prev = 31;
           _loop7 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop7() {
             var prfgNo, askedBy;
             return _regeneratorRuntime__default["default"].wrap(function _loop7$(_context5) {
@@ -20188,50 +20250,50 @@ function _loadMoreFromIDMArticles() {
             }, _loop7);
           });
           _iterator6.s();
-        case 33:
+        case 34:
           if ((_step6 = _iterator6.n()).done) {
-            _context8.next = 39;
+            _context8.next = 40;
             break;
           }
-          return _context8.delegateYield(_loop7(), "t1", 35);
-        case 35:
+          return _context8.delegateYield(_loop7(), "t1", 36);
+        case 36:
           if (!_context8.t1) {
-            _context8.next = 37;
+            _context8.next = 38;
             break;
           }
-          return _context8.abrupt("continue", 37);
-        case 37:
-          _context8.next = 33;
+          return _context8.abrupt("continue", 38);
+        case 38:
+          _context8.next = 34;
           break;
-        case 39:
-          _context8.next = 44;
+        case 40:
+          _context8.next = 45;
           break;
-        case 41:
-          _context8.prev = 41;
-          _context8.t2 = _context8["catch"](30);
+        case 42:
+          _context8.prev = 42;
+          _context8.t2 = _context8["catch"](31);
           _iterator6.e(_context8.t2);
-        case 44:
-          _context8.prev = 44;
+        case 45:
+          _context8.prev = 45;
           _iterator6.f();
-          return _context8.finish(44);
-        case 47:
+          return _context8.finish(45);
+        case 48:
           for (_i7 = 0; _i7 < catalogArticleDatas.length; _i7++) {
             catalogArticleData = catalogArticleDatas[_i7];
-            catalogArticleData.articleIDMDecisions = sortDecisions(set.CatalogData.getDecisionsByNo(_toConsumableArray__default["default"](new Set([].concat(_toConsumableArray__default["default"](set.CatalogData.globalDecisions.map(function (g) {
+            catalogArticleData.articleIDMDecisions = sortDecisions(catalogData.getDecisionsByNo(_toConsumableArray__default["default"](new Set([].concat(_toConsumableArray__default["default"](catalogData.globalDecisions.map(function (g) {
               return g.decisionNo;
-            })), _toConsumableArray__default["default"](set.CatalogData.serieDecisionRefs), _toConsumableArray__default["default"]((_catalogArticleData$d2 = catalogArticleData.decisionsRefs) !== null && _catalogArticleData$d2 !== void 0 ? _catalogArticleData$d2 : []))))));
+            })), _toConsumableArray__default["default"](catalogData.serieDecisionRefs), _toConsumableArray__default["default"]((_catalogArticleData$d2 = catalogArticleData.decisionsRefs) !== null && _catalogArticleData$d2 !== void 0 ? _catalogArticleData$d2 : []))))));
           }
           featureClasses.map(function (fc) {
-            return set.CatalogData.loadedFeatureClasses.push(fc);
+            return catalogData.loadedFeatureClasses.push(fc);
           });
-          toLoadFeatures = getFeatures(set, featureClasses);
+          toLoadFeatures = getFeatures(catalogData, featureClasses);
           if (!toLoadFeatures.length) {
-            _context8.next = 61;
+            _context8.next = 62;
             break;
           }
-          _context8.next = 53;
-          return set.api.getDataCache(set.api.getIDMFeatures(set.CatalogData.accountGuid, toLoadFeatures), undefined, undefined, 'enricher');
-        case 53:
+          _context8.next = 54;
+          return set.api.getDataCache(set.api.getIDMFeatures(catalogData.accountGuid, toLoadFeatures), undefined, undefined, 'enricher');
+        case 54:
           features = _context8.sent;
           _loop4 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop4() {
             var feature, insertIndex, k, _loop5, j;
@@ -20239,14 +20301,14 @@ function _loadMoreFromIDMArticles() {
               while (1) switch (_context3.prev = _context3.next) {
                 case 0:
                   feature = features[_i8];
-                  insertIndex = set.CatalogData.loadedFeatures.length;
+                  insertIndex = catalogData.loadedFeatures.length;
                   k = 0;
                 case 3:
-                  if (!(k < set.CatalogData.loadedFeatures.length)) {
+                  if (!(k < catalogData.loadedFeatures.length)) {
                     _context3.next = 10;
                     break;
                   }
-                  if (!(set.CatalogData.loadedFeatures[k].sequenceNo > feature.sequenceNo)) {
+                  if (!(catalogData.loadedFeatures[k].sequenceNo > feature.sequenceNo)) {
                     _context3.next = 7;
                     break;
                   }
@@ -20257,27 +20319,27 @@ function _loadMoreFromIDMArticles() {
                   _context3.next = 3;
                   break;
                 case 10:
-                  set.CatalogData.loadedFeatures.splice(insertIndex, 0, feature);
+                  catalogData.loadedFeatures.splice(insertIndex, 0, feature);
                   _loop5 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop5(j) {
                     var option, _insertIndex, _k;
                     return _regeneratorRuntime__default["default"].wrap(function _loop5$(_context2) {
                       while (1) switch (_context2.prev = _context2.next) {
                         case 0:
-                          if (set.CatalogData.loadedOptions.find(function (o) {
+                          if (catalogData.loadedOptions.find(function (o) {
                             return o.optionKey == feature.options[j].optionKey;
                           })) {
                             _context2.next = 12;
                             break;
                           }
                           option = feature.options[j];
-                          _insertIndex = set.CatalogData.loadedOptions.length;
+                          _insertIndex = catalogData.loadedOptions.length;
                           _k = 0;
                         case 4:
-                          if (!(_k < set.CatalogData.loadedOptions.length)) {
+                          if (!(_k < catalogData.loadedOptions.length)) {
                             _context2.next = 11;
                             break;
                           }
-                          if (!(set.CatalogData.loadedOptions[_k].sequenceNo > option.sequenceNo)) {
+                          if (!(catalogData.loadedOptions[_k].sequenceNo > option.sequenceNo)) {
                             _context2.next = 8;
                             break;
                           }
@@ -20288,7 +20350,7 @@ function _loadMoreFromIDMArticles() {
                           _context2.next = 4;
                           break;
                         case 11:
-                          set.CatalogData.loadedOptions.splice(_insertIndex, 0, option);
+                          catalogData.loadedOptions.splice(_insertIndex, 0, option);
                         case 12:
                         case "end":
                           return _context2.stop();
@@ -20313,19 +20375,19 @@ function _loadMoreFromIDMArticles() {
             }, _loop4);
           });
           _i8 = 0;
-        case 56:
+        case 57:
           if (!(_i8 < features.length)) {
-            _context8.next = 61;
+            _context8.next = 62;
             break;
           }
-          return _context8.delegateYield(_loop4(), "t3", 58);
-        case 58:
+          return _context8.delegateYield(_loop4(), "t3", 59);
+        case 59:
           _i8++;
-          _context8.next = 56;
+          _context8.next = 57;
           break;
-        case 61:
+        case 62:
           _iterator7 = _createForOfIteratorHelper$j(toLoadFeatures);
-          _context8.prev = 62;
+          _context8.prev = 63;
           _loop8 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop8() {
             var featureNo, askedBy;
             return _regeneratorRuntime__default["default"].wrap(function _loop8$(_context6) {
@@ -20355,33 +20417,33 @@ function _loadMoreFromIDMArticles() {
             }, _loop8);
           });
           _iterator7.s();
-        case 65:
+        case 66:
           if ((_step7 = _iterator7.n()).done) {
-            _context8.next = 71;
+            _context8.next = 72;
             break;
           }
-          return _context8.delegateYield(_loop8(), "t4", 67);
-        case 67:
+          return _context8.delegateYield(_loop8(), "t4", 68);
+        case 68:
           if (!_context8.t4) {
-            _context8.next = 69;
+            _context8.next = 70;
             break;
           }
-          return _context8.abrupt("continue", 69);
-        case 69:
-          _context8.next = 65;
+          return _context8.abrupt("continue", 70);
+        case 70:
+          _context8.next = 66;
           break;
-        case 71:
-          _context8.next = 76;
+        case 72:
+          _context8.next = 77;
           break;
-        case 73:
-          _context8.prev = 73;
-          _context8.t5 = _context8["catch"](62);
+        case 74:
+          _context8.prev = 74;
+          _context8.t5 = _context8["catch"](63);
           _iterator7.e(_context8.t5);
-        case 76:
-          _context8.prev = 76;
+        case 77:
+          _context8.prev = 77;
           _iterator7.f();
-          return _context8.finish(76);
-        case 79:
+          return _context8.finish(77);
+        case 80:
           _loop6 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop6() {
             var catalogArticleData, featureClass, features, j;
             return _regeneratorRuntime__default["default"].wrap(function _loop6$(_context7) {
@@ -20397,9 +20459,9 @@ function _loadMoreFromIDMArticles() {
                   }
                   throw new Error('featureClassRefNo ' + catalogArticleData.featureClassRefNo + ' not found');
                 case 4:
-                  features = set.CatalogData.getFeatures(getFeaturesByFeatureClass(featureClass));
+                  features = catalogData.getFeatures(getFeaturesByFeatureClass(featureClass));
                   for (j = 0; j < features.length; j++) {
-                    initFeature(features[j], catalogArticleData, set);
+                    initFeature(features[j], catalogArticleData, set, catalogData);
                   }
                 case 6:
                 case "end":
@@ -20408,25 +20470,25 @@ function _loadMoreFromIDMArticles() {
             }, _loop6);
           });
           _i9 = 0;
-        case 81:
+        case 82:
           if (!(_i9 < catalogArticleDatas.length)) {
-            _context8.next = 86;
+            _context8.next = 87;
             break;
           }
-          return _context8.delegateYield(_loop6(), "t6", 83);
-        case 83:
+          return _context8.delegateYield(_loop6(), "t6", 84);
+        case 84:
           _i9++;
-          _context8.next = 81;
+          _context8.next = 82;
           break;
-        case 86:
+        case 87:
           catalogArticleDatas.map(function (c) {
             return c.areOptionsLoaded = true;
           });
-        case 87:
+        case 88:
         case "end":
           return _context8.stop();
       }
-    }, _callee2, null, [[30, 41, 44, 47], [62, 73, 76, 79]]);
+    }, _callee2, null, [[31, 42, 45, 48], [63, 74, 77, 80]]);
   }));
   return _loadMoreFromIDMArticles.apply(this, arguments);
 }
@@ -20549,10 +20611,12 @@ function initIDMArticleRelations(item, catalogArticleData, catalog) {
   }
   catalogArticle.hasArticleRelations = catalogArticle.articleRelations.length > 0;
 }
-var fetchDecisions = function fetchDecisions(set, decisionNos) {
-  var getUrl = set.api.getIDMDecisions(set.CatalogData.accountGuid, decisionNos);
+
+/** Load IDM decisions by number; a list too long for one GET url goes through the POST query endpoint. */
+var fetchDecisions = function fetchDecisions(set, catalogData, decisionNos) {
+  var getUrl = set.api.getIDMDecisions(catalogData.accountGuid, decisionNos);
   if (getUrl.length > 2000) {
-    return set.api.getDataCache(set.api.getIDMDecisionsQueryUrl(set.CatalogData.accountGuid), undefined, undefined, 'enricher', 'POST', {
+    return set.api.getDataCache(set.api.getIDMDecisionsQueryUrl(catalogData.accountGuid), undefined, undefined, 'enricher', 'POST', {
       decisionNos: decisionNos.join(';')
     });
   }
@@ -20567,7 +20631,7 @@ var fetchDecisions = function fetchDecisions(set, decisionNos) {
  * apply while that action matches. References are followed transitively.
  */
 var loadDecisionsReferencedByActions = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(set) {
+  var _ref3 = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(set, catalogData) {
     var round, toLoad, _iterator3, _step3, _decision$optionCombi, decision, _iterator4, _step4, _combination$projectA, _combination$projectA2, _combination$projectA3, _combination$projectA4, combination, refs, _iterator5, _step5, ref, decisionNo, decisions, i, _decisions$length, stillMissing;
     return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -20579,7 +20643,7 @@ var loadDecisionsReferencedByActions = /*#__PURE__*/function () {
             break;
           }
           toLoad = new Set();
-          _iterator3 = _createForOfIteratorHelper$j(set.CatalogData.loadedDecisions);
+          _iterator3 = _createForOfIteratorHelper$j(catalogData.loadedDecisions);
           try {
             for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
               decision = _step3.value;
@@ -20593,7 +20657,7 @@ var loadDecisionsReferencedByActions = /*#__PURE__*/function () {
                     for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
                       ref = _step5.value;
                       decisionNo = Number(ref.decisionNo);
-                      if (!isNaN(decisionNo) && !set.CatalogData.getDecisionByNo(decisionNo)) toLoad.add(decisionNo);
+                      if (!isNaN(decisionNo) && !catalogData.getDecisionByNo(decisionNo)) toLoad.add(decisionNo);
                     }
                   } catch (err) {
                     _iterator5.e(err);
@@ -20619,14 +20683,14 @@ var loadDecisionsReferencedByActions = /*#__PURE__*/function () {
           return _context.abrupt("return");
         case 7:
           _context.next = 9;
-          return fetchDecisions(set, _toConsumableArray__default["default"](toLoad));
+          return fetchDecisions(set, catalogData, _toConsumableArray__default["default"](toLoad));
         case 9:
           decisions = _context.sent;
           for (i = 0; i < ((_decisions$length = decisions === null || decisions === void 0 ? void 0 : decisions.length) !== null && _decisions$length !== void 0 ? _decisions$length : 0); i++) {
-            set.CatalogData.loadedDecisions.push(initializeDecision(decisions[i], set.CatalogData.idmOptionGroups));
+            catalogData.loadedDecisions.push(initializeDecision(decisions[i], catalogData.idmOptionGroups));
           }
           stillMissing = _toConsumableArray__default["default"](toLoad).filter(function (decisionNo) {
-            return !set.CatalogData.getDecisionByNo(decisionNo);
+            return !catalogData.getDecisionByNo(decisionNo);
           });
           if (!stillMissing.length) {
             _context.next = 15;
@@ -20645,11 +20709,13 @@ var loadDecisionsReferencedByActions = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function loadDecisionsReferencedByActions(_x3) {
+  return function loadDecisionsReferencedByActions(_x3, _x4) {
     return _ref3.apply(this, arguments);
   };
 }();
-var getToLoadDecisionIds = function getToLoadDecisionIds(catalogArticleDatas, set) {
+
+/** Decision numbers the articles, their media items, the serie and the globals reference that the catalog has not loaded yet. */
+var getToLoadDecisionIds = function getToLoadDecisionIds(catalogArticleDatas, catalogData) {
   var allArticleDecisions = [];
   for (var i = 0; i < catalogArticleDatas.length; i++) {
     var _catalogArticleData$s, _catalogArticleData$s2, _catalogArticleData$i, _catalogArticleData$i2, _catalogArticleData$i3, _catalogArticleData$d;
@@ -20663,26 +20729,28 @@ var getToLoadDecisionIds = function getToLoadDecisionIds(catalogArticleDatas, se
     })) !== null && _catalogArticleData$i !== void 0 ? _catalogArticleData$i : []));
     allArticleDecisions = [].concat(_toConsumableArray__default["default"](allArticleDecisions), _toConsumableArray__default["default"]((_catalogArticleData$i3 = catalogArticleData.idmPartlistDecisions) !== null && _catalogArticleData$i3 !== void 0 ? _catalogArticleData$i3 : []), _toConsumableArray__default["default"]((_catalogArticleData$d = catalogArticleData.decisionsRefs) !== null && _catalogArticleData$d !== void 0 ? _catalogArticleData$d : []), _toConsumableArray__default["default"](decisionsOfMediaItems));
   }
-  var neededDecisionsIds = _toConsumableArray__default["default"](new Set([].concat(_toConsumableArray__default["default"](set.CatalogData.globalDecisions.map(function (g) {
+  var neededDecisionsIds = _toConsumableArray__default["default"](new Set([].concat(_toConsumableArray__default["default"](catalogData.globalDecisions.map(function (g) {
     return g.decisionNo;
-  })), _toConsumableArray__default["default"](set.CatalogData.serieDecisionRefs), _toConsumableArray__default["default"](allArticleDecisions))));
+  })), _toConsumableArray__default["default"](catalogData.serieDecisionRefs), _toConsumableArray__default["default"](allArticleDecisions))));
   var toLoadDecisionIds = [];
   for (var _i2 = 0; _i2 < neededDecisionsIds.length; _i2++) {
-    var found = set.CatalogData.getDecisionByNo(neededDecisionsIds[_i2]);
+    var found = catalogData.getDecisionByNo(neededDecisionsIds[_i2]);
     if (found) ; else {
       toLoadDecisionIds.push(neededDecisionsIds[_i2]);
     }
   }
   return toLoadDecisionIds;
 };
-var getFeatures = function getFeatures(set, featureClasses) {
+
+/** Feature numbers the feature classes reference that the catalog has not loaded yet. */
+var getFeatures = function getFeatures(catalogData, featureClasses) {
   var neededFeatures = [];
   for (var i = 0; i < featureClasses.length; i++) {
     var featureClass = featureClasses[i];
     neededFeatures = [].concat(_toConsumableArray__default["default"](neededFeatures), _toConsumableArray__default["default"](getFeaturesByFeatureClass(featureClass)));
   }
   neededFeatures = _toConsumableArray__default["default"](new Set(neededFeatures)); // remove duplicates
-  var alreadyLoadedFeatures = set.CatalogData.loadedFeatures;
+  var alreadyLoadedFeatures = catalogData.loadedFeatures;
   var toLoadFeatures = [];
   var loadedFeatures = [];
   var _loop = function _loop(_i3) {
@@ -20710,7 +20778,9 @@ var getFeaturesByFeatureClass = function getFeaturesByFeatureClass(featureClass)
   }
   return neededFeatures;
 };
-var getPriceFeatureGroups = function getPriceFeatureGroups(catalogArticleDatas, set) {
+
+/** Price feature group numbers the articles reference that the catalog has not loaded yet. */
+var getPriceFeatureGroups = function getPriceFeatureGroups(catalogArticleDatas, catalogData) {
   var neededPriceFeatureGroupNos = [];
   for (var i = 0; i < catalogArticleDatas.length; i++) {
     var _catalogArticleDatas$;
@@ -20719,7 +20789,7 @@ var getPriceFeatureGroups = function getPriceFeatureGroups(catalogArticleDatas,
   var toLoadPriceFeatureGroups = [];
   neededPriceFeatureGroupNos = _toConsumableArray__default["default"](new Set(neededPriceFeatureGroupNos));
   for (var _i4 = 0; _i4 < neededPriceFeatureGroupNos.length; _i4++) {
-    var found = set.CatalogData.getPricefeaturegroup(neededPriceFeatureGroupNos[_i4]);
+    var found = catalogData.getPricefeaturegroup(neededPriceFeatureGroupNos[_i4]);
     if (found) ; else {
       toLoadPriceFeatureGroups.push(neededPriceFeatureGroupNos[_i4]);
     }
@@ -20823,21 +20893,25 @@ var sortDecisions = function sortDecisions(decisions) {
   }
   return sortedDecisions;
 };
-var initFeature = function initFeature(feature, catalogArticleData, set) {
-  var catFeature = set.CatalogData.getOption(feature.featureNo);
+
+/** Register the feature once as a catalog option and attach it to the article as an article option. */
+var initFeature = function initFeature(feature, catalogArticleData, set, catalogData) {
+  var catFeature = catalogData.getOption(feature.featureNo);
   if (!catFeature) {
-    catFeature = new OptionCatalogData(getCatalogFeatureType(feature, catalogArticleData, set), set.CatalogData);
-    set.CatalogData.setOption(catFeature);
+    catFeature = new OptionCatalogData(getCatalogFeatureType(feature, catalogArticleData, set, catalogData), catalogData);
+    catalogData.setOption(catFeature);
   }
-  var newArticleFeature = new ArticleOptionData(getArticleFeatureType(feature, catalogArticleData, catFeature, set), set.CatalogData);
-  initOption(feature, newArticleFeature, catalogArticleData, set);
+  var newArticleFeature = new ArticleOptionData(getArticleFeatureType(feature, catalogArticleData, catFeature, set, catalogData), catalogData);
+  initOption(feature, newArticleFeature, catalogArticleData, set, catalogData);
   catalogArticleData.articleOptions[newArticleFeature.codex] = newArticleFeature;
 };
-function getCatalogFeatureType(feature, catalogArticleData, set) {
-  var _set$CatalogData$cata, _set$CatalogData$cata2, _set$CatalogData$cata3, _feature$detailInfos, _optionMask$hidden;
-  var featureClass = set.CatalogData.getFeatureClass(catalogArticleData.featureClassRefNo);
-  var optionMask = (_set$CatalogData$cata = set.CatalogData.catalogMask) === null || _set$CatalogData$cata === void 0 || (_set$CatalogData$cata = _set$CatalogData$cata.options) === null || _set$CatalogData$cata === void 0 ? void 0 : _set$CatalogData$cata[feature.featureNo];
-  var maskProperties = getPropertiesForFeatureNo((_set$CatalogData$cata2 = (_set$CatalogData$cata3 = set.CatalogData.catalogMask) === null || _set$CatalogData$cata3 === void 0 ? void 0 : _set$CatalogData$cata3.properties) !== null && _set$CatalogData$cata2 !== void 0 ? _set$CatalogData$cata2 : [], undefined, feature.featureNo, set.CatalogData.api.getLanguage());
+
+/** Catalog-level option data of an IDM feature: localized texts plus the feature's and the mask's properties. */
+function getCatalogFeatureType(feature, catalogArticleData, set, catalogData) {
+  var _catalogData$catalogM, _catalogData$catalogM2, _catalogData$catalogM3, _feature$detailInfos, _optionMask$hidden;
+  var featureClass = catalogData.getFeatureClass(catalogArticleData.featureClassRefNo);
+  var optionMask = (_catalogData$catalogM = catalogData.catalogMask) === null || _catalogData$catalogM === void 0 || (_catalogData$catalogM = _catalogData$catalogM.options) === null || _catalogData$catalogM === void 0 ? void 0 : _catalogData$catalogM[feature.featureNo];
+  var maskProperties = getPropertiesForFeatureNo((_catalogData$catalogM2 = (_catalogData$catalogM3 = catalogData.catalogMask) === null || _catalogData$catalogM3 === void 0 ? void 0 : _catalogData$catalogM3.properties) !== null && _catalogData$catalogM2 !== void 0 ? _catalogData$catalogM2 : [], undefined, feature.featureNo, catalogData.api.getLanguage());
   var properties = [].concat(_toConsumableArray__default["default"](convertProperties(feature.properties, set.api.getLanguageLowercase())), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : []));
   return {
     name: DivaUtils__default["default"].getLocals(feature.featureText, set.api.getLanguageLowercase()),
@@ -20859,16 +20933,16 @@ function getCatalogFeatureType(feature, catalogArticleData, set) {
     propertyObj: {}
   };
 }
-function getArticleFeatureType(feature, catalogArticleData, catOPT, set) {
-  var _catalogArticleData$f, _catalogArticleData$f2, _set$CatalogData$tabG, _set$CatalogData$cata4, _set$CatalogData$cata5;
+function getArticleFeatureType(feature, catalogArticleData, catOPT, set, catalogData) {
+  var _catalogArticleData$f, _catalogArticleData$f2, _catalogData$tabGroup, _catalogData$catalogM4, _catalogData$catalogM5;
   var props = (_catalogArticleData$f = (_catalogArticleData$f2 = catalogArticleData.featureProperties) === null || _catalogArticleData$f2 === void 0 ? void 0 : _catalogArticleData$f2.filter(function (p) {
     return p.FeatureNos.includes(feature.featureNo);
   })) !== null && _catalogArticleData$f !== void 0 ? _catalogArticleData$f : [];
-  var featureClass = set.CatalogData.getFeatureClass(catalogArticleData.featureClassRefNo);
-  var tabgroup = (_set$CatalogData$tabG = set.CatalogData.tabGroups) === null || _set$CatalogData$tabG === void 0 ? void 0 : _set$CatalogData$tabG.find(function (t) {
+  var featureClass = catalogData.getFeatureClass(catalogArticleData.featureClassRefNo);
+  var tabgroup = (_catalogData$tabGroup = catalogData.tabGroups) === null || _catalogData$tabGroup === void 0 ? void 0 : _catalogData$tabGroup.find(function (t) {
     return t.featureNos.includes(feature.featureNo);
   });
-  var maskProperties = getPropertiesForFeatureNo((_set$CatalogData$cata4 = (_set$CatalogData$cata5 = set.CatalogData.catalogMask) === null || _set$CatalogData$cata5 === void 0 ? void 0 : _set$CatalogData$cata5.properties) !== null && _set$CatalogData$cata4 !== void 0 ? _set$CatalogData$cata4 : [], catalogArticleData.articleCodex, feature.featureNo, set.CatalogData.api.getLanguage());
+  var maskProperties = getPropertiesForFeatureNo((_catalogData$catalogM4 = (_catalogData$catalogM5 = catalogData.catalogMask) === null || _catalogData$catalogM5 === void 0 ? void 0 : _catalogData$catalogM5.properties) !== null && _catalogData$catalogM4 !== void 0 ? _catalogData$catalogM4 : [], catalogArticleData.articleCodex, feature.featureNo, catalogData.api.getLanguage());
   var opt = {
     codex: feature.featureNo,
     catalogOPT: catOPT,
@@ -20886,17 +20960,17 @@ function getArticleFeatureType(feature, catalogArticleData, catOPT, set) {
 }
 
 //option in IDM language so in Diva World its OptionValue
-function initOption(feature, articleFeature, catalogArticle, set) {
+function initOption(feature, articleFeature, catalogArticle, set, catalogData) {
   var options = feature.options;
   var allOptionsOfFeature = new Map();
   //Items initalisieren
   var _loop2 = function _loop2() {
     var option = options[j];
-    var catOption = set.CatalogData.getOptionValues().find(function (o) {
+    var catOption = catalogData.getOptionValues().find(function (o) {
       return o.codex == option.optionKey;
     });
-    if (!catOption) catOption = getCatalogOptionType(option, set);
-    var articleIDMOption = new ArticleOptionValueData(getArticleOption(set, option, catOption, articleFeature, catalogArticle), set.CatalogData);
+    if (!catOption) catOption = getCatalogOptionType(option, set, catalogData);
+    var articleIDMOption = new ArticleOptionValueData(getArticleOption(set, option, catOption, articleFeature, catalogArticle, catalogData), catalogData);
     allOptionsOfFeature.set(articleIDMOption.codex, articleIDMOption);
   };
   for (var j = 0; j < options.length; j++) {
@@ -20905,12 +20979,13 @@ function initOption(feature, articleFeature, catalogArticle, set) {
   articleFeature.initOPVsInOPT(allOptionsOfFeature);
   catalogArticle.articleOptions[articleFeature.codex];
 }
-function getCatalogOptionType(option, set) {
-  var _catalogData$catalogM, _catalogData$catalogM2, _option$detailInfos, _option$detailInfos2, _option$measureValue;
-  var catalogData = set.CatalogData;
+
+/** Catalog-level option-value data of an IDM option: localized texts, properties from option and mask, media. */
+function getCatalogOptionType(option, set, catalogData) {
+  var _catalogData$catalogM6, _catalogData$catalogM7, _option$detailInfos, _option$detailInfos2, _option$measureValue;
   var name = DivaUtils__default["default"].getLocals(option.optionText, set.api.getLanguageLowercase());
-  var maskProperties = getPropertiesForOptionKey((_catalogData$catalogM = (_catalogData$catalogM2 = catalogData.catalogMask) === null || _catalogData$catalogM2 === void 0 ? void 0 : _catalogData$catalogM2.properties) !== null && _catalogData$catalogM !== void 0 ? _catalogData$catalogM : [], undefined, option.optionKey, set.CatalogData.api.getLanguage());
-  var properties = [].concat(_toConsumableArray__default["default"](convertProperties(option.properties, set.CatalogData.api.getLanguageLowercase())), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : []));
+  var maskProperties = getPropertiesForOptionKey((_catalogData$catalogM6 = (_catalogData$catalogM7 = catalogData.catalogMask) === null || _catalogData$catalogM7 === void 0 ? void 0 : _catalogData$catalogM7.properties) !== null && _catalogData$catalogM6 !== void 0 ? _catalogData$catalogM6 : [], undefined, option.optionKey, catalogData.api.getLanguage());
+  var properties = [].concat(_toConsumableArray__default["default"](convertProperties(option.properties, catalogData.api.getLanguageLowercase())), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : []));
   var opiton = {
     codex: option.optionKey,
     name: name,
@@ -20980,12 +21055,12 @@ function getCatalogOptionType(option, set) {
   }
   return new OptionValueCatalogData(opiton, catalogData);
 }
-function getArticleOption(set, option, catalogOption, feature, catalogArticleData) {
-  var _catalogArticleData$o, _set$CatalogData$cata6, _set$CatalogData$cata7;
+function getArticleOption(set, option, catalogOption, feature, catalogArticleData, catalogData) {
+  var _catalogArticleData$o, _catalogData$catalogM8, _catalogData$catalogM9;
   var props = (_catalogArticleData$o = catalogArticleData.optionProperties) === null || _catalogArticleData$o === void 0 ? void 0 : _catalogArticleData$o.filter(function (p) {
     return p.OptionKeys.includes(option.optionKey);
   });
-  var maskProperties = getPropertiesForOptionKey((_set$CatalogData$cata6 = (_set$CatalogData$cata7 = set.CatalogData.catalogMask) === null || _set$CatalogData$cata7 === void 0 ? void 0 : _set$CatalogData$cata7.properties) !== null && _set$CatalogData$cata6 !== void 0 ? _set$CatalogData$cata6 : [], undefined, option.optionKey, set.api.getLanguage());
+  var maskProperties = getPropertiesForOptionKey((_catalogData$catalogM8 = (_catalogData$catalogM9 = catalogData.catalogMask) === null || _catalogData$catalogM9 === void 0 ? void 0 : _catalogData$catalogM9.properties) !== null && _catalogData$catalogM8 !== void 0 ? _catalogData$catalogM8 : [], undefined, option.optionKey, set.api.getLanguage());
   //TODO add these props that are articleSpecific
   var opv = {
     codex: option.optionKey,
@@ -21599,7 +21674,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 3;
-              return loadMoreFromIDMArticles(catalogArticles, set);
+              return loadMoreFromIDMArticles(catalogArticles, set, this);
             case 3:
               _context.next = 9;
               break;
@@ -23117,7 +23192,12 @@ var DivaCatalogData = /*#__PURE__*/function () {
   }, {
     key: "checkIfArticleCodexExists",
     value: function checkIfArticleCodexExists(articleCodex) {
-      return !!this.catalogArticles[articleCodex];
+      if (this.catalogArticles[articleCodex]) return true;
+      // same resolution as getCatalogArticleByArticleCodex, but without logging WC_0006
+      if (this.isIDMFormat) return Object.values(this.catalogArticles).some(function (a) {
+        return a.configArticleCodex === articleCodex;
+      });
+      return false;
     }
   }, {
     key: "getCatalogArticleByArticleCodex",
@@ -23430,35 +23510,67 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
     key: "loadIDMCatalog",
     value: function () {
       var _loadIDMCatalog = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(state, serieNo, serieId, accountId, orderSet) {
-        var promises, _yield$Promise$all3, _yield$Promise$all4, catalogApiData, serieData, itemsList, catalogData;
+        var staleSafe, promises, _yield$Promise$all3, _yield$Promise$all4, catalogApiData, serieData, itemsList, resolvedSerieId, _yield$Promise$all5, _yield$Promise$all6, catalogData;
         return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              promises = [state.api.getDataCache(state.api.getIDMCatalog(accountId), undefined, undefined, 'enricher'), state.api.getDataCache(state.api.getIDMSerieByNo(accountId, serieId, serieNo), undefined, undefined, 'enricher'), state.api.getDataCache(state.api.getIDMItems(accountId, serieId, serieNo), undefined, undefined, 'enricher')
+              // A stale serieId 404s these fetches (fetchData THROWS) — swallow ONLY that, so the re-resolve below gets its
+              // chance; every other failure (500, timeout, auth) stays an error instead of passing as 'serie not found', and
+              // still surfaces the enricher error modal that `dontLogError` skipped for the 404's sake.
+              staleSafe = function staleSafe(queryString) {
+                return state.api.useIDMService ? state.api.getDataCache(queryString, undefined, undefined, 'enricher', undefined, undefined, true)["catch"](function (error) {
+                  if ((error === null || error === void 0 ? void 0 : error.status) === 404) return undefined;
+                  state.api.notifyEnricherErrorForQuery(queryString, 'enricher');
+                  throw error;
+                }) : state.api.getDataCache(queryString, undefined, undefined, 'enricher');
+              };
+              promises = [state.api.getDataCache(state.api.getIDMCatalog(accountId), undefined, undefined, 'enricher'), staleSafe(state.api.getIDMSerieByNo(accountId, serieId, serieNo)), staleSafe(state.api.getIDMItems(accountId, serieId, serieNo))
               //!state.api.dontLoadAdditionalModelInfos ? this.getAdditionalModeInfos(state, serieId, accountId) : undefined,
               ];
-              _context4.next = 3;
+              _context4.next = 4;
               return Promise.all(promises);
-            case 3:
+            case 4:
               _yield$Promise$all3 = _context4.sent;
               _yield$Promise$all4 = _slicedToArray__default["default"](_yield$Promise$all3, 3);
               catalogApiData = _yield$Promise$all4[0];
               serieData = _yield$Promise$all4[1];
               itemsList /*additionalModelInfos*/ = _yield$Promise$all4[2];
+              if (!(state.api.useIDMService && (!serieData || !itemsList || "".concat(serieData.serieNo) !== "".concat(serieNo)))) {
+                _context4.next = 21;
+                break;
+              }
+              _context4.next = 12;
+              return this.resolveIDMSerieIdByNo(state, accountId, serieNo);
+            case 12:
+              resolvedSerieId = _context4.sent;
+              if (resolvedSerieId) {
+                _context4.next = 15;
+                break;
+              }
+              throw new Error('Serie not found: ' + serieNo);
+            case 15:
+              _context4.next = 17;
+              return Promise.all([state.api.getDataCache(state.api.getIDMSerieByNo(accountId, resolvedSerieId, serieNo), undefined, undefined, 'enricher'), state.api.getDataCache(state.api.getIDMItems(accountId, resolvedSerieId, serieNo), undefined, undefined, 'enricher')]);
+            case 17:
+              _yield$Promise$all5 = _context4.sent;
+              _yield$Promise$all6 = _slicedToArray__default["default"](_yield$Promise$all5, 2);
+              serieData = _yield$Promise$all6[0];
+              itemsList = _yield$Promise$all6[1];
+            case 21:
               if (serieData) {
-                _context4.next = 10;
+                _context4.next = 23;
                 break;
               }
               throw new Error('Serie not found: ' + serieNo);
-            case 10:
+            case 23:
               catalogData = new DivaCatalogData(_objectSpread$m(_objectSpread$m({}, serieData), {}, {
                 catalogData: catalogApiData
               }), serieNo, orderSet, state.api, itemsList, undefined, true, undefined /*additionalModelInfos*/);
-              _context4.next = 13;
+              _context4.next = 26;
               return this.loadCatalogXml(state, catalogData);
-            case 13:
+            case 26:
               return _context4.abrupt("return", catalogData);
-            case 14:
+            case 27:
             case "end":
               return _context4.stop();
           }
@@ -23468,48 +23580,77 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
         return _loadIDMCatalog.apply(this, arguments);
       }
       return loadIDMCatalog;
-    }()
+    }() /** Resolves a serieNo to the serie's `_id` via the catalog's series list; undefined when no serie carries that number. */
+  }, {
+    key: "resolveIDMSerieIdByNo",
+    value: (function () {
+      var _resolveIDMSerieIdByNo = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(state, accountId, serieNo) {
+        var _response$data, _series$find;
+        var response, payload, series;
+        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.next = 2;
+              return state.api.getDataCache(state.api.getIDMSeriesList(accountId), undefined, undefined, 'enricher');
+            case 2:
+              response = _context5.sent;
+              payload = (_response$data = response === null || response === void 0 ? void 0 : response.data) !== null && _response$data !== void 0 ? _response$data : response;
+              series = Array.isArray(payload) ? payload : [];
+              return _context5.abrupt("return", (_series$find = series.find(function (serie) {
+                return "".concat(serie.serieNo) === "".concat(serieNo);
+              })) === null || _series$find === void 0 ? void 0 : _series$find._id);
+            case 6:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5);
+      }));
+      function resolveIDMSerieIdByNo(_x15, _x16, _x17) {
+        return _resolveIDMSerieIdByNo.apply(this, arguments);
+      }
+      return resolveIDMSerieIdByNo;
+    }())
   }, {
     key: "loadCatalogXml",
     value: function () {
-      var _loadCatalogXml = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(state, catalogData) {
+      var _loadCatalogXml = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(state, catalogData) {
         var constructorServiceUrl, iln, xml;
-        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               // Loaded even when the HQS is assembled remotely: the catalog XML's GEO names are needed for the
               // accessory variant-family mesh swap (FreePlacesOnGrids.geo3DName), not just for local assembly.
               constructorServiceUrl = state.api.getConstructorServiceUrl();
               iln = catalogData.supplierILN;
               if (!(!constructorServiceUrl || !iln)) {
-                _context5.next = 4;
+                _context6.next = 4;
                 break;
               }
-              return _context5.abrupt("return");
+              return _context6.abrupt("return");
             case 4:
               bootMark('catalog-xml start');
-              _context5.prev = 5;
-              _context5.next = 8;
+              _context6.prev = 5;
+              _context6.next = 8;
               return state.api.getCatalogXml(iln, catalogData.catalogCodex);
             case 8:
-              xml = _context5.sent;
+              xml = _context6.sent;
               if (xml) catalogData.catalogXml = xml;
               bootMark('catalog-xml done', {
                 chars: xml ? xml.length : 0
               });
-              _context5.next = 16;
+              _context6.next = 16;
               break;
             case 13:
-              _context5.prev = 13;
-              _context5.t0 = _context5["catch"](5);
-              LOG$i.debug('Failed to pre-load catalogXml: ' + _context5.t0);
+              _context6.prev = 13;
+              _context6.t0 = _context6["catch"](5);
+              LOG$i.debug('Failed to pre-load catalogXml: ' + _context6.t0);
             case 16:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, null, [[5, 13]]);
+        }, _callee6, null, [[5, 13]]);
       }));
-      function loadCatalogXml(_x15, _x16) {
+      function loadCatalogXml(_x18, _x19) {
         return _loadCatalogXml.apply(this, arguments);
       }
       return loadCatalogXml;
@@ -23517,27 +23658,27 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
   }, {
     key: "getAdditionalModeInfos",
     value: function () {
-      var _getAdditionalModeInfos = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(state, serieId, accountId) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _getAdditionalModeInfos = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(state, serieId, accountId) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context6.prev = 0;
-              _context6.next = 3;
+              _context7.prev = 0;
+              _context7.next = 3;
               return state.api.getDataCache(state.api.getAdditionalModelInfosQS(accountId, serieId, state.api.OrganizationId), undefined, undefined, 'catalog');
             case 3:
-              return _context6.abrupt("return", _context6.sent);
+              return _context7.abrupt("return", _context7.sent);
             case 6:
-              _context6.prev = 6;
-              _context6.t0 = _context6["catch"](0);
+              _context7.prev = 6;
+              _context7.t0 = _context7["catch"](0);
               LOG$i.debug('additional ModelInfo not found');
-              return _context6.abrupt("return", undefined);
+              return _context7.abrupt("return", undefined);
             case 10:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, null, [[0, 6]]);
+        }, _callee7, null, [[0, 6]]);
       }));
-      function getAdditionalModeInfos(_x17, _x18, _x19) {
+      function getAdditionalModeInfos(_x20, _x21, _x22) {
         return _getAdditionalModeInfos.apply(this, arguments);
       }
       return getAdditionalModeInfos;
@@ -23896,11 +24037,21 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     key: "isInvisible",
     get: function get() {
       return this.articleOptionState.invisible;
-    },
+    }
+    /**
+     * Restore the load-time visibility defaults (catalog + mask). IDM visibility is re-derived on
+     * every decision evaluation — a SET_FEATURE_INVISIBLE only holds while its condition matches.
+     */,
     set: function set(isInvisible) {
       this.articleOptionState.invisible = isInvisible;
       this.articleOptionState.invisibleWithoutMaskeInfluence = isInvisible;
     }
+  }, {
+    key: "resetVisibilityToOptionDefaults",
+    value: function resetVisibilityToOptionDefaults() {
+      this.articleOptionState.invisible = this.option.isInvisible;
+      this.articleOptionState.invisibleWithoutMaskeInfluence = this.option.isInvisibleWithoutMaskeInfluence;
+    }
   }, {
     key: "invisibleWithoutMaskeInfluence",
     get: function get() {
@@ -26449,7 +26600,9 @@ var IDMEngine = /*#__PURE__*/function () {
       var beforeHash = undefined;
       var afterHash = undefined;
       var count = 0;
-      var startTime = Date.now();
+      // Same gate as the per-decision line below: the string is built before LOG.debug is called.
+      var timeEval = this.article.set.logDecisions;
+      var startTime = timeEval ? Date.now() : 0;
       this.article.decisionDebugStacks = [];
       if (this.article.set.logDecisions) this.article.dataCreationErrors = [];
       do {
@@ -26459,8 +26612,7 @@ var IDMEngine = /*#__PURE__*/function () {
         afterHash = JSON.stringify(this.article.snapshot);
         count++;
       } while (afterHash !== beforeHash && count < 50 && !onlyUpdateOnce);
-      var endTime = Date.now();
-      LOG$g.debug('eval Decisions total time in ' + (endTime - startTime) + ' of ' + count);
+      if (timeEval) LOG$g.debug('eval Decisions total time in ' + (Date.now() - startTime) + ' of ' + count);
     }
   }, {
     key: "decisions",
@@ -26564,6 +26716,7 @@ var IDMEngine = /*#__PURE__*/function () {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
             var ops = _step4.value;
             ops.updateVisibleOptionValues(ops.option.articleOptionValues);
+            ops.resetVisibilityToOptionDefaults();
             if (!ops.val) this.updateArtOPV(this.article.getDefaultOpv(ops.visibleOptionValues), ops.optionCodex, ops, undefined);
             ops.definedBySetFeatureFixed = false;
           }
@@ -26586,6 +26739,7 @@ var IDMEngine = /*#__PURE__*/function () {
         for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
           var _ops = _step5.value;
           _ops.updateVisibleOptionValues(_ops.option.articleOptionValues);
+          _ops.resetVisibilityToOptionDefaults();
           if (!_ops.val) this.updateArtOPV(this.article.getDefaultOpv(_ops.visibleOptionValues), _ops.optionCodex, _ops, undefined);
           _ops.definedBySetFeatureFixed = false;
         }
@@ -26597,8 +26751,10 @@ var IDMEngine = /*#__PURE__*/function () {
       this.decisionDebugStack = [];
       var beforeSnapshot = this.article.set.logDecisions ? this.article.snapshot : undefined;
       var beforeDecisionState = this.article.set.logDecisions ? this.decisionStateSnapshot(decisions) : undefined;
+      // Gated on the same flag as the snapshots above — the Date.now() calls and string concatenation must not run with logging off.
+      var timeDecisions = this.article.set.logDecisions;
       for (var m = 0; m < decisions.length; m++) {
-        var startTime = Date.now();
+        var startTime = timeDecisions ? Date.now() : 0;
         //Alle Optionen Mit DOC Type 1 ermitten - diese zunächst alle ausblenden, werden dann später über Formeln wieder eingeschaltets
         var decision = decisions[m];
         if (decision.enabled && decision.optionCombinations.length) {
@@ -26622,8 +26778,7 @@ var IDMEngine = /*#__PURE__*/function () {
         var pushed = this.pushDecisionDebug(decision, decisions, beforeSnapshot, beforeDecisionState);
         beforeSnapshot = pushed === null || pushed === void 0 ? void 0 : pushed.afterSnapshot;
         beforeDecisionState = pushed === null || pushed === void 0 ? void 0 : pushed.afterDecisionState;
-        var endTime = Date.now();
-        LOG$g.debug('decision ' + decision.decisionNo + ' time ' + (endTime - startTime));
+        if (timeDecisions) LOG$g.debug('decision ' + decision.decisionNo + ' time ' + (Date.now() - startTime));
       }
       this.article.decisionDebugStacks.push({
         stack: this.decisionDebugStack,
@@ -26794,6 +26949,145 @@ var IDMEngine = /*#__PURE__*/function () {
       }
       return (_this$article$getArti = this.article.getArticleOptionStateFlat(targetFeatureNo)) === null || _this$article$getArti === void 0 ? void 0 : _this$article$getArti.visibleOptionValues;
     }
+
+    /**
+     * Statically derives the visible option values of `targetFeatureNo` under the hypothetical selection
+     * `groupFeatureNo = groupValueCodex` from the type-1 decision ROWS (no clone, no mutation) — exact only for
+     * the two-group-families standard shape; any other shape returns undefined and the caller falls back.
+     */
+  }, {
+    key: "staticVisibleOptionValuesForFeature",
+    value: function staticVisibleOptionValuesForFeature(targetFeatureNo, groupFeatureNo, groupValueCodex) {
+      var targetOps = this.article.getArticleOptionStateFlat(targetFeatureNo);
+      if (!targetOps || !this.article.getArticleOptionStateFlat(groupFeatureNo)) return undefined;
+      var decisions = this.decisions;
+      // type 0/1 decisions restrict every feature in their featureRefs — only the pure group→target shape is derivable
+      var influencing = decisions.filter(function (decision) {
+        var _decision$featureRefs3;
+        return decision.decisionType != 2 && ((_decision$featureRefs3 = decision.featureRefs) === null || _decision$featureRefs3 === void 0 ? void 0 : _decision$featureRefs3.includes(targetFeatureNo));
+      });
+      var _iterator11 = _createForOfIteratorHelper$e(influencing),
+        _step11;
+      try {
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var decision = _step11.value;
+          if (decision.decisionType != 1) return undefined;
+          if (decision.featureRefs.some(function (featureNo) {
+            return featureNo != targetFeatureNo && featureNo != groupFeatureNo;
+          })) return undefined;
+          if (this.sortFeatures(_toConsumableArray__default["default"](decision.featureRefs))[0] != groupFeatureNo) return undefined;
+        }
+        // A type-2 is judged by its ACTIONS: it interferes only when one SETS/FIXES/HIDES the target or toggles an influencing decision.
+      } catch (err) {
+        _iterator11.e(err);
+      } finally {
+        _iterator11.f();
+      }
+      var influencingNos = influencing.map(function (decision) {
+        return decision.decisionNo;
+      });
+      var targetNo = Number(targetFeatureNo);
+      var groupNo = Number(groupFeatureNo);
+      var type2Interferes = decisions.some(function (decision) {
+        var _decision$optionCombi3;
+        return decision.decisionType == 2 && ((_decision$optionCombi3 = decision.optionCombinations) === null || _decision$optionCombi3 === void 0 ? void 0 : _decision$optionCombi3.some(function (combination) {
+          var _actions$disableDecis, _actions$enableDecisi, _actions$setFeature, _actions$setFeatureDe, _actions$setFeatureDe2, _actions$setFeatureFi, _actions$setFeatureIn, _actions$setFeatureVi;
+          var actions = combination.projectActions;
+          var togglesInfluencing = [].concat(_toConsumableArray__default["default"]((_actions$disableDecis = actions === null || actions === void 0 ? void 0 : actions.disableDecision) !== null && _actions$disableDecis !== void 0 ? _actions$disableDecis : []), _toConsumableArray__default["default"]((_actions$enableDecisi = actions === null || actions === void 0 ? void 0 : actions.enableDecision) !== null && _actions$enableDecisi !== void 0 ? _actions$enableDecisi : [])).some(function (ref) {
+            return influencingNos.includes(Number(ref.decisionNo));
+          });
+          // An action on the GROUP feature overrides the hypothesized value — bail to the full-reconfiguration fallback.
+          var touchesTargetOrGroup = [].concat(_toConsumableArray__default["default"]((_actions$setFeature = actions === null || actions === void 0 ? void 0 : actions.setFeature) !== null && _actions$setFeature !== void 0 ? _actions$setFeature : []), _toConsumableArray__default["default"]((_actions$setFeatureDe = actions === null || actions === void 0 ? void 0 : actions.setFeatureDefault) !== null && _actions$setFeatureDe !== void 0 ? _actions$setFeatureDe : []), _toConsumableArray__default["default"]((_actions$setFeatureDe2 = actions === null || actions === void 0 ? void 0 : actions.setFeatureDefaultNull) !== null && _actions$setFeatureDe2 !== void 0 ? _actions$setFeatureDe2 : []), _toConsumableArray__default["default"]((_actions$setFeatureFi = actions === null || actions === void 0 ? void 0 : actions.setFeatureFixed) !== null && _actions$setFeatureFi !== void 0 ? _actions$setFeatureFi : []), _toConsumableArray__default["default"]((_actions$setFeatureIn = actions === null || actions === void 0 ? void 0 : actions.setFeatureInvisible) !== null && _actions$setFeatureIn !== void 0 ? _actions$setFeatureIn : []), _toConsumableArray__default["default"]((_actions$setFeatureVi = actions === null || actions === void 0 ? void 0 : actions.setFeatureVisible) !== null && _actions$setFeatureVi !== void 0 ? _actions$setFeatureVi : [])).some(function (action) {
+            return Number(action.featureNo) == targetNo || Number(action.featureNo) == groupNo;
+          });
+          return togglesInfluencing || touchesTargetOrGroup;
+        }));
+      });
+      if (type2Interferes) return undefined;
+
+      // Pool per decision = UNION of matching rows' target options; successive decisions INTERSECT (mirrors evalType1Decision).
+      var pool = undefined;
+      var _iterator12 = _createForOfIteratorHelper$e(influencing),
+        _step12;
+      try {
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var _decision3$optionComb;
+          var _decision3 = _step12.value;
+          var decisionPool = new Set();
+          var anyRowMatched = false;
+          var _iterator14 = _createForOfIteratorHelper$e((_decision3$optionComb = _decision3.optionCombinations) !== null && _decision3$optionComb !== void 0 ? _decision3$optionComb : []),
+            _step14;
+          try {
+            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+              var _combination$projectO, _combination$projectO2, _groupRef$options, _targetRef$options;
+              var combination = _step14.value;
+              var groupRef = this.getOptionListOfRef((_combination$projectO = combination.projectOptionsSetRefs) === null || _combination$projectO === void 0 ? void 0 : _combination$projectO.find(function (ref) {
+                return ref.featureNo == Number(groupFeatureNo);
+              }));
+              var targetRef = this.getOptionListOfRef((_combination$projectO2 = combination.projectOptionsSetRefs) === null || _combination$projectO2 === void 0 ? void 0 : _combination$projectO2.find(function (ref) {
+                return ref.featureNo == Number(targetFeatureNo);
+              }));
+              if (!groupRef || !targetRef) return undefined;
+              if (![0, 2].includes(groupRef.operator) || ![0, 2].includes(targetRef.operator)) return undefined;
+              if (!((_groupRef$options = groupRef.options) !== null && _groupRef$options !== void 0 && _groupRef$options.includes(groupValueCodex))) continue;
+              // evalType1Decision treats a matching row with NO target options as "unrestricted", not as "nothing allowed" -
+              // the static pool cannot express that, so leave this feature to the reconfiguration fallback.
+              if (!((_targetRef$options = targetRef.options) !== null && _targetRef$options !== void 0 && _targetRef$options.length)) return undefined;
+              anyRowMatched = true;
+              var _iterator15 = _createForOfIteratorHelper$e(targetRef.options),
+                _step15;
+              try {
+                for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+                  var option = _step15.value;
+                  decisionPool.add(option);
+                }
+              } catch (err) {
+                _iterator15.e(err);
+              } finally {
+                _iterator15.f();
+              }
+            }
+          } catch (err) {
+            _iterator14.e(err);
+          } finally {
+            _iterator14.f();
+          }
+          if (!anyRowMatched) continue;
+          pool = pool == undefined ? decisionPool : new Set(_toConsumableArray__default["default"](decisionPool).filter(function (key) {
+            var _pool;
+            return (_pool = pool) === null || _pool === void 0 ? void 0 : _pool.has(key);
+          }));
+        }
+      } catch (err) {
+        _iterator12.e(err);
+      } finally {
+        _iterator12.f();
+      }
+      var allValues = targetOps.option.articleOptionValues;
+      if (pool == undefined) return new Map(allValues);
+      // A grouped target keys `articleOptionValues` by its OPG codices and nests the values inside them, while the
+      // decision rows name the nested values — filtering by key would silently yield an empty pool, and the caller
+      // reads an empty map as "nothing selectable" instead of falling back. Leave that shape to the reconfiguration.
+      if (targetOps.option.hasOPG && _toConsumableArray__default["default"](pool).some(function (key) {
+        return !allValues.has(key);
+      })) return undefined;
+      var result = new Map();
+      var _iterator13 = _createForOfIteratorHelper$e(allValues),
+        _step13;
+      try {
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var _step13$value = _slicedToArray__default["default"](_step13.value, 2),
+            key = _step13$value[0],
+            value = _step13$value[1];
+          if (pool.has(key)) result.set(key, value);
+        }
+      } catch (err) {
+        _iterator13.e(err);
+      } finally {
+        _iterator13.f();
+      }
+      return result;
+    }
   }, {
     key: "presetFeatureValues",
     value: function presetFeatureValues(presetValues) {
@@ -26826,11 +27120,11 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "evalType1Decision",
     value: function evalType1Decision(decision) {
-      var _decision$featureRefs3,
+      var _decision$featureRefs4,
         _this4 = this;
       var validOptions = {};
       var doAlsoCheckFeatureNos = [];
-      if (!decision.optionCombinations.length || !((_decision$featureRefs3 = decision.featureRefs) !== null && _decision$featureRefs3 !== void 0 && _decision$featureRefs3.length)) return;
+      if (!decision.optionCombinations.length || !((_decision$featureRefs4 = decision.featureRefs) !== null && _decision$featureRefs4 !== void 0 && _decision$featureRefs4.length)) return;
       var sortedDeatureRefs = this.sortFeatures(decision.featureRefs);
       var _loop2 = function _loop2() {
         var featureNo = sortedDeatureRefs[p];
@@ -26942,13 +27236,13 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "evalType0Decision",
     value: function evalType0Decision(decision) {
-      var _decision$optionCombi3,
-        _decision$featureRefs4,
+      var _decision$optionCombi4,
         _decision$featureRefs5,
+        _decision$featureRefs6,
         _this5 = this;
       var invalidOptions = {},
         doAlsoCheckFeature = [];
-      if (!((_decision$optionCombi3 = decision.optionCombinations) !== null && _decision$optionCombi3 !== void 0 && _decision$optionCombi3.length) || ((_decision$featureRefs4 = (_decision$featureRefs5 = decision.featureRefs) === null || _decision$featureRefs5 === void 0 ? void 0 : _decision$featureRefs5.length) !== null && _decision$featureRefs4 !== void 0 ? _decision$featureRefs4 : 0) <= 1) return;
+      if (!((_decision$optionCombi4 = decision.optionCombinations) !== null && _decision$optionCombi4 !== void 0 && _decision$optionCombi4.length) || ((_decision$featureRefs5 = (_decision$featureRefs6 = decision.featureRefs) === null || _decision$featureRefs6 === void 0 ? void 0 : _decision$featureRefs6.length) !== null && _decision$featureRefs5 !== void 0 ? _decision$featureRefs5 : 0) <= 1) return;
       var sortedDeatureRefs = this.sortFeatures(decision.featureRefs);
       var _loop4 = function _loop4() {
         var featureNo = sortedDeatureRefs[p];
@@ -27065,9 +27359,9 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "evalType2Decision",
     value: function evalType2Decision(decision, allDecisions) {
-      var _decision$optionCombi4;
+      var _decision$optionCombi5;
       var hasSetFeatureInvisible = {};
-      if (!((_decision$optionCombi4 = decision.optionCombinations) !== null && _decision$optionCombi4 !== void 0 && _decision$optionCombi4.length)) return;
+      if (!((_decision$optionCombi5 = decision.optionCombinations) !== null && _decision$optionCombi5 !== void 0 && _decision$optionCombi5.length)) return;
       var _ref5 = this.getMatchingOptionCombination(decision.optionCombinations, decision.decisionNo),
         _ref6 = _slicedToArray__default["default"](_ref5, 1),
         combination = _ref6[0];
@@ -27087,12 +27381,12 @@ var IDMEngine = /*#__PURE__*/function () {
     key: "evalDisableDecision",
     value: function evalDisableDecision(actions, decision, allDecisions, disable) {
       var verb = disable ? 'disabled' : 'enabled';
-      var _iterator11 = _createForOfIteratorHelper$e(actions),
-        _step11;
+      var _iterator16 = _createForOfIteratorHelper$e(actions),
+        _step16;
       try {
         var _loop6 = function _loop6() {
           var _dec$disableHistory;
-          var action = _step11.value;
+          var action = _step16.value;
           var dec = allDecisions.find(function (d) {
             return d.decisionNo == Number(action.decisionNo);
           });
@@ -27103,42 +27397,42 @@ var IDMEngine = /*#__PURE__*/function () {
           dec.enabled = !disable;
           (_dec$disableHistory = dec.disableHistory) === null || _dec$disableHistory === void 0 || _dec$disableHistory.push(verb + ' By ' + decision.decisionNo);
         };
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
           if (_loop6()) continue;
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator11.f();
+        _iterator16.f();
       }
     }
   }, {
     key: "evalSetFeatureVisible",
     value: function evalSetFeatureVisible(actions, hasSetFeatureInvisible, invisible) {
-      var _iterator12 = _createForOfIteratorHelper$e(actions),
-        _step12;
+      var _iterator17 = _createForOfIteratorHelper$e(actions),
+        _step17;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var action = _step12.value;
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var action = _step17.value;
           if (!this.article.getArticleOptionState(action.featureNo.toString()) || !action.featureNo) continue;
           var ops = this.article.getArticleOptionState(action.featureNo.toString());
           if (invisible) hasSetFeatureInvisible[action.featureNo.toString()] = invisible;
           if (ops) ops.isInvisible = invisible;
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator12.f();
+        _iterator17.f();
       }
     }
   }, {
     key: "evalSetFeatureDefault",
     value: function evalSetFeatureDefault(actions, decision, isNull) {
-      var _iterator13 = _createForOfIteratorHelper$e(actions),
-        _step13;
+      var _iterator18 = _createForOfIteratorHelper$e(actions),
+        _step18;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var action = _step13.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var action = _step18.value;
           var ops = this.article.getArticleOptionState(action.featureNo.toString());
           if (ops && (isNull && ops.val === undefined || !isNull && (ops.val === undefined || !ops.valueWasSet))) {
             if (action.formulaRef) {
@@ -27163,20 +27457,20 @@ var IDMEngine = /*#__PURE__*/function () {
           break;
         }
       } catch (err) {
-        _iterator13.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator13.f();
+        _iterator18.f();
       }
     }
   }, {
     key: "evalSetFeature",
     value: function evalSetFeature(actions, decision, isFixed) {
-      var _iterator14 = _createForOfIteratorHelper$e(actions),
-        _step14;
+      var _iterator19 = _createForOfIteratorHelper$e(actions),
+        _step19;
       try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
           var _action$featureNo2;
-          var action = _step14.value;
+          var action = _step19.value;
           if (!this.article.getArticleOptionState((_action$featureNo2 = action.featureNo) === null || _action$featureNo2 === void 0 ? void 0 : _action$featureNo2.toString()) || !action.featureNo) {
             //usecase is that it want to be set on partlistarticle that is not currently loaded so its not found
             LOG$g.debug('evalSetFeature decision ' + decision.decisionNo + ' (isFixed=' + isFixed + '): target feature ' + action.featureNo + ' has no option state on article ' + this.article.articleCodex + ' - action skipped');
@@ -27221,9 +27515,9 @@ var IDMEngine = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator14.e(err);
+        _iterator19.e(err);
       } finally {
-        _iterator14.f();
+        _iterator19.f();
       }
     }
   }, {
@@ -27302,7 +27596,7 @@ var IDMEngine = /*#__PURE__*/function () {
       for (var i = 0; i < priceFeatureGroups.length; i++) {
         var priceFeatureGroup = priceFeatureGroups[i];
         this.checkPriceGroupAllZeros(priceFeatureGroup);
-        var _this$getMatchingOpti = this.getMatchingOptionCombination(priceFeatureGroup.projectFinishes),
+        var _this$getMatchingOpti = this.getMatchingOptionCombination(priceFeatureGroup.projectFinishes, undefined, "price feature group ".concat(priceFeatureGroup.priceFeatureGroupNo, " finishes")),
           _this$getMatchingOpti2 = _slicedToArray__default["default"](_this$getMatchingOpti, 2);
           _this$getMatchingOpti2[0];
           var index = _this$getMatchingOpti2[1];
@@ -27335,7 +27629,7 @@ var IDMEngine = /*#__PURE__*/function () {
         var _priceFeatureGroup$pr;
         var _priceFeatureGroup = priceFeatureGroups[_i];
         if ((_priceFeatureGroup$pr = _priceFeatureGroup.projectPercentageSurcharges) !== null && _priceFeatureGroup$pr !== void 0 && _priceFeatureGroup$pr.length) {
-          var _this$getMatchingOpti3 = this.getMatchingOptionCombination(_priceFeatureGroup.projectPercentageSurcharges),
+          var _this$getMatchingOpti3 = this.getMatchingOptionCombination(_priceFeatureGroup.projectPercentageSurcharges, undefined, "price feature group ".concat(_priceFeatureGroup.priceFeatureGroupNo, " percentage surcharges")),
             _this$getMatchingOpti4 = _slicedToArray__default["default"](_this$getMatchingOpti3, 2),
             ps = _this$getMatchingOpti4[0],
             indexPs = _this$getMatchingOpti4[1];
@@ -27385,7 +27679,7 @@ var IDMEngine = /*#__PURE__*/function () {
         var _priceFeatureGroup2$p;
         var _priceFeatureGroup2 = priceFeatureGroups[_i2];
         if ((_priceFeatureGroup2$p = _priceFeatureGroup2.projectPercentageSurcharges) !== null && _priceFeatureGroup2$p !== void 0 && _priceFeatureGroup2$p.length) {
-          var _this$getMatchingOpti5 = this.getMatchingOptionCombination(_priceFeatureGroup2.projectPercentageSurcharges),
+          var _this$getMatchingOpti5 = this.getMatchingOptionCombination(_priceFeatureGroup2.projectPercentageSurcharges, undefined, "price feature group ".concat(_priceFeatureGroup2.priceFeatureGroupNo, " percentage surcharges")),
             _this$getMatchingOpti6 = _slicedToArray__default["default"](_this$getMatchingOpti5, 2),
             _ps = _this$getMatchingOpti6[0],
             _indexPs = _this$getMatchingOpti6[1];
@@ -27600,18 +27894,18 @@ var IDMEngine = /*#__PURE__*/function () {
         for (var c = 0; c < decisions.length; c++) {
           var decision = decisions[c];
           lastTriedDecisionNo = decision.decisionNo;
-          var relationTypeNone = myPartListPos.decisionPosCount !== decision.decisionNo;
-          var isValidDOC = relationTypeNone ? undefined : this.checkDecisionNumber(decision.decisionNo);
-          if (!isValidDOC && !relationTypeNone) {
-            continue;
-          }
+          // Only the position's COUNT decision gates loading; the other attached decisions are pass-down payload.
+          if (myPartListPos.decisionPosCount !== decision.decisionNo) continue;
+          if (!this.checkDecisionNumber(decision.decisionNo)) continue;
           partlistAdded = true;
-          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, undefined, !relationTypeNone ? decision.decisionNo : undefined, 'Decision matched');
+          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, undefined, decision.decisionNo, 'Decision matched');
           break;
         }
-        if (decisions.length === 0 && !partlistAdded) {
-          LOG$g.log('partlistarticle loaded for haveing 0 decisions: ', myPartListPos.itemRefTypeNo);
-          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, undefined, undefined, 'No decisions');
+        // Without a COUNT decision nothing gates the position: attached pass-down decisions are payload, so such a
+        // position loads like one with no decisions at all (it did before the pass-down decisions stopped gating).
+        if (!myPartListPos.decisionPosCount && !partlistAdded) {
+          LOG$g.log('partlistarticle loaded for having no count decision: ', myPartListPos.itemRefTypeNo);
+          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, undefined, undefined, decisions.length ? 'No count decision' : 'No decisions');
         } else if (!partlistAdded && myPartListPos.posCountValue > 0) {
           LOG$g.log('partlistarticle loaded for having default PosCountValue ', myPartListPos.itemRefTypeNo);
           partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, undefined, undefined, 'Default posCountValue');
@@ -27697,9 +27991,9 @@ var IDMEngine = /*#__PURE__*/function () {
         _loop8(i);
       }
       if (quanitity >= 1) {
-        var _catalogCodex$toStrin, _ref7;
+        var _ref7;
         partlistArticlesToLoad.push({
-          CatalogCodex: (_catalogCodex$toStrin = catalogCodex.toString()) !== null && _catalogCodex$toStrin !== void 0 ? _catalogCodex$toStrin : this.article.catalogCodex,
+          CatalogCodex: catalogCodex != null ? catalogCodex.toString() : this.article.catalogCodex,
           BasketID: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.basketId,
           ArticleCodex: articleCodex,
           Quantity: quanitity,
@@ -27713,6 +28007,9 @@ var IDMEngine = /*#__PURE__*/function () {
           ConfigurationMode: myPartListPos.configurationMode,
           VariantValues: this.article.variantValuesForPla(myPartListPos.configurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
           VariantItemData: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantItemData,
+          // the replaced instance's own children seed the new instance's previous-map, so selections
+          // deeper than one level survive a parent reload (same contract as the order-restore seed)
+          PreviousPartlistArticles: previousPartlistArticle !== null && previousPartlistArticle !== void 0 && previousPartlistArticle.partlistArticles && Object.keys(previousPartlistArticle.partlistArticles).length ? previousPartlistArticle.partlistArticles : undefined,
           optionsForPrint: featuresForPrint,
           RetailArticleNr: myPartListPos.retailArticleNr && myPartListPos.retailArticleNr !== '' ? myPartListPos.retailArticleNr : undefined,
           RetailPrefix: (_ref7 = myPartListPos.retailPrefix) !== null && _ref7 !== void 0 ? _ref7 : undefined
@@ -27724,22 +28021,33 @@ var IDMEngine = /*#__PURE__*/function () {
       }
       return partlistArticlesToLoad;
     }
+
+    /**
+     * The first rule row whose conditions hold, with its index - a conditionless row matches unconditionally, which
+     * makes it the documented fallback when it is the LAST row and a fault when rows follow it. That fault is reported
+     * as WC_0012 for decisions and price rule sets alike; `ruleSet` names the set in the message where no decisionNo does.
+     */
   }, {
     key: "getMatchingOptionCombination",
-    value: function getMatchingOptionCombination(combinations, decisionNo) {
+    value: function getMatchingOptionCombination(combinations, decisionNo, ruleSet) {
       for (var i = 0; i < combinations.length; i++) {
         var _ref8, _ref9, _projectOptionsSetRef;
         var combination = combinations[i];
         var optionSetRefs = (_ref8 = (_ref9 = (_projectOptionsSetRef = combination.projectOptionsSetRefs) !== null && _projectOptionsSetRef !== void 0 ? _projectOptionsSetRef : combination.optionsSetRef) !== null && _ref9 !== void 0 ? _ref9 : combination.optionsSetRef) !== null && _ref8 !== void 0 ? _ref8 : [];
         if (optionSetRefs.length === 0) {
-          if (decisionNo !== undefined) {
+          // A conditionless LAST row is the documented fallback; a conditionless row with rows AFTER it is the fault (first match wins).
+          var shadowsLaterRows = i < combinations.length - 1;
+          if ((decisionNo !== undefined || ruleSet !== undefined) && shadowsLaterRows && !this.isShadowedRowReported(decisionNo, ruleSet, i)) {
+            var where = ruleSet !== null && ruleSet !== void 0 ? ruleSet : "decision ".concat(decisionNo);
             this.article.pushDataCreationError({
               code: 'WC_0012',
-              message: 'Rule with no conditions - always true, not useful',
+              message: "Rule row ".concat(i + 1, " of ").concat(where, " has no conditions but is not the last row - it always matches, so the ").concat(combinations.length - i - 1, " row(s) after it can never be reached"),
               severity: 'warning',
               custom: {
                 decisionNo: decisionNo,
+                ruleSet: ruleSet,
                 combinationIndex: i,
+                shadowedRows: combinations.length - i - 1,
                 catalogCodex: this.article.catalogCodex,
                 articleCodex: this.article.articleCodex
               }
@@ -27751,6 +28059,19 @@ var IDMEngine = /*#__PURE__*/function () {
       }
       return [undefined, undefined];
     }
+
+    /**
+     * Whether WC_0012 was already recorded for this row: evalDecisions clears the errors once and then converges over
+     * several passes, so the same matching row would otherwise report the same fault once per pass.
+     */
+  }, {
+    key: "isShadowedRowReported",
+    value: function isShadowedRowReported(decisionNo, ruleSet, combinationIndex) {
+      return this.article.dataCreationErrors.some(function (error) {
+        var _error$custom, _error$custom2, _error$custom3;
+        return error.code === 'WC_0012' && ((_error$custom = error.custom) === null || _error$custom === void 0 ? void 0 : _error$custom.decisionNo) === decisionNo && ((_error$custom2 = error.custom) === null || _error$custom2 === void 0 ? void 0 : _error$custom2.ruleSet) === ruleSet && ((_error$custom3 = error.custom) === null || _error$custom3 === void 0 ? void 0 : _error$custom3.combinationIndex) === combinationIndex;
+      });
+    }
   }, {
     key: "evalCombi",
     value: function evalCombi(optionSetRefs) {
@@ -27810,25 +28131,25 @@ var IDMEngine = /*#__PURE__*/function () {
       var cached = this.featureDefaultIndex;
       if (cached && cached.sources[0] === sources[0] && cached.sources[1] === sources[1]) return cached.byFeature;
       var byFeature = new Map();
-      var _iterator15 = _createForOfIteratorHelper$e(this.decisions),
-        _step15;
+      var _iterator20 = _createForOfIteratorHelper$e(this.decisions),
+        _step20;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var _decision$optionCombi5;
-          var decision = _step15.value;
+        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+          var _decision$optionCombi6;
+          var decision = _step20.value;
           if (decision.decisionType !== 2) continue;
-          var _iterator16 = _createForOfIteratorHelper$e((_decision$optionCombi5 = decision.optionCombinations) !== null && _decision$optionCombi5 !== void 0 ? _decision$optionCombi5 : []),
-            _step16;
+          var _iterator21 = _createForOfIteratorHelper$e((_decision$optionCombi6 = decision.optionCombinations) !== null && _decision$optionCombi6 !== void 0 ? _decision$optionCombi6 : []),
+            _step21;
           try {
-            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+            for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
               var _combination$projectA10, _combination$projectA11;
-              var combination = _step16.value;
-              var _iterator17 = _createForOfIteratorHelper$e((_combination$projectA10 = (_combination$projectA11 = combination.projectActions) === null || _combination$projectA11 === void 0 ? void 0 : _combination$projectA11.setFeatureDefault) !== null && _combination$projectA10 !== void 0 ? _combination$projectA10 : []),
-                _step17;
+              var combination = _step21.value;
+              var _iterator22 = _createForOfIteratorHelper$e((_combination$projectA10 = (_combination$projectA11 = combination.projectActions) === null || _combination$projectA11 === void 0 ? void 0 : _combination$projectA11.setFeatureDefault) !== null && _combination$projectA10 !== void 0 ? _combination$projectA10 : []),
+                _step22;
               try {
-                for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+                for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
                   var _action$featureNo4, _byFeature$get;
-                  var action = _step17.value;
+                  var action = _step22.value;
                   var featureNo = (_action$featureNo4 = action.featureNo) === null || _action$featureNo4 === void 0 ? void 0 : _action$featureNo4.toString();
                   if (!featureNo) continue;
                   var list = (_byFeature$get = byFeature.get(featureNo)) !== null && _byFeature$get !== void 0 ? _byFeature$get : [];
@@ -27836,21 +28157,21 @@ var IDMEngine = /*#__PURE__*/function () {
                   byFeature.set(featureNo, list);
                 }
               } catch (err) {
-                _iterator17.e(err);
+                _iterator22.e(err);
               } finally {
-                _iterator17.f();
+                _iterator22.f();
               }
             }
           } catch (err) {
-            _iterator16.e(err);
+            _iterator21.e(err);
           } finally {
-            _iterator16.f();
+            _iterator21.f();
           }
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator20.e(err);
       } finally {
-        _iterator15.f();
+        _iterator20.f();
       }
       this.featureDefaultIndex = {
         sources: sources,
@@ -27865,13 +28186,15 @@ var IDMEngine = /*#__PURE__*/function () {
     value: function setFeatureDefaultKey(featureNo) {
       var decisions = this.type2DefaultsByFeature().get(featureNo);
       if (!decisions) return undefined;
-      var _iterator18 = _createForOfIteratorHelper$e(decisions),
-        _step18;
+      var _iterator23 = _createForOfIteratorHelper$e(decisions),
+        _step23;
       try {
-        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
           var _combination$projectA12;
-          var decision = _step18.value;
-          var _ref12 = this.getMatchingOptionCombination(decision.optionCombinations, decision.decisionNo),
+          var decision = _step23.value;
+          // A decision evalType2Decision also visits would report WC_0012 twice per convergence pass — a DISABLED one it skips
+          // entirely, so there the warning has to come from here.
+          var _ref12 = this.getMatchingOptionCombination(decision.optionCombinations, decision.enabled === false ? decision.decisionNo : undefined),
             _ref13 = _slicedToArray__default["default"](_ref12, 1),
             combination = _ref13[0];
           var key = combination === null || combination === void 0 || (_combination$projectA12 = combination.projectActions) === null || _combination$projectA12 === void 0 || (_combination$projectA12 = _combination$projectA12.setFeatureDefault) === null || _combination$projectA12 === void 0 || (_combination$projectA12 = _combination$projectA12.find(function (a) {
@@ -27881,9 +28204,9 @@ var IDMEngine = /*#__PURE__*/function () {
           if (key) return key;
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator23.e(err);
       } finally {
-        _iterator18.f();
+        _iterator23.f();
       }
       return undefined;
     }
@@ -27904,11 +28227,11 @@ var IDMEngine = /*#__PURE__*/function () {
     key: "updateIDMSpecificFeatures",
     value: function updateIDMSpecificFeatures() {
       //updaten idm planner specific options
-      var _iterator19 = _createForOfIteratorHelper$e(this.article.articleOptionStates.values()),
-        _step19;
+      var _iterator24 = _createForOfIteratorHelper$e(this.article.articleOptionStates.values()),
+        _step24;
       try {
-        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-          var ops = _step19.value;
+        for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
+          var ops = _step24.value;
           //when an option has no decisions the first visible optionValue has to be selected per default
           if (ops.val === undefined && ops.visibleCount) {
             // Prefer an authored type-2 default (when visible) over the arbitrary first-visible pick.
@@ -27931,9 +28254,9 @@ var IDMEngine = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator19.e(err);
+        _iterator24.e(err);
       } finally {
-        _iterator19.f();
+        _iterator24.f();
       }
     }
   }, {
@@ -28020,11 +28343,11 @@ var IDMEngine = /*#__PURE__*/function () {
     key: "getConditionValuesOfCombination",
     value: function getConditionValuesOfCombination(combination, featureNo, optionKey) {
       var variantValues = {};
-      var _iterator20 = _createForOfIteratorHelper$e(combination.projectOptionsSetRefs),
-        _step20;
+      var _iterator25 = _createForOfIteratorHelper$e(combination.projectOptionsSetRefs),
+        _step25;
       try {
-        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-          var optionSetRef = _step20.value;
+        for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
+          var optionSetRef = _step25.value;
           var optionList = this.getOptionListOfRef(optionSetRef);
           if (optionSetRef.featureNo.toString() == featureNo) {
             return optionKey && !(optionList !== null && optionList !== void 0 && optionList.options.includes(optionKey)) ? undefined : variantValues;
@@ -28033,9 +28356,9 @@ var IDMEngine = /*#__PURE__*/function () {
           variantValues[optionSetRef.featureNo.toString()] = optionList.options[0];
         }
       } catch (err) {
-        _iterator20.e(err);
+        _iterator25.e(err);
       } finally {
-        _iterator20.f();
+        _iterator25.f();
       }
       return variantValues;
     }
@@ -28061,18 +28384,18 @@ var IDMEngine = /*#__PURE__*/function () {
         })) return false;
         return _this8.decisionRemovesOption(restriction, featureNo, optionKey);
       };
-      var _iterator21 = _createForOfIteratorHelper$e(articleDecisions),
-        _step21;
+      var _iterator26 = _createForOfIteratorHelper$e(articleDecisions),
+        _step26;
       try {
-        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-          var gate = _step21.value;
+        for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
+          var gate = _step26.value;
           if (gate.decisionType != 2) continue;
-          var _iterator22 = _createForOfIteratorHelper$e(gate.optionCombinations),
-            _step22;
+          var _iterator27 = _createForOfIteratorHelper$e(gate.optionCombinations),
+            _step27;
           try {
-            for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+            for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
               var _combination$projectA13, _combination$projectA14;
-              var combination = _step22.value;
+              var combination = _step27.value;
               var enabled = (_combination$projectA13 = (_combination$projectA14 = combination.projectActions) === null || _combination$projectA14 === void 0 ? void 0 : _combination$projectA14.enableDecision) !== null && _combination$projectA13 !== void 0 ? _combination$projectA13 : [];
               if (!enabled.some(function (ref) {
                 return isGatedRestriction(Number(ref.decisionNo));
@@ -28080,15 +28403,15 @@ var IDMEngine = /*#__PURE__*/function () {
               variantValuesArr.push.apply(variantValuesArr, _toConsumableArray__default["default"](this.getValuesNotMatchingCombination(combination)));
             }
           } catch (err) {
-            _iterator22.e(err);
+            _iterator27.e(err);
           } finally {
-            _iterator22.f();
+            _iterator27.f();
           }
         }
       } catch (err) {
-        _iterator21.e(err);
+        _iterator26.e(err);
       } finally {
-        _iterator21.f();
+        _iterator26.f();
       }
       return variantValuesArr;
     }
@@ -28113,34 +28436,34 @@ var IDMEngine = /*#__PURE__*/function () {
     key: "getValuesNotMatchingCombination",
     value: function getValuesNotMatchingCombination(combination) {
       var variantValuesArr = [];
-      var _iterator23 = _createForOfIteratorHelper$e(combination.projectOptionsSetRefs),
-        _step23;
+      var _iterator28 = _createForOfIteratorHelper$e(combination.projectOptionsSetRefs),
+        _step28;
       try {
-        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-          var optionSetRef = _step23.value;
+        for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
+          var optionSetRef = _step28.value;
           var optionList = this.getOptionListOfRef(optionSetRef);
           if (!(optionList !== null && optionList !== void 0 && optionList.options.length) || ![0, 1, 2, 3].includes(optionList.operator)) continue;
           var conditionFeatureNo = optionSetRef.featureNo.toString();
           var ops = this.article.getArticleOptionState(conditionFeatureNo);
           if (!ops) continue;
-          var _iterator24 = _createForOfIteratorHelper$e(ops.visibleOPVKeys),
-            _step24;
+          var _iterator29 = _createForOfIteratorHelper$e(ops.visibleOPVKeys),
+            _step29;
           try {
-            for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-              var candidate = _step24.value;
+            for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
+              var candidate = _step29.value;
               if (this.evalValueWithOperator(optionList.operator, optionList.options, candidate)) continue;
               variantValuesArr.push(_defineProperty__default["default"]({}, conditionFeatureNo, candidate));
             }
           } catch (err) {
-            _iterator24.e(err);
+            _iterator29.e(err);
           } finally {
-            _iterator24.f();
+            _iterator29.f();
           }
         }
       } catch (err) {
-        _iterator23.e(err);
+        _iterator28.e(err);
       } finally {
-        _iterator23.f();
+        _iterator28.f();
       }
       return variantValuesArr;
     }
@@ -28240,18 +28563,18 @@ var IDMEngine = /*#__PURE__*/function () {
       }
 
       // this functions updates the images of OPVs that depend on rules
-      var _iterator25 = _createForOfIteratorHelper$e(this.article.articleOptionStates.values()),
-        _step25;
+      var _iterator30 = _createForOfIteratorHelper$e(this.article.articleOptionStates.values()),
+        _step30;
       try {
-        for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
-          var ops = _step25.value;
-          var _iterator26 = _createForOfIteratorHelper$e(ops.visibleOptionValues),
-            _step26;
+        for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
+          var ops = _step30.value;
+          var _iterator31 = _createForOfIteratorHelper$e(ops.visibleOptionValues),
+            _step31;
           try {
-            for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
-              var _step26$value = _slicedToArray__default["default"](_step26.value, 2),
-                jKey = _step26$value[0],
-                opv = _step26$value[1];
+            for (_iterator31.s(); !(_step31 = _iterator31.n()).done;) {
+              var _step31$value = _slicedToArray__default["default"](_step31.value, 2),
+                jKey = _step31$value[0],
+                opv = _step31$value[1];
               if (opv.images) {
                 var imageFound = false;
                 for (var _i5 = 0; _i5 < opv.images.length; _i5++) {
@@ -28260,9 +28583,9 @@ var IDMEngine = /*#__PURE__*/function () {
                   var _doUse = !((_image$decisionNos2 = _image.decisionNos) !== null && _image$decisionNos2 !== void 0 && _image$decisionNos2.length);
                   if ((_image$decisionNos3 = _image.decisionNos) !== null && _image$decisionNos3 !== void 0 && _image$decisionNos3.length) {
                     for (var _j2 = 0; _j2 < _image.decisionNos.length; _j2++) {
-                      var _decision4 = catalogData.getDecisionsByNo([_image.decisionNos[_j2]])[0];
-                      if (!_decision4) continue;
-                      var _ref25 = this.getMatchingOptionCombination(_decision4.optionCombinations, _decision4.decisionNo),
+                      var _decision5 = catalogData.getDecisionsByNo([_image.decisionNos[_j2]])[0];
+                      if (!_decision5) continue;
+                      var _ref25 = this.getMatchingOptionCombination(_decision5.optionCombinations, _decision5.decisionNo),
                         _ref26 = _slicedToArray__default["default"](_ref25, 1),
                         _combination2 = _ref26[0];
                       if (_combination2) {
@@ -28281,18 +28604,18 @@ var IDMEngine = /*#__PURE__*/function () {
               }
             }
           } catch (err) {
-            _iterator26.e(err);
+            _iterator31.e(err);
           } finally {
-            _iterator26.f();
+            _iterator31.f();
           }
         }
 
         // this function calculates an Svg to the current configuration if neccessary (SVG Tausch)
         // if the Article has no SVG Tausch nothing is done
       } catch (err) {
-        _iterator25.e(err);
+        _iterator30.e(err);
       } finally {
-        _iterator25.f();
+        _iterator30.f();
       }
       var newSVGFile = null;
       var svgChangedViaSvgTausch = false;
@@ -28307,6 +28630,9 @@ var IDMEngine = /*#__PURE__*/function () {
           }
         }
         return;
+      } else if (!this.article.actPlannerData) {
+        // An item with SVGs that is NOT a planner article has no actPlannerData — legal data (e.g. a partlist component), nothing to swap.
+        return;
       } else {
         var plannerCatArt = this.article.catalogArticle.catalogPlannerArticle;
         var svgs = this.article.catalogArticle.svgs;
@@ -28317,13 +28643,13 @@ var IDMEngine = /*#__PURE__*/function () {
             var svgValid = !((_svg$decisionNos = svg.decisionNos) !== null && _svg$decisionNos !== void 0 && _svg$decisionNos.length);
             if ((_svg$decisionNos2 = svg.decisionNos) !== null && _svg$decisionNos2 !== void 0 && _svg$decisionNos2.length) {
               for (var _j = 0; _j < svg.decisionNos.length; _j++) {
-                var _decision3 = catalogData.getDecisionsByNo([svg.decisionNos[_j]])[0];
-                if (!_decision3) continue;
-                var _ref23 = this.getMatchingOptionCombination(_decision3.optionCombinations, _decision3.decisionNo),
+                var _decision4 = catalogData.getDecisionsByNo([svg.decisionNos[_j]])[0];
+                if (!_decision4) continue;
+                var _ref23 = this.getMatchingOptionCombination(_decision4.optionCombinations, _decision4.decisionNo),
                   _ref24 = _slicedToArray__default["default"](_ref23, 1),
                   _combination = _ref24[0];
                 if (_combination) {
-                  svgValid = _decision3;
+                  svgValid = _decision4;
                   break;
                 }
               }
@@ -28399,6 +28725,138 @@ function _arrayLikeToArray$d(r, a) { (null == a || a > r.length) && (a = r.lengt
 function ownKeys$i(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$i(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$i(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$i(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$f = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+
+/**
+ * Output formats a COMPUTED NUMBER field can request through its prefix. The computation itself is
+ * generic (placeholder substitution + integer arithmetic, see evaluateComputedNumber); a format only
+ * decides how the resulting number is rendered. Add a prefix here to support another number scheme.
+ */
+var COMPUTED_NUMBER_FORMATS = {
+  // EAN-14: 12-digit body, GS1 check digit, leading packaging indicator '0'.
+  'EAN14:': function EAN14(value) {
+    var body = String(value).padStart(12, '0');
+    return '0' + body + gs1CheckDigit(body);
+  }
+};
+
+/** The format prefix this value carries, or undefined when it is a literal rather than a formula. */
+function computedNumberFormatOf(value) {
+  if (typeof value !== 'string') return undefined;
+  return Object.keys(COMPUTED_NUMBER_FORMATS).find(function (prefix) {
+    return value.startsWith(prefix);
+  });
+}
+
+/** True when this field holds a computed-number FORMULA instead of a literal number. */
+function isComputedNumber(value) {
+  return computedNumberFormatOf(value) !== undefined;
+}
+
+/**
+ * Reads a property the CATALOG names (template placeholders like `{article.typeNr}`) off an object — the one
+ * place where a runtime string indexes typed instances, so the dynamic access is not scattered as casts.
+ */
+function dynamicProperty(source, key) {
+  return Reflect.get(source, key);
+}
+
+/** The option key of a group member, which may carry an assigned number as `<optionKey>=<number>`. */
+function optionGroupMemberKey(member) {
+  return member.split('=')[0].trim();
+}
+
+/** GS1 check digit over a 12/13-digit body: weights 3 and 1 from the left, complement to the next ten. */
+function gs1CheckDigit(body) {
+  var digits = body.padStart(13, '0');
+  var sum = 0;
+  for (var i = 0; i < digits.length; i++) sum += Number(digits[i]) * (i % 2 === 0 ? 3 : 1);
+  return (10 - sum % 10) % 10;
+}
+
+/**
+ * Evaluates `+`, `-`, `*` and parentheses over integers — no identifiers, no properties, no function calls,
+ * so a catalog-authored expression can only ever produce a number. Undefined on anything unparseable.
+ */
+function evaluateIntegerExpression(expression) {
+  var tokens = expression.match(/\d+|[+\-*()]/g);
+  if (!tokens || tokens.join('') !== expression.replace(/\s+/g, '')) return undefined;
+  var position = 0;
+  /** The next token without consuming it. */
+  var peek = function peek() {
+    return tokens[position];
+  };
+  /** sum := product (('+' | '-') product)* */
+  var parseSum = function parseSum() {
+    var left = parseProduct();
+    if (left === undefined) return undefined;
+    while (peek() === '+' || peek() === '-') {
+      var operator = tokens[position++];
+      var right = parseProduct();
+      if (right === undefined) return undefined;
+      left = operator === '+' ? left + right : left - right;
+      // Past 2^53 the arithmetic silently loses precision — a wrong EAN is worse than none.
+      if (!Number.isSafeInteger(left)) return undefined;
+    }
+    return left;
+  };
+  /** product := atom ('*' atom)* */
+  var parseProduct = function parseProduct() {
+    var left = parseAtom();
+    if (left === undefined) return undefined;
+    while (peek() === '*') {
+      position++;
+      var right = parseAtom();
+      if (right === undefined) return undefined;
+      left *= right;
+      if (!Number.isSafeInteger(left)) return undefined;
+    }
+    return left;
+  };
+  /** atom := integer | '(' sum ')' */
+  var parseAtom = function parseAtom() {
+    var token = tokens[position];
+    if (token === undefined) return undefined;
+    if (token === '(') {
+      position++;
+      var inner = parseSum();
+      if (inner === undefined || tokens[position] !== ')') return undefined;
+      position++;
+      return inner;
+    }
+    if (!/^\d+$/.test(token)) return undefined;
+    position++;
+    var literal = Number(token);
+    // An oversized literal would already be rounded here (and print as 1e+21 downstream).
+    return Number.isSafeInteger(literal) ? literal : undefined;
+  };
+  var result = parseSum();
+  return result === undefined || position !== tokens.length || !Number.isFinite(result) ? undefined : result;
+}
+
+/** Comparison for a template token's optional operator: numeric when both sides are numeric, else by string. */
+function compareTemplateValues(left, right, operator) {
+  var leftNumber = Number(left);
+  var rightNumber = Number(right);
+  var numeric = right !== undefined && left !== null && left !== '' && Number.isFinite(leftNumber) && Number.isFinite(rightNumber);
+  var a = numeric ? leftNumber : String(left !== null && left !== void 0 ? left : '');
+  var b = numeric ? rightNumber : String(right !== null && right !== void 0 ? right : '');
+  switch (operator) {
+    case '==':
+      return a === b;
+    case '!=':
+      return a !== b;
+    case '>=':
+      return a >= b;
+    case '<=':
+      return a <= b;
+    case '>':
+      return a > b;
+    case '<':
+      return a < b;
+    default:
+      return false;
+  }
+}
 var DivaArticle = /*#__PURE__*/function () {
   function DivaArticle(set, _basketId, initParams, articleData, catalogData) {
     var _this = this,
@@ -28433,6 +28891,8 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       return undefined;
     });
+    /** `{article.x}` reads currently being resolved — a template-evaluating getter (articleEAN, typeNr) must not re-enter itself. */
+    _defineProperty__default["default"](this, "resolvingTemplateKeys", void 0);
     this.article = {
       set: set,
       basketId: _basketId,
@@ -28745,10 +29205,21 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "deleted",
     get: function get() {
       return !!this.article.deleted;
-    },
+    }
+
+    /** True only while this article runs its after-load init — see loadPartlistArticle. */,
     set: function set(deleted) {
       this.article.deleted = deleted;
     }
+  }, {
+    key: "loadingPartlistChild",
+    get: /** Whether this article is still running its after-load init as a partlist child. */
+    function get() {
+      return !!this.article.loadingPartlistChild;
+    },
+    set: function set(loading) {
+      this.article.loadingPartlistChild = loading;
+    }
   }, {
     key: "toDeleteAfterInit",
     get: function get() {
@@ -29314,7 +29785,28 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "articleEAN",
     get: function get() {
-      return this.article.catalogArticle.articleEAN;
+      var ean = this.article.catalogArticle.articleEAN;
+      // A variant article's EAN is a function of the selected axes — such articles hold a FORMULA instead; plain EANs pass untouched.
+      return isComputedNumber(ean) ? this.evaluateComputedNumber(ean) : ean;
+    }
+
+    /**
+     * Evaluates a computed-number formula `<FORMAT>:<integer arithmetic over {token} placeholders>`, e.g.
+     * `EAN14:407142261118 + {1095.indexIn:EAN_S1_W}*1` — a counter over the variant axes; the FORMAT prefix only
+     * renders the number (EAN14: zero-pad + GS1 check digit). Unresolvable parts return a visible `___…___` marker.
+     */
+  }, {
+    key: "evaluateComputedNumber",
+    value: function evaluateComputedNumber(formula) {
+      var prefix = computedNumberFormatOf(formula);
+      if (!prefix) return formula;
+      var body = formula.slice(prefix.length);
+      var resolved = this.convertTemplateToCodex(body);
+      var value = evaluateIntegerExpression(resolved);
+      if (value === undefined || value < 0) return '___' + prefix + ' not computable: "' + body.trim() + '" -> "' + resolved.trim() + '"___';
+      var digits = Math.trunc(value).toString();
+      if (digits.length > 12) return '___' + prefix + ' overflow: ' + digits + ' exceeds 12 digits___';
+      return COMPUTED_NUMBER_FORMATS[prefix](value);
     }
   }, {
     key: "getArticleOptionStateFlat",
@@ -29494,7 +29986,13 @@ var DivaArticle = /*#__PURE__*/function () {
       } finally {
         _iterator7.f();
       }
-      return this.article.typeNr;
+      return this.evaluatedArticleTypeNr;
+    }
+    /** The record's typeNr — on IDM it falls back to eanNumber, which may hold a computed-number FORMULA, evaluated here. */
+  }, {
+    key: "evaluatedArticleTypeNr",
+    get: function get() {
+      return isComputedNumber(this.article.typeNr) ? this.evaluateComputedNumber(this.article.typeNr) : this.article.typeNr;
     }
   }, {
     key: "articlePrices",
@@ -30022,6 +30520,8 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "configArticleCodex",
     get: function get() {
+      var _this$article$configA;
+      if ((_this$article$configA = this.article.configArticleCodex) !== null && _this$article$configA !== void 0 && _this$article$configA.includes('{')) return this.convertTemplateToCodex(this.article.configArticleCodex);
       return this.article.configArticleCodex;
     },
     set: function set(codex) {
@@ -30437,6 +30937,15 @@ var DivaArticle = /*#__PURE__*/function () {
       newPartlistArticle.hasPartlistArticleInitialized = this.hasPartlistArticleInitialized;
       this.article.partlistArticles[newPartlistArticle.basketId] = newPartlistArticle;
     }
+    /**
+     * Drops one partlist child (and with it its own subtree) from this article again — used when the child's
+     * after-load init fails after it was registered, so no half-initialized child stays in the tree.
+     */
+  }, {
+    key: "removePartlistArticle",
+    value: function removePartlistArticle(basketId) {
+      delete this.article.partlistArticles[basketId];
+    }
   }, {
     key: "deletePartlistArticles",
     value: function deletePartlistArticles() {
@@ -31192,7 +31701,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-65f4da8e.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-8fa17486.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -31544,7 +32053,7 @@ var DivaArticle = /*#__PURE__*/function () {
         codex: this.articleCodex,
         singlePrice: this.price,
         image: this.image ? catalogData.getCatImageURL(this.image, '') : undefined,
-        typeNr: this.article.typeNr,
+        typeNr: this.evaluatedArticleTypeNr,
         width: this.calcWidth,
         height: this.calcHeight,
         depth: this.calcDepth,
@@ -31814,39 +32323,97 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       return this._engine;
     }
+
+    /**
+     * Substitutes `{identifier.accessor}` placeholders in a catalog-authored template (order codices, retail
+     * article numbers, EAN formulas). `identifier` is `article`, `parent` or a featureNo; `accessor` is a property
+     * name, optionally with a comparison (`==`, `!=`, …) that substitutes the comparison RESULT instead.
+     */
   }, {
     key: "convertTemplateToCodex",
     value: function convertTemplateToCodex(codex) {
-      var evaluatedOrderCodex = codex;
-      var array = _toConsumableArray__default["default"](evaluatedOrderCodex.matchAll(/\{(.*?)\}/g));
-      var toRepace = [];
-      for (var i = 0; i < array.length; i++) {
-        var expressions = array[i][1].split('.');
-        var identifier = expressions[0];
-        var _this$parseOperator = this.parseOperator(expressions[1]),
-          operator = _this$parseOperator.operator;
-          _this$parseOperator.key;
-          var value = _this$parseOperator.value;
-        var ruleExtension = operator ? ' ' + operator + ' ' + value : '';
-        if (identifier === 'article') {
-          toRepace.push(eval('this[key]' + ruleExtension));
-        } else if (identifier === 'parent') {
-          toRepace.push(eval('this[key]' + ruleExtension));
-        } else {
-          // IDM option codexes carry no 'OPT' prefix — the eval must look up the same codex the guard checked.
-          var optionStateCodex = (!this.CatalogData.isIDMFormat ? 'OPT' : '') + identifier;
-          if (this.getArticleOptionState(optionStateCodex)) {
-            toRepace.push(eval('this.getArticleOptionState(optionStateCodex)[key]' + ruleExtension));
-          } else {
-            toRepace.push('___Option: "' + identifier + '" not found!___');
-          }
+      var _this5 = this;
+      return codex.replace(/\{(.*?)\}/g, function (_match, expression) {
+        return _this5.resolveTemplateToken(String(expression));
+      });
+    }
+  }, {
+    key: "resolveTemplateToken",
+    value: /** Resolves ONE `{…}` template token to its replacement text ('' when the value is absent). */
+    function resolveTemplateToken(expression) {
+      var _expressions$;
+      var expressions = expression.split('.');
+      var identifier = expressions[0];
+      var _this$parseOperator = this.parseOperator((_expressions$ = expressions[1]) !== null && _expressions$ !== void 0 ? _expressions$ : ''),
+        operator = _this$parseOperator.operator,
+        key = _this$parseOperator.key,
+        value = _this$parseOperator.value;
+      var resolved;
+      if (identifier === 'article') {
+        var _this$resolvingTempla;
+        // Lazily built: prototype-only instances (tests, clones) never run the field initializers.
+        var resolving = (_this$resolvingTempla = this.resolvingTemplateKeys) !== null && _this$resolvingTempla !== void 0 ? _this$resolvingTempla : this.resolvingTemplateKeys = new Set();
+        if (resolving.has(key)) return '___article: "' + key + '" refers to itself!___';
+        resolving.add(key);
+        try {
+          resolved = dynamicProperty(this, key);
+        } finally {
+          resolving["delete"](key);
         }
-      }
-      for (var _i7 = 0; _i7 < toRepace.length; _i7++) {
-        var _toRepace$_i;
-        evaluatedOrderCodex = evaluatedOrderCodex.replace(/\{(.*?)\}/, (_toRepace$_i = toRepace[_i7]) !== null && _toRepace$_i !== void 0 ? _toRepace$_i : '');
-      }
-      return evaluatedOrderCodex;
+      } else if (identifier === 'parent') {
+        // The EMBEDDING article of a partlist component.
+        var parent = this.partListParentArticle;
+        if (!parent) return '___parent: "' + key + '" — this article has no partlist parent!___';
+        resolved = dynamicProperty(parent, key);
+      } else {
+        var optionStateKey = (!this.CatalogData.isIDMFormat ? 'OPT' : '') + identifier;
+        var optionState = this.getArticleOptionState(optionStateKey);
+        if (!optionState) return '___Option: "' + identifier + '" not found!___';
+        var _key$split = key.split(':'),
+          _key$split2 = _slicedToArray__default["default"](_key$split, 2),
+          accessor = _key$split2[0],
+          groupKey = _key$split2[1];
+        if (accessor.trim() === 'indexIn') resolved = this.resolveIndexInOptionGroup(optionState.valCodex, groupKey === null || groupKey === void 0 ? void 0 : groupKey.trim());else if (accessor.trim() === 'valueIn') resolved = this.resolveValueInOptionGroup(optionState.valCodex, groupKey === null || groupKey === void 0 ? void 0 : groupKey.trim());else resolved = dynamicProperty(optionState, accessor.trim());
+      }
+      if (operator === undefined) return resolved === undefined || resolved === null ? '' : String(resolved);
+      return String(compareTemplateValues(resolved, value, operator));
+    }
+
+    /**
+     * Position of `optionKey` within the ordered option group `groupKey`. The GROUP — not the feature's own
+     * value list — is the source of truth: positions differ per article family, and dependency decisions
+     * narrow the visible list at runtime.
+     */
+  }, {
+    key: "resolveIndexInOptionGroup",
+    value: function resolveIndexInOptionGroup(optionKey, groupKey) {
+      var _this$CatalogData$idm, _members$findIndex;
+      if (!optionKey || !groupKey) return undefined;
+      var members = (_this$CatalogData$idm = this.CatalogData.idmOptionGroups) === null || _this$CatalogData$idm === void 0 ? void 0 : _this$CatalogData$idm[groupKey];
+      var index = (_members$findIndex = members === null || members === void 0 ? void 0 : members.findIndex(function (member) {
+        return optionGroupMemberKey(member) === optionKey;
+      })) !== null && _members$findIndex !== void 0 ? _members$findIndex : -1;
+      return index < 0 ? undefined : index;
+    }
+
+    /**
+     * The NUMBER a group assigns to `optionKey` (`<optionKey>=<number>` on the member) — supplier numbering has
+     * holes no single stride reproduces; a member without `=` falls back to its position. Returned as the
+     * WRITTEN string because codex digits may carry leading zeros ('06').
+     */
+  }, {
+    key: "resolveValueInOptionGroup",
+    value: function resolveValueInOptionGroup(optionKey, groupKey) {
+      var _this$CatalogData$idm2, _members$findIndex2, _members$index$split$;
+      if (!optionKey || !groupKey) return undefined;
+      var members = (_this$CatalogData$idm2 = this.CatalogData.idmOptionGroups) === null || _this$CatalogData$idm2 === void 0 ? void 0 : _this$CatalogData$idm2[groupKey];
+      var index = (_members$findIndex2 = members === null || members === void 0 ? void 0 : members.findIndex(function (member) {
+        return optionGroupMemberKey(member) === optionKey;
+      })) !== null && _members$findIndex2 !== void 0 ? _members$findIndex2 : -1;
+      if (!members || index < 0) return undefined;
+      var assigned = (_members$index$split$ = members[index].split('=')[1]) === null || _members$index$split$ === void 0 ? void 0 : _members$index$split$.trim();
+      if (assigned === undefined) return index;
+      return assigned !== '' && Number.isFinite(Number(assigned)) ? assigned : undefined;
     }
   }, {
     key: "parseOperator",
@@ -31861,16 +32428,6 @@ var DivaArticle = /*#__PURE__*/function () {
         key: expression.split('!=')[0].trim(),
         value: expression.split('!=')[1].trim()
       };
-      if (expression.includes('>')) return {
-        operator: '>',
-        key: expression.split('>')[0].trim(),
-        value: expression.split('>')[1].trim()
-      };
-      if (expression.includes('<')) return {
-        operator: '<',
-        key: expression.split('<')[0].trim(),
-        value: expression.split('<')[1].trim()
-      };
       if (expression.includes('>=')) return {
         operator: '>=',
         key: expression.split('>=')[0].trim(),
@@ -31881,6 +32438,16 @@ var DivaArticle = /*#__PURE__*/function () {
         key: expression.split('<=')[0].trim(),
         value: expression.split('<=')[1].trim()
       };
+      if (expression.includes('>')) return {
+        operator: '>',
+        key: expression.split('>')[0].trim(),
+        value: expression.split('>')[1].trim()
+      };
+      if (expression.includes('<')) return {
+        operator: '<',
+        key: expression.split('<')[0].trim(),
+        value: expression.split('<')[1].trim()
+      };
       return {
         operator: undefined,
         key: expression.trim(),
@@ -31911,7 +32478,11 @@ var DivaArticle = /*#__PURE__*/function () {
       clonedArticle.article.partlistArticles = {};
       clonedArticle.article.previousPartlistArticles = {};
       for (var key in this.partlistArticles) {
-        clonedArticle.article.partlistArticles[key] = this.partlistArticles[key].cloneArticle(set);
+        var clonedChild = this.partlistArticles[key].cloneArticle(set);
+        // `{ ...this.article }` copied the LIVE parent reference — a sandbox that reconfigures the clone's parent
+        // (merged option groups, variant sweeps) would otherwise write into the user's real configuration.
+        clonedChild.article.partListParentArticle = clonedArticle;
+        clonedArticle.article.partlistArticles[key] = clonedChild;
       }
       return clonedArticle;
     }
@@ -32022,7 +32593,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               break;
             case 20:
               _loop = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop() {
-                var articlesObj, catalog, articles, _i, _set$actions, _set$actions$openModa, index, articleCodex, articlesToLoadMore;
+                var articlesObj, catalog, articles, _i, _set$actions, _set$actions$openModa, _set$api$getI18n$t, _set$api$getI18n, index, articleCodex, articlesToLoadMore;
                 return _regeneratorRuntime__default["default"].wrap(function _loop$(_context2) {
                   while (1) switch (_context2.prev = _context2.next) {
                     case 0:
@@ -32056,7 +32627,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                       });
                       articleCodex = articles[index].articleCodex;
                       (_set$actions = set.actions) === null || _set$actions === void 0 || (_set$actions$openModa = _set$actions.openModal) === null || _set$actions$openModa === void 0 || _set$actions$openModa.call(_set$actions, {
-                        title: set.api.getI18n().t('configurator.article_not_found'),
+                        title: (_set$api$getI18n$t = (_set$api$getI18n = set.api.getI18n()) === null || _set$api$getI18n === void 0 ? void 0 : _set$api$getI18n.t('configurator.article_not_found')) !== null && _set$api$getI18n$t !== void 0 ? _set$api$getI18n$t : 'configurator.article_not_found',
                         content: articleCodex,
                         accept: true
                       });
@@ -32191,11 +32762,26 @@ var DivaArticleHandler = /*#__PURE__*/function () {
             case 0:
               newEDOExtraArticles = [];
               partlistArticlesToLoad = [];
-              valuesArray = [];
+              valuesArray = []; // A partlist child's after-load init (toDoAfterArticleLoaded) has already initialized its config, evaluated
+              // its own partlist and filled its empty options while registered in the tree - there is nothing left for
+              // this pass to do for it. It MUST NOT run the set-wide sibling update from inside a child init either: with
+              // two top-level articles that each own visible partlist children, that pass reloads the OTHER parent, whose
+              // children's inits reload this parent again, and so on without end. Before the child was registered ahead
+              // of its init this call was a no-op for it (an unregistered target was dropped above); keep it that way.
+              if (!(from === 'initializingPartlist')) {
+                _context6.next = 5;
+                break;
+              }
+              return _context6.abrupt("return", {
+                newEDOExtraArticles: newEDOExtraArticles,
+                targetArticlesToUpdate: [],
+                partlistArticlesToLoad: partlistArticlesToLoad
+              });
+            case 5:
               i = 0;
-            case 4:
+            case 6:
               if (!(i < targetArticlesToUpdate.length)) {
-                _context6.next = 40;
+                _context6.next = 42;
                 break;
               }
               valuesArray[i] = {};
@@ -32204,13 +32790,13 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                 actArticle = actArticle.partListParentArticle.partlistArticles[actArticle.basketId];
               }
               if (!(!actArticle || actArticle.deleted)) {
-                _context6.next = 12;
+                _context6.next = 14;
                 break;
               }
               targetArticlesToUpdate.splice(i, 1);
               i--;
-              return _context6.abrupt("continue", 37);
-            case 12:
+              return _context6.abrupt("continue", 39);
+            case 14:
               if (targetArticlesWithNewValues.includes(targetArticlesToUpdate[i])) {
                 valuesArray[i] = actArticle.getValidValues(_objectSpread$h({}, myValues), actArticle.CatalogData.mergeOptionsToSameOption);
                 // Remember what the USER picked: a rule may hide that value for a while, and it has to come back when the rule frees it again.
@@ -32228,56 +32814,56 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               //only set config if valuesArray are not empty or the article is initializing
               newPLATL = void 0; // partlistarticle to load
               if (!(Object.entries(valuesArray[i]).length > 0 || from !== null && from !== void 0 && from.startsWith('initializing'))) {
-                _context6.next = 29;
+                _context6.next = 31;
                 break;
               }
-              _context6.next = 17;
+              _context6.next = 19;
               return this.updateCfgValues(actArticle, valuesArray[i], {}, undefined, undefined, from == 'calcVariant');
-            case 17:
+            case 19:
               newPLATL = _context6.sent;
               _actArticle$checkDefa = actArticle.checkDefaultGlobalOpt(valuesArray[i]), variantValues = _actArticle$checkDefa.variantValues, triggerUpdate = _actArticle$checkDefa.triggerUpdate;
               valuesArray[i] = variantValues;
-              _context6.next = 22;
+              _context6.next = 24;
               return this.updateAccessoriesFromGlobalOption(valuesArray[i], actArticle);
-            case 22:
+            case 24:
               if (!triggerUpdate) {
-                _context6.next = 26;
+                _context6.next = 28;
                 break;
               }
-              _context6.next = 25;
+              _context6.next = 27;
               return this.updateCfgValues(actArticle, valuesArray[i], {}, undefined, undefined, from == 'calcVariant');
-            case 25:
+            case 27:
               newPLATL = _context6.sent;
-            case 26:
+            case 28:
               newEDOExtraArticles = this.checkEDOArticles(articles);
-              _context6.next = 32;
+              _context6.next = 34;
               break;
-            case 29:
-              _context6.next = 31;
-              return this.updateCfgValues(actArticle, {}, {}, undefined, undefined, from == 'calcVariant');
             case 31:
+              _context6.next = 33;
+              return this.updateCfgValues(actArticle, {}, {}, undefined, undefined, from == 'calcVariant');
+            case 33:
               newPLATL = _context6.sent;
-            case 32:
-              _context6.next = 34;
-              return this.updateEmptyOption(actArticle);
             case 34:
+              _context6.next = 36;
+              return this.updateEmptyOption(actArticle);
+            case 36:
               pla = _context6.sent;
               if (pla !== undefined) newPLATL = pla;
               partlistArticlesToLoad = partlistArticlesToLoad.concat(newPLATL);
-            case 37:
+            case 39:
               i++;
-              _context6.next = 4;
+              _context6.next = 6;
               break;
-            case 40:
-              _context6.next = 42;
-              return this.triggerUpdateOnVisiblePartilstArticles(targetArticlesToUpdate, articles);
             case 42:
+              _context6.next = 44;
+              return this.triggerUpdateOnVisiblePartilstArticles(targetArticlesToUpdate, articles);
+            case 44:
               return _context6.abrupt("return", {
                 newEDOExtraArticles: newEDOExtraArticles,
                 targetArticlesToUpdate: targetArticlesToUpdate,
                 partlistArticlesToLoad: partlistArticlesToLoad
               });
-            case 43:
+            case 45:
             case "end":
               return _context6.stop();
           }
@@ -32298,13 +32884,13 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               if (!((_articles$targetArtic = articles[targetArticlesToUpdate[0]]) !== null && _articles$targetArtic !== void 0 && _articles$targetArtic.hasPartlistArticleVisibleInTree)) {
-                _context7.next = 13;
+                _context7.next = 15;
                 break;
               }
               _context7.t0 = _regeneratorRuntime__default["default"].keys(articles);
             case 2:
               if ((_context7.t1 = _context7.t0()).done) {
-                _context7.next = 13;
+                _context7.next = 15;
                 break;
               }
               key = _context7.t1.value;
@@ -32316,13 +32902,21 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               }
               return _context7.abrupt("continue", 2);
             case 8:
-              actArticle = articles[key];
-              _context7.next = 11;
-              return this.updateCfgValues(actArticle, {}, {});
+              actArticle = articles[key]; // A reload has replaced this instance; updating the dead one loads articles into a detached branch.
+              // An article still running its own after-load init must be skipped too — re-entering it here
+              // restarts its partlist load and never terminates.
+              if (!(actArticle.deleted || actArticle.loadingPartlistChild)) {
+                _context7.next = 11;
+                break;
+              }
+              return _context7.abrupt("continue", 2);
             case 11:
+              _context7.next = 13;
+              return this.updateCfgValues(actArticle, {}, {});
+            case 13:
               _context7.next = 2;
               break;
-            case 13:
+            case 15:
             case "end":
               return _context7.stop();
           }
@@ -32905,32 +33499,63 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         return _regeneratorRuntime__default["default"].wrap(function _callee15$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              this.checkPartlistDepth(article, doLoadItem);
-              //jeder neue Artikel sollte im Warenkorb als Zubehörartikel gelistet werden - es können auch mehrere sein
-              _context16.next = 3;
+              if (this.checkPartlistDepth(article, doLoadItem)) {
+                _context16.next = 2;
+                break;
+              }
+              return _context16.abrupt("return");
+            case 2:
+              _context16.next = 4;
               return this.loadArticle(article.set, doLoadItem.ArticleCodex, this.partlistArticleInitData(article, doLoadItem));
-            case 3:
+            case 4:
               nArticle = _context16.sent;
               if (!nArticle) {
-                _context16.next = 9;
+                _context16.next = 21;
                 break;
               }
               doLoadItem.BasketID = nArticle.basketId;
-              _context16.next = 8;
-              return this.toDoAfterArticleLoaded(nArticle, {}, nArticle.variantValuesForPla(nArticle.partlistArticleStandalone, (_doLoadItem$VariantVa = doLoadItem.VariantValues) !== null && _doLoadItem$VariantVa !== void 0 ? _doLoadItem$VariantVa : {}, newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}), 'initializingPartlist', doLoadItem.VariantItemData, true);
-            case 8:
+
+              // Register the child BEFORE its after-load init: the init evaluates the child's OWN partlist,
+              // and those position gates resolve their condition through the article tree — an unregistered
+              // child is invisible there, so every conditioned grandchild dropped on each parent reload.
+              // The `loadingPartlistChild` flag keeps it out of the set-wide pass in
+              // triggerUpdateOnVisiblePartilstArticles for exactly that window: without it, that pass walks
+              // into the in-flight child, re-evaluates its partlist and re-enters this method — an endless
+              // load loop (both measured 2026-09-03).
               article.addPartlistArticle(nArticle);
-            case 9:
+              nArticle.loadingPartlistChild = true;
+              _context16.prev = 9;
+              _context16.next = 12;
+              return this.toDoAfterArticleLoaded(nArticle, {}, nArticle.variantValuesForPla(nArticle.partlistArticleStandalone, (_doLoadItem$VariantVa = doLoadItem.VariantValues) !== null && _doLoadItem$VariantVa !== void 0 ? _doLoadItem$VariantVa : {}, newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}), 'initializingPartlist', doLoadItem.VariantItemData, true);
+            case 12:
+              _context16.next = 18;
+              break;
+            case 14:
+              _context16.prev = 14;
+              _context16.t0 = _context16["catch"](9);
+              // Registered early only for the init's sake — a child whose init failed must not stay in the tree,
+              // where tree evaluation and order lines would pick up its half-initialized state.
+              article.removePartlistArticle(nArticle.basketId);
+              throw _context16.t0;
+            case 18:
+              _context16.prev = 18;
+              nArticle.loadingPartlistChild = false;
+              return _context16.finish(18);
+            case 21:
             case "end":
               return _context16.stop();
           }
-        }, _callee15, this);
+        }, _callee15, this, [[9, 14, 18, 21]]);
       }));
       function loadPartlistArticle(_x47, _x48, _x49) {
         return _loadPartlistArticle.apply(this, arguments);
       }
       return loadPartlistArticle;
     }()
+    /**
+     * Whether the child may still be loaded. FALSE means the nesting limit is reached — the caller must stop, because
+     * a cyclic partlist re-enters `loadPartlistArticle` and this is the only thing that ends the recursion.
+     */
   }, {
     key: "checkPartlistDepth",
     value: function checkPartlistDepth(article, doLoadItem) {
@@ -32963,12 +33588,13 @@ var DivaArticleHandler = /*#__PURE__*/function () {
             text: "Aborted loading partlist article \"".concat(doLoadItem.ArticleCodex, "\" because the partlist nesting exceeded the maximum allowed depth of ").concat(PARTLIST_MAX_DEPTH, ". ") + "This usually means an article references itself or an ancestor as a partlist child. " + "Parent article: ".concat(article.articleCodex, ". Ancestor chain: ").concat(ancestorChain.join(' -> '), "."),
             accept: true
           });
-          return;
+          return false;
         } else {
           article.set.getSetState.errorHandler(new DivaUtils.DivaError('Partlist nesting exceeded the maximum allowed depth – aborting load'));
-          return;
+          return false;
         }
       }
+      return true;
     }
   }, {
     key: "collectAncestorChain",
@@ -33011,7 +33637,8 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         partlistGroupPrefix: doLoadItem.partlistGroupPrefix,
         optionsForPrint: doLoadItem.optionsForPrint,
         optionImgForPrint: doLoadItem.optionImgForPrint,
-        catalogCodex: doLoadItem.CatalogCodex
+        catalogCodex: doLoadItem.CatalogCodex,
+        PreviousPartlistArticles: doLoadItem.PreviousPartlistArticles
       };
     }
     /**************************************** Querkontrollen über mehrere Article deshalb hier im ArticleHandler ********************************************************************************/
@@ -34582,6 +35209,7 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
           } finally {
             _iterator20.f();
           }
+          this.mergeOptionGroupConnectedSteps(myTabGroup, catalog);
         }
       } catch (err) {
         _iterator19.e(err);
@@ -34590,36 +35218,131 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
       }
     }
 
-    /** Returns the codex of the OPG option a merged option's step was merged into by mergeIDMToOPG, or undefined when it is not merged. */
+    /**
+     * Auto-merges two visible option steps that are CONNECTED VIA IDM OPTION GROUPS, so a
+     * group feature + value feature pair (e.g. Bezugsgruppe + Bezug) collapses into one OPG-style
+     * step without variantenArt pairs or a mergeIDMToOPG property. Connection convention: EVERY
+     * option value codex of the group step is the key of an option group whose members are all
+     * option values of the value step. Steps already merged (explicitly or by variantenArt) are
+     * left untouched, and any ambiguity — a group step matching several value steps, a value step
+     * claimed by several group steps, or a mutual match — suppresses the merge instead of guessing.
+     */
   }, {
-    key: "getMergesToOPGParentCodex",
-    value: function getMergesToOPGParentCodex(optionCodex) {
-      var _iterator22 = _createForOfIteratorHelper$b(this.tabGroups),
+    key: "mergeOptionGroupConnectedSteps",
+    value: function mergeOptionGroupConnectedSteps(myTabGroup, catalog) {
+      var optionGroups = catalog.idmOptionGroups;
+      if (!optionGroups) return;
+      var candidates = [];
+      var _iterator22 = _createForOfIteratorHelper$b(myTabGroup.options),
         _step22;
       try {
         for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var _myTabGroup$options$g;
+          var _step$configSteps$val;
           var _step22$value = _slicedToArray__default["default"](_step22.value, 2),
-            myTabGroup = _step22$value[1];
-          if (((_myTabGroup$options$g = myTabGroup.options.get(optionCodex)) === null || _myTabGroup$options$g === void 0 ? void 0 : _myTabGroup$options$g.mergesToOPG) !== true) continue;
-          var _iterator23 = _createForOfIteratorHelper$b(myTabGroup.options),
+            step = _step22$value[1];
+          if (step.mergesToOPG !== undefined) continue;
+          var ops = (_step$configSteps$val = step.configSteps.values().next().value) === null || _step$configSteps$val === void 0 ? void 0 : _step$configSteps$val.optionstate;
+          // invisible steps only exist in inspect mode — the raw structure stays unmerged there
+          if (!ops || ops.isInvisible) continue;
+          var values = ops.option.articleOptionValues;
+          if (!(values !== null && values !== void 0 && values.size)) continue;
+          candidates.push({
+            step: step,
+            keys: new Set(values.keys())
+          });
+        }
+      } catch (err) {
+        _iterator22.e(err);
+      } finally {
+        _iterator22.f();
+      }
+      var connections = [];
+      var _loop = function _loop() {
+          var candidate = _candidates[_i];
+          var everyOpvIsAGroup = true;
+          var memberKeys = [];
+          var _iterator23 = _createForOfIteratorHelper$b(candidate.keys),
             _step23;
           try {
             for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-              var _step23$value = _slicedToArray__default["default"](_step23.value, 2),
-                myOption = _step23$value[1];
-              if (myOption.mergesToOPG === optionCodex) return myOption.codex;
+              var opvCodex = _step23.value;
+              var members = optionGroups[opvCodex];
+              if (!(members !== null && members !== void 0 && members.length)) {
+                everyOpvIsAGroup = false;
+                break;
+              }
+              memberKeys.push.apply(memberKeys, _toConsumableArray__default["default"](members.map(optionGroupMemberKey)));
             }
           } catch (err) {
             _iterator23.e(err);
           } finally {
             _iterator23.f();
           }
+          if (!everyOpvIsAGroup) return 0; // continue
+          var targets = candidates.filter(function (other) {
+            return other.step !== candidate.step && memberKeys.every(function (key) {
+              return other.keys.has(key);
+            });
+          });
+          if (targets.length !== 1) return 0; // continue
+          connections.push({
+            group: candidate.step,
+            target: targets[0].step
+          });
+        },
+        _ret;
+      for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
+        _ret = _loop();
+        if (_ret === 0) continue;
+      }
+      var _loop2 = function _loop2() {
+        var connection = _connections[_i2];
+        var claims = connections.filter(function (other) {
+          return other.target === connection.target;
+        });
+        // a step that is group and target at once (chain or mutual match) would overwrite its own merge state
+        var chained = connections.some(function (other) {
+          return other !== connection && (other.group === connection.target || other.target === connection.group);
+        });
+        if (claims.length !== 1 || chained) return 1; // continue
+        connection.group.mergesToOPG = connection.target.codex;
+        connection.target.mergesToOPG = true;
+      };
+      for (var _i2 = 0, _connections = connections; _i2 < _connections.length; _i2++) {
+        if (_loop2()) continue;
+      }
+    }
+
+    /** Returns the codex of the OPG option a merged option's step was merged into by mergeIDMToOPG, or undefined when it is not merged. */
+  }, {
+    key: "getMergesToOPGParentCodex",
+    value: function getMergesToOPGParentCodex(optionCodex) {
+      var _iterator24 = _createForOfIteratorHelper$b(this.tabGroups),
+        _step24;
+      try {
+        for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
+          var _myTabGroup$options$g;
+          var _step24$value = _slicedToArray__default["default"](_step24.value, 2),
+            myTabGroup = _step24$value[1];
+          if (((_myTabGroup$options$g = myTabGroup.options.get(optionCodex)) === null || _myTabGroup$options$g === void 0 ? void 0 : _myTabGroup$options$g.mergesToOPG) !== true) continue;
+          var _iterator25 = _createForOfIteratorHelper$b(myTabGroup.options),
+            _step25;
+          try {
+            for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
+              var _step25$value = _slicedToArray__default["default"](_step25.value, 2),
+                myOption = _step25$value[1];
+              if (myOption.mergesToOPG === optionCodex) return myOption.codex;
+            }
+          } catch (err) {
+            _iterator25.e(err);
+          } finally {
+            _iterator25.f();
+          }
         }
       } catch (err) {
-        _iterator22.e(err);
+        _iterator24.e(err);
       } finally {
-        _iterator22.f();
+        _iterator24.f();
       }
       return undefined;
     }
@@ -34628,20 +35351,20 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     value: function getOptionWhereIDMVariantIs(tabKey, variant) {
       var myTabGroup = this.tabGroups.get(tabKey);
       if (!myTabGroup) return false;
-      var _iterator24 = _createForOfIteratorHelper$b(myTabGroup.options),
-        _step24;
+      var _iterator26 = _createForOfIteratorHelper$b(myTabGroup.options),
+        _step26;
       try {
-        for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var _step24$value = _slicedToArray__default["default"](_step24.value, 2),
-            option = _step24$value[1];
+        for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
+          var _step26$value = _slicedToArray__default["default"](_step26.value, 2),
+            option = _step26$value[1];
           if (option.idmVariantType == variant) {
             return option;
           }
         }
       } catch (err) {
-        _iterator24.e(err);
+        _iterator26.e(err);
       } finally {
-        _iterator24.f();
+        _iterator26.f();
       }
       return false;
     }
@@ -34650,13 +35373,13 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     value: function sortConfigStepsInConfigTree(targetArticlesSorted) {
       var configStepCounter = 1;
       var configStepKeysPos = {};
-      var _iterator25 = _createForOfIteratorHelper$b(this.tabGroups),
-        _step25;
+      var _iterator27 = _createForOfIteratorHelper$b(this.tabGroups),
+        _step27;
       try {
-        for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
-          var _step25$value = _slicedToArray__default["default"](_step25.value, 2),
-            iKey = _step25$value[0],
-            myTabGroup = _step25$value[1];
+        for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
+          var _step27$value = _slicedToArray__default["default"](_step27.value, 2),
+            iKey = _step27$value[0],
+            myTabGroup = _step27$value[1];
           var tabSingleOPVOnly = true;
           var tabhidden = true;
           if (iKey == 'Summary') {
@@ -34680,18 +35403,18 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
           } else {
             var articlesInTabGroup = this.getTargetArticlesInTabGroup(myTabGroup, targetArticlesSorted);
             for (var i = 0; i < articlesInTabGroup.length; i++) {
-              var _iterator26 = _createForOfIteratorHelper$b(myTabGroup.options),
-                _step26;
+              var _iterator28 = _createForOfIteratorHelper$b(myTabGroup.options),
+                _step28;
               try {
-                for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
-                  var _step26$value = _slicedToArray__default["default"](_step26.value, 2),
-                    myOption = _step26$value[1];
-                  var _iterator27 = _createForOfIteratorHelper$b(myOption.configSteps),
-                    _step27;
+                for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
+                  var _step28$value = _slicedToArray__default["default"](_step28.value, 2),
+                    myOption = _step28$value[1];
+                  var _iterator29 = _createForOfIteratorHelper$b(myOption.configSteps),
+                    _step29;
                   try {
-                    for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
-                      var _step27$value = _slicedToArray__default["default"](_step27.value, 2),
-                        myConfigStep = _step27$value[1];
+                    for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
+                      var _step29$value = _slicedToArray__default["default"](_step29.value, 2),
+                        myConfigStep = _step29$value[1];
                       if (!myConfigStep.singleOPVOnly) {
                         tabSingleOPVOnly = false;
                       }
@@ -34704,24 +35427,24 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
                         configStepCounter++;
                         if (myConfigStep.key.startsWith('SHELFARTICLE_')) {
                           var steps = this.getChildsOfShelfStep(myTabGroup, myConfigStep.key);
-                          for (var _i = 0; _i < steps.length; _i++) {
-                            steps[_i].posNr = configStepCounter;
-                            configStepKeysPos[steps[_i].key] = configStepCounter;
+                          for (var _i3 = 0; _i3 < steps.length; _i3++) {
+                            steps[_i3].posNr = configStepCounter;
+                            configStepKeysPos[steps[_i3].key] = configStepCounter;
                             configStepCounter++;
                           }
                         }
                       }
                     }
                   } catch (err) {
-                    _iterator27.e(err);
+                    _iterator29.e(err);
                   } finally {
-                    _iterator27.f();
+                    _iterator29.f();
                   }
                 }
               } catch (err) {
-                _iterator26.e(err);
+                _iterator28.e(err);
               } finally {
-                _iterator26.f();
+                _iterator28.f();
               }
             }
             if (tabSingleOPVOnly) {
@@ -34733,41 +35456,41 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator25.e(err);
+        _iterator27.e(err);
       } finally {
-        _iterator25.f();
+        _iterator27.f();
       }
     }
   }, {
     key: "getChildsOfShelfStep",
     value: function getChildsOfShelfStep(tabGroup, shelfId) {
       var ret = [];
-      var _iterator28 = _createForOfIteratorHelper$b(tabGroup.options),
-        _step28;
+      var _iterator30 = _createForOfIteratorHelper$b(tabGroup.options),
+        _step30;
       try {
-        for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
-          var _step28$value = _slicedToArray__default["default"](_step28.value, 2),
-            option = _step28$value[1];
-          var _iterator29 = _createForOfIteratorHelper$b(option.configSteps),
-            _step29;
+        for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
+          var _step30$value = _slicedToArray__default["default"](_step30.value, 2),
+            option = _step30$value[1];
+          var _iterator31 = _createForOfIteratorHelper$b(option.configSteps),
+            _step31;
           try {
-            for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
-              var _step29$value = _slicedToArray__default["default"](_step29.value, 2),
-                configStep = _step29$value[1];
+            for (_iterator31.s(); !(_step31 = _iterator31.n()).done;) {
+              var _step31$value = _slicedToArray__default["default"](_step31.value, 2),
+                configStep = _step31$value[1];
               if (configStep.parentShelfId == shelfId) {
                 ret.push(configStep);
               }
             }
           } catch (err) {
-            _iterator29.e(err);
+            _iterator31.e(err);
           } finally {
-            _iterator29.f();
+            _iterator31.f();
           }
         }
       } catch (err) {
-        _iterator28.e(err);
+        _iterator30.e(err);
       } finally {
-        _iterator28.f();
+        _iterator30.f();
       }
       return ret;
     }
@@ -34777,12 +35500,12 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
       if (catalogData.hasAlternateRenderings) {
         for (var i = 0; i < catalogData.alternateRenderings.length; i++) {
           var onOptions = catalogData.alternateRenderings[i].onOptions;
-          var _iterator30 = _createForOfIteratorHelper$b(this.tabGroups),
-            _step30;
+          var _iterator32 = _createForOfIteratorHelper$b(this.tabGroups),
+            _step32;
           try {
-            var _loop = function _loop() {
-              var _step30$value = _slicedToArray__default["default"](_step30.value, 2),
-                tabGroup = _step30$value[1];
+            var _loop3 = function _loop3() {
+              var _step32$value = _slicedToArray__default["default"](_step32.value, 2),
+                tabGroup = _step32$value[1];
               var matched = onOptions.some(function (onOption) {
                 return onOption.startsWith('SHELFARTICLE_') ? _toConsumableArray__default["default"](tabGroup.options.keys()).some(function (key) {
                   return key.startsWith(onOption);
@@ -34792,13 +35515,13 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
                 tabGroup.alternateRenderings.push(catalogData.alternateRenderings[i]);
               }
             };
-            for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
-              _loop();
+            for (_iterator32.s(); !(_step32 = _iterator32.n()).done;) {
+              _loop3();
             }
           } catch (err) {
-            _iterator30.e(err);
+            _iterator32.e(err);
           } finally {
-            _iterator30.f();
+            _iterator32.f();
           }
         }
       }
@@ -34807,30 +35530,30 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     key: "getTargetArticlesInTabGroup",
     value: function getTargetArticlesInTabGroup(myTabGroup, allTargetArticlesSorted) {
       var articlesInTabGroup = [];
-      var _iterator31 = _createForOfIteratorHelper$b(myTabGroup.options),
-        _step31;
+      var _iterator33 = _createForOfIteratorHelper$b(myTabGroup.options),
+        _step33;
       try {
-        for (_iterator31.s(); !(_step31 = _iterator31.n()).done;) {
-          var _step31$value = _slicedToArray__default["default"](_step31.value, 2),
-            myOption = _step31$value[1];
-          var _iterator32 = _createForOfIteratorHelper$b(myOption.configSteps),
-            _step32;
+        for (_iterator33.s(); !(_step33 = _iterator33.n()).done;) {
+          var _step33$value = _slicedToArray__default["default"](_step33.value, 2),
+            myOption = _step33$value[1];
+          var _iterator34 = _createForOfIteratorHelper$b(myOption.configSteps),
+            _step34;
           try {
-            for (_iterator32.s(); !(_step32 = _iterator32.n()).done;) {
-              var _step32$value = _slicedToArray__default["default"](_step32.value, 2),
-                configStep = _step32$value[1];
+            for (_iterator34.s(); !(_step34 = _iterator34.n()).done;) {
+              var _step34$value = _slicedToArray__default["default"](_step34.value, 2),
+                configStep = _step34$value[1];
               articlesInTabGroup = articlesInTabGroup.concat(configStep.targetArticles);
             }
           } catch (err) {
-            _iterator32.e(err);
+            _iterator34.e(err);
           } finally {
-            _iterator32.f();
+            _iterator34.f();
           }
         }
       } catch (err) {
-        _iterator31.e(err);
+        _iterator33.e(err);
       } finally {
-        _iterator31.f();
+        _iterator33.f();
       }
       var basketIds = _toConsumableArray__default["default"](new Set(articlesInTabGroup));
       var basketIdsSorted = [];
@@ -34848,44 +35571,44 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     key: "getConfigStepKeyOfAccessoire",
     value: function getConfigStepKeyOfAccessoire(articleCodex, targetArticle) {
       var configStepKeys = [];
-      var _iterator33 = _createForOfIteratorHelper$b(this.tabGroups),
-        _step33;
+      var _iterator35 = _createForOfIteratorHelper$b(this.tabGroups),
+        _step35;
       try {
-        for (_iterator33.s(); !(_step33 = _iterator33.n()).done;) {
-          var _step33$value = _slicedToArray__default["default"](_step33.value, 2),
-            tabGroup = _step33$value[1];
-          var _iterator34 = _createForOfIteratorHelper$b(tabGroup.options),
-            _step34;
+        for (_iterator35.s(); !(_step35 = _iterator35.n()).done;) {
+          var _step35$value = _slicedToArray__default["default"](_step35.value, 2),
+            tabGroup = _step35$value[1];
+          var _iterator36 = _createForOfIteratorHelper$b(tabGroup.options),
+            _step36;
           try {
-            for (_iterator34.s(); !(_step34 = _iterator34.n()).done;) {
-              var _step34$value = _slicedToArray__default["default"](_step34.value, 2),
-                option = _step34$value[1];
-              var _iterator35 = _createForOfIteratorHelper$b(option.configSteps),
-                _step35;
+            for (_iterator36.s(); !(_step36 = _iterator36.n()).done;) {
+              var _step36$value = _slicedToArray__default["default"](_step36.value, 2),
+                option = _step36$value[1];
+              var _iterator37 = _createForOfIteratorHelper$b(option.configSteps),
+                _step37;
               try {
-                for (_iterator35.s(); !(_step35 = _iterator35.n()).done;) {
-                  var _step35$value = _slicedToArray__default["default"](_step35.value, 2),
-                    configStep = _step35$value[1];
+                for (_iterator37.s(); !(_step37 = _iterator37.n()).done;) {
+                  var _step37$value = _slicedToArray__default["default"](_step37.value, 2),
+                    configStep = _step37$value[1];
                   if (configStep.accessoireArticleCodex == articleCodex && configStep.targetArticles.includes(targetArticle)) {
                     configStepKeys.push(configStep.key);
                   }
                 }
               } catch (err) {
-                _iterator35.e(err);
+                _iterator37.e(err);
               } finally {
-                _iterator35.f();
+                _iterator37.f();
               }
             }
           } catch (err) {
-            _iterator34.e(err);
+            _iterator36.e(err);
           } finally {
-            _iterator34.f();
+            _iterator36.f();
           }
         }
       } catch (err) {
-        _iterator33.e(err);
+        _iterator35.e(err);
       } finally {
-        _iterator33.f();
+        _iterator35.f();
       }
       return configStepKeys;
     }
@@ -34910,12 +35633,12 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
   }, {
     key: "getFirstConfigStepKey",
     value: function getFirstConfigStepKey() {
-      var _iterator36 = _createForOfIteratorHelper$b(this.tabGroups),
-        _step36;
+      var _iterator38 = _createForOfIteratorHelper$b(this.tabGroups),
+        _step38;
       try {
-        for (_iterator36.s(); !(_step36 = _iterator36.n()).done;) {
-          var _step36$value = _slicedToArray__default["default"](_step36.value, 2),
-            tabGroup = _step36$value[1];
+        for (_iterator38.s(); !(_step38 = _iterator38.n()).done;) {
+          var _step38$value = _slicedToArray__default["default"](_step38.value, 2),
+            tabGroup = _step38$value[1];
           if (['ACC', 'OPTION', 'ACC_PLANNER'].includes(tabGroup.type)) {
             var firstOption = tabGroup.options.values().next().value;
             var firstConfigStep = firstOption === null || firstOption === void 0 ? void 0 : firstOption.configSteps.values().next().value;
@@ -34923,9 +35646,9 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator36.e(err);
+        _iterator38.e(err);
       } finally {
-        _iterator36.f();
+        _iterator38.f();
       }
       return undefined;
     }
@@ -36564,17 +37287,42 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
 }();
 var favoritesHandlerInstance = new DivaFavoritesHandler();
 
-function ownKeys$f(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$f(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$f(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper$9(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$9(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$9(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$9(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$9(r, a) : void 0; } }
 function _arrayLikeToArray$9(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function ownKeys$f(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$f(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$f(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 
 //Diese Klasse beinhaltet die Logik wie eine aktuelle Konfiguration mit allen möglicheen Ausprägungen mit Preisen in einem Set aussieht.
 //Der in einem Set gemergte Optionsbaum
 //er ist die logik welche sich beim alten Code im oberen Teil vom plArticleConfigWeb befindet
 //dort ist es die Funktionen: InitSetConfigOptionsData -> bauen des Configbaums
 var LOG$c = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+/**
+ * The article a config STEP belongs to: a partlist child that shows its options in the MAIN tree contributes
+ * them to its PARENT's step, everything else stands for itself. Returns the parent OBJECT — never a lookup in
+ * the caller's `articles` map, which holds only VISIBLE articles (an invisible shell with visible children is
+ * not a key of it); a child whose parent is missing falls back to itself.
+ */
+function resolveStepArticle(article) {
+  var _ref;
+  return (_ref = article.partlistArticleVisibleInTree ? article.partListParentArticle : undefined) !== null && _ref !== void 0 ? _ref : article;
+}
+
+/**
+ * `articles` plus every step article one of its members resolves to. A config step's `targetArticles` carry the
+ * basketId of `resolveStepArticle`, which may be an INVISIBLE parent the visible map does not hold — code that
+ * looks target articles up by basketId needs this map, code that iterates the visible articles does not.
+ */
+function withStepArticles(articles) {
+  var extended = _objectSpread$f({}, articles);
+  for (var _i = 0, _Object$values = Object.values(articles); _i < _Object$values.length; _i++) {
+    var article = _Object$values[_i];
+    var stepArticle = resolveStepArticle(article);
+    if (!extended[stepArticle.basketId]) extended[stepArticle.basketId] = stepArticle;
+  }
+  return extended;
+}
 var DivaConfigTreeHandler = /*#__PURE__*/function () {
   function DivaConfigTreeHandler() {
     _classCallCheck__default["default"](this, DivaConfigTreeHandler);
@@ -36890,9 +37638,10 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
   }, {
     key: "addOptionsStateToConfigTree",
     value: function addOptionsStateToConfigTree(set, configTree, articles, b, ops, optionCodex, selectionmode, visible, addToTabGroup) {
-      var _article$partListPare, _set$ViewConfig4;
+      var _set$ViewConfig4;
       var article = articles[b];
-      var basketId = article.partlistArticleVisibleInTree ? (_article$partListPare = article.partListParentArticle) === null || _article$partListPare === void 0 ? void 0 : _article$partListPare.basketId : article.basketId;
+      var stepArticle = resolveStepArticle(article);
+      var basketId = stepArticle.basketId;
       var tabGroupCodex;
       var tabGroupTitel;
       if (ops.optionTabGroup) {
@@ -36930,7 +37679,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
         }
         configStepKey = configStepKey + '_' + 'acc' + (set.CatalogData.forceConfigAllAccessoires ? article.articleCodex : basketId);
       }
-      var plaBasketIds = Object.keys(articles[basketId].getRecursivePartlistArticles(true, true));
+      var plaBasketIds = Object.keys(stepArticle.getRecursivePartlistArticles(true, true));
       var singleOPVOnly = ops.visibleCount == 1 && !ops.isFreeText && !set.CatalogData.dontHideOption.includes(ops.option.codex) && !((_set$ViewConfig4 = set.ViewConfig) !== null && _set$ViewConfig4 !== void 0 && _set$ViewConfig4.showSingleOPVOnly);
       var isAccessoire = isRelatedAccessoire ? article.articleCodex : false;
       if (!configTree.getTabGroupByCodex(tabGroupCodex)) {
@@ -37184,44 +37933,44 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
     key: "getConifgItemsForView",
     value: function () {
       var _getConifgItemsForView = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(set, configStepKey) {
-        var articles, step, retValues, optionCodex, configItems, selectedItems, optionState, _iterator12, _step12, _configItem$parent$oc, key, configItem, configItemsInOPG, retVal, _retVal, clonedSet, clonedArticles, configStepOPG, configStepOPV, targetArticle, opg, ops, selectedOpv, originalVariantValues, mergedOptionOnPartlistArticle, useFastPath, fastPathValidated, variantValues, _iterator13, _step13, _clonedSet$favorites$, _clonedSet$favorites, _step13$value, opgValue, alreadyCalcedVisibleOPVs, _loop5, _i, _targetArticle$engine, _targetArticle$engine2, _ops$optionOcd2, visibleOptionValues, updatedOps, fastPathKeys, fullKeys, _retVal2, clonedConfigItemsForView, _loop4, i;
-        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        var articles, step, retValues, optionCodex, configItems, selectedItems, optionState, _iterator12, _step12, _configItem$parent$oc, key, configItem, configItemsInOPG, retVal, _retVal, configStepOPG, configStepOPV, staticItems;
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
-              articles = set.getDivaArticles(true);
+              articles = withStepArticles(set.getDivaArticles(true));
               step = set.configTree.getAllByKey(configStepKey);
               retValues = this.getConfigItems(configStepKey, articles, set.configTree);
               optionCodex = undefined;
               if (!(retValues && step != null)) {
-                _context3.next = 111;
+                _context.next = 55;
                 break;
               }
               configItems = [];
               selectedItems = retValues.selectedVals;
               optionState = articles[retValues.targetArticles[0]].getArticleOptionState(retValues.optionCodex);
               if (optionState) {
-                _context3.next = 10;
+                _context.next = 10;
                 break;
               }
               throw new Error('myOptionState ' + retValues.optionCodex + ' is undefined');
             case 10:
               optionCodex = optionState.optionCodex;
               if (!retValues.isOPG) {
-                _context3.next = 36;
+                _context.next = 36;
                 break;
               }
               _iterator12 = _createForOfIteratorHelper$9(retValues.configItems.keys());
-              _context3.prev = 13;
+              _context.prev = 13;
               _iterator12.s();
             case 15:
               if ((_step12 = _iterator12.n()).done) {
-                _context3.next = 26;
+                _context.next = 26;
                 break;
               }
               key = _step12.value;
               configItem = retValues.configItems.get(key);
               if (configItem) {
-                _context3.next = 20;
+                _context.next = 20;
                 break;
               }
               throw new Error('configItem ' + key + ' not found in retValues.configItems');
@@ -37239,132 +37988,318 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 });
               }
             case 24:
-              _context3.next = 15;
+              _context.next = 15;
               break;
             case 26:
-              _context3.next = 31;
+              _context.next = 31;
               break;
             case 28:
-              _context3.prev = 28;
-              _context3.t0 = _context3["catch"](13);
-              _iterator12.e(_context3.t0);
+              _context.prev = 28;
+              _context.t0 = _context["catch"](13);
+              _iterator12.e(_context.t0);
             case 31:
-              _context3.prev = 31;
+              _context.prev = 31;
               _iterator12.f();
-              return _context3.finish(31);
+              return _context.finish(31);
             case 34:
-              _context3.next = 108;
+              _context.next = 52;
               break;
             case 36:
               if (!(step.optionStep.mergesToOPG == undefined)) {
-                _context3.next = 41;
+                _context.next = 41;
                 break;
               }
-              _retVal = this.prepareConfigItemsForView(set, optionState, retValues.configItems, retValues.constructionRules, selectedItems, step.configStep.targetArticles, undefined, undefined, undefined, undefined, retValues.freeTextValue, retValues.freeTextLang);
+              _retVal = this.prepareConfigItemsForView(set, optionState, retValues.configItems, retValues.constructionRules, selectedItems, step.configStep.targetArticles, undefined, undefined, undefined, undefined, undefined, retValues.freeTextValue, retValues.freeTextLang);
               configItems = _retVal.myConfigItemsForView;
-              _context3.next = 108;
+              _context.next = 52;
               break;
             case 41:
               if (!(typeof step.optionStep.mergesToOPG == 'string' && step.tabGroup.options.has(step.optionStep.mergesToOPG))) {
-                _context3.next = 108;
+                _context.next = 52;
                 break;
               }
-              clonedSet = set.cloneSet();
-              clonedArticles = clonedSet.getDivaArticles(true); //IDM Bezugschritte werden zusammengefasst zu OPG und OPV
+              //IDM Bezugschritte werden zusammengefasst zu OPG und OPV
               configStepOPG = step.configStep, configStepOPV = set.configTree.getConfigStepBasketIdAndOptionCodex(configStepOPG.targetArticles[0], step.optionStep.mergesToOPG); //falls mehrere Artikel im Schritt sind werden trotzdem nur die Values des erster verwendet um die z.B. OPT2 und OPT3 zu vereinen
               if (!configStepOPV) {
-                _context3.next = 108;
+                _context.next = 52;
+                break;
+              }
+              // Two-group-families standard: pools come from the type-1 decision rows alone — no clone, no reconfiguration per group.
+              staticItems = this.mergeOPGItemsFromDecisionRows(set, articles, configStepOPG, configStepOPV, optionState, retValues.constructionRules, selectedItems);
+              if (!staticItems) {
+                _context.next = 49;
+                break;
+              }
+              configItems = staticItems;
+              _context.next = 52;
+              break;
+            case 49:
+              _context.next = 51;
+              return this.mergeOPGItemsByReconfiguration(set, step, configStepOPG, configStepOPV, optionState, retValues.constructionRules, selectedItems);
+            case 51:
+              configItems = _context.sent;
+            case 52:
+              return _context.abrupt("return", {
+                configItems: configItems,
+                option: optionCodex ? optionState.option : undefined,
+                selectedItems: selectedItems.map(function (sel) {
+                  return configItems.find(function (c) {
+                    return c.codex === sel;
+                  });
+                }),
+                notTotallyMatichingOPVs: !set.CatalogData.articleConfigAll ? retValues.notTotallyMatichingOPVs : undefined
+              });
+            case 55:
+              return _context.abrupt("return", {
+                configItems: [],
+                selectedItems: []
+              });
+            case 56:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[13, 28, 31, 34]]);
+      }));
+      function getConifgItemsForView(_x, _x2) {
+        return _getConifgItemsForView.apply(this, arguments);
+      }
+      return getConifgItemsForView;
+    }()
+    /**
+     * The dropdown headers of a merged OPG step: when an INVISIBLE second group family spans the same value
+     * feature via option groups, every visible group maps to the parent whose option group contains all its
+     * members (the parent OPV's name becomes parentName). Undefined when no such family exists; an ambiguous
+     * group gets no header rather than a wrong one.
+     */
+  }, {
+    key: "idmOpgParentNames",
+    value: function idmOpgParentNames(targetArticle, opg, ops) {
+      var optionGroups = targetArticle.CatalogData.idmOptionGroups;
+      if (!optionGroups) return undefined;
+      var valueKeys = new Set(ops.option.articleOptionValues.keys());
+      var _iterator13 = _createForOfIteratorHelper$9(targetArticle.articleOptionStates.values()),
+        _step13;
+      try {
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var state = _step13.value;
+          if (state.optionCodex === opg.optionCodex || state.optionCodex === ops.optionCodex || !state.isInvisible) continue;
+          var parentValues = state.option.articleOptionValues;
+          if (!(parentValues !== null && parentValues !== void 0 && parentValues.size)) continue;
+
+          // a parent family: EVERY option value of the invisible feature is an option group over the value feature
+          var parentMembers = new Map();
+          var isFamily = true;
+          var _iterator14 = _createForOfIteratorHelper$9(parentValues.keys()),
+            _step14;
+          try {
+            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+              var _optionGroups$parentC;
+              var parentCodex = _step14.value;
+              var members = (_optionGroups$parentC = optionGroups[parentCodex]) === null || _optionGroups$parentC === void 0 ? void 0 : _optionGroups$parentC.map(optionGroupMemberKey);
+              if (!(members !== null && members !== void 0 && members.length) || !members.every(function (key) {
+                return valueKeys.has(key);
+              })) {
+                isFamily = false;
                 break;
               }
+              parentMembers.set(parentCodex, new Set(members));
+            }
+          } catch (err) {
+            _iterator14.e(err);
+          } finally {
+            _iterator14.f();
+          }
+          if (!isFamily) continue;
+          var parentNames = new Map();
+          var _iterator15 = _createForOfIteratorHelper$9(opg.visibleOptionValues),
+            _step15;
+          try {
+            var _loop4 = function _loop4() {
+                var _optionGroups$opgValu, _parentValues$get;
+                var _step15$value = _slicedToArray__default["default"](_step15.value, 2),
+                  opgValue = _step15$value[1];
+                var groupMembers = (_optionGroups$opgValu = optionGroups[opgValue.codex]) === null || _optionGroups$opgValu === void 0 ? void 0 : _optionGroups$opgValu.map(optionGroupMemberKey);
+                if (!(groupMembers !== null && groupMembers !== void 0 && groupMembers.length)) return 0; // continue
+                var parent = _toConsumableArray__default["default"](parentMembers.entries()).find(function (_ref2) {
+                  var _ref3 = _slicedToArray__default["default"](_ref2, 2),
+                    memberSet = _ref3[1];
+                  return groupMembers.every(function (key) {
+                    return memberSet.has(key);
+                  });
+                });
+                if (!parent) return 0; // continue
+                var parentName = (_parentValues$get = parentValues.get(parent[0])) === null || _parentValues$get === void 0 ? void 0 : _parentValues$get.name;
+                if (parentName) parentNames.set(opgValue.codex, parentName);
+              },
+              _ret;
+            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+              _ret = _loop4();
+              if (_ret === 0) continue;
+            }
+          } catch (err) {
+            _iterator15.e(err);
+          } finally {
+            _iterator15.f();
+          }
+          if (parentNames.size) return parentNames;
+        }
+      } catch (err) {
+        _iterator13.e(err);
+      } finally {
+        _iterator13.f();
+      }
+      return undefined;
+    }
+
+    /**
+     * Merged-OPG view via the static decision-row path — a read-only lookup on the original set. Undefined as
+     * soon as one pool is not statically derivable; the caller then falls back to the clone-based flow.
+     */
+  }, {
+    key: "mergeOPGItemsFromDecisionRows",
+    value: function mergeOPGItemsFromDecisionRows(set, articles, configStepOPG, configStepOPV, optionState, constructionRules, selectedItems) {
+      var targetArticle = articles[configStepOPG.targetArticles[0]];
+      var opg = targetArticle === null || targetArticle === void 0 ? void 0 : targetArticle.getArticleOptionState(configStepOPG.option);
+      var ops = targetArticle === null || targetArticle === void 0 ? void 0 : targetArticle.getArticleOptionState(configStepOPV.option);
+      if (!opg || !ops) return undefined;
+      var parentNames = this.idmOpgParentNames(targetArticle, opg, ops);
+      var configItems = [];
+      var _iterator16 = _createForOfIteratorHelper$9(opg.visibleOptionValues),
+        _step16;
+      try {
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var _targetArticle$engine, _targetArticle$engine2, _ops$optionOcd2;
+          var _step16$value = _slicedToArray__default["default"](_step16.value, 2),
+            opgValue = _step16$value[1];
+          var pool = (_targetArticle$engine = (_targetArticle$engine2 = targetArticle.engine).staticVisibleOptionValuesForFeature) === null || _targetArticle$engine === void 0 ? void 0 : _targetArticle$engine.call(_targetArticle$engine2, ops.optionCodex, opg.optionCodex, opgValue.codex);
+          if (!pool) return undefined;
+          var retVal = this.prepareConfigItemsForView(set, optionState, pool, constructionRules, [], configStepOPG.targetArticles, (_ops$optionOcd2 = ops.optionOcd) !== null && _ops$optionOcd2 !== void 0 ? _ops$optionOcd2 : ops.optionCodex, opgValue.name, opgValue.codex, opg.optionCodex, parentNames === null || parentNames === void 0 ? void 0 : parentNames.get(opgValue.codex));
+          configItems = configItems.concat(retVal.myConfigItemsForView);
+        }
+      } catch (err) {
+        _iterator16.e(err);
+      } finally {
+        _iterator16.f();
+      }
+      var _loop5 = function _loop5() {
+        var _articles$configStepO;
+        var valCodex = (_articles$configStepO = articles[configStepOPG.targetArticles[i]]) === null || _articles$configStepO === void 0 || (_articles$configStepO = _articles$configStepO.getArticleOptionState(configStepOPV.option)) === null || _articles$configStepO === void 0 ? void 0 : _articles$configStepO.valCodex;
+        var sel = configItems.find(function (c) {
+          return c.codex == valCodex;
+        });
+        if (sel) {
+          sel.sel = true;
+          if (!selectedItems.includes(sel.codex)) selectedItems.push(sel.codex);
+        }
+      };
+      for (var i = 0; i < configStepOPG.targetArticles.length; i++) {
+        _loop5();
+      }
+      return configItems;
+    }
+
+    /** Merged-OPG view via per-group reconfiguration on a cloned set — the pre-existing flow, used when the static decision-row path does not apply. */
+  }, {
+    key: "mergeOPGItemsByReconfiguration",
+    value: (function () {
+      var _mergeOPGItemsByReconfiguration = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(set, step, configStepOPG, configStepOPV, optionState, constructionRules, selectedItems) {
+        var configItems, clonedSet, clonedArticles, targetArticle, opg, ops, selectedOpv, originalVariantValues, parentNames, mergedOptionOnPartlistArticle, useFastPath, fastPathValidated, variantValues, _iterator17, _step17, _clonedSet$favorites$, _clonedSet$favorites, _step17$value, opgValue, alreadyCalcedVisibleOPVs, _loop7, _i2, _targetArticle$engine3, _targetArticle$engine4, _ops$optionOcd3, visibleOptionValues, updatedOps, fastPathKeys, fullKeys, retVal, clonedConfigItemsForView, _loop6, i;
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              configItems = [];
+              clonedSet = set.cloneSet(); // Same lookup contract as the static path: a step may target an INVISIBLE parent the visible map does not hold.
+              clonedArticles = withStepArticles(clonedSet.getDivaArticles(true));
               targetArticle = clonedArticles[configStepOPG.targetArticles[0]];
               opg = targetArticle.getArticleOptionState(configStepOPG.option);
               ops = targetArticle.getArticleOptionState(configStepOPV.option);
               if (opg) {
-                _context3.next = 51;
+                _context4.next = 8;
                 break;
               }
               throw new Error('myOptionState ' + configStepOPG.option + ' is undefined');
-            case 51:
+            case 8:
               if (ops) {
-                _context3.next = 53;
+                _context4.next = 10;
                 break;
               }
               throw new Error('myOptionState ' + configStepOPV.option + ' is undefined');
-            case 53:
+            case 10:
               selectedOpv = ops.valCodex;
               originalVariantValues = targetArticle.VariantValues;
+              parentNames = this.idmOpgParentNames(targetArticle, opg, ops);
               mergedOptionOnPartlistArticle = !targetArticle.getArticleOptionStateFlat(ops.optionCodex);
               useFastPath = true, fastPathValidated = false;
               variantValues = {};
-              _iterator13 = _createForOfIteratorHelper$9(opg.visibleOptionValues);
-              _context3.prev = 59;
-              _iterator13.s();
-            case 61:
-              if ((_step13 = _iterator13.n()).done) {
-                _context3.next = 93;
+              _iterator17 = _createForOfIteratorHelper$9(opg.visibleOptionValues);
+              _context4.prev = 17;
+              _iterator17.s();
+            case 19:
+              if ((_step17 = _iterator17.n()).done) {
+                _context4.next = 51;
                 break;
               }
-              _step13$value = _slicedToArray__default["default"](_step13.value, 2), opgValue = _step13$value[1];
-              //die sichtbaren gruppen werden nun nacheinander beim Artikel gesetzt und die Validen bezüge jeder gruppe geholt -> visibleOptionValues;
+              _step17$value = _slicedToArray__default["default"](_step17.value, 2), opgValue = _step17$value[1];
+              // The visible groups are set on the article one after another and each group's valid values fetched -> visibleOptionValues.
               variantValues[opg.optionCodex] = opgValue.codex;
               alreadyCalcedVisibleOPVs = targetArticle.getMergesToOPG(opg.optionCodex + '_' + opgValue.codex, JSON.stringify(targetArticle.getVariantValuesTillOPT(opg.optionCodex)));
               if (!(alreadyCalcedVisibleOPVs != undefined && Object.keys((_clonedSet$favorites$ = (_clonedSet$favorites = clonedSet.favorites) === null || _clonedSet$favorites === void 0 ? void 0 : _clonedSet$favorites.VariantValues) !== null && _clonedSet$favorites$ !== void 0 ? _clonedSet$favorites$ : {}).length == 0)) {
-                _context3.next = 77;
+                _context4.next = 35;
                 break;
               }
               if (!((originalVariantValues === null || originalVariantValues === void 0 ? void 0 : originalVariantValues[opg.optionCodex]) == opgValue.codex)) {
-                _context3.next = 74;
+                _context4.next = 32;
                 break;
               }
-              _loop5 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop5() {
+              _loop7 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop7() {
                 var _clonedArticles$confi;
                 var valCodex, sel;
-                return _regeneratorRuntime__default["default"].wrap(function _loop5$(_context) {
-                  while (1) switch (_context.prev = _context.next) {
+                return _regeneratorRuntime__default["default"].wrap(function _loop7$(_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
                     case 0:
-                      valCodex = (_clonedArticles$confi = clonedArticles[configStepOPG.targetArticles[_i]].getArticleOptionState(configStepOPV.option)) === null || _clonedArticles$confi === void 0 ? void 0 : _clonedArticles$confi.valCodex;
+                      valCodex = (_clonedArticles$confi = clonedArticles[configStepOPG.targetArticles[_i2]].getArticleOptionState(configStepOPV.option)) === null || _clonedArticles$confi === void 0 ? void 0 : _clonedArticles$confi.valCodex;
                       sel = alreadyCalcedVisibleOPVs.find(function (c) {
                         return c.codex == valCodex;
                       });
                       if (sel) sel.sel = true;
                     case 3:
                     case "end":
-                      return _context.stop();
+                      return _context2.stop();
                   }
-                }, _loop5);
+                }, _loop7);
               });
-              _i = 0;
-            case 69:
-              if (!(_i < configStepOPG.targetArticles.length)) {
-                _context3.next = 74;
+              _i2 = 0;
+            case 27:
+              if (!(_i2 < configStepOPG.targetArticles.length)) {
+                _context4.next = 32;
                 break;
               }
-              return _context3.delegateYield(_loop5(), "t1", 71);
-            case 71:
-              _i++;
-              _context3.next = 69;
+              return _context4.delegateYield(_loop7(), "t0", 29);
+            case 29:
+              _i2++;
+              _context4.next = 27;
               break;
-            case 74:
+            case 32:
               configItems = configItems.concat(alreadyCalcedVisibleOPVs);
-              _context3.next = 91;
+              _context4.next = 49;
               break;
-            case 77:
-              visibleOptionValues = useFastPath ? (_targetArticle$engine = (_targetArticle$engine2 = targetArticle.engine).evalVisibleOptionValuesForFeature) === null || _targetArticle$engine === void 0 ? void 0 : _targetArticle$engine.call(_targetArticle$engine2, ops.optionCodex, _defineProperty__default["default"]({}, opg.optionCodex, opgValue.codex)) : undefined;
+            case 35:
+              visibleOptionValues = useFastPath ? (_targetArticle$engine3 = (_targetArticle$engine4 = targetArticle.engine).evalVisibleOptionValuesForFeature) === null || _targetArticle$engine3 === void 0 ? void 0 : _targetArticle$engine3.call(_targetArticle$engine4, ops.optionCodex, _defineProperty__default["default"]({}, opg.optionCodex, opgValue.codex)) : undefined;
               if (!(!visibleOptionValues || !fastPathValidated)) {
-                _context3.next = 87;
+                _context4.next = 45;
                 break;
               }
-              _context3.next = 81;
+              _context4.next = 39;
               return articleHandlerInstance.updateCfgValues(targetArticle, variantValues, {}, true, !mergedOptionOnPartlistArticle, true, true);
-            case 81:
+            case 39:
               updatedOps = targetArticle.getArticleOptionState(ops.optionCodex);
               if (updatedOps) {
-                _context3.next = 85;
+                _context4.next = 43;
                 break;
               }
               LOG$c.warn('[mergesToOPG] option state ' + ops.optionCodex + ' not found after setting ' + opg.optionCodex + '=' + opgValue.codex);
-              return _context3.abrupt("continue", 91);
-            case 85:
+              return _context4.abrupt("continue", 49);
+            case 43:
               if (visibleOptionValues) {
                 fastPathKeys = JSON.stringify(Array.from(visibleOptionValues.keys()));
                 fullKeys = JSON.stringify(Array.from(updatedOps.visibleOptionValues.keys()));
@@ -37375,31 +38310,31 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 }
               }
               visibleOptionValues = updatedOps.visibleOptionValues;
-            case 87:
-              _retVal2 = this.prepareConfigItemsForView(clonedSet, optionState, visibleOptionValues, retValues.constructionRules, [], step.configStep.targetArticles, (_ops$optionOcd2 = ops.optionOcd) !== null && _ops$optionOcd2 !== void 0 ? _ops$optionOcd2 : ops.optionCodex, opgValue.name, opgValue.codex, opg.optionCodex);
-              configItems = configItems.concat(_retVal2.myConfigItemsForView);
-              clonedConfigItemsForView = JSON.parse(JSON.stringify(_retVal2.myConfigItemsForView));
+            case 45:
+              retVal = this.prepareConfigItemsForView(clonedSet, optionState, visibleOptionValues, constructionRules, [], step.configStep.targetArticles, (_ops$optionOcd3 = ops.optionOcd) !== null && _ops$optionOcd3 !== void 0 ? _ops$optionOcd3 : ops.optionCodex, opgValue.name, opgValue.codex, opg.optionCodex, parentNames === null || parentNames === void 0 ? void 0 : parentNames.get(opgValue.codex));
+              configItems = configItems.concat(retVal.myConfigItemsForView);
+              clonedConfigItemsForView = JSON.parse(JSON.stringify(retVal.myConfigItemsForView));
               targetArticle.addMergesToOPG(opg.optionCodex + '_' + opgValue.codex, JSON.stringify(targetArticle.getVariantValuesTillOPT(opg.optionCodex)), clonedConfigItemsForView);
-            case 91:
-              _context3.next = 61;
+            case 49:
+              _context4.next = 19;
               break;
-            case 93:
-              _context3.next = 98;
+            case 51:
+              _context4.next = 56;
               break;
-            case 95:
-              _context3.prev = 95;
-              _context3.t2 = _context3["catch"](59);
-              _iterator13.e(_context3.t2);
-            case 98:
-              _context3.prev = 98;
-              _iterator13.f();
-              return _context3.finish(98);
-            case 101:
-              _loop4 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop4() {
+            case 53:
+              _context4.prev = 53;
+              _context4.t1 = _context4["catch"](17);
+              _iterator17.e(_context4.t1);
+            case 56:
+              _context4.prev = 56;
+              _iterator17.f();
+              return _context4.finish(56);
+            case 59:
+              _loop6 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop6() {
                 var _clonedArticles$confi2;
                 var valCodex, sel;
-                return _regeneratorRuntime__default["default"].wrap(function _loop4$(_context2) {
-                  while (1) switch (_context2.prev = _context2.next) {
+                return _regeneratorRuntime__default["default"].wrap(function _loop6$(_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
                     case 0:
                       valCodex = i == 0 ? selectedOpv : (_clonedArticles$confi2 = clonedArticles[configStepOPG.targetArticles[i]].getArticleOptionState(configStepOPV.option)) === null || _clonedArticles$confi2 === void 0 ? void 0 : _clonedArticles$confi2.valCodex;
                       sel = configItems.find(function (c) {
@@ -37411,48 +38346,34 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                       }
                     case 3:
                     case "end":
-                      return _context2.stop();
+                      return _context3.stop();
                   }
-                }, _loop4);
+                }, _loop6);
               });
               i = 0;
-            case 103:
+            case 61:
               if (!(i < configStepOPG.targetArticles.length)) {
-                _context3.next = 108;
+                _context4.next = 66;
                 break;
               }
-              return _context3.delegateYield(_loop4(), "t3", 105);
-            case 105:
+              return _context4.delegateYield(_loop6(), "t2", 63);
+            case 63:
               i++;
-              _context3.next = 103;
+              _context4.next = 61;
               break;
-            case 108:
-              return _context3.abrupt("return", {
-                configItems: configItems,
-                option: optionCodex ? optionState.option : undefined,
-                selectedItems: selectedItems.map(function (sel) {
-                  return configItems.find(function (c) {
-                    return c.codex === sel;
-                  });
-                }),
-                notTotallyMatichingOPVs: !set.CatalogData.articleConfigAll ? retValues.notTotallyMatichingOPVs : undefined
-              });
-            case 111:
-              return _context3.abrupt("return", {
-                configItems: [],
-                selectedItems: []
-              });
-            case 112:
+            case 66:
+              return _context4.abrupt("return", configItems);
+            case 67:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee, this, [[13, 28, 31, 34], [59, 95, 98, 101]]);
+        }, _callee2, this, [[17, 53, 56, 59]]);
       }));
-      function getConifgItemsForView(_x, _x2) {
-        return _getConifgItemsForView.apply(this, arguments);
+      function mergeOPGItemsByReconfiguration(_x3, _x4, _x5, _x6, _x7, _x8, _x9) {
+        return _mergeOPGItemsByReconfiguration.apply(this, arguments);
       }
-      return getConifgItemsForView;
-    }()
+      return mergeOPGItemsByReconfiguration;
+    }())
   }, {
     key: "getConfigItems",
     value: function getConfigItems(key, articles, configTree) {
@@ -37490,11 +38411,11 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               constructionRules = myOptionState.constructionRules;
               configItems = new Map(myOptionState.visibleOptionValues);
             } else {
-              var _iterator14 = _createForOfIteratorHelper$9(configItems.keys()),
-                _step14;
+              var _iterator18 = _createForOfIteratorHelper$9(configItems.keys()),
+                _step18;
               try {
-                var _loop6 = function _loop6() {
-                  var key = _step14.value;
+                var _loop8 = function _loop8() {
+                  var key = _step18.value;
                   if (!myOptionState.visibleOptionValues.get(key) && !myOptionState.visibleOptionValues.values().find(function (v) {
                     var _configItems$get;
                     return v.sameopv && v.sameopv == ((_configItems$get = configItems.get(key)) === null || _configItems$get === void 0 ? void 0 : _configItems$get.sameopv);
@@ -37502,13 +38423,13 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                     configItems["delete"](key);
                   }
                 };
-                for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-                  _loop6();
+                for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+                  _loop8();
                 }
               } catch (err) {
-                _iterator14.e(err);
+                _iterator18.e(err);
               } finally {
-                _iterator14.f();
+                _iterator18.f();
               }
             }
           } else if (i == 0 && configStep.targetArticles.length == 1) {
@@ -37530,12 +38451,12 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
         }
         if (visibleOptionValuesOfArticles.length > 0) {
           configItems = new Map(visibleOptionValuesOfArticles[0]);
-          var _loop7 = function _loop7(_i2) {
+          var _loop9 = function _loop9(_i3) {
             var _article$getArticleOp2;
-            var article = articles[configStep.targetArticles[_i2]];
+            var article = articles[configStep.targetArticles[_i3]];
             if ((_article$getArticleOp2 = article.getArticleOptionStateFlat(configStep.option)) !== null && _article$getArticleOp2 !== void 0 && _article$getArticleOp2.definedBySetFeatureFixed) return 1; // continue
             var keys = Array.from(configItems.keys());
-            var newKeys = Array.from(visibleOptionValuesOfArticles[_i2].keys());
+            var newKeys = Array.from(visibleOptionValuesOfArticles[_i3].keys());
             var opvsOnlyInA = keys.filter(function (x) {
               return !newKeys.includes(x);
             });
@@ -37543,12 +38464,12 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               return !keys.includes(x);
             });
             if (opvsOnlyInA.length && opvsOnlyInB.length) {
-              var _loop8 = function _loop8() {
+              var _loop10 = function _loop10() {
                 var opva = configItems.get(opvsOnlyInA[j]);
                 if (!opva) return 1; // continue
                 var sameOPVExists = opvsOnlyInB.find(function (opvb) {
                   var _visibleOptionValuesO;
-                  return opva.sameopv && opva.sameopv == ((_visibleOptionValuesO = visibleOptionValuesOfArticles[_i2].get(opvb)) === null || _visibleOptionValuesO === void 0 ? void 0 : _visibleOptionValuesO.sameopv);
+                  return opva.sameopv && opva.sameopv == ((_visibleOptionValuesO = visibleOptionValuesOfArticles[_i3].get(opvb)) === null || _visibleOptionValuesO === void 0 ? void 0 : _visibleOptionValuesO.sameopv);
                 });
                 if (sameOPVExists) {
                   opvsOnlyInA.splice(j, 1);
@@ -37556,37 +38477,37 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 }
               };
               for (var j = opvsOnlyInA.length - 1; j >= 0; j--) {
-                if (_loop8()) continue;
+                if (_loop10()) continue;
               }
             } else if (opvsOnlyInA.length) {
-              var _loop9 = function _loop9() {
+              var _loop11 = function _loop11() {
                 var opva = configItems.get(opvsOnlyInA[_j]);
                 if (!opva) return 1; // continue
                 var sameOPVExists = newKeys.find(function (opvb) {
                   var _visibleOptionValuesO2;
-                  return opva.sameopv && opva.sameopv == ((_visibleOptionValuesO2 = visibleOptionValuesOfArticles[_i2].get(opvb)) === null || _visibleOptionValuesO2 === void 0 ? void 0 : _visibleOptionValuesO2.sameopv);
+                  return opva.sameopv && opva.sameopv == ((_visibleOptionValuesO2 = visibleOptionValuesOfArticles[_i3].get(opvb)) === null || _visibleOptionValuesO2 === void 0 ? void 0 : _visibleOptionValuesO2.sameopv);
                 });
                 if (sameOPVExists) {
                   opvsOnlyInA.splice(_j, 1);
                 }
               };
               for (var _j = opvsOnlyInA.length - 1; _j >= 0; _j--) {
-                if (_loop9()) continue;
+                if (_loop11()) continue;
               }
             } else if (opvsOnlyInB.length) {
-              var _loop10 = function _loop10() {
+              var _loop12 = function _loop12() {
                 var opva = configItems.get(opvsOnlyInB[_j2]);
                 if (!opva) return 1; // continue
                 var sameOPVExists = keys.find(function (opvb) {
                   var _visibleOptionValuesO3;
-                  return opva.sameopv && opva.sameopv == ((_visibleOptionValuesO3 = visibleOptionValuesOfArticles[_i2].get(opvb)) === null || _visibleOptionValuesO3 === void 0 ? void 0 : _visibleOptionValuesO3.sameopv);
+                  return opva.sameopv && opva.sameopv == ((_visibleOptionValuesO3 = visibleOptionValuesOfArticles[_i3].get(opvb)) === null || _visibleOptionValuesO3 === void 0 ? void 0 : _visibleOptionValuesO3.sameopv);
                 });
                 if (sameOPVExists) {
                   opvsOnlyInB.splice(_j2, 1);
                 }
               };
               for (var _j2 = opvsOnlyInB.length - 1; _j2 >= 0; _j2--) {
-                if (_loop10()) continue;
+                if (_loop12()) continue;
               }
             }
             var differentOPVs = opvsOnlyInA.concat(opvsOnlyInB);
@@ -37594,8 +38515,8 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               notTotallyMatichingOPVs = true;
             }
           };
-          for (var _i2 = 1; _i2 < visibleOptionValuesOfArticles.length; _i2++) {
-            if (_loop7(_i2)) continue;
+          for (var _i3 = 1; _i3 < visibleOptionValuesOfArticles.length; _i3++) {
+            if (_loop9(_i3)) continue;
           }
         }
         return {
@@ -37624,11 +38545,11 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
         ret = false;
       var articles = set.getDivaArticles();
       for (var basketId in articles) {
-        var _iterator15 = _createForOfIteratorHelper$9(articles[basketId].articleOptionStates.values()),
-          _step15;
+        var _iterator19 = _createForOfIteratorHelper$9(articles[basketId].articleOptionStates.values()),
+          _step19;
         try {
-          for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-            var ops = _step15.value;
+          for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+            var ops = _step19.value;
             if (ops.headerPosVariationType == 'K') {
               if (optionValues[ops.optionCodex] == undefined) {
                 optionValues[ops.optionCodex] = ops.valCodex ? ops.valCodex : null;
@@ -37641,9 +38562,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             }
           }
         } catch (err) {
-          _iterator15.e(err);
+          _iterator19.e(err);
         } finally {
-          _iterator15.f();
+          _iterator19.f();
         }
         if (ret == true) break;
       }
@@ -37667,8 +38588,8 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       var visibleHistory = [];
       var lastVisible = !((_this$getSnapshotOpt$ = (_this$getSnapshotOpt = this.getSnapshotOpt(stack[0].snapshots.before, ops.optionCodex)) === null || _this$getSnapshotOpt === void 0 ? void 0 : _this$getSnapshotOpt.invisible) !== null && _this$getSnapshotOpt$ !== void 0 ? _this$getSnapshotOpt$ : true);
       var toDecisionNo = function toDecisionNo(entry) {
-        var _ref, _Number, _entry$decision, _entry$decision2;
-        var nr = (_ref = (_Number = (_entry$decision = entry.decision) === null || _entry$decision === void 0 ? void 0 : _entry$decision.Number) !== null && _Number !== void 0 ? _Number : (_entry$decision2 = entry.decision) === null || _entry$decision2 === void 0 ? void 0 : _entry$decision2.decisionNo) !== null && _ref !== void 0 ? _ref : entry.nr;
+        var _ref4, _Number, _entry$decision, _entry$decision2;
+        var nr = (_ref4 = (_Number = (_entry$decision = entry.decision) === null || _entry$decision === void 0 ? void 0 : _entry$decision.Number) !== null && _Number !== void 0 ? _Number : (_entry$decision2 = entry.decision) === null || _entry$decision2 === void 0 ? void 0 : _entry$decision2.decisionNo) !== null && _ref4 !== void 0 ? _ref4 : entry.nr;
         return typeof nr === 'number' ? nr : Number(nr) || 0;
       };
       for (var i = 0; i < stack.length; i++) {
@@ -37737,11 +38658,11 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       var lastVisible = (_this$getSnapshotOpt$2 = (_this$getSnapshotOpt2 = this.getSnapshotOpt(stack[0].snapshots.before, optionCodex)) === null || _this$getSnapshotOpt2 === void 0 || (_this$getSnapshotOpt2 = _this$getSnapshotOpt2.visibleOPVs) === null || _this$getSnapshotOpt2 === void 0 ? void 0 : _this$getSnapshotOpt2.includes(opvCodex)) !== null && _this$getSnapshotOpt$2 !== void 0 ? _this$getSnapshotOpt$2 : false;
       var lastSel = (_this$getSnapshotOpt$3 = (_this$getSnapshotOpt3 = this.getSnapshotOpt(stack[0].snapshots.before, optionCodex)) === null || _this$getSnapshotOpt3 === void 0 ? void 0 : _this$getSnapshotOpt3.selOPV) !== null && _this$getSnapshotOpt$3 !== void 0 ? _this$getSnapshotOpt$3 : '';
       var toDecisionNo = function toDecisionNo(entry) {
-        var _ref2, _Number2, _entry$decision3, _entry$decision4;
-        var nr = (_ref2 = (_Number2 = (_entry$decision3 = entry.decision) === null || _entry$decision3 === void 0 ? void 0 : _entry$decision3.Number) !== null && _Number2 !== void 0 ? _Number2 : (_entry$decision4 = entry.decision) === null || _entry$decision4 === void 0 ? void 0 : _entry$decision4.decisionNo) !== null && _ref2 !== void 0 ? _ref2 : entry.nr;
+        var _ref5, _Number2, _entry$decision3, _entry$decision4;
+        var nr = (_ref5 = (_Number2 = (_entry$decision3 = entry.decision) === null || _entry$decision3 === void 0 ? void 0 : _entry$decision3.Number) !== null && _Number2 !== void 0 ? _Number2 : (_entry$decision4 = entry.decision) === null || _entry$decision4 === void 0 ? void 0 : _entry$decision4.decisionNo) !== null && _ref5 !== void 0 ? _ref5 : entry.nr;
         return typeof nr === 'number' ? nr : Number(nr) || 0;
       };
-      var _loop11 = function _loop11() {
+      var _loop13 = function _loop13() {
         var _before$visibleOPVs, _after$visibleOPVs$in, _after$visibleOPVs2, _after$selOPV;
         var entry = stack[i];
         var before = _this.getSnapshotOpt(entry.snapshots.before, optionCodex);
@@ -37762,7 +38683,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
         lastSel = newSel;
       };
       for (var i = 0; i < stack.length; i++) {
-        _loop11();
+        _loop13();
       }
       result.visible = lastVisible;
       return result;
@@ -37771,7 +38692,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
     key: "prepareConfigItemsForView",
     value: function prepareConfigItemsForView(set, ops, myConfigItems, constructionRules, selectedVals, targetArticles, optionCodex,
     //bei einer OPG wird hier dessen hauptoptionCodex Übergeben
-    idmOpgGroupName, idmOpgValCodex, idmOpgOptionCodex, freeTextValue, freeTextLang) {
+    idmOpgGroupName, idmOpgValCodex, idmOpgOptionCodex, idmOpgParentName,
+    //dropdown header above the group: the invisible parent family's OPV name (e.g. Preisgruppe)
+    freeTextValue, freeTextLang) {
       var _this2 = this;
       var myConfigItemsForView = [];
       var objectKeys = Array.from(myConfigItems.keys());
@@ -37780,8 +38703,8 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
         myConfigItems = new Map(ops.option.articleOptionValues);
       }
       var groupContentItemIdObject = this.getGroupContentItemIdObject(Array.from(myConfigItems.values()), idmOpgGroupName);
-      var _loop12 = function _loop12() {
-        var _ops$optionOcd3, _item$images, _item$colorGroups, _item$pdfUrl, _item$url, _ops$option$checkForR;
+      var _loop14 = function _loop14() {
+        var _ops$optionOcd4, _item$images, _item$colorGroups, _item$pdfUrl, _item$url, _ops$option$checkForR;
         var item = myConfigItems.get(objectKeys[i]);
         if (!item) throw new Error('item ' + objectKeys[i] + ' not found in myConfigItems');
         var key = objectKeys[i];
@@ -37800,7 +38723,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
         if (imageFromVisibleOPVsImages) {
           image = imageFromVisibleOPVsImages;
         }
-        var isFav = favoritesHandlerInstance.isFavorite(set, targetArticles, item, (_ops$optionOcd3 = ops.optionOcd) !== null && _ops$optionOcd3 !== void 0 ? _ops$optionOcd3 : optionCodex);
+        var isFav = favoritesHandlerInstance.isFavorite(set, targetArticles, item, (_ops$optionOcd4 = ops.optionOcd) !== null && _ops$optionOcd4 !== void 0 ? _ops$optionOcd4 : optionCodex);
         var isSelected = !!selectedVals.find(function (opv) {
           return opv == item.codex;
         });
@@ -37818,7 +38741,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           zoomImage: zoomImage,
           hexColor: item.hexColor,
           groupName: groupName,
-          parentName: !idmOpgOptionCodex && (!set.CatalogData.hidePriceGroupsOfOPGs || !item.isParentOPVG) ? item.parentName : undefined,
+          parentName: idmOpgOptionCodex ? !set.CatalogData.hidePriceGroupsOfOPGs ? idmOpgParentName : undefined : !set.CatalogData.hidePriceGroupsOfOPGs || !item.isParentOPVG ? item.parentName : undefined,
           longDescription: item.description,
           text: item.name + (item.isFreeText && freeTextToUse ? ': ' + freeTextToUse : ''),
           rals: item.rals,
@@ -37855,7 +38778,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
         });
       };
       for (var i = 0; i < objectKeys.length; i++) {
-        if (_loop12()) continue;
+        if (_loop14()) continue;
       }
       return {
         myConfigItemsForView: myConfigItemsForView
@@ -37889,12 +38812,12 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       for (var iKey in optionStatesOfArticles) {
         //hier evtl. die Article mit einer gewissen reihenfolge durchlaufen!
         var optionsStates = optionStatesOfArticles[iKey];
-        var _iterator16 = _createForOfIteratorHelper$9(optionsStates.values()),
-          _step16;
+        var _iterator20 = _createForOfIteratorHelper$9(optionsStates.values()),
+          _step20;
         try {
-          for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
             var _ops$addToMeasure2;
-            var ops = _step16.value;
+            var ops = _step20.value;
             var selectionmode = ops.selectionmode;
             if (set.CatalogData.forceConfigSingle && (selectionmode == 1 || selectionmode == 2)) selectionmode = 3;
             if (ops.isInvisible || selectionmode == 0 || !ops.isDoShow || ops.visibleCount == 0 || !!((_ops$addToMeasure2 = ops.addToMeasure) !== null && _ops$addToMeasure2 !== void 0 && _ops$addToMeasure2.length)) {
@@ -37902,9 +38825,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             }
           }
         } catch (err) {
-          _iterator16.e(err);
+          _iterator20.e(err);
         } finally {
-          _iterator16.f();
+          _iterator20.f();
         }
       }
       return configTree;
@@ -38396,7 +39319,7 @@ var DivaSet = /*#__PURE__*/function () {
       var allAccs = [];
       var articles = this.getDivaArticles();
       var article = articles[basketId];
-      if (!article) throw new Error('article ' + basketId + ' does not exist');
+      if (!article) return curNum;
       var myParentArticle = article.getBaseParent();
       var _this$getSplitPlanned = this.getSplitPlannedAccessoiresOfBasketId(basketId),
         notPlannedAcc = _this$getSplitPlanned.notPlannedAcc,
@@ -39305,7 +40228,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-9ea7a6aa.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-2350aacc.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -42695,7 +43618,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 newArticle.accessoireParentArticle = set.getArticleByBasketId(newArticle.relatedToBasketId);
               }
               //holt die bereits gesetzten Option welche beim neuen Article übernommen werden könnten
-              defaultHeaderValues = articleHandlerInstance.getDefaultValuesOfArticles(set.getDivaArticles()); //falls die SVGs im frontend ausmultipliziert wurden hier die regel des SVGs als VariantValues anwenden
+              defaultHeaderValues = initParams.dontInheritSetValues ? {} : articleHandlerInstance.getDefaultValuesOfArticles(set.getDivaArticles()); //falls die SVGs im frontend ausmultipliziert wurden hier die regel des SVGs als VariantValues anwenden
               if (initParams.svgJsonFormula && newArticle.catalogArticle.svgsAreMultiplied) {
                 defaultHeaderValues = DivaUtils__default["default"].getVariantValuesFromRule(initParams.svgJsonFormula, defaultHeaderValues);
               }
@@ -44543,7 +45466,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
     value: (function () {
       var _updateArticlesOptionStatesOfActSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee35(set, myValues, targetArticlesWithNewValues, ignorePlanner, from, partlistDiff, forceUpdate) {
         var _resultPlannerUpdate;
-        var elementsToDeleteById, targetArticlesToUpdateOnly, previousValues, articles, article, optState, retValues, diff, resultPlannerUpdate, targetElementIds, i, articleToDel, index, result, articleCopyRelation, newArticle, rpu, copyIndex;
+        var elementsToDeleteById, targetArticlesToUpdateOnly, previousValues, mayNeedRollback, articles, article, optState, retValues, diff, resultPlannerUpdate, targetElementIds, i, articleToDel, index, result, articleCopyRelation, newArticle, rpu, copyIndex;
         return _regeneratorRuntime__default["default"].wrap(function _callee35$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
             case 0:
@@ -44558,63 +45481,71 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 targetArticlesToUpdateOnly = targetArticlesWithNewValues;
               }
               previousValues = {};
+              /**
+               * The ONLY reader of `previousValues` is the planner-rollback below, and that whole block is
+               * skipped for `ignorePlanner` / `from === 'calcVariant'` callers. Snapshotting the article for
+               * them meant a `getArticleJsonVariantValues()` plus a `structuredClone()` per call whose result
+               * could never be read — and those callers are the hot ones: every variant sweep and every
+               * catalog-test combination goes through 'calcVariant'.
+               */
+              mayNeedRollback = !ignorePlanner && from !== 'calcVariant';
               articles = set.getDivaArticles();
-              if (articles && targetArticlesWithNewValues && targetArticlesWithNewValues.length > 0 && myValues) {
+              if (mayNeedRollback && articles && targetArticlesWithNewValues && targetArticlesWithNewValues.length > 0 && myValues) {
                 article = articles[targetArticlesWithNewValues[0]];
                 optState = article === null || article === void 0 ? void 0 : article.getArticleJsonVariantValues();
                 previousValues = structuredClone(optState);
               }
-              _context37.next = 8;
+              _context37.next = 9;
               return articleHandlerInstance.updateArticlesOptionStates(myValues, targetArticlesWithNewValues, targetArticlesToUpdateOnly, set.getDivaArticles(true), from);
-            case 8:
+            case 9:
               retValues = _context37.sent;
               targetArticlesWithNewValues = retValues.targetArticlesToUpdate;
               if (!(retValues.partlistArticlesToLoad.length > 0)) {
-                _context37.next = 19;
+                _context37.next = 20;
                 break;
               }
               diff = targetArticlesToUpdateOnly.length - Object.keys(set.getDivaArticles()).length;
               if (!(diff == 0 || partlistDiff == diff)) {
-                _context37.next = 17;
+                _context37.next = 18;
                 break;
               }
-              _context37.next = 15;
+              _context37.next = 16;
               return articleHandlerInstance.correctPartlistArticlesByGlobalRules(set, retValues.partlistArticlesToLoad, set.CatalogData.bundleRules, {
                 doChange: false
               });
-            case 15:
-              _context37.next = 19;
+            case 16:
+              _context37.next = 20;
               break;
-            case 17:
-              _context37.next = 19;
+            case 18:
+              _context37.next = 20;
               return this.updateArticlesOptionStatesOfActSet(set, {}, targetArticlesWithNewValues, ignorePlanner, from, diff);
-            case 19:
+            case 20:
               if (!(from !== 'initializingPartlist')) {
-                _context37.next = 22;
+                _context37.next = 23;
                 break;
               }
-              _context37.next = 22;
+              _context37.next = 23;
               return this.updateEdoArticles(set, retValues.newEDOExtraArticles);
-            case 22:
+            case 23:
               if (set.CatalogData.hasAlternateRenderings) set.CatalogData.updateAlternativeRenderings(set.getDivaArticles());
 
               //Update Planner - check if planner data changed
               if (!(!ignorePlanner && from != 'calcVariant')) {
-                _context37.next = 64;
+                _context37.next = 65;
                 break;
               }
               targetElementIds = this.getElementIdsOfArticles(set, targetArticlesWithNewValues);
-              _context37.next = 27;
+              _context37.next = 28;
               return set.plannerHandler.updatePlanner(set.getSetId(), myValues, targetElementIds, forceUpdate);
-            case 27:
+            case 28:
               resultPlannerUpdate = _context37.sent;
               if (!resultPlannerUpdate.failed) {
-                _context37.next = 31;
+                _context37.next = 32;
                 break;
               }
-              _context37.next = 31;
+              _context37.next = 32;
               return articleHandlerInstance.updateArticlesOptionStates(previousValues, targetArticlesWithNewValues, targetArticlesToUpdateOnly, set.getDivaArticles(true), from);
-            case 31:
+            case 32:
               elementsToDeleteById = resultPlannerUpdate.elemIdsToDelete;
               for (i = 0; i < resultPlannerUpdate.elemIdsToDelete.length; i++) {
                 articleToDel = set.getArticleByElementId(resultPlannerUpdate.elemIdsToDelete[i]);
@@ -44624,58 +45555,58 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 }
               }
               if (!resultPlannerUpdate.doDeleteBackGrid) {
-                _context37.next = 40;
+                _context37.next = 41;
                 break;
               }
-              _context37.next = 36;
+              _context37.next = 37;
               return this.deleteElementFromSetByElemId(set, resultPlannerUpdate.elemIdsToDelete[0], false, resultPlannerUpdate.deletionType);
-            case 36:
+            case 37:
               result = _context37.sent;
               //Others are deleted recursive
               if (result.selectElementId) {
                 resultPlannerUpdate.elementIdsToUpdateSelection = [result.selectElementId];
               }
-              _context37.next = 47;
+              _context37.next = 48;
               break;
-            case 40:
-              i = 0;
             case 41:
+              i = 0;
+            case 42:
               if (!(i < resultPlannerUpdate.elemIdsToDelete.length)) {
-                _context37.next = 47;
+                _context37.next = 48;
                 break;
               }
-              _context37.next = 44;
+              _context37.next = 45;
               return this.deleteElementFromSetByElemId(set, resultPlannerUpdate.elemIdsToDelete[i], false, resultPlannerUpdate.deletionType);
-            case 44:
+            case 45:
               i++;
-              _context37.next = 41;
+              _context37.next = 42;
               break;
-            case 47:
+            case 48:
               if (!(resultPlannerUpdate.elementIdToCopy && resultPlannerUpdate.elementIdToCopy.length > 0)) {
-                _context37.next = 63;
+                _context37.next = 64;
                 break;
               }
               //Todo copy these elements
               articleCopyRelation = [];
               i = 0;
-            case 50:
+            case 51:
               if (!(i < resultPlannerUpdate.elementIdToCopy.length)) {
-                _context37.next = 58;
+                _context37.next = 59;
                 break;
               }
-              _context37.next = 53;
+              _context37.next = 54;
               return this.copyArticleByElementId(set, resultPlannerUpdate.elementIdToCopy[i], resultPlannerUpdate.ignoreOptionsToCopy);
-            case 53:
+            case 54:
               newArticle = _context37.sent;
               articleCopyRelation.push({
                 key: resultPlannerUpdate.elementIdToCopy[i],
                 value: newArticle.basketId
               });
-            case 55:
+            case 56:
               i++;
-              _context37.next = 50;
+              _context37.next = 51;
               break;
-            case 58:
+            case 59:
               rpu = resultPlannerUpdate;
               copyIndex = {
                 x: rpu.copyDPType == 'AVL' ? -1 : rpu.copyDPType == 'AVR' ? 1 : 0,
@@ -44683,25 +45614,25 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 z: rpu.copyType == 'BoxPlanner_backside' ? -1 : 0
               };
               if (!(resultPlannerUpdate.copyType == 'BoxPlanner_backside')) {
-                _context37.next = 63;
+                _context37.next = 64;
                 break;
               }
-              _context37.next = 63;
+              _context37.next = 64;
               return set.plannerHandler.copyPlannerElements(set.getSetId(), articleCopyRelation, {
                 copyIndex: copyIndex,
                 copyType: resultPlannerUpdate.copyType,
                 changedOPT: resultPlannerUpdate.changedOPT,
                 targetElements: resultPlannerUpdate.targetElements
               });
-            case 63:
-              this.updatePosNrOfAccessoiresOfTargetArticles(set, targetArticlesWithNewValues);
             case 64:
+              this.updatePosNrOfAccessoiresOfTargetArticles(set, targetArticlesWithNewValues);
+            case 65:
               return _context37.abrupt("return", {
                 articleCountChanged: elementsToDeleteById.length > 0,
                 elementIdsToUpdateSelection: (_resultPlannerUpdate = resultPlannerUpdate) === null || _resultPlannerUpdate === void 0 ? void 0 : _resultPlannerUpdate.elementIdsToUpdateSelection,
                 setId: set.getSetId()
               });
-            case 65:
+            case 66:
             case "end":
               return _context37.stop();
           }
@@ -47133,7 +48064,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-1a240ebf.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-be3ebeaa.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -47141,7 +48072,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-fbc83326.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-1efa9da7.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -47149,7 +48080,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-f492ea60.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-6d4d921a.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -47157,7 +48088,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-6187c7c9.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-c84a70a7.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -48544,7 +49475,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
               //If we need real time rendering initialize the SignalR and 3D host connection Handler
               bootMark('signalr: chunk import start');
               _context3.next = 3;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-9710fc4e.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-dad3c3fd.js'); });
             case 3:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -50276,7 +51207,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context5.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-d6cb5f39.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-85b2b3ec.js'); });
             case 10:
               _yield$import = _context5.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -50287,7 +51218,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context5.abrupt("break", 21);
             case 15:
               _context5.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-e772f6a3.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-143d6027.js'); });
             case 17:
               _yield$import2 = _context5.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -54631,13 +55562,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     }()
     /*********************************END Functions in Logik called From View END *************************************/
     /*********************************** View attachment (Logik -> View) ***************************************/
-    /** True while a view is attached; false = headless (backoffice DIVA agent, artifact passes). */
-  }, {
-    key: "isViewAttached",
-    get: function get() {
-      return !!this.view;
-    }
-
     /** Attach the view (initial mount or adoption of an existing, possibly headless instance). */
   }, {
     key: "attachView",
@@ -54663,15 +55587,39 @@ var DivaWebPlanner = /*#__PURE__*/function () {
 
     /**
      * Bring the view to a config step (and optionally one option value): the view does the
-     * actual navigation/scrolling. Used by the diva agent after it drives the configuration.
-     * No-op when headless.
+     * actual navigation/scrolling. Used by the diva agent after it drives the configuration
+     * and to point a step out to the user.
+     *
+     * Returns FALSE when headless — nothing was shown to anyone. Callers must report that
+     * instead of assuming the user saw it; a silent no-op reads as success.
      */
   }, {
     key: "revealConfigStepInView",
     value: function revealConfigStepInView(configStepKey, optionValueCodex) {
-      var _this$view97, _this$view98;
-      (_this$view97 = this.view) === null || _this$view97 === void 0 || _this$view97.navigateToConfigStep(configStepKey, false);
-      if (optionValueCodex) (_this$view98 = this.view) === null || _this$view98 === void 0 || _this$view98.scrollToOptionValueInView(configStepKey, optionValueCodex);
+      if (!this.view) return false;
+      this.view.navigateToConfigStep(configStepKey, false);
+      if (optionValueCodex) this.view.scrollToOptionValueInView(configStepKey, optionValueCodex);
+      return true;
+    }
+
+    /** Is a view attached — i.e. can a user actually see this instance? False = headless. */
+  }, {
+    key: "hasAttachedView",
+    get: function get() {
+      return !!this.view;
+    }
+
+    /**
+     * The config step the attached view currently shows. The read-back for
+     * {@link revealConfigStepInView}: the view may land somewhere else (a step bound to
+     * another option redirects to its group) or nowhere at all, so a caller that wants to
+     * claim "the user is now looking at X" has to compare instead of trusting the call.
+     */
+  }, {
+    key: "getCurConfigStepKeyInView",
+    value: function getCurConfigStepKeyInView() {
+      var _this$view97, _this$view97$getCurCo;
+      return (_this$view97 = this.view) === null || _this$view97 === void 0 || (_this$view97$getCurCo = _this$view97.getCurConfigStepKey) === null || _this$view97$getCurCo === void 0 ? void 0 : _this$view97$getCurCo.call(_this$view97);
     }
 
     /***********************************Outside events the webPlanner subscribes to ******************************************/
@@ -57002,6 +57950,484 @@ var PlannerElementData = /*#__PURE__*/function () {
   }]);
 }();
 
+/**
+ * The VALUE ENCODING of every catalog/article/option/option-value property, keyed by codex.
+ *
+ * A property's `Value` travels as a STRING and each property decides how that string is read - '1' for one flag,
+ * 'true' for the next, a ';' list for a third. This table records which, so an editor can offer the right control
+ * and write back exactly what the parser reads, and so a caller can validate a value before storing it.
+ *
+ * GENERATED from the four parsers - do not hand-edit; regenerate when a `case` is added there:
+ *   CatalogData.ts | CatalogArticleData.ts | CatalogOptionData.ts | CatalogOptionValueData.ts
+ * `propertyValueCodec.test.ts` fails when a parser case has no entry here.
+ */
+
+/** The entity a property hangs on; the same codex can mean different things on different entities. */
+
+/**
+ * How the raw string is turned into a value. The boolean variants are NOT interchangeable: writing 'true' where
+ * the parser tests `== '1'` silently yields false, and `boolean:present` treats EVERY non-empty string as true,
+ * so its off-state is an ABSENT value rather than '0'.
+ */
+
+/** The encoding per property codex, for one entity. */
+
+/** 95 properties parsed on the catalog entity. */
+var CATALOG_PROPERTIES = {
+  '3D_COMPATIBLE_WITH_IMAGE_CACHE': 'boolean:1',
+  ACCESSOIRE_STEP_AS_PLANNER: 'boolean:1',
+  ADD_NEW_LINE_BEFOR_RULEDESC: 'boolean:1',
+  ADD_PA_ON_EDO: 'opaque',
+  ADD_POS_INVISIBILITY_TO_OL: 'boolean:1',
+  ARTICLECONFIGALL: 'boolean:1',
+  ARTICLECONFIGSINGLE: 'boolean:1',
+  ARTICLE_NR: 'string',
+  AUTO_OPEN_CONTENTITEM: 'all-or-list:;',
+  BANNER: 'json',
+  BUNDLE_RULES: 'json',
+  CHECK_COLLISION_DIFFERENT_LAYERS: 'list:;',
+  CONFIG_ACCESSOIRES: 'boolean:1',
+  CONFIG_ONLY_ACCESSOIRES: 'boolean:1',
+  DEFAULT_DO_SHOW_3DDIMENSIONS: 'boolean:1|true',
+  DEFAULT_GROUPS_CLOSED: 'boolean-or-list:;',
+  DIMENSION_CONFIG: 'json',
+  DIVA3D_AR_FORCERTV: 'boolean:1',
+  DIVA3D_AR_READY: 'boolean:1',
+  DIVA3D_DISABLE_3DEXPORT: 'boolean:1',
+  DIVA3D_PLANER_DIGITS: 'number',
+  DIVA3D_PLANER_SHOW_ARTICLE_SVG: 'boolean:1',
+  DIVA3D_RENDERING: 'boolean:1|true',
+  DIVA3D_ROOM: 'string',
+  DIVA3D_STATIC_BG_IMAGE_ROOMLIST: 'list:;',
+  DIVA3D_USE_RTV_NEXT: 'boolean:1',
+  DIVA_KI_READY: 'boolean:1|true',
+  DOCKACCONAVOONLY: 'boolean:1',
+  DONTCALCBASEPRICE: 'boolean:1',
+  DONTHIDEOPTION: 'list:,',
+  DONT_SAVE_ALTERNATIVERENDERINGS: 'boolean:1',
+  DONT_SET_POSNR_FROM_PLANNER: 'boolean:1',
+  DONT_SHOW_ACC_STEP: 'boolean:1',
+  DONT_USE_VCODEX_FOR_BASKET: 'boolean:1',
+  DO_SHOW_MAIN_DIMENSIONS: 'boolean:1|true',
+  DO_USE_RULEDESC_FOR_PARTLIST: 'boolean:1',
+  ELEMENT_COPY_AVLR: 'all-or-list:;',
+  ENABLE_DO_SHOW_3DDIMENSIONS: 'boolean:1|true',
+  FILTER_FOR_CHECKOUT_BUTTONS: 'list:;',
+  FORCECONSTRUCTIONWARNINGARTICLES: 'list:;',
+  FORCE_CONFIG_ALL_ACCESSOIRES: 'boolean:1',
+  FORCE_CONFIG_SINGLE: 'boolean:1',
+  HEADER_DIMENSION_IDS: 'list:;',
+  HIDECOMPLETENESSWARNING: 'boolean:1',
+  HIDECONSTRUCTIONWARNING: 'opaque',
+  HIDE_2D_PLANNER: 'boolean:1',
+  HIDE_AV_BUTTONS: 'string',
+  HIDE_PLANNER_UI_ICONS: 'boolean:1',
+  HIDE_PRICEPREVIEW_ON_OPTIONS: 'list:;',
+  HIDE_PRICE_GROUPS_OF_OPGS: 'boolean:1',
+  HIDE_SUBPOS_ARTICLECODEX_EKTEXT: 'boolean:1',
+  IDM3D_CAT_CODEX: 'string',
+  IDM3D_ENVIRONMENT: 'string',
+  IGNOREDOCKINGNUMBER: 'boolean:1',
+  IGNORELAYERAVC: 'boolean:1',
+  IGNORELAYERAVNAVS: 'boolean:1',
+  IGNORELAYERAVOAVU: 'boolean:1',
+  IGNORE_ARTICLERELATIONS: 'boolean:1',
+  IGNORE_ISDEFINED_CHECK: 'boolean:1',
+  IGNORE_MAX_PRICE_AS_BASEPRICE: 'boolean:1',
+  INIT_OPTIONTREE_TWICE: 'boolean:1',
+  IS_IDM3D_CAT: 'boolean:1|true',
+  MERGE_OPTIONS_TO_SAME_OPTION: 'list:;',
+  NOTIFICATIONS: 'json',
+  ONCONFIG_SINGLE_DONT_GENERALIZE: 'boolean:1',
+  PARTLIST_POSTFIX: 'list:;',
+  PLANNERTYPE: 'string',
+  PLANNER_2DOT0: 'boolean:1',
+  PLANNER_REPLACE_MODE: 'boolean:1',
+  PLAN_2D_FONT_URL: 'string',
+  PROGRAM_NR: 'string',
+  RECONFIG_AFTER_ARTICLE_DOCKED: 'boolean:1',
+  REPAIR_VARIANT_VALUES: 'opaque',
+  RTV_PRESET: 'json',
+  SHOWACCESSOIREONLASTTAB: 'boolean:1',
+  SHOWACCONDPONLY: 'boolean:1',
+  SHOWTYPENRINPLANNER: 'boolean:1',
+  SHOW_AI_ROOM_RENDERING_IN_SUMMARY: 'boolean:1',
+  SHOW_AI_ROOM_RENDERING_SUMMARY: 'boolean:1',
+  SHOW_ALL_ITEMS_IN_PLANNER: 'boolean:1',
+  SHOW_PRICEPREVIEW_ON_OPTIONS: 'list:;',
+  STARTFILTERPARAMS: 'string',
+  STARTHIDEARTICLES: 'list:;',
+  START_PLANNER_ARTICLE: 'string',
+  SUMMARY_TABGROUP_POSITION: 'list:;',
+  USEBOXPLANNER: 'all-or-list:;',
+  USEGLOBALSVGSCALE: 'boolean:1',
+  USEPOSCOUNTVALUE: 'boolean:1',
+  USEPRGASOPVARTICLENR: 'boolean:1',
+  USE_DECISION_POS_COUNT_VALUE: 'boolean:1',
+  USE_DIOMEX_CONFIG_LOGIC: 'boolean:1',
+  USE_SHELFPLANNER_RTV: 'boolean:1',
+  USE_SHORT_NAME_AS_NAME: 'boolean:1',
+  USE_TYPENR_AS_ARTICLENR_EKTEXT: 'boolean:1',
+  WARNINGS: 'json'
+};
+
+/** 30 properties parsed on the article entity. */
+var ARTICLE_PROPERTIES = {
+  '3DMODELNAME': 'string',
+  ACCESSOIRE_POS_PRIO: 'number',
+  ADD_AS_ZKAT: 'boolean:1|true',
+  BASIC_UNIT_PRICE: 'number',
+  BUNDLE_RULES: 'json',
+  CONTENT_ITEM: 'string',
+  DEPTH_HAS_PRICE: 'string',
+  DO_NOT_DEL_ACC_IF_NOT_DOCKED: 'string',
+  GROUP_CONTENT_ITEM: 'string',
+  HAS3D: 'string',
+  HEIGHTGRIDABOVE: 'number',
+  HEIGHTGRIDBELOW: 'number',
+  HEIGHTGRIDUSED: 'number',
+  HEIGHT_HAS_PRICE: 'string',
+  HIDE_IN_PLANNERSTEP: 'boolean:present',
+  INVALID_ACCESSORIES: 'list:,',
+  MAX_PLANNING_COUNT: 'number',
+  ON_CONFIG_OPTION: 'string',
+  ON_SET_CONFIG_OPTION: 'string',
+  OPTIONS_FOR_PRINT: 'list:;',
+  ORDER_POSNR: 'string',
+  OVERWRITE_PARENT_DEPTH: 'string',
+  OVERWRITE_PARENT_HEIGHT: 'string',
+  OVERWRITE_PARENT_WIDTH: 'string',
+  RETAIL_PREFIX: 'string',
+  TABGROUP: 'string',
+  TABGROUP_OPTIONS: 'string',
+  TYPE_NO: 'string',
+  WIDTH_HAS_PRICE: 'string',
+  ZUBEHOER_FAMILIE: 'string'
+};
+
+/** 40 properties parsed on the option entity. */
+var OPTION_PROPERTIES = {
+  ADDITIONAL_GROUP_FILTER: 'json',
+  ADD_OPT_TO_TABGROUP_IN_PL_SUM: 'string',
+  ADD_TO_WWS: 'boolean:present',
+  CHECK_FOR_REVERSE_CHANGES: 'list:;',
+  CONTENT_ITEM: 'string',
+  CONTENT_ITEM_TEASER: 'json',
+  CUSTOM_DIMENSION: 'boolean:present',
+  CUSTOM_DIMENSION_TEXT: 'string',
+  DEFAULT_SIBLING_OPTION: 'string',
+  DESCRIPTION: 'string',
+  DIAMETER: 'boolean:present',
+  EshopCategoryMapping: 'ignored',
+  EshopSearchRelevant: 'ignored',
+  FEATURE_TYPE: 'ignored',
+  FREETEXT_DEFAULT_VALUE: 'string',
+  GROUP_OPTIONS_LEFT_AND_RIGHT: 'list:;',
+  HIDE_OPTION_IN_CONFIGURATOR: 'boolean:present',
+  IGNORE_GROUPS: 'boolean:1',
+  IGNORE_PGR_GROUP_POSITION: 'boolean:1',
+  INFO_PDF: 'string',
+  INFO_URL: 'string',
+  ION_COMMENT_TEXT: 'ignored',
+  ISDEFAULTVALUEFOROPTIONS: 'string',
+  IS_MAIN_COLOR: 'boolean:present',
+  IS_STATE: 'boolean:present',
+  IsArtName: 'ignored',
+  IsSalesText: 'ignored',
+  MERGE_IDM_TO_OPG: 'string',
+  ONLY_VISIBLE_IF_CONFIG_ALL: 'string',
+  ONLY_VISIBLE_IF_CONFIG_SINGLE: 'string',
+  ONLY_VISIBLE_IF_NOT_UNDOCK: 'string',
+  REQUIRED_OPTION: 'boolean:present',
+  REQUIRES_USER_INPUT: 'boolean:present',
+  SETNAME: 'boolean:present',
+  SHOW_FILTER: 'boolean:1',
+  SHOW_IN_BASKET_WHEN_HAS_PRICE: 'ignored',
+  SHOW_IN_VARIANTDESC: 'string',
+  SHOW_SEARCHBAR: 'boolean:1',
+  SHOW_SEPARAT_ON_TABGROUP: 'string',
+  SUGGESTED_OPTION: 'boolean:present'
+};
+
+/** 30 properties parsed on the optionValue entity. */
+var OPTIONVALUE_PROPERTIES = {
+  ADD_TO_MEASURE: 'list:;',
+  CONTENT_ITEM: 'string',
+  CUSTOM_DIMENSION: 'opaque',
+  DEFAULT_VALUE: 'string',
+  EshopCategoryMapping: 'ignored',
+  GROUP_CONTENT_ITEM: 'string',
+  HIDE_IN_SUMMARY: 'boolean:present',
+  INFO_PDF: 'string',
+  INFO_URL: 'string',
+  ION_COMMENT_TEXT: 'ignored',
+  IS_NOT_RELEVANT: 'boolean:present',
+  IsArtName: 'ignored',
+  IsVariantAttribute: 'boolean:1',
+  MEASURE_MAXIMUM: 'string',
+  MEASURE_MINIMUM: 'string',
+  MEASURE_STEP: 'string',
+  MEASURE_UNIT: 'string',
+  ONLY_VISIBLE_IF_NOT_UNDOCK: 'string',
+  ON_RULE: 'string',
+  OPTION_FREE_TEXT: 'boolean:present',
+  PIMFlatValues: 'boolean:1',
+  PRICE_UNIT: 'string',
+  PriceTageRelevant: 'ignored',
+  SAME_OPV: 'string',
+  SETNAME: 'string',
+  SET_BY_RULE: 'string',
+  SET_CONFIG: 'string',
+  SUMMARY_CODEX: 'string',
+  TopFilterAttribute: 'ignored',
+  VIEWPOINTNAME: 'string'
+};
+var PROPERTY_SCHEMAS = {
+  catalog: CATALOG_PROPERTIES,
+  article: ARTICLE_PROPERTIES,
+  option: OPTION_PROPERTIES,
+  optionValue: OPTIONVALUE_PROPERTIES
+};
+
+/**
+ * The encoding of one property, or undefined when the codex is not one the engine parses - an organization's own
+ * key, which stays free text. A catalog-prefixed codex ('MYCAT__USEBOXPLANNER') resolves to its bare form, the
+ * same way the parsers strip it.
+ */
+function propertyEncodingOf(codex, entity) {
+  var bare = codex.includes('__') ? codex.slice(codex.indexOf('__') + 2) : codex;
+  var entities = entity ? [entity] : ['catalog', 'article', 'option', 'optionValue'];
+  for (var _i = 0, _entities = entities; _i < _entities.length; _i++) {
+    var candidate = _entities[_i];
+    // Own keys only: a codex like 'constructor' or 'toString' would otherwise resolve to an inherited function.
+    if (Object.prototype.hasOwnProperty.call(PROPERTY_SCHEMAS[candidate], bare)) return PROPERTY_SCHEMAS[candidate][bare];
+  }
+  return undefined;
+}
+
+/**
+ * Reading and writing a property VALUE in the encoding its own parser expects.
+ *
+ * Every property travels as a string and each one decides how that string is read (see propertySchemaRegistry).
+ * An editor therefore cannot write "a boolean" - it has to write the dialect of THAT property, or the parser reads
+ * the opposite of what the user chose. These two functions are that translation:
+ *
+ * - `decodePropertyValue` is DELIBERATELY TOLERANT. Stored values are a decade of history: the raw strings the
+ *   parsers document, real booleans and numbers written by editors that typed them natively, and the '.ToString()'
+ *   spellings those turn into on the way out ('True'). All of them must display as what they mean, or an editor
+ *   would show a flag as off and silently turn it off on the next save.
+ * - `encodePropertyValue` is STRICT. It emits exactly one spelling per encoding - the one the parser reads.
+ */
+
+/** What a decoded property value can be, before an editor renders it. */
+
+/** The raw string a stored value amounts to - what `.ToString()` would hand the parser. */
+function rawStringOf(stored) {
+  if (stored === undefined || stored === null) return '';
+  if (typeof stored === 'string') return stored;
+  // A real boolean stored natively reaches the parser as .NET spells it, capital included.
+  if (typeof stored === 'boolean') return stored ? 'True' : 'False';
+  if (typeof stored === 'number') return String(stored);
+  return JSON.stringify(stored);
+}
+
+/**
+ * Reads a stored boolean EXACTLY the way the property's parser does - the editor must show what the engine sees.
+ * A `== '1'` property holding 'true' (or a natively stored True) is OFF in the engine; showing it as on would let
+ * the next save switch the flag on for real. `boolean:present` is the odd one out, see the first branch.
+ */
+function decodeBoolean(raw, encoding) {
+  // ANY non-empty string is true here, '0' and 'false' included - the parser does `!!Value`. Reading it as a
+  // normal boolean would show 'off' for a flag that is on, and the next save would write the user's wrong idea back.
+  if (encoding === 'boolean:present') return raw !== '';
+  var token = raw.trim();
+  // The `'true'` parsers mostly lower-case before comparing, the `'1'` parsers compare the digit as is.
+  var isOne = token === '1';
+  var isTrue = token.toLowerCase() === 'true';
+  if (encoding === 'boolean:1') return isOne;
+  if (encoding === 'boolean:true') return isTrue;
+  return isOne || isTrue;
+}
+
+/** Splits a delimited list, dropping the empty segments a trailing delimiter leaves behind. */
+function decodeList(raw, separator) {
+  return raw.split(separator).map(function (entry) {
+    return entry.trim();
+  }).filter(function (entry) {
+    return entry !== '';
+  });
+}
+
+/**
+ * Joins list entries, or removes the property when nothing is left: '' would reach the parser's `split` and come
+ * back as the single entry '' - a cleared list must not turn into a list of one nameless group.
+ */
+function encodeList(value, separator) {
+  if (Array.isArray(value)) {
+    var entries = value.map(function (entry) {
+      return String(entry).trim();
+    }).filter(function (entry) {
+      return entry !== '';
+    });
+    return entries.length === 0 ? undefined : entries.join(separator);
+  }
+  // A boolean has no list spelling: 'True' would come back as a list of one entry literally named 'True'.
+  if (typeof value === 'boolean') return undefined;
+  var raw = rawStringOf(value);
+  return raw === '' ? undefined : raw;
+}
+
+/**
+ * The value an editor should show for a stored property. `stored` is what the record holds - a string in the
+ * normal case, or a natively-typed value from an editor that wrote one.
+ */
+function decodePropertyValue(encoding, stored) {
+  var raw = rawStringOf(stored);
+  switch (encoding) {
+    case 'boolean:1':
+    case 'boolean:1|true':
+    case 'boolean:true':
+    case 'boolean:present':
+      return decodeBoolean(raw, encoding);
+    case 'number':
+      {
+        if (raw.trim() === '') return undefined;
+        // German decimal commas reach these fields through spreadsheets and locale-formatted writers.
+        var parsed = Number(raw.trim().replace(',', '.'));
+        return Number.isFinite(parsed) ? parsed : undefined;
+      }
+    case 'list:;':
+      return decodeList(raw, ';');
+    case 'list:,':
+      return decodeList(raw, ',');
+
+    // '1' means EVERYTHING; any other value is a list. Kept as the literal '1' so an editor can offer the two
+    // states as a choice rather than making the user know the convention.
+    case 'all-or-list:;':
+      return raw.trim() === '1' ? true : decodeList(raw, ';');
+
+    // Three states, not two: '1' is ALL, '0' is NONE, and anything else is the list of the ones that apply.
+    // '0' must NOT read as a one-entry list - that is how an off-state turns into the group literally named '0'.
+    case 'boolean-or-list:;':
+      {
+        var token = raw.trim();
+        if (token === '1') return true;
+        if (token === '0') return false;
+        return decodeList(raw, ';');
+      }
+    case 'json':
+      {
+        if (raw.trim() === '') return undefined;
+        try {
+          return JSON.parse(raw);
+        } catch (_unused) {
+          // Invalid JSON is still the user's text - hand it back so the editor can show and repair it rather than
+          // replacing their work with an empty object.
+          return raw;
+        }
+      }
+    default:
+      return raw === '' ? undefined : raw;
+  }
+}
+
+/**
+ * The string to store for an edited value - exactly the spelling the property's parser reads.
+ * `undefined` means the property should be REMOVED rather than written empty, which is how a `boolean:present`
+ * flag is switched off.
+ */
+function encodePropertyValue(encoding, value) {
+  switch (encoding) {
+    case 'boolean:1':
+    case 'boolean:1|true':
+      return value ? '1' : '0';
+    case 'boolean:true':
+      return value ? 'true' : 'false';
+
+    // Off is the ABSENCE of a value: this parser reads every non-empty string as true, so writing '0' or 'false'
+    // would leave the flag ON.
+    case 'boolean:present':
+      return value ? '1' : undefined;
+    case 'number':
+      {
+        // Blank input (including whitespace) clears the property; Number('') would be 0.
+        if (value === undefined || value === null || String(value).trim() === '') return undefined;
+        var parsed = typeof value === 'number' ? value : Number(String(value).trim().replace(',', '.'));
+        // A decimal point, never a comma - the parsers run Number() on this string.
+        return Number.isFinite(parsed) ? String(parsed) : undefined;
+      }
+    case 'list:;':
+      return encodeList(value, ';');
+    case 'list:,':
+      return encodeList(value, ',');
+
+    // '1' is ALL; there is no spelling for OFF, so `false` removes the property (the list branch would otherwise
+    // store the text 'False' as a one-entry list).
+    case 'all-or-list:;':
+      if (value === true) return '1';
+      if (value === false) return undefined;
+      return encodeList(value, ';');
+    case 'boolean-or-list:;':
+      if (value === true) return '1';
+      // The off-state has its own spelling here, so it is written rather than left to the list branch, which
+      // would REMOVE the property for an empty list instead of switching the state off.
+      if (value === false) return '0';
+      return encodeList(value, ';');
+    case 'json':
+      {
+        if (value === undefined || value === '') return undefined;
+        // Already-text stays text: it is either JSON the user typed or something they are still repairing.
+        return typeof value === 'string' ? value : JSON.stringify(value);
+      }
+    default:
+      {
+        var raw = rawStringOf(value);
+        return raw === '' ? undefined : raw;
+      }
+  }
+}
+
+/** Whether a value can be stored for this encoding at all - what an editor blocks saving on. */
+function propertyValueProblem(encoding, value) {
+  if (encoding === 'json' && typeof value === 'string' && value.trim() !== '') {
+    try {
+      JSON.parse(value);
+    } catch (_unused2) {
+      return 'invalidJson';
+    }
+  }
+  if (encoding === 'number' && value !== undefined && String(value).trim() !== '') {
+    var parsed = typeof value === 'number' ? value : Number(String(value).trim().replace(',', '.'));
+    if (!Number.isFinite(parsed)) return 'notANumber';
+  }
+
+  // A ';' inside a ';'-list entry would split it into two on the way back in - and every encoding that JOINS on
+  // ';' is exposed to it, not just the plain list.
+  var joinsOnSemicolon = encoding === 'list:;' || encoding === 'all-or-list:;' || encoding === 'boolean-or-list:;';
+  if (joinsOnSemicolon && Array.isArray(value) && value.some(function (entry) {
+    return String(entry).includes(';');
+  })) {
+    return 'separatorInEntry';
+  }
+  if (encoding === 'list:,' && Array.isArray(value) && value.some(function (entry) {
+    return String(entry).includes(',');
+  })) {
+    return 'separatorInEntry';
+  }
+  return undefined;
+}
+
+/** The control an editor should render for an encoding. */
+function editorKindOf(encoding) {
+  if (encoding.startsWith('boolean:')) return 'checkbox';
+  if (encoding === 'number') return 'number';
+  if (encoding === 'list:;' || encoding === 'list:,') return 'list';
+  if (encoding === 'all-or-list:;') return 'allOrList';
+  if (encoding === 'boolean-or-list:;') return 'boolOrList';
+  if (encoding === 'json') return 'json';
+  return 'text';
+}
+
 /**
  * Placeholder for the set name in the Serious checkout. API2 bed catalogs yield "<headboard> - <width> X <length>" from the
  * OPTBR / OPTLAE options and the headboard partlist article. IDM catalogs have none of these, so the selected values of the
@@ -74250,6 +75676,7 @@ exports.Grid = Grid;
 exports.HQRenderScript = HQRenderScript;
 exports.JsonDataCache = JsonDataCache;
 exports.OptionCatalogData = OptionCatalogData;
+exports.PROPERTY_SCHEMAS = PROPERTY_SCHEMAS;
 exports.PlannerElementData = PlannerElementData;
 exports.Rendering = Rendering;
 exports.Vector2 = Vector2;
@@ -74263,10 +75690,16 @@ exports.bootNow = bootNow;
 exports.bootRequestName = bootRequestName;
 exports.collectStructureStepKeys = collectStructureStepKeys;
 exports.creatRenderOrders = creatRenderOrders;
+exports.decodePropertyValue = decodePropertyValue;
+exports.editorKindOf = editorKindOf;
+exports.encodePropertyValue = encodePropertyValue;
 exports.getOrigProductId = getOrigProductId;
 exports.getSeriousSetNamePlaceholder = getSeriousSetNamePlaceholder;
 exports.headlessSession = headlessSession;
 exports.loadAndRepairBasket = loadAndRepairBasket;
+exports.propertyEncodingOf = propertyEncodingOf;
+exports.propertyValueProblem = propertyValueProblem;
+exports.rawStringOf = rawStringOf;
 exports.runHeadlessArtifactPass = runHeadlessArtifactPass;
 exports.runHeadlessArtifactPassBatch = runHeadlessArtifactPassBatch;
 exports.setHandlerInstance = setHandlerInstance;