@elytracms/studio 0.0.91 → 0.0.93

package/dist/components/builder/composition-patches.js

@@ -0,0 +1,256 @@
+import { applyDocumentPatches, fieldPath, isComponentNodeValue, locateNode, isSequenceValue, nodePath, nodePropPath, semanticValueEqual, } from '@elytracms/core/cms-core';
+function index(content) {
+    const byId = new Map();
+    const order = [];
+    const typography = [];
+    let duplicate = false;
+    const visit = (list, parent, slot) => {
+        let previous;
+        list.forEach((entry, at) => {
+            if (!isComponentNodeValue(entry)) {
+                if (parent === null) {
+                    previous = { typography: typography.length };
+                    typography.push(entry);
+                }
+                return;
+            }
+            if (byId.has(entry.id))
+                duplicate = true;
+            const placed = { node: entry, parent, slot, index: at, previous };
+            byId.set(entry.id, placed);
+            order.push(placed);
+            previous = { node: entry.id };
+            for (const [name, children] of Object.entries(entry.slots ?? {})) {
+                if (Array.isArray(children))
+                    visit(children, entry.id, name);
+            }
+        });
+    };
+    visit(content, null, undefined);
+    return { byId, order, typography, duplicate };
+}
+/** Longest common subsequence of two id lists (the siblings that kept their relative order). */
+function lcs(a, b) {
+    const rows = a.length + 1;
+    const cols = b.length + 1;
+    const table = new Array(rows * cols).fill(0);
+    for (let i = a.length - 1; i >= 0; i -= 1) {
+        for (let j = b.length - 1; j >= 0; j -= 1) {
+            table[i * cols + j] =
+                a[i] === b[j]
+                    ? table[(i + 1) * cols + j + 1] + 1
+                    : Math.max(table[(i + 1) * cols + j], table[i * cols + j + 1]);
+        }
+    }
+    const kept = new Set();
+    let i = 0;
+    let j = 0;
+    while (i < a.length && j < b.length) {
+        if (a[i] === b[j]) {
+            kept.add(a[i]);
+            i += 1;
+            j += 1;
+        }
+        else if (table[(i + 1) * cols + j] >= table[i * cols + j + 1])
+            i += 1;
+        else
+            j += 1;
+    }
+    return kept;
+}
+/** The keys a node may change without a whole-node rewrite. */
+const STRUCTURAL_KEYS = new Set(['id', 'props', 'slots']);
+/** A static prop (`{ value }`) — the only prop shape a `node.prop` patch carries. */
+function staticValue(prop) {
+    if (typeof prop !== 'object' || prop === null || Array.isArray(prop))
+        return { ok: false };
+    const keys = Object.keys(prop);
+    if (keys.length !== 1 || keys[0] !== 'value')
+        return { ok: false };
+    return { ok: true, value: prop.value };
+}
+/** A new node's subtree without the descendants that already existed (they are moved in). */
+function withoutExisting(node, existed) {
+    if (!node.slots)
+        return node;
+    const slots = {};
+    for (const [name, children] of Object.entries(node.slots)) {
+        if (!Array.isArray(children))
+            continue;
+        slots[name] = children
+            .filter((child) => !(isComponentNodeValue(child) && existed.has(child.id)))
+            .map((child) => (isComponentNodeValue(child) ? withoutExisting(child, existed) : child));
+    }
+    return { ...node, slots };
+}
+class Coarser extends Error {
+}
+/**
+ * The patches that turn the composition field value `before` into `after` (both the
+ * stored v2 sequence, `undefined` when absent), addressed at `field` (+ `locale` for a
+ * localized field). See the module doc.
+ */
+export function compositionPatches(before, after, field, locale) {
+    const whole = fieldPath(field, locale);
+    if (semanticValueEqual(before, after))
+        return [];
+    if (after === undefined)
+        return [{ op: 'unset', path: whole }];
+    const beforeSequence = before === undefined ? { version: 2, content: [] } : before;
+    if (!isSequenceValue(beforeSequence) || !isSequenceValue(after))
+        return [{ op: 'set', path: whole, value: after }];
+    try {
+        return nodePatches(beforeSequence.content, after.content, field, locale);
+    }
+    catch (error) {
+        if (!(error instanceof Coarser))
+            throw error;
+        return [{ op: 'set', path: whole, value: after }];
+    }
+}
+function nodePatches(beforeContent, afterContent, field, locale) {
+    const was = index(beforeContent);
+    const now = index(afterContent);
+    if (was.duplicate || now.duplicate)
+        throw new Coarser();
+    // The canvas never edits typography: a typography change is not a node change.
+    if (!semanticValueEqual(was.typography, now.typography))
+        throw new Coarser();
+    // The structural patches apply in sequence; each position is computed against the
+    // value AS IT WILL BE when that patch applies (a simulation with THE merge), so the
+    // index is exact for an unchanged store — and anchored AFTER the previous component
+    // sibling, which keeps it right when a concurrent edit shifted the sequence.
+    let working = { collection: '_', id: '_', values: { [field]: { version: 2, content: [...beforeContent] } } };
+    const simulate = (patch) => {
+        const result = applyDocumentPatches({ document: working, patches: [patch], since: [] });
+        if (result.refused.length > 0)
+            throw new Coarser();
+        working = result.document;
+    };
+    const currentArray = (placed) => {
+        const value = working.values[field];
+        if (!isSequenceValue(value))
+            return [];
+        if (placed.parent === null)
+            return value.content;
+        const owner = locateNode(value, placed.parent);
+        const slot = owner?.node.slots?.[placed.slot ?? ''];
+        return Array.isArray(slot) ? slot : [];
+    };
+    const position = (placed, moving) => {
+        const parent = placed.parent === null ? fieldPath(field, locale) : nodePath(field, locale, placed.parent);
+        // A move detaches the node before it is placed: positions are read without it.
+        const list = currentArray(placed).filter((entry) => !(isComponentNodeValue(entry) && entry.id === moving));
+        let index = 0;
+        let anchor;
+        const previous = placed.previous;
+        if (previous && 'node' in previous) {
+            const at = list.findIndex((entry) => isComponentNodeValue(entry) && entry.id === previous.node);
+            index = at + 1;
+            anchor = previous.node;
+        }
+        else if (previous && 'typography' in previous) {
+            let seen = -1;
+            const at = list.findIndex((entry) => !isComponentNodeValue(entry) && ++seen === previous.typography);
+            index = at + 1;
+        }
+        return {
+            parent,
+            ...(placed.slot !== undefined ? { slot: placed.slot } : {}),
+            index: Math.max(0, index),
+            ...(anchor !== undefined ? { after: anchor } : {}),
+        };
+    };
+    // Siblings that kept their relative order, per (unchanged) parent array. In the
+    // top-level sequence the typography items are fixed separators (no verb moves them),
+    // so a component also counts as moved when the number of typography items before it
+    // changed — the canvas re-anchors typography by component count on write-back
+    // (`mergeBlockRoots`), and the patches must reproduce exactly that value.
+    const keptInOrder = new Set();
+    const segmentOf = (indexed, placed) => {
+        if (placed.parent !== null)
+            return 0;
+        const list = indexed === was ? beforeContent : afterContent;
+        return list.slice(0, placed.index).filter((entry) => !isComponentNodeValue(entry)).length;
+    };
+    const siblingsOf = (indexed) => {
+        const groups = new Map();
+        for (const placed of indexed.order) {
+            const key = `${placed.parent ?? ''}\u0001${placed.slot ?? ''}`;
+            const list = groups.get(key) ?? [];
+            list.push({ id: placed.node.id, segment: segmentOf(indexed, placed) });
+            groups.set(key, list);
+        }
+        return groups;
+    };
+    const wasGroups = siblingsOf(was);
+    for (const [key, entries] of siblingsOf(now)) {
+        const nowSegment = new Map(entries.map((entry) => [entry.id, entry.segment]));
+        const previous = (wasGroups.get(key) ?? [])
+            .filter((entry) => nowSegment.get(entry.id) === entry.segment)
+            .map((entry) => entry.id);
+        const current = entries.map((entry) => entry.id).filter((id) => previous.includes(id));
+        for (const id of lcs(previous, current))
+            keptInOrder.add(id);
+    }
+    const structure = [];
+    const props = [];
+    for (const placed of now.order) {
+        const id = placed.node.id;
+        const prior = was.byId.get(id);
+        if (!prior) {
+            const parentIsNew = placed.parent !== null && !was.byId.has(placed.parent);
+            if (parentIsNew)
+                continue; // carried by its new parent's insert
+            const insert = { op: 'insert', at: position(placed), node: withoutExisting(placed.node, was.byId) };
+            simulate(insert);
+            structure.push(insert);
+            continue;
+        }
+        const parentIsNew = placed.parent !== null && !was.byId.has(placed.parent);
+        const moved = parentIsNew || prior.parent !== placed.parent || prior.slot !== placed.slot || !keptInOrder.has(id);
+        if (moved) {
+            const move = { op: 'move', path: nodePath(field, locale, id), to: position(placed, id) };
+            simulate(move);
+            structure.push(move);
+        }
+        // Anything but props / slots changed → no node verb says it.
+        for (const key of new Set([...Object.keys(prior.node), ...Object.keys(placed.node)])) {
+            if (STRUCTURAL_KEYS.has(key))
+                continue;
+            const a = prior.node[key];
+            const b = placed.node[key];
+            if (!semanticValueEqual(a, b)) {
+                throw new Coarser();
+            }
+        }
+        const priorProps = prior.node.props ?? {};
+        const nextProps = placed.node.props ?? {};
+        for (const name of new Set([...Object.keys(priorProps), ...Object.keys(nextProps)])) {
+            const a = priorProps[name];
+            const b = nextProps[name];
+            if (semanticValueEqual(a, b))
+                continue;
+            const path = nodePropPath(field, locale, id, name);
+            if (b === undefined) {
+                props.push({ op: 'unset', path });
+                continue;
+            }
+            const value = staticValue(b);
+            if (!value.ok)
+                throw new Coarser();
+            props.push({ op: 'set', path, value: value.value });
+        }
+    }
+    // Removes LAST, top-most only: a child moved out of a removed container has left it.
+    const removes = [];
+    for (const placed of was.order) {
+        if (now.byId.has(placed.node.id))
+            continue;
+        if (placed.parent !== null && !now.byId.has(placed.parent) && was.byId.has(placed.parent))
+            continue;
+        removes.push({ op: 'remove', path: nodePath(field, locale, placed.node.id) });
+    }
+    return [...structure, ...removes, ...props];
+}
+//# sourceMappingURL=composition-patches.js.map

package/dist/components/builder/composition-patches.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"composition-patches.js","sourceRoot":"","sources":["../../../src/components/builder/composition-patches.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  applyDocumentPatches,\n  fieldPath,\n  isComponentNodeValue,\n  locateNode,\n  isSequenceValue,\n  nodePath,\n  nodePropPath,\n  semanticValueEqual,\n} from '@elytracms/core/cms-core'\nimport type { CmsDocument, DocumentPatch, SequencePosition, ValuePath } from '@elytracms/core/cms-core'\nimport type { ComponentNode } from '@elytracms/core/project-graph'\n\n/**\n * EC-595 A2 — the CANVAS WRITER's patches: a structural delta of one composition field,\n * keyed by component NODE ID, computed in the canvas write path from the field value\n * before and after one canvas action (insert / remove / duplicate / reorder / move /\n * replace / wrap / setProp / removeProp — and undo / redo, which are just another\n * before → after). It is \"at the source\" (the zone brief): the canvas knows its field\n * and its node ids; nothing diffs a document in the persister.\n *\n * The patches use the value-position grammar's sequence verbs (EC-595 binding point 3):\n *\n * - `insert` — a node new to the field, at its parent sequence (the field's top-level\n *   sequence, or a component's named slot) + index, anchored AFTER its previous\n *   component sibling; the inserted subtree carries its new descendants and leaves out\n *   descendants that already existed (those are `move`d in);\n * - `move` — an existing node whose parent / slot changed, or whose order among its\n *   siblings did (the nodes outside the longest common subsequence of the sibling ids);\n * - `remove` — a node gone from the field (only the top-most of a removed subtree);\n * - `set` / `unset` at `node.prop` — a static prop whose value changed.\n *\n * So two sessions inserting into one page both land (two `insert`s into one parent\n * never conflict); a prop edit on node X and a move of node Y in another session both\n * apply; only a change to the SAME node position conflicts (the merge's prefix rule).\n *\n * When a change cannot be said with node verbs — the typography items (which the canvas\n * never edits) differ, a node changes something other than its props / slots, a prop is\n * not a static value, duplicate ids — the delta is the coarser legal path: the whole\n * field (`set` / `unset`), and conflict detection is correspondingly coarser, never\n * wrong (value-path.ts: \"writers may always emit a coarser path\").\n */\n\ninterface Placed {\n  readonly node: ComponentNode\n  /** `null` = the field's top-level sequence. */\n  readonly parent: string | null\n  readonly slot: string | undefined\n  /** The index in the parent array (the full top-level `content`, or the slot list). */\n  readonly index: number\n  /** The entry immediately before it in the parent array: a component id, or the ordinal of a typography item. */\n  readonly previous: { readonly node: string } | { readonly typography: number } | undefined\n}\n\ninterface Indexed {\n  readonly byId: Map<string, Placed>\n  /** Pre-order. */\n  readonly order: readonly Placed[]\n  readonly typography: readonly unknown[]\n  readonly duplicate: boolean\n}\n\nfunction index(content: readonly unknown[]): Indexed {\n  const byId = new Map<string, Placed>()\n  const order: Placed[] = []\n  const typography: unknown[] = []\n  let duplicate = false\n  const visit = (list: readonly unknown[], parent: string | null, slot: string | undefined) => {\n    let previous: Placed['previous']\n    list.forEach((entry, at) => {\n      if (!isComponentNodeValue(entry)) {\n        if (parent === null) {\n          previous = { typography: typography.length }\n          typography.push(entry)\n        }\n        return\n      }\n      if (byId.has(entry.id)) duplicate = true\n      const placed: Placed = { node: entry, parent, slot, index: at, previous }\n      byId.set(entry.id, placed)\n      order.push(placed)\n      previous = { node: entry.id }\n      for (const [name, children] of Object.entries(entry.slots ?? {})) {\n        if (Array.isArray(children)) visit(children, entry.id, name)\n      }\n    })\n  }\n  visit(content, null, undefined)\n  return { byId, order, typography, duplicate }\n}\n\n/** Longest common subsequence of two id lists (the siblings that kept their relative order). */\nfunction lcs(a: readonly string[], b: readonly string[]): Set<string> {\n  const rows = a.length + 1\n  const cols = b.length + 1\n  const table: number[] = new Array(rows * cols).fill(0)\n  for (let i = a.length - 1; i >= 0; i -= 1) {\n    for (let j = b.length - 1; j >= 0; j -= 1) {\n      table[i * cols + j] =\n        a[i] === b[j]\n          ? table[(i + 1) * cols + j + 1]! + 1\n          : Math.max(table[(i + 1) * cols + j]!, table[i * cols + j + 1]!)\n    }\n  }\n  const kept = new Set<string>()\n  let i = 0\n  let j = 0\n  while (i < a.length && j < b.length) {\n    if (a[i] === b[j]) {\n      kept.add(a[i]!)\n      i += 1\n      j += 1\n    } else if (table[(i + 1) * cols + j]! >= table[i * cols + j + 1]!) i += 1\n    else j += 1\n  }\n  return kept\n}\n\n/** The keys a node may change without a whole-node rewrite. */\nconst STRUCTURAL_KEYS = new Set(['id', 'props', 'slots'])\n\n/** A static prop (`{ value }`) — the only prop shape a `node.prop` patch carries. */\nfunction staticValue(prop: unknown): { ok: true; value: unknown } | { ok: false } {\n  if (typeof prop !== 'object' || prop === null || Array.isArray(prop)) return { ok: false }\n  const keys = Object.keys(prop)\n  if (keys.length !== 1 || keys[0] !== 'value') return { ok: false }\n  return { ok: true, value: (prop as { value: unknown }).value }\n}\n\n/** A new node's subtree without the descendants that already existed (they are moved in). */\nfunction withoutExisting(node: ComponentNode, existed: ReadonlyMap<string, Placed>): ComponentNode {\n  if (!node.slots) return node\n  const slots: Record<string, ComponentNode[]> = {}\n  for (const [name, children] of Object.entries(node.slots)) {\n    if (!Array.isArray(children)) continue\n    slots[name] = children\n      .filter((child) => !(isComponentNodeValue(child) && existed.has(child.id)))\n      .map((child) => (isComponentNodeValue(child) ? withoutExisting(child, existed) : child))\n  }\n  return { ...node, slots }\n}\n\nclass Coarser extends Error {}\n\n/**\n * The patches that turn the composition field value `before` into `after` (both the\n * stored v2 sequence, `undefined` when absent), addressed at `field` (+ `locale` for a\n * localized field). See the module doc.\n */\nexport function compositionPatches(\n  before: unknown,\n  after: unknown,\n  field: string,\n  locale: string | undefined,\n): DocumentPatch[] {\n  const whole = fieldPath(field, locale)\n  if (semanticValueEqual(before, after)) return []\n  if (after === undefined) return [{ op: 'unset', path: whole }]\n  const beforeSequence = before === undefined ? { version: 2 as const, content: [] } : before\n  if (!isSequenceValue(beforeSequence) || !isSequenceValue(after)) return [{ op: 'set', path: whole, value: after }]\n  try {\n    return nodePatches(beforeSequence.content, after.content, field, locale)\n  } catch (error) {\n    if (!(error instanceof Coarser)) throw error\n    return [{ op: 'set', path: whole, value: after }]\n  }\n}\n\nfunction nodePatches(\n  beforeContent: readonly unknown[],\n  afterContent: readonly unknown[],\n  field: string,\n  locale: string | undefined,\n): DocumentPatch[] {\n  const was = index(beforeContent)\n  const now = index(afterContent)\n  if (was.duplicate || now.duplicate) throw new Coarser()\n  // The canvas never edits typography: a typography change is not a node change.\n  if (!semanticValueEqual(was.typography, now.typography)) throw new Coarser()\n\n  // The structural patches apply in sequence; each position is computed against the\n  // value AS IT WILL BE when that patch applies (a simulation with THE merge), so the\n  // index is exact for an unchanged store — and anchored AFTER the previous component\n  // sibling, which keeps it right when a concurrent edit shifted the sequence.\n  let working: CmsDocument = { collection: '_', id: '_', values: { [field]: { version: 2, content: [...beforeContent] } } }\n  const simulate = (patch: DocumentPatch) => {\n    const result = applyDocumentPatches({ document: working, patches: [patch], since: [] })\n    if (result.refused.length > 0) throw new Coarser()\n    working = result.document\n  }\n  const currentArray = (placed: Placed): readonly unknown[] => {\n    const value = working.values[field]\n    if (!isSequenceValue(value)) return []\n    if (placed.parent === null) return value.content\n    const owner = locateNode(value, placed.parent)\n    const slot = (owner?.node.slots as Record<string, unknown> | undefined)?.[placed.slot ?? '']\n    return Array.isArray(slot) ? slot : []\n  }\n  const position = (placed: Placed, moving?: string): SequencePosition => {\n    const parent: ValuePath = placed.parent === null ? fieldPath(field, locale) : nodePath(field, locale, placed.parent)\n    // A move detaches the node before it is placed: positions are read without it.\n    const list = currentArray(placed).filter((entry) => !(isComponentNodeValue(entry) && entry.id === moving))\n    let index = 0\n    let anchor: string | undefined\n    const previous = placed.previous\n    if (previous && 'node' in previous) {\n      const at = list.findIndex((entry) => isComponentNodeValue(entry) && entry.id === previous.node)\n      index = at + 1\n      anchor = previous.node\n    } else if (previous && 'typography' in previous) {\n      let seen = -1\n      const at = list.findIndex((entry) => !isComponentNodeValue(entry) && ++seen === previous.typography)\n      index = at + 1\n    }\n    return {\n      parent,\n      ...(placed.slot !== undefined ? { slot: placed.slot } : {}),\n      index: Math.max(0, index),\n      ...(anchor !== undefined ? { after: anchor } : {}),\n    }\n  }\n\n  // Siblings that kept their relative order, per (unchanged) parent array. In the\n  // top-level sequence the typography items are fixed separators (no verb moves them),\n  // so a component also counts as moved when the number of typography items before it\n  // changed — the canvas re-anchors typography by component count on write-back\n  // (`mergeBlockRoots`), and the patches must reproduce exactly that value.\n  const keptInOrder = new Set<string>()\n  const segmentOf = (indexed: Indexed, placed: Placed) => {\n    if (placed.parent !== null) return 0\n    const list = indexed === was ? beforeContent : afterContent\n    return list.slice(0, placed.index).filter((entry) => !isComponentNodeValue(entry)).length\n  }\n  const siblingsOf = (indexed: Indexed) => {\n    const groups = new Map<string, { id: string; segment: number }[]>()\n    for (const placed of indexed.order) {\n      const key = `${placed.parent ?? ''}\\u0001${placed.slot ?? ''}`\n      const list = groups.get(key) ?? []\n      list.push({ id: placed.node.id, segment: segmentOf(indexed, placed) })\n      groups.set(key, list)\n    }\n    return groups\n  }\n  const wasGroups = siblingsOf(was)\n  for (const [key, entries] of siblingsOf(now)) {\n    const nowSegment = new Map(entries.map((entry) => [entry.id, entry.segment]))\n    const previous = (wasGroups.get(key) ?? [])\n      .filter((entry) => nowSegment.get(entry.id) === entry.segment)\n      .map((entry) => entry.id)\n    const current = entries.map((entry) => entry.id).filter((id) => previous.includes(id))\n    for (const id of lcs(previous, current)) keptInOrder.add(id)\n  }\n\n  const structure: DocumentPatch[] = []\n  const props: DocumentPatch[] = []\n  for (const placed of now.order) {\n    const id = placed.node.id\n    const prior = was.byId.get(id)\n    if (!prior) {\n      const parentIsNew = placed.parent !== null && !was.byId.has(placed.parent)\n      if (parentIsNew) continue // carried by its new parent's insert\n      const insert: DocumentPatch = { op: 'insert', at: position(placed), node: withoutExisting(placed.node, was.byId) }\n      simulate(insert)\n      structure.push(insert)\n      continue\n    }\n    const parentIsNew = placed.parent !== null && !was.byId.has(placed.parent)\n    const moved =\n      parentIsNew || prior.parent !== placed.parent || prior.slot !== placed.slot || !keptInOrder.has(id)\n    if (moved) {\n      const move: DocumentPatch = { op: 'move', path: nodePath(field, locale, id), to: position(placed, id) }\n      simulate(move)\n      structure.push(move)\n    }\n    // Anything but props / slots changed → no node verb says it.\n    for (const key of new Set([...Object.keys(prior.node), ...Object.keys(placed.node)])) {\n      if (STRUCTURAL_KEYS.has(key)) continue\n      const a = (prior.node as unknown as Record<string, unknown>)[key]\n      const b = (placed.node as unknown as Record<string, unknown>)[key]\n      if (!semanticValueEqual(a, b)) {\n        throw new Coarser()\n      }\n    }\n    const priorProps = prior.node.props ?? {}\n    const nextProps = placed.node.props ?? {}\n    for (const name of new Set([...Object.keys(priorProps), ...Object.keys(nextProps)])) {\n      const a = (priorProps as Record<string, unknown>)[name]\n      const b = (nextProps as Record<string, unknown>)[name]\n      if (semanticValueEqual(a, b)) continue\n      const path = nodePropPath(field, locale, id, name)\n      if (b === undefined) {\n        props.push({ op: 'unset', path })\n        continue\n      }\n      const value = staticValue(b)\n      if (!value.ok) throw new Coarser()\n      props.push({ op: 'set', path, value: value.value })\n    }\n  }\n\n  // Removes LAST, top-most only: a child moved out of a removed container has left it.\n  const removes: DocumentPatch[] = []\n  for (const placed of was.order) {\n    if (now.byId.has(placed.node.id)) continue\n    if (placed.parent !== null && !now.byId.has(placed.parent) && was.byId.has(placed.parent)) continue\n    removes.push({ op: 'remove', path: nodePath(field, locale, placed.node.id) })\n  }\n  return [...structure, ...removes, ...props]\n}\n"]}

package/dist/components/builder/delete-key.d.ts

@@ -23,6 +23,11 @@ export interface DeleteKeyListenerOptions {
     getRootId: () => string | null;
     /** Extra suppression (e.g. a read-only published preview). */
     isDisabled?: () => boolean;
+    /**
+     * EC-549: remove the selected typography RUN, when one is selected (it takes
+     * precedence — a run and a node are never both selected); returns whether it did.
+     */
+    removeSelectedRun?: () => boolean;
 }
 interface ListenerTarget {
     addEventListener(type: string, listener: (e: Event) => void): void;

package/dist/components/builder/delete-key.js

@@ -34,6 +34,10 @@ export function attachDeleteKeyListener(target, opts) {
             return;
         if (isEditingContext(event.target))
             return;
+        if (opts.removeSelectedRun?.()) {
+            event.preventDefault();
+            return;
+        }
         const selectedId = opts.getSelectedId();
         if (!selectedId || selectedId === opts.getRootId())
             return;

package/dist/components/builder/delete-key.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-key.js","sourceRoot":"","sources":["../../../src/components/builder/delete-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAE3D;;;;;;;;GAQG;AAEH;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAA0B;IACzD,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAA;AACtC,CAAC;AAkBD;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,MAAsB,EACtB,IAA8B;IAE9B,MAAM,SAAS,GAAG,CAAC,CAAQ,EAAQ,EAAE;QACnC,MAAM,KAAK,GAAG,CAAkB,CAAA;QAChC,IAAI,KAAK,CAAC,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,GAAG,KAAK,WAAW;YAAE,OAAM;QAC/D,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM;YAAE,OAAM;QAC1D,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,KAAK;YAAE,OAAM;QACxC,IAAI,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC;YAAE,OAAM;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QACvC,IAAI,CAAC,UAAU,IAAI,UAAU,KAAK,IAAI,CAAC,SAAS,EAAE;YAAE,OAAM;QAC1D,KAAK,CAAC,cAAc,EAAE,CAAA;QACtB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACzB,CAAC,CAAA;IACD,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IAC7C,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AAC/D,CAAC","sourcesContent":["import { clipboardEventBlocked } from './clipboard-actions'\n\n/**\n * Delete/Backspace removes the selected node (EC-404, scope 3) — the gap the\n * findings batch surfaced: the studio had no keyboard remove at all except cut\n * (⌘X). This sits beside the clipboard listeners (`attachClipboardListeners`),\n * wired on the same two surfaces (the studio window for the page tree, the\n * iframe document for the canvas), and reuses the SAME editing-context guard so\n * pressing Backspace while typing in an input or an inline text/rich-text editor\n * edits the text — never deletes the block.\n */\n\n/**\n * True when a key event's target owns its own text-editing behavior — a form\n * field or any contenteditable (which includes the EC-158/EC-159 inline\n * editors). The single guard for the Delete/Backspace remove, kept identical to\n * the clipboard shortcuts' scope so the two can never disagree.\n */\nexport function isEditingContext(target: EventTarget | null): boolean {\n  return clipboardEventBlocked(target)\n}\n\nexport interface DeleteKeyListenerOptions {\n  /** The current selection — the remove subject. */\n  getSelectedId: () => string | null\n  /** Dispatch the remove (the existing `remove` tree action; one undo restores). */\n  remove: (id: string) => void\n  /** The id that must never be removed (the composition root). */\n  getRootId: () => string | null\n  /** Extra suppression (e.g. a read-only published preview). */\n  isDisabled?: () => boolean\n}\n\ninterface ListenerTarget {\n  addEventListener(type: string, listener: (e: Event) => void): void\n  removeEventListener(type: string, listener: (e: Event) => void): void\n}\n\n/**\n * Wire Delete/Backspace → remove the selected node. Inert when the event\n * targets an editing context, when nothing (or the root) is selected, or when\n * disabled. Modifier combinations are ignored so it never shadows a browser\n * shortcut (⌘Delete etc.).\n */\nexport function attachDeleteKeyListener(\n  target: ListenerTarget,\n  opts: DeleteKeyListenerOptions,\n): () => void {\n  const onKeyDown = (e: Event): void => {\n    const event = e as KeyboardEvent\n    if (event.key !== 'Delete' && event.key !== 'Backspace') return\n    if (event.metaKey || event.ctrlKey || event.altKey) return\n    if (opts.isDisabled?.() ?? false) return\n    if (isEditingContext(event.target)) return\n    const selectedId = opts.getSelectedId()\n    if (!selectedId || selectedId === opts.getRootId()) return\n    event.preventDefault()\n    opts.remove(selectedId)\n  }\n  target.addEventListener('keydown', onKeyDown)\n  return () => target.removeEventListener('keydown', onKeyDown)\n}\n"]}
+{"version":3,"file":"delete-key.js","sourceRoot":"","sources":["../../../src/components/builder/delete-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAE3D;;;;;;;;GAQG;AAEH;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAA0B;IACzD,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAA;AACtC,CAAC;AAuBD;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,MAAsB,EACtB,IAA8B;IAE9B,MAAM,SAAS,GAAG,CAAC,CAAQ,EAAQ,EAAE;QACnC,MAAM,KAAK,GAAG,CAAkB,CAAA;QAChC,IAAI,KAAK,CAAC,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,GAAG,KAAK,WAAW;YAAE,OAAM;QAC/D,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM;YAAE,OAAM;QAC1D,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,KAAK;YAAE,OAAM;QACxC,IAAI,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC;YAAE,OAAM;QAC1C,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAAE,EAAE,CAAC;YAC/B,KAAK,CAAC,cAAc,EAAE,CAAA;YACtB,OAAM;QACR,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QACvC,IAAI,CAAC,UAAU,IAAI,UAAU,KAAK,IAAI,CAAC,SAAS,EAAE;YAAE,OAAM;QAC1D,KAAK,CAAC,cAAc,EAAE,CAAA;QACtB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACzB,CAAC,CAAA;IACD,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IAC7C,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AAC/D,CAAC","sourcesContent":["import { clipboardEventBlocked } from './clipboard-actions'\n\n/**\n * Delete/Backspace removes the selected node (EC-404, scope 3) — the gap the\n * findings batch surfaced: the studio had no keyboard remove at all except cut\n * (⌘X). This sits beside the clipboard listeners (`attachClipboardListeners`),\n * wired on the same two surfaces (the studio window for the page tree, the\n * iframe document for the canvas), and reuses the SAME editing-context guard so\n * pressing Backspace while typing in an input or an inline text/rich-text editor\n * edits the text — never deletes the block.\n */\n\n/**\n * True when a key event's target owns its own text-editing behavior — a form\n * field or any contenteditable (which includes the EC-158/EC-159 inline\n * editors). The single guard for the Delete/Backspace remove, kept identical to\n * the clipboard shortcuts' scope so the two can never disagree.\n */\nexport function isEditingContext(target: EventTarget | null): boolean {\n  return clipboardEventBlocked(target)\n}\n\nexport interface DeleteKeyListenerOptions {\n  /** The current selection — the remove subject. */\n  getSelectedId: () => string | null\n  /** Dispatch the remove (the existing `remove` tree action; one undo restores). */\n  remove: (id: string) => void\n  /** The id that must never be removed (the composition root). */\n  getRootId: () => string | null\n  /** Extra suppression (e.g. a read-only published preview). */\n  isDisabled?: () => boolean\n  /**\n   * EC-549: remove the selected typography RUN, when one is selected (it takes\n   * precedence — a run and a node are never both selected); returns whether it did.\n   */\n  removeSelectedRun?: () => boolean\n}\n\ninterface ListenerTarget {\n  addEventListener(type: string, listener: (e: Event) => void): void\n  removeEventListener(type: string, listener: (e: Event) => void): void\n}\n\n/**\n * Wire Delete/Backspace → remove the selected node. Inert when the event\n * targets an editing context, when nothing (or the root) is selected, or when\n * disabled. Modifier combinations are ignored so it never shadows a browser\n * shortcut (⌘Delete etc.).\n */\nexport function attachDeleteKeyListener(\n  target: ListenerTarget,\n  opts: DeleteKeyListenerOptions,\n): () => void {\n  const onKeyDown = (e: Event): void => {\n    const event = e as KeyboardEvent\n    if (event.key !== 'Delete' && event.key !== 'Backspace') return\n    if (event.metaKey || event.ctrlKey || event.altKey) return\n    if (opts.isDisabled?.() ?? false) return\n    if (isEditingContext(event.target)) return\n    if (opts.removeSelectedRun?.()) {\n      event.preventDefault()\n      return\n    }\n    const selectedId = opts.getSelectedId()\n    if (!selectedId || selectedId === opts.getRootId()) return\n    event.preventDefault()\n    opts.remove(selectedId)\n  }\n  target.addEventListener('keydown', onKeyDown)\n  return () => target.removeEventListener('keydown', onKeyDown)\n}\n"]}

package/dist/components/builder/insert-context.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentNode } from '@elytracms/core/project-graph';
+import type { ComponentNode, PlacementScope } from '@elytracms/core/project-graph';
 import type { StudioRegistry } from '@elytracms/studio/lib/registry';
 import type { InsertContext } from './insert-menu.js';
 /**
@@ -9,22 +9,18 @@ import type { InsertContext } from './insert-menu.js';
  * Canvas editor (`composition-field-editor.tsx`, EC-188/AD-12) can own it without
  * importing the dead shell. No UI here — pure graph/registry resolution.
  */
+/** What the resolution reads from the builder store: the tree and its placement scope (EC-584). */
+export interface InsertScope {
+    present: ComponentNode;
+    placement: PlacementScope;
+}
 /**
- * Resolve where an insert lands: into the node's child slot, else as a sibling.
- *
- * `fieldAllow` (EC-188) is the composition field's TOP-LEVEL vocabulary
- * (`field.allow`). It constrains ONLY inserts that land as a direct child of the
- * active page root — the top level of a composition field value — where it is
- * intersected into `slotAllow` so forbidden components are never even offered,
- * mirroring the top-level leash in `validateCompositionValue`. Deeper inserts keep
- * following each component's own slot `allow`. Callers that omit `fieldAllow` get
- * an unconstrained top level. EC-554: which placements the field governs is read
- * through `fieldAllowAt` — the SAME reader drag-and-drop and paste judge with, so
- * the offer and the placement can never disagree.
+ * Resolve where an insert lands: into the node's child slot, else as a sibling. The
+ * offered vocabulary is the landing position's (see {@link contextAt}) — the SAME
+ * reader the reducer, drag-and-drop and paste judge with, so the offer and the
+ * placement can never disagree.
  */
-export declare function resolveInsertContext(builder: {
-    present: ComponentNode;
-}, nodeId: string, fieldAllow?: readonly string[], studio?: StudioRegistry): InsertContext | null;
+export declare function resolveInsertContext(builder: InsertScope, nodeId: string, studio?: StudioRegistry): InsertContext | null;
 /**
  * An in-canvas insertion position relative to a reference node (EC-405) — the
  * DnD position vocabulary (`lib/dnd/drop-rules`), narrowed to the three the
@@ -42,17 +38,15 @@ export type InsertPosition = 'before' | 'after' | 'into';
  * {@link primaryInsertSlot} (the same slot a drop `into` picks; `null` when the
  * node accepts no children), `before`/`after` use the reference's parent slot at
  * `index`/`index + 1` — so this surface and drag-insert can never disagree about
- * where a position lands or what it allows. `fieldAllow` (EC-188) still constrains
- * ONLY a direct child of the composition root, mirroring `resolveInsertContext`.
+ * where a position lands or what it allows (EC-584: the vocabulary is `allowAt`'s,
+ * exactly as in `resolveInsertContext`).
  */
-export declare function resolveInsertContextAt(builder: {
-    present: ComponentNode;
-}, nodeId: string, position: InsertPosition, fieldAllow?: readonly string[], studio?: StudioRegistry): InsertContext | null;
+export declare function resolveInsertContextAt(builder: InsertScope, nodeId: string, position: InsertPosition, studio?: StudioRegistry): InsertContext | null;
 /**
  * Which affordance positions are actually insertable at `nodeId` (EC-405 scope 3):
  * a position is offered only when it structurally exists AND at least one registry
- * component may land there (the SAME slot-rule filter the tree/DnD and the blocks
- * panel apply — {@link hasInsertableComponent} over the resolved `slotAllow`), so a
+ * component may land there (the SAME judge the tree/DnD, the blocks panel and the
+ * reducer apply — {@link hasInsertableComponent} over the resolved `allow`), so a
  * blocked spot shows no dead button.
  *
  * An EMPTY, insertable container surfaces ONLY `into` — the meaningful action there
@@ -62,6 +56,4 @@ export declare function resolveInsertContextAt(builder: {
  * child already carries its own edge affordances, so a filled container needs no
  * center "+").
  */
-export declare function insertablePositions(builder: {
-    present: ComponentNode;
-}, nodeId: string, fieldAllow?: readonly string[], studio?: StudioRegistry): InsertPosition[];
+export declare function insertablePositions(builder: InsertScope, nodeId: string, studio?: StudioRegistry): InsertPosition[];

package/dist/components/builder/insert-context.js

@@ -1,30 +1,29 @@
-import { getNode, getParentInfo } from '@elytracms/core/project-graph';
+import { allowAt, getNode, getParentInfo } from '@elytracms/core/project-graph';
 import { getStudioRegistry } from '@elytracms/studio/lib/registry';
 import { componentDisplayName } from '@elytracms/studio/lib/persona/labels';
-import { fieldAllowAt, manifestRules, primaryInsertSlot } from '@elytracms/studio/lib/dnd/drop-rules';
-import { hasInsertableComponent, intersectAllow } from './blocks-model.js';
+import { manifestRules, primaryInsertSlot } from '@elytracms/studio/lib/dnd/drop-rules';
+import { hasInsertableComponent } from './blocks-model.js';
 /**
- * Where an insert lands: the canvas insert-context resolution, shared by every
- * surface that mounts the canvas engine.
- *
- * Extracted from the retired standalone `BuilderShell` (EC-210) so the in-CMS
- * Canvas editor (`composition-field-editor.tsx`, EC-188/AD-12) can own it without
- * importing the dead shell. No UI here — pure graph/registry resolution.
+ * The offer at a target: its EFFECTIVE vocabulary, read through the core judge's own
+ * reader (`allowAt` — the composition field's at the composition root, keyed on node
+ * identity, mirroring the top-level leash in `validateCompositionValue`; each slot's
+ * own `allow` below), so the offer is exactly what the reducer admits (EC-584).
+ * EC-544: a closed set that admits nothing is the "No allowed components match" state.
  */
+function contextAt(builder, target, destinationLabel) {
+    return {
+        target,
+        allow: allowAt(builder.present, target.parentId, target.slot, builder.placement),
+        destinationLabel,
+    };
+}
 /**
- * Resolve where an insert lands: into the node's child slot, else as a sibling.
- *
- * `fieldAllow` (EC-188) is the composition field's TOP-LEVEL vocabulary
- * (`field.allow`). It constrains ONLY inserts that land as a direct child of the
- * active page root — the top level of a composition field value — where it is
- * intersected into `slotAllow` so forbidden components are never even offered,
- * mirroring the top-level leash in `validateCompositionValue`. Deeper inserts keep
- * following each component's own slot `allow`. Callers that omit `fieldAllow` get
- * an unconstrained top level. EC-554: which placements the field governs is read
- * through `fieldAllowAt` — the SAME reader drag-and-drop and paste judge with, so
- * the offer and the placement can never disagree.
+ * Resolve where an insert lands: into the node's child slot, else as a sibling. The
+ * offered vocabulary is the landing position's (see {@link contextAt}) — the SAME
+ * reader the reducer, drag-and-drop and paste judge with, so the offer and the
+ * placement can never disagree.
  */
-export function resolveInsertContext(builder, nodeId, fieldAllow, studio = getStudioRegistry()) {
+export function resolveInsertContext(builder, nodeId, studio = getStudioRegistry()) {
     const root = builder.present;
     const node = getNode(root, nodeId);
     if (!node)
@@ -35,47 +34,24 @@ export function resolveInsertContext(builder, nodeId, fieldAllow, studio = getSt
     // instead of silently degrading to a sibling insert.
     const manifest = studio.registry.getManifest(node.componentId);
     const childSlot = primaryInsertSlot(manifestRules(manifest));
-    const ctx = childSlot
-        ? {
-            target: { parentId: nodeId, slot: childSlot.name },
-            slotAllow: childSlot.allow,
-            destinationLabel: `${componentDisplayName(node.componentId, manifest)} · ${childSlot.name}`,
-        }
-        : resolveSiblingContext(studio, root, nodeId);
-    // The field vocabulary governs only the top level (a direct child of the page
-    // root). EC-544: an `allow` list is a closed set — absent = any, a list (even
-    // an empty one) = exactly those ids — the same reading the validator applies,
-    // so an empty intersection here is the "No allowed components match" state.
-    return withFieldLeash(root, ctx, fieldAllow);
-}
-/**
- * Layer the composition field's top-level vocabulary over the resolved slot
- * `allow` (EC-188) — for a direct child of the root only, as decided by
- * {@link fieldAllowAt} (EC-554: the one reader every placement path shares).
- */
-function withFieldLeash(root, ctx, fieldAllow) {
-    const leash = fieldAllowAt(root, ctx.target.parentId, fieldAllow);
-    return leash ? { ...ctx, slotAllow: intersectAllow(ctx.slotAllow, leash) } : ctx;
+    if (childSlot) {
+        return contextAt(builder, { parentId: nodeId, slot: childSlot.name }, `${componentDisplayName(node.componentId, manifest)} · ${childSlot.name}`);
+    }
+    return resolveSiblingContext(studio, builder, nodeId);
 }
 /** A destination's component label — its manifest title (EC-591: never a stripped id prefix). */
 function parentLabel(studio, componentId) {
     return componentDisplayName(componentId, studio.registry.getManifest(componentId));
 }
 /** Sibling-or-root insert context for a node with no insertable child slot. */
-function resolveSiblingContext(studio, root, nodeId) {
-    const info = getParentInfo(root, nodeId);
+function resolveSiblingContext(studio, builder, nodeId) {
+    const info = getParentInfo(builder.present, nodeId);
     if (info) {
-        // EC-386: the parent slot may be a blocks-prop region — look it up on the
-        // merged vocabulary so its `allow` leash still filters sibling inserts.
-        const pManifest = manifestRules(studio.registry.getManifest(info.parent.componentId));
-        const allow = pManifest?.slots.find((s) => s.name === info.slot)?.allow;
-        return {
-            target: { parentId: info.parent.id, slot: info.slot, index: info.index + 1 },
-            slotAllow: allow,
-            destinationLabel: `${parentLabel(studio, info.parent.componentId)} · ${info.slot}`,
-        };
+        // EC-386: the parent slot may be a blocks-prop region — its `allow` leash still
+        // filters sibling inserts (the core lookup merges blocks props into the slots).
+        return contextAt(builder, { parentId: info.parent.id, slot: info.slot, index: info.index + 1 }, `${parentLabel(studio, info.parent.componentId)} · ${info.slot}`);
     }
-    return { target: { parentId: nodeId, slot: 'children' }, destinationLabel: 'root' };
+    return contextAt(builder, { parentId: nodeId, slot: 'children' }, 'root');
 }
 /**
  * Resolve an `InsertContext` for an EXPLICIT position relative to `nodeId`
@@ -87,15 +63,14 @@ function resolveSiblingContext(studio, root, nodeId) {
  * {@link primaryInsertSlot} (the same slot a drop `into` picks; `null` when the
  * node accepts no children), `before`/`after` use the reference's parent slot at
  * `index`/`index + 1` — so this surface and drag-insert can never disagree about
- * where a position lands or what it allows. `fieldAllow` (EC-188) still constrains
- * ONLY a direct child of the composition root, mirroring `resolveInsertContext`.
+ * where a position lands or what it allows (EC-584: the vocabulary is `allowAt`'s,
+ * exactly as in `resolveInsertContext`).
  */
-export function resolveInsertContextAt(builder, nodeId, position, fieldAllow, studio = getStudioRegistry()) {
+export function resolveInsertContextAt(builder, nodeId, position, studio = getStudioRegistry()) {
     const root = builder.present;
     const node = getNode(root, nodeId);
     if (!node)
         return null;
-    let ctx;
     if (position === 'into') {
         // EC-386: `manifestRules` folds blocks-prop regions into the slot set, so
         // an affordance/drop `into` a Section-style body lands in that region.
@@ -103,40 +78,18 @@ export function resolveInsertContextAt(builder, nodeId, position, fieldAllow, st
         const slot = primaryInsertSlot(manifestRules(manifest));
         if (!slot)
             return null; // the node accepts no children — no `into` position
-        ctx = {
-            target: {
-                parentId: nodeId,
-                slot: slot.name,
-                index: (node.slots?.[slot.name] ?? []).length,
-            },
-            slotAllow: slot.allow,
-            destinationLabel: `${componentDisplayName(node.componentId, manifest)} · ${slot.name}`,
-        };
+        return contextAt(builder, { parentId: nodeId, slot: slot.name, index: (node.slots?.[slot.name] ?? []).length }, `${componentDisplayName(node.componentId, manifest)} · ${slot.name}`);
     }
-    else {
-        const info = getParentInfo(root, nodeId);
-        if (!info)
-            return null; // the root has no siblings — no before/after position
-        // EC-386: merged vocabulary — a blocks-prop parent region keeps its leash.
-        const pManifest = manifestRules(studio.registry.getManifest(info.parent.componentId));
-        ctx = {
-            target: {
-                parentId: info.parent.id,
-                slot: info.slot,
-                index: info.index + (position === 'after' ? 1 : 0),
-            },
-            slotAllow: pManifest?.slots.find((s) => s.name === info.slot)?.allow,
-            destinationLabel: `${parentLabel(studio, info.parent.componentId)} · ${info.slot}`,
-        };
-    }
-    // EC-544: closed-set reading, same as `resolveInsertContext` above.
-    return withFieldLeash(root, ctx, fieldAllow);
+    const info = getParentInfo(root, nodeId);
+    if (!info)
+        return null; // the root has no siblings — no before/after position
+    return contextAt(builder, { parentId: info.parent.id, slot: info.slot, index: info.index + (position === 'after' ? 1 : 0) }, `${parentLabel(studio, info.parent.componentId)} · ${info.slot}`);
 }
 /**
  * Which affordance positions are actually insertable at `nodeId` (EC-405 scope 3):
  * a position is offered only when it structurally exists AND at least one registry
- * component may land there (the SAME slot-rule filter the tree/DnD and the blocks
- * panel apply — {@link hasInsertableComponent} over the resolved `slotAllow`), so a
+ * component may land there (the SAME judge the tree/DnD, the blocks panel and the
+ * reducer apply — {@link hasInsertableComponent} over the resolved `allow`), so a
  * blocked spot shows no dead button.
  *
  * An EMPTY, insertable container surfaces ONLY `into` — the meaningful action there
@@ -146,17 +99,17 @@ export function resolveInsertContextAt(builder, nodeId, position, fieldAllow, st
  * child already carries its own edge affordances, so a filled container needs no
  * center "+").
  */
-export function insertablePositions(builder, nodeId, fieldAllow, studio = getStudioRegistry()) {
+export function insertablePositions(builder, nodeId, studio = getStudioRegistry()) {
     // Empty insertable container → into only.
-    const into = resolveInsertContextAt(builder, nodeId, 'into', fieldAllow, studio);
-    if (into && (into.target.index ?? 0) === 0 && hasInsertableComponent(studio, into.slotAllow)) {
+    const into = resolveInsertContextAt(builder, nodeId, 'into', studio);
+    if (into && (into.target.index ?? 0) === 0 && hasInsertableComponent(studio, into.allow)) {
         return ['into'];
     }
     // Otherwise the sibling edges that accept something.
     const out = [];
     for (const position of ['before', 'after']) {
-        const ctx = resolveInsertContextAt(builder, nodeId, position, fieldAllow, studio);
-        if (ctx && hasInsertableComponent(studio, ctx.slotAllow))
+        const ctx = resolveInsertContextAt(builder, nodeId, position, studio);
+        if (ctx && hasInsertableComponent(studio, ctx.allow))
             out.push(position);
     }
     return out;