tessera-learn 0.0.9 → 0.0.11

package/src/runtime/adapters/cmi5.ts

@@ -5,7 +5,7 @@ import {
   formatCorrectPattern,
   XAPI_INTERACTION_FORMAT,
 } from '../interaction-format.js';
-import { formatISO8601Duration } from './retry.js';
+import { formatISO8601Duration } from './format.js';
 import { XAPIPublisher } from '../xapi/publisher.js';
 import { X_API_VERSION } from '../xapi/version.js';
 import type { XAPIAgent } from '../xapi/types.js';
@@ -41,21 +41,6 @@ const CMI5_CATEGORY_CMI5 =
 const CMI5_CATEGORY_MOVEON =
   'https://w3id.org/xapi/cmi5/context/categories/moveon';
 
-export type CMI5MoveOn =
-  | 'Passed'
-  | 'Completed'
-  | 'CompletedAndPassed'
-  | 'CompletedOrPassed'
-  | 'NotApplicable';
-
-const VALID_MOVE_ON: ReadonlySet<CMI5MoveOn> = new Set([
-  'Passed',
-  'Completed',
-  'CompletedAndPassed',
-  'CompletedOrPassed',
-  'NotApplicable',
-]);
-
 /** cmi5 §10.2.2 — launch mode dictates which Defined Statements the AU may emit. */
 export type CMI5LaunchMode = 'Normal' | 'Browse' | 'Review';
 const VALID_LAUNCH_MODE: ReadonlySet<CMI5LaunchMode> = new Set([
@@ -87,21 +72,12 @@ interface CMI5LaunchData {
   };
   launchMode?: CMI5LaunchMode;
   launchMethod?: 'OwnWindow' | 'AnyWindow';
-  launchParameters?: string;
   returnURL?: string;
   masteryScore?: number;
-  moveOn?: CMI5MoveOn;
   entitlementKey?: Record<string, string>;
   [k: string]: unknown;
 }
 
-/** cmi5 §11.1 Learner Preferences Agent Profile document. */
-interface CMI5LearnerPreferences {
-  languagePreference?: string;
-  audioPreference?: 'on' | 'off';
-  [k: string]: unknown;
-}
-
 /** `.then` handler that warns on LRS non-2xx. Publisher resolves successfully on 4xx/5xx (failure is in the outcome), so `.catch` alone misses them. */
 function warnOnLRSReject(
   verbName: string
@@ -148,10 +124,8 @@ export class CMI5Adapter implements PersistenceAdapter {
   #terminated = false;
 
   // cmi5 §8 launch params. masteryScore (when present) overrides the
-  // course's manifest passingScore for this launch — the LMS is the
-  // authority. moveOn drives the optional Satisfied statement (§9.5.3).
+  // course's manifest passingScore for this launch — the LMS is the authority.
   #masteryScore: number | null = null;
-  #moveOn: CMI5MoveOn = 'NotApplicable';
 
   // cmi5 §10 LMS.LaunchData. `contextTemplate` is the AU's base context
   // (§9.6.2) — Publisher Activity and session id live there, and strict
@@ -161,10 +135,6 @@ export class CMI5Adapter implements PersistenceAdapter {
   #launchMode: CMI5LaunchMode = 'Normal';
   /** cmi5 §10.2.6 — AU redirects here on `exit()`. */
   #returnURL: string | undefined;
-  /** cmi5 §10.2.3 — opaque per-launch content config string. */
-  #launchParameters: string | undefined;
-  /** cmi5 §11.1 Learner Preferences. */
-  #learnerPreferences: CMI5LearnerPreferences | null = null;
 
   async init(): Promise<void> {
     const params = new URLSearchParams(window.location.search);
@@ -189,17 +159,6 @@ export class CMI5Adapter implements PersistenceAdapter {
       }
     }
 
-    const rawMoveOn = params.get('moveOn');
-    if (rawMoveOn !== null && rawMoveOn !== '') {
-      if (VALID_MOVE_ON.has(rawMoveOn as CMI5MoveOn)) {
-        this.#moveOn = rawMoveOn as CMI5MoveOn;
-      } else {
-        console.warn(
-          `Tessera cmi5: launch parameter 'moveOn' is not a recognized value (got "${rawMoveOn}"); defaulting to NotApplicable.`
-        );
-      }
-    }
-
     // Malformed actor JSON is a launch-time failure: an empty {} actor
     // would fail every Identified-Agent check downstream and produce
     // confusing 400s on every send. Fail loud here instead.
@@ -280,9 +239,9 @@ export class CMI5Adapter implements PersistenceAdapter {
 
     // cmi5 §10 — LaunchData is the only spec-defined channel for the
     // session id (§9.6.3.1) and Publisher Activity (§9.6.2.3) the LRS
-    // validates against, plus launchMode/returnURL/launchParameters/
-    // masteryScore/moveOn (§10.2). LaunchData values override the URL
-    // masteryScore parsed earlier (§10.2.4 makes it authoritative).
+    // validates against, plus launchMode/returnURL/masteryScore (§10.2).
+    // LaunchData values override the URL masteryScore parsed earlier
+    // (§10.2.4 makes it authoritative).
     this.#launchData = await this.#fetchLaunchData();
     const tmpl = this.#launchData?.contextTemplate ?? {};
     let sessionId: string | undefined;
@@ -303,9 +262,6 @@ export class CMI5Adapter implements PersistenceAdapter {
       ) {
         this.#returnURL = this.#launchData.returnURL;
       }
-      if (typeof this.#launchData.launchParameters === 'string') {
-        this.#launchParameters = this.#launchData.launchParameters;
-      }
       if (
         typeof this.#launchData.masteryScore === 'number' &&
         Number.isFinite(this.#launchData.masteryScore) &&
@@ -314,18 +270,12 @@ export class CMI5Adapter implements PersistenceAdapter {
       ) {
         this.#masteryScore = this.#launchData.masteryScore;
       }
-      if (
-        typeof this.#launchData.moveOn === 'string' &&
-        VALID_MOVE_ON.has(this.#launchData.moveOn)
-      ) {
-        this.#moveOn = this.#launchData.moveOn;
-      }
     }
 
     // cmi5 §11 — fetch the Agent Profile BEFORE Initialized. Strict
     // LRSes track the GET and reject Initialized otherwise. A 404 here
     // is legitimate (no prefs set); the GET itself is what's required.
-    this.#learnerPreferences = await this.#fetchLearnerPreferences();
+    await this.#fetchLearnerPreferences();
 
     this.#publisher = new XAPIPublisher({
       endpoint: this.#endpoint,
@@ -391,31 +341,11 @@ export class CMI5Adapter implements PersistenceAdapter {
     return this.#masteryScore;
   }
 
-  /** LMS-supplied moveOn criterion (defaults to "NotApplicable"). */
-  getMoveOn(): CMI5MoveOn {
-    return this.#moveOn;
-  }
-
   /** cmi5 §10.2.2 — "Normal" is the only mode where progress-bearing Defined Statements are permitted. */
   getLaunchMode(): CMI5LaunchMode {
     return this.#launchMode;
   }
 
-  /** cmi5 §10.2.6 — URL the AU navigates to on `exit()`. Returns undefined when the LMS didn't supply one. */
-  getReturnURL(): string | undefined {
-    return this.#returnURL;
-  }
-
-  /** cmi5 §10.2.3 — opaque per-launch content-config string. */
-  getLaunchParameters(): string | undefined {
-    return this.#launchParameters;
-  }
-
-  /** cmi5 §11.1 Learner Preferences. Null when the LMS didn't publish one. */
-  getLearnerPreferences(): CMI5LearnerPreferences | null {
-    return this.#learnerPreferences;
-  }
-
   getState(): SavedState | null {
     return this.#state;
   }
@@ -725,15 +655,16 @@ export class CMI5Adapter implements PersistenceAdapter {
     return null;
   }
 
-  /** GET cmi5 §11.1 Learner Preferences. 404 is normal (no prefs set). */
-  async #fetchLearnerPreferences(): Promise<CMI5LearnerPreferences | null> {
+  /**
+   * GET cmi5 §11.1 Learner Preferences. The GET itself is the §11
+   * obligation (it must precede Initialized); the response body is not
+   * consumed. 404 is normal (no prefs set).
+   */
+  async #fetchLearnerPreferences(): Promise<void> {
     try {
       const url = this.#buildAgentProfileUrl(CMI5_LEARNER_PREFS_PROFILE_ID);
       const resp = await this.#xapiFetch(url, { method: 'GET' });
-      if (resp.ok) {
-        return (await resp.json()) as CMI5LearnerPreferences;
-      }
-      if (resp.status !== 404) {
+      if (!resp.ok && resp.status !== 404) {
         console.warn(
           `Tessera cmi5: Agent Profile GET (cmi5LearnerPreferences) returned ${resp.status}.`
         );
@@ -743,7 +674,6 @@ export class CMI5Adapter implements PersistenceAdapter {
         `Tessera cmi5: Agent Profile GET (cmi5LearnerPreferences) failed (${err instanceof Error ? err.message : String(err)}).`
       );
     }
-    return null;
   }
 
   async #xapiFetch(url: string, options: RequestInit = {}): Promise<Response> {

package/src/runtime/adapters/format.ts

@@ -0,0 +1,67 @@
+/**
+ * Time / number formatters for SCORM & cmi5 data-model writes.
+ */
+
+/**
+ * Format integer seconds as SCORM 1.2 `CMITimespan` (HHHH:MM:SS.SS).
+ *
+ * `DurationTracker.sessionSeconds` always feeds integer seconds via
+ * `Math.floor`, so the centisecond field is always `.00`. The format
+ * still includes it because `CMITimespan` is defined that way and some
+ * older LMS importers reject the bare HHHH:MM:SS form.
+ */
+export function formatHHMMSS(totalSeconds: number): string {
+  const whole = Math.floor(totalSeconds);
+  const hours = Math.floor(whole / 3600);
+  const minutes = Math.floor((whole % 3600) / 60);
+  const seconds = whole % 60;
+  const hh = String(hours).padStart(4, '0');
+  const mm = String(minutes).padStart(2, '0');
+  const ss = String(seconds).padStart(2, '0');
+  return `${hh}:${mm}:${ss}.00`;
+}
+
+/**
+ * SCORM 2004 4E §4.2/§4.3 define CMIDecimal-like elements as real(10,7) —
+ * `String(1/3)` exceeds that and trips SCORM Cloud with error 406. Rounds,
+ * then trims trailing zeros (no padded "0.8500000" forms).
+ */
+export function formatReal107(value: number): string {
+  if (!Number.isFinite(value)) return '0';
+  const rounded = Math.round(value * 1e7) / 1e7;
+  return rounded
+    .toFixed(7)
+    .replace(/(\.\d*?)0+$/, '$1')
+    .replace(/\.$/, '');
+}
+
+/**
+ * SCORM 2004 4E §3.3.10.1 references ISO 8601 §5.3.3 — local date+time, no
+ * zone designator. Strict validators reject `Z`, `±hh:mm`, and fractional
+ * seconds with error 406. UTC components are used so writes don't drift
+ * across local-TZ flips even though the format is zone-free.
+ */
+export function formatISO8601Timestamp(date: Date): string {
+  const yyyy = date.getUTCFullYear();
+  const mm = String(date.getUTCMonth() + 1).padStart(2, '0');
+  const dd = String(date.getUTCDate()).padStart(2, '0');
+  const hh = String(date.getUTCHours()).padStart(2, '0');
+  const mi = String(date.getUTCMinutes()).padStart(2, '0');
+  const ss = String(date.getUTCSeconds()).padStart(2, '0');
+  return `${yyyy}-${mm}-${dd}T${hh}:${mi}:${ss}`;
+}
+
+/**
+ * Format seconds as ISO 8601 duration: PT1H30M45S
+ */
+export function formatISO8601Duration(totalSeconds: number): string {
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+  const seconds = totalSeconds % 60;
+
+  let result = 'PT';
+  if (hours > 0) result += `${hours}H`;
+  if (minutes > 0) result += `${minutes}M`;
+  if (seconds > 0 || result === 'PT') result += `${seconds}S`;
+  return result;
+}

package/src/runtime/adapters/index.ts

@@ -60,40 +60,39 @@ export interface CreateAdapterOptions {
  * In dev mode, missing APIs warn and fall back to `WebAdapter` so authors
  * can still iterate locally.
  */
+type LMSStandard = 'scorm12' | 'scorm2004' | 'cmi5';
+
+/** Per-standard LMS detection. `detect` returns an adapter when the LMS runtime is reachable, else null. */
+const LMS_ADAPTERS: Record<LMSStandard, { detect: () => PersistenceAdapter | null; label: string }> = {
+  scorm12: {
+    detect: () => { const api = findSCORM12API(); return api ? new SCORM12Adapter(api) : null; },
+    label: 'SCORM 1.2 API',
+  },
+  scorm2004: {
+    detect: () => { const api = findSCORM2004API(); return api ? new SCORM2004Adapter(api) : null; },
+    label: 'SCORM 2004 API',
+  },
+  cmi5: {
+    detect: () => (hasCMI5LaunchParams() ? new CMI5Adapter() : null),
+    label: 'cmi5 launch parameters',
+  },
+};
+
 export function createAdapter(
   config: CourseConfig,
   options: CreateAdapterOptions = {}
 ): PersistenceAdapter {
   const allowFallback =
     options.allowFallback ?? import.meta.env?.DEV === true;
-  switch (config.export?.standard) {
-    case 'scorm12': {
-      const api = findSCORM12API();
-      if (api) return new SCORM12Adapter(api);
-      if (!allowFallback) throw missingApiError('scorm12');
-      console.warn(
-        'Tessera (dev): SCORM 1.2 API not found — falling back to localStorage'
-      );
-      return new WebAdapter(config);
-    }
-    case 'scorm2004': {
-      const api = findSCORM2004API();
-      if (api) return new SCORM2004Adapter(api);
-      if (!allowFallback) throw missingApiError('scorm2004');
-      console.warn(
-        'Tessera (dev): SCORM 2004 API not found — falling back to localStorage'
-      );
-      return new WebAdapter(config);
-    }
-    case 'cmi5': {
-      if (hasCMI5LaunchParams()) return new CMI5Adapter();
-      if (!allowFallback) throw missingApiError('cmi5');
-      console.warn(
-        'Tessera (dev): cmi5 launch parameters not found — falling back to localStorage'
-      );
-      return new WebAdapter(config);
-    }
-    default:
-      return new WebAdapter(config);
+  const standard = config.export?.standard;
+  if (standard === 'scorm12' || standard === 'scorm2004' || standard === 'cmi5') {
+    const entry = LMS_ADAPTERS[standard];
+    const adapter = entry.detect();
+    if (adapter) return adapter;
+    if (!allowFallback) throw missingApiError(standard);
+    console.warn(
+      `Tessera (dev): ${entry.label} not found — falling back to localStorage`
+    );
   }
+  return new WebAdapter(config);
 }

package/src/runtime/adapters/retry.ts

@@ -296,67 +296,3 @@ export function findLMSAPI(propName: string): unknown {
   // Check window.parent chain (iframe launch pattern)
   return scan(window);
 }
-
-/**
- * Format integer seconds as SCORM 1.2 `CMITimespan` (HHHH:MM:SS.SS).
- *
- * `DurationTracker.sessionSeconds` always feeds integer seconds via
- * `Math.floor`, so the centisecond field is always `.00`. The format
- * still includes it because `CMITimespan` is defined that way and some
- * older LMS importers reject the bare HHHH:MM:SS form.
- */
-export function formatHHMMSS(totalSeconds: number): string {
-  const whole = Math.floor(totalSeconds);
-  const hours = Math.floor(whole / 3600);
-  const minutes = Math.floor((whole % 3600) / 60);
-  const seconds = whole % 60;
-  const hh = String(hours).padStart(4, '0');
-  const mm = String(minutes).padStart(2, '0');
-  const ss = String(seconds).padStart(2, '0');
-  return `${hh}:${mm}:${ss}.00`;
-}
-
-/**
- * SCORM 2004 4E §4.2/§4.3 define CMIDecimal-like elements as real(10,7) —
- * `String(1/3)` exceeds that and trips SCORM Cloud with error 406. Rounds,
- * then trims trailing zeros (no padded "0.8500000" forms).
- */
-export function formatReal107(value: number): string {
-  if (!Number.isFinite(value)) return '0';
-  const rounded = Math.round(value * 1e7) / 1e7;
-  return rounded
-    .toFixed(7)
-    .replace(/(\.\d*?)0+$/, '$1')
-    .replace(/\.$/, '');
-}
-
-/**
- * SCORM 2004 4E §3.3.10.1 references ISO 8601 §5.3.3 — local date+time, no
- * zone designator. Strict validators reject `Z`, `±hh:mm`, and fractional
- * seconds with error 406. UTC components are used so writes don't drift
- * across local-TZ flips even though the format is zone-free.
- */
-export function formatISO8601Timestamp(date: Date): string {
-  const yyyy = date.getUTCFullYear();
-  const mm = String(date.getUTCMonth() + 1).padStart(2, '0');
-  const dd = String(date.getUTCDate()).padStart(2, '0');
-  const hh = String(date.getUTCHours()).padStart(2, '0');
-  const mi = String(date.getUTCMinutes()).padStart(2, '0');
-  const ss = String(date.getUTCSeconds()).padStart(2, '0');
-  return `${yyyy}-${mm}-${dd}T${hh}:${mi}:${ss}`;
-}
-
-/**
- * Format seconds as ISO 8601 duration: PT1H30M45S
- */
-export function formatISO8601Duration(totalSeconds: number): string {
-  const hours = Math.floor(totalSeconds / 3600);
-  const minutes = Math.floor((totalSeconds % 3600) / 60);
-  const seconds = totalSeconds % 60;
-
-  let result = 'PT';
-  if (hours > 0) result += `${hours}H`;
-  if (minutes > 0) result += `${minutes}M`;
-  if (seconds > 0 || result === 'PT') result += `${seconds}S`;
-  return result;
-}

package/src/runtime/adapters/scorm12.ts

@@ -4,7 +4,7 @@ import {
 } from '../interaction-format.js';
 import type { SavedState } from '../persistence.js';
 import { BaseScormAdapter, type ScormDialect } from './scorm-base.js';
-import { formatHHMMSS, formatReal107 } from './retry.js';
+import { formatHHMMSS, formatReal107 } from './format.js';
 
 /**
  * SCORM 1.2 API interface.

package/src/runtime/adapters/scorm2004.ts

@@ -5,7 +5,7 @@ import {
   formatISO8601Duration,
   formatISO8601Timestamp,
   formatReal107,
-} from './retry.js';
+} from './format.js';
 
 export interface SCORM2004API {
   Initialize(param: string): string;
@@ -48,13 +48,11 @@ export type SCORM2004Mode = 'browse' | 'normal' | 'review';
 /**
  * Per §4.2.1.5, the SCO MUST NOT alter the learner record in `browse` or
  * `review` mode — every write below is gated on `#mode === 'normal'`.
- * `#masteryScore` (§4.2.4.3) and `#completionThreshold` (§4.2.4.4) are
- * LMS-supplied thresholds in [0,1].
+ * `#masteryScore` (§4.2.4.3) is the LMS-supplied pass threshold in [0,1].
  */
 export class SCORM2004Adapter extends BaseScormAdapter<SCORM2004API> {
   #mode: SCORM2004Mode = 'normal';
   #masteryScore: number | null = null;
-  #completionThreshold: number | null = null;
 
   constructor(api: SCORM2004API) {
     super(api, SCORM2004_DIALECT);
@@ -64,9 +62,6 @@ export class SCORM2004Adapter extends BaseScormAdapter<SCORM2004API> {
     await super.init();
     this.#mode = this.#readMode();
     this.#masteryScore = this.#readScaledThreshold('cmi.scaled_passing_score');
-    this.#completionThreshold = this.#readScaledThreshold(
-      'cmi.completion_threshold'
-    );
   }
 
   getLaunchMode(): SCORM2004Mode {
@@ -78,8 +73,8 @@ export class SCORM2004Adapter extends BaseScormAdapter<SCORM2004API> {
     return this.#masteryScore;
   }
 
-  getCompletionThreshold(): number | null {
-    return this.#completionThreshold;
+  get #canWrite(): boolean {
+    return this.#mode === 'normal';
   }
 
   #readMode(): SCORM2004Mode {
@@ -104,7 +99,7 @@ export class SCORM2004Adapter extends BaseScormAdapter<SCORM2004API> {
   }
 
   saveState(state: SavedState): void {
-    if (this.#mode !== 'normal') return;
+    if (!this.#canWrite) return;
     super.saveState(state);
     // §4.2.1.4 — bookmark for LMS "Resume from page N" affordances.
     this.queue.enqueue(
@@ -114,7 +109,7 @@ export class SCORM2004Adapter extends BaseScormAdapter<SCORM2004API> {
   }
 
   setDuration(seconds: number): void {
-    if (this.#mode !== 'normal') return;
+    if (!this.#canWrite) return;
     super.setDuration(seconds);
   }
 
@@ -123,12 +118,12 @@ export class SCORM2004Adapter extends BaseScormAdapter<SCORM2004API> {
     interaction: import('../interaction.js').Interaction,
     correct: boolean | null
   ): void {
-    if (this.#mode !== 'normal') return;
+    if (!this.#canWrite) return;
     super.reportInteraction(questionId, interaction, correct);
   }
 
   setScore(score: number): void {
-    if (this.#mode !== 'normal') return;
+    if (!this.#canWrite) return;
     const raw = formatReal107(score);
     // §4.2.4.3.5 — score.scaled is bounded to [-1, 1].
     const scaled = formatReal107(Math.max(0, Math.min(1, score / 100)));
@@ -151,7 +146,7 @@ export class SCORM2004Adapter extends BaseScormAdapter<SCORM2004API> {
   }
 
   setCompletionStatus(status: 'incomplete' | 'complete'): void {
-    if (this.#mode !== 'normal') return;
+    if (!this.#canWrite) return;
     const value = status === 'complete' ? 'completed' : 'incomplete';
     this.queue.enqueue(
       () => this.api.SetValue('cmi.completion_status', value),
@@ -167,7 +162,7 @@ export class SCORM2004Adapter extends BaseScormAdapter<SCORM2004API> {
   }
 
   setSuccessStatus(status: 'passed' | 'failed' | 'unknown'): void {
-    if (this.#mode !== 'normal') return;
+    if (!this.#canWrite) return;
     // Setting "unknown" explicitly prevents SCORM Cloud from rolling up
     // a null status to "passed".
     this.queue.enqueue(
@@ -177,7 +172,7 @@ export class SCORM2004Adapter extends BaseScormAdapter<SCORM2004API> {
   }
 
   setExit(mode: 'suspend' | 'normal'): void {
-    if (this.#mode !== 'normal') return;
+    if (!this.#canWrite) return;
     this.queue.enqueue(
       () => this.api.SetValue('cmi.exit', mode),
       'cmi.exit'

package/src/runtime/hooks.svelte.ts

@@ -1,4 +1,5 @@
 import { getContext, setContext, onDestroy, onMount, tick } from 'svelte';
+import { SvelteSet } from 'svelte/reactivity';
 import type { Interaction } from './interaction.js';
 import { isCorrect as isCorrectInteraction } from './interaction.js';
 import {
@@ -11,7 +12,6 @@ import {
 import {
   resolveFeedbackMode,
   resolveRetryStrategy,
-  type QuizPolicyConfig,
   type QuizQuestionResult,
 } from './quiz-policy.js';
 
@@ -185,8 +185,8 @@ export function useQuestion(opts: UseQuestionOptions): UseQuestionHandle {
     if (opts.graded && navCtx) {
       const pageIndex = navCtx.nav.currentPageIndex;
       navCtx.progress.markStandaloneQuestion(pageIndex, opts.id, score, true);
-      navCtx.progress.recalculateCompletion(navCtx.manifest, navCtx.config);
-      navCtx.progress.recalculateSuccess(navCtx.manifest, navCtx.config);
+      navCtx.progress.recalculateCompletion(navCtx.manifest.totalPages, navCtx.config);
+      navCtx.progress.recalculateSuccess(navCtx.config);
     } else if (navCtx) {
       const pageIndex = navCtx.nav.currentPageIndex;
       navCtx.progress.markStandaloneQuestion(pageIndex, opts.id, score, false);
@@ -291,7 +291,7 @@ export function useCompletion(): {
         return;
       }
       progress.markCompleteManually();
-      progress.recalculateSuccess(manifest, config);
+      progress.recalculateSuccess(config);
     },
     get completionStatus() {
       return progress.completionStatus;
@@ -410,9 +410,8 @@ export function useQuiz(opts: { element: () => HTMLElement | null }): UseQuizHan
   }
 
   const maxAttempts = quizConfig.maxAttempts ?? Infinity;
-  const policyCfg = quizConfig as QuizPolicyConfig;
-  const feedbackPredicate = resolveFeedbackMode(policyCfg);
-  const retryPredicate = resolveRetryStrategy(policyCfg);
+  const feedbackPredicate = resolveFeedbackMode(quizConfig);
+  const retryPredicate = resolveRetryStrategy(quizConfig);
 
   let internalQuestions = $state<InternalQuestion[]>([]);
   const answers = new Map<number, unknown>();
@@ -422,8 +421,8 @@ export function useQuiz(opts: { element: () => HTMLElement | null }): UseQuizHan
   let reviewing = $state(false);
   let score = $state(0);
   let attemptCount = $state(0);
-  let feedbackShown = $state(new Set<number>());
-  let lockedCorrect = $state(new Set<number>());
+  const feedbackShown = new SvelteSet<number>();
+  const lockedCorrect = new SvelteSet<number>();
   let submitCalled = false;
 
   const seenIds = new Set<string>();
@@ -477,7 +476,7 @@ export function useQuiz(opts: { element: () => HTMLElement | null }): UseQuizHan
   }
 
   function feedbackVisibleInternal(index: number): boolean {
-    if (policyCfg.feedbackMode === 'never') return false;
+    if (quizConfig.feedbackMode === 'never') return false;
     return feedbackPredicate({
       questionIndex: index,
       submitted,
@@ -489,10 +488,8 @@ export function useQuiz(opts: { element: () => HTMLElement | null }): UseQuizHan
   }
 
   function revealFeedbackInternal(index: number): void {
-    if (policyCfg.feedbackMode === 'never') return;
-    const next = new Set(feedbackShown);
-    next.add(index);
-    feedbackShown = next;
+    if (quizConfig.feedbackMode === 'never') return;
+    feedbackShown.add(index);
   }
 
   function isLockedCorrectInternal(index: number): boolean {
@@ -618,7 +615,8 @@ export function useQuiz(opts: { element: () => HTMLElement | null }): UseQuizHan
     for (const i of newLocked) {
       if (answers.has(i)) preserved.set(i, answers.get(i));
     }
-    lockedCorrect = newLocked;
+    lockedCorrect.clear();
+    for (const i of newLocked) lockedCorrect.add(i);
     answers.clear();
     reportedAnswers.clear();
     for (const [i, a] of preserved) answers.set(i, a);
@@ -626,7 +624,7 @@ export function useQuiz(opts: { element: () => HTMLElement | null }): UseQuizHan
       if (!newLocked.has(i) && internalQuestions[i].reset) internalQuestions[i].reset!();
     }
     answersVersion++;
-    feedbackShown = new Set();
+    feedbackShown.clear();
     submitted = false;
     reviewing = false;
     score = 0;