npm - @timeax/digital-service-engine - Versions diffs - 0.3.5 → 0.3.6 - Mend

@timeax/digital-service-engine 0.3.5 → 0.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

package/dist/core/index.cjs +659 -162
package/dist/core/index.cjs.map +1 -1
package/dist/core/index.d.cts +48 -6
package/dist/core/index.d.ts +48 -6
package/dist/core/index.js +650 -161
package/dist/core/index.js.map +1 -1
package/dist/react/index.cjs +1424 -448
package/dist/react/index.cjs.map +1 -1
package/dist/react/index.d.cts +48 -5
package/dist/react/index.d.ts +48 -5
package/dist/react/index.js +1424 -448
package/dist/react/index.js.map +1 -1
package/dist/schema/index.d.cts +19 -2
package/dist/schema/index.d.ts +19 -2
package/dist/workspace/index.cjs +1235 -374
package/dist/workspace/index.cjs.map +1 -1
package/dist/workspace/index.d.cts +45 -4
package/dist/workspace/index.d.ts +45 -4
package/dist/workspace/index.js +1235 -374
package/dist/workspace/index.js.map +1 -1
package/package.json +1 -1
package/schema/editor-snapshot.schema.json +38 -0
package/schema/service-props.schema.json +38 -0

package/dist/react/index.cjs CHANGED Viewed

@@ -731,6 +731,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));
@@ -746,6 +749,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
     },
@@ -900,6 +906,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: "",
@@ -908,7 +915,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;
 }
@@ -973,6 +981,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 include2 = toStringArray(effect.include);
+      const exclude2 = toStringArray(effect.exclude);
+      const next = {
+        ...effect.forceVisible === true ? { forceVisible: true } : {},
+        ...include2.length ? { include: dedupe(include2) } : {},
+        ...exclude2.length ? { exclude: dedupe(exclude2) } : {}
+      };
+      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);
@@ -1047,6 +1084,72 @@ 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 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);
@@ -1055,8 +1158,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;
@@ -1145,14 +1249,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",
@@ -1165,12 +1269,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") {
@@ -1222,11 +1320,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;
@@ -1309,6 +1402,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 include2 = new Set(
+          rule.include.filter((optionId) => known.has(optionId))
+        );
+        allowed = orderedOptionIds.filter(
+          (optionId) => include2.has(optionId) && allowed.includes(optionId)
+        );
+      }
+      if (Array.isArray(rule.exclude) && rule.exclude.length) {
+        const exclude2 = new Set(
+          rule.exclude.filter((optionId) => known.has(optionId))
+        );
+        allowed = allowed.filter((optionId) => !exclude2.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) {
@@ -1326,7 +1497,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
   });
@@ -1336,7 +1506,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);
     }
@@ -1345,7 +1515,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();
@@ -1395,9 +1565,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;
@@ -1438,7 +1608,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) {
@@ -1463,10 +1633,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();
@@ -1607,7 +1780,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;
   {
@@ -1707,7 +1880,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",
@@ -1722,25 +1895,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) {
@@ -1759,19 +1918,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);
@@ -1797,6 +1944,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);
@@ -1810,27 +2008,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;
@@ -1989,8 +2391,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;
@@ -2226,13 +2627,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;
@@ -2643,7 +3044,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(
@@ -2652,7 +3053,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;
@@ -2706,7 +3107,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",
@@ -2740,14 +3141,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;
@@ -2949,7 +3350,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;
@@ -2999,7 +3400,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);
@@ -3084,7 +3485,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];
@@ -3165,17 +3566,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)) {
@@ -3186,7 +3585,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);
@@ -3410,6 +3809,7 @@ function validate(props, ctx = {}) {
   validateStructure(v);
   validateIdentity(v);
   validateOptionMaps(v);
+  validateVisibilityCycles(v);
   validateOrderKinds(v);
   v.fieldsVisibleUnder = createFieldsVisibleUnder(v);
   const visSim = readVisibilitySimOpts(options);
@@ -3543,14 +3943,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 }
@@ -3597,7 +3997,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));
@@ -3609,6 +4009,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();
@@ -3628,6 +4029,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;
@@ -3645,6 +4054,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 = {};
@@ -3664,13 +4074,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 include2 = Array.from(
+            new Set((_a2 = effect.include) != null ? _a2 : [])
+          ).filter((optionId) => validOptionIds.has(optionId));
+          const exclude2 = Array.from(
+            new Set((_b2 = effect.exclude) != null ? _b2 : [])
+          ).filter((optionId) => validOptionIds.has(optionId));
+          const next = {
+            ...effect.forceVisible === true ? { forceVisible: true } : {},
+            ...include2.length ? { include: include2 } : {},
+            ...exclude2.length ? { exclude: exclude2 } : {}
+          };
+          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 } : {}
     };
@@ -3683,12 +4132,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());
@@ -3703,9 +4155,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 });
       }
     }
   }
@@ -5142,20 +5593,20 @@ 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, mode) {
-  var _a, _b;
+function getSelectedOptionsByFieldId(selection, fieldById, mode, visibleOptionsByFieldId) {
+  var _a;
   const collected = {};
   for (const visit of buildSelectedNodeVisitOrder(selection, fieldById)) {
     if (visit.kind !== "option") continue;
@@ -5166,18 +5617,18 @@ function getSelectedOptionsByFieldId(selection, fieldById, mode) {
   for (const [fieldId, optionIds] of Object.entries(collected)) {
     const field = fieldById.get(fieldId);
     if (!field) continue;
-    const validOptionIds = new Set(
-      ((_a = field.options) != null ? _a : []).map((option) => option.id)
-    );
+    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 = ((_b = field.meta) == null ? void 0 : _b.multi) === true;
+    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;
   }
@@ -5194,57 +5645,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 = [];
@@ -5271,9 +5714,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);
@@ -5404,16 +5847,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 } };
     }
@@ -5428,7 +5870,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 } };
   }
@@ -5531,12 +5973,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);
@@ -5652,7 +6092,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 = {
@@ -5665,14 +6105,31 @@ 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 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(
-    selection,
+    effectiveSelection,
     fieldById,
-    mode
+    mode,
+    resolvedVisibility == null ? void 0 : resolvedVisibility.optionsByFieldId
   );
   const selectionFields = visibleFieldIds.map((fid) => fieldById.get(fid)).filter((f) => !!f).map((f) => {
     var _a2;
@@ -5686,21 +6143,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
@@ -5722,7 +6179,7 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
   const utilities = collectUtilityLineItems(
     visibleFieldIds,
     fieldById,
-    selection,
+    effectiveSelection,
     selectedOptionsByFieldId,
     qtyRes.quantity
   );
@@ -5732,7 +6189,7 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
     prunedFallbacks.original,
     fieldById,
     visibleFieldIds,
-    selection
+    effectiveSelection
   ) : void 0;
   const meta = {
     schema_version: props.schema_version,
@@ -5745,7 +6202,7 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
         tagId,
         visibleFieldIds,
         fieldById,
-        selection,
+        effectiveSelection,
         selectedOptionsByFieldId
       ),
       policy: toSnapshotPolicy(fbSettings)
@@ -5757,7 +6214,7 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
     builtAt,
     selection: {
       tag: tagId,
-      buttons: selectedButtonKeys,
+      buttons: filteredSelectedButtonKeys,
       fields: selectionFields
     },
     inputs: { form: formValues, selections },
@@ -5775,6 +6232,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 = {}) {
@@ -6254,6 +6729,97 @@ function bumpSuffix(old) {
   return `${stem}${parseInt(m[2], 10) + 1}`;
 }
+// src/react/canvas/editor/editor-utils.ts
+function ownerOfOption(props, optionId) {
+  var _a;
+  for (const f of (_a = props.fields) != null ? _a : []) {
+    const found = findOptionLocationInField(f, optionId);
+    if (found) return { fieldId: f.id, index: found.index };
+  }
+  return null;
+}
+function findMutableOption(props, optionId) {
+  var _a;
+  for (const field of (_a = props.fields) != null ? _a : []) {
+    const found = findOptionLocationInField(field, optionId);
+    if (found) return { field, ...found };
+  }
+  return void 0;
+}
+function collectFieldOptionIds(field) {
+  const out = [];
+  const visit = (options) => {
+    for (const option of options != null ? options : []) {
+      out.push(String(option.id));
+      visit(option.children);
+    }
+  };
+  visit(field == null ? void 0 : field.options);
+  return out;
+}
+function findOptionLocationInField(field, optionId) {
+  const visit = (siblings, parent) => {
+    if (!siblings) return void 0;
+    const index = siblings.findIndex((option) => option.id === optionId);
+    if (index >= 0) {
+      return {
+        option: siblings[index],
+        siblings,
+        index,
+        parent
+      };
+    }
+    for (const option of siblings) {
+      const found = visit(option.children, option);
+      if (found) return found;
+    }
+    return void 0;
+  };
+  return visit(field.options);
+}
+function hasFieldOptions(field) {
+  return Array.isArray(field == null ? void 0 : field.options) && field.options.length > 0;
+}
+function isActualButtonField(field) {
+  return (field == null ? void 0 : field.button) === true && !hasFieldOptions(field);
+}
+function clearFieldButtonReceiverMaps(props, fieldId) {
+  var _a, _b, _c;
+  if ((_a = props.includes_for_buttons) == null ? void 0 : _a[fieldId]) {
+    delete props.includes_for_buttons[fieldId];
+  }
+  if ((_b = props.excludes_for_buttons) == null ? void 0 : _b[fieldId]) {
+    delete props.excludes_for_buttons[fieldId];
+  }
+  if (props.includes_for_buttons && Object.keys(props.includes_for_buttons).length === 0) {
+    delete props.includes_for_buttons;
+  }
+  if (props.excludes_for_buttons && Object.keys(props.excludes_for_buttons).length === 0) {
+    delete props.excludes_for_buttons;
+  }
+  if ((_c = props.option_effects_for_buttons) == null ? void 0 : _c[fieldId]) {
+    delete props.option_effects_for_buttons[fieldId];
+  }
+  if (props.option_effects_for_buttons && Object.keys(props.option_effects_for_buttons).length === 0) {
+    delete props.option_effects_for_buttons;
+  }
+}
+function ensureServiceExists(opts, id) {
+  if (typeof opts.serviceExists === "function") {
+    if (!opts.serviceExists(id)) {
+      throw new Error(`service_not_found:${String(id)}`);
+    }
+    return;
+  }
+  if (opts.serviceMap) {
+    if (!Object.prototype.hasOwnProperty.call(opts.serviceMap, id)) {
+      throw new Error(`service_not_found:${String(id)}`);
+    }
+    return;
+  }
+  throw new Error("service_checker_missing");
+}
 // src/react/canvas/editor/editor-duplicate.ts
 function duplicate(ctx, ref, opts = {}) {
   const snapBefore = ctx.makeSnapshot("duplicate:before");
@@ -6328,14 +6894,66 @@ function duplicateInPlace(ctx, ref, opts = {}) {
   return duplicateOption(ctx, ref.fieldId, ref.id, opts);
 }
 function ownerFieldOfOption(props, optionId) {
-  var _a, _b;
+  var _a;
   for (const field of (_a = props.fields) != null ? _a : []) {
-    if (((_b = field.options) != null ? _b : []).some((o) => o.id === optionId)) {
+    if (findMutableOption({ ...props, fields: [field] }, optionId)) {
       return { fieldId: field.id };
     }
   }
   return null;
 }
+function cloneOptionTree(ctx, fieldId, option, opts, optionIdMap) {
+  var _a, _b, _c, _d;
+  const newId = ctx.uniqueOptionId(
+    fieldId,
+    ((_a = opts.optionIdStrategy) != null ? _a : defaultOptionIdStrategy)(option.id)
+  );
+  optionIdMap.set(option.id, newId);
+  const children = (_b = option.children) == null ? void 0 : _b.map(
+    (child) => cloneOptionTree(ctx, fieldId, child, opts, optionIdMap)
+  );
+  return {
+    ...option,
+    id: newId,
+    label: ((_c = opts.labelStrategy) != null ? _c : nextCopyLabel)((_d = option.label) != null ? _d : option.id),
+    ...(children == null ? void 0 : children.length) ? { children } : {}
+  };
+}
+function remapEffect(effect, optionIdMap) {
+  const remapList = (values) => values == null ? void 0 : values.map((value) => {
+    var _a;
+    return (_a = optionIdMap.get(value)) != null ? _a : value;
+  });
+  return {
+    ...effect,
+    ...effect.include ? { include: remapList(effect.include) } : {},
+    ...effect.exclude ? { exclude: remapList(effect.exclude) } : {}
+  };
+}
+function copyOptionEffects(props, args) {
+  var _a, _b, _c, _d, _e;
+  const source = props.option_effects_for_buttons;
+  if (!source) return;
+  const next = {
+    ...source
+  };
+  const triggerIdMap = (_a = args.triggerIdMap) != null ? _a : /* @__PURE__ */ new Map();
+  const targetFieldIdMap = (_b = args.targetFieldIdMap) != null ? _b : /* @__PURE__ */ new Map();
+  const optionIdMap = (_c = args.optionIdMap) != null ? _c : /* @__PURE__ */ new Map();
+  for (const [oldTriggerId, targetMap] of Object.entries(source)) {
+    const newTriggerId = triggerIdMap.get(oldTriggerId);
+    if (!newTriggerId) continue;
+    const copiedTargets = {
+      ...(_d = next[newTriggerId]) != null ? _d : {}
+    };
+    for (const [oldTargetFieldId, effect] of Object.entries(targetMap != null ? targetMap : {})) {
+      const newTargetFieldId = (_e = targetFieldIdMap.get(oldTargetFieldId)) != null ? _e : oldTargetFieldId;
+      copiedTargets[newTargetFieldId] = remapEffect(effect, optionIdMap);
+    }
+    next[newTriggerId] = copiedTargets;
+  }
+  props.option_effects_for_buttons = next;
+}
 function duplicateTag(ctx, tagId, opts) {
   var _a, _b, _c, _d;
   const props = ctx.getProps();
@@ -6391,7 +7009,7 @@ function duplicateTag(ctx, tagId, opts) {
   return id;
 }
 function duplicateField(ctx, fieldId, opts) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f;
   const props = ctx.getProps();
   const fields = (_a = props.fields) != null ? _a : [];
   const src = fields.find((f) => f.id === fieldId);
@@ -6399,21 +7017,10 @@ function duplicateField(ctx, fieldId, opts) {
   const id = (_b = opts.id) != null ? _b : ctx.uniqueId(src.id);
   const label = ((_c = opts.labelStrategy) != null ? _c : nextCopyLabel)((_d = src.label) != null ? _d : id);
   const name = opts.nameStrategy ? opts.nameStrategy(src.name) : nextCopyName(src.name);
-  const optId = (old) => {
-    var _a2;
-    return ctx.uniqueOptionId(
-      id,
-      ((_a2 = opts.optionIdStrategy) != null ? _a2 : defaultOptionIdStrategy)(old)
-    );
-  };
-  const clonedOptions = ((_e = src.options) != null ? _e : []).map((o) => {
-    var _a2, _b2;
-    return {
-      ...o,
-      id: optId(o.id),
-      label: ((_a2 = opts.labelStrategy) != null ? _a2 : nextCopyLabel)((_b2 = o.label) != null ? _b2 : o.id)
-    };
-  });
+  const optionIdMap = /* @__PURE__ */ new Map();
+  const clonedOptions = ((_e = src.options) != null ? _e : []).map(
+    (o) => cloneOptionTree(ctx, id, o, opts, optionIdMap)
+  );
   const cloned = {
     ...src,
     id,
@@ -6422,14 +7029,8 @@ function duplicateField(ctx, fieldId, opts) {
     bind_id: ((_f = opts.copyBindings) != null ? _f : true) ? src.bind_id : void 0,
     options: clonedOptions
   };
-  const optionIdMap = /* @__PURE__ */ new Map();
-  ((_g = src.options) != null ? _g : []).forEach((o, i) => {
-    var _a2, _b2;
-    const newOptId = (_b2 = (_a2 = clonedOptions[i]) == null ? void 0 : _a2.id) != null ? _b2 : o.id;
-    optionIdMap.set(o.id, newOptId);
-  });
   ctx.patchProps((p) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g;
     const arr = (_a2 = p.fields) != null ? _a2 : [];
     const idx = arr.findIndex((f) => f.id === fieldId);
     arr.splice(idx + 1, 0, cloned);
@@ -6467,52 +7068,56 @@ function duplicateField(ctx, fieldId, opts) {
           }
           if (optionIdMap.has(key)) {
             const newKey = optionIdMap.get(key);
-            const merged = /* @__PURE__ */ new Set([...(_g2 = nextMap[newKey]) != null ? _g2 : [], ...targets]);
+            const merged = /* @__PURE__ */ new Set([...(_g = nextMap[newKey]) != null ? _g : [], ...targets]);
             nextMap[newKey] = Array.from(merged);
           }
         }
         p[mapKey] = nextMap;
       }
+      copyOptionEffects(p, {
+        triggerIdMap: new Map([
+          [fieldId, id],
+          ...Array.from(optionIdMap.entries())
+        ]),
+        targetFieldIdMap: /* @__PURE__ */ new Map([[fieldId, id]]),
+        optionIdMap
+      });
     }
   });
   return id;
 }
 function duplicateOption(ctx, fieldId, optionId, opts) {
-  var _a, _b, _c, _d, _e, _f;
   const props = ctx.getProps();
-  const fields = (_a = props.fields) != null ? _a : [];
-  const f = fields.find((x) => x.id === fieldId);
-  if (!f) throw new Error(`Field not found: ${fieldId}`);
-  const optIdx = ((_b = f.options) != null ? _b : []).findIndex((o) => o.id === optionId);
-  if (optIdx < 0) {
-    throw new Error(`Option not found: ${fieldId}::${optionId}`);
+  const location = findMutableOption(props, optionId);
+  if (!location || location.field.id !== fieldId) {
+    throw new Error(`Option not found: ${fieldId}/${optionId}`);
   }
-  const src = ((_c = f.options) != null ? _c : [])[optIdx];
-  const newId = ctx.uniqueOptionId(
-    fieldId,
-    ((_d = opts.optionIdStrategy) != null ? _d : defaultOptionIdStrategy)(src.id)
-  );
-  const newLabel = ((_e = opts.labelStrategy) != null ? _e : nextCopyLabel)((_f = src.label) != null ? _f : src.id);
+  const src = location.option;
+  const optionIdMap = /* @__PURE__ */ new Map();
+  const clone2 = cloneOptionTree(ctx, fieldId, src, opts, optionIdMap);
+  const newId = clone2.id;
   ctx.patchProps((p) => {
-    var _a2, _b2, _c2;
-    const fld = ((_a2 = p.fields) != null ? _a2 : []).find((x) => x.id === fieldId);
-    const arr = (_b2 = fld.options) != null ? _b2 : [];
-    const clone2 = { ...src, id: newId, label: newLabel };
-    arr.splice(optIdx + 1, 0, clone2);
-    fld.options = arr;
+    var _a;
+    const current = findMutableOption(p, optionId);
+    if (!current) return;
+    current.siblings.splice(current.index + 1, 0, clone2);
     if (opts.copyOptionMaps) {
-      const oldKey = `${fieldId}::${optionId}`;
-      const newKey = `${fieldId}::${newId}`;
       for (const mapKey of [
         "includes_for_buttons",
         "excludes_for_buttons"
       ]) {
-        const m = (_c2 = p[mapKey]) != null ? _c2 : {};
-        if (m[oldKey]) {
-          m[newKey] = Array.from(new Set(m[oldKey]));
-          p[mapKey] = m;
+        const m = (_a = p[mapKey]) != null ? _a : {};
+        for (const [oldKey, newKey] of optionIdMap.entries()) {
+          if (m[oldKey]) {
+            m[newKey] = Array.from(new Set(m[oldKey]));
+            p[mapKey] = m;
+          }
         }
       }
+      copyOptionEffects(p, {
+        triggerIdMap: optionIdMap,
+        optionIdMap
+      });
     }
   });
   return newId;
@@ -6574,54 +7179,6 @@ function removeNotice(ctx, id) {
 // src/react/canvas/editor/editor-nodes.ts
 var import_lodash_es3 = require("lodash-es");
-// src/react/canvas/editor/editor-utils.ts
-function ownerOfOption(props, optionId) {
-  var _a, _b;
-  for (const f of (_a = props.fields) != null ? _a : []) {
-    const idx = ((_b = f.options) != null ? _b : []).findIndex((o) => o.id === optionId);
-    if (idx >= 0) return { fieldId: f.id, index: idx };
-  }
-  return null;
-}
-function hasFieldOptions(field) {
-  return Array.isArray(field == null ? void 0 : field.options) && field.options.length > 0;
-}
-function isActualButtonField(field) {
-  return (field == null ? void 0 : field.button) === true && !hasFieldOptions(field);
-}
-function clearFieldButtonReceiverMaps(props, fieldId) {
-  var _a, _b;
-  if ((_a = props.includes_for_buttons) == null ? void 0 : _a[fieldId]) {
-    delete props.includes_for_buttons[fieldId];
-  }
-  if ((_b = props.excludes_for_buttons) == null ? void 0 : _b[fieldId]) {
-    delete props.excludes_for_buttons[fieldId];
-  }
-  if (props.includes_for_buttons && Object.keys(props.includes_for_buttons).length === 0) {
-    delete props.includes_for_buttons;
-  }
-  if (props.excludes_for_buttons && Object.keys(props.excludes_for_buttons).length === 0) {
-    delete props.excludes_for_buttons;
-  }
-}
-function ensureServiceExists(opts, id) {
-  if (typeof opts.serviceExists === "function") {
-    if (!opts.serviceExists(id)) {
-      throw new Error(`service_not_found:${String(id)}`);
-    }
-    return;
-  }
-  if (opts.serviceMap) {
-    if (!Object.prototype.hasOwnProperty.call(opts.serviceMap, id)) {
-      throw new Error(`service_not_found:${String(id)}`);
-    }
-    return;
-  }
-  throw new Error("service_checker_missing");
-}
-// src/react/canvas/editor/editor-nodes.ts
 var RELATION_MAP_KEYS = [
   "includes_for_buttons",
   "excludes_for_buttons",
@@ -6672,14 +7229,51 @@ function cleanRelationMapsForDeleted(p, deleted) {
         delete map[mapKey];
         continue;
       }
-      const next = ((_a = map[mapKey]) != null ? _a : []).filter(
-        (item) => !deleted.has(String(item))
-      );
-      if (next.length) map[mapKey] = next;
-      else delete map[mapKey];
+      const next = ((_a = map[mapKey]) != null ? _a : []).filter(
+        (item) => !deleted.has(String(item))
+      );
+      if (next.length) map[mapKey] = next;
+      else delete map[mapKey];
+    }
+    if (!Object.keys(map).length) delete p[key];
+  }
+}
+function cleanOptionEffectsForDeleted(p, deleted) {
+  var _a, _b;
+  const map = p.option_effects_for_buttons;
+  if (!map) return;
+  for (const triggerId of Object.keys(map)) {
+    if (deleted.has(String(triggerId))) {
+      delete map[triggerId];
+      continue;
+    }
+    const targets = map[triggerId];
+    for (const targetFieldId of Object.keys(targets != null ? targets : {})) {
+      if (deleted.has(String(targetFieldId))) {
+        delete targets[targetFieldId];
+        continue;
+      }
+      const effect = targets[targetFieldId];
+      if (!effect) continue;
+      if (effect.include) {
+        effect.include = effect.include.filter(
+          (optionId) => !deleted.has(String(optionId))
+        );
+        if (!effect.include.length) delete effect.include;
+      }
+      if (effect.exclude) {
+        effect.exclude = effect.exclude.filter(
+          (optionId) => !deleted.has(String(optionId))
+        );
+        if (!effect.exclude.length) delete effect.exclude;
+      }
+      if (effect.forceVisible !== true && !((_a = effect.include) == null ? void 0 : _a.length) && !((_b = effect.exclude) == null ? void 0 : _b.length)) {
+        delete targets[targetFieldId];
+      }
     }
-    if (!Object.keys(map).length) delete p[key];
+    if (!Object.keys(targets != null ? targets : {}).length) delete map[triggerId];
   }
+  if (!Object.keys(map).length) delete p.option_effects_for_buttons;
 }
 function cleanOrderForTagsForDeleted(p, deleted) {
   var _a, _b;
@@ -6716,28 +7310,37 @@ function applyDeleteCleanup(p, deleted) {
   cleanTagRelationsForDeleted(p, deleted);
   cleanFieldBindsForDeleted(p, deleted);
   cleanRelationMapsForDeleted(p, deleted);
+  cleanOptionEffectsForDeleted(p, deleted);
   cleanOrderForTagsForDeleted(p, deleted);
   cleanNoticesForDeleted(p, deleted);
 }
+function collectOptionSubtreeIds(option) {
+  var _a;
+  return [
+    String(option.id),
+    ...((_a = option.children) != null ? _a : []).flatMap((child) => collectOptionSubtreeIds(child))
+  ];
+}
 function removeOptionInPlace(p, optionId) {
   var _a;
-  const owner = ownerOfOption(p, optionId);
-  if (!owner) return false;
-  const f = ((_a = p.fields) != null ? _a : []).find((x) => x.id === owner.fieldId);
-  if (!(f == null ? void 0 : f.options)) return false;
-  const before = f.options.length;
-  f.options = f.options.filter((o) => o.id !== optionId);
-  return f.options.length !== before;
+  const found = findMutableOption(p, optionId);
+  if (!found) return [];
+  const deleted = collectOptionSubtreeIds(found.option);
+  found.siblings.splice(found.index, 1);
+  if (found.parent && ((_a = found.parent.children) == null ? void 0 : _a.length) === 0) {
+    delete found.parent.children;
+  }
+  return deleted;
 }
 function removeFieldInPlace(p, fieldId) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   const field = ((_a = p.fields) != null ? _a : []).find((f) => f.id === fieldId);
   if (!field) return [];
-  const deleted = [fieldId, ...((_b = field.options) != null ? _b : []).map((o) => String(o.id))];
-  const before = ((_c = p.fields) != null ? _c : []).length;
-  p.fields = ((_d = p.fields) != null ? _d : []).filter((f) => f.id !== fieldId);
+  const deleted = [fieldId, ...collectFieldOptionIds(field)];
+  const before = ((_b = p.fields) != null ? _b : []).length;
+  p.fields = ((_c = p.fields) != null ? _c : []).filter((f) => f.id !== fieldId);
   clearFieldButtonReceiverMaps(p, fieldId);
-  return ((_e = p.fields) != null ? _e : []).length !== before ? deleted : [];
+  return ((_d = p.fields) != null ? _d : []).length !== before ? deleted : [];
 }
 function removeTagInPlace(p, tagId) {
   var _a, _b, _c;
@@ -6750,7 +7353,7 @@ function reLabel(ctx, id, nextLabel) {
   ctx.exec({
     name: "reLabel",
     do: () => ctx.patchProps((p) => {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d, _e, _f;
       if (ctx.isTagId(id)) {
         const t = ((_a = p.filters) != null ? _a : []).find((x) => x.id === id);
         if (!t) return;
@@ -6760,19 +7363,16 @@ function reLabel(ctx, id, nextLabel) {
         return;
       }
       if (ctx.isOptionId(id)) {
-        const own = ownerOfOption(p, id);
-        if (!own) return;
-        const f = ((_c = p.fields) != null ? _c : []).find((x) => x.id === own.fieldId);
-        const o = (_d = f == null ? void 0 : f.options) == null ? void 0 : _d.find((x) => x.id === id);
+        const o = (_c = findMutableOption(p, id)) == null ? void 0 : _c.option;
         if (!o) return;
-        if (((_e = o.label) != null ? _e : "") === label) return;
+        if (((_d = o.label) != null ? _d : "") === label) return;
         o.label = label;
         ctx.api.refreshGraph();
         return;
       }
-      const fld = ((_f = p.fields) != null ? _f : []).find((x) => x.id === id);
+      const fld = ((_e = p.fields) != null ? _e : []).find((x) => x.id === id);
       if (!fld) return;
-      if (((_g = fld.label) != null ? _g : "") === label) return;
+      if (((_f = fld.label) != null ? _f : "") === label) return;
       fld.label = label;
       ctx.api.refreshGraph();
     }),
@@ -6862,11 +7462,7 @@ function updateOption(ctx, optionId, patch) {
     name: "updateOption",
     do: () => ctx.patchProps((p) => {
       var _a;
-      const owner = ownerOfOption(p, optionId);
-      if (!owner) return;
-      const f = ((_a = p.fields) != null ? _a : []).find((x) => x.id === owner.fieldId);
-      if (!(f == null ? void 0 : f.options)) return;
-      const o = f.options.find((x) => x.id === optionId);
+      const o = (_a = findMutableOption(p, optionId)) == null ? void 0 : _a.option;
       if (o) Object.assign(o, patch);
     }),
     undo: () => ctx.undo()
@@ -6879,9 +7475,9 @@ function removeOption(ctx, optionId) {
   ctx.exec({
     name: "removeOption",
     do: () => ctx.patchProps((p) => {
-      const removed = removeOptionInPlace(p, optionId);
-      if (!removed) return;
-      applyDeleteCleanup(p, /* @__PURE__ */ new Set([optionId]));
+      const removedIds = removeOptionInPlace(p, optionId);
+      if (!removedIds.length) return;
+      applyDeleteCleanup(p, new Set(removedIds));
     }),
     undo: () => ctx.undo()
   });
@@ -6892,7 +7488,7 @@ function editLabel(ctx, id, label) {
   ctx.exec({
     name: "editLabel",
     do: () => ctx.patchProps((p) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c;
       if (ctx.isTagId(id)) {
         const t = ((_a = p.filters) != null ? _a : []).find((x) => x.id === id);
         if (t) t.label = next;
@@ -6904,10 +7500,7 @@ function editLabel(ctx, id, label) {
         return;
       }
       if (ctx.isOptionId(id)) {
-        const own = ownerOfOption(p, id);
-        if (!own) return;
-        const f = ((_c = p.fields) != null ? _c : []).find((x) => x.id === own.fieldId);
-        const o = (_d = f == null ? void 0 : f.options) == null ? void 0 : _d.find((x) => x.id === id);
+        const o = (_c = findMutableOption(p, id)) == null ? void 0 : _c.option;
         if (o) o.label = next;
         return;
       }
@@ -6932,7 +7525,7 @@ function setService(ctx, id, input) {
   ctx.exec({
     name: "setService",
     do: () => ctx.patchProps((p) => {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e;
       const hasSidKey = Object.prototype.hasOwnProperty.call(
         input,
         "service_id"
@@ -6950,12 +7543,9 @@ function setService(ctx, id, input) {
         return;
       }
       if (ctx.isOptionId(id)) {
-        const own = ownerOfOption(p, id);
-        if (!own) return;
-        const f2 = ((_b = p.fields) != null ? _b : []).find((x) => x.id === own.fieldId);
-        const o = (_c = f2 == null ? void 0 : f2.options) == null ? void 0 : _c.find((x) => x.id === id);
+        const o = (_b = findMutableOption(p, id)) == null ? void 0 : _b.option;
         if (!o) return;
-        const currentRole = (_d = o.pricing_role) != null ? _d : "base";
+        const currentRole = (_c = o.pricing_role) != null ? _c : "base";
         const role = nextRole != null ? nextRole : currentRole;
         if (role === "utility") {
           if (hasSidKey && sid !== void 0) {
@@ -6976,7 +7566,7 @@ function setService(ctx, id, input) {
         }
         return;
       }
-      const f = ((_e = p.fields) != null ? _e : []).find((x) => x.id === id);
+      const f = ((_d = p.fields) != null ? _d : []).find((x) => x.id === id);
       if (!f) {
         throw new Error(
           'setService only supports tag ("t:*"), option ("o:*"), or field ("f:*") ids'
@@ -6987,7 +7577,7 @@ function setService(ctx, id, input) {
       if (nextRole) {
         f.pricing_role = nextRole;
       }
-      const effectiveRole = (_f = f.pricing_role) != null ? _f : "base";
+      const effectiveRole = (_e = f.pricing_role) != null ? _e : "base";
       if (isOptionBased2) {
         if (hasSidKey) {
           ctx.api.emit("error", {
@@ -7099,13 +7689,15 @@ function updateField(ctx, id, patch) {
   let prev;
   let prevIncludesForButton;
   let prevExcludesForButton;
+  let prevOptionEffectsForButton;
   ctx.exec({
     name: "updateField",
     do: () => ctx.patchProps((p) => {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       prevIncludesForButton = ((_a = p.includes_for_buttons) == null ? void 0 : _a[id]) ? [...(_c = (_b = p.includes_for_buttons) == null ? void 0 : _b[id]) != null ? _c : []] : void 0;
       prevExcludesForButton = ((_d = p.excludes_for_buttons) == null ? void 0 : _d[id]) ? [...(_f = (_e = p.excludes_for_buttons) == null ? void 0 : _e[id]) != null ? _f : []] : void 0;
-      p.fields = ((_g = p.fields) != null ? _g : []).map((f) => {
+      prevOptionEffectsForButton = ((_g = p.option_effects_for_buttons) == null ? void 0 : _g[id]) ? (0, import_lodash_es3.cloneDeep)(p.option_effects_for_buttons[id]) : void 0;
+      p.fields = ((_h = p.fields) != null ? _h : []).map((f) => {
         if (f.id !== id) return f;
         prev = (0, import_lodash_es3.cloneDeep)(f);
         const nextField = { ...f, ...patch };
@@ -7116,7 +7708,7 @@ function updateField(ctx, id, patch) {
       });
     }),
     undo: () => ctx.patchProps((p) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       p.fields = ((_a = p.fields) != null ? _a : []).map(
         (f) => f.id === id && prev ? prev : f
       );
@@ -7134,6 +7726,12 @@ function updateField(ctx, id, patch) {
           [id]: [...prevExcludesForButton]
         };
       }
+      if (prevOptionEffectsForButton) {
+        p.option_effects_for_buttons = {
+          ...(_d = p.option_effects_for_buttons) != null ? _d : {},
+          [id]: (0, import_lodash_es3.cloneDeep)(prevOptionEffectsForButton)
+        };
+      }
     })
   });
 }
@@ -7180,9 +7778,9 @@ function remove(ctx, id) {
     ctx.exec({
       name: "removeOption",
       do: () => ctx.patchProps((p) => {
-        const removed = removeOptionInPlace(p, key);
-        if (!removed) return;
-        applyDeleteCleanup(p, /* @__PURE__ */ new Set([key]));
+        const removedIds = removeOptionInPlace(p, key);
+        if (!removedIds.length) return;
+        applyDeleteCleanup(p, new Set(removedIds));
       }),
       undo: () => ctx.undo()
     });
@@ -7199,10 +7797,7 @@ function removeMany(ctx, ids) {
       const existingFieldIds = new Set(((_a = p.fields) != null ? _a : []).map((f) => String(f.id)));
       const existingTagIds = new Set(((_b = p.filters) != null ? _b : []).map((t) => String(t.id)));
       const existingOptionIds = new Set(
-        ((_c = p.fields) != null ? _c : []).flatMap((f) => {
-          var _a2;
-          return ((_a2 = f.options) != null ? _a2 : []).map((o) => String(o.id));
-        })
+        ((_c = p.fields) != null ? _c : []).flatMap((f) => collectFieldOptionIds(f))
       );
       const fieldIds = ordered.filter((id) => ctx.isFieldId(id) && existingFieldIds.has(id));
       const fieldIdSet = new Set(fieldIds);
@@ -7215,7 +7810,9 @@ function removeMany(ctx, ids) {
       });
       const deleted = /* @__PURE__ */ new Set();
       for (const optionId of optionIds) {
-        if (removeOptionInPlace(p, optionId)) deleted.add(optionId);
+        for (const removedId of removeOptionInPlace(p, optionId)) {
+          deleted.add(removedId);
+        }
       }
       for (const fieldId of fieldIds) {
         const removedIds = removeFieldInPlace(p, fieldId);
@@ -7230,7 +7827,7 @@ function removeMany(ctx, ids) {
   });
 }
 function getNode(ctx, id) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   const props = ctx.getProps();
   if (ctx.isTagId(id)) {
     const t = ((_a = props.filters) != null ? _a : []).find((x) => x.id === id);
@@ -7247,8 +7844,7 @@ function getNode(ctx, id) {
   }
   if (ctx.isOptionId(id)) {
     const own = ownerOfOption(props, id);
-    const f = own ? ((_c = props.fields) != null ? _c : []).find((x) => x.id === own.fieldId) : void 0;
-    const o = (_d = f == null ? void 0 : f.options) == null ? void 0 : _d.find((x) => x.id === id);
+    const o = (_c = findMutableOption(props, id)) == null ? void 0 : _c.option;
     return {
       kind: "option",
       data: o,
@@ -7785,7 +8381,7 @@ function connect(ctx, kind, fromId, toId2) {
   ctx.exec({
     name: `connect:${kind}`,
     do: () => ctx.patchProps((p) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g;
       if (kind === "bind") {
         if (ctx.isTagId(fromId) && ctx.isTagId(toId2)) {
           if (wouldCreateTagCycle(ctx, p, fromId, toId2)) {
@@ -7865,12 +8461,10 @@ function connect(ctx, kind, fromId, toId2) {
           return;
         }
         if (toId2.startsWith("o:")) {
-          for (const f of (_g = p.fields) != null ? _g : []) {
-            const o = (_h = f.options) == null ? void 0 : _h.find((x) => x.id === toId2);
-            if (o) {
-              o.service_id = fromId;
-              return;
-            }
+          const o = (_g = findMutableOption(p, toId2)) == null ? void 0 : _g.option;
+          if (o) {
+            o.service_id = fromId;
+            return;
           }
           return;
         }
@@ -7887,7 +8481,7 @@ function disconnect(ctx, kind, fromId, toId2) {
   ctx.exec({
     name: `disconnect:${kind}`,
     do: () => ctx.patchProps((p) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
       if (kind === "bind") {
         if (ctx.isTagId(fromId) && ctx.isTagId(toId2)) {
           const child = ((_a = p.filters) != null ? _a : []).find(
@@ -7963,12 +8557,10 @@ function disconnect(ctx, kind, fromId, toId2) {
           return;
         }
         if (toId2.startsWith("o:")) {
-          for (const f of (_i = p.fields) != null ? _i : []) {
-            const o = (_j = f.options) == null ? void 0 : _j.find((x) => x.id === toId2);
-            if (o) {
-              delete o.service_id;
-              return;
-            }
+          const o = (_i = findMutableOption(p, toId2)) == null ? void 0 : _i.option;
+          if (o) {
+            delete o.service_id;
+            return;
           }
           return;
         }
@@ -7991,6 +8583,250 @@ function addMappedField(p, mapKey, fromId, toId2) {
   p[mapKey] = maps;
 }
+// src/react/canvas/editor/editor-option-effects.ts
+function assertCanonicalId(id, label) {
+  if (!id || id.includes("::") || id.includes("/")) {
+    throw new Error(
+      `${label}: expected a raw field or option id, not a composite/path id`
+    );
+  }
+}
+function assertTrigger(ctx, triggerId) {
+  assertCanonicalId(triggerId, "option effect trigger");
+  const trigger = ctx.getNode(triggerId);
+  if (trigger.kind === "option" && trigger.data) return;
+  if (trigger.kind === "field" && trigger.data && isActualButtonField(trigger.data)) {
+    return;
+  }
+  throw new Error(
+    "option effect trigger must be an option id or button field id"
+  );
+}
+function assertTargetField(props, targetFieldId) {
+  var _a;
+  assertCanonicalId(targetFieldId, "option effect target");
+  const field = ((_a = props.fields) != null ? _a : []).find((item) => item.id === targetFieldId);
+  if (!field) {
+    throw new Error(`option effect target field not found: ${targetFieldId}`);
+  }
+  return field;
+}
+function dedupe2(values) {
+  if (!values) return void 0;
+  const out = [];
+  for (const value of values) {
+    const id = String(value);
+    if (!id || out.includes(id)) continue;
+    out.push(id);
+  }
+  return out.length ? out : void 0;
+}
+function assertTargetOptions(props, targetFieldId, ids, kind) {
+  if (!(ids == null ? void 0 : ids.length)) return;
+  const field = assertTargetField(props, targetFieldId);
+  const valid = fieldOptionIdSet(field);
+  for (const id of ids) {
+    assertCanonicalId(String(id), `option effect ${kind} option`);
+    if (!valid.has(String(id))) {
+      throw new Error(
+        `option effect ${kind} option not found under ${targetFieldId}: ${String(id)}`
+      );
+    }
+  }
+}
+function normalizeEffect(effect) {
+  var _a;
+  if (!effect) return void 0;
+  const exclude2 = dedupe2(effect.exclude);
+  const excluded = new Set(exclude2 != null ? exclude2 : []);
+  const include2 = (_a = dedupe2(effect.include)) == null ? void 0 : _a.filter((id) => !excluded.has(id));
+  const out = {};
+  if (effect.forceVisible === true) out.forceVisible = true;
+  if (include2 == null ? void 0 : include2.length) out.include = include2;
+  if (exclude2 == null ? void 0 : exclude2.length) out.exclude = exclude2;
+  return Object.keys(out).length ? out : void 0;
+}
+function ensureTargetMap(props, triggerId) {
+  var _a, _b, _c;
+  (_a = props.option_effects_for_buttons) != null ? _a : props.option_effects_for_buttons = {};
+  (_c = (_b = props.option_effects_for_buttons)[triggerId]) != null ? _c : _b[triggerId] = {};
+  return props.option_effects_for_buttons[triggerId];
+}
+function pruneEffectMap(props, triggerId) {
+  const map = props.option_effects_for_buttons;
+  if (!map) return;
+  const keys = triggerId ? [triggerId] : Object.keys(map);
+  for (const key of keys) {
+    const targets = map[key];
+    if (!targets || Object.keys(targets).length === 0) delete map[key];
+  }
+  if (Object.keys(map).length === 0) delete props.option_effects_for_buttons;
+}
+function validateEffect(ctx, props, triggerId, targetFieldId, effect) {
+  assertTrigger(ctx, triggerId);
+  assertTargetField(props, targetFieldId);
+  assertTargetOptions(props, targetFieldId, effect == null ? void 0 : effect.include, "include");
+  assertTargetOptions(props, targetFieldId, effect == null ? void 0 : effect.exclude, "exclude");
+  return normalizeEffect(effect);
+}
+function setOptionEffect(ctx, triggerId, targetFieldId, effect) {
+  ctx.exec({
+    name: "setOptionEffect",
+    do: () => ctx.patchProps((props) => {
+      var _a;
+      const normalized = validateEffect(
+        ctx,
+        props,
+        triggerId,
+        targetFieldId,
+        effect
+      );
+      if (!normalized) {
+        const map = (_a = props.option_effects_for_buttons) == null ? void 0 : _a[triggerId];
+        if (map) delete map[targetFieldId];
+        pruneEffectMap(props, triggerId);
+        return;
+      }
+      ensureTargetMap(props, triggerId)[targetFieldId] = normalized;
+    }),
+    undo: () => ctx.undo()
+  });
+}
+function patchOptionEffect(ctx, triggerId, targetFieldId, patch) {
+  ctx.exec({
+    name: "patchOptionEffect",
+    do: () => ctx.patchProps((props) => {
+      var _a, _b, _c, _d;
+      const current = (_c = (_b = (_a = props.option_effects_for_buttons) == null ? void 0 : _a[triggerId]) == null ? void 0 : _b[targetFieldId]) != null ? _c : {};
+      const merged = {
+        ...current,
+        ...patch
+      };
+      const normalized = validateEffect(
+        ctx,
+        props,
+        triggerId,
+        targetFieldId,
+        merged
+      );
+      if (!normalized) {
+        const map = (_d = props.option_effects_for_buttons) == null ? void 0 : _d[triggerId];
+        if (map) delete map[targetFieldId];
+        pruneEffectMap(props, triggerId);
+        return;
+      }
+      ensureTargetMap(props, triggerId)[targetFieldId] = normalized;
+    }),
+    undo: () => ctx.undo()
+  });
+}
+function clearOptionEffect(ctx, triggerId, targetFieldId) {
+  ctx.exec({
+    name: "clearOptionEffect",
+    do: () => ctx.patchProps((props) => {
+      var _a;
+      const map = (_a = props.option_effects_for_buttons) == null ? void 0 : _a[triggerId];
+      if (!map) return;
+      delete map[targetFieldId];
+      pruneEffectMap(props, triggerId);
+    }),
+    undo: () => ctx.undo()
+  });
+}
+function clearOptionEffectsForTrigger(ctx, triggerId) {
+  ctx.exec({
+    name: "clearOptionEffectsForTrigger",
+    do: () => ctx.patchProps((props) => {
+      if (!props.option_effects_for_buttons) return;
+      delete props.option_effects_for_buttons[triggerId];
+      pruneEffectMap(props);
+    }),
+    undo: () => ctx.undo()
+  });
+}
+function clearOptionEffectsForTarget(ctx, targetFieldId) {
+  ctx.exec({
+    name: "clearOptionEffectsForTarget",
+    do: () => ctx.patchProps((props) => {
+      var _a;
+      const map = props.option_effects_for_buttons;
+      if (!map) return;
+      for (const triggerId of Object.keys(map)) {
+        (_a = map[triggerId]) == null ? true : delete _a[targetFieldId];
+      }
+      pruneEffectMap(props);
+    }),
+    undo: () => ctx.undo()
+  });
+}
+function addOptionEffectOptions(ctx, triggerId, targetFieldId, kind, optionIds) {
+  var _a;
+  const additions = (_a = dedupe2(optionIds)) != null ? _a : [];
+  if (!additions.length) return;
+  ctx.exec({
+    name: "addOptionEffectOptions",
+    do: () => ctx.patchProps((props) => {
+      var _a2, _b, _c, _d;
+      const current = (_c = (_b = (_a2 = props.option_effects_for_buttons) == null ? void 0 : _a2[triggerId]) == null ? void 0 : _b[targetFieldId]) != null ? _c : {};
+      const nextValues = dedupe2([
+        ...(_d = current[kind]) != null ? _d : [],
+        ...additions
+      ]);
+      const normalized = validateEffect(
+        ctx,
+        props,
+        triggerId,
+        targetFieldId,
+        {
+          ...current,
+          [kind]: nextValues
+        }
+      );
+      if (!normalized) return;
+      ensureTargetMap(props, triggerId)[targetFieldId] = normalized;
+    }),
+    undo: () => ctx.undo()
+  });
+}
+function removeOptionEffectOptions(ctx, triggerId, targetFieldId, kind, optionIds) {
+  var _a;
+  const removals = new Set((_a = dedupe2(optionIds)) != null ? _a : []);
+  if (!removals.size) return;
+  ctx.exec({
+    name: "removeOptionEffectOptions",
+    do: () => ctx.patchProps((props) => {
+      var _a2, _b, _c, _d, _e;
+      const current = (_b = (_a2 = props.option_effects_for_buttons) == null ? void 0 : _a2[triggerId]) == null ? void 0 : _b[targetFieldId];
+      if (!current) return;
+      const next = {
+        ...current,
+        [kind]: ((_c = current[kind]) != null ? _c : []).filter(
+          (optionId) => !removals.has(optionId)
+        )
+      };
+      const normalized = validateEffect(
+        ctx,
+        props,
+        triggerId,
+        targetFieldId,
+        next
+      );
+      if (!normalized) {
+        (_e = (_d = props.option_effects_for_buttons) == null ? void 0 : _d[triggerId]) == null ? true : delete _e[targetFieldId];
+        pruneEffectMap(props, triggerId);
+        return;
+      }
+      ensureTargetMap(props, triggerId)[targetFieldId] = normalized;
+    }),
+    undo: () => ctx.undo()
+  });
+}
+function setOptionEffectForceVisible(ctx, triggerId, targetFieldId, forceVisible) {
+  patchOptionEffect(ctx, triggerId, targetFieldId, {
+    forceVisible: forceVisible === true ? true : void 0
+  });
+}
 // src/react/canvas/editor/editor-service-filter.ts
 function filterServicesForVisibleGroup2(ctx, candidates, input) {
   const coreInput = {
@@ -8577,7 +9413,7 @@ var Editor = class {
     if (!ordered.length) return;
     this.transact("clearServiceMany", () => {
       this.patchProps((p) => {
-        var _a, _b, _c, _d;
+        var _a, _b;
         for (const id of ordered) {
           if (this.isTagId(id)) {
             const t = ((_a = p.filters) != null ? _a : []).find((x) => x.id === id);
@@ -8590,10 +9426,8 @@ var Editor = class {
             continue;
           }
           if (this.isOptionId(id)) {
-            const own = ownerOfOption(p, id);
-            if (!own) continue;
-            const f = ((_c = p.fields) != null ? _c : []).find((x) => x.id === own.fieldId);
-            const o = (_d = f == null ? void 0 : f.options) == null ? void 0 : _d.find((x) => x.id === id);
+            const found = findMutableOption(p, id);
+            const o = found == null ? void 0 : found.option;
             if (o && "service_id" in o) delete o.service_id;
           }
         }
@@ -8642,7 +9476,7 @@ var Editor = class {
     if (!selected.size) return;
     this.transact("clearRelationsMany", () => {
       this.patchProps((p) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const clearOwned = mode === "owned" || mode === "both";
         const clearIncoming = mode === "incoming" || mode === "both";
         for (const t of (_a = p.filters) != null ? _a : []) {
@@ -8682,6 +9516,44 @@ var Editor = class {
           }
           if (!Object.keys(map).length) delete p[k];
         }
+        const effectMap = p.option_effects_for_buttons;
+        if (effectMap) {
+          for (const triggerId of Object.keys(effectMap)) {
+            if (clearOwned && selected.has(String(triggerId))) {
+              delete effectMap[triggerId];
+              continue;
+            }
+            const targets = effectMap[triggerId];
+            if (!targets || !clearIncoming) continue;
+            for (const targetFieldId of Object.keys(targets)) {
+              if (selected.has(String(targetFieldId))) {
+                delete targets[targetFieldId];
+                continue;
+              }
+              const effect = targets[targetFieldId];
+              if (!effect) continue;
+              if (effect.include) {
+                effect.include = effect.include.filter(
+                  (optionId) => !selected.has(String(optionId))
+                );
+                if (!effect.include.length) delete effect.include;
+              }
+              if (effect.exclude) {
+                effect.exclude = effect.exclude.filter(
+                  (optionId) => !selected.has(String(optionId))
+                );
+                if (!effect.exclude.length) delete effect.exclude;
+              }
+              if (effect.forceVisible !== true && !((_d = effect.include) == null ? void 0 : _d.length) && !((_e = effect.exclude) == null ? void 0 : _e.length)) {
+                delete targets[targetFieldId];
+              }
+            }
+            if (!Object.keys(targets).length) delete effectMap[triggerId];
+          }
+          if (!Object.keys(effectMap).length) {
+            delete p.option_effects_for_buttons;
+          }
+        }
       });
     });
   }
@@ -8693,7 +9565,7 @@ var Editor = class {
     const suffix = (_b = input.suffix) != null ? _b : "";
     this.transact("renameLabelsMany", () => {
       this.patchProps((p) => {
-        var _a2, _b2, _c, _d, _e, _f, _g;
+        var _a2, _b2, _c, _d, _e, _f;
         for (const id of ordered) {
           if (this.isTagId(id)) {
             const t = ((_a2 = p.filters) != null ? _a2 : []).find((x) => x.id === id);
@@ -8706,11 +9578,8 @@ var Editor = class {
             continue;
           }
           if (this.isOptionId(id)) {
-            const own = ownerOfOption(p, id);
-            if (!own) continue;
-            const f = ((_e = p.fields) != null ? _e : []).find((x) => x.id === own.fieldId);
-            const o = (_f = f == null ? void 0 : f.options) == null ? void 0 : _f.find((x) => x.id === id);
-            if (o) o.label = `${prefix}${(_g = o.label) != null ? _g : ""}${suffix}`.trim();
+            const o = (_e = findMutableOption(p, id)) == null ? void 0 : _e.option;
+            if (o) o.label = `${prefix}${(_f = o.label) != null ? _f : ""}${suffix}`.trim();
           }
         }
       });
@@ -8863,6 +9732,57 @@ var Editor = class {
   exclude(receiverId, idOrIds) {
     return exclude(this.moduleCtx(), receiverId, idOrIds);
   }
+  setOptionEffect(triggerId, targetFieldId, effect) {
+    return setOptionEffect(
+      this.moduleCtx(),
+      triggerId,
+      targetFieldId,
+      effect
+    );
+  }
+  patchOptionEffect(triggerId, targetFieldId, patch) {
+    return patchOptionEffect(
+      this.moduleCtx(),
+      triggerId,
+      targetFieldId,
+      patch
+    );
+  }
+  clearOptionEffect(triggerId, targetFieldId) {
+    return clearOptionEffect(this.moduleCtx(), triggerId, targetFieldId);
+  }
+  clearOptionEffectsForTrigger(triggerId) {
+    return clearOptionEffectsForTrigger(this.moduleCtx(), triggerId);
+  }
+  clearOptionEffectsForTarget(targetFieldId) {
+    return clearOptionEffectsForTarget(this.moduleCtx(), targetFieldId);
+  }
+  addOptionEffectOptions(triggerId, targetFieldId, kind, optionIds) {
+    return addOptionEffectOptions(
+      this.moduleCtx(),
+      triggerId,
+      targetFieldId,
+      kind,
+      optionIds
+    );
+  }
+  removeOptionEffectOptions(triggerId, targetFieldId, kind, optionIds) {
+    return removeOptionEffectOptions(
+      this.moduleCtx(),
+      triggerId,
+      targetFieldId,
+      kind,
+      optionIds
+    );
+  }
+  setOptionEffectForceVisible(triggerId, targetFieldId, forceVisible) {
+    return setOptionEffectForceVisible(
+      this.moduleCtx(),
+      triggerId,
+      targetFieldId,
+      forceVisible
+    );
+  }
   connect(kind, fromId, toId2) {
     return connect(this.moduleCtx(), kind, fromId, toId2);
   }
@@ -9231,11 +10151,10 @@ var Selection = class {
    * What counts as a "button selection" (trigger key):
    * - field key where the field has button === true (e.g. "f:dripfeed")
    * - option key (e.g. "o:fast")
-   * - composite key "fieldId::optionId" (e.g. "f:speed::o:fast")
    *
    * Grouping:
    * - button-field trigger groups under its own fieldId
-   * - option/composite groups under the option's owning fieldId (from nodeMap)
+   * - option trigger groups under the option's owning fieldId (from nodeMap)
    *
    * Deterministic:
    * - preserves selection insertion order
@@ -9252,15 +10171,6 @@ var Selection = class {
     };
     for (const key of this.set) {
       if (!key) continue;
-      const idx = key.indexOf("::");
-      if (idx !== -1) {
-        const optionId = key.slice(idx + 2);
-        const optRef = nodeMap.get(optionId);
-        if ((optRef == null ? void 0 : optRef.kind) === "option" && typeof optRef.fieldId === "string") {
-          push(optRef.fieldId, key);
-        }
-        continue;
-      }
       const ref = nodeMap.get(key);
       if (!ref) continue;
       if (ref.kind === "option" && typeof ref.fieldId === "string") {
@@ -9281,7 +10191,6 @@ var Selection = class {
    * Returns only selection keys that are valid "trigger buttons":
    * - field keys where field.button === true
    * - option keys
-   * - composite keys "fieldId::optionId" (validated by optionId)
    * Excludes tags and non-button fields.
    */
   selectedButtons() {
@@ -9297,13 +10206,6 @@ var Selection = class {
     };
     for (const key of this.set) {
       if (!key) continue;
-      const idx = key.indexOf("::");
-      if (idx !== -1) {
-        const optionId = key.slice(idx + 2);
-        const optRef = nodeMap.get(optionId);
-        if ((optRef == null ? void 0 : optRef.kind) === "option") push(key);
-        continue;
-      }
       const ref = nodeMap.get(key);
       if (!ref) continue;
       if (ref.kind === "option") {
@@ -9342,17 +10244,7 @@ var Selection = class {
       const direct = fields.find((x) => x.id === id);
       if (direct) return direct;
       if (this.builder.isOptionId(id)) {
-        return fields.find(
-          (x) => {
-            var _a2;
-            return ((_a2 = x.options) != null ? _a2 : []).some((o) => o.id === id);
-          }
-        );
-      }
-      if (id.includes("::")) {
-        const [fieldId] = id.split("::");
-        if (!fieldId) return void 0;
-        return fields.find((x) => x.id === fieldId);
+        return findOptionOwnerField(fields, id);
       }
       return void 0;
     };
@@ -9383,18 +10275,7 @@ var Selection = class {
     }
     for (const id of this.set) {
       if (this.builder.isOptionId(id)) {
-        const host = fields.find(
-          (x) => {
-            var _a2;
-            return ((_a2 = x.options) != null ? _a2 : []).some((o) => o.id === id);
-          }
-        );
-        if (host == null ? void 0 : host.bind_id)
-          return Array.isArray(host.bind_id) ? host.bind_id[0] : host.bind_id;
-      }
-      if (id.includes("::")) {
-        const [fid] = id.split("::");
-        const host = fields.find((x) => x.id === fid);
+        const host = findOptionOwnerField(fields, id);
         if (host == null ? void 0 : host.bind_id)
           return Array.isArray(host.bind_id) ? host.bind_id[0] : host.bind_id;
       }
@@ -9408,7 +10289,11 @@ var Selection = class {
     const tagById = new Map(tags.map((t) => [t.id, t]));
     const tag = tagById.get(tagId);
     const selectedTriggerIds = this.selectedButtons();
-    const fieldIds = this.builder.visibleFields(tagId, selectedTriggerIds);
+    const visibility = this.builder.resolveVisibility(
+      tagId,
+      selectedTriggerIds
+    );
+    const fieldIds = visibility.fieldIds;
     const fieldById = new Map(fields.map((f) => [f.id, f]));
     const visible = fieldIds.map((id) => fieldById.get(id)).filter(Boolean);
     const parentTags = [];
@@ -9434,6 +10319,14 @@ var Selection = class {
     let baseOverridden = false;
     for (const selId of this.set) {
       const opt = this.findOptionById(fields, selId);
+      if (opt && !this.isSelectedOptionVisible(
+        fields,
+        selId,
+        fieldIds,
+        visibility.optionsByFieldId
+      )) {
+        continue;
+      }
       if ((opt == null ? void 0 : opt.service_id) != null) {
         const role = (_d = opt.pricing_role) != null ? _d : "base";
         const cap = (_e = resolve == null ? void 0 : resolve(opt.service_id)) != null ? _e : { id: opt.service_id };
@@ -9464,6 +10357,8 @@ var Selection = class {
       tag,
       fields: visible,
       fieldIds,
+      optionsByFieldId: visibility.optionsByFieldId,
+      forcedFieldIds: visibility.forcedFieldIds,
       parentTags,
       childrenTags,
       services
@@ -9487,21 +10382,19 @@ var Selection = class {
     return baseOverridden;
   }
   findOptionById(fields, selId) {
-    var _a, _b;
     if (this.builder.isOptionId(selId)) {
-      for (const f of fields) {
-        const o = (_a = f.options) == null ? void 0 : _a.find((x) => x.id === selId);
-        if (o) return o;
-      }
-    }
-    if (selId.includes("::")) {
-      const [fid, oid] = selId.split("::");
-      const f = fields.find((x) => x.id === fid);
-      const o = (_b = f == null ? void 0 : f.options) == null ? void 0 : _b.find((x) => x.id === oid || x.id === selId);
-      if (o) return o;
+      const field = findOptionOwnerField(fields, selId);
+      return findFieldOption(field, selId);
     }
     return void 0;
   }
+  isSelectedOptionVisible(fields, selId, visibleFieldIds, optionsByFieldId) {
+    const visibleFields = new Set(visibleFieldIds);
+    const field = findOptionOwnerField(fields, selId);
+    if (!field || !visibleFields.has(field.id)) return false;
+    const allowed = optionsByFieldId[field.id];
+    return !allowed || allowed.includes(selId);
+  }
 };
 // src/react/canvas/api.ts
@@ -10404,11 +11297,83 @@ function useOrderFlow() {
     if (!ready) return void 0;
     return (_c2 = (_b2 = (_a2 = ctx.selection) == null ? void 0 : _a2.currentTag) == null ? void 0 : _b2.call(_a2)) != null ? _c2 : ctx.activeTagId;
   }, [ready, ctx.selection, ctx.activeTagId, selTick]);
+  const visibleOptionsByFieldId = (0, import_react6.useMemo)(
+    () => {
+      var _a2;
+      return (_a2 = visibleGroup == null ? void 0 : visibleGroup.optionsByFieldId) != null ? _a2 : {};
+    },
+    [visibleGroup]
+  );
+  const forcedFieldIds = (0, import_react6.useMemo)(
+    () => {
+      var _a2;
+      return (_a2 = visibleGroup == null ? void 0 : visibleGroup.forcedFieldIds) != null ? _a2 : [];
+    },
+    [visibleGroup]
+  );
   const formValuesByFieldId = (0, import_react6.useMemo)(() => {
     var _a2, _b2, _c2;
     const values = (_c2 = (_b2 = (_a2 = ctx.formApi).snapshot) == null ? void 0 : _b2.call(_a2)) != null ? _c2 : {};
     return values;
   }, [ctx.formApi, formTick]);
+  (0, import_react6.useEffect)(() => {
+    var _a2, _b2, _c2, _d;
+    if (!ready || !ctx.selection) return;
+    const { builder, selection } = ctx.ensureReady("pruneHiddenOptions");
+    const fields = (_a2 = builder.getProps().fields) != null ? _a2 : [];
+    const visibleOptionEntries = Object.entries(visibleOptionsByFieldId);
+    if (!visibleOptionEntries.length) return;
+    const visibleOptionSets = new Map(
+      visibleOptionEntries.map(([fieldId, optionIds]) => [
+        fieldId,
+        new Set(optionIds)
+      ])
+    );
+    const changedFieldIds = /* @__PURE__ */ new Set();
+    const ownerForToken = (token) => {
+      if (!token) return void 0;
+      const owner = findOptionOwnerField(fields, token);
+      return owner == null ? void 0 : owner.id;
+    };
+    const retained = [];
+    let changed = false;
+    for (const token of selection.all()) {
+      const ownerFieldId = ownerForToken(token);
+      if (!ownerFieldId) {
+        retained.push(token);
+        continue;
+      }
+      const allowed = visibleOptionSets.get(ownerFieldId);
+      if (!allowed) {
+        retained.push(token);
+        continue;
+      }
+      if (allowed.has(token)) {
+        retained.push(token);
+        continue;
+      }
+      changed = true;
+      changedFieldIds.add(ownerFieldId);
+    }
+    if (!changed) return;
+    for (const fieldId of changedFieldIds) {
+      const allowed = visibleOptionSets.get(fieldId);
+      const currentValue = ((_d = (_c2 = (_b2 = ctx.formApi).snapshot) == null ? void 0 : _c2.call(_b2)) != null ? _d : {})[fieldId];
+      if (Array.isArray(currentValue)) {
+        const next = currentValue.filter(
+          (value) => allowed == null ? void 0 : allowed.has(String(value))
+        );
+        if (next.length !== currentValue.length) {
+          ctx.formApi.set(fieldId, next.length ? next : void 0);
+        }
+        continue;
+      }
+      if (currentValue !== void 0 && allowed && !allowed.has(String(currentValue))) {
+        ctx.formApi.set(fieldId, void 0);
+      }
+    }
+    selection.many(retained, retained[retained.length - 1]);
+  }, [ctx, ready, selTick, visibleOptionsByFieldId]);
   const optionSelectionsByFieldId = (0, import_react6.useMemo)(
     () => ({}),
     []
@@ -10556,7 +11521,7 @@ function useOrderFlow() {
   );
   const setFieldOptions = (0, import_react6.useCallback)(
     (fieldId, optionIds) => {
-      var _a2, _b2, _c2, _d;
+      var _a2, _b2, _c2;
       const { builder, selection, init } = ctx.ensureReady(
         "setFieldOptions"
       );
@@ -10564,7 +11529,9 @@ function useOrderFlow() {
       const field = fields.find((f) => f.id === fieldId);
       if (!field) return;
       const validOptionIds = new Set(
-        ((_b2 = field.options) != null ? _b2 : []).map((option) => String(option.id))
+        Array.from(fieldOptionIdSet(field)).map(
+          (optionId) => String(optionId)
+        )
       );
       const dedupedValid = [];
       const seen = /* @__PURE__ */ new Set();
@@ -10575,36 +11542,18 @@ function useOrderFlow() {
         seen.add(optionId);
         dedupedValid.push(optionId);
       }
-      const mode = (_c2 = init.mode) != null ? _c2 : "prod";
-      const isMulti = ((_d = field.meta) == null ? void 0 : _d.multi) === true;
+      const mode = (_b2 = init.mode) != null ? _b2 : "prod";
+      const isMulti = ((_c2 = field.meta) == null ? void 0 : _c2.multi) === true;
       const normalized = mode === "prod" && !isMulti ? dedupedValid.length ? [dedupedValid[dedupedValid.length - 1]] : [] : dedupedValid;
-      const fieldById = new Map(fields.map((f) => [f.id, f]));
       const nodeMap = builder.getNodeMap();
       const resolveOptionOwnerFieldId = (token) => {
         var _a3;
         if (!token) return void 0;
-        if (token.includes("::")) {
-          const [legacyFieldId, optionId] = token.split("::", 2);
-          if (!optionId) return void 0;
-          const optionRef2 = nodeMap.get(optionId);
-          if ((optionRef2 == null ? void 0 : optionRef2.kind) === "option" && typeof optionRef2.fieldId === "string") {
-            return optionRef2.fieldId;
-          }
-          if (legacyFieldId && fieldById.has(legacyFieldId)) {
-            return legacyFieldId;
-          }
-          return void 0;
-        }
         const optionRef = nodeMap.get(token);
         if ((optionRef == null ? void 0 : optionRef.kind) === "option" && typeof optionRef.fieldId === "string") {
           return optionRef.fieldId;
         }
-        for (const f of fields) {
-          if ((_a3 = f.options) == null ? void 0 : _a3.some((option) => option.id === token)) {
-            return f.id;
-          }
-        }
-        return void 0;
+        return (_a3 = findOptionOwnerField(fields, token)) == null ? void 0 : _a3.id;
       };
       const retained = Array.from(selection.all()).filter(
         (token) => resolveOptionOwnerFieldId(token) !== fieldId
@@ -10708,6 +11657,8 @@ function useOrderFlow() {
     raw,
     notices,
     visibleGroup,
+    visibleOptionsByFieldId,
+    forcedFieldIds,
     formValuesByFieldId,
     optionSelectionsByFieldId,
     quantityPreview: previewSnapshot.quantity,
@@ -10814,6 +11765,18 @@ function Wrapper({
   const flow = useOrderFlow();
   const kind = toKind(field);
   const variant = toVariant(field);
+  const renderedField = React4.useMemo(() => {
+    var _a2;
+    const visibleOptionIds = flow.visibleOptionsByFieldId[field.id];
+    if (!visibleOptionIds) return field;
+    return {
+      ...field,
+      options: (_a2 = filterFieldOptionsById(
+        field.options,
+        new Set(visibleOptionIds)
+      )) != null ? _a2 : []
+    };
+  }, [field, flow.visibleOptionsByFieldId]);
   const descriptor = React4.useMemo(
     () => resolveInputDescriptor(registry, kind, variant),
     [kind, registry, variant]
@@ -10827,8 +11790,8 @@ function Wrapper({
   const baseProps = (_b = descriptor.defaultProps) != null ? _b : {};
   const defaultProps = (0, import_react7.useMemo)(() => {
     var _a2;
-    return { ...baseProps, ...(_a2 = field.defaults) != null ? _a2 : {} };
-  }, [baseProps, field.defaults]);
+    return { ...baseProps, ...(_a2 = renderedField.defaults) != null ? _a2 : {} };
+  }, [baseProps, renderedField.defaults]);
   const valueProp = (_c = adapter.valueProp) != null ? _c : "value";
   const changeProp = (_d = adapter.changeProp) != null ? _d : "onChange";
   const errorProp = (_e = adapter.errorProp) != null ? _e : "errorText";
@@ -10842,13 +11805,14 @@ function Wrapper({
     disabled: !!disabled
   });
   const optionIds = React4.useMemo(() => {
-    var _a2;
     if (!isOptionBased2) return /* @__PURE__ */ new Set();
-    return new Set(((_a2 = field.options) != null ? _a2 : []).map((o) => o.id));
-  }, [isOptionBased2, field.options]);
+    return new Set(
+      Array.from(fieldOptionIdSet(renderedField)).map(String)
+    );
+  }, [isOptionBased2, renderedField]);
   const adapterCtx = React4.useMemo(
-    () => ({ field, props: flow.raw }),
-    [field, flow.raw]
+    () => ({ field: renderedField, props: flow.raw }),
+    [renderedField, flow.raw]
   );
   const onHostChange = React4.useCallback(
     (next) => {
@@ -10859,7 +11823,7 @@ function Wrapper({
       if (isOptionBased2) {
         if (!adapter.getSelectedOptions) {
           throw new Error(
-            `[Wrapper] Adapter for "${field.id}" (${field.type}) must implement getSelectedOptions() because this field has options.`
+            `[Wrapper] Adapter for "${renderedField.id}" (${renderedField.type}) must implement getSelectedOptions() because this field has options.`
           );
         }
         const rawIds = adapter.getSelectedOptions(
@@ -10872,20 +11836,20 @@ function Wrapper({
             (rawIds != null ? rawIds : []).map(String).filter((id) => optionIds.has(id))
           )
         );
-        flow.setFieldOptions(field.id, nextIds);
+        flow.setFieldOptions(renderedField.id, nextIds);
         return;
       }
       if (isActionButton) {
         const isActive = (_e2 = (_d2 = adapter.isActive) == null ? void 0 : _d2.call(adapter, stored, adapterCtx)) != null ? _e2 : Boolean(stored);
-        if (isActive) flow.toggleOption(field.id);
-        else flow.clearField(field.id);
+        if (isActive) flow.toggleOption(renderedField.id);
+        else flow.clearField(renderedField.id);
       }
     },
     [
       adapter,
       adapterCtx,
-      field.id,
-      field.type,
+      renderedField.id,
+      renderedField.type,
       flow,
       fp,
       isActionButton,
@@ -10899,12 +11863,12 @@ function Wrapper({
     const ctx = ctxOverrides && typeof ctxOverrides === "object" ? { ...ctxFromInit, ...ctxOverrides } : ctxFromInit;
     return {
       ...ctx,
-      field,
+      field: renderedField,
       flow,
       value: fp.value,
       error: fp.error
     };
-  }, [ctxOverrides, field, flow, fp.error, fp.value]);
+  }, [ctxOverrides, renderedField, flow, fp.error, fp.value]);
   const templatedDefaultProps = React4.useMemo(() => {
     if (!templateStrings) return defaultProps;
     return templateDeep(defaultProps, templateCtx);
@@ -10914,14 +11878,14 @@ function Wrapper({
       return extraProps != null ? extraProps : {};
     return templateDeep(extraProps != null ? extraProps : {}, templateCtx);
   }, [extraProps, templateCtx, templateStrings]);
-  const fieldProps = (_h = (_g = adapter == null ? void 0 : adapter.getInputPropsFromField) == null ? void 0 : _g.call(adapter, { field, props: flow.raw })) != null ? _h : {};
+  const fieldProps = (_h = (_g = adapter == null ? void 0 : adapter.getInputPropsFromField) == null ? void 0 : _g.call(adapter, { field: renderedField, props: flow.raw })) != null ? _h : {};
   const hostProps = {
-    id: field.id,
-    field,
+    id: renderedField.id,
+    field: renderedField,
     disabled: !!disabled || !!fp.disabled,
     required: field.required,
     // DO NOT pass `name` to InputField/entries
-    fieldKey: field.id,
+    fieldKey: renderedField.id,
     ...fieldProps != null ? fieldProps : {},
     // error channel
     error: fp.error,
@@ -11927,7 +12891,10 @@ var treeSelectDescriptor = {
     supported: true,
     autoCreate: true,
     defaultLabel: "Option label",
-    defaultValue: "option"
+    defaultValue: "option",
+    children: {
+      supported: true
+    }
   },
   multi: {
     supported: true,
@@ -13118,20 +14085,29 @@ function withInputFieldUi(desc) {
         const fieldNotices = notices.filter(
           (notice) => matchesNotice(field, notice)
         );
+        const mapOptionForInputField = (item) => {
+          var _a3;
+          const optionNotices = notices.filter(
+            (notice) => matchesNotice(item, notice)
+          );
+          return {
+            ...item,
+            tags: optionNotices.map(toTagPill),
+            ...((_a3 = item.children) == null ? void 0 : _a3.length) ? {
+              children: item.children.map(
+                mapOptionForInputField
+              )
+            } : {}
+          };
+        };
         return {
           label: field.label,
           tags: fieldNotices.map(toTagPill),
           required: field.required,
           ...((_b = field.options) == null ? void 0 : _b.length) ? {
-            options: field.options.map((item) => {
-              const optionNotices = notices.filter(
-                (notice) => matchesNotice(item, notice)
-              );
-              return {
-                ...item,
-                tags: optionNotices.map(toTagPill)
-              };
-            })
+            options: field.options.map(
+              mapOptionForInputField
+            )
           } : {}
         };
       },