@orbat-mapper/tactical-draw 0.2.0-alpha.20 → 0.2.0-alpha.22

package/README.md

@@ -87,6 +87,22 @@ if (session && "canCommit" in session) {
 }
 ```
 
+Live edit and transform sessions expose a session-local `history`. Completed
+gestures and authored programmatic mutations are undoable without settling the
+session; pointer-move preview frames are not history steps:
+
+```ts
+const active = td.activeSession;
+const history =
+  (active && "history" in active ? active.history : null) ?? td.activeTransformSession?.history;
+if (history) history.undo();
+```
+
+`history.subscribe(...)` reports `canUndo`, `canRedo`, and optional operation
+labels. Committing folds only the selected working state into the host document
+as one operation. Changing a transform session's members with `setGraphics()`
+establishes a new local baseline and clears both stacks.
+
 ## Bring your own engine
 
 Implement `MapAdapter` (or extend `BaseMapAdapter`) against your map engine

package/dist/index.d.mts

@@ -12,6 +12,11 @@ interface PointerEventInfo {
    * mouse paths populate it; touch leaves it `undefined`.
    */
   altKey?: boolean;
+  /**
+   * Whether Shift was held for this pointer event. Rotation gestures use the
+   * live value to constrain transform-box angles to 15-degree increments.
+   */
+  shiftKey?: boolean;
   /** Engine-native event, for drivers that need to call preventDefault etc. */
   native?: unknown;
 }
@@ -672,6 +677,22 @@ type EditMode = "reshape" | "transform" | "labeldrag" | "delete";
  */
 type SettleReason = "close" | "error" | TacticalDrawAbortReason;
 //#endregion
+//#region src/tactical-draw/session-history.d.ts
+type SessionChangeSource = "gesture" | "undo" | "redo" | "programmatic";
+interface SessionHistoryState {
+  readonly canUndo: boolean;
+  readonly canRedo: boolean;
+  readonly undoLabel?: string;
+  readonly redoLabel?: string;
+}
+interface SessionHistory {
+  /** Current availability and optional labels. Each session retains at most 100 completed steps. */
+  readonly state: SessionHistoryState;
+  undo(): boolean;
+  redo(): boolean;
+  subscribe(listener: (state: SessionHistoryState) => void): () => void;
+}
+//#endregion
 //#region src/tactical-draw/edit-session.d.ts
 /**
  * Surface delivered via `td.edit(measure, opts).onSession` and synchronously
@@ -683,6 +704,8 @@ type SettleReason = "close" | "error" | TacticalDrawAbortReason;
  * asynchronously).
  */
 interface EditSession {
+  /** Undo/redo for completed mutations within this live session. */
+  readonly history: SessionHistory;
   /** Immutable edit-start input. */
   readonly graphic: ControlMeasure;
   /** Live complete working graphic. Copy on read. */
@@ -820,6 +843,8 @@ interface EditSession {
  * observe partial state. See PRD #40 user-stories 23–24.
  */
 interface EditChangeEvent {
+  /** How this working-copy transition was initiated. */
+  readonly source: SessionChangeSource;
   /** Working state after the completed gesture. */
   readonly graphic: GraphicSnapshot<ControlMeasure>;
   /** State immediately before this gesture. */
@@ -840,6 +865,7 @@ interface EditChangeEvent {
 //#endregion
 //#region src/tactical-draw/graphic-edit-session.d.ts
 interface GraphicEditChangeEvent<G extends Graphic = Graphic> {
+  readonly source: SessionChangeSource;
   readonly graphic: GraphicSnapshot<G>;
   readonly previous: GraphicSnapshot<G>;
   readonly session: GraphicEditSession<G>;
@@ -849,6 +875,7 @@ interface GraphicEditChangeEvent<G extends Graphic = Graphic> {
 }
 /** Common selection/editing contract shared by control measures and point symbols. */
 interface GraphicEditSession<G extends Graphic = Graphic> {
+  readonly history: SessionHistory;
   /** Immutable edit-start input. */
   readonly graphic: G;
   /** Live working graphic. Copy on read. */
@@ -885,6 +912,8 @@ interface GraphicEditSession<G extends Graphic = Graphic> {
  * delivers, asynchronously).
  */
 interface TransformSession {
+  /** Undo/redo for completed gestures within the current membership baseline. */
+  readonly history: SessionHistory;
   /**
    * Live view of the current members' join-time input graphics — a fresh array
    * on each read, in current membership order. Grows/shrinks as [[setGraphics]]
@@ -926,6 +955,11 @@ interface TransformSession {
    * current box angle. Session-scoped state (`sizeAnchor`, box angle,
    * non-geometry dirty) is unchanged.
    *
+   * Calling this establishes a new session-history baseline: both undo and
+   * redo are cleared after retained members carry their working state
+   * forward. Membership changes and already-emitted exit snapshots are not
+   * undoable within the live session.
+   *
    * **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
@@ -1036,6 +1070,8 @@ interface TransformSession {
  * `EditChangeEvent` for the identical emission contract this mirrors.
  */
 interface TransformChangeEvent {
+  /** How this working-copy transition was initiated. */
+  readonly source: SessionChangeSource;
   /** Working state after the completed gesture, index-aligned with `session.graphics` as of this emission. */
   readonly graphics: GraphicSnapshot<ControlMeasure>[];
   /** State immediately before this gesture, index-aligned with `session.graphics` as of this emission. */
@@ -1058,6 +1094,7 @@ interface TransformChangeEvent {
 //#endregion
 //#region src/tactical-draw/graphic-transform-session.d.ts
 interface GraphicTransformChangeEvent {
+  readonly source: SessionChangeSource;
   readonly graphics: GraphicSnapshot[];
   readonly previous: GraphicSnapshot[];
   readonly session: GraphicTransformSession;
@@ -1066,6 +1103,7 @@ interface GraphicTransformChangeEvent {
   abort(): void;
 }
 interface GraphicTransformSession {
+  readonly history: SessionHistory;
   readonly graphics: readonly Graphic[];
   readonly workingGraphics: readonly Graphic[];
   readonly dirty: boolean;
@@ -1782,4 +1820,4 @@ declare function nearestWorldCopyLng(lng: number, refLng: number): number;
 /** `nearestWorldCopyLng` applied to a lon/lat position. */
 declare function nearestWorldCopyPosition(position: Position, refLng: number): Position;
 //#endregion
-export { BaseMapAdapter, type CombinedAbort, DEFAULT_LABEL_SIZE_PIXELS, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, type DrawMeasureDraft, type DrawOptions, type DrawPointSymbolDraft, type DrawSession, type EditChangeEvent, type EditManyOptions, type EditMode, type EditOptions, type EditPointerDriver, type EditSession, type FeatureOps, type Graphic, type GraphicEditChangeEvent, type GraphicEditSession, type GraphicRender, type GraphicSnapshot, type GraphicTransformChangeEvent, type GraphicTransformSession, type GuideStyle, type HandleStyle, type IconResource, type InteractionHit, type InteractionStyle, type LayerId, type MapAdapter, type MapCursor, type MapEvent, type MapEventHandler, type NativeEventEntry, type PickEvent, type PickHandler, type PickOptions, type PixelCoordinate, type PointSymbol, type PointSymbolAnchor, type PointSymbolCapability, PointSymbolCapabilityRequiredError, type PointSymbolColors, type PointSymbolFootprint, type PointSymbolGraphicModifiers, type PointSymbolRender, type PointSymbolSize, type PointSymbolStyle, type PointerCallback, PointerCallbackHub, type PointerEventInfo, type SettleReason, type SizeAnchor, type StyleOptions, TOUCH_HIT_TOLERANCE_PX, TacticalDraw, TacticalDrawAbortError, type TacticalDrawAbortReason, TacticalDrawDestroyedError, type TacticalDrawLayerOptions, type TacticalDrawOptions, type TextStyleOptions, type ToPixel, type TransformBox, type TransformChangeEvent, type TransformSession, bindAbortable, clonePointSymbol, coerceHandleStyle, combineWithHostSignal, getSizeAnchor, hitTestFeature, hitTestIconFeature, ignoreAbort, isPointSymbol, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, pointSymbolFootprint, resolveGroundTextSizePixels, tryControlMeasureIdFromFeature };
+export { BaseMapAdapter, type CombinedAbort, DEFAULT_LABEL_SIZE_PIXELS, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, type DrawMeasureDraft, type DrawOptions, type DrawPointSymbolDraft, type DrawSession, type EditChangeEvent, type EditManyOptions, type EditMode, type EditOptions, type EditPointerDriver, type EditSession, type FeatureOps, type Graphic, type GraphicEditChangeEvent, type GraphicEditSession, type GraphicRender, type GraphicSnapshot, type GraphicTransformChangeEvent, type GraphicTransformSession, type GuideStyle, type HandleStyle, type IconResource, type InteractionHit, type InteractionStyle, type LayerId, type MapAdapter, type MapCursor, type MapEvent, type MapEventHandler, type NativeEventEntry, type PickEvent, type PickHandler, type PickOptions, type PixelCoordinate, type PointSymbol, type PointSymbolAnchor, type PointSymbolCapability, PointSymbolCapabilityRequiredError, type PointSymbolColors, type PointSymbolFootprint, type PointSymbolGraphicModifiers, type PointSymbolRender, type PointSymbolSize, type PointSymbolStyle, type PointerCallback, PointerCallbackHub, type PointerEventInfo, type SessionChangeSource, type SessionHistory, type SessionHistoryState, type SettleReason, type SizeAnchor, type StyleOptions, TOUCH_HIT_TOLERANCE_PX, TacticalDraw, TacticalDrawAbortError, type TacticalDrawAbortReason, TacticalDrawDestroyedError, type TacticalDrawLayerOptions, type TacticalDrawOptions, type TextStyleOptions, type ToPixel, type TransformBox, type TransformChangeEvent, type TransformSession, bindAbortable, clonePointSymbol, coerceHandleStyle, combineWithHostSignal, getSizeAnchor, hitTestFeature, hitTestIconFeature, ignoreAbort, isPointSymbol, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, pointSymbolFootprint, resolveGroundTextSizePixels, tryControlMeasureIdFromFeature };

package/dist/index.mjs

@@ -1693,6 +1693,19 @@ function pickHandle(handles, pixel, tolerance, toPixel) {
 	}
 	return null;
 }
+//#endregion
+//#region src/tactical-draw/rotation.ts
+/** Excalidraw-style rotation increment used while Shift is held. */
+const CONSTRAINED_ROTATION_STEP = Math.PI / 12;
+/** Normalize radians to the canonical clockwise [0, 2π) range. */
+function normalizeRotation(angle) {
+	const turn = Math.PI * 2;
+	return (angle % turn + turn) % turn;
+}
+/** Snap an absolute rotation angle to the nearest 15-degree increment. */
+function constrainRotation(angle) {
+	return Math.round(angle / CONSTRAINED_ROTATION_STEP) * CONSTRAINED_ROTATION_STEP;
+}
 function rotate(x, y, angle) {
 	const cos = Math.cos(angle);
 	const sin = Math.sin(angle);
@@ -1956,8 +1969,9 @@ function beginBoxDrag(args) {
 		const pivotPixel = box.center;
 		const pivot = fromPixel(pivotPixel);
 		const startAngle = Math.atan2(downPixel[1] - pivotPixel[1], downPixel[0] - pivotPixel[0]);
-		const move = (pixel) => {
-			const angle = Math.atan2(pixel[1] - pivotPixel[1], pixel[0] - pivotPixel[0]) - startAngle;
+		const move = (pixel, modifiers) => {
+			const rawAngle = Math.atan2(pixel[1] - pivotPixel[1], pixel[0] - pivotPixel[0]) - startAngle;
+			const angle = modifiers?.constrainRotation ? constrainRotation(box.angle + rawAngle) - box.angle : rawAngle;
 			return {
 				points: rotatePointsAround(preDragPoints, pivot, pivotPixel, angle, projection),
 				box: {
@@ -1971,7 +1985,7 @@ function beginBoxDrag(args) {
 		return {
 			kind,
 			move,
-			end: (pixel) => move(pixel).points
+			end: (pixel, modifiers) => move(pixel, modifiers).points
 		};
 	}
 	const origin = fromPixel(downPixel);
@@ -2035,6 +2049,102 @@ const BEGIN_DRAG_FOR_TEST = Symbol("EditSession.beginDragForTest");
 */
 const END_DRAG_FOR_TEST = Symbol("EditSession.endDragForTest");
 //#endregion
+//#region src/tactical-draw/session-history.ts
+/** @internal Controller-owned history stack. */
+function createSessionHistory(options) {
+	const limit = Math.max(1, options.limit ?? 100);
+	let entries = [{ value: options.clone(options.initial) }];
+	let index = 0;
+	let settled = false;
+	const listeners = /* @__PURE__ */ new Set();
+	function currentState() {
+		if (settled) return {
+			canUndo: false,
+			canRedo: false
+		};
+		return {
+			canUndo: index > 0,
+			canRedo: index < entries.length - 1,
+			...index > 0 && entries[index]?.label ? { undoLabel: entries[index].label } : {},
+			...index < entries.length - 1 && entries[index + 1]?.label ? { redoLabel: entries[index + 1].label } : {}
+		};
+	}
+	function notify() {
+		const state = currentState();
+		const errors = [];
+		for (const listener of [...listeners]) try {
+			listener(state);
+		} catch (error) {
+			errors.push(error);
+		}
+		if (errors.length === 1) throw errors[0];
+		if (errors.length > 1) throw new AggregateError(errors, "SessionHistory subscriber errors");
+	}
+	function move(nextIndex, source) {
+		if (settled || nextIndex < 0 || nextIndex >= entries.length) return false;
+		const from = options.clone(entries[index].value);
+		const to = options.clone(entries[nextIndex].value);
+		try {
+			if (!options.apply(from, to, source)) return false;
+		} catch (error) {
+			if (!options.isCurrent?.(to)) throw error;
+			index = nextIndex;
+			try {
+				notify();
+			} catch (notifyError) {
+				throw new AggregateError([error, notifyError], "SessionHistory undo/redo errors");
+			}
+			throw error;
+		}
+		index = nextIndex;
+		notify();
+		return true;
+	}
+	return {
+		get state() {
+			return currentState();
+		},
+		undo() {
+			return move(index - 1, "undo");
+		},
+		redo() {
+			return move(index + 1, "redo");
+		},
+		subscribe(listener) {
+			listener(currentState());
+			if (settled) return () => {};
+			listeners.add(listener);
+			return () => listeners.delete(listener);
+		},
+		record(value, label) {
+			if (settled || options.equals(entries[index].value, value)) return false;
+			entries.splice(index + 1);
+			entries.push({
+				value,
+				label
+			});
+			if (entries.length > limit + 1) entries.shift();
+			index = entries.length - 1;
+			notify();
+			return true;
+		},
+		reset(value) {
+			if (settled) return;
+			entries = [{ value: options.clone(value) }];
+			index = 0;
+			notify();
+		},
+		settle() {
+			if (settled) return;
+			settled = true;
+			entries = [];
+			index = 0;
+			notify();
+			listeners.clear();
+		}
+	};
+}
+//#endregion
 //#region src/tactical-draw/box-features.ts
 /**
 * Rendering helpers shared by the single-measure edit controller
@@ -2088,6 +2198,34 @@ function boxToHandles(box, fromPixel) {
 	return handles;
 }
 /**
+* The group's outline style: the resolved `boxOutline` plus `[4, 4]` dash so
+* the group reads as dashed per the reference design — unless the host
+* explicitly set their own `strokeDash`, which wins. Shared by
+* `transform-controller.ts` and `graphic-transform-controller.ts` so their
+* group boxes can't drift apart (member outlines stay solid).
+*/
+function groupOutlineStyle(base) {
+	if (base?.strokeDash !== void 0) return base;
+	return {
+		...base ?? {},
+		strokeDash: [4, 4]
+	};
+}
+/**
+* Build the per-member outline features for a group transform — one closed
+* `LineString` per `[memberId, box]` pair, id'd
+* `${handleIdPrefix}:member-outline:{memberId}` and styled with the plain
+* (solid) `boxOutline`. Shared by `transform-controller.ts` and
+* `graphic-transform-controller.ts` so member outlines can't drift between
+* the measures-only and mixed-graphic group transforms — only the group box
+* gets the dashed default (`groupOutlineStyle`).
+*/
+function memberOutlineFeatures(members, fromPixel, handleIdPrefix, style) {
+	const features = [];
+	for (const [memberId, box] of members) features.push(boxOutlineFeature(box, fromPixel, `${handleIdPrefix}:member-outline:${memberId}`, style));
+	return features;
+}
+/**
 * Build the closed `LineString` outline feature for `box`, styled from
 * `style` (delivered per-feature via `properties.style`, as the adapters
 * already honor for line features). `featureId` is the caller's stable id —
@@ -2358,6 +2496,28 @@ function runEdit(opts) {
 	* persisted on the measure; a fresh edit always starts back at `0`.
 	*/
 	let boxAngle = 0;
+	function captureHistory() {
+		return {
+			points: workingPoints.map((point) => [...point]),
+			options: { ...workingOptions ?? {} },
+			style: currentStyle ? { ...currentStyle } : void 0,
+			textAmplifiers: workingTextAmplifiers ? { ...workingTextAmplifiers } : void 0,
+			amplifierPlacements: snapshotAmplifierPlacements(),
+			sizeAnchor,
+			nonGeometryDirty,
+			boxAngle
+		};
+	}
+	function restoreHistory(value) {
+		replaceWorkingPoints(value.points);
+		replaceWorkingOptions(value.options);
+		currentStyle = value.style ? { ...value.style } : void 0;
+		workingTextAmplifiers = value.textAmplifiers ? { ...value.textAmplifiers } : void 0;
+		workingAmplifierPlacements = value.amplifierPlacements ? structuredClone(value.amplifierPlacements) : void 0;
+		sizeAnchor = value.sizeAnchor;
+		nonGeometryDirty = value.nonGeometryDirty;
+		boxAngle = value.boxAngle;
+	}
 	/**
 	* The transform box fitted around the *rendered* working-copy geometry
 	* (pixel space), or `null` when nothing projected this frame. Re-fitted
@@ -2584,12 +2744,13 @@ function runEdit(opts) {
 	*  - Reject restores the working state to the pre-gesture snapshot and
 	*    recomputes `dirty`. Close/abort settle the session as normal.
 	*/
-	function emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, previousSizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements) {
+	function emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, previousSizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, source = "gesture", historyLabel = "Edit", previousBoxAngle = boxAngle) {
 		if (ctx.settled) return;
 		let rejectRequested = false;
 		let closeRequested = false;
 		let abortRequested = false;
 		const event = {
+			source,
 			graphic: currentRendered,
 			previous: previousRendered,
 			session,
@@ -2618,11 +2779,13 @@ function runEdit(opts) {
 			sizeAnchor = previousSizeAnchor;
 			workingTextAmplifiers = previousTextAmplifiers;
 			workingAmplifierPlacements = previousAmplifierPlacements;
+			boxAngle = previousBoxAngle;
 			nonGeometryDirty = previousNonGeometryDirty;
 			renderPreview();
 			renderHandlesLayer();
 			recomputeDirty();
 		}
+		if (!ctx.settled && !rejectRequested && (source === "gesture" || source === "programmatic")) history.record(captureHistory(), historyLabel);
 		if (errors.length === 1) throw errors[0];
 		if (errors.length > 1) throw new AggregateError(errors, "EditSession.onChange listener errors");
 	}
@@ -2636,7 +2799,7 @@ function runEdit(opts) {
 	* queued during the drag are applied after the listener emission (so the
 	* post-gesture render reflects the requested mode set).
 	*/
-	function commitGesture(nextPoints, preGestureOptions, nextAmplifierPlacements) {
+	function commitGesture(nextPoints, preGestureOptions, nextAmplifierPlacements, preGestureBoxAngle = boxAngle) {
 		if (ctx.settled) return;
 		const previousPoints = workingPoints.map((p) => [...p]);
 		const previousOptions = { ...preGestureOptions ?? workingOptions ?? {} };
@@ -2663,7 +2826,7 @@ function runEdit(opts) {
 		recomputeDirty();
 		dragInFlight = false;
 		drainPendingModes();
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, "gesture", "Edit", preGestureBoxAngle);
 	}
 	function setOptions(partial) {
 		if (ctx.settled) return;
@@ -2678,6 +2841,7 @@ function runEdit(opts) {
 			...workingOptions ?? {},
 			...partial ?? {}
 		});
+		if (JSON.stringify(workingOptions) === JSON.stringify(previousOptions)) return;
 		let currentRendered;
 		try {
 			currentRendered = rebuildRendered();
@@ -2688,7 +2852,7 @@ function runEdit(opts) {
 		renderPreview();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, "programmatic", "Change options");
 	}
 	function setStyle(partial) {
 		if (ctx.settled) return;
@@ -2703,6 +2867,7 @@ function runEdit(opts) {
 			...currentStyle ?? {},
 			...partial
 		};
+		if (JSON.stringify(currentStyle) === JSON.stringify(previousStyle)) return;
 		let currentRendered;
 		try {
 			currentRendered = rebuildRendered();
@@ -2713,7 +2878,7 @@ function runEdit(opts) {
 		renderPreview();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, "programmatic", "Change style");
 	}
 	/**
 	* Shallow-merge into the live working text amplifiers. Mirrors
@@ -2748,6 +2913,7 @@ function runEdit(opts) {
 			if (value !== void 0 && value.trim() !== "") merged[canonicalKey ?? key] = value;
 		}
 		workingTextAmplifiers = Object.keys(merged).length > 0 ? merged : void 0;
+		if (JSON.stringify(workingTextAmplifiers) === JSON.stringify(previousTextAmplifiers)) return;
 		let currentRendered;
 		try {
 			currentRendered = rebuildRendered();
@@ -2758,9 +2924,9 @@ function runEdit(opts) {
 		renderPreview();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, "programmatic", "Change text");
 	}
-	function setAmplifierPlacements(partial) {
+	function setAmplifierPlacements(partial, source = "programmatic", historyLabel = "Move label") {
 		if (ctx.settled) return;
 		const previousPoints = workingPoints.map((p) => [...p]);
 		const previousOptions = { ...workingOptions ?? {} };
@@ -2780,11 +2946,12 @@ function runEdit(opts) {
 			else next[field] = merged;
 		}
 		workingAmplifierPlacements = Object.keys(next).length > 0 ? next : void 0;
+		if (JSON.stringify(workingAmplifierPlacements) === JSON.stringify(previousAmplifierPlacements)) return;
 		const currentRendered = rebuildRendered();
 		renderPreview();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, source, historyLabel);
 	}
 	/**
 	* Flip the size anchor for the measure under edit (ADR-0020). Re-renders the
@@ -2807,7 +2974,7 @@ function runEdit(opts) {
 		const currentRendered = rebuildRendered();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, previousSizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, previousSizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, "programmatic", "Change size anchor");
 	}
 	/** Apply a translate gesture by shifting every working point by `delta`. */
 	function commitTranslate(delta) {
@@ -2836,7 +3003,7 @@ function runEdit(opts) {
 		const pivot = box ? driver.fromPixel(box.center) : computeBoundingBoxCenter(workingPoints);
 		if (!pivot) return;
 		boxAngle += angle;
-		commitGesture(rotatePointsAround(workingPoints, pivot, pivotPixel, angle, dragProjection), preFreezeOptions);
+		commitGesture(rotatePointsAround(workingPoints, pivot, pivotPixel, angle, dragProjection), preFreezeOptions, void 0, boxAngle - angle);
 	}
 	function modesEqual(a, b) {
 		if (a.length !== b.length) return false;
@@ -2855,7 +3022,32 @@ function runEdit(opts) {
 		pendingModes = null;
 		applyModes(next);
 	}
+	const history = createSessionHistory({
+		initial: captureHistory(),
+		clone: (value) => ({
+			points: value.points.map((point) => [...point]),
+			options: { ...value.options ?? {} },
+			style: value.style ? { ...value.style } : void 0,
+			textAmplifiers: value.textAmplifiers ? { ...value.textAmplifiers } : void 0,
+			amplifierPlacements: value.amplifierPlacements ? structuredClone(value.amplifierPlacements) : void 0,
+			sizeAnchor: value.sizeAnchor,
+			nonGeometryDirty: value.nonGeometryDirty,
+			boxAngle: value.boxAngle
+		}),
+		equals: (a, b) => JSON.stringify(a) === JSON.stringify(b),
+		isCurrent: (value) => JSON.stringify(captureHistory()) === JSON.stringify(value),
+		apply(from, to, source) {
+			const previousRendered = rebuildRendered();
+			restoreHistory(to);
+			renderPreview();
+			renderHandlesLayer();
+			recomputeDirty();
+			emitChange(previousRendered, from.points, from.options, from.style, from.nonGeometryDirty, from.sizeAnchor, rebuildRendered(), from.textAmplifiers, from.amplifierPlacements, source, "Edit", from.boxAngle);
+			return !ctx.settled && JSON.stringify(captureHistory()) === JSON.stringify(to);
+		}
+	});
 	const session = {
+		history,
 		graphic: measure,
 		get workingGraphic() {
 			return cloneControlMeasure({
@@ -2915,6 +3107,7 @@ function runEdit(opts) {
 			const current = session.workingGraphic;
 			const next = updater(current);
 			if (next.id !== measure.id || next.kind !== measure.kind) throw new TypeError("updateGraphic must preserve control-measure id and kind");
+			if (JSON.stringify(next) === JSON.stringify(current)) return;
 			renderMeasureForAdapter(adapter, next, renderOpts);
 			workingPoints.splice(0, workingPoints.length, ...next.controlPoints.map((point) => [...point]));
 			workingOptions = { ...next.options ?? {} };
@@ -2925,7 +3118,7 @@ function runEdit(opts) {
 			renderPreview();
 			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);
+			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");
 		},
 		setOptions(partial) {
 			setOptions(partial);
@@ -3230,9 +3423,9 @@ function runEdit(opts) {
 		renderHandlesLayer();
 		recomputeDirty();
 	}
-	function paintBoxDragSnapshot(pixel) {
+	function paintBoxDragSnapshot(pixel, constrainRotation = false) {
 		if (!activeBoxDrag) return;
-		const snapshot = activeBoxDrag.fsm.move(pixel);
+		const snapshot = activeBoxDrag.fsm.move(pixel, { constrainRotation });
 		activeBoxDrag.lastSnapshot = snapshot;
 		workingPoints.splice(0, workingPoints.length, ...snapshot.points);
 		workingAmplifierPlacements = transformAmplifierPlacements(activeBoxDrag.preDragAmplifierPlacements, activeBoxDrag.preDragBox, snapshot.box, driver);
@@ -3240,7 +3433,7 @@ function runEdit(opts) {
 		renderHandlesLayer();
 		recomputeDirty();
 	}
-	const onDriverMove = (pixel) => {
+	const onDriverMove = (pixel, info) => {
 		if (ctx.settled) return;
 		if (activeLabelRotateDrag) {
 			const drag = activeLabelRotateDrag;
@@ -3276,7 +3469,7 @@ function runEdit(opts) {
 			renderPreview();
 			renderHandlesLayer();
 		} else if (activeDrag) paintDragSnapshot(pixel);
-		else if (activeBoxDrag) paintBoxDragSnapshot(pixel);
+		else if (activeBoxDrag) paintBoxDragSnapshot(pixel, info?.shiftKey);
 	};
 	/** Reset drag-in-flight bookkeeping shared by every "gesture ended" path. */
 	function endDragBookkeeping() {
@@ -3284,7 +3477,7 @@ function runEdit(opts) {
 		dragInFlight = false;
 		drainPendingModes();
 	}
-	const onDriverUp = (pixel) => {
+	const onDriverUp = (pixel, info) => {
 		if (activeLabelRotateDrag) {
 			const drag = activeLabelRotateDrag;
 			activeLabelRotateDrag = null;
@@ -3293,7 +3486,7 @@ function runEdit(opts) {
 			if (Math.hypot(pixel[0] - drag.downPixel[0], pixel[1] - drag.downPixel[1]) > CLICK_SLOP_PX$3) {
 				const delta = pointerAngleAround(pixel, drag.anchorPixel) - drag.startPointerAngle;
 				const rotation = drag.startRotation - delta;
-				setAmplifierPlacements({ [drag.key]: { rotation } });
+				setAmplifierPlacements({ [drag.key]: { rotation } }, "gesture", "Rotate label");
 			} else {
 				renderPreview();
 				renderHandlesLayer();
@@ -3307,7 +3500,7 @@ function runEdit(opts) {
 			const position = labelAnchorFromPointer(pixel, grabOffset);
 			workingAmplifierPlacements = previous;
 			endDragBookkeeping();
-			if (position && Math.hypot(pixel[0] - downPixel[0], pixel[1] - downPixel[1]) > CLICK_SLOP_PX$3) setAmplifierPlacements({ [field]: position });
+			if (position && Math.hypot(pixel[0] - downPixel[0], pixel[1] - downPixel[1]) > CLICK_SLOP_PX$3) setAmplifierPlacements({ [field]: position }, "gesture", "Move label");
 			else {
 				selectedLabelKey = selectedLabelKey === field ? null : field;
 				renderPreview();
@@ -3352,11 +3545,11 @@ function runEdit(opts) {
 				bodyClickPending = true;
 				return;
 			}
-			const finalSnapshot = fsm.move(pixel);
+			const finalSnapshot = fsm.move(pixel, { constrainRotation: info?.shiftKey });
 			replaceWorkingPoints(preDragPoints);
 			workingAmplifierPlacements = preDragAmplifierPlacements;
 			if (fsm.kind === "rotate") boxAngle += finalSnapshot.box.angle - preDragBox.angle;
-			commitGesture(finalSnapshot.points, preDragOptions, transformAmplifierPlacements(preDragAmplifierPlacements, preDragBox, finalSnapshot.box, driver));
+			commitGesture(finalSnapshot.points, preDragOptions, transformAmplifierPlacements(preDragAmplifierPlacements, preDragBox, finalSnapshot.box, driver), preDragBox.angle);
 			return;
 		}
 	};
@@ -3407,8 +3600,12 @@ function runEdit(opts) {
 		],
 		onViewChange: rescaleOnViewChange,
 		onSettled: (settlement) => {
-			if (onSettled) onSettled();
-			settleFromInteraction(settlement, commitEmitter, settleEmitter);
+			try {
+				history.settle();
+			} finally {
+				if (onSettled) onSettled();
+				settleFromInteraction(settlement, commitEmitter, settleEmitter);
+			}
 		},
 		attach(c) {
 			ctx = c;
@@ -3613,6 +3810,25 @@ function runGroupTransform(opts) {
 	const settleEmitter = createSettleEmitter("TransformSession.onSettled listener errors");
 	/** Session-scoped box rotation (ADR-0017 decision #2), shared by the whole group. */
 	let boxAngle = 0;
+	function captureHistory() {
+		return {
+			ids: members.map((member) => member.measure.id),
+			points: clonePointsByMember(),
+			amplifierPlacements: cloneAmplifierPlacementsByMember(),
+			optionsOverrides: cloneOptionsOverrideByMember(),
+			sizeAnchor,
+			nonGeometryDirty,
+			boxAngle
+		};
+	}
+	function restoreHistory(value) {
+		restorePointsByMember(value.points);
+		applyAmplifierPlacementsByMember(value.amplifierPlacements.map((placements) => placements ? structuredClone(placements) : void 0));
+		applyOptionsOverrides(value.optionsOverrides);
+		sizeAnchor = value.sizeAnchor;
+		nonGeometryDirty = value.nonGeometryDirty;
+		boxAngle = value.boxAngle;
+	}
 	/** The group box fitted over every member's rendered geometry, or `null` when nothing projects this frame. */
 	let groupBox = null;
 	let ctx;
@@ -3692,32 +3908,15 @@ function runGroupTransform(opts) {
 		else refitBoxes();
 		renderHandlesLayer();
 	}
-	/**
-	* The group's outline style: the resolved `boxOutline` plus `[4, 4]` dash
-	* so the group reads as dashed per the reference design — unless the host
-	* explicitly set their own `strokeDash`, which wins.
-	*/
-	function groupOutlineStyle() {
-		const base = interactionStyle?.boxOutline;
-		if (base?.strokeDash !== void 0) return base;
-		return {
-			...base ?? {},
-			strokeDash: [4, 4]
-		};
-	}
 	function renderHandlesLayer() {
 		if (ctx.settled) return;
 		const features = [];
 		const liveGroupBox = activeBoxDrag ? activeBoxDrag.lastSnapshot.box : groupBox;
 		if (liveGroupBox) {
-			features.push(boxOutlineFeature(liveGroupBox, dragProjection.fromPixel, `${handleIdPrefix}:box-outline`, groupOutlineStyle()));
+			features.push(boxOutlineFeature(liveGroupBox, dragProjection.fromPixel, `${handleIdPrefix}:box-outline`, groupOutlineStyle(interactionStyle?.boxOutline)));
 			features.push(...toFeatures(boxToHandles(liveGroupBox, dragProjection.fromPixel), handleIdPrefix, interactionStyle));
 		}
-		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));
-		}
+		features.push(...memberOutlineFeatures(members.flatMap((member) => member.box ? [[member.measure.id, member.box]] : []), dragProjection.fromPixel, handleIdPrefix, interactionStyle?.boxOutline));
 		ctx.writeLayer(handlesLayer, features);
 	}
 	/**
@@ -3806,12 +4005,13 @@ function runGroupTransform(opts) {
 	* instance to all listeners in order, deferred `reject`/`close`/`abort`
 	* (close/abort override reject), exception collection with `AggregateError`.
 	*/
-	function emitChange(previousRendered, previousPointsByMember, previousAmplifierPlacementsByMember, previousSizeAnchor, previousNonGeometryDirty, previousOptionsOverrideByMember, currentRendered) {
+	function emitChange(previousRendered, previousPointsByMember, previousAmplifierPlacementsByMember, previousSizeAnchor, previousNonGeometryDirty, previousOptionsOverrideByMember, currentRendered, source = "gesture", historyLabel = "Transform", previousBoxAngle = boxAngle) {
 		if (ctx.settled) return;
 		let rejectRequested = false;
 		let closeRequested = false;
 		let abortRequested = false;
 		const event = {
+			source,
 			graphics: currentRendered,
 			previous: previousRendered,
 			session,
@@ -3840,10 +4040,12 @@ function runGroupTransform(opts) {
 			sizeAnchor = previousSizeAnchor;
 			nonGeometryDirty = previousNonGeometryDirty;
 			applyOptionsOverrides(previousOptionsOverrideByMember);
+			boxAngle = previousBoxAngle;
 			renderAllPreviews();
 			renderHandlesLayer();
 			recomputeDirty();
 		}
+		if (!ctx.settled && !rejectRequested && members === membersAtEmission && (source === "gesture" || source === "programmatic")) history.record(captureHistory(), historyLabel);
 		if (errors.length === 1) throw errors[0];
 		if (errors.length > 1) throw new AggregateError(errors, "TransformSession.onChange listener errors");
 	}
@@ -3869,7 +4071,7 @@ function runGroupTransform(opts) {
 		}
 		return snapshots;
 	}
-	function commitGesture(nextConcatPoints, preGestureOptionsOverrideByMember, nextAmplifierPlacementsByMember) {
+	function commitGesture(nextConcatPoints, preGestureOptionsOverrideByMember, nextAmplifierPlacementsByMember, preGestureBoxAngle = boxAngle) {
 		if (ctx.settled) return;
 		const previousPointsByMember = clonePointsByMember();
 		const previousAmplifierPlacementsByMember = cloneAmplifierPlacementsByMember();
@@ -3890,7 +4092,7 @@ function runGroupTransform(opts) {
 		renderHandlesLayer();
 		recomputeDirty();
 		dragInFlight = false;
-		emitChange(previousRendered, previousPointsByMember, previousAmplifierPlacementsByMember, sizeAnchor, nonGeometryDirty, previousOptionsOverrideByMember, currentRendered);
+		emitChange(previousRendered, previousPointsByMember, previousAmplifierPlacementsByMember, sizeAnchor, nonGeometryDirty, previousOptionsOverrideByMember, currentRendered, "gesture", "Transform", preGestureBoxAngle);
 	}
 	function setSizeAnchor(next) {
 		if (ctx.settled || sizeAnchor === next) return;
@@ -3904,7 +4106,7 @@ function runGroupTransform(opts) {
 		const currentRendered = rebuildRenderedAll();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPointsByMember, previousAmplifierPlacementsByMember, previousSizeAnchor, previousNonGeometryDirty, previousOptionsOverrideByMember, currentRendered);
+		emitChange(previousRendered, previousPointsByMember, previousAmplifierPlacementsByMember, previousSizeAnchor, previousNonGeometryDirty, previousOptionsOverrideByMember, currentRendered, "programmatic", "Change size anchor");
 	}
 	/**
 	* Cancel an in-flight box drag without committing it: restore the pre-drag
@@ -3951,13 +4153,42 @@ function runGroupTransform(opts) {
 		renderAllPreviews();
 		renderHandlesLayer();
 		recomputeDirty();
-		if (removedSnapshots.length > 0) commitEmitter.emit(removedSnapshots);
+		const notificationErrors = [];
+		try {
+			history.reset(captureHistory());
+		} catch (error) {
+			notificationErrors.push(error);
+		}
+		if (removedSnapshots.length > 0) try {
+			commitEmitter.emit(removedSnapshots);
+		} catch (error) {
+			notificationErrors.push(error);
+		}
+		if (notificationErrors.length === 1) throw notificationErrors[0];
+		if (notificationErrors.length > 1) throw new AggregateError(notificationErrors, "TransformSession.setGraphics notification errors");
 		return removedSnapshots;
 	}
 	function close() {
 		return commitClose();
 	}
+	const history = createSessionHistory({
+		initial: captureHistory(),
+		clone: (value) => structuredClone(value),
+		equals: (a, b) => JSON.stringify(a) === JSON.stringify(b),
+		isCurrent: (value) => JSON.stringify(captureHistory()) === JSON.stringify(value),
+		apply(from, to, source) {
+			if (JSON.stringify(from.ids) !== JSON.stringify(to.ids)) return false;
+			const previousRendered = rebuildRenderedAll();
+			restoreHistory(to);
+			renderAllPreviews();
+			renderHandlesLayer();
+			recomputeDirty();
+			emitChange(previousRendered, from.points, from.amplifierPlacements, from.sizeAnchor, from.nonGeometryDirty, from.optionsOverrides, rebuildRenderedAll(), source, "Transform", from.boxAngle);
+			return !ctx.settled && JSON.stringify(captureHistory()) === JSON.stringify(to);
+		}
+	});
 	const session = {
+		history,
 		get graphics() {
 			return members.map((m) => m.measure);
 		},
@@ -4033,9 +4264,9 @@ function runGroupTransform(opts) {
 		dragInFlight = true;
 		driver.setDragPanEnabled(false);
 	};
-	function paintBoxDragSnapshot(pixel) {
+	function paintBoxDragSnapshot(pixel, constrainRotation = false) {
 		if (!activeBoxDrag) return;
-		const snapshot = activeBoxDrag.fsm.move(pixel);
+		const snapshot = activeBoxDrag.fsm.move(pixel, { constrainRotation });
 		activeBoxDrag.lastSnapshot = snapshot;
 		applyConcatenatedPoints(snapshot.points);
 		applyAmplifierPlacementsByMember(activeBoxDrag.preDragAmplifierPlacementsByMember.map((placements) => transformAmplifierPlacements(placements, activeBoxDrag.preDragBox, snapshot.box, driver)));
@@ -4043,11 +4274,11 @@ function runGroupTransform(opts) {
 		renderHandlesLayer();
 		recomputeDirty();
 	}
-	const onDriverMove = (pixel) => {
+	const onDriverMove = (pixel, info) => {
 		if (ctx.settled) return;
-		if (activeBoxDrag) paintBoxDragSnapshot(pixel);
+		if (activeBoxDrag) paintBoxDragSnapshot(pixel, info?.shiftKey);
 	};
-	const onDriverUp = (pixel) => {
+	const onDriverUp = (pixel, info) => {
 		if (!activeBoxDrag) return;
 		if (ctx.settled) {
 			activeBoxDrag = null;
@@ -4069,11 +4300,11 @@ function runGroupTransform(opts) {
 			bodyClickPending = true;
 			return;
 		}
-		const finalSnapshot = fsm.move(pixel);
+		const finalSnapshot = fsm.move(pixel, { constrainRotation: info?.shiftKey });
 		applyConcatenatedPoints(preDragPoints);
 		applyAmplifierPlacementsByMember(preDragAmplifierPlacementsByMember);
 		if (fsm.kind === "rotate") boxAngle += finalSnapshot.box.angle - preDragBox.angle;
-		commitGesture(finalSnapshot.points, preDragOptionsOverrideByMember, preDragAmplifierPlacementsByMember.map((placements) => transformAmplifierPlacements(placements, preDragBox, finalSnapshot.box, driver)));
+		commitGesture(finalSnapshot.points, preDragOptionsOverrideByMember, preDragAmplifierPlacementsByMember.map((placements) => transformAmplifierPlacements(placements, preDragBox, finalSnapshot.box, driver)), preDragBox.angle);
 	};
 	let pickPreview;
 	let pickHandles;
@@ -4119,8 +4350,12 @@ function runGroupTransform(opts) {
 		layers: [previewLayer, handlesLayer],
 		onViewChange: rescaleOnViewChange,
 		onSettled: (settlement) => {
-			if (onSettled) onSettled();
-			if (settlement.status === "rejected") settleEmitter.emit(settleReasonFromError(settlement.error));
+			try {
+				history.settle();
+			} finally {
+				if (onSettled) onSettled();
+				if (settlement.status === "rejected") settleEmitter.emit(settleReasonFromError(settlement.error));
+			}
 		},
 		attach(c) {
 			ctx = c;
@@ -4234,13 +4469,6 @@ function pointSymbolFeature(symbol, render, resolution) {
 	};
 }
 //#endregion
-//#region src/tactical-draw/rotation.ts
-/** Normalize radians to the canonical clockwise [0, 2π) range. */
-function normalizeRotation(angle) {
-	const turn = Math.PI * 2;
-	return (angle % turn + turn) % turn;
-}
-//#endregion
 //#region src/tactical-draw/graphic-transform-controller.ts
 const HIT_TOLERANCE_PX$1 = 12;
 const CLICK_SLOP_PX$1 = 3;
@@ -4261,35 +4489,52 @@ function runGraphicTransform(opts) {
 	const commitEmitter = createCommitEmitter("GraphicTransformSession.onCommit listener errors");
 	const settleEmitter = createSettleEmitter("GraphicTransformSession.onSettled listener errors");
 	const renderOpts = graphicsStyle ? { graphicsStyle } : void 0;
-	const snapshots = () => working.map((graphic) => isPointSymbol(graphic) ? {
+	const snapshotsFor = (source) => source.map((graphic) => isPointSymbol(graphic) ? {
 		graphic: clonePointSymbol(graphic),
 		render: capability.render(graphic)
 	} : {
 		graphic: cloneControlMeasure(graphic),
 		render: renderMeasureForAdapter(adapter, graphic, renderOpts)
 	});
+	const snapshots = () => snapshotsFor(working);
+	const captureHistory = () => ({
+		working: working.map(cloneGraphic),
+		boxAngle
+	});
+	const cloneHistory = (value) => ({
+		working: value.working.map(cloneGraphic),
+		boxAngle: value.boxAngle
+	});
 	function renderAll() {
 		if (ctx.settled) return;
 		const features = [];
 		const resources = /* @__PURE__ */ new Map();
 		const pixels = [];
-		for (const graphic of working) if (isPointSymbol(graphic)) {
-			const plan = renderPointSymbolForAdapter(adapter, capability, graphic);
-			resources.set(plan.resource.id, plan.resource);
-			features.push(plan.feature);
-			const footprint = pointSymbolFootprint(graphic, plan.render, adapter);
-			if (footprint) pixels.push(...footprint.corners);
-		} else {
-			const rendered = renderMeasureForAdapter(adapter, graphic, renderOpts);
-			features.push(...rendered.features);
-			for (const feature of rendered.features) {
-				const positions = [];
-				if (feature.geometry) collectFeaturePositions(feature.geometry, positions);
-				for (const position of positions) {
-					const pixel = driver.toPixel(position);
-					if (pixel) pixels.push(pixel);
+		const memberBoxes = [];
+		const angle = drag ? drag.liveBox.angle : boxAngle;
+		for (const graphic of working) {
+			const graphicPixels = [];
+			if (isPointSymbol(graphic)) {
+				const plan = renderPointSymbolForAdapter(adapter, capability, graphic);
+				resources.set(plan.resource.id, plan.resource);
+				features.push(plan.feature);
+				const footprint = pointSymbolFootprint(graphic, plan.render, adapter);
+				if (footprint) graphicPixels.push(...footprint.corners);
+			} else {
+				const rendered = renderMeasureForAdapter(adapter, graphic, renderOpts);
+				features.push(...rendered.features);
+				for (const feature of rendered.features) {
+					const positions = [];
+					if (feature.geometry) collectFeaturePositions(feature.geometry, positions);
+					for (const position of positions) {
+						const pixel = driver.toPixel(position);
+						if (pixel) graphicPixels.push(pixel);
+					}
 				}
 			}
+			pixels.push(...graphicPixels);
+			const memberBox = fitTransformBox(graphicPixels, angle, interactionStyle?.boxPadding);
+			if (memberBox) memberBoxes.push([graphic.id, memberBox]);
 		}
 		adapter.reconcileLayerIconResources(previewLayer, [...resources.values()]);
 		ctx.writeLayer(previewLayer, features);
@@ -4297,9 +4542,10 @@ function runGraphicTransform(opts) {
 		const liveBox = drag?.liveBox ?? box;
 		const handles = [];
 		if (liveBox) {
-			handles.push(boxOutlineFeature(liveBox, (pixel) => driver.fromPixel(pixel), `${handleIdPrefix}:box-outline`, interactionStyle?.boxOutline));
+			handles.push(boxOutlineFeature(liveBox, (pixel) => driver.fromPixel(pixel), `${handleIdPrefix}:box-outline`, groupOutlineStyle(interactionStyle?.boxOutline)));
 			handles.push(...toFeatures(boxToHandles(liveBox, (pixel) => driver.fromPixel(pixel)), handleIdPrefix, interactionStyle));
 		}
+		handles.push(...memberOutlineFeatures(memberBoxes, (pixel) => driver.fromPixel(pixel), handleIdPrefix, interactionStyle?.boxOutline));
 		ctx.writeLayer(handlesLayer, handles);
 	}
 	function anchorPoints(source) {
@@ -4325,12 +4571,14 @@ function runGraphicTransform(opts) {
 			return next;
 		});
 	}
-	function emit(previous, previousGraphics) {
+	function emit(previousState, source) {
+		const previous = snapshotsFor(previousState.working);
 		const current = snapshots();
 		let reject = false;
 		let close = false;
 		let abort = false;
 		const event = {
+			source,
 			graphics: current,
 			previous,
 			session,
@@ -4347,14 +4595,30 @@ function runGraphicTransform(opts) {
 		if (abort) ctx.fail(new TacticalDrawAbortError("session"));
 		else if (close) ctx.commit(snapshots);
 		else if (reject && !ctx.settled) {
-			working = previousGraphics.map(cloneGraphic);
+			working = previousState.working.map(cloneGraphic);
+			boxAngle = previousState.boxAngle;
 			dirty = JSON.stringify(working) !== JSON.stringify(original);
 			renderAll();
 		}
 		if (errors.length === 1) throw errors[0];
 		if (errors.length > 1) throw new AggregateError(errors, "GraphicTransformSession.onChange errors");
-	}
+		return !ctx.settled && !reject;
+	}
+	const history = createSessionHistory({
+		initial: captureHistory(),
+		clone: cloneHistory,
+		equals: (a, b) => a.boxAngle === b.boxAngle && JSON.stringify(a.working) === JSON.stringify(b.working),
+		isCurrent: (value) => boxAngle === value.boxAngle && JSON.stringify(working) === JSON.stringify(value.working),
+		apply(from, to, source) {
+			working = to.working.map(cloneGraphic);
+			boxAngle = to.boxAngle;
+			dirty = JSON.stringify(working) !== JSON.stringify(original);
+			renderAll();
+			return emit(from, source);
+		}
+	});
 	const session = {
+		history,
 		get graphics() {
 			return original.map(cloneGraphic);
 		},
@@ -4401,9 +4665,9 @@ function runGraphicTransform(opts) {
 		};
 		driver.setDragPanEnabled(false);
 	};
-	const dragResult = (pixel) => {
+	const dragResult = (pixel, constrainRotation = false) => {
 		if (!drag) return null;
-		const result = drag.fsm.move(pixel);
+		const result = drag.fsm.move(pixel, { constrainRotation });
 		const scale = drag.fsm.kind === "scale" ? Math.max(result.box.halfWidth / drag.startBox.halfWidth, result.box.halfHeight / drag.startBox.halfHeight) : 1;
 		const rotation = drag.fsm.kind === "rotate" ? result.box.angle - drag.startBox.angle : 0;
 		return {
@@ -4411,18 +4675,18 @@ function runGraphicTransform(opts) {
 			graphics: applyPoints(drag.start, result.points, scale, rotation)
 		};
 	};
-	const onMove = (pixel) => {
+	const onMove = (pixel, info) => {
 		const active = drag;
-		const next = dragResult(pixel);
+		const next = dragResult(pixel, info?.shiftKey);
 		if (!active || !next) return;
 		working = next.graphics;
 		active.liveBox = next.result.box;
 		renderAll();
 	};
-	const onUp = (pixel) => {
+	const onUp = (pixel, info) => {
 		if (!drag) return;
 		const active = drag;
-		const next = dragResult(pixel);
+		const next = dragResult(pixel, info?.shiftKey);
 		drag = null;
 		suppressClickAway = true;
 		driver.setDragPanEnabled(true);
@@ -4432,13 +4696,15 @@ function runGraphicTransform(opts) {
 			renderAll();
 			return;
 		}
-		const previous = snapshots();
-		const previousGraphics = working.map(cloneGraphic);
+		const previousState = captureHistory();
 		working = next.graphics;
 		if (active.fsm.kind === "rotate") boxAngle += next.result.box.angle - active.startBox.angle;
 		dirty = JSON.stringify(working) !== JSON.stringify(original);
 		renderAll();
-		emit(previous, previousGraphics);
+		if (emit(previousState, "gesture")) {
+			const label = `${active.fsm.kind[0].toUpperCase()}${active.fsm.kind.slice(1)}`;
+			history.record(captureHistory(), label);
+		}
 	};
 	let previewPick;
 	let handlesPick;
@@ -4461,8 +4727,12 @@ function runGraphicTransform(opts) {
 		layers: [previewLayer, handlesLayer],
 		onViewChange: renderAll,
 		onSettled(settlement) {
-			onSettled?.();
-			settleFromInteraction(settlement, commitEmitter, settleEmitter);
+			try {
+				history.settle();
+			} finally {
+				onSettled?.();
+				settleFromInteraction(settlement, commitEmitter, settleEmitter);
+			}
 		},
 		attach(interaction) {
 			ctx = interaction;
@@ -4612,6 +4882,8 @@ function runPointSymbolEdit(opts) {
 	const listeners = /* @__PURE__ */ new Set();
 	const commitEmitter = createCommitEmitter("GraphicEditSession.onCommit listener errors");
 	const settleEmitter = createSettleEmitter("GraphicEditSession.onSettled listener errors");
+	const captureHistory = () => ({ working: clonePointSymbol(working) });
+	const cloneHistory = (value) => ({ working: clonePointSymbol(value.working) });
 	const snapshot = () => ({
 		graphic: clonePointSymbol(working),
 		render: capability.render(working)
@@ -4629,15 +4901,17 @@ function runPointSymbolEdit(opts) {
 		}
 		ctx.writeLayer(handlesLayer, handles);
 	};
-	const apply = (next, previous = snapshot()) => {
-		working = clonePointSymbol(next);
-		dirty = JSON.stringify(working) !== JSON.stringify(symbol);
-		render();
+	const emitChange = (previousState, source) => {
+		const previous = {
+			graphic: clonePointSymbol(previousState.working),
+			render: capability.render(previousState.working)
+		};
 		const current = snapshot();
 		let reject = false;
 		let close = false;
 		let abort = false;
 		const event = {
+			source,
 			graphic: current,
 			previous,
 			session,
@@ -4660,14 +4934,35 @@ function runPointSymbolEdit(opts) {
 		if (abort) ctx.fail(new TacticalDrawAbortError("session"));
 		else if (close) ctx.commit(snapshot);
 		else if (reject && !ctx.settled) {
-			working = clonePointSymbol(previous.graphic);
+			working = clonePointSymbol(previousState.working);
 			dirty = JSON.stringify(working) !== JSON.stringify(symbol);
 			render();
 		}
 		if (errors.length === 1) throw errors[0];
 		if (errors.length > 1) throw new AggregateError(errors, "GraphicEditSession.onChange errors");
+		return !ctx.settled && !reject;
+	};
+	const history = createSessionHistory({
+		initial: captureHistory(),
+		clone: cloneHistory,
+		equals: (a, b) => JSON.stringify(a.working) === JSON.stringify(b.working),
+		isCurrent: (value) => JSON.stringify(working) === JSON.stringify(value.working),
+		apply(from, to, source) {
+			working = clonePointSymbol(to.working);
+			dirty = JSON.stringify(working) !== JSON.stringify(symbol);
+			render();
+			return emitChange(from, source);
+		}
+	});
+	const apply = (next, source = "programmatic", label = "Update graphic") => {
+		const previousState = captureHistory();
+		working = clonePointSymbol(next);
+		dirty = JSON.stringify(working) !== JSON.stringify(symbol);
+		render();
+		if (emitChange(previousState, source)) history.record(captureHistory(), label);
 	};
 	const session = {
+		history,
 		graphic: clonePointSymbol(symbol),
 		get workingGraphic() {
 			return clonePointSymbol(working);
@@ -4691,11 +4986,10 @@ function runPointSymbolEdit(opts) {
 		},
 		updateGraphic(updater) {
 			if (ctx.settled) return;
-			const previous = snapshot();
 			const next = updater(clonePointSymbol(working));
 			if (next.kind !== "point-symbol" || next.id !== symbol.id) throw new TypeError("updateGraphic must preserve point-symbol kind and id");
 			capability.render(next);
-			apply(next, previous);
+			apply(next, "programmatic", "Update graphic");
 		},
 		onChange(listener) {
 			if (ctx.settled) return () => {};
@@ -4727,27 +5021,29 @@ function runPointSymbolEdit(opts) {
 		};
 		driver.setDragPanEnabled(false);
 	};
-	const transformed = (pixel) => {
+	const transformed = (pixel, constrainAngle = false) => {
 		if (!drag) return null;
 		const next = clonePointSymbol(drag.start);
 		if (drag.kind === "body") next.position = driver.fromPixel([drag.anchor[0] + pixel[0] - drag.down[0], drag.anchor[1] + pixel[1] - drag.down[1]]);
-		else if (drag.kind === "rotate") next.rotation = normalizeRotation(drag.start.rotation + pointerAngle(pixel, drag.anchor) - drag.startPointerAngle);
-		else {
+		else if (drag.kind === "rotate") {
+			const rotation = drag.start.rotation + pointerAngle(pixel, drag.anchor) - drag.startPointerAngle;
+			next.rotation = normalizeRotation(constrainAngle ? constrainRotation(rotation) : rotation);
+		} else {
 			const distance = Math.hypot(pixel[0] - drag.anchor[0], pixel[1] - drag.anchor[1]);
 			next.size.value = Math.max(.1, drag.start.size.value * (distance / drag.startDistance));
 		}
 		return next;
 	};
-	const onMove = (pixel) => {
-		const next = transformed(pixel);
+	const onMove = (pixel, info) => {
+		const next = transformed(pixel, info?.shiftKey);
 		if (!next) return;
 		working = next;
 		render();
 	};
-	const onUp = (pixel) => {
+	const onUp = (pixel, info) => {
 		if (!drag) return;
 		const currentDrag = drag;
-		const next = transformed(pixel);
+		const next = transformed(pixel, info?.shiftKey);
 		drag = null;
 		suppressClickAway = true;
 		driver.setDragPanEnabled(true);
@@ -4757,7 +5053,7 @@ function runPointSymbolEdit(opts) {
 			render();
 			return;
 		}
-		apply(next);
+		apply(next, "gesture", `${currentDrag.kind[0].toUpperCase()}${currentDrag.kind.slice(1)}`);
 	};
 	let previewPick;
 	let handlesPick;
@@ -4783,8 +5079,12 @@ function runPointSymbolEdit(opts) {
 		layers: [previewLayer, handlesLayer],
 		onViewChange: render,
 		onSettled(settlement) {
-			onSettled?.();
-			settleFromInteraction(settlement, commitEmitter, settleEmitter);
+			try {
+				history.settle();
+			} finally {
+				onSettled?.();
+				settleFromInteraction(settlement, commitEmitter, settleEmitter);
+			}
 		},
 		attach(interaction) {
 			ctx = interaction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.2.0-alpha.20",
+  "version": "0.2.0-alpha.22",
   "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",