@pie-players/pie-default-tool-loaders 0.3.68 → 0.3.70

package/README.md

@@ -17,7 +17,7 @@ and how does the program tier them":
 | `PACKAGED_TOOL_TAG_MAP` | Which custom element each one renders as |
 | `PACKAGED_TOOL_PLACEMENT`, `SECTION_PLAYER_PREFERRED_TOOL_PLACEMENT`, `PACKAGED_TOOL_ORDER` | Where they appear and in what order |
 | `UNIVERSAL_SUPPORTS_PRESET`, `createUniversalPersonalNeedsProfile` | Which of their support ids the program grants to everyone |
-| `DEFAULT_TOOL_MODULE_LOADERS`, `registerSectionToolModuleLoaders` | When each one's bundle loads |
+| `DEFAULT_TOOL_MODULE_LOADERS`, `createDefaultToolModuleLoaders`, `registerSectionToolModuleLoaders` | When each one's bundle loads |
 
 The individual registrations are exported too, so a host can compose its own set
 rather than take the packaged one whole.
@@ -52,6 +52,43 @@ const registry = createPackagedToolRegistry({
 });
 ```
 
+Desmos remains the calculator delivery when no provider is configured. To use
+GeoGebra or the fully bundled open-source Cortex implementation, pass the same
+calculator configuration to both the toolkit and the
+packaged composition. The composition then owns the matching element tag and
+module loader; hosts do not hand-maintain a second vendor map.
+
+```ts
+import {
+	createDefaultToolModuleLoaders,
+	createPackagedToolRegistry,
+} from "@pie-players/pie-default-tool-loaders";
+
+const calculatorProviderConfig = {
+	provider: {
+		id: "calculator-geogebra",
+		init: { appletTimeoutMs: 20_000 },
+	},
+	settings: { showResetIcon: true },
+};
+
+const registry = createPackagedToolRegistry({
+	calculatorProviderConfig,
+	toolModuleLoaders: createDefaultToolModuleLoaders({
+		calculatorProviderConfig,
+	}),
+});
+
+const tools = {
+	providers: { calculator: calculatorProviderConfig },
+};
+```
+
+For an offline-capable calculator with no API key or runtime CDN, use
+`provider.id: "calculator-cortex"`. Its `settings` accept angle mode, precision,
+history, evaluation limit, allowed functions, clipboard policy, and graph
+viewport options documented by `@pie-players/pie-calculator-cortex`.
+
 `createDefaultToolRegistry()` in the toolkit is the other end of that choice: it
 builds an empty registry, and a host composing its own set registers into it.
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-export type { PackagedToolRegistryOptions, RegisterDefaultToolModuleLoadersOptions, RegisterPackagedToolsOptions, ToolModuleLoader, ToolRegistryLike, } from "./packaged-capability-composition.js";
-export { createPackagedToolRegistry, createUniversalPersonalNeedsProfile, DEFAULT_TOOL_MODULE_LOADERS, ITEM_TOOL_MODULE_LOADERS, PACKAGED_TOOL_ORDER, PACKAGED_TOOL_PLACEMENT, PACKAGED_TOOL_REGISTRATIONS, PACKAGED_TOOL_TAG_MAP, registerDefaultToolModuleLoaders, registerPackagedTools, registerSectionToolModuleLoaders, SECTION_PLAYER_PREFERRED_TOOL_PLACEMENT, SECTION_TOOL_MODULE_LOADERS, UNIVERSAL_SUPPORTS_PRESET, } from "./packaged-capability-composition.js";
+export type { PackagedCalculatorCompositionOptions, PackagedToolRegistryOptions, RegisterDefaultToolModuleLoadersOptions, RegisterPackagedToolsOptions, ToolModuleLoader, ToolRegistryLike, } from "./packaged-capability-composition.js";
+export { createPackagedToolRegistry, createDefaultToolModuleLoaders, createSectionToolModuleLoaders, createUniversalPersonalNeedsProfile, DEFAULT_TOOL_MODULE_LOADERS, ITEM_TOOL_MODULE_LOADERS, PACKAGED_TOOL_ORDER, PACKAGED_TOOL_PLACEMENT, PACKAGED_TOOL_REGISTRATIONS, PACKAGED_TOOL_TAG_MAP, registerDefaultToolModuleLoaders, registerPackagedTools, registerSectionToolModuleLoaders, SECTION_PLAYER_PREFERRED_TOOL_PLACEMENT, SECTION_TOOL_MODULE_LOADERS, UNIVERSAL_SUPPORTS_PRESET, } from "./packaged-capability-composition.js";
 export { CONTENT_ALTERNATE_REGISTRATIONS } from "./content-alternates.js";
 export { annotationToolbarRegistration, lineReaderToolRegistration, themeToolRegistration, } from "./registrations/accessibility-tools.js";
 export { AUDIO_TRANSCRIPT_FEATURE_ID, AUDIO_TRANSCRIPT_REGION_CLASS, AUDIO_TRANSCRIPT_REGION_LABEL, audioTranscriptRegistration, resolveAudioTranscript, type ResolvedAudioTranscript, } from "./registrations/audio-transcript.js";

package/dist/index.js

@@ -1,4 +1,4 @@
-export { createPackagedToolRegistry, createUniversalPersonalNeedsProfile, DEFAULT_TOOL_MODULE_LOADERS, ITEM_TOOL_MODULE_LOADERS, PACKAGED_TOOL_ORDER, PACKAGED_TOOL_PLACEMENT, PACKAGED_TOOL_REGISTRATIONS, PACKAGED_TOOL_TAG_MAP, registerDefaultToolModuleLoaders, registerPackagedTools, registerSectionToolModuleLoaders, SECTION_PLAYER_PREFERRED_TOOL_PLACEMENT, SECTION_TOOL_MODULE_LOADERS, UNIVERSAL_SUPPORTS_PRESET, } from "./packaged-capability-composition.js";
+export { createPackagedToolRegistry, createDefaultToolModuleLoaders, createSectionToolModuleLoaders, createUniversalPersonalNeedsProfile, DEFAULT_TOOL_MODULE_LOADERS, ITEM_TOOL_MODULE_LOADERS, PACKAGED_TOOL_ORDER, PACKAGED_TOOL_PLACEMENT, PACKAGED_TOOL_REGISTRATIONS, PACKAGED_TOOL_TAG_MAP, registerDefaultToolModuleLoaders, registerPackagedTools, registerSectionToolModuleLoaders, SECTION_PLAYER_PREFERRED_TOOL_PLACEMENT, SECTION_TOOL_MODULE_LOADERS, UNIVERSAL_SUPPORTS_PRESET, } from "./packaged-capability-composition.js";
 // The authored-alternate subset, for a renderer that shows alternates and no
 // toolbar — importable without the packaged composition's tool loaders.
 export { CONTENT_ALTERNATE_REGISTRATIONS } from "./content-alternates.js";

package/dist/packaged-capability-composition.d.ts

@@ -7,13 +7,21 @@
  * Public constants are projections of this composition so adding a capability
  * cannot leave a second hand-maintained catalogue silently behind.
  */
-import { ToolRegistry, type ToolComponentFactory, type ToolComponentFactoryMap, type ToolRegistration, type ToolTagMap } from "@pie-players/pie-assessment-toolkit/tools/internal";
+import { ToolRegistry, type ToolComponentFactory, type ToolComponentFactoryMap, type ToolRegistration, type ToolTagMap, type ToolProviderConfig } from "@pie-players/pie-assessment-toolkit/tools/internal";
 import type { PersonalNeedsProfile } from "@pie-players/pie-players-shared/types";
 export type ToolModuleLoader = () => Promise<unknown>;
 export interface ToolRegistryLike {
     setToolModuleLoaders(loaders: Partial<Record<string, ToolModuleLoader>>): void;
 }
-export interface PackagedToolRegistryOptions {
+export interface PackagedCalculatorCompositionOptions {
+    /**
+     * The same calculator config supplied at `tools.providers.calculator`.
+     * Selects the matching packaged element and default loader. Omit it to retain
+     * the existing Desmos delivery.
+     */
+    calculatorProviderConfig?: ToolProviderConfig;
+}
+export interface PackagedToolRegistryOptions extends PackagedCalculatorCompositionOptions {
     /** Override packaged registrations by toolId. */
     overrides?: Partial<Record<string, ToolRegistration>>;
     /** Override or extend the packaged element tag mapping. */
@@ -30,9 +38,9 @@ export interface RegisterPackagedToolsOptions {
     toolIds?: string[];
     applyOverrides?: (registration: ToolRegistration) => ToolRegistration;
 }
-export type RegisterDefaultToolModuleLoadersOptions = {
+export interface RegisterDefaultToolModuleLoadersOptions extends PackagedCalculatorCompositionOptions {
     loaders?: Partial<Record<string, ToolModuleLoader>>;
-};
+}
 /**
  * Release/build gate for PIE-authored composition data.
  *
@@ -46,6 +54,10 @@ export declare const PACKAGED_TOOL_TAG_MAP: ToolTagMap;
 export declare const ITEM_TOOL_MODULE_LOADERS: Record<string, ToolModuleLoader>;
 export declare const SECTION_TOOL_MODULE_LOADERS: Record<string, ToolModuleLoader>;
 export declare const DEFAULT_TOOL_MODULE_LOADERS: Record<string, ToolModuleLoader>;
+/** Build the packaged loader map for a selected calculator provider. */
+export declare function createDefaultToolModuleLoaders(options?: PackagedCalculatorCompositionOptions): Record<string, ToolModuleLoader>;
+/** Build the section-bootstrap loader subset for a selected calculator provider. */
+export declare function createSectionToolModuleLoaders(options?: PackagedCalculatorCompositionOptions): Record<string, ToolModuleLoader>;
 export declare const PACKAGED_TOOL_PLACEMENT: {
     readonly assessment: readonly ["theme"];
     readonly section: readonly ["theme"];

package/dist/packaged-capability-composition.js

@@ -10,20 +10,40 @@
 import { ToolRegistry, } from "@pie-players/pie-assessment-toolkit/tools/internal";
 import { annotationToolbarRegistration, lineReaderToolRegistration, themeToolRegistration, } from "./registrations/accessibility-tools.js";
 import { audioTranscriptRegistration } from "./registrations/audio-transcript.js";
-import { calculatorToolRegistration } from "./registrations/calculator.js";
+import { calculatorToolRegistration, resolveCalculatorProviderId, } from "./registrations/calculator.js";
 import { dictionaryToolRegistration, pictureDictionaryToolRegistration, spanishDictionaryToolRegistration, spanishPictureDictionaryToolRegistration, } from "./registrations/dictionary-tools.js";
 import { answerEliminatorToolRegistration } from "./registrations/interaction-tools.js";
 import { protractorToolRegistration, rulerToolRegistration, } from "./registrations/measurement-tools.js";
 import { graphToolRegistration, periodicTableToolRegistration, } from "./registrations/subject-specific-tools.js";
 import { ttsToolRegistration } from "./registrations/tts.js";
 const loadSideEffectModule = (load) => load().then(() => undefined);
-function loadCalculatorModule() {
+function loadCalculatorElement(tagName, load) {
     if (typeof globalThis !== "undefined" &&
         "customElements" in globalThis &&
-        globalThis.customElements?.get("pie-tool-calculator")) {
+        globalThis.customElements?.get(tagName)) {
         return Promise.resolve();
     }
-    return loadSideEffectModule(() => import("@pie-players/pie-tool-calculator-desmos"));
+    return loadSideEffectModule(load);
+}
+const loadDesmosCalculatorModule = () => loadCalculatorElement("pie-tool-calculator", () => import("@pie-players/pie-tool-calculator-shared/calculator-element"));
+const loadGeoGebraCalculatorModule = () => loadCalculatorElement("pie-tool-calculator-geogebra", () => import("@pie-players/pie-tool-calculator-geogebra"));
+const loadCortexCalculatorModule = () => loadCalculatorElement("pie-tool-calculator-cortex", () => import("@pie-players/pie-tool-calculator-cortex"));
+const CALCULATOR_DELIVERY = {
+    "calculator-desmos": {
+        tagName: "pie-tool-calculator",
+        loadModule: loadDesmosCalculatorModule,
+    },
+    "calculator-geogebra": {
+        tagName: "pie-tool-calculator-geogebra",
+        loadModule: loadGeoGebraCalculatorModule,
+    },
+    "calculator-cortex": {
+        tagName: "pie-tool-calculator-cortex",
+        loadModule: loadCortexCalculatorModule,
+    },
+};
+function resolveCalculatorDelivery(config) {
+    return CALCULATOR_DELIVERY[resolveCalculatorProviderId(config)];
 }
 const loadTtsModule = () => loadSideEffectModule(() => import("@pie-players/pie-tool-tts-inline"));
 const loadRulerModule = () => loadSideEffectModule(() => import("@pie-players/pie-tool-ruler"));
@@ -39,18 +59,13 @@ const loadPictureDictionaryModule = () => loadSideEffectModule(() => import("@pi
 const PACKAGED_CAPABILITY_DEFINITIONS = [
     {
         registration: calculatorToolRegistration,
-        tagName: "pie-tool-calculator",
-        loadModule: loadCalculatorModule,
+        tagName: CALCULATOR_DELIVERY["calculator-desmos"].tagName,
+        loadModule: CALCULATOR_DELIVERY["calculator-desmos"].loadModule,
         loaderTargets: ["item", "section"],
         placementOrder: { element: 10 },
         preferredPlacementOrder: { item: 10 },
         toolbarOrder: 20,
-        universalSupportIds: [
-            "calculator",
-            "graphingCalculator",
-            "basicCalculator",
-            "scientificCalculator",
-        ],
+        universalSupportIds: ["calculator", "graphingCalculator"],
     },
     {
         registration: ttsToolRegistration,
@@ -60,7 +75,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { item: 10, passage: 10, rubric: 10, element: 30 },
         preferredPlacementOrder: { item: 20, passage: 10 },
         toolbarOrder: 30,
-        universalSupportIds: ["textToSpeech", "readAloud", "tts", "speechOutput"],
+        universalSupportIds: ["textToSpeech", "readAloud"],
     },
     {
         registration: rulerToolRegistration,
@@ -70,7 +85,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { element: 40 },
         preferredPlacementOrder: { section: 50 },
         toolbarOrder: 80,
-        universalSupportIds: ["ruler", "measurement"],
+        universalSupportIds: ["ruler"],
     },
     {
         registration: protractorToolRegistration,
@@ -80,7 +95,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { element: 50 },
         preferredPlacementOrder: { section: 60 },
         toolbarOrder: 90,
-        universalSupportIds: ["protractor", "angleMeasurement"],
+        universalSupportIds: ["protractor"],
     },
     {
         registration: answerEliminatorToolRegistration,
@@ -90,12 +105,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { element: 20 },
         preferredPlacementOrder: { item: 30 },
         toolbarOrder: 70,
-        universalSupportIds: [
-            "answerMasking",
-            "answerEliminator",
-            "strikethrough",
-            "choiceMasking",
-        ],
+        universalSupportIds: ["answerMasking", "answerEliminator", "strikethrough"],
     },
     {
         registration: lineReaderToolRegistration,
@@ -105,13 +115,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { passage: 40, rubric: 40 },
         preferredPlacementOrder: { section: 40 },
         toolbarOrder: 40,
-        universalSupportIds: [
-            "readingMask",
-            "readingGuide",
-            "readingRuler",
-            "lineReader",
-            "trackingGuide",
-        ],
+        universalSupportIds: ["readingMask", "readingGuide", "readingRuler"],
     },
     {
         registration: themeToolRegistration,
@@ -126,8 +130,6 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
             "colorContrast",
             "invertColors",
             "theme",
-            "highContrast",
-            "customColors",
         ],
     },
     {
@@ -141,13 +143,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         // The last three came from the `highlighter` capability, which mounted this
         // same element behind a second identically-labelled button. Kept here so a
         // profile granted one of the older ids still gets highlighting.
-        universalSupportIds: [
-            "highlighting",
-            "annotations",
-            "highlighter",
-            "textHighlight",
-            "annotation",
-        ],
+        universalSupportIds: ["highlighting", "annotations"],
     },
     {
         registration: graphToolRegistration,
@@ -157,7 +153,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { item: 40, element: 80 },
         preferredPlacementOrder: { section: 20 },
         toolbarOrder: 100,
-        universalSupportIds: ["graph", "coordinatePlane", "graphingTool"],
+        universalSupportIds: ["graph"],
     },
     {
         registration: periodicTableToolRegistration,
@@ -167,11 +163,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { item: 50, element: 90 },
         preferredPlacementOrder: { section: 30 },
         toolbarOrder: 110,
-        universalSupportIds: [
-            "periodicTable",
-            "chemistryReference",
-            "elementReference",
-        ],
+        universalSupportIds: ["periodicTable"],
     },
     {
         registration: dictionaryToolRegistration,
@@ -406,10 +398,27 @@ class PackagedCapabilityComposition {
         // their bundle/runtime behavior.
         if (options.toolModuleLoaders &&
             Object.keys(options.toolModuleLoaders).length > 0) {
-            registry.setToolModuleLoaders(options.toolModuleLoaders);
+            const toolModuleLoaders = { ...options.toolModuleLoaders };
+            const calculatorDelivery = resolveCalculatorDelivery(options.calculatorProviderConfig);
+            // A host using the packaged default map gets a coherent provider-specific
+            // loader. A genuinely custom calculator loader remains the host's override.
+            if (options.calculatorProviderConfig &&
+                toolModuleLoaders.calculator === this.defaultModuleLoaders.calculator) {
+                toolModuleLoaders.calculator = calculatorDelivery.loadModule;
+            }
+            registry.setToolModuleLoaders(toolModuleLoaders);
         }
+        const calculatorTagMap = options.calculatorProviderConfig
+            ? {
+                calculator: resolveCalculatorDelivery(options.calculatorProviderConfig).tagName,
+            }
+            : {};
         registry.setComponentOverrides({
-            toolTagMap: { ...this.toolTagMap, ...(options.toolTagMap ?? {}) },
+            toolTagMap: {
+                ...this.toolTagMap,
+                ...calculatorTagMap,
+                ...(options.toolTagMap ?? {}),
+            },
             toolComponentFactory: options.toolComponentFactory,
             toolComponentFactories: options.toolComponentFactories,
         });
@@ -450,6 +459,22 @@ export const SECTION_TOOL_MODULE_LOADERS = {
 export const DEFAULT_TOOL_MODULE_LOADERS = {
     ...packagedCapabilityComposition.defaultModuleLoaders,
 };
+/** Build the packaged loader map for a selected calculator provider. */
+export function createDefaultToolModuleLoaders(options = {}) {
+    return {
+        ...DEFAULT_TOOL_MODULE_LOADERS,
+        calculator: resolveCalculatorDelivery(options.calculatorProviderConfig)
+            .loadModule,
+    };
+}
+/** Build the section-bootstrap loader subset for a selected calculator provider. */
+export function createSectionToolModuleLoaders(options = {}) {
+    return {
+        ...SECTION_TOOL_MODULE_LOADERS,
+        calculator: resolveCalculatorDelivery(options.calculatorProviderConfig)
+            .loadModule,
+    };
+}
 export const PACKAGED_TOOL_PLACEMENT = {
     assessment: [...packagedCapabilityComposition.placement.assessment],
     section: [...packagedCapabilityComposition.placement.section],
@@ -482,14 +507,14 @@ export function createUniversalPersonalNeedsProfile() {
 /** Register packaged lazy module loaders, followed by host overrides. */
 export function registerDefaultToolModuleLoaders(registry, options = {}) {
     registry.setToolModuleLoaders({
-        ...DEFAULT_TOOL_MODULE_LOADERS,
+        ...createDefaultToolModuleLoaders(options),
         ...(options.loaders ?? {}),
     });
 }
 /** Register only the section-bootstrap loader subset, then host overrides. */
 export function registerSectionToolModuleLoaders(registry, options = {}) {
     registry.setToolModuleLoaders({
-        ...SECTION_TOOL_MODULE_LOADERS,
+        ...createSectionToolModuleLoaders(options),
         ...(options.loaders ?? {}),
     });
 }

package/dist/registrations/accessibility-tools.js

@@ -36,8 +36,6 @@ export const lineReaderToolRegistration = {
         "readingMask", // QTI 3.0 standard (reading.readingMask)
         "readingGuide", // QTI 3.0 standard (reading.readingGuide)
         "readingRuler", // QTI 3.0 standard (reading.readingRuler)
-        "lineReader", // Common variant
-        "trackingGuide", // Common variant
     ],
     /**
      * Pass 2: Line reader is relevant when readable text is present
@@ -73,9 +71,7 @@ export const themeToolRegistration = {
         "highContrastDisplay", // QTI 3.0 standard (visual.highContrastDisplay)
         "colorContrast", // QTI 3.0 standard (visual.colorContrast)
         "invertColors", // QTI 3.0 standard (visual.invertColors)
-        "theme", // Canonical id
-        "highContrast", // Common variant
-        "customColors", // Common variant
+        "theme", // Canonical id, and this registration's toolId
     ],
     /**
      * Pass 2: Color scheme is always relevant when allowed
@@ -127,9 +123,6 @@ export const annotationToolbarRegistration = {
     pnpSupportIds: [
         "highlighting", // QTI 3.0 standard (cognitive.highlighting / reading.wordHighlighting)
         "annotations", // QTI 3.0 standard (cognitive.annotations)
-        "highlighter", // Common variant
-        "textHighlight", // Common variant
-        "annotation", // Common variant
     ],
     /**
      * Pass 2: Annotation is relevant when readable text is present

package/dist/registrations/calculator.d.ts

@@ -2,18 +2,22 @@
  * Calculator Tool Registration
  *
  * Registers the calculator tool with support for multiple calculator types
- * (basic, scientific, graphing) via Desmos provider.
+ * (basic, scientific, graphing) through a host-selected provider.
  *
  * Maps to QTI 3.0 standard access features:
  * - calculator (cognitive support)
  * - graphingCalculator (assessment tool)
  */
 import type { ToolRegistration } from "@pie-players/pie-assessment-toolkit/tools/internal";
+import type { ToolProviderConfig } from "@pie-players/pie-assessment-toolkit/tools/internal";
+export type CalculatorProviderId = "calculator-desmos" | "calculator-geogebra" | "calculator-cortex";
+export declare const DEFAULT_CALCULATOR_PROVIDER_ID: CalculatorProviderId;
+export declare function resolveCalculatorProviderId(config: ToolProviderConfig | undefined): CalculatorProviderId;
 /**
  * Calculator tool registration
  *
  * Supports:
- * - Basic, scientific, and graphing calculators via Desmos
+ * - Basic, scientific, and graphing calculators through Desmos, GeoGebra, or Cortex
  * - Context-aware visibility (shows only when math content is detected)
  * - Item level only
  */

package/dist/registrations/calculator.js

@@ -2,7 +2,7 @@
  * Calculator Tool Registration
  *
  * Registers the calculator tool with support for multiple calculator types
- * (basic, scientific, graphing) via Desmos provider.
+ * (basic, scientific, graphing) through a host-selected provider.
  *
  * Maps to QTI 3.0 standard access features:
  * - calculator (cognitive support)
@@ -11,7 +11,45 @@
 import { hasMathContent } from "@pie-players/pie-assessment-toolkit/tools/internal";
 import { createScopedToolId } from "@pie-players/pie-assessment-toolkit/tools/internal";
 import { DesmosToolProvider } from "@pie-players/pie-assessment-toolkit/tools/internal";
+import { CortexToolProvider } from "@pie-players/pie-assessment-toolkit/tools/internal";
+import { GeoGebraToolProvider } from "@pie-players/pie-assessment-toolkit/tools/internal";
 import { createToolElement } from "@pie-players/pie-assessment-toolkit/tools/internal";
+export const DEFAULT_CALCULATOR_PROVIDER_ID = "calculator-desmos";
+export function resolveCalculatorProviderId(config) {
+    const configured = config?.provider?.id;
+    if (configured === undefined || configured === "") {
+        return DEFAULT_CALCULATOR_PROVIDER_ID;
+    }
+    if (configured === "calculator-desmos" ||
+        configured === "calculator-geogebra" ||
+        configured === "calculator-cortex") {
+        return configured;
+    }
+    throw new Error(`Unsupported calculator provider "${String(configured)}". Expected "calculator-desmos", "calculator-geogebra", or "calculator-cortex".`);
+}
+function createCalculatorToolProvider(config) {
+    switch (resolveCalculatorProviderId(config)) {
+        case "calculator-cortex":
+            return new CortexToolProvider();
+        case "calculator-geogebra":
+            return new GeoGebraToolProvider();
+        default:
+            return new DesmosToolProvider();
+    }
+}
+function getCalculatorInstanceConfig(config) {
+    const theme = config?.theme;
+    return {
+        settings: config?.settings && typeof config.settings === "object"
+            ? { ...config.settings }
+            : {},
+        restrictedMode: config?.restrictedMode === true,
+        locale: typeof config?.locale === "string" ? config.locale : undefined,
+        theme: theme === "light" || theme === "dark" || theme === "auto"
+            ? theme
+            : undefined,
+    };
+}
 // The toolbar parent re-derives `renderedTools` whenever item state changes
 // (e.g. the learner answers a question and `effectiveItem`/`renderContext`
 // recompute). Calculator initialization is expensive (Desmos boot, container
@@ -45,7 +83,9 @@ function setCachedOverlay(coordinator, fullToolId, element) {
     scoped.set(fullToolId, element);
 }
 function normalizeCalculatorType(value) {
-    return value === "basic" || value === "scientific" ? value : null;
+    return value === "basic" || value === "scientific" || value === "graphing"
+        ? value
+        : null;
 }
 function getCalculatorRenderParams(toolbarContext) {
     const params = toolbarContext.getToolRenderParams?.("calculator") ?? {};
@@ -74,10 +114,14 @@ function getCalculatorRenderParams(toolbarContext) {
 const CALCULATOR_NAME_KEYS = {
     basic: "tools.calculator.nameBasic",
     scientific: "tools.calculator.nameScientific",
+    graphing: "tools.calculator.nameGraphing",
     untyped: "tools.calculator.name",
 };
-function applyCalculatorParamsToElement(element, calculatorType, availableTypes) {
+function applyCalculatorParamsToElement(element, calculatorType, availableTypes, providerId, calculatorConfig) {
     const calculatorElement = element;
+    calculatorElement.providerId = providerId;
+    calculatorElement.calculatorConfig = calculatorConfig;
+    element.setAttribute("provider-id", providerId);
     if (calculatorType) {
         calculatorElement.calculatorType = calculatorType;
         element.setAttribute("calculator-type", calculatorType);
@@ -97,7 +141,7 @@ function applyCalculatorParamsToElement(element, calculatorType, availableTypes)
  * Calculator tool registration
  *
  * Supports:
- * - Basic, scientific, and graphing calculators via Desmos
+ * - Basic, scientific, and graphing calculators through Desmos, GeoGebra, or Cortex
  * - Context-aware visibility (shows only when math content is detected)
  * - Item level only
  */
@@ -109,25 +153,14 @@ export const calculatorToolRegistration = {
     descriptionKey: "tools.calculator.description",
     icon: "calculator",
     provider: {
-        getProviderId: (config) => typeof config?.provider?.id === "string" && config.provider.id.length > 0
-            ? config.provider.id
-            : "calculator-desmos",
-        createProvider: () => new DesmosToolProvider(),
+        getProviderId: resolveCalculatorProviderId,
+        createProvider: createCalculatorToolProvider,
         getInitConfig: (config) => config?.provider?.init ?? {},
         getAuthFetcher: (config) => {
             const runtimeAuthFetcher = config?.provider?.runtime?.authFetcher;
-            if (typeof runtimeAuthFetcher === "function")
-                return runtimeAuthFetcher;
-            return async () => {
-                const response = await fetch("/api/tools/desmos/auth", {
-                    method: "GET",
-                    credentials: "same-origin",
-                });
-                if (!response.ok) {
-                    throw new Error(`Failed to fetch Desmos auth config (${response.status})`);
-                }
-                return (await response.json());
-            };
+            return typeof runtimeAuthFetcher === "function"
+                ? runtimeAuthFetcher
+                : undefined;
         },
         lazy: true,
     },
@@ -135,11 +168,13 @@ export const calculatorToolRegistration = {
     supportedLevels: ["item"],
     // PNP support IDs that enable this tool
     // Maps to QTI 3.0 standard features: calculator, graphingCalculator
+    // A type is not a feature id: `calculatorType` arrives through the host's
+    // render params, so `basicCalculator` / `scientificCalculator` granted the
+    // same untyped calculator these two do and only looked like they selected a
+    // variant.
     pnpSupportIds: [
         "calculator", // QTI 3.0 standard (cognitive.calculator)
         "graphingCalculator", // QTI 3.0 standard (assessment.graphingCalculator)
-        "basicCalculator", // Common variant
-        "scientificCalculator", // Common variant
     ],
     /**
      * Pass 2: Determine if calculator is relevant in this context
@@ -153,6 +188,9 @@ export const calculatorToolRegistration = {
     },
     renderToolbar(context, toolbarContext) {
         const { calculatorType, availableTypes, displayName } = getCalculatorRenderParams(toolbarContext);
+        const calculatorToolConfig = toolbarContext.toolkitCoordinator?.config.tools?.providers?.calculator;
+        const providerId = resolveCalculatorProviderId(calculatorToolConfig);
+        const calculatorConfig = getCalculatorInstanceConfig(calculatorToolConfig);
         const fullToolId = createScopedToolId(this.toolId, toolbarContext.scope.level, toolbarContext.scope.scopeId);
         const componentOverrides = toolbarContext.componentOverrides;
         const cachedOverlay = getCachedOverlay(toolbarContext.toolCoordinator, fullToolId);
@@ -163,7 +201,7 @@ export const calculatorToolRegistration = {
         }
         overlay.setAttribute("tool-id", fullToolId);
         overlay.toolkitCoordinator = toolbarContext.toolkitCoordinator;
-        applyCalculatorParamsToElement(overlay, calculatorType, availableTypes);
+        applyCalculatorParamsToElement(overlay, calculatorType, availableTypes, providerId, calculatorConfig);
         const button = {
             toolId: this.toolId,
             label: displayName,
@@ -199,11 +237,49 @@ export const calculatorToolRegistration = {
                         draggable: true,
                         resizable: true,
                         closeable: true,
-                        initialWidth: 380,
-                        initialHeight: 420,
+                        /*
+                         * Sized per type from what each layout measures, rather than one
+                         * size for all three. A shell subtracts ~74px of header from the
+                         * height it is given, and the numbers below are the content each
+                         * type needs plus room for its history tape:
+                         *
+                         * - basic: strip, display, edit row and a four-row keypad measure
+                         *   398px. 560 left ~90px of blank above the entry line, which is
+                         *   the gap that made the panel look mis-sized.
+                         * - scientific: the same plus a keypad layer tab row.
+                         * - graphing: the expression rail beside the plot, whose column
+                         *   wants 486px on its own — viewport controls, a 14rem board floor
+                         *   and the readout that *is* the graph for assistive technology,
+                         *   since the board itself is `aria-hidden`. At 620 that column was
+                         *   12px short and the readout's last line was cut off.
+                         *
+                         * The minimums stay shared across types and providers. This
+                         * registration serves Desmos, GeoGebra and Cortex alike, so a
+                         * graphing-only floor would move the resize limit under two vendors
+                         * whose layouts were never measured for it. Cortex below 42rem
+                         * stacks the rail above the plot and needs 701px there, which no
+                         * spacing tier closes — it scrolls its own content instead of
+                         * clipping it, which is the contract every size below the opening
+                         * one already relies on.
+                         */
+                        initialWidth: calculatorType === "graphing" ? 720 : 380,
+                        initialHeight: calculatorType === "graphing"
+                            ? 660
+                            : calculatorType === "basic"
+                                ? 500
+                                : 560,
                         minWidth: 380,
-                        minHeight: 420,
-                        initialAlign: "bottom-right",
+                        minHeight: 480,
+                        /*
+                         * `bottom-right` put a 560-620px-tall shell over the items
+                         * column it shares the viewport with — tall enough, at
+                         * ordinary viewport heights, to sit on top of a sibling
+                         * item's own toolbar row and block its button from mouse
+                         * and touch input. `bottom-left` keeps the same footprint
+                         * over the passage column instead, which carries no
+                         * per-item controls to collide with.
+                         */
+                        initialAlign: "bottom-left",
                         initialMargin: 16,
                         // Header controls in the host's design system, and the layout that
                         // goes with them.
@@ -237,7 +313,7 @@ export const calculatorToolRegistration = {
                 if (overlay.toolkitCoordinator !== toolbarContext.toolkitCoordinator) {
                     overlay.toolkitCoordinator = toolbarContext.toolkitCoordinator;
                 }
-                applyCalculatorParamsToElement(overlay, calculatorType, availableTypes);
+                applyCalculatorParamsToElement(overlay, calculatorType, availableTypes, providerId, calculatorConfig);
             },
             subscribeActive: (callback) => {
                 if (!toolbarContext.subscribeVisibility)

package/dist/registrations/dictionary-tools.js

@@ -223,13 +223,13 @@ export const spanishDictionaryToolRegistration = createDictionaryToolRegistratio
     toolId: "dictionarySpanish",
     name: "Spanish Dictionary",
     description: "Look up word definitions in Spanish",
-    pnpSupportIds: ["spanishDictionary", "spanishGlossary"],
+    pnpSupportIds: ["spanishDictionary"],
     lookupLanguage: "es",
 });
 export const spanishPictureDictionaryToolRegistration = createPictureDictionaryToolRegistration({
     toolId: "pictureDictionarySpanish",
     name: "Spanish Picture Dictionary",
     description: "Look up pictures for words in Spanish",
-    pnpSupportIds: ["spanishPictureDictionary", "spanishIllustratedGlossary"],
+    pnpSupportIds: ["spanishPictureDictionary"],
     lookupLanguage: "es",
 });

package/dist/registrations/interaction-tools.js

@@ -33,8 +33,7 @@ export const answerEliminatorToolRegistration = {
     pnpSupportIds: [
         "answerMasking", // QTI 3.0 standard (assessment.answerMasking)
         "answerEliminator", // QTI 3.0 standard (assessment.answerEliminator)
-        "strikethrough", // Common variant
-        "choiceMasking", // Common variant
+        "strikethrough", // QTI 3.0 standard (assessment.strikethrough)
     ],
     /**
      * Pass 2: Answer eliminator is relevant only for choice-based questions
@@ -42,6 +41,17 @@ export const answerEliminatorToolRegistration = {
     isVisibleInContext(context) {
         return hasChoiceInteraction(context);
     },
+    /**
+     * Pass 3: the same question, asked as a capability. Elimination controls are
+     * rendered per choice, so an item with no choice interaction gives this tool
+     * nothing to act on — `placement-ordering`, `categorize` and
+     * `drag-in-the-blank` included, whose `choices` hold draggables the
+     * eliminator cannot reach. Answering the relevance gate alone left the button
+     * on those items for any learner whose profile grants answer masking.
+     */
+    isApplicableToContent(context) {
+        return hasChoiceInteraction(context);
+    },
     renderToolbar(context, toolbarContext) {
         const visibility = createScopedVisibilityBinding(this.toolId, toolbarContext);
         const componentOverrides = toolbarContext.componentOverrides ?? {};

package/dist/registrations/measurement-tools.js

@@ -30,7 +30,6 @@ export const rulerToolRegistration = {
     // Maps to QTI 3.0 standard feature: ruler
     pnpSupportIds: [
         "ruler", // QTI 3.0 standard (assessment.ruler)
-        "measurement", // Common variant
     ],
     /**
      * Pass 2: Ruler is relevant when math content is present
@@ -64,7 +63,6 @@ export const protractorToolRegistration = {
     // Maps to QTI 3.0 standard feature: protractor
     pnpSupportIds: [
         "protractor", // QTI 3.0 standard (assessment.protractor)
-        "angleMeasurement", // Common variant
     ],
     /**
      * Pass 2: Protractor is relevant when math content is present

package/dist/registrations/overlay-toolbar-render.js

@@ -46,6 +46,13 @@ export function renderOverlayToolbar(registration, context, toolbarContext, opti
             {
                 element: overlay,
                 mount: "after-buttons",
+                // A frameless overlay draws its own surface over the content and
+                // positions itself, so the content's box has to be its containing
+                // block. A shelled tool is `position: fixed` and clamps to the
+                // viewport, so it stays where the toolbar puts it.
+                ...(options.surface === "frameless"
+                    ? { container: "content-boundary" }
+                    : {}),
                 ...(options.shell
                     ? {
                         shell: {

package/dist/registrations/subject-specific-tools.js

@@ -34,8 +34,6 @@ export const graphToolRegistration = {
     pnpSupportIds: [
         "graph", // QTI 3.0 standard (assessment.graph)
         "graphingCalculator", // QTI 3.0 standard (assessment.graphingCalculator)
-        "coordinatePlane", // Common variant
-        "graphingTool", // Common variant
     ],
     /**
      * Pass 2: Graph is relevant when math content is present
@@ -74,8 +72,6 @@ export const periodicTableToolRegistration = {
     // Maps to QTI 3.0 standard feature: periodicTable
     pnpSupportIds: [
         "periodicTable", // QTI 3.0 standard (assessment.periodicTable)
-        "chemistryReference", // Common variant
-        "elementReference", // Common variant
     ],
     /**
      * Pass 2: Periodic table is relevant when science content is present

package/dist/registrations/tts.js

@@ -86,8 +86,6 @@ export const ttsToolRegistration = {
     pnpSupportIds: [
         "textToSpeech", // QTI 3.0 standard (auditory.textToSpeech)
         "readAloud", // QTI 3.0 standard (auditory.readAloud)
-        "tts", // Common abbreviation
-        "speechOutput", // Common variant
     ],
     /**
      * Pass 2: Determine if TTS is relevant in this context

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@pie-players/pie-default-tool-loaders",
-	"version": "0.3.68",
+	"version": "0.3.70",
 	"type": "module",
 	"description": "Composition layer for the packaged PIE assessment tools: registrations, tag map, placement presets, universal supports and lazy module loaders",
 	"repository": {
@@ -33,23 +33,26 @@
 		"test": "bun test"
 	},
 	"dependencies": {
-		"@pie-players/pie-assessment-toolkit": "0.3.68",
-		"@pie-players/pie-players-shared": "0.3.68",
-		"@pie-players/pie-tool-annotation-toolbar": "0.3.68",
-		"@pie-players/pie-tool-answer-eliminator": "0.3.68",
-		"@pie-players/pie-tool-calculator-desmos": "0.3.68",
-		"@pie-players/pie-tool-dictionary": "0.3.68",
-		"@pie-players/pie-tool-graph": "0.3.68",
-		"@pie-players/pie-tool-line-reader": "0.3.68",
-		"@pie-players/pie-tool-periodic-table": "0.3.68",
-		"@pie-players/pie-tool-picture-dictionary": "0.3.68",
-		"@pie-players/pie-tool-protractor": "0.3.68",
-		"@pie-players/pie-tool-ruler": "0.3.68",
-		"@pie-players/pie-tool-theme": "0.3.68",
-		"@pie-players/pie-tool-tts-inline": "0.3.68"
+		"@pie-players/pie-assessment-toolkit": "0.3.70",
+		"@pie-players/pie-players-shared": "0.3.70",
+		"@pie-players/pie-tool-annotation-toolbar": "0.3.70",
+		"@pie-players/pie-tool-answer-eliminator": "0.3.70",
+		"@pie-players/pie-tool-calculator-desmos": "0.3.70",
+		"@pie-players/pie-tool-calculator-cortex": "0.3.70",
+		"@pie-players/pie-tool-calculator-geogebra": "0.3.70",
+		"@pie-players/pie-tool-calculator-shared": "0.3.70",
+		"@pie-players/pie-tool-dictionary": "0.3.70",
+		"@pie-players/pie-tool-graph": "0.3.70",
+		"@pie-players/pie-tool-line-reader": "0.3.70",
+		"@pie-players/pie-tool-periodic-table": "0.3.70",
+		"@pie-players/pie-tool-picture-dictionary": "0.3.70",
+		"@pie-players/pie-tool-protractor": "0.3.70",
+		"@pie-players/pie-tool-ruler": "0.3.70",
+		"@pie-players/pie-tool-theme": "0.3.70",
+		"@pie-players/pie-tool-tts-inline": "0.3.70"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^2.5.8",
+		"@biomejs/biome": "^2.5.11",
 		"typescript": "^5.9.3"
 	},
 	"homepage": "https://github.com/pie-framework/pie-players/tree/master/packages/default-tool-loaders#readme",