@lessonkit/react 1.2.0 → 1.3.0

package/dist/index.cjs

@@ -57,6 +57,8 @@ __export(index_exports, {
   Quiz: () => Quiz,
   Reflection: () => Reflection,
   Scenario: () => Scenario,
+  Slide: () => Slide,
+  SlideDeck: () => SlideDeck,
   Text: () => Text,
   ThemeProvider: () => ThemeProvider,
   TrueFalse: () => TrueFalse,
@@ -64,13 +66,13 @@ __export(index_exports, {
   blockCatalogV3Version: () => blockCatalogV3Version,
   blockCatalogVersion: () => blockCatalogVersion,
   buildBlockCatalog: () => buildBlockCatalog,
-  buildTelemetryEvent: () => import_core17.buildTelemetryEvent,
-  createLessonkitRuntime: () => import_core17.createLessonkitRuntime,
-  createPluginRegistry: () => import_core17.createPluginRegistry,
-  createTelemetryPipeline: () => import_core17.createTelemetryPipeline,
-  defineAssessmentPlugin: () => import_core17.defineAssessmentPlugin,
-  defineLifecyclePlugin: () => import_core17.defineLifecyclePlugin,
-  defineTelemetryPlugin: () => import_core17.defineTelemetryPlugin,
+  buildTelemetryEvent: () => import_core19.buildTelemetryEvent,
+  createLessonkitRuntime: () => import_core19.createLessonkitRuntime,
+  createPluginRegistry: () => import_core19.createPluginRegistry,
+  createTelemetryPipeline: () => import_core19.createTelemetryPipeline,
+  defineAssessmentPlugin: () => import_core19.defineAssessmentPlugin,
+  defineLifecyclePlugin: () => import_core19.defineLifecyclePlugin,
+  defineTelemetryPlugin: () => import_core19.defineTelemetryPlugin,
   getBlockCatalogEntry: () => getBlockCatalogEntry,
   resetAssessmentWarningsForTests: () => resetAssessmentWarningsForTests,
   resetQuizWarningsForTests: () => resetQuizWarningsForTests,
@@ -85,7 +87,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/components.tsx
-var import_react11 = require("react");
+var import_react13 = require("react");
 var import_accessibility2 = require("@lessonkit/accessibility");
 
 // src/context.tsx
@@ -216,6 +218,9 @@ function emitTelemetry(tracking, xapi, event, opts) {
 // src/runtime/ports.ts
 var import_core3 = require("@lessonkit/core");
 
+// src/provider/useLessonkitProviderRuntime.ts
+var import_core9 = require("@lessonkit/core");
+
 // src/runtime/progress.ts
 var import_core4 = require("@lessonkit/core");
 
@@ -348,9 +353,10 @@ async function emitCourseStartedToTracking(tracking, storage, sessionId, courseI
   try {
     if (shouldCommit && !shouldCommit()) return false;
     tracking.track(event);
-    await tracking.flush?.();
-    if (shouldCommit && !shouldCommit()) return false;
     (0, import_core5.markCourseStartedEmittedToTracking)(storage, sessionId, courseId);
+    const delivered = await tracking.flush?.();
+    if (delivered === false) return false;
+    if (shouldCommit && !shouldCommit()) return false;
     return true;
   } catch {
     return false;
@@ -477,13 +483,14 @@ function assertTrackingSinkConfig(tracking) {
 
 // src/runtime/telemetry.ts
 var import_core7 = require("@lessonkit/core");
-function createTrackingClientFromConfig(config) {
+function createTrackingClientFromConfig(config, observability) {
   if (config.tracking?.enabled === false) return (0, import_core7.createTrackingClient)();
   if (config.tracking?.createClient) return config.tracking.createClient();
   return (0, import_core7.createTrackingClient)({
     sink: config.tracking?.sink,
     batchSink: config.tracking?.batchSink,
-    batch: config.tracking?.batch
+    batch: config.tracking?.batch,
+    onBufferDrop: observability?.onTelemetryBufferDrop
   });
 }
 async function disposeTrackingClient(client) {
@@ -565,7 +572,8 @@ function useLessonkitProviderRuntime(config) {
         courseId: normalizedCourseId,
         runtimeVersion: "v2",
         session: normalizedConfig.session,
-        plugins: pluginHostRef.current ?? normalizedConfig.plugins
+        plugins: pluginHostRef.current ?? normalizedConfig.plugins,
+        deferPluginSetup: true
       });
       progressRef.current = headlessRef.current.progress;
     } else {
@@ -580,7 +588,8 @@ function useLessonkitProviderRuntime(config) {
       courseId: normalizedCourseId,
       runtimeVersion: "v2",
       session: normalizedConfig.session,
-      plugins: pluginHostRef.current ?? normalizedConfig.plugins
+      plugins: pluginHostRef.current ?? normalizedConfig.plugins,
+      deferPluginSetup: true
     });
   }
   if (prevCourseIdForProgressRef.current !== normalizedCourseId) {
@@ -725,9 +734,12 @@ function useLessonkitProviderRuntime(config) {
       }
       return userBatchSink(perEventForBatch);
     } : userBatchSink;
-    const next = createTrackingClientFromConfig({
-      tracking: { ...normalizedConfig.tracking, sink, batchSink }
-    });
+    const next = createTrackingClientFromConfig(
+      {
+        tracking: { ...normalizedConfig.tracking, sink, batchSink }
+      },
+      observabilityRef.current
+    );
     trackingRef.current = next;
     trackingClientForUnmountRef.current = next;
     setTracking(next);
@@ -1045,6 +1057,7 @@ function useLessonkitProviderRuntime(config) {
       config: normalizedConfig,
       tracking,
       xapi,
+      storage: defaultStorage,
       session: { sessionId: sessionIdRef.current, attemptId: attemptIdRef.current, user: userRef.current },
       progress,
       setActiveLesson,
@@ -1142,17 +1155,17 @@ function useEnclosingLessonId() {
 }
 
 // src/runtime/validateComponentId.ts
-var import_core9 = require("@lessonkit/core");
+var import_core10 = require("@lessonkit/core");
 function isDevEnvironment4() {
   const g = globalThis;
   return typeof g.process !== "undefined" && g.process.env?.NODE_ENV !== "production";
 }
 function normalizeComponentId(id, path) {
-  if (path === "courseId") return (0, import_core9.assertValidId)(id, "courseId");
-  if (path === "lessonId") return (0, import_core9.assertValidId)(id, "lessonId");
-  if (path === "checkId") return (0, import_core9.assertValidId)(id, "checkId");
-  if (path === "blockId") return (0, import_core9.assertValidId)(id, "blockId");
-  return (0, import_core9.assertValidId)(id, path);
+  if (path === "courseId") return (0, import_core10.assertValidId)(id, "courseId");
+  if (path === "lessonId") return (0, import_core10.assertValidId)(id, "lessonId");
+  if (path === "checkId") return (0, import_core10.assertValidId)(id, "checkId");
+  if (path === "blockId") return (0, import_core10.assertValidId)(id, "blockId");
+  return (0, import_core10.assertValidId)(id, path);
 }
 
 // src/runtime/lessonMountRegistry.ts
@@ -1180,7 +1193,7 @@ function getLessonMountCount(lessonId) {
 }
 
 // src/components/Quiz.tsx
-var import_react10 = require("react");
+var import_react12 = require("react");
 var import_accessibility = require("@lessonkit/accessibility");
 
 // src/assessment/AssessmentLessonGuard.tsx
@@ -1239,140 +1252,184 @@ function readStringField(state, key) {
   if (typeof value === "string" || value === null) return value;
   return void 0;
 }
+function readNumberField(state, key) {
+  const value = state[key];
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (value === null) return null;
+  return void 0;
+}
 function readBooleanStateField(state, key, apply) {
   const value = state[key];
   if (typeof value === "boolean") apply(value);
 }
 
 // src/assessment/internal/useAssessmentHandleRegistration.ts
-var import_react8 = require("react");
+var import_react10 = require("react");
 
 // src/compound/CompoundProvider.tsx
-var import_react7 = __toESM(require("react"), 1);
-var import_core10 = require("@lessonkit/core");
+var import_react9 = __toESM(require("react"), 1);
+var import_core11 = require("@lessonkit/core");
 
 // src/compound/aggregateScores.ts
-function aggregateAssessmentScores(handles) {
+function aggregateAssessmentScores(handles, opts) {
   let score = 0;
   let maxScore = 0;
   let allAnswered = true;
-  for (const handle of handles) {
+  for (const entry of handles) {
+    const handle = "handle" in entry ? entry.handle : entry;
+    const pageIndex = "handle" in entry ? entry.pageIndex : void 0;
     score += handle.getScore();
     maxScore += handle.getMaxScore();
-    if (!handle.getAnswerGiven()) allAnswered = false;
+    const countsForAnswerGiven = opts?.answerPageIndex === void 0 || pageIndex === void 0 || pageIndex === opts.answerPageIndex;
+    if (countsForAnswerGiven && !handle.getAnswerGiven()) allAnswered = false;
   }
   return { score, maxScore, allAnswered };
 }
 
-// src/compound/resumeChildHandles.ts
-function resumeChildHandles(handles, childStates, opts) {
-  if (opts?.waitForHandles && handles.size === 0 && Object.keys(childStates).length > 0) {
-    return false;
-  }
-  for (const [checkId, handle] of handles) {
-    const child = childStates[checkId];
-    if (child && handle.resume) handle.resume(child);
-  }
-  return true;
+// src/compound/CompoundHydrationBridge.tsx
+var import_react7 = require("react");
+var import_jsx_runtime3 = require("react/jsx-runtime");
+var CompoundHydrationBridgeContext = (0, import_react7.createContext)(
+  null
+);
+function CompoundHydrationBridgeProvider({ children }) {
+  const bridgeRef = (0, import_react7.useRef)(null);
+  return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(CompoundHydrationBridgeContext.Provider, { value: bridgeRef, children });
+}
+function useCompoundHydrationBridgeRef() {
+  return (0, import_react7.useContext)(CompoundHydrationBridgeContext);
+}
+
+// src/compound/CompoundPageIndexContext.tsx
+var import_react8 = require("react");
+var import_jsx_runtime4 = require("react/jsx-runtime");
+var CompoundPageIndexContext = (0, import_react8.createContext)(void 0);
+function CompoundPageIndexProvider({
+  pageIndex,
+  children
+}) {
+  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(CompoundPageIndexContext.Provider, { value: pageIndex, children });
+}
+function useCompoundPageIndex() {
+  return (0, import_react8.useContext)(CompoundPageIndexContext);
 }
 
 // src/compound/CompoundProvider.tsx
-var import_jsx_runtime3 = require("react/jsx-runtime");
-var CompoundRegistryContext = (0, import_react7.createContext)(null);
-var CompoundHandlesVersionContext = (0, import_react7.createContext)(0);
+var import_jsx_runtime5 = require("react/jsx-runtime");
+var CompoundRegistryContext = (0, import_react9.createContext)(null);
+var CompoundHandlesVersionContext = (0, import_react9.createContext)(0);
 function CompoundProvider({
   children,
   activePageIndex: _activePageIndex,
   onActivePageIndexChange: _onActivePageIndexChange
 }) {
-  const registryRef = (0, import_react7.useRef)(/* @__PURE__ */ new Map());
-  const [handlesVersion, setHandlesVersion] = (0, import_react7.useState)(0);
-  const register = (0, import_react7.useCallback)((checkId, handle) => {
+  const registryRef = (0, import_react9.useRef)(/* @__PURE__ */ new Map());
+  const [handlesVersion, setHandlesVersion] = (0, import_react9.useState)(0);
+  const register = (0, import_react9.useCallback)((checkId, handle, pageIndex) => {
     const prev = registryRef.current.get(checkId);
-    registryRef.current.set(checkId, handle);
-    if (prev !== handle) {
+    if (prev && prev.handle !== handle) {
+      const message = `[lessonkit] duplicate checkId "${checkId}" registered in the same compound container; the previous handle was replaced.`;
+      if (isDevEnvironment4()) {
+        console.error(message);
+      } else {
+        console.warn(message);
+      }
+    }
+    registryRef.current.set(checkId, { handle, pageIndex });
+    if (prev?.handle !== handle || prev?.pageIndex !== pageIndex) {
       setHandlesVersion((v) => v + 1);
     }
     return () => {
-      if (registryRef.current.get(checkId) === handle) {
+      const current = registryRef.current.get(checkId);
+      if (current?.handle === handle) {
         registryRef.current.delete(checkId);
         setHandlesVersion((v) => v + 1);
       }
     };
   }, []);
-  const registryValue = (0, import_react7.useMemo)(
+  const registryValue = (0, import_react9.useMemo)(
     () => ({
       register,
-      getHandles: () => registryRef.current
+      getHandles: () => {
+        const handles = /* @__PURE__ */ new Map();
+        for (const [checkId, entry] of registryRef.current) {
+          handles.set(checkId, entry.handle);
+        }
+        return handles;
+      },
+      getRegisteredHandles: () => registryRef.current
     }),
     [register]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(CompoundRegistryContext.Provider, { value: registryValue, children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(CompoundHandlesVersionContext.Provider, { value: handlesVersion, children }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(CompoundHydrationBridgeProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(CompoundRegistryContext.Provider, { value: registryValue, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(CompoundHandlesVersionContext.Provider, { value: handlesVersion, children }) }) });
 }
 function useCompoundRegistry() {
-  const registry = (0, import_react7.useContext)(CompoundRegistryContext);
-  const handlesVersion = (0, import_react7.useContext)(CompoundHandlesVersionContext);
+  const registry = (0, import_react9.useContext)(CompoundRegistryContext);
+  const handlesVersion = (0, import_react9.useContext)(CompoundHandlesVersionContext);
   if (!registry) return null;
   return { ...registry, handlesVersion };
 }
 function useCompoundHandlesVersion() {
-  return (0, import_react7.useContext)(CompoundHandlesVersionContext);
+  return (0, import_react9.useContext)(CompoundHandlesVersionContext);
 }
 function useRegisterAssessmentHandle(checkId, handle) {
-  const registry = (0, import_react7.useContext)(CompoundRegistryContext);
-  import_react7.default.useEffect(() => {
+  const registry = (0, import_react9.useContext)(CompoundRegistryContext);
+  const pageIndex = useCompoundPageIndex();
+  import_react9.default.useLayoutEffect(() => {
     if (!registry || !handle) return;
-    return registry.register(checkId, handle);
-  }, [registry, checkId, handle]);
+    return registry.register(checkId, handle, pageIndex);
+  }, [registry, checkId, handle, pageIndex]);
 }
 function useCompoundHandleRef(ref, opts) {
-  const { activePageIndex, setActivePageIndex, getHandles, pageCount } = opts;
-  const setIndexClamped = (0, import_react7.useCallback)(
+  const { activePageIndex, setActivePageIndex, getHandles, getRegisteredHandles, pageCount } = opts;
+  const bridgeRef = useCompoundHydrationBridgeRef();
+  const setIndexClamped = (0, import_react9.useCallback)(
     (index) => {
-      const next = pageCount !== void 0 ? (0, import_core10.clampCompoundPageIndex)(index, pageCount) : Math.max(0, Math.floor(index));
+      const next = pageCount !== void 0 ? (0, import_core11.clampCompoundPageIndex)(index, pageCount) : Math.max(0, Math.floor(index));
       setActivePageIndex(next);
     },
     [pageCount, setActivePageIndex]
   );
-  (0, import_react7.useImperativeHandle)(
+  (0, import_react9.useImperativeHandle)(
     ref,
     () => ({
-      getScore: () => aggregateAssessmentScores(getHandles().values()).score,
-      getMaxScore: () => aggregateAssessmentScores(getHandles().values()).maxScore,
-      getAnswerGiven: () => aggregateAssessmentScores(getHandles().values()).allAnswered,
+      getScore: () => aggregateAssessmentScores(getRegisteredHandles().values()).score,
+      getMaxScore: () => aggregateAssessmentScores(getRegisteredHandles().values()).maxScore,
+      getAnswerGiven: () => aggregateAssessmentScores(getRegisteredHandles().values(), {
+        answerPageIndex: activePageIndex
+      }).allAnswered,
       resetTask: () => {
-        for (const handle of getHandles().values()) handle.resetTask();
+        for (const entry of getRegisteredHandles().values()) entry.handle.resetTask();
       },
       showSolutions: () => {
         if (!opts.enableSolutionsButton) return;
-        for (const handle of getHandles().values()) handle.showSolutions();
+        for (const entry of getRegisteredHandles().values()) entry.handle.showSolutions();
       },
       getCurrentState: () => {
         const childStates = {};
-        for (const [checkId, handle] of getHandles()) {
-          if (handle.getCurrentState) {
-            childStates[checkId] = handle.getCurrentState();
+        for (const [checkId, entry] of getRegisteredHandles()) {
+          if (entry.handle.getCurrentState) {
+            childStates[checkId] = entry.handle.getCurrentState();
           }
         }
-        return (0, import_core10.createCompoundResumeState)({ activePageIndex, childStates });
+        return (0, import_core11.createCompoundResumeState)({ activePageIndex, childStates });
       },
       resume: (state) => {
-        setIndexClamped(state.activePageIndex);
-        resumeChildHandles(getHandles(), state.childStates);
+        bridgeRef?.current?.notifyImperativeResume(state);
       }
     }),
-    [activePageIndex, setIndexClamped, getHandles, opts.enableSolutionsButton]
+    [activePageIndex, setIndexClamped, getHandles, getRegisteredHandles, opts.enableSolutionsButton, bridgeRef]
   );
 }
 
 // src/assessment/internal/useAssessmentHandleRegistration.ts
 function useAssessmentHandleRegistration(checkId, handle, ref) {
-  (0, import_react8.useImperativeHandle)(ref, () => handle, [handle]);
+  (0, import_react10.useImperativeHandle)(ref, () => handle, [handle]);
   useRegisterAssessmentHandle(checkId, handle);
 }
 
 // src/assessment/internal/usePluginScoring.ts
-var import_react9 = require("react");
+var import_react11 = require("react");
 
 // src/assessment/scoring.ts
 function resolvePassingThreshold(passingScore, maxScore) {
@@ -1400,7 +1457,7 @@ function scoreFromCustom(custom, fallbackCorrect, fallbackMax = 1, passingScore)
 // src/assessment/internal/usePluginScoring.ts
 function usePluginScoring(checkId, lessonId) {
   const { plugins, config, session } = useLessonkit();
-  const getPluginScore = (0, import_react9.useCallback)(
+  const getPluginScore = (0, import_react11.useCallback)(
     (response) => {
       const pluginCtx = buildPluginContext({
         courseId: config.courseId,
@@ -1412,11 +1469,11 @@ function usePluginScoring(checkId, lessonId) {
     },
     [checkId, config.courseId, lessonId, plugins, session.attemptId, session.sessionId, session.user]
   );
-  const scoreResponse = (0, import_react9.useCallback)(
+  const scoreResponse = (0, import_react11.useCallback)(
     (response, defaultCorrect, maxScore = 1, passingScore) => scoreFromCustom(getPluginScore(response), defaultCorrect, maxScore, passingScore),
     [getPluginScore]
   );
-  const isChoiceCorrect = (0, import_react9.useCallback)(
+  const isChoiceCorrect = (0, import_react11.useCallback)(
     (choice, answer, custom, passingScore) => {
       if (!custom) return choice === answer;
       if (custom.passed !== void 0) return custom.passed;
@@ -1431,53 +1488,94 @@ function usePluginScoring(checkId, lessonId) {
 }
 
 // src/components/Quiz.tsx
-var import_jsx_runtime4 = require("react/jsx-runtime");
+var import_jsx_runtime6 = require("react/jsx-runtime");
 function QuizInner(props, ref) {
   const { enclosingLessonId } = props;
-  const checkId = (0, import_react10.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const checkId = (0, import_react12.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
   const quiz = useQuizState(enclosingLessonId);
   const { getPluginScore, isChoiceCorrect } = usePluginScoring(checkId, enclosingLessonId);
-  const [selected, setSelected] = (0, import_react10.useState)(null);
-  const [selectionCorrect, setSelectionCorrect] = (0, import_react10.useState)(null);
-  const [quizPassed, setQuizPassed] = (0, import_react10.useState)(false);
-  const completedRef = (0, import_react10.useRef)(false);
-  const questionId = (0, import_react10.useId)();
+  const [selected, setSelected] = (0, import_react12.useState)(null);
+  const [selectionCorrect, setSelectionCorrect] = (0, import_react12.useState)(null);
+  const [quizPassed, setQuizPassed] = (0, import_react12.useState)(false);
+  const [completedScore, setCompletedScore] = (0, import_react12.useState)(null);
+  const [completedMaxScore, setCompletedMaxScore] = (0, import_react12.useState)(null);
+  const completedRef = (0, import_react12.useRef)(false);
+  const telemetryReplayedRef = (0, import_react12.useRef)(false);
+  const questionId = (0, import_react12.useId)();
   const choicesKey = props.choices.join("\0");
-  (0, import_react10.useEffect)(() => {
+  (0, import_react12.useEffect)(() => {
     completedRef.current = false;
+    telemetryReplayedRef.current = false;
     setQuizPassed(false);
     setSelected(null);
     setSelectionCorrect(null);
+    setCompletedScore(null);
+    setCompletedMaxScore(null);
   }, [checkId, props.answer, props.question, choicesKey]);
   const passed = quizPassed;
-  const handle = (0, import_react10.useMemo)(
+  const resolveScores = () => {
+    const maxScore = completedMaxScore ?? 1;
+    if (quizPassed) {
+      return { score: completedScore ?? maxScore, maxScore };
+    }
+    if (selected !== null && selectionCorrect) {
+      return { score: completedMaxScore ?? maxScore, maxScore };
+    }
+    return { score: 0, maxScore };
+  };
+  const replayTelemetry = (nextSelected, nextCorrect, nextPassed, nextScore, nextMaxScore) => {
+    if (!nextPassed || telemetryReplayedRef.current) return;
+    telemetryReplayedRef.current = true;
+    if (nextSelected !== null) {
+      quiz.answer({
+        checkId,
+        question: props.question,
+        choice: nextSelected,
+        correct: nextCorrect ?? false
+      });
+    }
+    quiz.complete({
+      checkId,
+      score: nextScore,
+      maxScore: nextMaxScore,
+      passingScore: props.passingScore ?? nextMaxScore
+    });
+  };
+  const handle = (0, import_react12.useMemo)(
     () => buildAssessmentHandle({
       checkId,
-      getScore: () => {
-        const maxScore = 1;
-        if (quizPassed && selected !== null) return maxScore;
-        if (selected === null) return 0;
-        return selectionCorrect ? maxScore : 0;
-      },
-      getMaxScore: () => 1,
+      getScore: () => resolveScores().score,
+      getMaxScore: () => resolveScores().maxScore,
       getAnswerGiven: () => selected !== null,
       resetTask: () => {
         completedRef.current = false;
+        telemetryReplayedRef.current = false;
         setQuizPassed(false);
         setSelected(null);
         setSelectionCorrect(null);
+        setCompletedScore(null);
+        setCompletedMaxScore(null);
       },
       showSolutions: () => {
       },
-      getXAPIData: () => ({
-        checkId,
-        interactionType: "mcq",
-        response: selected ?? void 0,
-        correct: selectionCorrect ?? void 0,
-        score: quizPassed && selected !== null ? 1 : selected === null ? 0 : selectionCorrect ? 1 : 0,
-        maxScore: 1
+      getXAPIData: () => {
+        const { score, maxScore } = resolveScores();
+        return {
+          checkId,
+          interactionType: "mcq",
+          response: selected ?? void 0,
+          correct: selectionCorrect ?? void 0,
+          score,
+          maxScore
+        };
+      },
+      getCurrentState: () => ({
+        selected,
+        selectionCorrect,
+        quizPassed,
+        completedScore,
+        completedMaxScore
       }),
-      getCurrentState: () => ({ selected, selectionCorrect, quizPassed }),
       resume: (state) => {
         const nextSelected = readStringField(state, "selected");
         if (typeof nextSelected === "string" || nextSelected === null) setSelected(nextSelected);
@@ -1485,21 +1583,47 @@ function QuizInner(props, ref) {
         if (nextCorrect === true || nextCorrect === false || nextCorrect === null) {
           setSelectionCorrect(nextCorrect);
         }
-        readBooleanStateField(state, "quizPassed", (value) => {
-          setQuizPassed(value);
-          completedRef.current = value;
-        });
+        const nextCompletedScore = readNumberField(state, "completedScore");
+        if (typeof nextCompletedScore === "number") setCompletedScore(nextCompletedScore);
+        const nextCompletedMaxScore = readNumberField(state, "completedMaxScore");
+        if (typeof nextCompletedMaxScore === "number") setCompletedMaxScore(nextCompletedMaxScore);
+        const nextPassed = readBooleanField(state, "quizPassed");
+        if (nextPassed === true || nextPassed === false) {
+          setQuizPassed(nextPassed);
+          completedRef.current = nextPassed;
+          if (nextPassed) {
+            const maxScore = nextCompletedMaxScore ?? completedMaxScore ?? 1;
+            const score = nextCompletedScore ?? completedScore ?? maxScore;
+            replayTelemetry(
+              nextSelected ?? null,
+              nextCorrect ?? null,
+              nextPassed,
+              score,
+              maxScore
+            );
+          }
+        }
       }
     }),
-    [checkId, quizPassed, selected, selectionCorrect]
+    [
+      checkId,
+      completedMaxScore,
+      completedScore,
+      props.passingScore,
+      props.question,
+      quiz,
+      quizPassed,
+      selected,
+      selectionCorrect
+    ]
   );
   useAssessmentHandleRegistration(checkId, handle, ref);
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("section", { "aria-label": "Quiz", "data-lk-check-id": checkId, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("p", { id: questionId, children: props.question }),
-    /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("fieldset", { "aria-labelledby": questionId, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("legend", { style: import_accessibility.visuallyHiddenStyle, children: "Quiz choices" }),
-      props.choices.map((c, i) => /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("label", { style: { display: "block" }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("section", { "aria-label": "Quiz", "data-lk-check-id": checkId, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("p", { id: questionId, children: props.question }),
+    /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("fieldset", { "aria-labelledby": questionId, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("legend", { style: import_accessibility.visuallyHiddenStyle, children: "Quiz choices" }),
+      props.choices.map((c, i) => /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("label", { style: { display: "block" }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
           "input",
           {
             type: "radio",
@@ -1524,9 +1648,12 @@ function QuizInner(props, ref) {
                 completedRef.current = true;
                 setQuizPassed(true);
                 const maxScore = custom?.maxScore ?? 1;
+                const score = custom?.score ?? maxScore;
+                setCompletedScore(score);
+                setCompletedMaxScore(maxScore);
                 quiz.complete({
                   checkId,
-                  score: custom?.score ?? maxScore,
+                  score,
                   maxScore,
                   passingScore: props.passingScore ?? maxScore
                 });
@@ -1537,15 +1664,15 @@ function QuizInner(props, ref) {
         c
       ] }, `${questionId}-${i}`))
     ] }),
-    selected && selectionCorrect !== null ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("p", { role: "status", "aria-live": "polite", children: selectionCorrect ? "Correct" : "Try again" }) : null
+    selected && selectionCorrect !== null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("p", { role: "status", "aria-live": "polite", children: selectionCorrect ? "Correct" : "Try again" }) : null
   ] });
 }
-var QuizInnerForwarded = (0, import_react10.forwardRef)(QuizInner);
-var Quiz = (0, import_react10.forwardRef)(function Quiz2(props, ref) {
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(AssessmentLessonGuard, { blockLabel: "Quiz", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(QuizInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
+var QuizInnerForwarded = (0, import_react12.forwardRef)(QuizInner);
+var Quiz = (0, import_react12.forwardRef)(function Quiz2(props, ref) {
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(AssessmentLessonGuard, { blockLabel: "Quiz", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(QuizInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
 });
 function KnowledgeCheck(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
     Quiz,
     {
       checkId: props.checkId,
@@ -1561,27 +1688,27 @@ function resetQuizWarningsForTests() {
 }
 
 // src/components.tsx
-var import_jsx_runtime5 = require("react/jsx-runtime");
+var import_jsx_runtime7 = require("react/jsx-runtime");
 function Course(props) {
-  const courseId = (0, import_react11.useMemo)(() => normalizeComponentId(props.courseId, "courseId"), [props.courseId]);
-  const providerConfig = (0, import_react11.useMemo)(
+  const courseId = (0, import_react13.useMemo)(() => normalizeComponentId(props.courseId, "courseId"), [props.courseId]);
+  const providerConfig = (0, import_react13.useMemo)(
     () => ({ ...props.config, courseId }),
     [props.config, courseId]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(LessonkitProvider, { config: providerConfig, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)("section", { "aria-label": props.title, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("h1", { children: props.title }),
-    /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("div", { children: props.children })
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(LessonkitProvider, { config: providerConfig, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("section", { "aria-label": props.title, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("h1", { children: props.title }),
+    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { children: props.children })
   ] }) });
 }
 function Lesson(props) {
-  const lessonId = (0, import_react11.useMemo)(() => normalizeComponentId(props.lessonId, "lessonId"), [props.lessonId]);
+  const lessonId = (0, import_react13.useMemo)(() => normalizeComponentId(props.lessonId, "lessonId"), [props.lessonId]);
   const autoComplete = props.autoCompleteOnUnmount !== false;
   const { setActiveLesson, config } = useLessonkit();
   const { completeLesson } = useCompletion();
-  const lessonMountGenerationRef = (0, import_react11.useRef)(0);
-  const liveCourseIdRef = (0, import_react11.useRef)(config.courseId);
+  const lessonMountGenerationRef = (0, import_react13.useRef)(0);
+  const liveCourseIdRef = (0, import_react13.useRef)(config.courseId);
   liveCourseIdRef.current = config.courseId;
-  (0, import_react11.useEffect)(() => {
+  (0, import_react13.useEffect)(() => {
     const unregister = registerLessonMount(lessonId);
     const generation = ++lessonMountGenerationRef.current;
     const mountedCourseId = config.courseId;
@@ -1606,37 +1733,37 @@ function Lesson(props) {
       });
     };
   }, [lessonId, config.courseId, setActiveLesson, completeLesson, autoComplete]);
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(LessonContext.Provider, { value: lessonId, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)("article", { "aria-label": props.title, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("h2", { children: props.title }),
-    /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("div", { children: props.children })
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(LessonContext.Provider, { value: lessonId, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("article", { "aria-label": props.title, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("h2", { children: props.title }),
+    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { children: props.children })
   ] }) });
 }
 function Scenario(props) {
-  const blockId = (0, import_react11.useMemo)(
+  const blockId = (0, import_react13.useMemo)(
     () => props.blockId !== void 0 ? normalizeComponentId(props.blockId, "blockId") : void 0,
     [props.blockId]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("section", { "aria-label": "Scenario", "data-lk-block-id": blockId, children: props.children });
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("section", { "aria-label": "Scenario", "data-lk-block-id": blockId, children: props.children });
 }
 function Reflection(props) {
-  const blockId = (0, import_react11.useMemo)(
+  const blockId = (0, import_react13.useMemo)(
     () => props.blockId !== void 0 ? normalizeComponentId(props.blockId, "blockId") : void 0,
     [props.blockId]
   );
-  const promptId = (0, import_react11.useId)();
-  const hintId = (0, import_react11.useId)();
-  const [internalValue, setInternalValue] = (0, import_react11.useState)("");
+  const promptId = (0, import_react13.useId)();
+  const hintId = (0, import_react13.useId)();
+  const [internalValue, setInternalValue] = (0, import_react13.useState)("");
   const isControlled = props.value !== void 0;
   const value = isControlled ? props.value : internalValue;
   const handleChange = (event) => {
     if (!isControlled) setInternalValue(event.target.value);
     props.onChange?.(event.target.value);
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)("section", { "aria-label": "Reflection", "data-lk-block-id": blockId, children: [
-    props.prompt ? /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("p", { id: promptId, children: props.prompt }) : null,
-    props.hint ? /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("p", { id: hintId, style: import_accessibility2.visuallyHiddenStyle, children: props.hint }) : null,
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("section", { "aria-label": "Reflection", "data-lk-block-id": blockId, children: [
+    props.prompt ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("p", { id: promptId, children: props.prompt }) : null,
+    props.hint ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("p", { id: hintId, style: import_accessibility2.visuallyHiddenStyle, children: props.hint }) : null,
     props.children,
-    /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
       "textarea",
       {
         value,
@@ -1654,7 +1781,7 @@ function ProgressTracker(props) {
   if (props.totalLessons != null) {
     const total = props.totalLessons;
     const displayed = Math.min(completed, total);
-    return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("aside", { "aria-label": "Progress", children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("aside", { "aria-label": "Progress", children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
       "div",
       {
         role: "progressbar",
@@ -1662,7 +1789,7 @@ function ProgressTracker(props) {
         "aria-valuemax": total,
         "aria-valuenow": displayed,
         "aria-label": "Lessons completed",
-        children: /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)("p", { children: [
+        children: /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("p", { children: [
           "Lessons completed: ",
           displayed,
           " of ",
@@ -1671,58 +1798,101 @@ function ProgressTracker(props) {
       }
     ) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("aside", { "aria-label": "Progress", role: "status", children: /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)("p", { children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("aside", { "aria-label": "Progress", role: "status", children: /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("p", { children: [
     "Lessons completed: ",
     completed
   ] }) });
 }
 
 // src/blocks/TrueFalse.tsx
-var import_react12 = __toESM(require("react"), 1);
-var import_jsx_runtime6 = require("react/jsx-runtime");
+var import_react14 = __toESM(require("react"), 1);
+var import_jsx_runtime8 = require("react/jsx-runtime");
 var INTERACTION = "trueFalse";
 function TrueFalseInner(props, ref) {
   const { enclosingLessonId } = props;
-  const checkId = (0, import_react12.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const checkId = (0, import_react14.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
   const assessment = useAssessmentState(enclosingLessonId);
   const { config } = useLessonkit();
   const { scoreResponse } = usePluginScoring(checkId, enclosingLessonId);
-  const [selected, setSelected] = (0, import_react12.useState)(null);
-  const [selectionCorrect, setSelectionCorrect] = (0, import_react12.useState)(null);
-  const [showSolutions, setShowSolutions] = (0, import_react12.useState)(false);
-  const [passed, setPassed] = (0, import_react12.useState)(false);
-  const completedRef = (0, import_react12.useRef)(false);
-  const questionId = import_react12.default.useId();
+  const [selected, setSelected] = (0, import_react14.useState)(null);
+  const [selectionCorrect, setSelectionCorrect] = (0, import_react14.useState)(null);
+  const [showSolutions, setShowSolutions] = (0, import_react14.useState)(false);
+  const [passed, setPassed] = (0, import_react14.useState)(false);
+  const [completedScore, setCompletedScore] = (0, import_react14.useState)(null);
+  const [completedMaxScore, setCompletedMaxScore] = (0, import_react14.useState)(null);
+  const completedRef = (0, import_react14.useRef)(false);
+  const telemetryReplayedRef = (0, import_react14.useRef)(false);
+  const questionId = import_react14.default.useId();
   const reset = () => {
     completedRef.current = false;
+    telemetryReplayedRef.current = false;
     setPassed(false);
     setSelected(null);
     setSelectionCorrect(null);
     setShowSolutions(false);
+    setCompletedScore(null);
+    setCompletedMaxScore(null);
   };
-  (0, import_react12.useEffect)(() => {
+  (0, import_react14.useEffect)(() => {
     reset();
   }, [checkId, props.answer, props.question, config.courseId, enclosingLessonId]);
-  const handle = (0, import_react12.useMemo)(
+  const resolveScores = () => {
+    const maxScore = completedMaxScore ?? 1;
+    if (passed) {
+      return { score: completedScore ?? maxScore, maxScore };
+    }
+    if (selectionCorrect) {
+      return { score: completedMaxScore ?? maxScore, maxScore };
+    }
+    return { score: 0, maxScore };
+  };
+  const replayTelemetry = (nextSelected, nextCorrect, nextPassed, nextScore, nextMaxScore) => {
+    if (!nextPassed || telemetryReplayedRef.current) return;
+    telemetryReplayedRef.current = true;
+    if (nextSelected !== null) {
+      assessment.answer({
+        checkId,
+        interactionType: INTERACTION,
+        question: props.question,
+        response: nextSelected,
+        correct: nextCorrect ?? false
+      });
+    }
+    assessment.complete({
+      checkId,
+      interactionType: INTERACTION,
+      score: nextScore,
+      maxScore: nextMaxScore,
+      passingScore: props.passingScore ?? nextMaxScore
+    });
+  };
+  const handle = (0, import_react14.useMemo)(
     () => buildAssessmentHandle({
       checkId,
-      getScore: () => {
-        const maxScore = 1;
-        return passed ? maxScore : selected === null ? 0 : selected === props.answer ? maxScore : 0;
-      },
-      getMaxScore: () => 1,
+      getScore: () => resolveScores().score,
+      getMaxScore: () => resolveScores().maxScore,
       getAnswerGiven: () => selected !== null,
       resetTask: reset,
       showSolutions: () => setShowSolutions(true),
-      getXAPIData: () => ({
-        checkId,
-        interactionType: INTERACTION,
-        response: selected ?? void 0,
-        correct: selected === props.answer,
-        score: passed ? 1 : selected === null ? 0 : selected === props.answer ? 1 : 0,
-        maxScore: 1
+      getXAPIData: () => {
+        const { score, maxScore } = resolveScores();
+        return {
+          checkId,
+          interactionType: INTERACTION,
+          response: selected ?? void 0,
+          correct: selectionCorrect ?? void 0,
+          score,
+          maxScore
+        };
+      },
+      getCurrentState: () => ({
+        selected,
+        selectionCorrect,
+        passed,
+        showSolutions,
+        completedScore,
+        completedMaxScore
       }),
-      getCurrentState: () => ({ selected, selectionCorrect, passed, showSolutions }),
       resume: (state) => {
         const nextSelected = readBooleanField(state, "selected");
         if (nextSelected === true || nextSelected === false || nextSelected === null) {
@@ -1732,14 +1902,35 @@ function TrueFalseInner(props, ref) {
         if (nextCorrect === true || nextCorrect === false || nextCorrect === null) {
           setSelectionCorrect(nextCorrect);
         }
-        readBooleanStateField(state, "passed", (value) => {
-          setPassed(value);
-          completedRef.current = value;
-        });
+        const nextCompletedScore = readNumberField(state, "completedScore");
+        if (typeof nextCompletedScore === "number") setCompletedScore(nextCompletedScore);
+        const nextCompletedMaxScore = readNumberField(state, "completedMaxScore");
+        if (typeof nextCompletedMaxScore === "number") setCompletedMaxScore(nextCompletedMaxScore);
+        const nextPassed = readBooleanField(state, "passed");
+        if (nextPassed === true || nextPassed === false) {
+          setPassed(nextPassed);
+          completedRef.current = nextPassed;
+          if (nextPassed) {
+            const maxScore = nextCompletedMaxScore ?? completedMaxScore ?? 1;
+            const score = nextCompletedScore ?? completedScore ?? maxScore;
+            replayTelemetry(nextSelected ?? null, nextCorrect ?? null, nextPassed, score, maxScore);
+          }
+        }
         readBooleanStateField(state, "showSolutions", setShowSolutions);
       }
     }),
-    [checkId, passed, props.answer, selected, selectionCorrect, showSolutions]
+    [
+      assessment,
+      checkId,
+      completedMaxScore,
+      completedScore,
+      passed,
+      props.passingScore,
+      props.question,
+      selected,
+      selectionCorrect,
+      showSolutions
+    ]
   );
   useAssessmentHandleRegistration(checkId, handle, ref);
   const submit = (value) => {
@@ -1758,6 +1949,8 @@ function TrueFalseInner(props, ref) {
     if (scored.passed && !completedRef.current) {
       completedRef.current = true;
       setPassed(true);
+      setCompletedScore(scored.score);
+      setCompletedMaxScore(scored.maxScore);
       assessment.complete({
         checkId,
         interactionType: INTERACTION,
@@ -1768,12 +1961,12 @@ function TrueFalseInner(props, ref) {
     }
   };
   const reveal = showSolutions || passed && props.enableSolutionsButton;
-  return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("section", { "aria-label": "True or False", "data-lk-check-id": checkId, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("p", { id: questionId, children: props.question }),
-    /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("fieldset", { "aria-labelledby": questionId, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("legend", { className: "lk-visually-hidden", children: "True or False" }),
-      /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("label", { style: { display: "block", marginRight: "1rem" }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("section", { "aria-label": "True or False", "data-lk-check-id": checkId, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("p", { id: questionId, children: props.question }),
+    /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("fieldset", { "aria-labelledby": questionId, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("legend", { className: "lk-visually-hidden", children: "True or False" }),
+      /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("label", { style: { display: "block", marginRight: "1rem" }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
           "input",
           {
             type: "radio",
@@ -1785,8 +1978,8 @@ function TrueFalseInner(props, ref) {
         ),
         "True"
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("label", { style: { display: "block" }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("label", { style: { display: "block" }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
           "input",
           {
             type: "radio",
@@ -1799,49 +1992,49 @@ function TrueFalseInner(props, ref) {
         "False"
       ] })
     ] }),
-    reveal ? /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("p", { children: [
+    reveal ? /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("p", { children: [
       "Correct answer: ",
-      /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("strong", { children: props.answer ? "True" : "False" })
+      /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("strong", { children: props.answer ? "True" : "False" })
     ] }) : null,
-    selected !== null && selectionCorrect !== null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("p", { role: "status", "aria-live": "polite", children: selectionCorrect ? "Correct" : "Try again" }) : null,
-    props.enableRetry && passed ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("button", { type: "button", onClick: reset, children: "Try again" }) : null,
-    props.enableSolutionsButton && !reveal ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("button", { type: "button", onClick: () => setShowSolutions(true), children: "Show solution" }) : null
+    selected !== null && selectionCorrect !== null ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("p", { role: "status", "aria-live": "polite", children: selectionCorrect ? "Correct" : "Try again" }) : null,
+    props.enableRetry && passed ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("button", { type: "button", onClick: reset, children: "Try again" }) : null,
+    props.enableSolutionsButton && !reveal ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("button", { type: "button", onClick: () => setShowSolutions(true), children: "Show solution" }) : null
   ] });
 }
-var TrueFalseInnerForwarded = (0, import_react12.forwardRef)(TrueFalseInner);
-var TrueFalse = (0, import_react12.forwardRef)(function TrueFalse2(props, ref) {
-  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(AssessmentLessonGuard, { blockLabel: "TrueFalse", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(TrueFalseInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
+var TrueFalseInnerForwarded = (0, import_react14.forwardRef)(TrueFalseInner);
+var TrueFalse = (0, import_react14.forwardRef)(function TrueFalse2(props, ref) {
+  return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(AssessmentLessonGuard, { blockLabel: "TrueFalse", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(TrueFalseInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
 });
 
 // src/blocks/MarkTheWords.tsx
-var import_react13 = __toESM(require("react"), 1);
-var import_jsx_runtime7 = require("react/jsx-runtime");
+var import_react15 = __toESM(require("react"), 1);
+var import_jsx_runtime9 = require("react/jsx-runtime");
 var INTERACTION2 = "markTheWords";
 function tokenize(text) {
   return text.split(/(\s+)/).filter((t) => t.length > 0);
 }
 function MarkTheWordsInner(props, ref) {
-  const checkId = (0, import_react13.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const checkId = (0, import_react15.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
   const assessment = useAssessmentState(props.enclosingLessonId);
-  const tokens = (0, import_react13.useMemo)(() => tokenize(props.text), [props.text]);
-  const correctSet = (0, import_react13.useMemo)(
+  const tokens = (0, import_react15.useMemo)(() => tokenize(props.text), [props.text]);
+  const correctSet = (0, import_react15.useMemo)(
     () => new Set(props.correctWords.map((w) => w.toLowerCase())),
     [props.correctWords]
   );
-  const [marked, setMarked] = (0, import_react13.useState)(() => /* @__PURE__ */ new Set());
-  const [passed, setPassed] = (0, import_react13.useState)(false);
-  const [showSolutions, setShowSolutions] = (0, import_react13.useState)(false);
-  const completedRef = (0, import_react13.useRef)(false);
+  const [marked, setMarked] = (0, import_react15.useState)(() => /* @__PURE__ */ new Set());
+  const [passed, setPassed] = (0, import_react15.useState)(false);
+  const [showSolutions, setShowSolutions] = (0, import_react15.useState)(false);
+  const completedRef = (0, import_react15.useRef)(false);
   const reset = () => {
     completedRef.current = false;
     setPassed(false);
     setMarked(/* @__PURE__ */ new Set());
     setShowSolutions(false);
   };
-  (0, import_react13.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     reset();
   }, [checkId, props.text, props.correctWords.join("\0")]);
-  const selectableIndices = (0, import_react13.useMemo)(() => {
+  const selectableIndices = (0, import_react15.useMemo)(() => {
     const indices = [];
     tokens.forEach((t, i) => {
       if (!/^\s+$/.test(t) && correctSet.has(t.toLowerCase())) indices.push(i);
@@ -1853,7 +2046,7 @@ function MarkTheWordsInner(props, ref) {
   const maxScore = selectableIndices.length;
   const score = allMarked ? maxScore : marked.size;
   const passedThreshold = meetsPassingThreshold(score, maxScore || 1, props.passingScore);
-  const handle = (0, import_react13.useMemo)(
+  const handle = (0, import_react15.useMemo)(
     () => buildAssessmentHandle({
       checkId,
       getScore: () => score,
@@ -1892,7 +2085,7 @@ function MarkTheWordsInner(props, ref) {
       return next;
     });
   };
-  (0, import_react13.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     if (!hasTargets) {
       if (isDevEnvironment4()) {
         console.warn(
@@ -1910,7 +2103,7 @@ function MarkTheWordsInner(props, ref) {
       interactionType: INTERACTION2,
       question: props.text,
       response: [...marked].map((i) => tokens[i]),
-      correct: true
+      correct: passedThreshold
     });
     assessment.complete({
       checkId,
@@ -1932,20 +2125,20 @@ function MarkTheWordsInner(props, ref) {
     score,
     tokens
   ]);
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("section", { "aria-label": "Mark the Words", "data-lk-check-id": checkId, children: [
-    !hasTargets ? /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("p", { role: "alert", children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("section", { "aria-label": "Mark the Words", "data-lk-check-id": checkId, children: [
+    !hasTargets ? /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("p", { role: "alert", children: [
       "No words in this sentence match ",
-      /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("code", { children: "correctWords" }),
+      /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("code", { children: "correctWords" }),
       ". Check spelling and capitalization in the source text."
     ] }) : null,
-    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("p", { id: `${checkId}-hint`, children: "Select the correct words in the sentence." }),
-    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("p", { "aria-describedby": `${checkId}-hint`, children: tokens.map((token, i) => {
+    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { id: `${checkId}-hint`, children: "Select the correct words in the sentence." }),
+    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { "aria-describedby": `${checkId}-hint`, children: tokens.map((token, i) => {
       const isWord = !/^\s+$/.test(token);
       const isTarget = isWord && correctSet.has(token.toLowerCase());
-      if (!isTarget) return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_react13.default.Fragment, { children: token }, i);
+      if (!isTarget) return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_react15.default.Fragment, { children: token }, i);
       const selected = marked.has(i);
       const solution = showSolutions || passed && props.enableSolutionsButton;
-      return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
         "button",
         {
           type: "button",
@@ -1963,18 +2156,18 @@ function MarkTheWordsInner(props, ref) {
         i
       );
     }) }),
-    allMarked ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("p", { role: "status", "aria-live": "polite", children: "Correct" }) : null,
-    props.enableRetry && passed ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("button", { type: "button", onClick: reset, children: "Try again" }) : null,
-    props.enableSolutionsButton && !showSolutions ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("button", { type: "button", onClick: () => setShowSolutions(true), children: "Show solution" }) : null
+    allMarked ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { role: "status", "aria-live": "polite", children: "Correct" }) : null,
+    props.enableRetry && passed ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("button", { type: "button", onClick: reset, children: "Try again" }) : null,
+    props.enableSolutionsButton && !showSolutions ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("button", { type: "button", onClick: () => setShowSolutions(true), children: "Show solution" }) : null
   ] });
 }
-var MarkTheWordsInnerForwarded = (0, import_react13.forwardRef)(MarkTheWordsInner);
-var MarkTheWords = (0, import_react13.forwardRef)(function MarkTheWords2(props, ref) {
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(AssessmentLessonGuard, { blockLabel: "MarkTheWords", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(MarkTheWordsInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
+var MarkTheWordsInnerForwarded = (0, import_react15.forwardRef)(MarkTheWordsInner);
+var MarkTheWords = (0, import_react15.forwardRef)(function MarkTheWords2(props, ref) {
+  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(AssessmentLessonGuard, { blockLabel: "MarkTheWords", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(MarkTheWordsInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
 });
 
 // src/blocks/FillInTheBlanks.tsx
-var import_react14 = __toESM(require("react"), 1);
+var import_react16 = __toESM(require("react"), 1);
 
 // src/assessment/internal/parseStarDelimitedTemplate.ts
 function parseStarDelimitedTemplate(template, idPrefix) {
@@ -1995,7 +2188,7 @@ function parseStarDelimitedTemplate(template, idPrefix) {
 }
 
 // src/blocks/FillInTheBlanks.tsx
-var import_jsx_runtime8 = require("react/jsx-runtime");
+var import_jsx_runtime10 = require("react/jsx-runtime");
 var INTERACTION3 = "fillInBlanks";
 function parseTemplate(template) {
   const { parts, values } = parseStarDelimitedTemplate(template, "blank");
@@ -2005,25 +2198,27 @@ function parseTemplate(template) {
   };
 }
 function FillInTheBlanksInner(props, ref) {
-  const checkId = (0, import_react14.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const checkId = (0, import_react16.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
   const assessment = useAssessmentState(props.enclosingLessonId);
-  const parsed = (0, import_react14.useMemo)(() => parseTemplate(props.template), [props.template]);
+  const parsed = (0, import_react16.useMemo)(() => parseTemplate(props.template), [props.template]);
   const blanks = props.blanks ?? parsed.blanks;
-  const [values, setValues] = (0, import_react14.useState)(
+  const [values, setValues] = (0, import_react16.useState)(
     () => Object.fromEntries(blanks.map((b) => [b.id, ""]))
   );
-  const [passed, setPassed] = (0, import_react14.useState)(false);
-  const [showSolutions, setShowSolutions] = (0, import_react14.useState)(false);
-  const completedRef = (0, import_react14.useRef)(false);
-  const answeredRef = (0, import_react14.useRef)(false);
+  const [passed, setPassed] = (0, import_react16.useState)(false);
+  const [showSolutions, setShowSolutions] = (0, import_react16.useState)(false);
+  const [submitted, setSubmitted] = (0, import_react16.useState)(false);
+  const completedRef = (0, import_react16.useRef)(false);
+  const answeredRef = (0, import_react16.useRef)(false);
   const reset = () => {
     completedRef.current = false;
     answeredRef.current = false;
     setPassed(false);
     setValues(Object.fromEntries(blanks.map((b) => [b.id, ""])));
     setShowSolutions(false);
+    setSubmitted(false);
   };
-  (0, import_react14.useEffect)(() => {
+  (0, import_react16.useEffect)(() => {
     reset();
   }, [checkId, props.template, blanks.map((b) => b.answer).join("\0")]);
   const hasBlanks = blanks.length > 0;
@@ -2034,7 +2229,7 @@ function FillInTheBlanksInner(props, ref) {
   });
   const maxScore = blanks.length;
   const passedThreshold = meetsPassingThreshold(score, maxScore || 1, props.passingScore);
-  const handle = (0, import_react14.useMemo)(
+  const handle = (0, import_react16.useMemo)(
     () => buildAssessmentHandle({
       checkId,
       getScore: () => score,
@@ -2050,7 +2245,7 @@ function FillInTheBlanksInner(props, ref) {
         score,
         maxScore: maxScore || 1
       }),
-      getCurrentState: () => ({ values, passed, showSolutions }),
+      getCurrentState: () => ({ values, passed, showSolutions, submitted }),
       resume: (state) => {
         const raw = state.values;
         if (raw && typeof raw === "object") setValues({ ...raw });
@@ -2060,9 +2255,13 @@ function FillInTheBlanksInner(props, ref) {
           answeredRef.current = value;
         });
         readBooleanStateField(state, "showSolutions", setShowSolutions);
+        readBooleanStateField(state, "submitted", (value) => {
+          setSubmitted(value);
+          if (value) answeredRef.current = true;
+        });
       }
     }),
-    [allFilled, checkId, maxScore, passed, passedThreshold, score, showSolutions, values]
+    [allFilled, checkId, maxScore, passed, passedThreshold, score, showSolutions, submitted, values]
   );
   useAssessmentHandleRegistration(checkId, handle, ref);
   const check = () => {
@@ -2073,16 +2272,16 @@ function FillInTheBlanksInner(props, ref) {
       return;
     }
     if (!allFilled) return;
-    if (!answeredRef.current) {
-      answeredRef.current = true;
-      assessment.answer({
-        checkId,
-        interactionType: INTERACTION3,
-        question: props.template,
-        response: values,
-        correct: passedThreshold
-      });
-    }
+    if (answeredRef.current || submitted) return;
+    answeredRef.current = true;
+    setSubmitted(true);
+    assessment.answer({
+      checkId,
+      interactionType: INTERACTION3,
+      question: props.template,
+      response: values,
+      correct: passedThreshold
+    });
     if (passedThreshold && !completedRef.current) {
       completedRef.current = true;
       setPassed(true);
@@ -2095,20 +2294,23 @@ function FillInTheBlanksInner(props, ref) {
       });
     }
   };
-  (0, import_react14.useEffect)(() => {
-    if (!allFilled) answeredRef.current = false;
+  (0, import_react16.useEffect)(() => {
+    if (!allFilled) {
+      answeredRef.current = false;
+      setSubmitted(false);
+    }
   }, [allFilled]);
-  (0, import_react14.useEffect)(() => {
+  (0, import_react16.useEffect)(() => {
     if (props.autoCheck && allFilled) check();
   }, [allFilled, props.autoCheck, values, passedThreshold]);
   const reveal = showSolutions || passed && props.enableSolutionsButton;
-  return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("section", { "aria-label": "Fill in the Blanks", "data-lk-check-id": checkId, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("p", { children: parsed.parts.map((part, i) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("section", { "aria-label": "Fill in the Blanks", "data-lk-check-id": checkId, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("p", { children: parsed.parts.map((part, i) => {
       const blank = blanks.find((b) => b.id === part);
-      if (!blank) return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_react14.default.Fragment, { children: part }, i);
-      return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("label", { style: { margin: "0 0.25em" }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "lk-visually-hidden", children: blank.answer }),
-        /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+      if (!blank) return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_react16.default.Fragment, { children: part }, i);
+      return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("label", { style: { margin: "0 0.25em" }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: "lk-visually-hidden", children: blank.answer }),
+        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
           "input",
           {
             type: "text",
@@ -2124,49 +2326,51 @@ function FillInTheBlanksInner(props, ref) {
         )
       ] }, blank.id);
     }) }),
-    !props.autoCheck ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("button", { type: "button", "data-testid": "check-blanks", disabled: !allFilled || passed, onClick: check, children: "Check" }) : null,
-    !hasBlanks ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("p", { role: "alert", children: "This activity has no blanks. Add text wrapped in asterisks, e.g. The *answer* here." }) : null,
-    allFilled ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("p", { role: "status", "aria-live": "polite", children: passed || passedThreshold ? "Correct" : "Try again" }) : null,
-    props.enableRetry && passed ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("button", { type: "button", onClick: reset, children: "Try again" }) : null,
-    props.enableSolutionsButton && !reveal ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("button", { type: "button", onClick: () => setShowSolutions(true), children: "Show solution" }) : null
+    !props.autoCheck ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("button", { type: "button", "data-testid": "check-blanks", disabled: !allFilled || passed, onClick: check, children: "Check" }) : null,
+    !hasBlanks ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("p", { role: "alert", children: "This activity has no blanks. Add text wrapped in asterisks, e.g. The *answer* here." }) : null,
+    submitted ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("p", { role: "status", "aria-live": "polite", children: passed || passedThreshold ? "Correct" : "Try again" }) : null,
+    props.enableRetry && passed ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("button", { type: "button", onClick: reset, children: "Try again" }) : null,
+    props.enableSolutionsButton && !reveal ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("button", { type: "button", onClick: () => setShowSolutions(true), children: "Show solution" }) : null
   ] });
 }
-var FillInTheBlanksInnerForwarded = (0, import_react14.forwardRef)(FillInTheBlanksInner);
-var FillInTheBlanks = (0, import_react14.forwardRef)(
+var FillInTheBlanksInnerForwarded = (0, import_react16.forwardRef)(FillInTheBlanksInner);
+var FillInTheBlanks = (0, import_react16.forwardRef)(
   function FillInTheBlanks2(props, ref) {
-    return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(AssessmentLessonGuard, { blockLabel: "FillInTheBlanks", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(FillInTheBlanksInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(AssessmentLessonGuard, { blockLabel: "FillInTheBlanks", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(FillInTheBlanksInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
   }
 );
 
 // src/blocks/DragTheWords.tsx
-var import_react15 = __toESM(require("react"), 1);
-var import_jsx_runtime9 = require("react/jsx-runtime");
+var import_react17 = __toESM(require("react"), 1);
+var import_jsx_runtime11 = require("react/jsx-runtime");
 var INTERACTION4 = "dragTheWords";
 function parseZones(template) {
   const { parts, values } = parseStarDelimitedTemplate(template, "zone");
   return { parts, answers: values };
 }
 function DragTheWordsInner(props, ref) {
-  const checkId = (0, import_react15.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const checkId = (0, import_react17.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
   const assessment = useAssessmentState(props.enclosingLessonId);
-  const { parts, answers } = (0, import_react15.useMemo)(() => parseZones(props.template), [props.template]);
-  const [zones, setZones] = (0, import_react15.useState)(
+  const { parts, answers } = (0, import_react17.useMemo)(() => parseZones(props.template), [props.template]);
+  const [zones, setZones] = (0, import_react17.useState)(
     () => Object.fromEntries(answers.map((_, i) => [`zone-${i}`, ""]))
   );
-  const [pool, setPool] = (0, import_react15.useState)(() => [...props.words]);
-  const [keyboardWord, setKeyboardWord] = (0, import_react15.useState)(null);
-  const [passed, setPassed] = (0, import_react15.useState)(false);
-  const completedRef = (0, import_react15.useRef)(false);
-  const answeredRef = (0, import_react15.useRef)(false);
+  const [pool, setPool] = (0, import_react17.useState)(() => [...props.words]);
+  const [keyboardWord, setKeyboardWord] = (0, import_react17.useState)(null);
+  const [passed, setPassed] = (0, import_react17.useState)(false);
+  const [submitted, setSubmitted] = (0, import_react17.useState)(false);
+  const completedRef = (0, import_react17.useRef)(false);
+  const answeredRef = (0, import_react17.useRef)(false);
   const reset = () => {
     completedRef.current = false;
     answeredRef.current = false;
     setPassed(false);
+    setSubmitted(false);
     setZones(Object.fromEntries(answers.map((_, i) => [`zone-${i}`, ""])));
     setPool([...props.words]);
     setKeyboardWord(null);
   };
-  (0, import_react15.useEffect)(() => {
+  (0, import_react17.useEffect)(() => {
     reset();
   }, [checkId, props.template, props.words.join("\0")]);
   const hasZones = answers.length > 0;
@@ -2177,7 +2381,7 @@ function DragTheWordsInner(props, ref) {
   });
   const maxScore = answers.length;
   const passedThreshold = meetsPassingThreshold(score, maxScore || 1, props.passingScore);
-  const handle = (0, import_react15.useMemo)(
+  const handle = (0, import_react17.useMemo)(
     () => buildAssessmentHandle({
       checkId,
       getScore: () => score,
@@ -2194,7 +2398,7 @@ function DragTheWordsInner(props, ref) {
         score,
         maxScore: maxScore || 1
       }),
-      getCurrentState: () => ({ zones, pool, passed, keyboardWord }),
+      getCurrentState: () => ({ zones, pool, passed, keyboardWord, submitted }),
       resume: (state) => {
         const rawZones = state.zones;
         if (rawZones && typeof rawZones === "object") setZones({ ...rawZones });
@@ -2204,11 +2408,15 @@ function DragTheWordsInner(props, ref) {
           completedRef.current = value;
           answeredRef.current = value;
         });
+        readBooleanStateField(state, "submitted", (value) => {
+          setSubmitted(value);
+          if (value) answeredRef.current = true;
+        });
         const kw = state.keyboardWord;
         if (kw === null || typeof kw === "string") setKeyboardWord(kw ?? null);
       }
     }),
-    [allFilled, checkId, keyboardWord, maxScore, passed, passedThreshold, pool, score, zones]
+    [allFilled, checkId, keyboardWord, maxScore, passed, passedThreshold, pool, score, submitted, zones]
   );
   useAssessmentHandleRegistration(checkId, handle, ref);
   const placeInZone = (zoneId, word) => {
@@ -2238,16 +2446,16 @@ function DragTheWordsInner(props, ref) {
       return;
     }
     if (!allFilled) return;
-    if (!answeredRef.current) {
-      answeredRef.current = true;
-      assessment.answer({
-        checkId,
-        interactionType: INTERACTION4,
-        question: props.template,
-        response: zones,
-        correct: passedThreshold
-      });
-    }
+    if (answeredRef.current || submitted) return;
+    answeredRef.current = true;
+    setSubmitted(true);
+    assessment.answer({
+      checkId,
+      interactionType: INTERACTION4,
+      question: props.template,
+      response: zones,
+      correct: passedThreshold
+    });
     if (passedThreshold && !completedRef.current) {
       completedRef.current = true;
       setPassed(true);
@@ -2260,15 +2468,18 @@ function DragTheWordsInner(props, ref) {
       });
     }
   };
-  (0, import_react15.useEffect)(() => {
-    if (!allFilled) answeredRef.current = false;
+  (0, import_react17.useEffect)(() => {
+    if (!allFilled) {
+      answeredRef.current = false;
+      setSubmitted(false);
+    }
   }, [allFilled]);
-  (0, import_react15.useEffect)(() => {
+  (0, import_react17.useEffect)(() => {
     if (props.autoCheck && allFilled) check();
   }, [allFilled, props.autoCheck, zones, passedThreshold]);
-  return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("section", { "aria-label": "Drag the Words", "data-lk-check-id": checkId, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { children: "Drag words into the blanks (or select a word, then activate a blank)." }),
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { role: "list", "aria-label": "Word bank", "data-testid": "word-bank", children: pool.map((word) => /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)("section", { "aria-label": "Drag the Words", "data-lk-check-id": checkId, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("p", { children: "Drag words into the blanks (or select a word, then activate a blank)." }),
+    /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { role: "list", "aria-label": "Word bank", "data-testid": "word-bank", children: pool.map((word) => /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
       "button",
       {
         type: "button",
@@ -2282,9 +2493,9 @@ function DragTheWordsInner(props, ref) {
       },
       word
     )) }),
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { children: parts.map((part, i) => {
-      if (!part.startsWith("zone-")) return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_react15.default.Fragment, { children: part }, i);
-      return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("p", { children: parts.map((part, i) => {
+      if (!part.startsWith("zone-")) return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_react17.default.Fragment, { children: part }, i);
+      return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
         "span",
         {
           role: "button",
@@ -2308,53 +2519,56 @@ function DragTheWordsInner(props, ref) {
         part
       );
     }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("button", { type: "button", "data-testid": "check-drag-words", disabled: !allFilled || passed, onClick: check, children: "Check" }),
-    !hasZones ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { role: "alert", children: "This activity has no drop zones. Wrap answers in asterisks in the template." }) : null,
-    allFilled ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { role: "status", "aria-live": "polite", children: passed || passedThreshold ? "Correct" : "Try again" }) : null
+    /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("button", { type: "button", "data-testid": "check-drag-words", disabled: !allFilled || passed, onClick: check, children: "Check" }),
+    !hasZones ? /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("p", { role: "alert", children: "This activity has no drop zones. Wrap answers in asterisks in the template." }) : null,
+    submitted ? /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("p", { role: "status", "aria-live": "polite", children: passed || passedThreshold ? "Correct" : "Try again" }) : null
   ] });
 }
-var DragTheWordsInnerForwarded = (0, import_react15.forwardRef)(DragTheWordsInner);
-var DragTheWords = (0, import_react15.forwardRef)(function DragTheWords2(props, ref) {
-  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(AssessmentLessonGuard, { blockLabel: "DragTheWords", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(DragTheWordsInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
+var DragTheWordsInnerForwarded = (0, import_react17.forwardRef)(DragTheWordsInner);
+var DragTheWords = (0, import_react17.forwardRef)(function DragTheWords2(props, ref) {
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(AssessmentLessonGuard, { blockLabel: "DragTheWords", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(DragTheWordsInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
 });
 
 // src/blocks/DragAndDrop.tsx
-var import_react16 = require("react");
-var import_jsx_runtime10 = require("react/jsx-runtime");
+var import_react18 = require("react");
+var import_jsx_runtime12 = require("react/jsx-runtime");
 var INTERACTION5 = "dragAndDrop";
 function DragAndDropInner(props, ref) {
-  const checkId = (0, import_react16.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const checkId = (0, import_react18.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
   const assessment = useAssessmentState(props.enclosingLessonId);
-  const [assignments, setAssignments] = (0, import_react16.useState)(
+  const [assignments, setAssignments] = (0, import_react18.useState)(
     () => Object.fromEntries(props.targets.map((t) => [t.id, ""]))
   );
-  const [pool, setPool] = (0, import_react16.useState)(() => props.items.map((i) => i.id));
-  const [keyboardItem, setKeyboardItem] = (0, import_react16.useState)(null);
-  const [passed, setPassed] = (0, import_react16.useState)(false);
-  const completedRef = (0, import_react16.useRef)(false);
+  const [pool, setPool] = (0, import_react18.useState)(() => props.items.map((i) => i.id));
+  const [keyboardItem, setKeyboardItem] = (0, import_react18.useState)(null);
+  const [passed, setPassed] = (0, import_react18.useState)(false);
+  const [checked, setChecked] = (0, import_react18.useState)(false);
+  const completedRef = (0, import_react18.useRef)(false);
   const reset = () => {
     completedRef.current = false;
     setPassed(false);
+    setChecked(false);
     setAssignments(Object.fromEntries(props.targets.map((t) => [t.id, ""])));
     setPool(props.items.map((i) => i.id));
     setKeyboardItem(null);
   };
-  (0, import_react16.useEffect)(() => {
+  (0, import_react18.useEffect)(() => {
     reset();
   }, [checkId, props.items.map((i) => i.id).join(","), props.targets.map((t) => t.id).join(",")]);
-  const allFilled = props.targets.every((t) => (assignments[t.id] ?? "").length > 0);
-  const allCorrect = props.targets.every((t) => assignments[t.id] === t.accepts);
-  const handle = (0, import_react16.useMemo)(() => {
-    const maxScore = props.targets.length || 1;
-    let score = 0;
-    props.targets.forEach((t) => {
-      if (assignments[t.id] === t.accepts) score += 1;
-    });
+  const hasTargets = props.targets.length > 0;
+  const allFilled = hasTargets && props.targets.every((t) => (assignments[t.id] ?? "").length > 0);
+  let score = 0;
+  props.targets.forEach((t) => {
+    if (assignments[t.id] === t.accepts) score += 1;
+  });
+  const maxScore = props.targets.length || 1;
+  const passedThreshold = meetsPassingThreshold(score, maxScore, props.passingScore);
+  const handle = (0, import_react18.useMemo)(() => {
     return buildAssessmentHandle({
       checkId,
       getScore: () => score,
       getMaxScore: () => maxScore,
-      getAnswerGiven: () => allFilled,
+      getAnswerGiven: () => hasTargets && allFilled,
       resetTask: reset,
       showSolutions: () => {
       },
@@ -2362,11 +2576,11 @@ function DragAndDropInner(props, ref) {
         checkId,
         interactionType: INTERACTION5,
         response: assignments,
-        correct: allCorrect,
+        correct: passedThreshold,
         score,
         maxScore
       }),
-      getCurrentState: () => ({ assignments, pool, passed, keyboardItem }),
+      getCurrentState: () => ({ assignments, pool, passed, checked, keyboardItem }),
       resume: (state) => {
         const rawAssignments = state.assignments;
         if (rawAssignments && typeof rawAssignments === "object") {
@@ -2377,14 +2591,16 @@ function DragAndDropInner(props, ref) {
           setPassed(value);
           completedRef.current = value;
         });
+        readBooleanStateField(state, "checked", setChecked);
         const item = state.keyboardItem;
         if (item === null || typeof item === "string") setKeyboardItem(item ?? null);
       }
     });
-  }, [allCorrect, allFilled, assignments, checkId, keyboardItem, passed, pool, props.targets]);
+  }, [allFilled, assignments, checkId, checked, hasTargets, keyboardItem, maxScore, passed, passedThreshold, pool, props.targets, score]);
   useAssessmentHandleRegistration(checkId, handle, ref);
   const place = (targetId, itemId) => {
     if (passed && !props.enableRetry) return;
+    setChecked(false);
     const prev = assignments[targetId];
     setAssignments((a) => ({ ...a, [targetId]: itemId }));
     setPool((p) => {
@@ -2396,29 +2612,31 @@ function DragAndDropInner(props, ref) {
   };
   const check = () => {
     if (!allFilled) return;
+    setChecked(true);
     assessment.answer({
       checkId,
       interactionType: INTERACTION5,
       response: assignments,
-      correct: allCorrect
+      correct: passedThreshold
     });
-    if (allCorrect && !completedRef.current) {
+    if (passedThreshold && !completedRef.current) {
       completedRef.current = true;
       setPassed(true);
       assessment.complete({
         checkId,
         interactionType: INTERACTION5,
-        score: props.targets.length,
-        maxScore: props.targets.length,
-        passingScore: props.passingScore ?? props.targets.length
+        score,
+        maxScore,
+        passingScore: props.passingScore ?? maxScore
       });
     }
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("section", { "aria-label": "Drag and Drop", "data-lk-check-id": checkId, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("p", { children: "Match each item to the correct target (drag or use keyboard: select item, then activate target)." }),
-    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { role: "list", "aria-label": "Draggable items", children: pool.map((id) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("section", { "aria-label": "Drag and Drop", "data-lk-check-id": checkId, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("p", { children: "Match each item to the correct target (drag or use keyboard: select item, then activate target)." }),
+    /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { role: "list", "aria-label": "Draggable items", children: pool.flatMap((id) => {
       const item = props.items.find((i) => i.id === id);
-      return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+      if (!item) return [];
+      return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
         "button",
         {
           type: "button",
@@ -2433,13 +2651,13 @@ function DragAndDropInner(props, ref) {
         id
       );
     }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("ul", { children: props.targets.map((target) => {
+    /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("ul", { children: props.targets.map((target) => {
       const assigned = assignments[target.id];
       const label = assigned ? props.items.find((i) => i.id === assigned)?.label ?? assigned : "Drop here";
-      return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("li", { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("strong", { children: target.label }),
+      return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("li", { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("strong", { children: target.label }),
         " ",
-        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
           "span",
           {
             role: "button",
@@ -2466,30 +2684,31 @@ function DragAndDropInner(props, ref) {
         )
       ] }, target.id);
     }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("button", { type: "button", "data-testid": "check-drag-drop", disabled: !allFilled || passed, onClick: check, children: "Check" }),
-    allFilled ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("p", { role: "status", "aria-live": "polite", children: passed || allCorrect ? "Correct" : "Try again" }) : null
+    /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("button", { type: "button", "data-testid": "check-drag-drop", disabled: !hasTargets || !allFilled || passed, onClick: check, children: "Check" }),
+    checked ? /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("p", { role: "status", "aria-live": "polite", children: passedThreshold ? "Correct" : "Try again" }) : null
   ] });
 }
-var DragAndDropInnerForwarded = (0, import_react16.forwardRef)(DragAndDropInner);
-var DragAndDrop = (0, import_react16.forwardRef)(function DragAndDrop2(props, ref) {
-  return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(AssessmentLessonGuard, { blockLabel: "DragAndDrop", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(DragAndDropInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
+var DragAndDropInnerForwarded = (0, import_react18.forwardRef)(DragAndDropInner);
+var DragAndDrop = (0, import_react18.forwardRef)(function DragAndDrop2(props, ref) {
+  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(AssessmentLessonGuard, { blockLabel: "DragAndDrop", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(DragAndDropInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
 });
 
 // src/blocks/AssessmentSequence.tsx
-var import_react22 = __toESM(require("react"), 1);
+var import_react24 = __toESM(require("react"), 1);
+var import_core17 = require("@lessonkit/core");
 
 // src/compound/useCompoundShell.ts
-var import_react20 = require("react");
-var import_core14 = require("@lessonkit/core");
+var import_react22 = require("react");
+var import_core15 = require("@lessonkit/core");
 
 // src/compound/useCompoundNavigation.ts
-var import_react17 = require("react");
+var import_react19 = require("react");
 function useCompoundNavigation(pageCount, index, setIndex) {
-  const goNext = (0, import_react17.useCallback)(() => {
+  const goNext = (0, import_react19.useCallback)(() => {
     if (pageCount < 1) return;
     setIndex((i) => Math.min(i + 1, pageCount - 1));
   }, [pageCount, setIndex]);
-  const goPrev = (0, import_react17.useCallback)(() => {
+  const goPrev = (0, import_react19.useCallback)(() => {
     setIndex((i) => Math.max(i - 1, 0));
   }, [setIndex]);
   const clampedIndex = pageCount < 1 ? 0 : Math.min(index, pageCount - 1);
@@ -2503,102 +2722,254 @@ function useCompoundNavigation(pageCount, index, setIndex) {
 }
 
 // src/compound/useCompoundPersistence.ts
-var import_react19 = require("react");
-var import_core13 = require("@lessonkit/core");
+var import_react21 = require("react");
+var import_core14 = require("@lessonkit/core");
+
+// src/compound/resumeChildHandles.ts
+function filterRegisteredChildStates(handles, childStates) {
+  const filtered = {};
+  for (const [key, value] of Object.entries(childStates)) {
+    if (handles.has(key)) {
+      filtered[key] = value;
+    }
+  }
+  return filtered;
+}
+function resumeChildHandles(handles, childStates, opts) {
+  const pendingKeys = Object.keys(childStates);
+  const alreadyResumed = opts?.alreadyResumed;
+  if (opts?.waitForHandles && pendingKeys.length > 0) {
+    if (handles.size === 0) return false;
+    const registeredPending = pendingKeys.filter((k) => handles.has(k));
+    if (registeredPending.length === 0) {
+      return false;
+    }
+    if (registeredPending.length < pendingKeys.length) {
+      for (const key of registeredPending) {
+        if (alreadyResumed?.has(key)) continue;
+        const handle = handles.get(key);
+        const child = childStates[key];
+        if (handle?.resume && child) {
+          handle.resume(child);
+          alreadyResumed?.add(key);
+        }
+      }
+      return false;
+    }
+  }
+  for (const [checkId, handle] of handles) {
+    if (alreadyResumed?.has(checkId)) continue;
+    const child = childStates[checkId];
+    if (child && handle.resume) {
+      handle.resume(child);
+      alreadyResumed?.add(checkId);
+    }
+  }
+  return true;
+}
 
 // src/compound/useCompoundResume.ts
-var import_react18 = require("react");
-var import_core11 = require("@lessonkit/core");
+var import_react20 = require("react");
 var import_core12 = require("@lessonkit/core");
+var import_core13 = require("@lessonkit/core");
+var warnedCompoundPersistFailure = false;
+function warnCompoundPersistFailure() {
+  if (warnedCompoundPersistFailure || !isDevEnvironment4()) return;
+  warnedCompoundPersistFailure = true;
+  console.warn(
+    "[lessonkit] compound resume state could not be saved to sessionStorage (quota or privacy mode); progress may be lost on reload."
+  );
+}
 function useCompoundResume(opts) {
-  const storageRef = (0, import_react18.useRef)(opts.storage ?? (0, import_core12.createSessionStoragePort)());
-  const resumedRef = (0, import_react18.useRef)(false);
-  (0, import_react18.useEffect)(() => {
+  const lessonkitCtx = (0, import_react20.useContext)(LessonkitContext);
+  const storageRef = (0, import_react20.useRef)(opts.storage ?? lessonkitCtx?.storage ?? (0, import_core13.createSessionStoragePort)());
+  const resumedRef = (0, import_react20.useRef)(false);
+  const resumeKeyRef = (0, import_react20.useRef)("");
+  const prevEnabledRef = (0, import_react20.useRef)(opts.enabled);
+  (0, import_react20.useEffect)(() => {
+    storageRef.current = opts.storage ?? lessonkitCtx?.storage ?? (0, import_core13.createSessionStoragePort)();
+  }, [opts.storage, lessonkitCtx?.storage]);
+  (0, import_react20.useEffect)(() => {
+    if (!prevEnabledRef.current && opts.enabled) {
+      resumedRef.current = false;
+    }
+    prevEnabledRef.current = opts.enabled;
+    const key = `${opts.courseId ?? ""}:${opts.compoundId}`;
+    if (resumeKeyRef.current !== key) {
+      resumeKeyRef.current = key;
+      resumedRef.current = false;
+    }
     if (!opts.enabled || !opts.courseId || resumedRef.current) return;
-    const saved = (0, import_core11.loadCompoundState)(storageRef.current, opts.courseId, opts.compoundId);
+    const saved = (0, import_core12.loadCompoundState)(storageRef.current, opts.courseId, opts.compoundId);
     if (saved) {
       resumedRef.current = true;
       opts.onResume?.(saved);
     }
   }, [opts.enabled, opts.courseId, opts.compoundId, opts.onResume]);
-  return (0, import_react18.useCallback)(
+  return (0, import_react20.useCallback)(
     (state) => {
       if (!opts.enabled || !opts.courseId) return;
-      (0, import_core11.saveCompoundState)(storageRef.current, opts.courseId, opts.compoundId, state);
+      const persisted = (0, import_core12.saveCompoundState)(storageRef.current, opts.courseId, opts.compoundId, state);
+      if (!persisted) warnCompoundPersistFailure();
     },
     [opts.enabled, opts.courseId, opts.compoundId]
   );
 }
 
 // src/compound/useCompoundPersistence.ts
-function readCompoundInitialIndex(courseId, compoundId, pageCount, enabled, storage = (0, import_core13.createSessionStoragePort)()) {
+function readCompoundInitialIndex(courseId, compoundId, pageCount, enabled, storage = (0, import_core14.createSessionStoragePort)()) {
   if (!enabled || !courseId || pageCount < 1) return 0;
-  const saved = (0, import_core13.loadCompoundState)(storage, courseId, compoundId);
+  const saved = (0, import_core14.loadCompoundState)(storage, courseId, compoundId);
   if (!saved) return 0;
-  return (0, import_core13.clampCompoundPageIndex)(saved.activePageIndex, pageCount);
+  return (0, import_core14.clampCompoundPageIndex)(saved.activePageIndex, pageCount);
+}
+function stripOrphanChildStates(handles, childStates) {
+  return filterRegisteredChildStates(handles, childStates);
 }
 function useCompoundPersistence(opts) {
-  const storage = opts.storage ?? (0, import_core13.createSessionStoragePort)();
+  const lessonkitCtx = (0, import_react21.useContext)(LessonkitContext);
+  const storage = opts.storage ?? lessonkitCtx?.storage ?? (0, import_core14.createSessionStoragePort)();
   const ctx = useCompoundRegistry();
   const handlesVersion = useCompoundHandlesVersion();
-  const pendingChildResumeRef = (0, import_react19.useRef)(null);
-  const loadedChildStatesRef = (0, import_react19.useRef)({});
-  const skipSaveUntilHydratedRef = (0, import_react19.useRef)(false);
-  const buildState = (0, import_react19.useCallback)(() => {
+  const bridgeRef = useCompoundHydrationBridgeRef();
+  const pendingChildResumeRef = (0, import_react21.useRef)(null);
+  const resumedChildKeysRef = (0, import_react21.useRef)(/* @__PURE__ */ new Set());
+  const loadedChildStatesRef = (0, import_react21.useRef)({});
+  const skipSaveUntilHydratedRef = (0, import_react21.useRef)(false);
+  const hydrationKeyRef = (0, import_react21.useRef)("");
+  const hydrationInitRef = (0, import_react21.useRef)(false);
+  const hydrationKey = `${opts.courseId ?? ""}:${opts.compoundId}`;
+  if (hydrationKeyRef.current !== hydrationKey) {
+    hydrationKeyRef.current = hydrationKey;
+    hydrationInitRef.current = false;
+    loadedChildStatesRef.current = {};
+    skipSaveUntilHydratedRef.current = false;
+    pendingChildResumeRef.current = null;
+    resumedChildKeysRef.current = /* @__PURE__ */ new Set();
+  }
+  if (!hydrationInitRef.current && opts.enabled && opts.courseId) {
+    hydrationInitRef.current = true;
+    const saved = (0, import_core14.loadCompoundState)(storage, opts.courseId, opts.compoundId);
+    if (saved && Object.keys(saved.childStates).length > 0) {
+      loadedChildStatesRef.current = { ...saved.childStates };
+      skipSaveUntilHydratedRef.current = true;
+      pendingChildResumeRef.current = saved;
+    }
+  }
+  const buildState = (0, import_react21.useCallback)(() => {
     const childStates = {
       ...loadedChildStatesRef.current
     };
     if (ctx) {
-      for (const [checkId, handle] of ctx.getHandles()) {
+      for (const [checkId, entry] of ctx.getRegisteredHandles()) {
+        const handle = entry.handle;
         if (handle.getCurrentState) {
           childStates[checkId] = handle.getCurrentState();
           delete loadedChildStatesRef.current[checkId];
         }
       }
     }
-    return (0, import_core13.createCompoundResumeState)({
-      activePageIndex: (0, import_core13.clampCompoundPageIndex)(opts.index, opts.pageCount),
+    return (0, import_core14.createCompoundResumeState)({
+      activePageIndex: (0, import_core14.clampCompoundPageIndex)(opts.index, opts.pageCount),
       childStates
     });
   }, [ctx, opts.index, opts.pageCount]);
-  const applyPendingChildResume = (0, import_react19.useCallback)(() => {
+  const buildStateRef = (0, import_react21.useRef)(buildState);
+  buildStateRef.current = buildState;
+  const finalizeHydration = (0, import_react21.useCallback)(
+    (childStates) => {
+      loadedChildStatesRef.current = {
+        ...loadedChildStatesRef.current,
+        ...childStates
+      };
+      skipSaveUntilHydratedRef.current = false;
+      pendingChildResumeRef.current = null;
+    },
+    []
+  );
+  const applyPendingChildResume = (0, import_react21.useCallback)(() => {
     const pending = pendingChildResumeRef.current;
     if (!pending || !ctx) return;
-    const applied = resumeChildHandles(ctx.getHandles(), pending.childStates, { waitForHandles: true });
-    if (!applied) return;
-    pendingChildResumeRef.current = null;
-    skipSaveUntilHydratedRef.current = false;
-  }, [ctx]);
+    const handles = ctx.getHandles();
+    const applied = resumeChildHandles(handles, pending.childStates, {
+      waitForHandles: true,
+      alreadyResumed: resumedChildKeysRef.current
+    });
+    if (!applied) {
+      const handlesAtWait = handles.size;
+      queueMicrotask(() => {
+        if (pendingChildResumeRef.current !== pending) return;
+        const handlesNow = ctx.getHandles();
+        if (handlesNow.size !== handlesAtWait) return;
+        const registeredOnly2 = stripOrphanChildStates(handlesNow, pending.childStates);
+        resumeChildHandles(handlesNow, registeredOnly2, {
+          alreadyResumed: resumedChildKeysRef.current
+        });
+        finalizeHydration(registeredOnly2);
+      });
+      return;
+    }
+    const registeredOnly = stripOrphanChildStates(handles, pending.childStates);
+    finalizeHydration(registeredOnly);
+  }, [ctx, finalizeHydration]);
   const saveResume = useCompoundResume({
     courseId: opts.courseId,
     compoundId: opts.compoundId,
     enabled: opts.enabled,
     storage,
     onResume: (state) => {
-      const clamped = (0, import_core13.clampCompoundPageIndex)(state.activePageIndex, opts.pageCount);
+      const clamped = (0, import_core14.clampCompoundPageIndex)(state.activePageIndex, opts.pageCount);
       loadedChildStatesRef.current = { ...state.childStates };
       skipSaveUntilHydratedRef.current = Object.keys(state.childStates).length > 0;
       opts.setIndex(clamped);
-      pendingChildResumeRef.current = { ...state, activePageIndex: clamped };
+      resumedChildKeysRef.current = /* @__PURE__ */ new Set();
+      pendingChildResumeRef.current = { ...state, activePageIndex: clamped, childStates: state.childStates };
       queueMicrotask(() => applyPendingChildResume());
     }
   });
-  (0, import_react19.useEffect)(() => {
+  const persistNow = (0, import_react21.useCallback)(() => {
     if (!opts.enabled || !opts.courseId) return;
-    if (skipSaveUntilHydratedRef.current) return;
-    saveResume(buildState());
-  }, [
-    opts.enabled,
-    opts.courseId,
-    opts.index,
-    opts.pageCount,
-    handlesVersion,
-    saveResume,
-    buildState
-  ]);
-  (0, import_react19.useEffect)(() => {
+    saveResume(buildStateRef.current());
+  }, [opts.enabled, opts.courseId, saveResume]);
+  const notifyImperativeResume = (0, import_react21.useCallback)(
+    (state) => {
+      const clamped = (0, import_core14.clampCompoundPageIndex)(state.activePageIndex, opts.pageCount);
+      loadedChildStatesRef.current = { ...state.childStates };
+      skipSaveUntilHydratedRef.current = Object.keys(state.childStates).length > 0;
+      opts.setIndex(clamped);
+      resumedChildKeysRef.current = /* @__PURE__ */ new Set();
+      pendingChildResumeRef.current = { ...state, activePageIndex: clamped, childStates: state.childStates };
+      queueMicrotask(() => applyPendingChildResume());
+    },
+    [opts.pageCount, opts.setIndex, applyPendingChildResume]
+  );
+  (0, import_react21.useEffect)(() => {
+    if (!bridgeRef) return;
+    bridgeRef.current = { notifyImperativeResume };
+    return () => {
+      if (bridgeRef.current?.notifyImperativeResume === notifyImperativeResume) {
+        bridgeRef.current = null;
+      }
+    };
+  }, [bridgeRef, notifyImperativeResume]);
+  (0, import_react21.useEffect)(() => {
+    persistNow();
+  }, [persistNow, opts.index, opts.pageCount, handlesVersion]);
+  (0, import_react21.useEffect)(() => {
     applyPendingChildResume();
   }, [opts.index, handlesVersion, applyPendingChildResume]);
+  (0, import_react21.useEffect)(() => {
+    if (!opts.enabled || !opts.courseId || typeof document === "undefined") return;
+    const flushOnExit = () => {
+      if (document.visibilityState === "hidden") persistNow();
+    };
+    document.addEventListener("visibilitychange", flushOnExit);
+    window.addEventListener("pagehide", flushOnExit);
+    return () => {
+      document.removeEventListener("visibilitychange", flushOnExit);
+      window.removeEventListener("pagehide", flushOnExit);
+    };
+  }, [opts.enabled, opts.courseId, persistNow]);
 }
 
 // src/compound/useCompoundShell.ts
@@ -2614,18 +2985,19 @@ function useCompoundShell(opts) {
     storage: opts.storage
   });
   const { goNext, goPrev, progress } = useCompoundNavigation(opts.pageCount, opts.index, opts.setIndex);
-  const visibleIndex = (0, import_core14.clampCompoundPageIndex)(opts.index, opts.pageCount);
+  const visibleIndex = (0, import_core15.clampCompoundPageIndex)(opts.index, opts.pageCount);
   useCompoundHandleRef(opts.ref, {
     activePageIndex: visibleIndex,
     setActivePageIndex: opts.setIndex,
     getHandles: () => ctx?.getHandles() ?? /* @__PURE__ */ new Map(),
+    getRegisteredHandles: () => ctx?.getRegisteredHandles() ?? /* @__PURE__ */ new Map(),
     pageCount: opts.pageCount,
     enableSolutionsButton: opts.enableSolutionsButton
   });
   return { visibleIndex, goNext, goPrev, progress, ctx };
 }
 function useCompoundInitialIndex(opts) {
-  return (0, import_react20.useMemo)(
+  return (0, import_react22.useMemo)(
     () => readCompoundInitialIndex(
       opts.courseId,
       opts.compoundId,
@@ -2638,8 +3010,8 @@ function useCompoundInitialIndex(opts) {
 }
 
 // src/compound/validateChildren.ts
-var import_react21 = __toESM(require("react"), 1);
-var import_core15 = require("@lessonkit/core");
+var import_react23 = __toESM(require("react"), 1);
+var import_core16 = require("@lessonkit/core");
 
 // src/compound/blockType.ts
 var LESSONKIT_BLOCK_TYPE = /* @__PURE__ */ Symbol.for("lessonkit.blockType");
@@ -2663,6 +3035,8 @@ var warnedPairs = /* @__PURE__ */ new Set();
 var COMPOUND_CONTAINER_TYPES = /* @__PURE__ */ new Set([
   "Page",
   "InteractiveBook",
+  "Slide",
+  "SlideDeck",
   "AssessmentSequence"
 ]);
 function warnOrThrow(msg, strict) {
@@ -2673,8 +3047,8 @@ function warnOrThrow(msg, strict) {
   }
 }
 function validateNode(parent, node, depth, strict) {
-  import_react21.default.Children.forEach(node, (child) => {
-    if (!import_react21.default.isValidElement(child)) return;
+  import_react23.default.Children.forEach(node, (child) => {
+    if (!import_react23.default.isValidElement(child)) return;
     const blockType = getLessonkitBlockType(child.type);
     if (!blockType) {
       if (child.props && typeof child.props === "object" && "children" in child.props) {
@@ -2682,7 +3056,7 @@ function validateNode(parent, node, depth, strict) {
       }
       return;
     }
-    if (!(0, import_core15.isChildTypeAllowed)(parent, blockType)) {
+    if (!(0, import_core16.isChildTypeAllowed)(parent, blockType)) {
       const key = `${parent}:${blockType}`;
       if (!warnedPairs.has(key)) {
         warnedPairs.add(key);
@@ -2692,7 +3066,7 @@ function validateNode(parent, node, depth, strict) {
       }
     }
     if (COMPOUND_CONTAINER_TYPES.has(blockType)) {
-      const maxDepth = import_core15.COMPOUND_MAX_NESTING_DEPTH[parent];
+      const maxDepth = import_core16.COMPOUND_MAX_NESTING_DEPTH[parent];
       if (depth >= maxDepth) {
         warnOrThrow(
           `[lessonkit] Block "${blockType}" exceeds max nesting depth (${maxDepth}) for "${parent}"`,
@@ -2707,15 +3081,15 @@ function validateNode(parent, node, depth, strict) {
     } else if (child.props && typeof child.props === "object" && "children" in child.props) {
       validateSubtreeForForbidden(
         child.props.children,
-        import_core15.ACCORDION_FORBIDDEN_CHILD_TYPES,
+        import_core16.ACCORDION_FORBIDDEN_CHILD_TYPES,
         strict
       );
     }
   });
 }
 function validateSubtreeForForbidden(node, forbidden, strict) {
-  import_react21.default.Children.forEach(node, (child) => {
-    if (!import_react21.default.isValidElement(child)) return;
+  import_react23.default.Children.forEach(node, (child) => {
+    if (!import_react23.default.isValidElement(child)) return;
     const blockType = getLessonkitBlockType(child.type);
     if (blockType && forbidden.includes(blockType)) {
       warnOrThrow(`[lessonkit] Block "${blockType}" must not nest inside Accordion`, strict);
@@ -2737,7 +3111,7 @@ function validateSubtreeForForbidden(node, forbidden, strict) {
 function validateAccordionSections(sections, strict) {
   if (!isDevEnvironment4() && !strict) return;
   for (const section of sections) {
-    validateSubtreeForForbidden(section.content, import_core15.ACCORDION_FORBIDDEN_CHILD_TYPES, strict);
+    validateSubtreeForForbidden(section.content, import_core16.ACCORDION_FORBIDDEN_CHILD_TYPES, strict);
   }
 }
 function validateCompoundChildren(parent, children, strict) {
@@ -2755,8 +3129,8 @@ function warnSharedCompoundStorageKey(opts) {
 }
 
 // src/blocks/AssessmentSequence.tsx
-var import_jsx_runtime11 = require("react/jsx-runtime");
-var AssessmentSequenceInner = (0, import_react22.forwardRef)(
+var import_jsx_runtime13 = require("react/jsx-runtime");
+var AssessmentSequenceInner = (0, import_react24.forwardRef)(
   function AssessmentSequenceInner2(props, ref) {
     const { compoundId, childArray, index, setIndex, persistEnabled } = props;
     const sequential = props.sequential !== false;
@@ -2773,18 +3147,18 @@ var AssessmentSequenceInner = (0, import_react22.forwardRef)(
     });
     validateCompoundChildren("AssessmentSequence", props.children);
     if (!sequential) {
-      return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("section", { "aria-label": "Assessment sequence", "data-testid": "assessment-sequence", children: props.children });
+      return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("section", { "aria-label": "Assessment sequence", "data-testid": "assessment-sequence", children: props.children });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)("section", { "aria-label": "Assessment sequence", "data-testid": "assessment-sequence", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)("p", { children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("section", { "aria-label": "Assessment sequence", "data-testid": "assessment-sequence", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("p", { children: [
         "Question ",
         progress.current,
         " of ",
         progress.total
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { "data-testid": "assessment-sequence-step", children: childArray.map((child, i) => /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { hidden: i !== visibleIndex, children: child }, child.key ?? i)) }),
-      /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)("nav", { "aria-label": "Sequence navigation", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { "data-testid": "assessment-sequence-step", children: childArray.map((child, i) => /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { hidden: i !== visibleIndex, children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(CompoundPageIndexProvider, { pageIndex: i, children: child }) }, child.key ?? i)) }),
+      /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("nav", { "aria-label": "Sequence navigation", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
           "button",
           {
             type: "button",
@@ -2794,7 +3168,7 @@ var AssessmentSequenceInner = (0, import_react22.forwardRef)(
             children: "Previous"
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
           "button",
           {
             type: "button",
@@ -2808,18 +3182,23 @@ var AssessmentSequenceInner = (0, import_react22.forwardRef)(
     ] });
   }
 );
-var AssessmentSequence = (0, import_react22.forwardRef)(
+var AssessmentSequence = (0, import_react24.forwardRef)(
   function AssessmentSequence2(props, ref) {
-    const compoundId = (0, import_react22.useMemo)(
-      () => props.blockId ? normalizeComponentId(props.blockId, "blockId") : DEFAULT_ASSESSMENT_SEQUENCE_COMPOUND_ID,
+    const reactInstanceId = (0, import_react24.useId)();
+    const autoCompoundIdRef = (0, import_react24.useRef)(null);
+    if (!props.blockId && !autoCompoundIdRef.current) {
+      autoCompoundIdRef.current = (0, import_core17.deriveId)(`assessment-sequence-${reactInstanceId}`);
+    }
+    const compoundId = (0, import_react24.useMemo)(
+      () => props.blockId ? normalizeComponentId(props.blockId, "blockId") : autoCompoundIdRef.current ?? DEFAULT_ASSESSMENT_SEQUENCE_COMPOUND_ID,
       [props.blockId]
     );
-    const childArray = import_react22.default.Children.toArray(props.children).filter(
-      import_react22.default.isValidElement
+    const childArray = import_react24.default.Children.toArray(props.children).filter(
+      import_react24.default.isValidElement
     );
-    const { config } = useLessonkit();
+    const { config, storage } = useLessonkit();
     const persistEnabled = config.session?.persistCompoundState !== false;
-    (0, import_react22.useEffect)(() => {
+    (0, import_react24.useEffect)(() => {
       warnSharedCompoundStorageKey({
         persistEnabled,
         hasExplicitBlockId: Boolean(props.blockId),
@@ -2830,11 +3209,15 @@ var AssessmentSequence = (0, import_react22.forwardRef)(
       courseId: config.courseId,
       compoundId,
       pageCount: childArray.length,
-      persistEnabled
+      persistEnabled,
+      storage
     });
-    const [index, setIndex] = (0, import_react22.useState)(initialIndex);
-    const setIndexStable = (0, import_react22.useCallback)((i) => setIndex(i), []);
-    return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(CompoundProvider, { activePageIndex: index, onActivePageIndexChange: setIndexStable, children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+    const [index, setIndex] = (0, import_react24.useState)(initialIndex);
+    const setIndexStable = (0, import_react24.useCallback)((i) => setIndex(i), []);
+    (0, import_react24.useEffect)(() => {
+      setIndex(initialIndex);
+    }, [config.courseId, compoundId, initialIndex]);
+    return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(CompoundProvider, { activePageIndex: index, onActivePageIndexChange: setIndexStable, children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
       AssessmentSequenceInner,
       {
         ...props,
@@ -2851,25 +3234,25 @@ var AssessmentSequence = (0, import_react22.forwardRef)(
 setLessonkitBlockType(AssessmentSequence, "AssessmentSequence");
 
 // src/blocks/Text.tsx
-var import_react23 = require("react");
-var import_jsx_runtime12 = require("react/jsx-runtime");
+var import_react25 = require("react");
+var import_jsx_runtime14 = require("react/jsx-runtime");
 function Text(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("p", { "data-lk-block-id": props.blockId, "data-testid": props.blockId ? `text-${props.blockId}` : "text", children: props.children });
+  return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("p", { "data-lk-block-id": props.blockId, "data-testid": props.blockId ? `text-${props.blockId}` : "text", children: props.children });
 }
 setLessonkitBlockType(Text, "Text");
 
 // src/blocks/Heading.tsx
-var import_jsx_runtime13 = require("react/jsx-runtime");
+var import_jsx_runtime15 = require("react/jsx-runtime");
 function Heading(props) {
   const Tag = `h${props.level}`;
-  return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Tag, { "data-lk-block-id": props.blockId, "data-testid": props.blockId ? `heading-${props.blockId}` : "heading", children: props.children });
+  return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Tag, { "data-lk-block-id": props.blockId, "data-testid": props.blockId ? `heading-${props.blockId}` : "heading", children: props.children });
 }
 setLessonkitBlockType(Heading, "Heading");
 
 // src/blocks/Image.tsx
-var import_jsx_runtime14 = require("react/jsx-runtime");
+var import_jsx_runtime16 = require("react/jsx-runtime");
 function Image(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
     "img",
     {
       src: props.src,
@@ -2883,14 +3266,14 @@ function Image(props) {
 setLessonkitBlockType(Image, "Image");
 
 // src/blocks/Page.tsx
-var import_react24 = require("react");
-var import_jsx_runtime15 = require("react/jsx-runtime");
+var import_react26 = require("react");
+var import_jsx_runtime17 = require("react/jsx-runtime");
 function Page(props) {
   validateCompoundChildren("Page", props.children);
   const { track } = useLessonkit();
   const lessonId = useEnclosingLessonId();
-  (0, import_react24.useEffect)(() => {
-    if (props.hidden || !lessonId) return;
+  (0, import_react26.useEffect)(() => {
+    if (props.hidden || !lessonId || props.parentType) return;
     track(
       "compound_page_viewed",
       {
@@ -2901,7 +3284,7 @@ function Page(props) {
       { lessonId }
     );
   }, [props.hidden, props.pageIndex, props.parentType, props.blockId, lessonId, track]);
-  return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(
     "section",
     {
       "aria-label": props.title ?? "Page",
@@ -2909,8 +3292,8 @@ function Page(props) {
       "data-testid": `page-${props.blockId}`,
       hidden: props.hidden ? true : void 0,
       children: [
-        props.title ? /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("h3", { children: props.title }) : null,
-        /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { children: props.children })
+        props.title ? /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("h3", { children: props.title }) : null,
+        /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(CompoundPageIndexProvider, { pageIndex: props.pageIndex ?? 0, children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { children: props.children }) })
       ]
     }
   );
@@ -2918,9 +3301,9 @@ function Page(props) {
 setLessonkitBlockType(Page, "Page");
 
 // src/blocks/InteractiveBook.tsx
-var import_react25 = __toESM(require("react"), 1);
-var import_jsx_runtime16 = require("react/jsx-runtime");
-var InteractiveBookInner = (0, import_react25.forwardRef)(
+var import_react27 = __toESM(require("react"), 1);
+var import_jsx_runtime18 = require("react/jsx-runtime");
+var InteractiveBookInner = (0, import_react27.forwardRef)(
   function InteractiveBookInner2(props, ref) {
     const { blockId, pages, index, setIndex, persistEnabled } = props;
     validateCompoundChildren("InteractiveBook", pages);
@@ -2935,11 +3318,11 @@ var InteractiveBookInner = (0, import_react25.forwardRef)(
       persistEnabled,
       ref
     });
-    const pageTitles = (0, import_react25.useMemo)(
+    const pageTitles = (0, import_react27.useMemo)(
       () => pages.map((page) => page.props.title),
       [pages]
     );
-    (0, import_react25.useEffect)(() => {
+    (0, import_react27.useEffect)(() => {
       if (!lessonId || pages.length === 0) return;
       track(
         "book_page_viewed",
@@ -2951,31 +3334,31 @@ var InteractiveBookInner = (0, import_react25.forwardRef)(
         { lessonId }
       );
     }, [visibleIndex, blockId, lessonId, pages.length, pageTitles, track]);
-    return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("section", { "aria-label": props.title, "data-testid": "interactive-book", "data-lk-block-id": blockId, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("h3", { children: props.title }),
-      /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("p", { children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("section", { "aria-label": props.title, "data-testid": "interactive-book", "data-lk-block-id": blockId, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("h3", { children: props.title }),
+      /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("p", { children: [
         "Page ",
         progress.current,
         " of ",
         progress.total
       ] }),
-      props.showBookScore && ctx ? /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("p", { "data-testid": "book-score", children: [
+      props.showBookScore && ctx ? /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("p", { "data-testid": "book-score", children: [
         "Score: ",
         Array.from(ctx.getHandles().values()).reduce((s, h) => s + h.getScore(), 0),
         " /",
         " ",
         Array.from(ctx.getHandles().values()).reduce((s, h) => s + h.getMaxScore(), 0)
       ] }) : null,
-      /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { "data-testid": "interactive-book-page", children: pages.map(
-        (page, i) => import_react25.default.cloneElement(page, {
+      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { "data-testid": "interactive-book-page", children: pages.map(
+        (page, i) => import_react27.default.cloneElement(page, {
           key: page.key ?? page.props.blockId,
           hidden: i !== visibleIndex,
           pageIndex: i,
           parentType: "InteractiveBook"
         })
       ) }),
-      /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("nav", { "aria-label": "Book navigation", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("nav", { "aria-label": "Book navigation", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
           "button",
           {
             type: "button",
@@ -2985,7 +3368,7 @@ var InteractiveBookInner = (0, import_react25.forwardRef)(
             children: "Previous"
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
           "button",
           {
             type: "button",
@@ -2999,25 +3382,29 @@ var InteractiveBookInner = (0, import_react25.forwardRef)(
     ] });
   }
 );
-var InteractiveBook = (0, import_react25.forwardRef)(function InteractiveBook2(props, ref) {
-  const blockId = (0, import_react25.useMemo)(
+var InteractiveBook = (0, import_react27.forwardRef)(function InteractiveBook2(props, ref) {
+  const blockId = (0, import_react27.useMemo)(
     () => normalizeComponentId(props.blockId, "blockId"),
     [props.blockId]
   );
-  const pages = import_react25.default.Children.toArray(props.children).filter(
-    import_react25.default.isValidElement
+  const pages = import_react27.default.Children.toArray(props.children).filter(
+    import_react27.default.isValidElement
   );
-  const { config } = useLessonkit();
+  const { config, storage } = useLessonkit();
   const persistEnabled = config.session?.persistCompoundState !== false;
   const initialIndex = useCompoundInitialIndex({
     courseId: config.courseId,
     compoundId: blockId,
     pageCount: pages.length,
-    persistEnabled
+    persistEnabled,
+    storage
   });
-  const [index, setIndex] = (0, import_react25.useState)(initialIndex);
-  const setIndexStable = (0, import_react25.useCallback)((i) => setIndex(i), []);
-  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(CompoundProvider, { activePageIndex: index, onActivePageIndexChange: setIndexStable, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+  const [index, setIndex] = (0, import_react27.useState)(initialIndex);
+  const setIndexStable = (0, import_react27.useCallback)((i) => setIndex(i), []);
+  (0, import_react27.useEffect)(() => {
+    setIndex(initialIndex);
+  }, [config.courseId, blockId, initialIndex]);
+  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(CompoundProvider, { activePageIndex: index, onActivePageIndexChange: setIndexStable, children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
     InteractiveBookInner,
     {
       ...props,
@@ -3032,17 +3419,249 @@ var InteractiveBook = (0, import_react25.forwardRef)(function InteractiveBook2(p
 });
 setLessonkitBlockType(InteractiveBook, "InteractiveBook");
 
+// src/blocks/Slide.tsx
+var import_react28 = require("react");
+var import_jsx_runtime19 = require("react/jsx-runtime");
+function Slide(props) {
+  validateCompoundChildren("Slide", props.children);
+  const { track } = useLessonkit();
+  const lessonId = useEnclosingLessonId();
+  (0, import_react28.useEffect)(() => {
+    if (props.hidden || !lessonId || props.parentType) return;
+    track(
+      "compound_page_viewed",
+      {
+        blockId: props.blockId,
+        pageIndex: props.slideIndex ?? 0,
+        parentType: props.parentType
+      },
+      { lessonId }
+    );
+  }, [props.hidden, props.slideIndex, props.parentType, props.blockId, lessonId, track]);
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(
+    "section",
+    {
+      "aria-label": props.title ?? "Slide",
+      "data-lk-block-id": props.blockId,
+      "data-testid": `slide-${props.blockId}`,
+      hidden: props.hidden ? true : void 0,
+      children: [
+        props.title ? /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("h3", { children: props.title }) : null,
+        /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(CompoundPageIndexProvider, { pageIndex: props.slideIndex ?? 0, children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { children: props.children }) })
+      ]
+    }
+  );
+}
+setLessonkitBlockType(Slide, "Slide");
+
+// src/blocks/SlideDeck.tsx
+var import_react30 = __toESM(require("react"), 1);
+
+// src/compound/useCompoundKeyboardNav.ts
+var import_react29 = require("react");
+var INTERACTIVE_TAGS = /* @__PURE__ */ new Set(["INPUT", "TEXTAREA", "SELECT", "BUTTON"]);
+function isEditableTarget(target) {
+  if (!(target instanceof HTMLElement)) return false;
+  if (INTERACTIVE_TAGS.has(target.tagName)) return true;
+  if (target.isContentEditable) return true;
+  if (target.closest("[role='slider'], [role='listbox'], [data-lk-assessment-interactive]")) {
+    return true;
+  }
+  return false;
+}
+function useCompoundKeyboardNav(opts) {
+  const { containerRef, visibleIndex, pageCount, goNext, goPrev, setIndex } = opts;
+  (0, import_react29.useEffect)(() => {
+    const el = containerRef.current;
+    if (!el || pageCount === 0) return;
+    const onKeyDown = (event) => {
+      if (!el.contains(document.activeElement) && document.activeElement !== document.body) {
+        return;
+      }
+      if (isEditableTarget(event.target)) return;
+      switch (event.key) {
+        case "ArrowRight":
+        case "ArrowDown":
+          if (visibleIndex < pageCount - 1) {
+            event.preventDefault();
+            goNext();
+          }
+          break;
+        case "ArrowLeft":
+        case "ArrowUp":
+          if (visibleIndex > 0) {
+            event.preventDefault();
+            goPrev();
+          }
+          break;
+        case "Home":
+          if (visibleIndex !== 0) {
+            event.preventDefault();
+            setIndex(0);
+          }
+          break;
+        case "End":
+          if (visibleIndex !== pageCount - 1) {
+            event.preventDefault();
+            setIndex(pageCount - 1);
+          }
+          break;
+        default:
+          break;
+      }
+    };
+    el.addEventListener("keydown", onKeyDown);
+    return () => el.removeEventListener("keydown", onKeyDown);
+  }, [containerRef, visibleIndex, pageCount, goNext, goPrev, setIndex]);
+}
+
+// src/blocks/SlideDeck.tsx
+var import_jsx_runtime20 = require("react/jsx-runtime");
+var SlideDeckInner = (0, import_react30.forwardRef)(function SlideDeckInner2(props, ref) {
+  const { blockId, slides, index, setIndex, persistEnabled } = props;
+  validateCompoundChildren("SlideDeck", slides);
+  const { config, track } = useLessonkit();
+  const lessonId = useEnclosingLessonId();
+  const containerRef = (0, import_react30.useRef)(null);
+  const { visibleIndex, goNext, goPrev, progress, ctx } = useCompoundShell({
+    courseId: config.courseId,
+    compoundId: blockId,
+    pageCount: slides.length,
+    index,
+    setIndex,
+    persistEnabled,
+    ref
+  });
+  const setIndexStable = (0, import_react30.useCallback)((i) => setIndex(i), [setIndex]);
+  useCompoundKeyboardNav({
+    containerRef,
+    visibleIndex,
+    pageCount: slides.length,
+    goNext,
+    goPrev,
+    setIndex: setIndexStable
+  });
+  const slideTitles = (0, import_react30.useMemo)(
+    () => slides.map((slide) => slide.props.title),
+    [slides]
+  );
+  (0, import_react30.useEffect)(() => {
+    if (!lessonId || slides.length === 0) return;
+    track(
+      "slide_viewed",
+      {
+        blockId,
+        slideIndex: visibleIndex,
+        slideTitle: slideTitles[visibleIndex]
+      },
+      { lessonId }
+    );
+  }, [visibleIndex, blockId, lessonId, slides.length, slideTitles, track]);
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
+    "section",
+    {
+      ref: containerRef,
+      tabIndex: -1,
+      "aria-label": props.title,
+      "data-testid": "slide-deck",
+      "data-lk-block-id": blockId,
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("h3", { children: props.title }),
+        /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("p", { children: [
+          "Slide ",
+          progress.current,
+          " of ",
+          progress.total
+        ] }),
+        props.showDeckScore && ctx ? /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("p", { "data-testid": "deck-score", children: [
+          "Score: ",
+          Array.from(ctx.getHandles().values()).reduce((s, h) => s + h.getScore(), 0),
+          " /",
+          " ",
+          Array.from(ctx.getHandles().values()).reduce((s, h) => s + h.getMaxScore(), 0)
+        ] }) : null,
+        /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { "data-testid": "slide-deck-slide", children: slides.map(
+          (slide, i) => import_react30.default.cloneElement(slide, {
+            key: slide.key ?? slide.props.blockId,
+            hidden: i !== visibleIndex,
+            slideIndex: i,
+            parentType: "SlideDeck"
+          })
+        ) }),
+        /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("nav", { "aria-label": "Slide navigation", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+            "button",
+            {
+              type: "button",
+              "data-testid": "slide-prev",
+              disabled: visibleIndex === 0 || slides.length === 0,
+              onClick: goPrev,
+              children: "Previous slide"
+            }
+          ),
+          /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+            "button",
+            {
+              type: "button",
+              "data-testid": "slide-next",
+              disabled: visibleIndex >= slides.length - 1 || slides.length === 0,
+              onClick: goNext,
+              children: "Next slide"
+            }
+          )
+        ] })
+      ]
+    }
+  );
+});
+var SlideDeck = (0, import_react30.forwardRef)(function SlideDeck2(props, ref) {
+  const blockId = (0, import_react30.useMemo)(
+    () => normalizeComponentId(props.blockId, "blockId"),
+    [props.blockId]
+  );
+  const slides = import_react30.default.Children.toArray(props.children).filter(
+    import_react30.default.isValidElement
+  );
+  const { config, storage } = useLessonkit();
+  const persistEnabled = config.session?.persistCompoundState !== false;
+  const initialIndex = useCompoundInitialIndex({
+    courseId: config.courseId,
+    compoundId: blockId,
+    pageCount: slides.length,
+    persistEnabled,
+    storage
+  });
+  const [index, setIndex] = (0, import_react30.useState)(initialIndex);
+  const setIndexStable = (0, import_react30.useCallback)((i) => setIndex(i), []);
+  (0, import_react30.useEffect)(() => {
+    setIndex(initialIndex);
+  }, [config.courseId, blockId, initialIndex]);
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(CompoundProvider, { activePageIndex: index, onActivePageIndexChange: setIndexStable, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+    SlideDeckInner,
+    {
+      ...props,
+      ref,
+      blockId,
+      slides,
+      index,
+      setIndex,
+      persistEnabled
+    }
+  ) });
+});
+setLessonkitBlockType(SlideDeck, "SlideDeck");
+
 // src/blocks/Accordion.tsx
-var import_react26 = require("react");
-var import_jsx_runtime17 = require("react/jsx-runtime");
+var import_react31 = require("react");
+var import_jsx_runtime21 = require("react/jsx-runtime");
 function Accordion(props) {
   if (isDevEnvironment4()) {
     validateAccordionSections(props.sections);
   }
-  const [open, setOpen] = (0, import_react26.useState)(/* @__PURE__ */ new Set());
+  const [open, setOpen] = (0, import_react31.useState)(/* @__PURE__ */ new Set());
   const { track } = useLessonkit();
   const lessonId = useEnclosingLessonId();
-  const baseId = (0, import_react26.useId)();
+  const baseId = (0, import_react31.useId)();
   const toggle = (sectionId) => {
     setOpen((prev) => {
       const next = new Set(prev);
@@ -3057,12 +3676,12 @@ function Accordion(props) {
       return next;
     });
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("section", { "aria-label": "Accordion", "data-lk-block-id": props.blockId, "data-testid": "accordion", children: props.sections.map((section) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("section", { "aria-label": "Accordion", "data-lk-block-id": props.blockId, "data-testid": "accordion", children: props.sections.map((section) => {
     const expanded = open.has(section.id);
     const panelId = `${baseId}-${section.id}`;
     const triggerId = `${baseId}-trigger-${section.id}`;
-    return /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)("div", { "data-testid": `accordion-section-${section.id}`, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("h4", { children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { "data-testid": `accordion-section-${section.id}`, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("h4", { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
         "button",
         {
           id: triggerId,
@@ -3074,28 +3693,28 @@ function Accordion(props) {
           children: section.title
         }
       ) }),
-      expanded ? /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { id: panelId, role: "region", "aria-labelledby": triggerId, children: section.content }) : null
+      expanded ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { id: panelId, role: "region", "aria-labelledby": triggerId, children: section.content }) : null
     ] }, section.id);
   }) });
 }
 setLessonkitBlockType(Accordion, "Accordion");
 
 // src/blocks/DialogCards.tsx
-var import_react27 = require("react");
-var import_jsx_runtime18 = require("react/jsx-runtime");
+var import_react32 = require("react");
+var import_jsx_runtime22 = require("react/jsx-runtime");
 function DialogCards(props) {
-  const [index, setIndex] = (0, import_react27.useState)(0);
-  const [flipped, setFlipped] = (0, import_react27.useState)(false);
+  const [index, setIndex] = (0, import_react32.useState)(0);
+  const [flipped, setFlipped] = (0, import_react32.useState)(false);
   const card = props.cards[index];
   if (!card) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("section", { "aria-label": "Dialog cards", "data-lk-block-id": props.blockId, "data-testid": "dialog-cards", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("p", { children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("section", { "aria-label": "Dialog cards", "data-lk-block-id": props.blockId, "data-testid": "dialog-cards", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("p", { children: [
       "Card ",
       index + 1,
       " of ",
       props.cards.length
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
       "button",
       {
         type: "button",
@@ -3106,8 +3725,8 @@ function DialogCards(props) {
         children: flipped ? card.back : card.front
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("nav", { "aria-label": "Card navigation", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("nav", { "aria-label": "Card navigation", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
         "button",
         {
           type: "button",
@@ -3120,7 +3739,7 @@ function DialogCards(props) {
           children: "Previous"
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
         "button",
         {
           type: "button",
@@ -3139,11 +3758,11 @@ function DialogCards(props) {
 setLessonkitBlockType(DialogCards, "DialogCards");
 
 // src/blocks/Flashcards.tsx
-var import_react28 = require("react");
-var import_jsx_runtime19 = require("react/jsx-runtime");
+var import_react33 = require("react");
+var import_jsx_runtime23 = require("react/jsx-runtime");
 function Flashcards(props) {
-  const [index, setIndex] = (0, import_react28.useState)(0);
-  const [face, setFace] = (0, import_react28.useState)("front");
+  const [index, setIndex] = (0, import_react33.useState)(0);
+  const [face, setFace] = (0, import_react33.useState)("front");
   const { track } = useLessonkit();
   const lessonId = useEnclosingLessonId();
   const card = props.cards[index];
@@ -3157,10 +3776,10 @@ function Flashcards(props) {
       lessonId ? { lessonId } : void 0
     );
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("section", { "aria-label": "Flashcards", "data-lk-block-id": props.blockId, "data-testid": "flashcards", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("button", { type: "button", "data-testid": "flashcard-flip", onClick: flip, style: { minHeight: "6rem", width: "100%" }, children: face === "front" ? card.front : card.back }),
-    props.selfScore ? /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("p", { "data-testid": "flashcard-self-score", children: "Self-score mode enabled" }) : null,
-    /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("section", { "aria-label": "Flashcards", "data-lk-block-id": props.blockId, "data-testid": "flashcards", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("button", { type: "button", "data-testid": "flashcard-flip", onClick: flip, style: { minHeight: "6rem", width: "100%" }, children: face === "front" ? card.front : card.back }),
+    props.selfScore ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("p", { "data-testid": "flashcard-self-score", children: "Self-score mode enabled" }) : null,
+    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       "button",
       {
         type: "button",
@@ -3178,10 +3797,10 @@ function Flashcards(props) {
 setLessonkitBlockType(Flashcards, "Flashcards");
 
 // src/blocks/ImageHotspots.tsx
-var import_react29 = require("react");
-var import_jsx_runtime20 = require("react/jsx-runtime");
+var import_react34 = require("react");
+var import_jsx_runtime24 = require("react/jsx-runtime");
 function ImageHotspots(props) {
-  const [active, setActive] = (0, import_react29.useState)(null);
+  const [active, setActive] = (0, import_react34.useState)(null);
   const { track } = useLessonkit();
   const lessonId = useEnclosingLessonId();
   const open = (hotspotId) => {
@@ -3192,10 +3811,10 @@ function ImageHotspots(props) {
       lessonId ? { lessonId } : void 0
     );
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("section", { "aria-label": "Image hotspots", "data-lk-block-id": props.blockId, "data-testid": "image-hotspots", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("div", { style: { position: "relative", display: "inline-block" }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("img", { src: props.src, alt: props.alt, style: { maxWidth: "100%" } }),
-      props.hotspots.map((h) => /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("section", { "aria-label": "Image hotspots", "data-lk-block-id": props.blockId, "data-testid": "image-hotspots", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { style: { position: "relative", display: "inline-block" }, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("img", { src: props.src, alt: props.alt, style: { maxWidth: "100%" } }),
+      props.hotspots.map((h) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
         "button",
         {
           type: "button",
@@ -3214,19 +3833,19 @@ function ImageHotspots(props) {
         h.id
       ))
     ] }),
-    active ? /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("div", { role: "dialog", "aria-label": "Hotspot details", "data-testid": "hotspot-popover", children: [
+    active ? /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { role: "dialog", "aria-label": "Hotspot details", "data-testid": "hotspot-popover", children: [
       props.hotspots.find((h) => h.id === active)?.content,
-      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("button", { type: "button", onClick: () => setActive(null), children: "Close" })
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("button", { type: "button", onClick: () => setActive(null), children: "Close" })
     ] }) : null
   ] });
 }
 setLessonkitBlockType(ImageHotspots, "ImageHotspots");
 
 // src/blocks/ImageSlider.tsx
-var import_react30 = require("react");
-var import_jsx_runtime21 = require("react/jsx-runtime");
+var import_react35 = require("react");
+var import_jsx_runtime25 = require("react/jsx-runtime");
 function ImageSlider(props) {
-  const [index, setIndex] = (0, import_react30.useState)(0);
+  const [index, setIndex] = (0, import_react35.useState)(0);
   const { track } = useLessonkit();
   const lessonId = useEnclosingLessonId();
   const slide = props.slides[index];
@@ -3239,11 +3858,11 @@ function ImageSlider(props) {
       lessonId ? { lessonId } : void 0
     );
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("section", { "aria-label": "Image slider", "data-lk-block-id": props.blockId, "data-testid": "image-slider", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("img", { src: slide.src, alt: slide.alt, style: { maxWidth: "100%" } }),
-    slide.caption ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("p", { children: slide.caption }) : null,
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("nav", { "aria-label": "Slide navigation", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("section", { "aria-label": "Image slider", "data-lk-block-id": props.blockId, "data-testid": "image-slider", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("img", { src: slide.src, alt: slide.alt, style: { maxWidth: "100%" } }),
+    slide.caption ? /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("p", { children: slide.caption }) : null,
+    /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("nav", { "aria-label": "Slide navigation", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
         "button",
         {
           type: "button",
@@ -3253,12 +3872,12 @@ function ImageSlider(props) {
           children: "Previous"
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("span", { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("span", { children: [
         index + 1,
         " / ",
         props.slides.length
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
         "button",
         {
           type: "button",
@@ -3274,16 +3893,21 @@ function ImageSlider(props) {
 setLessonkitBlockType(ImageSlider, "ImageSlider");
 
 // src/blocks/FindHotspot.tsx
-var import_react31 = require("react");
-var import_jsx_runtime22 = require("react/jsx-runtime");
+var import_react36 = require("react");
+var import_jsx_runtime26 = require("react/jsx-runtime");
 var INTERACTION6 = "findHotspot";
 function FindHotspotInner(props, ref) {
-  const checkId = (0, import_react31.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
-  const [selected, setSelected] = (0, import_react31.useState)(null);
-  const [checked, setChecked] = (0, import_react31.useState)(false);
+  const checkId = (0, import_react36.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const [selected, setSelected] = (0, import_react36.useState)(null);
+  const [checked, setChecked] = (0, import_react36.useState)(false);
   const assessment = useAssessmentState(props.enclosingLessonId);
+  const targetIdsKey = props.targets.map((t) => t.id).join("\0");
+  (0, import_react36.useEffect)(() => {
+    setSelected(null);
+    setChecked(false);
+  }, [checkId, props.correctTargetId, targetIdsKey]);
   const correct = selected === props.correctTargetId;
-  const handle = (0, import_react31.useMemo)(
+  const handle = (0, import_react36.useMemo)(
     () => buildAssessmentHandle({
       checkId,
       getScore: () => checked && correct ? 1 : 0,
@@ -3305,15 +3929,22 @@ function FindHotspotInner(props, ref) {
       getCurrentState: () => ({ selected, checked }),
       resume: (state) => {
         const nextSelected = readStringField(state, "selected");
-        if (typeof nextSelected === "string") setSelected(nextSelected);
+        if (typeof nextSelected === "string" || nextSelected === null) {
+          const valid = nextSelected === null || props.targets.some((t) => t.id === nextSelected);
+          setSelected(valid ? nextSelected : null);
+        }
         readBooleanStateField(state, "checked", setChecked);
       }
     }),
-    [checkId, selected, checked, correct, props.correctTargetId]
+    [checkId, selected, checked, correct, props.correctTargetId, props.targets]
   );
   useAssessmentHandleRegistration(checkId, handle, ref);
+  const selectTarget = (id) => {
+    setSelected(id);
+    setChecked(false);
+  };
   const submit = () => {
-    if (!selected) return;
+    if (!selected || checked) return;
     setChecked(true);
     assessment.answer({
       checkId,
@@ -3327,14 +3958,14 @@ function FindHotspotInner(props, ref) {
         interactionType: INTERACTION6,
         score: 1,
         maxScore: 1,
-        passingScore: props.passingScore
+        passingScore: props.passingScore ?? 1
       });
     }
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("section", { "aria-label": "Find the hotspot", "data-lk-check-id": checkId, "data-testid": "find-hotspot", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: { position: "relative", display: "inline-block" }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("img", { src: props.src, alt: props.alt, style: { maxWidth: "100%" } }),
-      props.targets.map((t) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("section", { "aria-label": "Find the hotspot", "data-lk-check-id": checkId, "data-testid": "find-hotspot", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("div", { style: { position: "relative", display: "inline-block" }, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("img", { src: props.src, alt: props.alt, style: { maxWidth: "100%" } }),
+      props.targets.map((t) => /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
         "button",
         {
           type: "button",
@@ -3347,30 +3978,30 @@ function FindHotspotInner(props, ref) {
             top: `${t.y}%`,
             transform: "translate(-50%, -50%)"
           },
-          onClick: () => setSelected(t.id),
+          onClick: () => selectTarget(t.id),
           children: t.label
         },
         t.id
       ))
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("button", { type: "button", "data-testid": "check-hotspot", disabled: !selected, onClick: submit, children: "Check" }),
-    checked ? /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("p", { role: "status", children: correct ? "Correct" : "Try again" }) : null
+    /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("button", { type: "button", "data-testid": "check-hotspot", disabled: !selected, onClick: submit, children: "Check" }),
+    checked ? /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("p", { role: "status", children: correct ? "Correct" : "Try again" }) : null
   ] });
 }
-var FindHotspotInnerForwarded = (0, import_react31.forwardRef)(FindHotspotInner);
-var FindHotspot = (0, import_react31.forwardRef)(function FindHotspot2(props, ref) {
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(AssessmentLessonGuard, { blockLabel: "FindHotspot", checkId: props.checkId, children: (enclosingLessonId) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(FindHotspotInnerForwarded, { ...props, enclosingLessonId, ref }) });
+var FindHotspotInnerForwarded = (0, import_react36.forwardRef)(FindHotspotInner);
+var FindHotspot = (0, import_react36.forwardRef)(function FindHotspot2(props, ref) {
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(AssessmentLessonGuard, { blockLabel: "FindHotspot", checkId: props.checkId, children: (enclosingLessonId) => /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(FindHotspotInnerForwarded, { ...props, enclosingLessonId, ref }) });
 });
 setLessonkitBlockType(FindHotspot, "FindHotspot");
 
 // src/blocks/FindMultipleHotspots.tsx
-var import_react32 = require("react");
-var import_jsx_runtime23 = require("react/jsx-runtime");
+var import_react37 = require("react");
+var import_jsx_runtime27 = require("react/jsx-runtime");
 var INTERACTION7 = "findMultipleHotspots";
 function FindMultipleHotspotsInner(props, ref) {
-  const checkId = (0, import_react32.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
-  const [selected, setSelected] = (0, import_react32.useState)(/* @__PURE__ */ new Set());
-  const [checked, setChecked] = (0, import_react32.useState)(false);
+  const checkId = (0, import_react37.useMemo)(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const [selected, setSelected] = (0, import_react37.useState)(/* @__PURE__ */ new Set());
+  const [checked, setChecked] = (0, import_react37.useState)(false);
   const assessment = useAssessmentState(props.enclosingLessonId);
   const toggle = (id) => {
     setSelected((prev) => {
@@ -3379,9 +4010,10 @@ function FindMultipleHotspotsInner(props, ref) {
       else next.add(id);
       return next;
     });
+    setChecked(false);
   };
   const correct = selected.size === props.correctTargetIds.length && props.correctTargetIds.every((id) => selected.has(id));
-  const handle = (0, import_react32.useMemo)(
+  const handle = (0, import_react37.useMemo)(
     () => buildAssessmentHandle({
       checkId,
       getScore: () => checked && correct ? 1 : 0,
@@ -3411,7 +4043,7 @@ function FindMultipleHotspotsInner(props, ref) {
   );
   useAssessmentHandleRegistration(checkId, handle, ref);
   const submit = () => {
-    if (selected.size === 0) return;
+    if (selected.size === 0 || checked) return;
     setChecked(true);
     assessment.answer({
       checkId,
@@ -3425,14 +4057,14 @@ function FindMultipleHotspotsInner(props, ref) {
         interactionType: INTERACTION7,
         score: 1,
         maxScore: 1,
-        passingScore: props.passingScore
+        passingScore: props.passingScore ?? 1
       });
     }
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("section", { "aria-label": "Find multiple hotspots", "data-lk-check-id": checkId, "data-testid": "find-multiple-hotspots", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { style: { position: "relative", display: "inline-block" }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("img", { src: props.src, alt: props.alt, style: { maxWidth: "100%" } }),
-      props.targets.map((t) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("section", { "aria-label": "Find multiple hotspots", "data-lk-check-id": checkId, "data-testid": "find-multiple-hotspots", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { style: { position: "relative", display: "inline-block" }, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("img", { src: props.src, alt: props.alt, style: { maxWidth: "100%" } }),
+      props.targets.map((t) => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
         "button",
         {
           type: "button",
@@ -3451,23 +4083,23 @@ function FindMultipleHotspotsInner(props, ref) {
         t.id
       ))
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("button", { type: "button", "data-testid": "check-hotspots", disabled: selected.size === 0, onClick: submit, children: "Check" }),
-    checked ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("p", { role: "status", children: correct ? "Correct" : "Try again" }) : null
+    /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("button", { type: "button", "data-testid": "check-hotspots", disabled: selected.size === 0, onClick: submit, children: "Check" }),
+    checked ? /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("p", { role: "status", children: correct ? "Correct" : "Try again" }) : null
   ] });
 }
-var FindMultipleHotspotsInnerForwarded = (0, import_react32.forwardRef)(FindMultipleHotspotsInner);
-var FindMultipleHotspots = (0, import_react32.forwardRef)(
+var FindMultipleHotspotsInnerForwarded = (0, import_react37.forwardRef)(FindMultipleHotspotsInner);
+var FindMultipleHotspots = (0, import_react37.forwardRef)(
   function FindMultipleHotspots2(props, ref) {
-    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(AssessmentLessonGuard, { blockLabel: "FindMultipleHotspots", checkId: props.checkId, children: (enclosingLessonId) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(FindMultipleHotspotsInnerForwarded, { ...props, enclosingLessonId, ref }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(AssessmentLessonGuard, { blockLabel: "FindMultipleHotspots", checkId: props.checkId, children: (enclosingLessonId) => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(FindMultipleHotspotsInnerForwarded, { ...props, enclosingLessonId, ref }) });
   }
 );
 setLessonkitBlockType(FindMultipleHotspots, "FindMultipleHotspots");
 
 // src/index.tsx
-var import_core17 = require("@lessonkit/core");
+var import_core19 = require("@lessonkit/core");
 
 // src/theme/ThemeProvider.tsx
-var import_react33 = __toESM(require("react"), 1);
+var import_react38 = __toESM(require("react"), 1);
 var import_themes = require("@lessonkit/themes");
 
 // src/theme/applyCssVariables.ts
@@ -3486,11 +4118,11 @@ function applyCssVariables(target, vars, previousKeys) {
 }
 
 // src/theme/ThemeProvider.tsx
-var import_jsx_runtime24 = require("react/jsx-runtime");
-var ThemeContext = (0, import_react33.createContext)(null);
+var import_jsx_runtime28 = require("react/jsx-runtime");
+var ThemeContext = (0, import_react38.createContext)(null);
 var useIsoLayoutEffect2 = (
   /* v8 ignore next -- SSR uses useEffect when window is unavailable */
-  typeof window !== "undefined" ? import_react33.useLayoutEffect : import_react33.default.useEffect
+  typeof window !== "undefined" ? import_react38.useLayoutEffect : import_react38.default.useEffect
 );
 function getSystemMode() {
   if (typeof window === "undefined" || typeof window.matchMedia !== "function") {
@@ -3509,7 +4141,7 @@ function ThemeProvider(props) {
   const preset = props.preset ?? "default";
   const mode = props.mode ?? "light";
   const targetKind = props.target ?? "document";
-  const [resolvedMode, setResolvedMode] = (0, import_react33.useState)(
+  const [resolvedMode, setResolvedMode] = (0, import_react38.useState)(
     () => mode === "system" ? getSystemMode() : mode
   );
   useIsoLayoutEffect2(() => {
@@ -3525,20 +4157,20 @@ function ThemeProvider(props) {
     return () => mq.removeEventListener("change", onChange);
   }, [mode]);
   const dataTheme = mode === "system" ? resolvedMode : mode === "dark" ? "dark" : "light";
-  const effectiveTheme = (0, import_react33.useMemo)(() => {
+  const effectiveTheme = (0, import_react38.useMemo)(() => {
     const modeBase = resolveModeBase(mode, dataTheme);
     const base = preset === "default" ? modeBase : preset === "brand" ? (0, import_themes.mergeThemes)(modeBase, import_themes.brandThemeOverrides) : (0, import_themes.mergeThemes)(modeBase, (0, import_themes.getPresetTheme)(preset));
     return (0, import_themes.mergeThemes)(base, props.theme ?? {});
   }, [preset, mode, dataTheme, props.theme]);
-  const hostRef = (0, import_react33.useRef)(null);
-  const appliedKeysRef = (0, import_react33.useRef)(/* @__PURE__ */ new Set());
+  const hostRef = (0, import_react38.useRef)(null);
+  const appliedKeysRef = (0, import_react38.useRef)(/* @__PURE__ */ new Set());
   useIsoLayoutEffect2(() => {
     if (targetKind === "document" && typeof document !== "undefined") {
       document.documentElement.setAttribute("data-lk-theme", dataTheme);
       return () => document.documentElement.removeAttribute("data-lk-theme");
     }
   }, [targetKind, dataTheme]);
-  const inject = (0, import_react33.useCallback)(() => {
+  const inject = (0, import_react38.useCallback)(() => {
     const vars = (0, import_themes.themeToCssVariables)(effectiveTheme);
     const el = targetKind === "document" && typeof document !== "undefined" ? document.documentElement : hostRef.current;
     if (!el) return;
@@ -3555,7 +4187,7 @@ function ThemeProvider(props) {
       appliedKeysRef.current = /* @__PURE__ */ new Set();
     };
   }, [inject, targetKind]);
-  const value = (0, import_react33.useMemo)(
+  const value = (0, import_react38.useMemo)(
     () => ({
       theme: effectiveTheme,
       preset,
@@ -3565,12 +4197,12 @@ function ThemeProvider(props) {
     [effectiveTheme, preset, mode, dataTheme]
   );
   if (targetKind === "document") {
-    return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ThemeContext.Provider, { value, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { "data-lk-theme": dataTheme, style: { display: "contents" }, children: props.children }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(ThemeContext.Provider, { value, children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { "data-lk-theme": dataTheme, style: { display: "contents" }, children: props.children }) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ThemeContext.Provider, { value, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { ref: hostRef, "data-lk-theme": dataTheme, children: props.children }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(ThemeContext.Provider, { value, children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { ref: hostRef, "data-lk-theme": dataTheme, children: props.children }) });
 }
 function useTheme() {
-  const ctx = (0, import_react33.useContext)(ThemeContext);
+  const ctx = (0, import_react38.useContext)(ThemeContext);
   if (!ctx) {
     throw new Error("useTheme must be used within a ThemeProvider");
   }
@@ -3578,8 +4210,15 @@ function useTheme() {
 }
 
 // src/catalogV3Entries.ts
-var import_core16 = require("@lessonkit/core");
-var COMPOUND_PARENTS = ["Lesson", "Page", "InteractiveBook", "AssessmentSequence"];
+var import_core18 = require("@lessonkit/core");
+var COMPOUND_PARENTS = [
+  "Lesson",
+  "Page",
+  "InteractiveBook",
+  "Slide",
+  "SlideDeck",
+  "AssessmentSequence"
+];
 function extendParents(entry) {
   if (!entry.parentConstraints?.length) return entry;
   const merged = /* @__PURE__ */ new Set([...entry.parentConstraints, ...COMPOUND_PARENTS]);
@@ -3643,8 +4282,8 @@ var v3CompoundAndContentEntries = [
     h5pMachineName: "H5P.Column",
     h5pAlias: "Column",
     description: "Column layout container (H5P Column / Page).",
-    allowedChildTypes: [...import_core16.PAGE_ALLOWED_CHILD_TYPES],
-    maxNestingDepth: import_core16.COMPOUND_MAX_NESTING_DEPTH.Page,
+    allowedChildTypes: [...import_core18.PAGE_ALLOWED_CHILD_TYPES],
+    maxNestingDepth: import_core18.COMPOUND_MAX_NESTING_DEPTH.Page,
     props: [
       { name: "blockId", type: "BlockId", required: true, description: "Stable block id." },
       { name: "title", type: "string", required: false, description: "Page title." },
@@ -3664,8 +4303,8 @@ var v3CompoundAndContentEntries = [
     h5pMachineName: "H5P.InteractiveBook",
     h5pAlias: "Interactive Book",
     description: "Multi-page book with chapter navigation.",
-    allowedChildTypes: [...import_core16.INTERACTIVE_BOOK_ALLOWED_CHILD_TYPES],
-    maxNestingDepth: import_core16.COMPOUND_MAX_NESTING_DEPTH.InteractiveBook,
+    allowedChildTypes: [...import_core18.INTERACTIVE_BOOK_ALLOWED_CHILD_TYPES],
+    maxNestingDepth: import_core18.COMPOUND_MAX_NESTING_DEPTH.InteractiveBook,
     props: [
       { name: "blockId", type: "BlockId", required: true, description: "Stable block id." },
       { name: "title", type: "string", required: true, description: "Book title." },
@@ -3683,6 +4322,53 @@ var v3CompoundAndContentEntries = [
     theming: { surface: "global-inherit", stylingNotes: "Book chrome." },
     telemetry: { emits: ["book_page_viewed"], requiresActiveLesson: true }
   },
+  {
+    type: "Slide",
+    category: "container",
+    compoundContract: true,
+    h5pMachineName: "H5P.CoursePresentation",
+    h5pAlias: "Course Presentation slide",
+    description: "Single slide row in a SlideDeck. Planned allowlist expansion: Video, Summary.",
+    allowedChildTypes: [...import_core18.SLIDE_ALLOWED_CHILD_TYPES],
+    maxNestingDepth: import_core18.COMPOUND_MAX_NESTING_DEPTH.Slide,
+    props: [
+      { name: "blockId", type: "BlockId", required: true, description: "Stable block id." },
+      { name: "title", type: "string", required: false, description: "Slide title." },
+      { name: "children", type: "ReactNode", required: true, description: "Slide content." }
+    ],
+    requiredIds: [],
+    optionalIds: ["blockId"],
+    parentConstraints: ["SlideDeck"],
+    a11y: { element: "section", ariaLabel: "Slide", keyboard: "N/A", notes: "H5P Course Presentation slide row." },
+    theming: { surface: "global-inherit", stylingNotes: "Container." },
+    telemetry: { emits: ["compound_page_viewed"], requiresActiveLesson: true }
+  },
+  {
+    type: "SlideDeck",
+    category: "container",
+    compoundContract: true,
+    h5pMachineName: "H5P.CoursePresentation",
+    h5pAlias: "Course Presentation",
+    description: "Multi-slide presentation with keyboard navigation.",
+    allowedChildTypes: [...import_core18.SLIDE_DECK_ALLOWED_CHILD_TYPES],
+    maxNestingDepth: import_core18.COMPOUND_MAX_NESTING_DEPTH.SlideDeck,
+    props: [
+      { name: "blockId", type: "BlockId", required: true, description: "Stable block id." },
+      { name: "title", type: "string", required: true, description: "Deck title." },
+      { name: "showDeckScore", type: "boolean", required: false, description: "Show aggregate score." },
+      { name: "children", type: "Slide[]", required: true, description: "Slides." }
+    ],
+    requiredIds: ["blockId"],
+    parentConstraints: ["Lesson"],
+    a11y: {
+      element: "section",
+      ariaLabel: "Slide deck",
+      keyboard: "Arrow keys, Home, End, Previous/Next slide buttons.",
+      notes: "H5P Course Presentation equivalent."
+    },
+    theming: { surface: "global-inherit", stylingNotes: "Deck chrome." },
+    telemetry: { emits: ["slide_viewed"], requiresActiveLesson: true }
+  },
   {
     type: "Accordion",
     category: "content",
@@ -3816,8 +4502,8 @@ function buildV3CatalogFromV2(v2) {
       return {
         ...base,
         compoundContract: true,
-        allowedChildTypes: [...import_core16.ASSESSMENT_SEQUENCE_ALLOWED_CHILD_TYPES],
-        maxNestingDepth: import_core16.COMPOUND_MAX_NESTING_DEPTH.AssessmentSequence
+        allowedChildTypes: [...import_core18.ASSESSMENT_SEQUENCE_ALLOWED_CHILD_TYPES],
+        maxNestingDepth: import_core18.COMPOUND_MAX_NESTING_DEPTH.AssessmentSequence
       };
     }
     return base;
@@ -4229,6 +4915,8 @@ function getBlockCatalogEntry(type, opts) {
   Quiz,
   Reflection,
   Scenario,
+  Slide,
+  SlideDeck,
   Text,
   ThemeProvider,
   TrueFalse,