nudge-ui 0.2.2 → 0.2.4

package/dist/inspector/overlay/interactionStyles.js

@@ -1,8 +1,10 @@
+import { DESIGN_SELECT_CURSOR, INTERACTION_CURSOR_PROPERTY } from "../ui/customCursors.js";
 const INTERACTION_STYLE_ID = "nudge-ui-interaction-styles";
 const interactionStyleDocuments = new Set();
 const INTERACTION_CSS = `
+  html, body,
   [data-cid], [data-cid] * {
-    cursor: default !important;
+    cursor: var(${INTERACTION_CURSOR_PROPERTY}, ${DESIGN_SELECT_CURSOR}) !important;
     -webkit-user-select: none !important;
     user-select: none !important;
   }

package/dist/inspector/overlay/spacingGestures.d.ts

@@ -30,9 +30,21 @@ export interface SpacingDescriptor {
 export declare const SPACING_GUIDE_HANDLE_LENGTH = 40;
 /** Finds the spacing target under a document-local pointer location. */
 export declare function getSpacingAffordanceAtPoint(doc: Document, x: number, y: number): SpacingAffordance | null;
+/** Finds the spacing target whose visible padding or gap area contains the
+ * pointer, even when the pointer is outside the drag handle. Hover previews use
+ * this; drags and the resize cursor still require the handle hit from
+ * getSpacingAffordanceAtPoint. */
+export declare function getSpacingHoverAtPoint(doc: Document, x: number, y: number): SpacingAffordance | null;
 /** Re-resolves a renderer-reported spacing descriptor in its owner document. */
 export declare function getSpacingAffordanceForDescriptor(element: HTMLElement, descriptor: SpacingDescriptor): SpacingAffordance | null;
-/** Calculates a direct-manipulation value, optionally stepping changes by 8px. */
+/**
+ * Calculates a direct-manipulation value, optionally stepping changes by 8px.
+ * While Shift is held the value snaps to a step anchor: the first displacement
+ * picks the nearest multiple of 8 from the authored value in the drag
+ * direction (ties resolve upward), and further movement adds whole 8px steps
+ * from that anchor, so the result is always a multiple of 8 once the drag
+ * moves. At the exact start point the authored value is preserved.
+ */
 export declare function spacingValueForDrag(affordance: Pick<SpacingAffordance, "dragAxis" | "direction" | "value">, start: {
     x: number;
     y: number;

package/dist/inspector/overlay/spacingGestures.js

@@ -263,6 +263,52 @@ function gapDragHit(segment) {
     const orientation = segment.axis === "horizontal" ? "vertical" : "horizontal";
     return guideHit(gapGuide(segment), orientation);
 }
+/** Matches the padding bar whose visible area contains the pointer, whether or
+ * not the point is inside the drag handle. Returns the first side by the same
+ * priority order as the drag affordances so both paths agree on overlaps. */
+function paddingAffordanceInAreaAtPoint(element, x, y) {
+    const model = boxModel(element);
+    if (!containsPoint(model.outer, x, y))
+        return null;
+    const sides = ["top", "right", "bottom", "left"];
+    for (const side of sides) {
+        const affordance = paddingAffordanceForSide(element, side, model);
+        if (affordance
+            && affordance.affectedAreas.some((area) => containsRectPoint(area, x, y))) {
+            return affordance;
+        }
+    }
+    return null;
+}
+/** Matches a layout gap whose visible area contains the pointer, whether or not
+ * the point is inside the drag handle. Shares segment priority and geometry
+ * with gapAffordanceAtPoint so hover and drag agree on crossed gap properties. */
+function gapAffordanceInAreaAtPoint(element, x, y) {
+    const segments = gapSegments(element);
+    if (segments.length === 0)
+        return null;
+    const candidate = segments.find((segment) => containsRectPoint(gapArea(segment), x, y));
+    if (!candidate)
+        return null;
+    const matchingSegments = segments.filter((segment) => segment.property === candidate.property);
+    const first = matchingSegments[0];
+    const guide = gapGuide(first);
+    return {
+        kind: "gap",
+        property: first.property,
+        side: null,
+        axis: first.axis,
+        dragAxis: first.axis === "horizontal" ? "x" : "y",
+        value: gapValue(getElementComputedStyle(element), first.property),
+        cursor: first.axis === "horizontal" ? "ew-resize" : "ns-resize",
+        guide,
+        affectedGuides: matchingSegments.map(gapGuide),
+        affectedAreas: matchingSegments.map(gapArea),
+        hit: gapDragHit(first),
+        direction: 1,
+        element,
+    };
+}
 function gapValue(style, property) {
     const direct = style.getPropertyValue(property)
         || (property === "row-gap" ? style.rowGap : style.columnGap);
@@ -313,6 +359,24 @@ export function getSpacingAffordanceAtPoint(doc, x, y) {
     }
     return null;
 }
+/** Finds the spacing target whose visible padding or gap area contains the
+ * pointer, even when the pointer is outside the drag handle. Hover previews use
+ * this; drags and the resize cursor still require the handle hit from
+ * getSpacingAffordanceAtPoint. */
+export function getSpacingHoverAtPoint(doc, x, y) {
+    const candidates = trackedElementsAtPoint(doc, x, y);
+    for (const element of candidates) {
+        const padding = paddingAffordanceInAreaAtPoint(element, x, y);
+        if (padding)
+            return padding;
+    }
+    for (const element of candidates) {
+        const gap = gapAffordanceInAreaAtPoint(element, x, y);
+        if (gap)
+            return gap;
+    }
+    return null;
+}
 /** Re-resolves a renderer-reported spacing descriptor in its owner document. */
 export function getSpacingAffordanceForDescriptor(element, descriptor) {
     if (descriptor.kind === "padding") {
@@ -329,14 +393,27 @@ export function getSpacingAffordanceForDescriptor(element, descriptor) {
     const guide = gapGuide(segment);
     return gapAffordanceAtPoint(element, guide.left + guide.width / 2, guide.top + guide.height / 2, descriptor.property);
 }
-/** Calculates a direct-manipulation value, optionally stepping changes by 8px. */
+/**
+ * Calculates a direct-manipulation value, optionally stepping changes by 8px.
+ * While Shift is held the value snaps to a step anchor: the first displacement
+ * picks the nearest multiple of 8 from the authored value in the drag
+ * direction (ties resolve upward), and further movement adds whole 8px steps
+ * from that anchor, so the result is always a multiple of 8 once the drag
+ * moves. At the exact start point the authored value is preserved.
+ */
 export function spacingValueForDrag(affordance, start, point, shiftKey = false) {
     const delta = affordance.dragAxis === "x" ? point.x - start.x : point.y - start.y;
     const signedDelta = delta * affordance.direction;
-    const adjustedDelta = shiftKey
-        ? Math.trunc(signedDelta / SPACING_SHIFT_STEP) * SPACING_SHIFT_STEP
-        : signedDelta;
-    return Math.max(0, Math.round(affordance.value + adjustedDelta));
+    if (shiftKey) {
+        const step = SPACING_SHIFT_STEP;
+        if (signedDelta !== 0) {
+            const anchor = signedDelta > 0
+                ? Math.ceil(affordance.value / step) * step
+                : Math.floor(affordance.value / step) * step;
+            return Math.max(0, anchor + Math.trunc(signedDelta / step) * step);
+        }
+    }
+    return Math.max(0, Math.round(affordance.value + signedDelta));
 }
 export function spacingValueCss(value) {
     return `${Math.max(0, Math.round(value))}px`;

package/dist/inspector/projection/{workspaceProjection.d.ts → draftProjection.d.ts}

@@ -3,8 +3,8 @@ import type { RenderedInstanceOverride } from "../changes/editModel.js";
 import { type StructuralChange } from "./structuralProjection.js";
 import type { ComponentOverride } from "../componentSemantics/types.js";
 import { type TextContentChangeRecord } from "../changes/types.js";
-import type { WorkspaceContents } from "../changes/workspaceChanges.js";
-export interface WorkspaceProjectionSource extends WorkspaceContents {
+import type { DraftContents } from "../changes/draftChanges.js";
+export interface DraftProjectionSource extends DraftContents {
     readonly revision: number;
 }
 export interface CompiledManagedStyles {
@@ -15,7 +15,7 @@ export interface SerializedManagedStyles {
     readonly css: string;
 }
 /** A complete, read-only projection for one document-local runtime. */
-export interface WorkspaceProjectionPlan<ManagedStyles> {
+export interface DraftProjectionPlan<ManagedStyles> {
     readonly sourceRevision: number;
     readonly managedStyles: ManagedStyles;
     readonly instanceOverrides: readonly RenderedInstanceOverride[];
@@ -31,7 +31,7 @@ export interface DocumentProjectionAdapter<ManagedStyles> {
     applyComponents(overrides: readonly ComponentOverride[]): void;
     applyManagedStyles(styles: ManagedStyles): void;
 }
-export declare function compileWorkspaceProjection(snapshot: WorkspaceProjectionSource): WorkspaceProjectionPlan<CompiledManagedStyles>;
+export declare function compileDraftProjection(snapshot: DraftProjectionSource): DraftProjectionPlan<CompiledManagedStyles>;
 /**
  * Replaces one document projection in the required order.
  *
@@ -39,5 +39,5 @@ export declare function compileWorkspaceProjection(snapshot: WorkspaceProjection
  * can depend on the restored element order. Managed CSS is applied last so
  * selectors can use the document-local instance markers installed above.
  */
-export declare function applyWorkspaceProjection<ManagedStyles>(adapter: DocumentProjectionAdapter<ManagedStyles>, plan: WorkspaceProjectionPlan<ManagedStyles>): void;
-export declare function applyHostWorkspaceProjection(plan: WorkspaceProjectionPlan<CompiledManagedStyles>): void;
+export declare function applyDraftProjection<ManagedStyles>(adapter: DocumentProjectionAdapter<ManagedStyles>, plan: DraftProjectionPlan<ManagedStyles>): void;
+export declare function applyHostDraftProjection(plan: DraftProjectionPlan<CompiledManagedStyles>): void;

package/dist/inspector/projection/{workspaceProjection.js → draftProjection.js}

@@ -6,7 +6,7 @@ import { replaceComponentOverrideProjection } from "../componentSemantics/index.
 import { componentChangeToOverride } from "../componentSemantics/changeModel.js";
 import { isComponentChange } from "../changes/types.js";
 import { buildManagedStyleRules } from "../changes/managedStyleProjection.js";
-export function compileWorkspaceProjection(snapshot) {
+export function compileDraftProjection(snapshot) {
     const changes = [...snapshot.changes];
     const rules = buildManagedStyleRules(changes);
     return {
@@ -31,7 +31,7 @@ export function compileWorkspaceProjection(snapshot) {
  * can depend on the restored element order. Managed CSS is applied last so
  * selectors can use the document-local instance markers installed above.
  */
-export function applyWorkspaceProjection(adapter, plan) {
+export function applyDraftProjection(adapter, plan) {
     adapter.applyStructural(plan.structuralChanges);
     adapter.applyRenderedInstances(plan.instanceOverrides);
     adapter.applyText(plan.textContentChanges);
@@ -53,6 +53,6 @@ const hostDocumentProjectionAdapter = {
         applyRules([...styles.rules]);
     },
 };
-export function applyHostWorkspaceProjection(plan) {
-    applyWorkspaceProjection(hostDocumentProjectionAdapter, plan);
+export function applyHostDraftProjection(plan) {
+    applyDraftProjection(hostDocumentProjectionAdapter, plan);
 }

package/dist/inspector/projection/renderedInstance.d.ts

@@ -1,3 +1,4 @@
+import type { FrameProjection } from "../canvas/projection.js";
 import type { RenderedInstanceOverride, RenderedInstanceRef } from "../changes/editModel.js";
 export { isRenderedInstanceOverride, isRenderedInstanceRef } from "../changes/editModel.js";
 export type { RenderedInstanceOverride, RenderedInstanceRef, SourceSiteRef } from "../changes/editModel.js";
@@ -22,10 +23,23 @@ export declare function captureRenderedInstance(el: HTMLElement): RenderedInstan
 /**
  * Resolves exactly one element, or declines to apply. Occurrence documents the
  * captured placement, but structural previews can legitimately change it.
- * Evidence must therefore identify one current candidate before an edit can
- * be applied.
+ * Evidence, narrowed by a recorded invocation when present, must therefore
+ * identify one current candidate before an edit can be applied.
  */
 export declare function resolveRenderedInstance(doc: Document, ref: RenderedInstanceRef): ResolutionResult;
+/**
+ * Resolves a reference whose source position may have moved since capture.
+ * A relocated site still renders matching authored evidence, so an evidence
+ * miss there is reported as ambiguous rather than as proof of absence.
+ */
+export declare function resolveMovedRenderedInstance(doc: Document, ref: RenderedInstanceRef): ResolutionResult;
+/**
+ * Captures identity for a structural target. When evidence matches several
+ * identical outputs, the nearest component invocation whose entire output is
+ * this element can still identify it. Otherwise the evidence-only reference
+ * is returned and resolves as ambiguous.
+ */
+export declare function captureStructuralTarget(el: HTMLElement): RenderedInstanceRef | null;
 /** Checks stable source/evidence fields without treating a post-move ordinal as identity. */
 export declare function matchesRenderedInstanceEvidence(el: HTMLElement, ref: RenderedInstanceRef): boolean;
 /** Builds an instance override without changing the element's transient edit scope. */
@@ -50,7 +64,7 @@ export declare function getRenderedInstanceProjectionReports(doc: Document): rea
 /** Diagnostics arrive independently when a renderer reports or React reconciles. */
 export declare function subscribeRenderedInstanceDiagnostics(listener: () => void): () => void;
 export declare function getRenderedInstanceDiagnosticRevision(): number;
-export declare function recordCanvasRenderedInstanceProjectionReports(cardId: string, revision: number, reports: readonly DocumentProjectionReport[]): void;
+export declare function recordCanvasRenderedInstanceProjectionReports(cardId: string, revision: number, reports: readonly DocumentProjectionReport[], projection?: FrameProjection): void;
 export declare function clearCanvasRenderedInstanceProjectionReports(cardId: string): void;
 export declare function getRenderedInstanceChangeDiagnostics(overrideId: string): RenderedInstanceChangeDiagnostic[];
 export declare function isDocumentProjectionReport(value: unknown): value is DocumentProjectionReport;

package/dist/inspector/projection/renderedInstance.js

@@ -1,6 +1,8 @@
+import { getActiveDraftChanges, getDraftChanges } from "../changes/draftChanges.js";
+import { inspectRootInvocations } from "../componentSemantics/adapterRegistry.js";
 import { escapeAttrValue } from "./cssEscapes.js";
 import { isNudgeUiDev } from "../runtime/devFlag.js";
-import { sourceSiteSelector } from "../selection/sourceSite.js";
+import { relocateSourceSite, sourceSiteSelector } from "../selection/sourceSite.js";
 import { isRenderedInstanceOverride } from "../changes/editModel.js";
 export { isRenderedInstanceOverride, isRenderedInstanceRef } from "../changes/editModel.js";
 const PROJECTION_ATTR = "data-projection-instance";
@@ -49,19 +51,31 @@ export function captureRenderedInstance(el) {
 /**
  * Resolves exactly one element, or declines to apply. Occurrence documents the
  * captured placement, but structural previews can legitimately change it.
- * Evidence must therefore identify one current candidate before an edit can
- * be applied.
+ * Evidence, narrowed by a recorded invocation when present, must therefore
+ * identify one current candidate before an edit can be applied.
  */
 export function resolveRenderedInstance(doc, ref) {
     const sourceCandidates = candidates(doc, ref.sourceSite);
-    const { props, text, ariaLabel = null } = ref.locator;
+    const { props, text, ariaLabel = null, invocation } = ref.locator;
     // An ordinal alone is not an identity for a repeated source site.
-    if (sourceCandidates.length > 1 && props === null && text === null && ariaLabel === null) {
+    if (!invocation && sourceCandidates.length > 1 && props === null && text === null && ariaLabel === null) {
         return { status: "ambiguous" };
     }
-    const matchingEvidence = sourceCandidates.filter((element) => element.getAttribute("data-cprops") === props
+    let matchingEvidence = sourceCandidates.filter((element) => element.getAttribute("data-cprops") === props
         && normalizedText(element) === text
         && element.getAttribute("aria-label") === ariaLabel);
+    if (invocation) {
+        const scoped = [];
+        for (const element of matchingEvidence) {
+            const invocations = inspectRootInvocations(element);
+            // Without readable ancestry, absence of the invocation proves nothing.
+            if (invocations === null)
+                return { status: "ambiguous" };
+            if (invocations.some((candidate) => candidate.callsiteId === invocation.callsiteId))
+                scoped.push(element);
+        }
+        matchingEvidence = scoped;
+    }
     if (matchingEvidence.length === 0)
         return { status: "missing" };
     // Evidence alone is never enough to choose between two identical rendered
@@ -71,11 +85,45 @@ export function resolveRenderedInstance(doc, ref) {
         return { status: "ambiguous" };
     return { status: "resolved", element: matchingEvidence[0] };
 }
+/**
+ * Resolves a reference whose source position may have moved since capture.
+ * A relocated site still renders matching authored evidence, so an evidence
+ * miss there is reported as ambiguous rather than as proof of absence.
+ */
+export function resolveMovedRenderedInstance(doc, ref) {
+    const exact = resolveRenderedInstance(doc, ref);
+    if (exact.status !== "missing")
+        return exact;
+    const { props, ariaLabel = null } = ref.locator;
+    const sourceSite = relocateSourceSite(doc, ref.sourceSite, (element) => element.getAttribute("data-cprops") === props && element.getAttribute("aria-label") === ariaLabel);
+    if (!sourceSite)
+        return exact;
+    const moved = resolveRenderedInstance(doc, { ...ref, sourceSite });
+    return moved.status === "missing" ? { status: "ambiguous" } : moved;
+}
+/**
+ * Captures identity for a structural target. When evidence matches several
+ * identical outputs, the nearest component invocation whose entire output is
+ * this element can still identify it. Otherwise the evidence-only reference
+ * is returned and resolves as ambiguous.
+ */
+export function captureStructuralTarget(el) {
+    const ref = captureRenderedInstance(el);
+    if (!ref || resolveRenderedInstance(el.ownerDocument, ref).status !== "ambiguous")
+        return ref;
+    for (const invocation of inspectRootInvocations(el) ?? []) {
+        const scoped = { ...ref, locator: { ...ref.locator, invocation } };
+        const resolved = resolveRenderedInstance(el.ownerDocument, scoped);
+        if (resolved.status === "resolved" && resolved.element === el)
+            return scoped;
+    }
+    return ref;
+}
 /** Checks stable source/evidence fields without treating a post-move ordinal as identity. */
 export function matchesRenderedInstanceEvidence(el, ref) {
     const { props, text, ariaLabel = null } = ref.locator;
-    return el.getAttribute("data-cid") === ref.sourceSite.cid
-        && el.getAttribute("data-src") === ref.sourceSite.src
+    return (el.getAttribute("data-cid") ?? "") === ref.sourceSite.cid
+        && (el.getAttribute("data-src") ?? "") === ref.sourceSite.src
         && el.getAttribute("data-cprops") === props
         && normalizedText(el) === text
         && el.getAttribute("aria-label") === ariaLabel;
@@ -254,10 +302,10 @@ export function subscribeRenderedInstanceDiagnostics(listener) {
 export function getRenderedInstanceDiagnosticRevision() {
     return diagnosticRevision;
 }
-export function recordCanvasRenderedInstanceProjectionReports(cardId, revision, reports) {
+export function recordCanvasRenderedInstanceProjectionReports(cardId, revision, reports, projection) {
     if (!Number.isSafeInteger(revision) || revision < 0 || !reports.every(isDocumentProjectionReport))
         return;
-    const expected = new Set(canonicalOverrides.keys());
+    const expected = projection ? new Set(projection.instanceOverrides.map((record) => record.id)) : new Set(canonicalOverrides.keys());
     if (reports.length !== expected.size || new Set(reports.map((report) => report.overrideId)).size !== reports.length
         || reports.some((report) => !expected.has(report.overrideId)))
         return;
@@ -267,7 +315,8 @@ export function recordCanvasRenderedInstanceProjectionReports(cardId, revision,
     const next = reports.map((report) => ({ ...report }));
     if (existing && existing.revision === revision && sameReports(existing.reports, next))
         return;
-    reportsByCanvasCard.set(cardId, { revision, reports: next });
+    const current = getActiveDraftChanges();
+    reportsByCanvasCard.set(cardId, { revision, reports: next, draftId: projection?.draftId ?? current.draftId, draftRevision: projection?.draftRevision ?? current.revision });
     notifyDiagnostics();
 }
 export function clearCanvasRenderedInstanceProjectionReports(cardId) {
@@ -281,6 +330,8 @@ export function getRenderedInstanceChangeDiagnostics(overrideId) {
     if (host)
         diagnostics.push({ ...host, document: "Inspect" });
     for (const [cardId, entry] of reportsByCanvasCard) {
+        if (entry.draftId !== getActiveDraftChanges().draftId || entry.draftRevision !== getDraftChanges(entry.draftId).revision)
+            continue;
         const report = entry.reports.find((candidate) => candidate.overrideId === overrideId);
         if (report)
             diagnostics.push({ ...report, document: `Canvas ${cardId}` });

package/dist/inspector/projection/structuralProjection.d.ts

@@ -1,3 +1,4 @@
+import type { FrameProjection } from "../canvas/projection.js";
 import type { StructuralChange, StructuralDelete, StructuralMove, StructuralProjectionReason, StructuralProjectionReport } from "../changes/structuralTypes.js";
 export { isStructuralChange, isStructuralDelete, isStructuralMove, isStructuralProjectionReport, } from "./structuralProjectionBoundary.js";
 /**
@@ -76,7 +77,7 @@ export declare function getStructuralProjectionReports(doc: Document): readonly
  * Frames may report only their document-local outcome. The controller owns
  * these reports and filters them against its current canonical change set.
  */
-export declare function recordCanvasStructuralProjectionReports(cardId: string, revision: number, reports: readonly StructuralProjectionReport[]): void;
+export declare function recordCanvasStructuralProjectionReports(cardId: string, revision: number, reports: readonly StructuralProjectionReport[], projection?: FrameProjection): void;
 export declare function clearCanvasStructuralProjectionReports(cardId: string): void;
 /** Removes document-local reports for canonical intents that no longer exist. */
 export declare function pruneStructuralProjectionReports(changeIds: ReadonlySet<string>): void;

package/dist/inspector/projection/structuralProjection.js

@@ -1,6 +1,7 @@
-import { captureRenderedInstance, matchesRenderedInstanceEvidence, resolveRenderedInstance, } from "./renderedInstance.js";
+import { getActiveDraftChanges, getDraftChanges } from "../changes/draftChanges.js";
+import { captureRenderedInstance, captureStructuralTarget, matchesRenderedInstanceEvidence, resolveRenderedInstance, } from "./renderedInstance.js";
 import { isStructuralProjectionReport } from "./structuralProjectionBoundary.js";
-import { resetWorkspaceChanges, workspaceChangeStore, } from "../changes/workspaceChanges.js";
+import { resetDraftChanges, draftChangeStore, } from "../changes/draftChanges.js";
 export { isStructuralChange, isStructuralDelete, isStructuralMove, isStructuralProjectionReport, } from "./structuralProjectionBoundary.js";
 const VOID_PARENT_TAGS = new Set([
     "area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta", "param", "source", "track", "wbr",
@@ -181,7 +182,7 @@ function projectStructuralChanges(snapshot) {
 }
 /** Captures a delete intent once, in the controller, at the user gesture. */
 export function createStructuralDelete(element, id = structuralId()) {
-    const target = captureRenderedInstance(element);
+    const target = captureStructuralTarget(element);
     if (!target)
         return null;
     const route = documentRoute(element.ownerDocument);
@@ -193,9 +194,9 @@ export function createStructuralDelete(element, id = structuralId()) {
         ...(route ? { route } : {}),
         ...(state ? { state } : {}),
     };
-    if (!workspaceChangeStore.commitStructuralChange(change))
+    if (!draftChangeStore.commitStructuralChange(change))
         return null;
-    projectStructuralChanges(workspaceChangeStore.getSnapshot());
+    projectStructuralChanges(draftChangeStore.getSnapshot());
     return change;
 }
 /**
@@ -236,22 +237,22 @@ export function createStructuralMove(element, destination, id = structuralId())
                 : destinationChildren.length - (sameParent ? 1 : 0),
         },
     };
-    if (!workspaceChangeStore.commitStructuralChange(change))
+    if (!draftChangeStore.commitStructuralChange(change))
         return null;
-    projectStructuralChanges(workspaceChangeStore.getSnapshot());
+    projectStructuralChanges(draftChangeStore.getSnapshot());
     return change;
 }
 export function getStructuralChanges() {
-    return workspaceChangeStore.getSnapshot().structuralChanges;
+    return draftChangeStore.getSnapshot().structuralChanges;
 }
 export function getStructuralDeletes() {
     return getStructuralChanges().filter((change) => change.kind === "delete");
 }
 /** Revert removes one canonical intent and leaves every other intent intact. */
 export function revertStructuralChange(changeId) {
-    const changed = workspaceChangeStore.revertStructuralChangeRecord(changeId);
+    const changed = draftChangeStore.revertStructuralChangeRecord(changeId);
     if (changed)
-        projectStructuralChanges(workspaceChangeStore.getSnapshot());
+        projectStructuralChanges(draftChangeStore.getSnapshot());
     return changed;
 }
 /**
@@ -265,10 +266,10 @@ export function revertStructuralChange(changeId) {
 export function reconcileVerifiedStructuralChanges(verifiedIds) {
     if (verifiedIds.size === 0)
         return 0;
-    const removed = workspaceChangeStore.reconcileWorkspaceChanges(new Set(), verifiedIds);
+    const removed = draftChangeStore.reconcileActiveDraftChanges(new Set(), verifiedIds);
     if (removed === 0)
         return 0;
-    projectStructuralChanges(workspaceChangeStore.getSnapshot());
+    projectStructuralChanges(draftChangeStore.getSnapshot());
     for (const [cardId, canvasReports] of reportsByCanvasCard) {
         reportsByCanvasCard.set(cardId, {
             ...canvasReports,
@@ -280,7 +281,7 @@ export function reconcileVerifiedStructuralChanges(verifiedIds) {
 }
 /** State changes drive controller-to-renderer projection. Diagnostics do not. */
 export function subscribeStructuralChanges(listener) {
-    return workspaceChangeStore.subscribe(listener);
+    return draftChangeStore.subscribe(listener);
 }
 /** Compatibility name retained while the controller moved to a full union. */
 export const subscribeStructuralDeletes = subscribeStructuralChanges;
@@ -549,10 +550,10 @@ export function getStructuralProjectionReports(doc) {
  * Frames may report only their document-local outcome. The controller owns
  * these reports and filters them against its current canonical change set.
  */
-export function recordCanvasStructuralProjectionReports(cardId, revision, reports) {
+export function recordCanvasStructuralProjectionReports(cardId, revision, reports, projection) {
     if (!Number.isSafeInteger(revision) || revision < 0 || !reports.every(isStructuralProjectionReport))
         return;
-    const expected = new Set(getStructuralChanges().map((change) => change.id));
+    const expected = projection ? new Set(projection.structuralChanges.map((record) => record.id)) : new Set(getStructuralChanges().map((change) => change.id));
     if (reports.length !== expected.size || new Set(reports.map((report) => report.changeId)).size !== reports.length
         || reports.some((report) => !expected.has(report.changeId)))
         return;
@@ -562,7 +563,8 @@ export function recordCanvasStructuralProjectionReports(cardId, revision, report
     const next = reports.map((report) => ({ ...report }));
     if (existing && existing.revision === revision && sameReports(existing.reports, next))
         return;
-    reportsByCanvasCard.set(cardId, { revision, reports: next });
+    const current = getActiveDraftChanges();
+    reportsByCanvasCard.set(cardId, { revision, reports: next, draftId: projection?.draftId ?? current.draftId, draftRevision: projection?.draftRevision ?? current.revision });
     notifyDiagnostics();
 }
 export function clearCanvasStructuralProjectionReports(cardId) {
@@ -594,6 +596,8 @@ export function getStructuralChangeDiagnostics(changeId) {
     if (host)
         diagnostics.push({ ...host, document: "Inspect" });
     for (const [cardId, entry] of reportsByCanvasCard) {
+        if (entry.draftId !== getActiveDraftChanges().draftId || entry.draftRevision !== getDraftChanges(entry.draftId).revision)
+            continue;
         const report = entry.reports.find((candidate) => candidate.changeId === changeId);
         if (report)
             diagnostics.push({ ...report, document: `Canvas ${cardId}` });
@@ -615,7 +619,7 @@ export function resetStructuralDeleteProjection() {
     reportsByCanvasCard.clear();
     nextStructuralId = 1;
     diagnosticRevision = 0;
-    resetWorkspaceChanges();
+    resetDraftChanges();
     notifyDiagnostics();
 }
 /**

package/dist/inspector/projection/textProjection.d.ts

@@ -1,3 +1,4 @@
+import type { FrameProjection } from "../canvas/projection.js";
 import { isTextProjectionTargetValue, type TextContentChangeRecord, type TextProjectionTarget, type TextProjectionScope, type TextBindingEvidence } from "../inline-text/textChangeBoundary.js";
 /** Strict JSON boundary guard for a text projection target. */
 export declare const isTextProjectionTarget: typeof isTextProjectionTargetValue;
@@ -48,7 +49,7 @@ export declare function setCanonicalTextContentChanges(changes: ReadonlyArray<Te
 export declare function getTextProjectionReports(doc: Document): readonly TextProjectionReport[];
 export declare function subscribeTextProjectionDiagnostics(listener: () => void): () => void;
 export declare function getTextProjectionDiagnosticRevision(): number;
-export declare function recordCanvasTextProjectionReports(cardId: string, revision: number, reports: readonly TextProjectionReport[]): void;
+export declare function recordCanvasTextProjectionReports(cardId: string, revision: number, reports: readonly TextProjectionReport[], projection?: FrameProjection): void;
 export declare function clearCanvasTextProjectionReports(cardId: string): void;
 export declare function getTextContentChangeDiagnostics(changeId: string): TextContentProjectionDiagnostic[];
 export declare function isTextProjectionReport(value: unknown): value is TextProjectionReport;