@timeax/digital-service-engine 0.0.1 → 0.0.3

package/dist/workspace/index.cjs

@@ -3260,11 +3260,6 @@ function hasAnyServiceOption(f) {
   var _a;
   return ((_a = f.options) != null ? _a : []).some((o) => isFiniteNumber(o.service_id));
 }
-function isBoundTo(f, tagId) {
-  const b = f.bind_id;
-  if (!b) return false;
-  return Array.isArray(b) ? b.includes(tagId) : b === tagId;
-}
 function getByPath(obj, path) {
   if (!path) return void 0;
   const parts = path.split(".");
@@ -3350,33 +3345,214 @@ function withAffected(details, ids) {
   return { ...details != null ? details : {}, affectedIds: ids };
 }
 
+// src/core/node-map.ts
+function buildNodeMap(props) {
+  var _a, _b, _c;
+  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 : []) {
+      if (!map.has(o.id))
+        map.set(o.id, {
+          kind: "option",
+          id: o.id,
+          node: o,
+          fieldId: f.id
+        });
+    }
+  }
+  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") {
+    return {
+      kind: "option",
+      triggerKey: trigger,
+      id: direct.id,
+      fieldId: direct.fieldId
+    };
+  }
+  return { kind: direct.kind, triggerKey: trigger, id: direct.id };
+}
+
+// src/core/visibility.ts
+function visibleFieldIdsUnder(props, tagId, opts = {}) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  const tags = (_a = props.filters) != null ? _a : [];
+  const fields = (_b = props.fields) != null ? _b : [];
+  const tagById = new Map(tags.map((t) => [t.id, t]));
+  const tag = tagById.get(tagId);
+  if (!tag) return [];
+  const nodeMap = buildNodeMap(props);
+  const lineageDepth = /* @__PURE__ */ new Map();
+  {
+    const guard = /* @__PURE__ */ new Set();
+    let cur = tag;
+    let d = 0;
+    while (cur && !guard.has(cur.id)) {
+      lineageDepth.set(cur.id, d++);
+      guard.add(cur.id);
+      const parentId = cur.bind_id;
+      cur = parentId ? tagById.get(parentId) : void 0;
+    }
+  }
+  const isTagInLineage = (id) => lineageDepth.has(id);
+  const fieldById = new Map(fields.map((f) => [f.id, f]));
+  const ownerDepthForField = (f) => {
+    const b = f.bind_id;
+    if (!b) return void 0;
+    if (typeof b === "string") return lineageDepth.get(b);
+    let best = void 0;
+    for (const id of b) {
+      const d = lineageDepth.get(id);
+      if (d == null) continue;
+      if (best == null || d < best) best = d;
+    }
+    return best;
+  };
+  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;
+      return ownerDepthForField(f);
+    }
+    if (t.kind === "option") {
+      const f = t.fieldId ? fieldById.get(t.fieldId) : void 0;
+      if (!f) return void 0;
+      return ownerDepthForField(f);
+    }
+    return void 0;
+  };
+  const tagInclude = new Set((_c = tag.includes) != null ? _c : []);
+  const tagExclude = new Set((_d = tag.excludes) != null ? _d : []);
+  const selected = (_e = opts.selectedKeys) != null ? _e : /* @__PURE__ */ new Set();
+  const incMap = (_f = props.includes_for_buttons) != null ? _f : {};
+  const excMap = (_g = props.excludes_for_buttons) != null ? _g : {};
+  const relevantTriggersInOrder = [];
+  for (const key of selected) {
+    const d = ownerDepthForTriggerKey(key);
+    if (d == null) continue;
+    relevantTriggersInOrder.push(key);
+  }
+  const visible = /* @__PURE__ */ new Set();
+  const isBoundToLineage = (f) => {
+    const b = f.bind_id;
+    if (!b) return false;
+    if (typeof b === "string") return isTagInLineage(b);
+    for (const id of b) if (isTagInLineage(id)) return true;
+    return false;
+  };
+  for (const f of fields) {
+    if (isBoundToLineage(f)) visible.add(f.id);
+    if (tagInclude.has(f.id)) visible.add(f.id);
+  }
+  for (const id of tagExclude) visible.delete(id);
+  const decide = /* @__PURE__ */ new Map();
+  const applyDecision = (fieldId, next) => {
+    const prev = decide.get(fieldId);
+    if (!prev) return void decide.set(fieldId, next);
+    if (next.depth < prev.depth) return void decide.set(fieldId, next);
+    if (next.depth > prev.depth) return;
+    if (prev.kind === "include" && next.kind === "exclude") {
+      decide.set(fieldId, next);
+    }
+  };
+  const revealedOrder = [];
+  const revealedSeen = /* @__PURE__ */ new Set();
+  for (const triggerKey of relevantTriggersInOrder) {
+    const depth = ownerDepthForTriggerKey(triggerKey);
+    if (depth == null) continue;
+    for (const id of (_h = incMap[triggerKey]) != null ? _h : []) {
+      applyDecision(id, { depth, kind: "include" });
+      if (!revealedSeen.has(id)) {
+        revealedSeen.add(id);
+        revealedOrder.push(id);
+      }
+    }
+    for (const id of (_i = excMap[triggerKey]) != null ? _i : []) {
+      applyDecision(id, { depth, kind: "exclude" });
+    }
+  }
+  for (const [fid, d] of decide) {
+    if (d.kind === "include") visible.add(fid);
+    else visible.delete(fid);
+  }
+  const base = fields.filter((f) => visible.has(f.id)).map((f) => f.id);
+  const order = (_j = props.order_for_tags) == null ? void 0 : _j[tagId];
+  if (order && order.length) {
+    const ordered = order.filter((fid) => visible.has(fid));
+    const orderedSet = new Set(ordered);
+    const rest = base.filter((fid) => !orderedSet.has(fid));
+    return [...ordered, ...rest];
+  }
+  return base;
+}
+function visibleFieldsUnder(props, tagId, opts = {}) {
+  var _a;
+  const ids = visibleFieldIdsUnder(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);
+}
+
 // src/core/validate/steps/visibility.ts
 function createFieldsVisibleUnder(v) {
   return (tagId) => {
-    var _a, _b, _c, _d, _e, _f;
-    const tag = v.tagById.get(tagId);
-    const includesTag = new Set((_a = tag == null ? void 0 : tag.includes) != null ? _a : []);
-    const excludesTag = new Set((_b = tag == null ? void 0 : tag.excludes) != null ? _b : []);
-    const incForOpt = (_c = v.props.includes_for_buttons) != null ? _c : {};
-    const excForOpt = (_d = v.props.excludes_for_buttons) != null ? _d : {};
-    const includesOpt = /* @__PURE__ */ new Set();
-    const excludesOpt = /* @__PURE__ */ new Set();
-    for (const key of v.selectedKeys) {
-      for (const id of (_e = incForOpt[key]) != null ? _e : []) includesOpt.add(id);
-      for (const id of (_f = excForOpt[key]) != null ? _f : []) excludesOpt.add(id);
-    }
-    const merged = /* @__PURE__ */ new Map();
-    for (const f of v.fields) {
-      if (isBoundTo(f, tagId)) merged.set(f.id, f);
-      if (includesTag.has(f.id)) merged.set(f.id, f);
-      if (includesOpt.has(f.id)) merged.set(f.id, f);
-    }
-    for (const id of excludesTag) merged.delete(id);
-    for (const id of excludesOpt) merged.delete(id);
-    return Array.from(merged.values());
+    return visibleFieldsUnder(v.props, tagId, {
+      selectedKeys: v.selectedKeys
+    });
   };
 }
-function validateVisibility(v) {
+function stableKeyOfSelection(keys) {
+  return Array.from(keys).sort().join("|");
+}
+function resolveRootTags(tags) {
+  const roots = tags.filter((t) => !t.bind_id);
+  return roots.length ? roots : tags.slice(0, 1);
+}
+function isEffectfulTrigger(v, trigger) {
+  var _a, _b, _c, _d, _e, _f;
+  const inc = (_a = v.props.includes_for_buttons) != null ? _a : {};
+  const exc = (_b = v.props.excludes_for_buttons) != null ? _b : {};
+  return ((_d = (_c = inc[trigger]) == null ? void 0 : _c.length) != null ? _d : 0) > 0 || ((_f = (_e = exc[trigger]) == null ? void 0 : _e.length) != null ? _f : 0) > 0;
+}
+function collectSelectableTriggersInContext(v, tagId, selectedKeys, onlyEffectful) {
+  var _a;
+  const visible = visibleFieldsUnder(v.props, tagId, {
+    selectedKeys
+  });
+  const triggers = [];
+  for (const f of visible) {
+    if (f.button === true) {
+      const t = f.id;
+      if (!onlyEffectful || isEffectfulTrigger(v, t)) triggers.push(t);
+    }
+    for (const o of (_a = f.options) != null ? _a : []) {
+      const t = `${f.id}::${o.id}`;
+      if (!onlyEffectful || isEffectfulTrigger(v, t)) triggers.push(t);
+    }
+  }
+  triggers.sort();
+  return triggers;
+}
+function runVisibilityRulesOnce(v) {
   var _a, _b, _c, _d, _e;
   for (const t of v.tags) {
     const visible = v.fieldsVisibleUnder(t.id);
@@ -3451,12 +3627,85 @@ function validateVisibility(v) {
     }
   }
 }
+function dedupeErrorsInPlace(v, startIndex) {
+  const seen = /* @__PURE__ */ new Set();
+  const keyOfErr = (e) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    const tagId = (_e = (_d = (_a = e == null ? void 0 : e.details) == null ? void 0 : _a.tagId) != null ? _d : (_c = (_b = e == null ? void 0 : e.details) == null ? void 0 : _b.affected) == null ? void 0 : _c.tagId) != null ? _e : "";
+    const other = (_g = (_f = e == null ? void 0 : e.details) == null ? void 0 : _f.other) != null ? _g : "";
+    return `${(_h = e == null ? void 0 : e.code) != null ? _h : ""}::${(_i = e == null ? void 0 : e.nodeId) != null ? _i : ""}::${tagId}::${other}::${(_j = e == null ? void 0 : e.message) != null ? _j : ""}`;
+  };
+  const kept = [];
+  for (let i = startIndex; i < v.errors.length; i++) {
+    const e = v.errors[i];
+    const k = keyOfErr(e);
+    if (seen.has(k)) continue;
+    seen.add(k);
+    kept.push(e);
+  }
+  v.errors.splice(startIndex, v.errors.length - startIndex, ...kept);
+}
+function validateVisibility(v, options = {}) {
+  var _a, _b, _c;
+  const simulate = options.simulate === true;
+  if (!simulate) {
+    runVisibilityRulesOnce(v);
+    return;
+  }
+  const maxStates = Math.max(1, (_a = options.maxStates) != null ? _a : 500);
+  const maxDepth = Math.max(0, (_b = options.maxDepth) != null ? _b : 6);
+  const onlyEffectful = options.onlyEffectfulTriggers !== false;
+  const roots = resolveRootTags(v.tags);
+  const rootTags = options.simulateAllRoots ? roots : roots.slice(0, 1);
+  const originalSelected = new Set((_c = v.selectedKeys) != null ? _c : []);
+  const errorsStart = v.errors.length;
+  const visited = /* @__PURE__ */ new Set();
+  const stack = [];
+  for (const rt of rootTags) {
+    stack.push({
+      rootTagId: rt.id,
+      selected: new Set(originalSelected),
+      depth: 0
+    });
+  }
+  let validatedStates = 0;
+  while (stack.length) {
+    if (validatedStates >= maxStates) break;
+    const state = stack.pop();
+    const sig = stableKeyOfSelection(state.selected);
+    if (visited.has(sig)) continue;
+    visited.add(sig);
+    v.selectedKeys = state.selected;
+    validatedStates++;
+    runVisibilityRulesOnce(v);
+    if (state.depth >= maxDepth) continue;
+    const triggers = collectSelectableTriggersInContext(
+      v,
+      state.rootTagId,
+      state.selected,
+      onlyEffectful
+    );
+    for (let i = triggers.length - 1; i >= 0; i--) {
+      const trig = triggers[i];
+      if (state.selected.has(trig)) continue;
+      const next = new Set(state.selected);
+      next.add(trig);
+      stack.push({
+        rootTagId: state.rootTagId,
+        selected: next,
+        depth: state.depth + 1
+      });
+    }
+  }
+  v.selectedKeys = originalSelected;
+  dedupeErrorsInPlace(v, errorsStart);
+}
 
 // src/core/validate/steps/structure.ts
 function validateStructure(v) {
   const tags = v.tags;
   const fields = v.fields;
-  if (!tags.some((t) => t.id === "root")) {
+  if (!tags.some((t) => t.id === "t:root")) {
     v.errors.push({
       code: "root_missing",
       severity: "error",
@@ -3646,58 +3895,91 @@ 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;
   const incMap = (_a = v.props.includes_for_buttons) != null ? _a : {};
   const excMap = (_b = v.props.excludes_for_buttons) != null ? _b : {};
-  const parseKey = (key) => {
-    const parts = key.split("::");
-    const fid = parts[0];
-    const oid = parts[1];
-    if (!fid || !oid) return null;
-    return { fieldId: fid, optionId: oid };
-  };
-  const hasOption = (fid, oid) => {
-    var _a2;
-    const f = v.fieldById.get(fid);
-    if (!f) return false;
-    return !!((_a2 = f.options) != null ? _a2 : []).find((o) => o.id === oid);
+  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 validateTriggerKey = (key) => {
+    const ref = v.nodeMap.get(key);
+    if (ref) {
+      if (ref.kind === "option") {
+        return {
+          ok: true,
+          nodeId: ref.fieldId,
+          affected: [ref.fieldId, ref.id]
+        };
+      }
+      if (ref.kind === "field") {
+        const isButton = ref.node.button === true;
+        if (!isButton)
+          return { ok: false, nodeId: ref.id, affected: [ref.id] };
+        return { ok: true, nodeId: ref.id, affected: [ref.id] };
+      }
+      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]
+    };
   };
-  const badKeyMessage = (key) => `Invalid option-map key "${key}". Expected "fieldId::optionId" pointing to an existing option.`;
   for (const k of Object.keys(incMap)) {
-    const p = parseKey(k);
-    if (!p || !hasOption(p.fieldId, p.optionId)) {
+    const r = validateTriggerKey(k);
+    if (!r.ok) {
       v.errors.push({
         code: "bad_option_key",
         severity: "error",
         message: badKeyMessage(k),
-        details: { key: k }
+        nodeId: r.nodeId,
+        details: withAffected({ key: k }, r.affected)
       });
     }
   }
   for (const k of Object.keys(excMap)) {
-    const p = parseKey(k);
-    if (!p || !hasOption(p.fieldId, p.optionId)) {
+    const r = validateTriggerKey(k);
+    if (!r.ok) {
       v.errors.push({
         code: "bad_option_key",
         severity: "error",
         message: badKeyMessage(k),
-        details: { key: k }
+        nodeId: r.nodeId,
+        details: withAffected({ key: k }, r.affected)
       });
     }
   }
   for (const k of Object.keys(incMap)) {
-    if (k in excMap) {
-      const p = parseKey(k);
-      const affected = p ? [p.fieldId, p.optionId] : void 0;
-      v.errors.push({
-        code: "option_include_exclude_conflict",
-        severity: "error",
-        message: `Option-map key "${k}" appears in both includes_for_buttons and excludes_for_buttons.`,
-        nodeId: p == null ? void 0 : p.fieldId,
-        details: withAffected({ key: k }, affected)
-      });
-    }
+    if (!(k in excMap)) continue;
+    const r = validateTriggerKey(k);
+    v.errors.push({
+      code: "option_include_exclude_conflict",
+      severity: "error",
+      message: `Trigger-map key "${k}" appears in both includes_for_buttons and excludes_for_buttons.`,
+      nodeId: r.nodeId,
+      details: withAffected({ key: k }, r.affected)
+    });
   }
 }
 
@@ -4602,8 +4884,23 @@ function applyPolicies(errors, props, serviceMap, policies, fieldsVisibleUnder,
 }
 
 // src/core/validate/index.ts
+function readVisibilitySimOpts(ctx) {
+  const c = ctx;
+  const simulate = c.simulateVisibility === true || c.visibilitySimulate === true || c.simulate === true;
+  const maxStates = typeof c.maxVisibilityStates === "number" ? c.maxVisibilityStates : typeof c.visibilityMaxStates === "number" ? c.visibilityMaxStates : typeof c.maxStates === "number" ? c.maxStates : void 0;
+  const maxDepth = typeof c.maxVisibilityDepth === "number" ? c.maxVisibilityDepth : typeof c.visibilityMaxDepth === "number" ? c.visibilityMaxDepth : typeof c.maxDepth === "number" ? c.maxDepth : void 0;
+  const simulateAllRoots = c.simulateAllRoots === true || c.visibilitySimulateAllRoots === true;
+  const onlyEffectfulTriggers = c.onlyEffectfulTriggers === false ? false : c.visibilityOnlyEffectfulTriggers !== false;
+  return {
+    simulate,
+    maxStates,
+    maxDepth,
+    simulateAllRoots,
+    onlyEffectfulTriggers
+  };
+}
 function validate(props, ctx = {}) {
-  var _a, _b;
+  var _a, _b, _c;
   const errors = [];
   const serviceMap = (_a = ctx.serviceMap) != null ? _a : {};
   const selectedKeys = new Set(
@@ -4617,6 +4914,7 @@ function validate(props, ctx = {}) {
   for (const f of fields) fieldById.set(f.id, f);
   const v = {
     props,
+    nodeMap: (_c = ctx.nodeMap) != null ? _c : buildNodeMap(props),
     options: ctx,
     errors,
     serviceMap,
@@ -4631,7 +4929,8 @@ function validate(props, ctx = {}) {
   validateIdentity(v);
   validateOptionMaps(v);
   v.fieldsVisibleUnder = createFieldsVisibleUnder(v);
-  validateVisibility(v);
+  const visSim = readVisibilitySimOpts(ctx);
+  validateVisibility(v, visSim);
   applyPolicies(
     v.errors,
     v.props,
@@ -4667,11 +4966,21 @@ var BuilderImpl = class {
     this.optionOwnerById = /* @__PURE__ */ new Map();
     this.history = [];
     this.future = [];
+    this._nodemap = null;
     var _a;
     this.options = { ...opts };
     this.historyLimit = (_a = opts.historyLimit) != null ? _a : 50;
   }
   /* ───── lifecycle ─────────────────────────────────────────────────────── */
+  isTagId(id) {
+    return this.tagById.has(id);
+  }
+  isFieldId(id) {
+    return this.fieldById.has(id);
+  }
+  isOptionId(id) {
+    return this.optionOwnerById.has(id);
+  }
   load(raw) {
     const next = normalise(raw, {
       defaultPricingRole: "base",
@@ -4891,129 +5200,16 @@ var BuilderImpl = class {
     return validate(this.props, this.options);
   }
   visibleFields(tagId, selectedKeys) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-    const props = this.props;
-    const tags = (_a = props.filters) != null ? _a : [];
-    const fields = (_b = props.fields) != null ? _b : [];
-    const tagById = new Map(tags.map((t) => [t.id, t]));
-    const tag = tagById.get(tagId);
-    if (!tag) return [];
-    const lineageDepth = /* @__PURE__ */ new Map();
-    {
-      const guard = /* @__PURE__ */ new Set();
-      let cur = tag;
-      let d = 0;
-      while (cur && !guard.has(cur.id)) {
-        lineageDepth.set(cur.id, d++);
-        guard.add(cur.id);
-        const parentId = cur.bind_id;
-        cur = parentId ? tagById.get(parentId) : void 0;
-      }
-    }
-    const isTagInLineage = (id) => lineageDepth.has(id);
-    const fieldById = new Map(fields.map((f) => [f.id, f]));
-    const optionOwnerFieldId = /* @__PURE__ */ new Map();
-    for (const f of fields) {
-      for (const o of (_c = f.options) != null ? _c : []) optionOwnerFieldId.set(o.id, f.id);
-    }
-    const ownerDepthForField = (f) => {
-      const b = f.bind_id;
-      if (!b) return void 0;
-      if (typeof b === "string") return lineageDepth.get(b);
-      let best = void 0;
-      for (const id of b) {
-        const d = lineageDepth.get(id);
-        if (d == null) continue;
-        if (best == null || d < best) best = d;
-      }
-      return best;
-    };
-    const ownerDepthForTrigger = (triggerId) => {
-      if (triggerId.startsWith("o:")) {
-        const fid = optionOwnerFieldId.get(triggerId);
-        if (!fid) return void 0;
-        const f2 = fieldById.get(fid);
-        if (!f2) return void 0;
-        return ownerDepthForField(f2);
-      }
-      const f = fieldById.get(triggerId);
-      if (!f || f.button !== true) return void 0;
-      return ownerDepthForField(f);
-    };
-    const tagInclude = new Set((_d = tag.includes) != null ? _d : []);
-    const tagExclude = new Set((_e = tag.excludes) != null ? _e : []);
-    const selected = new Set(
-      (_f = selectedKeys != null ? selectedKeys : this.options.selectedOptionKeys) != null ? _f : []
-    );
-    const incMap = (_g = props.includes_for_buttons) != null ? _g : {};
-    const excMap = (_h = props.excludes_for_buttons) != null ? _h : {};
-    const relevantTriggersInOrder = [];
-    for (const key of selected) {
-      const d = ownerDepthForTrigger(key);
-      if (d == null) continue;
-      relevantTriggersInOrder.push(key);
-    }
-    const visible = /* @__PURE__ */ new Set();
-    const isBoundToLineage = (f) => {
-      const b = f.bind_id;
-      if (!b) return false;
-      if (typeof b === "string") return isTagInLineage(b);
-      for (const id of b) if (isTagInLineage(id)) return true;
-      return false;
-    };
-    for (const f of fields) {
-      if (isBoundToLineage(f)) visible.add(f.id);
-      if (tagInclude.has(f.id)) visible.add(f.id);
-    }
-    for (const id of tagExclude) visible.delete(id);
-    const decide = /* @__PURE__ */ new Map();
-    const applyDecision = (fieldId, next) => {
-      const prev = decide.get(fieldId);
-      if (!prev) {
-        decide.set(fieldId, next);
-        return;
-      }
-      if (next.depth < prev.depth) {
-        decide.set(fieldId, next);
-        return;
-      }
-      if (next.depth > prev.depth) return;
-      if (prev.kind === "include" && next.kind === "exclude") {
-        decide.set(fieldId, next);
-      }
-    };
-    const revealedOrder = [];
-    const revealedSeen = /* @__PURE__ */ new Set();
-    for (const triggerId of relevantTriggersInOrder) {
-      const depth = ownerDepthForTrigger(triggerId);
-      if (depth == null) continue;
-      for (const id of (_i = incMap[triggerId]) != null ? _i : []) {
-        applyDecision(id, { depth, kind: "include" });
-        if (!revealedSeen.has(id)) {
-          revealedSeen.add(id);
-          revealedOrder.push(id);
-        }
-      }
-      for (const id of (_j = excMap[triggerId]) != null ? _j : []) {
-        applyDecision(id, { depth, kind: "exclude" });
-      }
-    }
-    for (const [fid, d] of decide) {
-      if (d.kind === "include") visible.add(fid);
-      else visible.delete(fid);
-    }
-    const base = fields.filter((f) => visible.has(f.id)).map((f) => f.id);
-    const order = (_k = props.order_for_tags) == null ? void 0 : _k[tagId];
-    if (order && order.length) {
-      const ordered = order.filter((fid) => visible.has(fid));
-      const orderedSet = new Set(ordered);
-      const rest2 = base.filter((fid) => !orderedSet.has(fid));
-      return [...ordered, ...rest2];
-    }
-    const promoted = revealedOrder.filter((fid) => visible.has(fid));
-    const promotedSet = new Set(promoted);
-    const rest = base.filter((fid) => !promotedSet.has(fid));
-    return [...promoted, ...rest];
+    var _a;
+    return visibleFieldIdsUnder(this.props, tagId, {
+      selectedKeys: new Set(
+        (_a = selectedKeys != null ? selectedKeys : this.options.selectedOptionKeys) != null ? _a : []
+      )
+    });
+  }
+  getNodeMap() {
+    if (!this._nodemap) this._nodemap = buildNodeMap(this.getProps());
+    return this._nodemap;
   }
   /* ───── history ─────────────────────────────────────────────────────── */
   undo() {
@@ -5037,6 +5233,7 @@ var BuilderImpl = class {
     this.tagById.clear();
     this.fieldById.clear();
     this.optionOwnerById.clear();
+    this._nodemap = null;
     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);
@@ -5264,6 +5461,7 @@ var toBindList = (b) => {
 function createNodeIndex(builder) {
   var _a, _b, _c, _d;
   const props = builder.getProps();
+  const nodeMap = builder.getNodeMap();
   const tags = (_a = props.filters) != null ? _a : [];
   const fields = (_b = props.fields) != null ? _b : [];
   const tagById = new Map(tags.map((t) => [t.id, t]));
@@ -5467,7 +5665,9 @@ function createNodeIndex(builder) {
         return parentById.get(id) === tid;
       },
       getDescendant(descendantId) {
-        return this.getDescendants().find((item) => item.id == descendantId);
+        return this.getDescendants().find(
+          (item) => item.id == descendantId
+        );
       },
       getDescendants() {
         const results = [];
@@ -5476,7 +5676,9 @@ function createNodeIndex(builder) {
           const node2 = getField(fieldId);
           if (!node2) continue;
           const explicit = includes.has(fieldId) || isFieldBoundDirectToTag(fieldId, id);
-          results.push(explicit ? node2 : { ...node2, isInherited: true });
+          results.push(
+            explicit ? node2 : { ...node2, isInherited: true }
+          );
         }
         return Object.freeze(results);
       }
@@ -5525,7 +5727,9 @@ function createNodeIndex(builder) {
         return false;
       },
       getDescendant(descendantId, context) {
-        return this.getDescendants(context).find((item) => item.id == descendantId);
+        return this.getDescendants(context).find(
+          (item) => item.id == descendantId
+        );
       },
       getDescendants(tagId) {
         return resolveDescendants(id, includes, tagId, !isButton);
@@ -5567,7 +5771,9 @@ function createNodeIndex(builder) {
         return owner.isBoundTo(tagId);
       },
       getDescendant(descendantId, context) {
-        return this.getDescendants(context).find((item) => item.id == descendantId);
+        return this.getDescendants(context).find(
+          (item) => item.id == descendantId
+        );
       },
       getDescendants(tagId) {
         return resolveDescendants(id, includes, tagId);
@@ -5578,7 +5784,7 @@ function createNodeIndex(builder) {
     return node;
   };
   const getNode = (input) => {
-    var _a2, _b2, _c2, _d2, _e, _f, _g, _h, _i;
+    var _a2, _b2, _c2, _d2, _e;
     if (typeof input !== "string") {
       if ("bind_id" in input && !("type" in input))
         return (_a2 = getTag(input.id)) != null ? _a2 : mkUnknown(input.id);
@@ -5588,11 +5794,7 @@ function createNodeIndex(builder) {
     }
     const cached = nodeCache.get(input);
     if (cached) return cached;
-    const id = input;
-    if (id.startsWith("t:")) return (_d2 = getTag(id)) != null ? _d2 : mkUnknown(id);
-    if (id.startsWith("f:")) return (_e = getField(id)) != null ? _e : mkUnknown(id);
-    if (id.startsWith("o:")) return (_f = getOption(id)) != null ? _f : mkUnknown(id);
-    return (_i = (_h = (_g = getTag(id)) != null ? _g : getField(id)) != null ? _h : getOption(id)) != null ? _i : mkUnknown(id);
+    return (_e = (_d2 = nodeMap.get(input)) == null ? void 0 : _d2.node) != null ? _e : mkUnknown(input);
   };
   const mkUnknown = (id) => {
     const u = {
@@ -5652,9 +5854,6 @@ function rateOk(svcMap, candidate, primary, policy) {
 
 // src/react/canvas/editor.ts
 var MAX_LIMIT = 100;
-var isTagId = (id) => id.startsWith("t:");
-var isFieldId = (id) => id.startsWith("f:");
-var isOptionId = (id) => id.startsWith("o:");
 function ownerOfOption(props, optionId) {
   var _a, _b;
   for (const f of (_a = props.fields) != null ? _a : []) {
@@ -5696,6 +5895,15 @@ var Editor = class {
     this.pushHistory(this.makeSnapshot("init"));
   }
   /* ───────────────────────── Public API ───────────────────────── */
+  isTagId(id) {
+    return this.builder.isTagId(id);
+  }
+  isFieldId(id) {
+    return this.builder.isFieldId(id);
+  }
+  isOptionId(id) {
+    return this.builder.isOptionId(id);
+  }
   getProps() {
     return this.builder.getProps();
   }
@@ -5791,7 +5999,7 @@ var Editor = class {
       name: "reLabel",
       do: () => this.patchProps((p) => {
         var _a, _b, _c, _d, _e, _f, _g;
-        if (isTagId(id)) {
+        if (this.isTagId(id)) {
           const t = ((_a = p.filters) != null ? _a : []).find((x) => x.id === id);
           if (!t) return;
           if (((_b = t.label) != null ? _b : "") === label) return;
@@ -5799,7 +6007,7 @@ var Editor = class {
           this.api.refreshGraph();
           return;
         }
-        if (isOptionId(id)) {
+        if (this.isOptionId(id)) {
           const own = ownerOfOption(p, id);
           if (!own) return;
           const f = ((_c = p.fields) != null ? _c : []).find(
@@ -6100,7 +6308,7 @@ var Editor = class {
    * - Option: use placeOption() instead
    */
   placeNode(id, opts) {
-    if (isTagId(id)) {
+    if (this.isTagId(id)) {
       this.exec({
         name: "placeTag",
         do: () => this.patchProps((p) => {
@@ -6147,7 +6355,7 @@ var Editor = class {
         }),
         undo: () => this.api.undo()
       });
-    } else if (isFieldId(id)) {
+    } else if (this.isFieldId(id)) {
       if (!opts.scopeTagId)
         throw new Error("placeNode(field): scopeTagId is required");
       const fieldId = id;
@@ -6174,14 +6382,14 @@ var Editor = class {
         }),
         undo: () => this.api.undo()
       });
-    } else if (isOptionId(id)) {
+    } else if (this.isOptionId(id)) {
       this.placeOption(id, opts);
     } else {
       throw new Error("placeNode: unknown id prefix");
     }
   }
   placeOption(optionId, opts) {
-    if (!isOptionId(optionId))
+    if (!this.isOptionId(optionId))
       throw new Error('placeOption: optionId must start with "o:"');
     this.exec({
       name: "placeOption",
@@ -6238,7 +6446,7 @@ var Editor = class {
     return id;
   }
   updateOption(optionId, patch) {
-    if (!isOptionId(optionId))
+    if (!this.isOptionId(optionId))
       throw new Error('updateOption: optionId must start with "o:"');
     this.exec({
       name: "updateOption",
@@ -6257,7 +6465,7 @@ var Editor = class {
     });
   }
   removeOption(optionId) {
-    if (!isOptionId(optionId))
+    if (!this.isOptionId(optionId))
       throw new Error('removeOption: optionId must start with "o:"');
     this.exec({
       name: "removeOption",
@@ -6288,17 +6496,17 @@ var Editor = class {
       name: "editLabel",
       do: () => this.patchProps((p) => {
         var _a, _b, _c, _d;
-        if (isTagId(id)) {
+        if (this.isTagId(id)) {
           const t = ((_a = p.filters) != null ? _a : []).find((x) => x.id === id);
           if (t) t.label = next;
           return;
         }
-        if (isFieldId(id)) {
+        if (this.isFieldId(id)) {
           const f = ((_b = p.fields) != null ? _b : []).find((x) => x.id === id);
           if (f) f.label = next;
           return;
         }
-        if (isOptionId(id)) {
+        if (this.isOptionId(id)) {
           const own = ownerOfOption(p, id);
           if (!own) return;
           const f = ((_c = p.fields) != null ? _c : []).find(
@@ -6337,7 +6545,7 @@ var Editor = class {
         const validId = hasSidKey && typeof input.service_id === "number" && Number.isFinite(input.service_id);
         const sid = validId ? Number(input.service_id) : void 0;
         const nextRole = input.pricing_role;
-        if (isTagId(id)) {
+        if (this.isTagId(id)) {
           const t = ((_a = p.filters) != null ? _a : []).find((x) => x.id === id);
           if (!t) return;
           if (hasSidKey) {
@@ -6346,7 +6554,7 @@ var Editor = class {
           }
           return;
         }
-        if (isOptionId(id)) {
+        if (this.isOptionId(id)) {
           const own = ownerOfOption(p, id);
           if (!own) return;
           const f2 = ((_b = p.fields) != null ? _b : []).find(
@@ -6553,7 +6761,7 @@ var Editor = class {
     });
   }
   remove(id) {
-    if (isTagId(id)) {
+    if (this.isTagId(id)) {
       this.exec({
         name: "removeTag",
         do: () => this.patchProps((p) => {
@@ -6593,7 +6801,7 @@ var Editor = class {
       });
       return;
     }
-    if (isFieldId(id)) {
+    if (this.isFieldId(id)) {
       this.exec({
         name: "removeField",
         do: () => this.patchProps((p) => {
@@ -6629,7 +6837,7 @@ var Editor = class {
       });
       return;
     }
-    if (isOptionId(id)) {
+    if (this.isOptionId(id)) {
       this.removeOption(id);
       return;
     }
@@ -6638,7 +6846,7 @@ var Editor = class {
   getNode(id) {
     var _a, _b, _c, _d;
     const props = this.builder.getProps();
-    if (isTagId(id)) {
+    if (this.isTagId(id)) {
       const t = ((_a = props.filters) != null ? _a : []).find((x) => x.id === id);
       return {
         kind: "tag",
@@ -6646,12 +6854,12 @@ var Editor = class {
         owners: { parentTagId: t == null ? void 0 : t.bind_id }
       };
     }
-    if (isFieldId(id)) {
+    if (this.isFieldId(id)) {
       const f = ((_b = props.fields) != null ? _b : []).find((x) => x.id === id);
       const bind = Array.isArray(f == null ? void 0 : f.bind_id) ? f.bind_id : (f == null ? void 0 : f.bind_id) ? [f.bind_id] : [];
       return { kind: "field", data: f, owners: { bindTagIds: bind } };
     }
-    if (isOptionId(id)) {
+    if (this.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);
@@ -6729,7 +6937,7 @@ var Editor = class {
     if (receiverId === targetId) return true;
     const getDirectRelations = (id) => {
       var _a, _b, _c, _d, _e, _f, _g;
-      if (isTagId(id)) {
+      if (this.isTagId(id)) {
         const t = ((_a = p.filters) != null ? _a : []).find((x) => x.id === id);
         return [...(_b = t == null ? void 0 : t.includes) != null ? _b : [], ...(_c = t == null ? void 0 : t.excludes) != null ? _c : []];
       }
@@ -6949,7 +7157,7 @@ var Editor = class {
       do: () => this.patchProps((p) => {
         var _a, _b, _c, _d, _e;
         if (kind === "bind") {
-          if (isTagId(fromId) && isTagId(toId2)) {
+          if (this.isTagId(fromId) && this.isTagId(toId2)) {
             if (this.wouldCreateTagCycle(p, fromId, toId2)) {
               throw new Error(
                 `bind would create a cycle: ${fromId} \u2192 ${toId2}`
@@ -6961,9 +7169,9 @@ var Editor = class {
             if (child) child.bind_id = fromId;
             return;
           }
-          if (isTagId(fromId) && isFieldId(toId2) || isFieldId(fromId) && isTagId(toId2)) {
-            const fieldId = isFieldId(toId2) ? toId2 : fromId;
-            const tagId = isTagId(fromId) ? fromId : toId2;
+          if (this.isTagId(fromId) && this.isFieldId(toId2) || this.isFieldId(fromId) && this.isTagId(toId2)) {
+            const fieldId = this.isFieldId(toId2) ? toId2 : fromId;
+            const tagId = this.isTagId(fromId) ? fromId : toId2;
             const f = ((_b = p.fields) != null ? _b : []).find(
               (x) => x.id === fieldId
             );
@@ -6987,7 +7195,7 @@ var Editor = class {
         }
         if (kind === "include" || kind === "exclude") {
           const key = kind === "include" ? "includes" : "excludes";
-          if (isTagId(fromId) && isFieldId(toId2)) {
+          if (this.isTagId(fromId) && this.isFieldId(toId2)) {
             const t = ((_c = p.filters) != null ? _c : []).find(
               (x) => x.id === fromId
             );
@@ -6996,7 +7204,7 @@ var Editor = class {
             if (!arr.includes(toId2)) arr.push(toId2);
             return;
           }
-          if (isOptionId(fromId) && isFieldId(toId2)) {
+          if (this.isOptionId(fromId) && this.isFieldId(toId2)) {
             const mapKey = kind === "include" ? "includes_for_options" : "excludes_for_options";
             const maps = p[mapKey];
             const next = { ...maps != null ? maps : {} };
@@ -7064,16 +7272,16 @@ var Editor = class {
       do: () => this.patchProps((p) => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         if (kind === "bind") {
-          if (isTagId(fromId) && isTagId(toId2)) {
+          if (this.isTagId(fromId) && this.isTagId(toId2)) {
             const child = ((_a = p.filters) != null ? _a : []).find(
               (t) => t.id === toId2
             );
             if ((child == null ? void 0 : child.bind_id) === fromId) delete child.bind_id;
             return;
           }
-          if (isTagId(fromId) && isFieldId(toId2) || isFieldId(fromId) && isTagId(toId2)) {
-            const fieldId = isFieldId(toId2) ? toId2 : fromId;
-            const tagId = isTagId(fromId) ? fromId : toId2;
+          if (this.isTagId(fromId) && this.isFieldId(toId2) || this.isFieldId(fromId) && this.isTagId(toId2)) {
+            const fieldId = this.isFieldId(toId2) ? toId2 : fromId;
+            const tagId = this.isTagId(fromId) ? fromId : toId2;
             const f = ((_b = p.fields) != null ? _b : []).find(
               (x) => x.id === fieldId
             );
@@ -7094,7 +7302,7 @@ var Editor = class {
         }
         if (kind === "include" || kind === "exclude") {
           const key = kind === "include" ? "includes" : "excludes";
-          if (isTagId(fromId) && isFieldId(toId2)) {
+          if (this.isTagId(fromId) && this.isFieldId(toId2)) {
             const t = ((_d = p.filters) != null ? _d : []).find(
               (x) => x.id === fromId
             );
@@ -7103,7 +7311,7 @@ var Editor = class {
             if (!((_f = t[key]) == null ? void 0 : _f.length)) delete t[key];
             return;
           }
-          if (isOptionId(fromId) && isFieldId(toId2)) {
+          if (this.isOptionId(fromId) && this.isFieldId(toId2)) {
             const mapKey = kind === "include" ? "includes_for_options" : "excludes_for_options";
             const maps = p[mapKey];
             if (!maps) return;
@@ -7570,8 +7778,6 @@ function toStrSet(v) {
 }
 
 // src/react/canvas/selection.ts
-var isTagId2 = (id) => typeof id === "string" && id.startsWith("t:");
-var isOptionId2 = (id) => typeof id === "string" && id.startsWith("o:");
 var Selection = class {
   constructor(builder, opts) {
     this.builder = builder;
@@ -7589,6 +7795,7 @@ var Selection = class {
     this.emit();
   }
   add(id) {
+    if (this.set.has(id)) this.set.delete(id);
     this.set.add(id);
     this.primaryId = id;
     this.updateCurrentTagFrom(id);
@@ -7643,7 +7850,9 @@ var Selection = class {
     var _a;
     const props = this.builder.getProps();
     if (((_a = this.opts.env) != null ? _a : "client") === "workspace") {
-      const tagIds = Array.from(this.set).filter(isTagId2);
+      const tagIds = Array.from(this.set).filter(
+        this.builder.isTagId.bind(this.builder)
+      );
       if (tagIds.length > 1) {
         return { kind: "multi", groups: Array.from(this.set) };
       }
@@ -7654,6 +7863,98 @@ var Selection = class {
     const group = this.computeGroupForTag(props, tagId);
     return { kind: "single", group };
   }
+  /**
+   * Build a fieldId -> triggerKeys[] map from the current selection set.
+   *
+   * 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)
+   *
+   * Deterministic:
+   * - preserves selection insertion order
+   * - de-dupes per field
+   */
+  buttonSelectionsByFieldId() {
+    var _a, _b, _c, _d, _e;
+    const nodeMap = this.builder.getNodeMap();
+    const out = {};
+    const push = (fieldId, triggerKey) => {
+      var _a2;
+      const arr = (_a2 = out[fieldId]) != null ? _a2 : out[fieldId] = [];
+      if (!arr.includes(triggerKey)) arr.push(triggerKey);
+    };
+    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") {
+        push(ref.fieldId, (_a = ref.id) != null ? _a : key);
+        continue;
+      }
+      if (ref.kind === "field") {
+        const field = (_c = (_b = ref.node) != null ? _b : ref.field) != null ? _c : ref;
+        const fieldId = (_e = (_d = ref.id) != null ? _d : field == null ? void 0 : field.id) != null ? _e : key;
+        if ((field == null ? void 0 : field.button) === true && typeof fieldId === "string") {
+          push(fieldId, fieldId);
+        }
+      }
+    }
+    return out;
+  }
+  /**
+   * 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() {
+    var _a, _b;
+    const nodeMap = this.builder.getNodeMap();
+    const out = [];
+    const seen = /* @__PURE__ */ new Set();
+    const push = (k) => {
+      if (!seen.has(k)) {
+        seen.add(k);
+        out.push(k);
+      }
+    };
+    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") {
+        push(key);
+        continue;
+      }
+      if (ref.kind === "field") {
+        const field = (_b = (_a = ref.node) != null ? _a : ref.field) != null ? _b : ref;
+        if ((field == null ? void 0 : field.button) === true) push(key);
+      }
+    }
+    return out;
+  }
   // ── Internals ────────────────────────────────────────────────────────────
   emit() {
     const payload = {
@@ -7676,7 +7977,7 @@ var Selection = class {
       this.currentTagId = Array.isArray(f.bind_id) ? f.bind_id[0] : f.bind_id;
       return;
     }
-    if (isOptionId2(id)) {
+    if (this.builder.isOptionId(id)) {
       const host = fields.find(
         (x) => {
           var _a2;
@@ -7700,7 +8001,7 @@ var Selection = class {
   resolveTagContextId(props) {
     var _a;
     if (this.currentTagId) return this.currentTagId;
-    for (const id of this.set) if (isTagId2(id)) return id;
+    for (const id of this.set) if (this.builder.isTagId(id)) return id;
     const fields = (_a = props.fields) != null ? _a : [];
     for (const id of this.set) {
       const f = fields.find((x) => x.id === id);
@@ -7708,7 +8009,7 @@ var Selection = class {
         return Array.isArray(f.bind_id) ? f.bind_id[0] : f.bind_id;
     }
     for (const id of this.set) {
-      if (isOptionId2(id)) {
+      if (this.builder.isOptionId(id)) {
         const host = fields.find(
           (x) => {
             var _a2;
@@ -7727,28 +8028,13 @@ var Selection = class {
     }
     return this.opts.rootTagId;
   }
-  selectedButtonTriggerIds(props) {
-    var _a;
-    const fields = (_a = props.fields) != null ? _a : [];
-    const fieldById = new Map(fields.map((f) => [f.id, f]));
-    const out = [];
-    for (const selId of this.set) {
-      if (selId.startsWith("o:")) {
-        out.push(selId);
-        continue;
-      }
-      const f = fieldById.get(selId);
-      if ((f == null ? void 0 : f.button) === true) out.push(selId);
-    }
-    return out;
-  }
   computeGroupForTag(props, tagId) {
     var _a, _b, _c, _d, _e, _f, _g;
     const tags = (_a = props.filters) != null ? _a : [];
     const fields = (_b = props.fields) != null ? _b : [];
     const tagById = new Map(tags.map((t) => [t.id, t]));
     const tag = tagById.get(tagId);
-    const selectedTriggerIds = this.selectedButtonTriggerIds(props);
+    const selectedTriggerIds = this.selectedButtons();
     const fieldIds = this.builder.visibleFields(tagId, selectedTriggerIds);
     const fieldById = new Map(fields.map((f) => [f.id, f]));
     const visible = fieldIds.map((id) => fieldById.get(id)).filter(Boolean);
@@ -7829,7 +8115,7 @@ var Selection = class {
   }
   findOptionById(fields, selId) {
     var _a, _b;
-    if (isOptionId2(selId)) {
+    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;
@@ -8251,8 +8537,8 @@ function useCanvasOwned(initialProps, canvasOpts, builderOpts) {
 // src/react/workspace/context/hooks/use-canvas.ts
 var React16 = __toESM(require("react"), 1);
 var import_react4 = require("react");
-var isTagId3 = (id) => id.startsWith("t:");
-var isOptionId3 = (id) => id.startsWith("o:");
+var isTagId = (id) => id.startsWith("t:");
+var isOptionId = (id) => id.startsWith("o:");
 function deriveSelectionInfo(props, ids) {
   var _a, _b, _c, _d;
   const tags = [];
@@ -8261,11 +8547,11 @@ function deriveSelectionInfo(props, ids) {
   const fieldById = /* @__PURE__ */ new Map();
   for (const f of (_a = props.fields) != null ? _a : []) fieldById.set(f.id, f);
   for (const id of ids) {
-    if (isTagId3(id)) {
+    if (isTagId(id)) {
       tags.push(id);
       continue;
     }
-    if (isOptionId3(id)) {
+    if (isOptionId(id)) {
       options.push(id);
       continue;
     }