learningfoundry 0.45.0__tar.gz → 0.46.0__tar.gz

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.46.0] - 2026-05-01
+
+### Fixed
+
+- **Lesson navigation routing.** Sidebar lesson clicks, the Next/Finish button, and dashboard "Start module / Continue" buttons now call `goto()` from `$app/navigation` directly instead of going through the curriculum store helper. The previous flow updated `currentPosition` (and therefore the sidebar highlight) but left the URL untouched, so the lesson route was never re-mounted: `markLessonInProgress` ran only on the first lesson reached by direct URL, the sidebar checkmarks never updated, and the curriculum/module progress bars stayed at zero across the session. Components now route via `Navigation.svelte`, `LessonList.svelte`, `ProgressDashboard.svelte` → `goto('/${moduleId}/${lessonId}')`.
+- **Sticky LessonView state across navigations.** The dynamic lesson route now wraps `<LessonView>` in `{#key \`${moduleId}/${lessonId}\`}` so the subtree tears down and re-mounts whenever either route param changes — guaranteeing fresh `allBlocksComplete` / `completedBlocks` state and a re-run of the on-mount progress check (so revisiting a previously-completed lesson activates Next/Finish immediately).
+- **Stale video iframe across consecutive video lessons.** `LessonView`'s `{#each lesson.content_blocks}` now uses a stable identity key derived from `block.ref` or `block.content.url` (falling back to `${type}-${index}`); previously, two consecutive lessons each with a `video` block reused the same `<VideoBlock>` instance and its iframe player, leaving the previous lesson's video on screen. `VideoBlock.svelte` additionally tracks `content.url` via `$effect` and tears down / recreates its YouTube player whenever the URL changes, as belt-and-suspenders coverage.
+
+### Added
+
+- **Playwright e2e harness.** New `e2e/` directory with three regression specs (`navigation.spec.ts`, `progress.spec.ts`, `video.spec.ts`) covering the FR-P9/FR-P10 lifecycle invariants that vitest cannot exercise (because vitest mocks `$app/navigation`). New `pnpm e2e` script and `playwright.config.ts` driving `pnpm preview` against the built static site. The smoke test runs `pnpm e2e` after `pnpm build` and skips gracefully if Playwright browsers aren't installed locally; CI installs them via `pnpm exec playwright install chromium`.
+- **Vitest navigation regression coverage.** New `navigation.helpers.ts` (`resolveGoNext`, `resolveGoPrev`, `lessonHref`) and `navigation.test.ts` lock down the routing decisions made by Next/Finish, Previous, and lesson rows. New `contentBlockKey` helper (and tests) verifies the FR-P10 stable-identity convention used by `{#each}`.
+
+### Changed
+
+- `navigateTo` in `$lib/stores/curriculum.ts` is now documented as **internal route-sync only — UI code must use `goto` directly**. The function continues to set `currentPosition` for use by the dynamic lesson route's URL→store `$effect`; UI code (sidebar, dashboard, Next/Finish) routes via `goto()` so SvelteKit's full navigation lifecycle (page params, scroll restoration, `{#key}` re-mount) fires predictably.
+
 ## [0.45.0] - 2026-04-30
 
 ### Added

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: learningfoundry
-Version: 0.45.0
+Version: 0.46.0
 Summary: A curriculum engine that turns a YAML curriculum definition into a deployable SvelteKit learning application.
 Project-URL: Homepage, https://github.com/pointmatic/learningfoundry
 Project-URL: Repository, https://github.com/pointmatic/learningfoundry

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "learningfoundry"
-version = "0.45.0"
+version = "0.46.0"
 description = "A curriculum engine that turns a YAML curriculum definition into a deployable SvelteKit learning application."
 readme = "README.md"
 license = "Apache-2.0"

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/src/learningfoundry/__init__.py

@@ -1,4 +1,4 @@
 # Copyright 2026 Pointmatic
 # SPDX-License-Identifier: Apache-2.0
 
-__version__ = "0.45.0"
+__version__ = "0.46.0"

learningfoundry-0.46.0/src/learningfoundry/sveltekit_template/e2e/navigation.spec.ts

@@ -0,0 +1,30 @@
+// Copyright 2026 Pointmatic
+// SPDX-License-Identifier: Apache-2.0
+//
+// FR-P9 regression coverage: in-app navigation must update the URL.
+// Before v0.46.0 the sidebar / Next button updated `currentPosition` but
+// not the route, so `LessonView` was never re-mounted on lesson change.
+import { expect, test } from '@playwright/test';
+
+test.describe('lesson navigation routing', () => {
+	test('sidebar lesson click updates URL', async ({ page }) => {
+		await page.goto('/');
+		// Open the first module by clicking its header in the sidebar.
+		const firstModuleHeader = page.locator('aside nav button').first();
+		await firstModuleHeader.click();
+
+		// Click the first lesson row in the now-expanded module.
+		const firstLessonRow = page.locator('aside nav ul ul button').first();
+		await firstLessonRow.click();
+
+		// URL must reflect the click; before v0.46.0 it stayed at "/".
+		await expect(page).toHaveURL(/\/[^/]+\/[^/]+$/);
+	});
+
+	test('dashboard "Start module" deep-links into a lesson', async ({ page }) => {
+		await page.goto('/');
+		const startBtn = page.getByRole('button', { name: /start module|continue/i }).first();
+		await startBtn.click();
+		await expect(page).toHaveURL(/\/[^/]+\/[^/]+$/);
+	});
+});

learningfoundry-0.46.0/src/learningfoundry/sveltekit_template/e2e/progress.spec.ts

@@ -0,0 +1,24 @@
+// Copyright 2026 Pointmatic
+// SPDX-License-Identifier: Apache-2.0
+//
+// FR-P9 regression: progress reactivity. Reaching a lesson page must mark
+// it `in_progress` and the sidebar status icon must reflect that on the
+// next sidebar render — without a page reload.
+import { expect, test } from '@playwright/test';
+
+test.describe('progress reactivity', () => {
+	test('navigating into a lesson marks it in_progress in the sidebar', async ({ page }) => {
+		await page.goto('/');
+
+		// Expand the first module and click into its first lesson.
+		await page.locator('aside nav button').first().click();
+		await page.locator('aside nav ul ul button').first().click();
+		await expect(page).toHaveURL(/\/[^/]+\/[^/]+$/);
+
+		// Sidebar status icons: ○ = not_started, … = in_progress, ✓ = complete.
+		// After landing on the lesson page, the active row should not still
+		// show ○ (regression check; the previous bug left status forever ○).
+		const activeIcon = page.locator('aside nav ul ul button.bg-blue-100 span').first();
+		await expect(activeIcon).not.toHaveText('○');
+	});
+});

learningfoundry-0.46.0/src/learningfoundry/sveltekit_template/e2e/video.spec.ts

@@ -0,0 +1,27 @@
+// Copyright 2026 Pointmatic
+// SPDX-License-Identifier: Apache-2.0
+//
+// FR-P10 regression coverage: when navigating between two lessons that
+// each contain a video block, only the new lesson's iframe should be
+// present — the previous player must be destroyed. The {#key} wrapper
+// in `[module]/[lesson]/+page.svelte` plus the stable block key in
+// `LessonView` enforce this.
+import { expect, test } from '@playwright/test';
+
+test.describe('video block lifecycle', () => {
+	test('lesson page renders at most one YouTube iframe per video block', async ({ page }) => {
+		await page.goto('/');
+		await page.locator('aside nav button').first().click();
+		await page.locator('aside nav ul ul button').first().click();
+		await expect(page).toHaveURL(/\/[^/]+\/[^/]+$/);
+
+		// Wait briefly for the YouTube IFrame API to upgrade the placeholder
+		// `<div id="yt-player-…">` into an `<iframe>`. If the API is blocked
+		// (no network in CI), there will be zero iframes — that's still a
+		// pass for "no leaked iframes from a prior lesson", which is what
+		// the regression cares about.
+		await page.waitForTimeout(2000);
+		const iframes = await page.locator('iframe[src*="youtube"]').count();
+		expect(iframes).toBeLessThanOrEqual(1);
+	});
+});

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/src/learningfoundry/sveltekit_template/package.json

@@ -9,6 +9,7 @@
     "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
     "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
     "test": "vitest run",
+    "e2e": "playwright test",
     "postinstall": "node -e \"const fs=require('fs'); fs.mkdirSync('static',{recursive:true}); fs.copyFileSync(require.resolve('sql.js/dist/sql-wasm.wasm'),'static/sql-wasm.wasm')\""
   },
   "dependencies": {
@@ -21,6 +22,7 @@
     "svelte": "^5.0.0"
   },
   "devDependencies": {
+    "@playwright/test": "^1.48.0",
     "@sveltejs/adapter-static": "^3.0.0",
     "@sveltejs/vite-plugin-svelte": "^7.0.0",
     "@tailwindcss/typography": "^0.5.16",

learningfoundry-0.46.0/src/learningfoundry/sveltekit_template/playwright.config.ts

@@ -0,0 +1,27 @@
+// Copyright 2026 Pointmatic
+// SPDX-License-Identifier: Apache-2.0
+import { defineConfig, devices } from '@playwright/test';
+
+const PORT = Number(process.env.PLAYWRIGHT_PORT ?? 4173);
+
+export default defineConfig({
+	testDir: './e2e',
+	fullyParallel: false,
+	reporter: [['list']],
+	use: {
+		baseURL: `http://localhost:${PORT}`,
+		trace: 'retain-on-failure'
+	},
+	webServer: {
+		command: `pnpm preview --port ${PORT} --strictPort`,
+		port: PORT,
+		reuseExistingServer: !process.env.CI,
+		timeout: 60_000
+	},
+	projects: [
+		{
+			name: 'chromium',
+			use: { ...devices['Desktop Chrome'] }
+		}
+	]
+});

{learningfoundry-0.45.0 → learningfoundry-0.46.0/src/learningfoundry}/sveltekit_template/src/lib/components/LessonList.svelte

@@ -1,8 +1,10 @@
 <!-- Copyright 2026 Pointmatic — SPDX-License-Identifier: Apache-2.0 -->
 <script lang="ts">
-	import { currentPosition, navigateTo } from '$lib/stores/curriculum.js';
+	import { goto } from '$app/navigation';
+	import { currentPosition } from '$lib/stores/curriculum.js';
 	import type { Lesson, LessonProgress } from '$lib/types/index.js';
 	import { lessonStatusIcon, resolveLessonClick } from './module-list.helpers.js';
+	import { lessonHref } from './navigation.helpers.js';
 
 	interface Props {
 		moduleId: string;
@@ -34,7 +36,7 @@
 
 	function handleClick(lessonId: string) {
 		if (resolveLessonClick(lessonId, lockedLessons) === 'noop') return;
-		navigateTo(moduleId, lessonId);
+		void goto(lessonHref(moduleId, lessonId));
 	}
 </script>
 

{learningfoundry-0.45.0 → learningfoundry-0.46.0/src/learningfoundry}/sveltekit_template/src/lib/components/LessonView.svelte

@@ -6,6 +6,7 @@
 	import type { Lesson, QuizScore } from '$lib/types/index.js';
 	import ContentBlock from './ContentBlock.svelte';
 	import Navigation from './Navigation.svelte';
+	import { contentBlockKey } from './lesson-view.helpers.js';
 	import { onMount } from 'svelte';
 
 	interface Props {
@@ -65,7 +66,7 @@
 	</header>
 
 	<div class="space-y-8">
-		{#each lesson.content_blocks as block, i (i)}
+		{#each lesson.content_blocks as block, i (contentBlockKey(block, i))}
 			<section>
 				<ContentBlock
 					{block}

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/src/learningfoundry/sveltekit_template/src/lib/components/LessonView.test.ts

@@ -1,7 +1,8 @@
 // Copyright 2026 Pointmatic
 // SPDX-License-Identifier: Apache-2.0
 import { describe, expect, it } from 'vitest';
-import { createBlockTracker } from './lesson-view.helpers.js';
+import { contentBlockKey, createBlockTracker } from './lesson-view.helpers.js';
+import type { ContentBlock } from '$lib/types/index.js';
 
 describe('LessonView block tracking (via createBlockTracker)', () => {
 	it('all blocks complete → returns true on final markBlockComplete', () => {
@@ -66,3 +67,51 @@ describe('LessonView block tracking (via createBlockTracker)', () => {
 		expect(tracker.allComplete).toBe(true);
 	});
 });
+
+describe('contentBlockKey (FR-P10 stable identity)', () => {
+	it('uses ref when present', () => {
+		const block = {
+			type: 'text',
+			source: null,
+			ref: 'content/mod-01/lesson-01.md',
+			content: { markdown: '', path: '' }
+		} as ContentBlock;
+		expect(contentBlockKey(block, 0)).toBe('text:content/mod-01/lesson-01.md');
+	});
+
+	it('uses content.url for video blocks (no ref)', () => {
+		const block = {
+			type: 'video',
+			source: null,
+			ref: null,
+			content: { url: 'https://www.youtube.com/watch?v=abc' }
+		} as ContentBlock;
+		expect(contentBlockKey(block, 0)).toBe('video:https://www.youtube.com/watch?v=abc');
+	});
+
+	it('falls back to type + index when neither ref nor url is present', () => {
+		const block = {
+			type: 'visualization',
+			source: null,
+			ref: null,
+			content: {}
+		} as unknown as ContentBlock;
+		expect(contentBlockKey(block, 2)).toBe('visualization-2');
+	});
+
+	it('two video blocks with different URLs produce different keys', () => {
+		const a = {
+			type: 'video',
+			source: null,
+			ref: null,
+			content: { url: 'https://youtu.be/AAA' }
+		} as ContentBlock;
+		const b = {
+			type: 'video',
+			source: null,
+			ref: null,
+			content: { url: 'https://youtu.be/BBB' }
+		} as ContentBlock;
+		expect(contentBlockKey(a, 0)).not.toBe(contentBlockKey(b, 0));
+	});
+});

{learningfoundry-0.45.0 → learningfoundry-0.46.0/src/learningfoundry}/sveltekit_template/src/lib/components/Navigation.svelte

@@ -2,7 +2,8 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
 	import { ChevronLeft, ChevronRight } from 'lucide-svelte';
-	import { nextLesson, previousLesson, navigateTo } from '$lib/stores/curriculum.js';
+	import { nextLesson, previousLesson } from '$lib/stores/curriculum.js';
+	import { resolveGoNext, resolveGoPrev } from './navigation.helpers.js';
 
 	interface Props {
 		disabled?: boolean;
@@ -13,16 +14,13 @@
 	const next = $derived($nextLesson);
 
 	function goNext() {
-		if (disabled) return;
-		if (next) {
-			navigateTo(next.moduleId, next.lessonId);
-		} else {
-			void goto('/');
-		}
+		const action = resolveGoNext(disabled, next);
+		if (action.kind === 'goto') void goto(action.url);
 	}
 
 	function goPrev() {
-		if (prev) navigateTo(prev.moduleId, prev.lessonId);
+		const action = resolveGoPrev(prev);
+		if (action.kind === 'goto') void goto(action.url);
 	}
 </script>
 

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/src/learningfoundry/sveltekit_template/src/lib/components/ProgressDashboard.svelte

@@ -1,6 +1,6 @@
 <!-- Copyright 2026 Pointmatic — SPDX-License-Identifier: Apache-2.0 -->
 <script lang="ts">
-	import { navigateTo } from '$lib/stores/curriculum.js';
+	import { goto } from '$app/navigation';
 	import type { Curriculum, Module, ModuleProgress, QuizScore } from '$lib/types/index.js';
 	import { getOptionalLessons, isModuleComplete } from '$lib/utils/locking.js';
 	import ProgressBar from './ProgressBar.svelte';
@@ -45,7 +45,7 @@
 			(l) => !optional.has(l.id) && mp?.lessons[l.id]?.status !== 'complete'
 		);
 		const target = firstIncomplete ?? mod.lessons[0];
-		if (target) navigateTo(mod.id, target.id);
+		if (target) void goto(`/${mod.id}/${target.id}`);
 	}
 
 	const totalLessons = $derived(modules.reduce((n, m) => n + m.lessons.length, 0));

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/src/learningfoundry/sveltekit_template/src/lib/components/VideoBlock.svelte

@@ -1,7 +1,6 @@
 <!-- Copyright 2026 Pointmatic — SPDX-License-Identifier: Apache-2.0 -->
 <script lang="ts">
 	import type { VideoContent } from '$lib/types/index.js';
-	import { onMount } from 'svelte';
 
 	interface Props {
 		content: VideoContent;
@@ -51,11 +50,21 @@
 		};
 	}
 
-	onMount(() => {
+	// `$effect` re-runs whenever the watched URL changes, so when a parent
+	// reuses this component instance across lessons (e.g. two consecutive
+	// lessons each with a video block) we tear down the previous player
+	// and observer and create a fresh one for the new `videoId`. The
+	// {#key} wrapper at the lesson route plus the stable block key in
+	// `LessonView` already force a re-mount in normal flows; this effect
+	// is the belt-and-suspenders fallback if any caller skips both keys.
+	$effect(() => {
+		const url = content.url; // dependency
 		if (provider !== 'youtube' || !onvideocomplete) return;
-		const videoId = extractYouTubeId(content.url);
+		const videoId = extractYouTubeId(url);
 		if (!videoId) return;
 
+		fired = false;
+
 		let cleanup: (() => void) | undefined;
 		/* eslint-disable @typescript-eslint/no-explicit-any */
 		let player: any;
@@ -80,6 +89,8 @@
 			}
 		}
 
+		let fallbackTimer: ReturnType<typeof setTimeout> | undefined;
+
 		if ((window as any).YT?.Player) {
 			createPlayer();
 		} else {
@@ -95,21 +106,16 @@
 				createPlayer();
 			};
 
-			const fallbackTimer = setTimeout(() => {
+			fallbackTimer = setTimeout(() => {
 				if (!(window as any).YT?.Player && !fired) {
 					cleanup = setupViewportFallback();
 				}
 			}, 5000);
-
-			return () => {
-				clearTimeout(fallbackTimer);
-				player?.destroy?.();
-				cleanup?.();
-			};
 		}
 		/* eslint-enable @typescript-eslint/no-explicit-any */
 
 		return () => {
+			if (fallbackTimer !== undefined) clearTimeout(fallbackTimer);
 			player?.destroy?.();
 			cleanup?.();
 		};

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/src/learningfoundry/sveltekit_template/src/lib/components/lesson-view.helpers.ts

@@ -6,6 +6,21 @@
  * unit-tested without mounting the Svelte component.
  */
 
+import type { ContentBlock } from '$lib/types/index.js';
+
+/**
+ * Stable identity key for a content block. Used as the `{#each}` key so
+ * child components (notably `VideoBlock`, which holds an iframe player)
+ * tear down and re-mount when the underlying content changes rather
+ * than being reused across lessons with stale state.
+ */
+export function contentBlockKey(block: ContentBlock, index: number): string {
+	if (block.ref) return `${block.type}:${block.ref}`;
+	const url = (block.content as { url?: unknown })?.url;
+	if (typeof url === 'string') return `${block.type}:${url}`;
+	return `${block.type}-${index}`;
+}
+
 export interface BlockTracker {
 	/** Record a block as complete. Returns true if this was the final block. */
 	markBlockComplete(blockIndex: number): boolean;

learningfoundry-0.46.0/src/learningfoundry/sveltekit_template/src/lib/components/navigation.helpers.ts

@@ -0,0 +1,33 @@
+// Copyright 2026 Pointmatic — SPDX-License-Identifier: Apache-2.0
+/**
+ * Pure resolver for the Next/Finish and Previous button actions.
+ *
+ * Extracted so the routing decision can be unit-tested without mounting
+ * `Navigation.svelte` and stubbing all of its store dependencies. The
+ * component just calls these helpers and dispatches the resulting `goto`
+ * call to `$app/navigation`.
+ */
+import type { NavPosition } from '$lib/stores/curriculum.js';
+
+export type NavAction = { kind: 'noop' } | { kind: 'goto'; url: string };
+
+/** Resolve the action for the Next/Finish button click. */
+export function resolveGoNext(
+	disabled: boolean,
+	next: NavPosition | null
+): NavAction {
+	if (disabled) return { kind: 'noop' };
+	if (next) return { kind: 'goto', url: `/${next.moduleId}/${next.lessonId}` };
+	return { kind: 'goto', url: '/' };
+}
+
+/** Resolve the action for the Previous button click. */
+export function resolveGoPrev(prev: NavPosition | null): NavAction {
+	if (!prev) return { kind: 'noop' };
+	return { kind: 'goto', url: `/${prev.moduleId}/${prev.lessonId}` };
+}
+
+/** URL path for an in-app lesson link. */
+export function lessonHref(moduleId: string, lessonId: string): string {
+	return `/${moduleId}/${lessonId}`;
+}

learningfoundry-0.46.0/src/learningfoundry/sveltekit_template/src/lib/components/navigation.test.ts

@@ -0,0 +1,43 @@
+// Copyright 2026 Pointmatic
+// SPDX-License-Identifier: Apache-2.0
+import { describe, expect, it } from 'vitest';
+import { lessonHref, resolveGoNext, resolveGoPrev } from './navigation.helpers.js';
+
+describe('resolveGoNext (Next/Finish button)', () => {
+	it('routes to /{module}/{lesson} when there is a next lesson', () => {
+		const action = resolveGoNext(false, { moduleId: 'mod-01', lessonId: 'lesson-02' });
+		expect(action).toEqual({ kind: 'goto', url: '/mod-01/lesson-02' });
+	});
+
+	it('routes to / when next is null (Finish on last lesson)', () => {
+		const action = resolveGoNext(false, null);
+		expect(action).toEqual({ kind: 'goto', url: '/' });
+	});
+
+	it('disabled state is a no-op even with a next lesson', () => {
+		const action = resolveGoNext(true, { moduleId: 'mod-01', lessonId: 'lesson-02' });
+		expect(action).toEqual({ kind: 'noop' });
+	});
+
+	it('disabled state is a no-op when next is null', () => {
+		const action = resolveGoNext(true, null);
+		expect(action).toEqual({ kind: 'noop' });
+	});
+});
+
+describe('resolveGoPrev (Previous button)', () => {
+	it('routes to /{module}/{lesson} when there is a previous lesson', () => {
+		const action = resolveGoPrev({ moduleId: 'mod-01', lessonId: 'lesson-01' });
+		expect(action).toEqual({ kind: 'goto', url: '/mod-01/lesson-01' });
+	});
+
+	it('no-op when prev is null (first lesson)', () => {
+		expect(resolveGoPrev(null)).toEqual({ kind: 'noop' });
+	});
+});
+
+describe('lessonHref', () => {
+	it('formats /{module}/{lesson}', () => {
+		expect(lessonHref('mod-01', 'lesson-01')).toBe('/mod-01/lesson-01');
+	});
+});

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/src/learningfoundry/sveltekit_template/src/lib/stores/curriculum.ts

@@ -86,6 +86,17 @@ export const nextLesson = derived(
 // Navigation helpers
 // ---------------------------------------------------------------------------
 
+/**
+ * **Internal route-sync only — UI code must use `goto` directly.**
+ *
+ * Sets `currentPosition` and routes to `/${moduleId}/${lessonId}`. Used by the
+ * dynamic lesson route's URL→store `$effect` and by the legacy
+ * `navigateNext`/`navigatePrev` helpers; do **not** call from sidebars,
+ * dashboards, or navigation buttons. UI code should import `goto` from
+ * `$app/navigation` and build the path explicitly so SvelteKit's lifecycle
+ * (page params, scroll restoration, lesson-route `{#key}` re-mount) fires
+ * predictably for every user-initiated navigation.
+ */
 export function navigateTo(moduleId: string, lessonId: string): void {
 	currentPosition.set({ moduleId, lessonId });
 	void goto(`/${moduleId}/${lessonId}`);

{learningfoundry-0.45.0 → learningfoundry-0.46.0/src/learningfoundry}/sveltekit_template/src/routes/[module]/[lesson]/+page.svelte

@@ -31,7 +31,9 @@
 </svelte:head>
 
 {#if currentLesson && currentModule}
-	<LessonView lesson={currentLesson} moduleId={currentModule.id} />
+	{#key `${currentModule.id}/${currentLesson.id}`}
+		<LessonView lesson={currentLesson} moduleId={currentModule.id} />
+	{/key}
 {:else if $curriculum}
 	<div class="flex h-full items-center justify-center">
 		<p class="text-gray-400">Lesson not found.</p>

{learningfoundry-0.45.0/src/learningfoundry → learningfoundry-0.46.0}/sveltekit_template/src/lib/components/LessonList.svelte

@@ -1,8 +1,10 @@
 <!-- Copyright 2026 Pointmatic — SPDX-License-Identifier: Apache-2.0 -->
 <script lang="ts">
-	import { currentPosition, navigateTo } from '$lib/stores/curriculum.js';
+	import { goto } from '$app/navigation';
+	import { currentPosition } from '$lib/stores/curriculum.js';
 	import type { Lesson, LessonProgress } from '$lib/types/index.js';
 	import { lessonStatusIcon, resolveLessonClick } from './module-list.helpers.js';
+	import { lessonHref } from './navigation.helpers.js';
 
 	interface Props {
 		moduleId: string;
@@ -34,7 +36,7 @@
 
 	function handleClick(lessonId: string) {
 		if (resolveLessonClick(lessonId, lockedLessons) === 'noop') return;
-		navigateTo(moduleId, lessonId);
+		void goto(lessonHref(moduleId, lessonId));
 	}
 </script>
 

{learningfoundry-0.45.0/src/learningfoundry → learningfoundry-0.46.0}/sveltekit_template/src/lib/components/LessonView.svelte

@@ -6,6 +6,7 @@
 	import type { Lesson, QuizScore } from '$lib/types/index.js';
 	import ContentBlock from './ContentBlock.svelte';
 	import Navigation from './Navigation.svelte';
+	import { contentBlockKey } from './lesson-view.helpers.js';
 	import { onMount } from 'svelte';
 
 	interface Props {
@@ -65,7 +66,7 @@
 	</header>
 
 	<div class="space-y-8">
-		{#each lesson.content_blocks as block, i (i)}
+		{#each lesson.content_blocks as block, i (contentBlockKey(block, i))}
 			<section>
 				<ContentBlock
 					{block}

{learningfoundry-0.45.0/src/learningfoundry → learningfoundry-0.46.0}/sveltekit_template/src/lib/components/Navigation.svelte

@@ -2,7 +2,8 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
 	import { ChevronLeft, ChevronRight } from 'lucide-svelte';
-	import { nextLesson, previousLesson, navigateTo } from '$lib/stores/curriculum.js';
+	import { nextLesson, previousLesson } from '$lib/stores/curriculum.js';
+	import { resolveGoNext, resolveGoPrev } from './navigation.helpers.js';
 
 	interface Props {
 		disabled?: boolean;
@@ -13,16 +14,13 @@
 	const next = $derived($nextLesson);
 
 	function goNext() {
-		if (disabled) return;
-		if (next) {
-			navigateTo(next.moduleId, next.lessonId);
-		} else {
-			void goto('/');
-		}
+		const action = resolveGoNext(disabled, next);
+		if (action.kind === 'goto') void goto(action.url);
 	}
 
 	function goPrev() {
-		if (prev) navigateTo(prev.moduleId, prev.lessonId);
+		const action = resolveGoPrev(prev);
+		if (action.kind === 'goto') void goto(action.url);
 	}
 </script>
 

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/sveltekit_template/src/lib/components/ProgressDashboard.svelte

@@ -1,6 +1,6 @@
 <!-- Copyright 2026 Pointmatic — SPDX-License-Identifier: Apache-2.0 -->
 <script lang="ts">
-	import { navigateTo } from '$lib/stores/curriculum.js';
+	import { goto } from '$app/navigation';
 	import type { Curriculum, Module, ModuleProgress, QuizScore } from '$lib/types/index.js';
 	import { getOptionalLessons, isModuleComplete } from '$lib/utils/locking.js';
 	import ProgressBar from './ProgressBar.svelte';
@@ -45,7 +45,7 @@
 			(l) => !optional.has(l.id) && mp?.lessons[l.id]?.status !== 'complete'
 		);
 		const target = firstIncomplete ?? mod.lessons[0];
-		if (target) navigateTo(mod.id, target.id);
+		if (target) void goto(`/${mod.id}/${target.id}`);
 	}
 
 	const totalLessons = $derived(modules.reduce((n, m) => n + m.lessons.length, 0));

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/sveltekit_template/src/lib/components/VideoBlock.svelte

@@ -1,7 +1,6 @@
 <!-- Copyright 2026 Pointmatic — SPDX-License-Identifier: Apache-2.0 -->
 <script lang="ts">
 	import type { VideoContent } from '$lib/types/index.js';
-	import { onMount } from 'svelte';
 
 	interface Props {
 		content: VideoContent;
@@ -51,11 +50,21 @@
 		};
 	}
 
-	onMount(() => {
+	// `$effect` re-runs whenever the watched URL changes, so when a parent
+	// reuses this component instance across lessons (e.g. two consecutive
+	// lessons each with a video block) we tear down the previous player
+	// and observer and create a fresh one for the new `videoId`. The
+	// {#key} wrapper at the lesson route plus the stable block key in
+	// `LessonView` already force a re-mount in normal flows; this effect
+	// is the belt-and-suspenders fallback if any caller skips both keys.
+	$effect(() => {
+		const url = content.url; // dependency
 		if (provider !== 'youtube' || !onvideocomplete) return;
-		const videoId = extractYouTubeId(content.url);
+		const videoId = extractYouTubeId(url);
 		if (!videoId) return;
 
+		fired = false;
+
 		let cleanup: (() => void) | undefined;
 		/* eslint-disable @typescript-eslint/no-explicit-any */
 		let player: any;
@@ -80,6 +89,8 @@
 			}
 		}
 
+		let fallbackTimer: ReturnType<typeof setTimeout> | undefined;
+
 		if ((window as any).YT?.Player) {
 			createPlayer();
 		} else {
@@ -95,21 +106,16 @@
 				createPlayer();
 			};
 
-			const fallbackTimer = setTimeout(() => {
+			fallbackTimer = setTimeout(() => {
 				if (!(window as any).YT?.Player && !fired) {
 					cleanup = setupViewportFallback();
 				}
 			}, 5000);
-
-			return () => {
-				clearTimeout(fallbackTimer);
-				player?.destroy?.();
-				cleanup?.();
-			};
 		}
 		/* eslint-enable @typescript-eslint/no-explicit-any */
 
 		return () => {
+			if (fallbackTimer !== undefined) clearTimeout(fallbackTimer);
 			player?.destroy?.();
 			cleanup?.();
 		};

learningfoundry-0.46.0/sveltekit_template/src/lib/components/lesson-view.helpers.ts

@@ -0,0 +1,63 @@
+// Copyright 2026 Pointmatic — SPDX-License-Identifier: Apache-2.0
+/**
+ * LessonView block-tracking helpers.
+ *
+ * Extracted from `LessonView.svelte` so the completion logic can be
+ * unit-tested without mounting the Svelte component.
+ */
+
+import type { ContentBlock } from '$lib/types/index.js';
+
+/**
+ * Stable identity key for a content block. Used as the `{#each}` key so
+ * child components (notably `VideoBlock`, which holds an iframe player)
+ * tear down and re-mount when the underlying content changes rather
+ * than being reused across lessons with stale state.
+ */
+export function contentBlockKey(block: ContentBlock, index: number): string {
+	if (block.ref) return `${block.type}:${block.ref}`;
+	const url = (block.content as { url?: unknown })?.url;
+	if (typeof url === 'string') return `${block.type}:${url}`;
+	return `${block.type}-${index}`;
+}
+
+export interface BlockTracker {
+	/** Record a block as complete. Returns true if this was the final block. */
+	markBlockComplete(blockIndex: number): boolean;
+	/** Number of completed blocks so far. */
+	readonly completedCount: number;
+	/** Whether all blocks are complete. */
+	readonly allComplete: boolean;
+}
+
+/**
+ * Create a block tracker for a lesson with `totalBlocks` content blocks.
+ *
+ * If `preComplete` is true, the lesson was already marked complete in the DB
+ * on a previous visit — all blocks are considered done from the start.
+ *
+ * Zero-block lessons are immediately complete.
+ */
+export function createBlockTracker(
+	totalBlocks: number,
+	preComplete: boolean = false
+): BlockTracker {
+	const completed = new Set<number>();
+	const immediate = totalBlocks === 0 || preComplete;
+
+	return {
+		markBlockComplete(blockIndex: number): boolean {
+			if (immediate) return true;
+			completed.add(blockIndex);
+			return completed.size === totalBlocks;
+		},
+
+		get completedCount(): number {
+			return immediate ? totalBlocks : completed.size;
+		},
+
+		get allComplete(): boolean {
+			return immediate || completed.size === totalBlocks;
+		}
+	};
+}

learningfoundry-0.46.0/sveltekit_template/src/lib/components/navigation.helpers.ts

@@ -0,0 +1,33 @@
+// Copyright 2026 Pointmatic — SPDX-License-Identifier: Apache-2.0
+/**
+ * Pure resolver for the Next/Finish and Previous button actions.
+ *
+ * Extracted so the routing decision can be unit-tested without mounting
+ * `Navigation.svelte` and stubbing all of its store dependencies. The
+ * component just calls these helpers and dispatches the resulting `goto`
+ * call to `$app/navigation`.
+ */
+import type { NavPosition } from '$lib/stores/curriculum.js';
+
+export type NavAction = { kind: 'noop' } | { kind: 'goto'; url: string };
+
+/** Resolve the action for the Next/Finish button click. */
+export function resolveGoNext(
+	disabled: boolean,
+	next: NavPosition | null
+): NavAction {
+	if (disabled) return { kind: 'noop' };
+	if (next) return { kind: 'goto', url: `/${next.moduleId}/${next.lessonId}` };
+	return { kind: 'goto', url: '/' };
+}
+
+/** Resolve the action for the Previous button click. */
+export function resolveGoPrev(prev: NavPosition | null): NavAction {
+	if (!prev) return { kind: 'noop' };
+	return { kind: 'goto', url: `/${prev.moduleId}/${prev.lessonId}` };
+}
+
+/** URL path for an in-app lesson link. */
+export function lessonHref(moduleId: string, lessonId: string): string {
+	return `/${moduleId}/${lessonId}`;
+}

{learningfoundry-0.45.0 → learningfoundry-0.46.0}/sveltekit_template/src/lib/stores/curriculum.ts

@@ -85,6 +85,16 @@ export const nextLesson = derived(
 // Navigation helpers
 // ---------------------------------------------------------------------------
 
+/**
+ * **Internal route-sync only — UI code must use `goto` directly.**
+ *
+ * Sets `currentPosition`. Used by the dynamic lesson route's URL→store
+ * `$effect`; do **not** call from sidebars, dashboards, or navigation
+ * buttons. UI code should import `goto` from `$app/navigation` and build
+ * the path explicitly so SvelteKit's lifecycle (page params, scroll
+ * restoration, lesson-route `{#key}` re-mount) fires predictably for
+ * every user-initiated navigation.
+ */
 export function navigateTo(moduleId: string, lessonId: string): void {
 	currentPosition.set({ moduleId, lessonId });
 }

{learningfoundry-0.45.0/src/learningfoundry → learningfoundry-0.46.0}/sveltekit_template/src/routes/[module]/[lesson]/+page.svelte

@@ -31,7 +31,9 @@
 </svelte:head>
 
 {#if currentLesson && currentModule}
-	<LessonView lesson={currentLesson} moduleId={currentModule.id} />
+	{#key `${currentModule.id}/${currentLesson.id}`}
+		<LessonView lesson={currentLesson} moduleId={currentModule.id} />
+	{/key}
 {:else if $curriculum}
 	<div class="flex h-full items-center justify-center">
 		<p class="text-gray-400">Lesson not found.</p>