@orbat-mapper/tactical-draw 0.2.0-alpha.7 → 0.2.0-alpha.8

package/dist/index.d.mts

@@ -518,10 +518,12 @@ interface EditSession {
    */
   readonly sizeAnchor: SizeAnchor;
   /**
-   * Resolve the outer `edit` promise with a `ControlMeasureSnapshot` of the
-   * current working state.
+   * Commit: returns the `ControlMeasureSnapshot` of the current working state
+   * and resolves the outer `edit` promise with the same value (the same
+   * reference — no double-bake of ground-anchored sizes). Returns `undefined`
+   * after the session has settled (idempotent no-op).
    */
-  close(): void;
+  close(): ControlMeasureSnapshot | undefined;
   /** Reject the outer `edit` promise with reason `"session"`. */
   abort(): void;
   /**
@@ -592,12 +594,22 @@ interface EditChangeEvent {
  * transform box's corner-scale / rotate / body-translate gestures, applied to
  * every member at once. See the Phase 3 ("Multi-select") slice of ADR-0017.
  *
- * `measures` is the immutable edit-start input, index-aligned with every
- * snapshot array this session or its change events produce. After the
- * session settles (`close` / `abort`), every method is a silent no-op.
+ * The member set is mutable via [[setMembers]] (#187): members can join or
+ * leave a live session without a session boundary. Because membership changes
+ * over the session's lifetime, snapshot arrays are keyed by **measure id**, not
+ * by index — a snapshot's identity is `snapshot.measure.id`. `measures` is a
+ * live view of the current members' join-time inputs; a `TransformChangeEvent`'s
+ * arrays are index-aligned with `session.measures` *as of that emission*. After
+ * the session settles (`close` / `abort` / an emptying `setMembers`), every
+ * method is a silent no-op.
  */
 interface TransformSession {
-  /** Immutable edit-start inputs, index-aligned with every snapshot array. */
+  /**
+   * Live view of the current members' join-time input measures — a fresh array
+   * on each read, in current membership order. Grows/shrinks as [[setMembers]]
+   * adds or removes members. Not stable across membership changes: key
+   * snapshots by `snapshot.measure.id` rather than relying on index alignment.
+   */
   readonly measures: readonly ControlMeasure[];
   /**
    * Live working control points for the member whose id is `measureId`, or
@@ -615,10 +627,50 @@ interface TransformSession {
   /** Switch the group's size anchor (ADR-0020). Takes effect on the next emitted snapshot and on `close()`. */
   setSizeAnchor(anchor: SizeAnchor): void;
   /**
-   * Resolve the outer `editMany` promise with index-aligned
-   * `ControlMeasureSnapshot[]` of the current working state.
+   * Replace the member set in place — the primitive behind shift-click toggle,
+   * marquee replace, and single-edit → group folding, without tearing the
+   * session down (#187). Members are matched to the current set by measure id:
+   *
+   * - **Retained** members (id in both the current and next sets) carry their
+   *   current working state forward; the passed measure object is ignored for
+   *   them. Their `dirty` baseline stays their original join-time input, so a
+   *   session that has already moved things stays dirty across the call.
+   * - **Removed** members (id in the current set, absent from the next) are
+   *   committed at their current working state.
+   * - **Added** members (id only in the next set) join at their passed input
+   *   state; if currently on the graphics layer they are lifted off it exactly
+   *   like initial members.
+   *
+   * The transform box re-derives from the next member set at the session's
+   * current box angle. Session-scoped state (`sizeAnchor`, box angle,
+   * non-geometry dirty) is unchanged.
+   *
+   * **Return value** — the committed exit snapshots of the members removed *by
+   * this call*, built exactly like [[close]]'s snapshots (pixel size baked to
+   * ground unless `sizeAnchor` is `"screen"`, then cloned and rendered); an
+   * empty array when nothing was removed. This is the *only* delivery of a
+   * removed member's exit state: the outer `editMany` promise resolves with the
+   * snapshots of the members in the set **at close time only**. Removed members
+   * are NOT written back to the graphics layer by the controller — the host
+   * folds the returned snapshots into its document and calls `td.render()`, the
+   * same contract as [[close]]. Returns `undefined` (a silent no-op) after the
+   * session has settled.
+   *
+   * `setMembers([])` on a live session delegates to [[close]]: it commits every
+   * current member, resolves the promise with their snapshots, and returns that
+   * same array. Duplicate ids in `measures` throw `TypeError` synchronously,
+   * without mutating session state.
+   */
+  setMembers(measures: readonly ControlMeasure[]): ControlMeasureSnapshot[] | undefined;
+  /**
+   * Commit: returns the members' `ControlMeasureSnapshot[]` (the members in the
+   * set at close time) and resolves the outer `editMany` promise with the same
+   * value (the same reference — no double-bake of ground-anchored sizes). A
+   * member removed mid-session via [[setMembers]] is not included here; its exit
+   * snapshot was returned from that `setMembers` call. Returns `undefined` after
+   * the session has settled (idempotent no-op).
    */
-  close(): void;
+  close(): ControlMeasureSnapshot[] | undefined;
   /** Reject the outer `editMany` promise with reason `"session"`. */
   abort(): void;
   /**
@@ -638,13 +690,17 @@ interface TransformSession {
 /**
  * Delivered to `TransformSession.onChange` listeners once per completed group
  * gesture. Both `measures` and `previous` are index-aligned with
- * `session.measures`. See `EditChangeEvent` for the identical emission
- * contract this mirrors.
+ * `session.measures` *as of this emission*. Key by `measure.id` rather than
+ * relying on index alignment across emissions. A `setMembers` call from within
+ * a listener takes effect immediately and supersedes this emission's
+ * `reject()` (the rollback baseline no longer matches the member set);
+ * `close()` and `abort()` still apply, against the new membership. See
+ * `EditChangeEvent` for the identical emission contract this mirrors.
  */
 interface TransformChangeEvent {
-  /** Working state after the completed gesture, index-aligned with `session.measures`. */
+  /** Working state after the completed gesture, index-aligned with `session.measures` as of this emission. */
   readonly measures: ControlMeasureSnapshot[];
-  /** State immediately before this gesture, index-aligned with `session.measures`. */
+  /** State immediately before this gesture, index-aligned with `session.measures` as of this emission. */
   readonly previous: ControlMeasureSnapshot[];
   /** The session the event belongs to. */
   readonly session: TransformSession;
@@ -652,7 +708,8 @@ interface TransformChangeEvent {
    * Roll every member's working preview back to `previous` after all
    * listeners have run. Multiple calls collapse to a single rollback.
    * Overridden by `close()` or `abort()` if either is also called during this
-   * emission.
+   * emission, and dropped if a listener called `session.setMembers` (the
+   * rollback baseline no longer matches the member set).
    */
   reject(): void;
   /** Shortcut for `event.session.close()`, deferred until the emission ends. */
@@ -945,6 +1002,14 @@ declare class TacticalDraw {
    * working copy. Empty while idle.
    */
   private excludedInteractionIds;
+  /**
+   * Live member ids of the active group transform, or `undefined` when none.
+   * Falls back to the session ref because `onSession` fires from inside the
+   * controller's attach, before `runWithSlot` has assigned `activeTransform` —
+   * the session ref is registered first (`trackTransformSession`), so a
+   * `render()` from inside `onSession` still sees live membership.
+   */
+  private transformMemberIds;
   /**
    * Reconcile the graphics layer against the authoritative list of measures.
    * Idempotent. Throws synchronously on duplicate measure ids *before*
@@ -1028,9 +1093,13 @@ declare class TacticalDraw {
    * (ADR-0017 "Multi-select" slice). Every member is lifted onto the shared
    * preview layer; the box (corner scale, rotate grip, drag-anywhere body
    * translate) applies rigidly to all of them at once. Returns a Promise that
-   * resolves with index-aligned `ControlMeasureSnapshot[]` on
-   * `session.close()` and rejects with `TacticalDrawAbortError` on
-   * signal / Escape / destroy / preempt / `session.abort()`.
+   * resolves with `ControlMeasureSnapshot[]` on `session.close()` and rejects
+   * with `TacticalDrawAbortError` on signal / Escape / destroy / preempt /
+   * `session.abort()`. Key the resolved snapshots by `snapshot.measure.id`:
+   * the member set is mutable (`session.setMembers`, #187) so snapshot arrays
+   * are id-keyed, not index-aligned with this input. The promise resolves with
+   * the members in the set at close time; a member removed mid-session had its
+   * exit snapshot returned from the `setMembers` call that removed it.
    *
    * `measures.length` must be >= 1; a single-element array behaves like an
    * `edit` with only `transform` mode. Throws `TypeError` synchronously (before

package/dist/index.mjs

@@ -699,7 +699,7 @@ function runInteraction(spec) {
 		clearLayers();
 	}
 	function commit(produce) {
-		if (settled) return;
+		if (settled) return void 0;
 		let value;
 		try {
 			value = produce();
@@ -714,6 +714,7 @@ function runInteraction(spec) {
 		teardown();
 		resolveFn(value);
 		if (onSettled) onSettled();
+		return value;
 	}
 	function fail(error) {
 		if (settled) return;
@@ -2259,8 +2260,7 @@ function runEdit(opts) {
 			return sizeAnchor;
 		},
 		close() {
-			if (ctx.settled) return;
-			ctx.commit(rebuildRendered);
+			return ctx.commit(rebuildRendered);
 		},
 		abort() {
 			if (ctx.settled) return;
@@ -2664,49 +2664,67 @@ const CLICK_SLOP_PX = 3;
 *    thin outline (its own fit at the same angle)
 *  - dirty tracking, close/abort/signal/preempt/destroy, click-away — same
 *    contracts as `runEdit`, scoped to the group
+*  - membership is mutable via `session.setMembers` (#187): members join/leave
+*    a live session without a session boundary
 */
 function runGroupTransform(opts) {
-	const { adapter, measures, graphicsLayer, previewLayer, handlesLayer, graphicsStyle, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, restoreOriginalToGraphics, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick } = opts;
+	const { adapter, measures, graphicsLayer, previewLayer, handlesLayer, graphicsStyle, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, restoreOriginalToGraphics, isOnGraphicsLayer, onSettled, onClickAwayGraphicsPick } = opts;
 	const renderOpts = graphicsStyle ? { graphicsStyle } : void 0;
-	const memberIds = new Set(measures.map((m) => m.id));
 	let sizeAnchor = opts.sizeAnchor ?? "ground";
-	const editStartPointsByMember = measures.map((m) => m.controlPoints.map((p) => [...p]));
-	const workingPointsByMember = editStartPointsByMember.map((pts) => pts.map((p) => [...p]));
-	const counts = workingPointsByMember.map((pts) => pts.length);
+	/** Build a fresh working record for `measure`, snapshotting its edit-start points. */
+	function createMemberState(measure) {
+		const editStartPoints = measure.controlPoints.map((p) => [...p]);
+		return {
+			measure,
+			editStartPoints,
+			workingPoints: editStartPoints.map((p) => [...p]),
+			optionsOverride: null,
+			box: null,
+			lastPreviewFeatures: []
+		};
+	}
+	/** The single mutable source of truth for the current member set. */
+	let members = measures.map(createMemberState);
 	/**
-	* Per-member options patch, index-aligned with `measures`, applied on top of
-	* the member's own `options` when building its working/rendered measure.
-	* This exists solely to freeze orientation-derived option defaults (e.g.
-	* Battle Position's echelon anchor) the moment a group rotate gesture
-	* starts (ADR-0023) — there is no public per-member `setOptions` here, and
-	* the "no per-measure setOptions" contract for the group session still
-	* holds; a host cannot reach this array.
+	* `true` once any member has been lifted off the graphics layer (initial or a
+	* mid-session `setMembers` add). Gates the abort-path restore so a session
+	* that never touched the graphics layer doesn't rewrite it on abort.
 	*/
-	let optionsOverrideByMember = measures.map(() => null);
-	/** Effective options for member `i` against a given override array, merged onto its own options. */
-	function effectiveOptionsWith(i, overrides) {
-		const override = overrides[i];
-		if (!override) return measures[i].options;
+	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;
 		return {
-			...measures[i].options ?? {},
+			...base ?? {},
 			...override
 		};
 	}
-	/** Effective options for member `i`: its own options merged with the *live* override. */
+	/** Effective options for member `i`: its own options merged with its *live* override. */
 	function effectiveOptions(i) {
-		return effectiveOptionsWith(i, optionsOverrideByMember);
+		const member = members[i];
+		return mergeOptions(member.measure.options, member.optionsOverride);
 	}
-	/** The working measure for member `i` against a given override array, with live working points. */
-	function workingMeasureForWith(i, overrides) {
+	/** Build a member's committed snapshot with a given override, baking pixel size to ground unless "screen". */
+	function buildMemberSnapshot(member, override) {
+		const working = {
+			...member.measure,
+			options: mergeOptions(member.measure.options, override),
+			controlPoints: member.workingPoints.map((p) => [...p])
+		};
+		const committed = sizeAnchor === "screen" ? working : bakePixelSizeToGround(working, adapter);
 		return {
-			...measures[i],
-			options: effectiveOptionsWith(i, overrides),
-			controlPoints: workingPointsByMember[i].map((p) => [...p])
+			measure: cloneControlMeasure(committed),
+			render: renderMeasureForAdapter(adapter, committed, renderOpts)
 		};
 	}
 	/** The working measure for member `i`: original measure, live effective options, live working points. */
 	function workingMeasureFor(i) {
-		return workingMeasureForWith(i, optionsOverrideByMember);
+		const member = members[i];
+		return {
+			...member.measure,
+			options: effectiveOptions(i),
+			controlPoints: member.workingPoints.map((p) => [...p])
+		};
 	}
 	let dirty = false;
 	/**
@@ -2723,22 +2741,22 @@ function runGroupTransform(opts) {
 	let boxAngle = 0;
 	/** The group box fitted over every member's rendered geometry, or `null` when nothing projects this frame. */
 	let groupBox = null;
-	/** Each member's own fitted box (same angle as `groupBox`), index-aligned with `measures`. */
-	let memberBoxes = measures.map(() => null);
-	/** The features written to the preview layer for each member on the last paint. */
-	let lastPreviewFeaturesByMember = measures.map(() => []);
 	let ctx;
 	let driver;
 	const dragProjection = {
 		toPixel: (lonLat) => driver.toPixel(lonLat),
 		fromPixel: (pixel) => driver.fromPixel(pixel)
 	};
-	function liftOriginalsFromGraphics() {
-		measures.forEach((measure, i) => {
-			if (!wasOnGraphicsLayer[i]) return;
-			const ids = renderMeasureForAdapter(adapter, measure, renderOpts).features.map((f) => f.id).filter((id) => typeof id === "string");
-			if (ids.length > 0) adapter.removeFeatures(graphicsLayer, ids);
-		});
+	/**
+	* 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.measure.id)) return;
+		const ids = renderMeasureForAdapter(adapter, member.measure, renderOpts).features.map((f) => f.id).filter((id) => typeof id === "string");
+		if (ids.length > 0) adapter.removeFeatures(graphicsLayer, ids);
+		anyLiftedFromGraphics = true;
 	}
 	function pixelsFor(features) {
 		const positions = [];
@@ -2755,7 +2773,7 @@ function runGroupTransform(opts) {
 		return activeBoxDrag ? activeBoxDrag.lastSnapshot.box.angle : boxAngle;
 	}
 	/**
-	* Re-fit `groupBox` and every `memberBoxes[i]` from `lastPreviewFeaturesByMember`.
+	* Re-fit `groupBox` and every member's `box` from their `lastPreviewFeatures`.
 	* While a box gesture is in flight, `groupBox` itself is not touched here —
 	* `renderHandlesLayer` paints the drag's own rigidly-transformed box instead
 	* (matching `edit-controller.ts`'s `refitBox`) — but the member outlines are
@@ -2766,18 +2784,18 @@ function runGroupTransform(opts) {
 		const angle = currentAngle();
 		const padding = interactionStyle?.boxPadding ?? 0;
 		const allPixels = [];
-		memberBoxes = lastPreviewFeaturesByMember.map((features) => {
-			const pixels = pixelsFor(features);
+		for (const member of members) {
+			const pixels = pixelsFor(member.lastPreviewFeatures);
 			allPixels.push(...pixels);
-			return fitTransformBox(pixels, angle, padding);
-		});
+			member.box = fitTransformBox(pixels, angle, padding);
+		}
 		if (activeBoxDrag) return;
 		groupBox = fitTransformBox(allPixels, boxAngle, padding);
 	}
 	function renderAllPreviews() {
 		if (ctx.settled) return;
 		const allFeatures = [];
-		lastPreviewFeaturesByMember = measures.map((_measure, i) => {
+		members.forEach((member, i) => {
 			const working = workingMeasureFor(i);
 			let features;
 			try {
@@ -2785,17 +2803,17 @@ function runGroupTransform(opts) {
 			} catch {
 				features = [];
 			}
+			member.lastPreviewFeatures = features;
 			allFeatures.push(...features);
-			return features;
 		});
 		ctx.writeLayer(previewLayer, allFeatures);
 		refitBoxes();
 	}
 	function rescaleOnViewChange() {
 		if (ctx.settled) return;
-		if (measures.some((m) => measureUsesAdapterResolution({
-			kind: m.kind,
-			options: m.options
+		if (members.some((m) => measureUsesAdapterResolution({
+			kind: m.measure.kind,
+			options: m.measure.options
 		}))) renderAllPreviews();
 		else refitBoxes();
 		renderHandlesLayer();
@@ -2821,59 +2839,62 @@ function runGroupTransform(opts) {
 			features.push(boxOutlineFeature(liveGroupBox, dragProjection.fromPixel, `${handleIdPrefix}:box-outline`, groupOutlineStyle()));
 			features.push(...toFeatures(boxToHandles(liveGroupBox, dragProjection.fromPixel), handleIdPrefix, interactionStyle));
 		}
-		measures.forEach((measure, i) => {
-			const memberBox = memberBoxes[i];
-			if (!memberBox) return;
-			features.push(boxOutlineFeature(memberBox, dragProjection.fromPixel, `${handleIdPrefix}:member-outline:${measure.id}`, interactionStyle?.boxOutline));
-		});
+		for (const member of members) {
+			const memberBox = member.box;
+			if (!memberBox) continue;
+			features.push(boxOutlineFeature(memberBox, dragProjection.fromPixel, `${handleIdPrefix}:member-outline:${member.measure.id}`, interactionStyle?.boxOutline));
+		}
 		ctx.writeLayer(handlesLayer, features);
 	}
 	/**
 	* Builds every member's committed snapshot against a given override array
-	* rather than the live `optionsOverrideByMember` — used to render a
-	* gesture's pre-freeze "previous" snapshot when a rotate has already
-	* mutated the live overrides by the time the commit runs.
+	* rather than the live per-member override — used to render a gesture's
+	* pre-freeze "previous" snapshot when a rotate has already mutated the live
+	* overrides by the time the commit runs. Index-aligned with `members`, which
+	* is sound because membership cannot change within a gesture emission.
 	*/
 	function rebuildRenderedAllWith(overrides) {
-		return measures.map((_measure, i) => {
-			const working = workingMeasureForWith(i, overrides);
-			const committed = sizeAnchor === "screen" ? working : bakePixelSizeToGround(working, adapter);
-			return {
-				measure: cloneControlMeasure(committed),
-				render: renderMeasureForAdapter(adapter, committed, renderOpts)
-			};
-		});
+		return members.map((member, i) => buildMemberSnapshot(member, overrides[i] ?? null));
 	}
 	function rebuildRenderedAll() {
-		return rebuildRenderedAllWith(optionsOverrideByMember);
+		return members.map((member) => buildMemberSnapshot(member, member.optionsOverride));
 	}
 	function recomputeDirty() {
-		dirty = nonGeometryDirty || workingPointsByMember.some((pts, i) => !pointsEqualWithinTolerance(pts, editStartPointsByMember[i], DIRTY_EPSILON));
+		dirty = nonGeometryDirty || members.some((m) => !pointsEqualWithinTolerance(m.workingPoints, m.editStartPoints, DIRTY_EPSILON));
 	}
-	/** Split `points` (the concatenation of every member's control points) back per member and write them into `workingPointsByMember`. */
+	/** Split `points` (the concatenation of every member's control points) back per member. */
 	function applyConcatenatedPoints(points) {
 		const rounded = roundControlPoints(points);
 		let offset = 0;
-		for (let i = 0; i < counts.length; i++) {
-			const c = counts[i];
+		for (const member of members) {
+			const c = member.workingPoints.length;
 			const slice = rounded.slice(offset, offset + c);
-			workingPointsByMember[i].splice(0, workingPointsByMember[i].length, ...slice);
+			member.workingPoints.splice(0, member.workingPoints.length, ...slice);
 			offset += c;
 		}
 	}
 	function concatWorkingPoints() {
 		const out = [];
-		for (const pts of workingPointsByMember) out.push(...pts.map((p) => [...p]));
+		for (const member of members) out.push(...member.workingPoints.map((p) => [...p]));
 		return out;
 	}
 	function clonePointsByMember() {
-		return workingPointsByMember.map((pts) => pts.map((p) => [...p]));
+		return members.map((m) => m.workingPoints.map((p) => [...p]));
 	}
 	function restorePointsByMember(snapshot) {
-		for (let i = 0; i < workingPointsByMember.length; i++) workingPointsByMember[i].splice(0, workingPointsByMember[i].length, ...snapshot[i]);
+		members.forEach((member, i) => {
+			member.workingPoints.splice(0, member.workingPoints.length, ...snapshot[i]);
+		});
 	}
 	function cloneOptionsOverrideByMember() {
-		return optionsOverrideByMember.map((o) => o ? { ...o } : null);
+		return members.map((m) => m.optionsOverride ? { ...m.optionsOverride } : null);
+	}
+	/** Write a per-member override snapshot back onto the live members (index-aligned; gesture-scoped). */
+	function applyOptionsOverrides(overrides) {
+		members.forEach((member, i) => {
+			const o = overrides[i];
+			member.optionsOverride = o ? { ...o } : null;
+		});
 	}
 	/**
 	* Pin orientation-derived option defaults (e.g. Battle Position's echelon
@@ -2882,10 +2903,10 @@ function runGroupTransform(opts) {
 	* per-member since the group has no single working-options set.
 	*/
 	function freezeOrientationForRotate() {
-		measures.forEach((measure, i) => {
-			const patch = freezeOrientationOptions(measure.kind, workingPointsByMember[i].map((p) => [...p]), effectiveOptions(i));
-			if (patch) optionsOverrideByMember[i] = {
-				...optionsOverrideByMember[i] ?? {},
+		members.forEach((member, i) => {
+			const patch = freezeOrientationOptions(member.measure.kind, member.workingPoints.map((p) => [...p]), effectiveOptions(i));
+			if (patch) member.optionsOverride = {
+				...member.optionsOverride ?? {},
 				...patch
 			};
 		});
@@ -2915,6 +2936,7 @@ function runGroupTransform(opts) {
 				abortRequested = true;
 			}
 		};
+		const membersAtEmission = members;
 		const errors = [];
 		for (const listener of [...changeListeners]) try {
 			listener(event);
@@ -2923,11 +2945,11 @@ function runGroupTransform(opts) {
 		}
 		if (abortRequested) ctx.fail(new TacticalDrawAbortError("session"));
 		else if (closeRequested) ctx.commit(rebuildRenderedAll);
-		else if (rejectRequested && !ctx.settled) {
+		else if (rejectRequested && !ctx.settled && members === membersAtEmission) {
 			restorePointsByMember(previousPointsByMember);
 			sizeAnchor = previousSizeAnchor;
 			nonGeometryDirty = previousNonGeometryDirty;
-			optionsOverrideByMember = previousOptionsOverrideByMember.map((o) => o ? { ...o } : null);
+			applyOptionsOverrides(previousOptionsOverrideByMember);
 			renderAllPreviews();
 			renderHandlesLayer();
 			recomputeDirty();
@@ -2968,12 +2990,63 @@ function runGroupTransform(opts) {
 		dirty = true;
 		emitChange(previousRendered, previousPointsByMember, previousSizeAnchor, previousNonGeometryDirty, previousOptionsOverrideByMember, currentRendered);
 	}
+	/**
+	* Cancel an in-flight box drag without committing it: restore the pre-drag
+	* geometry and option overrides, re-enable drag pan, and clear the drag. Used
+	* by `setMembers` so a membership change never bakes a half-finished drag; the
+	* caller is responsible for the follow-up repaint (`renderAllPreviews` /
+	* `renderHandlesLayer` / `recomputeDirty`), so this leaves the paint to it
+	* rather than rendering the outgoing member set only to redo it immediately.
+	*/
+	function cancelActiveBoxDrag() {
+		if (!activeBoxDrag) return;
+		const { preDragPoints, preDragOptionsOverrideByMember } = activeBoxDrag;
+		activeBoxDrag = null;
+		driver.setDragPanEnabled(true);
+		applyConcatenatedPoints(preDragPoints);
+		applyOptionsOverrides(preDragOptionsOverrideByMember);
+		dragInFlight = false;
+	}
+	function setMembers(next) {
+		if (ctx.settled) return void 0;
+		const seen = /* @__PURE__ */ new Set();
+		for (const m of next) {
+			if (seen.has(m.id)) throw new TypeError(`TransformSession.setMembers: duplicate control measure id "${m.id}"`);
+			seen.add(m.id);
+		}
+		if (next.length === 0) return close();
+		cancelActiveBoxDrag();
+		const nextIds = new Set(next.map((m) => m.id));
+		const currentById = new Map(members.map((m) => [m.measure.id, m]));
+		const removedSnapshots = [];
+		for (const member of members) if (!nextIds.has(member.measure.id)) removedSnapshots.push(buildMemberSnapshot(member, member.optionsOverride));
+		const nextMembers = [];
+		for (const measure of next) {
+			const existing = currentById.get(measure.id);
+			if (existing) nextMembers.push(existing);
+			else {
+				const member = createMemberState(measure);
+				liftMemberFromGraphics(member);
+				nextMembers.push(member);
+			}
+		}
+		members = nextMembers;
+		renderAllPreviews();
+		renderHandlesLayer();
+		recomputeDirty();
+		return removedSnapshots;
+	}
+	function close() {
+		return ctx.commit(rebuildRenderedAll);
+	}
 	const session = {
-		measures,
+		get measures() {
+			return members.map((m) => m.measure);
+		},
 		controlPointsFor(measureId) {
-			const index = measures.findIndex((m) => m.id === measureId);
-			if (index < 0) return void 0;
-			return workingPointsByMember[index].map((p) => [...p]);
+			const member = members.find((m) => m.measure.id === measureId);
+			if (!member) return void 0;
+			return member.workingPoints.map((p) => [...p]);
 		},
 		get dirty() {
 			return dirty;
@@ -2984,10 +3057,8 @@ function runGroupTransform(opts) {
 		setSizeAnchor(next) {
 			setSizeAnchor(next);
 		},
-		close() {
-			if (ctx.settled) return;
-			ctx.commit(rebuildRenderedAll);
-		},
+		setMembers,
+		close,
 		abort() {
 			if (ctx.settled) return;
 			ctx.fail(new TacticalDrawAbortError("session"));
@@ -3100,7 +3171,8 @@ function runGroupTransform(opts) {
 			return;
 		}
 		if (localPreview || localHandles) return;
-		if (localGraphics && !memberIds.has(localGraphics.id)) {
+		const isMember = localGraphics ? members.some((m) => m.measure.id === localGraphics.id) : false;
+		if (localGraphics && !isMember) {
 			ctx.commit(rebuildRenderedAll);
 			if (onClickAwayGraphicsPick) onClickAwayGraphicsPick(localGraphics);
 			return;
@@ -3116,7 +3188,7 @@ function runGroupTransform(opts) {
 		attach(c) {
 			ctx = c;
 			driver = adapter.createEditPointerDriver();
-			liftOriginalsFromGraphics();
+			for (const member of members) liftMemberFromGraphics(member);
 			const unsubDown = driver.onPointerDown(onDriverDown);
 			const unsubMove = driver.onPointerMove(onDriverMove);
 			const unsubUp = driver.onPointerUp(onDriverUp);
@@ -3124,7 +3196,6 @@ function runGroupTransform(opts) {
 			const unsubPickHandles = adapter.onPick(handlesLayer, handlePickHandles);
 			const unsubPickGraphics = adapter.onPick(graphicsLayer, handlePickGraphics);
 			adapter.on("click", handleClick);
-			const anyWasOnGraphicsLayer = wasOnGraphicsLayer.some(Boolean);
 			c.onTeardown(() => {
 				adapter.off("click", handleClick);
 				unsubPickPreview();
@@ -3139,7 +3210,9 @@ function runGroupTransform(opts) {
 					dragInFlight = false;
 				}
 				driver.dispose();
-			}, anyWasOnGraphicsLayer ? restoreOriginalToGraphics : void 0);
+			}, () => {
+				if (anyLiftedFromGraphics) restoreOriginalToGraphics();
+			});
 			renderAllPreviews();
 			renderHandlesLayer();
 			recomputeDirty();
@@ -3151,7 +3224,9 @@ function runGroupTransform(opts) {
 		get settled() {
 			return core.settled;
 		},
-		measureIds: measures.map((m) => m.id),
+		get measureIds() {
+			return members.map((m) => m.measure.id);
+		},
 		abort(reason, cause) {
 			core.abort(reason, cause);
 		}
@@ -3297,10 +3372,21 @@ var TacticalDraw = class {
 	excludedInteractionIds() {
 		const ids = /* @__PURE__ */ new Set();
 		if (this.activeEdit) ids.add(this.activeEdit.measureId);
-		if (this.activeTransform) for (const id of this.activeTransform.measureIds) ids.add(id);
+		for (const id of this.transformMemberIds() ?? []) ids.add(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
+	* controller's attach, before `runWithSlot` has assigned `activeTransform` —
+	* the session ref is registered first (`trackTransformSession`), so a
+	* `render()` from inside `onSession` still sees live membership.
+	*/
+	transformMemberIds() {
+		if (this.activeTransform) return this.activeTransform.measureIds;
+		return this.activeTransformSessionRef?.measures.map((m) => m.id);
+	}
+	/**
 	* Reconcile the graphics layer against the authoritative list of measures.
 	* Idempotent. Throws synchronously on duplicate measure ids *before*
 	* mutating any layer. An empty list before any prior render is a no-op.
@@ -3339,7 +3425,7 @@ var TacticalDraw = class {
 			externalEdited = measures.find((m) => m.id === editedId);
 			editedRemoved = externalEdited === void 0;
 		}
-		const transformIds = this.activeTransform?.measureIds;
+		const transformIds = this.transformMemberIds();
 		const transformMemberRemoved = transformIds ? transformIds.some((id) => !seen.has(id)) : false;
 		const excluded = this.excludedInteractionIds();
 		const visible = excluded.size > 0 ? measures.filter((m) => !excluded.has(m.id)) : measures;
@@ -3355,10 +3441,14 @@ var TacticalDraw = class {
 				editHandle.abort("removed");
 			});
 		}
-		if (transformMemberRemoved && this.activeTransform) {
-			const transformHandle = this.activeTransform;
+		if (transformMemberRemoved) {
+			const sessionRef = this.activeTransformSessionRef;
 			queueMicrotask(() => {
-				transformHandle.abort("removed");
+				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.measureIds.some((id) => !rendered.has(id))) handle.abort("removed");
 			});
 		}
 	}
@@ -3564,9 +3654,13 @@ var TacticalDraw = class {
 	* (ADR-0017 "Multi-select" slice). Every member is lifted onto the shared
 	* preview layer; the box (corner scale, rotate grip, drag-anywhere body
 	* translate) applies rigidly to all of them at once. Returns a Promise that
-	* resolves with index-aligned `ControlMeasureSnapshot[]` on
-	* `session.close()` and rejects with `TacticalDrawAbortError` on
-	* signal / Escape / destroy / preempt / `session.abort()`.
+	* resolves with `ControlMeasureSnapshot[]` on `session.close()` and rejects
+	* with `TacticalDrawAbortError` on signal / Escape / destroy / preempt /
+	* `session.abort()`. Key the resolved snapshots by `snapshot.measure.id`:
+	* the member set is mutable (`session.setMembers`, #187) so snapshot arrays
+	* are id-keyed, not index-aligned with this input. The promise resolves with
+	* the members in the set at close time; a member removed mid-session had its
+	* exit snapshot returned from the `setMembers` call that removed it.
 	*
 	* `measures.length` must be >= 1; a single-element array behaves like an
 	* `edit` with only `transform` mode. Throws `TypeError` synchronously (before
@@ -3582,7 +3676,7 @@ var TacticalDraw = class {
 		}
 		const preempt = this.guardAndPreempt();
 		if (preempt) return preempt;
-		const wasOnGraphicsLayer = measures.map((m) => this.lastRenderedMeasures.some((rendered) => rendered.id === m.id));
+		const isOnGraphicsLayer = (id) => this.lastRenderedMeasures.some((m) => m.id === id);
 		const restoreOriginalToGraphics = () => {
 			this.renderMeasuresToGraphics(this.lastRenderedMeasures);
 		};
@@ -3608,7 +3702,7 @@ var TacticalDraw = class {
 			handleIdPrefix,
 			sizeAnchor: options?.sizeAnchor,
 			restoreOriginalToGraphics,
-			wasOnGraphicsLayer,
+			isOnGraphicsLayer,
 			onSettled,
 			onClickAwayGraphicsPick
 		}), (handle) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.2.0-alpha.7",
+  "version": "0.2.0-alpha.8",
   "description": "Engine-agnostic draw/edit core for tactical control measures (MIL-STD-2525 / APP-6). The MapAdapter ABI and bring-your-own-engine entry point for the tactical-draw package family.",
   "license": "MIT",
   "author": "Orbat Mapper",