@archie/devtools 0.1.1 → 0.1.3

package/README.md

@@ -89,6 +89,11 @@ opción `allowLegacyIds` es `true` (default en esta versión — transicional,
 se eliminará más adelante); con `allowLegacyIds: false` el elemento no se
 instrumenta.
 
+El plugin nunca estampa `data-vid` en runtime (eso lo hace el stamper de
+Genesis). El plugin Vite (`archieDevTools()`) solo VALIDA: en dev, un
+`JSXOpeningElement` sin `data-vid` dispara un warning una vez por archivo
+(`onMissingVid` en `babel-plugin-editor-meta.ts`).
+
 En runtime, `node-key.ts` resuelve la identidad con la prioridad
 `meta.vid` → `data-vid` del DOM → (legado) `meta.nodeId` → `runtime:N`, y
 `fiber-bridge.ts` expone `getNodeMeta(el)`, que valida el `NodeMeta`

package/dist/{chunk-THKKWDMJ.mjs → chunk-U4KG6UDY.mjs}

@@ -63,8 +63,10 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
     includeHostSourceRef = false,
     origin = "screen",
     templateOrigin = false,
-    allowLegacyIds = true
+    allowLegacyIds = true,
+    onMissingVid
   } = opts;
+  let missingVidWarned = false;
   function getJSXTagName(el) {
     const { name } = el;
     if (t.isJSXIdentifier(name)) return name.name;
@@ -151,11 +153,17 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
     }
     return "STATIC";
   }
-  const SHELL_FILE_RE = /(^|\/)shell\.jsx$/;
+  const SHELL_FILE_RE = /(^|\/)shell\.(jsx|tsx)$/;
   const SHELL_DIR_RE = /(^|\/)components\/shell\//;
+  const SHELL_BASENAME_RE = /shell/i;
   const CHROME_ANCESTOR_TAGS = /* @__PURE__ */ new Set(["nav", "aside", "header"]);
-  function computeIsChrome(file, path2) {
+  function isChromeFilePath(file) {
     if (SHELL_FILE_RE.test(file) || SHELL_DIR_RE.test(file)) return true;
+    const base = file.split("/").pop() ?? file;
+    return SHELL_BASENAME_RE.test(base);
+  }
+  function computeIsChrome(file, path2) {
+    if (isChromeFilePath(file)) return true;
     let current = path2.parentPath;
     while (current) {
       if (current.isJSXElement()) {
@@ -169,17 +177,65 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
   function computeContainerKind(path2) {
     const elPath = path2.parentPath;
     if (!elPath?.isJSXElement()) return "none";
-    const children = meaningfulChildren(t, elPath.node.children);
-    if (children.length === 0) return "none";
-    const allPlain = children.every((c) => t.isJSXElement(c) || t.isJSXText(c));
+    if (!elPath.node.closingElement) return "none";
+    const children = elPath.node.children;
+    const allPlain = children.every((c) => {
+      if (t.isJSXElement(c)) return true;
+      if (t.isJSXText(c)) return c.value.trim() === "";
+      return false;
+    });
     return allPlain ? "plain" : "expression";
   }
-  function computeLockReason(isKitOrigin, isChrome, dynamicType, containerKind) {
+  const kitBoundNamesCache = /* @__PURE__ */ new WeakMap();
+  function computeKitBoundNames(programPath) {
+    const cached = kitBoundNamesCache.get(programPath.node);
+    if (cached) return cached;
+    const names = /* @__PURE__ */ new Set();
+    for (const stmt of programPath.node.body) {
+      if (!t.isVariableDeclaration(stmt)) continue;
+      for (const decl of stmt.declarations) {
+        if (!t.isObjectPattern(decl.id)) continue;
+        if (!decl.init || !t.isIdentifier(decl.init) || decl.init.name !== "Kit") continue;
+        for (const prop of decl.id.properties) {
+          if (!t.isObjectProperty(prop)) continue;
+          const value = t.isIdentifier(prop.value) ? prop.value : t.isIdentifier(prop.key) ? prop.key : null;
+          if (value) names.add(value.name);
+        }
+      }
+    }
+    kitBoundNamesCache.set(programPath.node, names);
+    return names;
+  }
+  function isKitComponentTagName(path2) {
+    const name = path2.node.name;
+    let head = null;
+    if (t.isJSXIdentifier(name)) {
+      head = name.name;
+    } else if (t.isJSXMemberExpression(name)) {
+      let cur = name;
+      while (t.isJSXMemberExpression(cur)) cur = cur.object;
+      if (t.isJSXIdentifier(cur)) head = cur.name;
+    }
+    if (!head || !/^[A-Z]/.test(head)) return false;
+    if (head === "Kit") return true;
+    const programPath = path2.scope.getProgramParent().path;
+    if (programPath.isProgram() && computeKitBoundNames(programPath).has(head)) return true;
+    const binding = path2.scope.getBinding(head);
+    if (binding) {
+      const bp = binding.path;
+      const isImport = bp.isImportSpecifier() || bp.isImportDefaultSpecifier() || bp.isImportNamespaceSpecifier();
+      if (isImport) {
+        const decl = bp.parentPath;
+        if (decl?.isImportDeclaration() && /kit-runtime/.test(decl.node.source.value)) return true;
+      }
+    }
+    return false;
+  }
+  function computeLockReason(isKitOrigin, isChrome, dynamicType) {
     if (isKitOrigin) return "KIT_INTERNAL";
     if (isChrome) return "CHROME_STRUCTURAL";
     if (dynamicType === "ARRAY") return "DYNAMIC_ARRAY";
     if (dynamicType === "CONDITIONAL") return "DYNAMIC_CONDITIONAL";
-    if (containerKind === "expression") return "EXPRESSION_CONTAINER";
     return void 0;
   }
   function isMovable(path2) {
@@ -829,6 +885,10 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
           }
         }
         const vid = readVidAttr(path2.node.attributes);
+        if (!vid && onMissingVid && !missingVidWarned) {
+          missingVidWarned = true;
+          onMissingVid({ file, line, col, componentName, instrumented: allowLegacyIds });
+        }
         if (!vid && !allowLegacyIds) return;
         const nodeId = vid ?? computeNodeId(file, line, col, componentName);
         const isKitOrigin = origin === "kit" || hasSlotAttr;
@@ -856,7 +916,8 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
           const dynamicType = computeDynamicType(path2);
           const isChrome = computeIsChrome(file, path2);
           const containerKind = computeContainerKind(path2);
-          const lockReason = computeLockReason(isKitOrigin, isChrome, dynamicType, containerKind);
+          const isKitComponentContainer = isKitComponentTagName(path2);
+          const lockReason = computeLockReason(isKitOrigin, isChrome, dynamicType);
           metaObj.properties.push(
             t.objectProperty(t.identifier("vid"), t.stringLiteral(vid)),
             t.objectProperty(t.identifier("isKitOrigin"), t.booleanLiteral(isKitOrigin)),
@@ -864,6 +925,11 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
             t.objectProperty(t.identifier("isChrome"), t.booleanLiteral(isChrome)),
             t.objectProperty(t.identifier("containerKind"), t.stringLiteral(containerKind))
           );
+          if (isKitComponentContainer) {
+            metaObj.properties.push(
+              t.objectProperty(t.identifier("isKitContainer"), t.booleanLiteral(true))
+            );
+          }
           if (lockReason) {
             metaObj.properties.push(
               t.objectProperty(t.identifier("lockReason"), t.stringLiteral(lockReason))

package/dist/client/client.js

@@ -4235,6 +4235,7 @@ function isNonDroppableNodeMeta(meta) {
   if (meta.containerKind && meta.containerKind !== "plain") return true;
   if (meta.isChrome) return true;
   if (meta.isKitOrigin) return true;
+  if (meta.isKitContainer) return true;
   return false;
 }
 function isNonDraggableNodeMeta(meta) {
@@ -4261,26 +4262,37 @@ function collectSubtreeIds(rootId, projection) {
 }
 function computeDroppableSet(sourceId, projection, nodeMap) {
   const excluded = collectSubtreeIds(sourceId, projection);
+  const sourceFile = nodeMap.get(sourceId)?.editorMeta?.file;
   const droppable = /* @__PURE__ */ new Set();
   for (const containerId of projection.containerIndex.keys()) {
     if (excluded.has(containerId)) continue;
     if (isStructuralContainer(containerId, nodeMap)) continue;
     if (isNonDroppableNodeMeta(nodeMap.get(containerId)?.editorMeta)) continue;
+    const containerFile = nodeMap.get(containerId)?.editorMeta?.file;
+    if (sourceFile && containerFile && containerFile !== sourceFile) continue;
     droppable.add(containerId);
   }
   return droppable;
 }
-function buildBlockedNodeMetaContainerIds(projection, nodeMap) {
+function buildBlockedNodeMetaContainerIds(projection, nodeMap, sourceId) {
+  const sourceFile = sourceId ? nodeMap.get(sourceId)?.editorMeta?.file : void 0;
   const blocked = /* @__PURE__ */ new Set();
   for (const containerId of projection.containerIndex.keys()) {
     if (isNonDroppableNodeMeta(nodeMap.get(containerId)?.editorMeta)) {
       blocked.add(containerId);
+      continue;
+    }
+    const containerFile = nodeMap.get(containerId)?.editorMeta?.file;
+    if (sourceFile && containerFile && containerFile !== sourceFile) {
+      blocked.add(containerId);
     }
   }
   return blocked;
 }
 function resolveRefusalCode(meta, fallback) {
-  return meta?.lockReason ?? fallback;
+  if (meta?.lockReason) return meta.lockReason;
+  if (meta?.isKitContainer) return "KIT_INTERNAL";
+  return fallback;
 }
 function buildBlockedStructuralContainerIds(projection, nodeMap, sourceContainerId) {
   const blocked = /* @__PURE__ */ new Set();
@@ -4586,6 +4598,15 @@ function resolveVidFromElement(el) {
   const key2 = getNodeKeyFromElement(el);
   return VID_PATTERN.test(key2) ? key2 : null;
 }
+function resolveVidForScannedNode(nodeId, nodeMap, fallbackEl) {
+  const scannedVid = nodeId ? nodeMap.get(nodeId)?.editorMeta?.vid : void 0;
+  if (scannedVid && VID_PATTERN.test(scannedVid)) return scannedVid;
+  return fallbackEl ? resolveVidFromElement(fallbackEl) : null;
+}
+function resolveVidForScannedNodeStrict(nodeId, nodeMap) {
+  const scannedVid = nodeId ? nodeMap.get(nodeId)?.editorMeta?.vid : void 0;
+  return scannedVid && VID_PATTERN.test(scannedVid) ? scannedVid : null;
+}
 function getInspectorRefFromElement(el) {
   const resolved = resolveDragSurface(el);
   const host = resolved.host ?? el;
@@ -8282,12 +8303,12 @@ function useDragVisualLoop({
 
 // src/client/dnd/design-mode/useDragLifecycle.ts
 var import_react13 = require("react");
-function emitRefused(code, cause, element) {
+function emitRefused(code, cause, vid) {
   dispatchRuntimeEvent({
     type: "drag-refused",
     code,
     cause,
-    vid: element ? resolveVidFromElement(element) : null
+    vid
   });
 }
 function resolveLaneAllowedContainers(anchorElement, srcContainerId) {
@@ -8361,7 +8382,8 @@ function recordCommittedMove(args) {
     sourceLaneSnapshot,
     targetLaneSnapshot,
     resolveNodeElement,
-    recordMoveChange
+    recordMoveChange,
+    nodeMap
   } = args;
   const sourceLaneIdentitySnapshot = captureCommitLaneIdentitySnapshot(
     sourceLaneSnapshot,
@@ -8406,10 +8428,10 @@ function recordCommittedMove(args) {
   });
   const componentName = getEditorMeta(anchorEl)?.componentName;
   const operationId = `${command.at}:${anchorNodeId}`;
-  const targetVid = resolveVidFromElement(selectedEl);
   const targetContainerId = command.to.parentNodeId ?? command.to.laneContainerId;
   const targetContainerEl = targetContainerId ? resolveNodeElement(targetContainerId) : null;
-  const containerVid = targetContainerEl ? resolveVidFromElement(targetContainerEl) : null;
+  const targetVid = resolveVidForScannedNode(selectedNodeId, nodeMap, selectedEl);
+  const containerVid = resolveVidForScannedNode(targetContainerId, nodeMap, targetContainerEl);
   const binding = resolveRowBinding(selectedEl);
   const beforePayload = buildMovePayloadWithEffectiveIdentities({
     placement: command.from,
@@ -8556,7 +8578,7 @@ function useDragLifecycle({
       emitRefused(
         resolveRefusalCode(found.editorMeta, "GATE_REJECT"),
         "Node is not draggable (dynamic render, chrome, or kit-origin).",
-        found.element
+        resolveVidForScannedNode(activeId, refs.nodeMapRef.current, found.element)
       );
       return;
     }
@@ -8585,7 +8607,11 @@ function useDragLifecycle({
       emitRefused(
         resolveRefusalCode(anchorScanned?.editorMeta, "GATE_REJECT"),
         "Resolved drag anchor is not draggable.",
-        anchorScanned?.element ?? found.element
+        resolveVidForScannedNode(
+          anchor.anchorNodeId,
+          refs.nodeMapRef.current,
+          anchorScanned?.element ?? found.element
+        )
       );
       return;
     }
@@ -8594,14 +8620,14 @@ function useDragLifecycle({
     const sourceCommitLane = getCommitLaneSnapshot(srcContainerId);
     const startPosition = getCurrentCommitPlacement(anchorNodeId, srcContainerId);
     const blockedContainerIds = buildBlockedStructuralContainerIds(proj, refs.nodeMapRef.current, srcContainerId);
-    for (const id of buildBlockedNodeMetaContainerIds(proj, refs.nodeMapRef.current)) {
+    for (const id of buildBlockedNodeMetaContainerIds(proj, refs.nodeMapRef.current, anchorNodeId)) {
       blockedContainerIds.add(id);
     }
     const droppableSet = computeDroppableSet(anchorNodeId, proj, refs.nodeMapRef.current);
     refs.droppableContainerIdsRef.current = droppableSet;
     dispatchRuntimeEvent({
       type: "drag-started",
-      targetVid: resolveVidFromElement(anchorScanned.element),
+      targetVid: resolveVidForScannedNode(anchorNodeId, refs.nodeMapRef.current, anchorScanned.element),
       droppable: Array.from(droppableSet)
     });
     const engineOptions = buildDragIntentEngineOptions(anchorScanned.element, srcContainerId, blockedContainerIds);
@@ -8679,11 +8705,10 @@ function useDragLifecycle({
       if (dropTargetId && !refs.droppableContainerIdsRef.current?.has(dropTargetId)) {
         const targetContainerEl = resolveNodeElement(dropTargetId);
         const targetMeta = refs.nodeMapRef.current.get(dropTargetId)?.editorMeta;
-        const fallbackCode = targetMeta?.containerKind === "expression" ? "EXPRESSION_CONTAINER" : "CONTAINER_NOT_PLAIN";
         emitRefused(
-          resolveRefusalCode(targetMeta, fallbackCode),
+          resolveRefusalCode(targetMeta, "CONTAINER_NOT_PLAIN"),
           "Drop target is outside the droppable set for this node.",
-          targetContainerEl
+          resolveVidForScannedNode(dropTargetId, refs.nodeMapRef.current, targetContainerEl)
         );
         clearDragState();
         syncHistoryAvailability();
@@ -8749,7 +8774,8 @@ function useDragLifecycle({
             sourceLaneSnapshot,
             targetLaneSnapshot,
             resolveNodeElement,
-            recordMoveChange
+            recordMoveChange,
+            nodeMap: refs.nodeMapRef.current
           });
         }
       }
@@ -8900,7 +8926,7 @@ function useResizeSession({
       return;
     }
     const inspectorRef = getInspectorRefFromElement(element);
-    const targetVid = resolveVidFromElement(element);
+    const targetVid = resolveVidForScannedNode(targetNodeId, refs.nodeMapRef.current, element);
     const resizeCmd = {
       type: "resize",
       mode,
@@ -9150,7 +9176,7 @@ function commitExternalDrop(x, y, engine, component, refs, resolveNodeElement, s
       };
     }
     const operationId = `${insertCommand.at}:${nodeId}`;
-    const containerVid = containerEl ? resolveVidFromElement(containerEl) : null;
+    const containerVid = resolveVidForScannedNodeStrict(intent.containerId, refs.nodeMapRef.current);
     const insertedVid = resolveVidFromElement(newElement);
     useDesignModeStore.getState().recordInsertChange({
       operationId,
@@ -9992,8 +10018,14 @@ function isPreviewOrigin(origin) {
 
 // src/client/inject-inspector/injectInspector.ts
 var DEFAULT_SCRIPT_ID = "archie-inspector-script";
-var REMOTE_INSPECTOR_SCRIPT_URL = "https://pub-bf238c278d9644b39ec34ecaca1d315c.r2.dev/inspector.standalone.js";
-function getInspectorScriptUrl(base, cacheBust = true) {
+var R2_INSPECTOR_BASE_URL = "https://pub-bf238c278d9644b39ec34ecaca1d315c.r2.dev";
+function readBuildVersion() {
+  return "0.1.3" ? "0.1.3" : null;
+}
+var REMOTE_INSPECTOR_VERSION = readBuildVersion();
+var isRemoteInspectorUrlVersioned = REMOTE_INSPECTOR_VERSION !== null;
+var REMOTE_INSPECTOR_SCRIPT_URL = REMOTE_INSPECTOR_VERSION ? `${R2_INSPECTOR_BASE_URL}/inspector.standalone@${REMOTE_INSPECTOR_VERSION}.js` : `${R2_INSPECTOR_BASE_URL}/inspector.standalone.js`;
+function getInspectorScriptUrl(base, cacheBust) {
   const separator = base.includes("?") ? "&" : "?";
   return cacheBust ? `${base}${separator}h=${Date.now()}` : base;
 }
@@ -10049,7 +10081,8 @@ function injectInspector(opts = {}) {
     }
   }
   const useLocal = opts.scriptSource === "local";
-  const scriptUrl = useLocal ? opts.localScriptUrl ?? "/_archie/inspector.js" : getInspectorScriptUrl(opts.scriptUrl ?? REMOTE_INSPECTOR_SCRIPT_URL, true);
+  const usingDefaultVersionedUrl = opts.scriptUrl === void 0 && isRemoteInspectorUrlVersioned;
+  const scriptUrl = useLocal ? opts.localScriptUrl ?? "/_archie/inspector.js" : getInspectorScriptUrl(opts.scriptUrl ?? REMOTE_INSPECTOR_SCRIPT_URL, !usingDefaultVersionedUrl);
   const script = document.createElement("script");
   script.id = id;
   script.src = scriptUrl;

package/dist/client/client.mjs

@@ -4200,6 +4200,7 @@ function isNonDroppableNodeMeta(meta) {
   if (meta.containerKind && meta.containerKind !== "plain") return true;
   if (meta.isChrome) return true;
   if (meta.isKitOrigin) return true;
+  if (meta.isKitContainer) return true;
   return false;
 }
 function isNonDraggableNodeMeta(meta) {
@@ -4226,26 +4227,37 @@ function collectSubtreeIds(rootId, projection) {
 }
 function computeDroppableSet(sourceId, projection, nodeMap) {
   const excluded = collectSubtreeIds(sourceId, projection);
+  const sourceFile = nodeMap.get(sourceId)?.editorMeta?.file;
   const droppable = /* @__PURE__ */ new Set();
   for (const containerId of projection.containerIndex.keys()) {
     if (excluded.has(containerId)) continue;
     if (isStructuralContainer(containerId, nodeMap)) continue;
     if (isNonDroppableNodeMeta(nodeMap.get(containerId)?.editorMeta)) continue;
+    const containerFile = nodeMap.get(containerId)?.editorMeta?.file;
+    if (sourceFile && containerFile && containerFile !== sourceFile) continue;
     droppable.add(containerId);
   }
   return droppable;
 }
-function buildBlockedNodeMetaContainerIds(projection, nodeMap) {
+function buildBlockedNodeMetaContainerIds(projection, nodeMap, sourceId) {
+  const sourceFile = sourceId ? nodeMap.get(sourceId)?.editorMeta?.file : void 0;
   const blocked = /* @__PURE__ */ new Set();
   for (const containerId of projection.containerIndex.keys()) {
     if (isNonDroppableNodeMeta(nodeMap.get(containerId)?.editorMeta)) {
       blocked.add(containerId);
+      continue;
+    }
+    const containerFile = nodeMap.get(containerId)?.editorMeta?.file;
+    if (sourceFile && containerFile && containerFile !== sourceFile) {
+      blocked.add(containerId);
     }
   }
   return blocked;
 }
 function resolveRefusalCode(meta, fallback) {
-  return meta?.lockReason ?? fallback;
+  if (meta?.lockReason) return meta.lockReason;
+  if (meta?.isKitContainer) return "KIT_INTERNAL";
+  return fallback;
 }
 function buildBlockedStructuralContainerIds(projection, nodeMap, sourceContainerId) {
   const blocked = /* @__PURE__ */ new Set();
@@ -4551,6 +4563,15 @@ function resolveVidFromElement(el) {
   const key2 = getNodeKeyFromElement(el);
   return VID_PATTERN.test(key2) ? key2 : null;
 }
+function resolveVidForScannedNode(nodeId, nodeMap, fallbackEl) {
+  const scannedVid = nodeId ? nodeMap.get(nodeId)?.editorMeta?.vid : void 0;
+  if (scannedVid && VID_PATTERN.test(scannedVid)) return scannedVid;
+  return fallbackEl ? resolveVidFromElement(fallbackEl) : null;
+}
+function resolveVidForScannedNodeStrict(nodeId, nodeMap) {
+  const scannedVid = nodeId ? nodeMap.get(nodeId)?.editorMeta?.vid : void 0;
+  return scannedVid && VID_PATTERN.test(scannedVid) ? scannedVid : null;
+}
 function getInspectorRefFromElement(el) {
   const resolved = resolveDragSurface(el);
   const host = resolved.host ?? el;
@@ -8247,12 +8268,12 @@ function useDragVisualLoop({
 
 // src/client/dnd/design-mode/useDragLifecycle.ts
 import { useState as useState5, useCallback as useCallback6 } from "react";
-function emitRefused(code, cause, element) {
+function emitRefused(code, cause, vid) {
   dispatchRuntimeEvent({
     type: "drag-refused",
     code,
     cause,
-    vid: element ? resolveVidFromElement(element) : null
+    vid
   });
 }
 function resolveLaneAllowedContainers(anchorElement, srcContainerId) {
@@ -8326,7 +8347,8 @@ function recordCommittedMove(args) {
     sourceLaneSnapshot,
     targetLaneSnapshot,
     resolveNodeElement,
-    recordMoveChange
+    recordMoveChange,
+    nodeMap
   } = args;
   const sourceLaneIdentitySnapshot = captureCommitLaneIdentitySnapshot(
     sourceLaneSnapshot,
@@ -8371,10 +8393,10 @@ function recordCommittedMove(args) {
   });
   const componentName = getEditorMeta(anchorEl)?.componentName;
   const operationId = `${command.at}:${anchorNodeId}`;
-  const targetVid = resolveVidFromElement(selectedEl);
   const targetContainerId = command.to.parentNodeId ?? command.to.laneContainerId;
   const targetContainerEl = targetContainerId ? resolveNodeElement(targetContainerId) : null;
-  const containerVid = targetContainerEl ? resolveVidFromElement(targetContainerEl) : null;
+  const targetVid = resolveVidForScannedNode(selectedNodeId, nodeMap, selectedEl);
+  const containerVid = resolveVidForScannedNode(targetContainerId, nodeMap, targetContainerEl);
   const binding = resolveRowBinding(selectedEl);
   const beforePayload = buildMovePayloadWithEffectiveIdentities({
     placement: command.from,
@@ -8521,7 +8543,7 @@ function useDragLifecycle({
       emitRefused(
         resolveRefusalCode(found.editorMeta, "GATE_REJECT"),
         "Node is not draggable (dynamic render, chrome, or kit-origin).",
-        found.element
+        resolveVidForScannedNode(activeId, refs.nodeMapRef.current, found.element)
       );
       return;
     }
@@ -8550,7 +8572,11 @@ function useDragLifecycle({
       emitRefused(
         resolveRefusalCode(anchorScanned?.editorMeta, "GATE_REJECT"),
         "Resolved drag anchor is not draggable.",
-        anchorScanned?.element ?? found.element
+        resolveVidForScannedNode(
+          anchor.anchorNodeId,
+          refs.nodeMapRef.current,
+          anchorScanned?.element ?? found.element
+        )
       );
       return;
     }
@@ -8559,14 +8585,14 @@ function useDragLifecycle({
     const sourceCommitLane = getCommitLaneSnapshot(srcContainerId);
     const startPosition = getCurrentCommitPlacement(anchorNodeId, srcContainerId);
     const blockedContainerIds = buildBlockedStructuralContainerIds(proj, refs.nodeMapRef.current, srcContainerId);
-    for (const id of buildBlockedNodeMetaContainerIds(proj, refs.nodeMapRef.current)) {
+    for (const id of buildBlockedNodeMetaContainerIds(proj, refs.nodeMapRef.current, anchorNodeId)) {
       blockedContainerIds.add(id);
     }
     const droppableSet = computeDroppableSet(anchorNodeId, proj, refs.nodeMapRef.current);
     refs.droppableContainerIdsRef.current = droppableSet;
     dispatchRuntimeEvent({
       type: "drag-started",
-      targetVid: resolveVidFromElement(anchorScanned.element),
+      targetVid: resolveVidForScannedNode(anchorNodeId, refs.nodeMapRef.current, anchorScanned.element),
       droppable: Array.from(droppableSet)
     });
     const engineOptions = buildDragIntentEngineOptions(anchorScanned.element, srcContainerId, blockedContainerIds);
@@ -8644,11 +8670,10 @@ function useDragLifecycle({
       if (dropTargetId && !refs.droppableContainerIdsRef.current?.has(dropTargetId)) {
         const targetContainerEl = resolveNodeElement(dropTargetId);
         const targetMeta = refs.nodeMapRef.current.get(dropTargetId)?.editorMeta;
-        const fallbackCode = targetMeta?.containerKind === "expression" ? "EXPRESSION_CONTAINER" : "CONTAINER_NOT_PLAIN";
         emitRefused(
-          resolveRefusalCode(targetMeta, fallbackCode),
+          resolveRefusalCode(targetMeta, "CONTAINER_NOT_PLAIN"),
           "Drop target is outside the droppable set for this node.",
-          targetContainerEl
+          resolveVidForScannedNode(dropTargetId, refs.nodeMapRef.current, targetContainerEl)
         );
         clearDragState();
         syncHistoryAvailability();
@@ -8714,7 +8739,8 @@ function useDragLifecycle({
             sourceLaneSnapshot,
             targetLaneSnapshot,
             resolveNodeElement,
-            recordMoveChange
+            recordMoveChange,
+            nodeMap: refs.nodeMapRef.current
           });
         }
       }
@@ -8865,7 +8891,7 @@ function useResizeSession({
       return;
     }
     const inspectorRef = getInspectorRefFromElement(element);
-    const targetVid = resolveVidFromElement(element);
+    const targetVid = resolveVidForScannedNode(targetNodeId, refs.nodeMapRef.current, element);
     const resizeCmd = {
       type: "resize",
       mode,
@@ -9115,7 +9141,7 @@ function commitExternalDrop(x, y, engine, component, refs, resolveNodeElement, s
       };
     }
     const operationId = `${insertCommand.at}:${nodeId}`;
-    const containerVid = containerEl ? resolveVidFromElement(containerEl) : null;
+    const containerVid = resolveVidForScannedNodeStrict(intent.containerId, refs.nodeMapRef.current);
     const insertedVid = resolveVidFromElement(newElement);
     useDesignModeStore.getState().recordInsertChange({
       operationId,
@@ -9957,8 +9983,14 @@ function isPreviewOrigin(origin) {
 
 // src/client/inject-inspector/injectInspector.ts
 var DEFAULT_SCRIPT_ID = "archie-inspector-script";
-var REMOTE_INSPECTOR_SCRIPT_URL = "https://pub-bf238c278d9644b39ec34ecaca1d315c.r2.dev/inspector.standalone.js";
-function getInspectorScriptUrl(base, cacheBust = true) {
+var R2_INSPECTOR_BASE_URL = "https://pub-bf238c278d9644b39ec34ecaca1d315c.r2.dev";
+function readBuildVersion() {
+  return "0.1.3" ? "0.1.3" : null;
+}
+var REMOTE_INSPECTOR_VERSION = readBuildVersion();
+var isRemoteInspectorUrlVersioned = REMOTE_INSPECTOR_VERSION !== null;
+var REMOTE_INSPECTOR_SCRIPT_URL = REMOTE_INSPECTOR_VERSION ? `${R2_INSPECTOR_BASE_URL}/inspector.standalone@${REMOTE_INSPECTOR_VERSION}.js` : `${R2_INSPECTOR_BASE_URL}/inspector.standalone.js`;
+function getInspectorScriptUrl(base, cacheBust) {
   const separator = base.includes("?") ? "&" : "?";
   return cacheBust ? `${base}${separator}h=${Date.now()}` : base;
 }
@@ -10014,7 +10046,8 @@ function injectInspector(opts = {}) {
     }
   }
   const useLocal = opts.scriptSource === "local";
-  const scriptUrl = useLocal ? opts.localScriptUrl ?? "/_archie/inspector.js" : getInspectorScriptUrl(opts.scriptUrl ?? REMOTE_INSPECTOR_SCRIPT_URL, true);
+  const usingDefaultVersionedUrl = opts.scriptUrl === void 0 && isRemoteInspectorUrlVersioned;
+  const scriptUrl = useLocal ? opts.localScriptUrl ?? "/_archie/inspector.js" : getInspectorScriptUrl(opts.scriptUrl ?? REMOTE_INSPECTOR_SCRIPT_URL, !usingDefaultVersionedUrl);
   const script = document.createElement("script");
   script.id = id;
   script.src = scriptUrl;

package/dist/collection-binding.mjs

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

package/dist/index.d.mts

@@ -165,6 +165,23 @@ interface EditorMetaPluginOptions {
      * @default true
      */
     allowLegacyIds?: boolean;
+    /**
+     * Called at most once per file, the first time a `JSXOpeningElement` has
+     * no well-formed `data-vid`. Signal only — never itself changes
+     * instrumentation. `instrumented` reports what THIS element gets right
+     * after the callback returns: `true` when it falls back to legacy
+     * `file:line:col:componentName` addressing (`allowLegacyIds` true, the
+     * default), `false` when the plugin declines to instrument it at all
+     * (`allowLegacyIds: false`) — the callback fires before that decision, so
+     * a caller cannot infer it from call order alone.
+     */
+    onMissingVid?: (info: {
+        file: string;
+        line: number;
+        col: number;
+        componentName: string;
+        instrumented: boolean;
+    }) => void;
 }
 declare function babelPluginEditorMeta({ types: t }: {
     types: typeof types;
@@ -644,6 +661,14 @@ interface EditorMeta {
      * writable, static, non-chrome, non-kit element.
      */
     lockReason?: 'KIT_INTERNAL' | 'DYNAMIC_ARRAY' | 'DYNAMIC_CONDITIONAL' | 'CHROME_STRUCTURAL' | 'EXPRESSION_CONTAINER';
+    /**
+     * `true` when this element's own tag is a Kit component instance
+     * (`isKitComponentTagName` in `babel-plugin-editor-meta.ts`). Devtools-local
+     * only, not in the `.strict()` NodeMeta protocol schema, and never folded
+     * into `isKitOrigin`/`lockReason` — it blocks this element as a drop
+     * CONTAINER only, not the element's own draggability/inspectability.
+     */
+    isKitContainer?: boolean;
 }
 
 interface ArchieDevToolsOptions {

package/dist/index.d.ts

@@ -165,6 +165,23 @@ interface EditorMetaPluginOptions {
      * @default true
      */
     allowLegacyIds?: boolean;
+    /**
+     * Called at most once per file, the first time a `JSXOpeningElement` has
+     * no well-formed `data-vid`. Signal only — never itself changes
+     * instrumentation. `instrumented` reports what THIS element gets right
+     * after the callback returns: `true` when it falls back to legacy
+     * `file:line:col:componentName` addressing (`allowLegacyIds` true, the
+     * default), `false` when the plugin declines to instrument it at all
+     * (`allowLegacyIds: false`) — the callback fires before that decision, so
+     * a caller cannot infer it from call order alone.
+     */
+    onMissingVid?: (info: {
+        file: string;
+        line: number;
+        col: number;
+        componentName: string;
+        instrumented: boolean;
+    }) => void;
 }
 declare function babelPluginEditorMeta({ types: t }: {
     types: typeof types;
@@ -644,6 +661,14 @@ interface EditorMeta {
      * writable, static, non-chrome, non-kit element.
      */
     lockReason?: 'KIT_INTERNAL' | 'DYNAMIC_ARRAY' | 'DYNAMIC_CONDITIONAL' | 'CHROME_STRUCTURAL' | 'EXPRESSION_CONTAINER';
+    /**
+     * `true` when this element's own tag is a Kit component instance
+     * (`isKitComponentTagName` in `babel-plugin-editor-meta.ts`). Devtools-local
+     * only, not in the `.strict()` NodeMeta protocol schema, and never folded
+     * into `isKitOrigin`/`lockReason` — it blocks this element as a drop
+     * CONTAINER only, not the element's own draggability/inspectability.
+     */
+    isKitContainer?: boolean;
 }
 
 interface ArchieDevToolsOptions {