@timeax/digital-service-engine 0.3.4 → 0.3.6

package/dist/core/index.cjs

@@ -26,17 +26,25 @@ __export(core_exports, {
   createBuilder: () => createBuilder,
   createFallbackEditor: () => createFallbackEditor,
   createNodeIndex: () => createNodeIndex,
+  fieldOptionIdSet: () => fieldOptionIdSet,
+  fieldOptionIds: () => fieldOptionIds,
+  filterFieldOptionsById: () => filterFieldOptionsById,
   filterServicesForVisibleGroup: () => filterServicesForVisibleGroup,
+  findFieldOption: () => findFieldOption,
+  findOptionOwnerField: () => findOptionOwnerField,
   getAssignedServiceIds: () => getAssignedServiceIds,
   getEligibleFallbacks: () => getEligibleFallbacks,
   getFallbackRegistrationInfo: () => getFallbackRegistrationInfo,
   isRefExcludedBySelectedKeys: () => isRefExcludedBySelectedKeys,
   normalise: () => normalise,
   normalizeFieldValidation: () => normalizeFieldValidation,
+  optionOwnerMap: () => optionOwnerMap,
   resolveServiceFallback: () => resolveServiceFallback,
   validate: () => validate,
   validateAsync: () => validateAsync,
-  validateRateCoherenceDeep: () => validateRateCoherenceDeep
+  validateRateCoherenceDeep: () => validateRateCoherenceDeep,
+  walkFieldOptions: () => walkFieldOptions,
+  walkOptions: () => walkOptions
 });
 module.exports = __toCommonJS(core_exports);
 
@@ -55,6 +63,9 @@ function normalise(input, opts = {}) {
   const excludes_for_buttons = toStringArrayMap(
     obj.excludes_for_buttons
   );
+  const option_effects_for_buttons = toOptionEffectMap(
+    obj.option_effects_for_buttons
+  );
   const orderKinds = toStringMap(obj.orderKinds);
   const notices = toNoticeArray(obj.notices);
   let filters = rawFilters.map((t) => coerceTag(t, constraints));
@@ -70,6 +81,9 @@ function normalise(input, opts = {}) {
     ...isNonEmpty(orderKinds) && { orderKinds },
     ...isNonEmpty(includes_for_buttons) && { includes_for_buttons },
     ...isNonEmpty(excludes_for_buttons) && { excludes_for_buttons },
+    ...isNonEmpty(option_effects_for_buttons) && {
+      option_effects_for_buttons
+    },
     ...fallbacks && (isNonEmpty(fallbacks.nodes) || isNonEmpty(fallbacks.global)) && {
       fallbacks
     },
@@ -224,6 +238,7 @@ function coerceOption(src, inheritRole) {
   const value = typeof src.value === "string" || typeof src.value === "number" ? src.value : void 0;
   const pricing_role = src.pricing_role === "utility" || src.pricing_role === "base" ? src.pricing_role : inheritRole;
   const meta = src.meta && typeof src.meta === "object" ? src.meta : void 0;
+  const children = Array.isArray(src.children) ? src.children.map((child) => coerceOption(child, pricing_role)) : void 0;
   const option = {
     id: "",
     label: "",
@@ -232,7 +247,8 @@ function coerceOption(src, inheritRole) {
     ...value !== void 0 && { value },
     ...service_id !== void 0 && { service_id },
     pricing_role,
-    ...meta && { meta }
+    ...meta && { meta },
+    ...children && children.length && { children }
   };
   return option;
 }
@@ -297,6 +313,35 @@ function toStringArrayMap(src) {
   }
   return Object.keys(out).length ? out : void 0;
 }
+function toOptionEffectMap(src) {
+  var _a, _b;
+  if (!src || typeof src !== "object") return void 0;
+  const out = {};
+  for (const [triggerId, rawTargets] of Object.entries(src)) {
+    if (!triggerId || !rawTargets || typeof rawTargets !== "object") {
+      continue;
+    }
+    const targets = {};
+    for (const [fieldId, rawEffect] of Object.entries(rawTargets)) {
+      if (!fieldId || !rawEffect || typeof rawEffect !== "object") {
+        continue;
+      }
+      const effect = rawEffect;
+      const include = toStringArray(effect.include);
+      const exclude = toStringArray(effect.exclude);
+      const next = {
+        ...effect.forceVisible === true ? { forceVisible: true } : {},
+        ...include.length ? { include: dedupe(include) } : {},
+        ...exclude.length ? { exclude: dedupe(exclude) } : {}
+      };
+      if (next.forceVisible === true || ((_a = next.include) == null ? void 0 : _a.length) || ((_b = next.exclude) == null ? void 0 : _b.length)) {
+        targets[fieldId] = next;
+      }
+    }
+    if (Object.keys(targets).length) out[triggerId] = targets;
+  }
+  return Object.keys(out).length ? out : void 0;
+}
 function toStringArray(v) {
   if (!Array.isArray(v)) return [];
   return v.map((x) => String(x)).filter((s) => !!s && s.trim().length > 0);
@@ -371,6 +416,76 @@ function normalizeFieldValidation(input) {
   return one ? [one] : void 0;
 }
 
+// src/core/options.ts
+function walkFieldOptions(field) {
+  const out = [];
+  const visit = (options, depth, parentId) => {
+    for (const option of options != null ? options : []) {
+      out.push({
+        field,
+        fieldId: field.id,
+        option,
+        optionId: option.id,
+        depth,
+        parentId
+      });
+      visit(option.children, depth + 1, option.id);
+    }
+  };
+  visit(field.options, 0);
+  return out;
+}
+function walkOptions(props) {
+  var _a;
+  return ((_a = props.fields) != null ? _a : []).flatMap((field) => walkFieldOptions(field));
+}
+function fieldOptionIds(field) {
+  return walkFieldOptions(field).map((visit) => visit.optionId);
+}
+function fieldOptionIdSet(field) {
+  return new Set(fieldOptionIds(field));
+}
+function findFieldOption(field, optionId) {
+  var _a;
+  if (!field) return void 0;
+  return (_a = walkFieldOptions(field).find((visit) => visit.optionId === optionId)) == null ? void 0 : _a.option;
+}
+function findOptionOwnerField(fields, optionId) {
+  for (const field of fields) {
+    if (findFieldOption(field, optionId)) return field;
+  }
+  return void 0;
+}
+function optionOwnerMap(fields) {
+  const out = /* @__PURE__ */ new Map();
+  for (const field of fields) {
+    for (const visit of walkFieldOptions(field)) {
+      if (!out.has(visit.optionId)) {
+        out.set(visit.optionId, {
+          fieldId: field.id,
+          option: visit.option
+        });
+      }
+    }
+  }
+  return out;
+}
+function filterFieldOptionsById(options, allowed) {
+  if (!Array.isArray(options)) return void 0;
+  const out = [];
+  for (const option of options) {
+    const children = filterFieldOptionsById(option.children, allowed);
+    if (!allowed.has(option.id) && (!children || children.length === 0)) {
+      continue;
+    }
+    out.push({
+      ...option,
+      ...children ? { children } : {}
+    });
+  }
+  return out;
+}
+
 // src/core/validate/shared.ts
 function isFiniteNumber(v) {
   return typeof v === "number" && Number.isFinite(v);
@@ -379,8 +494,9 @@ function isServiceIdRef(v) {
   return typeof v === "string" && v.trim().length > 0 || typeof v === "number" && Number.isFinite(v);
 }
 function hasAnyServiceOption(f) {
-  var _a;
-  return ((_a = f.options) != null ? _a : []).some((o) => isServiceIdRef(o.service_id));
+  return walkFieldOptions(f).some(
+    (visit) => isServiceIdRef(visit.option.service_id)
+  );
 }
 function getByPath(obj, path) {
   if (!path) return void 0;
@@ -469,14 +585,14 @@ function withAffected(details, ids) {
 
 // src/core/node-map.ts
 function buildNodeMap(props) {
-  var _a, _b, _c;
+  var _a, _b;
   const map = /* @__PURE__ */ new Map();
   for (const t of (_a = props.filters) != null ? _a : []) {
     if (!map.has(t.id)) map.set(t.id, { kind: "tag", id: t.id, node: t });
   }
   for (const f of (_b = props.fields) != null ? _b : []) {
     if (!map.has(f.id)) map.set(f.id, { kind: "field", id: f.id, node: f });
-    for (const o of (_c = f.options) != null ? _c : []) {
+    for (const { option: o } of walkFieldOptions(f)) {
       if (!map.has(o.id))
         map.set(o.id, {
           kind: "option",
@@ -489,12 +605,6 @@ function buildNodeMap(props) {
   return map;
 }
 function resolveTrigger(trigger, nodeMap) {
-  const idx = trigger.indexOf("::");
-  if (idx !== -1) {
-    const fieldId = trigger.slice(0, idx);
-    const optionId = trigger.slice(idx + 2);
-    return { kind: "composite", triggerKey: trigger, fieldId, optionId };
-  }
   const direct = nodeMap.get(trigger);
   if (!direct) return void 0;
   if (direct.kind === "option") {
@@ -546,11 +656,6 @@ function visibleFieldIdsUnder(props, tagId, opts = {}) {
   const ownerDepthForTriggerKey = (triggerKey) => {
     const t = resolveTrigger(triggerKey, nodeMap);
     if (!t) return void 0;
-    if (t.kind === "composite") {
-      const f = fieldById.get(t.fieldId);
-      if (!f) return void 0;
-      return ownerDepthForField(f);
-    }
     if (t.kind === "field") {
       const f = fieldById.get(t.id);
       if (!f || f.button !== true) return void 0;
@@ -633,6 +738,84 @@ function visibleFieldsUnder(props, tagId, opts = {}) {
   const fieldById = new Map(((_a = props.fields) != null ? _a : []).map((f) => [f.id, f]));
   return ids.map((id) => fieldById.get(id)).filter(Boolean);
 }
+function resolveVisibility(props, tagId, selectedKeys) {
+  var _a, _b, _c, _d;
+  const selected = new Set(selectedKeys != null ? selectedKeys : []);
+  const baseFieldIds = visibleFieldIdsUnder(props, tagId, { selectedKeys: selected });
+  const fieldById = new Map(((_a = props.fields) != null ? _a : []).map((field) => [field.id, field]));
+  const visible = new Set(baseFieldIds);
+  const forced = /* @__PURE__ */ new Set();
+  const optionsByFieldId = {};
+  const optionIdsByFieldId = /* @__PURE__ */ new Map();
+  const getOptionIds = (field) => {
+    let ids = optionIdsByFieldId.get(field.id);
+    if (!ids) {
+      ids = fieldOptionIds(field);
+      optionIdsByFieldId.set(field.id, ids);
+    }
+    return ids;
+  };
+  const ensureOptions = (field) => {
+    const ids = getOptionIds(field);
+    if (!ids.length) return void 0;
+    if (!optionsByFieldId[field.id]) optionsByFieldId[field.id] = [...ids];
+    return optionsByFieldId[field.id];
+  };
+  for (const fieldId of baseFieldIds) {
+    const field = fieldById.get(fieldId);
+    if (field) ensureOptions(field);
+  }
+  const effects = (_b = props.option_effects_for_buttons) != null ? _b : {};
+  for (const triggerId of selected) {
+    const targetRules = effects[triggerId];
+    if (!targetRules) continue;
+    for (const [targetFieldId, rule] of Object.entries(targetRules)) {
+      const field = fieldById.get(targetFieldId);
+      if (!field) continue;
+      const isVisible = visible.has(targetFieldId);
+      if (!isVisible && rule.forceVisible !== true) continue;
+      if (!isVisible && rule.forceVisible === true) {
+        visible.add(targetFieldId);
+        forced.add(targetFieldId);
+      }
+      const orderedOptionIds = getOptionIds(field);
+      if (!orderedOptionIds.length) continue;
+      const known = new Set(orderedOptionIds);
+      let allowed = (_c = optionsByFieldId[targetFieldId]) != null ? _c : [...orderedOptionIds];
+      if (Array.isArray(rule.include) && rule.include.length) {
+        const include = new Set(
+          rule.include.filter((optionId) => known.has(optionId))
+        );
+        allowed = orderedOptionIds.filter(
+          (optionId) => include.has(optionId) && allowed.includes(optionId)
+        );
+      }
+      if (Array.isArray(rule.exclude) && rule.exclude.length) {
+        const exclude = new Set(
+          rule.exclude.filter((optionId) => known.has(optionId))
+        );
+        allowed = allowed.filter((optionId) => !exclude.has(optionId));
+      }
+      optionsByFieldId[targetFieldId] = allowed;
+    }
+  }
+  const visibleFieldIds = baseFieldIds.filter((fieldId) => visible.has(fieldId));
+  const seen = new Set(visibleFieldIds);
+  for (const field of (_d = props.fields) != null ? _d : []) {
+    if (!visible.has(field.id) || seen.has(field.id)) continue;
+    seen.add(field.id);
+    visibleFieldIds.push(field.id);
+    ensureOptions(field);
+  }
+  for (const fieldId of Object.keys(optionsByFieldId)) {
+    if (!visible.has(fieldId)) delete optionsByFieldId[fieldId];
+  }
+  return {
+    fieldIds: visibleFieldIds,
+    optionsByFieldId,
+    forcedFieldIds: visibleFieldIds.filter((fieldId) => forced.has(fieldId))
+  };
+}
 
 // src/core/validate/steps/visibility.ts
 function createFieldsVisibleUnder(v) {
@@ -650,7 +833,6 @@ function resolveRootTags(tags) {
   return roots.length ? roots : tags.slice(0, 1);
 }
 function collectSelectableTriggersInContext(v, tagId, selectedKeys, effectfulKeys) {
-  var _a;
   const visible = visibleFieldsUnder(v.props, tagId, {
     selectedKeys
   });
@@ -660,7 +842,7 @@ function collectSelectableTriggersInContext(v, tagId, selectedKeys, effectfulKey
       const t = f.id;
       if (effectfulKeys.has(t)) triggers.push(t);
     }
-    for (const o of (_a = f.options) != null ? _a : []) {
+    for (const { option: o } of walkFieldOptions(f)) {
       const t = o.id;
       if (effectfulKeys.has(t)) triggers.push(t);
     }
@@ -669,7 +851,7 @@ function collectSelectableTriggersInContext(v, tagId, selectedKeys, effectfulKey
   return triggers;
 }
 function runVisibilityRulesOnce(v) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   for (const t of v.tags) {
     const visible = v.fieldsVisibleUnder(t.id);
     const seen = /* @__PURE__ */ new Map();
@@ -719,9 +901,9 @@ function runVisibilityRulesOnce(v) {
     let hasUtility = false;
     const utilityOptionIds = [];
     for (const f of visible) {
-      for (const o of (_c = f.options) != null ? _c : []) {
+      for (const { option: o } of walkFieldOptions(f)) {
         if (!isServiceIdRef(o.service_id)) continue;
-        const role = (_e = (_d = o.pricing_role) != null ? _d : f.pricing_role) != null ? _e : "base";
+        const role = (_d = (_c = o.pricing_role) != null ? _c : f.pricing_role) != null ? _d : "base";
         if (role === "base") hasBase = true;
         else if (role === "utility") {
           hasUtility = true;
@@ -762,7 +944,7 @@ function dedupeErrorsInPlace(v, startIndex) {
   v.errors.splice(startIndex, v.errors.length - startIndex, ...kept);
 }
 function validateVisibility(v, options = {}) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   v.simulatedVisibilityContexts = [];
   const simulate = options.simulate === true;
   if (!simulate) {
@@ -787,10 +969,13 @@ function validateVisibility(v, options = {}) {
     for (const key of Object.keys((_d = v.props.excludes_for_buttons) != null ? _d : {})) {
       effectfulKeys.add(key);
     }
+    for (const key of Object.keys((_e = v.props.option_effects_for_buttons) != null ? _e : {})) {
+      effectfulKeys.add(key);
+    }
   }
   const roots = resolveRootTags(v.tags);
   const rootTags = options.simulateAllRoots ? roots : roots.slice(0, 1);
-  const originalSelected = new Set((_e = v.selectedKeys) != null ? _e : []);
+  const originalSelected = new Set((_f = v.selectedKeys) != null ? _f : []);
   const errorsStart = v.errors.length;
   const visited = /* @__PURE__ */ new Set();
   const seenContexts = /* @__PURE__ */ new Set();
@@ -931,7 +1116,7 @@ function validateStructure(v) {
 
 // src/core/validate/steps/identity.ts
 function validateIdentity(v) {
-  var _a, _b;
+  var _a;
   const tags = v.tags;
   const fields = v.fields;
   {
@@ -1031,7 +1216,7 @@ function validateIdentity(v) {
     }
   }
   for (const f of fields) {
-    for (const o of (_b = f.options) != null ? _b : []) {
+    for (const { option: o } of walkFieldOptions(f)) {
       if (!o.label || !o.label.trim()) {
         v.errors.push({
           code: "label_missing",
@@ -1046,25 +1231,11 @@ function validateIdentity(v) {
 }
 
 // src/core/validate/steps/option-maps.ts
-function parseFieldOptionKey(key) {
-  const idx = key.indexOf("::");
-  if (idx === -1) return null;
-  const fieldId = key.slice(0, idx).trim();
-  const optionId = key.slice(idx + 2).trim();
-  if (!fieldId || !optionId) return null;
-  return { fieldId, optionId };
-}
-function hasOption(v, fid, oid) {
-  var _a;
-  const f = v.fieldById.get(fid);
-  if (!f) return false;
-  return !!((_a = f.options) != null ? _a : []).find((o) => o.id === oid);
-}
 function validateOptionMaps(v) {
-  var _a, _b;
+  var _a, _b, _c;
   const incMap = (_a = v.props.includes_for_buttons) != null ? _a : {};
   const excMap = (_b = v.props.excludes_for_buttons) != null ? _b : {};
-  const badKeyMessage = (key) => `Invalid trigger-map key "${key}". Expected a known node id (option or button-field), or "fieldId::optionId" pointing to an existing option.`;
+  const badKeyMessage = (key) => `Invalid trigger-map key "${key}". Expected a known option id or button-field id.`;
   const validateTriggerKey = (key) => {
     const ref = v.nodeMap.get(key);
     if (ref) {
@@ -1083,19 +1254,7 @@ function validateOptionMaps(v) {
       }
       return { ok: false, nodeId: ref.id, affected: [ref.id] };
     }
-    const p = parseFieldOptionKey(key);
-    if (!p) return { ok: false };
-    if (!hasOption(v, p.fieldId, p.optionId))
-      return {
-        ok: false,
-        nodeId: p.fieldId,
-        affected: [p.fieldId, p.optionId]
-      };
-    return {
-      ok: true,
-      nodeId: p.fieldId,
-      affected: [p.fieldId, p.optionId]
-    };
+    return { ok: false };
   };
   for (const k of Object.keys(incMap)) {
     const r = validateTriggerKey(k);
@@ -1121,6 +1280,57 @@ function validateOptionMaps(v) {
       });
     }
   }
+  const effectMap = (_c = v.props.option_effects_for_buttons) != null ? _c : {};
+  for (const [triggerKey, targets] of Object.entries(effectMap)) {
+    const trigger = validateTriggerKey(triggerKey);
+    if (!trigger.ok) {
+      v.errors.push({
+        code: "bad_option_effect_key",
+        severity: "error",
+        message: badKeyMessage(triggerKey),
+        nodeId: trigger.nodeId,
+        details: withAffected({ key: triggerKey }, trigger.affected)
+      });
+    }
+    for (const [targetFieldId, effect] of Object.entries(targets != null ? targets : {})) {
+      const field = v.fieldById.get(targetFieldId);
+      if (!field) {
+        v.errors.push({
+          code: "bad_option_effect_target",
+          severity: "error",
+          message: `Option effect trigger "${triggerKey}" targets unknown field "${targetFieldId}".`,
+          details: withAffected(
+            { key: triggerKey, targetFieldId },
+            trigger.affected
+          )
+        });
+        continue;
+      }
+      const validOptionIds = fieldOptionIdSet(field);
+      const checkTargetOptions = (kind, optionIds) => {
+        for (const optionId of optionIds != null ? optionIds : []) {
+          if (validOptionIds.has(optionId)) continue;
+          v.errors.push({
+            code: "bad_option_effect_option",
+            severity: "error",
+            message: `Option effect trigger "${triggerKey}" references unknown ${kind} option "${optionId}" for field "${targetFieldId}".`,
+            nodeId: targetFieldId,
+            details: withAffected(
+              {
+                key: triggerKey,
+                targetFieldId,
+                optionId,
+                kind
+              },
+              [targetFieldId, optionId]
+            )
+          });
+        }
+      };
+      checkTargetOptions("include", effect == null ? void 0 : effect.include);
+      checkTargetOptions("exclude", effect == null ? void 0 : effect.exclude);
+    }
+  }
   for (const k of Object.keys(incMap)) {
     if (!(k in excMap)) continue;
     const r = validateTriggerKey(k);
@@ -1134,27 +1344,231 @@ function validateOptionMaps(v) {
   }
 }
 
-// src/utils/order-kind.ts
-function normalizeSelectedTriggerKey(key, nodeMap) {
-  if (!key) return void 0;
-  const compositeIdx = key.indexOf("::");
-  if (compositeIdx !== -1) {
-    const fieldId = key.slice(0, compositeIdx).trim();
-    const optionId = key.slice(compositeIdx + 2).trim();
-    if (optionId) {
-      const optionRef = nodeMap.get(optionId);
-      if ((optionRef == null ? void 0 : optionRef.kind) === "option") {
-        return { nodeId: optionRef.id, nodeKind: "option" };
+// src/core/validate/steps/visibility-cycles.ts
+var MAX_VISIBILITY_CYCLE_DEPTH = 20;
+function validateVisibilityCycles(v) {
+  const triggerById = buildTriggerIndex(v.fields);
+  if (!triggerById.size) return;
+  const fieldTriggers = buildFieldTriggerIndex(v.fields);
+  const revealTargetsByTrigger = buildRevealIndex(v, triggerById);
+  const reported = /* @__PURE__ */ new Set();
+  for (const rootTriggerId of Array.from(triggerById.keys()).sort()) {
+    const required = makeRequiredState(triggerById, [rootTriggerId]);
+    walkFromTrigger({
+      v,
+      triggerById,
+      fieldTriggers,
+      revealTargetsByTrigger,
+      rootTriggerId,
+      currentTriggerId: rootTriggerId,
+      required,
+      path: [rootTriggerId],
+      visited: /* @__PURE__ */ new Set(),
+      reported,
+      depth: 0
+    });
+  }
+}
+function buildTriggerIndex(fields) {
+  const out = /* @__PURE__ */ new Map();
+  const owners = optionOwnerMap(fields);
+  for (const field of fields) {
+    if (field.button === true) {
+      out.set(field.id, {
+        kind: "field",
+        id: field.id,
+        ownerFieldId: field.id
+      });
+    }
+  }
+  for (const [optionId, owner] of owners) {
+    out.set(optionId, {
+      kind: "option",
+      id: optionId,
+      ownerFieldId: owner.fieldId
+    });
+  }
+  return out;
+}
+function buildFieldTriggerIndex(fields) {
+  const out = /* @__PURE__ */ new Map();
+  for (const field of fields) {
+    const triggers = [];
+    if (field.button === true) triggers.push(field.id);
+    for (const visit of walkFieldOptions(field)) {
+      triggers.push(visit.optionId);
+    }
+    out.set(field.id, triggers);
+  }
+  return out;
+}
+function buildRevealIndex(v, triggerById) {
+  var _a, _b;
+  const out = /* @__PURE__ */ new Map();
+  const addReveal = (triggerId, targetFieldId) => {
+    var _a2;
+    if (!triggerById.has(triggerId)) return;
+    if (!v.fieldById.has(targetFieldId)) return;
+    const set = (_a2 = out.get(triggerId)) != null ? _a2 : /* @__PURE__ */ new Set();
+    set.add(targetFieldId);
+    out.set(triggerId, set);
+  };
+  for (const [triggerId, targetIds] of Object.entries(
+    (_a = v.props.includes_for_buttons) != null ? _a : {}
+  )) {
+    for (const targetId of targetIds != null ? targetIds : []) addReveal(triggerId, targetId);
+  }
+  for (const [triggerId, targets] of Object.entries(
+    (_b = v.props.option_effects_for_buttons) != null ? _b : {}
+  )) {
+    for (const [targetFieldId, effect] of Object.entries(targets != null ? targets : {})) {
+      if ((effect == null ? void 0 : effect.forceVisible) === true)
+        addReveal(triggerId, targetFieldId);
+    }
+  }
+  return new Map(
+    Array.from(out.entries()).map(([triggerId, fieldIds]) => [
+      triggerId,
+      Array.from(fieldIds).sort()
+    ])
+  );
+}
+function walkFromTrigger(args) {
+  var _a, _b, _c;
+  if (args.depth >= MAX_VISIBILITY_CYCLE_DEPTH) return;
+  const visitedKey = `${args.rootTriggerId}::${args.currentTriggerId}::${args.path.join(">")}`;
+  if (args.visited.has(visitedKey)) return;
+  args.visited.add(visitedKey);
+  const revealedFieldIds = (_a = args.revealTargetsByTrigger.get(args.currentTriggerId)) != null ? _a : [];
+  for (const revealedFieldId of revealedFieldIds) {
+    const reachableTriggers = (_c = (_b = args.fieldTriggers.get(revealedFieldId)) == null ? void 0 : _b.slice().sort()) != null ? _c : [];
+    for (const reachableTriggerId of reachableTriggers) {
+      const invalidation = invalidatesRequiredPath(
+        args.v,
+        args.triggerById,
+        reachableTriggerId,
+        args.required
+      );
+      if (invalidation) {
+        emitCycleError({
+          v: args.v,
+          rootTriggerId: args.rootTriggerId,
+          revealedFieldId,
+          conflictingTriggerId: reachableTriggerId,
+          invalidatedId: invalidation.invalidatedId,
+          path: [...args.path, reachableTriggerId],
+          reported: args.reported
+        });
+      }
+      if (args.path.includes(reachableTriggerId)) continue;
+      walkFromTrigger({
+        ...args,
+        currentTriggerId: reachableTriggerId,
+        required: addRequiredTrigger(
+          args.triggerById,
+          args.required,
+          reachableTriggerId
+        ),
+        path: [...args.path, reachableTriggerId],
+        depth: args.depth + 1
+      });
+    }
+  }
+}
+function makeRequiredState(triggerById, triggerIds) {
+  let required = {
+    triggers: /* @__PURE__ */ new Set(),
+    ownerFields: /* @__PURE__ */ new Set()
+  };
+  for (const triggerId of triggerIds) {
+    required = addRequiredTrigger(triggerById, required, triggerId);
+  }
+  return required;
+}
+function addRequiredTrigger(triggerById, current, triggerId) {
+  const next = {
+    triggers: new Set(current.triggers),
+    ownerFields: new Set(current.ownerFields)
+  };
+  const trigger = triggerById.get(triggerId);
+  if (!trigger) return next;
+  next.triggers.add(triggerId);
+  next.ownerFields.add(trigger.ownerFieldId);
+  return next;
+}
+function invalidatesRequiredPath(v, triggerById, conflictingTriggerId, required) {
+  var _a, _b, _c, _d, _e, _f;
+  for (const targetId of (_b = (_a = v.props.excludes_for_buttons) == null ? void 0 : _a[conflictingTriggerId]) != null ? _b : []) {
+    if (required.ownerFields.has(targetId)) {
+      return { invalidatedId: targetId };
+    }
+    const targetTrigger = triggerById.get(targetId);
+    if ((targetTrigger == null ? void 0 : targetTrigger.kind) === "option" && required.triggers.has(targetId)) {
+      return { invalidatedId: targetId };
+    }
+  }
+  const effects = (_d = (_c = v.props.option_effects_for_buttons) == null ? void 0 : _c[conflictingTriggerId]) != null ? _d : {};
+  for (const [targetFieldId, effect] of Object.entries(effects)) {
+    if (!v.fieldById.has(targetFieldId)) continue;
+    if ((_e = effect == null ? void 0 : effect.exclude) == null ? void 0 : _e.length) {
+      const excluded = new Set(effect.exclude);
+      for (const requiredTriggerId of required.triggers) {
+        const requiredTrigger = triggerById.get(requiredTriggerId);
+        if ((requiredTrigger == null ? void 0 : requiredTrigger.kind) !== "option") continue;
+        if (requiredTrigger.ownerFieldId !== targetFieldId) continue;
+        if (excluded.has(requiredTriggerId)) {
+          return { invalidatedId: requiredTriggerId };
+        }
       }
     }
-    if (fieldId) {
-      const fieldRef = nodeMap.get(fieldId);
-      if ((fieldRef == null ? void 0 : fieldRef.kind) === "field") {
-        return { nodeId: fieldRef.id, nodeKind: "field" };
+    if ((_f = effect == null ? void 0 : effect.include) == null ? void 0 : _f.length) {
+      const included = new Set(effect.include);
+      for (const requiredTriggerId of required.triggers) {
+        const requiredTrigger = triggerById.get(requiredTriggerId);
+        if ((requiredTrigger == null ? void 0 : requiredTrigger.kind) !== "option") continue;
+        if (requiredTrigger.ownerFieldId !== targetFieldId) continue;
+        if (!included.has(requiredTriggerId)) {
+          return { invalidatedId: requiredTriggerId };
+        }
       }
     }
-    return void 0;
   }
+  return void 0;
+}
+function emitCycleError(args) {
+  const key = [
+    args.rootTriggerId,
+    args.conflictingTriggerId,
+    args.invalidatedId,
+    args.path.join(">")
+  ].join("::");
+  if (args.reported.has(key)) return;
+  args.reported.add(key);
+  args.v.errors.push({
+    code: "visibility_dependency_cycle",
+    severity: "error",
+    message: `Visibility dependency cycle: trigger "${args.rootTriggerId}" reveals "${args.revealedFieldId}", but reachable trigger "${args.conflictingTriggerId}" can hide or remove "${args.invalidatedId}".`,
+    nodeId: args.conflictingTriggerId,
+    details: withAffected(
+      {
+        rootTriggerId: args.rootTriggerId,
+        conflictingTriggerId: args.conflictingTriggerId,
+        invalidatedId: args.invalidatedId,
+        path: args.path
+      },
+      [
+        args.rootTriggerId,
+        args.revealedFieldId,
+        args.conflictingTriggerId,
+        args.invalidatedId
+      ]
+    )
+  });
+}
+
+// src/utils/order-kind.ts
+function normalizeSelectedTriggerKey(key, nodeMap) {
+  if (!key) return void 0;
   const ref = nodeMap.get(key);
   if (!ref) return void 0;
   if (ref.kind !== "field" && ref.kind !== "option") return void 0;
@@ -1313,8 +1727,7 @@ function validateUtilityMarkers(v) {
     "percent"
   ]);
   for (const f of v.fields) {
-    const optsArr = Array.isArray(f.options) ? f.options : [];
-    for (const o of optsArr) {
+    for (const { option: o } of walkFieldOptions(f)) {
       const role = (_b = (_a = o.pricing_role) != null ? _a : f.pricing_role) != null ? _b : "base";
       const hasService = isServiceIdRef(o.service_id);
       const util = (_c = o.meta) == null ? void 0 : _c.utility;
@@ -1550,13 +1963,13 @@ function normalizeServiceRef(value) {
 
 // src/core/validate/steps/rates.ts
 function validateRates(v) {
-  var _a, _b, _c;
+  var _a, _b;
   const ratePolicy = normalizeRatePolicy(v.options.ratePolicy);
   for (const f of v.fields) {
     if (!isMultiField(f)) continue;
     const baseRates = [];
-    for (const o of (_a = f.options) != null ? _a : []) {
-      const role = (_c = (_b = o.pricing_role) != null ? _b : f.pricing_role) != null ? _c : "base";
+    for (const { option: o } of walkFieldOptions(f)) {
+      const role = (_b = (_a = o.pricing_role) != null ? _a : f.pricing_role) != null ? _b : "base";
       if (role !== "base") continue;
       const sid = o.service_id;
       if (!isServiceIdRef(sid)) continue;
@@ -1758,8 +2171,9 @@ function collectAnchors(fields) {
   const anchors = [];
   for (const field of fields) {
     if (!isButton(field)) continue;
-    if (Array.isArray(field.options) && field.options.length > 0) {
-      for (const option of field.options) {
+    const optionVisits = walkFieldOptions(field);
+    if (optionVisits.length > 0) {
+      for (const { option } of optionVisits) {
         anchors.push({
           kind: "option",
           id: option.id,
@@ -1808,8 +2222,9 @@ function collectFieldReferences(field, services) {
 function collectBaseMembers(field, services) {
   var _a, _b, _c;
   const members = [];
-  if (Array.isArray(field.options) && field.options.length > 0) {
-    for (const option of field.options) {
+  const optionVisits = walkFieldOptions(field);
+  if (optionVisits.length > 0) {
+    for (const { option } of optionVisits) {
       const role2 = normalizeRole((_a = option.pricing_role) != null ? _a : field.pricing_role, "base");
       if (role2 !== "base") continue;
       if (option.service_id === void 0 || option.service_id === null) {
@@ -2224,7 +2639,7 @@ function effectiveConstraints(v, tagId) {
   return out;
 }
 function validateConstraints(v) {
-  var _a, _b;
+  var _a;
   for (const t of v.tags) {
     const eff = effectiveConstraints(v, t.id);
     const hasAnyRequired = Object.values(eff).some(
@@ -2233,7 +2648,7 @@ function validateConstraints(v) {
     if (!hasAnyRequired) continue;
     const visible = v.fieldsVisibleUnder(t.id);
     for (const f of visible) {
-      for (const o of (_a = f.options) != null ? _a : []) {
+      for (const { option: o } of walkFieldOptions(f)) {
         if (!isServiceIdRef(o.service_id)) continue;
         const svc = getServiceCapability(v.serviceMap, o.service_id);
         if (!svc || typeof svc !== "object") continue;
@@ -2287,7 +2702,7 @@ function validateConstraints(v) {
       if (!row) continue;
       const from = row.from === true;
       const to = row.to === true;
-      const origin = String((_b = row.origin) != null ? _b : "");
+      const origin = String((_a = row.origin) != null ? _a : "");
       v.errors.push({
         code: "constraint_overridden",
         severity: "warning",
@@ -2321,14 +2736,14 @@ function validateCustomFields(v) {
 
 // src/core/validate/steps/global-utility-guard.ts
 function validateGlobalUtilityGuard(v) {
-  var _a, _b, _c;
+  var _a, _b;
   if (!v.options.globalUtilityGuard) return;
   let hasUtility = false;
   let hasBase = false;
   for (const f of v.fields) {
-    for (const o of (_a = f.options) != null ? _a : []) {
+    for (const { option: o } of walkFieldOptions(f)) {
       if (!isServiceIdRef(o.service_id)) continue;
-      const role = (_c = (_b = o.pricing_role) != null ? _b : f.pricing_role) != null ? _c : "base";
+      const role = (_b = (_a = o.pricing_role) != null ? _a : f.pricing_role) != null ? _b : "base";
       if (role === "base") hasBase = true;
       else if (role === "utility") hasUtility = true;
       if (hasUtility && hasBase) break;
@@ -2530,7 +2945,7 @@ function applyFilterAllowLists(tagId, fieldId, filter) {
   return true;
 }
 function collectServiceItems(args) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   const filter = args.filter;
   const roleFilter = (_a = filter == null ? void 0 : filter.role) != null ? _a : "both";
   const where = filter == null ? void 0 : filter.where;
@@ -2580,7 +2995,7 @@ function collectServiceItems(args) {
         affectedIds: [`field:${f.id}`, `service:${String(fSid)}`]
       });
     }
-    for (const o of (_d = f.options) != null ? _d : []) {
+    for (const { option: o } of walkFieldOptions(f)) {
       const oSid = o.service_id;
       if (!isServiceIdRef2(oSid)) continue;
       const role = fieldRoleOf(f, o);
@@ -2665,7 +3080,7 @@ function collectServiceItems(args) {
       }
     } else if (includeGroupFallbacks) {
       const allowPrimaries = new Set(
-        ((_e = args.visiblePrimaries) != null ? _e : []).map((x) => String(x))
+        ((_d = args.visiblePrimaries) != null ? _d : []).map((x) => String(x))
       );
       for (const primaryKey of allowPrimaries) {
         const list = globalFb[primaryKey];
@@ -2746,17 +3161,15 @@ function affectedFromItems(items) {
   return uniq(ids);
 }
 function visibleGroupNodeIds(tag, fields) {
-  var _a;
   const ids = [tag.id];
   for (const f of fields) {
-    for (const o of (_a = f.options) != null ? _a : []) {
+    for (const { option: o } of walkFieldOptions(f)) {
       ids.push(o.id);
     }
   }
   return uniq(ids);
 }
 function visibleGroupPrimaries(tag, fields) {
-  var _a;
   const prim = [];
   const tagSid = tag.service_id;
   if (typeof tagSid === "string" || typeof tagSid === "number" && Number.isFinite(tagSid)) {
@@ -2767,7 +3180,7 @@ function visibleGroupPrimaries(tag, fields) {
     if (typeof fsid === "string" || typeof fsid === "number" && Number.isFinite(fsid)) {
       prim.push(fsid);
     }
-    for (const o of (_a = f.options) != null ? _a : []) {
+    for (const { option: o } of walkFieldOptions(f)) {
       const osid = o.service_id;
       if (typeof osid === "string" || typeof osid === "number" && Number.isFinite(osid)) {
         prim.push(osid);
@@ -2991,6 +3404,7 @@ function validate(props, ctx = {}) {
   validateStructure(v);
   validateIdentity(v);
   validateOptionMaps(v);
+  validateVisibilityCycles(v);
   validateOrderKinds(v);
   v.fieldsVisibleUnder = createFieldsVisibleUnder(v);
   const visSim = readVisibilitySimOpts(options);
@@ -3135,14 +3549,14 @@ var BuilderImpl = class {
       const showOptions = showSet.has(f.id);
       if (!showOptions) continue;
       if (!Array.isArray(f.options)) continue;
-      for (const o of f.options) {
+      for (const { option: o, parentId } of walkFieldOptions(f)) {
         nodes.push({
           id: o.id,
           kind: "option",
           label: o.label
         });
         const e = {
-          from: f.id,
+          from: parentId != null ? parentId : f.id,
           to: o.id,
           kind: "option",
           meta: { ownerField: f.id }
@@ -3189,7 +3603,7 @@ var BuilderImpl = class {
     return { nodes, edges };
   }
   cleanedProps() {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const fieldIds = new Set(this.props.fields.map((f) => f.id));
     const optionIds = /* @__PURE__ */ new Set();
     this.optionOwnerById.forEach((_v, oid) => optionIds.add(oid));
@@ -3201,6 +3615,7 @@ var BuilderImpl = class {
     }
     const incMap = (_c = this.props.includes_for_buttons) != null ? _c : {};
     const excMap = (_d = this.props.excludes_for_buttons) != null ? _d : {};
+    const effectMap = (_e = this.props.option_effects_for_buttons) != null ? _e : {};
     const includedByButtons = /* @__PURE__ */ new Set();
     const referencedKeys = /* @__PURE__ */ new Set();
     const referencedOwnerFields = /* @__PURE__ */ new Set();
@@ -3220,6 +3635,14 @@ var BuilderImpl = class {
         void fid;
       }
     }
+    for (const [key, targets] of Object.entries(effectMap)) {
+      referencedKeys.add(key);
+      const owner = this.optionOwnerById.get(key);
+      if (owner) referencedOwnerFields.add(owner.fieldId);
+      for (const [fid, effect] of Object.entries(targets != null ? targets : {})) {
+        if ((effect == null ? void 0 : effect.forceVisible) === true) includedByButtons.add(fid);
+      }
+    }
     const boundIds = /* @__PURE__ */ new Set();
     for (const f of this.props.fields) {
       const b = f.bind_id;
@@ -3237,6 +3660,7 @@ var BuilderImpl = class {
       return bound || included || referenced || !excluded;
     });
     const allowedTargets = new Set(fields.map((f) => f.id));
+    const allowedFieldById = new Map(fields.map((f) => [f.id, f]));
     const pruneButtons = (src) => {
       if (!src) return void 0;
       const out2 = {};
@@ -3256,13 +3680,52 @@ var BuilderImpl = class {
     const excludes_for_buttons = pruneButtons(
       this.props.excludes_for_buttons
     );
+    const pruneOptionEffects = (src) => {
+      var _a2, _b2, _c2, _d2;
+      if (!src) return void 0;
+      const out2 = {};
+      for (const [key, targets] of Object.entries(src)) {
+        const keyIsValid = optionIds.has(key) || fieldIds.has(key);
+        if (!keyIsValid) continue;
+        const cleanedTargets = {};
+        for (const [targetFieldId, effect] of Object.entries(
+          targets != null ? targets : {}
+        )) {
+          const field = allowedFieldById.get(targetFieldId);
+          if (!field || !effect) continue;
+          const validOptionIds = fieldOptionIdSet(field);
+          const include = Array.from(
+            new Set((_a2 = effect.include) != null ? _a2 : [])
+          ).filter((optionId) => validOptionIds.has(optionId));
+          const exclude = Array.from(
+            new Set((_b2 = effect.exclude) != null ? _b2 : [])
+          ).filter((optionId) => validOptionIds.has(optionId));
+          const next = {
+            ...effect.forceVisible === true ? { forceVisible: true } : {},
+            ...include.length ? { include } : {},
+            ...exclude.length ? { exclude } : {}
+          };
+          if (next.forceVisible === true || ((_c2 = next.include) == null ? void 0 : _c2.length) || ((_d2 = next.exclude) == null ? void 0 : _d2.length)) {
+            cleanedTargets[targetFieldId] = next;
+          }
+        }
+        if (Object.keys(cleanedTargets).length) {
+          out2[key] = cleanedTargets;
+        }
+      }
+      return Object.keys(out2).length ? out2 : void 0;
+    };
+    const option_effects_for_buttons = pruneOptionEffects(
+      this.props.option_effects_for_buttons
+    );
     const out = {
       filters: this.props.filters.slice(),
       fields,
       ...this.props.orderKinds ? { orderKinds: this.props.orderKinds } : {},
       ...includes_for_buttons && { includes_for_buttons },
       ...excludes_for_buttons && { excludes_for_buttons },
-      schema_version: (_e = this.props.schema_version) != null ? _e : "1.0",
+      ...option_effects_for_buttons && { option_effects_for_buttons },
+      schema_version: (_f = this.props.schema_version) != null ? _f : "1.0",
       // keep fallbacks & other maps as-is
       ...this.props.fallbacks ? { fallbacks: this.props.fallbacks } : {}
     };
@@ -3275,12 +3738,15 @@ var BuilderImpl = class {
     return (0, import_lodash_es2.cloneDeep)(this.options);
   }
   visibleFields(tagId, selectedKeys) {
+    return this.resolveVisibility(tagId, selectedKeys).fieldIds;
+  }
+  resolveVisibility(tagId, selectedKeys) {
     var _a;
-    return visibleFieldIdsUnder(this.props, tagId, {
-      selectedKeys: new Set(
-        (_a = selectedKeys != null ? selectedKeys : this.options.selectedOptionKeys) != null ? _a : []
-      )
-    });
+    return resolveVisibility(
+      this.props,
+      tagId,
+      (_a = selectedKeys != null ? selectedKeys : this.options.selectedOptionKeys) != null ? _a : []
+    );
   }
   getNodeMap() {
     if (!this._nodemap) this._nodemap = buildNodeMap(this.getProps());
@@ -3295,9 +3761,8 @@ var BuilderImpl = class {
     for (const t of this.props.filters) this.tagById.set(t.id, t);
     for (const f of this.props.fields) {
       this.fieldById.set(f.id, f);
-      if (Array.isArray(f.options)) {
-        for (const o of f.options)
-          this.optionOwnerById.set(o.id, { fieldId: f.id });
+      for (const [optionId, owner] of optionOwnerMap([f])) {
+        this.optionOwnerById.set(optionId, { fieldId: owner.fieldId });
       }
     }
   }
@@ -4775,24 +5240,44 @@ function isFiniteNumber2(v) {
 
 // src/utils/build-order-snapshot/selection.ts
 function isOptionBased(f) {
-  const hasOptions = Array.isArray(f.options) && f.options.length > 0;
+  const hasOptions = fieldOptionIdSet(f).size > 0;
   return hasOptions || isMultiField(f);
 }
 function toSelectedOptionKeys(byField) {
   const keys = [];
-  for (const [fieldId, optionIds] of Object.entries(byField != null ? byField : {})) {
+  for (const optionIds of Object.values(byField != null ? byField : {})) {
     for (const optionId of optionIds != null ? optionIds : []) {
-      keys.push(`${fieldId}::${optionId}`);
+      keys.push(optionId);
     }
   }
   return keys;
 }
-function getSelectedOptionsByFieldId(selection, fieldById) {
-  const out = {};
+function getSelectedOptionsByFieldId(selection, fieldById, mode, visibleOptionsByFieldId) {
+  var _a;
+  const collected = {};
   for (const visit of buildSelectedNodeVisitOrder(selection, fieldById)) {
     if (visit.kind !== "option") continue;
-    if (!out[visit.fieldId]) out[visit.fieldId] = [];
-    out[visit.fieldId].push(visit.optionId);
+    if (!collected[visit.fieldId]) collected[visit.fieldId] = [];
+    collected[visit.fieldId].push(visit.optionId);
+  }
+  const out = {};
+  for (const [fieldId, optionIds] of Object.entries(collected)) {
+    const field = fieldById.get(fieldId);
+    if (!field) continue;
+    const validOptionIds = fieldOptionIdSet(field);
+    const visibleOptionIds = (visibleOptionsByFieldId == null ? void 0 : visibleOptionsByFieldId[fieldId]) ? new Set(visibleOptionsByFieldId[fieldId]) : void 0;
+    const dedupedValid = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (const optionId of optionIds) {
+      if (!validOptionIds.has(optionId)) continue;
+      if (visibleOptionIds && !visibleOptionIds.has(optionId)) continue;
+      if (seen.has(optionId)) continue;
+      seen.add(optionId);
+      dedupedValid.push(optionId);
+    }
+    const isMulti = ((_a = field.meta) == null ? void 0 : _a.multi) === true;
+    const normalized = mode === "prod" && !isMulti ? dedupedValid.length ? [dedupedValid[dedupedValid.length - 1]] : [] : dedupedValid;
+    if (normalized.length) out[fieldId] = normalized;
   }
   return out;
 }
@@ -4807,57 +5292,49 @@ function buildSelectedNodeVisitOrder(selection, fieldById) {
     out.push({ kind: "field", fieldId });
   }
   function pushOption(fieldId, optionId) {
-    const key = `option:${fieldId}::${optionId}`;
+    const key = `option:${optionId}`;
     if (seen.has(key)) return;
     seen.add(key);
     out.push({ kind: "option", fieldId, optionId });
   }
-  for (const item of (_a = selection.optionTraversalOrder) != null ? _a : []) {
-    pushOption(item.fieldId, item.optionId);
+  for (const optionId of (_a = selection.optionTraversalOrder) != null ? _a : []) {
+    const ownerField = findOptionOwnerField(fieldById.values(), optionId);
+    if (ownerField) pushOption(ownerField.id, optionId);
   }
   for (const rawKey of (_b = selection.selectedKeys) != null ? _b : []) {
     const key = String(rawKey);
-    if (key.includes("::")) {
-      const [fieldId, optionId] = key.split("::", 2);
-      if (fieldId && optionId) pushOption(fieldId, optionId);
-      continue;
-    }
     const field = fieldById.get(key);
     if (field) {
       pushField(field.id);
       continue;
     }
-    const ownerField = findOptionOwnerField(key, fieldById);
+    const ownerField = findOptionOwnerField(fieldById.values(), key);
     if (ownerField) pushOption(ownerField.id, key);
   }
   for (const [fieldId, optionIds] of Object.entries(
     (_c = selection.optionSelectionsByFieldId) != null ? _c : {}
   )) {
-    if (!fieldById.has(fieldId)) continue;
+    const hintedField = fieldById.get(fieldId);
+    if (!hintedField) continue;
     for (const optionId of optionIds != null ? optionIds : []) {
-      pushOption(fieldId, optionId);
+      const ownerField = findOptionOwnerField(fieldById.values(), optionId);
+      if ((ownerField == null ? void 0 : ownerField.id) === hintedField.id) {
+        pushOption(ownerField.id, optionId);
+      }
     }
   }
   return out;
 }
-function findOptionOwnerField(optionId, fieldById) {
-  var _a;
-  for (const field of fieldById.values()) {
-    if ((_a = field.options) == null ? void 0 : _a.some((option) => option.id === optionId)) return field;
-  }
-  return void 0;
-}
 
 // src/utils/build-order-snapshot/services.ts
 function isServiceBased(field) {
-  var _a;
   if (field.service_id !== void 0 && field.service_id !== null) return true;
-  return !!((_a = field.options) == null ? void 0 : _a.some(
-    (item) => item.service_id !== void 0 && item.service_id !== null
-  ));
+  return walkFieldOptions(field).some(
+    ({ option }) => option.service_id !== void 0 && option.service_id !== null
+  );
 }
 function resolveServices(tagId, visibleFieldIds, selection, tagById, fieldById, services) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   const serviceMap = {};
   const visible = new Set(visibleFieldIds);
   const selectedBaseServices = [];
@@ -4884,9 +5361,9 @@ function resolveServices(tagId, visibleFieldIds, selection, tagById, fieldById,
       }
       continue;
     }
-    const option = (_b = field.options) == null ? void 0 : _b.find((item) => item.id === visit.optionId);
+    const option = findFieldOption(field, visit.optionId);
     if (!option) continue;
-    const role = (_d = (_c = option.pricing_role) != null ? _c : field.pricing_role) != null ? _d : "base";
+    const role = (_c = (_b = option.pricing_role) != null ? _b : field.pricing_role) != null ? _c : "base";
     if (role === "utility") continue;
     if (option.service_id !== void 0 && option.service_id !== null) {
       addSelectedBaseService(option.id, option.service_id);
@@ -5017,16 +5494,15 @@ function resolveQuantity(visibleFieldIds, fieldById, tagById, selection, tagId,
   return { quantity: hostDefault, source: { kind: "default", defaultedFromHost: true } };
 }
 function resolveNodeDefaultQuantity(visibleFieldIds, fieldById, tagById, selection, tagId) {
-  var _a, _b, _c;
+  var _a, _b;
   const visible = new Set(visibleFieldIds);
   const visits = buildSelectedNodeVisitOrder(selection, fieldById);
   for (const visit of visits) {
     if (visit.kind !== "option") continue;
     if (!visible.has(visit.fieldId)) continue;
     const field = fieldById.get(visit.fieldId);
-    if (!((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.length)) continue;
-    const option = field.options.find((item) => item.id === visit.optionId);
-    const quantity = readPositiveFiniteNumber((_b = option == null ? void 0 : option.meta) == null ? void 0 : _b.quantityDefault);
+    const option = findFieldOption(field, visit.optionId);
+    const quantity = readPositiveFiniteNumber((_a = option == null ? void 0 : option.meta) == null ? void 0 : _a.quantityDefault);
     if (quantity !== void 0) {
       return { quantity, source: { kind: "option", id: option.id } };
     }
@@ -5041,7 +5517,7 @@ function resolveNodeDefaultQuantity(visibleFieldIds, fieldById, tagById, selecti
     }
   }
   const tag = tagById.get(tagId);
-  const tagQuantity = readPositiveFiniteNumber((_c = tag == null ? void 0 : tag.meta) == null ? void 0 : _c.quantityDefault);
+  const tagQuantity = readPositiveFiniteNumber((_b = tag == null ? void 0 : tag.meta) == null ? void 0 : _b.quantityDefault);
   if (tagQuantity !== void 0) {
     return { quantity: tagQuantity, source: { kind: "tag", id: tagId } };
   }
@@ -5144,12 +5620,10 @@ function collectUtilityLineItems(visibleFieldIds, fieldById, selection, selected
       const item = buildUtilityItemFromMarker(field.id, marker, quantity, value);
       if (item) items.push(item);
     }
-    if (Array.isArray(field.options) && field.options.length) {
-      const selectedOptionIds = (_c = selectedOptionsByFieldId[field.id]) != null ? _c : [];
-      if (!selectedOptionIds.length) continue;
-      const optById = new Map(field.options.map((o) => [o.id, o]));
+    const selectedOptionIds = (_c = selectedOptionsByFieldId[field.id]) != null ? _c : [];
+    if (selectedOptionIds.length) {
       for (const oid of selectedOptionIds) {
-        const option = optById.get(oid);
+        const option = findFieldOption(field, oid);
         if (!option) continue;
         if (((_d = option.pricing_role) != null ? _d : "base") !== "utility") continue;
         const optionMarker = readUtilityMarker((_e = option.meta) == null ? void 0 : _e.utility);
@@ -5265,7 +5739,7 @@ function buildDevWarnings(props, svcMap, originalFallbacks, fieldById, visibleFi
 
 // src/utils/build-order-snapshot/index.ts
 function buildOrderSnapshot(props, builder, selection, services, settings = {}) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const mode = (_a = settings.mode) != null ? _a : "prod";
   const hostDefaultQty = Number.isFinite((_b = settings.hostDefaultQuantity) != null ? _b : 1) ? settings.hostDefaultQuantity : 1;
   const fbSettings = {
@@ -5278,11 +5752,32 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
   const builtAt = (/* @__PURE__ */ new Date()).toISOString();
   const tagId = selection.activeTagId;
   const selectedButtonKeys = (_d = selection.selectedKeys) != null ? _d : toSelectedOptionKeys(selection.optionSelectionsByFieldId);
-  const visibleFieldIds = builder.visibleFields(tagId, selectedButtonKeys);
   const tagById = new Map(((_e = props.filters) != null ? _e : []).map((t) => [t.id, t]));
   const fieldById = new Map(((_f = props.fields) != null ? _f : []).map((f) => [f.id, f]));
-  const tagConstraints = (_h = (_g = tagById.get(tagId)) == null ? void 0 : _g.constraints) != null ? _h : void 0;
-  const selectedOptionsByFieldId = getSelectedOptionsByFieldId(selection, fieldById);
+  const resolve = typeof builder.resolveVisibility === "function" ? builder.resolveVisibility.bind(builder) : void 0;
+  let resolvedVisibility = resolve == null ? void 0 : resolve(tagId, selectedButtonKeys);
+  let visibleFieldIds = (_g = resolvedVisibility == null ? void 0 : resolvedVisibility.fieldIds) != null ? _g : builder.visibleFields(tagId, selectedButtonKeys);
+  const filteredSelectedButtonKeys = filterSelectedKeysByVisibility(
+    selectedButtonKeys,
+    visibleFieldIds,
+    resolvedVisibility == null ? void 0 : resolvedVisibility.optionsByFieldId,
+    fieldById
+  );
+  if (resolve && filteredSelectedButtonKeys.join("\0") !== selectedButtonKeys.join("\0")) {
+    resolvedVisibility = resolve(tagId, filteredSelectedButtonKeys);
+    visibleFieldIds = resolvedVisibility.fieldIds;
+  }
+  const effectiveSelection = {
+    ...selection,
+    selectedKeys: filteredSelectedButtonKeys
+  };
+  const tagConstraints = (_i = (_h = tagById.get(tagId)) == null ? void 0 : _h.constraints) != null ? _i : void 0;
+  const selectedOptionsByFieldId = getSelectedOptionsByFieldId(
+    effectiveSelection,
+    fieldById,
+    mode,
+    resolvedVisibility == null ? void 0 : resolvedVisibility.optionsByFieldId
+  );
   const selectionFields = visibleFieldIds.map((fid) => fieldById.get(fid)).filter((f) => !!f).map((f) => {
     var _a2;
     const optionIds = isOptionBased(f) ? (_a2 = selectedOptionsByFieldId[f.id]) != null ? _a2 : [] : void 0;
@@ -5295,21 +5790,21 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
   const { formValues, selections } = buildInputs(
     visibleFieldIds,
     fieldById,
-    selection,
+    effectiveSelection,
     selectedOptionsByFieldId
   );
   const qtyRes = resolveQuantity(
     visibleFieldIds,
     fieldById,
     tagById,
-    selection,
+    effectiveSelection,
     tagId,
     hostDefaultQty
   );
   const { serviceMap, servicesList } = resolveServices(
     tagId,
     visibleFieldIds,
-    selection,
+    effectiveSelection,
     tagById,
     fieldById,
     services
@@ -5331,7 +5826,7 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
   const utilities = collectUtilityLineItems(
     visibleFieldIds,
     fieldById,
-    selection,
+    effectiveSelection,
     selectedOptionsByFieldId,
     qtyRes.quantity
   );
@@ -5341,7 +5836,7 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
     prunedFallbacks.original,
     fieldById,
     visibleFieldIds,
-    selection
+    effectiveSelection
   ) : void 0;
   const meta = {
     schema_version: props.schema_version,
@@ -5354,7 +5849,7 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
         tagId,
         visibleFieldIds,
         fieldById,
-        selection,
+        effectiveSelection,
         selectedOptionsByFieldId
       ),
       policy: toSnapshotPolicy(fbSettings)
@@ -5366,7 +5861,7 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
     builtAt,
     selection: {
       tag: tagId,
-      buttons: selectedButtonKeys,
+      buttons: filteredSelectedButtonKeys,
       fields: selectionFields
     },
     inputs: { form: formValues, selections },
@@ -5384,6 +5879,24 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
     meta
   };
 }
+function filterSelectedKeysByVisibility(selectedKeys, visibleFieldIds, optionsByFieldId, fieldById) {
+  if (!optionsByFieldId) return selectedKeys;
+  const visibleFields = new Set(visibleFieldIds);
+  const out = [];
+  for (const rawKey of selectedKeys) {
+    const key = String(rawKey);
+    if (fieldById.has(key)) {
+      if (visibleFields.has(key)) out.push(key);
+      continue;
+    }
+    const owner = findOptionOwnerField(fieldById.values(), key);
+    if (!owner || !visibleFields.has(owner.id)) continue;
+    const allowed = optionsByFieldId[owner.id];
+    if (allowed && !allowed.includes(key)) continue;
+    out.push(key);
+  }
+  return out;
+}
 
 // src/core/fallback-editor.ts
 function createFallbackEditor(options = {}) {
@@ -5765,16 +6278,24 @@ function mapDiagReason(reason) {
   createBuilder,
   createFallbackEditor,
   createNodeIndex,
+  fieldOptionIdSet,
+  fieldOptionIds,
+  filterFieldOptionsById,
   filterServicesForVisibleGroup,
+  findFieldOption,
+  findOptionOwnerField,
   getAssignedServiceIds,
   getEligibleFallbacks,
   getFallbackRegistrationInfo,
   isRefExcludedBySelectedKeys,
   normalise,
   normalizeFieldValidation,
+  optionOwnerMap,
   resolveServiceFallback,
   validate,
   validateAsync,
-  validateRateCoherenceDeep
+  validateRateCoherenceDeep,
+  walkFieldOptions,
+  walkOptions
 });
 //# sourceMappingURL=index.cjs.map