@orbat-mapper/tactical-draw 0.2.0-alpha.34 → 0.2.0-alpha.36

package/dist/index.mjs

@@ -1,219 +1,4 @@
 import { applyBoxTransformOptions, canonicalTextAmplifierKey, cloneControlMeasure, controlMeasureIdFromFeature, freezeOrientationOptions, getControlMeasureMetadata, getDefaultOptions, renderControlMeasure, resolveAmplifierPlacement, resolveStyleHints, roundToFixed } from "@orbat-mapper/control-measures";
-//#region src/base-map-adapter.ts
-/**
-* Abstract base class shared by all `MapAdapter` implementations.
-*
-* Owns shared bookkeeping (layer registry, feature cache, event-token
-* tracking) and orchestrates the public methods over a small
-* protected primitive surface that subclasses implement. See
-* `docs/adr/0001-map-adapter-base-class.md` for the rationale, in particular
-* around the `applyFeatureOps` primitive shape.
-*/
-var BaseMapAdapter = class {
-	layers = /* @__PURE__ */ new Map();
-	eventTokens = /* @__PURE__ */ new Map();
-	viewChangeTokens = /* @__PURE__ */ new Map();
-	featureCache = /* @__PURE__ */ new Map();
-	featuresChangedListeners = /* @__PURE__ */ new Map();
-	iconResources = /* @__PURE__ */ new Map();
-	layerIconResourceIds = /* @__PURE__ */ new Map();
-	layerCounter = 0;
-	destroyed = false;
-	nextLayerId() {
-		return `layer-${++this.layerCounter}`;
-	}
-	addVectorLayer(options) {
-		const id = this.nextLayerId();
-		const handle = this.createLayer(id, options?.style);
-		this.layers.set(id, handle);
-		this.featureCache.set(id, []);
-		return id;
-	}
-	removeLayer(layerId) {
-		const handle = this.layers.get(layerId);
-		if (!handle) return;
-		this.destroyLayer(handle);
-		this.layers.delete(layerId);
-		this.featureCache.delete(layerId);
-		this.featuresChangedListeners.delete(layerId);
-		this.layerIconResourceIds.delete(layerId);
-		this.pruneIconResources();
-	}
-	reconcileLayerIconResources(layerId, resources) {
-		if (!this.layers.has(layerId)) return;
-		const ids = /* @__PURE__ */ new Set();
-		for (const resource of resources) {
-			ids.add(resource.id);
-			this.iconResources.set(resource.id, resource);
-		}
-		this.layerIconResourceIds.set(layerId, ids);
-		this.applyIconResources(resources);
-		this.pruneIconResources();
-	}
-	setLayerFeatures(layerId, features) {
-		if (!this.layers.has(layerId)) return;
-		const next = [...features];
-		this.featureCache.set(layerId, next);
-		this.applyFeatureOps(layerId, {
-			adds: next,
-			updates: [],
-			full: next,
-			replace: true
-		});
-		this.emitLayerFeaturesChanged(layerId, next);
-	}
-	updateLayerFeatures(layerId, features) {
-		if (!this.layers.has(layerId)) return;
-		const existing = this.featureCache.get(layerId) ?? [];
-		const existingIds = /* @__PURE__ */ new Set();
-		for (const f of existing) if (f.id != null) existingIds.add(f.id);
-		const adds = [];
-		const updates = [];
-		const updateById = /* @__PURE__ */ new Map();
-		for (const f of features) {
-			if (f.id == null) continue;
-			if (existingIds.has(f.id)) updates.push(f);
-			else adds.push(f);
-			updateById.set(f.id, f);
-		}
-		const merged = [...updateById.values()];
-		const removed = [];
-		for (const f of existing) if (f.id == null) merged.push(f);
-		else if (!updateById.has(f.id)) removed.push(f);
-		this.featureCache.set(layerId, merged);
-		this.applyFeatureOps(layerId, {
-			adds,
-			updates,
-			removes: removed,
-			full: merged,
-			replace: false
-		});
-		this.emitLayerFeaturesChanged(layerId, merged);
-	}
-	removeFeatures(layerId, ids) {
-		if (!this.layers.has(layerId)) return;
-		if (ids.length === 0) return;
-		const existing = this.featureCache.get(layerId) ?? [];
-		const idSet = new Set(ids);
-		const merged = [];
-		const removed = [];
-		for (const f of existing) if (typeof f.id === "string" && idSet.has(f.id)) removed.push(f);
-		else merged.push(f);
-		if (removed.length === 0) return;
-		this.featureCache.set(layerId, merged);
-		this.applyFeatureOps(layerId, {
-			adds: [],
-			updates: [],
-			removes: removed,
-			full: merged,
-			replace: false
-		});
-		this.emitLayerFeaturesChanged(layerId, merged);
-	}
-	clearLayer(layerId) {
-		if (!this.layers.has(layerId)) return;
-		this.featureCache.set(layerId, []);
-		this.applyFeatureOps(layerId, {
-			adds: [],
-			updates: [],
-			full: [],
-			replace: true
-		});
-		this.emitLayerFeaturesChanged(layerId, []);
-	}
-	on(eventType, handler) {
-		const entry = this.attachNativeEvent(eventType, (lonLat, pixel, originalEvent) => {
-			handler({
-				type: eventType,
-				coordinate: lonLat,
-				pixel,
-				originalEvent
-			});
-		});
-		this.eventTokens.set(handler, entry);
-	}
-	off(eventType, handler) {
-		const entry = this.eventTokens.get(handler);
-		if (!entry) return;
-		this.detachNativeEvent(entry);
-		this.eventTokens.delete(handler);
-	}
-	onViewChange(handler) {
-		const token = this.attachViewChange(handler);
-		this.viewChangeTokens.set(handler, token);
-	}
-	offViewChange(handler) {
-		const token = this.viewChangeTokens.get(handler);
-		if (token === void 0) return;
-		this.detachViewChange(token);
-		this.viewChangeTokens.delete(handler);
-	}
-	destroy() {
-		if (this.destroyed) return;
-		try {
-			for (const entry of this.eventTokens.values()) this.detachNativeEvent(entry);
-			this.eventTokens.clear();
-			for (const token of this.viewChangeTokens.values()) this.detachViewChange(token);
-			this.viewChangeTokens.clear();
-			for (const handle of this.layers.values()) this.destroyLayer(handle);
-			this.layers.clear();
-			this.featureCache.clear();
-			this.featuresChangedListeners.clear();
-			for (const id of this.iconResources.keys()) this.removeIconResource(id);
-			this.iconResources.clear();
-			this.layerIconResourceIds.clear();
-			this.destroyEngineResources();
-		} finally {
-			this.destroyed = true;
-		}
-	}
-	emitLayerFeaturesChanged(layerId, features) {
-		const listeners = this.featuresChangedListeners.get(layerId);
-		if (!listeners) return;
-		for (const fn of listeners) fn(features);
-	}
-	onLayerFeaturesChanged(layerId, listener) {
-		let listeners = this.featuresChangedListeners.get(layerId);
-		if (!listeners) {
-			listeners = /* @__PURE__ */ new Set();
-			this.featuresChangedListeners.set(layerId, listeners);
-		}
-		listeners.add(listener);
-		return () => {
-			const set = this.featuresChangedListeners.get(layerId);
-			if (!set) return;
-			set.delete(listener);
-			if (set.size === 0) this.featuresChangedListeners.delete(layerId);
-		};
-	}
-	destroyEngineResources() {}
-	applyIconResources(resources) {}
-	getIconResource(id) {
-		return this.iconResources.get(id);
-	}
-	removeIconResource(id) {}
-	pruneIconResources() {
-		const active = /* @__PURE__ */ new Set();
-		for (const ids of this.layerIconResourceIds.values()) for (const id of ids) active.add(id);
-		if (this.iconResources.size <= active.size + 32) return;
-		for (const id of this.iconResources.keys()) {
-			if (active.has(id)) continue;
-			this.iconResources.delete(id);
-			this.removeIconResource(id);
-			if (this.iconResources.size <= active.size + 32) break;
-		}
-	}
-	/**
-	* Default for engines/views that don't rotate (Leaflet). Rotating engines
-	* (MapLibre, OpenLayers) override this.
-	*/
-	getBearing() {
-		return 0;
-	}
-	getLayerFeatures(layerId) {
-		return this.featureCache.get(layerId) ?? [];
-	}
-};
 function pickPointerType(originalEvent) {
 	if (typeof PointerEvent !== "undefined" && originalEvent instanceof PointerEvent) {
 		if (originalEvent.pointerType === "touch") return "touch";
@@ -314,11 +99,9 @@ function mergeNativeAndCachedPickFeatures(nativeFeatures, cachedFeatures) {
 * primary candidate.
 */
 function evaluatePickCandidates(inputs, context) {
+	const candidates = eligibleCandidates(inputs, context);
 	let best = null;
-	for (const input of inputs) {
-		const candidate = buildCandidate(input, context);
-		if (candidate && (best === null || compareCandidates(candidate, best) < 0)) best = candidate;
-	}
+	for (const candidate of candidates) if (best === null || compareCandidates(candidate, best) < 0) best = candidate;
 	return best;
 }
 function buildCandidate(input, context) {
@@ -333,10 +116,17 @@ function buildCandidate(input, context) {
 		viewport: context.viewport,
 		presentation,
 		visualOrder: input.visualOrder,
+		...input.featureGroupOrder !== void 0 ? { featureGroupOrder: input.featureGroupOrder } : {},
 		...evaluated.iconFootprint ? { iconFootprint: evaluated.iconFootprint } : {},
 		...input.labelExtent ? { labelExtent: input.labelExtent } : {}
 	};
 }
+function eligibleCandidates(inputs, context) {
+	const candidates = inputs.map((input) => buildCandidate(input, context)).filter((candidate) => candidate !== null);
+	const opaqueCovers = candidates.filter(isOpaqueFillInterior);
+	if (opaqueCovers.length === 0) return candidates;
+	return candidates.filter((candidate) => !opaqueCovers.some((cover) => cover.featureGroupOrder !== void 0 && candidate.featureGroupOrder !== void 0 && cover.featureGroupOrder < candidate.featureGroupOrder));
+}
 function compareCandidates(a, b) {
 	const rankA = selectionSurfaceRank(a);
 	const rankDifference = rankA - selectionSurfaceRank(b);
@@ -345,8 +135,13 @@ function compareCandidates(a, b) {
 		const distanceDifference = a.hit.distance - b.hit.distance;
 		if (distanceDifference !== 0) return distanceDifference;
 	}
+	if (a.featureGroupOrder !== void 0 && b.featureGroupOrder !== void 0 && a.featureGroupOrder !== b.featureGroupOrder) return a.featureGroupOrder - b.featureGroupOrder;
 	return a.visualOrder - b.visualOrder;
 }
+function isOpaqueFillInterior(candidate) {
+	const fill = candidate.presentation.fill;
+	return candidate.hit.kind === "polygon-interior" && fill?.opacity === 1 && (fill.pattern === void 0 || fill.pattern === "solid");
+}
 function selectionSurfaceRank(candidate) {
 	if (candidate.hit.kind !== "polygon-interior") return 0;
 	return (candidate.presentation.fill?.opacity ?? 0) > 0 ? 1 : 2;
@@ -641,6 +436,196 @@ function numberArray(value) {
 	return Array.isArray(value) && value.every((item) => typeof item === "number") ? [...value] : void 0;
 }
 //#endregion
+//#region src/base-map-adapter.ts
+/**
+* Abstract base class shared by all `MapAdapter` implementations.
+*
+* Owns shared bookkeeping (layer registry, feature cache, event-token
+* tracking) and orchestrates the public methods over a small protected
+* grouped desired-state primitive that subclasses implement.
+*/
+var BaseMapAdapter = class {
+	layers = /* @__PURE__ */ new Map();
+	eventTokens = /* @__PURE__ */ new Map();
+	viewChangeTokens = /* @__PURE__ */ new Map();
+	featureCache = /* @__PURE__ */ new Map();
+	featuresChangedListeners = /* @__PURE__ */ new Map();
+	iconResources = /* @__PURE__ */ new Map();
+	featureGroupState = /* @__PURE__ */ new Map();
+	layerIconResourceIds = /* @__PURE__ */ new Map();
+	layerCounter = 0;
+	destroyed = false;
+	nextLayerId() {
+		return `layer-${++this.layerCounter}`;
+	}
+	addVectorLayer(options) {
+		const id = this.nextLayerId();
+		const handle = this.createLayer(id, options?.style);
+		this.layers.set(id, handle);
+		this.featureCache.set(id, []);
+		this.featureGroupState.set(id, {
+			groups: [],
+			orderByFeatureId: /* @__PURE__ */ new Map()
+		});
+		return id;
+	}
+	removeLayer(layerId) {
+		const handle = this.layers.get(layerId);
+		if (!handle) return;
+		this.destroyLayer(handle);
+		this.layers.delete(layerId);
+		this.featureCache.delete(layerId);
+		this.featureGroupState.delete(layerId);
+		this.featuresChangedListeners.delete(layerId);
+		this.layerIconResourceIds.delete(layerId);
+		this.pruneIconResources();
+	}
+	setLayerFeatureGroups(layerId, groups) {
+		validateFeatureGroups(groups);
+		if (!this.layers.has(layerId)) return;
+		const nextGroups = groups.map((group) => ({
+			id: group.id,
+			features: [...group.features],
+			iconResources: [...group.iconResources]
+		}));
+		const nextFeatures = nextGroups.flatMap((group) => group.features);
+		const nextResourcesById = /* @__PURE__ */ new Map();
+		for (const group of nextGroups) for (const resource of group.iconResources) nextResourcesById.set(resource.id, resource);
+		const nextResources = [...nextResourcesById.values()];
+		const resourceIds = new Set(nextResourcesById.keys());
+		for (const resource of nextResources) this.iconResources.set(resource.id, resource);
+		this.layerIconResourceIds.set(layerId, resourceIds);
+		this.applyIconResources(nextResources);
+		this.featureGroupState.set(layerId, {
+			groups: nextGroups,
+			orderByFeatureId: indexFeatureGroupOrder(nextGroups)
+		});
+		this.featureCache.set(layerId, nextFeatures);
+		this.applyFeatureGroups(layerId, nextGroups);
+		this.emitLayerFeaturesChanged(layerId, nextFeatures);
+		this.pruneIconResources(true);
+	}
+	on(eventType, handler) {
+		const entry = this.attachNativeEvent(eventType, (lonLat, pixel, originalEvent) => {
+			handler({
+				type: eventType,
+				coordinate: lonLat,
+				pixel,
+				originalEvent
+			});
+		});
+		this.eventTokens.set(handler, entry);
+	}
+	off(eventType, handler) {
+		const entry = this.eventTokens.get(handler);
+		if (!entry) return;
+		this.detachNativeEvent(entry);
+		this.eventTokens.delete(handler);
+	}
+	onViewChange(handler) {
+		const token = this.attachViewChange(handler);
+		this.viewChangeTokens.set(handler, token);
+	}
+	offViewChange(handler) {
+		const token = this.viewChangeTokens.get(handler);
+		if (token === void 0) return;
+		this.detachViewChange(token);
+		this.viewChangeTokens.delete(handler);
+	}
+	destroy() {
+		if (this.destroyed) return;
+		try {
+			for (const entry of this.eventTokens.values()) this.detachNativeEvent(entry);
+			this.eventTokens.clear();
+			for (const token of this.viewChangeTokens.values()) this.detachViewChange(token);
+			this.viewChangeTokens.clear();
+			for (const handle of this.layers.values()) this.destroyLayer(handle);
+			this.layers.clear();
+			this.featureCache.clear();
+			this.featureGroupState.clear();
+			this.featuresChangedListeners.clear();
+			for (const id of this.iconResources.keys()) this.removeIconResource(id);
+			this.iconResources.clear();
+			this.layerIconResourceIds.clear();
+			this.destroyEngineResources();
+		} finally {
+			this.destroyed = true;
+		}
+	}
+	emitLayerFeaturesChanged(layerId, features) {
+		const listeners = this.featuresChangedListeners.get(layerId);
+		if (!listeners) return;
+		for (const fn of listeners) fn(features);
+	}
+	onLayerFeaturesChanged(layerId, listener) {
+		let listeners = this.featuresChangedListeners.get(layerId);
+		if (!listeners) {
+			listeners = /* @__PURE__ */ new Set();
+			this.featuresChangedListeners.set(layerId, listeners);
+		}
+		listeners.add(listener);
+		return () => {
+			const set = this.featuresChangedListeners.get(layerId);
+			if (!set) return;
+			set.delete(listener);
+			if (set.size === 0) this.featuresChangedListeners.delete(layerId);
+		};
+	}
+	destroyEngineResources() {}
+	applyIconResources(resources) {}
+	getIconResource(id) {
+		return this.iconResources.get(id);
+	}
+	getFeatureGroupOrder(layerId, featureId) {
+		if (featureId === void 0) return void 0;
+		return this.featureGroupState.get(layerId)?.orderByFeatureId.get(featureId);
+	}
+	removeIconResource(id) {}
+	pruneIconResources(removeAllUnused = false) {
+		const active = /* @__PURE__ */ new Set();
+		for (const ids of this.layerIconResourceIds.values()) for (const id of ids) active.add(id);
+		if (!removeAllUnused && this.iconResources.size <= active.size + 32) return;
+		for (const id of this.iconResources.keys()) {
+			if (active.has(id)) continue;
+			this.iconResources.delete(id);
+			this.removeIconResource(id);
+			if (!removeAllUnused && this.iconResources.size <= active.size + 32) break;
+		}
+	}
+	/**
+	* Default for engines/views that don't rotate (Leaflet). Rotating engines
+	* (MapLibre, OpenLayers) override this.
+	*/
+	getBearing() {
+		return 0;
+	}
+	getLayerFeatures(layerId) {
+		return this.featureCache.get(layerId) ?? [];
+	}
+};
+function indexFeatureGroupOrder(groups) {
+	const orderByFeatureId = /* @__PURE__ */ new Map();
+	groups.forEach((group, index) => {
+		const visualOrder = renderOrderToVisualOrder(index, groups.length);
+		for (const feature of group.features) if (feature.id != null) orderByFeatureId.set(feature.id, visualOrder);
+	});
+	return orderByFeatureId;
+}
+function validateFeatureGroups(groups) {
+	const groupIds = /* @__PURE__ */ new Set();
+	const featureIds = /* @__PURE__ */ new Set();
+	for (const group of groups) {
+		if (typeof group.id !== "string" || group.id.trim().length === 0) throw new Error("Feature group id must be a non-empty string");
+		if (groupIds.has(group.id)) throw new Error(`Duplicate feature group id: ${group.id}`);
+		groupIds.add(group.id);
+		for (const feature of group.features) {
+			if (feature.id == null) throw new Error(`Feature in group "${group.id}" is missing an id`);
+			if (featureIds.has(feature.id)) throw new Error(`Duplicate feature id: ${String(feature.id)}`);
+			featureIds.add(feature.id);
+		}
+	}
+}
+//#endregion
 //#region src/feature-style.ts
 /**
 * Coerce a raw `properties.style` value into a `HandleStyle` for the
@@ -1258,23 +1243,15 @@ function runInteraction(spec) {
 		resolveFn = resolve;
 		rejectFn = reject;
 	});
-	const idsByLayer = /* @__PURE__ */ new Map();
-	for (const layer of layers) idsByLayer.set(layer, /* @__PURE__ */ new Set());
+	const ownedLayers = new Set(layers);
 	let controllerDetach = null;
 	let controllerOnAbort = null;
-	function writeLayer(layer, features) {
-		adapter.updateLayerFeatures(layer, features);
-		const set = idsByLayer.get(layer);
-		if (!set) return;
-		set.clear();
-		for (const f of features) if (typeof f.id === "string") set.add(f.id);
+	function writeLayer(layer, groups) {
+		if (!ownedLayers.has(layer)) return;
+		adapter.setLayerFeatureGroups(layer, groups);
 	}
 	function clearLayers() {
-		for (const [layer, set] of idsByLayer) {
-			if (set.size === 0) continue;
-			adapter.removeFeatures(layer, [...set]);
-			set.clear();
-		}
+		for (const layer of ownedLayers) adapter.setLayerFeatureGroups(layer, []);
 	}
 	const handleKeydown = (event) => {
 		if (settled) return;
@@ -1812,6 +1789,7 @@ function createCommitEmitter(listenerErrorsMessage) {
 //#endregion
 //#region src/tactical-draw/draw-controller.ts
 const PREVIEW_CM_ID$1 = "__td_preview__";
+const GUIDE_GROUP_ID = "__td_draw_guide__";
 const PREVIEW_CURSOR$1 = "crosshair";
 /**
 * Drive an interactive fixed-length draw against a `MapAdapter`.
@@ -1926,16 +1904,32 @@ function runFixedLengthDraw(options) {
 	function renderPreview() {
 		const raw = rubberBand !== void 0 ? [...committed, rubberBand] : [...committed];
 		if (raw.length === 0) {
-			ctx.writeLayer(previewLayer, []);
-			ctx.writeLayer(guideLayer, []);
+			ctx.writeLayer(previewLayer, [{
+				id: PREVIEW_CM_ID$1,
+				features: [],
+				iconResources: []
+			}]);
+			ctx.writeLayer(guideLayer, [{
+				id: GUIDE_GROUP_ID,
+				features: [],
+				iconResources: []
+			}]);
 			return;
 		}
 		const previewThreshold = rule?.minimumPreviewPoints ?? required;
 		const features = buildPreviewFeatures$1(adapter, kind, rule && raw.length >= previewThreshold ? rule.derive(raw) : raw, measureOptions, measureStyle, measureTextAmplifiers, renderOpts);
-		ctx.writeLayer(previewLayer, features);
+		ctx.writeLayer(previewLayer, [{
+			id: PREVIEW_CM_ID$1,
+			features,
+			iconResources: []
+		}]);
 		const guidePoints = rule?.guidePoints ? rule.guidePoints(raw) : raw;
 		const guideFeatures = guideEnabled ? buildGuideFeatures(guidePoints, isAreaKind) : [];
-		ctx.writeLayer(guideLayer, guideFeatures);
+		ctx.writeLayer(guideLayer, [{
+			id: GUIDE_GROUP_ID,
+			features: guideFeatures,
+			iconResources: []
+		}]);
 	}
 	function rescaleOnViewChange() {
 		if (!measureRendersFromViewState({
@@ -2214,9 +2208,17 @@ function runVariableLengthDraw(options) {
 		} else points = [...committed];
 		if (rule) points = rule.derive(points);
 		const previewFeatures = points.length === 0 ? [] : buildPreviewFeatures(adapter, kind, points, measureOptions, measureStyle, measureTextAmplifiers, renderOpts);
-		ctx.writeLayer(previewLayer, previewFeatures);
+		ctx.writeLayer(previewLayer, [{
+			id: "__td_variable_draw_preview__",
+			features: previewFeatures,
+			iconResources: []
+		}]);
 		const guideFeatures = points.length === 0 || !guideEnabled ? [] : buildGuideFeatures(points, isAreaKind, trailingFixed);
-		ctx.writeLayer(guideLayer, guideFeatures);
+		ctx.writeLayer(guideLayer, [{
+			id: "__td_variable_draw_guide__",
+			features: guideFeatures,
+			iconResources: []
+		}]);
 	}
 	function rescaleOnViewChange() {
 		if (!measureRendersFromViewState({
@@ -2382,6 +2384,7 @@ function runEditInteraction(spec) {
 			spec.onForeignPick?.(localGraphics);
 			return;
 		}
+		if (localGraphics && spec.ownsGraphic(localGraphics.id)) return;
 		if (localPreview) return;
 		if (wasBodyClick) return;
 		spec.close();
@@ -3570,15 +3573,15 @@ const ALLOWED_EDIT_MODES = new Set([
 * Drive an interactive edit against a `MapAdapter`. Implements the edit
 * lifecycle (issue #48) plus the ADR-0017 transform box:
 *
-*  - lift-original (remove from graphics layer) + working copy
-*  - preview + reshape-handle rendering, and the oriented transform box
+*  - working-render publication into the host-owned Graphic stack slot
+*  - reshape-handle rendering and the oriented transform box
 *    (corner scale handles, rotate grip, drag-anywhere-inside body translate)
 *  - dirty tracking via [[DIRTY_EPSILON]] tolerance
 *  - default click-away close policy
 *  - close / abort / signal / preempt / destroy paths
 */
 function runEdit(opts) {
-	const { adapter, measure, graphicsLayer, previewLayer, guideLayer, handlesLayer, graphicsStyle, signal, closeOnClickAway = true, modes: initialModes, interactionStyle, onSession, handleIdPrefix, guide: guideOpt, settleToGraphics, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick, snap } = opts;
+	const { adapter, measure, graphicsLayer, previewLayer, guideLayer, handlesLayer, graphicsStyle, signal, closeOnClickAway = true, modes: initialModes, interactionStyle, onSession, handleIdPrefix, guide: guideOpt, settleToGraphics, publishWorkingGraphic, onSettled, onClickAwayGraphicsPick, snap } = opts;
 	const renderOpts = graphicsStyle ? { graphicsStyle } : void 0;
 	let sizeAnchor = opts.sizeAnchor ?? "ground";
 	const metadata = getControlMeasureMetadata(measure.kind);
@@ -3691,8 +3694,8 @@ function runEdit(opts) {
 	* while a box gesture (`activeBoxDrag`) is in flight.
 	*/
 	let box = null;
-	/** The features written to the preview layer on the last `renderPreview()` call — reused to refit `box` without a second render pass. */
-	let lastPreviewFeatures = [];
+	/** The last working-render features, reused to refit `box` without a second render pass. */
+	let lastWorkingFeatures = [];
 	let ctx;
 	let driver;
 	let shell;
@@ -3706,7 +3709,7 @@ function runEdit(opts) {
 			resolution: adapter.getResolution(),
 			bearing: adapter.getBearing()
 		}),
-		features: () => lastPreviewFeatures,
+		features: () => lastWorkingFeatures,
 		snapshotAmplifierPlacements,
 		handleIdPrefix,
 		interactionStyle
@@ -3742,7 +3745,7 @@ function runEdit(opts) {
 		});
 	}
 	/**
-	* Re-fit `box` from `lastPreviewFeatures`. A no-op while a box gesture is
+	* Re-fit `box` from `lastWorkingFeatures`. A no-op while a box gesture is
 	* in flight — that drag paints the box rigidly from its own snapshot
 	* (`BoxDragSnapshot.box`) instead of a re-fit, so a corner/rotate/body drag
 	* doesn't fight its own paint. Text is the exception: its box follows the
@@ -3751,14 +3754,9 @@ function runEdit(opts) {
 	*/
 	function refitBox() {
 		if (activeBoxDrag && !isTextGraphic) return;
-		box = fitBoxFromFeatures(lastPreviewFeatures);
+		box = fitBoxFromFeatures(lastWorkingFeatures);
 	}
-	function liftOriginalFromGraphics() {
-		if (!wasOnGraphicsLayer) return;
-		const originalFeatureIds = renderMeasureForAdapter(adapter, measure, renderOpts).features.map((f) => f.id).filter((id) => typeof id === "string");
-		if (originalFeatureIds.length > 0) adapter.removeFeatures(graphicsLayer, originalFeatureIds);
-	}
-	function renderPreview() {
+	function renderWorkingGraphic() {
 		if (ctx.settled) return;
 		const working = {
 			...measure,
@@ -3776,19 +3774,23 @@ function runEdit(opts) {
 		} catch {
 			features = [];
 		}
-		ctx.writeLayer(previewLayer, features);
-		lastPreviewFeatures = features;
+		publishWorkingGraphic(working, features);
+		lastWorkingFeatures = features;
 		refitBox();
 		const guidePoints = rule?.guidePoints ? rule.guidePoints(workingPoints) : workingPoints;
 		const guideFeatures = guideEnabled ? buildGuideFeatures(guidePoints, isAreaKind, trailingFixedSlots) : [];
-		ctx.writeLayer(guideLayer, guideFeatures);
+		ctx.writeLayer(guideLayer, [{
+			id: `__td_edit_guide__:${measure.id}`,
+			features: guideFeatures,
+			iconResources: []
+		}]);
 	}
 	function rescaleOnViewChange() {
 		if (ctx.settled) return;
 		if (measureRendersFromViewState({
 			kind: measure.kind,
 			options: workingOptions
-		})) renderPreview();
+		})) renderWorkingGraphic();
 		else refitBox();
 		renderHandlesLayer();
 	}
@@ -3807,10 +3809,14 @@ function runEdit(opts) {
 				features.push(...toFeatures(boxToHandles(liveBox, dragProjection.fromPixel), handleIdPrefix, interactionStyle));
 			}
 		}
-		ctx.writeLayer(handlesLayer, features);
+		ctx.writeLayer(handlesLayer, [{
+			id: `__td_edit_handles__:${measure.id}`,
+			features,
+			iconResources: []
+		}]);
 	}
 	/**
-	* Repaint the preview and, in lockstep, the handles. `renderPreview` re-fits
+	* Repaint the preview and, in lockstep, the handles. `renderWorkingGraphic` re-fits
 	* `box` (for Text, the footprint depends on options — size/rotation/
 	* alignment/text), so the transform-box outline and its corner/rotate handles
 	* must repaint to match; otherwise they stay where the old options placed them
@@ -3818,8 +3824,8 @@ function runEdit(opts) {
 	* (#scale-handle desync). Used by the non-geometry option/style/amplifier
 	* setters, which change what the preview renders without moving a point.
 	*/
-	function renderPreviewAndHandles() {
-		renderPreview();
+	function renderWorkingGraphicAndHandles() {
+		renderWorkingGraphic();
 		renderHandlesLayer();
 	}
 	/**
@@ -3900,7 +3906,7 @@ function runEdit(opts) {
 				workingAmplifierPlacements = previousAmplifierPlacements;
 				boxAngle = previousBoxAngle;
 				nonGeometryDirty = previousNonGeometryDirty;
-				renderPreview();
+				renderWorkingGraphic();
 				renderHandlesLayer();
 				recomputeDirty();
 			},
@@ -3939,7 +3945,7 @@ function runEdit(opts) {
 			drainPendingModes();
 			throw err;
 		}
-		renderPreview();
+		renderWorkingGraphic();
 		renderHandlesLayer();
 		recomputeDirty();
 		dragInFlight = false;
@@ -3967,7 +3973,7 @@ function runEdit(opts) {
 			replaceWorkingOptions(previousOptions);
 			throw err;
 		}
-		renderPreviewAndHandles();
+		renderWorkingGraphicAndHandles();
 		nonGeometryDirty = true;
 		dirty = true;
 		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, "programmatic", "Change options");
@@ -3993,7 +3999,7 @@ function runEdit(opts) {
 			currentStyle = previousStyle;
 			throw err;
 		}
-		renderPreviewAndHandles();
+		renderWorkingGraphicAndHandles();
 		nonGeometryDirty = true;
 		dirty = true;
 		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, "programmatic", "Change style");
@@ -4003,7 +4009,7 @@ function runEdit(opts) {
 	* [[setOptions]] exactly (dirty tracking, re-render, change emission) —
 	* see that function for the shared shape. A merge value of `undefined` or
 	* an empty/whitespace-only string deletes the key; the record collapses to
-	* `undefined` once empty so `renderPreview`/`rebuildRenderedWith` omit the
+	* `undefined` once empty so `renderWorkingGraphic`/`rebuildRenderedWith` omit the
 	* key rather than persist `{}`.
 	*
 	* Each patch key resolves to its canonical field key and evicts every
@@ -4039,7 +4045,7 @@ function runEdit(opts) {
 			workingTextAmplifiers = previousTextAmplifiers;
 			throw err;
 		}
-		renderPreviewAndHandles();
+		renderWorkingGraphicAndHandles();
 		nonGeometryDirty = true;
 		dirty = true;
 		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, "programmatic", "Change text");
@@ -4066,7 +4072,7 @@ function runEdit(opts) {
 		workingAmplifierPlacements = Object.keys(next).length > 0 ? next : void 0;
 		if (JSON.stringify(workingAmplifierPlacements) === JSON.stringify(previousAmplifierPlacements)) return;
 		const currentRendered = rebuildRendered();
-		renderPreviewAndHandles();
+		renderWorkingGraphicAndHandles();
 		nonGeometryDirty = true;
 		dirty = true;
 		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, source, historyLabel);
@@ -4074,7 +4080,7 @@ function runEdit(opts) {
 	/**
 	* Flip the size anchor for the measure under edit (ADR-0020). Re-renders the
 	* emitted snapshot through `rebuildRendered` (which reads `sizeAnchor` live)
-	* and emits a change so hosts see the re-anchored measure. The preview layer
+	* and emits a change so hosts see the re-anchored measure. The working render
 	* is unaffected — it renders from `workingOptions`, which still carry the
 	* pixel size, so the in-flight symbol stays screen-locked until commit.
 	*/
@@ -4128,7 +4134,7 @@ function runEdit(opts) {
 		apply(from, to, source) {
 			const previousRendered = rebuildRendered();
 			restoreHistory(to);
-			renderPreview();
+			renderWorkingGraphic();
 			renderHandlesLayer();
 			recomputeDirty();
 			emitChange(previousRendered, from.points, from.options, from.style, from.nonGeometryDirty, from.sizeAnchor, rebuildRendered(), from.textAmplifiers, from.amplifierPlacements, source, "Edit", from.boxAngle);
@@ -4204,7 +4210,7 @@ function runEdit(opts) {
 			workingTextAmplifiers = next.textAmplifiers ? { ...next.textAmplifiers } : void 0;
 			workingAmplifierPlacements = next.amplifierPlacements ? structuredClone(next.amplifierPlacements) : void 0;
 			nonGeometryDirty = true;
-			renderPreview();
+			renderWorkingGraphic();
 			renderHandlesLayer();
 			recomputeDirty();
 			emitChange(previous, previous.graphic.controlPoints.map((point) => [...point]), previous.graphic.options, previous.graphic.style, previousNonGeometryDirty, previousSizeAnchor, rebuildRendered(), previous.graphic.textAmplifiers, previous.graphic.amplifierPlacements, "programmatic", "Update graphic");
@@ -4360,7 +4366,7 @@ function runEdit(opts) {
 			emitTransient("start", fsm.kind === "midpoint" ? initialPoints : preDragPoints, activeDrag.controlPointIndex);
 			if (fsm.kind === "midpoint") {
 				workingPoints.splice(0, workingPoints.length, ...initialPoints);
-				renderPreview();
+				renderWorkingGraphic();
 				renderHandlesLayer();
 			}
 			dragInFlight = true;
@@ -4373,7 +4379,7 @@ function runEdit(opts) {
 				const preDragOptions = { ...workingOptions ?? {} };
 				if (boxHit.kind === "rotate") {
 					freezeOrientationForRotate();
-					renderPreview();
+					renderWorkingGraphic();
 					renderHandlesLayer();
 				}
 				const preDragPoints = workingPoints.map((p) => [...p]);
@@ -4407,7 +4413,7 @@ function runEdit(opts) {
 		const resolvedPixel = snappedPixel(pixel, info, "reshape", activeDrag.controlPointIndex);
 		const snapshot = activeDrag.fsm.move(resolvedPixel);
 		workingPoints.splice(0, workingPoints.length, ...snapshot.points);
-		renderPreview();
+		renderWorkingGraphic();
 		renderHandlesLayer();
 		recomputeDirty();
 		emitTransient("move", snapshot.points, activeDrag.controlPointIndex);
@@ -4440,7 +4446,7 @@ function runEdit(opts) {
 			workingPoints.splice(0, workingPoints.length, ...activeBoxDrag.preDragPoints);
 			workingOptions = foldTextTransform(activeBoxDrag.preDragBox, snapshot.box, activeBoxDrag.fsm.kind, activeBoxDrag.preDragOptions);
 			nonGeometryDirty = true;
-			renderPreview();
+			renderWorkingGraphic();
 			renderHandlesLayer();
 			recomputeDirty();
 			emitTransient("move", activeBoxDrag.preDragPoints, null);
@@ -4448,7 +4454,7 @@ function runEdit(opts) {
 		}
 		workingPoints.splice(0, workingPoints.length, ...snapshot.points);
 		workingAmplifierPlacements = transformAmplifierPlacements(activeBoxDrag.preDragAmplifierPlacements, activeBoxDrag.preDragBox, snapshot.box, driver);
-		renderPreview();
+		renderWorkingGraphic();
 		renderHandlesLayer();
 		recomputeDirty();
 		emitTransient("move", snapshot.points, null);
@@ -4463,7 +4469,7 @@ function runEdit(opts) {
 					...workingAmplifierPlacements ?? {},
 					...merged !== void 0 ? { [patch.field]: merged } : {}
 				};
-				renderPreview();
+				renderWorkingGraphic();
 				renderHandlesLayer();
 			}
 		} else if (activeDrag) paintDragSnapshot(pixel, info);
@@ -4483,7 +4489,7 @@ function runEdit(opts) {
 			if (labelOutcome.kind === "rotate") setAmplifierPlacements({ [labelOutcome.key]: { rotation: labelOutcome.rotation } }, "gesture", "Rotate label");
 			else if (labelOutcome.kind === "move") setAmplifierPlacements({ [labelOutcome.field]: labelOutcome.position }, "gesture", "Move label");
 			else {
-				renderPreview();
+				renderWorkingGraphic();
 				renderHandlesLayer();
 			}
 			shell.suppressNextClickAway();
@@ -4521,7 +4527,7 @@ function runEdit(opts) {
 				replaceWorkingPoints(preDragPoints);
 				workingAmplifierPlacements = preDragAmplifierPlacements;
 				emitTransient("end", preDragPoints, null);
-				renderPreview();
+				renderWorkingGraphic();
 				renderHandlesLayer();
 				recomputeDirty();
 				endDragBookkeeping();
@@ -4551,11 +4557,7 @@ function runEdit(opts) {
 	const core = runEditInteraction({
 		adapter,
 		signal,
-		layers: [
-			previewLayer,
-			guideLayer,
-			handlesLayer
-		],
+		layers: [guideLayer, handlesLayer],
 		graphicsLayer,
 		previewLayer,
 		handlesLayer,
@@ -4589,11 +4591,7 @@ function runEdit(opts) {
 			ctx = interaction;
 			driver = createdDriver;
 			shell = createdShell;
-			renderPreview();
-			if (wasOnGraphicsLayer) {
-				adapter.deferLayerRemovalUntilLayerUpdate?.(graphicsLayer, previewLayer);
-				liftOriginalFromGraphics();
-			}
+			renderWorkingGraphic();
 			renderHandlesLayer();
 			recomputeDirty();
 			if (onSession) onSession(session);
@@ -4604,6 +4602,7 @@ function runEdit(opts) {
 		get settled() {
 			return core.settled;
 		},
+		usesGraphicStack: true,
 		measureId: measure.id,
 		abort(reason, cause) {
 			core.abort(reason, cause);
@@ -4612,7 +4611,7 @@ function runEdit(opts) {
 			if (core.settled) return;
 			if (stylesEqual(currentStyle, next.style)) return;
 			currentStyle = next.style;
-			renderPreview();
+			renderWorkingGraphic();
 		}
 	};
 }
@@ -4779,8 +4778,8 @@ function scalePointSymbolStates(pre, scale, rotation) {
 * position, scales its size value, and rotates its rotation — its persisted
 * size unit is never converted.
 *
-*  - lift every member off the graphics layer + per-member working copies
-*  - render every member's preview to the shared preview layer each paint
+*  - replace each host-provided Graphic slot with its per-member working copy
+*  - use the preview layer only for members that have no host-provided slot
 *  - group box = fit over the union of every member's rendered pixel footprint
 *    at the session `boxAngle`; each member also gets its own thin outline
 *  - dirty tracking, close/abort/signal/preempt/destroy, click-away — same
@@ -4789,7 +4788,7 @@ function scalePointSymbolStates(pre, scale, rotation) {
 *    a live session without a session boundary
 */
 function runGroupTransform(opts) {
-	const { adapter, capability, graphics, graphicsLayer, previewLayer, handlesLayer, graphicsStyle, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, restoreOriginalToGraphics, isOnGraphicsLayer, onSettled, onClickAwayGraphicsPick } = opts;
+	const { adapter, capability, graphics, graphicsLayer, previewLayer, handlesLayer, graphicsStyle, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, publishWorkingGraphics, settleWorkingGraphics, isOnGraphicsLayer, onSettled, onClickAwayGraphicsPick } = opts;
 	assertCapabilityFor(graphics);
 	const renderOpts = graphicsStyle ? { graphicsStyle } : void 0;
 	let sizeAnchor = opts.sizeAnchor ?? "ground";
@@ -4815,7 +4814,8 @@ function runGroupTransform(opts) {
 				workingAmplifierPlacements: void 0,
 				optionsOverride: null,
 				box: null,
-				lastBoxPixels: []
+				lastBoxPixels: [],
+				usesGraphicStack: isOnGraphicsLayer(graphic.id)
 			};
 		}
 		const editStartPoints = graphic.controlPoints.map((p) => [...p]);
@@ -4830,17 +4830,12 @@ function runGroupTransform(opts) {
 			workingAmplifierPlacements: graphic.amplifierPlacements ? structuredClone(graphic.amplifierPlacements) : void 0,
 			optionsOverride: null,
 			box: null,
-			lastBoxPixels: []
+			lastBoxPixels: [],
+			usesGraphicStack: isOnGraphicsLayer(graphic.id)
 		};
 	}
 	/** The single mutable source of truth for the current member set. */
 	let members = graphics.map(createMemberState);
-	/**
-	* `true` once any member has been lifted off the graphics layer (initial or a
-	* mid-session `setGraphics` add). Gates the abort-path restore so a session
-	* that never touched the graphics layer doesn't rewrite it on abort.
-	*/
-	let anyLiftedFromGraphics = false;
 	/** A member's own options merged with an override patch (a null override leaves them unchanged). */
 	function mergeOptions(base, override) {
 		if (!override) return base;
@@ -4889,7 +4884,7 @@ function runGroupTransform(opts) {
 			render: renderMeasureForAdapter(adapter, committed, renderOpts)
 		};
 	}
-	/** The working graphic for member `i` (measure or point symbol), for preview and `workingGraphics`. */
+	/** The working graphic for member `i` (measure or point symbol), for paint and `workingGraphics`. */
 	function workingGraphicFor(i) {
 		const member = members[i];
 		if (isPointSymbolMember(member)) return buildWorkingPointSymbol(member);
@@ -4944,20 +4939,6 @@ function runGroupTransform(opts) {
 		toPixel: (lonLat) => driver.toPixel(lonLat),
 		fromPixel: (pixel) => driver.fromPixel(pixel)
 	};
-	/**
-	* Lift `member` off the graphics layer when the host reports it currently
-	* there, flipping `anyLiftedFromGraphics` so the abort path knows to restore.
-	* Used for both initial and mid-session-added members.
-	*/
-	function liftMemberFromGraphics(member) {
-		if (!isOnGraphicsLayer(member.graphic.id)) return;
-		if (isPointSymbol(member.graphic)) adapter.removeFeatures(graphicsLayer, [`${member.graphic.id}:point-symbol`]);
-		else {
-			const ids = renderMeasureForAdapter(adapter, member.graphic, renderOpts).features.map((f) => f.id).filter((id) => typeof id === "string");
-			if (ids.length > 0) adapter.removeFeatures(graphicsLayer, ids);
-		}
-		anyLiftedFromGraphics = true;
-	}
 	function pixelsFromFeatures(features) {
 		const positions = [];
 		for (const f of features) if (f.geometry) collectFeaturePositions(f.geometry, positions);
@@ -5027,16 +5008,17 @@ function runGroupTransform(opts) {
 	}
 	function renderAllPreviews() {
 		if (ctx.settled) return;
-		const allFeatures = [];
-		const resources = /* @__PURE__ */ new Map();
+		const previewGroups = [];
+		const workingGroups = [];
 		members.forEach((member, i) => {
 			let features;
+			let iconResources = [];
 			let boxPixels = [];
 			try {
 				if (isPointSymbolMember(member)) {
 					const symbol = buildWorkingPointSymbol(member);
 					const plan = renderPointSymbolForAdapter(adapter, capability, symbol);
-					resources.set(plan.resource.id, plan.resource);
+					iconResources = [plan.resource];
 					features = [plan.feature];
 					const footprint = pointSymbolFootprint(symbol, plan.render, adapter);
 					if (footprint) boxPixels = footprint.corners;
@@ -5050,10 +5032,19 @@ function runGroupTransform(opts) {
 				boxPixels = [];
 			}
 			member.lastBoxPixels = boxPixels;
-			allFeatures.push(...features);
+			if (member.usesGraphicStack) workingGroups.push({
+				id: member.graphic.id,
+				features,
+				iconResources
+			});
+			else previewGroups.push({
+				id: member.graphic.id,
+				features,
+				iconResources
+			});
 		});
-		adapter.reconcileLayerIconResources(previewLayer, [...resources.values()]);
-		ctx.writeLayer(previewLayer, allFeatures);
+		publishWorkingGraphics(workingGroups);
+		ctx.writeLayer(previewLayer, previewGroups);
 		refitBoxes();
 	}
 	function rescaleOnViewChange() {
@@ -5074,7 +5065,11 @@ function runGroupTransform(opts) {
 			features.push(...toFeatures(boxToHandles(liveGroupBox, dragProjection.fromPixel), handleIdPrefix, interactionStyle));
 		}
 		features.push(...memberOutlineFeatures(members.flatMap((member) => member.box ? [[member.graphic.id, member.box]] : []), dragProjection.fromPixel, handleIdPrefix, interactionStyle?.boxOutline));
-		ctx.writeLayer(handlesLayer, features);
+		ctx.writeLayer(handlesLayer, [{
+			id: "__td_transform_handles__",
+			features,
+			iconResources: []
+		}]);
 	}
 	/**
 	* Builds every member's committed snapshot against a given override array
@@ -5307,13 +5302,13 @@ function runGroupTransform(opts) {
 		for (const graphic of next) {
 			const existing = currentById.get(graphic.id);
 			if (existing) nextMembers.push(existing);
-			else {
-				const member = createMemberState(graphic);
-				liftMemberFromGraphics(member);
-				nextMembers.push(member);
-			}
+			else nextMembers.push(createMemberState(graphic));
 		}
 		members = nextMembers;
+		if (removedSnapshots.length > 0) settleWorkingGraphics(removedSnapshots.map((snapshot) => ({
+			id: snapshot.graphic.id,
+			committed: snapshot.graphic
+		})));
 		renderAllPreviews();
 		renderHandlesLayer();
 		recomputeDirty();
@@ -5332,6 +5327,28 @@ function runGroupTransform(opts) {
 		if (notificationErrors.length > 1) throw new AggregateError(notificationErrors, "TransformSession.setGraphics notification errors");
 		return removedSnapshots;
 	}
+	function syncHostGraphics(hostGraphics) {
+		if (ctx.settled) return;
+		const hostIds = new Set(hostGraphics.map((graphic) => graphic.id));
+		const withdrawnIds = members.filter((member) => !hostIds.has(member.graphic.id)).map((member) => member.graphic.id);
+		const membershipChanged = withdrawnIds.length > 0;
+		const surfaceChanged = members.some((member) => member.usesGraphicStack !== hostIds.has(member.graphic.id));
+		if (!membershipChanged && !surfaceChanged) return;
+		cancelActiveBoxDrag();
+		if (withdrawnIds.length > 0) {
+			settleWorkingGraphics(withdrawnIds.map((id) => ({ id })));
+			members = members.filter((member) => hostIds.has(member.graphic.id));
+		}
+		for (const member of members) member.usesGraphicStack = true;
+		if (members.length === 0) {
+			ctx.fail(new TacticalDrawAbortError("removed"));
+			return;
+		}
+		renderAllPreviews();
+		renderHandlesLayer();
+		recomputeDirty();
+		if (membershipChanged) history.reset(captureHistory());
+	}
 	function close() {
 		return commitClose();
 	}
@@ -5374,6 +5391,7 @@ function runGroupTransform(opts) {
 			setSizeAnchor(next);
 		},
 		setGraphics,
+		syncHostGraphics,
 		close,
 		abort() {
 			if (ctx.settled) return;
@@ -5494,6 +5512,12 @@ function runGroupTransform(opts) {
 		handlesLayer,
 		closeOnClickAway,
 		onViewChange: rescaleOnViewChange,
+		onBeforeTeardown: (settlement) => {
+			settleWorkingGraphics(settlement.status === "committed" ? settlement.value.map((snapshot) => ({
+				id: snapshot.graphic.id,
+				committed: snapshot.graphic
+			})) : members.map((member) => ({ id: member.graphic.id })));
+		},
 		onDown: onDriverDown,
 		onMove: onDriverMove,
 		onUp: onDriverUp,
@@ -5513,16 +5537,11 @@ function runGroupTransform(opts) {
 				activeBoxDrag = null;
 				dragInFlight = false;
 			}
-			adapter.reconcileLayerIconResources(previewLayer, []);
-		},
-		onAbort: () => {
-			if (anyLiftedFromGraphics) restoreOriginalToGraphics();
 		},
 		attach(interaction, createdDriver, createdShell) {
 			ctx = interaction;
 			driver = createdDriver;
 			shell = createdShell;
-			for (const member of members) liftMemberFromGraphics(member);
 			renderAllPreviews();
 			renderHandlesLayer();
 			recomputeDirty();
@@ -5539,7 +5558,8 @@ function runGroupTransform(opts) {
 		},
 		abort(reason, cause) {
 			core.abort(reason, cause);
-		}
+		},
+		syncHostGraphics
 	};
 }
 //#endregion
@@ -5562,8 +5582,11 @@ function runPointSymbolDraw(options) {
 	const renderPreview = () => {
 		if (!latestPosition) return;
 		const plan = renderPointSymbolForAdapter(adapter, capability, build(PREVIEW_ID, latestPosition));
-		adapter.reconcileLayerIconResources(previewLayer, [plan.resource]);
-		ctx.writeLayer(previewLayer, [plan.feature]);
+		ctx.writeLayer(previewLayer, [{
+			id: PREVIEW_ID,
+			features: [plan.feature],
+			iconResources: [plan.resource]
+		}]);
 	};
 	const handlePointerMove = (event) => {
 		latestPosition = snappedDrawPosition(snap, event);
@@ -5590,7 +5613,6 @@ function runPointSymbolDraw(options) {
 			interaction.onTeardown(() => {
 				adapter.off("pointermove", handlePointerMove);
 				adapter.off("click", handleClick);
-				adapter.reconcileLayerIconResources(previewLayer, []);
 				adapter.setCursor(savedCursor);
 			});
 			adapter.setCursor("crosshair");
@@ -5607,8 +5629,8 @@ function normalisePointModes(input) {
 	for (const mode of modes) if (mode !== "transform" && mode !== "delete") throw new TypeError(`Point-symbol editing does not support mode "${mode}"`);
 	return modes.includes("delete") ? ["delete"] : [...new Set(modes)];
 }
-function symbolBox(adapter, capability, symbol, padding = 0) {
-	const footprint = pointSymbolFootprint(symbol, capability.render(symbol), adapter);
+function symbolBox(adapter, symbol, rendered, padding = 0) {
+	const footprint = pointSymbolFootprint(symbol, rendered, adapter);
 	if (!footprint) return null;
 	return {
 		...footprint.box,
@@ -5617,8 +5639,9 @@ function symbolBox(adapter, capability, symbol, padding = 0) {
 	};
 }
 function runPointSymbolEdit(opts) {
-	const { adapter, capability, symbol, graphicsLayer, previewLayer, handlesLayer, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, settleToGraphics, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick, snap } = opts;
+	const { adapter, capability, symbol, graphicsLayer, previewLayer, handlesLayer, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, settleToGraphics, publishWorkingGraphic, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick, snap } = opts;
 	let modes = normalisePointModes(opts.modes);
+	let usesGraphicStack = wasOnGraphicsLayer;
 	let working = clonePointSymbol(symbol);
 	let dirty = false;
 	let box = null;
@@ -5643,15 +5666,29 @@ function runPointSymbolEdit(opts) {
 	const render = () => {
 		if (ctx.settled) return;
 		const plan = renderPointSymbolForAdapter(adapter, capability, working);
-		adapter.reconcileLayerIconResources(previewLayer, [plan.resource]);
-		ctx.writeLayer(previewLayer, [plan.feature]);
-		box = symbolBox(adapter, capability, working, interactionStyle?.boxPadding);
+		const nextBox = symbolBox(adapter, working, plan.render, interactionStyle?.boxPadding);
 		const handles = [];
-		if (modes.includes("transform") && box) {
-			handles.push(boxOutlineFeature(box, (pixel) => driver.fromPixel(pixel), `${handleIdPrefix}:box-outline`, interactionStyle?.boxOutline));
-			handles.push(...toFeatures(boxToHandles(box, (pixel) => driver.fromPixel(pixel)), handleIdPrefix, interactionStyle));
-		}
-		ctx.writeLayer(handlesLayer, handles);
+		if (modes.includes("transform") && nextBox) {
+			handles.push(boxOutlineFeature(nextBox, (pixel) => driver.fromPixel(pixel), `${handleIdPrefix}:box-outline`, interactionStyle?.boxOutline));
+			handles.push(...toFeatures(boxToHandles(nextBox, (pixel) => driver.fromPixel(pixel)), handleIdPrefix, interactionStyle));
+		}
+		publishWorkingGraphic({
+			id: working.id,
+			features: [plan.feature],
+			iconResources: [plan.resource]
+		});
+		if (usesGraphicStack) ctx.writeLayer(previewLayer, []);
+		else ctx.writeLayer(previewLayer, [{
+			id: `__td_point_symbol_edit_preview__:${working.id}`,
+			features: [plan.feature],
+			iconResources: [plan.resource]
+		}]);
+		box = nextBox;
+		ctx.writeLayer(handlesLayer, [{
+			id: `__td_point_symbol_edit_handles__:${working.id}`,
+			features: handles,
+			iconResources: []
+		}]);
 	};
 	const emitChange = (previousState, source, onAccepted) => {
 		const previous = {
@@ -5816,16 +5853,11 @@ function runPointSymbolEdit(opts) {
 		historySettle: () => history.settle(),
 		facadeOnSettled: onSettled,
 		emitSettle: (settlement) => settleFromInteraction(settlement, commitEmitter, settleEmitter),
-		extraTeardown: () => adapter.reconcileLayerIconResources(previewLayer, []),
 		attach(interaction, createdDriver, createdShell) {
 			ctx = interaction;
 			driver = createdDriver;
 			shell = createdShell;
 			render();
-			if (wasOnGraphicsLayer) {
-				adapter.deferLayerRemovalUntilLayerUpdate?.(graphicsLayer, previewLayer);
-				adapter.removeFeatures(graphicsLayer, [`${symbol.id}:point-symbol`]);
-			}
 			onSession?.(session);
 		}
 	});
@@ -5834,11 +5866,55 @@ function runPointSymbolEdit(opts) {
 		get settled() {
 			return handle.settled;
 		},
+		get usesGraphicStack() {
+			return usesGraphicStack;
+		},
 		measureId: symbol.id,
-		abort: handle.abort
+		abort: handle.abort,
+		syncHostMembership(present) {
+			if (handle.settled || usesGraphicStack === present) return;
+			const previous = usesGraphicStack;
+			usesGraphicStack = present;
+			try {
+				render();
+			} catch (error) {
+				usesGraphicStack = previous;
+				throw error;
+			}
+		}
 	};
 }
 //#endregion
+//#region src/tactical-draw/graphic-stack-coordinator.ts
+/**
+* Combines host-owned Graphic order with live or settled render overrides.
+*
+* The host always owns membership and order. A working override only replaces
+* the contents of its matching host slot; a committed override survives until
+* the host next acknowledges that Graphic in `render()`.
+*/
+var GraphicStackCoordinator = class {
+	overrides = /* @__PURE__ */ new Map();
+	acknowledgeHostRender(graphics) {
+		for (const graphic of graphics) if (this.overrides.get(graphic.id)?.settled) this.overrides.delete(graphic.id);
+	}
+	publishWorking(group) {
+		this.overrides.set(group.id, {
+			group,
+			settled: false
+		});
+	}
+	settle(graphicId, committed) {
+		const override = this.overrides.get(graphicId);
+		if (!override) return;
+		if (committed) override.settled = true;
+		else this.overrides.delete(graphicId);
+	}
+	desiredGroups(graphics, renderHostGraphic) {
+		return graphics.map((graphic) => this.overrides.get(graphic.id)?.group ?? renderHostGraphic(graphic));
+	}
+};
+//#endregion
 //#region src/tactical-draw/tactical-draw.ts
 /**
 * `TacticalDraw` façade — slice #6 (issue #45).
@@ -5861,6 +5937,7 @@ var TacticalDraw = class {
 	pointSymbols;
 	snappingOptions;
 	resolveSnap;
+	graphicStack = new GraphicStackCoordinator();
 	destroyed = false;
 	hasRendered = false;
 	activeInteraction = new ActiveInteractionTracker();
@@ -5904,12 +5981,7 @@ var TacticalDraw = class {
 	idCounter = 0;
 	editCounter = 0;
 	transformCounter = 0;
-	/**
-	* Snapshot of the host's last `render()` argument. The edit slice uses it
-	* to recompute the graphics-layer state during a lift / restore — the
-	* façade owns the policy because controllers shouldn't need to know the
-	* surrounding collection state.
-	*/
+	/** Snapshot of the host's latest authoritative Graphic membership and order. */
 	lastRenderedMeasures = [];
 	snapGeometryFeatures = [];
 	/**
@@ -5959,53 +6031,65 @@ var TacticalDraw = class {
 	clearSnapResult() {
 		this.snappingOptions?.onSnap?.(null);
 	}
-	/**
-	* Render `measures` into features and write them to the graphics layer.
-	* Routes every measure through [[renderMeasureForAdapter]] so pixel sizing is
-	* resolved against the live map. Callers own any edit-exclusion policy — see
-	* `render()` (excludes the edited measure, owned by the preview layer) versus
-	* `settleToGraphics` (no exclusion, the edit is ending).
-	*/
-	renderMeasuresToGraphics(graphics) {
-		const features = [];
-		const resources = /* @__PURE__ */ new Map();
+	/** Render one atomic Graphic group for the engine-neutral graphics stack. */
+	renderGraphicGroup(graphic) {
 		const renderOpts = { graphicsStyle: this.graphicsStyle };
-		for (const graphic of graphics) if (isPointSymbol(graphic)) {
+		if (isPointSymbol(graphic)) {
 			if (!this.pointSymbols) throw new PointSymbolCapabilityRequiredError();
 			const plan = renderPointSymbolForAdapter(this.adapter, this.pointSymbols, graphic);
-			resources.set(plan.resource.id, plan.resource);
-			features.push(plan.feature);
-		} else {
-			const render = renderMeasureForAdapter(this.adapter, graphic, renderOpts);
-			for (const feature of render.features) features.push(feature);
+			return {
+				id: graphic.id,
+				features: [plan.feature],
+				iconResources: [plan.resource]
+			};
+		}
+		const render = renderMeasureForAdapter(this.adapter, graphic, renderOpts);
+		return {
+			id: graphic.id,
+			features: render.features,
+			iconResources: []
+		};
+	}
+	/** Submit one complete grouped desired state for the host stack plus overrides. */
+	reconcileGraphicsStack(graphics = this.lastRenderedMeasures) {
+		const groups = this.graphicStack.desiredGroups(graphics, (graphic) => this.renderGraphicGroup(graphic));
+		this.adapter.setLayerFeatureGroups(this.graphicsLayer, groups);
+		this.snapGeometryFeatures = groups.flatMap((group) => group.features);
+	}
+	/** Atomically publish several live renders into their host-owned Graphic slots. */
+	publishWorkingGraphics(groups) {
+		for (const group of groups) this.graphicStack.publishWorking(group);
+		this.reconcileGraphicsStack();
+	}
+	/** Settle several stack overrides in one graphics-layer reconciliation. */
+	settleWorkingGraphics(settlements) {
+		for (const { id, committed } of settlements) {
+			if (committed) this.graphicStack.publishWorking(this.renderGraphicGroup(committed));
+			this.graphicStack.settle(id, committed !== void 0);
 		}
-		this.adapter.reconcileLayerIconResources(this.graphicsLayer, [...resources.values()]);
-		this.adapter.updateLayerFeatures(this.graphicsLayer, features);
-		this.snapGeometryFeatures = features;
+		this.reconcileGraphicsStack();
 	}
 	/**
 	* Re-render the graphics layer on a view (zoom) change so pixel-denominated
 	* and not-yet-committed label-sized measures rescale live. Skipped entirely
 	* when nothing rendered still reads live view state — meter geometry with a
 	* captured label size is zoom-independent, so a rebuild would be wasted
-	* layer writes. During an active edit the edited measure lives on the
-	* preview layer (lifted from graphics), so it is excluded here exactly as
-	* in `render()`; the preview's own view-change subscription rescales it.
+	* layer writes. A single-control-measure edit publishes through the stack
+	* coordinator; point symbols and transform members already present in the
+	* host stack do the same. Graphics without a host slot remain on preview.
 	*/
 	handleViewChange = () => {
 		if (this.destroyed || !this.hasRendered) return;
 		this.renderHighlights();
-		const excluded = this.excludedInteractionIds();
+		const excluded = this.graphicsStackExcludedIds();
 		const visible = excluded.size > 0 ? this.lastRenderedMeasures.filter((m) => !excluded.has(m.id)) : this.lastRenderedMeasures;
 		const nativeGroundIconScaling = this.adapter.scalesGroundPointSymbolsNatively === true;
 		if (!visible.some((g) => graphicRendersFromViewState(g, nativeGroundIconScaling))) return;
-		this.renderMeasuresToGraphics(visible);
+		this.reconcileGraphicsStack(visible);
 	};
 	/**
-	* Every measure id currently lifted onto the preview layer by an active
-	* edit or group transform — excluded from `render()` / view-change
-	* reconciliation because the preview layer (not graphics) owns their
-	* working copy. Empty while idle.
+	* Every Graphic id owned by an active interaction. Used for highlight and
+	* pick routing; not every such Graphic is excluded from stack reconciliation.
 	*/
 	excludedInteractionIds() {
 		const ids = /* @__PURE__ */ new Set();
@@ -6013,6 +6097,13 @@ var TacticalDraw = class {
 		for (const id of this.transformMemberIds() ?? []) ids.add(id);
 		return ids;
 	}
+	/** Interaction ids still rendered on the legacy preview surface. */
+	graphicsStackExcludedIds() {
+		const ids = this.excludedInteractionIds();
+		if (this.activeEdit?.usesGraphicStack) ids.delete(this.activeEdit.measureId);
+		for (const id of this.transformMemberIds() ?? []) ids.delete(id);
+		return ids;
+	}
 	/**
 	* Live member ids of the active group transform, or `undefined` when none.
 	* Falls back to the session ref because `onSession` fires from inside the
@@ -6031,24 +6122,24 @@ var TacticalDraw = class {
 	* Idempotent. Throws synchronously on duplicate measure ids *before*
 	* mutating any layer. An empty list before any prior render is a no-op.
 	*
-	* Cross-layer semantics with an active edit (issue #51):
-	*  - The measure under edit is **excluded** from the reconcile pass — the
-	*    preview layer owns its working copy and the lift on the graphics layer
-	*    must stay in place.
+	* Cross-layer semantics with an active edit:
+	*  - The stack coordinator replaces the edited Graphic's host-owned slot
+	*    with its working render; membership and order remain host-authoritative.
 	*  - If the edited measure is absent from `measures`, the pending `edit`
 	*    promise rejects on the **next microtask** with reason `"removed"`.
 	*    `render` itself returns normally so host collection ops stay synchronous.
-	*  - If the edited measure is present and its `style` changed, the preview
-	*    picks up the new style on this render. `controlPoints` changes on the
+	*  - If the edited measure is present and its `style` changed, its working
+	*    group picks up the new style on this render. `controlPoints` changes on the
 	*    edited measure are routed nowhere — the user's in-flight drag is never
-	*    yanked out from under them.
+	*    yanked out from under them. A point symbol's complete working group remains
+	*    authoritative until settle, including any changed icon resource.
 	*
 	* Cross-layer semantics with an active draw: `render` only touches the
 	* graphics layer, so the draw's preview is undisturbed.
 	*
 	* Reentrancy: calling `td.render(...)` from inside `EditSession.onChange` is
-	* safe — `render` never re-enters the active edit or its preview / handle
-	* layers (the only edit-facing side effect, `notifyExternalMeasure`, is a
+	* safe — `render` never re-enters the active edit or its handle layer (the
+	* only edit-facing side effect, `notifyExternalMeasure`, is a
 	* pure style replay).
 	*/
 	render(measures) {
@@ -6058,39 +6149,36 @@ var TacticalDraw = class {
 			if (seen.has(m.id)) throw new Error(`TacticalDraw.render: duplicate graphic id "${m.id}"`);
 			seen.add(m.id);
 		}
-		const editedId = this.activeEdit?.measureId;
+		const activeEdit = this.activeEdit;
+		const constructingSession = activeEdit ? null : this.activeInteraction.session;
+		const constructingGraphic = constructingSession && "workingGraphic" in constructingSession ? constructingSession.workingGraphic : void 0;
+		const editedId = activeEdit?.measureId ?? constructingGraphic?.id;
 		let externalEdited;
 		let editedRemoved = false;
 		if (editedId !== void 0) {
 			const candidate = measures.find((m) => m.id === editedId);
-			externalEdited = candidate && !isPointSymbol(candidate) ? candidate : void 0;
-			editedRemoved = externalEdited === void 0;
+			if (activeEdit && "notifyExternalMeasure" in activeEdit || constructingGraphic !== void 0 && !isPointSymbol(constructingGraphic)) {
+				externalEdited = candidate && !isPointSymbol(candidate) ? candidate : void 0;
+				editedRemoved = externalEdited === void 0;
+			} else editedRemoved = candidate === void 0 || !isPointSymbol(candidate);
 		}
-		const transformIds = this.transformMemberIds();
-		const transformMemberRemoved = transformIds ? transformIds.some((id) => !seen.has(id)) : false;
-		const excluded = this.excludedInteractionIds();
+		this.lastRenderedMeasures = measures.slice();
+		this.graphicStack.acknowledgeHostRender(measures);
+		if (activeEdit && "syncHostMembership" in activeEdit && measures.some((graphic) => graphic.id === activeEdit.measureId && isPointSymbol(graphic))) activeEdit.syncHostMembership(true);
+		(this.activeTransform ?? this.activeTransformSessionRef)?.syncHostGraphics(measures);
+		const excluded = this.graphicsStackExcludedIds();
 		const visible = excluded.size > 0 ? measures.filter((m) => !excluded.has(m.id)) : measures;
 		if (!(visible.length === 0 && !this.hasRendered)) {
-			this.renderMeasuresToGraphics(visible);
+			this.reconcileGraphicsStack(visible);
 			this.hasRendered = true;
 		}
-		this.lastRenderedMeasures = measures.slice();
 		if (externalEdited && this.activeEdit && "notifyExternalMeasure" in this.activeEdit) this.activeEdit.notifyExternalMeasure(externalEdited);
-		if (editedRemoved && this.activeEdit) {
+		if (editedRemoved) {
 			const editHandle = this.activeEdit;
-			queueMicrotask(() => {
+			if (editHandle) queueMicrotask(() => {
 				editHandle.abort("removed");
 			});
-		}
-		if (transformMemberRemoved) {
-			const sessionRef = this.activeTransformSessionRef;
-			queueMicrotask(() => {
-				const handle = this.activeTransform;
-				if (!handle || handle.settled) return;
-				if (this.activeTransformSessionRef !== sessionRef) return;
-				const rendered = new Set(this.lastRenderedMeasures.map((m) => m.id));
-				if (handle.graphicIds.some((id) => !rendered.has(id))) handle.abort("removed");
-			});
+			else if (this.activeInteraction.isStarting) this.activeInteraction.cancel("removed");
 		}
 		this.renderHighlights();
 	}
@@ -6099,7 +6187,7 @@ var TacticalDraw = class {
 	* idempotent (mirrors {@link render}): a non-interactive outline box is drawn
 	* around each still-rendered graphic on the dedicated highlight layer — no
 	* draw / edit / transform session, no promise, no pick subscription. Passing
-	* `[]` clears every highlight. Unknown ids and ids currently lifted into an
+	* `[]` clears every highlight. Unknown ids and ids currently active in an
 	* active edit / transform session are skipped (the live session's own visuals
 	* supersede the passive outline). Hosts use it for Excalidraw-style
 	* "locked selection" chrome.
@@ -6112,9 +6200,9 @@ var TacticalDraw = class {
 	/**
 	* Project the current {@link highlightedIds} into one outline `LineString`
 	* per graphic and reconcile them onto the highlight layer. Idempotent and
-	* id-keyed via `adapter.updateLayerFeatures`, so a set-replace removes stale
-	* outlines and an unchanged set is a cheap no-op write. Skips ids that are
-	* unknown (not in the last render) or lifted into an active session, and
+	* grouped by graphic id, so desired-state replacement removes stale outlines
+	* and an unchanged set is a cheap no-op write. Skips ids that are
+	* unknown (not in the last render) or active in an interaction session, and
 	* bails gracefully when the adapter cannot invert pixels to coordinates
 	* (`getCoordinateFromPixel` is optional in the MapAdapter ABI).
 	*/
@@ -6147,7 +6235,11 @@ var TacticalDraw = class {
 			const feature = boxOutlineFeature(box, invert, `__td_highlight__:${id}`, style);
 			if (!invertFailed) features.push(feature);
 		}
-		this.adapter.updateLayerFeatures(this.highlightLayer, features);
+		this.adapter.setLayerFeatureGroups(this.highlightLayer, features.map((feature) => ({
+			id: String(feature.id),
+			features: [feature],
+			iconResources: []
+		})));
 		this.hasHighlightOutlines = features.length > 0;
 	}
 	/**
@@ -6349,10 +6441,10 @@ var TacticalDraw = class {
 			if (preempt) return preempt;
 			const wasOnGraphicsLayer = this.lastRenderedMeasures.some((m) => m.id === measure.id);
 			const settleToGraphics = (settledSymbol) => {
-				if (!wasOnGraphicsLayer) return;
-				const graphics = settledSymbol ? this.lastRenderedMeasures.map((graphic) => graphic.id === measure.id ? settledSymbol : graphic) : this.lastRenderedMeasures;
-				this.renderMeasuresToGraphics(graphics);
-				this.adapter.deferLayerRemovalUntilLayerUpdate?.(this.previewLayer, this.graphicsLayer);
+				this.settleWorkingGraphics([{
+					id: measure.id,
+					committed: settledSymbol
+				}]);
 			};
 			const handleIdPrefix = `__td_edit_${++this.editCounter}__`;
 			return this.runWithSlot((onSettled) => runPointSymbolEdit({
@@ -6366,14 +6458,16 @@ var TacticalDraw = class {
 				closeOnClickAway: options?.closeOnClickAway,
 				modes: options?.modes,
 				interactionStyle: this.resolveInteractionStyle(options?.interactionStyle),
-				onSession: options?.onSession,
+				onSession: this.trackSession(options?.onSession),
 				handleIdPrefix,
 				settleToGraphics,
+				publishWorkingGraphic: (group) => this.publishWorkingGraphics([group]),
 				wasOnGraphicsLayer,
 				onSettled,
 				onClickAwayGraphicsPick: (event) => this.dispatchHostPick(this.graphicsLayer, event),
 				snap: this.resolveSnap
 			}), (handle) => {
+				handle.syncHostMembership(this.lastRenderedMeasures.some((graphic) => graphic.id === handle.measureId && isPointSymbol(graphic)));
 				this.activeEdit = handle;
 				return () => {
 					if (this.activeEdit === handle) this.activeEdit = null;
@@ -6383,12 +6477,11 @@ var TacticalDraw = class {
 		normaliseModes(options?.modes);
 		const preempt = this.guardAndPreempt();
 		if (preempt) return preempt;
-		const wasOnGraphicsLayer = this.lastRenderedMeasures.some((m) => m.id === measure.id);
 		const settleToGraphics = (settledMeasure) => {
-			if (!wasOnGraphicsLayer) return;
-			const graphics = settledMeasure ? this.lastRenderedMeasures.map((graphic) => graphic.id === measure.id ? settledMeasure : graphic) : this.lastRenderedMeasures;
-			this.renderMeasuresToGraphics(graphics);
-			this.adapter.deferLayerRemovalUntilLayerUpdate?.(this.previewLayer, this.graphicsLayer);
+			this.settleWorkingGraphics([{
+				id: measure.id,
+				committed: settledMeasure
+			}]);
 		};
 		const handleIdPrefix = `__td_edit_${++this.editCounter}__`;
 		const mergedInteractionStyle = this.resolveInteractionStyle(options?.interactionStyle);
@@ -6413,7 +6506,11 @@ var TacticalDraw = class {
 			guide: options?.guide,
 			sizeAnchor: options?.sizeAnchor,
 			settleToGraphics,
-			wasOnGraphicsLayer,
+			publishWorkingGraphic: (graphic, features) => this.publishWorkingGraphics([{
+				id: graphic.id,
+				features,
+				iconResources: []
+			}]),
 			onSettled,
 			onClickAwayGraphicsPick,
 			snap: this.resolveSnap
@@ -6436,9 +6533,6 @@ var TacticalDraw = class {
 		const preempt = this.guardAndPreempt();
 		if (preempt) return preempt;
 		const isOnGraphicsLayer = (id) => this.lastRenderedMeasures.some((m) => m.id === id);
-		const restoreOriginalToGraphics = () => {
-			this.renderMeasuresToGraphics(this.lastRenderedMeasures);
-		};
 		const handleIdPrefix = `__td_transform_${++this.transformCounter}__`;
 		const mergedInteractionStyle = this.resolveInteractionStyle(options?.interactionStyle);
 		const onClickAwayGraphicsPick = (event) => {
@@ -6461,7 +6555,8 @@ var TacticalDraw = class {
 			onSession: this.trackTransformSession(options?.onSession),
 			handleIdPrefix,
 			sizeAnchor: options?.sizeAnchor,
-			restoreOriginalToGraphics,
+			publishWorkingGraphics: (groups) => this.publishWorkingGraphics(groups),
+			settleWorkingGraphics: (settlements) => this.settleWorkingGraphics(settlements),
 			isOnGraphicsLayer,
 			onSettled,
 			onClickAwayGraphicsPick
@@ -6743,7 +6838,8 @@ var TacticalDraw = class {
 	*/
 	routePick(layerId, event) {
 		const excluded = this.excludedInteractionIds();
-		if (layerId === this.graphicsLayer && excluded.size > 0 && !excluded.has(event.id)) {
+		if (layerId === this.graphicsLayer && excluded.size > 0) {
+			if (excluded.has(event.id)) return;
 			this.deferredGraphicsPick = event;
 			return;
 		}