@archie/devtools 0.0.31 → 0.0.33

package/dist/{chunk-4VGQJ3PW.mjs → chunk-CO6SWEYJ.mjs}

@@ -534,6 +534,11 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
             parentNodeId ? t.stringLiteral(parentNodeId) : t.nullLiteral()
           )
         ]);
+        if (isKitOrigin) {
+          metaObj.properties.push(
+            t.objectProperty(t.identifier("origin"), t.stringLiteral("kit"))
+          );
+        }
         if (slot !== null) {
           metaObj.properties.push(
             t.objectProperty(t.identifier("slot"), t.stringLiteral(slot))

package/dist/client/client.js

@@ -4160,6 +4160,7 @@ var FIBER_KEY_PREFIX = "__reactFiber$";
 var PROPS_KEY_PREFIX = "__reactProps$";
 var metaCache = /* @__PURE__ */ new WeakMap();
 var directMetaCache = /* @__PURE__ */ new WeakMap();
+var usageMetaCache = /* @__PURE__ */ new WeakMap();
 function readEditorMetaValue(value) {
   if (typeof value === "function") {
     return value();
@@ -4324,6 +4325,34 @@ function getSingleHostElement(owner) {
   }
   return hosts.length === 1 ? hosts[0] : null;
 }
+function getUsageMetaOwnerFiber(el) {
+  let fiber = getFiberSelectionFromElement(el).fiber;
+  while (fiber) {
+    const meta = readEditorMetaValue(fiber.memoizedProps?.__editorMeta);
+    if (meta && meta.origin !== "kit") return fiber;
+    fiber = fiber.return;
+  }
+  return null;
+}
+function projectFromOwner(owner, el) {
+  if (!owner) return null;
+  if (getSingleHostElement(owner) !== el) return null;
+  return readEditorMetaValue(owner.memoizedProps?.__editorMeta);
+}
+function projectUsageMeta(el) {
+  const selection = getFiberSelectionFromElement(el);
+  const cached = readFiberAwareCache(usageMetaCache, el, selection);
+  if (cached !== void 0) return cached;
+  return writeFiberAwareCache(usageMetaCache, el, selection, computeUsageMeta(el));
+}
+function computeUsageMeta(el) {
+  const direct = getDirectEditorMeta(el);
+  if (direct && direct.origin !== "kit") return null;
+  const usage = projectFromOwner(getUsageMetaOwnerFiber(el), el);
+  if (usage) return usage;
+  if (direct) return null;
+  return projectFromOwner(getEditorMetaOwnerFiber(el), el);
+}
 function findMetaOwnerElement(el) {
   let current = el;
   while (current) {
@@ -4391,10 +4420,13 @@ function getRuntimeKey(el) {
   _runtimeKeyMap.set(el, key2);
   return key2;
 }
+function identityMeta(host) {
+  return projectUsageMeta(host) ?? getEditorMeta(host);
+}
 function getNodeKeyFromElement(el) {
   const resolved = resolveDragSurface(el);
   const host = resolved.host ?? el;
-  const meta = getEditorMeta(host);
+  const meta = identityMeta(host);
   if (meta) return meta.nodeId;
   const persisted = host.getAttribute("data-dnd-node-id");
   if (persisted) return persisted;
@@ -4403,7 +4435,7 @@ function getNodeKeyFromElement(el) {
 function getInspectorRefFromElement(el) {
   const resolved = resolveDragSurface(el);
   const host = resolved.host ?? el;
-  const meta = getEditorMeta(host);
+  const meta = identityMeta(host);
   if (!meta) return null;
   return { relativePath: meta.file, line: meta.line, column: meta.col };
 }
@@ -5081,13 +5113,6 @@ function isInspectorEligible(el) {
   if (el.hasAttribute("data-dnd-force-allow")) return "force-allow";
   return null;
 }
-function projectUsageMeta(el) {
-  if (getDirectEditorMeta(el)) return null;
-  const owner = getEditorMetaOwnerFiber(el);
-  if (!owner) return null;
-  if (getSingleHostElement(owner) !== el) return null;
-  return readEditorMetaValue(owner.memoizedProps?.__editorMeta);
-}
 function isRuntimeVisualInternal(el) {
   if (shouldIgnoreAsVirtualRuntime(el)) return true;
   const tag = el.tagName.toLowerCase();
@@ -5117,10 +5142,10 @@ function ensureUniqueNodeId(base, used) {
 function resolveStableNodeId(el, used) {
   const persisted = el.getAttribute(DND_NODE_ID_ATTR);
   if (persisted && !used.has(persisted)) return persisted;
-  const metaId = getEditorMetaNodeId(el);
-  if (metaId) return ensureUniqueNodeId(metaId, used);
   const projected = projectUsageMeta(el);
   if (projected) return ensureUniqueNodeId(projected.nodeId, used);
+  const metaId = getEditorMetaNodeId(el);
+  if (metaId) return ensureUniqueNodeId(metaId, used);
   return ensureUniqueNodeId(getRuntimeNodeId(el), used);
 }
 function getUniqueSelector(el) {
@@ -5205,6 +5230,36 @@ function scanElements(root, depth = 0, usedNodeIds = /* @__PURE__ */ new Set(),
       const minW = isExplicit ? INTERACTIVE_MIN : MIN_WIDTH;
       const minH = isExplicit ? INTERACTIVE_MIN : MIN_HEIGHT;
       if (rect.width < minW || rect.height < minH || rect.width === 0 || rect.height === 0) {
+        const isZeroRect = rect.width === 0 || rect.height === 0;
+        const smallEligibility = isInspectorEligible(el) ?? (projectUsageMeta(el) ? "projected-usage" : null);
+        if (smallEligibility !== null && !seenResolvedHosts.has(el)) {
+          const nodeId2 = resolveStableNodeId(el, usedNodeIds);
+          usedNodeIds.add(nodeId2);
+          el.setAttribute(DND_NODE_ID_ATTR, nodeId2);
+          if (!isZeroRect) {
+            seenResolvedHosts.add(el);
+            const surfaceMeta2 = el instanceof HTMLElement ? getDirectEditorMeta(el) ?? void 0 : void 0;
+            const identityMeta3 = projectUsageMeta(el) ?? surfaceMeta2;
+            const selector = getUniqueSelector(el);
+            const parentEl2 = el.parentElement;
+            results.push({
+              nodeId: nodeId2,
+              element: el,
+              selector,
+              sourceMetaNodeId: identityMeta3?.nodeId ?? null,
+              resolvedHostNodeId: nodeId2,
+              resolvedHostSelector: selector,
+              resolutionKind: "direct-host",
+              label: getLabel(el),
+              rect,
+              containerStrategy: parentEl2 && isFlexOrGridParent(parentEl2) ? resolveContainerStrategy(parentEl2) : null,
+              eligibilitySource: smallEligibility,
+              draggable: false,
+              identityOrigin: identityMeta3?.origin ?? null,
+              editorMeta: surfaceMeta2
+            });
+          }
+        }
         if (!isSvgRoot) results.push(...scanElements(el, depth + 1, usedNodeIds, seenResolvedHosts));
         continue;
       }
@@ -5259,13 +5314,15 @@ function scanElements(root, depth = 0, usedNodeIds = /* @__PURE__ */ new Set(),
       const surfaceMeta = hostEl instanceof HTMLElement ? getDirectEditorMeta(hostEl) ?? void 0 : void 0;
       const ownerMeta = dragSurface.metaOwner && dragSurface.metaOwner instanceof HTMLElement ? getEditorMeta(dragSurface.metaOwner) : null;
       const resolvedSelector = getUniqueSelector(hostEl);
-      const draggable = inferredEligibility === "force-allow" || !nodeId.startsWith("runtime:");
+      const usageMeta = hostEl instanceof HTMLElement ? projectUsageMeta(hostEl) : null;
+      const identityMeta2 = usageMeta ?? ownerMeta ?? surfaceMeta;
+      const draggable = inferredEligibility === "force-allow" || !nodeId.startsWith("runtime:") && (identityMeta2?.origin !== "kit" || resolveRowBinding(hostEl) !== null);
       results.push({
         nodeId,
         element: hostEl,
         selector: resolvedSelector,
         draggable,
-        sourceMetaNodeId: ownerMeta?.nodeId ?? surfaceMeta?.nodeId ?? null,
+        sourceMetaNodeId: identityMeta2?.nodeId ?? null,
         resolvedHostNodeId: nodeId,
         resolvedHostSelector: resolvedSelector,
         resolutionKind: dragSurface.kind,
@@ -5273,6 +5330,7 @@ function scanElements(root, depth = 0, usedNodeIds = /* @__PURE__ */ new Set(),
         rect: hostRect,
         containerStrategy,
         eligibilitySource: inferredEligibility,
+        identityOrigin: identityMeta2?.origin ?? null,
         editorMeta: surfaceMeta
       });
       if (!isSvgRoot) results.push(...scanElements(el, depth + 1, usedNodeIds, seenResolvedHosts));
@@ -5282,6 +5340,45 @@ function scanElements(root, depth = 0, usedNodeIds = /* @__PURE__ */ new Set(),
   }
   return results;
 }
+function buildMovedElementEntry(el, usedNodeIds) {
+  const rect = el.getBoundingClientRect();
+  if (rect.width === 0 || rect.height === 0) {
+    if (isInspectorEligible(el) !== null || projectUsageMeta(el) !== null) {
+      const nodeId2 = resolveStableNodeId(el, usedNodeIds);
+      usedNodeIds.add(nodeId2);
+      el.setAttribute(DND_NODE_ID_ATTR, nodeId2);
+    }
+    return null;
+  }
+  const nodeId = resolveStableNodeId(el, usedNodeIds);
+  el.setAttribute(DND_NODE_ID_ATTR, nodeId);
+  const parentEl = el.parentElement;
+  const surfaceMeta = getDirectEditorMeta(el) ?? void 0;
+  const ownerMeta = getEditorMeta(el);
+  const identityMeta2 = projectUsageMeta(el) ?? ownerMeta ?? surfaceMeta;
+  const selector = getUniqueSelector(el);
+  const eligibility = isInspectorEligible(el);
+  return {
+    nodeId,
+    element: el,
+    selector,
+    // Same draggable rule as the main scan, INCLUDING the force-allow
+    // escape — an element that was draggable when the user moved it must
+    // not silently lose draggability for having landed below MAX_DEPTH.
+    // Same kit-origin bound-row exemption as the main scan (see there).
+    draggable: eligibility === "force-allow" || !nodeId.startsWith("runtime:") && (identityMeta2?.origin !== "kit" || resolveRowBinding(el) !== null),
+    sourceMetaNodeId: identityMeta2?.nodeId ?? null,
+    resolvedHostNodeId: nodeId,
+    resolvedHostSelector: selector,
+    resolutionKind: ownerMeta && ownerMeta.componentName[0] !== ownerMeta.componentName[0].toLowerCase() ? "wrapper-to-host" : "direct-host",
+    label: getLabel(el),
+    rect,
+    containerStrategy: parentEl && isFlexOrGridParent(parentEl) ? resolveContainerStrategy(parentEl) : null,
+    eligibilitySource: eligibility ?? "force-allow",
+    identityOrigin: identityMeta2?.origin ?? null,
+    editorMeta: surfaceMeta
+  };
+}
 function useElementScanner(enabled) {
   const [elements, setElements] = (0, import_react6.useState)([]);
   const rafRef = (0, import_react6.useRef)(0);
@@ -5298,30 +5395,10 @@ function useElementScanner(enabled) {
       const seenEls = new Set(scanned.map((s) => s.element));
       for (const el of Array.from(document.querySelectorAll("[data-dnd-moved]"))) {
         if (seenEls.has(el)) continue;
-        const rect = el.getBoundingClientRect();
-        if (rect.width === 0 || rect.height === 0) continue;
-        const nodeId = resolveStableNodeId(el, usedNodeIds);
-        usedNodeIds.add(nodeId);
-        el.setAttribute(DND_NODE_ID_ATTR, nodeId);
-        const parentEl = el.parentElement;
-        const surfaceMeta = getDirectEditorMeta(el) ?? void 0;
-        const ownerMeta = getEditorMeta(el);
-        const selector = getUniqueSelector(el);
-        scanned.push({
-          nodeId,
-          element: el,
-          selector,
-          draggable: !nodeId.startsWith("runtime:"),
-          sourceMetaNodeId: ownerMeta?.nodeId ?? surfaceMeta?.nodeId ?? null,
-          resolvedHostNodeId: nodeId,
-          resolvedHostSelector: selector,
-          resolutionKind: ownerMeta && ownerMeta.componentName[0] !== ownerMeta.componentName[0].toLowerCase() ? "wrapper-to-host" : "direct-host",
-          label: getLabel(el),
-          rect,
-          containerStrategy: parentEl && isFlexOrGridParent(parentEl) ? resolveContainerStrategy(parentEl) : null,
-          eligibilitySource: isInspectorEligible(el) ?? "force-allow",
-          editorMeta: surfaceMeta
-        });
+        const entry = buildMovedElementEntry(el, usedNodeIds);
+        if (!entry) continue;
+        usedNodeIds.add(entry.nodeId);
+        scanned.push(entry);
       }
       const seen = /* @__PURE__ */ new Set();
       setElements(scanned.filter((el) => {
@@ -8526,7 +8603,9 @@ function useExternalDragLoop({
           externalDrag,
           refs,
           resolveNodeElement,
-          setDropLine
+          setDropLine,
+          scrollX,
+          scrollY
         );
         return;
       }
@@ -8559,10 +8638,8 @@ function useExternalDragLoop({
     return () => cancelAnimationFrame(rafId);
   }, [externalDrag, elements, refs, resolveNodeElement, setDropLine]);
 }
-function commitExternalDrop(x, y, engine, component, refs, resolveNodeElement, setDropLine) {
-  const scrollX = window.scrollX;
-  const scrollY = window.scrollY;
-  const intent = engine.resolve(x, y, scrollX, scrollY, scrollX, scrollY);
+function commitExternalDrop(x, y, engine, component, refs, resolveNodeElement, setDropLine, startScrollX, startScrollY) {
+  const intent = engine.resolve(x, y, window.scrollX, window.scrollY, startScrollX, startScrollY);
   if (!intent || intent.mode !== "reorder") {
     useDesignModeStore.getState().cancelExternalDrag();
     setDropLine(null);

package/dist/client/client.mjs

@@ -4125,6 +4125,7 @@ var FIBER_KEY_PREFIX = "__reactFiber$";
 var PROPS_KEY_PREFIX = "__reactProps$";
 var metaCache = /* @__PURE__ */ new WeakMap();
 var directMetaCache = /* @__PURE__ */ new WeakMap();
+var usageMetaCache = /* @__PURE__ */ new WeakMap();
 function readEditorMetaValue(value) {
   if (typeof value === "function") {
     return value();
@@ -4289,6 +4290,34 @@ function getSingleHostElement(owner) {
   }
   return hosts.length === 1 ? hosts[0] : null;
 }
+function getUsageMetaOwnerFiber(el) {
+  let fiber = getFiberSelectionFromElement(el).fiber;
+  while (fiber) {
+    const meta = readEditorMetaValue(fiber.memoizedProps?.__editorMeta);
+    if (meta && meta.origin !== "kit") return fiber;
+    fiber = fiber.return;
+  }
+  return null;
+}
+function projectFromOwner(owner, el) {
+  if (!owner) return null;
+  if (getSingleHostElement(owner) !== el) return null;
+  return readEditorMetaValue(owner.memoizedProps?.__editorMeta);
+}
+function projectUsageMeta(el) {
+  const selection = getFiberSelectionFromElement(el);
+  const cached = readFiberAwareCache(usageMetaCache, el, selection);
+  if (cached !== void 0) return cached;
+  return writeFiberAwareCache(usageMetaCache, el, selection, computeUsageMeta(el));
+}
+function computeUsageMeta(el) {
+  const direct = getDirectEditorMeta(el);
+  if (direct && direct.origin !== "kit") return null;
+  const usage = projectFromOwner(getUsageMetaOwnerFiber(el), el);
+  if (usage) return usage;
+  if (direct) return null;
+  return projectFromOwner(getEditorMetaOwnerFiber(el), el);
+}
 function findMetaOwnerElement(el) {
   let current = el;
   while (current) {
@@ -4356,10 +4385,13 @@ function getRuntimeKey(el) {
   _runtimeKeyMap.set(el, key2);
   return key2;
 }
+function identityMeta(host) {
+  return projectUsageMeta(host) ?? getEditorMeta(host);
+}
 function getNodeKeyFromElement(el) {
   const resolved = resolveDragSurface(el);
   const host = resolved.host ?? el;
-  const meta = getEditorMeta(host);
+  const meta = identityMeta(host);
   if (meta) return meta.nodeId;
   const persisted = host.getAttribute("data-dnd-node-id");
   if (persisted) return persisted;
@@ -4368,7 +4400,7 @@ function getNodeKeyFromElement(el) {
 function getInspectorRefFromElement(el) {
   const resolved = resolveDragSurface(el);
   const host = resolved.host ?? el;
-  const meta = getEditorMeta(host);
+  const meta = identityMeta(host);
   if (!meta) return null;
   return { relativePath: meta.file, line: meta.line, column: meta.col };
 }
@@ -5046,13 +5078,6 @@ function isInspectorEligible(el) {
   if (el.hasAttribute("data-dnd-force-allow")) return "force-allow";
   return null;
 }
-function projectUsageMeta(el) {
-  if (getDirectEditorMeta(el)) return null;
-  const owner = getEditorMetaOwnerFiber(el);
-  if (!owner) return null;
-  if (getSingleHostElement(owner) !== el) return null;
-  return readEditorMetaValue(owner.memoizedProps?.__editorMeta);
-}
 function isRuntimeVisualInternal(el) {
   if (shouldIgnoreAsVirtualRuntime(el)) return true;
   const tag = el.tagName.toLowerCase();
@@ -5082,10 +5107,10 @@ function ensureUniqueNodeId(base, used) {
 function resolveStableNodeId(el, used) {
   const persisted = el.getAttribute(DND_NODE_ID_ATTR);
   if (persisted && !used.has(persisted)) return persisted;
-  const metaId = getEditorMetaNodeId(el);
-  if (metaId) return ensureUniqueNodeId(metaId, used);
   const projected = projectUsageMeta(el);
   if (projected) return ensureUniqueNodeId(projected.nodeId, used);
+  const metaId = getEditorMetaNodeId(el);
+  if (metaId) return ensureUniqueNodeId(metaId, used);
   return ensureUniqueNodeId(getRuntimeNodeId(el), used);
 }
 function getUniqueSelector(el) {
@@ -5170,6 +5195,36 @@ function scanElements(root, depth = 0, usedNodeIds = /* @__PURE__ */ new Set(),
       const minW = isExplicit ? INTERACTIVE_MIN : MIN_WIDTH;
       const minH = isExplicit ? INTERACTIVE_MIN : MIN_HEIGHT;
       if (rect.width < minW || rect.height < minH || rect.width === 0 || rect.height === 0) {
+        const isZeroRect = rect.width === 0 || rect.height === 0;
+        const smallEligibility = isInspectorEligible(el) ?? (projectUsageMeta(el) ? "projected-usage" : null);
+        if (smallEligibility !== null && !seenResolvedHosts.has(el)) {
+          const nodeId2 = resolveStableNodeId(el, usedNodeIds);
+          usedNodeIds.add(nodeId2);
+          el.setAttribute(DND_NODE_ID_ATTR, nodeId2);
+          if (!isZeroRect) {
+            seenResolvedHosts.add(el);
+            const surfaceMeta2 = el instanceof HTMLElement ? getDirectEditorMeta(el) ?? void 0 : void 0;
+            const identityMeta3 = projectUsageMeta(el) ?? surfaceMeta2;
+            const selector = getUniqueSelector(el);
+            const parentEl2 = el.parentElement;
+            results.push({
+              nodeId: nodeId2,
+              element: el,
+              selector,
+              sourceMetaNodeId: identityMeta3?.nodeId ?? null,
+              resolvedHostNodeId: nodeId2,
+              resolvedHostSelector: selector,
+              resolutionKind: "direct-host",
+              label: getLabel(el),
+              rect,
+              containerStrategy: parentEl2 && isFlexOrGridParent(parentEl2) ? resolveContainerStrategy(parentEl2) : null,
+              eligibilitySource: smallEligibility,
+              draggable: false,
+              identityOrigin: identityMeta3?.origin ?? null,
+              editorMeta: surfaceMeta2
+            });
+          }
+        }
         if (!isSvgRoot) results.push(...scanElements(el, depth + 1, usedNodeIds, seenResolvedHosts));
         continue;
       }
@@ -5224,13 +5279,15 @@ function scanElements(root, depth = 0, usedNodeIds = /* @__PURE__ */ new Set(),
       const surfaceMeta = hostEl instanceof HTMLElement ? getDirectEditorMeta(hostEl) ?? void 0 : void 0;
       const ownerMeta = dragSurface.metaOwner && dragSurface.metaOwner instanceof HTMLElement ? getEditorMeta(dragSurface.metaOwner) : null;
       const resolvedSelector = getUniqueSelector(hostEl);
-      const draggable = inferredEligibility === "force-allow" || !nodeId.startsWith("runtime:");
+      const usageMeta = hostEl instanceof HTMLElement ? projectUsageMeta(hostEl) : null;
+      const identityMeta2 = usageMeta ?? ownerMeta ?? surfaceMeta;
+      const draggable = inferredEligibility === "force-allow" || !nodeId.startsWith("runtime:") && (identityMeta2?.origin !== "kit" || resolveRowBinding(hostEl) !== null);
       results.push({
         nodeId,
         element: hostEl,
         selector: resolvedSelector,
         draggable,
-        sourceMetaNodeId: ownerMeta?.nodeId ?? surfaceMeta?.nodeId ?? null,
+        sourceMetaNodeId: identityMeta2?.nodeId ?? null,
         resolvedHostNodeId: nodeId,
         resolvedHostSelector: resolvedSelector,
         resolutionKind: dragSurface.kind,
@@ -5238,6 +5295,7 @@ function scanElements(root, depth = 0, usedNodeIds = /* @__PURE__ */ new Set(),
         rect: hostRect,
         containerStrategy,
         eligibilitySource: inferredEligibility,
+        identityOrigin: identityMeta2?.origin ?? null,
         editorMeta: surfaceMeta
       });
       if (!isSvgRoot) results.push(...scanElements(el, depth + 1, usedNodeIds, seenResolvedHosts));
@@ -5247,6 +5305,45 @@ function scanElements(root, depth = 0, usedNodeIds = /* @__PURE__ */ new Set(),
   }
   return results;
 }
+function buildMovedElementEntry(el, usedNodeIds) {
+  const rect = el.getBoundingClientRect();
+  if (rect.width === 0 || rect.height === 0) {
+    if (isInspectorEligible(el) !== null || projectUsageMeta(el) !== null) {
+      const nodeId2 = resolveStableNodeId(el, usedNodeIds);
+      usedNodeIds.add(nodeId2);
+      el.setAttribute(DND_NODE_ID_ATTR, nodeId2);
+    }
+    return null;
+  }
+  const nodeId = resolveStableNodeId(el, usedNodeIds);
+  el.setAttribute(DND_NODE_ID_ATTR, nodeId);
+  const parentEl = el.parentElement;
+  const surfaceMeta = getDirectEditorMeta(el) ?? void 0;
+  const ownerMeta = getEditorMeta(el);
+  const identityMeta2 = projectUsageMeta(el) ?? ownerMeta ?? surfaceMeta;
+  const selector = getUniqueSelector(el);
+  const eligibility = isInspectorEligible(el);
+  return {
+    nodeId,
+    element: el,
+    selector,
+    // Same draggable rule as the main scan, INCLUDING the force-allow
+    // escape — an element that was draggable when the user moved it must
+    // not silently lose draggability for having landed below MAX_DEPTH.
+    // Same kit-origin bound-row exemption as the main scan (see there).
+    draggable: eligibility === "force-allow" || !nodeId.startsWith("runtime:") && (identityMeta2?.origin !== "kit" || resolveRowBinding(el) !== null),
+    sourceMetaNodeId: identityMeta2?.nodeId ?? null,
+    resolvedHostNodeId: nodeId,
+    resolvedHostSelector: selector,
+    resolutionKind: ownerMeta && ownerMeta.componentName[0] !== ownerMeta.componentName[0].toLowerCase() ? "wrapper-to-host" : "direct-host",
+    label: getLabel(el),
+    rect,
+    containerStrategy: parentEl && isFlexOrGridParent(parentEl) ? resolveContainerStrategy(parentEl) : null,
+    eligibilitySource: eligibility ?? "force-allow",
+    identityOrigin: identityMeta2?.origin ?? null,
+    editorMeta: surfaceMeta
+  };
+}
 function useElementScanner(enabled) {
   const [elements, setElements] = useState4([]);
   const rafRef = useRef4(0);
@@ -5263,30 +5360,10 @@ function useElementScanner(enabled) {
       const seenEls = new Set(scanned.map((s) => s.element));
       for (const el of Array.from(document.querySelectorAll("[data-dnd-moved]"))) {
         if (seenEls.has(el)) continue;
-        const rect = el.getBoundingClientRect();
-        if (rect.width === 0 || rect.height === 0) continue;
-        const nodeId = resolveStableNodeId(el, usedNodeIds);
-        usedNodeIds.add(nodeId);
-        el.setAttribute(DND_NODE_ID_ATTR, nodeId);
-        const parentEl = el.parentElement;
-        const surfaceMeta = getDirectEditorMeta(el) ?? void 0;
-        const ownerMeta = getEditorMeta(el);
-        const selector = getUniqueSelector(el);
-        scanned.push({
-          nodeId,
-          element: el,
-          selector,
-          draggable: !nodeId.startsWith("runtime:"),
-          sourceMetaNodeId: ownerMeta?.nodeId ?? surfaceMeta?.nodeId ?? null,
-          resolvedHostNodeId: nodeId,
-          resolvedHostSelector: selector,
-          resolutionKind: ownerMeta && ownerMeta.componentName[0] !== ownerMeta.componentName[0].toLowerCase() ? "wrapper-to-host" : "direct-host",
-          label: getLabel(el),
-          rect,
-          containerStrategy: parentEl && isFlexOrGridParent(parentEl) ? resolveContainerStrategy(parentEl) : null,
-          eligibilitySource: isInspectorEligible(el) ?? "force-allow",
-          editorMeta: surfaceMeta
-        });
+        const entry = buildMovedElementEntry(el, usedNodeIds);
+        if (!entry) continue;
+        usedNodeIds.add(entry.nodeId);
+        scanned.push(entry);
       }
       const seen = /* @__PURE__ */ new Set();
       setElements(scanned.filter((el) => {
@@ -8491,7 +8568,9 @@ function useExternalDragLoop({
           externalDrag,
           refs,
           resolveNodeElement,
-          setDropLine
+          setDropLine,
+          scrollX,
+          scrollY
         );
         return;
       }
@@ -8524,10 +8603,8 @@ function useExternalDragLoop({
     return () => cancelAnimationFrame(rafId);
   }, [externalDrag, elements, refs, resolveNodeElement, setDropLine]);
 }
-function commitExternalDrop(x, y, engine, component, refs, resolveNodeElement, setDropLine) {
-  const scrollX = window.scrollX;
-  const scrollY = window.scrollY;
-  const intent = engine.resolve(x, y, scrollX, scrollY, scrollX, scrollY);
+function commitExternalDrop(x, y, engine, component, refs, resolveNodeElement, setDropLine, startScrollX, startScrollY) {
+  const intent = engine.resolve(x, y, window.scrollX, window.scrollY, startScrollX, startScrollY);
   if (!intent || intent.mode !== "reorder") {
     useDesignModeStore.getState().cancelExternalDrag();
     setDropLine(null);

package/dist/collection-binding.mjs

@@ -1,6 +1,6 @@
 import {
   meaningfulChildren
-} from "./chunk-4VGQJ3PW.mjs";
+} from "./chunk-CO6SWEYJ.mjs";
 
 // src/babel-plugin-collection-binding.ts
 import { VISITOR_KEYS } from "@babel/types";

package/dist/index.d.mts

@@ -11,6 +11,7 @@ import { types, PluginObj } from '@babel/core';
  * The injected prop contains:
  *   nodeId, file, line, col, componentName, staticProps, movable, parentNodeId
  *   + (ARCH-883 F1) slot, propBindings, propOwner
+ *   + (ARCH-883-KOI) origin
  *
  * At runtime the Fiber bridge reads `memoizedProps.__editorMeta` to resolve
  * element identity without any DOM attributes.
@@ -30,6 +31,10 @@ import { types, PluginObj } from '@babel/core';
  *   3. `movable: false` for kit-origin nodes — reordering inside a kit template
  *      affects N usages, a permanent non-objective (PRD §1.3).
  *
+ * ARCH-883-KOI (kit-origin-identity, CREW round) adds a FOURTH: `origin: 'kit'`
+ * on every kit-origin node (see `types/editor-meta.ts`'s docstring on that
+ * field for why it exists separately from `movable`).
+ *
  * `parentNodeId` stays INTRA-FILE by construction (it only ever walks JSX
  * ancestors within the file being transformed), so it never links a kit template
  * node to a screen usage; per SDD §2.3 it must not be used across that seam.
@@ -174,6 +179,52 @@ interface EditorMeta {
      * DOM. The root node of a kit template emits `null` here.
      */
     parentNodeId: string | null;
+    /**
+     * `'kit'` when the node comes from a kit template — emitted with
+     * `origin: 'kit'`, or carrying a slot (which makes it kit-origin by
+     * definition). Absent means screen-origin.
+     *
+     * WHY THIS EXISTS SEPARATELY FROM `movable`. Both are `false`/`'kit'` for a
+     * kit node, so it looks redundant, and it is not: `movable` is ALSO `false`
+     * for map-callback roots, fragment children and expression-container siblings
+     * in ordinary SCREENS (RFC E2.4 §2.7). A consumer that wants "may this node
+     * be reordered at all, by any write path" must not read `movable` — it would
+     * over-block exactly the list instances that reorder through their backing
+     * data. `origin` answers the narrower, structural question: this node is one
+     * template behind N usages, so no write path can ever reorder it (PRD §1.3).
+     *
+     * ABSENCE IS AMBIGUOUS, NOT SAFE, on today's fleet — this is NOT the same
+     * claim as "reads the same as screen-origin, the pre-existing meaning of
+     * every meta" (an earlier version of this doc said exactly that, and it is
+     * false for the current deployed fleet; kept here as the record of the
+     * CREW correction, ARCH-883-KOI F4). Two axes move independently:
+     *
+     *   1. Whether kit COMPONENTS render instrumented (kit-runtime's late-
+     *      binding fix — a separate repo/change from this one).
+     *   2. Whether the `@archie/devtools` version that built a given bundle
+     *      emits `origin` at all (this field).
+     *
+     * A page can be on axis-1-yes / axis-2-no TODAY: kit-runtime already
+     * instruments kit components on pages whose screen (or kit) build used a
+     * pre-`origin` `@archie/devtools`. On such a page a kit-internal host's
+     * template meta is present (per the P0-1 thunk) but carries no `origin`
+     * key — indistinguishable from a genuine screen-origin meta by this field
+     * alone. A consumer that trusts absence-means-screen-origin on that page
+     * reproduces the exact F1 bug this change fixes, silently.
+     *
+     * There is no per-node way to close this gap (a missing field cannot prove
+     * its own absence is meaningful). The mitigation is PAGE-LEVEL: the
+     * standalone inspector script's `INSPECTOR_SCRIPT_LOADED` handshake reports
+     * a `kitOriginIdentity` capability bit (see `inspector.standalone.js`) that
+     * tells the host "this SCRIPT understands `origin` and projects across the
+     * kit boundary" — it does NOT and cannot tell the host whether the PAGE's
+     * own plugin build emitted the field, which is the acg/kitgen build's
+     * `@archie/devtools` version, an axis this package has no visibility into.
+     * Hosts that need a hard guarantee must track that build version
+     * themselves; this capability bit only rules out "the runtime code is too
+     * old to know what `origin` means" as a failure mode.
+     */
+    origin?: 'kit';
     /**
      * Curated kit slot label, e.g. `"AuthFrame/aside/headline"` (SDD §2.6).
      *

package/dist/index.d.ts

@@ -11,6 +11,7 @@ import { types, PluginObj } from '@babel/core';
  * The injected prop contains:
  *   nodeId, file, line, col, componentName, staticProps, movable, parentNodeId
  *   + (ARCH-883 F1) slot, propBindings, propOwner
+ *   + (ARCH-883-KOI) origin
  *
  * At runtime the Fiber bridge reads `memoizedProps.__editorMeta` to resolve
  * element identity without any DOM attributes.
@@ -30,6 +31,10 @@ import { types, PluginObj } from '@babel/core';
  *   3. `movable: false` for kit-origin nodes — reordering inside a kit template
  *      affects N usages, a permanent non-objective (PRD §1.3).
  *
+ * ARCH-883-KOI (kit-origin-identity, CREW round) adds a FOURTH: `origin: 'kit'`
+ * on every kit-origin node (see `types/editor-meta.ts`'s docstring on that
+ * field for why it exists separately from `movable`).
+ *
  * `parentNodeId` stays INTRA-FILE by construction (it only ever walks JSX
  * ancestors within the file being transformed), so it never links a kit template
  * node to a screen usage; per SDD §2.3 it must not be used across that seam.
@@ -174,6 +179,52 @@ interface EditorMeta {
      * DOM. The root node of a kit template emits `null` here.
      */
     parentNodeId: string | null;
+    /**
+     * `'kit'` when the node comes from a kit template — emitted with
+     * `origin: 'kit'`, or carrying a slot (which makes it kit-origin by
+     * definition). Absent means screen-origin.
+     *
+     * WHY THIS EXISTS SEPARATELY FROM `movable`. Both are `false`/`'kit'` for a
+     * kit node, so it looks redundant, and it is not: `movable` is ALSO `false`
+     * for map-callback roots, fragment children and expression-container siblings
+     * in ordinary SCREENS (RFC E2.4 §2.7). A consumer that wants "may this node
+     * be reordered at all, by any write path" must not read `movable` — it would
+     * over-block exactly the list instances that reorder through their backing
+     * data. `origin` answers the narrower, structural question: this node is one
+     * template behind N usages, so no write path can ever reorder it (PRD §1.3).
+     *
+     * ABSENCE IS AMBIGUOUS, NOT SAFE, on today's fleet — this is NOT the same
+     * claim as "reads the same as screen-origin, the pre-existing meaning of
+     * every meta" (an earlier version of this doc said exactly that, and it is
+     * false for the current deployed fleet; kept here as the record of the
+     * CREW correction, ARCH-883-KOI F4). Two axes move independently:
+     *
+     *   1. Whether kit COMPONENTS render instrumented (kit-runtime's late-
+     *      binding fix — a separate repo/change from this one).
+     *   2. Whether the `@archie/devtools` version that built a given bundle
+     *      emits `origin` at all (this field).
+     *
+     * A page can be on axis-1-yes / axis-2-no TODAY: kit-runtime already
+     * instruments kit components on pages whose screen (or kit) build used a
+     * pre-`origin` `@archie/devtools`. On such a page a kit-internal host's
+     * template meta is present (per the P0-1 thunk) but carries no `origin`
+     * key — indistinguishable from a genuine screen-origin meta by this field
+     * alone. A consumer that trusts absence-means-screen-origin on that page
+     * reproduces the exact F1 bug this change fixes, silently.
+     *
+     * There is no per-node way to close this gap (a missing field cannot prove
+     * its own absence is meaningful). The mitigation is PAGE-LEVEL: the
+     * standalone inspector script's `INSPECTOR_SCRIPT_LOADED` handshake reports
+     * a `kitOriginIdentity` capability bit (see `inspector.standalone.js`) that
+     * tells the host "this SCRIPT understands `origin` and projects across the
+     * kit boundary" — it does NOT and cannot tell the host whether the PAGE's
+     * own plugin build emitted the field, which is the acg/kitgen build's
+     * `@archie/devtools` version, an axis this package has no visibility into.
+     * Hosts that need a hard guarantee must track that build version
+     * themselves; this capability bit only rules out "the runtime code is too
+     * old to know what `origin` means" as a failure mode.
+     */
+    origin?: 'kit';
     /**
      * Curated kit slot label, e.g. `"AuthFrame/aside/headline"` (SDD §2.6).
      *

package/dist/index.js

@@ -733,6 +733,11 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
             parentNodeId ? t.stringLiteral(parentNodeId) : t.nullLiteral()
           )
         ]);
+        if (isKitOrigin) {
+          metaObj.properties.push(
+            t.objectProperty(t.identifier("origin"), t.stringLiteral("kit"))
+          );
+        }
         if (slot !== null) {
           metaObj.properties.push(
             t.objectProperty(t.identifier("slot"), t.stringLiteral(slot))

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import {
   __dirname,
   babelPluginEditorMeta
-} from "./chunk-4VGQJ3PW.mjs";
+} from "./chunk-CO6SWEYJ.mjs";
 
 // src/index.ts
 import { readFileSync } from "fs";

package/dist/inspector.standalone.js

@@ -1,10 +1,4 @@
-/**
- * Archie Inspector - Standalone script for CDN injection.
- * Set before loading: window.__ARCHIE_INSPECTOR_TARGET_ORIGIN__, window.__ARCHIE_INSPECTOR_ALLOWED_ORIGINS__
- * Then load: <script src="https://your-cdn/inspector.standalone.js"></script>
- * Auto-runs if configured; or call window.__ARCHIE_INSPECTOR_RUN__().
- * Security: No eval(), no "*" origins; style values sanitized.
- */
+/** Archie Inspector standalone: safe DOM inspector for CDN use. */
 ;(function () {
   "use strict"
   // Capture originals at module load time so the patch below is never recursive
@@ -95,19 +89,10 @@
       var FIBER_KEY_PREFIX = "__reactFiber$"
       var PROPS_KEY_PREFIX = "__reactProps$"
 
-      // ARCH-883 P0-1: babel-plugin-editor-meta.ts (TypeScript context) now
-      // emits __editorMeta as a zero-arg function, not the object literal
-      // directly, so React never writes it into the DOM. Every extraction
-      // site below must invoke the value when it is a function. Mirrors
-      // readEditorMetaValue in fiber-bridge.ts — if this changes, update
-      // that copy to maintain parity.
+      // __editorMeta is emitted as a thunk; invoke it (parity with fiber-bridge).
       function resolveEditorMetaValue(value) {
         if (typeof value === "function") {
-          // Each call re-evaluates the plugin-emitted `() => ({...})`
-          // closure and returns a FRESH object literal — never rely on
-          // meta object identity (`===`) across two separate reads, even
-          // within the same render (mirrors readEditorMetaValue in
-          // fiber-bridge.ts).
+          // Invoke thunk and return a fresh meta object (do not rely on identity).
           return value()
         }
         // Twin parity with fiber-bridge.ts's readEditorMetaValue: only
@@ -338,19 +323,56 @@
         return hosts.length === 1 ? hosts[0] : null
       }
 
-      // Vanilla twin of projectUsageMeta (useElementScanner.ts): the usage meta
-      // when `el` is the SINGLE host root a component usage renders and that
-      // component destructured its props, so the host fiber carries no meta.
-      function projectUsageMetaFromElement(el) {
-        if (getDirectEditorMetaFromElement(el)) return null
-        var owner = getEditorMetaOwnerFiberFromElement(el)
+      // The fiber owning the nearest NON-kit __editorMeta for `el` — the usage
+      // written in a screen, reached across however many kit template frames
+      // sit in between. Vanilla twin of getUsageMetaOwnerFiber
+      // (fiber-bridge.ts); see that docstring for why the nearest meta is the
+      // wrong one once the kit itself is instrumented.
+      function getUsageMetaOwnerFiberFromElement(el) {
+        var fiber = getFiberFromElement(el)
+        while (fiber) {
+          if (fiber.memoizedProps && fiber.memoizedProps.__editorMeta) {
+            var meta = resolveEditorMetaValue(fiber.memoizedProps.__editorMeta)
+            if (meta && meta.origin !== "kit") return fiber
+          }
+          fiber = fiber["return"]
+        }
+        return null
+      }
+
+      // The meta `owner` carries, but only if `el` is the single host it renders.
+      function projectFromOwnerFiber(owner, el) {
         if (!owner) return null
         if (getSingleHostElementFromFiber(owner) !== el) return null
         return resolveEditorMetaValue(owner.memoizedProps.__editorMeta)
       }
 
-      // The nodeId this element carries AS ITS OWN — direct fiber meta, or the
-      // single-host projection. NEVER an inherited ancestor nodeId: walking the
+      // Vanilla twin of projectUsageMeta (fiber-bridge.ts): the usage meta when
+      // `el` is the SINGLE host root a component usage renders and that usage's
+      // meta never reached the host fiber — because the component destructured
+      // its props, or because the plugin sanitized it out of the spread (which
+      // is every kit component, once the kit is instrumented).
+      function projectUsageMetaFromElement(el) {
+        var direct = getDirectEditorMetaFromElement(el)
+        if (direct && direct.origin !== "kit") return null
+
+        var usage = projectFromOwnerFiber(
+          getUsageMetaOwnerFiberFromElement(el),
+          el
+        )
+        if (usage) return usage
+
+        // A kit-internal host already has its own identity; nothing to project.
+        if (direct) return null
+
+        return projectFromOwnerFiber(
+          getEditorMetaOwnerFiberFromElement(el),
+          el
+        )
+      }
+
+      // The nodeId this element carries AS ITS OWN — the single-host projection,
+      // then direct fiber meta. NEVER an inherited ancestor nodeId: walking the
       // fiber chain here made every UNSTAMPED subtree (any two siblings
       // rendered by a component the plugin never transformed — anything from
       // node_modules, and here SVG internals too, since this twin accepts any
@@ -358,13 +380,39 @@
       // direct-meta-ONLY rule would make every kit component that destructures
       // its props look like a singleton — which is the fail-OPEN mistake, and
       // would write a literal into a mapped usage, changing every row.
-      // See instance-identity.ts for the full rationale.
+      // The projection is checked FIRST because an instrumented kit gives every
+      // <Card/> host the same template nodeId; two unrelated Cards under one
+      // parent would otherwise read as one repeated source position.
+      //
+      // ARCH-883-KOI F1 (CREW round): a direct KIT meta is the TEMPLATE's
+      // position, shared by every usage. When a screen USAGE exists above (the
+      // projection bailed only because `el` is a template-internal node BELOW
+      // the usage's single host root — a <Card/>'s inner <span>, not the outer
+      // <div> the projection already caught) the id CANNOT be the bare usage
+      // nodeId: every other template-internal node under that SAME usage (the
+      // sibling <p>) would walk to the identical usage fiber and report the
+      // identical id, collapsing two distinct template positions into one and
+      // making `findCollectionWindow` read them as a false repeated collection
+      // with no real key — refusing a legitimate kit-internal edit. The id is
+      // instead a COMPOSITE of the usage's nodeId and this node's OWN template
+      // position: stable across N repeats of the SAME position (the
+      // DataTable-row case — same usage, same template row id, correctly still
+      // a collection) while distinct across different positions under one
+      // usage (span vs p). Mirrors ownNodeId in instance-identity.ts — if this
+      // changes, update that copy to maintain parity.
       function ownMetaNodeId(el) {
         if (!el || el.nodeType !== 1) return null
-        var direct = getDirectEditorMetaFromElement(el)
-        if (direct && direct.nodeId) return direct.nodeId
         var projected = projectUsageMetaFromElement(el)
-        return projected && projected.nodeId ? projected.nodeId : null
+        if (projected && projected.nodeId) return projected.nodeId
+        var direct = getDirectEditorMetaFromElement(el)
+        if (direct && direct.origin === "kit") {
+          var usageOwner = getUsageMetaOwnerFiberFromElement(el)
+          var usage =
+            usageOwner &&
+            resolveEditorMetaValue(usageOwner.memoizedProps.__editorMeta)
+          if (usage && usage.nodeId) return usage.nodeId + " " + direct.nodeId
+        }
+        return direct && direct.nodeId ? direct.nodeId : null
       }
 
       // The repeated-row boundary above `el`, or a search outcome explaining
@@ -786,6 +834,17 @@
       function getExactSourceSignatureFromElement(element) {
         if (!element) return ""
 
+        // The projected USAGE outranks the element's own meta. On an
+        // instrumented kit the host of a `<Card/>` carries the kit TEMPLATE's
+        // meta, so reading the direct one first signs the selection as
+        // `card.jsx` — a file the per-screen save path cannot write, which
+        // surfaces to the user as "no editable source for these changes".
+        var usageMeta = projectUsageMetaFromElement(element)
+        var usageSignature = usageMeta
+          ? getSharedSignatureFromMeta(usageMeta)
+          : ""
+        if (usageSignature) return usageSignature
+
         var directMeta = getDirectEditorMetaFromElement(element)
         var directSignature = directMeta
           ? getSharedSignatureFromMeta(directMeta)
@@ -1099,6 +1158,15 @@
       function getInspectorInfoFromElement(element) {
         if (!element) return null
 
+        // Same precedence as getExactSourceSignatureFromElement: the usage the
+        // screen wrote outranks the kit template that rendered the host. This
+        // is the value that becomes `inspectorSource` in ELEMENT_SELECTED, so
+        // getting it wrong is what makes the host app refuse the save.
+        var usageMeta = projectUsageMetaFromElement(element)
+        if (usageMeta) {
+          return buildInspectorInfoFromMeta(usageMeta)
+        }
+
         var directMeta = getDirectEditorMetaFromElement(element)
         if (directMeta) {
           return buildInspectorInfoFromMeta(directMeta)
@@ -1350,7 +1418,11 @@
         // 2.3.0 (ARCH-1065 A17-support): additive only — `QUERY_COLLECTION_ORDER`
         // in the message protocol and `capabilities.collectionOrderQuery`
         // below. No existing field changed shape, so `protocolVersion` stays 1.
-        version: "2.3.0",
+        // 2.4.0 (ARCH-883-KOI, CREW round): additive only — `origin` on
+        // `EditorMeta`, the usage-projected `ownMetaNodeId`/`inspectorSource`/
+        // `editorInstance` resolution, and `capabilities.kitOriginIdentity`
+        // below. No existing field changed shape, so `protocolVersion` stays 1.
+        version: "2.4.0",
         protocolVersion: 1,
         capabilities: {
           // 2.1.1: function-valued __editorMeta props are invoked before any
@@ -1391,6 +1463,24 @@
           // concept, singular mechanism — are treated as opaque strings
           // elsewhere in this file).
           bindingContract: readBindingContractMeta(),
+          // ARCH-883-KOI F4 (v2.4.0) — this SCRIPT resolves `EditorMeta.origin`
+          // and projects identity across an instrumented kit boundary
+          // (`ownMetaNodeId`, `projectUsageMetaFromElement`,
+          // `getInspectorInfoFromElement`, `resolveInstanceIdentity`). Hosts
+          // MUST feature-detect on this flag before trusting `origin`
+          // (absent or `editorMeta.origin === 'kit'`) as meaningful: a frozen
+          // pre-2.4.0 inspector never reads the field at all, so its
+          // `inspectorSource`/`editorInstance` on an instrumented-kit page
+          // reproduce the exact F1 bug this version fixes.
+          //
+          // What this bit CANNOT tell the host: whether the PAGE's own build
+          // emitted `origin` on its metas in the first place — that is the
+          // `@archie/devtools` version the acg/kitgen esbuild path had
+          // installed when the screen (or the kit) was built, a completely
+          // separate axis from this CDN script's version (see the `origin`
+          // field's docstring in `types/editor-meta.ts` for the full
+          // reasoning, and why NO per-node signal can close that gap).
+          kitOriginIdentity: true,
         },
       })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archie/devtools",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "DevTools for Archie generated applications - Route synchronization and editor communication",
   "repository": {
     "type": "git",