@pie-players/pie-assessment-toolkit 0.3.30 → 0.3.31

package/dist/components/ItemToolBar.custom-element.js

@@ -33,7 +33,7 @@ import { sanitizeSvgIcon } from '@pie-players/pie-players-shared/security';
 import { createFocusTrap } from '@pie-players/pie-players-shared';
 import { createPackagedToolRegistry } from '../services/createDefaultToolRegistry.js';
 import { DEFAULT_TOOL_MODULE_LOADERS } from '../tools/default-tool-module-loaders.js';
-import { normalizeToolsConfig, parseToolList, resolveToolsForLevel } from '../services/tools-config-normalizer.js';
+import { parseToolList } from '../services/tools-config-normalizer.js';
 import { createScopedToolId, parseScopedToolId } from '../services/tool-instance-id.js';
 
 var root_4 = $.from_html(`<span class="item-toolbar__element-host svelte-rnx3ie"></span>`);
@@ -79,9 +79,6 @@ export default function ItemToolBar($$anchor, $$props) {
 		position = $.prop($$props, 'position', 7, 'bottom'),
 		scopeElement = $.prop($$props, 'scopeElement', 7, null),
 		toolRegistry = $.prop($$props, 'toolRegistry', 7, null),
-		pnpResolver = $.prop($$props, 'pnpResolver', 7, null),
-		assessment = $.prop($$props, 'assessment', 7, null),
-		itemRef = $.prop($$props, 'itemRef', 7, null),
 		item = $.prop($$props, 'item', 7, null),
 		hostButtons = $.prop($$props, 'hostButtons', 23, () => []),
 		className = $.prop($$props, 'class', 7, ''),
@@ -93,6 +90,14 @@ export default function ItemToolBar($$anchor, $$props) {
 	let shellContext = $.state(null);
 	let moduleLoadVersion = $.state(0);
 
+	// Bumped from `coordinator.onPolicyChange(...)` so the engine-driven
+	// `policyDecision` / `policyInputs` derivations rerun on input
+	// changes (`updateAssessment`, `setQtiEnforcement`, custom source
+	// register / remove). The decision itself is computed by the
+	// coordinator's policy engine — this counter is just the reactive
+	// fanout that lets Svelte know the engine answer may have changed.
+	let policyChangeVersion = $.state(0);
+
 	$.user_effect(() => {
 		if (!$.get(toolbarRootElement)) return;
 
@@ -109,6 +114,25 @@ export default function ItemToolBar($$anchor, $$props) {
 		});
 	});
 
+	$.user_effect(() => {
+		const coord = $.get(runtimeContext)?.toolkitCoordinator;
+
+		if (!coord || typeof coord.onPolicyChange !== 'function') return;
+
+		const unsubscribe = coord.onPolicyChange(() => {
+			$.set(policyChangeVersion, $.get(policyChangeVersion) + 1);
+		});
+
+		return () => {
+			try {
+				unsubscribe?.();
+			} catch {
+				// detach errors are non-fatal: the coordinator may already
+				// be torn down, in which case the listener set is GC-eligible.
+			}
+		};
+	});
+
 	const effectiveToolCoordinator = $.derived(() => $.get(runtimeContext)?.toolCoordinator);
 	const effectiveTTSService = $.derived(() => $.get(runtimeContext)?.ttsService);
 	const effectiveElementToolStateStore = $.derived(() => $.get(runtimeContext)?.elementToolStateStore);
@@ -142,12 +166,6 @@ export default function ItemToolBar($$anchor, $$props) {
 	const explicitTools = $.derived(() => parseToolList(tools()));
 	const normalizedExplicitTools = $.derived(() => $.get(effectiveToolRegistry).normalizeToolIds($.get(explicitTools)).filter(Boolean));
 
-	const effectiveToolsConfig = $.derived(() => {
-		const coordinatorConfig = $.get(runtimeContext)?.toolkitCoordinator?.config?.tools;
-
-		return normalizeToolsConfig(coordinatorConfig || {});
-	});
-
 	const placementLevel = $.derived(() => {
 		if ($.get(effectiveLevel) === 'section') return 'section';
 		if ($.get(effectiveLevel) === 'passage' || $.get(effectiveContentKind) === 'rubric-block-stimulus') return 'passage';
@@ -155,48 +173,58 @@ export default function ItemToolBar($$anchor, $$props) {
 		return 'item';
 	});
 
-	const placementAllowedToolIds = $.derived(() => {
-		const resolved = resolveToolsForLevel($.get(effectiveToolsConfig), $.get(placementLevel));
-
-		return $.get(effectiveToolRegistry).normalizeToolIds(resolved).filter(Boolean);
-	});
-
-	const providerConfig = $.derived(() => $.get(effectiveToolsConfig)?.providers || {});
-
-	const normalizedProviderConfig = $.derived(() => {
-		const normalized = {};
-
-		for (const [toolId, config] of Object.entries($.get(providerConfig))) {
-			const canonicalToolId = $.get(effectiveToolRegistry).normalizeToolId(toolId);
-
-			if (!canonicalToolId) continue;
-
-			normalized[canonicalToolId] = config;
+	// Pass 1 — single source of truth via the ToolPolicyEngine
+	// (M8 PR 3). When the toolbar is mounted under
+	// `<pie-assessment-toolkit>` the coordinator owns the engine and
+	// applies `placement → policy.allowed → policy.blocked →
+	// providers → QTI` plus any custom `PolicySource`s the host has
+	// registered. The toolbar trusts that decision verbatim — the
+	// `tools=` prop is *not* applied as a downstream filter.
+	//
+	// The `tools=` attribute is only consulted in the standalone
+	// fallback path (no coordinator in scope, e.g. fixtures that
+	// mount `<pie-item-toolbar>` directly). Hosts that want to
+	// restrict the engine's visible set should configure
+	// `tools.policy` / `tools.providers` on the assessment-toolkit
+	// inputs, or register a custom `PolicySource`, rather than
+	// passing `tools=` here.
+	const policyDecision = $.derived(() => {
+		// Read `policyChangeVersion` so we re-derive whenever the
+		// coordinator emits a policy change (assessment binding,
+		// QTI enforcement override, custom source registration).
+		void $.get(policyChangeVersion);
+
+		const coord = $.get(runtimeContext)?.toolkitCoordinator;
+
+		if (!coord || typeof coord.decideToolPolicy !== 'function') {
+			return null;
 		}
 
-		return normalized;
+		return coord.decideToolPolicy({
+			level: $.get(placementLevel),
+			scope: {
+				level: $.get(effectiveLevel),
+				scopeId: $.get(effectiveScopeId),
+				assessmentId: $.get(runtimeContext)?.assessmentId,
+				sectionId: $.get(effectiveSectionId) || undefined,
+				itemId: $.get(effectiveItemId) || undefined,
+				canonicalItemId: $.get(effectiveCanonicalItemId) || undefined,
+				contentKind: $.get(effectiveContentKind)
+			}
+		});
 	});
 
-	const isProviderEnabled = (toolId) => $.get(normalizedProviderConfig)[toolId]?.enabled !== false;
-
-	// Pass 1: determine allowed tools
 	const allowedToolIds = $.derived(() => {
-		const configuredTools = $.get(normalizedExplicitTools).length > 0
-			? $.get(normalizedExplicitTools)
-			: $.get(placementAllowedToolIds);
-
-		const providerEnabledConfiguredTools = configuredTools.filter((toolId) => isProviderEnabled(toolId));
 		const dedupe = (toolIds) => Array.from(new Set(toolIds));
 
-		if (pnpResolver() && assessment() && itemRef()) {
-			const allowedByPnp = dedupe($.get(effectiveToolRegistry).normalizeToolIds(pnpResolver().getAllowedToolIds(assessment(), itemRef()))).filter(Boolean);
-
-			if (providerEnabledConfiguredTools.length === 0) return allowedByPnp;
-
-			return dedupe(allowedByPnp.filter((toolId) => providerEnabledConfiguredTools.includes(toolId)));
+		if ($.get(policyDecision)) {
+			return dedupe($.get(effectiveToolRegistry).normalizeToolIds($.get(policyDecision).visibleTools.map((entry) => entry.toolId)).filter(Boolean));
 		}
 
-		return dedupe(providerEnabledConfiguredTools);
+		// Standalone fallback: no coordinator in scope. Honour the
+		// explicit `tools=` prop verbatim so demo fixtures keep
+		// working without a `<pie-assessment-toolkit>` ancestor.
+		return dedupe($.get(normalizedExplicitTools));
 	});
 
 	const contentReady = $.derived(() => {
@@ -207,17 +235,41 @@ export default function ItemToolBar($$anchor, $$props) {
 		return !!($.get(effectiveItem) && config && typeof config === 'object');
 	});
 
+	// QTI inputs (`assessment`, `currentItemRef`) live on the
+	// coordinator after M8 PR 2; the toolbar reads them through
+	// `getPolicyInputs()` so it can build the correct Pass-2 context
+	// without re-binding props. Standalone (no-coordinator) usage
+	// falls back to the empty / canonical-id-derived contexts that
+	// satisfy the `ToolContext` shape for `isVisibleInContext` calls.
+	const policyInputs = $.derived(() => {
+		void $.get(policyChangeVersion);
+
+		const coord = $.get(runtimeContext)?.toolkitCoordinator;
+
+		if (!coord || typeof coord.getPolicyInputs !== 'function') {
+			return null;
+		}
+
+		return coord.getPolicyInputs();
+	});
+
+	const effectiveAssessment = $.derived(() => $.get(policyInputs)?.assessment ?? null);
+	const effectiveItemRef = $.derived(() => $.get(policyInputs)?.currentItemRef ?? null);
+
 	const toolContext = $.derived(() => {
 		if ($.get(effectiveLevel) === 'section') {
 			return {
 				level: 'section',
-				assessment: assessment() || {},
+				assessment: $.get(effectiveAssessment) || {},
 				section: {}
 			};
 		}
 
 		if ($.get(effectiveLevel) === 'assessment') {
-			return { level: 'assessment', assessment: assessment() || {} };
+			return {
+				level: 'assessment',
+				assessment: $.get(effectiveAssessment) || {}
+			};
 		}
 
 		if (!$.get(contentReady) || !$.get(effectiveItem)) {
@@ -227,16 +279,16 @@ export default function ItemToolBar($$anchor, $$props) {
 		if ($.get(effectiveLevel) === 'passage') {
 			return {
 				level: 'passage',
-				assessment: assessment() || {},
-				itemRef: itemRef() || { id: $.get(effectiveCanonicalItemId) },
+				assessment: $.get(effectiveAssessment) || {},
+				itemRef: $.get(effectiveItemRef) || { id: $.get(effectiveCanonicalItemId) },
 				passage: $.get(effectiveItem)
 			};
 		}
 
 		return {
 			level: 'item',
-			assessment: assessment() || {},
-			itemRef: itemRef() || { id: $.get(effectiveCanonicalItemId) },
+			assessment: $.get(effectiveAssessment) || {},
+			itemRef: $.get(effectiveItemRef) || { id: $.get(effectiveCanonicalItemId) },
 			item: $.get(effectiveItem)
 		};
 	});
@@ -246,8 +298,8 @@ export default function ItemToolBar($$anchor, $$props) {
 
 		return {
 			level: 'item',
-			assessment: assessment() || {},
-			itemRef: itemRef() || { id: $.get(effectiveCanonicalItemId) },
+			assessment: $.get(effectiveAssessment) || {},
+			itemRef: $.get(effectiveItemRef) || { id: $.get(effectiveCanonicalItemId) },
 			item: $.get(effectiveItem) || { id: $.get(effectiveCanonicalItemId), config: {} }
 		};
 	});
@@ -264,8 +316,8 @@ export default function ItemToolBar($$anchor, $$props) {
 
 		return models.filter((model) => model && typeof model === 'object' && typeof model.id === 'string').map((model) => ({
 			level: 'element',
-			assessment: assessment() || {},
-			itemRef: itemRef() || { id: $.get(effectiveCanonicalItemId) },
+			assessment: $.get(effectiveAssessment) || {},
+			itemRef: $.get(effectiveItemRef) || { id: $.get(effectiveCanonicalItemId) },
 			item: $.get(effectiveItem),
 			elementId: model.id
 		}));
@@ -539,12 +591,32 @@ export default function ItemToolBar($$anchor, $$props) {
 
 		for (const renderedTool of $.get(renderedTools)) {
 			if (renderedTool.subscribeActive) {
+				let disposed = false;
+
 				const unsubscribe = renderedTool.subscribeActive((active) => {
-					$.set(activeToolState, { ...$.get(activeToolState), [renderedTool.toolId]: active }, true);
-					renderedTool.sync?.();
+					// Tools may dispatch their active-change signal from inside
+					// a tracked Svelte $effect (e.g. tool-tts-inline does this
+					// on mount). When the toolbar synchronously creates / re-
+					// connects the tool element during its own template/
+					// derivation pass — for example when the section player
+					// collapses on resize — that dispatch lands back here while
+					// our parent derivation is still running, and Svelte
+					// rejects the `activeToolState` write with
+					// `state_unsafe_mutation`. Queue the update on a
+					// microtask so the mutation happens after the current
+					// reactive flush settles.
+					queueMicrotask(() => {
+						if (disposed) return;
+
+						$.set(activeToolState, { ...$.get(activeToolState), [renderedTool.toolId]: active }, true);
+						renderedTool.sync?.();
+					});
 				});
 
-				unsubs.push(unsubscribe);
+				unsubs.push(() => {
+					disposed = true;
+					unsubscribe();
+				});
 			}
 		}
 
@@ -556,9 +628,25 @@ export default function ItemToolBar($$anchor, $$props) {
 	$.user_effect(() => {
 		if (!$.get(toolbarContext).subscribeVisibility) return;
 
-		return $.get(toolbarContext).subscribeVisibility(() => {
-			syncRenderedToolsState();
+		let disposed = false;
+
+		const unsubscribe = $.get(toolbarContext).subscribeVisibility(() => {
+			// Defense-in-depth: defer the state write so a synchronous
+			// visibility broadcast from the coordinator never lands inside
+			// an active parent derivation/template flush. See the
+			// `subscribeActive` handler above for the failure mode this
+			// pattern prevents.
+			queueMicrotask(() => {
+				if (disposed) return;
+
+				syncRenderedToolsState();
+			});
 		});
+
+		return () => {
+			disposed = true;
+			unsubscribe?.();
+		};
 	});
 
 	$.user_effect(() => {
@@ -566,13 +654,28 @@ export default function ItemToolBar($$anchor, $$props) {
 
 		if (typeof toolkitCoordinator?.subscribeTelemetry !== 'function') return;
 
-		return toolkitCoordinator.subscribeTelemetry(({ eventName, payload }) => {
-			if (eventName !== 'tool-config-updated') return;
+		let disposed = false;
+
+		const unsubscribe = toolkitCoordinator.subscribeTelemetry(({ eventName, payload }) => {
+			if (eventName !== 'pie-toolkit-tool-config-updated') return;
 			if (payload?.toolId && !$.get(toolbarVisibleToolIds).includes(payload.toolId)) return;
 
-			$.set(moduleLoadVersion, $.get(moduleLoadVersion) + 1);
-			syncRenderedToolsState();
+			// Defense-in-depth: telemetry can be emitted from anywhere in
+			// the toolkit lifecycle, including paths that flush
+			// synchronously while this component's deriveds are running.
+			// Defer the writes so the parent flush always settles first.
+			queueMicrotask(() => {
+				if (disposed) return;
+
+				$.set(moduleLoadVersion, $.get(moduleLoadVersion) + 1);
+				syncRenderedToolsState();
+			});
 		});
+
+		return () => {
+			disposed = true;
+			unsubscribe?.();
+		};
 	});
 
 	function mountElement(node, element) {
@@ -1334,33 +1437,6 @@ export default function ItemToolBar($$anchor, $$props) {
 			$.flush();
 		},
 
-		get pnpResolver() {
-			return pnpResolver();
-		},
-
-		set pnpResolver($$value) {
-			pnpResolver($$value);
-			$.flush();
-		},
-
-		get assessment() {
-			return assessment();
-		},
-
-		set assessment($$value) {
-			assessment($$value);
-			$.flush();
-		},
-
-		get itemRef() {
-			return itemRef();
-		},
-
-		set itemRef($$value) {
-			itemRef($$value);
-			$.flush();
-		},
-
 		get item() {
 			return item();
 		},
@@ -1796,9 +1872,6 @@ __pieDefineSafely('pie-item-toolbar', $.create_custom_element(
 		language: { attribute: 'language', type: 'String' },
 		scopeElement: { type: 'Object' },
 		toolRegistry: { type: 'Object' },
-		pnpResolver: { type: 'Object' },
-		assessment: { type: 'Object' },
-		itemRef: { type: 'Object' },
 		item: { type: 'Object' },
 		hostButtons: { type: 'Object' },
 		class: {}