diff --git a/.env.example b/.env.example
index 7c53313..22361b8 100644
--- a/.env.example
+++ b/.env.example
@@ -32,12 +32,7 @@ CRON_SECRET=""                           # auto-filled by `npm run setup` — sh
 # --- Logging --------------------------------------------------
 LOG_LEVEL="info"                         # debug | info | warn | error
 
-# --- Push Notifications (Web Push / VAPID) --------------------
-VAPID_PUBLIC_KEY=""                      # generate with: npx web-push generate-vapid-keys
-VAPID_PRIVATE_KEY=""
-VAPID_SUBJECT="mailto:admin@studybot.app"
-
-# --- Email Reminders ------------------------------------------
+# --- Email ----------------------------------------------------
 EMAIL_PROVIDER="console"                # console | smtp
 SMTP_HOST=""
 SMTP_PORT="587"
@@ -45,6 +40,12 @@ SMTP_USER=""
 SMTP_PASS=""
 SMTP_FROM="Study Bot <noreply@studybot.app>"
 
+# Require users to verify their email address before signing in.
+# Default: off (unset/false) — new accounts can sign in immediately.
+# Only enable this with a real SMTP provider configured above; with the
+# console provider, verification links are only printed to the server logs.
+# REQUIRE_EMAIL_VERIFICATION="true"
+
 # --- Google Calendar Integration ------------------------------
 GOOGLE_CLIENT_ID=""
 GOOGLE_CLIENT_SECRET=""
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 72e388f..ffcb0d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,8 +81,8 @@ jobs:
 
       - run: npm ci
       - run: npx prisma generate
-      - name: Push schema to test DB
-        run: npx prisma db push --force-reset --accept-data-loss
+      - name: Apply migration history to test DB
+        run: npx prisma migrate deploy
       - name: Apply pgvector migration
         run: psql "${DATABASE_URL%%\?*}" -f prisma/manual-scripts/001_pgvector.sql
       - run: npm run test:integration
@@ -121,8 +121,8 @@ jobs:
 
       - run: npm ci
       - run: npx prisma generate
-      - name: Push schema to test DB
-        run: npx prisma db push --force-reset --accept-data-loss
+      - name: Apply migration history to test DB
+        run: npx prisma migrate deploy
       - name: Apply pgvector migration
         run: psql "${DATABASE_URL%%\?*}" -f prisma/manual-scripts/001_pgvector.sql
       - run: npx playwright install --with-deps chromium
diff --git a/README.md b/README.md
index dd34c54..85711d5 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,8 @@ The full treatment, with effect sizes, primary citations, and the failure modes
 
 ## Quick start
 
+Prerequisites: Node 20.19 or newer, plus Docker Desktop (or your own PostgreSQL server).
+
 ```
 git clone <repo> && cd Study-Bot
 npm install
@@ -31,7 +33,9 @@ npm run setup
 npm run dev
 ```
 
-Then open http://localhost:3000. The defaults need no API keys or external accounts: the AI provider is a deterministic mock, email logs to the console, and calendar sync uses a local fake. For real AI generated questions and feedback, set `AI_PROVIDER` to `openai` and add your `OPENAI_API_KEY` in `.env`.
+Then open http://localhost:3000. The defaults need no API keys or external accounts: the AI provider is a deterministic mock, email logs to the console, and calendar sync uses a local fake.
+
+To be blunt about the default: mock mode exists for tests. With `AI_PROVIDER` set to `mock`, sessions get template questions and canned feedback, which exercises the machinery but teaches you nothing. To actually study, set `AI_PROVIDER` to `openai` and add an `OPENAI_API_KEY` in `.env`.
 
 What `npm run setup` does: copies `.env.example` to `.env`, generates `NEXTAUTH_SECRET`, `TOKEN_ENC_KEY`, and `CRON_SECRET`, starts PostgreSQL through Docker, and applies all migrations. It is idempotent and never overwrites a value you set yourself.
 
@@ -139,6 +143,13 @@ Each technique below is implemented in the product. Citations are shortened here
 
 One warning: `ALLOW_TEST_AUTH` makes the app trust a header as the authenticated identity. It exists only for automated tests and must never be set in production.
 
+## Deployment and ops notes
+
+* **Auth gates.** `REQUIRE_EMAIL_VERIFICATION` is off by default, so new accounts can sign in immediately; enable it only once real SMTP is configured, because the console email provider prints verification links to server logs only. `ALLOW_TEST_AUTH` must never be set in production. `TOKEN_ENC_KEY` is required in production (setup generates one for local use).
+* **One long lived Node process.** The app is not serverless safe. Feedback is generated eagerly when an attempt lands, and the AI rate limiter and circuit breaker hold their state in process, so run it as a single persistent Node server via `npm start` rather than as per request functions.
+* **The port 3000 trap.** If something else already holds port 3000, Next silently starts on 3001 while `NEXTAUTH_URL` still points at 3000, and sign in breaks with baffling redirects. Free port 3000, or update `NEXTAUTH_URL` (plus `BASE_URL` and `NEXT_PUBLIC_APP_URL`) to the port actually in use.
+* **Admin routes.** The `/admin` pages and admin APIs are gated by `ADMIN_USER_IDS`, a comma separated list of user UUIDs. Until you set it, nobody is an admin.
+
 ## Development
 
 * `npm run dev`, `npm run build`, and `npm start` cover the dev server and production.
diff --git a/e2e/knowledge-layer.spec.ts b/e2e/knowledge-layer.spec.ts
index eb2c454..84a640d 100644
--- a/e2e/knowledge-layer.spec.ts
+++ b/e2e/knowledge-layer.spec.ts
@@ -5,10 +5,9 @@ const BASE_URL = process.env.BASE_URL || "http://localhost:3000";
 const USER_ID = "e2e_test_user";
 const pool = new pg.Pool({ connectionString: process.env.DATABASE_URL });
 
-// Override extraHTTPHeaders to remove X-User-Id — we set it via localStorage
-// and the client JS adds it to fetch calls. Having Playwright ALSO inject it
-// causes duplicate headers which break the ownership check.
-test.use({ extraHTTPHeaders: {} });
+// Playwright context headers ride on every browser request, so app fetches
+// authenticate as the test user (clients no longer send identity headers).
+test.use({ extraHTTPHeaders: { "X-User-Id": USER_ID } });
 
 test.describe.serial("Knowledge Layer — Leak Prevention", () => {
   const COURSE = "E2E_CS_KL";
@@ -78,10 +77,6 @@ test.describe.serial("Knowledge Layer — Leak Prevention", () => {
   test("review panel NOT visible before submitting answer", async ({ page }) => {
     const sessionUrl = `${BASE_URL}/s/${sessionId}`;
     await page.goto(sessionUrl);
-    await page.evaluate((uid) => {
-      localStorage.setItem("study_bot_user_id", uid);
-    }, USER_ID);
-    await page.goto(sessionUrl);
 
     await page.getByRole("button", { name: /start session|resume session/i }).click();
 
@@ -98,10 +93,6 @@ test.describe.serial("Knowledge Layer — Leak Prevention", () => {
   test("review panel appears after INCORRECT scoring with deferred feedback", async ({ page }) => {
     const sessionUrl = `${BASE_URL}/s/${sessionId}`;
     await page.goto(sessionUrl);
-    await page.evaluate((uid) => {
-      localStorage.setItem("study_bot_user_id", uid);
-    }, USER_ID);
-    await page.goto(sessionUrl);
 
     await page.getByRole("button", { name: /start session|resume session/i }).click();
 
diff --git a/e2e/session-runner.spec.ts b/e2e/session-runner.spec.ts
index bd16c86..3a48898 100644
--- a/e2e/session-runner.spec.ts
+++ b/e2e/session-runner.spec.ts
@@ -23,10 +23,9 @@ const SESSION_PAYLOAD = {
 let sessionId: string;
 let sessionUrl: string;
 
-// Override extraHTTPHeaders to remove X-User-Id — we set it via localStorage
-// and the client JS adds it to fetch calls. Having Playwright ALSO inject it
-// causes duplicate headers which break the ownership check.
-test.use({ extraHTTPHeaders: {} });
+// Playwright context headers ride on every browser request, so app fetches
+// authenticate as the test user (clients no longer send identity headers).
+test.use({ extraHTTPHeaders: { "X-User-Id": USER_ID } });
 
 test.describe.serial("E2E: Full Retrieval Session Runner", () => {
   test.beforeAll(async () => {
@@ -80,11 +79,6 @@ test.describe.serial("E2E: Full Retrieval Session Runner", () => {
   });
 
   test("start session and see first prompt", async ({ page }) => {
-    // Need to set the user ID in localStorage before starting
-    await page.goto(sessionUrl);
-    await page.evaluate((uid) => {
-      localStorage.setItem("study_bot_user_id", uid);
-    }, USER_ID);
     await page.goto(sessionUrl);
 
     await page.getByRole("button", { name: /start session/i }).click();
@@ -96,10 +90,6 @@ test.describe.serial("E2E: Full Retrieval Session Runner", () => {
 
   test("submit a CORRECT answer", async ({ page }) => {
     await page.goto(sessionUrl);
-    await page.evaluate((uid) => {
-      localStorage.setItem("study_bot_user_id", uid);
-    }, USER_ID);
-    await page.goto(sessionUrl);
 
     await page.getByRole("button", { name: /start session|resume session/i }).click();
 
@@ -125,10 +115,6 @@ test.describe.serial("E2E: Full Retrieval Session Runner", () => {
 
   test("submit an INCORRECT answer with error log", async ({ page }) => {
     await page.goto(sessionUrl);
-    await page.evaluate((uid) => {
-      localStorage.setItem("study_bot_user_id", uid);
-    }, USER_ID);
-    await page.goto(sessionUrl);
 
     await page.getByRole("button", { name: /start session|resume session/i }).click();
     await expect(page.locator("textarea")).toBeVisible({ timeout: 5000 });
@@ -160,10 +146,6 @@ test.describe.serial("E2E: Full Retrieval Session Runner", () => {
 
   test("refresh page mid-run preserves progress", async ({ page }) => {
     await page.goto(sessionUrl);
-    await page.evaluate((uid) => {
-      localStorage.setItem("study_bot_user_id", uid);
-    }, USER_ID);
-    await page.goto(sessionUrl);
 
     // Should show Resume (not Start) since we have an active run
     await expect(page.getByRole("button", { name: /resume session/i })).toBeVisible({
@@ -178,10 +160,6 @@ test.describe.serial("E2E: Full Retrieval Session Runner", () => {
 
   test("complete final prompt and see end screen", async ({ page }) => {
     await page.goto(sessionUrl);
-    await page.evaluate((uid) => {
-      localStorage.setItem("study_bot_user_id", uid);
-    }, USER_ID);
-    await page.goto(sessionUrl);
 
     await page.getByRole("button", { name: /start session|resume session/i }).click();
     // The review panel renders reflection textareas too, so target the
diff --git a/package-lock.json b/package-lock.json
index ed7f2e5..4b4b4ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,6 @@
         "pg": "^8.20.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "web-push": "^3.6.7",
         "zod": "^4.3.6"
       },
       "devDependencies": {
@@ -31,12 +30,10 @@
         "@types/react": "^19.2.14",
         "@types/web-push": "^3.6.4",
         "@vitejs/plugin-react": "^6.0.1",
+        "dotenv": "^17.4.2",
         "eslint": "^8.57.1",
         "eslint-config-next": "^14.2.35",
-        "fast-glob": "^3.3.3",
         "prisma": "^7.6.0",
-        "sharp": "^0.34.5",
-        "svgo": "^4.0.1",
         "tsx": "^4.21.0",
         "typescript": "^6.0.2",
         "vitest": "^4.1.2"
@@ -783,496 +780,6 @@
       "dev": true,
       "license": "BSD-3-Clause"
     },
-    "node_modules/@img/colour": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz",
-      "integrity": "sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@img/sharp-darwin-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.5.tgz",
-      "integrity": "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-arm64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-darwin-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.5.tgz",
-      "integrity": "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-x64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-libvips-darwin-arm64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.4.tgz",
-      "integrity": "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-darwin-x64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.4.tgz",
-      "integrity": "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-arm": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.4.tgz",
-      "integrity": "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-arm64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.4.tgz",
-      "integrity": "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-ppc64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.4.tgz",
-      "integrity": "sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-riscv64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.2.4.tgz",
-      "integrity": "sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-s390x": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.4.tgz",
-      "integrity": "sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-x64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.4.tgz",
-      "integrity": "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.4.tgz",
-      "integrity": "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.4.tgz",
-      "integrity": "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-linux-arm": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.5.tgz",
-      "integrity": "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.5.tgz",
-      "integrity": "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-ppc64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.5.tgz",
-      "integrity": "sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-ppc64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-riscv64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.34.5.tgz",
-      "integrity": "sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-riscv64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-s390x": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.5.tgz",
-      "integrity": "sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-s390x": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.5.tgz",
-      "integrity": "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-x64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-linuxmusl-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.5.tgz",
-      "integrity": "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-arm64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-linuxmusl-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.5.tgz",
-      "integrity": "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-x64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-wasm32": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.5.tgz",
-      "integrity": "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==",
-      "cpu": [
-        "wasm32"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/runtime": "^1.7.0"
-      },
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-win32-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz",
-      "integrity": "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-win32-ia32": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.5.tgz",
-      "integrity": "sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-win32-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz",
-      "integrity": "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -3224,15 +2731,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/agent-base": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
-      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/ajv": {
       "version": "8.18.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
@@ -3453,18 +2951,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
     "node_modules/assertion-error": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
@@ -3567,19 +3053,6 @@
         "better-result": "bin/cli.mjs"
       }
     },
-    "node_modules/bn.js": {
-      "version": "4.12.3",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz",
-      "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==",
-      "license": "MIT"
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
@@ -3591,25 +3064,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
-      "license": "BSD-3-Clause"
-    },
     "node_modules/busboy": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
@@ -3650,6 +3104,19 @@
         }
       }
     },
+    "node_modules/c12/node_modules/dotenv": {
+      "version": "16.6.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+      "devOptional": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
@@ -3822,16 +3289,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/commander": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
-      "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      }
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -3856,117 +3313,37 @@
         "node": "^14.18.0 || >=16.10.0"
       }
     },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/cookie": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
-      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-      "devOptional": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz",
-      "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
-        "domhandler": "^5.0.2",
-        "domutils": "^3.0.1",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css-tree": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz",
-      "integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mdn-data": "2.27.1",
-        "source-map-js": "^1.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz",
-      "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/csso": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
-      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "license": "MIT",
-      "dependencies": {
-        "css-tree": "~2.2.0"
-      },
       "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
-        "npm": ">=7.0.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
-      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
-      "dev": true,
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.0.28",
-        "source-map-js": "^1.0.1"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
-        "npm": ">=7.0.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.28",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
-      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
-      "dev": true,
-      "license": "CC0-1.0"
-    },
     "node_modules/csstype": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
@@ -4144,70 +3521,11 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "domelementtype": "^2.3.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
-      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
     "node_modules/dotenv": {
-      "version": "16.6.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
-      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
-      "devOptional": true,
+      "version": "17.4.2",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz",
+      "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==",
+      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -4238,15 +3556,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/effect": {
       "version": "3.20.0",
       "resolved": "https://registry.npmjs.org/effect/-/effect-3.20.0.tgz",
@@ -4275,19 +3584,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
     "node_modules/env-paths": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
@@ -5120,36 +4416,6 @@
       "devOptional": true,
       "license": "MIT"
     },
-    "node_modules/fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -5222,19 +4488,6 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -5681,15 +4934,6 @@
         "node": ">=16.9.0"
       }
     },
-    "node_modules/http_ece": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.2.0.tgz",
-      "integrity": "sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      }
-    },
     "node_modules/http-status-codes": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/http-status-codes/-/http-status-codes-2.3.0.tgz",
@@ -5697,36 +4941,6 @@
       "devOptional": true,
       "license": "MIT"
     },
-    "node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/https-proxy-agent/node_modules/debug": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
-      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/iconv-lite": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
@@ -5797,6 +5011,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/internal-slot": {
@@ -6067,16 +5282,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
     "node_modules/is-number-object": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
@@ -6382,27 +5587,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/jwa": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
-      "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
-      "license": "MIT",
-      "dependencies": {
-        "buffer-equal-constant-time": "^1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/jws": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
-      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
-      "license": "MIT",
-      "dependencies": {
-        "jwa": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -6793,56 +5977,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/mdn-data": {
-      "version": "2.27.1",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz",
-      "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==",
-      "dev": true,
-      "license": "CC0-1.0"
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/micromatch/node_modules/picomatch": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
-      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "license": "ISC"
-    },
     "node_modules/minimatch": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
@@ -6860,6 +5994,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7079,19 +6214,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
     "node_modules/nypm": {
       "version": "0.6.5",
       "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.5.tgz",
@@ -8184,26 +7306,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
     "node_modules/safe-push-apply": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
@@ -8243,18 +7345,9 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "devOptional": true,
       "license": "MIT"
     },
-    "node_modules/sax": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
-      "integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": ">=11.0.0"
-      }
-    },
     "node_modules/scheduler": {
       "version": "0.23.2",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
@@ -8329,64 +7422,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/sharp": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.5.tgz",
-      "integrity": "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@img/colour": "^1.0.0",
-        "detect-libc": "^2.1.2",
-        "semver": "^7.7.3"
-      },
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-darwin-arm64": "0.34.5",
-        "@img/sharp-darwin-x64": "0.34.5",
-        "@img/sharp-libvips-darwin-arm64": "1.2.4",
-        "@img/sharp-libvips-darwin-x64": "1.2.4",
-        "@img/sharp-libvips-linux-arm": "1.2.4",
-        "@img/sharp-libvips-linux-arm64": "1.2.4",
-        "@img/sharp-libvips-linux-ppc64": "1.2.4",
-        "@img/sharp-libvips-linux-riscv64": "1.2.4",
-        "@img/sharp-libvips-linux-s390x": "1.2.4",
-        "@img/sharp-libvips-linux-x64": "1.2.4",
-        "@img/sharp-libvips-linuxmusl-arm64": "1.2.4",
-        "@img/sharp-libvips-linuxmusl-x64": "1.2.4",
-        "@img/sharp-linux-arm": "0.34.5",
-        "@img/sharp-linux-arm64": "0.34.5",
-        "@img/sharp-linux-ppc64": "0.34.5",
-        "@img/sharp-linux-riscv64": "0.34.5",
-        "@img/sharp-linux-s390x": "0.34.5",
-        "@img/sharp-linux-x64": "0.34.5",
-        "@img/sharp-linuxmusl-arm64": "0.34.5",
-        "@img/sharp-linuxmusl-x64": "0.34.5",
-        "@img/sharp-wasm32": "0.34.5",
-        "@img/sharp-win32-arm64": "0.34.5",
-        "@img/sharp-win32-ia32": "0.34.5",
-        "@img/sharp-win32-x64": "0.34.5"
-      }
-    },
-    "node_modules/sharp/node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -8866,32 +7901,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/svgo": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-4.0.1.tgz",
-      "integrity": "sha512-XDpWUOPC6FEibaLzjfe0ucaV0YrOjYotGJO1WpF0Zd+n6ZGEQUsSugaoLq9QkEZtAfQIxT42UChcssDVPP3+/w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "commander": "^11.1.0",
-        "css-select": "^5.1.0",
-        "css-tree": "^3.0.1",
-        "css-what": "^6.1.0",
-        "csso": "^5.0.5",
-        "picocolors": "^1.1.1",
-        "sax": "^1.5.0"
-      },
-      "bin": {
-        "svgo": "bin/svgo.js"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/svgo"
-      }
-    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -8943,19 +7952,6 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/ts-api-utils": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
@@ -9429,25 +8425,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/web-push": {
-      "version": "3.6.7",
-      "resolved": "https://registry.npmjs.org/web-push/-/web-push-3.6.7.tgz",
-      "integrity": "sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==",
-      "license": "MPL-2.0",
-      "dependencies": {
-        "asn1.js": "^5.3.0",
-        "http_ece": "1.2.0",
-        "https-proxy-agent": "^7.0.0",
-        "jws": "^4.0.0",
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "web-push": "src/cli.js"
-      },
-      "engines": {
-        "node": ">= 16"
-      }
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/package.json b/package.json
index e722a61..eee670b 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,6 @@
     "test:integration": "vitest run src/__tests__/integration/",
     "test:watch": "vitest",
     "test:e2e": "playwright test",
-    "assets:build": "tsx scripts/assets-build.ts",
-    "assets:check": "tsx scripts/assets-check.ts",
-    "prebuild": "npm run assets:build",
     "worker": "tsx scripts/worker.ts",
     "db:up": "docker compose up -d db",
     "db:down": "docker compose down",
@@ -40,7 +37,6 @@
     "pg": "^8.20.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "web-push": "^3.6.7",
     "zod": "^4.3.6"
   },
   "devDependencies": {
@@ -52,12 +48,10 @@
     "@types/react": "^19.2.14",
     "@types/web-push": "^3.6.4",
     "@vitejs/plugin-react": "^6.0.1",
+    "dotenv": "^17.4.2",
     "eslint": "^8.57.1",
     "eslint-config-next": "^14.2.35",
-    "fast-glob": "^3.3.3",
     "prisma": "^7.6.0",
-    "sharp": "^0.34.5",
-    "svgo": "^4.0.1",
     "tsx": "^4.21.0",
     "typescript": "^6.0.2",
     "vitest": "^4.1.2"
diff --git a/prisma/migrations/20260716030000_slim_and_reconcile/migration.sql b/prisma/migrations/20260716030000_slim_and_reconcile/migration.sql
new file mode 100644
index 0000000..4741f3f
--- /dev/null
+++ b/prisma/migrations/20260716030000_slim_and_reconcile/migration.sql
@@ -0,0 +1,113 @@
+-- Slim & reconcile: drop dead feature tables (push notifications, scheduled
+-- reminders, practice sets) and fix schema/migration drift so
+-- `prisma migrate diff --from-migrations --to-schema` is clean.
+
+-- ---------------------------------------------------------------------------
+-- 1. Drop dead feature tables (feature code already removed)
+-- ---------------------------------------------------------------------------
+
+-- DropForeignKey
+ALTER TABLE "practice_questions" DROP CONSTRAINT "practice_questions_practice_set_id_fkey";
+
+-- DropForeignKey
+ALTER TABLE "push_subscriptions" DROP CONSTRAINT "push_subscriptions_user_id_fkey";
+
+-- DropForeignKey
+ALTER TABLE "scheduled_reminders" DROP CONSTRAINT "scheduled_reminders_user_id_fkey";
+
+-- DropTable
+DROP TABLE "practice_questions";
+
+-- DropTable
+DROP TABLE "practice_sets";
+
+-- DropTable
+DROP TABLE "push_subscriptions";
+
+-- DropTable
+DROP TABLE "scheduled_reminders";
+
+-- ---------------------------------------------------------------------------
+-- 2. Drift: session_error_logs.user_id carried a stray DEFAULT ''
+-- ---------------------------------------------------------------------------
+
+-- AlterTable
+ALTER TABLE "session_error_logs" ALTER COLUMN "user_id" DROP DEFAULT;
+
+-- ---------------------------------------------------------------------------
+-- 3. Drift: foreign keys created with ON DELETE RESTRICT, schema declares
+--    onDelete: Cascade
+-- ---------------------------------------------------------------------------
+
+-- DropForeignKey
+ALTER TABLE "session_runs" DROP CONSTRAINT "session_runs_session_id_fkey";
+
+-- DropForeignKey
+ALTER TABLE "session_attempts" DROP CONSTRAINT "session_attempts_run_id_fkey";
+
+-- DropForeignKey
+ALTER TABLE "session_error_logs" DROP CONSTRAINT "session_error_logs_run_id_fkey";
+
+-- DropForeignKey
+ALTER TABLE "study_plan_items" DROP CONSTRAINT "study_plan_items_plan_id_fkey";
+
+-- DropForeignKey
+ALTER TABLE "plan_calendar_publications" DROP CONSTRAINT "plan_calendar_publications_plan_id_fkey";
+
+-- DropForeignKey
+ALTER TABLE "plan_item_external_events" DROP CONSTRAINT "plan_item_external_events_plan_item_id_fkey";
+
+-- AddForeignKey
+ALTER TABLE "session_runs" ADD CONSTRAINT "session_runs_session_id_fkey" FOREIGN KEY ("session_id") REFERENCES "sessions"("session_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "session_attempts" ADD CONSTRAINT "session_attempts_run_id_fkey" FOREIGN KEY ("run_id") REFERENCES "session_runs"("run_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "session_error_logs" ADD CONSTRAINT "session_error_logs_run_id_fkey" FOREIGN KEY ("run_id") REFERENCES "session_runs"("run_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "study_plan_items" ADD CONSTRAINT "study_plan_items_plan_id_fkey" FOREIGN KEY ("plan_id") REFERENCES "study_plans"("plan_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "plan_calendar_publications" ADD CONSTRAINT "plan_calendar_publications_plan_id_fkey" FOREIGN KEY ("plan_id") REFERENCES "study_plans"("plan_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "plan_item_external_events" ADD CONSTRAINT "plan_item_external_events_plan_item_id_fkey" FOREIGN KEY ("plan_item_id") REFERENCES "study_plan_items"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- ---------------------------------------------------------------------------
+-- 4. Drift: indexes declared in the schema but never migrated
+-- ---------------------------------------------------------------------------
+
+-- CreateIndex
+CREATE INDEX "evidence_cards_strength_idx" ON "evidence_cards"("strength");
+
+-- CreateIndex
+CREATE INDEX "session_runs_user_created_idx" ON "session_runs"("user_id", "created_at" DESC);
+
+-- CreateIndex
+CREATE INDEX "sessions_user_created_idx" ON "sessions"("user_id", "created_at" DESC);
+
+-- CreateIndex
+CREATE INDEX "study_plans_user_exam_date_idx" ON "study_plans"("user_id", "exam_date");
+
+-- Dedupe flashcard ordinals before adding the unique index: reassign a dense
+-- 0-based ordinal per deck, preserving existing order (ordinal, then insert
+-- order) so decks with duplicate or gappy ordinals migrate cleanly.
+WITH ranked AS (
+  SELECT
+    "id",
+    ROW_NUMBER() OVER (
+      PARTITION BY "deck_id"
+      ORDER BY "ordinal", "created_at", "id"
+    ) - 1 AS new_ordinal
+  FROM "flashcards"
+)
+UPDATE "flashcards" f
+SET "ordinal" = ranked.new_ordinal
+FROM ranked
+WHERE f."id" = ranked."id"
+  AND f."ordinal" IS DISTINCT FROM ranked.new_ordinal;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "flashcards_deck_ordinal_key" ON "flashcards"("deck_id", "ordinal");
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index accf84a..cb2a95e 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -231,36 +231,6 @@ model ObjectiveAnchor {
   @@map("objective_anchors")
 }
 
-model PracticeSet {
-  id         String   @id @default(uuid())
-  userId     String   @map("user_id")
-  courseName String   @map("course_name")
-  examName   String?  @map("exam_name")
-  title      String
-  createdAt  DateTime @default(now()) @map("created_at")
-
-  questions PracticeQuestion[]
-
-  @@index([userId, courseName, examName], map: "practice_sets_user_course_exam_idx")
-  @@map("practice_sets")
-}
-
-model PracticeQuestion {
-  id            String   @id @default(uuid())
-  practiceSetId String   @map("practice_set_id")
-  kind          String // SHORT_ANSWER | MCQ | CODING
-  promptText    String   @map("prompt_text")
-  answerKey     String?  @map("answer_key")
-  solutionSteps String?  @map("solution_steps")
-  tags          Json?
-  createdAt     DateTime @default(now()) @map("created_at")
-
-  practiceSet PracticeSet @relation(fields: [practiceSetId], references: [id], onDelete: Cascade)
-
-  @@index([practiceSetId])
-  @@map("practice_questions")
-}
-
 model EvidencePaper {
   id         String   @id @default(uuid())
   userId     String   @map("user_id")
@@ -647,31 +617,13 @@ model User {
   createdAt     DateTime  @default(now()) @map("created_at")
   updatedAt     DateTime  @updatedAt @map("updated_at")
 
-  pushSubscriptions      PushSubscription[]
   notificationPreference NotificationPreference?
   chatMessages           ChatMessage[]
-  scheduledReminders     ScheduledReminder[]
   verificationTokens     VerificationToken[]
 
   @@map("users")
 }
 
-// ── Push Notifications ──────────────────────────────────────────
-
-model PushSubscription {
-  id        String   @id @default(uuid())
-  userId    String   @map("user_id")
-  endpoint  String
-  p256dh    String
-  auth      String
-  createdAt DateTime @default(now()) @map("created_at")
-
-  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
-
-  @@unique([userId, endpoint])
-  @@map("push_subscriptions")
-}
-
 // ── Chat Persistence ────────────────────────────────────────────
 
 model ChatMessage {
@@ -708,24 +660,6 @@ model NotificationPreference {
   @@map("notification_preferences")
 }
 
-// ── Email Reminders (scheduled) ─────────────────────────────────
-
-model ScheduledReminder {
-  id           String    @id @default(uuid())
-  userId       String    @map("user_id")
-  type         String // STUDY_REMINDER | STREAK_WARNING | WEEKLY_DIGEST
-  scheduledFor DateTime  @map("scheduled_for")
-  sentAt       DateTime? @map("sent_at")
-  payload      Json? // extra data (plan items, streak count, etc.)
-  createdAt    DateTime  @default(now()) @map("created_at")
-
-  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
-
-  @@index([scheduledFor, sentAt])
-  @@index([userId])
-  @@map("scheduled_reminders")
-}
-
 // ── Verification Tokens (email verify, password reset) ──────────
 
 model VerificationToken {
diff --git a/public/sw.js b/public/sw.js
deleted file mode 100644
index 0bbc025..0000000
--- a/public/sw.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// ── Study Bot Service Worker ────────────────────────────────────
-// Handles push notifications and notification click events.
-
-self.addEventListener("activate", (event) => {
-  // Claim all open clients so the SW takes effect immediately
-  event.waitUntil(self.clients.claim());
-});
-
-self.addEventListener("push", (event) => {
-  if (!event.data) return;
-
-  let payload;
-  try {
-    payload = event.data.json();
-  } catch {
-    payload = { title: "Study Bot", body: event.data.text() };
-  }
-
-  const { title = "Study Bot", body = "", url = "/", icon = "/assets/icon-192.png" } = payload;
-
-  event.waitUntil(
-    self.registration.showNotification(title, {
-      body,
-      icon,
-      badge: icon,
-      data: { url },
-    }),
-  );
-});
-
-self.addEventListener("notificationclick", (event) => {
-  event.notification.close();
-
-  const targetUrl = event.notification.data?.url || "/";
-
-  event.waitUntil(
-    self.clients.matchAll({ type: "window", includeUncontrolled: true }).then((clientList) => {
-      // If there's already an open tab, focus it and navigate
-      for (const client of clientList) {
-        if (client.url.includes(self.location.origin) && "focus" in client) {
-          client.focus();
-          client.navigate(targetUrl);
-          return;
-        }
-      }
-      // Otherwise open a new window
-      return self.clients.openWindow(targetUrl);
-    }),
-  );
-});
diff --git a/scripts/assets-build.ts b/scripts/assets-build.ts
deleted file mode 100644
index 0fd1f30..0000000
--- a/scripts/assets-build.ts
+++ /dev/null
@@ -1,291 +0,0 @@
-/**
- * Asset optimization pipeline.
- *
- * Reads raw exports from design/exports-raw/,
- * outputs optimized assets to public/assets/ui/,
- * generates src/ui/assets/manifest.ts.
- *
- * Usage: npx tsx scripts/assets-build.ts
- *
- * PNG → AVIF (q55) + WebP (q80), strip metadata, optional @2x→@1x downscale
- * SVG → SVGO optimized
- */
-import { mkdir, writeFile, rm } from "fs/promises";
-import { existsSync } from "fs";
-import path from "path";
-import sharp from "sharp";
-import { optimize } from "svgo";
-import { readFile } from "fs/promises";
-import fg from "fast-glob";
-
-// ---- Config ----
-
-const RAW_DIR = "design/exports-raw";
-const OUT_DIR = "public/assets/ui";
-const MANIFEST_PATH = "src/ui/assets/manifest.ts";
-
-const AVIF_QUALITY = 55;
-const WEBP_QUALITY = 80;
-
-const MAX_FILE_SIZE = 300 * 1024; // 300KB
-const MAX_DIMENSION = 2000;
-const MAX_PIXELS = 4_000_000;
-
-// Assets allowed to exceed pixel budget (e.g. hero backgrounds)
-const PIXEL_ALLOWLIST: string[] = [];
-
-// ---- Types ----
-
-interface AssetEntry {
-  key: string;
-  avif?: string;
-  webp?: string;
-  svg?: string;
-  width?: number;
-  height?: number;
-}
-
-interface BuildResult {
-  assets: AssetEntry[];
-  warnings: string[];
-  errors: string[];
-}
-
-// ---- SVG optimization config ----
-
-const SVGO_CONFIG = {
-  plugins: [
-    { name: "removeDoctype" as const },
-    { name: "removeXMLProcInst" as const },
-    { name: "removeComments" as const },
-    { name: "removeMetadata" as const },
-    { name: "removeEditorsNSData" as const },
-    { name: "removeDesc" as const, params: { removeAny: true } },
-    { name: "removeUselessDefs" as const },
-    { name: "cleanupAttrs" as const },
-    { name: "removeEmptyAttrs" as const },
-    { name: "removeEmptyContainers" as const },
-    { name: "sortAttrs" as const },
-    { name: "removeDimensions" as const, active: false },
-  ],
-};
-
-// ---- Main ----
-
-export async function buildAssets(): Promise<BuildResult> {
-  const warnings: string[] = [];
-  const errors: string[] = [];
-  const assets: AssetEntry[] = [];
-
-  // Clean and recreate output dir
-  if (existsSync(OUT_DIR)) {
-    await rm(OUT_DIR, { recursive: true });
-  }
-  await mkdir(OUT_DIR, { recursive: true });
-
-  // Scan raw exports
-  const pngFiles = await fg("**/*.png", { cwd: RAW_DIR });
-  const svgFiles = await fg("**/*.svg", { cwd: RAW_DIR });
-
-  // Sort for deterministic output
-  pngFiles.sort();
-  svgFiles.sort();
-
-  // Process PNGs
-  for (const file of pngFiles) {
-    const fullPath = path.join(RAW_DIR, file);
-    const basename = path.basename(file, ".png");
-
-    try {
-      const img = sharp(fullPath);
-      const meta = await img.metadata();
-      const w = meta.width!;
-      const h = meta.height!;
-
-      // Dimension warnings
-      if (w > MAX_DIMENSION || h > MAX_DIMENSION) {
-        warnings.push(`${file}: dimensions ${w}x${h} exceed ${MAX_DIMENSION}px`);
-      }
-
-      // Pixel budget
-      if (w * h > MAX_PIXELS && !PIXEL_ALLOWLIST.includes(basename)) {
-        errors.push(`${file}: ${w * h} pixels exceeds ${MAX_PIXELS} limit`);
-        continue;
-      }
-
-      // Generate AVIF + WebP
-      const avifPath = path.join(OUT_DIR, `${basename}.avif`);
-      const webpPath = path.join(OUT_DIR, `${basename}.webp`);
-
-      await sharp(fullPath)
-        .avif({ quality: AVIF_QUALITY })
-        .toFile(avifPath);
-
-      await sharp(fullPath)
-        .webp({ quality: WEBP_QUALITY })
-        .toFile(webpPath);
-
-      assets.push({
-        key: basename,
-        avif: `/assets/ui/${basename}.avif`,
-        webp: `/assets/ui/${basename}.webp`,
-        width: w,
-        height: h,
-      });
-
-      // Handle @2x → @1x downscale
-      if (basename.endsWith("@2x")) {
-        const baseKey = basename.replace(/@2x$/, "");
-        const halfW = Math.round(w / 2);
-        const halfH = Math.round(h / 2);
-
-        const avif1x = path.join(OUT_DIR, `${baseKey}@1x.avif`);
-        const webp1x = path.join(OUT_DIR, `${baseKey}@1x.webp`);
-
-        await sharp(fullPath)
-          .resize(halfW, halfH)
-          .avif({ quality: AVIF_QUALITY })
-          .toFile(avif1x);
-
-        await sharp(fullPath)
-          .resize(halfW, halfH)
-          .webp({ quality: WEBP_QUALITY })
-          .toFile(webp1x);
-
-        assets.push({
-          key: `${baseKey}@1x`,
-          avif: `/assets/ui/${baseKey}@1x.avif`,
-          webp: `/assets/ui/${baseKey}@1x.webp`,
-          width: halfW,
-          height: halfH,
-        });
-      }
-    } catch (err) {
-      errors.push(`${file}: processing failed — ${err}`);
-    }
-  }
-
-  // Process SVGs
-  for (const file of svgFiles) {
-    const fullPath = path.join(RAW_DIR, file);
-    const basename = path.basename(file, ".svg");
-
-    try {
-      const raw = await readFile(fullPath, "utf-8");
-      const result = optimize(raw, {
-        path: fullPath,
-        ...SVGO_CONFIG,
-      });
-
-      const outPath = path.join(OUT_DIR, `${basename}.svg`);
-      await writeFile(outPath, result.data, "utf-8");
-
-      // Parse width/height from SVG if present
-      const wMatch = raw.match(/width="(\d+)"/);
-      const hMatch = raw.match(/height="(\d+)"/);
-
-      assets.push({
-        key: basename,
-        svg: `/assets/ui/${basename}.svg`,
-        width: wMatch ? parseInt(wMatch[1], 10) : undefined,
-        height: hMatch ? parseInt(hMatch[1], 10) : undefined,
-      });
-    } catch (err) {
-      errors.push(`${file}: SVG optimization failed — ${err}`);
-    }
-  }
-
-  // Sort assets by key for deterministic manifest
-  assets.sort((a, b) => a.key.localeCompare(b.key));
-
-  // Budget check: output file sizes
-  const outputFiles = await fg("**/*", { cwd: OUT_DIR, stats: true });
-  for (const entry of outputFiles) {
-    // fast-glob with stats returns stats on the entry
-    const filePath = path.join(OUT_DIR, entry.path);
-    const { size } = await import("fs").then((fs) =>
-      fs.promises.stat(filePath)
-    );
-    if (size > MAX_FILE_SIZE) {
-      errors.push(
-        `${entry.path}: ${(size / 1024).toFixed(1)}KB exceeds ${MAX_FILE_SIZE / 1024}KB budget`
-      );
-    }
-  }
-
-  // Generate manifest
-  await generateManifest(assets);
-
-  return { assets, warnings, errors };
-}
-
-// ---- Manifest generator ----
-
-async function generateManifest(assets: AssetEntry[]): Promise<void> {
-  await mkdir(path.dirname(MANIFEST_PATH), { recursive: true });
-
-  const keys = assets.map((a) => `  | "${a.key}"`).join("\n");
-
-  const entries = assets
-    .map((a) => {
-      const fields: string[] = [];
-      if (a.avif) fields.push(`avif: "${a.avif}"`);
-      if (a.webp) fields.push(`webp: "${a.webp}"`);
-      if (a.svg) fields.push(`svg: "${a.svg}"`);
-      if (a.width != null) fields.push(`width: ${a.width}`);
-      if (a.height != null) fields.push(`height: ${a.height}`);
-      return `  "${a.key}": { ${fields.join(", ")} }`;
-    })
-    .join(",\n");
-
-  const code = `/**
- * AUTO-GENERATED by scripts/assets-build.ts — do not edit manually.
- * Run \`npm run assets:build\` to regenerate.
- */
-
-export type AssetKey =
-${keys};
-
-export interface AssetMeta {
-  avif?: string;
-  webp?: string;
-  svg?: string;
-  width?: number;
-  height?: number;
-}
-
-export const assets: Record<AssetKey, AssetMeta> = {
-${entries},
-};
-
-/**
- * Get the best available source URL for an asset.
- * Preference: avif > webp > svg.
- */
-export function assetSrc(key: AssetKey): string {
-  const a = assets[key];
-  return a.avif ?? a.webp ?? a.svg ?? "";
-}
-`;
-
-  await writeFile(MANIFEST_PATH, code, "utf-8");
-}
-
-// ---- CLI entry ----
-
-if (process.argv[1]?.endsWith("assets-build.ts") || process.argv[1]?.endsWith("assets-build")) {
-  buildAssets().then((result) => {
-    for (const w of result.warnings) {
-      console.warn(`⚠ ${w}`);
-    }
-    for (const e of result.errors) {
-      console.error(`✗ ${e}`);
-    }
-    console.log(
-      `✓ ${result.assets.length} assets built (${result.errors.length} errors, ${result.warnings.length} warnings)`
-    );
-    if (result.errors.length > 0) {
-      process.exit(1);
-    }
-  });
-}
diff --git a/scripts/assets-check.ts b/scripts/assets-check.ts
deleted file mode 100644
index 4937950..0000000
--- a/scripts/assets-check.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Asset budget checker.
- *
- * Validates that all optimized assets meet size/dimension budgets.
- * Run via: npx tsx scripts/assets-check.ts
- * Used in CI to prevent regressions.
- */
-import { stat } from "fs/promises";
-import path from "path";
-import fg from "fast-glob";
-import sharp from "sharp";
-
-const OUT_DIR = "public/assets/ui";
-
-const MAX_FILE_SIZE = 300 * 1024; // 300KB
-const MAX_DIMENSION = 2000;
-const MAX_PIXELS = 4_000_000;
-const PIXEL_ALLOWLIST: string[] = [];
-
-export interface CheckResult {
-  total: number;
-  warnings: string[];
-  errors: string[];
-}
-
-export async function checkAssets(): Promise<CheckResult> {
-  const warnings: string[] = [];
-  const errors: string[] = [];
-
-  const files = await fg("**/*", { cwd: OUT_DIR });
-  files.sort();
-
-  for (const file of files) {
-    const filePath = path.join(OUT_DIR, file);
-    const stats = await stat(filePath);
-
-    // Size budget
-    if (stats.size > MAX_FILE_SIZE) {
-      errors.push(
-        `${file}: ${(stats.size / 1024).toFixed(1)}KB exceeds ${MAX_FILE_SIZE / 1024}KB limit`
-      );
-    }
-
-    // Dimension checks for raster images
-    const ext = path.extname(file).toLowerCase();
-    if (ext === ".avif" || ext === ".webp" || ext === ".png") {
-      try {
-        const meta = await sharp(filePath).metadata();
-        const w = meta.width ?? 0;
-        const h = meta.height ?? 0;
-
-        if (w > MAX_DIMENSION || h > MAX_DIMENSION) {
-          warnings.push(`${file}: ${w}x${h} exceeds ${MAX_DIMENSION}px`);
-        }
-
-        const basename = path.basename(file, ext);
-        if (w * h > MAX_PIXELS && !PIXEL_ALLOWLIST.includes(basename)) {
-          errors.push(`${file}: ${w * h} pixels exceeds ${MAX_PIXELS} limit`);
-        }
-      } catch {
-        // Non-image file, skip dimension check
-      }
-    }
-  }
-
-  return { total: files.length, warnings, errors };
-}
-
-// CLI entry
-if (process.argv[1]?.endsWith("assets-check.ts") || process.argv[1]?.endsWith("assets-check")) {
-  checkAssets().then((result) => {
-    for (const w of result.warnings) {
-      console.warn(`⚠ ${w}`);
-    }
-    for (const e of result.errors) {
-      console.error(`✗ ${e}`);
-    }
-    console.log(`✓ ${result.total} assets checked (${result.errors.length} errors, ${result.warnings.length} warnings)`);
-    if (result.errors.length > 0) {
-      process.exit(1);
-    }
-  });
-}
diff --git a/scripts/setup.mjs b/scripts/setup.mjs
index 66f441b..5bbd201 100644
--- a/scripts/setup.mjs
+++ b/scripts/setup.mjs
@@ -25,6 +25,17 @@ const root = join(dirname(fileURLToPath(import.meta.url)), "..");
 const envPath = join(root, ".env");
 const examplePath = join(root, ".env.example");
 
+// ---------------------------------------------------------------------------
+// 0. Node version check (Next.js 15 + this script need Node 20.19+)
+// ---------------------------------------------------------------------------
+const [nodeMajor, nodeMinor] = process.versions.node.split(".").map(Number);
+if (nodeMajor < 20 || (nodeMajor === 20 && nodeMinor < 19)) {
+  console.error(
+    `Setup failed: Node ${process.versions.node} is too old — this project requires Node 20.19 or newer, so install a current Node LTS and re-run npm run setup.`,
+  );
+  process.exit(1);
+}
+
 // On Windows, docker/npx are .cmd shims and need a shell to resolve.
 const useShell = process.platform === "win32";
 
@@ -121,7 +132,8 @@ function parseEnv(text) {
   return result;
 }
 
-for (const [key, value] of Object.entries(parseEnv(envText))) {
+const parsedEnv = parseEnv(envText);
+for (const [key, value] of Object.entries(parsedEnv)) {
   if (process.env[key] === undefined) process.env[key] = value;
 }
 
@@ -238,6 +250,12 @@ if (!migrated || !generated) {
   }
   if (!generated) log("  - npx prisma generate");
 }
+if (parsedEnv.AI_PROVIDER === "mock") {
+  log("");
+  log("Heads up: AI_PROVIDER is \"mock\" in .env. Mock mode exists for tests —");
+  log("sessions get template questions and canned feedback. For real studying,");
+  log("set AI_PROVIDER=openai and add an OPENAI_API_KEY in .env.");
+}
 log("");
 log("Next steps:");
 log("  npm run dev       start the app  ->  http://localhost:3000");
diff --git a/src/__tests__/assets-pipeline.test.ts b/src/__tests__/assets-pipeline.test.ts
deleted file mode 100644
index fdbcb14..0000000
--- a/src/__tests__/assets-pipeline.test.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * Tests for the asset optimization pipeline.
- *
- * Verifies:
- * - Manifest generation with stable keys
- * - Budget enforcement (file size, dimensions, pixels)
- * - Deterministic output (running twice yields same manifest)
- * - @2x → @1x downscaling
- * - SVG optimization (metadata stripped)
- */
-import { describe, it, expect, beforeAll } from "vitest";
-import { existsSync, readFileSync, statSync } from "fs";
-import path from "path";
-
-// Build assets before tests (the pipeline should already have been run)
-// If not, tests will verify against whatever is in public/assets/ui
-
-const OUT_DIR = "public/assets/ui";
-const MANIFEST_PATH = "src/ui/assets/manifest.ts";
-const MAX_FILE_SIZE = 300 * 1024;
-
-describe("Asset Pipeline", () => {
-  let manifestContent: string;
-  let manifestModule: any;
-
-  beforeAll(async () => {
-    // Build assets fresh
-    const { buildAssets } = await import("../../scripts/assets-build");
-    const result = await buildAssets();
-    expect(result.errors).toHaveLength(0);
-
-    manifestContent = readFileSync(MANIFEST_PATH, "utf-8");
-    manifestModule = await import("@/ui/assets/manifest");
-  });
-
-  describe("manifest generation", () => {
-    it("generates a valid TypeScript manifest file", () => {
-      expect(existsSync(MANIFEST_PATH)).toBe(true);
-      expect(manifestContent).toContain("export type AssetKey");
-      expect(manifestContent).toContain("export const assets");
-      expect(manifestContent).toContain("export function assetSrc");
-    });
-
-    it("produces stable keys sorted alphabetically", () => {
-      const keyMatches = manifestContent.match(/\| "([^"]+)"/g);
-      expect(keyMatches).toBeTruthy();
-      const keys = keyMatches!.map((m) => m.replace('| "', "").replace('"', ""));
-      const sorted = [...keys].sort();
-      expect(keys).toEqual(sorted);
-    });
-
-    it("includes all expected fixture assets", () => {
-      const { assets } = manifestModule;
-      expect(assets["btn-primary"]).toBeDefined();
-      expect(assets["icon-phone-off"]).toBeDefined();
-      expect(assets["icon-check"]).toBeDefined();
-      expect(assets["icon-session"]).toBeDefined();
-    });
-
-    it("raster assets have avif and webp paths", () => {
-      const { assets } = manifestModule;
-      const btn = assets["btn-primary"];
-      expect(btn.avif).toMatch(/\.avif$/);
-      expect(btn.webp).toMatch(/\.webp$/);
-      expect(btn.width).toBeGreaterThan(0);
-      expect(btn.height).toBeGreaterThan(0);
-    });
-
-    it("SVG assets have svg path", () => {
-      const { assets } = manifestModule;
-      const icon = assets["icon-phone-off"];
-      expect(icon.svg).toMatch(/\.svg$/);
-      expect(icon.avif).toBeUndefined();
-      expect(icon.webp).toBeUndefined();
-    });
-
-    it("assetSrc prefers avif for raster assets", () => {
-      const { assetSrc } = manifestModule;
-      expect(assetSrc("btn-primary")).toMatch(/\.avif$/);
-    });
-
-    it("assetSrc returns svg for SVG-only assets", () => {
-      const { assetSrc } = manifestModule;
-      expect(assetSrc("icon-check")).toMatch(/\.svg$/);
-    });
-  });
-
-  describe("@2x downscaling", () => {
-    it("generates @1x variant from @2x input", () => {
-      const { assets } = manifestModule;
-      expect(assets["btn-primary@2x"]).toBeDefined();
-      expect(assets["btn-primary@1x"]).toBeDefined();
-    });
-
-    it("@1x dimensions are half of @2x", () => {
-      const { assets } = manifestModule;
-      const x2 = assets["btn-primary@2x"];
-      const x1 = assets["btn-primary@1x"];
-      expect(x1.width).toBe(Math.round(x2.width / 2));
-      expect(x1.height).toBe(Math.round(x2.height / 2));
-    });
-  });
-
-  describe("SVG optimization", () => {
-    it("strips metadata and comments from SVGs", () => {
-      const svgPath = path.join(OUT_DIR, "icon-phone-off.svg");
-      const content = readFileSync(svgPath, "utf-8");
-      expect(content).not.toContain("<metadata>");
-      expect(content).not.toContain("<!--");
-      expect(content).not.toContain("<desc>");
-    });
-
-    it("preserves functional SVG content", () => {
-      const svgPath = path.join(OUT_DIR, "icon-phone-off.svg");
-      const content = readFileSync(svgPath, "utf-8");
-      expect(content).toContain("<svg");
-      expect(content).toContain("<path");
-      expect(content).toContain("viewBox");
-    });
-  });
-
-  describe("budgets", () => {
-    it("all output files are under 300KB", () => {
-      const { assets } = manifestModule;
-      for (const key of Object.keys(assets)) {
-        const meta = assets[key];
-        const paths = [meta.avif, meta.webp, meta.svg].filter(Boolean);
-        for (const p of paths) {
-          const fullPath = path.join("public", p);
-          if (existsSync(fullPath)) {
-            const size = statSync(fullPath).size;
-            expect(size).toBeLessThan(MAX_FILE_SIZE);
-          }
-        }
-      }
-    });
-  });
-
-  describe("determinism", () => {
-    it("running build twice produces identical manifest", async () => {
-      const { buildAssets } = await import("../../scripts/assets-build");
-      await buildAssets();
-      const first = readFileSync(MANIFEST_PATH, "utf-8");
-      await buildAssets();
-      const second = readFileSync(MANIFEST_PATH, "utf-8");
-      expect(first).toBe(second);
-    });
-  });
-});
diff --git a/src/__tests__/calendar.test.ts b/src/__tests__/calendar.test.ts
index 21126ff..1c729b6 100644
--- a/src/__tests__/calendar.test.ts
+++ b/src/__tests__/calendar.test.ts
@@ -29,7 +29,6 @@ describe("buildCalendarTitle", () => {
       ["ERROR_REPAIR", "Error Repair"],
       ["EXAM_SIM", "Exam Sim"],
       ["WORKED_EXAMPLES", "Worked Examples"],
-      ["OFFICE_HOURS_PREP", "Office Hours Prep"],
     ] as const;
 
     for (const [mode, label] of modes) {
diff --git a/src/__tests__/content-prompts-validation.test.ts b/src/__tests__/content-prompts-validation.test.ts
new file mode 100644
index 0000000..94d558a
--- /dev/null
+++ b/src/__tests__/content-prompts-validation.test.ts
@@ -0,0 +1,214 @@
+/**
+ * Unit tests for model-output validation in generateContentAwarePrompts.
+ *
+ * The model's JSON is untrusted: prompts without real question text or an
+ * objective id must be dropped (never persisted into a run), and when fewer
+ * than 3 valid prompts survive the generator must return null so callers
+ * fall back to deterministic prompts.
+ */
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+vi.mock("@/services/content-plan", () => ({
+  getContentContextForSession: vi.fn(),
+}));
+
+vi.mock("@/lib/ai/gateway", () => ({
+  runTask: vi.fn(),
+}));
+
+vi.mock("@/lib/ai/prompt-registry", () => ({
+  getPrompt: vi.fn(() => ({ version: "v1_test" })),
+}));
+
+vi.mock("@/lib/mastery", () => ({
+  getMasterySummary: vi.fn(async () => ({ total: 0, mastered: 0, due: 0, objectives: [] })),
+}));
+
+vi.mock("@/lib/db", () => ({
+  prisma: {
+    sessionErrorLog: { findMany: vi.fn(async () => []) },
+  },
+}));
+
+import { generateContentAwarePrompts } from "@/lib/content-prompts";
+import { getContentContextForSession } from "@/services/content-plan";
+import { runTask } from "@/lib/ai/gateway";
+import type { GatewayContext } from "@/lib/ai/gateway";
+
+const contentMock = getContentContextForSession as ReturnType<typeof vi.fn>;
+const runTaskMock = runTask as ReturnType<typeof vi.fn>;
+
+const gatewayCtx = { userId: "user-1", provider: {} } as unknown as GatewayContext;
+
+const DEFAULT_PARAMS = {
+  userId: "user-1",
+  courseName: "Biology",
+  examName: "Midterm 1",
+  mode: "RETRIEVAL",
+  topicScope: "Cell transport",
+  objectives: [
+    { id: "obj_0", title: "Osmosis" },
+    { id: "obj_1", title: "Active transport" },
+  ],
+  promptCount: 6,
+  gatewayCtx,
+};
+
+function makeSnippets(count: number) {
+  return Array.from({ length: count }, (_, i) => ({
+    chunk_id: `c_${i}`,
+    doc_title: `Lecture ${i}`,
+    page_number: i + 1,
+    text: `content ${i}`,
+  }));
+}
+
+function validPrompt(i: number, objectiveId = "obj_0") {
+  return {
+    objective_id: objectiveId,
+    text: `Question ${i}: explain the mechanism.`,
+    difficulty: 2,
+    format: "FREE_RECALL",
+  };
+}
+
+function mockRunTaskRaw(raw: unknown) {
+  runTaskMock.mockImplementation(
+    async (_ctx: unknown, spec: { parseOutput: (r: unknown) => unknown }) => ({
+      output: spec.parseOutput(raw),
+      meta: { cacheHit: false, latencyMs: 1, promptVersion: "v1_test", model: "m", task: "GENERATE_PROMPTS" },
+    }),
+  );
+}
+
+describe("generateContentAwarePrompts output validation", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    contentMock.mockResolvedValue({ snippets: makeSnippets(5), totalChunks: 20 });
+  });
+
+  it("drops prompts with missing/empty/non-string text or missing objective_id", async () => {
+    mockRunTaskRaw({
+      prompts: [
+        validPrompt(1),
+        { objective_id: "obj_0", text: 42, difficulty: 1 }, // non-string text
+        { objective_id: "obj_0", text: "   ", difficulty: 1 }, // blank text
+        { objective_id: "obj_0", difficulty: 1 }, // missing text
+        { text: "No objective id", difficulty: 1 }, // missing objective_id
+        { objective_id: 7, text: "Numeric objective id", difficulty: 1 }, // non-string objective_id
+        null, // not even an object
+        validPrompt(2, "obj_1"),
+        validPrompt(3, "obj_1"),
+      ],
+    });
+
+    const result = await generateContentAwarePrompts(DEFAULT_PARAMS);
+
+    expect(result).not.toBeNull();
+    expect(result).toHaveLength(3);
+    expect(result!.map((p) => p.text)).toEqual([
+      "Question 1: explain the mechanism.",
+      "Question 2: explain the mechanism.",
+      "Question 3: explain the mechanism.",
+    ]);
+    // Sequential ids assigned after filtering
+    expect(result!.map((p) => p.id)).toEqual(["p_0", "p_1", "p_2"]);
+  });
+
+  it("returns null when fewer than 3 valid prompts survive", async () => {
+    mockRunTaskRaw({
+      prompts: [
+        validPrompt(1),
+        validPrompt(2),
+        { objective_id: "obj_0", text: "", difficulty: 1 },
+        { text: "orphan", difficulty: 1 },
+      ],
+    });
+
+    const result = await generateContentAwarePrompts(DEFAULT_PARAMS);
+
+    expect(result).toBeNull();
+  });
+
+  it("returns null when the model returns no prompts", async () => {
+    mockRunTaskRaw({ prompts: [] });
+
+    expect(await generateContentAwarePrompts(DEFAULT_PARAMS)).toBeNull();
+  });
+
+  it("returns null when prompts is not an array", async () => {
+    mockRunTaskRaw({ prompts: "not-an-array" });
+
+    expect(await generateContentAwarePrompts(DEFAULT_PARAMS)).toBeNull();
+  });
+
+  it("returns null when the raw output is not an object", async () => {
+    mockRunTaskRaw(null);
+
+    expect(await generateContentAwarePrompts(DEFAULT_PARAMS)).toBeNull();
+  });
+
+  it("demotes an MCQ with an out-of-range correct_index to FREE_RECALL without throwing", async () => {
+    mockRunTaskRaw({
+      prompts: [
+        validPrompt(1),
+        validPrompt(2),
+        {
+          objective_id: "obj_1",
+          text: "Off-by-one MCQ",
+          difficulty: 2,
+          format: "MCQ",
+          choices: ["A", "B", "C", "D"],
+          correct_index: 4, // 1-based off-by-one — unanswerable as MCQ
+        },
+      ],
+    });
+
+    const result = await generateContentAwarePrompts(DEFAULT_PARAMS);
+
+    expect(result).not.toBeNull();
+    expect(result).toHaveLength(3);
+    const demoted = result!.find((p) => p.text === "Off-by-one MCQ")!;
+    expect(demoted.format).toBe("FREE_RECALL");
+    expect(demoted.choices).toBeUndefined();
+    expect(demoted.correctIndex).toBeUndefined();
+  });
+
+  it("keeps a well-formed MCQ intact (choices, valid index, answer meta)", async () => {
+    mockRunTaskRaw({
+      prompts: [
+        validPrompt(1),
+        validPrompt(2),
+        {
+          objective_id: "obj_1",
+          text: "Valid MCQ",
+          difficulty: 2,
+          format: "MCQ",
+          choices: ["A", "B", "C", "D"],
+          correct_index: 1,
+          model_answer: "B is correct.",
+          key_points: ["point one", "point two"],
+        },
+      ],
+    });
+
+    const result = await generateContentAwarePrompts(DEFAULT_PARAMS);
+
+    expect(result).not.toBeNull();
+    const mcq = result!.find((p) => p.text === "Valid MCQ")!;
+    expect(mcq.format).toBe("MCQ");
+    expect(mcq.choices).toHaveLength(4);
+    expect(mcq.correctIndex).toBeGreaterThanOrEqual(0);
+    expect(mcq.correctIndex).toBeLessThan(4);
+    // The shuffled correct choice still points at the right answer
+    expect(mcq.choices![mcq.correctIndex!]).toBe("B");
+    expect(mcq.meta?.model_answer).toBe("B is correct.");
+    expect(mcq.meta?.key_points).toEqual(["point one", "point two"]);
+  });
+
+  it("returns null when runTask throws", async () => {
+    runTaskMock.mockRejectedValue(new Error("provider down"));
+
+    expect(await generateContentAwarePrompts(DEFAULT_PARAMS)).toBeNull();
+  });
+});
diff --git a/src/__tests__/feedback-malformed-output.test.ts b/src/__tests__/feedback-malformed-output.test.ts
new file mode 100644
index 0000000..23490f7
--- /dev/null
+++ b/src/__tests__/feedback-malformed-output.test.ts
@@ -0,0 +1,236 @@
+/**
+ * Unit tests for model-output hardening in the feedback service.
+ *
+ * The AI's JSON is untrusted: fields that are not strings (numbers, arrays,
+ * objects, booleans) must be dropped from the FeedbackResponse — never
+ * persisted into feedbackJson — and generation must not throw.
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { AiTask } from "@/lib/ai/types";
+
+const updateManyCalls: { where: Record<string, unknown>; data: Record<string, unknown> }[] = [];
+
+vi.mock("@/lib/db", () => {
+  const prisma = {
+    sessionAttempt: {
+      findUnique: vi.fn(),
+      updateMany: vi.fn(async (args: { where: Record<string, unknown>; data: Record<string, unknown> }) => {
+        updateManyCalls.push(args);
+        return { count: 1 };
+      }),
+    },
+    sessionErrorLog: {
+      findFirst: vi.fn(async () => null),
+      findMany: vi.fn(async () => []),
+    },
+    sessionRunPrompt: { findUnique: vi.fn(async () => null) },
+    objectiveAnchor: { findMany: vi.fn(async () => []) },
+    attemptCitation: { upsert: vi.fn(async () => ({})) },
+    $transaction: vi.fn(async (ops: Promise<unknown>[]) => Promise.all(ops)),
+  };
+  return { prisma };
+});
+
+vi.mock("@/lib/search", () => ({
+  searchChunks: vi.fn(async () => [
+    {
+      chunk_id: "chunk-1",
+      doc_id: "doc-1",
+      doc_title: "Notes",
+      page_number: 2,
+      rank_score: 1,
+      snippet: "relevant snippet",
+    },
+  ]),
+  buildFeedbackQuery: vi.fn(() => "query"),
+}));
+
+// Avoid constructing a real OpenAI provider when AI_PROVIDER=openai
+vi.mock("@/lib/ai/provider-factory", () => ({
+  createProvider: vi.fn(() => ({})),
+}));
+
+vi.mock("@/lib/ai/gateway", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/lib/ai/gateway")>();
+  return { ...actual, runTask: vi.fn() };
+});
+
+import { generateFeedback } from "@/services/feedback";
+import { prisma } from "@/lib/db";
+import { runTask } from "@/lib/ai/gateway";
+
+const findUniqueAttemptMock = prisma.sessionAttempt.findUnique as ReturnType<typeof vi.fn>;
+const runTaskMock = runTask as ReturnType<typeof vi.fn>;
+
+function makeAttempt(selfScore: "CORRECT" | "INCORRECT") {
+  return {
+    id: "attempt-1",
+    runId: "run-1",
+    promptIndex: 0,
+    promptText: "What is osmosis?",
+    userAnswer: "an answer",
+    selfScore,
+    confidenceRating: null,
+    feedbackStatus: "NONE",
+    feedbackJson: null,
+    run: {
+      userId: "user-1",
+      session: {
+        courseName: "Biology",
+        examName: "Midterm 1",
+        objectives: [{ id: "obj-1", title: "Cell transport" }],
+      },
+    },
+    citations: [],
+  };
+}
+
+/** Route runTask through the real parseOutput with per-task raw JSON. */
+function mockRawByTask(rawByTask: Partial<Record<string, unknown>>) {
+  runTaskMock.mockImplementation(
+    async (_ctx: unknown, spec: { task: string; parseOutput: (r: unknown) => unknown }) => ({
+      output: spec.parseOutput(rawByTask[spec.task]),
+      meta: { cacheHit: false, latencyMs: 1, promptVersion: "v", model: "m", task: spec.task },
+    }),
+  );
+}
+
+const MALFORMED_FEEDBACK_RAW = {
+  explanation: 42,
+  key_takeaway: ["not", "a", "string"],
+  concept_connection: { nested: true },
+  mnemonic: 3.14,
+  pattern_advice: false,
+  referenced_chunk_ids: "not-an-array",
+};
+
+const MALFORMED_SOCRATIC_RAW = {
+  followup_question: ["why?"],
+  purpose: 7,
+};
+
+const MALFORMED_REINFORCEMENT_RAW = {
+  reinforcement: { text: "nested" },
+  deeper_insight: 0,
+  concept_connection: [],
+};
+
+describe("feedback model-output hardening", () => {
+  const prevProvider = process.env.AI_PROVIDER;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    updateManyCalls.length = 0;
+    process.env.AI_PROVIDER = "openai";
+  });
+
+  afterEach(() => {
+    if (prevProvider === undefined) delete process.env.AI_PROVIDER;
+    else process.env.AI_PROVIDER = prevProvider;
+  });
+
+  it("drops all malformed explanation/socratic fields for INCORRECT without throwing", async () => {
+    findUniqueAttemptMock.mockResolvedValue(makeAttempt("INCORRECT"));
+    mockRawByTask({
+      [AiTask.GENERATE_FEEDBACK]: MALFORMED_FEEDBACK_RAW,
+      [AiTask.SOCRATIC_FOLLOWUP]: MALFORMED_SOCRATIC_RAW,
+    });
+
+    const result = await generateFeedback("user-1", "attempt-1");
+
+    expect(result.status).toBe("OK");
+    expect(result.excerpts).toHaveLength(1);
+    expect(result.explanation).toBeUndefined();
+    expect(result.key_takeaway).toBeUndefined();
+    expect(result.concept_connection).toBeUndefined();
+    expect(result.mnemonic).toBeUndefined();
+    expect(result.pattern_advice).toBeUndefined();
+    expect(result.socratic_followup).toBeUndefined();
+    expect(result.socratic_purpose).toBeUndefined();
+  });
+
+  it("never persists malformed fields into feedbackJson", async () => {
+    findUniqueAttemptMock.mockResolvedValue(makeAttempt("INCORRECT"));
+    mockRawByTask({
+      [AiTask.GENERATE_FEEDBACK]: MALFORMED_FEEDBACK_RAW,
+      [AiTask.SOCRATIC_FOLLOWUP]: MALFORMED_SOCRATIC_RAW,
+    });
+
+    await generateFeedback("user-1", "attempt-1");
+
+    const persisted = updateManyCalls.find((c) => c.data.feedbackStatus === "READY");
+    expect(persisted).toBeDefined();
+    // Prisma persists JSON via serialization, which strips undefined-valued
+    // keys — assert on the serialized form, i.e. what actually reaches the DB.
+    const json = JSON.parse(
+      JSON.stringify(persisted!.data.feedbackJson),
+    ) as Record<string, unknown>;
+    expect(json.status).toBe("OK");
+    // Only status + excerpts survive — no key carries a non-string AI field
+    for (const [key, value] of Object.entries(json)) {
+      if (key === "excerpts") continue;
+      expect(typeof value, `field ${key} must be a string`).toBe("string");
+    }
+    expect(json).not.toHaveProperty("explanation");
+    expect(json).not.toHaveProperty("key_takeaway");
+    expect(json).not.toHaveProperty("mnemonic");
+    expect(json).not.toHaveProperty("socratic_followup");
+  });
+
+  it("drops malformed reinforcement fields for CORRECT without throwing", async () => {
+    findUniqueAttemptMock.mockResolvedValue(makeAttempt("CORRECT"));
+    mockRawByTask({
+      [AiTask.REINFORCE_CORRECT]: MALFORMED_REINFORCEMENT_RAW,
+      [AiTask.SOCRATIC_FOLLOWUP]: MALFORMED_SOCRATIC_RAW,
+    });
+
+    const result = await generateFeedback("user-1", "attempt-1");
+
+    expect(result.status).toBe("OK");
+    expect(result.reinforcement).toBeUndefined();
+    expect(result.deeper_insight).toBeUndefined();
+    expect(result.concept_connection).toBeUndefined();
+    expect(result.socratic_followup).toBeUndefined();
+  });
+
+  it("keeps well-formed string fields (sanity)", async () => {
+    findUniqueAttemptMock.mockResolvedValue(makeAttempt("INCORRECT"));
+    mockRawByTask({
+      [AiTask.GENERATE_FEEDBACK]: {
+        explanation: "You skipped the gradient direction.",
+        key_takeaway: "Water moves toward higher solute concentration.",
+        concept_connection: "Related to diffusion.",
+        mnemonic: null,
+        pattern_advice: null,
+        referenced_chunk_ids: ["chunk-1"],
+      },
+      [AiTask.SOCRATIC_FOLLOWUP]: {
+        followup_question: "What happens if the membrane is impermeable?",
+        purpose: "Probe boundary conditions.",
+      },
+    });
+
+    const result = await generateFeedback("user-1", "attempt-1");
+
+    expect(result.explanation).toBe("You skipped the gradient direction.");
+    expect(result.key_takeaway).toBe("Water moves toward higher solute concentration.");
+    expect(result.concept_connection).toBe("Related to diffusion.");
+    expect(result.mnemonic).toBeUndefined();
+    expect(result.socratic_followup).toBe("What happens if the membrane is impermeable?");
+    expect(result.socratic_purpose).toBe("Probe boundary conditions.");
+  });
+
+  it("tolerates a completely non-object model payload", async () => {
+    findUniqueAttemptMock.mockResolvedValue(makeAttempt("INCORRECT"));
+    mockRawByTask({
+      [AiTask.GENERATE_FEEDBACK]: "plain text, not json",
+      [AiTask.SOCRATIC_FOLLOWUP]: 12345,
+    });
+
+    const result = await generateFeedback("user-1", "attempt-1");
+
+    expect(result.status).toBe("OK");
+    expect(result.explanation).toBeUndefined();
+    expect(result.socratic_followup).toBeUndefined();
+  });
+});
diff --git a/src/__tests__/integration/knowledge-layer.test.ts b/src/__tests__/integration/knowledge-layer.test.ts
index 31e227b..3100703 100644
--- a/src/__tests__/integration/knowledge-layer.test.ts
+++ b/src/__tests__/integration/knowledge-layer.test.ts
@@ -1,5 +1,5 @@
 /**
- * Integration tests for the Knowledge Layer (CKB, Practice Bank, Evidence Cards).
+ * Integration tests for the Knowledge Layer (CKB, Evidence Cards).
  *
  * These tests exercise the service layer directly (no HTTP). They require a
  * running PostgreSQL database. Set DATABASE_URL to a test database before running.
@@ -87,12 +87,6 @@ The outer loop invariant must account for the inner loop's effect.
     await prisma.evidencePaper.deleteMany({
       where: { userId: { in: [USER_A, USER_B] } },
     });
-    await prisma.practiceQuestion.deleteMany({
-      where: { practiceSet: { userId: { in: [USER_A, USER_B] } } },
-    });
-    await prisma.practiceSet.deleteMany({
-      where: { userId: { in: [USER_A, USER_B] } },
-    });
     await prisma.contentChunk.deleteMany({
       where: { document: { userId: { in: [USER_A, USER_B] } } },
     });
@@ -262,56 +256,6 @@ The outer loop invariant must account for the inner loop's effect.
     });
   });
 
-  // Practice Bank
-  describe("Practice Bank", () => {
-    let setId: string;
-
-    it("creates a practice set", async () => {
-      const set = await prisma.practiceSet.create({
-        data: {
-          userId: USER_A,
-          courseName: COURSE,
-          title: "Midterm Prep",
-        },
-      });
-      expect(set.id).toBeTruthy();
-      setId = set.id;
-    });
-
-    it("imports questions", async () => {
-      const questions = [
-        { kind: "SHORT_ANSWER", promptText: "Define loop invariant" },
-        { kind: "MCQ", promptText: "Which is NOT a loop property?", answerKey: "D" },
-      ];
-      for (const q of questions) {
-        await prisma.practiceQuestion.create({
-          data: {
-            practiceSet: { connect: { id: setId } },
-            kind: q.kind,
-            promptText: q.promptText,
-            answerKey: q.answerKey ?? null,
-          },
-        });
-      }
-      const count = await prisma.practiceQuestion.count({ where: { practiceSetId: setId } });
-      expect(count).toBe(2);
-    });
-
-    it("lists questions", async () => {
-      const questions = await prisma.practiceQuestion.findMany({
-        where: { practiceSetId: setId },
-      });
-      expect(questions.length).toBe(2);
-    });
-
-    it("user B cannot import into user A's set", async () => {
-      // Verify ownership check: user B should not own the set
-      const set = await prisma.practiceSet.findUnique({ where: { id: setId } });
-      expect(set.userId).toBe(USER_A);
-      expect(set.userId).not.toBe(USER_B);
-    });
-  });
-
   // Evidence
   describe("Evidence Cards", () => {
     let researchDocId: string;
diff --git a/src/__tests__/mock-provider-canned.test.ts b/src/__tests__/mock-provider-canned.test.ts
new file mode 100644
index 0000000..07b8856
--- /dev/null
+++ b/src/__tests__/mock-provider-canned.test.ts
@@ -0,0 +1,173 @@
+/**
+ * Unit tests for the MockProvider canned GENERATE_PROMPTS / GENERATE_FEEDBACK /
+ * GENERATE_WORKED_EXAMPLES responses, and the test-only malformed elicitation
+ * (env var MOCK_AI_MALFORMED=1 or the __ELICIT_MALFORMED__ input marker).
+ */
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import { MockProvider, MALFORMED_MARKER } from "@/lib/ai/providers/mock";
+
+const PROMPTS_SYS = "You are a professor. Task: GENERATE_PROMPTS.";
+const FEEDBACK_SYS = "You are a professor. Task: GENERATE_FEEDBACK.";
+const WORKED_SYS = "You are a professor. Task: GENERATE_WORKED_EXAMPLES.";
+
+interface MockPrompt {
+  objective_id?: unknown;
+  text?: unknown;
+  format?: string;
+  choices?: unknown;
+  correct_index?: unknown;
+  distractor_rationales?: unknown;
+  model_answer?: unknown;
+  key_points?: unknown;
+}
+
+interface MockSet {
+  problem?: unknown;
+  steps?: { action?: unknown; why?: unknown }[];
+  completion_problem_1?: unknown;
+  completion_problem_2?: unknown;
+  full_problem?: unknown;
+  model_answer?: unknown;
+}
+
+const isNonEmptyString = (v: unknown): v is string =>
+  typeof v === "string" && v.trim().length > 0;
+
+describe("MockProvider canned AI responses", () => {
+  let provider: MockProvider;
+  const prevEnv = process.env.MOCK_AI_MALFORMED;
+
+  beforeEach(() => {
+    provider = new MockProvider();
+    delete process.env.MOCK_AI_MALFORMED;
+  });
+
+  afterEach(() => {
+    if (prevEnv === undefined) delete process.env.MOCK_AI_MALFORMED;
+    else process.env.MOCK_AI_MALFORMED = prevEnv;
+  });
+
+  it("GENERATE_PROMPTS default: at least 3 valid prompts, MCQs well-formed", async () => {
+    const result = await provider.completeJson(PROMPTS_SYS, "generate questions", "m");
+    const prompts = (result.json as { prompts: MockPrompt[] }).prompts;
+
+    expect(prompts.length).toBeGreaterThanOrEqual(3);
+    for (const p of prompts) {
+      expect(isNonEmptyString(p.text)).toBe(true);
+      expect(typeof p.objective_id).toBe("string");
+      expect(isNonEmptyString(p.model_answer)).toBe(true);
+      expect(Array.isArray(p.key_points)).toBe(true);
+      expect((p.key_points as unknown[]).every((k) => isNonEmptyString(k))).toBe(true);
+      if (p.format === "MCQ") {
+        expect(Array.isArray(p.choices)).toBe(true);
+        expect(p.choices as unknown[]).toHaveLength(4);
+        expect(Number.isInteger(p.correct_index)).toBe(true);
+        expect(p.correct_index as number).toBeGreaterThanOrEqual(0);
+        expect(p.correct_index as number).toBeLessThan(4);
+        expect(p.distractor_rationales as unknown[]).toHaveLength(4);
+      }
+    }
+    // At least one MCQ and one FREE_RECALL in the canned deck
+    expect(prompts.some((p) => p.format === "MCQ")).toBe(true);
+    expect(prompts.some((p) => p.format === "FREE_RECALL")).toBe(true);
+  });
+
+  it("GENERATE_FEEDBACK default: all fields are strings", async () => {
+    const result = await provider.completeJson(FEEDBACK_SYS, "give feedback", "m");
+    const json = result.json as Record<string, unknown>;
+
+    expect(isNonEmptyString(json.explanation)).toBe(true);
+    expect(isNonEmptyString(json.key_takeaway)).toBe(true);
+    expect(isNonEmptyString(json.concept_connection)).toBe(true);
+    expect(isNonEmptyString(json.mnemonic)).toBe(true);
+    expect(isNonEmptyString(json.pattern_advice)).toBe(true);
+    expect(Array.isArray(json.referenced_chunk_ids)).toBe(true);
+  });
+
+  it("GENERATE_WORKED_EXAMPLES default: sets satisfy the deck validity rules", async () => {
+    const result = await provider.completeJson(WORKED_SYS, "generate sets", "m");
+    const sets = (result.json as { sets: MockSet[] }).sets;
+
+    expect(sets.length).toBeGreaterThanOrEqual(1);
+    for (const s of sets) {
+      expect(isNonEmptyString(s.problem)).toBe(true);
+      expect(Array.isArray(s.steps)).toBe(true);
+      expect(s.steps!.length).toBeGreaterThanOrEqual(2);
+      for (const step of s.steps!) {
+        expect(isNonEmptyString(step.action)).toBe(true);
+        expect(isNonEmptyString(step.why)).toBe(true);
+      }
+      expect(isNonEmptyString(s.completion_problem_1)).toBe(true);
+      expect(isNonEmptyString(s.completion_problem_2)).toBe(true);
+      expect(isNonEmptyString(s.full_problem)).toBe(true);
+      expect(isNonEmptyString(s.model_answer)).toBe(true);
+    }
+  });
+
+  it("input marker elicits malformed GENERATE_PROMPTS (fewer than 3 valid survive)", async () => {
+    const result = await provider.completeJson(
+      PROMPTS_SYS,
+      `topic ${MALFORMED_MARKER}`,
+      "m",
+    );
+    const prompts = (result.json as { prompts: MockPrompt[] }).prompts;
+
+    const valid = prompts.filter(
+      (p) => isNonEmptyString(p.text) && typeof p.objective_id === "string",
+    );
+    expect(valid.length).toBeLessThan(3);
+    expect(prompts.length).toBeGreaterThan(valid.length);
+    // Includes an off-by-one MCQ that must be demoted, not scored
+    expect(
+      prompts.some(
+        (p) =>
+          p.format === "MCQ" &&
+          Array.isArray(p.choices) &&
+          (p.correct_index as number) >= (p.choices as unknown[]).length,
+      ),
+    ).toBe(true);
+  });
+
+  it("env var elicits malformed GENERATE_FEEDBACK (no string fields)", async () => {
+    process.env.MOCK_AI_MALFORMED = "1";
+    const result = await provider.completeJson(FEEDBACK_SYS, "give feedback", "m");
+    const json = result.json as Record<string, unknown>;
+
+    expect(typeof json.explanation).not.toBe("string");
+    expect(typeof json.key_takeaway).not.toBe("string");
+    expect(typeof json.mnemonic).not.toBe("string");
+    expect(Array.isArray(json.referenced_chunk_ids)).toBe(false);
+  });
+
+  it("env var elicits malformed GENERATE_WORKED_EXAMPLES (every set invalid)", async () => {
+    process.env.MOCK_AI_MALFORMED = "1";
+    const result = await provider.completeJson(WORKED_SYS, "generate sets", "m");
+    const sets = (result.json as { sets: MockSet[] }).sets;
+
+    expect(sets.length).toBeGreaterThan(0);
+    const validSets = sets.filter(
+      (s) =>
+        isNonEmptyString(s.problem) &&
+        Array.isArray(s.steps) &&
+        s.steps.length >= 2 &&
+        s.steps.every((st) => isNonEmptyString(st?.action) && isNonEmptyString(st?.why)) &&
+        isNonEmptyString(s.completion_problem_1) &&
+        isNonEmptyString(s.completion_problem_2) &&
+        isNonEmptyString(s.full_problem) &&
+        isNonEmptyString(s.model_answer),
+    );
+    expect(validSets).toHaveLength(0);
+  });
+
+  it("leaves other canned tasks untouched", async () => {
+    const citations = await provider.completeJson(
+      "Task: ANSWER_WITH_CITATIONS.",
+      "question",
+      "m",
+    );
+    expect((citations.json as Record<string, unknown>).answer_markdown).toBeTruthy();
+
+    const fallback = await provider.completeJson("Task: SOMETHING_ELSE.", "x", "m");
+    expect(fallback.json).toEqual({ text: "Mock response" });
+  });
+});
diff --git a/src/__tests__/worked-examples.test.ts b/src/__tests__/worked-examples.test.ts
index fd656d9..4a12356 100644
--- a/src/__tests__/worked-examples.test.ts
+++ b/src/__tests__/worked-examples.test.ts
@@ -227,6 +227,75 @@ describe("generateWorkedExampleDeck", () => {
     expect(result![3].meta?.pack).toBe("WE_FULL");
   });
 
+  it("rejects sets whose steps are missing an action or a why", async () => {
+    const emptyWhy = {
+      ...makeSet("obj_0", "X"),
+      steps: [
+        { action: "do the thing", why: "because" },
+        { action: "do the next thing", why: "" },
+      ],
+    };
+    const missingAction = {
+      ...makeSet("obj_0", "Y"),
+      steps: [
+        { action: "   ", why: "reason" },
+        { action: "step two", why: "reason two" },
+      ],
+    };
+    const nonObjectStep = {
+      ...makeSet("obj_0", "Z"),
+      steps: [{ action: "a", why: "b" }, null],
+    };
+    const valid = makeSet("obj_1", "B");
+
+    mockRunTaskSets([emptyWhy, missingAction, nonObjectStep, valid]);
+
+    const result = await generateWorkedExampleDeck(DEFAULT_PARAMS);
+
+    expect(result).not.toBeNull();
+    expect(result).toHaveLength(4);
+    expect(result!.every((p) => p.objective_id === "obj_1")).toBe(true);
+  });
+
+  it("rejects sets missing completion problems or the model answer", async () => {
+    const emptyCompletion1 = { ...makeSet("obj_0", "X"), completion_problem_1: "" };
+    const missingCompletion2 = { ...makeSet("obj_0", "Y"), completion_problem_2: undefined };
+    const emptyModelAnswer = { ...makeSet("obj_0", "Z"), model_answer: "   " };
+    const missingModelAnswer = { ...makeSet("obj_0", "W"), model_answer: undefined };
+    const valid = makeSet("obj_1", "B");
+
+    mockRunTaskSets([
+      emptyCompletion1,
+      missingCompletion2,
+      emptyModelAnswer,
+      missingModelAnswer,
+      valid,
+    ]);
+
+    const result = await generateWorkedExampleDeck(DEFAULT_PARAMS);
+
+    expect(result).not.toBeNull();
+    expect(result).toHaveLength(4);
+    expect(result!.every((p) => p.objective_id === "obj_1")).toBe(true);
+    expect(result![3].meta?.model_answer).toBe("B model answer");
+  });
+
+  it("returns null when sets is not an array or raw output is not an object", async () => {
+    const mockRunTaskRaw = (raw: unknown) =>
+      runTaskMock.mockImplementation(
+        async (_ctx: unknown, spec: { parseOutput: (r: unknown) => unknown }) => ({
+          output: spec.parseOutput(raw),
+          meta: { cacheHit: false, latencyMs: 1, promptVersion: "v", model: "m", task: AiTask.GENERATE_WORKED_EXAMPLES },
+        }),
+      );
+
+    mockRunTaskRaw({ sets: "garbage" });
+    expect(await generateWorkedExampleDeck(DEFAULT_PARAMS)).toBeNull();
+
+    mockRunTaskRaw(null);
+    expect(await generateWorkedExampleDeck(DEFAULT_PARAMS)).toBeNull();
+  });
+
   it("returns null when all sets are invalid", async () => {
     mockRunTaskSets([
       { ...makeSet("obj_0", "X"), problem: "" },
diff --git a/src/app/api/account/delete/route.ts b/src/app/api/account/delete/route.ts
index 810b298..0c1d159 100644
--- a/src/app/api/account/delete/route.ts
+++ b/src/app/api/account/delete/route.ts
@@ -49,9 +49,7 @@ export async function DELETE(request: NextRequest) {
         tx.planReflowAudit.deleteMany({ where: { userId } }),
         tx.objectiveAnchor.deleteMany({ where: { userId } }),
         tx.sessionErrorLog.deleteMany({ where: { userId } }),
-        tx.scheduledReminder.deleteMany({ where: { userId } }),
         tx.chatMessage.deleteMany({ where: { userId } }),
-        tx.pushSubscription.deleteMany({ where: { userId } }),
         tx.notificationPreference.deleteMany({ where: { userId } }),
         tx.verificationToken.deleteMany({ where: { userId } }),
       ]);
@@ -64,7 +62,6 @@ export async function DELETE(request: NextRequest) {
 
       // Phase 3: Parent models with userId (their cascading children are gone)
       await Promise.all([
-        tx.practiceSet.deleteMany({ where: { userId } }),
         tx.evidencePaper.deleteMany({ where: { userId } }),
         tx.flashcardDeck.deleteMany({ where: { userId } }),
         tx.sessionRun.deleteMany({ where: { userId } }),
diff --git a/src/app/api/account/export/route.ts b/src/app/api/account/export/route.ts
index ee76826..decca62 100644
--- a/src/app/api/account/export/route.ts
+++ b/src/app/api/account/export/route.ts
@@ -25,13 +25,10 @@ export async function GET(request: NextRequest) {
       flashcardDecks,
       chatMessages,
       notificationPreference,
-      pushSubscriptions,
-      scheduledReminders,
       userGameState,
       aiCallLogs,
       contentDocuments,
       objectiveAnchors,
-      practiceSets,
       evidencePapers,
       planReflowAudits,
       planCalendarPublications,
@@ -73,15 +70,6 @@ export async function GET(request: NextRequest) {
         where: { userId },
       }),
 
-      prisma.pushSubscription.findMany({
-        where: { userId },
-        omit: { auth: true, p256dh: true },
-      }),
-
-      prisma.scheduledReminder.findMany({
-        where: { userId },
-      }),
-
       prisma.userGameState.findUnique({
         where: { userId },
       }),
@@ -100,11 +88,6 @@ export async function GET(request: NextRequest) {
         where: { userId },
       }),
 
-      prisma.practiceSet.findMany({
-        where: { userId },
-        include: { questions: true },
-      }),
-
       prisma.evidencePaper.findMany({
         where: { userId },
         include: { cards: true },
@@ -163,7 +146,6 @@ export async function GET(request: NextRequest) {
       sessions,
       contentDocuments,
       flashcardDecks,
-      practiceSets,
       evidencePapers,
       objectiveAnchors,
       objectiveMastery,
@@ -180,8 +162,6 @@ export async function GET(request: NextRequest) {
       planItemExternalEvents,
       googleIntegration,
       notificationPreference,
-      pushSubscriptions,
-      scheduledReminders,
     };
 
     logger.info("account.export.success", { userId });
diff --git a/src/app/api/content/anchors/build/route.ts b/src/app/api/content/anchors/build/route.ts
deleted file mode 100644
index 20e182e..0000000
--- a/src/app/api/content/anchors/build/route.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { getUserId } from "@/lib/auth";
-import { buildObjectiveAnchors } from "@/services/anchors";
-import { z } from "zod/v4";
-import { logger } from "@/lib/logger";
-
-const buildAnchorsSchema = z.object({
-  course_name: z.string().min(1),
-  exam_name: z.string().optional(),
-  objectives: z.array(z.object({ id: z.string(), title: z.string() })).min(1),
-});
-
-export async function POST(request: NextRequest) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  let body: unknown;
-  try {
-    body = await request.json();
-  } catch {
-    return NextResponse.json({ error: "Invalid JSON body" }, { status: 400 });
-  }
-
-  let parsed;
-  try {
-    parsed = buildAnchorsSchema.parse(body);
-  } catch (err) {
-    if (err instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: "Validation failed", issues: err.issues },
-        { status: 400 }
-      );
-    }
-    throw err;
-  }
-
-  try {
-    const result = await buildObjectiveAnchors(
-      userId,
-      parsed.course_name,
-      parsed.exam_name,
-      parsed.objectives
-    );
-    return NextResponse.json(result);
-  } catch (err) {
-    logger.error("build_anchors_failed", { error: String(err) });
-    return NextResponse.json({ error: "Internal server error" }, { status: 500 });
-  }
-}
diff --git a/src/app/api/evidence/cards/route.ts b/src/app/api/evidence/cards/route.ts
deleted file mode 100644
index 80d1a42..0000000
--- a/src/app/api/evidence/cards/route.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { getUserId } from "@/lib/auth";
-import { prisma } from "@/lib/db";
-import { logger } from "@/lib/logger";
-
-export async function GET(request: NextRequest) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  const { searchParams } = new URL(request.url);
-  const tagsParam = searchParams.get("tags");
-  const limitRaw = parseInt(searchParams.get("limit") || "50", 10);
-  const limit = Math.max(1, Math.min(Number.isNaN(limitRaw) ? 50 : limitRaw, 100));
-  const cursor = searchParams.get("cursor") || undefined;
-
-  // Build query — cards are accessed through papers which have userId
-  const where: Record<string, unknown> = {
-    paper: { userId },
-  };
-
-  // Filter by tags if provided (comma-separated)
-  // tags is a Json column holding an array, so use Json array filtering:
-  // OR of array_contains per tag to match any of the provided tags
-  if (tagsParam) {
-    const tags = tagsParam.split(",").map((t) => t.trim()).filter(Boolean);
-    if (tags.length > 0) {
-      where.OR = tags.map((tag) => ({ tags: { array_contains: [tag] } }));
-    }
-  }
-
-  try {
-    const cards = await prisma.evidenceCard.findMany({
-      where,
-      orderBy: { createdAt: "desc" },
-      include: {
-        paper: {
-          select: { id: true, title: true, authors: true, year: true },
-        },
-      },
-      take: limit + 1,
-      ...(cursor ? { cursor: { id: cursor }, skip: 1 } : {}),
-    });
-
-    const hasMore = cards.length > limit;
-    const items = hasMore ? cards.slice(0, limit) : cards;
-    const nextCursor = hasMore ? items[items.length - 1].id : null;
-
-    return NextResponse.json({
-      cards: items.map((c) => ({
-        card_id: c.id,
-        paper_id: c.evidencePaperId,
-        paper_title: c.paper.title,
-        paper_authors: c.paper.authors,
-        paper_year: c.paper.year,
-        claim: c.claim,
-        recommendation: c.recommendation,
-        boundary_conditions: c.boundaryConditions,
-        strength: c.strength,
-        tags: c.tags,
-        created_at: c.createdAt.toISOString(),
-      })),
-      next_cursor: nextCursor,
-    }, {
-      headers: { "Cache-Control": "private, max-age=60" },
-    });
-  } catch (err) {
-    logger.error("list_evidence_cards_failed", { error: String(err) });
-    return NextResponse.json({ error: "Internal server error" }, { status: 500 });
-  }
-}
diff --git a/src/app/api/evidence/papers/[id]/cards/route.ts b/src/app/api/evidence/papers/[id]/cards/route.ts
deleted file mode 100644
index c4ae46f..0000000
--- a/src/app/api/evidence/papers/[id]/cards/route.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { getUserId } from "@/lib/auth";
-import { prisma } from "@/lib/db";
-import { createEvidenceCardSchema } from "@/lib/validation-content";
-import { z } from "zod/v4";
-import { logger } from "@/lib/logger";
-
-export async function POST(
-  request: NextRequest,
-  { params }: { params: { id: string } }
-) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  const { id } = await params;
-
-  // Verify ownership
-  const paper = await prisma.evidencePaper.findUnique({ where: { id } });
-  if (!paper) {
-    return NextResponse.json({ error: "Paper not found" }, { status: 404 });
-  }
-  if (paper.userId !== userId) {
-    return NextResponse.json({ error: "Forbidden" }, { status: 403 });
-  }
-
-  let body: unknown;
-  try {
-    body = await request.json();
-  } catch {
-    return NextResponse.json({ error: "Invalid JSON body" }, { status: 400 });
-  }
-
-  try {
-    const parsed = createEvidenceCardSchema.parse(body);
-
-    const card = await prisma.evidenceCard.create({
-      data: {
-        evidencePaperId: id,
-        claim: parsed.claim,
-        recommendation: parsed.recommendation,
-        boundaryConditions: parsed.boundary_conditions ?? null,
-        strength: parsed.strength,
-        tags: (parsed.tags as string[]) ?? undefined,
-      },
-    });
-
-    return NextResponse.json(
-      {
-        card_id: card.id,
-        paper_id: id,
-        claim: card.claim,
-        strength: card.strength,
-      },
-      { status: 201 }
-    );
-  } catch (err) {
-    if (err instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: "Validation failed", issues: err.issues },
-        { status: 400 }
-      );
-    }
-    logger.error("create_evidence_card_failed", { error: String(err) });
-    return NextResponse.json({ error: "Internal server error" }, { status: 500 });
-  }
-}
diff --git a/src/app/api/evidence/papers/route.ts b/src/app/api/evidence/papers/route.ts
deleted file mode 100644
index 3822f23..0000000
--- a/src/app/api/evidence/papers/route.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { getUserId } from "@/lib/auth";
-import { prisma } from "@/lib/db";
-import { createEvidencePaperSchema } from "@/lib/validation-content";
-import { z } from "zod/v4";
-import { logger } from "@/lib/logger";
-
-export async function POST(request: NextRequest) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  let body: unknown;
-  try {
-    body = await request.json();
-  } catch {
-    return NextResponse.json({ error: "Invalid JSON body" }, { status: 400 });
-  }
-
-  try {
-    const parsed = createEvidencePaperSchema.parse(body);
-
-    // Verify the linked document exists and belongs to user
-    const doc = await prisma.contentDocument.findUnique({
-      where: { id: parsed.document_id },
-    });
-    if (!doc) {
-      return NextResponse.json({ error: "Document not found" }, { status: 404 });
-    }
-    if (doc.userId !== userId) {
-      return NextResponse.json({ error: "Forbidden" }, { status: 403 });
-    }
-    if (doc.namespace !== "RESEARCH") {
-      return NextResponse.json(
-        { error: "Document must be in RESEARCH namespace" },
-        { status: 400 }
-      );
-    }
-
-    const paper = await prisma.evidencePaper.create({
-      data: {
-        userId,
-        title: parsed.title,
-        authors: parsed.authors ?? null,
-        year: parsed.year ?? null,
-        venue: parsed.venue ?? null,
-        documentId: parsed.document_id,
-        tags: (parsed.tags as string[]) ?? undefined,
-      },
-    });
-
-    return NextResponse.json(
-      {
-        paper_id: paper.id,
-        title: paper.title,
-        document_id: paper.documentId,
-      },
-      { status: 201 }
-    );
-  } catch (err) {
-    if (err instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: "Validation failed", issues: err.issues },
-        { status: 400 }
-      );
-    }
-    logger.error("create_evidence_paper_failed", { error: String(err) });
-    return NextResponse.json({ error: "Internal server error" }, { status: 500 });
-  }
-}
diff --git a/src/app/api/leaderboard/route.ts b/src/app/api/leaderboard/route.ts
deleted file mode 100644
index 7100a46..0000000
--- a/src/app/api/leaderboard/route.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { getUserId } from "@/lib/auth";
-import { prisma } from "@/lib/db";
-import { generalLimiter, tooManyRequests } from "@/lib/rate-limit";
-
-/**
- * GET /api/leaderboard
- * Returns weekly XP leaderboard — top users by XP earned this week.
- * Query param: period=week|month|all (default: week)
- */
-export async function GET(request: NextRequest) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  const rl = generalLimiter.check(userId);
-  if (!rl.allowed) return tooManyRequests(rl.retryAfterMs);
-
-  const { searchParams } = new URL(request.url);
-  const rawPeriod = searchParams.get("period") || "week";
-  const period = ["week", "month", "all"].includes(rawPeriod) ? rawPeriod : "week";
-
-  try {
-    const now = new Date();
-    let since: Date;
-    if (period === "month") {
-      since = new Date(now);
-      since.setDate(since.getDate() - 30);
-      since.setHours(0, 0, 0, 0);
-    } else if (period === "all") {
-      since = new Date(0);
-    } else {
-      since = new Date(now);
-      const dayOfWeek = since.getDay();
-      const daysSinceMonday = dayOfWeek === 0 ? 6 : dayOfWeek - 1;
-      since.setDate(since.getDate() - daysSinceMonday);
-      since.setHours(0, 0, 0, 0);
-    }
-
-    const xpByUser = await prisma.xpEvent.groupBy({
-      by: ["userId"],
-      where: { createdAt: { gte: since } },
-      _sum: { xpAmount: true },
-      orderBy: { _sum: { xpAmount: "desc" } },
-      take: 20,
-    });
-
-    if (xpByUser.length === 0) {
-      return NextResponse.json({ leaderboard: [], period, userRank: null });
-    }
-
-    const userIds = xpByUser.map((u) => u.userId);
-    const gameStates = await prisma.userGameState.findMany({
-      where: { userId: { in: userIds } },
-      select: { userId: true, displayName: true, leaderboardVisible: true },
-    });
-    const stateMap = new Map(gameStates.map((g) => [g.userId, g]));
-
-    // Filter out users who opted out, but always include the current user
-    const visibleEntries = xpByUser.filter((entry) => {
-      if (entry.userId === userId) return true;
-      const state = stateMap.get(entry.userId);
-      return !state || state.leaderboardVisible !== false;
-    });
-
-    const leaderboard = visibleEntries.map((entry, i) => ({
-      rank: i + 1,
-      displayName: stateMap.get(entry.userId)?.displayName || anonymizeName(entry.userId),
-      xp: entry._sum.xpAmount || 0,
-      isCurrentUser: entry.userId === userId,
-    }));
-
-    let userRank = leaderboard.find((e) => e.isCurrentUser)?.rank ?? null;
-    if (userRank === null) {
-      const userXp = await prisma.xpEvent.aggregate({
-        where: { userId, createdAt: { gte: since } },
-        _sum: { xpAmount: true },
-      });
-      const userTotal = userXp._sum.xpAmount || 0;
-      if (userTotal > 0) {
-        const countAbove = await prisma.xpEvent.groupBy({
-          by: ["userId"],
-          where: { createdAt: { gte: since } },
-          _sum: { xpAmount: true },
-          having: { xpAmount: { _sum: { gt: userTotal } } },
-        });
-        userRank = countAbove.length + 1;
-      }
-    }
-
-    return NextResponse.json({ leaderboard, period, userRank });
-  } catch {
-    return NextResponse.json({ error: "Internal server error" }, { status: 500 });
-  }
-}
-
-function anonymizeName(userId: string): string {
-  const adjectives = ["Eager", "Bright", "Swift", "Keen", "Bold", "Sharp", "Calm", "Wise"];
-  const nouns = ["Scholar", "Learner", "Student", "Thinker", "Reader", "Writer", "Seeker", "Explorer"];
-  let hash = 0;
-  for (let i = 0; i < userId.length; i++) {
-    hash = ((hash << 5) - hash + userId.charCodeAt(i)) | 0;
-  }
-  const adj = adjectives[Math.abs(hash) % adjectives.length];
-  const noun = nouns[Math.abs(hash >> 8) % nouns.length];
-  return `${adj} ${noun}`;
-}
diff --git a/src/app/api/practice-sets/[id]/import/route.ts b/src/app/api/practice-sets/[id]/import/route.ts
deleted file mode 100644
index bbc5c03..0000000
--- a/src/app/api/practice-sets/[id]/import/route.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { getUserId } from "@/lib/auth";
-import { prisma } from "@/lib/db";
-import { importQuestionsSchema } from "@/lib/validation-content";
-import { z } from "zod/v4";
-import { logger } from "@/lib/logger";
-
-export async function POST(
-  request: NextRequest,
-  { params }: { params: { id: string } }
-) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  const { id } = await params;
-
-  // Verify ownership
-  const set = await prisma.practiceSet.findUnique({ where: { id } });
-  if (!set) {
-    return NextResponse.json({ error: "Practice set not found" }, { status: 404 });
-  }
-  if (set.userId !== userId) {
-    return NextResponse.json({ error: "Forbidden" }, { status: 403 });
-  }
-
-  let body: unknown;
-  try {
-    body = await request.json();
-  } catch {
-    return NextResponse.json({ error: "Invalid JSON body" }, { status: 400 });
-  }
-
-  try {
-    const parsed = importQuestionsSchema.parse(body);
-
-    const created = await prisma.$transaction(
-      parsed.questions.map((q) =>
-        prisma.practiceQuestion.create({
-          data: {
-            practiceSetId: id,
-            kind: q.kind,
-            promptText: q.prompt_text,
-            answerKey: q.answer_key ?? null,
-            solutionSteps: q.solution_steps ?? null,
-            tags: q.tags ? (q.tags as object) : undefined,
-          },
-        })
-      )
-    );
-
-    return NextResponse.json(
-      { imported_count: created.length },
-      { status: 201 }
-    );
-  } catch (err) {
-    if (err instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: "Validation failed", issues: err.issues },
-        { status: 400 }
-      );
-    }
-    logger.error("import_questions_failed", { error: String(err) });
-    return NextResponse.json({ error: "Internal server error" }, { status: 500 });
-  }
-}
diff --git a/src/app/api/practice-sets/[id]/questions/route.ts b/src/app/api/practice-sets/[id]/questions/route.ts
deleted file mode 100644
index f7e9fca..0000000
--- a/src/app/api/practice-sets/[id]/questions/route.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { getUserId } from "@/lib/auth";
-import { prisma } from "@/lib/db";
-
-export async function GET(
-  request: NextRequest,
-  { params }: { params: { id: string } }
-) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  const { id } = await params;
-
-  const set = await prisma.practiceSet.findUnique({
-    where: { id },
-    include: {
-      questions: { orderBy: { createdAt: "asc" } },
-    },
-  });
-
-  if (!set) {
-    return NextResponse.json({ error: "Practice set not found" }, { status: 404 });
-  }
-  if (set.userId !== userId) {
-    return NextResponse.json({ error: "Forbidden" }, { status: 403 });
-  }
-
-  return NextResponse.json({
-    practice_set_id: set.id,
-    title: set.title,
-    questions: set.questions.map((q) => ({
-      question_id: q.id,
-      kind: q.kind,
-      prompt_text: q.promptText,
-      answer_key: q.answerKey,
-      solution_steps: q.solutionSteps,
-      tags: q.tags,
-      created_at: q.createdAt.toISOString(),
-    })),
-  });
-}
diff --git a/src/app/api/practice-sets/route.ts b/src/app/api/practice-sets/route.ts
deleted file mode 100644
index e898a7d..0000000
--- a/src/app/api/practice-sets/route.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { getUserId } from "@/lib/auth";
-import { prisma } from "@/lib/db";
-import { createPracticeSetSchema } from "@/lib/validation-content";
-import { z } from "zod/v4";
-import { logger } from "@/lib/logger";
-
-export async function POST(request: NextRequest) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  let body: unknown;
-  try {
-    body = await request.json();
-  } catch {
-    return NextResponse.json({ error: "Invalid JSON body" }, { status: 400 });
-  }
-
-  try {
-    const parsed = createPracticeSetSchema.parse(body);
-
-    const set = await prisma.practiceSet.create({
-      data: {
-        userId,
-        courseName: parsed.course_name,
-        examName: parsed.exam_name ?? null,
-        title: parsed.title,
-      },
-    });
-
-    return NextResponse.json(
-      {
-        practice_set_id: set.id,
-        course_name: set.courseName,
-        exam_name: set.examName,
-        title: set.title,
-      },
-      { status: 201 }
-    );
-  } catch (err) {
-    if (err instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: "Validation failed", issues: err.issues },
-        { status: 400 }
-      );
-    }
-    logger.error("create_practice_set_failed", { error: String(err) });
-    return NextResponse.json({ error: "Internal server error" }, { status: 500 });
-  }
-}
-
-export async function GET(request: NextRequest) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  const { searchParams } = new URL(request.url);
-  const courseName = searchParams.get("course_name") || undefined;
-  const examName = searchParams.get("exam_name") || undefined;
-  const limitRaw = parseInt(searchParams.get("limit") || "50", 10);
-  const limit = Math.max(1, Math.min(Number.isNaN(limitRaw) ? 50 : limitRaw, 100));
-  const cursor = searchParams.get("cursor") || undefined;
-
-  const where: Record<string, unknown> = { userId };
-  if (courseName) where.courseName = courseName;
-  if (examName) where.examName = examName;
-
-  const sets = await prisma.practiceSet.findMany({
-    where,
-    orderBy: { createdAt: "desc" },
-    include: { _count: { select: { questions: true } } },
-    take: limit + 1,
-    ...(cursor ? { cursor: { id: cursor }, skip: 1 } : {}),
-  });
-
-  const hasMore = sets.length > limit;
-  const items = hasMore ? sets.slice(0, limit) : sets;
-  const nextCursor = hasMore ? items[items.length - 1].id : null;
-
-  return NextResponse.json({
-    practice_sets: items.map((s) => ({
-      practice_set_id: s.id,
-      course_name: s.courseName,
-      exam_name: s.examName,
-      title: s.title,
-      question_count: s._count.questions,
-      created_at: s.createdAt.toISOString(),
-    })),
-    next_cursor: nextCursor,
-  }, {
-    headers: { "Cache-Control": "private, max-age=60" },
-  });
-}
diff --git a/src/app/api/push/send/route.ts b/src/app/api/push/send/route.ts
deleted file mode 100644
index 18611f3..0000000
--- a/src/app/api/push/send/route.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { z } from "zod/v4";
-import { sendPushNotification } from "@/lib/push";
-import {
-  STUDY_REMINDERS,
-  STREAK_WARNINGS,
-  ACHIEVEMENT_UNLOCKED,
-  WEEKLY_NUDGE,
-  pickRandom,
-  formatMessage,
-} from "@/lib/push/messages";
-import { logger } from "@/lib/logger";
-
-const notificationType = z.enum([
-  "STUDY_REMINDER",
-  "STREAK_WARNING",
-  "ACHIEVEMENT",
-  "WEEKLY_NUDGE",
-]);
-
-const sendSchema = z.object({
-  userId: z.string().min(1),
-  type: notificationType,
-  data: z.record(z.string(), z.string()).optional(),
-});
-
-const MESSAGE_MAP: Record<z.infer<typeof notificationType>, readonly string[]> = {
-  STUDY_REMINDER: STUDY_REMINDERS,
-  STREAK_WARNING: STREAK_WARNINGS,
-  ACHIEVEMENT: ACHIEVEMENT_UNLOCKED,
-  WEEKLY_NUDGE: WEEKLY_NUDGE,
-};
-
-const TITLE_MAP: Record<z.infer<typeof notificationType>, string> = {
-  STUDY_REMINDER: "Time to Study!",
-  STREAK_WARNING: "Streak Alert!",
-  ACHIEVEMENT: "Achievement Unlocked!",
-  WEEKLY_NUDGE: "Weekly Check-in",
-};
-
-/**
- * POST /api/push/send — send a push notification (admin / internal use).
- * Requires CRON_SECRET in Authorization header, or non-production env.
- *
- * Body: { userId, type, data? }
- */
-export async function POST(request: NextRequest) {
-  const cronSecret = process.env.CRON_SECRET;
-  const authHeader = request.headers.get("authorization");
-  const authorized =
-    (cronSecret && authHeader === `Bearer ${cronSecret}`) ||
-    (!cronSecret && process.env.NODE_ENV !== "production");
-
-  if (!authorized) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  let body: unknown;
-  try {
-    body = await request.json();
-  } catch {
-    return NextResponse.json({ error: "Invalid JSON" }, { status: 400 });
-  }
-
-  const parsed = sendSchema.safeParse(body);
-  if (!parsed.success) {
-    return NextResponse.json(
-      { error: "Invalid request", details: parsed.error.issues },
-      { status: 400 },
-    );
-  }
-
-  const { userId, type, data } = parsed.data;
-
-  const messages = MESSAGE_MAP[type];
-  const rawMessage = pickRandom(messages);
-  const message = formatMessage(rawMessage, data);
-  const title = TITLE_MAP[type];
-
-  logger.info("Sending push notification", { userId, type, title });
-
-  await sendPushNotification(userId, title, message, "/");
-
-  return NextResponse.json({ ok: true, title, message }, { status: 200 });
-}
diff --git a/src/app/api/push/subscribe/route.ts b/src/app/api/push/subscribe/route.ts
deleted file mode 100644
index 64eda5a..0000000
--- a/src/app/api/push/subscribe/route.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { z } from "zod/v4";
-import { getUserId } from "@/lib/auth";
-import { prisma } from "@/lib/db";
-import { logger } from "@/lib/logger";
-import { pushLimiter, tooManyRequests } from "@/lib/rate-limit";
-
-const subscribeSchema = z.object({
-  endpoint: z.string().url().max(2000),
-  keys: z.object({
-    p256dh: z.string().min(1).max(500),
-    auth: z.string().min(1).max(500),
-  }),
-});
-
-/**
- * POST /api/push/subscribe — register a push subscription for the current user.
- */
-export async function POST(request: NextRequest) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  const rl = pushLimiter.check(userId);
-  if (!rl.allowed) return tooManyRequests(rl.retryAfterMs);
-
-  let body: unknown;
-  try {
-    body = await request.json();
-  } catch {
-    return NextResponse.json({ error: "Invalid JSON" }, { status: 400 });
-  }
-
-  const parsed = subscribeSchema.safeParse(body);
-  if (!parsed.success) {
-    return NextResponse.json(
-      { error: "Invalid subscription", details: parsed.error.issues },
-      { status: 400 },
-    );
-  }
-
-  const { endpoint, keys } = parsed.data;
-
-  const existingCount = await prisma.pushSubscription.count({ where: { userId } });
-  if (existingCount >= 10) {
-    return NextResponse.json(
-      { error: "Maximum of 10 push subscriptions per account" },
-      { status: 400 },
-    );
-  }
-
-  await prisma.pushSubscription.upsert({
-    where: { userId_endpoint: { userId, endpoint } },
-    update: { p256dh: keys.p256dh, auth: keys.auth },
-    create: { userId, endpoint, p256dh: keys.p256dh, auth: keys.auth },
-  });
-
-  logger.info("Push subscription registered", { userId, endpoint });
-
-  return NextResponse.json({ ok: true }, { status: 201 });
-}
diff --git a/src/app/api/push/unsubscribe/route.ts b/src/app/api/push/unsubscribe/route.ts
deleted file mode 100644
index 62ac47e..0000000
--- a/src/app/api/push/unsubscribe/route.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { getUserId } from "@/lib/auth";
-import { prisma } from "@/lib/db";
-import { logger } from "@/lib/logger";
-
-/**
- * POST /api/push/unsubscribe — remove a push subscription for the current user.
- */
-export async function POST(request: NextRequest) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  let body: unknown;
-  try {
-    body = await request.json();
-  } catch {
-    return NextResponse.json({ error: "Invalid JSON" }, { status: 400 });
-  }
-
-  const { endpoint } = body as { endpoint?: string };
-  if (!endpoint || typeof endpoint !== "string") {
-    return NextResponse.json({ error: "Missing endpoint" }, { status: 400 });
-  }
-
-  await prisma.pushSubscription.deleteMany({
-    where: { userId, endpoint },
-  });
-
-  logger.info("Push subscription removed", { userId, endpoint });
-
-  return NextResponse.json({ ok: true }, { status: 200 });
-}
diff --git a/src/app/api/push/vapid-key/route.ts b/src/app/api/push/vapid-key/route.ts
deleted file mode 100644
index 54f7e36..0000000
--- a/src/app/api/push/vapid-key/route.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { NextResponse } from "next/server";
-
-/**
- * GET /api/push/vapid-key — return the VAPID public key so clients can subscribe.
- */
-export async function GET() {
-  return NextResponse.json({ publicKey: process.env.VAPID_PUBLIC_KEY });
-}
diff --git a/src/app/api/reminders/process/route.ts b/src/app/api/reminders/process/route.ts
deleted file mode 100644
index 78bd1b9..0000000
--- a/src/app/api/reminders/process/route.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { processScheduledReminders } from "@/lib/email/scheduler";
-import { logger } from "@/lib/logger";
-
-// POST /api/reminders/process — process all due scheduled reminders
-// This endpoint is intended to be called by a cron job or background worker.
-// It requires either:
-//   - An Authorization header matching the CRON_SECRET env var
-//   - An admin user session (x-user-id of an admin, for dev/testing)
-
-function isAuthorized(request: NextRequest): boolean {
-  const cronSecret = process.env.CRON_SECRET;
-
-  // Check Authorization: Bearer <secret> header
-  const authHeader = request.headers.get("authorization");
-  if (cronSecret && authHeader === `Bearer ${cronSecret}`) {
-    return true;
-  }
-
-  // In non-production, allow if no CRON_SECRET is configured
-  if (!cronSecret && process.env.NODE_ENV !== "production") {
-    logger.warn("reminders_process_no_secret", {
-      message: "CRON_SECRET not set — allowing unauthenticated access in dev",
-    });
-    return true;
-  }
-
-  return false;
-}
-
-export async function POST(request: NextRequest) {
-  if (!isAuthorized(request)) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  try {
-    const result = await processScheduledReminders();
-
-    logger.info("process_reminders_api", {
-      processed: result.processed,
-      failed: result.failed,
-    });
-
-    return NextResponse.json({
-      message: "Reminders processed",
-      processed: result.processed,
-      failed: result.failed,
-    });
-  } catch (err) {
-    logger.error("process_reminders_api_failed", { error: String(err) });
-    return NextResponse.json(
-      { error: "Internal server error" },
-      { status: 500 },
-    );
-  }
-}
diff --git a/src/app/api/reminders/route.ts b/src/app/api/reminders/route.ts
deleted file mode 100644
index 477ca80..0000000
--- a/src/app/api/reminders/route.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { getUserId } from "@/lib/auth";
-import { prisma } from "@/lib/db";
-import { scheduleStudyReminders } from "@/lib/email/scheduler";
-import { logger } from "@/lib/logger";
-
-// GET /api/reminders — list the authenticated user's scheduled reminders
-export async function GET(request: NextRequest) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  try {
-    const reminders = await prisma.scheduledReminder.findMany({
-      where: { userId },
-      orderBy: { scheduledFor: "desc" },
-      take: 50,
-    });
-
-    return NextResponse.json({
-      reminders: reminders.map((r) => ({
-        id: r.id,
-        type: r.type,
-        scheduled_for: r.scheduledFor.toISOString(),
-        sent_at: r.sentAt?.toISOString() ?? null,
-        payload: r.payload,
-        created_at: r.createdAt.toISOString(),
-      })),
-    });
-  } catch (err) {
-    logger.error("list_reminders_failed", { error: String(err) });
-    return NextResponse.json(
-      { error: "Internal server error" },
-      { status: 500 },
-    );
-  }
-}
-
-// POST /api/reminders — schedule study reminders for the authenticated user
-export async function POST(request: NextRequest) {
-  const userId = await getUserId(request);
-  if (!userId) {
-    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
-
-  try {
-    const created = await scheduleStudyReminders(userId);
-    return NextResponse.json(
-      { message: `Scheduled ${created} reminder(s)`, created },
-      { status: 201 },
-    );
-  } catch (err) {
-    logger.error("schedule_reminders_failed", {
-      userId,
-      error: String(err),
-    });
-    return NextResponse.json(
-      { error: "Internal server error" },
-      { status: 500 },
-    );
-  }
-}
diff --git a/src/app/api/settings/route.ts b/src/app/api/settings/route.ts
index 7ff2008..39fe107 100644
--- a/src/app/api/settings/route.ts
+++ b/src/app/api/settings/route.ts
@@ -20,23 +20,20 @@ export async function GET(request: NextRequest) {
   }
 
   return NextResponse.json({
-    displayName: state.displayName,
     studyStart: state.studyStartTime,
     studyEnd: state.studyEndTime,
     dailyCap: state.dailyStudyCap,
     dailyXpGoal: state.dailyXpGoal,
-    leaderboardVisible: state.leaderboardVisible,
     timezone: state.timezone,
+    google_configured: Boolean(process.env.GOOGLE_CLIENT_ID),
   });
 }
 
 const updateSchema = z.object({
-  displayName: z.string().max(50).optional(),
   studyStart: z.string().regex(/^([01]\d|2[0-3]):[0-5]\d$/).optional(),
   studyEnd: z.string().regex(/^([01]\d|2[0-3]):[0-5]\d$/).optional(),
   dailyCap: z.number().int().min(30).max(480).optional(),
   dailyXpGoal: z.number().int().min(10).max(500).optional(),
-  leaderboardVisible: z.boolean().optional(),
   // IANA timezone for streak day boundaries; empty string or null clears it (= UTC)
   timezone: z.string().max(100).nullable().optional(),
 });
@@ -67,12 +64,10 @@ export async function PUT(request: NextRequest) {
 
   const data = parsed.data;
   const updateData: Record<string, unknown> = {};
-  if (data.displayName !== undefined) updateData.displayName = data.displayName || null;
   if (data.studyStart !== undefined) updateData.studyStartTime = data.studyStart;
   if (data.studyEnd !== undefined) updateData.studyEndTime = data.studyEnd;
   if (data.dailyCap !== undefined) updateData.dailyStudyCap = data.dailyCap;
   if (data.dailyXpGoal !== undefined) updateData.dailyXpGoal = data.dailyXpGoal;
-  if (data.leaderboardVisible !== undefined) updateData.leaderboardVisible = data.leaderboardVisible;
   if (data.timezone !== undefined) {
     if (data.timezone === null || data.timezone === "") {
       updateData.timezone = null;
@@ -99,12 +94,10 @@ export async function PUT(request: NextRequest) {
     logger.info("settings.updated", { user_id: userId, fields: Object.keys(updateData) });
 
     return NextResponse.json({
-      displayName: state.displayName,
       studyStart: state.studyStartTime,
       studyEnd: state.studyEndTime,
       dailyCap: state.dailyStudyCap,
       dailyXpGoal: state.dailyXpGoal,
-      leaderboardVisible: state.leaderboardVisible,
       timezone: state.timezone,
     });
   } catch (err) {
diff --git a/src/app/auth/verify-email/page.tsx b/src/app/auth/verify-email/page.tsx
index d118cb2..04d5313 100644
--- a/src/app/auth/verify-email/page.tsx
+++ b/src/app/auth/verify-email/page.tsx
@@ -61,6 +61,12 @@ function VerifyEmailContent() {
         <p style={mutedStyle}>
           The link expires in 24 hours. If you don&apos;t see it, check your spam folder.
         </p>
+        <p style={mutedStyle}>
+          Running locally with the default console email provider? The verification link is
+          printed in the terminal where <code>npm run dev</code> is running. And unless
+          REQUIRE_EMAIL_VERIFICATION is set, verification is optional and you can just sign
+          in directly.
+        </p>
 
         {error && <div style={errorStyle} role="alert" aria-live="polite">{error}</div>}
         {resent && <div style={successStyle} role="alert">Verification email resent!</div>}
diff --git a/src/app/flashcards/page.tsx b/src/app/flashcards/page.tsx
index a24b0b1..a3439e5 100644
--- a/src/app/flashcards/page.tsx
+++ b/src/app/flashcards/page.tsx
@@ -563,7 +563,7 @@ export default function FlashcardsPage() {
             No course documents yet
           </p>
           <p style={{ color: "var(--color-text-faint)", fontSize: "0.85rem", margin: "0 0 1rem" }}>
-            Upload your lecture notes, textbooks, or slides to get started with flashcards.
+            Create a plan and upload your course notes there, then come back to generate flashcards.
           </p>
           <Link href="/plan" style={{ padding: "0.5rem 1rem", background: "var(--color-primary)", color: "var(--color-bg-darkest)", borderRadius: "var(--radius)", fontWeight: 700, textDecoration: "none", fontSize: "0.9rem" }}>
             Create a Study Plan
diff --git a/src/app/guides/page.tsx b/src/app/guides/page.tsx
index 540991e..3911f65 100644
--- a/src/app/guides/page.tsx
+++ b/src/app/guides/page.tsx
@@ -232,10 +232,10 @@ export default function GuidesPage() {
             No course documents yet
           </p>
           <p style={{ color: "var(--color-text-faint)", fontSize: "0.85rem", margin: "0 0 1rem" }}>
-            Upload your course materials first, then come back to generate study guides.
+            Create a plan and upload your course notes there, then come back to generate study guides.
           </p>
-          <Link href="/flashcards" style={{ padding: "0.5rem 1rem", background: "var(--color-primary)", color: "var(--color-bg-darkest)", borderRadius: "var(--radius)", fontWeight: 700, textDecoration: "none", fontSize: "0.9rem" }}>
-            Upload Documents
+          <Link href="/plan" style={{ padding: "0.5rem 1rem", background: "var(--color-primary)", color: "var(--color-bg-darkest)", borderRadius: "var(--radius)", fontWeight: 700, textDecoration: "none", fontSize: "0.9rem" }}>
+            Create a Study Plan
           </Link>
         </div>
       )}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 426a0f6..a8cde30 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,7 +1,6 @@
 import type { Metadata } from "next";
 import { NavBar, NAV_HEIGHT } from "@/ui/components/NavBar";
 import { SessionProviderWrapper } from "@/ui/components/SessionProviderWrapper";
-import { ServiceWorkerRegistration } from "@/ui/components/ServiceWorkerRegistration";
 import "./globals.css";
 
 export const metadata: Metadata = {
@@ -31,7 +30,6 @@ export default function RootLayout({
           <a href="#main-content" className="skip-to-content">
             Skip to content
           </a>
-          <ServiceWorkerRegistration />
           <NavBar />
           <main id="main-content" style={{ paddingTop: NAV_HEIGHT }}>
             {children}
diff --git a/src/app/learn/page.tsx b/src/app/learn/page.tsx
index f8be785..11db04f 100644
--- a/src/app/learn/page.tsx
+++ b/src/app/learn/page.tsx
@@ -43,6 +43,43 @@ export default function LearnPage() {
   const [loading, setLoading] = useState(true);
   const [selectedCourse, setSelectedCourseRaw] = useState<string | null>(null);
   const [recs, setRecs] = useState<Recommendation | null>(null);
+  const [startingSession, setStartingSession] = useState(false);
+  const [startError, setStartError] = useState<string | null>(null);
+
+  // The core-loop entry point: turn the recommendation into a real session
+  // and go study. Objective ids reuse the mastery keys so spaced repetition,
+  // warm-ups, and pretest gating stay continuous with past sessions.
+  const startRecommendedSession = async () => {
+    if (!recs || !data || startingSession) return;
+    const activeCourse = data.courses.find((c) => c.courseName === selectedCourse) || data.courses[0];
+    if (!activeCourse) return;
+    setStartingSession(true);
+    setStartError(null);
+    try {
+      const res = await fetch("/api/sessions", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          course_name: activeCourse.courseName,
+          exam_name: activeCourse.examNames[0] || "General",
+          mode: recs.next_session.mode,
+          topic_scope: recs.next_session.topic_scope || activeCourse.courseName,
+          planned_minutes: 30,
+          objectives: recs.next_session.objectives.length > 0
+            ? recs.next_session.objectives.map((key) => ({ id: key, title: key.replace(/_/g, " ") }))
+            : undefined,
+          target_outcome: { prompt_count: 10 },
+          break_protocol: { type: "25_5", cycles: 1 },
+        }),
+      });
+      const body = await res.json();
+      if (!res.ok) throw new Error(body.error || "Failed to create session");
+      window.location.href = body.session_url || `/s/${body.session_id}`;
+    } catch (e: unknown) {
+      setStartError(e instanceof Error ? e.message : "Failed to create session");
+      setStartingSession(false);
+    }
+  };
   const setSelectedCourse = (v: string | null) => { setSelectedCourseRaw(v); if (v) setActiveCourse(v); };
 
   useEffect(() => {
@@ -213,12 +250,16 @@ export default function LearnPage() {
               {recs.unresolved_errors.count} unresolved error{recs.unresolved_errors.count !== 1 ? "s" : ""} to repair
             </div>
           )}
-          <Link
-            href={`/plan?mode=${recs.next_session.mode}&topic=${encodeURIComponent(recs.next_session.topic_scope)}`}
-            style={{ ...primaryBtnStyle, display: "inline-block", marginTop: "0.5rem", fontSize: "0.85rem", padding: "0.5rem 1.25rem" }}
+          <button
+            onClick={startRecommendedSession}
+            disabled={startingSession}
+            style={{ ...primaryBtnStyle, display: "inline-block", marginTop: "0.5rem", fontSize: "0.85rem", padding: "0.5rem 1.25rem", opacity: startingSession ? 0.6 : 1, cursor: startingSession ? "wait" : "pointer", border: "none" }}
           >
-            Start {recs.next_session.mode.replace(/_/g, " ")} Session
-          </Link>
+            {startingSession ? "Creating session..." : `Start ${recs.next_session.mode.replace(/_/g, " ")} Session`}
+          </button>
+          {startError && (
+            <p style={{ color: "var(--color-error)", fontSize: "0.8rem", margin: "0.4rem 0 0" }}>{startError}</p>
+          )}
         </section>
       )}
 
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 3b6e0e8..def8b29 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -3,7 +3,7 @@
 import { useState, useEffect, useMemo, useCallback, useRef } from "react";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
-import { getOrCreateUserId, MODE_LABELS } from "@/lib/client-utils";
+import { MODE_LABELS } from "@/lib/client-utils";
 import { BADGE_MAP, TOTAL_BADGES } from "@/lib/badge-data";
 import { ErrorBoundary } from "@/ui/components/ErrorBoundary";
 
@@ -59,19 +59,6 @@ interface GameState {
 }
 
 
-interface LeaderboardEntry {
-  rank: number;
-  displayName: string;
-  xp: number;
-  isCurrentUser: boolean;
-}
-
-interface LeaderboardData {
-  leaderboard: LeaderboardEntry[];
-  period: string;
-  userRank: number | null;
-}
-
 // ---- Helpers ----
 
 function formatTime(iso: string): string {
@@ -88,7 +75,6 @@ const MODE_COLORS: Record<string, string> = {
   ERROR_REPAIR: "var(--color-error)",
   EXAM_SIM: "var(--color-primary)",
   WORKED_EXAMPLES: "var(--color-success)",
-  OFFICE_HOURS_PREP: "var(--color-warning)",
 };
 
 // ---- Component ----
@@ -102,19 +88,12 @@ export default function DashboardPage() {
   const [gameState, setGameState] = useState<GameState | null>(null);
   const [showConfetti, setShowConfetti] = useState(false);
   const [celebrationBadge, setCelebrationBadge] = useState<string | null>(null);
-  const [leaderboard, setLeaderboard] = useState<LeaderboardData | null>(null);
-  const [lbLoading, setLbLoading] = useState(false);
-  const [lbPeriod, setLbPeriod] = useState<"week" | "month" | "all">("week");
   const [onboarding, setOnboarding] = useState<{ show: boolean; step: number }>({ show: false, step: 0 });
-  const [displayName, setDisplayName] = useState("");
 
   useEffect(() => {
-    const userId = getOrCreateUserId();
     async function fetchPlans() {
       try {
-        const res = await fetch("/api/plans", {
-          headers: { "X-User-Id": userId },
-        });
+        const res = await fetch("/api/plans");
         if (!res.ok) {
           const data = await res.json().catch(() => ({}));
           throw new Error(data.error || `HTTP ${res.status}`);
@@ -129,9 +108,7 @@ export default function DashboardPage() {
     }
     async function fetchActivity() {
       try {
-        const res = await fetch("/api/stats/activity", {
-          headers: { "X-User-Id": userId },
-        });
+        const res = await fetch("/api/stats/activity");
         if (res.ok) {
           const data = await res.json();
           setActivityData(data);
@@ -142,9 +119,7 @@ export default function DashboardPage() {
     }
     async function fetchGameState() {
       try {
-        const res = await fetch("/api/stats/game", {
-          headers: { "X-User-Id": userId },
-        });
+        const res = await fetch("/api/stats/game");
         if (res.ok) {
           const data: GameState = await res.json();
           setGameState(data);
@@ -161,9 +136,7 @@ export default function DashboardPage() {
     }
     async function checkOnboarding() {
       try {
-        const res = await fetch("/api/onboarding", {
-          headers: { "X-User-Id": userId },
-        });
+        const res = await fetch("/api/onboarding");
         if (res.ok) {
           const data = await res.json();
           if (!data.complete) {
@@ -178,22 +151,8 @@ export default function DashboardPage() {
     fetchActivity();
     fetchGameState();
     checkOnboarding();
-    // Leaderboard is fetched by the lbPeriod effect
   }, []);
 
-  // Reload leaderboard when period changes
-  useEffect(() => {
-    const userId = getOrCreateUserId();
-    setLbLoading(true);
-    fetch(`/api/leaderboard?period=${lbPeriod}`, {
-      headers: { "X-User-Id": userId },
-    })
-      .then((r) => r.ok ? r.json() : null)
-      .then((data) => { if (data) setLeaderboard(data); })
-      .catch(() => {})
-      .finally(() => setLbLoading(false));
-  }, [lbPeriod]);
-
   const allItems = useMemo(() => plans.flatMap((p) => p.items), [plans]);
   const today = useMemo(() => new Date(), []);
 
@@ -273,32 +232,15 @@ export default function DashboardPage() {
       {onboarding.show && (
         <OnboardingFlow
           step={onboarding.step}
-          displayName={displayName}
-          onDisplayNameChange={setDisplayName}
           onNext={() => setOnboarding((prev) => ({ ...prev, step: prev.step + 1 }))}
           onComplete={async () => {
             setOnboarding({ show: false, step: 0 });
-            const userId = getOrCreateUserId();
-            if (displayName.trim()) {
-              await fetch("/api/settings", {
-                method: "PUT",
-                headers: { "Content-Type": "application/json", "X-User-Id": userId },
-                body: JSON.stringify({ displayName: displayName.trim() }),
-              }).catch(() => {});
-            }
-            await fetch("/api/onboarding", {
-              method: "POST",
-              headers: { "X-User-Id": userId },
-            }).catch(() => {});
-            router.push("/learn");
+            await fetch("/api/onboarding", { method: "POST" }).catch(() => {});
+            router.push("/plan");
           }}
           onSkip={async () => {
             setOnboarding({ show: false, step: 0 });
-            const userId = getOrCreateUserId();
-            await fetch("/api/onboarding", {
-              method: "POST",
-              headers: { "X-User-Id": userId },
-            }).catch(() => {});
+            await fetch("/api/onboarding", { method: "POST" }).catch(() => {});
           }}
         />
       )}
@@ -481,69 +423,6 @@ export default function DashboardPage() {
         </section>
       )}
 
-      {/* Leaderboard */}
-      {leaderboard && leaderboard.leaderboard.length > 0 && (
-        <section style={{ marginBottom: "2rem" }}>
-          <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center", marginBottom: "0.75rem" }}>
-            <h2 style={{ ...sectionHeadingStyle, margin: 0 }}>Leaderboard</h2>
-            <div style={{ display: "flex", gap: "0.25rem" }}>
-              {(["week", "month", "all"] as const).map((p) => (
-                <button
-                  key={p}
-                  onClick={() => setLbPeriod(p)}
-                  aria-pressed={lbPeriod === p}
-                  style={{
-                    padding: "0.2rem 0.5rem",
-                    fontSize: "0.7rem",
-                    fontFamily: "inherit",
-                    background: lbPeriod === p ? "var(--color-bg-selected)" : "transparent",
-                    color: lbPeriod === p ? "var(--color-primary)" : "var(--color-text-faint)",
-                    border: `1px solid ${lbPeriod === p ? "var(--color-primary)" : "var(--color-border-subtle)"}`,
-                    borderRadius: "var(--radius-sm)",
-                    cursor: "pointer",
-                    textTransform: "capitalize",
-                  }}
-                >
-                  {p}
-                </button>
-              ))}
-            </div>
-          </div>
-          <div style={{ background: "var(--color-bg-card)", border: "1px solid var(--color-border-subtle)", borderRadius: "var(--radius)", boxShadow: "var(--shadow-card)", overflow: "hidden", opacity: lbLoading ? 0.5 : 1, transition: "opacity 0.15s" }}>
-            {leaderboard.leaderboard.slice(0, 10).map((entry) => (
-              <div
-                key={entry.rank}
-                style={{
-                  display: "flex",
-                  alignItems: "center",
-                  padding: "0.5rem 0.75rem",
-                  borderBottom: "1px solid var(--color-border-subtle)",
-                  background: entry.isCurrentUser ? "var(--color-bg-selected)" : "transparent",
-                }}
-              >
-                <span style={{
-                  width: 24, textAlign: "center", fontWeight: 700, fontSize: "0.85rem",
-                  color: entry.rank === 1 ? "var(--color-primary)" : entry.rank === 2 ? "#c4c4c4" : entry.rank === 3 ? "#cd7f32" : "var(--color-text-faint)",
-                }}>
-                  {entry.rank}
-                </span>
-                <span style={{ flex: 1, marginLeft: "0.5rem", fontSize: "0.85rem", color: entry.isCurrentUser ? "var(--color-primary)" : "var(--color-text)", fontWeight: entry.isCurrentUser ? 600 : 400 }}>
-                  {entry.displayName}
-                  {entry.isCurrentUser && <span style={{ fontSize: "0.7rem", color: "var(--color-text-faint)", marginLeft: "0.35rem" }}>(you)</span>}
-                </span>
-                <span style={{ fontSize: "0.8rem", color: "var(--color-primary)", fontWeight: 600 }}>
-                  {entry.xp} XP
-                </span>
-              </div>
-            ))}
-          </div>
-          {leaderboard.userRank && leaderboard.userRank > 10 && (
-            <p style={{ fontSize: "0.75rem", color: "var(--color-text-faint)", marginTop: "0.4rem", textAlign: "center" }}>
-              Your rank: #{leaderboard.userRank}
-            </p>
-          )}
-        </section>
-      )}
     </main>
   );
 }
@@ -552,15 +431,11 @@ export default function DashboardPage() {
 
 function OnboardingFlow({
   step,
-  displayName,
-  onDisplayNameChange,
   onNext,
   onComplete,
   onSkip,
 }: {
   step: number;
-  displayName: string;
-  onDisplayNameChange: (v: string) => void;
   onNext: () => void;
   onComplete: () => void;
   onSkip: () => void;
@@ -597,34 +472,6 @@ function OnboardingFlow({
         </div>
       ),
     },
-    {
-      title: "Set your display name",
-      content: (
-        <div>
-          <p style={{ fontSize: "0.9rem", color: "var(--color-text-muted)", marginBottom: "1rem" }}>
-            Choose a name for the leaderboard. You can always change this later in Settings.
-          </p>
-          <input
-            type="text"
-            value={displayName}
-            onChange={(e) => onDisplayNameChange(e.target.value)}
-            placeholder="Your display name"
-            maxLength={50}
-            style={{
-              width: "100%",
-              background: "var(--color-bg-input)",
-              color: "var(--color-text)",
-              border: "1px solid var(--color-border)",
-              padding: "0.6rem 0.75rem",
-              fontFamily: "inherit",
-              fontSize: "1rem",
-              borderRadius: "var(--radius-sm)",
-              boxSizing: "border-box",
-            }}
-          />
-        </div>
-      ),
-    },
     {
       title: "Your learning journey",
       content: (
@@ -634,8 +481,8 @@ function OnboardingFlow({
           </p>
           <div style={{ display: "flex", flexDirection: "column", gap: "0.75rem" }}>
             {[
-              { step: "1", title: "Upload documents", desc: "Add your lecture notes, textbooks, or slides via the Flashcards page" },
-              { step: "2", title: "Generate study materials", desc: "Create flashcard decks and study guides from your content" },
+              { step: "1", title: "Create a plan", desc: "On the Plan page: course name, exam date, and upload your notes" },
+              { step: "2", title: "Study your sessions", desc: "Each plan day links to a session with questions from your materials" },
               { step: "3", title: "Review regularly", desc: "Use spaced repetition to build lasting knowledge" },
               { step: "4", title: "Track progress", desc: "Watch your XP grow and unlock achievements" },
             ].map((item) => (
diff --git a/src/app/plan/page.tsx b/src/app/plan/page.tsx
index b04e9a8..c98976d 100644
--- a/src/app/plan/page.tsx
+++ b/src/app/plan/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useState, useEffect } from "react";
-import { MODE_LABELS, getOrCreateUserId } from "@/lib/client-utils";
+import { MODE_LABELS } from "@/lib/client-utils";
 
 const DAY_LABELS = ["Day 0 (Today)", "Day 1", "Day 2", "Day 3", "Day 4", "Day 5", "Day 6"];
 
@@ -41,12 +41,13 @@ export default function PlanPage() {
   const [publishing, setPublishing] = useState(false);
   const [publishDone, setPublishDone] = useState(false);
   const [deletingPlan, setDeletingPlan] = useState(false);
+  const [reflowLoading, setReflowLoading] = useState(false);
+  const [reflowPreview, setReflowPreview] = useState<{ moved: number; kept: number; dropped: number; total_items: number } | null>(null);
 
   useEffect(() => {
     async function checkGoogle() {
       try {
         const res = await fetch("/api/integrations/google/status", {
-          headers: { "X-User-Id": getOrCreateUserId() },
         });
         const data = await res.json();
         setGoogleConnected(data.connected ?? data.status === "CONNECTED");
@@ -78,7 +79,6 @@ export default function PlanPage() {
       try {
         const res = await fetch("/api/content/documents", {
           method: "POST",
-          headers: { "X-User-Id": getOrCreateUserId() },
           body: formData,
         });
         const data = await res.json();
@@ -91,7 +91,6 @@ export default function PlanPage() {
           if (data.status !== "PROCESSED") {
             fetch(`/api/content/documents/${docId}/process`, {
               method: "POST",
-              headers: { "X-User-Id": getOrCreateUserId() },
             })
               .then((r) => r.json())
               .then((d) => {
@@ -124,7 +123,7 @@ export default function PlanPage() {
     try {
       const res = await fetch(`/api/plans/${result.plan_id}/publish/google`, {
         method: "POST",
-        headers: { "Content-Type": "application/json", "X-User-Id": getOrCreateUserId() },
+        headers: { "Content-Type": "application/json" },
         body: JSON.stringify({}),
       });
       if (!res.ok) {
@@ -162,7 +161,6 @@ export default function PlanPage() {
     let dailyCap = 180;
     try {
       const settingsRes = await fetch("/api/settings", {
-        headers: { "X-User-Id": getOrCreateUserId() },
       });
       if (settingsRes.ok) {
         const settings = await settingsRes.json();
@@ -189,7 +187,7 @@ export default function PlanPage() {
     try {
       const res = await fetch("/api/plans", {
         method: "POST",
-        headers: { "Content-Type": "application/json", "X-User-Id": getOrCreateUserId() },
+        headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
           course_name: courseName,
           exam_name: examName,
@@ -224,7 +222,6 @@ export default function PlanPage() {
     try {
       const res = await fetch(`/api/plans/${result.plan_id}`, {
         method: "DELETE",
-        headers: { "X-User-Id": getOrCreateUserId() },
       });
       if (!res.ok) {
         const data = await res.json().catch(() => ({}));
@@ -240,6 +237,54 @@ export default function PlanPage() {
     }
   };
 
+  // ---- Reflow: reschedule missed sessions (the recovery path a slipping
+  // exam week actually needs; ~900 lines of tested logic behind one button)
+  const previewReflow = async () => {
+    if (!result || reflowLoading) return;
+    setReflowLoading(true);
+    setError(null);
+    try {
+      const res = await fetch(`/api/plans/${result.plan_id}/reflow/preview`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ reason: "missed_sessions" }),
+      });
+      const data = await res.json();
+      if (!res.ok) throw new Error(data.error || "Failed to preview reschedule");
+      setReflowPreview(data.summary);
+    } catch (e: unknown) {
+      setError(e instanceof Error ? e.message : "Failed to preview reschedule");
+    } finally {
+      setReflowLoading(false);
+    }
+  };
+
+  const applyReflow = async () => {
+    if (!result || reflowLoading) return;
+    setReflowLoading(true);
+    setError(null);
+    try {
+      const res = await fetch(`/api/plans/${result.plan_id}/reflow/apply`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ reason: "missed_sessions" }),
+      });
+      const data = await res.json();
+      if (!res.ok) throw new Error(data.error || "Failed to apply reschedule");
+      // Refresh the plan so the new times render
+      const fresh = await fetch(`/api/plans/${result.plan_id}`);
+      const freshData = await fresh.json();
+      if (fresh.ok && freshData.items) {
+        setResult((prev) => (prev ? { ...prev, items: freshData.items } : prev));
+      }
+      setReflowPreview(null);
+    } catch (e: unknown) {
+      setError(e instanceof Error ? e.message : "Failed to apply reschedule");
+    } finally {
+      setReflowLoading(false);
+    }
+  };
+
   const grouped = result
     ? result.items.reduce<Record<number, PlanItem[]>>((acc, item) => {
         (acc[item.day_index] = acc[item.day_index] || []).push(item);
@@ -379,6 +424,23 @@ export default function PlanPage() {
             <span style={{ color: "var(--color-success)", fontSize: "0.95rem", padding: "0.5rem" }}>Added to calendar</span>
           )}
           <a href={result.ics_download_url} style={btnStyle}>Download .ics</a>
+          {!reflowPreview ? (
+            <button onClick={previewReflow} disabled={reflowLoading} style={btnStyle}>
+              {reflowLoading ? "Checking..." : "Reschedule missed sessions"}
+            </button>
+          ) : (
+            <span style={{ display: "inline-flex", alignItems: "center", gap: "0.5rem", fontSize: "0.9rem" }}>
+              <span style={{ color: "var(--color-text-secondary)" }}>
+                {reflowPreview.moved} moved · {reflowPreview.kept} kept · {reflowPreview.dropped} dropped
+              </span>
+              <button onClick={applyReflow} disabled={reflowLoading} style={btnStyle}>
+                {reflowLoading ? "Applying..." : "Apply"}
+              </button>
+              <button onClick={() => setReflowPreview(null)} disabled={reflowLoading} style={btnStyle}>
+                Cancel
+              </button>
+            </span>
+          )}
           <button onClick={() => { setResult(null); setPublishDone(false); }} style={btnStyle}>
             New Plan
           </button>
diff --git a/src/app/s/[sessionId]/session-runner.tsx b/src/app/s/[sessionId]/session-runner.tsx
index bebca15..5118644 100644
--- a/src/app/s/[sessionId]/session-runner.tsx
+++ b/src/app/s/[sessionId]/session-runner.tsx
@@ -1,7 +1,6 @@
 "use client";
 
-import { useState, useCallback } from "react";
-import { getOrCreateUserId } from "@/lib/client-utils";
+import { useState, useCallback, useEffect } from "react";
 import { PreflightScreen } from "./screens/preflight";
 import { RunnerScreen } from "./screens/runner";
 import { BreakScreen } from "./screens/break-screen";
@@ -184,7 +183,6 @@ async function apiPost(url: string, body?: unknown) {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      "X-User-Id": getOrCreateUserId(),
     },
     body: body ? JSON.stringify(body) : undefined,
   });
@@ -194,9 +192,7 @@ async function apiPost(url: string, body?: unknown) {
 }
 
 async function apiGet(url: string) {
-  const res = await fetch(url, {
-    headers: { "X-User-Id": getOrCreateUserId() },
-  });
+  const res = await fetch(url);
   const data = await res.json();
   if (!res.ok) throw new Error(data.error || "Request failed");
   return data;
@@ -246,7 +242,6 @@ export async function patchAttemptMeta(
     method: "PATCH",
     headers: {
       "Content-Type": "application/json",
-      "X-User-Id": getOrCreateUserId(),
     },
     body: JSON.stringify(meta),
   });
@@ -290,6 +285,37 @@ export function SessionRunner({ session }: Props) {
   const [error, setError] = useState<string | null>(null);
   const [loading, setLoading] = useState(false);
 
+  // Reload restore: landing on the end screen after a refresh loses the
+  // in-memory run, which blanked the calibration dashboard the student paid
+  // for with per-question confidence ratings. Refetch the completed run
+  // (attempts include confidence_rating) and hand it to EndScreen.
+  useEffect(() => {
+    if (screen !== "end" || run !== null || !session.last_completed_run) return;
+    let mounted = true;
+    apiGet(`/api/runs/${session.last_completed_run.run_id}`)
+      .then((full) => {
+        if (!mounted) return;
+        setRun((prev) =>
+          prev ?? ({
+            run_id: full.run_id,
+            status: full.status,
+            mode: full.mode,
+            phase: full.phase,
+            current_index: full.current_index,
+            prompt_count: full.prompt_count,
+            current_prompt: null,
+            prompts: full.prompts,
+            policies: full.policies,
+            metrics: full.metrics,
+            break_state: full.break_state,
+            attempts: full.attempts,
+          } as RunData),
+        );
+      })
+      .catch(() => { /* best effort — end screen still shows stored metrics */ });
+    return () => { mounted = false; };
+  }, [screen, run, session.last_completed_run]);
+
   const startRun = useCallback(async () => {
     setLoading(true);
     setError(null);
diff --git a/src/app/settings/page.tsx b/src/app/settings/page.tsx
index 57d772d..086a82d 100644
--- a/src/app/settings/page.tsx
+++ b/src/app/settings/page.tsx
@@ -2,7 +2,6 @@
 
 import { useState, useEffect } from "react";
 const DEFAULTS = {
-  displayName: "",
   studyStart: "09:00",
   studyEnd: "17:00",
   dailyCap: 180,
@@ -37,27 +36,17 @@ const TIMEZONE_OPTIONS: string[] =
     : COMMON_TIMEZONES;
 
 export default function SettingsPage() {
-  const [displayName, setDisplayName] = useState(DEFAULTS.displayName);
   const [studyStart, setStudyStart] = useState(DEFAULTS.studyStart);
   const [studyEnd, setStudyEnd] = useState(DEFAULTS.studyEnd);
   const [dailyCap, setDailyCap] = useState(DEFAULTS.dailyCap);
   const [dailyXpGoal, setDailyXpGoal] = useState(DEFAULTS.dailyXpGoal);
-  const [leaderboardVisible, setLeaderboardVisible] = useState(true);
   const [timezone, setTimezone] = useState("");
   const [saved, setSaved] = useState(false);
   const [saving, setSaving] = useState(false);
   const [loading, setLoading] = useState(true);
 
   const [googleStatus, setGoogleStatus] = useState<"loading" | "connected" | "disconnected">("loading");
-
-  // Notification preferences
-  const [pushReminders, setPushReminders] = useState(true);
-  const [streakReminders, setStreakReminders] = useState(true);
-  const [emailReminders, setEmailReminders] = useState(true);
-  const [weeklyDigest, setWeeklyDigest] = useState(true);
-  const [reminderTime, setReminderTime] = useState("09:00");
-  const [pushSupported, setPushSupported] = useState(false);
-  const [pushSubscribed, setPushSubscribed] = useState(false);
+  const [googleConfigured, setGoogleConfigured] = useState(true);
 
   // Load settings from backend (with localStorage fallback)
   useEffect(() => {
@@ -66,13 +55,12 @@ export default function SettingsPage() {
         const res = await fetch("/api/settings");
         if (res.ok) {
           const data = await res.json();
-          setDisplayName(data.displayName || "");
           setStudyStart(data.studyStart || DEFAULTS.studyStart);
           setStudyEnd(data.studyEnd || DEFAULTS.studyEnd);
           setDailyCap(data.dailyCap ?? DEFAULTS.dailyCap);
           setDailyXpGoal(data.dailyXpGoal ?? DEFAULTS.dailyXpGoal);
-          setLeaderboardVisible(data.leaderboardVisible !== false);
           setTimezone(data.timezone || "");
+          setGoogleConfigured(Boolean(data.google_configured));
           // Also sync to localStorage for plan page compatibility
           localStorage.setItem("study_bot_prefs", JSON.stringify({
             studyStart: data.studyStart || DEFAULTS.studyStart,
@@ -105,30 +93,6 @@ export default function SettingsPage() {
     }
 
     loadSettings();
-
-    // Load notification preferences
-    fetch("/api/notifications/preferences")
-      .then((r) => r.ok ? r.json() : null)
-      .then((data) => {
-        if (data) {
-          setPushReminders(data.pushReminders);
-          setStreakReminders(data.streakReminders);
-          setEmailReminders(data.emailReminders);
-          setWeeklyDigest(data.weeklyDigest);
-          setReminderTime(data.reminderTime || "09:00");
-        }
-      })
-      .catch(() => {});
-
-    // Check push notification support
-    if ("serviceWorker" in navigator && "PushManager" in window) {
-      setPushSupported(true);
-      navigator.serviceWorker.ready.then((reg) => {
-        reg.pushManager.getSubscription().then((sub) => {
-          setPushSubscribed(!!sub);
-        });
-      });
-    }
   }, []);
 
   useEffect(() => {
@@ -160,21 +124,13 @@ export default function SettingsPage() {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
-          displayName: displayName.trim() || undefined,
           studyStart,
           studyEnd,
           dailyCap,
           dailyXpGoal,
-          leaderboardVisible,
           timezone: timezone.trim() || null,
         }),
       });
-      // Save notification preferences in parallel
-      await fetch("/api/notifications/preferences", {
-        method: "PUT",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ pushReminders, streakReminders, emailReminders, weeklyDigest, reminderTime }),
-      }).catch(() => {});
 
       if (res.ok) {
         setSaved(true);
@@ -193,44 +149,6 @@ export default function SettingsPage() {
     window.location.href = `/api/integrations/google/connect`;
   };
 
-  const handlePushToggle = async () => {
-    if (!pushSupported) return;
-    try {
-      const reg = await navigator.serviceWorker.ready;
-      if (pushSubscribed) {
-        const sub = await reg.pushManager.getSubscription();
-        if (sub) {
-          await fetch("/api/push/unsubscribe", {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ endpoint: sub.endpoint }),
-          });
-          await sub.unsubscribe();
-        }
-        setPushSubscribed(false);
-      } else {
-        const keyRes = await fetch("/api/push/vapid-key");
-        const { publicKey } = await keyRes.json();
-        const sub = await reg.pushManager.subscribe({
-          userVisibleOnly: true,
-          applicationServerKey: publicKey,
-        });
-        const json = sub.toJSON();
-        await fetch("/api/push/subscribe", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
-            endpoint: sub.endpoint,
-            keys: { p256dh: json.keys?.p256dh, auth: json.keys?.auth },
-          }),
-        });
-        setPushSubscribed(true);
-      }
-    } catch {
-      // Permission denied or other error
-    }
-  };
-
   if (loading) {
     return (
       <div style={pageStyle}>
@@ -244,20 +162,6 @@ export default function SettingsPage() {
     <div id="main-content" style={pageStyle} role="form" aria-label="User settings">
       <h1 style={headingStyle}>Settings</h1>
 
-      <section style={{ marginBottom: "2rem" }}>
-        <h2 style={sectionStyle}>Profile</h2>
-        <p style={hintStyle}>Set a display name for the leaderboard.</p>
-        <input
-          type="text"
-          value={displayName}
-          onChange={(e) => setDisplayName(e.target.value)}
-          placeholder="Your display name"
-          maxLength={50}
-          aria-label="Display name"
-          style={textInputStyle}
-        />
-      </section>
-
       <section style={{ marginBottom: "2rem" }}>
         <h2 style={sectionStyle}>Study hours</h2>
         <p style={hintStyle}>Sessions will be scheduled between these times.</p>
@@ -327,22 +231,6 @@ export default function SettingsPage() {
         </div>
       </section>
 
-      <section style={{ marginBottom: "2rem" }}>
-        <h2 style={sectionStyle}>Leaderboard</h2>
-        <label style={{ display: "flex", alignItems: "center", gap: "0.75rem", cursor: "pointer" }}>
-          <input
-            type="checkbox"
-            checked={leaderboardVisible}
-            onChange={(e) => setLeaderboardVisible(e.target.checked)}
-            style={{ accentColor: "var(--color-primary)", width: 18, height: 18, cursor: "pointer" }}
-          />
-          <span style={{ color: "var(--color-text)", fontSize: "0.95rem" }}>Show me on the leaderboard</span>
-        </label>
-        <p style={{ ...hintStyle, marginTop: "0.35rem" }}>
-          When off, your name won&apos;t appear to other users.
-        </p>
-      </section>
-
       <section style={{ marginBottom: "2rem" }}>
         <h2 style={sectionStyle}>Google Calendar</h2>
         {googleStatus === "loading" ? (
@@ -352,72 +240,21 @@ export default function SettingsPage() {
             <span style={{ color: "var(--color-success)", fontSize: "0.95rem" }}>Connected</span>
             <span style={{ color: "var(--color-text-dim)", fontSize: "0.9rem" }}>Plans can be published to your calendar.</span>
           </div>
-        ) : (
+        ) : googleConfigured ? (
           <div>
             <p style={hintStyle}>Connect to publish study sessions to your calendar and auto-detect busy times.</p>
             <button onClick={handleGoogleConnect} style={connectBtnStyle}>
               Connect Google Calendar
             </button>
           </div>
+        ) : (
+          <p style={hintStyle}>
+            Google Calendar sync is not configured on this server. Set GOOGLE_CLIENT_ID and
+            GOOGLE_CLIENT_SECRET (see .env.example) to enable it.
+          </p>
         )}
       </section>
 
-      <section style={{ marginBottom: "2rem" }}>
-        <h2 style={sectionStyle}>Notifications</h2>
-        <p style={hintStyle}>Control how Study Bot nags you (lovingly).</p>
-
-        {pushSupported && (
-          <div style={{ marginBottom: "1rem" }}>
-            <label style={toggleRowStyle}>
-              <input
-                type="checkbox"
-                checked={pushSubscribed}
-                onChange={handlePushToggle}
-                style={checkboxStyle}
-              />
-              <span style={{ color: "var(--color-text)", fontSize: "0.95rem" }}>Push notifications</span>
-            </label>
-            <p style={{ ...hintStyle, marginLeft: "2rem", marginTop: "0.15rem" }}>
-              {pushSubscribed ? "We'll bug you right on your device." : "Allow browser notifications for study reminders."}
-            </p>
-          </div>
-        )}
-
-        <label style={toggleRowStyle}>
-          <input type="checkbox" checked={pushReminders} onChange={(e) => setPushReminders(e.target.checked)} style={checkboxStyle} />
-          <span style={{ color: "var(--color-text)", fontSize: "0.95rem" }}>Study reminders</span>
-        </label>
-
-        <label style={toggleRowStyle}>
-          <input type="checkbox" checked={streakReminders} onChange={(e) => setStreakReminders(e.target.checked)} style={checkboxStyle} />
-          <span style={{ color: "var(--color-text)", fontSize: "0.95rem" }}>Streak warnings</span>
-        </label>
-
-        <label style={toggleRowStyle}>
-          <input type="checkbox" checked={emailReminders} onChange={(e) => setEmailReminders(e.target.checked)} style={checkboxStyle} />
-          <span style={{ color: "var(--color-text)", fontSize: "0.95rem" }}>Email reminders</span>
-        </label>
-
-        <label style={toggleRowStyle}>
-          <input type="checkbox" checked={weeklyDigest} onChange={(e) => setWeeklyDigest(e.target.checked)} style={checkboxStyle} />
-          <span style={{ color: "var(--color-text)", fontSize: "0.95rem" }}>Weekly digest email</span>
-        </label>
-
-        <div style={{ marginTop: "0.75rem" }}>
-          <label style={{ display: "flex", alignItems: "center", gap: "0.75rem" }}>
-            <span style={{ color: "var(--color-text-faint)", fontSize: "0.85rem", textTransform: "uppercase", letterSpacing: "0.06em" }}>
-              Reminder time
-            </span>
-            <input
-              type="time"
-              value={reminderTime}
-              onChange={(e) => setReminderTime(e.target.value)}
-              style={timeInputStyle}
-            />
-          </label>
-        </div>
-      </section>
-
       {saveError && (
         <div role="alert" aria-live="polite" style={{ background: "var(--color-bg-error-tint)", color: "var(--color-error)", border: "1px solid var(--color-error)", padding: "0.5rem 0.75rem", borderRadius: "var(--radius-sm)", fontSize: "0.85rem", marginBottom: "0.75rem", textAlign: "center" }}>
           {saveError}
@@ -500,21 +337,6 @@ const saveBtnStyle: React.CSSProperties = {
   borderRadius: "var(--radius-sm)",
 };
 
-const toggleRowStyle: React.CSSProperties = {
-  display: "flex",
-  alignItems: "center",
-  gap: "0.75rem",
-  cursor: "pointer",
-  marginBottom: "0.5rem",
-};
-
-const checkboxStyle: React.CSSProperties = {
-  accentColor: "var(--color-primary)",
-  width: 18,
-  height: 18,
-  cursor: "pointer",
-};
-
 const connectBtnStyle: React.CSSProperties = {
   background: "var(--color-info)",
   color: "var(--color-bg-darkest)",
diff --git a/src/lib/ai/providers/mock.ts b/src/lib/ai/providers/mock.ts
index 121cafb..12d78e9 100644
--- a/src/lib/ai/providers/mock.ts
+++ b/src/lib/ai/providers/mock.ts
@@ -9,6 +9,20 @@ import type { AiProvider, EmbedResult, CompleteJsonResult } from "../provider";
 
 const EMBED_DIM = 1536;
 
+/**
+ * Test-only escape hatch: when set (env var MOCK_AI_MALFORMED=1) or when the
+ * user prompt carries the marker below (e.g. planted in topicScope/question
+ * text by a test), the mock returns deliberately malformed variants for
+ * GENERATE_PROMPTS / GENERATE_FEEDBACK / GENERATE_WORKED_EXAMPLES so the
+ * output-hardening paths (drop/demote/fallback) can be exercised end-to-end.
+ * Default behavior is unchanged.
+ */
+export const MALFORMED_MARKER = "__ELICIT_MALFORMED__";
+
+function shouldElicitMalformed(userPrompt: string): boolean {
+  return process.env.MOCK_AI_MALFORMED === "1" || userPrompt.includes(MALFORMED_MARKER);
+}
+
 /**
  * Generate a deterministic embedding vector from text.
  * Same text always produces the same vector. Different texts produce different vectors.
@@ -175,6 +189,205 @@ export class MockProvider implements AiProvider {
       };
     }
 
+    if (systemPrompt.includes("GENERATE_PROMPTS")) {
+      if (shouldElicitMalformed(userPrompt)) {
+        // Malformed variant: only 2 usable prompts survive validation
+        // (< 3 → callers must fall back to deterministic prompts).
+        return {
+          json: {
+            prompts: [
+              // Valid FREE_RECALL
+              { objective_id: "obj_0", text: "Define the core concept in your own words.", difficulty: 1, format: "FREE_RECALL" },
+              // Non-string text — must be dropped
+              { objective_id: "obj_0", text: 42, difficulty: 1 },
+              // Empty text — must be dropped
+              { objective_id: "obj_1", text: "   ", difficulty: 1 },
+              // Missing objective_id — must be dropped
+              { text: "Orphan question with no objective", difficulty: 2 },
+              // MCQ with a 1-based correct_index (off-by-one): text/objective
+              // are valid so it survives the drop filter, but it must be
+              // demoted to FREE_RECALL rather than scored as an MCQ.
+              {
+                objective_id: "obj_1",
+                text: "Off-by-one MCQ",
+                difficulty: 2,
+                format: "MCQ",
+                choices: ["A", "B", "C", "D"],
+                correct_index: 4,
+              },
+            ],
+          },
+          usage: { tokenIn: 900, tokenOut: 400, costUsdMicros: 200 },
+        };
+      }
+      return {
+        json: {
+          prompts: [
+            {
+              objective_id: "obj_0",
+              text: "Which of the following best describes the fundamental principle introduced in the course materials?",
+              difficulty: 2,
+              format: "MCQ",
+              choices: [
+                "A foundational rule that governs how the core concepts interact",
+                "An optional convention used only in edge cases",
+                "A deprecated technique replaced by newer methods",
+                "A notation shortcut with no theoretical significance",
+              ],
+              correct_index: 0,
+              distractor_rationales: [
+                "Correct — the principle underpins how the core concepts interact.",
+                "Confuses a foundational requirement with an optional style choice.",
+                "Assumes the principle was superseded; it remains current.",
+                "Mistakes a load-bearing concept for mere notation.",
+              ],
+              model_answer: "The fundamental principle is a foundational rule that governs how the core concepts interact.",
+              key_points: ["foundational rule", "governs concept interactions"],
+            },
+            {
+              objective_id: "obj_0",
+              text: "In your own words, explain how the fundamental principle applies to a practical problem from the course.",
+              difficulty: 3,
+              format: "FREE_RECALL",
+              model_answer: "Applying the principle means identifying the governing rule first, then using it to constrain the solution steps for the practical problem.",
+              key_points: ["identify the governing rule", "constrain solution steps", "connect to a concrete example"],
+            },
+            {
+              objective_id: "obj_1",
+              text: "A scenario applies the applied method incorrectly. Which error is most likely responsible?",
+              difficulty: 3,
+              format: "MCQ",
+              choices: [
+                "Skipping the validation step before applying the method",
+                "Using the method on a supported input type",
+                "Following the documented procedure in order",
+                "Checking boundary conditions twice",
+              ],
+              correct_index: 0,
+              distractor_rationales: [
+                "Correct — the validation step is required before applying the method.",
+                "Supported input types are exactly where the method should be used.",
+                "Following the documented order is correct usage, not an error.",
+                "Re-checking boundaries is redundant but not incorrect.",
+              ],
+              model_answer: "Skipping the validation step before applying the method causes the failure.",
+              key_points: ["validation precedes application", "procedure order matters"],
+            },
+            {
+              objective_id: "obj_1",
+              text: "Compare and contrast the two applied methods covered in the materials: when would you choose each?",
+              difficulty: 4,
+              format: "FREE_RECALL",
+              model_answer: "Method one suits well-defined inputs where the validation cost is low; method two trades setup cost for robustness on noisy inputs.",
+              key_points: ["method one: well-defined inputs", "method two: robustness on noisy inputs", "trade-off: setup cost vs validation cost"],
+            },
+          ],
+        },
+        usage: { tokenIn: 1200, tokenOut: 600, costUsdMicros: 300 },
+      };
+    }
+
+    if (systemPrompt.includes("GENERATE_FEEDBACK")) {
+      if (shouldElicitMalformed(userPrompt)) {
+        // Every field has the wrong shape — hardened mappers must drop all
+        // of them rather than persisting non-strings into feedbackJson.
+        return {
+          json: {
+            explanation: 42,
+            key_takeaway: ["not", "a", "string"],
+            concept_connection: { nested: true },
+            mnemonic: 3.14,
+            pattern_advice: false,
+            referenced_chunk_ids: "not-an-array",
+          },
+          usage: { tokenIn: 600, tokenOut: 150, costUsdMicros: 120 },
+        };
+      }
+      return {
+        json: {
+          explanation: "Your answer missed the validation step: the method only applies after its preconditions are checked, which is why the result diverged.",
+          key_takeaway: "Always verify the preconditions before applying the method.",
+          concept_connection: "This mirrors the fundamental principle: governing rules constrain every later step.",
+          mnemonic: "V-A-R: Validate, Apply, Review.",
+          pattern_advice: "You have repeatedly skipped setup steps under time pressure — slow down on the first line of each problem.",
+          referenced_chunk_ids: ["mock_chunk_1"],
+        },
+        usage: { tokenIn: 700, tokenOut: 220, costUsdMicros: 160 },
+      };
+    }
+
+    if (systemPrompt.includes("GENERATE_WORKED_EXAMPLES")) {
+      if (shouldElicitMalformed(userPrompt)) {
+        // Every set violates a validity rule — isValidSet must reject all,
+        // so the deck generator returns null (deterministic fallback).
+        return {
+          json: {
+            sets: [
+              {
+                // Step missing its "why"
+                objective_id: "obj_0",
+                problem: "Compute the result for input 4.",
+                steps: [
+                  { action: "Write the governing equation", why: "It constrains the unknowns" },
+                  { action: "Substitute the input", why: "" },
+                ],
+                completion_problem_1: "Compute the result for input 5 (final step missing).",
+                completion_problem_2: "Compute the result for input 6 (final two steps missing).",
+                full_problem: "Compute the result for input 7.",
+                model_answer: "The result is 14.",
+              },
+              {
+                // Missing completion problem and model answer
+                objective_id: "obj_1",
+                problem: "Derive the relation between the two quantities.",
+                steps: [
+                  { action: "State the definitions", why: "Definitions anchor the derivation" },
+                  { action: "Combine them", why: "Yields the relation" },
+                ],
+                completion_problem_1: "",
+                completion_problem_2: "Derive the relation for the alternate case (final two steps missing).",
+                full_problem: "Derive the relation for the general case.",
+              },
+            ],
+          },
+          usage: { tokenIn: 900, tokenOut: 350, costUsdMicros: 220 },
+        };
+      }
+      return {
+        json: {
+          sets: [
+            {
+              objective_id: "obj_0",
+              problem: "Worked example: apply the fundamental principle to compute the outcome for a standard input.",
+              steps: [
+                { action: "Identify the governing rule for the input", why: "The rule determines which relationships hold" },
+                { action: "Express the unknown in terms of known quantities", why: "Reduces the problem to substitution" },
+                { action: "Substitute the values and simplify", why: "Produces the final outcome in one pass" },
+              ],
+              completion_problem_1: "Apply the fundamental principle to a slightly larger input; the setup and substitution are given.",
+              completion_problem_2: "Apply the fundamental principle to a new input; only the governing rule is given.",
+              full_problem: "Apply the fundamental principle end-to-end to an unfamiliar input.",
+              model_answer: "Identify the governing rule, express the unknown via known quantities, substitute, and simplify to obtain the outcome.",
+            },
+            {
+              objective_id: "obj_1",
+              problem: "Worked example: use the applied method to resolve a practical scenario from the materials.",
+              steps: [
+                { action: "Validate the scenario against the method's preconditions", why: "The method is only sound when preconditions hold" },
+                { action: "Apply the method's documented procedure", why: "Ordered steps prevent skipped constraints" },
+                { action: "Review the result against the boundary conditions", why: "Catches off-by-one and edge-case errors" },
+              ],
+              completion_problem_1: "Resolve a similar scenario; validation and application are done — supply the review.",
+              completion_problem_2: "Resolve a similar scenario; only the validation is done.",
+              full_problem: "Resolve a novel scenario with the applied method, unaided.",
+              model_answer: "Validate preconditions, apply the documented procedure in order, then review the result against boundary conditions.",
+            },
+          ],
+        },
+        usage: { tokenIn: 1100, tokenOut: 500, costUsdMicros: 260 },
+      };
+    }
+
     if (systemPrompt.includes("GENERATE_FLASHCARDS")) {
       return {
         json: {
diff --git a/src/lib/auth-options.ts b/src/lib/auth-options.ts
index 1558ac3..e15bbf6 100644
--- a/src/lib/auth-options.ts
+++ b/src/lib/auth-options.ts
@@ -55,8 +55,10 @@ export const authOptions: NextAuthOptions = {
         );
         if (!user || !valid) return null;
 
-        // Reject unverified emails in production
-        if (process.env.NODE_ENV === "production" && !user.emailVerified) {
+        // Single-user app: verifying your own email to yourself protects
+        // nothing, and this gate once locked the owner out of a local
+        // production build. Opt in only when real SMTP can deliver links.
+        if (process.env.REQUIRE_EMAIL_VERIFICATION === "true" && !user.emailVerified) {
           return null;
         }
 
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index 759befc..434c497 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -20,7 +20,7 @@ export async function getUserId(request: Request): Promise<string | null> {
   }
 
   // Fallback: X-User-Id header — ONLY in non-production or explicit test mode
-  if (process.env.NODE_ENV !== "production" || process.env.ALLOW_TEST_AUTH === "true") {
+  if (process.env.ALLOW_TEST_AUTH === "true") {
     const raw = request.headers.get("x-user-id");
     if (!raw) return null;
     if (
diff --git a/src/lib/calendar.ts b/src/lib/calendar.ts
index bf8f7e4..18d45d2 100644
--- a/src/lib/calendar.ts
+++ b/src/lib/calendar.ts
@@ -6,7 +6,6 @@ export const MODE_LABELS: Record<string, string> = {
   ERROR_REPAIR: "Error Repair",
   EXAM_SIM: "Exam Sim",
   WORKED_EXAMPLES: "Worked Examples",
-  OFFICE_HOURS_PREP: "Office Hours Prep",
 };
 
 export function buildCalendarTitle(params: {
diff --git a/src/lib/client-api.ts b/src/lib/client-api.ts
index 707d59e..1bcf846 100644
--- a/src/lib/client-api.ts
+++ b/src/lib/client-api.ts
@@ -1,8 +1,12 @@
 /**
  * Shared client-side API helpers.
  * Must only be imported from "use client" components.
+ *
+ * Authentication rides on the NextAuth session cookie (sent automatically
+ * on same-origin fetches). No identity headers: the old X-User-Id header
+ * could silently split data across phantom identities when a session
+ * expired in dev.
  */
-import { getOrCreateUserId } from "./client-utils";
 
 export interface CourseOption {
   course_name: string;
@@ -13,7 +17,7 @@ export interface CourseOption {
 const DEFAULT_TIMEOUT_MS = 30_000;
 
 function authHeaders(extra?: Record<string, string>): Record<string, string> {
-  return { "X-User-Id": getOrCreateUserId(), ...extra };
+  return { ...extra };
 }
 
 function withTimeout(timeoutMs: number = DEFAULT_TIMEOUT_MS): AbortSignal {
diff --git a/src/lib/content-prompts.ts b/src/lib/content-prompts.ts
index 4debc04..4576f36 100644
--- a/src/lib/content-prompts.ts
+++ b/src/lib/content-prompts.ts
@@ -162,18 +162,52 @@ export async function generateContentAwarePrompts(
         errorPatterns: errorPatterns.length > 0 ? errorPatterns : undefined,
       },
       parseOutput: (raw: unknown) => {
-        const data = raw as Record<string, unknown>;
-        const prompts = (data.prompts as GeneratedPrompt[]) || [];
+        const data = (raw && typeof raw === "object" ? raw : {}) as Record<string, unknown>;
+        const prompts = Array.isArray(data.prompts) ? (data.prompts as GeneratedPrompt[]) : [];
         return { prompts };
       },
     });
 
-    const generated = result.output.prompts;
-    if (generated.length === 0) {
+    const returned = result.output.prompts;
+    if (returned.length === 0) {
       logger.warn("content_prompts.empty_result", { user_id: userId });
       return null;
     }
 
+    // Model output is untrusted: a prompt without real question text or an
+    // objective id is unusable (blank card / unattributable mastery). Drop
+    // malformed entries instead of persisting them into the run.
+    const generated = returned.filter(
+      (g): g is GeneratedPrompt =>
+        !!g &&
+        typeof g === "object" &&
+        typeof g.text === "string" &&
+        g.text.trim().length > 0 &&
+        typeof g.objective_id === "string",
+    );
+
+    if (generated.length < returned.length) {
+      logger.warn("content_prompts.invalid_prompts_dropped", {
+        user_id: userId,
+        course_name: courseName,
+        returned: returned.length,
+        valid: generated.length,
+        dropped: returned.length - generated.length,
+      });
+    }
+
+    // Too few usable questions for a meaningful session — signal the caller
+    // to use the deterministic fallback deck instead of a threadbare AI one.
+    if (generated.length < 3) {
+      logger.warn("content_prompts.too_few_valid", {
+        user_id: userId,
+        course_name: courseName,
+        returned: returned.length,
+        valid: generated.length,
+      });
+      return null;
+    }
+
     // Generate a run-level seed for MCQ choice shuffling
     const runSeed = `${userId}:${courseName}:${Date.now()}`;
 
diff --git a/src/lib/email/provider.ts b/src/lib/email/provider.ts
index b4abb89..0433438 100644
--- a/src/lib/email/provider.ts
+++ b/src/lib/email/provider.ts
@@ -44,6 +44,18 @@ class SmtpProvider implements EmailProvider {
 class ConsoleProvider implements EmailProvider {
   async send(to: string, subject: string, html: string): Promise<void> {
     const divider = "═".repeat(60);
+    // Collect every URL in the email (href attributes and bare URLs) so
+    // links like verification/reset URLs are always printed in full, even
+    // when the body preview below is truncated.
+    const urls = new Set<string>();
+    for (const match of html.matchAll(/href="([^"]+)"/g)) urls.add(match[1]);
+    for (const match of html.replace(/<[^>]+>/g, " ").matchAll(/https?:\/\/[^\s<>"')\]]+/g)) {
+      urls.add(match[0]);
+    }
+    const linkBlock =
+      urls.size > 0
+        ? `\n  Links (full, untruncated):\n${[...urls].map((u) => `  ${u}`).join("\n")}\n${divider}`
+        : "";
     console.log(`
 ${divider}
   EMAIL (console provider)
@@ -52,7 +64,7 @@ ${divider}
   Subject: ${subject}
 ${divider}
 ${html.replace(/<[^>]+>/g, " ").replace(/\s+/g, " ").trim().slice(0, 500)}
-${divider}
+${divider}${linkBlock}
 `);
     logger.info("email_sent_console", { to, subject });
   }
diff --git a/src/lib/email/scheduler.ts b/src/lib/email/scheduler.ts
deleted file mode 100644
index 2a41347..0000000
--- a/src/lib/email/scheduler.ts
+++ /dev/null
@@ -1,298 +0,0 @@
-import { prisma } from "@/lib/db";
-import { emailProvider } from "@/lib/email/provider";
-import {
-  studyReminder,
-  streakWarning,
-  weeklyDigest,
-  missedSession,
-} from "@/lib/email/templates";
-import { logger } from "@/lib/logger";
-
-// ---------------------------------------------------------------------------
-// Types for the JSON payload stored in ScheduledReminder.payload
-// ---------------------------------------------------------------------------
-
-interface StudyReminderPayload {
-  name: string;
-  items: string[];
-  minutes: number;
-}
-
-interface StreakWarningPayload {
-  name: string;
-  streak: number;
-}
-
-interface WeeklyDigestPayload {
-  name: string;
-  stats: { sessions: number; xp: number; accuracy: number; streak: number };
-}
-
-interface MissedSessionPayload {
-  name: string;
-  sessionTitle: string;
-}
-
-// ---------------------------------------------------------------------------
-// processScheduledReminders
-// Finds all unsent reminders that are due and sends them.
-// ---------------------------------------------------------------------------
-
-export async function processScheduledReminders(): Promise<{
-  processed: number;
-  failed: number;
-}> {
-  const now = new Date();
-
-  const dueReminders = await prisma.scheduledReminder.findMany({
-    where: {
-      sentAt: null,
-      scheduledFor: { lte: now },
-    },
-    orderBy: { scheduledFor: "asc" },
-    take: 200, // process in batches to avoid overloading
-  });
-
-  if (dueReminders.length === 0) {
-    logger.info("process_reminders_none_due");
-    return { processed: 0, failed: 0 };
-  }
-
-  logger.info("process_reminders_start", { count: dueReminders.length });
-
-  let processed = 0;
-  let failed = 0;
-
-  for (const reminder of dueReminders) {
-    try {
-      // Look up the user's email (and check notification preferences)
-      const user = await prisma.user.findUnique({
-        where: { id: reminder.userId },
-        include: { notificationPreference: true },
-      });
-
-      if (!user) {
-        logger.warn("process_reminder_user_not_found", {
-          reminderId: reminder.id,
-          userId: reminder.userId,
-        });
-        // Mark as sent so we don't retry a missing user forever
-        await prisma.scheduledReminder.update({
-          where: { id: reminder.id },
-          data: { sentAt: now },
-        });
-        failed++;
-        continue;
-      }
-
-      // Check if user still has email reminders enabled
-      const prefs = user.notificationPreference;
-      if (prefs && !prefs.emailReminders) {
-        logger.info("process_reminder_skipped_disabled", {
-          reminderId: reminder.id,
-          userId: user.id,
-        });
-        await prisma.scheduledReminder.update({
-          where: { id: reminder.id },
-          data: { sentAt: now },
-        });
-        processed++;
-        continue;
-      }
-
-      const email = prefs?.emailAddress || user.email;
-      const payload = reminder.payload as Record<string, unknown> | null;
-
-      let subject: string;
-      let html: string;
-
-      switch (reminder.type) {
-        case "STUDY_REMINDER": {
-          const p = payload as unknown as StudyReminderPayload;
-          const result = studyReminder(
-            p?.name || user.name || "there",
-            p?.items || ["Your scheduled study items"],
-            p?.minutes || 30,
-          );
-          subject = result.subject;
-          html = result.html;
-          break;
-        }
-
-        case "STREAK_WARNING": {
-          const p = payload as unknown as StreakWarningPayload;
-          const result = streakWarning(
-            p?.name || user.name || "there",
-            p?.streak || 1,
-          );
-          subject = result.subject;
-          html = result.html;
-          break;
-        }
-
-        case "WEEKLY_DIGEST": {
-          const p = payload as unknown as WeeklyDigestPayload;
-          const result = weeklyDigest(
-            p?.name || user.name || "there",
-            p?.stats || { sessions: 0, xp: 0, accuracy: 0, streak: 0 },
-          );
-          subject = result.subject;
-          html = result.html;
-          break;
-        }
-
-        case "MISSED_SESSION": {
-          const p = payload as unknown as MissedSessionPayload;
-          const result = missedSession(
-            p?.name || user.name || "there",
-            p?.sessionTitle || "a study session",
-          );
-          subject = result.subject;
-          html = result.html;
-          break;
-        }
-
-        default:
-          logger.warn("process_reminder_unknown_type", {
-            reminderId: reminder.id,
-            type: reminder.type,
-          });
-          await prisma.scheduledReminder.update({
-            where: { id: reminder.id },
-            data: { sentAt: now },
-          });
-          failed++;
-          continue;
-      }
-
-      await emailProvider.send(email, subject, html);
-
-      await prisma.scheduledReminder.update({
-        where: { id: reminder.id },
-        data: { sentAt: new Date() },
-      });
-
-      processed++;
-    } catch (err) {
-      logger.error("process_reminder_failed", {
-        reminderId: reminder.id,
-        error: String(err),
-      });
-      failed++;
-    }
-  }
-
-  logger.info("process_reminders_done", { processed, failed });
-  return { processed, failed };
-}
-
-// ---------------------------------------------------------------------------
-// scheduleStudyReminders
-// Creates ScheduledReminder records for a user's upcoming study plan items.
-// ---------------------------------------------------------------------------
-
-export async function scheduleStudyReminders(userId: string): Promise<number> {
-  const user = await prisma.user.findUnique({
-    where: { id: userId },
-    include: { notificationPreference: true },
-  });
-
-  if (!user) throw new Error("User not found");
-
-  const prefs = user.notificationPreference;
-  if (prefs && !prefs.emailReminders) {
-    logger.info("schedule_reminders_disabled", { userId });
-    return 0;
-  }
-
-  // Default reminder time: 09:00, or whatever the user configured
-  const reminderTime = prefs?.reminderTime || "09:00";
-  const [hours, mins] = reminderTime.split(":").map(Number);
-
-  // Find upcoming scheduled plan items (next 7 days)
-  const now = new Date();
-  const nextWeek = new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000);
-
-  const plans = await prisma.studyPlan.findMany({
-    where: { userId },
-    include: {
-      items: {
-        where: {
-          status: "SCHEDULED",
-          startTime: { gte: now, lte: nextWeek },
-        },
-        orderBy: { startTime: "asc" },
-      },
-    },
-  });
-
-  // Batch-fetch all sessions referenced by plan items (avoids N+1)
-  const allSessionIds = plans.flatMap((p) => p.items.map((i) => i.sessionId));
-  const uniqueSessionIds = [...new Set(allSessionIds)];
-  const sessions = await prisma.session.findMany({
-    where: { sessionId: { in: uniqueSessionIds } },
-  });
-  const sessionMap = new Map(sessions.map((s) => [s.sessionId, s]));
-
-  // Group items by date
-  const itemsByDate = new Map<string, { titles: string[]; totalMinutes: number; planCourseName: string }>();
-
-  for (const plan of plans) {
-    for (const item of plan.items) {
-      const dateKey = item.startTime.toISOString().split("T")[0];
-      const entry = itemsByDate.get(dateKey) || {
-        titles: [],
-        totalMinutes: 0,
-        planCourseName: plan.courseName,
-      };
-
-      const session = sessionMap.get(item.sessionId);
-      const title = session
-        ? `${session.topicScope} (${session.mode})`
-        : `Study session`;
-      entry.titles.push(title);
-      entry.totalMinutes += session?.plannedMinutes || 30;
-      itemsByDate.set(dateKey, entry);
-    }
-  }
-
-  // Create a ScheduledReminder for each date that doesn't already have one
-  let created = 0;
-
-  for (const [dateKey, entry] of itemsByDate) {
-    const scheduledFor = new Date(`${dateKey}T${String(hours).padStart(2, "0")}:${String(mins).padStart(2, "0")}:00`);
-
-    // Skip if already in the past
-    if (scheduledFor <= now) continue;
-
-    // Check if we already have a reminder for this user/date/type
-    const existing = await prisma.scheduledReminder.findFirst({
-      where: {
-        userId,
-        type: "STUDY_REMINDER",
-        scheduledFor,
-        sentAt: null,
-      },
-    });
-
-    if (existing) continue;
-
-    await prisma.scheduledReminder.create({
-      data: {
-        userId,
-        type: "STUDY_REMINDER",
-        scheduledFor,
-        payload: {
-          name: user.name || "there",
-          items: entry.titles,
-          minutes: entry.totalMinutes,
-        },
-      },
-    });
-
-    created++;
-  }
-
-  logger.info("schedule_reminders_created", { userId, created });
-  return created;
-}
diff --git a/src/lib/plan-generator.ts b/src/lib/plan-generator.ts
index 0206ac4..b35f493 100644
--- a/src/lib/plan-generator.ts
+++ b/src/lib/plan-generator.ts
@@ -95,13 +95,22 @@ export function generatePlan(input: PlanGeneratorInput): PlanBlock[] {
       objs: packA,
       desiredMinutes: 70,
     },
-    // Day 1: Retrieval pack B
+    // Day 1: Worked examples for first exposure to pack B (Sweller & Cooper
+    // 1985: novices learn more from studying solutions than problem solving),
+    // then retrieval on the same material.
+    {
+      dayIndex: 1,
+      mode: "WORKED_EXAMPLES",
+      scope: packB.join(", "),
+      objs: packB,
+      desiredMinutes: 30,
+    },
     {
       dayIndex: 1,
       mode: "RETRIEVAL",
       scope: packB.join(", "),
       objs: packB,
-      desiredMinutes: 80,
+      desiredMinutes: 60,
     },
     // Day 2: Interleaved A+B
     {
diff --git a/src/lib/push/index.ts b/src/lib/push/index.ts
deleted file mode 100644
index c9c495a..0000000
--- a/src/lib/push/index.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import webpush from "web-push";
-import { prisma } from "@/lib/db";
-import { logger } from "@/lib/logger";
-
-// ── Lazy VAPID configuration (avoids crashes at build time) ───
-let vapidConfigured = false;
-function ensureVapid() {
-  if (vapidConfigured) return;
-  const subject = process.env.VAPID_SUBJECT;
-  const publicKey = process.env.VAPID_PUBLIC_KEY;
-  const privateKey = process.env.VAPID_PRIVATE_KEY;
-  if (!subject || !publicKey || !privateKey) {
-    throw new Error("VAPID env vars (VAPID_SUBJECT, VAPID_PUBLIC_KEY, VAPID_PRIVATE_KEY) are not set");
-  }
-  webpush.setVapidDetails(subject, publicKey, privateKey);
-  vapidConfigured = true;
-}
-
-/**
- * Send a push notification to every registered device for a user.
- *
- * - Fetches all PushSubscription rows for the given userId
- * - Fires a web-push to each subscription in parallel
- * - Silently removes subscriptions that return 410 (expired / unsubscribed)
- * - Logs errors but never throws — callers don't need to handle push failures
- */
-export async function sendPushNotification(
-  userId: string,
-  title: string,
-  body: string,
-  url?: string,
-): Promise<void> {
-  try {
-    ensureVapid();
-
-    const subscriptions = await prisma.pushSubscription.findMany({
-      where: { userId },
-    });
-
-    if (subscriptions.length === 0) return;
-
-    const payload = JSON.stringify({ title, body, url, icon: "/assets/icon-192.png" });
-
-    const results = await Promise.allSettled(
-      subscriptions.map(async (sub) => {
-        try {
-          await webpush.sendNotification(
-            {
-              endpoint: sub.endpoint,
-              keys: { p256dh: sub.p256dh, auth: sub.auth },
-            },
-            payload,
-          );
-        } catch (err: unknown) {
-          const statusCode =
-            err instanceof webpush.WebPushError ? err.statusCode : undefined;
-
-          if (statusCode === 410) {
-            // Subscription expired — clean it up
-            await prisma.pushSubscription.delete({ where: { id: sub.id } });
-            logger.info("Deleted expired push subscription", {
-              subscriptionId: sub.id,
-              userId,
-            });
-          } else {
-            logger.error("Failed to send push notification", {
-              subscriptionId: sub.id,
-              userId,
-              error: err instanceof Error ? err.message : String(err),
-              statusCode,
-            });
-          }
-        }
-      }),
-    );
-
-    const sent = results.filter((r) => r.status === "fulfilled").length;
-    logger.info("Push notifications dispatched", { userId, total: subscriptions.length, sent });
-  } catch (err) {
-    logger.error("sendPushNotification failed", {
-      userId,
-      error: err instanceof Error ? err.message : String(err),
-    });
-  }
-}
diff --git a/src/lib/push/messages.ts b/src/lib/push/messages.ts
deleted file mode 100644
index 7a022e9..0000000
--- a/src/lib/push/messages.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-// ── Funny push-notification copy ────────────────────────────────
-// Each category is an array of strings.
-// For templates with dynamic values, use {placeholder} syntax — the
-// caller is responsible for interpolation via `formatMessage()`.
-
-export const STUDY_REMINDERS: string[] = [
-  "Your brain cells are filing a missing persons report. Come study.",
-  "That textbook isn't going to read itself. We checked.",
-  "Netflix will still be there later. Your GPA won't.",
-  "Your flashcards miss you. They told us. It was weird.",
-  "Remember when you said 'I'll study later'? It's later.",
-  "Your neurons are getting cobwebs. Quick study session?",
-  "Fun fact: procrastination was invented in 1847. Don't be traditional.",
-  "Your future self just called. They're begging you to study.",
-  "Plot twist: studying now means less panic later. Revolutionary concept.",
-  "Your brain has entered power-saving mode. Only studying can wake it up.",
-  "Roses are red, violets are blue, your exam is coming, and it won't study for you.",
-  "The WiFi is strong but your study habits are weak. Let's fix that.",
-  "Your flashcards are gathering dust. Digital dust. That's somehow worse.",
-  "Somewhere, a textbook just whispered your name. Don't leave it on read.",
-  "You've scrolled 3 miles on your phone today. Walk 3 feet to your desk instead.",
-  "Breaking: local student discovers studying works. More at 11.",
-  "Your brain called — it wants to feel useful again.",
-];
-
-export const STREAK_WARNINGS: string[] = [
-  "Your streak is hanging by a thread. One quick review?",
-  "Your {streak}-day streak is screaming internally right now.",
-  "Do you hear that? That's the sound of your streak crying.",
-  "BREAKING NEWS: Local student's streak in critical condition.",
-  "Your {streak}-day streak just asked if you still care.",
-  "One quick review stands between you and streak devastation.",
-  "Your streak is pacing back and forth. It's worried.",
-  "Don't let your {streak}-day streak become a 0-day streak. That's just sad.",
-  "Your streak is writing its will. You have minutes to intervene.",
-  "Emergency broadcast: your study streak is on life support.",
-  "Your {streak}-day streak is refreshing the app, hoping you'll show up.",
-];
-
-export const ACHIEVEMENT_UNLOCKED: string[] = [
-  "Achievement unlocked! Your brain just leveled up.",
-  "New badge! Frame it, put it on the fridge, whatever you do.",
-  "You just earned a new achievement. Your neurons are literally applauding.",
-  "Ding! New badge unlocked. You're basically a study RPG character now.",
-  "Achievement get! Tell your mom — she'll finally be proud. (Kidding, she already is.)",
-];
-
-export const WEEKLY_NUDGE: string[] = [
-  "New week, new you, same flashcards. Let's go.",
-  "Monday called. It said you should study. We agree with Monday for once.",
-  "Fresh week energy: convert it to study XP before it expires.",
-  "A new week of knowledge awaits. Your brain cleared some cache — time to refill it.",
-  "Weekly reminder that your goals won't achieve themselves. We checked the code.",
-];
-
-/**
- * Replace `{key}` placeholders in a message with values from `data`.
- *
- * Example:
- *   formatMessage("Your {streak}-day streak is crying.", { streak: "14" })
- *   // => "Your 14-day streak is crying."
- */
-export function formatMessage(
-  template: string,
-  data?: Record<string, string>,
-): string {
-  if (!data) return template;
-  return template.replace(/\{(\w+)\}/g, (match, key: string) => data[key] ?? match);
-}
-
-/**
- * Pick a random element from an array.
- */
-export function pickRandom<T>(arr: readonly T[]): T {
-  return arr[Math.floor(Math.random() * arr.length)];
-}
diff --git a/src/lib/validation.ts b/src/lib/validation.ts
index bf95bcf..aad1ca3 100644
--- a/src/lib/validation.ts
+++ b/src/lib/validation.ts
@@ -6,7 +6,6 @@ export const SESSION_MODES = [
   "ERROR_REPAIR",
   "EXAM_SIM",
   "WORKED_EXAMPLES",
-  "OFFICE_HOURS_PREP",
 ] as const;
 
 export type SessionMode = (typeof SESSION_MODES)[number];
diff --git a/src/lib/worked-examples.ts b/src/lib/worked-examples.ts
index b4afaef..07ca613 100644
--- a/src/lib/worked-examples.ts
+++ b/src/lib/worked-examples.ts
@@ -64,15 +64,25 @@ function isNonEmptyString(value: unknown): value is string {
 
 /**
  * A set is usable when it has a problem statement, at least 2 solution steps
- * (backward fading needs a penultimate step to remove), and a full problem.
+ * (backward fading needs a penultimate step to remove) each with a real
+ * action AND rationale (a step without a "why" defeats self-explanation),
+ * both completion problems, a full problem, and a model answer (the
+ * post-answer scoring standard for the FULL prompt).
  */
 function isValidSet(set: WorkedExampleSet | null | undefined): set is WorkedExampleSet {
   return (
     !!set &&
+    typeof set === "object" &&
     isNonEmptyString(set.problem) &&
     Array.isArray(set.steps) &&
     set.steps.length >= 2 &&
-    isNonEmptyString(set.full_problem)
+    set.steps.every(
+      (s) => !!s && isNonEmptyString(s.action) && isNonEmptyString(s.why),
+    ) &&
+    isNonEmptyString(set.completion_problem_1) &&
+    isNonEmptyString(set.completion_problem_2) &&
+    isNonEmptyString(set.full_problem) &&
+    isNonEmptyString(set.model_answer)
   );
 }
 
@@ -188,8 +198,8 @@ export async function generateWorkedExampleDeck(
         setCount,
       },
       parseOutput: (raw: unknown) => {
-        const data = raw as Record<string, unknown>;
-        const sets = (data.sets as WorkedExampleSet[]) || [];
+        const data = (raw && typeof raw === "object" ? raw : {}) as Record<string, unknown>;
+        const sets = Array.isArray(data.sets) ? (data.sets as WorkedExampleSet[]) : [];
         return { sets };
       },
     });
diff --git a/src/middleware.ts b/src/middleware.ts
index 82198a9..424ffe1 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -28,7 +28,6 @@ export async function middleware(request: NextRequest) {
   // Allow static assets and Next.js internals
   if (
     pathname.startsWith("/_next") ||
-    pathname.startsWith("/sw.js") ||
     pathname.startsWith("/favicon") ||
     pathname.includes(".")
   ) {
@@ -43,7 +42,7 @@ export async function middleware(request: NextRequest) {
   // Allow requests with X-User-Id header — ONLY in non-production or explicit test mode
   if (
     !token &&
-    (process.env.NODE_ENV !== "production" || process.env.ALLOW_TEST_AUTH === "true") &&
+    (process.env.ALLOW_TEST_AUTH === "true") &&
     request.headers.get("x-user-id")
   ) {
     if (
diff --git a/src/services/feedback.ts b/src/services/feedback.ts
index f01e223..c137ec9 100644
--- a/src/services/feedback.ts
+++ b/src/services/feedback.ts
@@ -458,6 +458,25 @@ async function detectMistakePatterns(
   }
 }
 
+// ---- Model output guards ----
+
+/**
+ * Model output is untrusted JSON. Only accept real strings — any other shape
+ * (number, array, object, null) is dropped so malformed fields never reach
+ * feedbackJson. A bare `as string` cast would let e.g. a numeric
+ * `explanation: 42` survive `|| undefined` (truthy) and get persisted.
+ */
+function stringOrNull(value: unknown): string | null {
+  return typeof value === "string" ? value : null;
+}
+
+/** Coerce untrusted model output into a plain record for field extraction. */
+function asRecord(raw: unknown): Record<string, unknown> {
+  return raw && typeof raw === "object" && !Array.isArray(raw)
+    ? (raw as Record<string, unknown>)
+    : {};
+}
+
 // ---- AI Explanation (PARTIAL/INCORRECT) ----
 
 async function generateAIExplanation(
@@ -516,14 +535,16 @@ async function generateAIExplanation(
           })),
         },
         parseOutput: (raw: unknown) => {
-          const data = raw as Record<string, unknown>;
+          const data = asRecord(raw);
           return {
-            explanation: (data.explanation as string) || "",
-            key_takeaway: (data.key_takeaway as string) || "",
-            concept_connection: (data.concept_connection as string) || null,
-            mnemonic: (data.mnemonic as string) || null,
-            pattern_advice: (data.pattern_advice as string) || null,
-            referenced_chunk_ids: (data.referenced_chunk_ids as string[]) || [],
+            explanation: stringOrNull(data.explanation) ?? "",
+            key_takeaway: stringOrNull(data.key_takeaway) ?? "",
+            concept_connection: stringOrNull(data.concept_connection),
+            mnemonic: stringOrNull(data.mnemonic),
+            pattern_advice: stringOrNull(data.pattern_advice),
+            referenced_chunk_ids: Array.isArray(data.referenced_chunk_ids)
+              ? data.referenced_chunk_ids.filter((id): id is string => typeof id === "string")
+              : [],
           };
         },
       },
@@ -584,11 +605,11 @@ async function generateReinforcement(
           })),
         },
         parseOutput: (raw: unknown) => {
-          const data = raw as Record<string, unknown>;
+          const data = asRecord(raw);
           return {
-            reinforcement: (data.reinforcement as string) || "",
-            deeper_insight: (data.deeper_insight as string) || "",
-            concept_connection: (data.concept_connection as string) || null,
+            reinforcement: stringOrNull(data.reinforcement) ?? "",
+            deeper_insight: stringOrNull(data.deeper_insight) ?? "",
+            concept_connection: stringOrNull(data.concept_connection),
           };
         },
       },
@@ -651,10 +672,10 @@ async function generateSocraticFollowup(
           })),
         },
         parseOutput: (raw: unknown) => {
-          const data = raw as Record<string, unknown>;
+          const data = asRecord(raw);
           return {
-            followup_question: (data.followup_question as string) || "",
-            purpose: (data.purpose as string) || "",
+            followup_question: stringOrNull(data.followup_question) ?? "",
+            purpose: stringOrNull(data.purpose) ?? "",
           };
         },
       },
diff --git a/src/services/plan.ts b/src/services/plan.ts
index a2406ee..4d4967c 100644
--- a/src/services/plan.ts
+++ b/src/services/plan.ts
@@ -12,6 +12,7 @@ import { buildGoogleCalendarLink } from "@/lib/gcal-link";
 import { createProvider } from "@/lib/ai/provider-factory";
 import type { GatewayContext } from "@/lib/ai/gateway";
 import { buildContentAwarePlanInput, extractObjectivesFromContent } from "@/services/content-plan";
+import { buildObjectiveAnchors } from "@/services/anchors";
 import {
   applyPreExamTaper,
   adjustDurationByMode,
@@ -410,6 +411,38 @@ export async function createPlan(userId: string, input: unknown) {
     items_count: items.length,
   });
 
+  // Fire-and-forget: pre-build objective anchors so the feedback fast path
+  // (objective -> top chunks) is warm before the first session runs. Failure
+  // is non-fatal — feedback falls back to FTS when no anchors exist.
+  const anchorObjectives = Array.from(
+    new Map(
+      items.flatMap((item) => item.block.objectives).map((o) => [o.id, o]),
+    ).values(),
+  );
+  if (anchorObjectives.length > 0) {
+    void buildObjectiveAnchors(
+      userId,
+      parsed.course_name,
+      parsed.exam_name,
+      anchorObjectives,
+    )
+      .then((res) =>
+        // Exam-scoped search only matches documents tagged with this exact
+        // exam name. When none are, rebuild unscoped (anchors keyed by "") —
+        // the feedback lookup serves both keys, preferring exact matches.
+        res.anchors_created === 0
+          ? buildObjectiveAnchors(userId, parsed.course_name, undefined, anchorObjectives)
+          : res,
+      )
+      .catch((err) => {
+        logger.warn("plan.anchor_build_failed", {
+          user_id: userId,
+          plan_id: planId,
+          error: String(err),
+        });
+      });
+  }
+
   const baseUrl = getBaseUrl();
   const feedUrl = `${baseUrl}/api/plans/${planId}/feed`;
   const webcalUrl = feedUrl.replace(/^https?:\/\//, "webcal://");
diff --git a/src/services/reflow.ts b/src/services/reflow.ts
index 7cbf59a..0ee4551 100644
--- a/src/services/reflow.ts
+++ b/src/services/reflow.ts
@@ -35,7 +35,6 @@ const MODE_PRIORITY: Record<string, number> = {
   ERROR_REPAIR: 2,
   EXAM_SIM: 3,
   WORKED_EXAMPLES: 4,
-  OFFICE_HOURS_PREP: 5,
 };
 
 export interface ReflowItem {
diff --git a/src/services/run.ts b/src/services/run.ts
index 760edc0..9fdcbbf 100644
--- a/src/services/run.ts
+++ b/src/services/run.ts
@@ -30,6 +30,7 @@ import { RUNNABLE_MODES } from "@/lib/validation";
 import { generateVariantQuestion, MAX_VARIANTS_PER_SESSION } from "@/lib/variant-questions";
 import { createFlashcardsFromErrors } from "@/lib/auto-flashcards";
 import { dayKey, getUserTimezone } from "@/lib/timezone";
+import { awardXp } from "@/services/gamification";
 
 // ---- Sentinel errors for transaction control flow ----
 
@@ -214,6 +215,21 @@ async function runPostCompletionEffects(
 
     await updateObjectiveMastery(userId, runId, s.courseName);
 
+    // Sessions are the app's highest-value activity — they must move the
+    // daily XP goal (previously only flashcard reviews did, nudging users
+    // toward card grinding over retrieval practice). Deduped per run.
+    try {
+      const already = await prisma.xpEvent.findFirst({
+        where: { userId, action: "SESSION_COMPLETED", sourceId: runId },
+        select: { id: true },
+      });
+      if (!already) {
+        await awardXp(userId, "SESSION_COMPLETED", undefined, runId);
+      }
+    } catch (xpErr) {
+      logger.warn("xp.session_award_failed", { user_id: userId, run_id: runId, error: String(xpErr) });
+    }
+
     // Replace the fixed-offset follow-up ladder with the actual SM-2 due
     // dates just computed (Cepeda 2008: the review gap should come from the
     // scheduler, not a static table). Falls back to the fixed ladder when no
@@ -1067,8 +1083,8 @@ async function handleImmediateScoring(
         throw new WrongIndexError(fresh.currentIndex);
       }
 
-      const promptCount = fresh.promptCount || (fresh.prompts as unknown as Prompt[]).length;
-      const metrics = fresh.metrics as unknown as RunMetrics;
+      const promptCount = fresh.promptCount || (Array.isArray(fresh.prompts) ? (fresh.prompts as unknown as Prompt[]).length : 0);
+      const metrics: RunMetrics = { ...emptyMetrics(), ...(fresh.metrics as object) };
       const freshBreak = fresh.breakState as unknown as BreakState;
       const newMetrics: RunMetrics = isPretest
         ? {
@@ -1356,7 +1372,7 @@ async function handleExamAnswer(
       const isLastAnswer = newIndex >= promptCount;
       const updatedBreakState = isLastAnswer ? freshBreak : checkBreakNeeded(freshBreak);
 
-      const metrics = fresh.metrics as unknown as RunMetrics;
+      const metrics: RunMetrics = { ...emptyMetrics(), ...(fresh.metrics as object) };
       const newMetrics: RunMetrics = {
         ...metrics,
         time_spent_seconds: metrics.time_spent_seconds + (timeToAnswer ?? 0),
@@ -1456,8 +1472,8 @@ async function handleExamScore(
       if (!existing) throw new Error("no_attempt_to_score");
       if (existing.selfScore !== null) throw new Error("already_scored");
 
-      const promptCount = fresh.promptCount || (fresh.prompts as unknown as Prompt[]).length;
-      const metrics = fresh.metrics as unknown as RunMetrics;
+      const promptCount = fresh.promptCount || (Array.isArray(fresh.prompts) ? (fresh.prompts as unknown as Prompt[]).length : 0);
+      const metrics: RunMetrics = { ...emptyMetrics(), ...(fresh.metrics as object) };
       const newScoredCount = (fresh.scoredCount ?? 0) + 1;
       const newIndex = fresh.currentIndex + 1;
       const isLastScore = newIndex >= promptCount;
diff --git a/src/ui/components/Button.tsx b/src/ui/components/Button.tsx
deleted file mode 100644
index 4bb6637..0000000
--- a/src/ui/components/Button.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Button component — CSS-first with optional raster texture accent.
- *
- * Usage:
- *   <Button>Start Session</Button>
- *   <Button variant="secondary" size="sm">Cancel</Button>
- *   <Button textureKey="btn-primary">Textured Button</Button>
- *
- * Prefer CSS for states and layout. Use textureKey only for
- * Photoshop-designed button skins/textures.
- */
-import { assets, type AssetKey } from "@/ui/assets/manifest";
-
-type ButtonVariant = "primary" | "secondary" | "danger";
-type ButtonSize = "sm" | "md" | "lg";
-
-interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
-  variant?: ButtonVariant;
-  size?: ButtonSize;
-  textureKey?: AssetKey;
-}
-
-const variantStyles: Record<ButtonVariant, React.CSSProperties> = {
-  primary: {
-    background: "var(--color-primary)",
-    color: "var(--color-bg-darkest)",
-    border: "none",
-  },
-  secondary: {
-    background: "var(--color-bg-card)",
-    color: "var(--color-text)",
-    border: "1px solid var(--color-border)",
-  },
-  danger: {
-    background: "var(--color-error)",
-    color: "var(--color-bg-darkest)",
-    border: "none",
-  },
-};
-
-const sizeStyles: Record<ButtonSize, React.CSSProperties> = {
-  sm: { padding: "0.3rem 0.6rem", fontSize: "0.8rem" },
-  md: { padding: "0.5rem 1rem", fontSize: "0.9rem" },
-  lg: { padding: "0.75rem 1.5rem", fontSize: "1rem" },
-};
-
-export function Button({
-  variant = "primary",
-  size = "md",
-  textureKey,
-  type = "button",
-  style,
-  disabled,
-  children,
-  ...rest
-}: ButtonProps) {
-  const baseStyle: React.CSSProperties = {
-    fontFamily: "var(--font-body)",
-    fontWeight: 600,
-    borderRadius: "var(--radius-sm)",
-    cursor: disabled ? "not-allowed" : "pointer",
-    opacity: disabled ? 0.6 : 1,
-    transition: "opacity 0.15s",
-    ...variantStyles[variant],
-    ...sizeStyles[size],
-  };
-
-  // Apply raster texture as background image if specified
-  if (textureKey) {
-    const meta = assets[textureKey];
-    const src = meta?.avif ?? meta?.webp;
-    if (src) {
-      baseStyle.backgroundImage = `url(${src})`;
-      baseStyle.backgroundSize = "cover";
-      baseStyle.backgroundPosition = "center";
-    }
-  }
-
-  return (
-    <button
-      type={type}
-      style={{ ...baseStyle, ...style }}
-      disabled={disabled}
-      aria-disabled={disabled || undefined}
-      {...rest}
-    >
-      {children}
-    </button>
-  );
-}
diff --git a/src/ui/components/Icon.tsx b/src/ui/components/Icon.tsx
deleted file mode 100644
index 321e988..0000000
--- a/src/ui/components/Icon.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Icon component — renders SVG from asset manifest.
- *
- * Usage:
- *   <Icon name="icon-check" size={20} />
- *   <Icon name="icon-phone-off" className="text-red-500" />
- */
-import { assets, type AssetKey, type AssetMeta } from "@/ui/assets/manifest";
-
-interface IconProps extends React.ImgHTMLAttributes<HTMLImageElement> {
-  name: AssetKey;
-  size?: number;
-}
-
-export function Icon({ name, size, style, ...rest }: IconProps) {
-  const meta: AssetMeta = assets[name];
-  const src = meta.svg ?? meta.avif ?? meta.webp;
-  if (!src) return null;
-
-  const w = size ?? meta.width ?? 24;
-  const h = size ?? meta.height ?? 24;
-
-  return (
-    <img
-      src={src}
-      width={w}
-      height={h}
-      alt={rest.alt ?? name}
-      style={{ display: "inline-block", verticalAlign: "middle", ...style }}
-      {...rest}
-    />
-  );
-}
diff --git a/src/ui/components/ServiceWorkerRegistration.tsx b/src/ui/components/ServiceWorkerRegistration.tsx
deleted file mode 100644
index 6e271e0..0000000
--- a/src/ui/components/ServiceWorkerRegistration.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-"use client";
-
-import { useEffect } from "react";
-
-export function ServiceWorkerRegistration() {
-  useEffect(() => {
-    if ("serviceWorker" in navigator) {
-      navigator.serviceWorker.register("/sw.js").catch(() => {
-        // Service worker registration failed — non-fatal
-      });
-    }
-  }, []);
-
-  return null;
-}
diff --git a/start.bat b/start.bat
deleted file mode 100644
index 913a401..0000000
--- a/start.bat
+++ /dev/null
@@ -1,57 +0,0 @@
-@echo off
-echo ============================================
-echo   Study Bot - Starting up...
-echo ============================================
-echo.
-
-:: Kill any old Node processes hogging ports
-echo [0/4] Cleaning up old processes...
-taskkill /F /IM node.exe >nul 2>&1
-timeout /t 1 /nobreak >nul
-
-:: Check if Docker Desktop is running
-docker info >nul 2>&1
-if %errorlevel% neq 0 (
-    echo [1/4] Starting Docker Desktop...
-    start "" "C:\Program Files\Docker\Docker\Docker Desktop.exe"
-    echo       Waiting for Docker to start...
-    :wait_docker
-    timeout /t 3 /nobreak >nul
-    docker info >nul 2>&1
-    if %errorlevel% neq 0 goto wait_docker
-    echo       Docker is ready!
-) else (
-    echo [1/4] Docker Desktop is already running.
-)
-
-echo.
-echo [2/4] Starting database...
-docker compose up -d
-if %errorlevel% neq 0 (
-    echo       ERROR: Failed to start database. Is Docker Desktop fully loaded?
-    pause
-    exit /b 1
-)
-
-:: Wait for Postgres to accept connections
-echo       Waiting for database to be ready...
-:wait_db
-timeout /t 2 /nobreak >nul
-docker compose exec -T db pg_isready -U postgres >nul 2>&1
-if %errorlevel% neq 0 goto wait_db
-echo       Database is ready!
-
-echo.
-echo [3/4] Syncing database schema...
-call npx prisma generate
-call npx prisma db push --skip-generate
-echo       Schema synced!
-
-echo.
-echo [4/4] Starting dev server...
-echo ============================================
-echo   Open http://localhost:3000 in your browser
-echo   Press Ctrl+C to stop
-echo ============================================
-echo.
-npm run dev