diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 691d8e4f4..8e608153e 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -1,7 +1,7 @@
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
   root: true,
-  parser: "@typescript-eslint/parser",
+  extends: ["eslint-config-custom"],
   parserOptions: {
     tsconfigRootDir: __dirname,
     project: [
@@ -10,9 +10,4 @@ module.exports = {
       "./packages/*/tsconfig.json",
     ],
   },
-  plugins: ["@typescript-eslint"],
-  extends: ["plugin:@typescript-eslint/recommended"],
-  rules: {
-    "no-console": "warn"
-  }
 };
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 245182dad..cad1aa60e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,7 +33,7 @@ jobs:
         run: pnpm install
 
       - name: Generate prisma client
-        run: pnpm db-generate
+        run: pnpm db-generate:no-engine
 
       - name: Inject Doppler env vars
         uses: dopplerhq/secrets-fetch-action@v1.2.0
@@ -43,4 +43,4 @@ jobs:
           inject-env-vars: true
 
       - name: Run tests
-        run: pnpm turbo test --cache-dir=".turbo"
+        run: pnpm turbo test --cache-dir=".turbo" -- --maxWorkers=33%
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f17db0427..daa6fc1fd 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -19,8 +19,10 @@
     "autodocs",
     "autoprefixer",
     "autosize",
+    "backmerge",
     "backticked",
     "beitzah",
+    "bethclark",
     "bugsnag",
     "categorisation",
     "Categorised",
@@ -28,6 +30,7 @@
     "cloudinary",
     "clsx",
     "codegen",
+    "COLOR",
     "compat",
     "contrib",
     "cuid",
@@ -40,6 +43,7 @@
     "Docgen",
     "dockerized",
     "dopplerhq",
+    "dotenv",
     "EASS",
     "EHRC",
     "estree",
@@ -106,6 +110,7 @@
     "ponyfill",
     "popover",
     "portabletext",
+    "postcss",
     "posthog",
     "postpack",
     "posttest",
@@ -117,6 +122,7 @@
     "psql",
     "pusherapp",
     "ratelimit",
+    "refs",
     "Regen",
     "remeda",
     "Rerank",
@@ -128,6 +134,7 @@
     "sslmode",
     "SUBJ",
     "superjson",
+    "svgs",
     "tailwindcss",
     "tanstack",
     "testid",
@@ -143,6 +150,8 @@
     "turborepo",
     "uidotdev",
     "unjudged",
+    "unsets",
+    "unshallow",
     "unsummarised",
     "untruncate",
     "untruncated",
@@ -154,6 +163,7 @@
     "valign",
     "vars",
     "vectorstores",
+    "vercel",
     "WCAG",
     "webvtt",
     "zadd",
@@ -193,5 +203,6 @@
   "yaml.schemas": {
     "file:///c%3A/Users/Simon/.vscode/extensions/atlassian.atlascode-2.8.6/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml",
     "https://www.artillery.io/schema.json": []
-  }
+  },
+  "typescript.preferences.preferTypeOnlyAutoImports": true
 }
diff --git a/apps/nextjs/.eslintrc.cjs b/apps/nextjs/.eslintrc.cjs
index cc5073297..d815e14a5 100644
--- a/apps/nextjs/.eslintrc.cjs
+++ b/apps/nextjs/.eslintrc.cjs
@@ -16,4 +16,7 @@ module.exports = {
       },
     ],
   },
+  parserOptions: {
+    project: __dirname + "/tsconfig.json",
+  },
 };
diff --git a/apps/nextjs/.storybook/main.ts b/apps/nextjs/.storybook/main.ts
index 53b58e031..0b2d01b6e 100644
--- a/apps/nextjs/.storybook/main.ts
+++ b/apps/nextjs/.storybook/main.ts
@@ -2,6 +2,8 @@ import type { StorybookConfig } from "@storybook/nextjs";
 import { join, dirname, resolve } from "path";
 import webpack from "webpack";
 
+process.env.NEXT_PUBLIC_DEBUG = process.env.DEBUG;
+
 /**
  * This function is used to resolve the absolute path of a package.
  * It is needed in projects that use Yarn PnP or are set up within a monorepo.
diff --git a/apps/nextjs/.storybook/preview.tsx b/apps/nextjs/.storybook/preview.tsx
index 3a13c4d01..887d667e3 100644
--- a/apps/nextjs/.storybook/preview.tsx
+++ b/apps/nextjs/.storybook/preview.tsx
@@ -8,7 +8,6 @@ import "@fontsource/lexend/800.css";
 import "@fontsource/lexend/900.css";
 import { OakThemeProvider, oakDefaultTheme } from "@oaknational/oak-components";
 import type { Preview, Decorator } from "@storybook/react";
-import { GeistMono } from "geist/font/mono";
 
 // ModerationProvider is coming in the main Chat.tsx refactor
 //import { ModerationProvider } from "../src/components/AppComponents/Chat/Chat/ModerationProvider";
diff --git a/apps/nextjs/jest.setup.js b/apps/nextjs/jest.setup.js
index 61958adc9..f6a95f743 100644
--- a/apps/nextjs/jest.setup.js
+++ b/apps/nextjs/jest.setup.js
@@ -1,5 +1,7 @@
 require("@testing-library/jest-dom");
 
+process.env.NEXT_PUBLIC_DEBUG = process.env.DEBUG;
+
 // Mock Next.js Image component
 jest.mock("next/image", () => ({
   __esModule: true,
diff --git a/apps/nextjs/next.config.js b/apps/nextjs/next.config.js
index 3d7103f35..4cc207922 100644
--- a/apps/nextjs/next.config.js
+++ b/apps/nextjs/next.config.js
@@ -5,7 +5,6 @@ const {
   RELEASE_STAGE_TESTING,
 } = require("./scripts/build_config_helpers.js");
 const path = require("path");
-const Sentry = require("@sentry/nextjs");
 
 const { PHASE_PRODUCTION_BUILD, PHASE_TEST } = require("next/constants");
 
@@ -89,6 +88,7 @@ const getConfig = async (phase) => {
     env: {
       NEXT_PUBLIC_APP_VERSION: appVersion,
       NEXT_PUBLIC_RELEASE_STAGE: releaseStage,
+      NEXT_PUBLIC_DEBUG: process.env.DEBUG,
     },
 
     productionBrowserSourceMaps: true,
@@ -155,41 +155,37 @@ const getConfig = async (phase) => {
 
 module.exports = getConfig;
 
-if (!process.env.TURBOPACK) {
-  module.exports = withSentryConfig(module.exports, {
-    // For all available options, see:
-    // https://github.com/getsentry/sentry-webpack-plugin#options
+module.exports = withSentryConfig(module.exports, {
+  // For all available options, see:
+  // https://github.com/getsentry/sentry-webpack-plugin#options
 
-    org: process.env.SENTRY_ORG,
-    project: process.env.SENTRY_PROJECT,
+  org: process.env.SENTRY_ORG,
+  project: process.env.SENTRY_PROJECT,
 
-    // Only print logs for uploading source maps in CI
-    silent: !process.env.CI,
+  // Only print logs for uploading source maps in CI
+  silent: !process.env.CI,
 
-    // For all available options, see:
-    // https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
+  // For all available options, see:
+  // https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
 
-    // Upload a larger set of source maps for prettier stack traces (increases build time)
-    widenClientFileUpload: true,
+  // Upload a larger set of source maps for prettier stack traces (increases build time)
+  widenClientFileUpload: true,
 
-    // Route browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers.
-    // This can increase your server load as well as your hosting bill.
-    // Note: Check that the configured route will not match with your Next.js middleware, otherwise reporting of client-
-    // side errors will fail.
-    tunnelRoute: "/monitoring",
+  // Route browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers.
+  // This can increase your server load as well as your hosting bill.
+  // Note: Check that the configured route will not match with your Next.js middleware, otherwise reporting of client-
+  // side errors will fail.
+  tunnelRoute: "/monitoring",
 
-    // Hides source maps from generated client bundles
-    hideSourceMaps: true,
+  // Hides source maps from generated client bundles
+  hideSourceMaps: true,
 
-    // Automatically tree-shake Sentry logger statements to reduce bundle size
-    disableLogger: true,
+  // Automatically tree-shake Sentry logger statements to reduce bundle size
+  disableLogger: true,
 
-    // Enables automatic instrumentation of Vercel Cron Monitors. (Does not yet work with App Router route handlers.)
-    // See the following for more information:
-    // https://docs.sentry.io/product/crons/
-    // https://vercel.com/docs/cron-jobs
-    automaticVercelMonitors: true,
-  });
-}
-
-module.exports.onRequestError = Sentry.captureRequestError;
+  // Enables automatic instrumentation of Vercel Cron Monitors. (Does not yet work with App Router route handlers.)
+  // See the following for more information:
+  // https://docs.sentry.io/product/crons/
+  // https://vercel.com/docs/cron-jobs
+  automaticVercelMonitors: true,
+});
diff --git a/apps/nextjs/package.json b/apps/nextjs/package.json
index 7ae770a2d..fd0e25a4f 100644
--- a/apps/nextjs/package.json
+++ b/apps/nextjs/package.json
@@ -7,10 +7,8 @@
     "build:dev": "pnpm with-env next build",
     "check": "tsc --noEmit",
     "clean": "rm -rf .next .turbo node_modules",
-    "dev": "FORCE_COLOR=1 concurrently \"pnpm dev-server\" \"node scripts/local-dev.mjs\"",
-    "dev-turbo": "FORCE_COLOR=1 concurrently \"pnpm dev-server-turbo\" \"node scripts/local-dev.mjs\"",
-    "dev-server-turbo": "FORCE_COLOR=1 pnpm with-env node scripts/increase-listeners.js next dev --port 2525 --turbo | pino-pretty -C",
-    "dev-server": "FORCE_COLOR=1 pnpm with-env node scripts/increase-listeners.js next dev --port 2525 | pino-pretty -C",
+    "dev": "FORCE_COLOR=1 SENTRY_SUPPRESS_TURBOPACK_WARNING=1 pnpm with-env node scripts/increase-listeners.js next dev --port 2525 --turbo | pino-pretty -C",
+    "dev:sentry": "FORCE_COLOR=1 pnpm with-env node scripts/increase-listeners.js next dev --port 2525 | pino-pretty -C",
     "dev-trace-deprecation": "NODE_OPTIONS=\"--trace-deprecation\" next dev --port 2525 | pino-pretty -C",
     "lint": "next lint",
     "lint-fix": "next lint --fix",
@@ -56,7 +54,7 @@
     "@radix-ui/react-tooltip": "^1.0.7",
     "@radix-ui/themes": "^1.0.0",
     "@sanity/client": "^6.21.3",
-    "@sentry/nextjs": "^8.19.0",
+    "@sentry/nextjs": "^8.35.0",
     "@storybook/testing-react": "^2.0.1",
     "@tanstack/react-query": "^4.16.1",
     "@testing-library/jest-dom": "^6.4.8",
@@ -151,7 +149,7 @@
     "concurrently": "^8.2.2",
     "dotenv-cli": "^6.0.0",
     "eslint": "^8.56.0",
-    "eslint-config-next": "14.0.4",
+    "eslint-config-next": "15.0.1",
     "eslint-plugin-storybook": "^0.8.0",
     "graphql": "^16.9.0",
     "jest": "^29.7.0",
diff --git a/apps/nextjs/scripts/aila-cli.ts b/apps/nextjs/scripts/aila-cli.ts
index 23c7f3dca..12e328731 100644
--- a/apps/nextjs/scripts/aila-cli.ts
+++ b/apps/nextjs/scripts/aila-cli.ts
@@ -1,4 +1,4 @@
-import { Aila } from "@oakai/aila";
+import { Aila } from "@oakai/aila/src/core/Aila";
 import { AilaPlugin } from "@oakai/aila/src/core/plugins";
 
 const cliPlugin: AilaPlugin = {
diff --git a/apps/nextjs/scripts/local-dev.mjs b/apps/nextjs/scripts/preload-chat-routes.mjs
similarity index 100%
rename from apps/nextjs/scripts/local-dev.mjs
rename to apps/nextjs/scripts/preload-chat-routes.mjs
diff --git a/apps/nextjs/src/ai-apps/common/getSessionOutput.ts b/apps/nextjs/src/ai-apps/common/getSessionOutput.ts
index 6b4f8d1e8..bcbebb9f8 100644
--- a/apps/nextjs/src/ai-apps/common/getSessionOutput.ts
+++ b/apps/nextjs/src/ai-apps/common/getSessionOutput.ts
@@ -1,4 +1,4 @@
-import { Apps } from "@oakai/core";
+import { Apps } from "@oakai/core/src/models/apps";
 import { prisma } from "@oakai/db";
 import { outputSchema } from "ai-apps/generations/types";
 
diff --git a/apps/nextjs/src/ai-apps/common/parseLocalStorageData.ts b/apps/nextjs/src/ai-apps/common/parseLocalStorageData.ts
index 5bd6ce109..63a57753f 100644
--- a/apps/nextjs/src/ai-apps/common/parseLocalStorageData.ts
+++ b/apps/nextjs/src/ai-apps/common/parseLocalStorageData.ts
@@ -1,6 +1,6 @@
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
-import { z } from "zod";
+import type { z } from "zod";
 
 const log = aiLogger("ui");
 
diff --git a/apps/nextjs/src/ai-apps/common/state/create-parts.ts b/apps/nextjs/src/ai-apps/common/state/create-parts.ts
index ada374416..ce6f27dd5 100644
--- a/apps/nextjs/src/ai-apps/common/state/create-parts.ts
+++ b/apps/nextjs/src/ai-apps/common/state/create-parts.ts
@@ -1,9 +1,9 @@
-import {
+import type {
   GenerationPart,
   GenerationPartAIGenerated,
-  GenerationPartType,
   GenerationPartUserTweaked,
 } from "@oakai/core/src/types";
+import { GenerationPartType } from "@oakai/core/src/types";
 
 export function createAIGeneratedPart<Value>(
   value: Value,
diff --git a/apps/nextjs/src/ai-apps/common/state/helpers.ts b/apps/nextjs/src/ai-apps/common/state/helpers.ts
index 33cea956f..d62726193 100644
--- a/apps/nextjs/src/ai-apps/common/state/helpers.ts
+++ b/apps/nextjs/src/ai-apps/common/state/helpers.ts
@@ -1,4 +1,4 @@
-import { GenerationPart } from "@oakai/core/src/types";
+import type { GenerationPart } from "@oakai/core/src/types";
 
 /**
  * Apply the `updater` function to the item
diff --git a/apps/nextjs/src/ai-apps/lesson-planner/state/actions.ts b/apps/nextjs/src/ai-apps/lesson-planner/state/actions.ts
index d237bb22e..16ef00a41 100644
--- a/apps/nextjs/src/ai-apps/lesson-planner/state/actions.ts
+++ b/apps/nextjs/src/ai-apps/lesson-planner/state/actions.ts
@@ -1,13 +1,13 @@
-import { RateLimitInfo } from "@oakai/api/src/types";
-import { KeyStageName, SubjectName } from "@oakai/core";
-import {
+import type { RateLimitInfo } from "@oakai/api/src/types";
+import type { KeyStageName, SubjectName } from "@oakai/core";
+import type {
   QuizAppQuestion,
   QuizAppStateQuestion,
 } from "ai-apps/quiz-designer/state/types";
 
-import { DeepPartial } from "@/utils/types/DeepPartial";
+import type { DeepPartial } from "@/utils/types/DeepPartial";
 
-import {
+import type {
   LPKeyLearningPoint,
   LPKeyword,
   LPMisconception,
diff --git a/apps/nextjs/src/ai-apps/quiz-designer/convertToCSV.ts b/apps/nextjs/src/ai-apps/quiz-designer/convertToCSV.ts
index f4e45054e..6dec1fc91 100644
--- a/apps/nextjs/src/ai-apps/quiz-designer/convertToCSV.ts
+++ b/apps/nextjs/src/ai-apps/quiz-designer/convertToCSV.ts
@@ -1,4 +1,4 @@
-import { ExportableQuizAppState } from "@oakai/exports/src/schema/input.schema";
+import type { ExportableQuizAppState } from "@oakai/exports/src/schema/input.schema";
 
 export function convertQuizToCSV(data: ExportableQuizAppState) {
   // Define the headers for your CSV
diff --git a/apps/nextjs/src/ai-apps/quiz-designer/convertToGIFTFormat.ts b/apps/nextjs/src/ai-apps/quiz-designer/convertToGIFTFormat.ts
index 900419109..f7eb577e9 100644
--- a/apps/nextjs/src/ai-apps/quiz-designer/convertToGIFTFormat.ts
+++ b/apps/nextjs/src/ai-apps/quiz-designer/convertToGIFTFormat.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   ExportableQuizAppState,
   ExportableQuizQuestion,
 } from "@oakai/exports/src/schema/input.schema";
@@ -29,7 +29,7 @@ export function convertToGIFTFormat(
       }
     }
 
-    giftString += `\n}\n`;
+    giftString += "\n}\n";
   }
 
   return giftString;
diff --git a/apps/nextjs/src/ai-apps/quiz-designer/export-helpers.ts b/apps/nextjs/src/ai-apps/quiz-designer/export-helpers.ts
index 44ecd6ce9..e4a90e80b 100644
--- a/apps/nextjs/src/ai-apps/quiz-designer/export-helpers.ts
+++ b/apps/nextjs/src/ai-apps/quiz-designer/export-helpers.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   ExportableQuizAppState,
   ExportableQuizQuestion,
 } from "@oakai/exports/src/schema/input.schema";
@@ -6,7 +6,7 @@ import { getGenerationPartValue } from "ai-apps/common/state/helpers";
 
 import { sortAlphabetically } from "@/utils/alphabetiseArray";
 
-import {
+import type {
   QuizAppQuestion,
   QuizAppState,
   QuizAppStateQuestion,
diff --git a/apps/nextjs/src/ai-apps/quiz-designer/extraQuizPromptInfo.ts b/apps/nextjs/src/ai-apps/quiz-designer/extraQuizPromptInfo.ts
index 22b579306..d90b7a39b 100644
--- a/apps/nextjs/src/ai-apps/quiz-designer/extraQuizPromptInfo.ts
+++ b/apps/nextjs/src/ai-apps/quiz-designer/extraQuizPromptInfo.ts
@@ -1,4 +1,4 @@
-import { QuizAppState, QuizAppStateQuestion } from "./state/types";
+import type { QuizAppState, QuizAppStateQuestion } from "./state/types";
 
 type OtherQuestionForPromptPropos = {
   state: QuizAppState;
diff --git a/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts b/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts
index a270b3942..5efddcb15 100644
--- a/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts
+++ b/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts
@@ -1,9 +1,9 @@
-import { GenerationPart } from "@oakai/core/src/types";
+import type { GenerationPart } from "@oakai/core/src/types";
 
 import { getAgesFromKeyStage } from "@/utils/getAgesFromKeyStage";
 
 import { extraQuizPromptInfo } from "./extraQuizPromptInfo";
-import { QuizAppState, QuizAppStateQuestion } from "./state/types";
+import type { QuizAppState, QuizAppStateQuestion } from "./state/types";
 
 type RequestionGenerationInputs = {
   lastGenerationId: string | null;
diff --git a/apps/nextjs/src/ai-apps/quiz-designer/state/actions.ts b/apps/nextjs/src/ai-apps/quiz-designer/state/actions.ts
index a5a55c020..9641f803e 100644
--- a/apps/nextjs/src/ai-apps/quiz-designer/state/actions.ts
+++ b/apps/nextjs/src/ai-apps/quiz-designer/state/actions.ts
@@ -1,8 +1,8 @@
-import { RateLimitInfo } from "@oakai/api/src/types";
-import { KeyStageName, SubjectName } from "@oakai/core";
-import { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
+import type { RateLimitInfo } from "@oakai/api/src/types";
+import type { KeyStageName, SubjectName } from "@oakai/core";
+import type { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
 
-import { QuizAppState, QuizQuestionType } from "./types";
+import type { QuizAppState, QuizQuestionType } from "./types";
 
 /**
  * Our action types are declared as a const enum with string values
diff --git a/apps/nextjs/src/ai-apps/quiz-designer/state/reducer.ts b/apps/nextjs/src/ai-apps/quiz-designer/state/reducer.ts
index 0b2719325..82ca64f85 100644
--- a/apps/nextjs/src/ai-apps/quiz-designer/state/reducer.ts
+++ b/apps/nextjs/src/ai-apps/quiz-designer/state/reducer.ts
@@ -5,15 +5,12 @@ import {
   createTweakPart,
 } from "ai-apps/common/state/create-parts";
 import { removeAtIndex, updateAtIndex } from "ai-apps/common/state/helpers";
-import { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
+import type { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
 
-import { QuizAppAction, QuizAppActions } from "./actions";
-import {
-  QuizAppState,
-  QuizAppStateQuestion,
-  QuizAppStatus,
-  QuizQuestionType,
-} from "./types";
+import type { QuizAppAction } from "./actions";
+import { QuizAppActions } from "./actions";
+import type { QuizAppState, QuizAppStateQuestion } from "./types";
+import { QuizAppStatus, QuizQuestionType } from "./types";
 
 export function quizAppReducer(
   state: QuizAppState,
diff --git a/apps/nextjs/src/app/actions.ts b/apps/nextjs/src/app/actions.ts
index d515d3330..7cc3bb9b5 100644
--- a/apps/nextjs/src/app/actions.ts
+++ b/apps/nextjs/src/app/actions.ts
@@ -1,7 +1,9 @@
 "use server";
 
-import { AilaPersistedChat, chatSchema } from "@oakai/aila/src/protocol/schema";
-import { Prisma, prisma } from "@oakai/db";
+import type { AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
+import { chatSchema } from "@oakai/aila/src/protocol/schema";
+import type { Prisma } from "@oakai/db";
+import { prisma } from "@oakai/db";
 import * as Sentry from "@sentry/nextjs";
 
 function parseChatAndReportError({
@@ -14,7 +16,7 @@ function parseChatAndReportError({
   userId: string;
 }): AilaPersistedChat | undefined {
   if (typeof sessionOutput !== "object") {
-    throw new Error(`sessionOutput is not an object`);
+    throw new Error("sessionOutput is not an object");
   }
   const parseResult = chatSchema.safeParse({
     ...sessionOutput,
@@ -23,7 +25,7 @@ function parseChatAndReportError({
   });
 
   if (!parseResult.success) {
-    const error = new Error(`Failed to parse chat`);
+    const error = new Error("Failed to parse chat");
     Sentry.captureException(error, {
       extra: {
         id,
diff --git a/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx b/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx
index 8b223ea2e..fa67b0510 100644
--- a/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx
+++ b/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx
@@ -1,8 +1,8 @@
 import { useState } from "react";
 
-import { type AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
+import type { AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
 import { getSafetyResult } from "@oakai/core/src/utils/ailaModeration/helpers";
-import { type Moderation } from "@oakai/db";
+import type { Moderation } from "@oakai/db";
 import { OakAccordion, OakPrimaryButton } from "@oaknational/oak-components";
 
 import { trpc } from "@/utils/trpc";
diff --git a/apps/nextjs/src/app/aila/[id]/download/DownloadView.tsx b/apps/nextjs/src/app/aila/[id]/download/DownloadView.tsx
index 30c02929f..a6fde2f92 100644
--- a/apps/nextjs/src/app/aila/[id]/download/DownloadView.tsx
+++ b/apps/nextjs/src/app/aila/[id]/download/DownloadView.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
+import type { AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
 import { Box, Flex, Grid } from "@radix-ui/themes";
 
 import Layout from "@/components/AppComponents/Layout";
diff --git a/apps/nextjs/src/app/aila/[id]/download/page.tsx b/apps/nextjs/src/app/aila/[id]/download/page.tsx
index 4c1c13193..819e50957 100644
--- a/apps/nextjs/src/app/aila/[id]/download/page.tsx
+++ b/apps/nextjs/src/app/aila/[id]/download/page.tsx
@@ -1,5 +1,5 @@
 import { auth } from "@clerk/nextjs/server";
-import { type Metadata } from "next";
+import type { Metadata } from "next";
 import { notFound, redirect } from "next/navigation";
 
 import { getChatById } from "@/app/actions";
diff --git a/apps/nextjs/src/app/aila/[id]/download/useDownloadView.ts b/apps/nextjs/src/app/aila/[id]/download/useDownloadView.ts
index cd0eef6ad..ab80452e2 100644
--- a/apps/nextjs/src/app/aila/[id]/download/useDownloadView.ts
+++ b/apps/nextjs/src/app/aila/[id]/download/useDownloadView.ts
@@ -1,8 +1,8 @@
 import { getLastAssistantMessage } from "@oakai/aila/src/helpers/chat/getLastAssistantMessage";
-import { AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
+import type { AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
 
 import { useProgressForDownloads } from "@/components/AppComponents/Chat/Chat/hooks/useProgressForDownloads";
-import { ExportsHookProps } from "@/components/ExportsDialogs/exports.types";
+import type { ExportsHookProps } from "@/components/ExportsDialogs/exports.types";
 import { useExportAdditionalMaterials } from "@/components/ExportsDialogs/useExportAdditionalMaterials";
 import { useExportAllLessonAssets } from "@/components/ExportsDialogs/useExportAllLessonAssets";
 import { useExportLessonPlanDoc } from "@/components/ExportsDialogs/useExportLessonPlanDoc";
diff --git a/apps/nextjs/src/app/aila/[id]/layout.tsx b/apps/nextjs/src/app/aila/[id]/layout.tsx
index a31f4fe7f..89534d9e0 100644
--- a/apps/nextjs/src/app/aila/[id]/layout.tsx
+++ b/apps/nextjs/src/app/aila/[id]/layout.tsx
@@ -2,9 +2,7 @@ interface ChatLayoutProps {
   children: React.ReactNode;
 }
 
-export default async function ChatLayout({
-  children,
-}: Readonly<ChatLayoutProps>) {
+export default function ChatLayout({ children }: Readonly<ChatLayoutProps>) {
   return (
     <div className="relative flex h-full overflow-hidden">
       <div className="group w-full overflow-auto pl-0 duration-300 ease-in-out animate-in peer-[[data-state=open]]:lg:pl-[250px] peer-[[data-state=open]]:xl:pl-[300px]">
diff --git a/apps/nextjs/src/app/aila/[id]/share/index.tsx b/apps/nextjs/src/app/aila/[id]/share/index.tsx
index 833238906..e199c6023 100644
--- a/apps/nextjs/src/app/aila/[id]/share/index.tsx
+++ b/apps/nextjs/src/app/aila/[id]/share/index.tsx
@@ -2,8 +2,8 @@
 
 import { useEffect, useState } from "react";
 
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
-import { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import { OakSmallPrimaryButton } from "@oaknational/oak-components";
 import Link from "next/link";
 
diff --git a/apps/nextjs/src/app/aila/[id]/share/page.tsx b/apps/nextjs/src/app/aila/[id]/share/page.tsx
index be64ec031..fe63e137b 100644
--- a/apps/nextjs/src/app/aila/[id]/share/page.tsx
+++ b/apps/nextjs/src/app/aila/[id]/share/page.tsx
@@ -1,9 +1,10 @@
-import { User, clerkClient } from "@clerk/nextjs/server";
+import type { User } from "@clerk/nextjs/server";
+import { clerkClient } from "@clerk/nextjs/server";
 import { getSessionModerations } from "@oakai/aila/src/features/moderation/getSessionModerations";
-import { demoUsers } from "@oakai/core";
+import { demoUsers } from "@oakai/core/src/models/demoUsers";
 import { isToxic } from "@oakai/core/src/utils/ailaModeration/helpers";
-import { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
-import { type Metadata } from "next";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { Metadata } from "next";
 import { notFound } from "next/navigation";
 
 import { getSharedChatById } from "@/app/actions";
diff --git a/apps/nextjs/src/app/aila/help/index.tsx b/apps/nextjs/src/app/aila/help/index.tsx
index a58146343..649a9431d 100644
--- a/apps/nextjs/src/app/aila/help/index.tsx
+++ b/apps/nextjs/src/app/aila/help/index.tsx
@@ -99,7 +99,7 @@ const Help = () => {
           <div className="mb-40 max-w-[800px]">
             <div className="mb-20 mt-10 sm:hidden">
               <OakLink
-                href={ailaId ? `/aila/${ailaId}` : `/aila`}
+                href={ailaId ? `/aila/${ailaId}` : "/aila"}
                 iconName="chevron-left"
               >
                 Back to Aila
diff --git a/apps/nextjs/src/app/aila/help/page.tsx b/apps/nextjs/src/app/aila/help/page.tsx
index d6598506f..a49d678c5 100644
--- a/apps/nextjs/src/app/aila/help/page.tsx
+++ b/apps/nextjs/src/app/aila/help/page.tsx
@@ -1,5 +1,5 @@
 import Help from ".";
 
-export default async function HelpPage() {
+export default function HelpPage() {
   return <Help />;
 }
diff --git a/apps/nextjs/src/app/aila/page.tsx b/apps/nextjs/src/app/aila/page.tsx
index e5d4e01a5..4d8e8e054 100644
--- a/apps/nextjs/src/app/aila/page.tsx
+++ b/apps/nextjs/src/app/aila/page.tsx
@@ -5,11 +5,11 @@ import { redirect } from "next/navigation";
 import { ChatStart } from "@/components/AppComponents/Chat/chat-start";
 import Layout from "@/components/AppComponents/Layout";
 
-export default async function IndexPage() {
+export default function IndexPage() {
   const clerkAuthentication = auth();
   const { userId }: { userId: string | null } = clerkAuthentication;
   if (!userId) {
-    redirect(`/sign-in?next=/aila`);
+    redirect("/sign-in?next=/aila");
   }
 
   return (
diff --git a/apps/nextjs/src/app/api/aila-download-all/route.ts b/apps/nextjs/src/app/api/aila-download-all/route.ts
index 169dc444b..7df412f2e 100644
--- a/apps/nextjs/src/app/api/aila-download-all/route.ts
+++ b/apps/nextjs/src/app/api/aila-download-all/route.ts
@@ -1,5 +1,6 @@
 import { auth } from "@clerk/nextjs/server";
-import { LessonExportType, prisma } from "@oakai/db";
+import type { LessonExportType } from "@oakai/db";
+import { prisma } from "@oakai/db";
 import { downloadDriveFile } from "@oakai/exports";
 import * as Sentry from "@sentry/node";
 import { kv } from "@vercel/kv";
diff --git a/apps/nextjs/src/app/api/aila-download/route.ts b/apps/nextjs/src/app/api/aila-download/route.ts
index ada790560..52d4cf5b3 100644
--- a/apps/nextjs/src/app/api/aila-download/route.ts
+++ b/apps/nextjs/src/app/api/aila-download/route.ts
@@ -1,5 +1,6 @@
 import { auth } from "@clerk/nextjs/server";
-import { LessonExportType, prisma } from "@oakai/db";
+import type { LessonExportType } from "@oakai/db";
+import { prisma } from "@oakai/db";
 import { downloadDriveFile } from "@oakai/exports";
 import * as Sentry from "@sentry/node";
 
diff --git a/apps/nextjs/src/app/api/chat/chatHandler.ts b/apps/nextjs/src/app/api/chat/chatHandler.ts
index 3283a993d..7ab8bf78c 100644
--- a/apps/nextjs/src/app/api/chat/chatHandler.ts
+++ b/apps/nextjs/src/app/api/chat/chatHandler.ts
@@ -1,25 +1,31 @@
-import { Aila } from "@oakai/aila";
+import type { Aila } from "@oakai/aila/src/core/Aila";
+import type { AilaServices } from "@oakai/aila/src/core/AilaServices";
+import type { Message } from "@oakai/aila/src/core/chat";
+import type { AilaInitializationOptions } from "@oakai/aila/src/core/types";
 import type {
-  AilaInitializationOptions,
   AilaOptions,
   AilaPublicChatOptions,
-  Message,
-} from "@oakai/aila";
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+} from "@oakai/aila/src/core/types";
+import { AilaAmericanisms } from "@oakai/aila/src/features/americanisms/AilaAmericanisms";
 import {
-  TracingSpan,
-  withTelemetry,
-} from "@oakai/core/src/tracing/serverTracing";
-import { PrismaClientWithAccelerate, prisma as globalPrisma } from "@oakai/db";
+  DatadogAnalyticsAdapter,
+  PosthogAnalyticsAdapter,
+} from "@oakai/aila/src/features/analytics";
+import { AilaRag } from "@oakai/aila/src/features/rag/AilaRag";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { TracingSpan } from "@oakai/core/src/tracing/serverTracing";
+import { withTelemetry } from "@oakai/core/src/tracing/serverTracing";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
+import { prisma as globalPrisma } from "@oakai/db/client";
 import { aiLogger } from "@oakai/logger";
 // #TODO StreamingTextResponse is deprecated. If we choose to adopt the "ai" package
 // more fully, we should refactor to support its approach to streaming
 // but this could be a significant change given we have our record-separator approach
 import { StreamingTextResponse } from "ai";
-import { NextRequest } from "next/server";
+import type { NextRequest } from "next/server";
 import invariant from "tiny-invariant";
 
-import { Config } from "./config";
+import type { Config } from "./config";
 import { handleChatException } from "./errorHandling";
 import {
   getFixtureLLMService,
@@ -176,6 +182,12 @@ export async function handleChatPostRequest(
             services: {
               chatLlmService: llmService,
               moderationAiClient,
+              ragService: (aila: AilaServices) => new AilaRag({ aila }),
+              americanismsService: () => new AilaAmericanisms(),
+              analyticsAdapters: (aila: AilaServices) => [
+                new PosthogAnalyticsAdapter(aila),
+                new DatadogAnalyticsAdapter(aila),
+              ],
             },
             lessonPlan: lessonPlan ?? {},
           };
diff --git a/apps/nextjs/src/app/api/chat/config.ts b/apps/nextjs/src/app/api/chat/config.ts
index 5c9b91f3f..c3ba5b90d 100644
--- a/apps/nextjs/src/app/api/chat/config.ts
+++ b/apps/nextjs/src/app/api/chat/config.ts
@@ -1,9 +1,10 @@
-import { Aila, AilaInitializationOptions } from "@oakai/aila";
+import { Aila } from "@oakai/aila/src/core/Aila";
+import type { AilaInitializationOptions } from "@oakai/aila/src/core/types";
 import {
   prisma as globalPrisma,
   type PrismaClientWithAccelerate,
 } from "@oakai/db";
-import { nanoid } from "ai";
+import { nanoid } from "nanoid";
 
 import { createWebActionsPlugin } from "./webActionsPlugin";
 
diff --git a/apps/nextjs/src/app/api/chat/errorHandling.test.ts b/apps/nextjs/src/app/api/chat/errorHandling.test.ts
index 573c8550c..33f618225 100644
--- a/apps/nextjs/src/app/api/chat/errorHandling.test.ts
+++ b/apps/nextjs/src/app/api/chat/errorHandling.test.ts
@@ -1,9 +1,10 @@
-import { AilaAuthenticationError, AilaThreatDetectionError } from "@oakai/aila";
+import { AilaAuthenticationError } from "@oakai/aila/src/core/AilaError";
+import { AilaThreatDetectionError } from "@oakai/aila/src/features/threatDetection/types";
 import * as moderationErrorHandling from "@oakai/aila/src/utils/moderation/moderationErrorHandling";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
-import { TracingSpan } from "@oakai/core/src/tracing/serverTracing";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
+import type { TracingSpan } from "@oakai/core/src/tracing/serverTracing";
 import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import invariant from "tiny-invariant";
 
 import {
@@ -37,7 +38,7 @@ describe("handleChatException", () => {
 
       expect(response.status).toBe(200);
 
-      invariant(response.body instanceof ReadableStream);
+      invariant(response.body);
       const message = extractStreamMessage(await consumeStream(response.body));
 
       expect(message).toEqual({
@@ -123,4 +124,4 @@ describe("handleChatException", () => {
       });
     });
   });
-});
\ No newline at end of file
+});
diff --git a/apps/nextjs/src/app/api/chat/errorHandling.ts b/apps/nextjs/src/app/api/chat/errorHandling.ts
index be22e99d6..d6ca10169 100644
--- a/apps/nextjs/src/app/api/chat/errorHandling.ts
+++ b/apps/nextjs/src/app/api/chat/errorHandling.ts
@@ -1,13 +1,14 @@
-import { AilaAuthenticationError, AilaThreatDetectionError } from "@oakai/aila";
-import {
+import { AilaAuthenticationError } from "@oakai/aila/src/core/AilaError";
+import { AilaThreatDetectionError } from "@oakai/aila/src/features/threatDetection";
+import type {
   ActionDocument,
   ErrorDocument,
 } from "@oakai/aila/src/protocol/jsonPatchProtocol";
 import { handleHeliconeError } from "@oakai/aila/src/utils/moderation/moderationErrorHandling";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
-import { TracingSpan } from "@oakai/core/src/tracing/serverTracing";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
+import type { TracingSpan } from "@oakai/core/src/tracing/serverTracing";
 import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { streamingJSON } from "./protocol";
 
diff --git a/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordLLMService.ts b/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordLLMService.ts
index d4d9f5b8e..fa68531f1 100644
--- a/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordLLMService.ts
+++ b/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordLLMService.ts
@@ -1,9 +1,9 @@
-import { Message } from "@oakai/aila";
-import { LLMService } from "@oakai/aila/src/core/llm/LLMService";
+import type { Message } from "@oakai/aila";
+import type { LLMService } from "@oakai/aila/src/core/llm/LLMService";
 import { OpenAIService } from "@oakai/aila/src/core/llm/OpenAIService";
 import { aiLogger } from "@oakai/logger";
 import fs from "fs/promises";
-import { ZodSchema } from "zod";
+import type { ZodSchema } from "zod";
 
 const log = aiLogger("fixtures");
 
diff --git a/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordOpenAiClient.ts b/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordOpenAiClient.ts
index b7b0e0b31..cb0d5d686 100644
--- a/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordOpenAiClient.ts
+++ b/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordOpenAiClient.ts
@@ -1,9 +1,9 @@
-import { OpenAILike } from "@oakai/aila/src/features/moderation/moderators/OpenAiModerator";
+import type { OpenAILike } from "@oakai/aila/src/features/moderation/moderators/OpenAiModerator";
 import { createOpenAIClient } from "@oakai/core/src/llm/openai";
 import { aiLogger } from "@oakai/logger";
 import fs from "fs/promises";
-import OpenAI from "openai";
-import { ChatCompletionCreateParamsNonStreaming } from "openai/resources";
+import type OpenAI from "openai";
+import type { ChatCompletionCreateParamsNonStreaming } from "openai/resources";
 
 const log = aiLogger("fixtures");
 
diff --git a/apps/nextjs/src/app/api/chat/fixtures/FixtureReplayOpenAiClient.ts b/apps/nextjs/src/app/api/chat/fixtures/FixtureReplayOpenAiClient.ts
index 895a9ea33..bd7248313 100644
--- a/apps/nextjs/src/app/api/chat/fixtures/FixtureReplayOpenAiClient.ts
+++ b/apps/nextjs/src/app/api/chat/fixtures/FixtureReplayOpenAiClient.ts
@@ -1,7 +1,7 @@
-import { OpenAILike } from "@oakai/aila/src/features/moderation/moderators/OpenAiModerator";
+import type { OpenAILike } from "@oakai/aila/src/features/moderation/moderators/OpenAiModerator";
 import { aiLogger } from "@oakai/logger";
 import fs from "fs/promises";
-import OpenAI from "openai";
+import type OpenAI from "openai";
 
 const log = aiLogger("fixtures");
 
diff --git a/apps/nextjs/src/app/api/chat/protocol.ts b/apps/nextjs/src/app/api/chat/protocol.ts
index 322d43d6a..fc4fb0cb5 100644
--- a/apps/nextjs/src/app/api/chat/protocol.ts
+++ b/apps/nextjs/src/app/api/chat/protocol.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   ActionDocument,
   ErrorDocument,
 } from "@oakai/aila/src/protocol/jsonPatchProtocol";
diff --git a/apps/nextjs/src/app/api/chat/route.test.ts b/apps/nextjs/src/app/api/chat/route.test.ts
index 7adfde59b..1d976909c 100644
--- a/apps/nextjs/src/app/api/chat/route.test.ts
+++ b/apps/nextjs/src/app/api/chat/route.test.ts
@@ -1,12 +1,13 @@
-import { Aila, AilaInitializationOptions } from "@oakai/aila";
+import { Aila } from "@oakai/aila/src/core/Aila";
 import { MockLLMService } from "@oakai/aila/src/core/llm/MockLLMService";
+import type { AilaInitializationOptions } from "@oakai/aila/src/core/types";
 import { MockCategoriser } from "@oakai/aila/src/features/categorisation/categorisers/MockCategoriser";
 import { mockTracer } from "@oakai/core/src/tracing/mockTracer";
 import { NextRequest } from "next/server";
 
 import { expectTracingSpan } from "../../../utils/testHelpers/tracing";
 import { handleChatPostRequest } from "./chatHandler";
-import { Config } from "./config";
+import type { Config } from "./config";
 
 const chatId = "test-chat-id";
 const userId = "test-user-id";
diff --git a/apps/nextjs/src/app/api/chat/route.ts b/apps/nextjs/src/app/api/chat/route.ts
index 365edd577..5e68ed27d 100644
--- a/apps/nextjs/src/app/api/chat/route.ts
+++ b/apps/nextjs/src/app/api/chat/route.ts
@@ -1,9 +1,10 @@
-import { NextRequest } from "next/server";
+import type { NextRequest } from "next/server";
 
 import { withSentry } from "@/lib/sentry/withSentry";
 
 import { handleChatPostRequest } from "./chatHandler";
-import { Config, defaultConfig } from "./config";
+import type { Config } from "./config";
+import { defaultConfig } from "./config";
 
 async function postHandler(req: NextRequest): Promise<Response> {
   const config: Config = defaultConfig;
@@ -11,7 +12,7 @@ async function postHandler(req: NextRequest): Promise<Response> {
 }
 
 async function getHandler(): Promise<Response> {
-  return new Response("Server is ready", { status: 200 });
+  return Promise.resolve(new Response("Server is ready", { status: 200 }));
 }
 
 export const POST = withSentry(postHandler);
diff --git a/apps/nextjs/src/app/api/chat/user.test.ts b/apps/nextjs/src/app/api/chat/user.test.ts
index 4c9c3cedf..9e693e036 100644
--- a/apps/nextjs/src/app/api/chat/user.test.ts
+++ b/apps/nextjs/src/app/api/chat/user.test.ts
@@ -1,10 +1,10 @@
-import { inngest } from "@oakai/core";
 import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBetaServerClient";
+import { inngest } from "@oakai/core/src/inngest";
 import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
 
 import { reportRateLimitError } from "./user";
 
-jest.mock("@oakai/core/src/client", () => ({
+jest.mock("@oakai/core/src/inngest", () => ({
   inngest: {
     createFunction: jest.fn(),
     send: jest.fn(),
@@ -62,7 +62,6 @@ describe("chat route user functions", () => {
       const chatId = "testChatId";
 
       await reportRateLimitError(error, userId, chatId);
-
       expect(inngest.send).toHaveBeenCalledTimes(1);
       expect(inngest.send).toHaveBeenCalledWith({
         name: "app/slack.notifyRateLimit",
diff --git a/apps/nextjs/src/app/api/chat/user.ts b/apps/nextjs/src/app/api/chat/user.ts
index dfa8bd629..3ebf504b5 100644
--- a/apps/nextjs/src/app/api/chat/user.ts
+++ b/apps/nextjs/src/app/api/chat/user.ts
@@ -1,8 +1,9 @@
 import { auth, clerkClient } from "@clerk/nextjs/server";
-import { AilaAuthenticationError } from "@oakai/aila";
-import { demoUsers, inngest } from "@oakai/core";
+import { AilaAuthenticationError } from "@oakai/aila/src/core/AilaError";
+import { demoUsers } from "@oakai/core";
 import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBetaServerClient";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
+import { inngest } from "@oakai/core/src/inngest";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
 import { withTelemetry } from "@oakai/core/src/tracing/serverTracing";
 import { rateLimits } from "@oakai/core/src/utils/rateLimiting/rateLimit";
 import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
diff --git a/apps/nextjs/src/app/api/chat/webActionsPlugin.test.ts b/apps/nextjs/src/app/api/chat/webActionsPlugin.test.ts
index 289b5a6a3..906b4d83a 100644
--- a/apps/nextjs/src/app/api/chat/webActionsPlugin.test.ts
+++ b/apps/nextjs/src/app/api/chat/webActionsPlugin.test.ts
@@ -1,14 +1,17 @@
-import { AilaThreatDetectionError } from "@oakai/aila";
-import { AilaPluginContext } from "@oakai/aila/src/core/plugins";
-import { inngest } from "@oakai/core";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
-import { PrismaClientWithAccelerate } from "@oakai/db";
-import { Moderation } from "@prisma/client";
+import type { AilaPluginContext } from "@oakai/aila/src/core/plugins";
+import { AilaThreatDetectionError } from "@oakai/aila/src/features/threatDetection/types";
+import { inngest } from "@oakai/core/src/inngest";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
+import type { Moderation } from "@prisma/client";
 
 import { createWebActionsPlugin } from "./webActionsPlugin";
 
-jest.mock("@oakai/core", () => ({
+jest.mock("@oakai/core/src/inngest", () => ({
+  __esModule: true,
+
   inngest: {
+    createFunction: jest.fn(),
     send: jest.fn(),
   },
 }));
diff --git a/apps/nextjs/src/app/api/chat/webActionsPlugin.ts b/apps/nextjs/src/app/api/chat/webActionsPlugin.ts
index 2d24a3aa2..46daa425b 100644
--- a/apps/nextjs/src/app/api/chat/webActionsPlugin.ts
+++ b/apps/nextjs/src/app/api/chat/webActionsPlugin.ts
@@ -1,12 +1,10 @@
-import { AilaThreatDetectionError } from "@oakai/aila";
-import { AilaPlugin } from "@oakai/aila/src/core/plugins";
+import type { AilaPlugin } from "@oakai/aila/src/core/plugins";
+import { AilaThreatDetectionError } from "@oakai/aila/src/features/threatDetection";
 import { handleHeliconeError } from "@oakai/aila/src/utils/moderation/moderationErrorHandling";
-import {
-  SafetyViolations as defaultSafetyViolations,
-  inngest,
-} from "@oakai/core";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import { SafetyViolations as defaultSafetyViolations } from "@oakai/core";
+import { inngest } from "@oakai/core/src/inngest";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 import { waitUntil } from "@vercel/functions";
 
@@ -35,11 +33,11 @@ export const createWebActionsPlugin: PluginCreator = (
         prisma,
         SafetyViolations,
       );
-      enqueue(heliconeErrorMessage);
+      await enqueue(heliconeErrorMessage);
     }
 
     if (error instanceof Error) {
-      enqueue({
+      await enqueue({
         type: "error",
         message: error.message,
         value: `Sorry, an error occurred: ${error.message}`,
@@ -82,7 +80,7 @@ export const createWebActionsPlugin: PluginCreator = (
     } catch (error) {
       if (error instanceof UserBannedError) {
         log.info("User is banned, queueing account lock message");
-        enqueue({
+        await enqueue({
           type: "action",
           action: "SHOW_ACCOUNT_LOCKED",
         });
diff --git a/apps/nextjs/src/app/api/qd-download/route.ts b/apps/nextjs/src/app/api/qd-download/route.ts
index bae256c49..49e30af9e 100644
--- a/apps/nextjs/src/app/api/qd-download/route.ts
+++ b/apps/nextjs/src/app/api/qd-download/route.ts
@@ -1,5 +1,6 @@
 import { auth } from "@clerk/nextjs/server";
-import { LessonExportType, prisma } from "@oakai/db";
+import type { LessonExportType } from "@oakai/db";
+import { prisma } from "@oakai/db/client";
 import { downloadDriveFile } from "@oakai/exports";
 import * as Sentry from "@sentry/node";
 
@@ -128,7 +129,7 @@ async function getHandler(req: Request) {
     });
   }
 
-  saveDownloadEvent({
+  await saveDownloadEvent({
     exportId: qdExport.id,
     downloadedBy: userId,
     ext,
diff --git a/apps/nextjs/src/app/api/sanitizeFilename.test.ts b/apps/nextjs/src/app/api/sanitizeFilename.test.ts
index ac8b3d888..e0af33511 100644
--- a/apps/nextjs/src/app/api/sanitizeFilename.test.ts
+++ b/apps/nextjs/src/app/api/sanitizeFilename.test.ts
@@ -3,9 +3,9 @@ import { sanitizeFilename } from "./sanitizeFilename";
 describe("sanitizeFilename", () => {
   test("should remove special characters", () => {
     const lessonTitle =
-      "The econonomy: Boom or Bust? You decide! Let's start, shall we?";
+      "The economy: Boom or Bust? You decide! Let's start, shall we?";
     expect(sanitizeFilename(lessonTitle)).toBe(
-      "The econonomy Boom or Bust You decide Lets start shall we",
+      "The economy Boom or Bust You decide Lets start shall we",
     );
   });
 });
diff --git a/apps/nextjs/src/app/api/trpc/chat/[trpc]/route.ts b/apps/nextjs/src/app/api/trpc/chat/[trpc]/route.ts
index d38a54bf4..27e3f609d 100644
--- a/apps/nextjs/src/app/api/trpc/chat/[trpc]/route.ts
+++ b/apps/nextjs/src/app/api/trpc/chat/[trpc]/route.ts
@@ -3,7 +3,7 @@ import { chatAppRouter } from "@oakai/api/src/router/chat";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
-import { NextRequest, NextResponse } from "next/server";
+import type { NextRequest, NextResponse } from "next/server";
 
 import { withSentry } from "@/lib/sentry/withSentry";
 
diff --git a/apps/nextjs/src/app/api/trpc/main/[trpc]/route.ts b/apps/nextjs/src/app/api/trpc/main/[trpc]/route.ts
index 41b409442..97cbf0c94 100644
--- a/apps/nextjs/src/app/api/trpc/main/[trpc]/route.ts
+++ b/apps/nextjs/src/app/api/trpc/main/[trpc]/route.ts
@@ -3,7 +3,7 @@ import { oakAppRouter } from "@oakai/api/src/router";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
-import { NextRequest, NextResponse } from "next/server";
+import type { NextRequest, NextResponse } from "next/server";
 
 import { withSentry } from "@/lib/sentry/withSentry";
 
diff --git a/apps/nextjs/src/app/api/trpc/test-support/[trpc]/route.ts b/apps/nextjs/src/app/api/trpc/test-support/[trpc]/route.ts
index 9d1b4bfa1..15d0ccf6a 100644
--- a/apps/nextjs/src/app/api/trpc/test-support/[trpc]/route.ts
+++ b/apps/nextjs/src/app/api/trpc/test-support/[trpc]/route.ts
@@ -4,7 +4,7 @@ import { router } from "@oakai/api/src/trpc";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
-import { NextRequest, NextResponse } from "next/server";
+import type { NextRequest, NextResponse } from "next/server";
 
 import { withSentry } from "@/lib/sentry/withSentry";
 
diff --git a/apps/nextjs/src/app/faqs/page.tsx b/apps/nextjs/src/app/faqs/page.tsx
index 43148a4c4..4a7701661 100644
--- a/apps/nextjs/src/app/faqs/page.tsx
+++ b/apps/nextjs/src/app/faqs/page.tsx
@@ -1,6 +1,6 @@
 import FAQPage from ".";
 
-const FAQ = async () => {
+const FAQ = () => {
   return <FAQPage />;
 };
 
diff --git a/apps/nextjs/src/app/generations/page.tsx b/apps/nextjs/src/app/generations/page.tsx
index 4d70f247d..718eb0df7 100644
--- a/apps/nextjs/src/app/generations/page.tsx
+++ b/apps/nextjs/src/app/generations/page.tsx
@@ -1,3 +1,3 @@
-export default async function GenerationsPage() {
+export default function GenerationsPage() {
   return null;
 }
diff --git a/apps/nextjs/src/app/home-page.tsx b/apps/nextjs/src/app/home-page.tsx
index e3c6cbbc6..1179832f0 100644
--- a/apps/nextjs/src/app/home-page.tsx
+++ b/apps/nextjs/src/app/home-page.tsx
@@ -2,18 +2,18 @@
 
 import { useUser } from "@clerk/nextjs";
 import MuxPlayer from "@mux/mux-player-react";
+import type { OakColorToken } from "@oaknational/oak-components";
 import {
   OakBox,
   OakFlex,
   OakHeading,
   OakLink,
   OakP,
-  OakColorToken,
   oakColorTokens,
   OakPrimaryButton,
 } from "@oaknational/oak-components";
-import { HomePageQueryResult } from "cms/types/aiHomePageType";
-import { Metadata } from "next";
+import type { HomePageQueryResult } from "cms/types/aiHomePageType";
+import type { Metadata } from "next";
 import Image from "next/image";
 import Link from "next/link";
 import styled from "styled-components";
diff --git a/apps/nextjs/src/app/layout.tsx b/apps/nextjs/src/app/layout.tsx
index 5c476fa6d..70fb045da 100644
--- a/apps/nextjs/src/app/layout.tsx
+++ b/apps/nextjs/src/app/layout.tsx
@@ -44,7 +44,7 @@ export const metadata = {
   metadataBase: new URL(vercel_url),
   title: {
     default: "Oak AI Experiments",
-    template: `%s - AI Lesson Planner`,
+    template: "%s - AI Lesson Planner",
   },
   description:
     "Oak AI experiments offers some experimental generative AI tools designed for and freely available to teachers. We are actively looking for your feedback to refine and optimise these tools, making them more effective and time-saving.",
diff --git a/apps/nextjs/src/app/legal/[slug]/legal.tsx b/apps/nextjs/src/app/legal/[slug]/legal.tsx
index baff0b6aa..34ee39173 100644
--- a/apps/nextjs/src/app/legal/[slug]/legal.tsx
+++ b/apps/nextjs/src/app/legal/[slug]/legal.tsx
@@ -2,7 +2,7 @@
 
 import { OakBox } from "@oaknational/oak-components";
 import { PortableText } from "@portabletext/react";
-import { PolicyDocument } from "cms/types/policyDocument";
+import type { PolicyDocument } from "cms/types/policyDocument";
 
 import Layout from "@/components/Layout";
 import { portableTextComponents } from "@/components/PortableText/portableTextComponents";
diff --git a/apps/nextjs/src/app/legal/account-locked/page.tsx b/apps/nextjs/src/app/legal/account-locked/page.tsx
index 5cb497153..d1f64fc61 100644
--- a/apps/nextjs/src/app/legal/account-locked/page.tsx
+++ b/apps/nextjs/src/app/legal/account-locked/page.tsx
@@ -1,5 +1,5 @@
 import AccountLocked from "./account-locked";
 
-export default async function SuspendedPage() {
+export default function SuspendedPage() {
   return <AccountLocked />;
 }
diff --git a/apps/nextjs/src/app/lesson-planner/page.tsx b/apps/nextjs/src/app/lesson-planner/page.tsx
index 089e4c78c..d6cadf0fe 100644
--- a/apps/nextjs/src/app/lesson-planner/page.tsx
+++ b/apps/nextjs/src/app/lesson-planner/page.tsx
@@ -1,5 +1,5 @@
 import LessonPlannerPage from ".";
 
-export default async function LessonPlanner() {
+export default function LessonPlanner() {
   return <LessonPlannerPage />;
 }
diff --git a/apps/nextjs/src/app/lesson-planner/preview/[slug]/page.tsx b/apps/nextjs/src/app/lesson-planner/preview/[slug]/page.tsx
index f626780f6..4de40351c 100644
--- a/apps/nextjs/src/app/lesson-planner/preview/[slug]/page.tsx
+++ b/apps/nextjs/src/app/lesson-planner/preview/[slug]/page.tsx
@@ -1,5 +1,5 @@
-import { Apps } from "@oakai/core";
-import { prisma } from "@oakai/db";
+import { Apps } from "@oakai/core/src/models/apps";
+import { prisma } from "@oakai/db/client";
 import { aiLogger } from "@oakai/logger";
 
 import { LessonPlanPreview } from "./preview";
diff --git a/apps/nextjs/src/app/lesson-planner/preview/page.tsx b/apps/nextjs/src/app/lesson-planner/preview/page.tsx
index 466483d34..24a1db312 100644
--- a/apps/nextjs/src/app/lesson-planner/preview/page.tsx
+++ b/apps/nextjs/src/app/lesson-planner/preview/page.tsx
@@ -1,5 +1,5 @@
 import PreviewRedirect from "./preview-redirect";
 
-export default async function PreviewRedirectPage() {
+export default function PreviewRedirectPage() {
   return <PreviewRedirect />;
 }
diff --git a/apps/nextjs/src/app/manifest.ts b/apps/nextjs/src/app/manifest.ts
index 90755d770..17d91bd8d 100644
--- a/apps/nextjs/src/app/manifest.ts
+++ b/apps/nextjs/src/app/manifest.ts
@@ -1,45 +1,46 @@
-import type { MetadataRoute } from 'next'
- 
+import type { MetadataRoute } from "next";
+
 export default function manifest(): MetadataRoute.Manifest {
   return {
     name: "Aila: Oak's AI Lesson Assistant",
-    short_name: 'Aila',
-    description: 'An AI lesson assistant chatbot for UK teachers to create lessons personalised for their classes, with the aim of reducing teacher workload.',
-    start_url: '/',
-    display: 'minimal-ui',
-    background_color: '#BEF2BD',
-    theme_color: '#BEF2BD',
+    short_name: "Aila",
+    description:
+      "An AI lesson assistant chatbot for UK teachers to create lessons personalised for their classes, with the aim of reducing teacher workload.",
+    start_url: "/",
+    display: "minimal-ui",
+    background_color: "#BEF2BD",
+    theme_color: "#BEF2BD",
     icons: [
       {
-        "src": "/favicon/android-chrome-192x192.png",
-        "sizes": "192x192",
-        "type": "image/png"
+        src: "/favicon/android-chrome-192x192.png",
+        sizes: "192x192",
+        type: "image/png",
       },
       {
-        "src": "/favicon/android-chrome-512x512.png",
-        "sizes": "512x512",
-        "type": "image/png"
+        src: "/favicon/android-chrome-512x512.png",
+        sizes: "512x512",
+        type: "image/png",
       },
       {
-        "src": "/favicon/apple-touch-icon.png",
-        "sizes": "180x180",
-        "type": "image/png"
+        src: "/favicon/apple-touch-icon.png",
+        sizes: "180x180",
+        type: "image/png",
       },
       {
-        "src": "/favicon/favicon-16x16.png",
-        "sizes": "16x16",
-        "type": "image/png"
+        src: "/favicon/favicon-16x16.png",
+        sizes: "16x16",
+        type: "image/png",
       },
       {
-        "src": "/favicon/favicon-32x32.png",
-        "sizes": "32x32",
-        "type": "image/png"
+        src: "/favicon/favicon-32x32.png",
+        sizes: "32x32",
+        type: "image/png",
       },
       {
-        "src": "/favicon/favicon.ico",
-        "sizes": "48x48 16x16 32x32",
-        "type": "image/x-icon"
-      }
-    ]
-  }
-}
\ No newline at end of file
+        src: "/favicon/favicon.ico",
+        sizes: "48x48 16x16 32x32",
+        type: "image/x-icon",
+      },
+    ],
+  };
+}
diff --git a/apps/nextjs/src/app/prompts/prompts.tsx b/apps/nextjs/src/app/prompts/prompts.tsx
index b20f03aa1..b66557ff4 100644
--- a/apps/nextjs/src/app/prompts/prompts.tsx
+++ b/apps/nextjs/src/app/prompts/prompts.tsx
@@ -2,7 +2,7 @@
 
 import React, { useEffect, useMemo } from "react";
 
-import { SerializedAppWithPrompt } from "@oakai/core/src/models/serializers";
+import type { SerializedAppWithPrompt } from "@oakai/core/src/models/serializers";
 import {
   OakBox,
   OakHeading,
diff --git a/apps/nextjs/src/app/quiz-designer/page.tsx b/apps/nextjs/src/app/quiz-designer/page.tsx
index 33f6d834e..42876ecdc 100644
--- a/apps/nextjs/src/app/quiz-designer/page.tsx
+++ b/apps/nextjs/src/app/quiz-designer/page.tsx
@@ -1,5 +1,5 @@
 import QuizDesignerPage from "./quiz-designer-page";
 
-export default async function QuizDesigner() {
+export default function QuizDesigner() {
   return <QuizDesignerPage />;
 }
diff --git a/apps/nextjs/src/app/quiz-designer/preview/page.tsx b/apps/nextjs/src/app/quiz-designer/preview/page.tsx
index 466483d34..24a1db312 100644
--- a/apps/nextjs/src/app/quiz-designer/preview/page.tsx
+++ b/apps/nextjs/src/app/quiz-designer/preview/page.tsx
@@ -1,5 +1,5 @@
 import PreviewRedirect from "./preview-redirect";
 
-export default async function PreviewRedirectPage() {
+export default function PreviewRedirectPage() {
   return <PreviewRedirect />;
 }
diff --git a/apps/nextjs/src/app/quiz-designer/quiz-designer-page.tsx b/apps/nextjs/src/app/quiz-designer/quiz-designer-page.tsx
index 466f8671d..06b02df09 100644
--- a/apps/nextjs/src/app/quiz-designer/quiz-designer-page.tsx
+++ b/apps/nextjs/src/app/quiz-designer/quiz-designer-page.tsx
@@ -5,7 +5,8 @@ import { memo, useCallback, useEffect, useReducer, useState } from "react";
 import { useUser } from "@clerk/nextjs";
 import { aiLogger } from "@oakai/logger";
 import { quizAppReducer } from "ai-apps/quiz-designer/state/reducer";
-import { QuizAppState, QuizAppStatus } from "ai-apps/quiz-designer/state/types";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
+import { QuizAppStatus } from "ai-apps/quiz-designer/state/types";
 import { useQuizSession } from "hooks/useQuizSession";
 import { useRouter } from "next/navigation";
 import { equals } from "remeda";
diff --git a/apps/nextjs/src/app/test-support/clerk/page.tsx b/apps/nextjs/src/app/test-support/clerk/page.tsx
index 6a01d80c2..d2d56463f 100644
--- a/apps/nextjs/src/app/test-support/clerk/page.tsx
+++ b/apps/nextjs/src/app/test-support/clerk/page.tsx
@@ -5,7 +5,7 @@ import { notFound } from "next/navigation";
  * This is a minimal page that gives it access to a clerk instance
  */
 
-export default async function TestSupportSignIn() {
+export default function TestSupportSignIn() {
   if (
     process.env.NODE_ENV !== "development" &&
     process.env.VERCEL_ENV !== "preview"
diff --git a/apps/nextjs/src/app/user/[[...index]]/page.tsx b/apps/nextjs/src/app/user/[[...index]]/page.tsx
index 804f85b9d..340bc036c 100644
--- a/apps/nextjs/src/app/user/[[...index]]/page.tsx
+++ b/apps/nextjs/src/app/user/[[...index]]/page.tsx
@@ -1,4 +1,4 @@
-import { UserProfile } from '@clerk/nextjs'
+import { UserProfile } from "@clerk/nextjs";
 
 export default function Page() {
   return (
diff --git a/apps/nextjs/src/cms/data/fetchAiHomepage.ts b/apps/nextjs/src/cms/data/fetchAiHomepage.ts
index 955419f7b..39622c269 100644
--- a/apps/nextjs/src/cms/data/fetchAiHomepage.ts
+++ b/apps/nextjs/src/cms/data/fetchAiHomepage.ts
@@ -1,6 +1,6 @@
 import { homePageQuery } from "cms/queries/homePageQuery";
 import { sanityClient } from "cms/sanityClient";
-import { HomePageQueryResult } from "cms/types/aiHomePageType";
+import type { HomePageQueryResult } from "cms/types/aiHomePageType";
 
 export async function fetchAiHomepage(): Promise<HomePageQueryResult | null> {
   const query = homePageQuery;
diff --git a/apps/nextjs/src/cms/data/fetchPolicyDocument.ts b/apps/nextjs/src/cms/data/fetchPolicyDocument.ts
index 4abe871e6..e2e6d23e4 100644
--- a/apps/nextjs/src/cms/data/fetchPolicyDocument.ts
+++ b/apps/nextjs/src/cms/data/fetchPolicyDocument.ts
@@ -1,5 +1,5 @@
 import { sanityClient } from "cms/sanityClient";
-import { PolicyDocument } from "cms/types/policyDocument";
+import type { PolicyDocument } from "cms/types/policyDocument";
 
 export async function fetchPolicyDocument({
   slug,
diff --git a/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.stories.tsx
index dcea3d3d2..84aa6955e 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.stories.tsx
@@ -1,4 +1,4 @@
-import { type PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import type { Meta, StoryObj } from "@storybook/react";
 
 import { ChatModerationDisplay } from "./ChatModerationDisplay";
diff --git a/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.tsx b/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.tsx
index 82f53e05f..fbf72ab34 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { type PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import { Flex } from "@radix-ui/themes";
 
 import ToxicModerationView from "../toxic-moderation-view";
diff --git a/apps/nextjs/src/components/AppComponents/Chat/Chat/hooks/useAilaStreamingStatus.ts b/apps/nextjs/src/components/AppComponents/Chat/Chat/hooks/useAilaStreamingStatus.ts
index 429271400..3ea9adca2 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/Chat/hooks/useAilaStreamingStatus.ts
+++ b/apps/nextjs/src/components/AppComponents/Chat/Chat/hooks/useAilaStreamingStatus.ts
@@ -1,7 +1,7 @@
 import { useMemo, useEffect } from "react";
 
 import { aiLogger } from "@oakai/logger";
-import { Message } from "ai";
+import type { Message } from "ai";
 
 const log = aiLogger("chat");
 
@@ -20,8 +20,8 @@ export const useAilaStreamingStatus = ({
   messages: Message[];
 }): AilaStreamingStatus => {
   const ailaStreamingStatus = useMemo<AilaStreamingStatus>(() => {
-    const moderationStart = `MODERATION_START`;
-    const chatStart = `CHAT_START`;
+    const moderationStart = "MODERATION_START";
+    const chatStart = "CHAT_START";
     if (messages.length === 0) return "Idle";
     const lastMessage = messages[messages.length - 1];
 
@@ -33,8 +33,8 @@ export const useAilaStreamingStatus = ({
       } else if (content.includes(moderationStart)) {
         return "Moderating";
       } else if (
-        content.includes(`"type":"prompt"`) ||
-        content.includes(`\\"type\\":\\"prompt\\"`)
+        content.includes('"type":"prompt"') ||
+        content.includes('\\"type\\":\\"prompt\\"')
       ) {
         return "StreamingChatResponse";
       } else if (content.includes(chatStart)) {
diff --git a/apps/nextjs/src/components/AppComponents/Chat/Chat/hooks/useProgressForDownloads.ts b/apps/nextjs/src/components/AppComponents/Chat/Chat/hooks/useProgressForDownloads.ts
index 3ae82ffe5..a3503b2c0 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/Chat/hooks/useProgressForDownloads.ts
+++ b/apps/nextjs/src/components/AppComponents/Chat/Chat/hooks/useProgressForDownloads.ts
@@ -1,8 +1,8 @@
 import { useMemo } from "react";
 
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { lessonPlanSectionsSchema } from "@oakai/exports/src/schema/input.schema";
-import { ZodIssue } from "zod";
+import type { ZodIssue } from "zod";
 
 /**
  * For a given list of Zod issues and lessonPlan fields, checks that none of
diff --git a/apps/nextjs/src/components/AppComponents/Chat/Chat/utils/index.ts b/apps/nextjs/src/components/AppComponents/Chat/Chat/utils/index.ts
index 1f4cac571..48df113c6 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/Chat/utils/index.ts
+++ b/apps/nextjs/src/components/AppComponents/Chat/Chat/utils/index.ts
@@ -1,12 +1,12 @@
-import { type LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { aiLogger } from "@oakai/logger";
-import { type Message } from "ai/react";
+import type { Message } from "ai/react";
 
 const log = aiLogger("chat");
 
 export function findMessageIdFromContent({ content }: { content: string }) {
   return content
-    .split(`␞`)
+    .split("␞")
     .map((s) => {
       try {
         return JSON.parse(s.trim());
@@ -21,12 +21,12 @@ export function findMessageIdFromContent({ content }: { content: string }) {
 export function findLatestServerSideState(workingMessages: Message[]) {
   log.info("Finding latest server-side state", { workingMessages });
   const lastMessage = workingMessages[workingMessages.length - 1];
-  if (!lastMessage?.content.includes(`"type":"state"`)) {
+  if (!lastMessage?.content.includes('"type":"state"')) {
     log.info("No server state found");
     return;
   }
   const state: LooseLessonPlan = lastMessage.content
-    .split(`␞`)
+    .split("␞")
     .map((s) => {
       try {
         return JSON.parse(s.trim());
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-left-hand-side.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-left-hand-side.tsx
index c7737763b..b36ff5a7f 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-left-hand-side.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-left-hand-side.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 
 import { Flex } from "@radix-ui/themes";
-import { Message } from "ai";
+import type { Message } from "ai";
 
-import { DemoContextProps } from "@/components/ContextProviders/Demo";
+import type { DemoContextProps } from "@/components/ContextProviders/Demo";
 
 import ChatLhsHeader from "./chat-lhs-header";
 import { ChatList } from "./chat-list";
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.tsx
index 632ba018f..81a8637c0 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 
-import { BasedOnOptional } from "@oakai/aila/src/protocol/schema";
+import type { BasedOnOptional } from "@oakai/aila/src/protocol/schema";
 import { Flex, Text } from "@radix-ui/themes";
 import { cva } from "class-variance-authority";
 
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanMapToMarkDown.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanMapToMarkDown.tsx
index ee8656e89..f9b405ee0 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanMapToMarkDown.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanMapToMarkDown.tsx
@@ -1,6 +1,6 @@
 import { useRef } from "react";
 
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { sectionToMarkdown } from "@oakai/aila/src/protocol/sectionToMarkdown";
 import { lessonSectionTitlesAndMiniDescriptions } from "data/lessonSectionTitlesAndMiniDescriptions";
 
@@ -64,7 +64,7 @@ export default LessonPlanMapToMarkDown;
 
 const ChatSection = ({ sectionRefs, objectKey, value }) => {
   const sectionRef = useRef(null);
-  if (!!sectionRefs) sectionRefs[objectKey] = sectionRef;
+  if (sectionRefs) sectionRefs[objectKey] = sectionRef;
 
   return (
     <div ref={sectionRef}>
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-lhs-header.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-lhs-header.tsx
index f8b69e2f7..f01676dec 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-lhs-header.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-lhs-header.tsx
@@ -20,16 +20,14 @@ const ChatLhsHeader = ({
 }: Readonly<ChatLhsHeaderProps>) => {
   const router = useRouter();
   const chat = useLessonChat();
-
   return (
     <>
       <div className="mt-6 hidden items-center justify-end gap-5 sm:flex">
-        {process.env.NEXT_PUBLIC_ENVIRONMENT !== "prd" && (
-          <div
-            className="flex-grow text-left text-xs"
-            data-testid="chat-aila-streaming-status"
-          >
-            {chat.ailaStreamingStatus}
+        {process.env.NEXT_PUBLIC_ENVIRONMENT !== "production" && (
+          <div className="flex flex-grow flex-row space-x-4 text-left text-xs">
+            <div data-testid="chat-aila-streaming-status">
+              {chat.ailaStreamingStatus}
+            </div>
           </div>
         )}
         <ChatButton
@@ -42,13 +40,13 @@ const ChatLhsHeader = ({
           New lesson
         </ChatButton>
       </div>
-      <div className={`${isDemoUser && `mt-16`} flex justify-end sm:hidden`}>
+      <div className={`${isDemoUser && "mt-16"} flex justify-end sm:hidden`}>
         <button
           onClick={() => setShowLessonMobile(!showLessonMobile)}
           className="flex items-center gap-5"
         >
           <AiIcon />{" "}
-          <span className={`text-base font-bold `}>View lesson &gt;</span>
+          <span className={"text-base font-bold "}>View lesson &gt;</span>
         </button>
       </div>
     </>
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx
index c6794c2ff..5a6aaff8b 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx
@@ -1,27 +1,21 @@
 "use client";
 
-import {
-  Dispatch,
-  SetStateAction,
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-} from "react";
+import type { Dispatch, SetStateAction } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 
-import { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import { OakBox, OakFlex, OakIcon, OakSpan } from "@oaknational/oak-components";
-import { Message } from "ai";
+import type { Message } from "ai";
 import Link from "next/link";
 
 import { ChatMessage } from "@/components/AppComponents/Chat/chat-message";
 import { useLessonChat } from "@/components/ContextProviders/ChatProvider";
-import { DemoContextProps } from "@/components/ContextProviders/Demo";
+import type { DemoContextProps } from "@/components/ContextProviders/Demo";
 
 import { useDialog } from "../DialogContext";
-import { AilaStreamingStatus } from "./Chat/hooks/useAilaStreamingStatus";
+import type { AilaStreamingStatus } from "./Chat/hooks/useAilaStreamingStatus";
 import { useProgressForDownloads } from "./Chat/hooks/useProgressForDownloads";
-import { DialogTypes } from "./Chat/types";
+import type { DialogTypes } from "./Chat/types";
 
 export interface ChatListProps {
   isDemoLocked: boolean;
@@ -38,7 +32,8 @@ function DemoLimitMessage({ id }: Readonly<{ id: string }>) {
         message={{
           id: "demo-limit",
           role: "assistant",
-          content: `{"type": "error", "message": "**Your lesson is complete**\\nYou can no longer edit this lesson. [Create new lesson.](/aila)"}`,
+          content:
+            '{"type": "error", "message": "**Your lesson is complete**\\nYou can no longer edit this lesson. [Create new lesson.](/aila)"}',
         }}
         persistedModerations={[]}
         separator={<span className="my-10 flex" />}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx
index dec946012..184bc6707 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx
@@ -1,8 +1,9 @@
 // Inspired by Chatbot-UI and modified to fit the needs of this project
 // @see https://github.com/mckaywrigley/chatbot-ui/blob/main/components/Chat/ChatMessage.tsx
-import { ReactNode, useState } from "react";
+import type { ReactNode } from "react";
+import { useState } from "react";
 
-import {
+import type {
   ActionDocument,
   BadDocument,
   CommentDocument,
@@ -14,20 +15,20 @@ import {
   StateDocument,
   TextDocument,
   UnknownDocument,
-  parseMessageParts,
 } from "@oakai/aila/src/protocol/jsonPatchProtocol";
+import { parseMessageParts } from "@oakai/aila/src/protocol/jsonPatchProtocol";
 import { isSafe } from "@oakai/core/src/utils/ailaModeration/helpers";
-import { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import { aiLogger } from "@oakai/logger";
-import { Message } from "ai";
+import type { Message } from "ai";
 
 import { MemoizedReactMarkdownWithStyles } from "@/components/AppComponents/Chat/markdown";
 import { useChatModeration } from "@/components/ContextProviders/ChatModerationContext";
 import { Icon } from "@/components/Icon";
 import { cn } from "@/lib/utils";
 
-import { ModerationModalHelpers } from "../../FeedbackForms/ModerationFeedbackModal";
-import { AilaStreamingStatus } from "../Chat/hooks/useAilaStreamingStatus";
+import type { ModerationModalHelpers } from "../../FeedbackForms/ModerationFeedbackModal";
+import type { AilaStreamingStatus } from "../Chat/hooks/useAilaStreamingStatus";
 import { isModeration } from "./protocol";
 
 const log = aiLogger("chat");
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-message/protocol.ts b/apps/nextjs/src/components/AppComponents/Chat/chat-message/protocol.ts
index dfcf5bfa0..5ed65611b 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-message/protocol.ts
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-message/protocol.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   ActionDocument,
   MessagePartDocument,
   ModerationDocument,
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-quick-buttons.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-quick-buttons.tsx
index 3b8a35b52..3226fc83d 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-quick-buttons.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-quick-buttons.tsx
@@ -8,7 +8,7 @@ import { useLessonPlanTracking } from "@/lib/analytics/lessonPlanTrackingContext
 import useAnalytics from "@/lib/analytics/useAnalytics";
 
 import { useDialog } from "../DialogContext";
-import { AilaStreamingStatus } from "./Chat/hooks/useAilaStreamingStatus";
+import type { AilaStreamingStatus } from "./Chat/hooks/useAilaStreamingStatus";
 import ChatButton from "./ui/chat-button";
 import { IconRefresh, IconStop } from "./ui/icons";
 
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-right-hand-side-lesson.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-right-hand-side-lesson.tsx
index bd0d63026..7f3b515e1 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-right-hand-side-lesson.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-right-hand-side-lesson.tsx
@@ -1,12 +1,12 @@
 import React, { useRef, useState } from "react";
 
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { OakIcon, OakSmallSecondaryButton } from "@oaknational/oak-components";
-import { Message } from "ai";
+import type { Message } from "ai";
 import Link from "next/link";
 
 import AiIcon from "../../AiIcon";
-import { DemoContextProps } from "../../ContextProviders/Demo";
+import type { DemoContextProps } from "../../ContextProviders/Demo";
 import { useDialog } from "../DialogContext";
 import LessonPlanDisplay from "./chat-lessonPlanDisplay";
 import ExportButtons from "./export-buttons";
@@ -61,7 +61,7 @@ const ChatRightHandSideLesson = ({
   const endOfDocRef = useRef<HTMLDivElement>(null);
   return (
     <div
-      className={`fixed bottom-0 ${showLessonMobile ? `right-0` : `right-[-100%] sm:right-0`} right-0 ${demo.isDemoUser ? `top-8 sm:top-0` : `top-0`} z-30 w-[95%] bg-white shadow-md duration-300 sm:relative sm:z-0  sm:w-[50%] sm:shadow-none lg:w-full`}
+      className={`fixed bottom-0 ${showLessonMobile ? "right-0" : "right-[-100%] sm:right-0"} right-0 ${demo.isDemoUser ? "top-8 sm:top-0" : "top-0"} z-30 w-[95%] bg-white shadow-md duration-300 sm:relative sm:z-0  sm:w-[50%] sm:shadow-none lg:w-full`}
       data-testid="chat-right-hand-side-lesson"
       ref={documentContainerRef}
       onScroll={handleScroll}
@@ -77,7 +77,7 @@ const ChatRightHandSideLesson = ({
           onClick={() => {
             closeMobileLessonPullOut();
           }}
-          className={`${demo.isDemoUser ? `mt-25` : ``} flex items-center justify-center gap-3 `}
+          className={`${demo.isDemoUser ? "mt-25" : ""} flex items-center justify-center gap-3 `}
         >
           <span className="scale-75">
             <OakIcon iconName="cross" />
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-share-dialog.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-share-dialog.tsx
index bd47903b4..f6ab67705 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-share-dialog.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-share-dialog.tsx
@@ -4,7 +4,7 @@ import * as React from "react";
 import { toast } from "react-hot-toast";
 
 import { aiLogger } from "@oakai/logger";
-import { type DialogProps } from "@radix-ui/react-dialog";
+import type { DialogProps } from "@radix-ui/react-dialog";
 
 import { Button } from "@/components/AppComponents/Chat/ui/button";
 import {
@@ -17,7 +17,7 @@ import {
 } from "@/components/AppComponents/Chat/ui/dialog";
 import { IconSpinner } from "@/components/AppComponents/Chat/ui/icons";
 import { useCopyToClipboard } from "@/lib/hooks/use-copy-to-clipboard";
-import { SideBarChatItem } from "@/lib/types";
+import type { SideBarChatItem } from "@/lib/types";
 import { trpc } from "@/utils/trpc";
 
 import { constructSharePath } from "./Chat/utils";
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-start.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-start.tsx
index 40ed7c88a..cbb91a319 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-start.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-start.tsx
@@ -17,14 +17,15 @@ import { trpc } from "@/utils/trpc";
 import { useDialog } from "../DialogContext";
 import ChatPanelDisclaimer from "./chat-panel-disclaimer";
 import { ChatStartForm } from "./chat-start-form";
-import EmptyScreenAccordion from "./empty-screen-accordian";
+import EmptyScreenAccordion from "./empty-screen-accordion";
 
 const log = aiLogger("chat");
 
 const exampleMessages = [
   {
     heading: "History • Key stage 3 • The end of Roman Britain ",
-    message: `Create a lesson plan about The End of Roman Britain for Key Stage 3 History`,
+    message:
+      "Create a lesson plan about The End of Roman Britain for Key Stage 3 History",
   },
 ];
 
diff --git a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/flag-button.tsx b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/flag-button.tsx
index 523bd0ffd..48a17ecd5 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/flag-button.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/flag-button.tsx
@@ -9,7 +9,8 @@ import { useLessonChat } from "@/components/ContextProviders/ChatProvider";
 import { trpc } from "@/utils/trpc";
 
 import ActionButton from "./action-button";
-import { DropDownFormWrapper, FeedbackOption } from "./drop-down-form-wrapper";
+import type { FeedbackOption } from "./drop-down-form-wrapper";
+import { DropDownFormWrapper } from "./drop-down-form-wrapper";
 import { SmallRadioButton } from "./small-radio-button";
 
 const flagOptions = [
diff --git a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/modify-button.tsx b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/modify-button.tsx
index 0b6b4890d..ee4a17e30 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/modify-button.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/modify-button.tsx
@@ -10,7 +10,8 @@ import { useLessonChat } from "@/components/ContextProviders/ChatProvider";
 import { trpc } from "@/utils/trpc";
 
 import ActionButton from "./action-button";
-import { DropDownFormWrapper, FeedbackOption } from "./drop-down-form-wrapper";
+import type { FeedbackOption } from "./drop-down-form-wrapper";
+import { DropDownFormWrapper } from "./drop-down-form-wrapper";
 import { SmallRadioButton } from "./small-radio-button";
 
 const log = aiLogger("chat");
diff --git a/apps/nextjs/src/components/AppComponents/Chat/empty-screen-accordian.tsx b/apps/nextjs/src/components/AppComponents/Chat/empty-screen-accordion.tsx
similarity index 98%
rename from apps/nextjs/src/components/AppComponents/Chat/empty-screen-accordian.tsx
rename to apps/nextjs/src/components/AppComponents/Chat/empty-screen-accordion.tsx
index 1aee07a50..4a4efa09f 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/empty-screen-accordian.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/empty-screen-accordion.tsx
@@ -157,11 +157,12 @@ const AccordionItem = React.forwardRef<HTMLDivElement, AccordionItemProps>(
 AccordionItem.displayName = "AccordionItem";
 
 const AccordionTrigger = React.forwardRef<
-  HTMLDivElement,
+  HTMLButtonElement,
   AccordionTriggerProps
->(({ children, ...props }) => (
+>(({ children, ...props }, forwardedRef) => (
   <Accordion.Trigger
     {...props}
+    ref={forwardedRef}
     className="flex w-full items-center justify-between "
   >
     <span className="flex w-full items-center gap-10 text-left text-base font-bold">
diff --git a/apps/nextjs/src/components/AppComponents/Chat/export-buttons/LessonPlanProgressDropdown.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/export-buttons/LessonPlanProgressDropdown.stories.tsx
index cbac20242..f32699fa2 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/export-buttons/LessonPlanProgressDropdown.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/export-buttons/LessonPlanProgressDropdown.stories.tsx
@@ -1,4 +1,4 @@
-import {
+import type {
   Cycle,
   Keyword,
   Misconception,
diff --git a/apps/nextjs/src/components/AppComponents/Chat/export-buttons/LessonPlanProgressDropdown.tsx b/apps/nextjs/src/components/AppComponents/Chat/export-buttons/LessonPlanProgressDropdown.tsx
index 72b1aa62a..98f414d2e 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/export-buttons/LessonPlanProgressDropdown.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/export-buttons/LessonPlanProgressDropdown.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import { Flex } from "@radix-ui/themes";
 
diff --git a/apps/nextjs/src/components/AppComponents/Chat/guidance-required.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/guidance-required.stories.tsx
index a85f96a87..8d7b547d3 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/guidance-required.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/guidance-required.stories.tsx
@@ -1,4 +1,4 @@
-import { type PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import type { Meta, StoryObj } from "@storybook/react";
 
 import { GuidanceRequired } from "./guidance-required";
diff --git a/apps/nextjs/src/components/AppComponents/Chat/guidance-required.tsx b/apps/nextjs/src/components/AppComponents/Chat/guidance-required.tsx
index 1ef467d58..14cecca3b 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/guidance-required.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/guidance-required.tsx
@@ -2,7 +2,7 @@ import {
   isSafe,
   moderationSlugToDescription,
 } from "@oakai/core/src/utils/ailaModeration/helpers";
-import { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 
 import { Icon } from "@/components/Icon";
 import { cn } from "@/lib/utils";
diff --git a/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx b/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
index bdc9dc5d6..1fe02df05 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
@@ -1,5 +1,7 @@
-import React, { FC, memo } from "react";
-import ReactMarkdown, { Options } from "react-markdown";
+import type { FC } from "react";
+import React, { memo } from "react";
+import type { Options } from "react-markdown";
+import ReactMarkdown from "react-markdown";
 
 import * as Tooltip from "@radix-ui/react-tooltip";
 import { Box, Flex } from "@radix-ui/themes";
diff --git a/apps/nextjs/src/components/AppComponents/Chat/prompt-form.tsx b/apps/nextjs/src/components/AppComponents/Chat/prompt-form.tsx
index 16b8de455..04e600d87 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/prompt-form.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/prompt-form.tsx
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useRef } from "react";
-import { UseChatHelpers } from "ai/react";
+
+import type { UseChatHelpers } from "ai/react";
 
 import {
   Tooltip,
@@ -11,7 +12,7 @@ import { useLessonPlanTracking } from "@/lib/analytics/lessonPlanTrackingContext
 import { useEnterSubmit } from "@/lib/hooks/use-enter-submit";
 import { useSidebar } from "@/lib/hooks/use-sidebar";
 
-import { AilaStreamingStatus } from "./Chat/hooks/useAilaStreamingStatus";
+import type { AilaStreamingStatus } from "./Chat/hooks/useAilaStreamingStatus";
 
 export interface PromptFormProps
   extends Pick<UseChatHelpers, "input" | "setInput"> {
diff --git a/apps/nextjs/src/components/AppComponents/Chat/sidebar-actions.tsx b/apps/nextjs/src/components/AppComponents/Chat/sidebar-actions.tsx
index af053e9a1..90d157eaa 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/sidebar-actions.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/sidebar-actions.tsx
@@ -27,7 +27,7 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from "@/components/AppComponents/Chat/ui/tooltip";
-import { SideBarChatItem } from "@/lib/types";
+import type { SideBarChatItem } from "@/lib/types";
 import { trpc } from "@/utils/trpc";
 
 type SidebarActionsProps = Readonly<{
diff --git a/apps/nextjs/src/components/AppComponents/Chat/sidebar-item.tsx b/apps/nextjs/src/components/AppComponents/Chat/sidebar-item.tsx
index 65926df69..71dec1e16 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/sidebar-item.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/sidebar-item.tsx
@@ -14,7 +14,7 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from "@/components/AppComponents/Chat/ui/tooltip";
-import { SideBarChatItem } from "@/lib/types";
+import type { SideBarChatItem } from "@/lib/types";
 import { cn } from "@/lib/utils";
 
 import { constructChatPath } from "./Chat/utils";
diff --git a/apps/nextjs/src/components/AppComponents/Chat/sidebar-items.tsx b/apps/nextjs/src/components/AppComponents/Chat/sidebar-items.tsx
index d396f6d6c..ff3503223 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/sidebar-items.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/sidebar-items.tsx
@@ -3,7 +3,7 @@
 import { AnimatePresence, motion } from "framer-motion";
 
 import { SidebarItem } from "@/components/AppComponents/Chat/sidebar-item";
-import { SideBarChatItem } from "@/lib/types";
+import type { SideBarChatItem } from "@/lib/types";
 
 interface SidebarItemsProps {
   chats: SideBarChatItem[];
diff --git a/apps/nextjs/src/components/AppComponents/Chat/sidebar-list.tsx b/apps/nextjs/src/components/AppComponents/Chat/sidebar-list.tsx
index 9f5faea5f..d68c6860a 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/sidebar-list.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/sidebar-list.tsx
@@ -4,7 +4,7 @@ import { ClearHistory } from "@/components/AppComponents/Chat/clear-history";
 import { SidebarItems } from "@/components/AppComponents/Chat/sidebar-items";
 import { trpc } from "@/utils/trpc";
 
-export async function SidebarList() {
+export function SidebarList() {
   const chatsRequest = trpc.chat.appSessions.getSidebarChats.useQuery();
 
   const chats = chatsRequest.data;
diff --git a/apps/nextjs/src/components/AppComponents/Chat/toxic-moderation-view.tsx b/apps/nextjs/src/components/AppComponents/Chat/toxic-moderation-view.tsx
index 2341659e9..853024644 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/toxic-moderation-view.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/toxic-moderation-view.tsx
@@ -1,6 +1,6 @@
 import Textarea from "react-textarea-autosize";
 
-import { type PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import { useModerationFeedbackSurvey } from "hooks/surveys/useModerationFeedbackSurvey";
 import { useRouter } from "next/navigation";
 
diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
index ccc1923a2..8f4e0aa35 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
@@ -1,57 +1,58 @@
-import * as React from 'react'
-import { Slot } from '@radix-ui/react-slot'
-import { cva, type VariantProps } from 'class-variance-authority'
+import * as React from "react";
 
-import { cn } from '@/lib/utils'
+import { Slot } from "@radix-ui/react-slot";
+import { cva, type VariantProps } from "class-variance-authority";
+
+import { cn } from "@/lib/utils";
 
 const buttonVariants = cva(
-  'inline-flex items-center justify-center rounded-md text-sm font-medium shadow ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
+  "inline-flex items-center justify-center rounded-md text-sm font-medium shadow ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
   {
     variants: {
       variant: {
         default:
-          'bg-primary text-primary-foreground shadow-md hover:bg-primary/90',
+          "bg-primary text-primary-foreground shadow-md hover:bg-primary/90",
         destructive:
-          'bg-destructive text-destructive-foreground hover:bg-destructive/90',
+          "bg-destructive text-destructive-foreground hover:bg-destructive/90",
         outline:
-          'border border-input hover:bg-accent hover:text-accent-foreground',
+          "border border-input hover:bg-accent hover:text-accent-foreground",
         secondary:
-          'bg-secondary text-secondary-foreground hover:bg-secondary/80',
-        ghost: 'shadow-none hover:bg-accent hover:text-accent-foreground',
-        link: 'text-primary underline-offset-4 shadow-none hover:underline'
+          "bg-secondary text-secondary-foreground hover:bg-secondary/80",
+        ghost: "shadow-none hover:bg-accent hover:text-accent-foreground",
+        link: "text-primary underline-offset-4 shadow-none hover:underline",
       },
       size: {
-        default: 'h-18 px-10 py-7',
-        sm: 'h-18 rounded-md px-9',
-        lg: 'h-22 rounded-md px-18',
-        icon: 'h-18 w-18 p-0'
-      }
+        default: "h-18 px-10 py-7",
+        sm: "h-18 rounded-md px-9",
+        lg: "h-22 rounded-md px-18",
+        icon: "h-18 w-18 p-0",
+      },
     },
     defaultVariants: {
-      variant: 'default',
-      size: 'default'
-    }
-  }
-)
+      variant: "default",
+      size: "default",
+    },
+  },
+);
 
 export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
-  asChild?: boolean
+  asChild?: boolean;
 }
 
 const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
   ({ className, variant, size, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? Slot : 'button'
+    const Comp = asChild ? Slot : "button";
     return (
       <Comp
         className={cn(buttonVariants({ variant, size, className }))}
         ref={ref}
         {...props}
       />
-    )
-  }
-)
-Button.displayName = 'Button'
+    );
+  },
+);
+Button.displayName = "Button";
 
-export { Button, buttonVariants }
+export { Button, buttonVariants };
diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/chat-button.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/chat-button.tsx
index 1c482e484..379b1d74a 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/chat-button.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/chat-button.tsx
@@ -1,6 +1,7 @@
 import { cva } from "class-variance-authority";
 
-import ButtonCore, { ButtonVariant } from "@/components/ButtonCore";
+import type { ButtonVariant } from "@/components/ButtonCore";
+import ButtonCore from "@/components/ButtonCore";
 import type { IconName } from "@/components/Icon";
 
 interface ButtonProps {
diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
index f9daf291d..1633f7d0c 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
@@ -1,6 +1,7 @@
 "use client";
 
-import { FC, memo } from "react";
+import type { FC } from "react";
+import { memo } from "react";
 import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
 import { coldarkDark } from "react-syntax-highlighter/dist/cjs/styles/prism";
 
diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/tooltip.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/tooltip.tsx
index 2ba086a4c..baa2503dc 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/tooltip.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/tooltip.tsx
@@ -1,15 +1,16 @@
-'use client'
+"use client";
 
-import * as React from 'react'
-import * as TooltipPrimitive from '@radix-ui/react-tooltip'
+import * as React from "react";
 
-import { cn } from '@/lib/utils'
+import * as TooltipPrimitive from "@radix-ui/react-tooltip";
 
-const TooltipProvider = TooltipPrimitive.Provider
+import { cn } from "@/lib/utils";
 
-const Tooltip = TooltipPrimitive.Root
+const TooltipProvider = TooltipPrimitive.Provider;
 
-const TooltipTrigger = TooltipPrimitive.Trigger
+const Tooltip = TooltipPrimitive.Root;
+
+const TooltipTrigger = TooltipPrimitive.Trigger;
 
 const TooltipContent = React.forwardRef<
   React.ElementRef<typeof TooltipPrimitive.Content>,
@@ -19,12 +20,12 @@ const TooltipContent = React.forwardRef<
     ref={ref}
     sideOffset={sideOffset}
     className={cn(
-      'z-50 overflow-hidden rounded-md border bg-popover px-9 py-5.5 text-xs font-medium text-popover-foreground shadow-md animate-in fade-in-50 data-[side=bottom]:slide-in-from-top-5 data-[side=left]:slide-in-from-right-5 data-[side=right]:slide-in-from-left-5 data-[side=top]:slide-in-from-bottom-5',
-      className
+      "py-5.5 z-50 overflow-hidden rounded-md border bg-popover px-9 text-xs font-medium text-popover-foreground shadow-md animate-in fade-in-50 data-[side=bottom]:slide-in-from-top-5 data-[side=left]:slide-in-from-right-5 data-[side=right]:slide-in-from-left-5 data-[side=top]:slide-in-from-bottom-5",
+      className,
     )}
     {...props}
   />
-))
-TooltipContent.displayName = TooltipPrimitive.Content.displayName
+));
+TooltipContent.displayName = TooltipPrimitive.Content.displayName;
 
-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }
+export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
diff --git a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/JudgementContent.tsx b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/JudgementContent.tsx
index 3fd2f2427..f2c750455 100644
--- a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/JudgementContent.tsx
+++ b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/JudgementContent.tsx
@@ -1,9 +1,10 @@
-import { Dispatch, SetStateAction, useMemo } from "react";
+import type { Dispatch, SetStateAction } from "react";
+import { useMemo } from "react";
 
 import { Box, Grid, Text } from "@radix-ui/themes";
 import { cva } from "class-variance-authority";
 
-import { Option } from "../../../ai-apps/comparative-judgement/state/types";
+import type { Option } from "../../../ai-apps/comparative-judgement/state/types";
 import JudgementHeading from "./JudgementHeading";
 import QuestionButton from "./QuestionButton";
 import ReasonForChoosing from "./ReasonForChoosing";
diff --git a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx
index 93224cdea..b5a039e53 100644
--- a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx
+++ b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx
@@ -1,10 +1,10 @@
 import { useEffect, useMemo } from "react";
 
-import {
+import type {
   KeyStageName,
   SubjectName,
-  subjectsAndKeyStages,
 } from "@oakai/core/src/data/subjectsAndKeyStages";
+import { subjectsAndKeyStages } from "@oakai/core/src/data/subjectsAndKeyStages";
 import { Flex } from "@radix-ui/themes";
 
 import Input from "@/components/Input";
@@ -80,7 +80,7 @@ const KeyStageAndSubjectPicker = ({
           type="dropdown"
           label="Subject"
           name="subject"
-          options={allowedSubjects as string[]}
+          options={allowedSubjects}
           onChange={(e) => setSelectedSubject(e.target.value as SubjectName)}
           value={selectedSubject}
         />
diff --git a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/PreviewContent.tsx b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/PreviewContent.tsx
index f0f961a18..c742826b3 100644
--- a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/PreviewContent.tsx
+++ b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/PreviewContent.tsx
@@ -1,8 +1,5 @@
 import { Box, Flex, Text } from "@radix-ui/themes";
-import {
-  AnswerAndDistractor,
-  OptionWithPrompt,
-} from "ai-apps/comparative-judgement/state/types";
+import type { OptionWithPrompt } from "ai-apps/comparative-judgement/state/types";
 
 import { sortAlphabetically } from "@/utils/alphabetiseArray";
 
@@ -16,8 +13,7 @@ type PreviewContentProps = {
 
 const PreviewContent = ({ option, question }: PreviewContentProps) => {
   if (!option?.answerAndDistractor) return null;
-  const answersAndDistractors =
-    option?.answerAndDistractor as AnswerAndDistractor;
+  const answersAndDistractors = option?.answerAndDistractor;
   const { answers, distractors } = answersAndDistractors;
 
   const answerAndDistractorArray = [...answers, ...distractors];
@@ -39,7 +35,7 @@ const PreviewContent = ({ option, question }: PreviewContentProps) => {
 
       <Box>
         <Text className="opacity-80">
-          {option.isOakQuestion ? "Created by a Human" : `Created by Oak AI`}
+          {option.isOakQuestion ? "Created by a Human" : "Created by Oak AI"}
         </Text>
         {!option.isOakQuestion && (
           <PromptTemplate
diff --git a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/QuestionButton.tsx b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/QuestionButton.tsx
index 9ea001607..aa08fba0b 100644
--- a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/QuestionButton.tsx
+++ b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/QuestionButton.tsx
@@ -1,4 +1,4 @@
-import { Dispatch } from "react";
+import type { Dispatch } from "react";
 
 import { Flex } from "@radix-ui/themes";
 import { cva } from "class-variance-authority";
@@ -6,7 +6,7 @@ import { cva } from "class-variance-authority";
 import Button from "@/components/Button";
 import { sortAlphabetically } from "@/utils/alphabetiseArray";
 
-import {
+import type {
   AnswerAndDistractor,
   Option,
 } from "../../../ai-apps/comparative-judgement/state/types";
diff --git a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/index.tsx b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/index.tsx
index 02d38a225..b84488502 100644
--- a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/index.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useState } from "react";
 
-import { KeyStageName, SubjectName } from "@oakai/core";
+import type { KeyStageName, SubjectName } from "@oakai/core";
 import { Flex } from "@radix-ui/themes";
 import useQuestionsForJudgement from "hooks/useQuestionsForJudgement";
 
@@ -64,7 +64,7 @@ const ComparativeJudgement = ({
         </Flex>
       )}
       {isLoading && (
-        <div className="min-w-18 flex min-h-[500px] w-full items-center justify-center">
+        <div className="flex min-h-[500px] w-full min-w-18 items-center justify-center">
           <Icon
             icon="reload"
             size="md"
diff --git a/apps/nextjs/src/components/AppComponents/DialogContext/index.tsx b/apps/nextjs/src/components/AppComponents/DialogContext/index.tsx
index dd3448c0e..d59b8ae55 100644
--- a/apps/nextjs/src/components/AppComponents/DialogContext/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/DialogContext/index.tsx
@@ -2,7 +2,7 @@
 
 import React, { createContext, useState, useContext, useMemo } from "react";
 
-import { DialogTypes } from "../Chat/Chat/types";
+import type { DialogTypes } from "../Chat/Chat/types";
 
 interface DialogContextType {
   dialogWindow: DialogTypes;
diff --git a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
index b218669ff..a4407a22c 100644
--- a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
+++ b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from "react";
 
 import { moderationSlugToDescription } from "@oakai/core/src/utils/ailaModeration/helpers";
-import { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import { Dialog } from "@radix-ui/themes";
 import { useModerationFeedbackSurvey } from "hooks/surveys/useModerationFeedbackSurvey";
 
diff --git a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackModal.tsx b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackModal.tsx
index 561676fbe..f0a79d180 100644
--- a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackModal.tsx
+++ b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackModal.tsx
@@ -3,10 +3,8 @@ import { useState } from "react";
 import * as Dialog from "@radix-ui/react-dialog";
 import * as Sentry from "@sentry/react";
 
-import {
-  ModerationFeedbackForm,
-  ModerationFeedbackFormProps,
-} from "@/components/AppComponents/FeedbackForms/ModerationFeedbackForm";
+import type { ModerationFeedbackFormProps } from "@/components/AppComponents/FeedbackForms/ModerationFeedbackForm";
+import { ModerationFeedbackForm } from "@/components/AppComponents/FeedbackForms/ModerationFeedbackForm";
 
 import { dialogOverlay } from "../../DialogControl/dialogStyles";
 
diff --git a/apps/nextjs/src/components/AppComponents/Layout/index.tsx b/apps/nextjs/src/components/AppComponents/Layout/index.tsx
index 68df650e3..805022741 100644
--- a/apps/nextjs/src/components/AppComponents/Layout/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/Layout/index.tsx
@@ -18,7 +18,7 @@ const Layout = ({
     <div className="flex min-h-screen flex-col ">
       <Header />
       <main
-        className={`flex h-full flex-1 flex-col bg-muted/50 bg-white ${isDemoUser && `pt-28 sm:pt-20`}`}
+        className={`flex h-full flex-1 flex-col bg-muted/50 bg-white ${isDemoUser && "pt-28 sm:pt-20"}`}
       >
         <DialogProvider>{children}</DialogProvider>
       </main>
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/DownloadGiftButton.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/DownloadGiftButton.tsx
index 9d078dc29..732da1b79 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/DownloadGiftButton.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/DownloadGiftButton.tsx
@@ -1,4 +1,4 @@
-import { ExportableQuizAppState } from "@oakai/exports/src/schema/input.schema";
+import type { ExportableQuizAppState } from "@oakai/exports/src/schema/input.schema";
 import { convertToGIFTFormat } from "ai-apps/quiz-designer/convertToGIFTFormat";
 
 import useAnalytics from "@/lib/analytics/useAnalytics";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/ErrorBox.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/ErrorBox.tsx
index 9014511f0..3b3c7869c 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/ErrorBox.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/ErrorBox.tsx
@@ -1,4 +1,5 @@
-import { Box, Responsive } from "@radix-ui/themes";
+import type { Responsive } from "@radix-ui/themes";
+import { Box } from "@radix-ui/themes";
 
 type ErrorBoxProps = {
   message: string | JSX.Element;
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/ExportMenu.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/ExportMenu.tsx
index 4e8c1fe7c..35a626543 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/ExportMenu.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/ExportMenu.tsx
@@ -3,7 +3,7 @@ import { useMemo } from "react";
 import { Box, Flex, Heading, Text } from "@radix-ui/themes";
 import { convertQuizToCSV } from "ai-apps/quiz-designer/convertToCSV";
 import { makeExportable } from "ai-apps/quiz-designer/export-helpers";
-import { QuizAppState } from "ai-apps/quiz-designer/state/types";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
 import useShareContent from "hooks/useShareContent";
 
 import Button from "@/components/Button";
@@ -13,7 +13,7 @@ import LoadingWheel from "@/components/LoadingWheel";
 import useAnalytics from "@/lib/analytics/useAnalytics";
 
 import ChatButton from "../Chat/ui/chat-button";
-import ShareButtonGroup from "../common/ShareButttonGroup";
+import ShareButtonGroup from "../common/ShareButtonGroup";
 import DownloadGiftButton from "./DownloadGiftButton";
 
 interface ExportMenuProps {
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/GenerateAllButton.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/GenerateAllButton.tsx
index 646f56d4a..a5cea6259 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/GenerateAllButton.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/GenerateAllButton.tsx
@@ -1,6 +1,6 @@
 import { Box, Flex } from "@radix-ui/themes";
 
-import { IconName } from "../../Icon";
+import type { IconName } from "../../Icon";
 import ChatButton from "../Chat/ui/chat-button";
 import Generating from "../common/Generating";
 import PromptExplainerButton from "../common/PromptExplainerButton";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx
index b18bb246b..22661d048 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx
@@ -1,12 +1,12 @@
-import { Dispatch, useCallback } from "react";
+import type { Dispatch } from "react";
+import { useCallback } from "react";
 
-import { KeyStageName, SubjectName } from "@oakai/core";
+import type { KeyStageName, SubjectName } from "@oakai/core";
 import { Box, Flex, Heading, Text } from "@radix-ui/themes";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import { QuizAppState, QuizAppStatus } from "ai-apps/quiz-designer/state/types";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
+import { QuizAppStatus } from "ai-apps/quiz-designer/state/types";
 import Image from "next/image";
 
 import jigsaw from "@/assets/svg/illustration/jigsaw.svg";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx
index 4c0fba348..23a5ef2bc 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx
@@ -1,8 +1,10 @@
-import { Dispatch, useRef } from "react";
+import type { Dispatch } from "react";
+import { useRef } from "react";
 
 import { Box, Container } from "@radix-ui/themes";
-import { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
-import { QuizAppState, QuizAppStatus } from "ai-apps/quiz-designer/state/types";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
+import { QuizAppStatus } from "ai-apps/quiz-designer/state/types";
 import useShareContent from "hooks/useShareContent";
 import useSuggestedQuestions from "hooks/useSuggestedQuestions";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx
index 56f090582..8b920cee7 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx
@@ -1,4 +1,5 @@
-import { Dispatch, useRef } from "react";
+import type { Dispatch } from "react";
+import { useRef } from "react";
 
 import { Box, Container } from "@radix-ui/themes";
 import useSuggestedQuestions from "hooks/useSuggestedQuestions";
@@ -10,11 +11,9 @@ import ControllerRow from "@/components/AppComponents/QuizDesigner/QuizQuestionR
 import RateLimitNotification from "@/components/AppComponents/common/RateLimitNotification";
 import Layout from "@/components/Layout";
 
-import { QuizAppAction } from "../../../ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppState,
-  QuizAppStatus,
-} from "../../../ai-apps/quiz-designer/state/types";
+import type { QuizAppAction } from "../../../ai-apps/quiz-designer/state/actions";
+import type { QuizAppState } from "../../../ai-apps/quiz-designer/state/types";
+import { QuizAppStatus } from "../../../ai-apps/quiz-designer/state/types";
 import SuggestedQuestions from "./SuggestedQuestions";
 
 type Props = {
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answer.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answer.tsx
index b1db590bd..0447dd562 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answer.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answer.tsx
@@ -1,13 +1,12 @@
 import { useCallback } from "react";
 
-import { GenerationPart, GenerationPartType } from "@oakai/core/src/types";
+import type { GenerationPart } from "@oakai/core/src/types";
+import { GenerationPartType } from "@oakai/core/src/types";
 import browserLogger from "@oakai/logger/browser";
 import { Flex } from "@radix-ui/themes";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import {
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type {
   QuizAppAnswer,
   QuizAppState,
   QuizAppStateQuestion,
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
index b70c96cff..cd739f83d 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
@@ -1,8 +1,9 @@
-import { Dispatch, useState } from "react";
+import type { Dispatch } from "react";
+import { useState } from "react";
 
 import { Box, Flex } from "@radix-ui/themes";
-import { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
-import {
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import type {
   QuizAppState,
   QuizAppStateQuestion,
 } from "ai-apps/quiz-designer/state/types";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/ControllerRow.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/ControllerRow.tsx
index 12adff9e6..49fa1d7f7 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/ControllerRow.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/ControllerRow.tsx
@@ -1,15 +1,14 @@
-import { Dispatch, useState } from "react";
+import type { Dispatch } from "react";
+import { useState } from "react";
 
 import { Flex, Heading } from "@radix-ui/themes";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
 
 import useAnalytics from "@/lib/analytics/useAnalytics";
 
 import ChatButton from "../../Chat/ui/chat-button";
-import ShareButtonGroup from "../../common/ShareButttonGroup";
+import ShareButtonGroup from "../../common/ShareButtonGroup";
 
 type ControllerProps = {
   hasQuestions: boolean;
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx
index 38d070217..9fc978685 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx
@@ -1,13 +1,13 @@
-import { Dispatch, useCallback, useState } from "react";
+import type { Dispatch } from "react";
+import { useCallback, useState } from "react";
 
-import { GenerationPart, GenerationPartType } from "@oakai/core/src/types";
+import type { GenerationPart } from "@oakai/core/src/types";
+import { GenerationPartType } from "@oakai/core/src/types";
 import browserLogger from "@oakai/logger/browser";
 import { Flex } from "@radix-ui/themes";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import {
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type {
   QuizAppDistractor,
   QuizAppState,
   QuizAppStateQuestion,
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractors.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractors.tsx
index dc75c74b4..7c7ec3774 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractors.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractors.tsx
@@ -1,8 +1,8 @@
-import { Dispatch } from "react";
+import type { Dispatch } from "react";
 
 import { Box, Flex } from "@radix-ui/themes";
-import { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
-import {
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import type {
   QuizAppState,
   QuizAppStateQuestion,
 } from "ai-apps/quiz-designer/state/types";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
index d5b6f2498..13b0272ef 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
@@ -1,17 +1,16 @@
-import { Dispatch, useCallback } from "react";
+import type { Dispatch } from "react";
+import { useCallback } from "react";
 
 import { Box, Flex } from "@radix-ui/themes";
 import { quizRequestGeneration } from "ai-apps/quiz-designer/quizRequestGeneration";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import {
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type {
   QuizAppState,
   QuizAppStateQuestion,
 } from "ai-apps/quiz-designer/state/types";
+import type { GenerationWithResponse } from "hooks/useGeneration";
 import {
-  GenerationWithResponse,
   UseGenerationStatus,
   isGenerationHookLoading,
 } from "hooks/useGeneration";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/RegenButtonGroup.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/RegenButtonGroup.tsx
index 89b05da04..420fede29 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/RegenButtonGroup.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/RegenButtonGroup.tsx
@@ -1,8 +1,6 @@
 import { Flex } from "@radix-ui/themes";
-import {
-  UseGenerationStatus,
-  isGenerationHookLoading,
-} from "hooks/useGeneration";
+import type { UseGenerationStatus } from "hooks/useGeneration";
+import { isGenerationHookLoading } from "hooks/useGeneration";
 
 import { trpc } from "@/utils/trpc";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/index.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/index.tsx
index 3f2912fda..fbe90ec90 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/index.tsx
@@ -1,11 +1,9 @@
-import { Dispatch } from "react";
+import type { Dispatch } from "react";
 
 import { Box, Flex, Heading, Text } from "@radix-ui/themes";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import {
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type {
   QuizAppState,
   QuizAppStateQuestion,
 } from "ai-apps/quiz-designer/state/types";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx
index cdbad249d..f61bfc39e 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx
@@ -1,11 +1,10 @@
-import { Dispatch, useCallback } from "react";
+import type { Dispatch } from "react";
+import { useCallback } from "react";
 
 import * as Sentry from "@sentry/nextjs";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import { QuizAppState } from "ai-apps/quiz-designer/state/types";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
 
 import { trpc } from "@/utils/trpc";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/Choose.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/Choose.tsx
index f317d172e..81d91e568 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/Choose.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/Choose.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 
-import {
+import type {
   KeyStageName,
   SubjectName,
 } from "@oakai/core/src/data/subjectsAndKeyStages";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/Confirmed.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/Confirmed.tsx
index ec2e0321d..690797399 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/Confirmed.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/Confirmed.tsx
@@ -1,4 +1,4 @@
-import { KeyStageName, SubjectName } from "@oakai/core";
+import type { KeyStageName, SubjectName } from "@oakai/core";
 import { Flex, Heading, Text } from "@radix-ui/themes";
 
 type ConfirmedProps = {
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/index.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/index.tsx
index 3e95c1b16..fd34ee4ec 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/SubjectKeyStageSection/index.tsx
@@ -1,4 +1,4 @@
-import {
+import type {
   KeyStageName,
   SubjectName,
 } from "@oakai/core/src/data/subjectsAndKeyStages";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
index 9fdd2f725..5c907490a 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
@@ -1,11 +1,10 @@
-import { Dispatch, useState } from "react";
+import type { Dispatch } from "react";
+import { useState } from "react";
 
 import { Flex, Text } from "@radix-ui/themes";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
 
 import { Icon } from "@/components/Icon";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestions.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestions.tsx
index 2145a3097..c1113bd8e 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestions.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestions.tsx
@@ -1,9 +1,9 @@
-import { Dispatch } from "react";
+import type { Dispatch } from "react";
 
 import { Box, Flex, Grid, Text } from "@radix-ui/themes";
-import { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
-import { UseGenerationError } from "hooks/useGeneration";
-import { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import type { UseGenerationError } from "hooks/useGeneration";
+import type { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
 
 import LoadingWheel from "@/components/LoadingWheel";
 
diff --git a/apps/nextjs/src/components/AppComponents/common/RateLimitNotification.tsx b/apps/nextjs/src/components/AppComponents/common/RateLimitNotification.tsx
index ea0b8d5e8..7e8e376cc 100644
--- a/apps/nextjs/src/components/AppComponents/common/RateLimitNotification.tsx
+++ b/apps/nextjs/src/components/AppComponents/common/RateLimitNotification.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 
 import { useUser } from "@clerk/nextjs";
-import { RateLimitInfo } from "@oakai/api/src/types";
+import type { RateLimitInfo } from "@oakai/api/src/types";
 import { Box, Flex, Text } from "@radix-ui/themes";
 import { cva } from "class-variance-authority";
 
diff --git a/apps/nextjs/src/components/AppComponents/common/ShareButttonGroup.tsx b/apps/nextjs/src/components/AppComponents/common/ShareButtonGroup.tsx
similarity index 100%
rename from apps/nextjs/src/components/AppComponents/common/ShareButttonGroup.tsx
rename to apps/nextjs/src/components/AppComponents/common/ShareButtonGroup.tsx
diff --git a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationFeedbackDialog.tsx b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationFeedbackDialog.tsx
index 58d886f53..444eb2d5b 100644
--- a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationFeedbackDialog.tsx
+++ b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationFeedbackDialog.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 
 import { useUser } from "@clerk/nextjs";
-import { GenerationPart } from "@oakai/core/src/types";
+import type { GenerationPart } from "@oakai/core/src/types";
 import { structuredLogger as logger } from "@oakai/logger";
 import * as Dialog from "@radix-ui/react-dialog";
 
diff --git a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx
index 9f7902b31..23e2b08be 100644
--- a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx
+++ b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 
-import {
+import type {
   GenerationPart,
   GenerationPartPlaceholder,
 } from "@oakai/core/src/types";
@@ -59,7 +59,7 @@ function GenerationInputAndText({
         className={
           userIsEditing
             ? "hidden"
-            : `flex text-lg ${isLoading && `line-through opacity-60	`}`
+            : `flex text-lg ${isLoading && "line-through opacity-60	"}`
         }
       >
         {children}
diff --git a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationWrapper.tsx b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationWrapper.tsx
index 7ba0fe6cc..d837683f7 100644
--- a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationWrapper.tsx
+++ b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationWrapper.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useState } from "react";
 
-import { GenerationPart } from "@oakai/core/src/types";
+import type { GenerationPart } from "@oakai/core/src/types";
 import { Box } from "@radix-ui/themes";
 
 import GenerationFeedbackDialog, {
diff --git a/apps/nextjs/src/components/AppComponents/common/SuggestedLessons.tsx b/apps/nextjs/src/components/AppComponents/common/SuggestedLessons.tsx
index c91f50e15..5fba0caaf 100644
--- a/apps/nextjs/src/components/AppComponents/common/SuggestedLessons.tsx
+++ b/apps/nextjs/src/components/AppComponents/common/SuggestedLessons.tsx
@@ -1,6 +1,6 @@
 import { Flex, Grid, Heading } from "@radix-ui/themes";
-import { LessonPlannerAppState } from "ai-apps/lesson-planner/state/types";
-import { QuizAppState } from "ai-apps/quiz-designer/state/types";
+import type { LessonPlannerAppState } from "ai-apps/lesson-planner/state/types";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
 import Link from "next/link";
 
 import { Icon } from "@/components/Icon";
diff --git a/apps/nextjs/src/components/AppComponents/download/DownloadAllButton.tsx b/apps/nextjs/src/components/AppComponents/download/DownloadAllButton.tsx
index 50aa10624..4e75ffbe2 100644
--- a/apps/nextjs/src/components/AppComponents/download/DownloadAllButton.tsx
+++ b/apps/nextjs/src/components/AppComponents/download/DownloadAllButton.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { aiLogger } from "@oakai/logger";
 import { Box } from "@radix-ui/themes";
 import * as Sentry from "@sentry/nextjs";
@@ -21,7 +21,7 @@ import SlidesIcon from "../../SVGParts/SlidesIcon";
 
 const log = aiLogger("chat");
 
-const allexportLinksObject = z.object({
+const allExportLinksObject = z.object({
   lessonSlides: z.string(),
   lessonPlan: z.string(),
   worksheet: z.string(),
@@ -114,7 +114,7 @@ export const DownloadAllButton = ({
       try {
         const lessonTitle = lesson.title;
         if (!lessonTitle) return;
-        const parsedData = allexportLinksObject.parse(data);
+        const parsedData = allExportLinksObject.parse(data);
         mutateAsync({
           lessonTitle,
           slidesLink: parsedData.lessonSlides,
@@ -188,8 +188,8 @@ export const DownloadAllButton = ({
           <div className="flex flex-col gap-6">
             <span className="text-left font-bold">
               Email me
-              {isSuccess && `- email sent`}{" "}
-              {isError && `- There was an error sending the email!`}
+              {isSuccess && "- email sent"}{" "}
+              {isError && "- There was an error sending the email!"}
             </span>
             <span className="text-left opacity-80">
               Google account needed for this option
@@ -202,7 +202,7 @@ export const DownloadAllButton = ({
   return (
     <>
       <button
-        className={`flex items-center justify-between gap-9 rounded-md border-2 border-black px-14 py-10 ${downloadAvailable ? `border-opacity-100` : ` border-opacity-40`}`}
+        className={`flex items-center justify-between gap-9 rounded-md border-2 border-black px-14 py-10 ${downloadAvailable ? "border-opacity-100" : " border-opacity-40"}`}
         onClick={() => onClick()}
         disabled={!downloadAvailable}
         data-testid={dataTestId}
diff --git a/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx b/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
index c84385113..cfe0a4d87 100644
--- a/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
+++ b/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
@@ -1,4 +1,4 @@
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { Box } from "@radix-ui/themes";
 import Link from "next/link";
 
@@ -6,10 +6,8 @@ import useAnalytics from "@/lib/analytics/useAnalytics";
 import { trackDownload } from "@/utils/trackDownload";
 import { trpc } from "@/utils/trpc";
 
-import {
-  ExportsType,
-  getExportsConfig,
-} from "../../ExportsDialogs/exports.helpers";
+import type { ExportsType } from "../../ExportsDialogs/exports.helpers";
+import { getExportsConfig } from "../../ExportsDialogs/exports.helpers";
 import { Icon } from "../../Icon";
 import LoadingWheel from "../../LoadingWheel";
 import LessonIcon from "../../SVGParts/LessonIcon";
diff --git a/apps/nextjs/src/components/AppComponents/download/SectionsNotCompleteDownloadNotice.tsx b/apps/nextjs/src/components/AppComponents/download/SectionsNotCompleteDownloadNotice.tsx
index 5ef0328aa..a0932aa1c 100644
--- a/apps/nextjs/src/components/AppComponents/download/SectionsNotCompleteDownloadNotice.tsx
+++ b/apps/nextjs/src/components/AppComponents/download/SectionsNotCompleteDownloadNotice.tsx
@@ -12,7 +12,7 @@ import {
 
 import AiIcon from "@/components/SVGParts/AiIcon";
 
-import { ProgressSections } from "../Chat/Chat/hooks/useProgressForDownloads";
+import type { ProgressSections } from "../Chat/Chat/hooks/useProgressForDownloads";
 
 const SectionsNotCompleteDownloadNotice = ({
   sections,
diff --git a/apps/nextjs/src/components/Border/BoxBorder/BoxBorderBottom.tsx b/apps/nextjs/src/components/Border/BoxBorder/BoxBorderBottom.tsx
index 02772ba40..49a34c953 100644
--- a/apps/nextjs/src/components/Border/BoxBorder/BoxBorderBottom.tsx
+++ b/apps/nextjs/src/components/Border/BoxBorder/BoxBorderBottom.tsx
@@ -1,4 +1,4 @@
-import { BorderProps } from "../";
+import type { BorderProps } from "../";
 
 function BoxBorderBottom({ className = "" }: Readonly<BorderProps>) {
   return (
diff --git a/apps/nextjs/src/components/Border/BoxBorder/BoxBorderLeft.tsx b/apps/nextjs/src/components/Border/BoxBorder/BoxBorderLeft.tsx
index 2349219b2..b8ff0c702 100644
--- a/apps/nextjs/src/components/Border/BoxBorder/BoxBorderLeft.tsx
+++ b/apps/nextjs/src/components/Border/BoxBorder/BoxBorderLeft.tsx
@@ -1,4 +1,4 @@
-import { BorderProps } from "../";
+import type { BorderProps } from "../";
 
 function BoxBorderLeft({ className = "" }: Readonly<BorderProps>) {
   return (
diff --git a/apps/nextjs/src/components/Border/BoxBorder/BoxBorderRight.tsx b/apps/nextjs/src/components/Border/BoxBorder/BoxBorderRight.tsx
index 97a412d6c..34a08db5b 100644
--- a/apps/nextjs/src/components/Border/BoxBorder/BoxBorderRight.tsx
+++ b/apps/nextjs/src/components/Border/BoxBorder/BoxBorderRight.tsx
@@ -1,4 +1,4 @@
-import { BorderProps } from "../";
+import type { BorderProps } from "../";
 
 function BoxBorderRight({ className = "" }: Readonly<BorderProps>) {
   return (
diff --git a/apps/nextjs/src/components/Border/BoxBorder/BoxBorderTop.tsx b/apps/nextjs/src/components/Border/BoxBorder/BoxBorderTop.tsx
index 9cc4cf690..ec7a6f9aa 100644
--- a/apps/nextjs/src/components/Border/BoxBorder/BoxBorderTop.tsx
+++ b/apps/nextjs/src/components/Border/BoxBorder/BoxBorderTop.tsx
@@ -1,4 +1,4 @@
-import { BorderProps } from "../";
+import type { BorderProps } from "../";
 
 function BoxBorderTop({ className = "" }: Readonly<BorderProps>) {
   return (
diff --git a/apps/nextjs/src/components/Button.tsx b/apps/nextjs/src/components/Button.tsx
index 8af6b7efd..58dd9ecee 100644
--- a/apps/nextjs/src/components/Button.tsx
+++ b/apps/nextjs/src/components/Button.tsx
@@ -2,7 +2,8 @@ import { cva } from "class-variance-authority";
 
 import type { IconName } from "@/components/Icon";
 
-import ButtonCore, { ButtonVariant } from "./ButtonCore";
+import type { ButtonVariant } from "./ButtonCore";
+import ButtonCore from "./ButtonCore";
 
 interface ButtonProps {
   children?: React.ReactNode;
diff --git a/apps/nextjs/src/components/ButtonCore.tsx b/apps/nextjs/src/components/ButtonCore.tsx
index 9abedb3b1..d9e5d1601 100644
--- a/apps/nextjs/src/components/ButtonCore.tsx
+++ b/apps/nextjs/src/components/ButtonCore.tsx
@@ -5,7 +5,8 @@ import Link from "next/link";
 
 import splodge from "@/assets/svg/splodge.svg";
 
-import { Icon, IconName } from "./Icon";
+import type { IconName } from "./Icon";
+import { Icon } from "./Icon";
 
 type ContainerClassNameFn = (options: {
   disabled?: boolean;
diff --git a/apps/nextjs/src/components/CheckBox.tsx b/apps/nextjs/src/components/CheckBox.tsx
index 8baa6c367..8473dd3db 100644
--- a/apps/nextjs/src/components/CheckBox.tsx
+++ b/apps/nextjs/src/components/CheckBox.tsx
@@ -1,4 +1,4 @@
-import { PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
 
 import * as Checkbox from "@radix-ui/react-checkbox";
 import { CheckIcon } from "@radix-ui/react-icons";
diff --git a/apps/nextjs/src/components/ContextProviders/ChatModerationContext.tsx b/apps/nextjs/src/components/ContextProviders/ChatModerationContext.tsx
index 488b7f927..2e90dfe4a 100644
--- a/apps/nextjs/src/components/ContextProviders/ChatModerationContext.tsx
+++ b/apps/nextjs/src/components/ContextProviders/ChatModerationContext.tsx
@@ -1,4 +1,5 @@
-import { useMemo, createContext, useContext, ReactNode } from "react";
+import type { ReactNode } from "react";
+import { useMemo, createContext, useContext } from "react";
 
 import { useModerationModal } from "../AppComponents/FeedbackForms/ModerationFeedbackModal";
 
diff --git a/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx b/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
index 60458bc66..de9fac36b 100644
--- a/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
@@ -11,17 +11,18 @@ import { toast } from "react-hot-toast";
 
 import { generateMessageId } from "@oakai/aila/src/helpers/chat/generateMessageId";
 import { parseMessageParts } from "@oakai/aila/src/protocol/jsonPatchProtocol";
-import {
+import type {
   AilaPersistedChat,
   LooseLessonPlan,
 } from "@oakai/aila/src/protocol/schema";
 import { isToxic } from "@oakai/core/src/utils/ailaModeration/helpers";
-import { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
-import { Moderation } from "@oakai/db";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { Moderation } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
-import { Message, nanoid } from "ai";
-import { ChatRequestOptions, CreateMessage } from "ai";
+import type { Message } from "ai";
+import { nanoid } from "ai";
+import type { ChatRequestOptions, CreateMessage } from "ai";
 import { useChat } from "ai/react";
 import { useTemporaryLessonPlanWithStreamingEdits } from "hooks/useTemporaryLessonPlanWithStreamingEdits";
 import { redirect, usePathname, useRouter } from "next/navigation";
@@ -30,10 +31,8 @@ import { useLessonPlanTracking } from "@/lib/analytics/lessonPlanTrackingContext
 import useAnalytics from "@/lib/analytics/useAnalytics";
 import { trpc } from "@/utils/trpc";
 
-import {
-  AilaStreamingStatus,
-  useAilaStreamingStatus,
-} from "../AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
+import type { AilaStreamingStatus } from "../AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
+import { useAilaStreamingStatus } from "../AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
 import { findMessageIdFromContent } from "../AppComponents/Chat/Chat/utils";
 import {
   isAccountLocked,
diff --git a/apps/nextjs/src/components/ContextProviders/CookieConsentProvider.tsx b/apps/nextjs/src/components/ContextProviders/CookieConsentProvider.tsx
index ed448debc..e4c4f5234 100644
--- a/apps/nextjs/src/components/ContextProviders/CookieConsentProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/CookieConsentProvider.tsx
@@ -1,6 +1,7 @@
 "use client";
 
-import { PropsWithChildren, useEffect } from "react";
+import type { PropsWithChildren } from "react";
+import { useEffect } from "react";
 
 import {
   OakCookieConsentProvider,
diff --git a/apps/nextjs/src/components/ContextProviders/FontProvider.tsx b/apps/nextjs/src/components/ContextProviders/FontProvider.tsx
index 32d861d9a..e8008ba58 100644
--- a/apps/nextjs/src/components/ContextProviders/FontProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/FontProvider.tsx
@@ -1,12 +1,7 @@
 "use client";
 
-import React, {
-  Dispatch,
-  createContext,
-  useContext,
-  useMemo,
-  useState,
-} from "react";
+import type { Dispatch } from "react";
+import React, { createContext, useContext, useMemo, useState } from "react";
 
 interface FontContextProps {
   fontClass: string;
diff --git a/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx b/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx
index 9f45fa4ec..4ff4f790d 100644
--- a/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx
@@ -1,6 +1,7 @@
 "use client";
 
-import { PropsWithChildren, useEffect } from "react";
+import type { PropsWithChildren } from "react";
+import { useEffect } from "react";
 
 import { useAuth, useUser } from "@clerk/nextjs";
 import { useOakConsent } from "@oaknational/oak-consent-client";
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
index 586d65226..9e9106560 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
 
 import { aiLogger } from "@oakai/logger";
 import { Flex } from "@radix-ui/themes";
-import { Message } from "ai";
+import type { Message } from "ai";
 import { usePosthogFeedbackSurvey } from "hooks/surveys/usePosthogFeedbackSurvey";
 
 import ChatButton from "@/components/AppComponents/Chat/ui/chat-button";
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/ShareChatDialog.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/ShareChatDialog.tsx
index e38f080a7..bf12bd9c0 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/ShareChatDialog.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/ShareChatDialog.tsx
@@ -1,10 +1,10 @@
 import { useCallback } from "react";
 
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { Flex } from "@radix-ui/themes";
 import * as Sentry from "@sentry/react";
 
-import { DialogTypes } from "@/components/AppComponents/Chat/Chat/types";
+import type { DialogTypes } from "@/components/AppComponents/Chat/Chat/types";
 import ChatButton from "@/components/AppComponents/Chat/ui/chat-button";
 import LoadingWheel from "@/components/LoadingWheel";
 import { getLessonTrackingProps } from "@/lib/analytics/helpers";
diff --git a/apps/nextjs/src/components/DialogControl/DialogContents.tsx b/apps/nextjs/src/components/DialogControl/DialogContents.tsx
index 8f148b249..c26db0b2d 100644
--- a/apps/nextjs/src/components/DialogControl/DialogContents.tsx
+++ b/apps/nextjs/src/components/DialogControl/DialogContents.tsx
@@ -1,7 +1,7 @@
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import * as Dialog from "@radix-ui/react-dialog";
 import { Box, Flex } from "@radix-ui/themes";
-import { Message } from "ai";
+import type { Message } from "ai";
 
 import { useDialog } from "../AppComponents/DialogContext";
 import { Icon } from "../Icon";
diff --git a/apps/nextjs/src/components/ExportsDialogs/exports.helpers.ts b/apps/nextjs/src/components/ExportsDialogs/exports.helpers.ts
index feab9db88..3c5c42159 100644
--- a/apps/nextjs/src/components/ExportsDialogs/exports.helpers.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/exports.helpers.ts
@@ -1,4 +1,4 @@
-import { ResourceTypeValueType } from "@/lib/avo/Avo";
+import type { ResourceTypeValueType } from "@/lib/avo/Avo";
 
 export type ExportsType =
   | "lessonSlides"
diff --git a/apps/nextjs/src/components/ExportsDialogs/exports.types.ts b/apps/nextjs/src/components/ExportsDialogs/exports.types.ts
index a0ed0b0d8..b3ba95042 100644
--- a/apps/nextjs/src/components/ExportsDialogs/exports.types.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/exports.types.ts
@@ -1,4 +1,4 @@
-import { LessonDeepPartial } from "@oakai/exports";
+import type { LessonDeepPartial } from "@oakai/exports";
 
 export type ExportsHookProps<T = unknown> = T & {
   onStart: () => void;
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportAdditionalMaterials.ts b/apps/nextjs/src/components/ExportsDialogs/useExportAdditionalMaterials.ts
index 6affbc9d9..37aed51c6 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportAdditionalMaterials.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportAdditionalMaterials.ts
@@ -1,14 +1,14 @@
 import { useEffect, useMemo, useState, useCallback } from "react";
 
 import { exportSlidesFullLessonSchema } from "@oakai/exports/browser";
-import { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
-import { ExportsHookProps } from "./exports.types";
+import type { ExportsHookProps } from "./exports.types";
 import { useExportsExistenceCheck } from "./useExportsExistenceCheck";
 
 export function useExportAdditionalMaterials({
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts b/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts
index e52c96c2f..7005f37b1 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts
@@ -1,14 +1,12 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
-import {
-  LessonDeepPartial,
-  exportSlidesFullLessonSchema,
-} from "@oakai/exports/browser";
-import { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonDeepPartial } from "@oakai/exports/browser";
+import { exportSlidesFullLessonSchema } from "@oakai/exports/browser";
+import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts b/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts
index 8d3e49a2d..d8ae4ad9c 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts
@@ -1,14 +1,14 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { exportDocLessonPlanSchema } from "@oakai/exports/browser";
-import { LessonPlanDocInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonPlanDocInputData } from "@oakai/exports/src/schema/input.schema";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
-import { ExportsHookProps } from "./exports.types";
+import type { ExportsHookProps } from "./exports.types";
 import { useExportsExistenceCheck } from "./useExportsExistenceCheck";
 
 export function useExportLessonPlanDoc({
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts b/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts
index f75b10ae8..e43e1d588 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts
@@ -1,14 +1,14 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { exportSlidesFullLessonSchema } from "@oakai/exports/browser";
-import { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
-import { ExportsHookProps } from "./exports.types";
+import type { ExportsHookProps } from "./exports.types";
 import { useExportsExistenceCheck } from "./useExportsExistenceCheck";
 
 export function useExportLessonSlides({
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts
index 2d9783519..c78b0eae4 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts
@@ -1,13 +1,11 @@
 import { useEffect, useState } from "react";
 
-import {
-  ExportableQuizAppState,
-  exportableQuizAppStateSchema,
-} from "@oakai/exports/src/schema/input.schema";
+import type { ExportableQuizAppState } from "@oakai/exports/src/schema/input.schema";
+import { exportableQuizAppStateSchema } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
index c867e4131..28d2e103b 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
@@ -1,14 +1,14 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { exportDocQuizSchema } from "@oakai/exports/browser";
-import { QuizDocInputData } from "@oakai/exports/src/schema/input.schema";
+import type { QuizDocInputData } from "@oakai/exports/src/schema/input.schema";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
-import { ExportsHookProps } from "./exports.types";
+import type { ExportsHookProps } from "./exports.types";
 import { useExportsExistenceCheck } from "./useExportsExistenceCheck";
 
 export function useExportQuizDoc({
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts b/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts
index ce83a7d45..1a1ce8056 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts
@@ -1,14 +1,14 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { exportSlidesWorksheetSchema } from "@oakai/exports/browser";
-import { WorksheetSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { WorksheetSlidesInputData } from "@oakai/exports/src/schema/input.schema";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
-import { ExportsHookProps } from "./exports.types";
+import type { ExportsHookProps } from "./exports.types";
 import { useExportsExistenceCheck } from "./useExportsExistenceCheck";
 
 export function useExportWorksheetSlides({
diff --git a/apps/nextjs/src/components/Feedback/index.tsx b/apps/nextjs/src/components/Feedback/index.tsx
index 3ed474a71..8f9f32a7c 100644
--- a/apps/nextjs/src/components/Feedback/index.tsx
+++ b/apps/nextjs/src/components/Feedback/index.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 
 import { Flex } from "@radix-ui/themes";
-import { Survey } from "posthog-js";
+import type { Survey } from "posthog-js";
 
 import ChatButton from "../AppComponents/Chat/ui/chat-button";
 import { Icon } from "../Icon";
@@ -50,7 +50,7 @@ const FeedBack = ({
           // first survey key should be $survey_response
           // see https://posthog.com/docs/surveys/implementing-custom-surveys under Capturing multiple responses
           const surveyResponseKey =
-            i === 0 ? `$survey_response` : `$survey_response_${i}`;
+            i === 0 ? "$survey_response" : `$survey_response_${i}`;
           if (question.type === "rating") {
             return (
               <div
@@ -71,7 +71,9 @@ const FeedBack = ({
                     return (
                       <button
                         key={feedback.number}
-                        className={`flex flex-col items-center justify-center gap-6`}
+                        className={
+                          "flex flex-col items-center justify-center gap-6"
+                        }
                         onClick={() => {
                           setUsersResponse((prevState) => ({
                             ...prevState,
@@ -83,8 +85,8 @@ const FeedBack = ({
                           className={`rounded-sm border-2  p-8 px-9 text-lg sm:px-15 ${
                             usersResponse[surveyResponseKey] ===
                             feedback.number.toString()
-                              ? `border-black bg-black text-white`
-                              : ` border-oakGrey3 bg-white text-black`
+                              ? "border-black bg-black text-white"
+                              : " border-oakGrey3 bg-white text-black"
                           }`}
                         >
                           {feedback.number}
diff --git a/apps/nextjs/src/components/Footer.tsx b/apps/nextjs/src/components/Footer.tsx
index 6736a84be..3533f3cd7 100644
--- a/apps/nextjs/src/components/Footer.tsx
+++ b/apps/nextjs/src/components/Footer.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useAuth } from "@clerk/nextjs";
+import type { OakIconName } from "@oaknational/oak-components";
 import {
   OakBox,
   OakFlex,
@@ -8,7 +9,6 @@ import {
   OakMaxWidth,
   OakSpan,
   useCookieConsent,
-  OakIconName,
   OakP,
   OakUL,
   OakLI,
diff --git a/apps/nextjs/src/components/FullPageWarning.tsx b/apps/nextjs/src/components/FullPageWarning.tsx
index b1acb918b..3bea5a398 100644
--- a/apps/nextjs/src/components/FullPageWarning.tsx
+++ b/apps/nextjs/src/components/FullPageWarning.tsx
@@ -1,7 +1,8 @@
 import React from "react";
 
 import Button from "./Button";
-import { Icon, IconName, IconSize } from "./Icon";
+import type { IconName, IconSize } from "./Icon";
+import { Icon } from "./Icon";
 
 interface FullPageWarningProps {
   children: React.ReactNode;
diff --git a/apps/nextjs/src/components/Icon/svgs.tsx b/apps/nextjs/src/components/Icon/svgs.tsx
index ffdcc9399..cc17d4485 100644
--- a/apps/nextjs/src/components/Icon/svgs.tsx
+++ b/apps/nextjs/src/components/Icon/svgs.tsx
@@ -71,7 +71,7 @@ import reload from "@/assets/svg/reload.svg";
 import uploadWhite from "@/assets/svg/upload-white.svg";
 import upload from "@/assets/svg/upload.svg";
 
-import { IconName } from "./types";
+import type { IconName } from "./types";
 
 export const svgs: Record<IconName, string> = {
   "arrow-left": arrowLeft,
diff --git a/apps/nextjs/src/components/ImageAltGenerator/ImageRow.tsx b/apps/nextjs/src/components/ImageAltGenerator/ImageRow.tsx
index fa0dcfa1b..c1da6d492 100644
--- a/apps/nextjs/src/components/ImageAltGenerator/ImageRow.tsx
+++ b/apps/nextjs/src/components/ImageAltGenerator/ImageRow.tsx
@@ -2,7 +2,7 @@ import { useCallback, useState } from "react";
 
 import { aiLogger } from "@oakai/logger";
 import { Box, Flex } from "@radix-ui/themes";
-import { Resource } from "ai-apps/image-alt-generation/types";
+import type { Resource } from "ai-apps/image-alt-generation/types";
 import encode from "base64url";
 import Image from "next/image";
 import { useRouter } from "next/navigation";
diff --git a/apps/nextjs/src/components/Input.tsx b/apps/nextjs/src/components/Input.tsx
index 1e060a39a..254d25e35 100644
--- a/apps/nextjs/src/components/Input.tsx
+++ b/apps/nextjs/src/components/Input.tsx
@@ -77,7 +77,7 @@ const Input: React.FC<InputProps> = ({
     >,
   ) => {
     // Update the type
-    if (!!onChange) onChange(e);
+    if (onChange) onChange(e);
   };
 
   return (
diff --git a/apps/nextjs/src/components/LoadingWheel.tsx b/apps/nextjs/src/components/LoadingWheel.tsx
index 2f44c1bf0..0ce8e90f7 100644
--- a/apps/nextjs/src/components/LoadingWheel.tsx
+++ b/apps/nextjs/src/components/LoadingWheel.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 
-import { Icon, IconName, IconSize } from "./Icon";
+import type { IconName, IconSize } from "./Icon";
+import { Icon } from "./Icon";
 
 const LoadingWheel = React.forwardRef<
   HTMLDivElement,
diff --git a/apps/nextjs/src/components/MainNavigation/MainNavigationMenu.tsx b/apps/nextjs/src/components/MainNavigation/MainNavigationMenu.tsx
index 680cb62da..2d657e627 100644
--- a/apps/nextjs/src/components/MainNavigation/MainNavigationMenu.tsx
+++ b/apps/nextjs/src/components/MainNavigation/MainNavigationMenu.tsx
@@ -1,4 +1,5 @@
-import { Ref, forwardRef } from "react";
+import type { Ref } from "react";
+import { forwardRef } from "react";
 
 import { useAuth } from "@clerk/nextjs";
 import { Box, Flex } from "@radix-ui/themes";
@@ -10,7 +11,7 @@ import { usePathname } from "next/navigation";
 import loopingLine from "@/assets/svg/looping-line-1.svg";
 import useAnalytics from "@/lib/analytics/useAnalytics";
 
-import { MainNavigationProps } from ".";
+import type { MainNavigationProps } from ".";
 import Button from "../Button";
 import { Icon } from "../Icon";
 import { MobileListItem } from "./MobileListItem";
diff --git a/apps/nextjs/src/components/MainNavigation/MobileListItem.tsx b/apps/nextjs/src/components/MainNavigation/MobileListItem.tsx
index c19c0f4fd..07587bcf7 100644
--- a/apps/nextjs/src/components/MainNavigation/MobileListItem.tsx
+++ b/apps/nextjs/src/components/MainNavigation/MobileListItem.tsx
@@ -1,4 +1,4 @@
-import { MenuItem } from "data/menus";
+import type { MenuItem } from "data/menus";
 import { usePathname } from "next/navigation";
 
 import Button from "../Button";
diff --git a/apps/nextjs/src/components/MainNavigation/index.tsx b/apps/nextjs/src/components/MainNavigation/index.tsx
index ed8553745..ff342ef85 100644
--- a/apps/nextjs/src/components/MainNavigation/index.tsx
+++ b/apps/nextjs/src/components/MainNavigation/index.tsx
@@ -1,4 +1,5 @@
-import { Dispatch, Fragment } from "react";
+import type { Dispatch } from "react";
+import { Fragment } from "react";
 
 import { Dialog, Transition } from "@headlessui/react";
 
diff --git a/apps/nextjs/src/components/PortableText/portableTextComponents.tsx b/apps/nextjs/src/components/PortableText/portableTextComponents.tsx
index 2eba67a80..f758cd385 100644
--- a/apps/nextjs/src/components/PortableText/portableTextComponents.tsx
+++ b/apps/nextjs/src/components/PortableText/portableTextComponents.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { OakHeading, OakLink } from "@oaknational/oak-components";
-import { PortableTextComponents } from "@portabletext/react";
+import type { PortableTextComponents } from "@portabletext/react";
 import Link from "next/link";
 
 export const portableTextComponents: PortableTextComponents = {
diff --git a/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx b/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx
index 7d5146426..4c90a4093 100644
--- a/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx
+++ b/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx
@@ -1,10 +1,10 @@
 import { useEffect, useMemo } from "react";
 
-import {
+import type {
   KeyStageName,
   SubjectName,
-  subjectsAndKeyStages,
 } from "@oakai/core/src/data/subjectsAndKeyStages";
+import { subjectsAndKeyStages } from "@oakai/core/src/data/subjectsAndKeyStages";
 import { Flex } from "@radix-ui/themes";
 
 import Input from "../Input";
@@ -114,7 +114,7 @@ const SubjectSelect = ({
       type="dropdown"
       label="Subject"
       name="subject"
-      options={allowedSubjects as string[]}
+      options={allowedSubjects}
       onChange={(e) => setSelectedSubject(e.target.value as SubjectName)}
       value={selectedSubject}
     />
diff --git a/apps/nextjs/src/data/menus.tsx b/apps/nextjs/src/data/menus.tsx
index ac8bebbdf..786df5f08 100644
--- a/apps/nextjs/src/data/menus.tsx
+++ b/apps/nextjs/src/data/menus.tsx
@@ -1,4 +1,4 @@
-import { IconName } from "@/components/Icon";
+import type { IconName } from "@/components/Icon";
 
 interface SocialItem {
   icon: IconName;
diff --git a/apps/nextjs/src/hooks/surveys/useModerationFeedbackSurvey.ts b/apps/nextjs/src/hooks/surveys/useModerationFeedbackSurvey.ts
index 9b16eb7e6..4319a560e 100644
--- a/apps/nextjs/src/hooks/surveys/useModerationFeedbackSurvey.ts
+++ b/apps/nextjs/src/hooks/surveys/useModerationFeedbackSurvey.ts
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 
 import { getSafetyResult } from "@oakai/core/src/utils/ailaModeration/helpers";
-import { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 
 import { trpc } from "@/utils/trpc";
 
diff --git a/apps/nextjs/src/hooks/surveys/usePosthogFeedbackSurvey.ts b/apps/nextjs/src/hooks/surveys/usePosthogFeedbackSurvey.ts
index 279a9bee8..8f6a04eb3 100644
--- a/apps/nextjs/src/hooks/surveys/usePosthogFeedbackSurvey.ts
+++ b/apps/nextjs/src/hooks/surveys/usePosthogFeedbackSurvey.ts
@@ -2,7 +2,7 @@ import { useEffect, useState, useCallback } from "react";
 
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/react";
-import { Survey } from "posthog-js";
+import type { Survey } from "posthog-js";
 
 import useAnalytics from "@/lib/analytics/useAnalytics";
 
diff --git a/apps/nextjs/src/hooks/useDemoLocking.ts b/apps/nextjs/src/hooks/useDemoLocking.ts
index 263723eaa..815309601 100644
--- a/apps/nextjs/src/hooks/useDemoLocking.ts
+++ b/apps/nextjs/src/hooks/useDemoLocking.ts
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 
-import { LessonPlanKeys } from "@oakai/aila/src/protocol/schema";
-import { Message } from "ai";
+import type { LessonPlanKeys } from "@oakai/aila/src/protocol/schema";
+import type { Message } from "ai";
 
 import { useDemoUser } from "@/components/ContextProviders/Demo";
 
@@ -31,7 +31,7 @@ const DEMO_MESSAGES_AFTER_COMPLETE = parseInt(
 );
 
 const stateLineHasAllSections = (line: string) => {
-  if (!line.includes(`"type":"state"`)) {
+  if (!line.includes('"type":"state"')) {
     return false;
   }
 
diff --git a/apps/nextjs/src/hooks/useGeneration.ts b/apps/nextjs/src/hooks/useGeneration.ts
index 604354c86..b316a82fc 100644
--- a/apps/nextjs/src/hooks/useGeneration.ts
+++ b/apps/nextjs/src/hooks/useGeneration.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useReducer } from "react";
 
-import { RateLimitInfo } from "@oakai/api/src/types";
+import type { RateLimitInfo } from "@oakai/api/src/types";
 import type { SerializedGeneration } from "@oakai/core/src/models/serializers";
 import { GenerationStatus } from "@oakai/db/prisma/client";
 import { aiLogger } from "@oakai/logger";
@@ -9,11 +9,12 @@ import {
   default as logger,
 } from "@oakai/logger/browser";
 import { TRPCClientError } from "@trpc/client";
-import { z } from "zod";
+import type { z } from "zod";
 
-import { DeepPartial } from "@/utils/types/DeepPartial";
+import type { DeepPartial } from "@/utils/types/DeepPartial";
 
-import { RouterInputs, trpc } from "../utils/trpc";
+import type { RouterInputs } from "../utils/trpc";
+import { trpc } from "../utils/trpc";
 import { useDidTransition } from "./useDidTransition";
 
 const log = aiLogger("generation");
diff --git a/apps/nextjs/src/hooks/useGenerationCallbacks.ts b/apps/nextjs/src/hooks/useGenerationCallbacks.ts
index 8f5a7b016..fb25cf64d 100644
--- a/apps/nextjs/src/hooks/useGenerationCallbacks.ts
+++ b/apps/nextjs/src/hooks/useGenerationCallbacks.ts
@@ -1,17 +1,19 @@
 import { useCallback, useEffect } from "react";
 
 import * as Sentry from "@sentry/nextjs";
-import {
+import type {
   AdditionalUseGenerationOptions,
   FailedGenerationState,
   GeneratingGenerationState,
   PendingGenerationState,
   SuccessfulGenerationState,
+} from "hooks/useGeneration";
+import {
   UseGenerationError,
   UseGenerationStatus,
   useGeneration,
 } from "hooks/useGeneration";
-import { z } from "zod";
+import type { z } from "zod";
 
 import useAnalytics from "@/lib/analytics/useAnalytics";
 import { usePreviousValue } from "./usePreviousValue";
diff --git a/apps/nextjs/src/hooks/useMobileLessonPullOutControl.ts b/apps/nextjs/src/hooks/useMobileLessonPullOutControl.ts
index 9cc76c58e..e39bdb4a8 100644
--- a/apps/nextjs/src/hooks/useMobileLessonPullOutControl.ts
+++ b/apps/nextjs/src/hooks/useMobileLessonPullOutControl.ts
@@ -1,9 +1,9 @@
 import { useEffect, useState } from "react";
 
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
-import { Message } from "ai";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { Message } from "ai";
 
-import { AilaStreamingStatus } from "@/components/AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
+import type { AilaStreamingStatus } from "@/components/AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
 
 export const useMobileLessonPullOutControl = ({
   ailaStreamingStatus,
diff --git a/apps/nextjs/src/hooks/useQuizSession.ts b/apps/nextjs/src/hooks/useQuizSession.ts
index 359725847..31bcc8398 100644
--- a/apps/nextjs/src/hooks/useQuizSession.ts
+++ b/apps/nextjs/src/hooks/useQuizSession.ts
@@ -1,14 +1,14 @@
-import { Dispatch, useEffect, useRef } from "react";
+import type { Dispatch } from "react";
+import { useEffect, useRef } from "react";
 
 import { useUser } from "@clerk/nextjs";
 import browserLogger from "@oakai/logger/browser";
 import * as Sentry from "@sentry/nextjs";
 import { parseLocalStorageData } from "ai-apps/common/parseLocalStorageData";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import { QuizAppState, QuizAppStatus } from "ai-apps/quiz-designer/state/types";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
+import { QuizAppStatus } from "ai-apps/quiz-designer/state/types";
 import { z } from "zod";
 
 import { trpc } from "@/utils/trpc";
diff --git a/apps/nextjs/src/hooks/useRegenerateAnswers.ts b/apps/nextjs/src/hooks/useRegenerateAnswers.ts
index 9b70a99f7..35fff7d90 100644
--- a/apps/nextjs/src/hooks/useRegenerateAnswers.ts
+++ b/apps/nextjs/src/hooks/useRegenerateAnswers.ts
@@ -1,11 +1,10 @@
-import { Dispatch, useCallback } from "react";
+import type { Dispatch } from "react";
+import { useCallback } from "react";
 
 import { quizRequestGeneration } from "ai-apps/quiz-designer/quizRequestGeneration";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import {
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type {
   QuizAppState,
   QuizAppStateQuestion,
 } from "ai-apps/quiz-designer/state/types";
diff --git a/apps/nextjs/src/hooks/useRegenerateDistractors.ts b/apps/nextjs/src/hooks/useRegenerateDistractors.ts
index b937135b7..d8c7466e5 100644
--- a/apps/nextjs/src/hooks/useRegenerateDistractors.ts
+++ b/apps/nextjs/src/hooks/useRegenerateDistractors.ts
@@ -1,11 +1,10 @@
-import { Dispatch, useCallback } from "react";
+import type { Dispatch } from "react";
+import { useCallback } from "react";
 
 import { quizRequestGeneration } from "ai-apps/quiz-designer/quizRequestGeneration";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import {
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type {
   QuizAppState,
   QuizAppStateQuestion,
 } from "ai-apps/quiz-designer/state/types";
diff --git a/apps/nextjs/src/hooks/useSuggestedQuestions.ts b/apps/nextjs/src/hooks/useSuggestedQuestions.ts
index 33b03a9f1..4a2c8f192 100644
--- a/apps/nextjs/src/hooks/useSuggestedQuestions.ts
+++ b/apps/nextjs/src/hooks/useSuggestedQuestions.ts
@@ -1,11 +1,10 @@
 import { useCallback, useEffect, useState } from "react";
 
 import { extraQuizPromptInfo } from "ai-apps/quiz-designer/extraQuizPromptInfo";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import { QuizAppState, QuizAppStatus } from "ai-apps/quiz-designer/state/types";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
+import { QuizAppStatus } from "ai-apps/quiz-designer/state/types";
 import { z } from "zod";
 
 import { answersAndDistractorOutputSchema } from "@/components/AppComponents/QuizDesigner/QuizQuestionRow";
diff --git a/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts b/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts
index e82212edb..ec963f1a3 100644
--- a/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts
+++ b/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts
@@ -1,13 +1,13 @@
 import { useEffect, useRef, useMemo } from "react";
 
+import type { PatchDocument } from "@oakai/aila/src/protocol/jsonPatchProtocol";
 import {
-  PatchDocument,
   applyLessonPlanPatch,
   extractPatches,
 } from "@oakai/aila/src/protocol/jsonPatchProtocol";
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { useThrottle } from "@uidotdev/usehooks";
-import { type Message } from "ai/react";
+import type { Message } from "ai/react";
 import { deepClone } from "fast-json-patch";
 import hash from "object-hash";
 import { equals } from "remeda";
@@ -23,7 +23,7 @@ const hashFor = (obj: object, messageHashes) => {
 };
 
 function extractPatchesFromMessage(message: Message) {
-  const { validPatches, partialPatches } = extractPatches(message.content, 100);
+  const { validPatches, partialPatches } = extractPatches(message.content);
   return { validPatches, partialPatches };
 }
 
diff --git a/apps/nextjs/src/instrumentation.ts b/apps/nextjs/src/instrumentation.ts
index 32a937a7a..72a66aa19 100644
--- a/apps/nextjs/src/instrumentation.ts
+++ b/apps/nextjs/src/instrumentation.ts
@@ -1,3 +1,5 @@
+import * as Sentry from "@sentry/nextjs";
+
 export async function register() {
   if (process.env.NEXT_RUNTIME === "nodejs") {
     await import("../sentry.server.config");
@@ -11,3 +13,5 @@ export async function register() {
     await import("./instrumentation/tracer");
   }
 }
+
+export const onRequestError = Sentry.captureRequestError;
diff --git a/apps/nextjs/src/lib/analytics/helpers.ts b/apps/nextjs/src/lib/analytics/helpers.ts
index 0d1d6e08a..000ee732a 100644
--- a/apps/nextjs/src/lib/analytics/helpers.ts
+++ b/apps/nextjs/src/lib/analytics/helpers.ts
@@ -1,13 +1,13 @@
-import { ModerationDocument } from "@oakai/aila/src/protocol/jsonPatchProtocol";
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { ModerationDocument } from "@oakai/aila/src/protocol/jsonPatchProtocol";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { lessonPlanSectionsSchema } from "@oakai/exports/src/schema/input.schema";
 import { isTruthy } from "remeda";
 
-import {
-  ModeratedContentType,
+import type {
   ModeratedContentTypeValueType,
   ProductValueType,
 } from "../avo/Avo";
+import { ModeratedContentType } from "../avo/Avo";
 
 /**
  * These are the actions which a user could take which result in a message
diff --git a/apps/nextjs/src/lib/analytics/hubspot/HubspotClient.ts b/apps/nextjs/src/lib/analytics/hubspot/HubspotClient.ts
index 614fb28e2..1f0013a60 100644
--- a/apps/nextjs/src/lib/analytics/hubspot/HubspotClient.ts
+++ b/apps/nextjs/src/lib/analytics/hubspot/HubspotClient.ts
@@ -1,4 +1,4 @@
-import { AnalyticsService } from "@/components/ContextProviders/AnalyticsProvider";
+import type { AnalyticsService } from "@/components/ContextProviders/AnalyticsProvider";
 import { ServicePolicyMap } from "@/lib/cookie-consent/ServicePolicyMap";
 import { consentClient } from "@/lib/cookie-consent/consentClient";
 
diff --git a/apps/nextjs/src/lib/analytics/hubspot/HubspotLoader.tsx b/apps/nextjs/src/lib/analytics/hubspot/HubspotLoader.tsx
index ab996e3c6..ecd0a440f 100644
--- a/apps/nextjs/src/lib/analytics/hubspot/HubspotLoader.tsx
+++ b/apps/nextjs/src/lib/analytics/hubspot/HubspotLoader.tsx
@@ -1,10 +1,11 @@
-import { FC, useEffect } from "react";
+import type { FC } from "react";
+import { useEffect } from "react";
 
 import * as Sentry from "@sentry/nextjs";
 import { usePathname, useSearchParams } from "next/navigation";
 import Script from "next/script";
 
-import { ConsentState } from "@/components/ContextProviders/CookieConsentProvider";
+import type { ConsentState } from "@/components/ContextProviders/CookieConsentProvider";
 
 import { usePersistUtmParams } from "../useUtmParams";
 
diff --git a/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx b/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx
index 9c3436335..3d2412218 100644
--- a/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx
+++ b/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx
@@ -1,6 +1,6 @@
+import type { FC } from "react";
 import {
   createContext,
-  FC,
   useCallback,
   useContext,
   useEffect,
@@ -9,10 +9,10 @@ import {
 } from "react";
 
 import { getLastAssistantMessage } from "@oakai/aila/src/helpers/chat/getLastAssistantMessage";
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
-import { Message } from "ai";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { Message } from "ai";
 
-import { UserAction } from "./helpers";
+import type { UserAction } from "./helpers";
 import { trackLessonPlanRefined } from "./trackLessonPlanRefined";
 import useAnalytics from "./useAnalytics";
 
diff --git a/apps/nextjs/src/lib/analytics/trackLessonPlanRefined.ts b/apps/nextjs/src/lib/analytics/trackLessonPlanRefined.ts
index 0f1c8c48e..6c08a2c74 100644
--- a/apps/nextjs/src/lib/analytics/trackLessonPlanRefined.ts
+++ b/apps/nextjs/src/lib/analytics/trackLessonPlanRefined.ts
@@ -1,5 +1,5 @@
 import { parseMessageParts } from "@oakai/aila/src/protocol/jsonPatchProtocol";
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { isToxic } from "@oakai/core/src/utils/ailaModeration/helpers";
 import * as Sentry from "@sentry/nextjs";
 
@@ -8,11 +8,12 @@ import {
   isModeration,
   isAccountLocked,
 } from "@/components/AppComponents/Chat/chat-message/protocol";
-import { TrackFns } from "@/components/ContextProviders/AnalyticsProvider";
+import type { TrackFns } from "@/components/ContextProviders/AnalyticsProvider";
 
-import { ComponentType, ComponentTypeValueType } from "../avo/Avo";
+import type { ComponentTypeValueType } from "../avo/Avo";
+import { ComponentType } from "../avo/Avo";
+import type { UserAction } from "./helpers";
 import {
-  UserAction,
   getLessonTrackingProps,
   getModerationTypes,
   isLessonComplete,
diff --git a/apps/nextjs/src/lib/analytics/useAnalyticsService.ts b/apps/nextjs/src/lib/analytics/useAnalyticsService.ts
index 552750387..676870543 100644
--- a/apps/nextjs/src/lib/analytics/useAnalyticsService.ts
+++ b/apps/nextjs/src/lib/analytics/useAnalyticsService.ts
@@ -1,12 +1,12 @@
 import { useEffect, useState } from "react";
 
-import {
+import type {
   AnalyticsService,
   ServiceName,
 } from "@/components/ContextProviders/AnalyticsProvider";
-import { ConsentState } from "@/components/ContextProviders/CookieConsentProvider";
+import type { ConsentState } from "@/components/ContextProviders/CookieConsentProvider";
 
-import { MaybeDistinctId } from "../posthog/posthog";
+import type { MaybeDistinctId } from "../posthog/posthog";
 
 export const useAnalyticsService = <T, S extends ServiceName>({
   service,
diff --git a/apps/nextjs/src/lib/avo/getAvoBridge.ts b/apps/nextjs/src/lib/avo/getAvoBridge.ts
index 9cba48f8d..655a29edc 100644
--- a/apps/nextjs/src/lib/avo/getAvoBridge.ts
+++ b/apps/nextjs/src/lib/avo/getAvoBridge.ts
@@ -4,10 +4,10 @@
 import browserLogger from "@oakai/logger/browser";
 import * as Sentry from "@sentry/nextjs";
 
-import { AnalyticsService } from "@/components/ContextProviders/AnalyticsProvider";
+import type { AnalyticsService } from "@/components/ContextProviders/AnalyticsProvider";
 
-import { PosthogConfig } from "../posthog/posthog";
-import { CustomDestination } from "./Avo";
+import type { PosthogConfig } from "../posthog/posthog";
+import type { CustomDestination } from "./Avo";
 
 type AnalyticsServices = {
   posthog: Pick<AnalyticsService<PosthogConfig, "posthog">, "track">;
diff --git a/apps/nextjs/src/lib/lessonPlan/sectionsInOrder.ts b/apps/nextjs/src/lib/lessonPlan/sectionsInOrder.ts
index a0e18facd..cc6d9c783 100644
--- a/apps/nextjs/src/lib/lessonPlan/sectionsInOrder.ts
+++ b/apps/nextjs/src/lib/lessonPlan/sectionsInOrder.ts
@@ -1,4 +1,4 @@
-import { LessonPlanKeys } from "@oakai/aila/src/protocol/schema";
+import type { LessonPlanKeys } from "@oakai/aila/src/protocol/schema";
 
 export const allSectionsInOrder: LessonPlanKeys[] = [
   "learningOutcome",
diff --git a/apps/nextjs/src/lib/posthog/posthog.ts b/apps/nextjs/src/lib/posthog/posthog.ts
index 9a2fe4245..ea20b44b8 100644
--- a/apps/nextjs/src/lib/posthog/posthog.ts
+++ b/apps/nextjs/src/lib/posthog/posthog.ts
@@ -1,6 +1,6 @@
-import { PostHog } from "posthog-js";
+import type { PostHog } from "posthog-js";
 
-import { AnalyticsService } from "@/components/ContextProviders/AnalyticsProvider";
+import type { AnalyticsService } from "@/components/ContextProviders/AnalyticsProvider";
 
 import { ServicePolicyMap } from "../cookie-consent/ServicePolicyMap";
 import { consentClient } from "../cookie-consent/consentClient";
diff --git a/apps/nextjs/src/lib/sentry/sentrySetUser.ts b/apps/nextjs/src/lib/sentry/sentrySetUser.ts
index a577dc152..ee94ea21c 100644
--- a/apps/nextjs/src/lib/sentry/sentrySetUser.ts
+++ b/apps/nextjs/src/lib/sentry/sentrySetUser.ts
@@ -1,4 +1,4 @@
-import { ClerkMiddlewareAuthObject } from "@clerk/nextjs/server";
+import type { ClerkMiddlewareAuthObject } from "@clerk/nextjs/server";
 import * as Sentry from "@sentry/nextjs";
 
 export function sentrySetUser({ userId }: ClerkMiddlewareAuthObject) {
diff --git a/apps/nextjs/src/lib/sentry/withSentry.ts b/apps/nextjs/src/lib/sentry/withSentry.ts
index 019516b69..dfdb64ac3 100644
--- a/apps/nextjs/src/lib/sentry/withSentry.ts
+++ b/apps/nextjs/src/lib/sentry/withSentry.ts
@@ -1,6 +1,6 @@
 import { auth } from "@clerk/nextjs/server";
 import * as Sentry from "@sentry/node";
-import { NextRequest, NextResponse } from "next/server";
+import type { NextRequest, NextResponse } from "next/server";
 
 import { sentryCleanup } from "./sentryCleanup";
 import { sentrySetUser } from "./sentrySetUser";
diff --git a/apps/nextjs/src/middleware.test.ts b/apps/nextjs/src/middleware.test.ts
index d79e59180..29b6041c3 100644
--- a/apps/nextjs/src/middleware.test.ts
+++ b/apps/nextjs/src/middleware.test.ts
@@ -1,12 +1,9 @@
-import { NextRequest, NextFetchEvent, NextResponse } from "next/server";
+import type { NextFetchEvent } from "next/server";
+import { NextRequest, NextResponse } from "next/server";
 
 import { handleError } from "./middleware";
-import {
-  CspConfig,
-  CspEnvironment,
-  addCspHeaders,
-  buildCspHeaders,
-} from "./middlewares/csp";
+import type { CspConfig, CspEnvironment } from "./middlewares/csp";
+import { addCspHeaders, buildCspHeaders } from "./middlewares/csp";
 
 describe("handleError", () => {
   let mockRequest: NextRequest;
diff --git a/apps/nextjs/src/middleware.ts b/apps/nextjs/src/middleware.ts
index 128c9c026..5a4f0aacd 100644
--- a/apps/nextjs/src/middleware.ts
+++ b/apps/nextjs/src/middleware.ts
@@ -1,15 +1,12 @@
-import { NextMiddlewareResult } from "next/dist/server/web/types";
-import {
-  NextFetchEvent,
-  NextMiddleware,
-  NextRequest,
-  NextResponse,
-} from "next/server";
+import type { NextMiddlewareResult } from "next/dist/server/web/types";
+import type { NextFetchEvent, NextMiddleware, NextRequest } from "next/server";
+import { NextResponse } from "next/server";
 
 import { getRootErrorCause } from "./lib/errors/getRootErrorCause";
 import { sentryCleanup } from "./lib/sentry/sentryCleanup";
 import { authMiddleware } from "./middlewares/auth.middleware";
-import { CspConfig, addCspHeaders } from "./middlewares/csp";
+import type { CspConfig } from "./middlewares/csp";
+import { addCspHeaders } from "./middlewares/csp";
 import { logError } from "./middlewares/middlewareErrorLogging";
 
 const parseEnvironment = (
diff --git a/apps/nextjs/src/middlewares/auth.middleware.ts b/apps/nextjs/src/middlewares/auth.middleware.ts
index 12a4bd937..f67bbb0ba 100644
--- a/apps/nextjs/src/middlewares/auth.middleware.ts
+++ b/apps/nextjs/src/middlewares/auth.middleware.ts
@@ -1,10 +1,8 @@
-import {
-  ClerkMiddlewareAuth,
-  clerkMiddleware,
-  createRouteMatcher,
-} from "@clerk/nextjs/server";
+import type { ClerkMiddlewareAuth } from "@clerk/nextjs/server";
+import { clerkMiddleware, createRouteMatcher } from "@clerk/nextjs/server";
 import { aiLogger } from "@oakai/logger";
-import { NextFetchEvent, NextRequest, NextResponse } from "next/server";
+import type { NextFetchEvent, NextRequest } from "next/server";
+import { NextResponse } from "next/server";
 
 import { sentrySetUser } from "@/lib/sentry/sentrySetUser";
 
diff --git a/apps/nextjs/src/middlewares/csp.test.ts b/apps/nextjs/src/middlewares/csp.test.ts
index b0e934ea8..7850f55d5 100644
--- a/apps/nextjs/src/middlewares/csp.test.ts
+++ b/apps/nextjs/src/middlewares/csp.test.ts
@@ -2,7 +2,8 @@
 // pnpm --filter @oakai/nextjs test -- -u src/middlewares/csp.test.ts
 import { NextRequest } from "next/server";
 
-import { addCspHeaders, CspConfig, CspEnvironment } from "./csp";
+import type { CspConfig, CspEnvironment } from "./csp";
+import { addCspHeaders } from "./csp";
 
 const environments = ["development", "production", "preview", "test"] as const;
 
diff --git a/apps/nextjs/src/middlewares/csp.ts b/apps/nextjs/src/middlewares/csp.ts
index 052993cc9..a00611977 100644
--- a/apps/nextjs/src/middlewares/csp.ts
+++ b/apps/nextjs/src/middlewares/csp.ts
@@ -1,4 +1,5 @@
-import { NextRequest, NextResponse } from "next/server";
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
 import { v4 as uuidv4 } from "uuid";
 
 function generateNonce(): string {
@@ -169,7 +170,7 @@ export const buildCspHeaders = (nonce: string, config: CspConfig) => {
       ];
 
       for (const policyObject of additionalPolicies) {
-        const policyValue = policyObject[policy as keyof typeof policyObject];
+        const policyValue = policyObject[policy];
         if (Array.isArray(policyValue)) {
           value.push(...policyValue);
         }
diff --git a/apps/nextjs/src/middlewares/middlewareErrorLogging.ts b/apps/nextjs/src/middlewares/middlewareErrorLogging.ts
index 56b725aaf..2ca71e848 100644
--- a/apps/nextjs/src/middlewares/middlewareErrorLogging.ts
+++ b/apps/nextjs/src/middlewares/middlewareErrorLogging.ts
@@ -1,6 +1,6 @@
 import { structuredLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
-import { NextFetchEvent, NextRequest } from "next/server";
+import type { NextFetchEvent, NextRequest } from "next/server";
 
 export async function logError(
   rootError: unknown,
diff --git a/apps/nextjs/src/mocks/analytics/provider.tsx b/apps/nextjs/src/mocks/analytics/provider.tsx
index a8659afbb..837784288 100644
--- a/apps/nextjs/src/mocks/analytics/provider.tsx
+++ b/apps/nextjs/src/mocks/analytics/provider.tsx
@@ -5,7 +5,7 @@ See the readme for why this is needed.
 import React from "react";
 
 import { aiLogger } from "@oakai/logger";
-import { PostHog } from "posthog-js";
+import type { PostHog } from "posthog-js";
 
 import Avo from "@/lib/avo/Avo";
 
diff --git a/apps/nextjs/src/utils/alphabetiseArray.ts b/apps/nextjs/src/utils/alphabetiseArray.ts
index 768ba9d5d..e8816c69f 100644
--- a/apps/nextjs/src/utils/alphabetiseArray.ts
+++ b/apps/nextjs/src/utils/alphabetiseArray.ts
@@ -1,7 +1,7 @@
 /**
  * Alphabetizes an array of comparable elements in-place
  */
-import {
+import type {
   GenerationPart,
   GenerationPartPlaceholder,
 } from "@oakai/core/src/types";
diff --git a/apps/nextjs/src/utils/checkFeatureFlag.ts b/apps/nextjs/src/utils/checkFeatureFlag.ts
index 169a8e92d..201b62513 100644
--- a/apps/nextjs/src/utils/checkFeatureFlag.ts
+++ b/apps/nextjs/src/utils/checkFeatureFlag.ts
@@ -1,4 +1,4 @@
-import { type PostHog } from "posthog-js";
+import type { PostHog } from "posthog-js";
 
 export function checkFeatureFlag(
   posthogClient: PostHog,
diff --git a/apps/nextjs/src/utils/scrollToRef.ts b/apps/nextjs/src/utils/scrollToRef.ts
index b07de0797..0d66b1230 100644
--- a/apps/nextjs/src/utils/scrollToRef.ts
+++ b/apps/nextjs/src/utils/scrollToRef.ts
@@ -1,4 +1,4 @@
-import { RefObject } from "react";
+import type { RefObject } from "react";
 
 import { aiLogger } from "@oakai/logger";
 
diff --git a/apps/nextjs/src/utils/trackDownload.ts b/apps/nextjs/src/utils/trackDownload.ts
index 1e867de0a..e74541758 100644
--- a/apps/nextjs/src/utils/trackDownload.ts
+++ b/apps/nextjs/src/utils/trackDownload.ts
@@ -1,8 +1,8 @@
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 
 import { getLessonTrackingProps } from "@/lib/analytics/helpers";
-import useAnalytics from "@/lib/analytics/useAnalytics";
-import {
+import type useAnalytics from "@/lib/analytics/useAnalytics";
+import type {
   ResourceFileTypeValueType,
   ResourceTypeValueType,
 } from "@/lib/avo/Avo";
diff --git a/apps/nextjs/src/utils/trpc.tsx b/apps/nextjs/src/utils/trpc.tsx
index d016e0962..e6311d224 100644
--- a/apps/nextjs/src/utils/trpc.tsx
+++ b/apps/nextjs/src/utils/trpc.tsx
@@ -2,13 +2,14 @@
 
 import { useState } from "react";
 
-import { type AppRouter } from "@oakai/api/src/router";
-import { type ChatAppRouter } from "@oakai/api/src/router/chat";
+import type { AppRouter } from "@oakai/api/src/router";
+import type { ChatAppRouter } from "@oakai/api/src/router/chat";
 import { transformer } from "@oakai/api/transformer";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { TRPCLink, httpBatchLink, loggerLink } from "@trpc/client";
+import type { TRPCLink } from "@trpc/client";
+import { httpBatchLink, loggerLink } from "@trpc/client";
 import { createTRPCReact } from "@trpc/react-query";
-import { inferRouterInputs } from "@trpc/server";
+import type { inferRouterInputs } from "@trpc/server";
 
 const getBaseUrl = () => {
   if (typeof window !== "undefined") return ""; // browser should use relative url
diff --git a/apps/nextjs/tests-e2e/config/common-persona.setup.ts b/apps/nextjs/tests-e2e/config/common-persona.setup.ts
index bd828e356..438f1bb74 100644
--- a/apps/nextjs/tests-e2e/config/common-persona.setup.ts
+++ b/apps/nextjs/tests-e2e/config/common-persona.setup.ts
@@ -1,4 +1,5 @@
-import { Page, test as setup } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { test as setup } from "@playwright/test";
 import path from "path";
 
 import { prepareUser } from "../helpers/auth";
diff --git a/apps/nextjs/tests-e2e/helpers/auth/clerkHelpers.ts b/apps/nextjs/tests-e2e/helpers/auth/clerkHelpers.ts
index ee3076be1..1c857d0b3 100644
--- a/apps/nextjs/tests-e2e/helpers/auth/clerkHelpers.ts
+++ b/apps/nextjs/tests-e2e/helpers/auth/clerkHelpers.ts
@@ -1,4 +1,5 @@
-import { Page, expect } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { expect } from "@playwright/test";
 
 /**
  * This file replicates helpers provided by @clerk/testing
diff --git a/apps/nextjs/tests-e2e/helpers/auth/index.ts b/apps/nextjs/tests-e2e/helpers/auth/index.ts
index fd02424e6..420e2913a 100644
--- a/apps/nextjs/tests-e2e/helpers/auth/index.ts
+++ b/apps/nextjs/tests-e2e/helpers/auth/index.ts
@@ -1,7 +1,8 @@
 import { setupClerkTestingToken } from "@clerk/testing/playwright";
-import { TestSupportRouter } from "@oakai/api/src/router/testSupport";
+import type { TestSupportRouter } from "@oakai/api/src/router/testSupport";
 import { transformer } from "@oakai/api/transformer";
-import { test, Page } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { test } from "@playwright/test";
 import { createTRPCProxyClient, httpBatchLink, loggerLink } from "@trpc/client";
 
 import {
diff --git a/apps/nextjs/tests-e2e/helpers/vercel.ts b/apps/nextjs/tests-e2e/helpers/vercel.ts
index 310508922..b121eff3c 100644
--- a/apps/nextjs/tests-e2e/helpers/vercel.ts
+++ b/apps/nextjs/tests-e2e/helpers/vercel.ts
@@ -1,4 +1,4 @@
-import { BrowserContext, Page } from "@playwright/test";
+import type { BrowserContext, Page } from "@playwright/test";
 
 import {
   TEST_BASE_URL,
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-1.chunks.txt b/apps/nextjs/tests-e2e/recordings/roman-britain-1.chunks.txt
index 125f54791..3bf050761 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-1.chunks.txt
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-1.chunks.txt
@@ -3,52 +3,169 @@ type":"
 ll
 m
 Message
-","patches":[]
-,"prompt":{"
+","sectionsToEdit":["
+learning
+Outcome
+","
+learning
+Cycles
+"],"patches":[
+{"
 type":"
-text
-","value":"
-There
+patch
+","reasoning":"
+I
+ have
+ created
+ new
+ learning
+ outcomes
+ and
+ learning
+ cycles
+ from
+ scratch
+ as
+ there
  are
  no
  existing
  Oak
  lessons
+ available
  for
- the
- specific
+ this
  topic
- of
- \"
-End
- of
- Roman
+.","
+value":{"
+type":"
+string
+","op":"
+add
+","path":"/
+learning
+Outcome
+","value":"
+I
+ can
+ describe
+ why
+ the
+ Romans
+ left
  Britain
-,\"
- so
- we'll
- start
- a
- new
+ and
+ what
+ happened
+ afterwards
+."
+},"status":"
+complete
+"},{"
+type":"
+patch
+","reasoning":"
+This
+ patch
+ adds
+ learning
+ cycles
+ which
+ break
+ down
+ the
  lesson
- from
- scratch
+ into
+ achievable
+ tasks
+,
+ focusing
+ on
+ Roman
+ departure
+ and
+ its
+ impact
+ on
+ Britain
+.","
+value":{"
+type":"
+string
+-array
+","op":"
+add
+","path":"/
+learning
+Cycles
+","value":["
+Explain
+ the
+ reasons
+ for
+ the
+ Romans
+ leaving
+ Britain
+.","
+Describe
+ the
+ changes
+ that
+ occurred
+ in
+ Britain
+ after
+ the
+ Romans
+ left
+.","
+Identify
+ the
+ role
+ of
+ archae
+ologists
+ in
+ uncover
+ing
+ Roman
+ history
 .
- Let's
- begin
- by
- outlining
+"]},"status":"
+complete
+"}],"sectionsEdited":["
+learning
+Outcome
+","
+learning
+Cycles
+"],"prompt":{"
+type":"
+text
+","value":"
+Are
  the
  learning
- outcomes
+ outcome
  and
  learning
  cycles
+ appropriate
  for
- the
- lesson
+ your
+ pupils
+?
+ If
+ not
+,
+ suggest
+ an
+ edit
 .
- Tap
+ Otherwise
+,
+ tap
  **
 Continue
 **
@@ -60,4 +177,6 @@ Continue
  next
  step
 ."
-}}
\ No newline at end of file
+},"status":"
+complete
+"}
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-1.formatted.json b/apps/nextjs/tests-e2e/recordings/roman-britain-1.formatted.json
index 74d623c61..0a981311f 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-1.formatted.json
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-1.formatted.json
@@ -1,8 +1,44 @@
 {
   "type": "llmMessage",
-  "patches": [],
+  "sectionsToEdit": [
+    "learningOutcome",
+    "learningCycles"
+  ],
+  "patches": [
+    {
+      "type": "patch",
+      "reasoning": "I have created new learning outcomes and learning cycles from scratch as there are no existing Oak lessons available for this topic.",
+      "value": {
+        "type": "string",
+        "op": "add",
+        "path": "/learningOutcome",
+        "value": "I can describe why the Romans left Britain and what happened afterwards."
+      },
+      "status": "complete"
+    },
+    {
+      "type": "patch",
+      "reasoning": "This patch adds learning cycles which break down the lesson into achievable tasks, focusing on Roman departure and its impact on Britain.",
+      "value": {
+        "type": "string-array",
+        "op": "add",
+        "path": "/learningCycles",
+        "value": [
+          "Explain the reasons for the Romans leaving Britain.",
+          "Describe the changes that occurred in Britain after the Romans left.",
+          "Identify the role of archaeologists in uncovering Roman history."
+        ]
+      },
+      "status": "complete"
+    }
+  ],
+  "sectionsEdited": [
+    "learningOutcome",
+    "learningCycles"
+  ],
   "prompt": {
     "type": "text",
-    "value": "There are no existing Oak lessons for the specific topic of \"End of Roman Britain,\" so we'll start a new lesson from scratch. Let's begin by outlining the learning outcomes and learning cycles for the lesson. Tap **Continue** to move on to the next step."
-  }
+    "value": "Are the learning outcome and learning cycles appropriate for your pupils? If not, suggest an edit. Otherwise, tap **Continue** to move on to the next step."
+  },
+  "status": "complete"
 }
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-1.moderation.json b/apps/nextjs/tests-e2e/recordings/roman-britain-1.moderation.json
index 44c0a6449..91cc3b3de 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-1.moderation.json
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-1.moderation.json
@@ -1,14 +1,14 @@
 {
-  "id": "chatcmpl-AAdBxHbh94auX6oHYcBB7BNt9CWkY",
+  "id": "chatcmpl-ANdWlVyt9QK14JTGZfiB9u3p3lQxr",
   "object": "chat.completion",
-  "created": 1727097297,
+  "created": 1730196851,
   "model": "gpt-4o-2024-08-06",
   "choices": [
     {
       "index": 0,
       "message": {
         "role": "assistant",
-        "content": "{\"scores\":{\"l\":5,\"v\":5,\"u\":5,\"s\":5,\"p\":5,\"t\":5},\"justification\":\"The lesson plan on 'End of Roman Britain' is appropriate for key-stage-1 students. It does not contain any discriminatory language or behavior, offensive or strong language, depictions of conflict, violence, or sensitive topics. The content is historical and educational, focusing on the end of Roman rule in Britain without delving into upsetting, sensitive, or distressing details. There is no discussion of nudity, sexual content, or any physical activities involving exploration or equipment usage that require supervision. Additionally, the lesson plan does not include any toxic or harmful instructions or encouragements. Overall, the lesson is fully compliant with content guidelines for young learners.\",\"categories\":[]}",
+        "content": "{\"scores\":{\"l\":5,\"v\":5,\"u\":5,\"s\":5,\"p\":4,\"t\":5},\"justification\":\"The lesson plan is compliant in the categories of 'Language and discrimination', 'Violence and crime', 'Upsetting, disturbing and sensitive', 'Nudity and sex', and 'Toxic', as it does not contain any inappropriate content or discussion for these categories. However, the 'Physical activity and safety' category is rated a 4 because the topic of archaeology may involve exploration of objects or sites, which can require supervision or safety precautions, particularly for the key-stage 1 age group. Although this is minimal, it should be noted for safety purposes.\",\"categories\":[\"p/exploration-of-objects\"]}",
         "refusal": null
       },
       "logprobs": null,
@@ -16,12 +16,15 @@
     }
   ],
   "usage": {
-    "prompt_tokens": 2234,
-    "completion_tokens": 162,
-    "total_tokens": 2396,
+    "prompt_tokens": 2283,
+    "completion_tokens": 154,
+    "total_tokens": 2437,
+    "prompt_tokens_details": {
+      "cached_tokens": 2048
+    },
     "completion_tokens_details": {
       "reasoning_tokens": 0
     }
   },
-  "system_fingerprint": "fp_7568d46099"
+  "system_fingerprint": "fp_90354628f2"
 }
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-2.chunks.txt b/apps/nextjs/tests-e2e/recordings/roman-britain-2.chunks.txt
index 3e223820b..481f2de6f 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-2.chunks.txt
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-2.chunks.txt
@@ -3,76 +3,125 @@ type":"
 ll
 m
 Message
-","patches":[
+","sectionsToEdit":["
+prior
+Knowledge
+","
+key
+Learning
+Points
+","
+mis
+con
+ceptions
+","
+keywords
+"],"patches":[
 {"
 type":"
 patch
 ","reasoning":"
-Est
-ablish
-ing
- a
- clear
- learning
- outcome
- to
- focus
- the
+Ident
+ified
+ prior
+ knowledge
+ that
+ KS
+1
+ pupils
+ should
+ have
+ before
+ starting
+ this
  lesson
  on
  the
- specific
- impact
- of
- the
  end
  of
  Roman
- rule
- in
  Britain
 .","
 value":{"
 type":"
 string
+-array
 ","op":"
 add
 ","path":"/
-learning
-Outcome
-","value":"
-I
- can
- describe
- the
- changes
- in
+prior
+Knowledge
+","value":["
+The
+ Romans
+ invaded
  Britain
- after
+ and
+ ruled
+ for
+ several
+ centuries
+.","
+Roman
+ roads
+ and
+ towns
+ were
+ built
+ during
+ their
+ occupation
+.","
+Brit
+ain
+ was
+ part
+ of
  the
- Romans
- left
-."
-}},{"
+ Roman
+ Empire
+.","
+The
+ concept
+ of
+ an
+ empire
+ and
+ its
+ importance
+.","
+Basic
+ understanding
+ of
+ what
+ archae
+ologists
+ do
+.
+"]},"status":"
+complete
+"},{"
 type":"
 patch
 ","reasoning":"
-Def
-ining
+Outlined
+ key
  learning
- cycles
- to
- structure
+ points
+ that
+ pupils
+ should
+ take
+ away
+ from
  the
  lesson
- effectively
-,
- increasing
- complexity
- as
+ on
  the
- lesson
- progresses
+ end
+ of
+ Roman
+ Britain
 .","
 value":{"
 type":"
@@ -81,82 +130,368 @@ string
 ","op":"
 add
 ","path":"/
-learning
-Cycles
+key
+Learning
+Points
 ","value":["
-Identify
- key
- reasons
- why
- the
+The
  Romans
  left
  Britain
+ around
+ AD
+ 
+410
+ due
+ to
+ pressures
+ on
+ their
+ empire
 .","
-Describe
+After
  the
- immediate
- effects
- on
- local
- communities
+ Romans
+ left
+,
+ Britain
+ faced
+ invas
+ions
+ from
+ other
+ groups
+ like
+ the
+ Sax
+ons
 .","
-Explain
- how
+Many
+ Roman
+ buildings
+ and
+ roads
+ influenced
+ the
+ landscape
+ of
  Britain
- changed
- in
+.","
+Ar
+chae
+ologists
+ help
+ uncover
  the
- years
- following
+ history
+ of
  Roman
- departure
+ Britain
+ through
+ excav
+ations
 .
-"]}}],"prompt":{"
+"]},"status":"
+complete
+"},{"
 type":"
-text
-","value":"
-I've
- set
+patch
+","reasoning":"
+Address
+ed
+ common
+ misconceptions
+ about
  the
- learning
- outcome
+ end
+ of
+ Roman
+ Britain
  to
- focus
- on
- describing
+ help
+ teachers
+ correct
+ them
+ during
  the
- changes
- in
+ lesson
+.","
+value":{"
+type":"
+mis
+con
+ceptions
+","op":"
+add
+","path":"/
+mis
+con
+ceptions
+","value":[
+{"
+misconception":"
+The
+ Romans
+ left
  Britain
- after
+ because
+ they
+ were
+ defeated
+ by
  the
+ Brit
+ons
+","description":"
+The
  Romans
  left
+ due
+ to
+ internal
+ problems
+ within
+ the
+ empire
  and
- outlined
+ threats
+ elsewhere
+,
+ not
+ because
+ they
+ were
+ defeated
+ by
  the
- learning
- cycles
-.
- Are
+ Brit
+ons
+."
+},{"
+misconception":"
+Roman
+ Britain
+ ended
+ suddenly
+ without
+ any
+ lasting
+ impact
+","description":"
+Roman
+ influence
+ persisted
+ in
+ Britain's
+ infrastructure
+,
+ such
+ as
+ roads
+ and
+ towns
+,
+ even
+ after
+ their
+ departure
+."
+}]},"status":"
+complete
+"},{"
+type":"
+patch
+","reasoning":"
+Provided
+ keywords
+ that
+ will
+ be
+ used
+ throughout
  the
- learning
- outcome
+ lesson
+ to
+ ensure
+ pupils
+ understand
+ the
+ key
+ concepts
+.","
+value":{"
+type":"
+keywords
+","op":"
+add
+","path":"/
+keywords
+","value":[
+{"
+keyword":"
+Romans
+","definition":"
+People
+ from
+ the
+ ancient
+ city
+ of
+ Rome
+ who
+ ruled
+ over
+ Britain
+ for
+ several
+ centuries
+."
+},{"
+keyword":"
+Empire
+","definition":"
+A
+ large
+ group
+ of
+ territories
+ and
+ people
+ ruled
+ over
+ by
+ a
+ single
+ authority
+,
+ like
+ the
+ Roman
+ Empire
+."
+},{"
+keyword":"
+Ar
+chae
+ologist
+","definition":"
+A
+ person
+ who
+ studies
+ human
+ history
+ by
+ digging
+ up
  and
+ examining
+ ancient
+ sites
+ and
+ objects
+."
+},{"
+keyword":"
+In
+vasion
+","definition":"
+An
+ instance
+ of
+ invading
+ a
+ country
+ or
+ region
+ with
+ an
+ armed
+ force
+."
+},{"
+keyword":"
+S
+ax
+ons
+","definition":"
+A
+ group
+ of
+ tribes
+ from
+ northern
+ Europe
+ who
+ invaded
+ Britain
+ after
+ the
+ Romans
+ left
+."
+}]},"status":"
+complete
+"}],"sectionsEdited":["
+prior
+Knowledge
+","
+key
+Learning
+Points
+","
+mis
+con
+ceptions
+","
+keywords
+"],"prompt":{"
+type":"
+text
+","value":"
+Are
+ the
+ prior
+ knowledge
+,
+ key
  learning
- cycles
- appropriate
+ points
+,
+ misconceptions
+,
+ and
+ keywords
+ sections
+ suitable
  for
  your
- pupils
+ class
 ?
  If
  not
 ,
- suggest
- an
- edit
- below
+ reply
+ with
+ what
+ I
+ should
+ change
+.
+ Otherwise
+,
+ tap
+ **
+Continue
+**
+ to
+ move
+ on
+ to
+ the
+ next
+ step
 ."
-}}
\ No newline at end of file
+},"status":"
+complete
+"}
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-2.formatted.json b/apps/nextjs/tests-e2e/recordings/roman-britain-2.formatted.json
index becabd619..617fb17e0 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-2.formatted.json
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-2.formatted.json
@@ -1,33 +1,107 @@
 {
   "type": "llmMessage",
+  "sectionsToEdit": [
+    "priorKnowledge",
+    "keyLearningPoints",
+    "misconceptions",
+    "keywords"
+  ],
   "patches": [
     {
       "type": "patch",
-      "reasoning": "Establishing a clear learning outcome to focus the lesson on the specific impact of the end of Roman rule in Britain.",
+      "reasoning": "Identified prior knowledge that KS1 pupils should have before starting this lesson on the end of Roman Britain.",
       "value": {
-        "type": "string",
+        "type": "string-array",
         "op": "add",
-        "path": "/learningOutcome",
-        "value": "I can describe the changes in Britain after the Romans left."
-      }
+        "path": "/priorKnowledge",
+        "value": [
+          "The Romans invaded Britain and ruled for several centuries.",
+          "Roman roads and towns were built during their occupation.",
+          "Britain was part of the Roman Empire.",
+          "The concept of an empire and its importance.",
+          "Basic understanding of what archaeologists do."
+        ]
+      },
+      "status": "complete"
     },
     {
       "type": "patch",
-      "reasoning": "Defining learning cycles to structure the lesson effectively, increasing complexity as the lesson progresses.",
+      "reasoning": "Outlined key learning points that pupils should take away from the lesson on the end of Roman Britain.",
       "value": {
         "type": "string-array",
         "op": "add",
-        "path": "/learningCycles",
+        "path": "/keyLearningPoints",
         "value": [
-          "Identify key reasons why the Romans left Britain.",
-          "Describe the immediate effects on local communities.",
-          "Explain how Britain changed in the years following Roman departure."
+          "The Romans left Britain around AD 410 due to pressures on their empire.",
+          "After the Romans left, Britain faced invasions from other groups like the Saxons.",
+          "Many Roman buildings and roads influenced the landscape of Britain.",
+          "Archaeologists help uncover the history of Roman Britain through excavations."
         ]
-      }
+      },
+      "status": "complete"
+    },
+    {
+      "type": "patch",
+      "reasoning": "Addressed common misconceptions about the end of Roman Britain to help teachers correct them during the lesson.",
+      "value": {
+        "type": "misconceptions",
+        "op": "add",
+        "path": "/misconceptions",
+        "value": [
+          {
+            "misconception": "The Romans left Britain because they were defeated by the Britons",
+            "description": "The Romans left due to internal problems within the empire and threats elsewhere, not because they were defeated by the Britons."
+          },
+          {
+            "misconception": "Roman Britain ended suddenly without any lasting impact",
+            "description": "Roman influence persisted in Britain's infrastructure, such as roads and towns, even after their departure."
+          }
+        ]
+      },
+      "status": "complete"
+    },
+    {
+      "type": "patch",
+      "reasoning": "Provided keywords that will be used throughout the lesson to ensure pupils understand the key concepts.",
+      "value": {
+        "type": "keywords",
+        "op": "add",
+        "path": "/keywords",
+        "value": [
+          {
+            "keyword": "Romans",
+            "definition": "People from the ancient city of Rome who ruled over Britain for several centuries."
+          },
+          {
+            "keyword": "Empire",
+            "definition": "A large group of territories and people ruled over by a single authority, like the Roman Empire."
+          },
+          {
+            "keyword": "Archaeologist",
+            "definition": "A person who studies human history by digging up and examining ancient sites and objects."
+          },
+          {
+            "keyword": "Invasion",
+            "definition": "An instance of invading a country or region with an armed force."
+          },
+          {
+            "keyword": "Saxons",
+            "definition": "A group of tribes from northern Europe who invaded Britain after the Romans left."
+          }
+        ]
+      },
+      "status": "complete"
     }
   ],
+  "sectionsEdited": [
+    "priorKnowledge",
+    "keyLearningPoints",
+    "misconceptions",
+    "keywords"
+  ],
   "prompt": {
     "type": "text",
-    "value": "I've set the learning outcome to focus on describing the changes in Britain after the Romans left and outlined the learning cycles. Are the learning outcome and learning cycles appropriate for your pupils? If not, suggest an edit below."
-  }
+    "value": "Are the prior knowledge, key learning points, misconceptions, and keywords sections suitable for your class? If not, reply with what I should change. Otherwise, tap **Continue** to move on to the next step."
+  },
+  "status": "complete"
 }
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-2.moderation.json b/apps/nextjs/tests-e2e/recordings/roman-britain-2.moderation.json
index a0e65531b..171cc2eed 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-2.moderation.json
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-2.moderation.json
@@ -1,14 +1,14 @@
 {
-  "id": "chatcmpl-AAdCA5XfaGmUbEN7TkuDd6BEkXKK2",
+  "id": "chatcmpl-ANdX7W6LJidRv2NxImpbuB49osq2h",
   "object": "chat.completion",
-  "created": 1727097310,
+  "created": 1730196873,
   "model": "gpt-4o-2024-08-06",
   "choices": [
     {
       "index": 0,
       "message": {
         "role": "assistant",
-        "content": "{\"scores\":{\"l\":5,\"v\":5,\"u\":5,\"s\":5,\"p\":5,\"t\":5},\"justification\":\"The lesson plan titled 'End of Roman Britain' is fully compliant across all categories for a Key Stage 1 audience. It focuses on historical events related to the end of Roman rule in Britain and its effects. There is no use of discriminatory language or behavior, no depiction or discussion of violence or sensitive topics, no nudity or sexual content, no physical activities that require safety considerations, and no toxic content or encouragement of harmful behavior. The content is appropriate for young learners and is presented in a factual and educational manner without any elements that could be considered inappropriate or harmful.\",\"categories\":[]}",
+        "content": "{\"scores\":{\"l\":5,\"v\":5,\"u\":5,\"s\":5,\"p\":5,\"t\":5},\"justification\":\"The lesson plan on the 'End of Roman Britain' is fully compliant across all categories. It is designed for Key Stage 1 (ages 5-7) and focuses on historical facts about the Romans leaving Britain, without any inclusion of discriminatory language, offensive or strong language. There is no mention of violence, crime, or any upsetting, sensitive, or distressing content. The lesson does not include any depiction or discussion of nudity or sexual content. Additionally, there is no physical activity or safety concern involved, and no external content or use of equipment requiring supervision is mentioned. Finally, the lesson plan does not contain any toxic elements like encouragement of harmful behavior or instructions on creating weapons. All content is appropriate for the intended young audience and is presented in an educational and age-appropriate manner.\",\"categories\":[]}",
         "refusal": null
       },
       "logprobs": null,
@@ -16,12 +16,15 @@
     }
   ],
   "usage": {
-    "prompt_tokens": 2282,
-    "completion_tokens": 147,
-    "total_tokens": 2429,
+    "prompt_tokens": 2600,
+    "completion_tokens": 193,
+    "total_tokens": 2793,
+    "prompt_tokens_details": {
+      "cached_tokens": 2048
+    },
     "completion_tokens_details": {
       "reasoning_tokens": 0
     }
   },
-  "system_fingerprint": "fp_7568d46099"
+  "system_fingerprint": "fp_90354628f2"
 }
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-3.chunks.txt b/apps/nextjs/tests-e2e/recordings/roman-britain-3.chunks.txt
index a975baaf9..0bea461fd 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-3.chunks.txt
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-3.chunks.txt
@@ -3,356 +3,1128 @@ type":"
 ll
 m
 Message
-","patches":[
+","sectionsToEdit":["
+starter
+Quiz
+","
+cycle
+1
+","
+cycle
+2
+","
+cycle
+3
+","
+exit
+Quiz
+"],"patches":[
 {"
 type":"
 patch
 ","reasoning":"
-Est
-ablish
-ing
- key
+Designed
+ a
+ starter
+ quiz
+ to
+ assess
+ pupils
+'
  prior
  knowledge
+ on
+ Roman
+ Britain
+ before
+ the
+ main
+ lesson
+ content
+.","
+value":{"
+type":"
+quiz
+","op":"
+add
+","path":"/
+starter
+Quiz
+","value":[
+{"
+question":"
+What
+ did
+ the
+ Romans
+ build
+ in
+ Britain
+ during
+ their
+ rule
+?
+","answers":["
+Road
+s
+ and
+ towns
+"],"distractors":["
+Cast
+les
+ and
+ forts
+","
+Schools
+ and
+ hospitals
+"]},{"
+question":"
+How
+ long
+ did
+ the
+ Romans
+ rule
+ over
+ Britain
+?
+","answers":["
+Several
+ centuries
+"],"distractors":["
+A
+ few
+ years
+","
+A
+ decade
+"]},{"
+question":"
+What
+ is
+ an
+ empire
+?
+","answers":["
+A
+ large
+ group
+ of
+ territories
+ ruled
+ by
+ one
+ authority
+"],"distractors":["
+A
+ small
+ country
+","
+A
+ type
+ of
+ government
+"]},{"
+question":"
+What
+ role
+ do
+ archae
+ologists
+ play
+ in
+ history
+?
+","answers":["
+They
+ study
+ human
+ history
+ by
+ digging
+ up
+ ancient
+ sites
+"],"distractors":["
+They
+ write
+ history
+ books
+","
+They
+ teach
+ history
+ in
+ schools
+"]},{"
+question":"
+Which
+ empire
+ did
+ Britain
+ belong
  to
- ensure
+ during
+ Roman
+ rule
+?
+","answers":["
+The
+ Roman
+ Empire
+"],"distractors":["
+The
+ Greek
+ Empire
+","
+The
+ Egyptian
+ Empire
+"]},{"
+question":"
+What
+ is
+ one
+ thing
  pupils
- have
- the
- foundational
- understanding
- necessary
- for
+ should
+ understand
+ before
  this
  lesson
+?
+","answers":["
+The
+ concept
+ of
+ an
+ empire
+"],"distractors":["
+The
+ history
+ of
+ the
+ Sax
+ons
+","
+The
+ fall
+ of
+ the
+ Roman
+ Empire
+"]}]},"status":"
+complete
+"},{"
+type":"
+patch
+","reasoning":"
+Develop
+ed
+ the
+ first
+ learning
+ cycle
+ focusing
+ on
+ explaining
+ why
+ the
+ Romans
+ left
+ Britain
 .","
 value":{"
 type":"
-string
--array
+cycle
 ","op":"
 add
 ","path":"/
-prior
-Knowledge
-","value":["
-Romans
- invaded
+cycle
+1
+","value":{"
+title":"
+Why
+ the
+ Romans
+ Left
  Britain
- in
- 
-43
+","durationInMinutes":15
+,"explanation":{"
+spokenExplanation":["
+Discuss
+ the
+ pressures
+ faced
+ by
+ the
+ Roman
+ Empire
+ around
  AD
+ 
+410
 .","
-Roman
- roads
- connected
- towns
- across
+Explain
+ how
+ internal
+ conflicts
+ weakened
+ the
+ Roman
+ control
+ over
+ distant
+ regions
+ like
  Britain
 .","
-Romans
- built
- Had
-rian
-'s
- Wall
- in
+Describe
  the
- north
+ external
+ threats
+ from
+ other
+ tribes
+ and
+ groups
+ that
+ required
+ Roman
+ attention
+ elsewhere
+.","
+Mention
+ how
+ resources
+ and
+ troops
+ were
+ needed
+ more
+ urgently
+ in
+ other
+ parts
  of
+ the
+ empire
+.","
+Highlight
+ that
+ the
+ decision
+ to
+ leave
+ was
+ strategic
+,
+ not
+ due
+ to
+ defeat
+ by
+ Brit
+ons
+."
+],"accompanyingSlideDetails":"
+A
+ timeline
+ showing
+ key
+ events
+ leading
+ to
+ the
+ Roman
+ departure
+ from
  Britain
 .","
-Romans
- introduced
- new
- food
+imagePrompt":"
+Roman
+ Empire
+ timeline
+ AD
+ 
+410
+","slideText":"
+The
+ Romans
+ left
+ Britain
+ around
+ AD
+ 
+410
+ due
+ to
+ internal
  and
- customs
+ external
+ pressures
+ on
+ their
+ empire
+."
+},"checkForUnderstanding":[
+{"
+question":"
+Why
+ did
+ the
+ Romans
+ decide
  to
+ leave
  Britain
-.","
-Some
+?
+","answers":["
+Due
+ to
+ internal
+ and
+ external
+ pressures
+"],"distractors":["
+They
+ were
+ defeated
+ by
  Brit
 ons
- adopted
+","
+They
+ found
+ new
+ lands
+"]},{"
+question":"
+What
+ was
+ a
+ major
+ factor
+ in
+ the
  Roman
- ways
- of
- life
+ departure
+ from
+ Britain
+?
+","answers":["
+Resource
+ needs
+ elsewhere
+"],"distractors":["
+British
+ rebellion
+","
+New
+ Roman
+ emperor
+"]}],"practice":"
+List
+ two
+ reasons
+ why
+ the
+ Romans
+ left
+ Britain
+ and
+ explain
+ how
+ these
+ reasons
+ impacted
+ their
+ empire
+.","
+feedback":"
+Model
+ answer
+:
+ The
+ Romans
+ left
+ due
+ to
+ internal
+ conflicts
+ and
+ external
+ threats
 .
-"]}},{"
+ These
+ weakened
+ their
+ control
+,
+ requiring
+ resources
+ elsewhere
+."
+}},"status":"
+complete
+"},{"
 type":"
 patch
 ","reasoning":"
-Ident
-ifying
- key
+Created
+ the
+ second
  learning
- points
+ cycle
  to
- ensure
- the
- lesson
- covers
- the
- most
- important
- aspects
- of
- the
- topic
+ describe
+ changes
+ in
+ Britain
+ post
+-R
+om
+ans
 .","
 value":{"
 type":"
-string
--array
+cycle
 ","op":"
 add
 ","path":"/
-key
-Learning
-Points
-","value":["
-The
+cycle
+2
+","value":{"
+title":"
+Changes
+ in
+ Post
+-R
+oman
+ Britain
+","durationInMinutes":15
+,"explanation":{"
+spokenExplanation":["
+Explain
+ how
+ the
+ departure
+ of
  Romans
- left
+ led
+ to
+ power
+ vac
+u
+ums
+ in
  Britain
- around
- 
-410
- AD
 .","
+Discuss
+ the
+ arrival
+ of
+ the
+ Sax
+ons
+ and
+ other
+ groups
+ invading
+ Britain
+.","
+Describe
+ the
+ changes
+ in
+ town
+ structures
+ and
+ the
+ decline
+ of
+ Roman
+-built
+ infrastructure
+.","
+Highlight
+ the
+ blend
+ of
+ Roman
+ and
+ new
+ cultural
+ influences
+ in
+ Britain
+.","
+Show
+ examples
+ of
+ Roman
+ architecture
+ that
+ remained
+ influential
+."
+],"accompanyingSlideDetails":"
+Images
+ showing
+ Roman
+ roads
+ and
+ Sax
+on
+ settlements
+.","
+imagePrompt":"
 Roman
- withdrawal
+ roads
+ and
+ Sax
+on
+ settlements
+","slideText":"
+After
+ the
+ Romans
  left
+,
  Britain
- vulnerable
- to
+ faced
  invas
 ions
-.","
-Many
+ and
+ cultural
+ changes
+ with
+ enduring
  Roman
- structures
- fell
- into
- dis
-repair
-.","
-Local
- communities
- had
+ influences
+."
+},"checkForUnderstanding":[
+{"
+question":"
+What
+ happened
  to
- adapt
- without
+ Britain
+ after
+ the
+ Romans
+ left
+?
+","answers":["
+It
+ faced
+ invas
+ions
+ from
+ other
+ groups
+"],"distractors":["
+It
+ became
+ a
  Roman
- support
+ province
+","
+It
+ remained
+ peaceful
+"]},{"
+question":"
+Which
+ group
+ invaded
+ Britain
+ after
+ the
+ Romans
+?
+","answers":["
+The
+ Sax
+ons
+"],"distractors":["
+The
+ Greeks
+","
+The
+ Norm
+ans
+"]}],"practice":"
+Draw
+ a
+ picture
+ showing
+ a
+ Roman
+ road
+.
+ Label
+ it
+ and
+ describe
+ its
+ importance
+ in
+ post
+-R
+oman
+ Britain
 .","
-C
-ultural
+feedback":"
+Model
+ answer
+:
+ Roman
+ roads
+ remained
+ important
+ for
+ trade
  and
- technological
- changes
- occurred
+ travel
+ in
  post
 -R
 oman
- rule
-.
-"]}},{"
+ Britain
+,
+ influencing
+ settlement
+ patterns
+."
+}},"status":"
+complete
+"},{"
 type":"
 patch
 ","reasoning":"
-Address
-ing
- common
- misconceptions
- to
- ensure
- they
- are
- clarified
- in
+Form
+ulated
  the
- lesson
+ third
+ learning
+ cycle
+ focusing
+ on
+ archaeological
+ discoveries
+ of
+ Roman
+ Britain
 .","
 value":{"
 type":"
-mis
-con
-ceptions
+cycle
 ","op":"
 add
 ","path":"/
-mis
-con
-ceptions
-","value":[
-{"
-misconception":"
-Romans
- were
- forced
- out
+cycle
+3
+","value":{"
+title":"
+Ar
+chae
+ologists
+ and
+ Roman
+ Britain
+","durationInMinutes":15
+,"explanation":{"
+spokenExplanation":["
+Define
+ the
+ role
  of
+ archae
+ologists
+ in
+ studying
+ history
+.","
+Explain
+ how
+ archae
+ologists
+ uncover
+ Roman
+ artifacts
+ through
+ excav
+ations
+.","
+Discuss
+ the
+ types
+ of
+ artifacts
+ commonly
+ found
+ from
+ Roman
  Britain
- by
- barb
-arians
-","description":"
-The
- Romans
- left
+.","
+Describe
+ how
+ these
+ discoveries
+ help
+ us
+ understand
+ Roman
+ life
+ and
+ influence
+.","
+Mention
+ key
+ archaeological
+ sites
+ in
  Britain
- mainly
- due
+ linked
  to
- internal
- issues
- in
  the
+ Romans
+."
+],"accompanyingSlideDetails":"
+Images
+ of
  Roman
- Empire
-.
- This
- can
- be
- clarified
- by
- explaining
- the
+ artifacts
+ and
+ archaeological
+ sites
+ in
+ Britain
+.","
+imagePrompt":"
+Roman
+ artifacts
+ from
+ Britain
+","slideText":"
+Ar
+chae
+ologists
+ uncover
  Roman
- Empire
-'s
- struggles
-."
-},{"
-misconception":"
-Brit
-ain
- became
- immediately
- barbar
-ic
- after
- Romans
- left
-","description":"
-Although
- there
- were
- challenges
+ history
+ through
+ excav
+ations
 ,
+ revealing
+ insights
+ into
+ life
+ in
+ Roman
  Britain
- continued
- to
- have
- structured
- communities
+."
+},"checkForUnderstanding":[
+{"
+question":"
+What
+ do
+ archae
+ologists
+ do
+?
+","answers":["
+Study
+ history
+ through
+ excav
+ations
+"],"distractors":["
+Write
+ history
+ books
+","
+Teach
+ in
+ schools
+"]},{"
+question":"
+Why
+ are
+ Roman
+ artifacts
+ important
+?
+","answers":["
+They
+ help
+ us
+ understand
+ Roman
+ life
+"],"distractors":["
+They
+ are
+ decorative
+","
+They
+ are
+ made
+ of
+ gold
+"]}],"practice":"
+Match
+ pictures
+ of
+ Roman
+ artifacts
+ with
+ their
+ descriptions
  and
- slowly
- adapted
- without
+ explain
+ their
+ significance
+ in
+ Roman
+ history
+.","
+feedback":"
+Model
+ answer
+:
  Roman
- governance
+ coins
+,
+ pottery
+,
+ and
+ tools
+ reveal
+ daily
+ life
+ and
+ trade
+ practices
+ in
+ Roman
+ Britain
 ."
-}]}},{"
+}},"status":"
+complete
+"},{"
 type":"
 patch
 ","reasoning":"
-Including
- keywords
+Designed
+ an
+ exit
+ quiz
  to
- bolster
- vocabulary
- comprehension
- for
+ assess
+ pupils
+'
+ understanding
+ of
  the
  lesson
+'s
+ key
+ concepts
 .","
 value":{"
 type":"
-keywords
+quiz
 ","op":"
 add
 ","path":"/
-keywords
+exit
+Quiz
 ","value":[
 {"
-keyword":"
-Roman
- Empire
-","definition":"
-The
- vast
+question":"
+When
+ did
+ the
+ Romans
+ leave
+ Britain
+?
+","answers":["
+Around
+ AD
+ 
+410
+"],"distractors":["
+Around
+ AD
+ 
+300
+","
+Around
+ AD
+ 
+500
+"]},{"
+question":"
+What
+ was
+ one
+ reason
+ for
+ the
+ Roman
+ departure
+?
+","answers":["
+Internal
  empire
- ruled
+ pressures
+"],"distractors":["
+Def
+eat
  by
- Rome
- that
- included
+ Brit
+ons
+","
+L
+ack
+ of
+ interest
+ in
  Britain
- for
- nearly
- 
-400
- years
-."
-},{"
-keyword":"
-Withdrawal
-","definition":"
+"]},{"
+question":"
+Who
+ invaded
+ Britain
+ after
+ the
+ Romans
+ left
+?
+","answers":["
 The
- act
- of
- pulling
- out
- or
- leaving
- a
- place
- or
- position
-."
-},{"
-keyword":"
-Inv
-aders
-","definition":"
-People
- or
- groups
- that
- enter
- a
- region
- to
- take
- control
-."
-}]}}],"prompt":{"
+ Sax
+ons
+"],"distractors":["
+The
+ Norm
+ans
+","
+The
+ Vikings
+"]},{"
+question":"
+What
+ did
+ archae
+ologists
+ find
+ in
+ Roman
+ Britain
+?
+","answers":["
+Artifacts
+ like
+ coins
+ and
+ pottery
+"],"distractors":["
+Modern
+ buildings
+","
+Anc
+ient
+ books
+"]},{"
+question":"
+Why
+ are
+ Roman
+ roads
+ significant
+?
+","answers":["
+They
+ influenced
+ travel
+ and
+ trade
+"],"distractors":["
+They
+ were
+ all
+ destroyed
+","
+They
+ were
+ only
+ decorative
+"]},{"
+question":"
+What
+ role
+ do
+ archae
+ologists
+ play
+ in
+ history
+?
+","answers":["
+They
+ uncover
+ past
+ through
+ excav
+ations
+"],"distractors":["
+They
+ build
+ new
+ sites
+","
+They
+ rule
+ ancient
+ lands
+"]}]},"status":"
+complete
+"}],"sectionsEdited":["
+starter
+Quiz
+","
+cycle
+1
+","
+cycle
+2
+","
+cycle
+3
+","
+exit
+Quiz
+"],"prompt":{"
 type":"
 text
 ","value":"
-The
- prior
- knowledge
+Are
+ the
+ starter
+ quiz
 ,
- key
  learning
- points
-,
- misconceptions
+ cycles
 ,
  and
- keywords
- have
- been
- set
-.
- Are
- these
+ exit
+ quiz
  sections
  suitable
  for
@@ -360,13 +1132,29 @@ The
  class
 ?
  If
- you
- need
- any
- changes
+ not
+,
+ reply
+ with
+ what
+ I
+ should
+ change
+.
+ Otherwise
 ,
- let
- me
- know
-!"
-}}
\ No newline at end of file
+ tap
+ **
+Continue
+**
+ to
+ move
+ on
+ to
+ the
+ next
+ step
+."
+},"status":"
+complete
+"}
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-3.formatted.json b/apps/nextjs/tests-e2e/recordings/roman-britain-3.formatted.json
index d7e4fd886..82d9720d8 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-3.formatted.json
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-3.formatted.json
@@ -1,83 +1,318 @@
 {
   "type": "llmMessage",
+  "sectionsToEdit": [
+    "starterQuiz",
+    "cycle1",
+    "cycle2",
+    "cycle3",
+    "exitQuiz"
+  ],
   "patches": [
     {
       "type": "patch",
-      "reasoning": "Establishing key prior knowledge to ensure pupils have the foundational understanding necessary for this lesson.",
+      "reasoning": "Designed a starter quiz to assess pupils' prior knowledge on Roman Britain before the main lesson content.",
       "value": {
-        "type": "string-array",
+        "type": "quiz",
         "op": "add",
-        "path": "/priorKnowledge",
+        "path": "/starterQuiz",
         "value": [
-          "Romans invaded Britain in 43 AD.",
-          "Roman roads connected towns across Britain.",
-          "Romans built Hadrian's Wall in the north of Britain.",
-          "Romans introduced new food and customs to Britain.",
-          "Some Britons adopted Roman ways of life."
+          {
+            "question": "What did the Romans build in Britain during their rule?",
+            "answers": [
+              "Roads and towns"
+            ],
+            "distractors": [
+              "Castles and forts",
+              "Schools and hospitals"
+            ]
+          },
+          {
+            "question": "How long did the Romans rule over Britain?",
+            "answers": [
+              "Several centuries"
+            ],
+            "distractors": [
+              "A few years",
+              "A decade"
+            ]
+          },
+          {
+            "question": "What is an empire?",
+            "answers": [
+              "A large group of territories ruled by one authority"
+            ],
+            "distractors": [
+              "A small country",
+              "A type of government"
+            ]
+          },
+          {
+            "question": "What role do archaeologists play in history?",
+            "answers": [
+              "They study human history by digging up ancient sites"
+            ],
+            "distractors": [
+              "They write history books",
+              "They teach history in schools"
+            ]
+          },
+          {
+            "question": "Which empire did Britain belong to during Roman rule?",
+            "answers": [
+              "The Roman Empire"
+            ],
+            "distractors": [
+              "The Greek Empire",
+              "The Egyptian Empire"
+            ]
+          },
+          {
+            "question": "What is one thing pupils should understand before this lesson?",
+            "answers": [
+              "The concept of an empire"
+            ],
+            "distractors": [
+              "The history of the Saxons",
+              "The fall of the Roman Empire"
+            ]
+          }
         ]
-      }
+      },
+      "status": "complete"
     },
     {
       "type": "patch",
-      "reasoning": "Identifying key learning points to ensure the lesson covers the most important aspects of the topic.",
+      "reasoning": "Developed the first learning cycle focusing on explaining why the Romans left Britain.",
       "value": {
-        "type": "string-array",
+        "type": "cycle",
         "op": "add",
-        "path": "/keyLearningPoints",
-        "value": [
-          "The Romans left Britain around 410 AD.",
-          "Roman withdrawal left Britain vulnerable to invasions.",
-          "Many Roman structures fell into disrepair.",
-          "Local communities had to adapt without Roman support.",
-          "Cultural and technological changes occurred post-Roman rule."
-        ]
-      }
+        "path": "/cycle1",
+        "value": {
+          "title": "Why the Romans Left Britain",
+          "durationInMinutes": 15,
+          "explanation": {
+            "spokenExplanation": [
+              "Discuss the pressures faced by the Roman Empire around AD 410.",
+              "Explain how internal conflicts weakened the Roman control over distant regions like Britain.",
+              "Describe the external threats from other tribes and groups that required Roman attention elsewhere.",
+              "Mention how resources and troops were needed more urgently in other parts of the empire.",
+              "Highlight that the decision to leave was strategic, not due to defeat by Britons."
+            ],
+            "accompanyingSlideDetails": "A timeline showing key events leading to the Roman departure from Britain.",
+            "imagePrompt": "Roman Empire timeline AD 410",
+            "slideText": "The Romans left Britain around AD 410 due to internal and external pressures on their empire."
+          },
+          "checkForUnderstanding": [
+            {
+              "question": "Why did the Romans decide to leave Britain?",
+              "answers": [
+                "Due to internal and external pressures"
+              ],
+              "distractors": [
+                "They were defeated by Britons",
+                "They found new lands"
+              ]
+            },
+            {
+              "question": "What was a major factor in the Roman departure from Britain?",
+              "answers": [
+                "Resource needs elsewhere"
+              ],
+              "distractors": [
+                "British rebellion",
+                "New Roman emperor"
+              ]
+            }
+          ],
+          "practice": "List two reasons why the Romans left Britain and explain how these reasons impacted their empire.",
+          "feedback": "Model answer: The Romans left due to internal conflicts and external threats. These weakened their control, requiring resources elsewhere."
+        }
+      },
+      "status": "complete"
     },
     {
       "type": "patch",
-      "reasoning": "Addressing common misconceptions to ensure they are clarified in the lesson.",
+      "reasoning": "Created the second learning cycle to describe changes in Britain post-Romans.",
       "value": {
-        "type": "misconceptions",
+        "type": "cycle",
         "op": "add",
-        "path": "/misconceptions",
-        "value": [
-          {
-            "misconception": "Romans were forced out of Britain by barbarians",
-            "description": "The Romans left Britain mainly due to internal issues in the Roman Empire. This can be clarified by explaining the Roman Empire's struggles."
+        "path": "/cycle2",
+        "value": {
+          "title": "Changes in Post-Roman Britain",
+          "durationInMinutes": 15,
+          "explanation": {
+            "spokenExplanation": [
+              "Explain how the departure of Romans led to power vacuums in Britain.",
+              "Discuss the arrival of the Saxons and other groups invading Britain.",
+              "Describe the changes in town structures and the decline of Roman-built infrastructure.",
+              "Highlight the blend of Roman and new cultural influences in Britain.",
+              "Show examples of Roman architecture that remained influential."
+            ],
+            "accompanyingSlideDetails": "Images showing Roman roads and Saxon settlements.",
+            "imagePrompt": "Roman roads and Saxon settlements",
+            "slideText": "After the Romans left, Britain faced invasions and cultural changes with enduring Roman influences."
           },
-          {
-            "misconception": "Britain became immediately barbaric after Romans left",
-            "description": "Although there were challenges, Britain continued to have structured communities and slowly adapted without Roman governance."
-          }
-        ]
-      }
+          "checkForUnderstanding": [
+            {
+              "question": "What happened to Britain after the Romans left?",
+              "answers": [
+                "It faced invasions from other groups"
+              ],
+              "distractors": [
+                "It became a Roman province",
+                "It remained peaceful"
+              ]
+            },
+            {
+              "question": "Which group invaded Britain after the Romans?",
+              "answers": [
+                "The Saxons"
+              ],
+              "distractors": [
+                "The Greeks",
+                "The Normans"
+              ]
+            }
+          ],
+          "practice": "Draw a picture showing a Roman road. Label it and describe its importance in post-Roman Britain.",
+          "feedback": "Model answer: Roman roads remained important for trade and travel in post-Roman Britain, influencing settlement patterns."
+        }
+      },
+      "status": "complete"
     },
     {
       "type": "patch",
-      "reasoning": "Including keywords to bolster vocabulary comprehension for the lesson.",
+      "reasoning": "Formulated the third learning cycle focusing on archaeological discoveries of Roman Britain.",
       "value": {
-        "type": "keywords",
+        "type": "cycle",
         "op": "add",
-        "path": "/keywords",
+        "path": "/cycle3",
+        "value": {
+          "title": "Archaeologists and Roman Britain",
+          "durationInMinutes": 15,
+          "explanation": {
+            "spokenExplanation": [
+              "Define the role of archaeologists in studying history.",
+              "Explain how archaeologists uncover Roman artifacts through excavations.",
+              "Discuss the types of artifacts commonly found from Roman Britain.",
+              "Describe how these discoveries help us understand Roman life and influence.",
+              "Mention key archaeological sites in Britain linked to the Romans."
+            ],
+            "accompanyingSlideDetails": "Images of Roman artifacts and archaeological sites in Britain.",
+            "imagePrompt": "Roman artifacts from Britain",
+            "slideText": "Archaeologists uncover Roman history through excavations, revealing insights into life in Roman Britain."
+          },
+          "checkForUnderstanding": [
+            {
+              "question": "What do archaeologists do?",
+              "answers": [
+                "Study history through excavations"
+              ],
+              "distractors": [
+                "Write history books",
+                "Teach in schools"
+              ]
+            },
+            {
+              "question": "Why are Roman artifacts important?",
+              "answers": [
+                "They help us understand Roman life"
+              ],
+              "distractors": [
+                "They are decorative",
+                "They are made of gold"
+              ]
+            }
+          ],
+          "practice": "Match pictures of Roman artifacts with their descriptions and explain their significance in Roman history.",
+          "feedback": "Model answer: Roman coins, pottery, and tools reveal daily life and trade practices in Roman Britain."
+        }
+      },
+      "status": "complete"
+    },
+    {
+      "type": "patch",
+      "reasoning": "Designed an exit quiz to assess pupils' understanding of the lesson's key concepts.",
+      "value": {
+        "type": "quiz",
+        "op": "add",
+        "path": "/exitQuiz",
         "value": [
           {
-            "keyword": "Roman Empire",
-            "definition": "The vast empire ruled by Rome that included Britain for nearly 400 years."
+            "question": "When did the Romans leave Britain?",
+            "answers": [
+              "Around AD 410"
+            ],
+            "distractors": [
+              "Around AD 300",
+              "Around AD 500"
+            ]
+          },
+          {
+            "question": "What was one reason for the Roman departure?",
+            "answers": [
+              "Internal empire pressures"
+            ],
+            "distractors": [
+              "Defeat by Britons",
+              "Lack of interest in Britain"
+            ]
+          },
+          {
+            "question": "Who invaded Britain after the Romans left?",
+            "answers": [
+              "The Saxons"
+            ],
+            "distractors": [
+              "The Normans",
+              "The Vikings"
+            ]
+          },
+          {
+            "question": "What did archaeologists find in Roman Britain?",
+            "answers": [
+              "Artifacts like coins and pottery"
+            ],
+            "distractors": [
+              "Modern buildings",
+              "Ancient books"
+            ]
           },
           {
-            "keyword": "Withdrawal",
-            "definition": "The act of pulling out or leaving a place or position."
+            "question": "Why are Roman roads significant?",
+            "answers": [
+              "They influenced travel and trade"
+            ],
+            "distractors": [
+              "They were all destroyed",
+              "They were only decorative"
+            ]
           },
           {
-            "keyword": "Invaders",
-            "definition": "People or groups that enter a region to take control."
+            "question": "What role do archaeologists play in history?",
+            "answers": [
+              "They uncover past through excavations"
+            ],
+            "distractors": [
+              "They build new sites",
+              "They rule ancient lands"
+            ]
           }
         ]
-      }
+      },
+      "status": "complete"
     }
   ],
+  "sectionsEdited": [
+    "starterQuiz",
+    "cycle1",
+    "cycle2",
+    "cycle3",
+    "exitQuiz"
+  ],
   "prompt": {
     "type": "text",
-    "value": "The prior knowledge, key learning points, misconceptions, and keywords have been set. Are these sections suitable for your class? If you need any changes, let me know!"
-  }
+    "value": "Are the starter quiz, learning cycles, and exit quiz sections suitable for your class? If not, reply with what I should change. Otherwise, tap **Continue** to move on to the next step."
+  },
+  "status": "complete"
 }
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-3.moderation.json b/apps/nextjs/tests-e2e/recordings/roman-britain-3.moderation.json
index a65498eef..33a48873c 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-3.moderation.json
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-3.moderation.json
@@ -1,14 +1,14 @@
 {
-  "id": "chatcmpl-AAdCU7gblV63CXLpunQCC7o2hxAZh",
+  "id": "chatcmpl-ANdXfnfoZyYbX8821gnToLzVG2k6N",
   "object": "chat.completion",
-  "created": 1727097330,
+  "created": 1730196907,
   "model": "gpt-4o-2024-08-06",
   "choices": [
     {
       "index": 0,
       "message": {
         "role": "assistant",
-        "content": "{\"scores\":{\"l\":5,\"v\":5,\"u\":5,\"s\":5,\"p\":5,\"t\":5},\"justification\":\"The lesson plan on 'End of Roman Britain' for key-stage-1 students is fully compliant across all categories. There is no use of discriminatory or offensive language, nor is there any depiction or discussion of violence, serious conflict, or sexual violence. The content does not contain upsetting, sensitive, or distressing topics, such as criminal behavior or mental health issues, which are not appropriate for the intended young audience. Additionally, there is no depiction or discussion of nudity or sexual content. The lesson plan does not involve exploration of objects, use of potentially hazardous equipment, imitable behaviors, or physical activities that would require supervision. Finally, there is no presence of toxic content such as guides or encouragements of harmful or illegal activities. The lesson content is entirely appropriate for the key-stage-1 age group.\",\"categories\":[]}",
+        "content": "{\"scores\":{\"l\":5,\"v\":5,\"u\":5,\"s\":5,\"p\":5,\"t\":5},\"justification\":\"The lesson plan titled 'End of Roman Britain' is fully compliant across all category groups for key-stage 1 history. It does not contain any discriminatory language, offensive content, or strong language. The content does not depict or discuss conflict, violence, or sensitive subjects, and there is no mention of nudity or sexual content. Physical activities, if any, are not hazardous or require special supervision. Furthermore, there are no guides or encouragements for harmful or illegal behavior. The content is appropriate for young learners, focusing on historical events and archaeological studies related to Roman Britain, presented in an educational and age-appropriate manner.\",\"categories\":[]}",
         "refusal": null
       },
       "logprobs": null,
@@ -16,12 +16,15 @@
     }
   ],
   "usage": {
-    "prompt_tokens": 2530,
-    "completion_tokens": 195,
-    "total_tokens": 2725,
+    "prompt_tokens": 3796,
+    "completion_tokens": 158,
+    "total_tokens": 3954,
+    "prompt_tokens_details": {
+      "cached_tokens": 2432
+    },
     "completion_tokens_details": {
       "reasoning_tokens": 0
     }
   },
-  "system_fingerprint": "fp_7568d46099"
+  "system_fingerprint": "fp_90354628f2"
 }
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-4.chunks.txt b/apps/nextjs/tests-e2e/recordings/roman-britain-4.chunks.txt
index 4f299f15d..0a04db3ce 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-4.chunks.txt
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-4.chunks.txt
@@ -3,1015 +3,392 @@ type":"
 ll
 m
 Message
-","patches":[
+","sectionsToEdit":["
+additional
+Materials
+"],"patches":[
 {"
 type":"
 patch
 ","reasoning":"
-Creating
- a
- Starter
- Quiz
- to
- check
- prior
- knowledge
- before
- the
- lesson
- begins
-.","
-value":{"
-type":"
-quiz
-","op":"
-add
-","path":"/
-starter
-Quiz
-","value":[
-{"
-question":"
-When
- did
- the
- Romans
- invade
- Britain
-?
-","answers":["
-43
- AD
-"],"distractors":["
-410
- AD
-","
-106
-6
- AD
-"]},{"
-question":"
-What
- was
- Had
-rian
-'s
- Wall
-?
-","answers":["
-A
- wall
- built
- by
- Romans
+Providing
+ additional
+ materials
  in
  the
- north
+ form
  of
- Britain
-"],"distractors":["
-A
- wall
- built
- by
- Brit
-ons
+ a
+ narrative
+ script
  to
- keep
- Romans
- out
-","
-A
- wall
+ support
+ the
+ teacher
  in
- Rome
-"]},{"
-question":"
-What
- connected
- towns
- across
- Roman
- Britain
-?
-","answers":["
-Roman
- roads
-"],"distractors":["
-Can
-als
-","
-R
-ivers
-"]},{"
-question":"
-What
- did
- Romans
- introduce
- to
- Britain
-?
-","answers":["
-New
- food
- and
- customs
-"],"distractors":["
-The
- English
- language
-","
-Modern
- technology
-"]},{"
-question":"
-Who
- adopted
+ delivering
+ complex
+ topics
+ about
  Roman
- ways
- of
- life
-?
-","answers":["
-Some
- Brit
-ons
-"],"distractors":["
-All
- Brit
-ons
-","
-None
- of
- the
- Brit
-ons
-"]},{"
-question":"
-What
- year
- did
- the
- Romans
- leave
- Britain
-?
-","answers":["
-410
- AD
-"],"distractors":["
-43
- AD
-","
-106
-6
- AD
-"]}]}},{"
-type":"
-patch
-","reasoning":"
-Design
-ing
- the
- first
- learning
- cycle
- to
- introduce
- why
- the
- Romans
- left
  Britain
 .","
 value":{"
 type":"
-cycle
+string
 ","op":"
 add
 ","path":"/
-cycle
-1
-","value":{"
-title":"
-Reasons
+additional
+Materials
+","value":"
+##
+ Narrative
+ Script
  for
- Roman
- Departure
-","durationInMinutes":15
-,"explanation":{"
-spokenExplanation":["
-Discuss
- the
- internal
- struggles
- of
- the
- Roman
- Empire
- around
- 
-410
- AD
-.","
-Explain
- how
- these
- struggles
- led
+ Teachers
+\n
+\n
+\"
+Today
+,
+ we're
+ going
+ to
+ travel
+ back
+ in
+ time
  to
+ when
  the
- withdrawal
- from
+ Romans
+ were
+ in
  Britain
-.","
-Introduce
- the
- concept
- of
- '
-withdraw
-al
-'
- as
+.
+ Imagine
+ you
+ are
  a
- strategic
- move
- by
- the
- Romans
-.","
-Link
- how
- the
  Roman
- Empire
-'s
- focus
- shifted
- elsewhere
- due
- to
- these
- struggles
-."
-],"accompanyingSlideDetails":"
-A
- map
- showing
- the
- Roman
- Empire
+ soldier
+,
+ wearing
+ your
+ armour
  and
- its
- extent
+ sandals
 ,
- highlighting
- Britain
-.","
-imagePrompt":"
-Roman
- Empire
- map
- 
-410
- AD
-","slideText":"
-The
- Romans
- left
- Britain
+ walking
+ the
+ long
+ roads
+ they
+ built
+.
+ These
+ roads
+ were
+ very
+ important
+ because
+ they
+ connected
+ towns
+ and
+ made
+ travel
+ easier
+.
+ But
  around
+ AD
  
 410
- AD
- due
- to
- internal
- struggles
-.
- They
- withdrew
- strategically
-."
-},"checkForUnderstanding":[
-{"
-question":"
-Why
- did
- the
- Romans
- leave
- Britain
-?
-","answers":["
-Internal
- struggles
- in
+,
  the
  Roman
  Empire
-"],"distractors":["
-British
- rebellion
-","
-Bar
-bar
-ian
- invasion
-"]},{"
-question":"
-What
- does
- '
-withdraw
-al
-'
- mean
- in
- this
- context
-?
-","answers":["
-Leaving
- a
- place
- or
- position
-"],"distractors":["
-Att
-acking
- a
- place
-","
-Building
- a
- wall
-"]}],"practice":"
-List
- two
- reasons
- why
- the
- Romans
+ was
+ facing
+ big
+ problems
+.
+ They
+ needed
+ their
+ soldiers
+ back
+ home
+ to
+ help
+ fight
+ battles
+ elsewhere
+.
+ So
+,
+ they
  decided
  to
- withdraw
- from
+ leave
  Britain
+.\
+n
+\n
+Now
 ,
- using
+ picture
  the
- slide
- for
- guidance
-.","
-feedback":"
-Model
- answer
-:
- 
-1
-.
- Internal
- struggles
+ changes
  in
+ Britain
+ when
  the
- Roman
- Empire
-.
- 
-2
+ Romans
+ left
 .
- Shift
-ed
- focus
- to
- other
- regions
-."
-}}},{"
-type":"
-patch
-","reasoning":"
-Organ
-izing
+ New
+ groups
+ like
  the
- second
- learning
- cycle
+ Sax
+ons
+ came
+ and
+ started
  to
- cover
- the
- immediate
- effects
- on
- local
- communities
- after
- Roman
- withdrawal
-.","
-value":{"
-type":"
-cycle
-","op":"
-add
-","path":"/
-cycle
-2
-","value":{"
-title":"
-Immediate
- Effects
- on
- Local
- Communities
-","durationInMinutes":15
-,"explanation":{"
-spokenExplanation":["
-Describe
- how
+ live
+ here
+.
+ The
  Roman
- withdrawal
- left
- Britain
- vulnerable
- to
- invas
-ions
-.","
-Explain
- the
- immediate
- impact
- on
- local
- communities
+ buildings
+ slowly
+ changed
+ or
+ disappeared
 ,
- such
- as
- lack
- of
- Roman
- support
-.","
-Discuss
- the
- decline
- of
- Roman
- structures
- and
+ but
+ some
+ things
+,
+ like
  roads
- over
- time
-."
-],"accompanyingSlideDetails":"
-Images
- of
- Roman
- ruins
  and
- a
- map
- of
- Britain
- showing
- vulnerable
- areas
- after
- Roman
- withdrawal
-.","
-imagePrompt":"
-Roman
- ruins
- Britain
-","slideText":"
-Roman
- withdrawal
- left
- Britain
- vulnerable
- to
- invas
-ions
+ towns
+,
+ stayed
  and
- local
- communities
- without
- support
-."
-},"checkForUnderstanding":[
-{"
-question":"
-What
- happened
- to
- Roman
- structures
- after
- the
- Romans
- left
-?
-","answers":["
-They
- fell
- into
- dis
-repair
-"],"distractors":["
-They
- were
- improved
-","
-They
- turned
- into
- castles
-"]},{"
-question":"
-How
- did
- Roman
- withdrawal
- affect
- local
- communities
-?
-","answers":["
-Commun
-ities
- lacked
- Roman
- support
-"],"distractors":["
-Commun
-ities
- became
- wealth
-ier
-","
-Commun
-ities
- built
- new
- structures
-"]}],"practice":"
-Describe
- one
- immediate
- effect
- on
- local
- communities
- after
- the
- Romans
- left
+ influenced
+ how
+ people
+ lived
+.\
+n
+\n
+Ar
+chae
+ologists
+ are
+ like
+ detectives
 .
- Use
- examples
- from
- the
- slide
- to
- help
- your
- understanding
-.","
-feedback":"
-Model
- answer
-:
- Local
- communities
- lacked
+ They
+ dig
+ up
+ old
  Roman
- support
+ coins
+,
+ pottery
+,
  and
- faced
- invas
-ions
-."
-}}},{"
-type":"
-patch
-","reasoning":"
-Creating
- the
- third
- learning
- cycle
+ tools
  to
- focus
- on
+ learn
+ about
  how
- Britain
- changed
- in
+ people
+ lived
+ back
+ then
+.
+ These
+ discoveries
+ tell
+ us
+ exciting
+ stories
+ about
+ the
+ past
+,
+ like
+ what
  the
- years
- following
- Roman
- departure
-.","
-value":{"
-type":"
-cycle
-","op":"
-add
-","path":"/
-cycle
-3
-","value":{"
-title":"
-Long
--term
- Changes
- in
- Britain
-","durationInMinutes":15
-,"explanation":{"
-spokenExplanation":["
-Explain
- how
- Britain
- adapted
- and
- changed
- culturally
- and
- technologically
- post
--R
-oman
- rule
-.","
-Discuss
+ Romans
+ ate
+,
  the
- blend
- of
- Roman
+ clothes
+ they
+ wore
+,
  and
- local
- traditions
- that
- emerged
-.","
-Highlight
  the
- technological
- changes
- that
- occurred
- as
+ games
+ they
+ played
+.\
+n
+\n
+Remember
+,
+ history
+ is
  a
- result
+ puzzle
+,
+ and
+ each
+ piece
+ helps
+ us
+ understand
+ more
+ about
+ our
+ world
+ today
+.
+\"\
+n
+\n
+###
+ Key
+ Points
+ for
+ Explanation
+\n
+-
+ Importance
  of
  Roman
- influence
-."
-],"accompanyingSlideDetails":"
-A
- timeline
- showing
- cultural
+ roads
  and
- technological
- changes
- in
- Britain
- after
- Romans
-.","
-imagePrompt":"
-Post
--R
-oman
- Britain
- timeline
-","slideText":"
-Post
+ infrastructure
+.\
+n
+-
+ Reasons
+ for
+ Roman
+ departure
+ due
+ to
+ empire
+ pressures
+.\
+n
+-
+ Post
 -R
 oman
- Britain
- saw
- cultural
- and
- technological
  changes
-,
- blending
- Roman
  and
- local
- traditions
-."
-},"checkForUnderstanding":[
-{"
-question":"
-How
- did
- Britain's
- culture
- change
- after
- the
- Romans
- left
-?
-","answers":["
-Bl
-ended
- Roman
- and
- local
- traditions
-"],"distractors":["
-B
-ec
-ame
- entirely
- Roman
-","
-Forgot
- Roman
- ways
-"]},{"
-question":"
-What
- type
+ Sax
+on
+ invas
+ions
+.\
+n
+-
+ Role
  of
- changes
- occurred
+ archae
+ologists
  in
- Britain
- after
- Roman
- rule
-?
-","answers":["
-C
-ultural
- and
- technological
-"],"distractors":["
-Only
- political
-","
-Only
- economical
-"]}],"practice":"
-Explain
- one
- cultural
- or
- technological
- change
- in
- Britain
- after
- the
- Romans
- left
-.
- Provide
- an
- example
- from
- the
- slide
-.","
-feedback":"
-Model
- answer
-:
- The
- blend
- of
- Roman
- and
- local
- traditions
- led
- to
- new
- cultural
- practices
-."
-}}},{"
-type":"
-patch
-","reasoning":"
-Creating
- an
- Exit
- Quiz
- to
- assess
- understanding
- of
- the
- lesson
- topics
-.","
-value":{"
-type":"
-quiz
-","op":"
-add
-","path":"/
-exit
-Quiz
-","value":[
-{"
-question":"
-When
- did
- the
- Romans
- leave
- Britain
-?
-","answers":["
-Around
- 
-410
- AD
-"],"distractors":["
-43
- AD
-","
-106
-6
- AD
-"]},{"
-question":"
-What
- was
- a
- reason
+ uncover
+ing
+ history
+.\
+n
+\n
+Search
+ terms
  for
- Roman
- withdrawal
-?
-","answers":["
-Internal
- struggles
-"],"distractors":["
-British
- alliance
-","
+ images
+:
+ \"
 Roman
- expansion
-"]},{"
-question":"
-How
- were
- Roman
- structures
- affected
- after
- withdrawal
-?
-","answers":["
-F
-ell
- into
- dis
-repair
-"],"distractors":["
-B
-ec
-ame
- museums
-","
-Were
- exported
-"]},{"
-question":"
-What
- did
- local
- communities
- lack
- after
- Roman
- withdrawal
-?
-","answers":["
+ soldier
+ armour
+\",
+ \"
 Roman
- support
-"],"distractors":["
-Water
- supply
-","
-New
  roads
-"]},{"
-question":"
-What
- cultural
- changes
- occurred
- after
- Roman
- rule
-?
-","answers":["
-Bl
-ended
- Roman
- and
- local
- traditions
-"],"distractors":["
-Ad
-opt
-ed
- only
- Roman
- traditions
-","
-El
-imin
-ated
- Roman
- influence
-"]},{"
-question":"
-What
- kind
- of
- changes
- did
- Britain
- experience
- post
--R
-oman
- rule
-?
-","answers":["
-C
-ultural
- and
- technological
-"],"distractors":["
-Only
- military
-","
-Only
- agricultural
-"]}]}}],"prompt":{"
+\",
+ \"
+S
+axon
+ settlements
+\",
+ \"
+Roman
+ artifacts
+\"
+."
+},"status":"
+complete
+"}],"sectionsEdited":["
+additional
+Materials
+"],"prompt":{"
 type":"
 text
 ","value":"
-The
- quizzes
- and
- learning
- cycles
+I
  have
- been
- created
-.
- These
- include
- questions
+ added
+ a
+ narrative
+ script
  to
- test
- understanding
- at
- each
- stage
+ support
+ the
+ lesson
+ delivery
 .
  Are
  the
- quizzes
- and
- learning
- cycles
- at
- an
+ additional
+ materials
  appropriate
- difficulty
- level
  for
  your
  pupils
 ?
- Let
- me
- know
- if
- you
- need
- any
- adjustments
-!"
-}}
\ No newline at end of file
+ If
+ not
+,
+ suggest
+ an
+ edit
+.
+ Otherwise
+,
+ tap
+ **
+Continue
+**
+ to
+ complete
+ the
+ lesson
+ plan
+."
+},"status":"
+complete
+"}
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-4.formatted.json b/apps/nextjs/tests-e2e/recordings/roman-britain-4.formatted.json
index 07ada930a..f584fab37 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-4.formatted.json
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-4.formatted.json
@@ -1,293 +1,27 @@
 {
   "type": "llmMessage",
+  "sectionsToEdit": [
+    "additionalMaterials"
+  ],
   "patches": [
     {
       "type": "patch",
-      "reasoning": "Creating a Starter Quiz to check prior knowledge before the lesson begins.",
-      "value": {
-        "type": "quiz",
-        "op": "add",
-        "path": "/starterQuiz",
-        "value": [
-          {
-            "question": "When did the Romans invade Britain?",
-            "answers": [
-              "43 AD"
-            ],
-            "distractors": [
-              "410 AD",
-              "1066 AD"
-            ]
-          },
-          {
-            "question": "What was Hadrian's Wall?",
-            "answers": [
-              "A wall built by Romans in the north of Britain"
-            ],
-            "distractors": [
-              "A wall built by Britons to keep Romans out",
-              "A wall in Rome"
-            ]
-          },
-          {
-            "question": "What connected towns across Roman Britain?",
-            "answers": [
-              "Roman roads"
-            ],
-            "distractors": [
-              "Canals",
-              "Rivers"
-            ]
-          },
-          {
-            "question": "What did Romans introduce to Britain?",
-            "answers": [
-              "New food and customs"
-            ],
-            "distractors": [
-              "The English language",
-              "Modern technology"
-            ]
-          },
-          {
-            "question": "Who adopted Roman ways of life?",
-            "answers": [
-              "Some Britons"
-            ],
-            "distractors": [
-              "All Britons",
-              "None of the Britons"
-            ]
-          },
-          {
-            "question": "What year did the Romans leave Britain?",
-            "answers": [
-              "410 AD"
-            ],
-            "distractors": [
-              "43 AD",
-              "1066 AD"
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "type": "patch",
-      "reasoning": "Designing the first learning cycle to introduce why the Romans left Britain.",
-      "value": {
-        "type": "cycle",
-        "op": "add",
-        "path": "/cycle1",
-        "value": {
-          "title": "Reasons for Roman Departure",
-          "durationInMinutes": 15,
-          "explanation": {
-            "spokenExplanation": [
-              "Discuss the internal struggles of the Roman Empire around 410 AD.",
-              "Explain how these struggles led to the withdrawal from Britain.",
-              "Introduce the concept of 'withdrawal' as a strategic move by the Romans.",
-              "Link how the Roman Empire's focus shifted elsewhere due to these struggles."
-            ],
-            "accompanyingSlideDetails": "A map showing the Roman Empire and its extent, highlighting Britain.",
-            "imagePrompt": "Roman Empire map 410 AD",
-            "slideText": "The Romans left Britain around 410 AD due to internal struggles. They withdrew strategically."
-          },
-          "checkForUnderstanding": [
-            {
-              "question": "Why did the Romans leave Britain?",
-              "answers": [
-                "Internal struggles in the Roman Empire"
-              ],
-              "distractors": [
-                "British rebellion",
-                "Barbarian invasion"
-              ]
-            },
-            {
-              "question": "What does 'withdrawal' mean in this context?",
-              "answers": [
-                "Leaving a place or position"
-              ],
-              "distractors": [
-                "Attacking a place",
-                "Building a wall"
-              ]
-            }
-          ],
-          "practice": "List two reasons why the Romans decided to withdraw from Britain, using the slide for guidance.",
-          "feedback": "Model answer: 1. Internal struggles in the Roman Empire. 2. Shifted focus to other regions."
-        }
-      }
-    },
-    {
-      "type": "patch",
-      "reasoning": "Organizing the second learning cycle to cover the immediate effects on local communities after Roman withdrawal.",
+      "reasoning": "Providing additional materials in the form of a narrative script to support the teacher in delivering complex topics about Roman Britain.",
       "value": {
-        "type": "cycle",
+        "type": "string",
         "op": "add",
-        "path": "/cycle2",
-        "value": {
-          "title": "Immediate Effects on Local Communities",
-          "durationInMinutes": 15,
-          "explanation": {
-            "spokenExplanation": [
-              "Describe how Roman withdrawal left Britain vulnerable to invasions.",
-              "Explain the immediate impact on local communities, such as lack of Roman support.",
-              "Discuss the decline of Roman structures and roads over time."
-            ],
-            "accompanyingSlideDetails": "Images of Roman ruins and a map of Britain showing vulnerable areas after Roman withdrawal.",
-            "imagePrompt": "Roman ruins Britain",
-            "slideText": "Roman withdrawal left Britain vulnerable to invasions and local communities without support."
-          },
-          "checkForUnderstanding": [
-            {
-              "question": "What happened to Roman structures after the Romans left?",
-              "answers": [
-                "They fell into disrepair"
-              ],
-              "distractors": [
-                "They were improved",
-                "They turned into castles"
-              ]
-            },
-            {
-              "question": "How did Roman withdrawal affect local communities?",
-              "answers": [
-                "Communities lacked Roman support"
-              ],
-              "distractors": [
-                "Communities became wealthier",
-                "Communities built new structures"
-              ]
-            }
-          ],
-          "practice": "Describe one immediate effect on local communities after the Romans left. Use examples from the slide to help your understanding.",
-          "feedback": "Model answer: Local communities lacked Roman support and faced invasions."
-        }
-      }
-    },
-    {
-      "type": "patch",
-      "reasoning": "Creating the third learning cycle to focus on how Britain changed in the years following Roman departure.",
-      "value": {
-        "type": "cycle",
-        "op": "add",
-        "path": "/cycle3",
-        "value": {
-          "title": "Long-term Changes in Britain",
-          "durationInMinutes": 15,
-          "explanation": {
-            "spokenExplanation": [
-              "Explain how Britain adapted and changed culturally and technologically post-Roman rule.",
-              "Discuss the blend of Roman and local traditions that emerged.",
-              "Highlight the technological changes that occurred as a result of Roman influence."
-            ],
-            "accompanyingSlideDetails": "A timeline showing cultural and technological changes in Britain after Romans.",
-            "imagePrompt": "Post-Roman Britain timeline",
-            "slideText": "Post-Roman Britain saw cultural and technological changes, blending Roman and local traditions."
-          },
-          "checkForUnderstanding": [
-            {
-              "question": "How did Britain's culture change after the Romans left?",
-              "answers": [
-                "Blended Roman and local traditions"
-              ],
-              "distractors": [
-                "Became entirely Roman",
-                "Forgot Roman ways"
-              ]
-            },
-            {
-              "question": "What type of changes occurred in Britain after Roman rule?",
-              "answers": [
-                "Cultural and technological"
-              ],
-              "distractors": [
-                "Only political",
-                "Only economical"
-              ]
-            }
-          ],
-          "practice": "Explain one cultural or technological change in Britain after the Romans left. Provide an example from the slide.",
-          "feedback": "Model answer: The blend of Roman and local traditions led to new cultural practices."
-        }
-      }
-    },
-    {
-      "type": "patch",
-      "reasoning": "Creating an Exit Quiz to assess understanding of the lesson topics.",
-      "value": {
-        "type": "quiz",
-        "op": "add",
-        "path": "/exitQuiz",
-        "value": [
-          {
-            "question": "When did the Romans leave Britain?",
-            "answers": [
-              "Around 410 AD"
-            ],
-            "distractors": [
-              "43 AD",
-              "1066 AD"
-            ]
-          },
-          {
-            "question": "What was a reason for Roman withdrawal?",
-            "answers": [
-              "Internal struggles"
-            ],
-            "distractors": [
-              "British alliance",
-              "Roman expansion"
-            ]
-          },
-          {
-            "question": "How were Roman structures affected after withdrawal?",
-            "answers": [
-              "Fell into disrepair"
-            ],
-            "distractors": [
-              "Became museums",
-              "Were exported"
-            ]
-          },
-          {
-            "question": "What did local communities lack after Roman withdrawal?",
-            "answers": [
-              "Roman support"
-            ],
-            "distractors": [
-              "Water supply",
-              "New roads"
-            ]
-          },
-          {
-            "question": "What cultural changes occurred after Roman rule?",
-            "answers": [
-              "Blended Roman and local traditions"
-            ],
-            "distractors": [
-              "Adopted only Roman traditions",
-              "Eliminated Roman influence"
-            ]
-          },
-          {
-            "question": "What kind of changes did Britain experience post-Roman rule?",
-            "answers": [
-              "Cultural and technological"
-            ],
-            "distractors": [
-              "Only military",
-              "Only agricultural"
-            ]
-          }
-        ]
-      }
+        "path": "/additionalMaterials",
+        "value": "## Narrative Script for Teachers\n\n\"Today, we're going to travel back in time to when the Romans were in Britain. Imagine you are a Roman soldier, wearing your armour and sandals, walking the long roads they built. These roads were very important because they connected towns and made travel easier. But around AD 410, the Roman Empire was facing big problems. They needed their soldiers back home to help fight battles elsewhere. So, they decided to leave Britain.\n\nNow, picture the changes in Britain when the Romans left. New groups like the Saxons came and started to live here. The Roman buildings slowly changed or disappeared, but some things, like roads and towns, stayed and influenced how people lived.\n\nArchaeologists are like detectives. They dig up old Roman coins, pottery, and tools to learn about how people lived back then. These discoveries tell us exciting stories about the past, like what the Romans ate, the clothes they wore, and the games they played.\n\nRemember, history is a puzzle, and each piece helps us understand more about our world today.\"\n\n### Key Points for Explanation\n- Importance of Roman roads and infrastructure.\n- Reasons for Roman departure due to empire pressures.\n- Post-Roman changes and Saxon invasions.\n- Role of archaeologists in uncovering history.\n\nSearch terms for images: \"Roman soldier armour\", \"Roman roads\", \"Saxon settlements\", \"Roman artifacts\"."
+      },
+      "status": "complete"
     }
   ],
+  "sectionsEdited": [
+    "additionalMaterials"
+  ],
   "prompt": {
     "type": "text",
-    "value": "The quizzes and learning cycles have been created. These include questions to test understanding at each stage. Are the quizzes and learning cycles at an appropriate difficulty level for your pupils? Let me know if you need any adjustments!"
-  }
+    "value": "I have added a narrative script to support the lesson delivery. Are the additional materials appropriate for your pupils? If not, suggest an edit. Otherwise, tap **Continue** to complete the lesson plan."
+  },
+  "status": "complete"
 }
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-4.moderation.json b/apps/nextjs/tests-e2e/recordings/roman-britain-4.moderation.json
index 415d84318..fb7df491f 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-4.moderation.json
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-4.moderation.json
@@ -1,14 +1,14 @@
 {
-  "id": "chatcmpl-AAdCsMbt9HTt6nlyK1VwS7c30H6ma",
+  "id": "chatcmpl-ANdXxPFyq8YyfRXY85uI1uNrgJ0N9",
   "object": "chat.completion",
-  "created": 1727097354,
+  "created": 1730196925,
   "model": "gpt-4o-2024-08-06",
   "choices": [
     {
       "index": 0,
       "message": {
         "role": "assistant",
-        "content": "{\"scores\":{\"l\":5,\"v\":5,\"u\":5,\"s\":5,\"p\":5,\"t\":5},\"justification\":\"The lesson plan titled 'End of Roman Britain' is designed for Key Stage 1 history students. It focuses on the historical events surrounding the end of Roman rule in Britain and its effects, aiming to describe changes in Britain after the Romans left. The content is age-appropriate and free from any discriminatory language, offensive language, or strong language. There is no depiction or discussion of violence, serious violence, or sexual violence. The lesson does not contain upsetting, sensitive, or distressing content, such as depictions of criminal behavior, unsafe situations, or sensitive topics like mental health or death. There is no depiction or discussion of nudity or sexual content. The lesson does not involve exploration of objects, use of equipment requiring supervision, imitable behaviors, external content, or physical activity. Finally, the lesson plan does not contain any guides or encouragement of harmful behaviors, illegal activity, or violence. Overall, the lesson is fully compliant across all categories.\",\"categories\":[]}",
+        "content": "{\"scores\":{\"l\":5,\"v\":5,\"u\":5,\"s\":5,\"p\":5,\"t\":5},\"justification\":\"The lesson plan for \\\"End of Roman Britain\\\" is appropriate for Key Stage 1 students, with content that is educational and age-appropriate. It focuses on historical events and changes without delving into any potentially offensive or sensitive topics. There is no discriminatory language or behavior. The lesson does not discuss or depict violence or crime, nor does it contain upsetting or sensitive content. There is no mention of nudity or sexual content. The lesson includes standard educational activities and discussions, without involving physical activities requiring safety considerations. Additionally, there is no toxic content, such as instructions or encouragement of harmful or illegal activities. Overall, the lesson is fully compliant with guidelines across all categories.\",\"categories\":[]}",
         "refusal": null
       },
       "logprobs": null,
@@ -16,12 +16,15 @@
     }
   ],
   "usage": {
-    "prompt_tokens": 3627,
-    "completion_tokens": 224,
-    "total_tokens": 3851,
+    "prompt_tokens": 4098,
+    "completion_tokens": 168,
+    "total_tokens": 4266,
+    "prompt_tokens_details": {
+      "cached_tokens": 3584
+    },
     "completion_tokens_details": {
       "reasoning_tokens": 0
     }
   },
-  "system_fingerprint": "fp_7568d46099"
+  "system_fingerprint": "fp_90354628f2"
 }
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-5.chunks.txt b/apps/nextjs/tests-e2e/recordings/roman-britain-5.chunks.txt
index 7fdb79e62..c7e49eda5 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-5.chunks.txt
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-5.chunks.txt
@@ -3,67 +3,53 @@ type":"
 ll
 m
 Message
-","patches":[
-{"
-type":"
-patch
-","reasoning":"
-Adding
- a
- placeholder
- for
- potential
- additional
- materials
- or
- narratives
- that
- may
- support
- the
- lesson
- plan
-.","
-value":{"
-type":"
-string
-","op":"
-add
-","path":"/
-additional
-Materials
-","value":"
-None
-"}}],"prompt":{"
+","sectionsToEdit":[]
+,"patches":[]
+,"sectionsEdited":[]
+,"prompt":{"
 type":"
 text
 ","value":"
-Would
- you
- like
- to
- add
- any
- additional
- materials
-,
- such
- as
- a
- narrative
- to
- support
- your
- explanations
-,
- instructions
+I
+ have
+ checked
  for
- practical
-s
+ British
+ spelling
+ and
+ grammar
 ,
+ coherence
+,
+ and
+ accuracy
+.
+ You
+ can
+ now
+ share
+ your
+ lesson
  or
- extra
- homework
- questions
-?"
-}}
\ No newline at end of file
+ download
+ your
+ resources
+.\
+n
+\n
+Click
+ on
+ the
+ **
+Menu
+**
+ button
+ to
+ find
+ previously
+ created
+ lessons
+."
+},"status":"
+complete
+"}
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-5.formatted.json b/apps/nextjs/tests-e2e/recordings/roman-britain-5.formatted.json
index e12063cac..c446088cb 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-5.formatted.json
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-5.formatted.json
@@ -1,19 +1,11 @@
 {
   "type": "llmMessage",
-  "patches": [
-    {
-      "type": "patch",
-      "reasoning": "Adding a placeholder for potential additional materials or narratives that may support the lesson plan.",
-      "value": {
-        "type": "string",
-        "op": "add",
-        "path": "/additionalMaterials",
-        "value": "None"
-      }
-    }
-  ],
+  "sectionsToEdit": [],
+  "patches": [],
+  "sectionsEdited": [],
   "prompt": {
     "type": "text",
-    "value": "Would you like to add any additional materials, such as a narrative to support your explanations, instructions for practicals, or extra homework questions?"
-  }
+    "value": "I have checked for British spelling and grammar, coherence, and accuracy. You can now share your lesson or download your resources.\n\nClick on the **Menu** button to find previously created lessons."
+  },
+  "status": "complete"
 }
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/recordings/roman-britain-5.moderation.json b/apps/nextjs/tests-e2e/recordings/roman-britain-5.moderation.json
index 6e9784362..221611a02 100644
--- a/apps/nextjs/tests-e2e/recordings/roman-britain-5.moderation.json
+++ b/apps/nextjs/tests-e2e/recordings/roman-britain-5.moderation.json
@@ -1,14 +1,14 @@
 {
-  "id": "chatcmpl-AAdD8dTCVQDaTA5fC2CxjBBenZ9yu",
+  "id": "chatcmpl-ANdYBeKYKlYscRigozQrSkrUxlhAQ",
   "object": "chat.completion",
-  "created": 1727097370,
+  "created": 1730196939,
   "model": "gpt-4o-2024-08-06",
   "choices": [
     {
       "index": 0,
       "message": {
         "role": "assistant",
-        "content": "{\"scores\":{\"l\":5,\"v\":5,\"u\":5,\"s\":5,\"p\":5,\"t\":5},\"justification\":\"The lesson plan for 'End of Roman Britain' is fully compliant with all content guidelines. It does not contain any discriminatory language, offensive or strong language, or depict any violence or crime. The content is sensitive and age-appropriate for Key Stage 1 students, avoiding topics that could be upsetting, disturbing, or sensitive. There are no discussions or depictions of nudity or sexual content. The lesson does not involve any physical activities or use of equipment that require safety supervision. Additionally, there are no toxic elements such as guides for harmful behavior or creation of weapons. The lesson focuses on historical changes in Britain after the Roman withdrawal, presented in a factual and educational manner suitable for young learners.\",\"categories\":[]}",
+        "content": "{\"scores\":{\"l\":5,\"v\":5,\"u\":5,\"s\":5,\"p\":5,\"t\":5},\"justification\":\"The lesson plan on 'End of Roman Britain' is fully compliant across all categories. It does not contain any discriminatory language, offensive language, or strong language. There is no depiction or discussion of conflict, violence, serious violence, or sexual violence. The content is age-appropriate for Key Stage 1 and does not include any upsetting, sensitive, or distressing content. There is no depiction or discussion of nudity or sexual content. The lesson does not involve exploration of objects, use of equipment requiring supervision, imitable behaviors, external content, or physical activity that might require adult supervision. Lastly, it does not contain any toxic content such as guides or encouragements for harmful or illegal activities. The lesson focuses on historical facts in a sensitive and educational manner suitable for young learners.\",\"categories\":[]}",
         "refusal": null
       },
       "logprobs": null,
@@ -16,12 +16,15 @@
     }
   ],
   "usage": {
-    "prompt_tokens": 3632,
-    "completion_tokens": 172,
-    "total_tokens": 3804,
+    "prompt_tokens": 4098,
+    "completion_tokens": 190,
+    "total_tokens": 4288,
+    "prompt_tokens_details": {
+      "cached_tokens": 3968
+    },
     "completion_tokens_details": {
       "reasoning_tokens": 0
     }
   },
-  "system_fingerprint": "fp_7568d46099"
+  "system_fingerprint": "fp_90354628f2"
 }
\ No newline at end of file
diff --git a/apps/nextjs/tests-e2e/tests/aila-chat/downloads.test.ts b/apps/nextjs/tests-e2e/tests/aila-chat/downloads.test.ts
index 4c7126c77..09a85371e 100644
--- a/apps/nextjs/tests-e2e/tests/aila-chat/downloads.test.ts
+++ b/apps/nextjs/tests-e2e/tests/aila-chat/downloads.test.ts
@@ -1,5 +1,6 @@
 import { setupClerkTestingToken } from "@clerk/testing/playwright";
-import { test, expect, Page } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { test, expect } from "@playwright/test";
 
 import { TEST_BASE_URL } from "../../config/config";
 import { bypassVercelProtection } from "../../helpers/vercel";
diff --git a/apps/nextjs/tests-e2e/tests/aila-chat/full-romans.mobile.test.ts b/apps/nextjs/tests-e2e/tests/aila-chat/full-romans.mobile.test.ts
index 6575dc56e..176bc5693 100644
--- a/apps/nextjs/tests-e2e/tests/aila-chat/full-romans.mobile.test.ts
+++ b/apps/nextjs/tests-e2e/tests/aila-chat/full-romans.mobile.test.ts
@@ -1,21 +1,25 @@
 import { setupClerkTestingToken } from "@clerk/testing/playwright";
-import { test, expect, Page } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { test, expect } from "@playwright/test";
 
 import { TEST_BASE_URL } from "../../config/config";
 import { bypassVercelProtection } from "../../helpers/vercel";
+import type { FixtureMode } from "./helpers";
 import {
-  FixtureMode,
   applyLlmFixtures,
   continueChat,
   expectFinished,
   expectSectionsComplete,
+  expectStreamingStatus,
+  letUiSettle,
+  scrollLessonPlanFromTopToBottom,
   waitForGeneration,
 } from "./helpers";
 
 // --------
 // CHANGE "replay" TO "record" TO RECORD A NEW FIXTURE
 // --------
-// const FIXTURE_MODE = "record" as FixtureMode;
+//const FIXTURE_MODE = "record" as FixtureMode;
 const FIXTURE_MODE = "replay" as FixtureMode;
 
 async function closePreview(page: Page) {
@@ -32,7 +36,7 @@ async function expectPreviewVisible(page: Page) {
 test(
   "Full aila flow with Romans fixture",
   { tag: "@mobile-common-auth" },
-  async ({ page }) => {
+  async ({ page }, testInfo) => {
     const generationTimeout = FIXTURE_MODE === "record" ? 75000 : 50000;
     test.setTimeout(generationTimeout * 5);
 
@@ -49,8 +53,7 @@ test(
     await test.step("Fill in the chat box", async () => {
       const textbox = page.getByTestId("chat-input");
       const sendMessage = page.getByTestId("send-message");
-      const message =
-        "Create a KS1 lesson on the end of Roman Britain. Ask a question for each quiz and cycle";
+      const message = "Create a KS1 lesson on the end of Roman Britain";
       await textbox.fill(message);
       await expect(textbox).toContainText(message);
 
@@ -67,22 +70,28 @@ test(
 
       await waitForGeneration(page, generationTimeout);
       await expectPreviewVisible(page);
-      await expectSectionsComplete(page, 1);
+      await expectSectionsComplete(page, 3);
       await closePreview(page);
+      await expectStreamingStatus(page, "Idle", { timeout: 5000 });
+      await letUiSettle(page, testInfo);
 
       setFixture("roman-britain-2");
       await continueChat(page);
       await waitForGeneration(page, generationTimeout);
       await expectPreviewVisible(page);
-      await expectSectionsComplete(page, 3);
+      await expectSectionsComplete(page, 7);
       await closePreview(page);
+      await expectStreamingStatus(page, "Idle", { timeout: 5000 });
+      await letUiSettle(page, testInfo);
 
       setFixture("roman-britain-3");
       await continueChat(page);
       await waitForGeneration(page, generationTimeout);
       await expectPreviewVisible(page);
-      await expectSectionsComplete(page, 7);
+      await expectSectionsComplete(page, 10);
       await closePreview(page);
+      await expectStreamingStatus(page, "Idle", { timeout: 5000 });
+      await letUiSettle(page, testInfo);
 
       setFixture("roman-britain-4");
       await continueChat(page);
@@ -90,12 +99,17 @@ test(
       await expectPreviewVisible(page);
       await expectSectionsComplete(page, 10);
       await closePreview(page);
+      await expectStreamingStatus(page, "Idle", { timeout: 5000 });
+      await letUiSettle(page, testInfo);
 
       setFixture("roman-britain-5");
       await continueChat(page);
       await waitForGeneration(page, generationTimeout);
       await expectPreviewVisible(page);
       await expectSectionsComplete(page, 10);
+      await expectStreamingStatus(page, "Idle", { timeout: 5000 });
+      await letUiSettle(page, testInfo);
+      await scrollLessonPlanFromTopToBottom(page);
       await expectFinished(page);
     });
   },
diff --git a/apps/nextjs/tests-e2e/tests/aila-chat/full-romans.test.ts b/apps/nextjs/tests-e2e/tests/aila-chat/full-romans.test.ts
index de65ad42b..7ca82c9d3 100644
--- a/apps/nextjs/tests-e2e/tests/aila-chat/full-romans.test.ts
+++ b/apps/nextjs/tests-e2e/tests/aila-chat/full-romans.test.ts
@@ -1,36 +1,32 @@
 import { setupClerkTestingToken } from "@clerk/testing/playwright";
-import { test, expect, Page } from "@playwright/test";
+import { test, expect } from "@playwright/test";
 
 import { TEST_BASE_URL } from "../../config/config";
 import { bypassVercelProtection } from "../../helpers/vercel";
+import type { FixtureMode } from "./helpers";
 import {
-  FixtureMode,
   applyLlmFixtures,
   continueChat,
   expectFinished,
-  expectSectionsComplete,
-  waitForGeneration,
+  expectStreamingStatus,
+  isFinished,
+  scrollLessonPlanFromTopToBottom,
+  waitForStreamingStatusChange,
 } from "./helpers";
 
 // --------
 // CHANGE "replay" TO "record" TO RECORD A NEW FIXTURE
 // --------
-// const FIXTURE_MODE = "record" as FixtureMode;
+//const FIXTURE_MODE = "record" as FixtureMode;
 const FIXTURE_MODE = "replay" as FixtureMode;
 
 test(
   "Full aila flow with Romans fixture",
   { tag: "@common-auth" },
-  async ({ page }, testInfo) => {
+  async ({ page }) => {
     const generationTimeout = FIXTURE_MODE === "record" ? 75000 : 50000;
     test.setTimeout(generationTimeout * 5);
 
-    // The chat UI has a race condition when you submit a message too quickly after the previous response
-    // This is a temporary fix to fix test flake
-    async function letUiSettle() {
-      return await page.waitForTimeout(testInfo.retry === 0 ? 500 : 6000);
-    }
-
     await test.step("Setup", async () => {
       await bypassVercelProtection(page);
       await setupClerkTestingToken({ page });
@@ -44,8 +40,7 @@ test(
     await test.step("Fill in the chat box", async () => {
       const textbox = page.getByTestId("chat-input");
       const sendMessage = page.getByTestId("send-message");
-      const message =
-        "Create a KS1 lesson on the end of Roman Britain. Ask a question for each quiz and cycle";
+      const message = "Create a KS1 lesson on the end of Roman Britain";
       await textbox.fill(message);
       await expect(textbox).toContainText(message);
 
@@ -59,33 +54,39 @@ test(
 
     await test.step("Iterate through the fixtures", async () => {
       await page.waitForURL(/\/aila\/.+/);
-      await waitForGeneration(page, generationTimeout);
-      await expectSectionsComplete(page, 1);
-      await letUiSettle();
-
-      setFixture("roman-britain-2");
-      await continueChat(page);
-      await waitForGeneration(page, generationTimeout);
-      await expectSectionsComplete(page, 3);
-      await letUiSettle();
-
-      setFixture("roman-britain-3");
-      await continueChat(page);
-      await waitForGeneration(page, generationTimeout);
-      await expectSectionsComplete(page, 7);
-      await letUiSettle();
-
-      setFixture("roman-britain-4");
-      await continueChat(page);
-      await waitForGeneration(page, generationTimeout);
-      await expectSectionsComplete(page, 10);
-      await letUiSettle();
-
-      setFixture("roman-britain-5");
-      await continueChat(page);
-      await waitForGeneration(page, generationTimeout);
-      await expectSectionsComplete(page, 10);
 
+      const maxIterations = 20;
+
+      for (
+        let iterationCount = 1;
+        iterationCount <= maxIterations;
+        iterationCount++
+      ) {
+        setFixture(`roman-britain-${iterationCount}`);
+        await expectStreamingStatus(page, "RequestMade", { timeout: 5000 });
+
+        await waitForStreamingStatusChange(
+          page,
+          "RequestMade",
+          "Idle",
+          generationTimeout,
+        );
+
+        await expectStreamingStatus(page, "Idle", { timeout: 5000 });
+
+        if (await isFinished(page)) {
+          break;
+        }
+        await continueChat(page);
+        await waitForStreamingStatusChange(
+          page,
+          "Idle",
+          "RequestMade",
+          generationTimeout,
+        );
+      }
+
+      await scrollLessonPlanFromTopToBottom(page);
       await expectFinished(page);
     });
   },
diff --git a/apps/nextjs/tests-e2e/tests/aila-chat/helpers.ts b/apps/nextjs/tests-e2e/tests/aila-chat/helpers.ts
index 563adb244..7f33455bd 100644
--- a/apps/nextjs/tests-e2e/tests/aila-chat/helpers.ts
+++ b/apps/nextjs/tests-e2e/tests/aila-chat/helpers.ts
@@ -1,4 +1,4 @@
-import { expect, Page, test } from "@playwright/test";
+import { expect, Page, test, TestInfo } from "@playwright/test";
 
 import { AilaStreamingStatus } from "@/components/AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
 
@@ -8,7 +8,33 @@ export async function expectStreamingStatus(
   args?: { timeout: number },
 ) {
   const statusElement = page.getByTestId("chat-aila-streaming-status");
-  await expect(statusElement).toHaveText(status, args);
+  await expect(statusElement).toContainText(status, args);
+}
+
+export async function waitForStreamingStatusChange(
+  page: Page,
+  currentStatus: AilaStreamingStatus,
+  expectedStatus: AilaStreamingStatus,
+  timeout: number,
+) {
+  await page.waitForFunction(
+    ([currentStatus, expectedStatus]) => {
+      const statusElement = document.querySelector(
+        '[data-testid="chat-aila-streaming-status"]',
+      );
+      return (
+        statusElement &&
+        currentStatus &&
+        expectedStatus &&
+        !statusElement.textContent?.includes(currentStatus) &&
+        statusElement.textContent?.includes(expectedStatus)
+      );
+    },
+    [currentStatus, expectedStatus],
+    { timeout },
+  );
+
+  await expectStreamingStatus(page, expectedStatus);
 }
 
 export async function waitForGeneration(page: Page, generationTimeout: number) {
@@ -35,6 +61,17 @@ export async function expectFinished(page: Page) {
   );
 }
 
+export async function getSectionsComplete(page: Page): Promise<number> {
+  const progressText = await page.getByTestId("chat-progress").textContent();
+  const match = (progressText ?? "").match(/(\d+) of 10 sections complete/);
+
+  if (match && match[1]) {
+    return parseInt(match[1], 10);
+  } else {
+    return 0;
+  }
+}
+
 export async function expectSectionsComplete(
   page: Page,
   numberOfSections: number,
@@ -67,3 +104,38 @@ export const applyLlmFixtures = async (
     },
   };
 };
+
+// The chat UI has a race condition when you submit a message too quickly after the previous response
+// This is a temporary fix to fix test flake
+export async function letUiSettle(page, testInfo: TestInfo) {
+  return await page.waitForTimeout(testInfo.retry === 0 ? 500 : 6000);
+}
+
+// So that we can capture the lesson plan in the Playwright screenshot
+// recording, we need to scroll the lesson plan from top to bottom.
+export async function scrollLessonPlanFromTopToBottom(page: Page) {
+  await page.evaluate(async () => {
+    const scrollableParent = document.querySelector(
+      '[data-testid="chat-right-hand-side-lesson"]',
+    ) as HTMLElement;
+
+    if (scrollableParent) {
+      const scrollHeight = scrollableParent.scrollHeight;
+      const clientHeight = scrollableParent.clientHeight;
+      const scrollStep = 100; // Adjust this value to control the scroll speed
+      const scrollDuration = 200; // Adjust this value to control the pause between each scroll step
+
+      for (
+        let scrollTop = 0;
+        scrollTop < scrollHeight - clientHeight;
+        scrollTop += scrollStep
+      ) {
+        scrollableParent.scrollTop = scrollTop;
+        await new Promise((resolve) => setTimeout(resolve, scrollDuration));
+      }
+
+      // Ensure we scroll to the very bottom
+      scrollableParent.scrollTop = scrollHeight;
+    }
+  });
+}
diff --git a/apps/nextjs/tests-e2e/tests/auth.test.ts b/apps/nextjs/tests-e2e/tests/auth.test.ts
index a525b3d1d..ef6bdc451 100644
--- a/apps/nextjs/tests-e2e/tests/auth.test.ts
+++ b/apps/nextjs/tests-e2e/tests/auth.test.ts
@@ -1,5 +1,6 @@
 import { setupClerkTestingToken } from "@clerk/testing/playwright";
-import { Page, expect, test } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { expect, test } from "@playwright/test";
 
 import {
   TEST_USER_EMAIL,
diff --git a/apps/nextjs/tests-e2e/tests/sharing.test.ts b/apps/nextjs/tests-e2e/tests/sharing.test.ts
index 36a2aed13..6e0bdd046 100644
--- a/apps/nextjs/tests-e2e/tests/sharing.test.ts
+++ b/apps/nextjs/tests-e2e/tests/sharing.test.ts
@@ -1,4 +1,5 @@
-import { test, expect, Page } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { test, expect } from "@playwright/test";
 
 import { TEST_BASE_URL } from "../config/config";
 import { prepareUser } from "../helpers/auth";
diff --git a/package.json b/package.json
index d6bbf0cff..d504cac36 100644
--- a/package.json
+++ b/package.json
@@ -10,20 +10,21 @@
     "clean:workspaces": "turbo clean",
     "db-export:dev": "doppler run --config dev -- bash scripts/db_export.sh",
     "db-generate": "turbo db-generate",
+    "db-generate:no-engine": "turbo db-generate:no-engine",
     "db-migrate": "turbo db-migrate",
     "db-publish:stg": "doppler run --config stg -- bash scripts/db_publish.sh",
     "db-push": "turbo db-push",
     "db-push-force": "turbo db-push-force",
     "db-seed": "turbo db-seed",
     "dev": "FORCE_COLOR=1 turbo dev --parallel --ui=stream --log-prefix=none --filter=!@oakai/db",
-    "dev-turbo": "FORCE_COLOR=1 turbo dev-turbo --parallel --log-prefix=none --ui=stream --filter=!@oakai/db",
     "doppler:pull:dev": "doppler secrets download --config dev --no-file --format env > .env",
     "doppler:pull:stg": "doppler secrets download --config stg --no-file --format env > .env",
     "doppler:run:stg": "doppler run -c stg --silent",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "lint": "turbo lint",
-    "prompts": "turbo prompts --filter=core",
-    "prompts:dev": "turbo prompts:dev --filter=core",
+    "lint:fix": "pnpm lint -- --fix",
+    "prompts": "turbo prompts",
+    "prompts:dev": "turbo prompts:dev",
     "sort-package-json": "sort-package-json \"package.json\" \"packages/*/package.json\" \"apps/*/package.json\"",
     "type-check": "turbo type-check",
     "node-version": "node -v",
@@ -48,6 +49,7 @@
     "@types/jest": "^29.5.12",
     "autoprefixer": "^10.4.16",
     "eslint-config-custom": "0.0.0",
+    "eslint-plugin-turbo": "^2.2.3",
     "husky": "^8.0.3",
     "lint-staged": "^15.2.0",
     "next": "14.2.5",
diff --git a/packages/aila/.eslintrc.cjs b/packages/aila/.eslintrc.cjs
index c057acbbf..9526c3c79 100644
--- a/packages/aila/.eslintrc.cjs
+++ b/packages/aila/.eslintrc.cjs
@@ -1,25 +1,7 @@
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
-  extends: ["../../.eslintrc.cjs", "next"],
-  //plugins: ["import"],
-  rules: {
-    // ... other rules ...
-    // "import/order": [
-    //   "error",
-    //   {
-    //     groups: [
-    //       "builtin",
-    //       "external",
-    //       "internal",
-    //       "parent",
-    //       "sibling",
-    //       "index",
-    //     ],
-    //     alphabetize: {
-    //       order: "asc",
-    //       caseInsensitive: true,
-    //     },
-    //   },
-    // ],
+  extends: ["eslint-config-custom"],
+  parserOptions: {
+    project: __dirname + "/tsconfig.json",
   },
 };
diff --git a/packages/aila/package.json b/packages/aila/package.json
index 9bb11f81d..f6ecfd2e6 100644
--- a/packages/aila/package.json
+++ b/packages/aila/package.json
@@ -22,7 +22,7 @@
     "@oakai/db": "*",
     "@oakai/exports": "*",
     "@oakai/logger": "*",
-    "@sentry/nextjs": "^8.19.0",
+    "@sentry/nextjs": "^8.35.0",
     "@vercel/kv": "^0.2.2",
     "ai": "^3.3.26",
     "american-british-english-translator": "^0.2.1",
@@ -44,6 +44,7 @@
     "@pollyjs/persister-fs": "^6.0.6",
     "@types/jest": "^29.5.12",
     "eslint": "^8.56.0",
+    "eslint-plugin-turbo": "^2.2.3",
     "jest": "^29.7.0",
     "setup-polly-jest": "^0.11.0",
     "ts-jest": "^29.1.4",
diff --git a/packages/aila/src/constants.ts b/packages/aila/src/constants.ts
index 2df3b7dbe..fbcc27ab5 100644
--- a/packages/aila/src/constants.ts
+++ b/packages/aila/src/constants.ts
@@ -1,4 +1,4 @@
-import OpenAI from "openai";
+import type OpenAI from "openai";
 
 export const DEFAULT_MODEL: OpenAI.Chat.ChatModel = "gpt-4o-2024-08-06";
 export const DEFAULT_MODERATION_MODEL: OpenAI.Chat.ChatModel =
diff --git a/packages/aila/src/core/Aila.liveWithOpenAI.test.ts b/packages/aila/src/core/Aila.liveWithOpenAI.test.ts
index ae38ffcfb..c58a64d92 100644
--- a/packages/aila/src/core/Aila.liveWithOpenAI.test.ts
+++ b/packages/aila/src/core/Aila.liveWithOpenAI.test.ts
@@ -1,6 +1,7 @@
-import { Aila, AilaInitializationOptions } from ".";
 import { MockCategoriser } from "../features/categorisation/categorisers/MockCategoriser";
+import { Aila } from "./Aila";
 import { checkLastMessage, expectPatch, expectText } from "./Aila.testHelpers";
+import type { AilaInitializationOptions } from "./types";
 
 const runInCI = process.env.CI === "true";
 const runManually = process.env.RUN_LLM_TESTS === "true";
diff --git a/packages/aila/src/core/Aila.test.ts b/packages/aila/src/core/Aila.test.ts
index 51b11afbd..12f725f3d 100644
--- a/packages/aila/src/core/Aila.test.ts
+++ b/packages/aila/src/core/Aila.test.ts
@@ -1,12 +1,13 @@
-import { Aila } from ".";
+import type { Polly } from "@pollyjs/core";
+
 import { setupPolly } from "../../tests/mocks/setupPolly";
 import { MockCategoriser } from "../features/categorisation/categorisers/MockCategoriser";
+import { Aila } from "./Aila";
 import { AilaAuthenticationError } from "./AilaError";
 import { MockLLMService } from "./llm/MockLLMService";
 
 describe("Aila", () => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let polly: any;
+  let polly: Polly;
 
   beforeAll(() => {
     polly = setupPolly();
@@ -195,6 +196,16 @@ describe("Aila", () => {
   describe("generateSync", () => {
     // Should return a stream when generating a lesson plan with valid input
     it("should set the initial title, subject and key stage when presented with a valid initial user input", async () => {
+      const mockChatCategoriser = new MockCategoriser({
+        mockedLessonPlan: {
+          title: "Glaciation",
+          topic: "The Landscapes of the UK",
+          subject: "geography",
+          keyStage: "key-stage-3",
+        },
+      });
+      const mockLLMService = new MockLLMService();
+
       const ailaInstance = new Aila({
         lessonPlan: {},
         chat: { id: "123", userId: "user123" },
@@ -205,6 +216,10 @@ describe("Aila", () => {
           useModeration: false,
         },
         plugins: [],
+        services: {
+          chatLlmService: mockLLMService,
+          chatCategoriser: mockChatCategoriser,
+        },
       });
 
       expect(ailaInstance.lesson.plan.title).not.toBeDefined();
@@ -320,7 +335,7 @@ describe("Aila", () => {
       expect(ailaInstance.lesson.plan.title).toBe("Mocked Lesson Plan");
       expect(ailaInstance.lesson.plan.subject).toBe("Mocked Subject");
       expect(ailaInstance.lesson.plan.keyStage).toBe("key-stage-3");
-    });
+    }, 8000);
   });
 
   describe("categorisation and LLM service", () => {
@@ -334,7 +349,9 @@ describe("Aila", () => {
       const mockCategoriser = new MockCategoriser({ mockedLessonPlan });
 
       const mockLLMResponse = [
+        // eslint-disable-next-line @typescript-eslint/quotes, quotes
         '{"type":"patch","reasoning":"Update title","value":{"op":"replace","path":"/title","value":"Updated Mocked Lesson Plan"}}␞\n',
+        // eslint-disable-next-line @typescript-eslint/quotes, quotes
         '{"type":"patch","reasoning":"Update subject","value":{"op":"replace","path":"/subject","value":"Updated Mocked Subject"}}␞\n',
       ];
       const mockLLMService = new MockLLMService(mockLLMResponse);
@@ -368,6 +385,6 @@ describe("Aila", () => {
       // Check if MockLLMService updates were applied
       expect(ailaInstance.lesson.plan.title).toBe("Updated Mocked Lesson Plan");
       expect(ailaInstance.lesson.plan.subject).toBe("Updated Mocked Subject");
-    });
+    }, 8000);
   });
 });
diff --git a/packages/aila/src/core/Aila.testHelpers.ts b/packages/aila/src/core/Aila.testHelpers.ts
index f7b7c4387..927f88255 100644
--- a/packages/aila/src/core/Aila.testHelpers.ts
+++ b/packages/aila/src/core/Aila.testHelpers.ts
@@ -1,8 +1,8 @@
 import { expect } from "@jest/globals";
 import invariant from "tiny-invariant";
 
-import { Aila } from ".";
-import { MessagePart, TextDocument } from "../protocol/jsonPatchProtocol";
+import type { MessagePart, TextDocument } from "../protocol/jsonPatchProtocol";
+import type { Aila } from "./Aila";
 
 export function checkAssistantResponse(content: string) {
   // Check that the response is a string (not JSON)
diff --git a/packages/aila/src/core/Aila.ts b/packages/aila/src/core/Aila.ts
index 05c31f14e..886bc6089 100644
--- a/packages/aila/src/core/Aila.ts
+++ b/packages/aila/src/core/Aila.ts
@@ -1,13 +1,19 @@
-import { PrismaClientWithAccelerate, prisma as globalPrisma } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
+import { prisma as globalPrisma } from "@oakai/db/client";
+import { aiLogger } from "@oakai/logger";
 
 import {
   DEFAULT_MODEL,
   DEFAULT_TEMPERATURE,
   DEFAULT_RAG_LESSON_PLANS,
 } from "../constants";
+import type { AilaAmericanismsFeature } from "../features/americanisms";
+import { NullAilaAmericanisms } from "../features/americanisms/NullAilaAmericanisms";
 import { AilaCategorisation } from "../features/categorisation";
-import { AilaSnapshotStore } from "../features/snapshotStore";
-import {
+import type { AilaRagFeature } from "../features/rag";
+import { NullAilaRag } from "../features/rag/NullAilaRag";
+import type { AilaSnapshotStore } from "../features/snapshotStore";
+import type {
   AilaAnalyticsFeature,
   AilaErrorReportingFeature,
   AilaModerationFeature,
@@ -17,23 +23,25 @@ import {
 import { generateMessageId } from "../helpers/chat/generateMessageId";
 import { AilaAuthenticationError, AilaGenerationError } from "./AilaError";
 import { AilaFeatureFactory } from "./AilaFeatureFactory";
-import {
+import type {
   AilaChatService,
   AilaLessonService,
   AilaServices,
 } from "./AilaServices";
-import { AilaChat, Message } from "./chat";
+import type { Message } from "./chat";
+import { AilaChat } from "./chat";
 import { AilaLesson } from "./lesson";
-import { LLMService } from "./llm/LLMService";
+import type { LLMService } from "./llm/LLMService";
 import { OpenAIService } from "./llm/OpenAIService";
-import { AilaPlugin } from "./plugins/types";
-import {
+import type { AilaPlugin } from "./plugins/types";
+import type {
   AilaGenerateLessonPlanOptions,
   AilaOptions,
   AilaOptionsWithDefaultFallbackValues,
   AilaInitializationOptions,
 } from "./types";
 
+const log = aiLogger("aila");
 export class Aila implements AilaServices {
   private _analytics?: AilaAnalyticsFeature;
   private _chat: AilaChatService;
@@ -47,9 +55,11 @@ export class Aila implements AilaServices {
   private _persistence: AilaPersistenceFeature[] = [];
   private _threatDetection?: AilaThreatDetectionFeature;
   private _prisma: PrismaClientWithAccelerate;
+  private _rag: AilaRagFeature;
   private _plugins: AilaPlugin[];
   private _userId!: string | undefined;
   private _chatId!: string;
+  private _americanisms: AilaAmericanismsFeature;
 
   constructor(options: AilaInitializationOptions) {
     this._userId = options.chat.userId;
@@ -75,13 +85,14 @@ export class Aila implements AilaServices {
         options.services?.chatCategoriser ??
         new AilaCategorisation({
           aila: this,
-          prisma: this._prisma,
-          chatId: this._chatId,
-          userId: this._userId,
         }),
     });
 
-    this._analytics = AilaFeatureFactory.createAnalytics(this, this._options);
+    this._analytics = AilaFeatureFactory.createAnalytics(
+      this,
+      this._options,
+      options.services?.analyticsAdapters?.(this),
+    );
     this._moderation = AilaFeatureFactory.createModeration(
       this,
       this._options,
@@ -100,6 +111,10 @@ export class Aila implements AilaServices {
       this,
       this._options,
     );
+    this._rag = options.services?.ragService?.(this) ?? new NullAilaRag();
+    this._americanisms =
+      options.services?.americanismsService?.(this) ??
+      new NullAilaAmericanisms();
 
     if (this._analytics) {
       this._analytics.initialiseAnalyticsContext();
@@ -112,6 +127,10 @@ export class Aila implements AilaServices {
   public async initialise() {
     this.checkUserIdPresentIfPersisting();
     await this.loadChatIfPersisting();
+    const persistedLessonPlan = this._chat.persistedChat?.lessonPlan;
+    if (persistedLessonPlan) {
+      this._lesson.setPlan(persistedLessonPlan);
+    }
     await this._lesson.setUpInitialLessonPlan(this._chat.messages);
   }
 
@@ -204,6 +223,18 @@ export class Aila implements AilaServices {
     return this._chatLlmService;
   }
 
+  public get rag() {
+    return this._rag;
+  }
+
+  public get americanisms() {
+    return this._americanisms;
+  }
+
+  public get prisma() {
+    return this._prisma;
+  }
+
   // Check methods
   public checkUserIdPresentIfPersisting() {
     if (!this._chat.userId && this._options.usePersistence) {
@@ -248,6 +279,7 @@ export class Aila implements AilaServices {
       );
     }
     if (input) {
+      log.info("Initiate chat with input", input);
       const message: Message = {
         id: generateMessageId({ role: "user" }),
         role: "user",
diff --git a/packages/aila/src/core/AilaFeatureFactory.ts b/packages/aila/src/core/AilaFeatureFactory.ts
index c98f9df46..e25d20069 100644
--- a/packages/aila/src/core/AilaFeatureFactory.ts
+++ b/packages/aila/src/core/AilaFeatureFactory.ts
@@ -1,40 +1,33 @@
 // AilaFeatureFactory.ts
-import {
-  DatadogAnalyticsAdapter,
-  PosthogAnalyticsAdapter,
-} from "../features/analytics";
+import type { AnalyticsAdapter } from "../features/analytics";
 import { AilaAnalytics } from "../features/analytics/AilaAnalytics";
 import { SentryErrorReporter } from "../features/errorReporting/reporters/SentryErrorReporter";
 import { AilaModeration } from "../features/moderation";
-import {
-  OpenAILike,
-  OpenAiModerator,
-} from "../features/moderation/moderators/OpenAiModerator";
+import type { OpenAILike } from "../features/moderation/moderators/OpenAiModerator";
+import { OpenAiModerator } from "../features/moderation/moderators/OpenAiModerator";
 import { AilaPrismaPersistence } from "../features/persistence/adaptors/prisma";
 import { AilaSnapshotStore } from "../features/snapshotStore";
 import { AilaThreatDetection } from "../features/threatDetection";
-import {
+import type {
   AilaAnalyticsFeature,
   AilaErrorReportingFeature,
   AilaModerationFeature,
   AilaPersistenceFeature,
   AilaThreatDetectionFeature,
 } from "../features/types";
-import { AilaServices } from "./AilaServices";
-import { AilaOptions } from "./types";
+import type { AilaServices } from "./AilaServices";
+import type { AilaOptions } from "./types";
 
 export class AilaFeatureFactory {
   static createAnalytics(
     aila: AilaServices,
     options: AilaOptions,
+    adapters: AnalyticsAdapter[] = [],
   ): AilaAnalyticsFeature | undefined {
     if (options.useAnalytics) {
       return new AilaAnalytics({
         aila,
-        adapters: [
-          new PosthogAnalyticsAdapter(aila),
-          new DatadogAnalyticsAdapter(aila),
-        ],
+        adapters,
       });
     }
     return undefined;
diff --git a/packages/aila/src/core/AilaServices.ts b/packages/aila/src/core/AilaServices.ts
index 9a713530e..816a4b09e 100644
--- a/packages/aila/src/core/AilaServices.ts
+++ b/packages/aila/src/core/AilaServices.ts
@@ -1,17 +1,23 @@
-import { AilaAnalytics } from "../features/analytics/AilaAnalytics";
-import { AilaErrorReporter } from "../features/errorReporting";
-import { AilaSnapshotStore } from "../features/snapshotStore";
-import {
+import type { AilaAmericanismsFeature } from "../features/americanisms";
+import type { AilaAnalytics } from "../features/analytics/AilaAnalytics";
+import type { AilaErrorReporter } from "../features/errorReporting";
+import type { AilaRagFeature } from "../features/rag";
+import type { AilaSnapshotStore } from "../features/snapshotStore";
+import type {
   AilaAnalyticsFeature,
   AilaModerationFeature,
   AilaPersistenceFeature,
   AilaThreatDetectionFeature,
 } from "../features/types";
-import { MessagePart } from "../protocol/jsonPatchProtocol";
-import { AilaRagRelevantLesson, LooseLessonPlan } from "../protocol/schema";
-import { Message } from "./chat";
-import { AilaOptionsWithDefaultFallbackValues } from "./index";
-import { AilaPlugin } from "./plugins";
+import type { MessagePart } from "../protocol/jsonPatchProtocol";
+import type {
+  AilaPersistedChat,
+  AilaRagRelevantLesson,
+  LooseLessonPlan,
+} from "../protocol/schema";
+import type { Message } from "./chat";
+import type { AilaPlugin } from "./plugins";
+import type { AilaOptionsWithDefaultFallbackValues } from "./types";
 
 // This provides a set of interfaces between the Aila core and the features that use it.
 // We can then mock these out in tests without needing to instantiate the entire Aila object.
@@ -23,6 +29,7 @@ export interface AilaAnalyticsService {
 export interface AilaLessonService {
   readonly plan: LooseLessonPlan;
   readonly hasSetInitialState: boolean;
+  setPlan(plan: LooseLessonPlan): void;
   applyPatches(patches: string): void;
   initialise(plan: LooseLessonPlan): void;
   setUpInitialLessonPlan(messages: Message[]): Promise<void>;
@@ -32,6 +39,9 @@ export interface AilaChatService {
   readonly userId: string | undefined;
   readonly id: string;
   readonly messages: Message[];
+  readonly iteration: number | undefined;
+  readonly createdAt: Date | undefined;
+  readonly persistedChat: AilaPersistedChat | undefined;
   get relevantLessons(): AilaRagRelevantLesson[];
   set relevantLessons(lessons: AilaRagRelevantLesson[]);
   readonly parsedMessages: MessagePart[][];
@@ -56,4 +66,6 @@ export interface AilaServices {
   readonly persistence?: AilaPersistenceFeature[];
   readonly moderation?: AilaModerationFeature;
   readonly plugins: AilaPlugin[];
+  readonly rag: AilaRagFeature;
+  readonly americanisms: AilaAmericanismsFeature;
 }
diff --git a/packages/aila/src/core/chat/AilaChat.ts b/packages/aila/src/core/chat/AilaChat.ts
index 5395275ee..3a71f524c 100644
--- a/packages/aila/src/core/chat/AilaChat.ts
+++ b/packages/aila/src/core/chat/AilaChat.ts
@@ -4,29 +4,30 @@ import {
   subjectWarnings,
 } from "@oakai/core/src/utils/subjects";
 import invariant from "tiny-invariant";
-import { z } from "zod";
 
-import { AilaChatService, AilaError, AilaServices } from "../..";
 import { DEFAULT_MODEL, DEFAULT_TEMPERATURE } from "../../constants";
-import {
-  AilaGeneration,
-  AilaGenerationStatus,
-} from "../../features/generation";
+import type { AilaChatService } from "../../core/AilaServices";
+import type { AilaServices } from "../../core/AilaServices";
+import { AilaGeneration } from "../../features/generation/AilaGeneration";
+import type { AilaGenerationStatus } from "../../features/generation/types";
 import { generateMessageId } from "../../helpers/chat/generateMessageId";
+import type { JsonPatchDocumentOptional } from "../../protocol/jsonPatchProtocol";
 import {
-  JsonPatchDocumentOptional,
-  LLMPatchDocumentSchema,
-  TextDocumentSchema,
+  LLMMessageSchema,
   parseMessageParts,
 } from "../../protocol/jsonPatchProtocol";
-import { AilaRagRelevantLesson } from "../../protocol/schema";
-import { LLMService } from "../llm/LLMService";
+import type {
+  AilaPersistedChat,
+  AilaRagRelevantLesson,
+} from "../../protocol/schema";
+import { AilaError } from "../AilaError";
+import type { LLMService } from "../llm/LLMService";
 import { OpenAIService } from "../llm/OpenAIService";
-import { AilaPromptBuilder } from "../prompt/AilaPromptBuilder";
+import type { AilaPromptBuilder } from "../prompt/AilaPromptBuilder";
 import { AilaLessonPromptBuilder } from "../prompt/builders/AilaLessonPromptBuilder";
 import { AilaStreamHandler } from "./AilaStreamHandler";
 import { PatchEnqueuer } from "./PatchEnqueuer";
-import { Message } from "./types";
+import type { Message } from "./types";
 
 export class AilaChat implements AilaChatService {
   private readonly _id: string;
@@ -40,6 +41,9 @@ export class AilaChat implements AilaChatService {
   private readonly _patchEnqueuer: PatchEnqueuer;
   private readonly _llmService: LLMService;
   private readonly _promptBuilder: AilaPromptBuilder;
+  private _iteration: number | undefined;
+  private _createdAt: Date | undefined;
+  private _persistedChat: AilaPersistedChat | undefined;
 
   constructor({
     id,
@@ -87,6 +91,14 @@ export class AilaChat implements AilaChatService {
     return this._isShared;
   }
 
+  public get iteration() {
+    return this._iteration;
+  }
+
+  public get createdAt() {
+    return this._createdAt;
+  }
+
   public get messages() {
     return this._messages;
   }
@@ -95,6 +107,10 @@ export class AilaChat implements AilaChatService {
     return this._messages.map((m) => parseMessageParts(m.content));
   }
 
+  public get persistedChat() {
+    return this._persistedChat;
+  }
+
   public get relevantLessons() {
     return this._relevantLessons;
   }
@@ -140,7 +156,7 @@ export class AilaChat implements AilaChatService {
     });
   }
 
-  public async systemMessage() {
+  public systemMessage() {
     invariant(this._generation?.systemPrompt, "System prompt not initialised");
     return {
       id: generateMessageId({ role: "system" }),
@@ -149,12 +165,12 @@ export class AilaChat implements AilaChatService {
     };
   }
 
-  public async completionMessages() {
+  public completionMessages() {
     const reducedMessages = this._promptBuilder.reduceMessagesForPrompt(
       this._messages,
     );
 
-    const systemMessage = await this.systemMessage();
+    const systemMessage = this.systemMessage();
     const applicableMessages: Message[] = [systemMessage, ...reducedMessages]; // only send
 
     if (this._aila?.lesson.hasSetInitialState) {
@@ -214,7 +230,7 @@ export class AilaChat implements AilaChatService {
   }
 
   public async enqueue(message: JsonPatchDocumentOptional) {
-    // Optional "?"" necessary to avoid a "terminated" error
+    // Optional "?" Necessary to avoid a "terminated" error
     if (this?._patchEnqueuer) {
       await this._patchEnqueuer.enqueueMessage(message);
     }
@@ -224,7 +240,7 @@ export class AilaChat implements AilaChatService {
     path: string,
     value: string | string[] | number | object,
   ) {
-    // Optional "?"" necessary to avoid a "terminated" error
+    // Optional "?" necessary to avoid a "terminated" error
     if (this?._patchEnqueuer) {
       await this._patchEnqueuer.enqueuePatch(path, value);
     }
@@ -260,7 +276,7 @@ export class AilaChat implements AilaChatService {
       invariant(responseText, "Response text not set");
       await this._generation.complete({ status, responseText });
     }
-    this._generation.persist(status);
+    await this._generation.persist(status);
   }
 
   private async persistChat() {
@@ -291,6 +307,9 @@ export class AilaChat implements AilaChatService {
     if (persistedChat) {
       this._relevantLessons = persistedChat.relevantLessons ?? [];
       this._isShared = persistedChat.isShared;
+      this._iteration = persistedChat.iteration ?? 1;
+      this._createdAt = new Date(persistedChat.createdAt);
+      this._persistedChat = persistedChat;
     }
   }
 
@@ -314,14 +333,6 @@ export class AilaChat implements AilaChatService {
     return assistantMessage;
   }
 
-  private async enqueueFinalState() {
-    await this.enqueue({
-      type: "state",
-      reasoning: "final",
-      value: this._aila.lesson.plan,
-    });
-  }
-
   private async enqueueMessageId(messageId: string) {
     await this.enqueue({
       type: "id",
@@ -338,21 +349,9 @@ export class AilaChat implements AilaChatService {
   }
 
   public async createChatCompletionObjectStream(messages: Message[]) {
-    const schema = z.object({
-      type: z.literal("llmMessage"),
-      patches: z
-        .array(LLMPatchDocumentSchema)
-        .describe(
-          "This is the set of patches you have generated to edit the lesson plan. Follow the instructions in the system prompt to ensure that you produce a valid patch. For instance, if you are providing a patch to add a cycle, the op should be 'add' and the value should be the JSON object representing the full, valid cycle. The same applies for all of the other parts of the lesson plan. This should not include more than one 'add' patch for the same section of the lesson plan. These edits will overwrite each other and result in unexpected results. If you want to do multiple updates on the same section, it is best to generate one 'add' patch with all of your edits included.",
-        ),
-      prompt: TextDocumentSchema.describe(
-        "If you imagine the user talking to you, this is where you would put your human-readable reply that would explain the changes you have made (if any), ask them questions, and prompt them to send their next message. This should not contain any of the lesson plan content. That should all be delivered in patches.",
-      ),
-    });
-
     return this._llmService.createChatCompletionObjectStream({
       model: this._aila.options.model ?? DEFAULT_MODEL,
-      schema,
+      schema: LLMMessageSchema,
       schemaName: "response",
       messages,
       temperature: this._aila.options.temperature ?? DEFAULT_TEMPERATURE,
@@ -360,10 +359,6 @@ export class AilaChat implements AilaChatService {
   }
 
   public async complete() {
-    await this.enqueue({
-      type: "comment",
-      value: "CHAT_COMPLETE",
-    });
     await this.reportUsageMetrics();
     this.applyEdits();
     const assistantMessage = this.appendAssistantMessage();
@@ -372,6 +367,10 @@ export class AilaChat implements AilaChatService {
     await this.moderate();
     await this.persistChat();
     await this.persistGeneration("SUCCESS");
+    await this.enqueue({
+      type: "comment",
+      value: "CHAT_COMPLETE",
+    });
   }
 
   public async saveSnapshot({ messageId }: { messageId: string }) {
@@ -415,7 +414,6 @@ export class AilaChat implements AilaChatService {
 
   public async setupGeneration() {
     await this.startNewGeneration();
-    await this.persistChat();
     await this.persistGeneration("REQUESTED");
   }
 
diff --git a/packages/aila/src/core/chat/AilaStreamHandler.ts b/packages/aila/src/core/chat/AilaStreamHandler.ts
index 1f171825c..bf7c1098a 100644
--- a/packages/aila/src/core/chat/AilaStreamHandler.ts
+++ b/packages/aila/src/core/chat/AilaStreamHandler.ts
@@ -1,11 +1,13 @@
-import { ReadableStreamDefaultController } from "stream/web";
+import { aiLogger } from "@oakai/logger";
+import type { ReadableStreamDefaultController } from "stream/web";
 import invariant from "tiny-invariant";
 
 import { AilaThreatDetectionError } from "../../features/threatDetection/types";
 import { AilaChatError } from "../AilaError";
-import { AilaChat } from "./AilaChat";
-import { PatchEnqueuer } from "./PatchEnqueuer";
+import type { AilaChat } from "./AilaChat";
+import type { PatchEnqueuer } from "./PatchEnqueuer";
 
+const log = aiLogger("aila:stream");
 export class AilaStreamHandler {
   private _chat: AilaChat;
   private _controller?: ReadableStreamDefaultController;
@@ -43,15 +45,20 @@ export class AilaStreamHandler {
       }
     } catch (e) {
       this.handleStreamError(e);
+      log.info("Stream error", e, this._chat.iteration, this._chat.id);
     } finally {
       this._isStreaming = false;
       try {
         await this._chat.complete();
+        log.info("Chat completed", this._chat.iteration, this._chat.id);
       } catch (e) {
         this._chat.aila.errorReporter?.reportError(e);
-        throw new AilaChatError("Chat completion failed", { cause: e });
+        controller.error(
+          new AilaChatError("Chat completion failed", { cause: e }),
+        );
       } finally {
         this.closeController();
+        log.info("Stream closed", this._chat.iteration, this._chat.id);
       }
     }
   }
@@ -83,7 +90,7 @@ export class AilaStreamHandler {
       type: "comment",
       value: "CHAT_START",
     });
-    const messages = await this._chat.completionMessages();
+    const messages = this._chat.completionMessages();
     this._streamReader =
       await this._chat.createChatCompletionObjectStream(messages);
     this._isStreaming = true;
@@ -94,6 +101,7 @@ export class AilaStreamHandler {
       await this.fetchChunkFromStream();
     } catch (error) {
       await this._chat.generationFailed(error);
+      throw error;
     }
   }
 
diff --git a/packages/aila/src/core/chat/PatchEnqueuer.test.ts b/packages/aila/src/core/chat/PatchEnqueuer.test.ts
index 4d8283c8e..40f35df8b 100644
--- a/packages/aila/src/core/chat/PatchEnqueuer.test.ts
+++ b/packages/aila/src/core/chat/PatchEnqueuer.test.ts
@@ -14,12 +14,15 @@ describe("PatchEnqueuer", () => {
 
     await patchEnqueuer.enqueuePatch(path, value);
 
+    // eslint-disable-next-line @typescript-eslint/unbound-method
     expect(controller.enqueue).toHaveBeenCalled();
     const expectedPatch = `\n␞\n${JSON.stringify({
       type: "patch",
       reasoning: "generated",
       value: { op: "add", path, value },
+      status: "complete",
     })}\n␞\n`;
+    // eslint-disable-next-line @typescript-eslint/unbound-method
     expect(controller.enqueue).toHaveBeenCalledWith(expectedPatch);
   });
 
diff --git a/packages/aila/src/core/chat/PatchEnqueuer.ts b/packages/aila/src/core/chat/PatchEnqueuer.ts
index 36f210cb8..90c2d3816 100644
--- a/packages/aila/src/core/chat/PatchEnqueuer.ts
+++ b/packages/aila/src/core/chat/PatchEnqueuer.ts
@@ -1,15 +1,13 @@
 import { aiLogger } from "@oakai/logger";
 
-import { JsonPatchDocumentOptional } from "../../protocol/jsonPatchProtocol";
+import type { JsonPatchDocumentOptional } from "../../protocol/jsonPatchProtocol";
 
 const log = aiLogger("aila:protocol");
 
 export class PatchEnqueuer {
-  private encoder: TextEncoder;
   private controller?: ReadableStreamDefaultController;
 
   constructor(controller?: ReadableStreamDefaultController) {
-    this.encoder = new TextEncoder();
     this.controller = controller;
   }
 
@@ -65,6 +63,7 @@ export class PatchEnqueuer {
       type: "patch",
       reasoning: "generated",
       value: { op: "add", path, value },
+      status: "complete",
     };
   }
 
diff --git a/packages/aila/src/core/lesson/AilaLesson.ts b/packages/aila/src/core/lesson/AilaLesson.ts
index 48159b9a8..e2b5003e5 100644
--- a/packages/aila/src/core/lesson/AilaLesson.ts
+++ b/packages/aila/src/core/lesson/AilaLesson.ts
@@ -1,15 +1,18 @@
+import { aiLogger } from "@oakai/logger";
 import { deepClone } from "fast-json-patch";
 
 import { AilaCategorisation } from "../../features/categorisation/categorisers/AilaCategorisation";
-import { AilaCategorisationFeature } from "../../features/types";
+import type { AilaCategorisationFeature } from "../../features/types";
+import type { PatchDocument } from "../../protocol/jsonPatchProtocol";
 import {
-  PatchDocument,
   applyLessonPlanPatch,
   extractPatches,
 } from "../../protocol/jsonPatchProtocol";
-import { LooseLessonPlan } from "../../protocol/schema";
-import { AilaLessonService, AilaServices } from "../AilaServices";
-import { Message } from "../chat";
+import type { LooseLessonPlan } from "../../protocol/schema";
+import type { AilaLessonService, AilaServices } from "../AilaServices";
+import type { Message } from "../chat";
+
+const log = aiLogger("aila:lesson");
 
 export class AilaLesson implements AilaLessonService {
   private _aila: AilaServices;
@@ -28,14 +31,13 @@ export class AilaLesson implements AilaLessonService {
     lessonPlan?: LooseLessonPlan;
     categoriser?: AilaCategorisationFeature;
   }) {
+    log.info("Creating AilaLesson", lessonPlan?.title);
     this._aila = aila;
     this._plan = lessonPlan ?? {};
     this._categoriser =
       categoriser ??
       new AilaCategorisation({
         aila,
-        userId: aila.userId,
-        chatId: aila.chatId,
       });
   }
 
@@ -47,6 +49,10 @@ export class AilaLesson implements AilaLessonService {
     this._plan = plan;
   }
 
+  public setPlan(plan: LooseLessonPlan) {
+    this._plan = plan;
+  }
+
   public get hasSetInitialState(): boolean {
     return this._hasSetInitialState;
   }
@@ -72,13 +78,26 @@ export class AilaLesson implements AilaLessonService {
 
   public applyPatches(patches: string) {
     let workingLessonPlan = deepClone(this._plan);
+    const beforeKeys = Object.keys(workingLessonPlan).filter(
+      (k) => workingLessonPlan[k],
+    );
+    log.info(
+      "Apply patches: Lesson state before:",
+      `${beforeKeys.length} keys`,
+      beforeKeys.join("|"),
+    );
 
     // TODO do we need to apply all patches even if they are partial?
-    const { validPatches, partialPatches } = extractPatches(patches, 100);
+    const { validPatches, partialPatches } = extractPatches(patches);
     for (const patch of partialPatches) {
       this._invalidPatches.push(patch);
     }
 
+    if (this._invalidPatches.length > 0) {
+      // This should never occur server-side. If it does, we should log it.
+      log.warn("Invalid patches found. Not applying", this._invalidPatches);
+    }
+
     for (const patch of validPatches) {
       const newWorkingLessonPlan = applyLessonPlanPatch(
         workingLessonPlan,
@@ -91,12 +110,23 @@ export class AilaLesson implements AilaLessonService {
 
     for (const patch of validPatches) {
       this._appliedPatches.push(patch);
+      log.info("Applied patch", patch.value.path);
     }
 
+    const afterKeys = Object.keys(workingLessonPlan).filter(
+      (k) => workingLessonPlan[k],
+    );
+    log.info(
+      "Apply patches: Lesson state after:",
+      `${afterKeys.length} keys`,
+      afterKeys.join("|"),
+    );
+
     this._plan = workingLessonPlan;
   }
 
   public async setUpInitialLessonPlan(messages: Message[]) {
+    log.info("Setting up initial lesson plan", this._plan.title);
     const shouldCategoriseBasedOnInitialMessages = Boolean(
       !this._plan.subject && !this._plan.keyStage && !this._plan.title,
     );
diff --git a/packages/aila/src/core/llm/LLMService.ts b/packages/aila/src/core/llm/LLMService.ts
index 685850d28..9b549ec07 100644
--- a/packages/aila/src/core/llm/LLMService.ts
+++ b/packages/aila/src/core/llm/LLMService.ts
@@ -1,6 +1,6 @@
-import { ZodSchema } from "zod";
+import type { ZodSchema } from "zod";
 
-import { Message } from "../chat";
+import type { Message } from "../chat";
 
 export interface LLMService {
   name: string;
diff --git a/packages/aila/src/core/llm/MockLLMService.ts b/packages/aila/src/core/llm/MockLLMService.ts
index 5a99b3ea0..034c94f60 100644
--- a/packages/aila/src/core/llm/MockLLMService.ts
+++ b/packages/aila/src/core/llm/MockLLMService.ts
@@ -1,4 +1,4 @@
-import { LLMService } from "./LLMService";
+import type { LLMService } from "./LLMService";
 
 async function sleep(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms));
diff --git a/packages/aila/src/core/llm/OpenAIService.ts b/packages/aila/src/core/llm/OpenAIService.ts
index af157bac7..6f3d0047f 100644
--- a/packages/aila/src/core/llm/OpenAIService.ts
+++ b/packages/aila/src/core/llm/OpenAIService.ts
@@ -1,12 +1,12 @@
-import { OpenAIProvider } from "@ai-sdk/openai";
-import { HeliconeChatMeta } from "@oakai/core/src/llm/helicone";
+import type { OpenAIProvider } from "@ai-sdk/openai";
+import type { HeliconeChatMeta } from "@oakai/core/src/llm/helicone";
 import { createVercelOpenAIClient } from "@oakai/core/src/llm/openai";
 import { aiLogger } from "@oakai/logger";
 import { streamObject, streamText } from "ai";
-import { ZodSchema } from "zod";
+import type { ZodSchema } from "zod";
 
-import { Message } from "../chat";
-import { LLMService } from "./LLMService";
+import type { Message } from "../chat";
+import type { LLMService } from "./LLMService";
 
 const log = aiLogger("aila:llm");
 
diff --git a/packages/aila/src/core/plugins/types.ts b/packages/aila/src/core/plugins/types.ts
index fd609b52c..b7c277054 100644
--- a/packages/aila/src/core/plugins/types.ts
+++ b/packages/aila/src/core/plugins/types.ts
@@ -1,7 +1,7 @@
-import { Moderation } from "@prisma/client";
+import type { Moderation } from "@prisma/client";
 
-import { JsonPatchDocumentOptional } from "../../protocol/jsonPatchProtocol";
-import { AilaServices } from "../AilaServices";
+import type { JsonPatchDocumentOptional } from "../../protocol/jsonPatchProtocol";
+import type { AilaServices } from "../AilaServices";
 
 export type AilaPluginContext = {
   aila: AilaServices;
diff --git a/packages/aila/src/core/prompt/AilaPromptBuilder.ts b/packages/aila/src/core/prompt/AilaPromptBuilder.ts
index 0ff27baf8..87e0d1265 100644
--- a/packages/aila/src/core/prompt/AilaPromptBuilder.ts
+++ b/packages/aila/src/core/prompt/AilaPromptBuilder.ts
@@ -1,8 +1,8 @@
 import { jsonrepair } from "jsonrepair";
 
-import { Message } from "..";
-import { AilaServices } from "../..";
+import type { AilaServices } from "../../core/AilaServices";
 import { tryWithErrorReporting } from "../../helpers/errorReporting";
+import type { Message } from "../chat";
 
 export abstract class AilaPromptBuilder {
   protected _aila: AilaServices;
@@ -41,7 +41,7 @@ export abstract class AilaPromptBuilder {
                   }
                   return row;
                 },
-                `Failed to parse row`,
+                "Failed to parse row",
                 "info",
                 {
                   category: "json",
diff --git a/packages/aila/src/core/prompt/builders/AilaLessonPromptBuilder.ts b/packages/aila/src/core/prompt/builders/AilaLessonPromptBuilder.ts
index e8b67461f..a6142cd71 100644
--- a/packages/aila/src/core/prompt/builders/AilaLessonPromptBuilder.ts
+++ b/packages/aila/src/core/prompt/builders/AilaLessonPromptBuilder.ts
@@ -1,25 +1,18 @@
-import {
-  TemplateProps,
-  template,
-} from "@oakai/core/src/prompts/lesson-assistant";
-import { prisma as globalPrisma } from "@oakai/db";
+import type { TemplateProps } from "@oakai/core/src/prompts/lesson-assistant";
+import { template } from "@oakai/core/src/prompts/lesson-assistant";
+import { prisma as globalPrisma } from "@oakai/db/client";
 import { aiLogger } from "@oakai/logger";
 
 import { DEFAULT_RAG_LESSON_PLANS } from "../../../constants";
 import { tryWithErrorReporting } from "../../../helpers/errorReporting";
 import { LLMResponseJsonSchema } from "../../../protocol/jsonPatchProtocol";
-import {
-  LessonPlanJsonSchema,
-  LooseLessonPlan,
-} from "../../../protocol/schema";
-import { findAmericanisms } from "../../../utils/language/findAmericanisms";
+import type { LooseLessonPlan } from "../../../protocol/schema";
+import { LessonPlanJsonSchema } from "../../../protocol/schema";
 import { compressedLessonPlanForRag } from "../../../utils/lessonPlan/compressedLessonPlanForRag";
 import { fetchLessonPlan } from "../../../utils/lessonPlan/fetchLessonPlan";
-import {
-  fetchRagContent,
-  RagLessonPlan,
-} from "../../../utils/rag/fetchRagContent";
-import { AilaServices } from "../../AilaServices";
+import type { RagLessonPlan } from "../../../utils/rag/fetchRagContent";
+import { fetchRagContent } from "../../../utils/rag/fetchRagContent";
+import type { AilaServices } from "../../AilaServices";
 import { AilaPromptBuilder } from "../AilaPromptBuilder";
 
 const log = aiLogger("aila:prompt");
@@ -114,7 +107,7 @@ export class AilaLessonPromptBuilder extends AilaPromptBuilder {
       summaries: "None",
       responseMode: this._aila?.options.mode ?? "interactive",
       useRag: this._aila?.options.useRag ?? true,
-      americanisms: findAmericanisms(lessonPlan),
+      americanisms: this._aila.americanisms.findAmericanisms(lessonPlan),
       baseLessonPlan: baseLessonPlan
         ? compressedLessonPlanForRag(baseLessonPlan)
         : undefined,
diff --git a/packages/aila/src/core/types.ts b/packages/aila/src/core/types.ts
index 6a8d2623b..516aa0ab6 100644
--- a/packages/aila/src/core/types.ts
+++ b/packages/aila/src/core/types.ts
@@ -1,21 +1,25 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db/client";
 
-import { AilaModerator } from "../features/moderation/moderators";
-import { OpenAILike } from "../features/moderation/moderators/OpenAiModerator";
-import { AilaPersistence } from "../features/persistence";
-import { AilaThreatDetector } from "../features/threatDetection";
-import {
+import type { AilaAmericanismsFeature } from "../features/americanisms";
+import type { AnalyticsAdapter } from "../features/analytics";
+import type { AilaModerator } from "../features/moderation/moderators";
+import type { OpenAILike } from "../features/moderation/moderators/OpenAiModerator";
+import type { AilaPersistence } from "../features/persistence";
+import type { AilaRagFeature } from "../features/rag";
+import type { AilaThreatDetector } from "../features/threatDetection";
+import type {
   AilaAnalyticsFeature,
   AilaCategorisationFeature,
   AilaErrorReportingFeature,
   AilaModerationFeature,
   AilaThreatDetectionFeature,
 } from "../features/types";
-import { LooseLessonPlan } from "../protocol/schema";
-import { Message } from "./chat";
-import { LLMService } from "./llm/LLMService";
-import { AilaPlugin } from "./plugins/types";
-import { AilaPromptBuilder } from "./prompt/AilaPromptBuilder";
+import type { LooseLessonPlan } from "../protocol/schema";
+import type { AilaServices } from "./AilaServices";
+import type { Message } from "./chat";
+import type { LLMService } from "./llm/LLMService";
+import type { AilaPlugin } from "./plugins/types";
+import type { AilaPromptBuilder } from "./prompt/AilaPromptBuilder";
 
 export type AilaGenerateLessonPlanMode = "interactive" | "generate";
 
@@ -73,5 +77,8 @@ export type AilaInitializationOptions = {
     chatCategoriser?: AilaCategorisationFeature;
     chatLlmService?: LLMService;
     moderationAiClient?: OpenAILike;
+    ragService?: (aila: AilaServices) => AilaRagFeature;
+    americanismsService?: (aila: AilaServices) => AilaAmericanismsFeature;
+    analyticsAdapters?: (aila: AilaServices) => AnalyticsAdapter[];
   };
 };
diff --git a/packages/aila/src/features/americanisms/AilaAmericanisms.ts b/packages/aila/src/features/americanisms/AilaAmericanisms.ts
new file mode 100644
index 000000000..022d2831d
--- /dev/null
+++ b/packages/aila/src/features/americanisms/AilaAmericanisms.ts
@@ -0,0 +1,69 @@
+// eslint-disable-next-line @typescript-eslint/triple-slash-reference
+/// <reference path="./american-british-english-translator.d.ts" />
+import { textify } from "@oakai/core/src/utils/textify";
+import translator from "american-british-english-translator";
+
+import type { AilaAmericanismsFeature } from ".";
+import type {
+  AmericanismIssue,
+  AmericanismIssueBySection,
+} from "../../features/americanisms";
+import type { LessonPlanKeys, LooseLessonPlan } from "../../protocol/schema";
+
+export type TranslationResult = Record<
+  string,
+  Array<{ [phrase: string]: { issue: string; details: string } }>
+>;
+
+export class AilaAmericanisms implements AilaAmericanismsFeature {
+  private findSectionAmericanisms(
+    section: LessonPlanKeys,
+    lessonPlan: LooseLessonPlan,
+  ): AmericanismIssueBySection | undefined {
+    const filterOutPhrases = new Set([
+      "practice",
+      "practices",
+      "gas",
+      "gases",
+      "period",
+      "periods",
+      "fall",
+      "falls",
+    ]);
+
+    const sectionContent = lessonPlan[section];
+    if (!sectionContent) return;
+
+    const sectionText = textify(sectionContent);
+    const sectionAmericanismScan: TranslationResult = translator.translate(
+      sectionText,
+      { american: true },
+    );
+
+    const issues: AmericanismIssue[] = [];
+    Object.values(sectionAmericanismScan).forEach((lineIssues) => {
+      lineIssues.forEach((lineIssue) => {
+        const [phrase, issueDefinition] = Object.entries(lineIssue)[0] ?? [];
+        if (phrase && issueDefinition && !filterOutPhrases.has(phrase)) {
+          if (!issues.some((issue) => issue.phrase === phrase)) {
+            issues.push({ phrase, ...issueDefinition });
+          }
+        }
+      });
+    });
+
+    return { section, issues };
+  }
+
+  public findAmericanisms(lessonPlan: LooseLessonPlan) {
+    return Object.keys(lessonPlan).flatMap((section) => {
+      const sectionIssues = this.findSectionAmericanisms(
+        section as LessonPlanKeys,
+        lessonPlan,
+      );
+      return sectionIssues && sectionIssues.issues.length > 0
+        ? [sectionIssues]
+        : [];
+    });
+  }
+}
diff --git a/packages/aila/src/features/americanisms/NullAilaAmericanisms.ts b/packages/aila/src/features/americanisms/NullAilaAmericanisms.ts
new file mode 100644
index 000000000..7b5ce8e9a
--- /dev/null
+++ b/packages/aila/src/features/americanisms/NullAilaAmericanisms.ts
@@ -0,0 +1,7 @@
+import type { AilaAmericanismsFeature } from ".";
+
+export class NullAilaAmericanisms implements AilaAmericanismsFeature {
+  public findAmericanisms() {
+    return [];
+  }
+}
diff --git a/packages/aila/src/utils/language/american-british-english-translator.d.ts b/packages/aila/src/features/americanisms/american-british-english-translator.d.ts
similarity index 100%
rename from packages/aila/src/utils/language/american-british-english-translator.d.ts
rename to packages/aila/src/features/americanisms/american-british-english-translator.d.ts
diff --git a/packages/aila/src/features/americanisms/index.ts b/packages/aila/src/features/americanisms/index.ts
new file mode 100644
index 000000000..41004974f
--- /dev/null
+++ b/packages/aila/src/features/americanisms/index.ts
@@ -0,0 +1,16 @@
+import type { LooseLessonPlan } from "../../protocol/schema";
+
+export type AmericanismIssueBySection = {
+  section: string;
+  issues: AmericanismIssue[];
+};
+
+export type AmericanismIssue = {
+  phrase: string;
+  issue?: string;
+  details?: string;
+};
+
+export interface AilaAmericanismsFeature {
+  findAmericanisms(lessonPlan: LooseLessonPlan): AmericanismIssueBySection[];
+}
diff --git a/packages/aila/src/features/analytics/AilaAnalytics.ts b/packages/aila/src/features/analytics/AilaAnalytics.ts
index 730777f45..0a28776eb 100644
--- a/packages/aila/src/features/analytics/AilaAnalytics.ts
+++ b/packages/aila/src/features/analytics/AilaAnalytics.ts
@@ -1,5 +1,5 @@
-import { AilaServices } from "../../core";
-import { AnalyticsAdapter } from "./adapters/AnalyticsAdapter";
+import type { AilaServices } from "../../core/AilaServices";
+import type { AnalyticsAdapter } from "./adapters/AnalyticsAdapter";
 
 export class AilaAnalytics {
   private _aila: AilaServices;
diff --git a/packages/aila/src/features/analytics/adapters/AnalyticsAdapter.ts b/packages/aila/src/features/analytics/adapters/AnalyticsAdapter.ts
index 1a2738a9e..c99612c6b 100644
--- a/packages/aila/src/features/analytics/adapters/AnalyticsAdapter.ts
+++ b/packages/aila/src/features/analytics/adapters/AnalyticsAdapter.ts
@@ -1,4 +1,4 @@
-import { AilaServices } from "../../../core";
+import type { AilaServices } from "../../../core/AilaServices";
 
 export abstract class AnalyticsAdapter {
   protected _aila: AilaServices;
diff --git a/packages/aila/src/features/analytics/adapters/PosthogAnalyticsAdapter.ts b/packages/aila/src/features/analytics/adapters/PosthogAnalyticsAdapter.ts
index 9949af3ef..4b0edb998 100644
--- a/packages/aila/src/features/analytics/adapters/PosthogAnalyticsAdapter.ts
+++ b/packages/aila/src/features/analytics/adapters/PosthogAnalyticsAdapter.ts
@@ -2,7 +2,7 @@ import { getEncoding } from "js-tiktoken";
 import { PostHog } from "posthog-node";
 import invariant from "tiny-invariant";
 
-import { AilaServices } from "../../../core";
+import type { AilaServices } from "../../../core/AilaServices";
 import { reportCompletionAnalyticsEvent } from "../../../lib/openai/OpenAICompletionWithLogging";
 import { AnalyticsAdapter } from "./AnalyticsAdapter";
 
diff --git a/packages/aila/src/features/categorisation/categorisers/AilaCategorisation.ts b/packages/aila/src/features/categorisation/categorisers/AilaCategorisation.ts
index 4b098c2ce..0037e6c81 100644
--- a/packages/aila/src/features/categorisation/categorisers/AilaCategorisation.ts
+++ b/packages/aila/src/features/categorisation/categorisers/AilaCategorisation.ts
@@ -1,33 +1,23 @@
-import { RAG } from "@oakai/core/src/rag";
-import {
-  type PrismaClientWithAccelerate,
-  prisma as globalPrisma,
-} from "@oakai/db";
+import { CategoriseKeyStageAndSubjectResponse } from "@oakai/core/src/rag/categorisation";
+import { keyStages, subjects } from "@oakai/core/src/utils/subjects";
+import { aiLogger } from "@oakai/logger";
+import type { ChatCompletionMessageParam } from "openai/resources";
+import { Md5 } from "ts-md5";
 
-import { AilaServices, Message } from "../../../core";
-import { LooseLessonPlan } from "../../../protocol/schema";
-import { AilaCategorisationFeature } from "../../types";
+import { DEFAULT_CATEGORISE_MODEL } from "../../../constants";
+import type { AilaServices } from "../../../core/AilaServices";
+import type { Message } from "../../../core/chat";
+import type { OpenAICompletionWithLoggingOptions } from "../../../lib/openai/OpenAICompletionWithLogging";
+import { OpenAICompletionWithLogging } from "../../../lib/openai/OpenAICompletionWithLogging";
+import type { LooseLessonPlan } from "../../../protocol/schema";
+import type { AilaCategorisationFeature } from "../../types";
+
+const log = aiLogger("aila:categorisation");
 
 export class AilaCategorisation implements AilaCategorisationFeature {
   private _aila: AilaServices;
-  private _prisma: PrismaClientWithAccelerate;
-  private _chatId: string;
-  private _userId: string | undefined;
-  constructor({
-    aila,
-    prisma,
-    chatId,
-    userId,
-  }: {
-    aila: AilaServices;
-    prisma?: PrismaClientWithAccelerate;
-    chatId: string;
-    userId?: string;
-  }) {
+  constructor({ aila }: { aila: AilaServices }) {
     this._aila = aila;
-    this._prisma = prisma ?? globalPrisma;
-    this._chatId = chatId;
-    this._userId = userId;
   }
   public async categorise(
     messages: Message[],
@@ -39,25 +29,123 @@ export class AilaCategorisation implements AilaCategorisationFeature {
       .filter((i) => i)
       .join(" ");
 
-    const result = await this.fetchCategorisedInput(
-      categorisationInput,
-      this._prisma,
-    );
+    const result = await this.fetchCategorisedInput(categorisationInput);
     return result;
   }
 
+  private async categoriseKeyStageAndSubject(
+    input: string,
+    chatMeta: OpenAICompletionWithLoggingOptions,
+  ) {
+    log.info("Categorise input", JSON.stringify(input));
+    //# TODO Duplicated for now until we refactor the RAG class
+    const systemMessage = `You are a classifier which can help me categorise the intent of the user's input for an application which helps a teacher build a lesson plan their students in a UK school.
+You accept a string as input and return an object with the keys keyStage, subject, title and topic.
+
+USER INPUT
+The user will likely be starting to make a new lesson plan and this may be their first interaction with the system. So it's likely that the text will include introductory information, such as "Hello, I would like you to make a lesson about {title} for {key stage} students in {subject}." or "I need a lesson plan for {title} for {subject} students in {key stage}." The user may also include a topic for the lesson plan, such as "I need a lesson plan for {title} for {subject} students in {key stage} about {topic}."
+The input will be highly variable, so you should be able to handle a wide range of inputs, and extract the relevant information from the input.
+
+KEY STAGE SLUGS
+The following are the key stages you can use to categorise the input. Each of these is slug which we use in the database to refer to them:
+${keyStages.join("\n")}
+
+SUBJECT SLUGS
+The following are the subjects you can use to categorise the input. Each of these is a slug which we use in the database to refer to them:
+${subjects.join("\n")}
+
+LESSON TITLES
+The title of the lesson plan is the title of the lesson plan that the user wants to create. This could be anything, but it will likely be a short phrase or sentence that describes the topic of the lesson plan.
+Do not include "Lesson about" or "…Lesson" in the title. The title should be the standalone main topic of the lesson plan and not mention the word Lesson. It will be used as the title of the lesson plan in our database and displayed to the user in an overview document.
+
+RETURNED OBJECT
+The object you return should have the following shape:
+{
+  reasoning: string, // Why you have chosen to categorise the input in the way that you have
+  keyStage: string, // The slug of the key stage that the input is relevant to
+  subject: string, // The slug of the subject that the input is relevant to
+  title: string, // The title of the lesson plan
+  topic: string // The topic of the lesson plan
+}
+
+GUESSING AN APPROPRIATE KEY STAGE, SUBJECT OR TOPIC WHEN NOT SPECIFIED
+Where not specified by the user, you should attempt to come up with a reasonable title, key stage, subject and topic based on the input from the user.
+For instance, "Plate tectonics" is obviously something covered in Geography and based on your knowledge of the UK education system I'm sure you know that this is often taught in Key Stage 2.
+Imagine that you are a teacher who is trying to categorise the input. 
+You should use your knowledge of the UK education system to make an educated guess about the key stage and subject that the input is relevant to.
+
+EXAMPLE ALIASES
+
+Often, teachers will use shorthand to refer to a key stage or subject. For example, "KS3" is often used to refer to "Key Stage 3". You should be able to handle these aliases and return the correct slug for the key stage or subject.
+The teacher might also say "Year 10". You should be able to handle this and return the correct slug for the key stage based on the teaching years that are part of the Key Stages in the UK National Curriculum.
+For subjects, you should also be able to handle the plural form of the subject. For example, "Maths" should be categorised as "maths" and "Mathematics" should be categorised as "maths".
+"PSHE" is often used to refer to "Personal, Social, Health and Economic education" and maps to "psed" in our database.
+"PE" is often used to refer to "Physical Education". 
+"DT" is often used to refer to "Design and Technology".
+"RSHE" is often used as a synonym for "PSHE" and "PSED" and maps to "rshe-pshe" in our database.
+You should be able to handle any of these aliases and return the correct slug for the subject.
+For computing we have both "GCSE" and "non-GCSE". By default, assume that the input is relevant to the GCSE computing curriculum. If the input is relevant to the non-GCSE computing curriculum, the user will specify this in the input.
+
+PROVIDING REASONING
+When key stage, subject and topic are not provided by the user, it may be helpful to write out your reasoning for why you think the input relates to a particular key stage, subject or topic. Start with this reasoning in your response and write out why you think that the input is relevant to the key stage, subject and topic that you have chosen. This will help us to understand your thought process and improve the system in the future.
+
+BRITISH ENGLISH
+The audience for your categorisation is teachers in the UK, so you should use British English when responding to the user. For example, use "Maths" instead of "Math" and "Key Stage 3" instead of "Grade 3".
+If the user has provided a title or topic that is in American English, you should still respond with the British English equivalent. For example, if the user has provided the subject "Math" you should respond with "Maths". Or if the user has provided the title "Globalization" you should respond with "Globalisation".
+
+RESPONDING TO THE USER
+All keys are optional but always prefer sending back a keyStage or subject if you are able to take a good guess at what would be appropriate values. If you are *REALLY* not able to determine the key stage or subject, you can return null for these values, but only do so as a last resort! If you are not able to determine the title or topic, you can return null for these values.
+Always respond with a valid JSON document. If you are not able to respond for some reason, respond with another valid JSON document with the keys set to null and an "error" key with the value specifying the reason for the error.
+Never respond with slugs that are not in the list of slugs provided above. If you are not able to categorise the input, return null for the key stage and subject. This is very important! We use the slugs to categorise the input in our database, so if you return a slug that is not in the list above, we will not be able to categorise the input correctly.
+Do not respond with any other output than the object described above. If you do, the system will not be able to understand your response and will not be able to categorise the input correctly.
+Thank you and happy classifying!`;
+
+    const promptVersion = Md5.hashStr(systemMessage);
+    const messages: ChatCompletionMessageParam[] = [
+      { role: "system", content: systemMessage },
+      { role: "user", content: input },
+    ];
+
+    // #TODO This is the only place where we use this old OpenAICompletionWithLogging
+    // We should be using methods on the Aila instance instead
+    const { completion } = await OpenAICompletionWithLogging(
+      {
+        ...chatMeta,
+        promptVersion,
+        prompt: "categorise_key_stage_and_subject",
+      },
+      {
+        model: DEFAULT_CATEGORISE_MODEL,
+        stream: false,
+        messages,
+        response_format: { type: "json_object" },
+      },
+    );
+
+    try {
+      const content = completion.choices?.[0]?.message.content;
+      if (!content) return { error: "No content in response" };
+
+      const parsedResponse = CategoriseKeyStageAndSubjectResponse.parse(
+        JSON.parse(content),
+      );
+      log.info("Categorisation results", parsedResponse);
+      return parsedResponse;
+    } catch (e) {
+      return { error: "Error parsing response" };
+    }
+  }
+
   private async fetchCategorisedInput(
     input: string,
-    prisma: PrismaClientWithAccelerate,
   ): Promise<LooseLessonPlan | undefined> {
-    const rag = new RAG(prisma, {
-      chatId: this._chatId,
-      userId: this._userId,
-    });
-    const parsedCategorisation = await rag.categoriseKeyStageAndSubject(input, {
-      chatId: this._chatId,
-      userId: this._userId,
-    });
+    const parsedCategorisation = await this.categoriseKeyStageAndSubject(
+      input,
+      {
+        chatId: this._aila.chatId,
+        userId: this._aila.userId,
+      },
+    );
     const { keyStage, subject, title, topic } = parsedCategorisation;
     const plan: LooseLessonPlan = {
       keyStage: keyStage ?? undefined,
diff --git a/packages/aila/src/features/categorisation/categorisers/MockCategoriser.ts b/packages/aila/src/features/categorisation/categorisers/MockCategoriser.ts
index ab51ba369..f5a429dde 100644
--- a/packages/aila/src/features/categorisation/categorisers/MockCategoriser.ts
+++ b/packages/aila/src/features/categorisation/categorisers/MockCategoriser.ts
@@ -1,5 +1,5 @@
-import { LooseLessonPlan } from "../../../protocol/schema";
-import { AilaCategorisationFeature } from "../../types";
+import type { LooseLessonPlan } from "../../../protocol/schema";
+import type { AilaCategorisationFeature } from "../../types";
 
 export class MockCategoriser implements AilaCategorisationFeature {
   private _mockedLessonPlan: LooseLessonPlan | undefined;
diff --git a/packages/aila/src/features/errorReporting/reporters/AilaErrorReporter.ts b/packages/aila/src/features/errorReporting/reporters/AilaErrorReporter.ts
index 584b98349..06a281d9c 100644
--- a/packages/aila/src/features/errorReporting/reporters/AilaErrorReporter.ts
+++ b/packages/aila/src/features/errorReporting/reporters/AilaErrorReporter.ts
@@ -1,5 +1,5 @@
-import { AilaErrorReportingFeature } from "../../types";
-import { AilaErrorBreadcrumb, AilaErrorSeverity } from "../types";
+import type { AilaErrorReportingFeature } from "../../types";
+import type { AilaErrorBreadcrumb, AilaErrorSeverity } from "../types";
 
 export abstract class AilaErrorReporter implements AilaErrorReportingFeature {
   abstract captureException(
diff --git a/packages/aila/src/features/errorReporting/reporters/SentryErrorReporter.ts b/packages/aila/src/features/errorReporting/reporters/SentryErrorReporter.ts
index 048e35c25..704d3113e 100644
--- a/packages/aila/src/features/errorReporting/reporters/SentryErrorReporter.ts
+++ b/packages/aila/src/features/errorReporting/reporters/SentryErrorReporter.ts
@@ -1,7 +1,7 @@
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 
-import { AilaErrorSeverity, AilaErrorBreadcrumb } from "../types";
+import type { AilaErrorSeverity, AilaErrorBreadcrumb } from "../types";
 import { AilaErrorReporter } from "./AilaErrorReporter";
 
 const log = aiLogger("aila:errors");
diff --git a/packages/aila/src/features/generation/AilaGeneration.ts b/packages/aila/src/features/generation/AilaGeneration.ts
index d96b154a0..3be904df3 100644
--- a/packages/aila/src/features/generation/AilaGeneration.ts
+++ b/packages/aila/src/features/generation/AilaGeneration.ts
@@ -3,14 +3,15 @@ import {
   ailaGenerate,
   generateAilaPromptVersionVariantSlug,
 } from "@oakai/core/src/prompts/lesson-assistant/variants";
-import { prisma, Prompt } from "@oakai/db";
+import type { Prompt } from "@oakai/db";
+import { prisma } from "@oakai/db/client";
 import { aiLogger } from "@oakai/logger";
 import { kv } from "@vercel/kv";
 import { getEncoding } from "js-tiktoken";
 
-import { AilaServices } from "../../core";
-import { AilaChat } from "../../core/chat";
-import { AilaGenerationStatus } from "./types";
+import type { AilaServices } from "../../core/AilaServices";
+import type { AilaChat } from "../../core/chat";
+import type { AilaGenerationStatus } from "./types";
 
 const log = aiLogger("generation");
 
diff --git a/packages/aila/src/features/generation/index.test.ts b/packages/aila/src/features/generation/index.test.ts
index e1270b103..1173efc77 100644
--- a/packages/aila/src/features/generation/index.test.ts
+++ b/packages/aila/src/features/generation/index.test.ts
@@ -1,6 +1,8 @@
-import { AilaGeneration } from ".";
-import { Aila, AilaInitializationOptions } from "../..";
-import { AilaChat, Message } from "../../core/chat";
+import { Aila } from "../../core/Aila";
+import type { Message } from "../../core/chat";
+import { AilaChat } from "../../core/chat";
+import type { AilaInitializationOptions } from "../../core/types";
+import { AilaGeneration } from "./AilaGeneration";
 
 const ailaArgs: AilaInitializationOptions = {
   plugins: [],
@@ -19,7 +21,9 @@ describe("calculateTokenUsage", () => {
     ];
 
     const mockEncoding = {
-      encode: jest.fn().mockImplementation((text) => text.split(" ").length),
+      encode: jest
+        .fn()
+        .mockImplementation((text: string) => text.split(" ").length),
     };
     jest.mock("js-tiktoken", () => ({
       getEncoding: () => mockEncoding,
@@ -55,7 +59,9 @@ describe("calculateTokenUsage", () => {
     ];
 
     const mockEncoding = {
-      encode: jest.fn().mockImplementation((text) => text.split(" ").length),
+      encode: jest
+        .fn()
+        .mockImplementation((text: string) => text.split(" ").length),
     };
     jest.mock("js-tiktoken", () => ({
       getEncoding: () => mockEncoding,
diff --git a/packages/aila/src/features/moderation/AilaModeration.ts b/packages/aila/src/features/moderation/AilaModeration.ts
index 6aa716190..3eab050be 100644
--- a/packages/aila/src/features/moderation/AilaModeration.ts
+++ b/packages/aila/src/features/moderation/AilaModeration.ts
@@ -1,27 +1,24 @@
-import { Moderations } from "@oakai/core";
+import { Moderations } from "@oakai/core/src/models/moderations";
 import {
   getCategoryGroup,
   getMockModerationResult,
   getSafetyResult,
   isToxic,
 } from "@oakai/core/src/utils/ailaModeration/helpers";
-import { ModerationResult } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
-import {
-  Moderation,
-  PrismaClientWithAccelerate,
-  prisma as globalPrisma,
-} from "@oakai/db";
+import type { ModerationResult } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { Moderation, PrismaClientWithAccelerate } from "@oakai/db";
+import { prisma as globalPrisma } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 import invariant from "tiny-invariant";
 
-import { AilaServices } from "../../core";
-import { Message } from "../../core/chat";
-import { AilaPluginContext } from "../../core/plugins/types";
+import type { AilaServices } from "../../core/AilaServices";
+import type { Message } from "../../core/chat";
+import type { AilaPluginContext } from "../../core/plugins/types";
 import { getLastAssistantMessage } from "../../helpers/chat/getLastAssistantMessage";
-import { ModerationDocument } from "../../protocol/jsonPatchProtocol";
-import { LooseLessonPlan } from "../../protocol/schema";
-import { AilaModerationFeature } from "../types";
-import { AilaModerator } from "./moderators";
+import type { ModerationDocument } from "../../protocol/jsonPatchProtocol";
+import type { LooseLessonPlan } from "../../protocol/schema";
+import type { AilaModerationFeature } from "../types";
+import type { AilaModerator } from "./moderators";
 import { OpenAiModerator } from "./moderators/OpenAiModerator";
 
 const log = aiLogger("aila:moderation");
diff --git a/packages/aila/src/features/moderation/getSessionModerations.ts b/packages/aila/src/features/moderation/getSessionModerations.ts
index 3a30b7cc7..57e5a8bd7 100644
--- a/packages/aila/src/features/moderation/getSessionModerations.ts
+++ b/packages/aila/src/features/moderation/getSessionModerations.ts
@@ -1,5 +1,6 @@
-import { Moderations } from "@oakai/core";
-import { Moderation, prisma } from "@oakai/db";
+import { Moderations } from "@oakai/core/src/models/moderations";
+import { prisma } from "@oakai/db/client";
+import type { Moderation } from "@prisma/client";
 
 export async function getSessionModerations(
   appSessionId: string,
diff --git a/packages/aila/src/features/moderation/index.test.ts b/packages/aila/src/features/moderation/index.test.ts
index 91af17f01..f84c77cb6 100644
--- a/packages/aila/src/features/moderation/index.test.ts
+++ b/packages/aila/src/features/moderation/index.test.ts
@@ -1,14 +1,15 @@
 // Generated by CodiumAI
-import { Moderations } from "@oakai/core";
-import { ModerationResult } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { Moderations } from "@oakai/core/src/models/moderations";
+import type { ModerationResult } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { AilaModeration } from ".";
-import { Aila } from "../..";
-import { AilaChatInitializationOptions, Message } from "../../core";
-import { AilaPlugin } from "../../core/plugins";
-import { LooseLessonPlan } from "../../protocol/schema";
-import { AilaModerator } from "./moderators";
+import { Aila } from "../../core/Aila";
+import type { Message } from "../../core/chat";
+import type { AilaPlugin } from "../../core/plugins";
+import type { AilaChatInitializationOptions } from "../../core/types";
+import type { LooseLessonPlan } from "../../protocol/schema";
+import type { AilaModerator } from "./moderators";
 import { MockModerator } from "./moderators/MockModerator";
 
 // Ensure that no tests start relying on prisma
@@ -182,6 +183,7 @@ describe("AilaModeration", () => {
         messages,
       };
       const moderations = {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         create: jest.fn((mod) => ({ id: "ABC", ...mod })),
       } as unknown as Moderations;
       const mockPlugin = {
@@ -211,6 +213,7 @@ describe("AilaModeration", () => {
         categories: moderationResult.categories,
         id: "ABC",
       });
+      // eslint-disable-next-line @typescript-eslint/unbound-method
       expect(mockPlugin.onToxicModeration).toHaveBeenCalledWith(
         expect.objectContaining({
           categories: ["t/encouragement-illegal-activity"],
diff --git a/packages/aila/src/features/moderation/moderators/MockModerator.ts b/packages/aila/src/features/moderation/moderators/MockModerator.ts
index a11bbb0dc..20c802cfc 100644
--- a/packages/aila/src/features/moderation/moderators/MockModerator.ts
+++ b/packages/aila/src/features/moderation/moderators/MockModerator.ts
@@ -1,4 +1,4 @@
-import { ModerationResult } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { ModerationResult } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import { aiLogger } from "@oakai/logger";
 
 import { AilaModerator, AilaModerationError } from ".";
diff --git a/packages/aila/src/features/moderation/moderators/OpenAiModerator.ts b/packages/aila/src/features/moderation/moderators/OpenAiModerator.ts
index 897dcaebf..5d186e632 100644
--- a/packages/aila/src/features/moderation/moderators/OpenAiModerator.ts
+++ b/packages/aila/src/features/moderation/moderators/OpenAiModerator.ts
@@ -1,12 +1,10 @@
 import { createOpenAIClient } from "@oakai/core/src/llm/openai";
 import { moderationPrompt } from "@oakai/core/src/utils/ailaModeration/moderationPrompt";
-import {
-  ModerationResult,
-  moderationResponseSchema,
-} from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { ModerationResult } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import { moderationResponseSchema } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import { aiLogger } from "@oakai/logger";
-import OpenAI from "openai";
-import {
+import type OpenAI from "openai";
+import type {
   ChatCompletion,
   ChatCompletionCreateParamsNonStreaming,
 } from "openai/resources";
@@ -17,7 +15,7 @@ import {
   DEFAULT_MODERATION_MODEL,
   DEFAULT_MODERATION_TEMPERATURE,
 } from "../../../constants";
-import { AilaServices } from "../../../core";
+import type { AilaServices } from "../../../core/AilaServices";
 
 const log = aiLogger("aila:moderation");
 
@@ -140,14 +138,14 @@ export class OpenAiModerator extends AilaModerator {
         message: "No message.content in moderation response from OpenAI",
         data: { moderationResponse },
       });
-      throw new AilaModerationError(`Failed to get moderation response`);
+      throw new AilaModerationError("Failed to get moderation response");
     }
     if (!response.data) {
       this._aila?.errorReporter?.addBreadcrumb({
         message: "Invalid moderation response",
         data: { moderationResponse },
       });
-      throw new AilaModerationError(`No moderation response`);
+      throw new AilaModerationError("No moderation response");
     }
 
     const { categories, justification, scores } = response.data;
diff --git a/packages/aila/src/features/moderation/moderators/index.ts b/packages/aila/src/features/moderation/moderators/index.ts
index b356cdaac..c749307dd 100644
--- a/packages/aila/src/features/moderation/moderators/index.ts
+++ b/packages/aila/src/features/moderation/moderators/index.ts
@@ -1,4 +1,4 @@
-import { ModerationResult } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
+import type { ModerationResult } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 
 export abstract class AilaModerator {
   private _userId: string | undefined;
diff --git a/packages/aila/src/features/persistence/AilaPersistence.ts b/packages/aila/src/features/persistence/AilaPersistence.ts
index bb9994b3f..a375e4328 100644
--- a/packages/aila/src/features/persistence/AilaPersistence.ts
+++ b/packages/aila/src/features/persistence/AilaPersistence.ts
@@ -1,10 +1,12 @@
-import { GenerationStatus } from "@prisma/client";
+import type { GenerationStatus } from "@prisma/client";
 import invariant from "tiny-invariant";
 
-import { AilaChatService, AilaError, AilaServices } from "../../core";
-import { AilaOptionsWithDefaultFallbackValues } from "../../core/types";
-import { AilaPersistedChat } from "../../protocol/schema";
-import { AilaGeneration } from "../generation";
+import { AilaError } from "../../core/AilaError";
+import type { AilaChatService } from "../../core/AilaServices";
+import type { AilaServices } from "../../core/AilaServices";
+import type { AilaOptionsWithDefaultFallbackValues } from "../../core/types";
+import type { AilaPersistedChat } from "../../protocol/schema";
+import type { AilaGeneration } from "../generation/AilaGeneration";
 
 export abstract class AilaPersistence {
   protected _chat: AilaChatService;
@@ -34,7 +36,15 @@ export abstract class AilaPersistence {
   }
 
   protected createChatPayload(): ChatPersistencePayload {
-    const { id, userId, messages, isShared, relevantLessons } = this._chat;
+    const {
+      id,
+      userId,
+      messages,
+      isShared,
+      relevantLessons,
+      iteration,
+      createdAt,
+    } = this._chat;
 
     invariant(userId, "userId is required for chat persistence");
 
@@ -48,7 +58,9 @@ export abstract class AilaPersistence {
       subject,
       keyStage,
       topic,
-      createdAt: Date.now(),
+      createdAt: createdAt ? createdAt.getTime() : Date.now(),
+      updatedAt: Date.now(),
+      iteration: iteration ? iteration + 1 : 1,
       isShared,
       path: `/aila/${id}`,
       lessonPlan: lesson.plan,
diff --git a/packages/aila/src/features/persistence/adaptors/file/index.ts b/packages/aila/src/features/persistence/adaptors/file/index.ts
index 616cf889a..cfe5bff7a 100644
--- a/packages/aila/src/features/persistence/adaptors/file/index.ts
+++ b/packages/aila/src/features/persistence/adaptors/file/index.ts
@@ -1,6 +1,6 @@
 import { AilaPersistence } from "../..";
-import { AilaChatService, AilaServices } from "../../../../core";
-import { AilaGeneration } from "../../../generation";
+import type { AilaChatService, AilaServices } from "../../../../core/AilaServices";
+import type { AilaGeneration } from "../../../generation/AilaGeneration";
 
 export class AilaFilePersistence extends AilaPersistence {
   constructor({ aila, chat }: { aila: AilaServices; chat: AilaChatService }) {
diff --git a/packages/aila/src/features/persistence/adaptors/kv/index.ts b/packages/aila/src/features/persistence/adaptors/kv/index.ts
index f7db56da4..4423d0622 100644
--- a/packages/aila/src/features/persistence/adaptors/kv/index.ts
+++ b/packages/aila/src/features/persistence/adaptors/kv/index.ts
@@ -1,7 +1,7 @@
 import { kv } from "@vercel/kv";
 
 import { AilaPersistence } from "../..";
-import { AilaChatService, AilaServices } from "../../../../core";
+import type { AilaChatService, AilaServices } from "../../../../core/AilaServices";
 
 export class AilaKVPersistence extends AilaPersistence {
   constructor({ chat, aila }: { chat: AilaChatService; aila: AilaServices }) {
diff --git a/packages/aila/src/features/persistence/adaptors/prisma/index.ts b/packages/aila/src/features/persistence/adaptors/prisma/index.ts
index 48fa4df82..de7c8cb17 100644
--- a/packages/aila/src/features/persistence/adaptors/prisma/index.ts
+++ b/packages/aila/src/features/persistence/adaptors/prisma/index.ts
@@ -1,18 +1,19 @@
-import {
-  Prisma,
-  PrismaClientWithAccelerate,
-  prisma as globalPrisma,
-} from "@oakai/db";
+import type { Prisma, PrismaClientWithAccelerate } from "@oakai/db";
+import { prisma as globalPrisma } from "@oakai/db/client";
 import { aiLogger } from "@oakai/logger";
 
 import { AilaPersistence } from "../..";
-import {
-  AilaAuthenticationError,
+import { AilaAuthenticationError } from "../../../../core/AilaError";
+import type {
   AilaChatService,
   AilaServices,
-} from "../../../../core";
-import { AilaPersistedChat, chatSchema } from "../../../../protocol/schema";
-import { AilaGeneration } from "../../../generation";
+} from "../../../../core/AilaServices";
+import type {
+  AilaPersistedChat,
+  LessonPlanKeys,
+} from "../../../../protocol/schema";
+import { chatSchema } from "../../../../protocol/schema";
+import type { AilaGeneration } from "../../../generation/AilaGeneration";
 
 const log = aiLogger("aila:persistence");
 
@@ -55,7 +56,12 @@ export class AilaPrismaPersistence extends AilaPersistence {
   }
 
   async upsertChat(): Promise<void> {
+    const currentIteration = this._chat.iteration;
     const payload = this.createChatPayload();
+    const keys = (Object.keys(payload.lessonPlan) as LessonPlanKeys[]).filter(
+      (k) => payload.lessonPlan[k],
+    );
+
     if (!payload.id || !payload.userId) {
       log.info("No ID or userId found for chat. Not persisting.");
       return;
@@ -71,11 +77,19 @@ export class AilaPrismaPersistence extends AilaPersistence {
         userId: payload.userId,
         appId: "lesson-planner",
         output: payload,
+        createdAt: new Date(),
       },
       update: {
         output: payload,
+        updatedAt: new Date(),
       },
     });
+    log.info(
+      `Chat updated from ${currentIteration} to ${payload.iteration}`,
+      `${keys.length}`,
+      keys.join("|"),
+      payload.id,
+    );
   }
 
   async upsertGeneration(generation?: AilaGeneration): Promise<void> {
diff --git a/packages/aila/src/features/rag/AilaRag.ts b/packages/aila/src/features/rag/AilaRag.ts
index 213bba4a7..f9b58fb71 100644
--- a/packages/aila/src/features/rag/AilaRag.ts
+++ b/packages/aila/src/features/rag/AilaRag.ts
@@ -1,16 +1,17 @@
 import { RAG } from "@oakai/core/src/rag";
-import { PrismaClientWithAccelerate } from "@oakai/db";
-import { prisma as globalPrisma } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
+import { prisma as globalPrisma } from "@oakai/db/client";
 import { aiLogger } from "@oakai/logger";
 
-import { AilaServices } from "../../core";
+import type { AilaRagFeature } from ".";
+import type { AilaServices } from "../../core/AilaServices";
 import { tryWithErrorReporting } from "../../helpers/errorReporting";
-import { LooseLessonPlan } from "../../protocol/schema";
+import type { LooseLessonPlan } from "../../protocol/schema";
 import { minifyLessonPlanForRelevantLessons } from "../../utils/lessonPlan/minifyLessonPlanForRelevantLessons";
 
 const log = aiLogger("aila:rag");
 
-export class AilaRag {
+export class AilaRag implements AilaRagFeature {
   private _aila: AilaServices;
   private _rag: RAG;
   private _prisma: PrismaClientWithAccelerate;
diff --git a/packages/aila/src/features/rag/NullAilaRag.ts b/packages/aila/src/features/rag/NullAilaRag.ts
new file mode 100644
index 000000000..8d8606ea5
--- /dev/null
+++ b/packages/aila/src/features/rag/NullAilaRag.ts
@@ -0,0 +1,7 @@
+import type { AilaRagFeature } from ".";
+
+export class NullAilaRag implements AilaRagFeature {
+  public async fetchRagContent() {
+    return "";
+  }
+}
diff --git a/packages/aila/src/features/rag/index.ts b/packages/aila/src/features/rag/index.ts
index 0f6542d26..71cffadc6 100644
--- a/packages/aila/src/features/rag/index.ts
+++ b/packages/aila/src/features/rag/index.ts
@@ -1 +1,8 @@
-export { AilaRag } from "./AilaRag";
+import type { LooseLessonPlan } from "../../protocol/schema";
+
+export interface AilaRagFeature {
+  fetchRagContent(params: {
+    numberOfLessonPlansInRag?: number;
+    lessonPlan?: LooseLessonPlan;
+  }): Promise<string>;
+}
diff --git a/packages/aila/src/features/snapshotStore/AilaSnapshotStore.ts b/packages/aila/src/features/snapshotStore/AilaSnapshotStore.ts
index f76585525..7b8d54833 100644
--- a/packages/aila/src/features/snapshotStore/AilaSnapshotStore.ts
+++ b/packages/aila/src/features/snapshotStore/AilaSnapshotStore.ts
@@ -1,10 +1,11 @@
-import { LessonSnapshots } from "@oakai/core";
-import { PrismaClientWithAccelerate, prisma as globalPrisma } from "@oakai/db";
-import { LessonSnapshotTrigger } from "@prisma/client";
+import { LessonSnapshots } from "@oakai/core/src/models/lessonSnapshots";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
+import { prisma as globalPrisma } from "@oakai/db/client";
+import type { LessonSnapshotTrigger } from "@prisma/client";
 import invariant from "tiny-invariant";
 
-import { AilaServices } from "../../core";
-import { LooseLessonPlan } from "../../protocol/schema";
+import type { AilaServices } from "../../core/AilaServices";
+import type { LooseLessonPlan } from "../../protocol/schema";
 
 export class AilaSnapshotStore {
   protected _name: string;
diff --git a/packages/aila/src/features/threatDetection/AilaThreatDetection.ts b/packages/aila/src/features/threatDetection/AilaThreatDetection.ts
index 13780f538..04d2bc140 100644
--- a/packages/aila/src/features/threatDetection/AilaThreatDetection.ts
+++ b/packages/aila/src/features/threatDetection/AilaThreatDetection.ts
@@ -1,5 +1,5 @@
-import { AilaThreatDetectionFeature } from "../types";
-import { AilaThreatDetector } from "./detectors/AilaThreatDetector";
+import type { AilaThreatDetectionFeature } from "../types";
+import type { AilaThreatDetector } from "./detectors/AilaThreatDetector";
 import { HeliconeThreatDetector } from "./detectors/HeliconeThreatDetector";
 
 export class AilaThreatDetection implements AilaThreatDetectionFeature {
diff --git a/packages/aila/src/features/threatDetection/index.ts b/packages/aila/src/features/threatDetection/index.ts
index b06023e5e..43d34cdc2 100644
--- a/packages/aila/src/features/threatDetection/index.ts
+++ b/packages/aila/src/features/threatDetection/index.ts
@@ -1,2 +1,3 @@
 export { AilaThreatDetection } from "./AilaThreatDetection";
 export { AilaThreatDetector } from "./detectors/AilaThreatDetector";
+export { AilaThreatDetectionError } from "./types";
diff --git a/packages/aila/src/features/types.ts b/packages/aila/src/features/types.ts
index 5ea17970e..0b75b745c 100644
--- a/packages/aila/src/features/types.ts
+++ b/packages/aila/src/features/types.ts
@@ -1,10 +1,10 @@
-import { Message } from "../core/chat";
-import { AilaPluginContext } from "../core/plugins";
-import { ModerationDocument } from "../protocol/jsonPatchProtocol";
-import { AilaPersistedChat, LooseLessonPlan } from "../protocol/schema";
-import { AilaErrorBreadcrumb, AilaErrorSeverity } from "./errorReporting/types";
-import { AilaGeneration } from "./generation";
-import { AilaThreatDetector } from "./threatDetection";
+import type { Message } from "../core/chat";
+import type { AilaPluginContext } from "../core/plugins";
+import type { ModerationDocument } from "../protocol/jsonPatchProtocol";
+import type { AilaPersistedChat, LooseLessonPlan } from "../protocol/schema";
+import type { AilaErrorBreadcrumb, AilaErrorSeverity } from "./errorReporting/types";
+import type { AilaGeneration } from "./generation/AilaGeneration";
+import type { AilaThreatDetector } from "./threatDetection";
 
 export interface AilaModerationFeature {
   moderate(options: {
diff --git a/packages/aila/src/lib/openai/OpenAICompletionWithLogging.ts b/packages/aila/src/lib/openai/OpenAICompletionWithLogging.ts
index 52dd9d339..9bc652951 100644
--- a/packages/aila/src/lib/openai/OpenAICompletionWithLogging.ts
+++ b/packages/aila/src/lib/openai/OpenAICompletionWithLogging.ts
@@ -3,7 +3,7 @@
 import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBetaServerClient";
 import { createOpenAIClient } from "@oakai/core/src/llm/openai";
 import { aiLogger } from "@oakai/logger";
-import OpenAI from "openai";
+import type OpenAI from "openai";
 import type { PostHog } from "posthog-node";
 
 const log = aiLogger("aila:llm");
diff --git a/packages/aila/src/protocol/jsonPatchProtocol.ts b/packages/aila/src/protocol/jsonPatchProtocol.ts
index cb3a0e9f7..90533503b 100644
--- a/packages/aila/src/protocol/jsonPatchProtocol.ts
+++ b/packages/aila/src/protocol/jsonPatchProtocol.ts
@@ -1,15 +1,13 @@
 import { moderationCategoriesSchema } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
-import {
-  Operation,
-  applyPatch,
-  deepClone,
-  JsonPatchError,
-} from "fast-json-patch";
-import { ZodError, z } from "zod";
+import type { Operation } from "fast-json-patch";
+import { applyPatch, deepClone, JsonPatchError } from "fast-json-patch";
+import untruncateJson from "untruncate-json";
+import { z } from "zod";
 import zodToJsonSchema from "zod-to-json-schema";
 
+import type { LooseLessonPlan } from "./schema";
 import {
   BasedOnOptionalSchema,
   BasedOnSchema,
@@ -20,7 +18,6 @@ import {
   KeywordsSchema,
   KeywordsSchemaWithoutLength,
   LessonPlanSchemaWhilstStreaming,
-  LooseLessonPlan,
   MisconceptionsOptionalSchema,
   MisconceptionsSchema,
   MisconceptionsSchemaWithoutLength,
@@ -282,6 +279,7 @@ export const PatchDocumentSchema = z.object({
   type: z.literal("patch"),
   reasoning: z.string().optional(),
   value: JsonPatchValueSchema,
+  status: z.string().optional(),
 });
 
 // This is the schema that we send when requesting Structured Outputs
@@ -304,6 +302,7 @@ export const LLMPatchDocumentSchema = z.object({
     PatchCycleForLLM,
     JsonPatchRemoveSchemaForLLM,
   ]),
+  status: z.literal("complete"),
 });
 
 export type PatchDocument = z.infer<typeof PatchDocumentSchema>;
@@ -312,6 +311,7 @@ const PatchDocumentOptionalSchema = z.object({
   type: z.literal("patch"),
   reasoning: z.string(),
   value: JsonPatchValueOptionalSchema,
+  status: z.literal("complete").optional(),
 });
 
 export type PatchDocumentOptional = z.infer<typeof PatchDocumentOptionalSchema>;
@@ -320,6 +320,7 @@ export const PromptDocumentSchema = z.object({
   type: z.literal("prompt"),
   message: z.string(),
   options: z.array(z.object({ id: z.string(), title: z.string() })).optional(),
+  status: z.literal("complete").optional(),
 });
 
 export const PromptDocumentSchemaWithoutOptions = z.object({
@@ -390,6 +391,7 @@ export const UnknownDocumentSchema = z.object({
   type: z.literal("unknown"),
   value: z.unknown().optional(),
   error: z.unknown().optional(),
+  status: z.string().optional(),
 });
 
 export type UnknownDocument = z.infer<typeof UnknownDocumentSchema>;
@@ -506,14 +508,34 @@ export type MessagePart = z.infer<typeof MessagePartSchema>;
 
 export const LLMMessageSchema = z.object({
   type: z.literal("llmMessage"),
-  patches: z.array(PatchDocumentSchema),
-  prompt: TextDocumentSchema,
+  sectionsToEdit: z
+    .array(z.string())
+    .describe(
+      "The sections of the lesson plan that you are considering editing. This should be an array of strings, where each string is the key of the section you are proposing to edit. For example, if you are proposing to edit the 'priorKnowledge' section, you should include 'priorKnowledge' in this array. If you are proposing to edit multiple sections, you should include all of the keys in this array.",
+    ),
+  patches: z
+    .array(LLMPatchDocumentSchema)
+    .describe(
+      "This is the set of patches you have generated to edit the lesson plan. Follow the instructions in the system prompt to ensure that you produce a valid patch. For instance, if you are providing a patch to add a cycle, the op should be 'add' and the value should be the JSON object representing the full, valid cycle. The same applies for all of the other parts of the lesson plan. This should not include more than one 'add' patch for the same section of the lesson plan. These edits will overwrite each other and result in unexpected results. If you want to do multiple updates on the same section, it is best to generate one 'add' patch with all of your edits included.",
+    ),
+  sectionsEdited: z
+    .array(z.string())
+    .describe(
+      "The sections of the lesson plan that you are actually edited. This should be an array of strings, where each string is the key of the section you are proposing to edit. For example, if you edited the 'priorKnowledge' section, you should include 'priorKnowledge' in this array. If you edited multiple sections, you should include all of the keys in this array.",
+    ),
+  prompt: TextDocumentSchema.describe(
+    "If you imagine the user talking to you, this is where you would put your human-readable reply that would explain the changes you have made (if any), ask them questions, and prompt them to send their next message. This should not contain any of the lesson plan content. That should all be delivered in patches. If you have made edits, you should respond to the user by asking if they are happy with the changes you have made if any, and prompt them with what they can do next",
+  ),
+  status: z.literal("complete"),
 });
 
 const LLMMessageSchemaWhileStreaming = z.object({
   type: z.literal("llmMessage"),
+  sectionsToEdit: z.array(z.string()).optional(),
   patches: z.array(z.object({}).passthrough()).optional(),
+  sectionsEdited: z.array(z.string()).optional(),
   prompt: TextDocumentSchema.optional(),
+  status: z.literal("complete").optional(),
 });
 
 function tryParseJson(str: string): {
@@ -530,11 +552,25 @@ function tryParseJson(str: string): {
     }
     return { parsed, isPartial: false };
   } catch (e) {
-    // If parsing fails, assume it's partial
-    return { parsed: null, isPartial: true };
+    try {
+      // Is this a JSON streaming in?
+      const parsedTruncated = JSON.parse(untruncateJson(str));
+      if (isObject(parsedTruncated) && "type" in parsedTruncated) {
+        return { parsed: parsedTruncated, isPartial: true };
+      } else {
+        throw new Error("The parsed JSON object does not have a type");
+      }
+    } catch (e) {
+      // If parsing fails, assume it's partial
+      return { parsed: null, isPartial: true };
+    }
   }
 }
 
+function isObject(value: unknown): value is { type: string } {
+  return typeof value === "object" && value !== null && "type" in value;
+}
+
 export function tryParsePart(
   obj: object,
 ): MessagePartDocument | UnknownDocument {
@@ -564,7 +600,6 @@ export function tryParsePatch(obj: object): PatchDocument | UnknownDocument {
     const patchDocument: PatchDocument = parsed.data;
     return patchDocument;
   } else {
-    log.info("Unable to parse patch", parsed, parsed.error);
     return { type: "unknown", value: JSON.stringify(obj), error: parsed.error };
   }
 }
@@ -629,7 +664,7 @@ export function parseMessageRow(row: string, index: number): MessagePart[] {
         result.push({
           type: "message-part",
           document: parsedPatch,
-          isPartial,
+          isPartial: parsedPatch.status !== "complete",
           id: `${index}-patch-${i}`,
         });
         i++;
@@ -640,7 +675,7 @@ export function parseMessageRow(row: string, index: number): MessagePart[] {
         result.push({
           type: "message-part",
           document: parsedPrompt,
-          isPartial,
+          isPartial: llmMessage.status !== "complete",
           id: `${index}-prompt`,
         });
       }
@@ -681,61 +716,32 @@ export function parseMessageParts(content: string): MessagePart[] {
   return messageParts;
 }
 
-export function extractPatches(
-  edit: string,
-  mostRecent: number = 2,
-): {
+export function extractPatches(edit: string): {
   validPatches: PatchDocument[];
   partialPatches: PatchDocument[];
 } {
-  const validPatches: PatchDocument[] = [];
-  const partialPatches: PatchDocument[] = [];
-
-  const messageParts = parseMessageParts(edit);
-  const relevantParts = messageParts.slice(-mostRecent);
-
-  for (const part of relevantParts) {
-    if (part.document.type === "patch") {
-      try {
-        const validatedPatch = PatchDocumentSchema.parse(part.document);
-        if (part.isPartial) {
-          partialPatches.push(validatedPatch);
-        } else {
-          validPatches.push(validatedPatch);
-        }
-      } catch (e) {
-        if (e instanceof ZodError) {
-          log.info("Failed to parse patch due to Zod validation errors:", part);
-          e.errors.forEach((error, index) => {
-            log.info(`Error ${index + 1}:`);
-            log.info(`  Path: ${error.path.join(".")}`);
-            log.info(`  Message: ${error.message}`);
-            if (error.code) log.info(`  Code: ${error.code}`);
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const errorValue = error.path.reduce((obj: any, key) => {
-              if (obj && typeof obj === "object" && key in obj) {
-                return (obj as Record<string, unknown>)[key];
-              }
-              return undefined;
-            }, part);
-            log.error(`  Invalid value:`, errorValue);
-          });
-        } else {
-          log.error("Failed to parse patch:", e);
-        }
-
-        Sentry.withScope(function (scope) {
-          scope.setLevel("error");
-          if (e instanceof ZodError) {
-            scope.setExtra("zodErrors", e.errors);
-          }
-          scope.setExtra("parsedData", part);
-          Sentry.captureException(e);
-        });
-      }
-    }
+  const parts: MessagePart[] | undefined = parseMessageParts(edit);
+
+  if (!parts) {
+    // Handle parsing failure
+    throw new Error("Failed to parse the edit content");
   }
 
+  const patchMessageParts: MessagePart[] = parts.filter(
+    (p) => p.document.type === "patch",
+  );
+  const validPatches: PatchDocument[] = patchMessageParts
+    .filter((p) => !p.isPartial)
+    .map((p) => p.document as PatchDocument);
+  const partialPatches: PatchDocument[] = patchMessageParts
+    .filter((p) => p.isPartial)
+    .map((p) => p.document as PatchDocument);
+
+  log.info(
+    "Extracted patches",
+    validPatches.map((i) => i.value.path),
+    partialPatches.map((i) => i.value.path),
+  );
   return { validPatches, partialPatches };
 }
 
@@ -756,6 +762,7 @@ export function applyLessonPlanPatch(
   lessonPlan: LooseLessonPlan,
   command: JsonPatchDocument,
 ) {
+  log.info("Apply patch", JSON.stringify(command));
   let updatedLessonPlan = { ...lessonPlan };
   if (command.type !== "patch") return lessonPlan;
   const patch = command.value as Operation;
@@ -775,8 +782,17 @@ export function applyLessonPlanPatch(
       extra["index"] = e.index;
       extra["operation"] = e.operation;
       extra["tree"] = e.tree;
+      log.error("JSON Patch Error:", e, extra);
+    } else if (e instanceof z.ZodError) {
+      log.error(
+        "Zod Error:",
+        e.errors
+          .map((err) => `${err.path.join(".")}: ${err.message}`)
+          .join(", "),
+      );
+    } else {
+      log.error("Failed to apply patch", patch, e);
     }
-    log.error("Failed to apply patch", patch, e);
     Sentry.withScope(function (scope) {
       scope.setLevel("info");
       Sentry.captureException(e, { extra });
diff --git a/packages/aila/src/protocol/parseMessageRow.test.ts b/packages/aila/src/protocol/parseMessageRow.test.ts
index c1d60a1c8..7057c7798 100644
--- a/packages/aila/src/protocol/parseMessageRow.test.ts
+++ b/packages/aila/src/protocol/parseMessageRow.test.ts
@@ -1,7 +1,7 @@
 import invariant from "tiny-invariant";
 
 import { PatchCycle, parseMessageRow } from "./jsonPatchProtocol";
-import { Cycle } from "./schema";
+import type { Cycle } from "./schema";
 
 /* 
 
diff --git a/packages/aila/src/protocol/schema.ts b/packages/aila/src/protocol/schema.ts
index 390842fff..f25bd115c 100644
--- a/packages/aila/src/protocol/schema.ts
+++ b/packages/aila/src/protocol/schema.ts
@@ -10,7 +10,9 @@ export const BasedOnSchema = z
       ),
     title: z.string().describe("The human-readable title of the lesson."),
   })
-  .describe("A reference to a lesson plan that this lesson is based on.");
+  .describe(
+    "A reference to a lesson plan that this lesson is based on. This value should only be set if the user has explicitly chosen to base their lesson on an existing lesson plan by selecting one from a selection of options, otherwise this should be blank.",
+  );
 
 export const BasedOnOptionalSchema = z.object({
   id: z.string().optional(),
@@ -78,6 +80,9 @@ export const MisconceptionsOptionalSchema = z.array(
 
 export type Misconception = z.infer<typeof MisconceptionSchema>;
 export type MisconceptionOptional = z.infer<typeof MisconceptionOptionalSchema>;
+export type MisconceptionsOptional = z.infer<
+  typeof MisconceptionsOptionalSchema
+>;
 
 export const QuizQuestionOptionalSchema = z.object({
   question: z.string().optional(),
@@ -501,24 +506,27 @@ export const LessonPlanSchemaWhilstStreaming = LessonPlanSchema;
 // TODO old - refactor these to the new types
 
 export type LooseLessonPlan = z.infer<typeof LessonPlanSchemaWhilstStreaming>;
-export type LessonPlanKeys =
-  | "title"
-  | "subject"
-  | "keyStage"
-  | "topic"
-  | "learningOutcome"
-  | "learningCycles"
-  | "priorKnowledge"
-  | "keyLearningPoints"
-  | "misconceptions"
-  | "keywords"
-  | "basedOn"
-  | "starterQuiz"
-  | "exitQuiz"
-  | "cycle1"
-  | "cycle2"
-  | "cycle3"
-  | "additionalMaterials";
+export const LessonPlanKeysSchema = z.enum([
+  "title",
+  "subject",
+  "keyStage",
+  "topic",
+  "learningOutcome",
+  "learningCycles",
+  "priorKnowledge",
+  "keyLearningPoints",
+  "misconceptions",
+  "keywords",
+  "basedOn",
+  "starterQuiz",
+  "exitQuiz",
+  "cycle1",
+  "cycle2",
+  "cycle3",
+  "additionalMaterials",
+]);
+
+export type LessonPlanKeys = z.infer<typeof LessonPlanKeysSchema>;
 export const quizSchema = z.array(QuizSchema);
 
 export const cycleSchema = CycleSchema;
@@ -592,6 +600,8 @@ export const chatSchema = z
     relevantLessons: z.array(AilaRagRelevantLessonSchema).optional(),
     isShared: z.boolean().optional(),
     createdAt: z.union([z.date(), z.number()]),
+    updatedAt: z.union([z.date(), z.number()]).optional(),
+    iteration: z.number().optional(),
     startingMessage: z.string().optional(),
     messages: z.array(
       z
@@ -623,6 +633,8 @@ export const chatSchemaWithMissingMessageIds = z
     lessonPlan: LessonPlanSchemaWhilstStreaming,
     isShared: z.boolean().optional(),
     createdAt: z.union([z.date(), z.number()]),
+    updatedAt: z.union([z.date(), z.number()]).optional(),
+    iteration: z.number().optional(),
     startingMessage: z.string().optional(),
     messages: z.array(
       z
@@ -646,3 +658,13 @@ export const chatSchemaWithMissingMessageIds = z
 export type AilaPersistedChatWithMissingMessageIds = z.infer<
   typeof chatSchemaWithMissingMessageIds
 >;
+
+export type LessonPlanSectionWhileStreaming =
+  | BasedOnOptional
+  | MisconceptionsOptional
+  | KeywordOptional[]
+  | QuizOptional
+  | CycleOptional
+  | string
+  | string[]
+  | number;
diff --git a/packages/aila/src/protocol/sectionToMarkdown.ts b/packages/aila/src/protocol/sectionToMarkdown.ts
index 2ede1e2fb..e9b8f36fd 100644
--- a/packages/aila/src/protocol/sectionToMarkdown.ts
+++ b/packages/aila/src/protocol/sectionToMarkdown.ts
@@ -1,15 +1,12 @@
 import { camelCaseToSentenceCase } from "@oakai/core/src/utils/camelCaseToSentenceCase";
 import { isArray, isNumber, isObject, isString } from "remeda";
 
-import {
-  CycleOptionalSchema,
-  QuizOptional,
-  QuizOptionalSchema,
-} from "./schema";
+import type { QuizOptional } from "./schema";
+import { CycleOptionalSchema, QuizOptionalSchema } from "./schema";
 
 export function sortIgnoringSpecialChars(strings: string[]): string[] {
   // Function to normalize strings by removing *, -, and spaces
-  const normalize = (str: string) => str.replace(/[\*\-\s]/g, "");
+  const normalize = (str: string) => str.replace(/[*\-\s]/g, "");
 
   // Sort the array using the normalized values for comparison
   return strings.sort((a, b) => {
@@ -45,12 +42,12 @@ export function sectionToMarkdown(
       return `${content}\n\n### Explanation\n\n${sectionToMarkdown("explanation", cycle.explanation ?? "…")}\n\n### Check for Understanding\n\n${cycle.checkForUnderstanding ? organiseAnswersAndDistractors(cycle.checkForUnderstanding) : "…"}\n\n### Practice\n\n${cycle.practice ?? "…"}\n\n### Feedback\n\n${cycle.feedback ?? "…"}`;
     } catch (e) {
       // Invalid schema
-      return `## There's been a problem\n\nIt looks like this learning cycle hasn't generated properly. Tap **Retry** or ask for this section to be regenerated.`;
+      return "## There's been a problem\n\nIt looks like this learning cycle hasn't generated properly. Tap **Retry** or ask for this section to be regenerated.";
     }
   }
 
   if (isArray(value)) {
-    if (value.map((v) => typeof v).every((v) => v === "string")) {
+    if (value.every((v): v is string => typeof v === "string")) {
       // Render arrays of strings as bullets
       return value.map((v) => `- ${v}`).join("\n\n");
     } else {
@@ -84,8 +81,10 @@ export function sectionToMarkdown(
               .filter((v) => v[keys[0]] && v[keys[1]])
               .map((v) => {
                 // @ts-expect-error - we know that the keys exist
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 const header = v[keys[0]];
                 // @ts-expect-error - we know that the keys exist
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 const body = v[keys[1]];
                 return `### ${header}\n\n${body}`;
               })
diff --git a/packages/aila/src/utils/language/findAmericanisms.ts b/packages/aila/src/utils/language/findAmericanisms.ts
deleted file mode 100644
index 40418f849..000000000
--- a/packages/aila/src/utils/language/findAmericanisms.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/triple-slash-reference
-/// <reference path="./american-british-english-translator.d.ts" />
-import { textify } from "@oakai/core/src/models/lessonPlans";
-import translator from "american-british-english-translator";
-
-import { LessonPlanKeys, LooseLessonPlan } from "../../protocol/schema";
-
-export type AmericanismIssueBySection = {
-  section: string;
-  issues: AmericanismIssue[];
-};
-
-export type AmericanismIssue = {
-  phrase: string;
-  issue?: string;
-  details?: string;
-};
-
-export type TranslationResult = Record<
-  string,
-  Array<{ [phrase: string]: { issue: string; details: string } }>
->;
-
-const filterOutPhrases = new Set([
-  "practice",
-  "practices",
-  "gas",
-  "gases",
-  "period",
-  "periods",
-  "fall",
-  "falls",
-]);
-
-export function findSectionAmericanisms(
-  section: LessonPlanKeys,
-  lessonPlan: LooseLessonPlan,
-): AmericanismIssueBySection | undefined {
-  const sectionContent = lessonPlan[section];
-  if (!sectionContent) return;
-
-  const sectionText = textify(sectionContent);
-  const sectionAmericanismScan: TranslationResult = translator.translate(
-    sectionText,
-    { american: true },
-  );
-
-  const issues: AmericanismIssue[] = [];
-  Object.values(sectionAmericanismScan).forEach((lineIssues) => {
-    lineIssues.forEach((lineIssue) => {
-      const [phrase, issueDefinition] = Object.entries(lineIssue)[0] ?? [];
-      if (phrase && issueDefinition && !filterOutPhrases.has(phrase)) {
-        if (!issues.some((issue) => issue.phrase === phrase)) {
-          issues.push({ phrase, ...issueDefinition });
-        }
-      }
-    });
-  });
-
-  return { section, issues };
-}
-
-export function findAmericanisms(
-  lessonPlan: LooseLessonPlan,
-): AmericanismIssueBySection[] {
-  return Object.keys(lessonPlan).flatMap((section) => {
-    const sectionIssues = findSectionAmericanisms(
-      section as LessonPlanKeys,
-      lessonPlan,
-    );
-    return sectionIssues && sectionIssues.issues.length > 0
-      ? [sectionIssues]
-      : [];
-  });
-}
diff --git a/packages/aila/src/utils/lessonPlan/compressedLessonPlanForRag.ts b/packages/aila/src/utils/lessonPlan/compressedLessonPlanForRag.ts
index 63dc9ac67..ba45194a6 100644
--- a/packages/aila/src/utils/lessonPlan/compressedLessonPlanForRag.ts
+++ b/packages/aila/src/utils/lessonPlan/compressedLessonPlanForRag.ts
@@ -1,4 +1,4 @@
-import { LooseLessonPlan } from "../../protocol/schema";
+import type { LooseLessonPlan } from "../../protocol/schema";
 
 /**
  * Compresses a lesson plan to a stringified JSON object, excluding the exit and starter quizzes
diff --git a/packages/aila/src/utils/lessonPlan/fetchLessonPlan.ts b/packages/aila/src/utils/lessonPlan/fetchLessonPlan.ts
index d3e90e309..1415de620 100644
--- a/packages/aila/src/utils/lessonPlan/fetchLessonPlan.ts
+++ b/packages/aila/src/utils/lessonPlan/fetchLessonPlan.ts
@@ -1,7 +1,7 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { kv } from "@vercel/kv";
 
-import { LooseLessonPlan } from "../../protocol/schema";
+import type { LooseLessonPlan } from "../../protocol/schema";
 import { fetchLessonPlanContentById } from "./fetchLessonPlanContentById";
 
 export async function fetchLessonPlan({
diff --git a/packages/aila/src/utils/lessonPlan/fetchLessonPlanContentById.ts b/packages/aila/src/utils/lessonPlan/fetchLessonPlanContentById.ts
index f706a0025..6496d98ca 100644
--- a/packages/aila/src/utils/lessonPlan/fetchLessonPlanContentById.ts
+++ b/packages/aila/src/utils/lessonPlan/fetchLessonPlanContentById.ts
@@ -1,10 +1,8 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { tryWithErrorReporting } from "../../helpers/errorReporting";
-import {
-  LessonPlanSchemaWhilstStreaming,
-  LooseLessonPlan,
-} from "../../protocol/schema";
+import type { LooseLessonPlan } from "../../protocol/schema";
+import { LessonPlanSchemaWhilstStreaming } from "../../protocol/schema";
 
 export async function fetchLessonPlanContentById(
   id: string,
diff --git a/packages/aila/src/utils/lessonPlan/minifyLessonPlanForRelevantLessons.ts b/packages/aila/src/utils/lessonPlan/minifyLessonPlanForRelevantLessons.ts
index deed91501..3bb1ecb8a 100644
--- a/packages/aila/src/utils/lessonPlan/minifyLessonPlanForRelevantLessons.ts
+++ b/packages/aila/src/utils/lessonPlan/minifyLessonPlanForRelevantLessons.ts
@@ -1,6 +1,6 @@
-import { LessonPlan as DatabaseLessonPlan } from "@oakai/db";
+import type { LessonPlan as DatabaseLessonPlan } from "@oakai/db";
 
-import { CompletedLessonPlan } from "../../protocol/schema";
+import type { CompletedLessonPlan } from "../../protocol/schema";
 
 export function minifyLessonPlanForRelevantLessons(
   lessonPlan: DatabaseLessonPlan,
diff --git a/packages/aila/src/utils/moderation/moderationErrorHandling.ts b/packages/aila/src/utils/moderation/moderationErrorHandling.ts
index 82266b3b9..7ff04673e 100644
--- a/packages/aila/src/utils/moderation/moderationErrorHandling.ts
+++ b/packages/aila/src/utils/moderation/moderationErrorHandling.ts
@@ -1,9 +1,9 @@
-import { SafetyViolations as defaultSafetyViolations } from "@oakai/core";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import { SafetyViolations as defaultSafetyViolations } from "@oakai/core/src/models/safetyViolations";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
-import { AilaThreatDetectionError } from "../../features/threatDetection/types";
-import {
+import type { AilaThreatDetectionError } from "../../features/threatDetection/types";
+import type {
   ActionDocument,
   ErrorDocument,
 } from "../../protocol/jsonPatchProtocol";
diff --git a/packages/aila/src/utils/rag/fetchRagContent.ts b/packages/aila/src/utils/rag/fetchRagContent.ts
index f13be709b..3ffb709dc 100644
--- a/packages/aila/src/utils/rag/fetchRagContent.ts
+++ b/packages/aila/src/utils/rag/fetchRagContent.ts
@@ -1,8 +1,8 @@
 import { RAG } from "@oakai/core/src/rag";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { tryWithErrorReporting } from "../../helpers/errorReporting";
-import { CompletedLessonPlan } from "../../protocol/schema";
+import type { CompletedLessonPlan } from "../../protocol/schema";
 import { minifyLessonPlanForRelevantLessons } from "../lessonPlan/minifyLessonPlanForRelevantLessons";
 
 export type RagLessonPlan = Omit<
diff --git a/packages/api/src/context.ts b/packages/api/src/context.ts
index fd5761114..abf9507b0 100644
--- a/packages/api/src/context.ts
+++ b/packages/api/src/context.ts
@@ -1,14 +1,14 @@
-import {
+import type {
   SignedInAuthObject,
   SignedOutAuthObject,
 } from "@clerk/backend/internal";
 import { getAuth } from "@clerk/nextjs/server";
 import { prisma } from "@oakai/db";
-import { type inferAsyncReturnType } from "@trpc/server";
-import { NodeHTTPCreateContextFnOptions } from "@trpc/server/adapters/node-http";
-import { NextRequest, NextResponse } from "next/server";
+import type { inferAsyncReturnType } from "@trpc/server";
+import type { NodeHTTPCreateContextFnOptions } from "@trpc/server/adapters/node-http";
+import type { NextRequest, NextResponse } from "next/server";
 
-import { RateLimitInfo } from "./types";
+import type { RateLimitInfo } from "./types";
 
 type ClerkAuthSig = typeof getAuth;
 type ClerkAuthReturn = inferAsyncReturnType<ClerkAuthSig>;
diff --git a/packages/api/src/export/exportAdditionalMaterialsDoc.ts b/packages/api/src/export/exportAdditionalMaterialsDoc.ts
index 2617bf7d6..826339ea4 100644
--- a/packages/api/src/export/exportAdditionalMaterialsDoc.ts
+++ b/packages/api/src/export/exportAdditionalMaterialsDoc.ts
@@ -1,16 +1,17 @@
-import { SignedInAuthObject } from "@clerk/backend/internal";
+import type { SignedInAuthObject } from "@clerk/backend/internal";
 import { clerkClient } from "@clerk/nextjs/server";
 import { LessonSnapshots } from "@oakai/core";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { exportAdditionalMaterials } from "@oakai/exports";
-import { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 
+import type {
+  OutputSchema} from "../router/exports";
 import {
   ailaGetExportBySnapshotId,
   ailaSaveExport,
-  OutputSchema,
   reportErrorResult,
 } from "../router/exports";
 
diff --git a/packages/api/src/export/exportLessonPlan.ts b/packages/api/src/export/exportLessonPlan.ts
index 3847e38ad..705b197ae 100644
--- a/packages/api/src/export/exportLessonPlan.ts
+++ b/packages/api/src/export/exportLessonPlan.ts
@@ -1,16 +1,17 @@
-import { SignedInAuthObject } from "@clerk/backend/internal";
+import type { SignedInAuthObject } from "@clerk/backend/internal";
 import { clerkClient } from "@clerk/nextjs/server";
 import { LessonSnapshots } from "@oakai/core";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { exportDocLessonPlan } from "@oakai/exports";
-import { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 
+import type {
+  OutputSchema} from "../router/exports";
 import {
   ailaGetExportBySnapshotId,
   ailaSaveExport,
-  OutputSchema,
   reportErrorResult,
 } from "../router/exports";
 
diff --git a/packages/api/src/export/exportLessonSlides.ts b/packages/api/src/export/exportLessonSlides.ts
index a129f1211..c941915e3 100644
--- a/packages/api/src/export/exportLessonSlides.ts
+++ b/packages/api/src/export/exportLessonSlides.ts
@@ -1,16 +1,17 @@
-import { SignedInAuthObject } from "@clerk/backend/internal";
+import type { SignedInAuthObject } from "@clerk/backend/internal";
 import { clerkClient } from "@clerk/nextjs/server";
 import { LessonSnapshots } from "@oakai/core";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { exportSlidesFullLesson } from "@oakai/exports";
-import { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 
+import type {
+  OutputSchema} from "../router/exports";
 import {
   ailaGetExportBySnapshotId,
   ailaSaveExport,
-  OutputSchema,
   reportErrorResult,
 } from "../router/exports";
 
diff --git a/packages/api/src/export/exportQuizDoc.ts b/packages/api/src/export/exportQuizDoc.ts
index 0e6415e4f..640273a14 100644
--- a/packages/api/src/export/exportQuizDoc.ts
+++ b/packages/api/src/export/exportQuizDoc.ts
@@ -1,17 +1,18 @@
-import { SignedInAuthObject } from "@clerk/backend/internal";
+import type { SignedInAuthObject } from "@clerk/backend/internal";
 import { clerkClient } from "@clerk/nextjs/server";
 import { LessonSnapshots } from "@oakai/core";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { exportDocQuiz } from "@oakai/exports";
-import { QuizDocInputData } from "@oakai/exports/src/schema/input.schema";
+import type { QuizDocInputData } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { z } from "zod";
 
+import type {
+  OutputSchema} from "../router/exports";
 import {
   ailaGetExportBySnapshotId,
   ailaSaveExport,
-  OutputSchema,
   reportErrorResult,
 } from "../router/exports";
 
diff --git a/packages/api/src/export/exportWorksheets.ts b/packages/api/src/export/exportWorksheets.ts
index 5a69da542..45e9785fa 100644
--- a/packages/api/src/export/exportWorksheets.ts
+++ b/packages/api/src/export/exportWorksheets.ts
@@ -1,16 +1,17 @@
-import { SignedInAuthObject } from "@clerk/backend/internal";
+import type { SignedInAuthObject } from "@clerk/backend/internal";
 import { clerkClient } from "@clerk/nextjs/server";
 import { LessonSnapshots } from "@oakai/core";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { exportDocsWorksheet } from "@oakai/exports";
-import { WorksheetSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { WorksheetSlidesInputData } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 
+import type {
+  OutputSchema} from "../router/exports";
 import {
   ailaGetExportBySnapshotId,
   ailaSaveExport,
-  OutputSchema,
   reportErrorResult,
 } from "../router/exports";
 
diff --git a/packages/api/src/middleware/adminAuth.ts b/packages/api/src/middleware/adminAuth.ts
index 0c9cba918..1ff69a4b1 100644
--- a/packages/api/src/middleware/adminAuth.ts
+++ b/packages/api/src/middleware/adminAuth.ts
@@ -1,4 +1,4 @@
-import { SignedInAuthObject } from "@clerk/backend/internal";
+import type { SignedInAuthObject } from "@clerk/backend/internal";
 import { clerkClient } from "@clerk/nextjs/server";
 import { aiLogger } from "@oakai/logger";
 import { TRPCError } from "@trpc/server";
@@ -15,7 +15,7 @@ const log = aiLogger("auth");
  */
 const isAdminMiddleware = t.middleware(async ({ next, ctx }) => {
   if (!ctx.auth.userId) {
-    log.info({ auth: ctx.auth, url: ctx.req.url }, `User not an admin`);
+    log.info({ auth: ctx.auth, url: ctx.req.url }, "User not an admin");
     throw new TRPCError({
       code: "UNAUTHORIZED",
       message: "Not an admin",
@@ -29,7 +29,7 @@ const isAdminMiddleware = t.middleware(async ({ next, ctx }) => {
       email.emailAddress.endsWith("@thenational.academy"),
     )
   ) {
-    log.info({ auth: ctx.auth, url: ctx.req.url }, `User not an admin`);
+    log.info({ auth: ctx.auth, url: ctx.req.url }, "User not an admin");
     throw new TRPCError({
       code: "UNAUTHORIZED",
       message: "Not an admin",
diff --git a/packages/api/src/middleware/apiKeyAuth.ts b/packages/api/src/middleware/apiKeyAuth.ts
index 366ac49ee..3d00682ff 100644
--- a/packages/api/src/middleware/apiKeyAuth.ts
+++ b/packages/api/src/middleware/apiKeyAuth.ts
@@ -1,6 +1,6 @@
 import { TRPCError } from "@trpc/server";
 
-import { APIKeyAuthObject } from "../context";
+import type { APIKeyAuthObject } from "../context";
 import { t } from "../trpc";
 
 const OAI_INTERNAL_API_KEY = process.env.OAI_INTERNAL_API_KEY;
diff --git a/packages/api/src/middleware/auth.ts b/packages/api/src/middleware/auth.ts
index 00129ea5e..82da78603 100644
--- a/packages/api/src/middleware/auth.ts
+++ b/packages/api/src/middleware/auth.ts
@@ -1,4 +1,4 @@
-import { SignedInAuthObject } from "@clerk/backend/internal";
+import type { SignedInAuthObject } from "@clerk/backend/internal";
 import { aiLogger } from "@oakai/logger";
 import { TRPCError } from "@trpc/server";
 
@@ -9,7 +9,7 @@ const log = aiLogger("auth");
 
 export const isLoggedInMiddleware = t.middleware(async ({ next, ctx }) => {
   if (!ctx.auth.userId) {
-    log.info({ auth: ctx.auth, url: ctx.req.url }, `User not authenticated`);
+    log.info({ auth: ctx.auth, url: ctx.req.url }, "User not authenticated");
     throw new TRPCError({
       code: "UNAUTHORIZED",
       message: "Not authenticated",
diff --git a/packages/api/src/middleware/rateLimiter.ts b/packages/api/src/middleware/rateLimiter.ts
index f68120bb5..f3e69be07 100644
--- a/packages/api/src/middleware/rateLimiter.ts
+++ b/packages/api/src/middleware/rateLimiter.ts
@@ -1,9 +1,7 @@
-import { inngest } from "@oakai/core";
+import { inngest } from "@oakai/core/src/inngest";
 import { rateLimits } from "@oakai/core/src/utils/rateLimiting/rateLimit";
-import {
-  RateLimitExceededError,
-  RateLimiter,
-} from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
+import type { RateLimiter } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
+import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
 import { TRPCError } from "@trpc/server";
 
 import { t } from "../trpc";
@@ -48,7 +46,7 @@ function createRateLimiterMiddleware(rateLimiter: RateLimiter) {
         });
         throw new TRPCError({
           code: "TOO_MANY_REQUESTS",
-          message: `Too many requests, please try again later.`,
+          message: "Too many requests, please try again later.",
           cause: e,
         });
       }
diff --git a/packages/api/src/router/admin.ts b/packages/api/src/router/admin.ts
index f05ed17aa..c5f06298f 100644
--- a/packages/api/src/router/admin.ts
+++ b/packages/api/src/router/admin.ts
@@ -1,13 +1,11 @@
 import { Moderations, SafetyViolations } from "@oakai/core";
-import { Moderation } from "@oakai/db";
+import type { Moderation } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 import { z } from "zod";
 
 import { getSessionModerations } from "../../../aila/src/features/moderation/getSessionModerations";
-import {
-  AilaPersistedChat,
-  chatSchema,
-} from "../../../aila/src/protocol/schema";
+import type { AilaPersistedChat } from "../../../aila/src/protocol/schema";
+import { chatSchema } from "../../../aila/src/protocol/schema";
 import { adminProcedure } from "../middleware/adminAuth";
 import { router } from "../trpc";
 
@@ -42,7 +40,7 @@ export const adminRouter = router({
 
       const output = chatRecord.output;
       if (typeof output !== "object") {
-        throw new Error(`sessionOutput is not an object`);
+        throw new Error("sessionOutput is not an object");
       }
       const parseResult = chatSchema.safeParse({
         ...output,
diff --git a/packages/api/src/router/appSessions.ts b/packages/api/src/router/appSessions.ts
index dd64b451e..ce46e6572 100644
--- a/packages/api/src/router/appSessions.ts
+++ b/packages/api/src/router/appSessions.ts
@@ -1,9 +1,9 @@
-import { SignedInAuthObject } from "@clerk/backend/internal";
+import type { SignedInAuthObject } from "@clerk/backend/internal";
 import { clerkClient } from "@clerk/nextjs/server";
 import { demoUsers } from "@oakai/core";
 import { rateLimits } from "@oakai/core/src/utils/rateLimiting/rateLimit";
 import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
-import { Prisma, PrismaClientWithAccelerate } from "@oakai/db";
+import type { Prisma, PrismaClientWithAccelerate } from "@oakai/db";
 import * as Sentry from "@sentry/nextjs";
 import { TRPCError } from "@trpc/server";
 import { isTruthy } from "remeda";
@@ -11,10 +11,8 @@ import { z } from "zod";
 
 import { getSessionModerations } from "../../../aila/src/features/moderation/getSessionModerations";
 import { generateChatId } from "../../../aila/src/helpers/chat/generateChatId";
-import {
-  AilaPersistedChat,
-  chatSchema,
-} from "../../../aila/src/protocol/schema";
+import type { AilaPersistedChat } from "../../../aila/src/protocol/schema";
+import { chatSchema } from "../../../aila/src/protocol/schema";
 import { protectedProcedure } from "../middleware/auth";
 import { router } from "../trpc";
 
@@ -32,7 +30,7 @@ function parseChatAndReportError({
   userId: string;
 }) {
   if (typeof sessionOutput !== "object") {
-    throw new Error(`sessionOutput is not an object`);
+    throw new Error("sessionOutput is not an object");
   }
   const parseResult = chatSchema.safeParse({
     ...sessionOutput,
@@ -41,7 +39,7 @@ function parseChatAndReportError({
   });
 
   if (!parseResult.success) {
-    const error = new Error(`Failed to parse chat`);
+    const error = new Error("Failed to parse chat");
     Sentry.captureException(error, {
       extra: {
         id,
diff --git a/packages/api/src/router/exports.ts b/packages/api/src/router/exports.ts
index e81f44cc1..b711a6fa4 100644
--- a/packages/api/src/router/exports.ts
+++ b/packages/api/src/router/exports.ts
@@ -1,8 +1,8 @@
-import { SignedInAuthObject } from "@clerk/backend/internal";
+import type { SignedInAuthObject } from "@clerk/backend/internal";
 import { clerkClient } from "@clerk/nextjs/server";
 import { LessonSnapshots } from "@oakai/core";
 import { sendEmail } from "@oakai/core/src/utils/sendEmail";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import {
   exportDocLessonPlanSchema,
   exportDocQuizSchema,
@@ -12,7 +12,7 @@ import {
 } from "@oakai/exports";
 import { exportableQuizAppStateSchema } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
-import { LessonExportType } from "@prisma/client";
+import type { LessonExportType } from "@prisma/client";
 import * as Sentry from "@sentry/nextjs";
 import { kv } from "@vercel/kv";
 import { z } from "zod";
diff --git a/packages/api/src/router/generations.ts b/packages/api/src/router/generations.ts
index 906ec75b7..70fd77857 100644
--- a/packages/api/src/router/generations.ts
+++ b/packages/api/src/router/generations.ts
@@ -6,8 +6,9 @@ import {
   serializeGeneration,
   serializedGenerationSchema,
 } from "@oakai/core/src/models/serializers";
+import type {
+  GenerationPart} from "@oakai/core/src/types";
 import {
-  GenerationPart,
   generationPartSchema,
   generationPartUserTweakedSchema,
 } from "@oakai/core/src/types";
diff --git a/packages/api/src/router/judgements.ts b/packages/api/src/router/judgements.ts
index a76aedc1a..0c29cb4a9 100644
--- a/packages/api/src/router/judgements.ts
+++ b/packages/api/src/router/judgements.ts
@@ -1,4 +1,4 @@
-import { KeyStageName, SubjectName, subjectsAndKeyStages } from "@oakai/core";
+import type { KeyStageName, SubjectName, subjectsAndKeyStages } from "@oakai/core";
 import { sendJudgementFeedbackEmail } from "@oakai/core/src/utils/sendJudgementFeedbackEmail";
 import { structuredLogger as logger, aiLogger } from "@oakai/logger";
 import { z } from "zod";
diff --git a/packages/api/src/router/lesson.ts b/packages/api/src/router/lesson.ts
index 26c4154a8..06ae3154e 100644
--- a/packages/api/src/router/lesson.ts
+++ b/packages/api/src/router/lesson.ts
@@ -1,5 +1,6 @@
 import { Lessons, inngest } from "@oakai/core";
-import { LessonSummary, LessonWithSnippets, Transcript } from "@oakai/db";
+import type { LessonSummary, Transcript } from "@oakai/db";
+import { LessonWithSnippets } from "@oakai/db";
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
 
diff --git a/packages/api/src/router/subjectsAndKeyStage.ts b/packages/api/src/router/subjectsAndKeyStage.ts
index 8d1ab7f86..e4e5d3327 100644
--- a/packages/api/src/router/subjectsAndKeyStage.ts
+++ b/packages/api/src/router/subjectsAndKeyStage.ts
@@ -3,7 +3,7 @@ import {
   type KeyStageName,
   type SubjectName,
 } from "@oakai/core";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { z } from "zod";
 
 import { protectedProcedure } from "../middleware/auth";
diff --git a/packages/api/src/trpc.ts b/packages/api/src/trpc.ts
index 6b84936e8..f31c30298 100644
--- a/packages/api/src/trpc.ts
+++ b/packages/api/src/trpc.ts
@@ -3,7 +3,7 @@ import { initTRPC } from "@trpc/server";
 import { ZodError } from "zod";
 
 import { transformer } from "../transformer";
-import { type Context } from "./context";
+import type { Context } from "./context";
 
 const log = aiLogger("trpc");
 
diff --git a/packages/core/index.ts b/packages/core/index.ts
index ef3c66798..597d7e888 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -31,7 +31,7 @@ import { generatePlansForSubjectLessons } from "./src/functions/subject/generate
 import { summariseSubjectLessons } from "./src/functions/subject/summariseSubjectLessons";
 import { generateTranscriptEmbeddings } from "./src/functions/transcript/generateTranscriptEmbeddings";
 
-export { inngest } from "./src/client";
+export { inngest } from "./src/inngest";
 export * from "./src/data/subjectsAndKeyStages";
 export * from "./src/models";
 //export * from "./src/models/promptVariants";
diff --git a/packages/core/package.json b/packages/core/package.json
index 2739092ae..17b7892ac 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -23,9 +23,9 @@
     "process:lessons": "pnpm doppler:run:dev -- ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./src/scripts/processLessons.ts",
     "process:lessons:dev": "pnpm doppler:run:dev -- pnpm process:lessons",
     "prompts": "ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./src/scripts/setupPrompts.ts",
-    "prompts:dev": "pnpm doppler:run:dev -- ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./src/scripts/setupPrompts.ts",
+    "prompts:dev": "dotenv -e ../../.env -- ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./src/scripts/setupPrompts.ts",
     "seed": "ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./src/scripts/seedLessons.ts",
-    "seed:dev": "pnpm doppler:run:dev -- pnpm seed",
+    "seed:dev": "dotenv -e ../../.env -- pnpm seed",
     "seed:prd": "pnpm doppler:run:prd -- pnpm seed",
     "seed:stg": "pnpm doppler:run:stg -- pnpm seed",
     "type-check": "tsc --noEmit"
diff --git a/packages/core/src/analytics/posthogAiBetaServerClient.ts b/packages/core/src/analytics/posthogAiBetaServerClient.ts
index 4d80e0ad2..3e7f23ef4 100644
--- a/packages/core/src/analytics/posthogAiBetaServerClient.ts
+++ b/packages/core/src/analytics/posthogAiBetaServerClient.ts
@@ -4,10 +4,10 @@ const host = process.env.NEXT_PUBLIC_POSTHOG_HOST as string;
 const apiKey = process.env.NEXT_PUBLIC_POSTHOG_API_KEY || "*";
 
 /**
- * This is the posthog nodejs client cofigured to send events to the
+ * This is the posthog nodejs client configured to send events to the
  * posthog AI BETA instance.
  *
  * This is the main Oak posthog instance used for tracking user events
- * on the clientside.
+ * on the client-side.
  */
 export const posthogAiBetaServerClient = new PostHog(apiKey, { host });
diff --git a/packages/core/src/functions/demo/populateDemoStatuses.ts b/packages/core/src/functions/demo/populateDemoStatuses.ts
index 92259733b..356f01e5d 100644
--- a/packages/core/src/functions/demo/populateDemoStatuses.ts
+++ b/packages/core/src/functions/demo/populateDemoStatuses.ts
@@ -1,7 +1,7 @@
 import { clerkClient } from "@clerk/nextjs/server";
 import { aiLogger } from "@oakai/logger";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { populateDemoStatusesSchema } from "./populateDemoStatuses.schema";
 
 const log = aiLogger("demo");
diff --git a/packages/core/src/functions/event-types.ts b/packages/core/src/functions/event-types.ts
index c21295aed..7a83f3cd5 100644
--- a/packages/core/src/functions/event-types.ts
+++ b/packages/core/src/functions/event-types.ts
@@ -1,4 +1,4 @@
-import { ZodEventSchemas } from "inngest";
+import type { ZodEventSchemas } from "inngest";
 import { z } from "zod";
 
 import { populateDemoStatusesSchema } from "./demo/populateDemoStatuses.schema";
diff --git a/packages/core/src/functions/generation/imageAltTextRequestGeneration.ts/requestImageDescription.ts b/packages/core/src/functions/generation/imageAltTextRequestGeneration.ts/requestImageDescription.ts
index a4fa79d63..46c60d847 100644
--- a/packages/core/src/functions/generation/imageAltTextRequestGeneration.ts/requestImageDescription.ts
+++ b/packages/core/src/functions/generation/imageAltTextRequestGeneration.ts/requestImageDescription.ts
@@ -6,7 +6,8 @@ const log = aiLogger("generation");
 
 const openai = createOpenAIClient({ app: "image-alt-text" });
 
-const prompt = `You are a content creator and an accessibility specialist for visually impaired users. You must write a clear and accurate ALT text for this image. You should accurately describe the image foreground and background, the colours and any objects in the image. Write out any text if it is present, and describe any people, their clothes, and their expressions if they are present. The literacy level of the text should be understandable to a 6-year-old pupil and written with exceptional spelling, punctuation and grammar in British English, think about the language that is understandable to this age group. Do not exceed 300 characters. If you believe you can accurately complete the task in less than 300 characters than do so. `;
+const prompt =
+  "You are a content creator and an accessibility specialist for visually impaired users. You must write a clear and accurate ALT text for this image. You should accurately describe the image foreground and background, the colours and any objects in the image. Write out any text if it is present, and describe any people, their clothes, and their expressions if they are present. The literacy level of the text should be understandable to a 6-year-old pupil and written with exceptional spelling, punctuation and grammar in British English, think about the language that is understandable to this age group. Do not exceed 300 characters. If you believe you can accurately complete the task in less than 300 characters than do so. ";
 
 const promptInQuizMode = `You are a content creator and an accessibility specialist for visually impaired users. 
 
diff --git a/packages/core/src/functions/lesson/generateLessonQuizEmbeddings.ts b/packages/core/src/functions/lesson/generateLessonQuizEmbeddings.ts
index eeff94321..36f2e4788 100644
--- a/packages/core/src/functions/lesson/generateLessonQuizEmbeddings.ts
+++ b/packages/core/src/functions/lesson/generateLessonQuizEmbeddings.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Lessons } from "../../models";
 
 export const generateLessonQuizEmbeddings = inngest.createFunction(
diff --git a/packages/core/src/functions/lesson/generatePlan.ts b/packages/core/src/functions/lesson/generatePlan.ts
index c3d0c9264..2a2c02232 100644
--- a/packages/core/src/functions/lesson/generatePlan.ts
+++ b/packages/core/src/functions/lesson/generatePlan.ts
@@ -1,7 +1,7 @@
 import { prisma } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 const log = aiLogger("lessons");
diff --git a/packages/core/src/functions/lesson/summarise.ts b/packages/core/src/functions/lesson/summarise.ts
index 42e43fb09..52e27b512 100644
--- a/packages/core/src/functions/lesson/summarise.ts
+++ b/packages/core/src/functions/lesson/summarise.ts
@@ -1,7 +1,7 @@
 import { LessonSummaryStatus, prisma } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Lessons } from "../../models";
 
 const log = aiLogger("lessons");
diff --git a/packages/core/src/functions/lesson/summariseAll.ts b/packages/core/src/functions/lesson/summariseAll.ts
index d16c3f13d..f035f7e7a 100644
--- a/packages/core/src/functions/lesson/summariseAll.ts
+++ b/packages/core/src/functions/lesson/summariseAll.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Lessons } from "../../models";
 
 export const summariseAllLessons = inngest.createFunction(
diff --git a/packages/core/src/functions/lessonPlan/embed.ts b/packages/core/src/functions/lessonPlan/embed.ts
index 76c1801e5..6fe96c5eb 100644
--- a/packages/core/src/functions/lessonPlan/embed.ts
+++ b/packages/core/src/functions/lessonPlan/embed.ts
@@ -1,6 +1,6 @@
 import { LessonPlanStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 export const embedLessonPlan = inngest.createFunction(
diff --git a/packages/core/src/functions/lessonPlan/embedAll.ts b/packages/core/src/functions/lessonPlan/embedAll.ts
index c7a09a9f3..9de32b0f2 100644
--- a/packages/core/src/functions/lessonPlan/embedAll.ts
+++ b/packages/core/src/functions/lessonPlan/embedAll.ts
@@ -1,7 +1,7 @@
 import { LessonPlanStatus, prisma } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 const log = aiLogger("lessons");
diff --git a/packages/core/src/functions/lessonPlan/embedAllParts.ts b/packages/core/src/functions/lessonPlan/embedAllParts.ts
index 8efd6fd74..8b9244eea 100644
--- a/packages/core/src/functions/lessonPlan/embedAllParts.ts
+++ b/packages/core/src/functions/lessonPlan/embedAllParts.ts
@@ -1,6 +1,6 @@
 import { LessonPlanPartStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 export const embedAllLessonPlanParts = inngest.createFunction(
diff --git a/packages/core/src/functions/lessonPlan/embedPart.ts b/packages/core/src/functions/lessonPlan/embedPart.ts
index 8b2fd5429..4545fe7f1 100644
--- a/packages/core/src/functions/lessonPlan/embedPart.ts
+++ b/packages/core/src/functions/lessonPlan/embedPart.ts
@@ -1,6 +1,6 @@
 import { LessonPlanPartStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 export const embedLessonPlanPart = inngest.createFunction(
diff --git a/packages/core/src/functions/lessonPlan/generateAll.ts b/packages/core/src/functions/lessonPlan/generateAll.ts
index d07d0f76f..ccda36e9c 100644
--- a/packages/core/src/functions/lessonPlan/generateAll.ts
+++ b/packages/core/src/functions/lessonPlan/generateAll.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 
 export const generateAllLessonPlans = inngest.createFunction(
   {
diff --git a/packages/core/src/functions/lessonPlan/process.ts b/packages/core/src/functions/lessonPlan/process.ts
index 634373d85..33b392ff0 100644
--- a/packages/core/src/functions/lessonPlan/process.ts
+++ b/packages/core/src/functions/lessonPlan/process.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 export const processLessonPlan = inngest.createFunction(
diff --git a/packages/core/src/functions/lessonSummary/embed.ts b/packages/core/src/functions/lessonSummary/embed.ts
index 8936e5966..eee51a26a 100644
--- a/packages/core/src/functions/lessonSummary/embed.ts
+++ b/packages/core/src/functions/lessonSummary/embed.ts
@@ -1,6 +1,6 @@
 import { LessonSummaryStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonSummaries } from "../../models";
 
 export const embedLessonSummary = inngest.createFunction(
diff --git a/packages/core/src/functions/lessonSummary/embedAll.ts b/packages/core/src/functions/lessonSummary/embedAll.ts
index e39ba0d19..b1e69392a 100644
--- a/packages/core/src/functions/lessonSummary/embedAll.ts
+++ b/packages/core/src/functions/lessonSummary/embedAll.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonSummaries } from "../../models";
 
 export const embedAllLessonSummaries = inngest.createFunction(
diff --git a/packages/core/src/functions/migrations/addIdsToMessages.ts b/packages/core/src/functions/migrations/addIdsToMessages.ts
index 2c461d413..5ca7c4577 100644
--- a/packages/core/src/functions/migrations/addIdsToMessages.ts
+++ b/packages/core/src/functions/migrations/addIdsToMessages.ts
@@ -2,7 +2,7 @@ import { Prisma, prisma } from "@oakai/db";
 import crypto from "crypto";
 import { z } from "zod";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { addIdsToMessagesSchema } from "./addIdsToMessages.schema";
 
 const chatSchema = z
diff --git a/packages/core/src/functions/migrations/kvChatsToPrisma.ts b/packages/core/src/functions/migrations/kvChatsToPrisma.ts
index 58a2f7fa8..7861ad6d8 100644
--- a/packages/core/src/functions/migrations/kvChatsToPrisma.ts
+++ b/packages/core/src/functions/migrations/kvChatsToPrisma.ts
@@ -4,7 +4,7 @@ import { kv } from "@vercel/kv";
 import { z } from "zod";
 
 import { LessonPlanSchemaWhilstStreaming } from "../../../../aila/src/protocol/schema";
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { kvChatsToPrismaSchema } from "./kvChatsToPrisma.schema";
 
 const chatSchema = z
diff --git a/packages/core/src/functions/quizAnswer/embedAll.ts b/packages/core/src/functions/quizAnswer/embedAll.ts
index 5cd963c6e..c7054bdc6 100644
--- a/packages/core/src/functions/quizAnswer/embedAll.ts
+++ b/packages/core/src/functions/quizAnswer/embedAll.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { QuizAnswers } from "../../models";
 
 export const embedAllQuizAnswers = inngest.createFunction(
diff --git a/packages/core/src/functions/quizAnswer/generateQuizAnswerEmbeddings.ts b/packages/core/src/functions/quizAnswer/generateQuizAnswerEmbeddings.ts
index a4006643f..4dcd4f82f 100644
--- a/packages/core/src/functions/quizAnswer/generateQuizAnswerEmbeddings.ts
+++ b/packages/core/src/functions/quizAnswer/generateQuizAnswerEmbeddings.ts
@@ -1,6 +1,6 @@
 import { prisma, QuizAnswerStatus } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { QuizAnswers } from "../../models";
 
 export const generateQuizAnswerEmbeddings = inngest.createFunction(
diff --git a/packages/core/src/functions/quizQuestion/embedAll.ts b/packages/core/src/functions/quizQuestion/embedAll.ts
index 225643212..c9ee08f52 100644
--- a/packages/core/src/functions/quizQuestion/embedAll.ts
+++ b/packages/core/src/functions/quizQuestion/embedAll.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { QuizQuestions } from "../../models";
 
 export const embedAllQuizQuestions = inngest.createFunction(
diff --git a/packages/core/src/functions/quizQuestion/generateAll.ts b/packages/core/src/functions/quizQuestion/generateAll.ts
index 7b6715151..2f0cb5a18 100644
--- a/packages/core/src/functions/quizQuestion/generateAll.ts
+++ b/packages/core/src/functions/quizQuestion/generateAll.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { QuizQuestions } from "../../models";
 
 export const generateAllQuizQuestions = inngest.createFunction(
diff --git a/packages/core/src/functions/quizQuestion/generateQuizQuestionEmbeddings.ts b/packages/core/src/functions/quizQuestion/generateQuizQuestionEmbeddings.ts
index 3ca3ef4e2..b0d144099 100644
--- a/packages/core/src/functions/quizQuestion/generateQuizQuestionEmbeddings.ts
+++ b/packages/core/src/functions/quizQuestion/generateQuizQuestionEmbeddings.ts
@@ -1,6 +1,6 @@
 import { QuizQuestionStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { QuizQuestions } from "../../models";
 
 export const generateQuizQuestionEmbeddings = inngest.createFunction(
diff --git a/packages/core/src/functions/slack/notifyModeration.ts b/packages/core/src/functions/slack/notifyModeration.ts
index c2c7d4cc3..52bf6d8cd 100644
--- a/packages/core/src/functions/slack/notifyModeration.ts
+++ b/packages/core/src/functions/slack/notifyModeration.ts
@@ -1,4 +1,4 @@
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import {
   slackNotificationChannelId,
   slackWebClient,
diff --git a/packages/core/src/functions/slack/notifyRateLimit.ts b/packages/core/src/functions/slack/notifyRateLimit.ts
index 596802c7e..11a2a3773 100644
--- a/packages/core/src/functions/slack/notifyRateLimit.ts
+++ b/packages/core/src/functions/slack/notifyRateLimit.ts
@@ -1,4 +1,4 @@
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import {
   slackNotificationChannelId,
   slackWebClient,
@@ -26,7 +26,7 @@ export const notifyRateLimit = inngest.createFunction(
 
       const response = await slackWebClient.chat.postMessage({
         channel: slackNotificationChannelId,
-        text: `User rate limit exceeded`,
+        text: "User rate limit exceeded",
         blocks: [
           {
             type: "header",
diff --git a/packages/core/src/functions/slack/notifyUserBan.ts b/packages/core/src/functions/slack/notifyUserBan.ts
index ea543d202..b8d59b554 100644
--- a/packages/core/src/functions/slack/notifyUserBan.ts
+++ b/packages/core/src/functions/slack/notifyUserBan.ts
@@ -1,4 +1,4 @@
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import {
   slackNotificationChannelId,
   slackWebClient,
diff --git a/packages/core/src/functions/snippet/embedAll.ts b/packages/core/src/functions/snippet/embedAll.ts
index d017f9198..60558bd67 100644
--- a/packages/core/src/functions/snippet/embedAll.ts
+++ b/packages/core/src/functions/snippet/embedAll.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Snippets } from "../../models";
 
 export const embedAllSnippets = inngest.createFunction(
diff --git a/packages/core/src/functions/snippet/generateForAllQuestions.ts b/packages/core/src/functions/snippet/generateForAllQuestions.ts
index 346c7e7b5..ff36f1488 100644
--- a/packages/core/src/functions/snippet/generateForAllQuestions.ts
+++ b/packages/core/src/functions/snippet/generateForAllQuestions.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Snippets } from "../../models";
 
 export const generateSnippetsForAllQuestions = inngest.createFunction(
diff --git a/packages/core/src/functions/snippet/generateSnippetEmbeddings.ts b/packages/core/src/functions/snippet/generateSnippetEmbeddings.ts
index 269264405..2a890d80c 100644
--- a/packages/core/src/functions/snippet/generateSnippetEmbeddings.ts
+++ b/packages/core/src/functions/snippet/generateSnippetEmbeddings.ts
@@ -1,6 +1,6 @@
 import { SnippetStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Snippets } from "../../models";
 
 export const generateSnippetEmbeddings = inngest.createFunction(
diff --git a/packages/core/src/functions/statistics/recalculateStatistics.ts b/packages/core/src/functions/statistics/recalculateStatistics.ts
index a42084325..54f73ecb5 100644
--- a/packages/core/src/functions/statistics/recalculateStatistics.ts
+++ b/packages/core/src/functions/statistics/recalculateStatistics.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Statistics } from "../../models/statistics";
 
 export const recalculateStatistics = inngest.createFunction(
diff --git a/packages/core/src/functions/subject/embedSubjectLessonQuizzes.ts b/packages/core/src/functions/subject/embedSubjectLessonQuizzes.ts
index 41e354bd2..859249cf9 100644
--- a/packages/core/src/functions/subject/embedSubjectLessonQuizzes.ts
+++ b/packages/core/src/functions/subject/embedSubjectLessonQuizzes.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 
 interface SimplifiedLesson {
   id: string;
diff --git a/packages/core/src/functions/subject/embedSubjectLessonTranscripts.ts b/packages/core/src/functions/subject/embedSubjectLessonTranscripts.ts
index c697e3ccf..c4b9254dd 100644
--- a/packages/core/src/functions/subject/embedSubjectLessonTranscripts.ts
+++ b/packages/core/src/functions/subject/embedSubjectLessonTranscripts.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 
 interface SimplifiedLesson {
   id: string;
diff --git a/packages/core/src/functions/subject/generatePlansForSubjectLessons.ts b/packages/core/src/functions/subject/generatePlansForSubjectLessons.ts
index 7a1c95e3b..dd734c769 100644
--- a/packages/core/src/functions/subject/generatePlansForSubjectLessons.ts
+++ b/packages/core/src/functions/subject/generatePlansForSubjectLessons.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 
 interface SimplifiedLesson {
   id: string;
diff --git a/packages/core/src/functions/subject/summariseSubjectLessons.ts b/packages/core/src/functions/subject/summariseSubjectLessons.ts
index 305c42386..0a79c58d8 100644
--- a/packages/core/src/functions/subject/summariseSubjectLessons.ts
+++ b/packages/core/src/functions/subject/summariseSubjectLessons.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 
 interface SimplifiedLesson {
   id: string;
diff --git a/packages/core/src/functions/transcript/generateTranscriptEmbeddings.ts b/packages/core/src/functions/transcript/generateTranscriptEmbeddings.ts
index 20912d10e..65a5e582f 100644
--- a/packages/core/src/functions/transcript/generateTranscriptEmbeddings.ts
+++ b/packages/core/src/functions/transcript/generateTranscriptEmbeddings.ts
@@ -1,6 +1,6 @@
 import { TranscriptStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Transcripts } from "../../models/transcript";
 
 export const generateTranscriptEmbeddings = inngest.createFunction(
diff --git a/packages/core/src/client.ts b/packages/core/src/inngest/index.ts
similarity index 72%
rename from packages/core/src/client.ts
rename to packages/core/src/inngest/index.ts
index b255c1b71..a2d792d0c 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/inngest/index.ts
@@ -1,9 +1,12 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { structuredLogger } from "@oakai/logger";
 import { EventSchemas, Inngest } from "inngest";
 import getConfig from "next/config";
 
-import types from "./functions/event-types";
-import { eventLogger } from "./middleware/eventLogger";
+import types from "../functions/event-types";
+import { eventLogger } from "../middleware/eventLogger";
 
 let serverRuntimeConfig;
 try {
@@ -12,8 +15,9 @@ try {
 } catch (e) {
   //console.log("No Next environment");
 }
-const CONTEXT = serverRuntimeConfig?.DEPLOY_CONTEXT;
-const BRANCH = serverRuntimeConfig?.BRANCH;
+
+const CONTEXT = serverRuntimeConfig?.DEPLOY_CONTEXT as string | undefined;
+const BRANCH = serverRuntimeConfig?.BRANCH as string | undefined;
 
 function getInngestEnv() {
   if (CONTEXT === "production") {
@@ -45,5 +49,5 @@ export const inngest = new Inngest({
   env: inngestEnv,
   logger: structuredLogger,
   middleware: [eventLogger(inngestEnv, inngestEventKey)],
-  isDev: process.env.NODE_ENV === "development" && !isJestEnvironment(),
+  isDev: process.env.NODE_ENV === "development" || isJestEnvironment(),
 });
diff --git a/packages/core/src/llm/langchain.ts b/packages/core/src/llm/langchain.ts
new file mode 100644
index 000000000..1b0f30414
--- /dev/null
+++ b/packages/core/src/llm/langchain.ts
@@ -0,0 +1,55 @@
+import { ChatOpenAI as LangchainChatOpenAI } from "langchain/chat_models/openai";
+import type { BaseLLMParams } from "langchain/llms/base";
+import type {
+  AzureOpenAIInput,
+  OpenAIInput} from "langchain/llms/openai";
+import {
+  OpenAI as OpenAILangchain,
+} from "langchain/llms/openai";
+import type { ClientOptions } from "openai";
+
+import { heliconeHeaders } from "./helicone";
+
+export function createOpenAILangchainClient({
+  app,
+  fields = {},
+}: {
+  app: string;
+  fields?: Partial<OpenAIInput> &
+    Partial<AzureOpenAIInput> &
+    BaseLLMParams & {
+      configuration?: ClientOptions;
+    };
+}) {
+  const defaultHeaders = heliconeHeaders({ app });
+  return new OpenAILangchain({
+    ...fields,
+    configuration: {
+      apiKey: process.env.OPENAI_API_KEY,
+      baseURL: process.env.HELICONE_EU_HOST,
+      defaultHeaders,
+    },
+  });
+}
+
+export function createOpenAILangchainChatClient({
+  app,
+  fields = {},
+}: {
+  app: string;
+  fields?: Partial<OpenAIInput> &
+    Partial<AzureOpenAIInput> &
+    BaseLLMParams & {
+      configuration?: ClientOptions;
+    };
+}) {
+  const defaultHeaders = heliconeHeaders({ app });
+  return new LangchainChatOpenAI({
+    ...fields,
+    configuration: {
+      apiKey: process.env.OPENAI_API_KEY,
+      baseURL: process.env.HELICONE_EU_HOST,
+      defaultHeaders,
+    },
+  });
+}
diff --git a/packages/core/src/llm/openai.ts b/packages/core/src/llm/openai.ts
index 213e88b5a..dea3ef760 100644
--- a/packages/core/src/llm/openai.ts
+++ b/packages/core/src/llm/openai.ts
@@ -1,14 +1,10 @@
-import { createOpenAI, OpenAIProvider } from "@ai-sdk/openai";
-import { ChatOpenAI as LangchainChatOpenAI } from "langchain/chat_models/openai";
-import { BaseLLMParams } from "langchain/llms/base";
-import {
-  AzureOpenAIInput,
-  OpenAIInput,
-  OpenAI as OpenAILangchain,
-} from "langchain/llms/openai";
-import OpenAI, { ClientOptions } from "openai";
+import type { OpenAIProvider } from "@ai-sdk/openai";
+import { createOpenAI } from "@ai-sdk/openai";
+import type { ClientOptions } from "openai";
+import OpenAI from "openai";
 
-import { HeliconeChatMeta, heliconeHeaders } from "./helicone";
+import type { HeliconeChatMeta} from "./helicone";
+import { heliconeHeaders } from "./helicone";
 
 export type CreateOpenAIClientProps =
   | {
@@ -53,54 +49,8 @@ function createOpenAIModerationsClient() {
   return openAi.moderations;
 }
 
-function createOpenAILangchainClient({
-  app,
-  fields = {},
-}: {
-  app: string;
-  fields?: Partial<OpenAIInput> &
-    Partial<AzureOpenAIInput> &
-    BaseLLMParams & {
-      configuration?: ClientOptions;
-    };
-}) {
-  const defaultHeaders = heliconeHeaders({ app });
-  return new OpenAILangchain({
-    ...fields,
-    configuration: {
-      apiKey: process.env.OPENAI_API_KEY,
-      baseURL: process.env.HELICONE_EU_HOST,
-      defaultHeaders,
-    },
-  });
-}
-
-function createOpenAILangchainChatClient({
-  app,
-  fields = {},
-}: {
-  app: string;
-  fields?: Partial<OpenAIInput> &
-    Partial<AzureOpenAIInput> &
-    BaseLLMParams & {
-      configuration?: ClientOptions;
-    };
-}) {
-  const defaultHeaders = heliconeHeaders({ app });
-  return new LangchainChatOpenAI({
-    ...fields,
-    configuration: {
-      apiKey: process.env.OPENAI_API_KEY,
-      baseURL: process.env.HELICONE_EU_HOST,
-      defaultHeaders,
-    },
-  });
-}
-
 export {
   createOpenAIClient,
   createVercelOpenAIClient,
   createOpenAIModerationsClient,
-  createOpenAILangchainClient,
-  createOpenAILangchainChatClient,
 };
diff --git a/packages/core/src/models/apps.ts b/packages/core/src/models/apps.ts
index 6b3f552e0..4c9b6563a 100644
--- a/packages/core/src/models/apps.ts
+++ b/packages/core/src/models/apps.ts
@@ -1,5 +1,6 @@
-import { Prisma, PrismaClientWithAccelerate, Prompt } from "@oakai/db";
-import { App } from "@prisma/client";
+import type { Prompt, PrismaClientWithAccelerate } from "@oakai/db";
+import { Prisma } from "@prisma/client";
+import type { App } from "@prisma/client";
 
 import { Prompts } from "./prompts";
 
diff --git a/packages/core/src/models/demoUsers.ts b/packages/core/src/models/demoUsers.ts
index e9a6c668e..db7ef64aa 100644
--- a/packages/core/src/models/demoUsers.ts
+++ b/packages/core/src/models/demoUsers.ts
@@ -1,4 +1,4 @@
-import { User } from "@clerk/nextjs/server";
+import type { User } from "@clerk/nextjs/server";
 
 const DEVELOPMENT_USER_REGION = process.env.DEVELOPMENT_USER_REGION || null;
 if (process.env.NODE_ENV === "development" && !DEVELOPMENT_USER_REGION) {
diff --git a/packages/core/src/models/feedback.ts b/packages/core/src/models/feedback.ts
index 9dc368bd6..d797431a4 100644
--- a/packages/core/src/models/feedback.ts
+++ b/packages/core/src/models/feedback.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   GenerationUserFlag,
   PrismaClientWithAccelerate,
   ReGeneration,
diff --git a/packages/core/src/models/generations.ts b/packages/core/src/models/generations.ts
index 699cbca71..c256a015f 100644
--- a/packages/core/src/models/generations.ts
+++ b/packages/core/src/models/generations.ts
@@ -1,12 +1,14 @@
-import {
+import type {
   Generation,
-  GenerationStatus,
   ModerationType,
   Prisma,
-  PrismaClientWithAccelerate,
+  PrismaClientWithAccelerate} from "@oakai/db";
+import {
+  GenerationStatus
 } from "@oakai/db";
-import { structuredLogger, StructuredLogger } from "@oakai/logger";
-import { Logger as InngestLogger } from "inngest/middleware/logger";
+import type { StructuredLogger } from "@oakai/logger";
+import { structuredLogger } from "@oakai/logger";
+import type { Logger as InngestLogger } from "inngest/middleware/logger";
 import { omit } from "remeda";
 import { Md5 } from "ts-md5";
 
diff --git a/packages/core/src/models/lessonPlans.ts b/packages/core/src/models/lessonPlans.ts
index fb8b5b729..736c6fc58 100644
--- a/packages/core/src/models/lessonPlans.ts
+++ b/packages/core/src/models/lessonPlans.ts
@@ -1,40 +1,31 @@
-import {
+import type {
   KeyStage,
   Lesson,
   LessonPlan,
   LessonPlanPart,
-  LessonPlanPartStatus,
-  LessonPlanStatus,
   LessonSummary,
   PrismaClientWithAccelerate,
-  Subject,
+  Subject} from "@oakai/db";
+import {
+  LessonPlanPartStatus,
+  LessonPlanStatus
 } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
-import yaml from "yaml";
 
 import { LLMResponseJsonSchema } from "../../../aila/src/protocol/jsonPatchProtocol";
 import { LessonPlanJsonSchema } from "../../../aila/src/protocol/schema";
-import { inngest } from "../client";
+import { inngest } from "../inngest";
 import { createOpenAIClient } from "../llm/openai";
 import { template } from "../prompts/lesson-assistant";
 import { RAG } from "../rag";
 import { camelCaseToSentenceCase } from "../utils/camelCaseToSentenceCase";
 import { embedWithCache } from "../utils/embeddings";
-import { Caption, CaptionsSchema } from "./types/caption";
+import { textify } from "../utils/textify";
+import type { Caption} from "./types/caption";
+import { CaptionsSchema } from "./types/caption";
 
 const log = aiLogger("lessons");
 
-// Simplifies the input to a string for embedding
-export function textify(input: string | string[] | object): string {
-  if (Array.isArray(input)) {
-    return input.map((row) => textify(row)).join("\n");
-  } else if (typeof input === "object") {
-    return yaml.stringify(input);
-  } else {
-    return input;
-  }
-}
-
 export type LessonPlanWithLesson = LessonPlan & {
   lesson: Omit<
     Lesson,
diff --git a/packages/core/src/models/lessonSnapshots.ts b/packages/core/src/models/lessonSnapshots.ts
index c1314aae2..baf62b4d5 100644
--- a/packages/core/src/models/lessonSnapshots.ts
+++ b/packages/core/src/models/lessonSnapshots.ts
@@ -1,17 +1,18 @@
-import {
+import type {
   LessonSnapshot,
   LessonSnapshotTrigger,
   PrismaClientWithAccelerate,
 } from "@oakai/db";
 import crypto from "crypto";
 
+import type {
+  LooseLessonPlan} from "../../../aila/src/protocol/schema";
 import {
-  LessonPlanJsonSchema,
-  LooseLessonPlan,
+  LessonPlanJsonSchema
 } from "../../../aila/src/protocol/schema";
 // #TODO this import is reaching out of the package because it would otherwise be a circular dependency
-import { DeepNullable } from "../utils/DeepNullable";
-import { DeepPartial } from "../utils/DeepPartial";
+import type { DeepNullable } from "../utils/DeepNullable";
+import type { DeepPartial } from "../utils/DeepPartial";
 
 export type Snapshot = DeepPartial<DeepNullable<LooseLessonPlan>>;
 const JsonSchemaString = JSON.stringify(LessonPlanJsonSchema);
diff --git a/packages/core/src/models/lessonSummaries.ts b/packages/core/src/models/lessonSummaries.ts
index 104f7be50..edcae0b98 100644
--- a/packages/core/src/models/lessonSummaries.ts
+++ b/packages/core/src/models/lessonSummaries.ts
@@ -1,9 +1,9 @@
-import { Lesson, LessonSummary, PrismaClientWithAccelerate } from "@oakai/db";
+import type { Lesson, LessonSummary, PrismaClientWithAccelerate } from "@oakai/db";
 import { Prisma } from "@prisma/client";
 import { OpenAIEmbeddings } from "langchain/embeddings/openai";
 import { PrismaVectorStore } from "langchain/vectorstores/prisma";
 
-import { inngest } from "../client";
+import { inngest } from "../inngest";
 import { RAG } from "../rag";
 import { embedWithCache } from "../utils/embeddings";
 
diff --git a/packages/core/src/models/lessons.ts b/packages/core/src/models/lessons.ts
index b76e51d52..358d3fdc9 100644
--- a/packages/core/src/models/lessons.ts
+++ b/packages/core/src/models/lessons.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   Lesson,
   LessonSummary,
   PrismaClientWithAccelerate,
@@ -6,8 +6,8 @@ import {
   Snippet,
   SnippetVariant,
   Transcript,
-  ZLesson,
 } from "@oakai/db";
+import { ZLesson } from "@oakai/db";
 import { ZNewLesson } from "@oakai/db/schemas/lesson";
 import { aiLogger } from "@oakai/logger";
 import { StructuredOutputParser } from "langchain/output_parsers";
@@ -15,10 +15,12 @@ import { PromptTemplate } from "langchain/prompts";
 import { RunnableSequence } from "langchain/schema/runnable";
 import { z } from "zod";
 
-import { inngest } from "../client";
-import { createOpenAILangchainClient } from "../llm/openai";
-import { SnippetWithLesson, Snippets } from "./snippets";
-import { Caption, CaptionsSchema } from "./types/caption";
+import { inngest } from "../inngest";
+import { createOpenAILangchainClient } from "../llm/langchain";
+import type { SnippetWithLesson } from "./snippets";
+import { Snippets } from "./snippets";
+import type { Caption } from "./types/caption";
+import { CaptionsSchema } from "./types/caption";
 
 const log = aiLogger("lessons");
 
diff --git a/packages/core/src/models/moderations.ts b/packages/core/src/models/moderations.ts
index 49cd046d3..7f7acb858 100644
--- a/packages/core/src/models/moderations.ts
+++ b/packages/core/src/models/moderations.ts
@@ -1,7 +1,8 @@
-import { Moderation, PrismaClientWithAccelerate } from "@oakai/db";
+import type { Moderation, PrismaClientWithAccelerate } from "@oakai/db";
 
-import { ModerationResult } from "../utils/ailaModeration/moderationSchema";
-import { LessonSnapshots, Snapshot } from "./lessonSnapshots";
+import type { ModerationResult } from "../utils/ailaModeration/moderationSchema";
+import type { Snapshot } from "./lessonSnapshots";
+import { LessonSnapshots } from "./lessonSnapshots";
 
 /**
  * By default, only moderations which haven't been invalidated returned by this API
diff --git a/packages/core/src/models/promptVariants.ts b/packages/core/src/models/promptVariants.ts
index babd890b9..0987f326d 100644
--- a/packages/core/src/models/promptVariants.ts
+++ b/packages/core/src/models/promptVariants.ts
@@ -1,13 +1,13 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
+import { aiLogger } from "@oakai/logger";
 import dedent from "ts-dedent";
 import { Md5 } from "ts-md5";
 
 import errorHandling from "../prompts/shared/error-handling";
 import promptInjection from "../prompts/shared/prompt-injection";
-import { OakPromptDefinition, OakPromptVariant } from "../prompts/types";
-import { aiLogger } from "@oakai/logger";
+import type { OakPromptDefinition, OakPromptVariant } from "../prompts/types";
 
-const log = aiLogger("prompts")
+const log = aiLogger("prompts");
 
 export class PromptVariants {
   definition: OakPromptDefinition;
@@ -49,11 +49,10 @@ export class PromptVariants {
     const app = await this.prisma.app.findFirstOrThrow({
       where: { slug: appSlug },
     });
-    const maxVersionRows = (await this.prisma
-      .$queryRaw`select max(version) as max_version from prompts where slug = ${slug}`) as {
-      max_version: number;
-    }[];
-    const maxVersion = maxVersionRows?.[0]?.max_version ?? 0;
+    const maxVersionRow = await this.prisma.$queryRaw<
+      { max_version: number | null }[]
+    >`SELECT MAX(version) AS max_version FROM prompts WHERE slug = ${slug}`;
+    const maxVersion = maxVersionRow[0]?.max_version ?? 0;
     const version = maxVersion + 1;
     const created = await this.prisma.prompt.create({
       data: {
diff --git a/packages/core/src/models/prompts.ts b/packages/core/src/models/prompts.ts
index 467855ca2..d7317c6fe 100644
--- a/packages/core/src/models/prompts.ts
+++ b/packages/core/src/models/prompts.ts
@@ -1,11 +1,13 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
-import { structuredLogger, StructuredLogger } from "@oakai/logger";
-import { Logger as InngestLogger } from "inngest/middleware/logger";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
+import type { StructuredLogger } from "@oakai/logger";
+import { structuredLogger } from "@oakai/logger";
+import type { Logger as InngestLogger } from "inngest/middleware/logger";
 import { PromptTemplate } from "langchain/prompts";
-import { BaseMessage, SystemMessage } from "langchain/schema";
+import type { BaseMessage} from "langchain/schema";
+import { SystemMessage } from "langchain/schema";
 import untruncateJson from "untruncate-json";
 
-import { createOpenAILangchainChatClient } from "../llm/openai";
+import { createOpenAILangchainChatClient } from "../llm/langchain";
 
 type CompletionMeta = {
   timeTaken: number;
@@ -131,7 +133,7 @@ export class Prompts {
             }
           },
           handleChainError: (err) => {
-            this.logger.error(err, `LLM chain error`);
+            this.logger.error(err, "LLM chain error");
           },
         },
       ],
@@ -160,7 +162,7 @@ export class Prompts {
     }
 
     if ("errorMessage" in result && typeof result.errorMessage === "string") {
-      this.logger.info(`llm refused to fulfil prompt: %s`, result.errorMessage);
+      this.logger.info("llm refused to fulfil prompt: %s", result.errorMessage);
       throw new LLMRefusalError(result.errorMessage, meta);
     }
 
diff --git a/packages/core/src/models/quizAnswers.ts b/packages/core/src/models/quizAnswers.ts
index 0616c2f69..7c2739745 100644
--- a/packages/core/src/models/quizAnswers.ts
+++ b/packages/core/src/models/quizAnswers.ts
@@ -1,6 +1,6 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
-import { inngest } from "../client";
+import { inngest } from "../inngest";
 import { embedWithCache } from "../utils/embeddings";
 
 export class QuizAnswers {
diff --git a/packages/core/src/models/quizQuestions.ts b/packages/core/src/models/quizQuestions.ts
index 77b5966f7..d7ebe51b6 100644
--- a/packages/core/src/models/quizQuestions.ts
+++ b/packages/core/src/models/quizQuestions.ts
@@ -1,6 +1,6 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
-import { inngest } from "../client";
+import { inngest } from "../inngest";
 import { embedWithCache } from "../utils/embeddings";
 
 export class QuizQuestions {
diff --git a/packages/core/src/models/safetyViolations.ts b/packages/core/src/models/safetyViolations.ts
index d2ceeec5e..823a02d67 100644
--- a/packages/core/src/models/safetyViolations.ts
+++ b/packages/core/src/models/safetyViolations.ts
@@ -1,15 +1,17 @@
 import { clerkClient } from "@clerk/nextjs/server";
-import {
+import type {
   SafetyViolationAction,
   SafetyViolationRecordType,
   SafetyViolationSource,
   PrismaClientWithAccelerate,
 } from "@oakai/db";
-import { structuredLogger, StructuredLogger } from "@oakai/logger";
-import { Logger as InngestLogger } from "inngest/middleware/logger";
+import type { StructuredLogger } from "@oakai/logger";
+import { structuredLogger } from "@oakai/logger";
+import type { Logger as InngestLogger } from "inngest/middleware/logger";
 
 import { posthogAiBetaServerClient } from "../analytics/posthogAiBetaServerClient";
-import { inngest } from "../client";
+import { inngest } from "../inngest";
+import { UserBannedError } from "./userBannedError";
 
 const ALLOWED_VIOLATIONS = parseInt(
   process.env.SAFETY_VIOLATIONS_MAX_ALLOWED || "5",
@@ -21,12 +23,6 @@ const CHECK_WINDOW_DAYS = parseInt(
 );
 const checkWindowMs = 1000 * 60 * 60 * 24 * CHECK_WINDOW_DAYS;
 
-export class UserBannedError extends Error {
-  constructor(userId: string) {
-    super(`User banned: ${userId}`);
-  }
-}
-
 /**
  * SafetyViolations records safety violations and bans users who exceed the
  * allowed number of violations in a given time window.
diff --git a/packages/core/src/models/serializers.ts b/packages/core/src/models/serializers.ts
index 37ce0cde7..7e6fce37f 100644
--- a/packages/core/src/models/serializers.ts
+++ b/packages/core/src/models/serializers.ts
@@ -13,10 +13,11 @@
  * As these grow we will likely want to either extract them to their own files, or
  * make them part of the models
  */
-import { App, Generation, GenerationStatus, Prompt } from "@oakai/db";
+import type { App, Generation, Prompt } from "@oakai/db";
+import { GenerationStatus } from "@oakai/db";
 import { z } from "zod";
 
-import { AppWithPrompt } from "./apps";
+import type { AppWithPrompt } from "./apps";
 
 type SerializedApp = Pick<App, "id" | "slug" | "name">;
 
diff --git a/packages/core/src/models/snippets.ts b/packages/core/src/models/snippets.ts
index 0dd5b0465..0b7781333 100644
--- a/packages/core/src/models/snippets.ts
+++ b/packages/core/src/models/snippets.ts
@@ -1,10 +1,5 @@
-import {
-  Prisma,
-  PrismaClientWithAccelerate,
-  Snippet,
-  SnippetStatus,
-  SnippetVariant,
-} from "@oakai/db";
+import type { PrismaClientWithAccelerate, Snippet } from "@oakai/db";
+import { Prisma, SnippetStatus, SnippetVariant } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 import { LLMChain, RetrievalQAChain } from "langchain/chains";
 import { OpenAIEmbeddings } from "langchain/embeddings/openai";
@@ -23,8 +18,8 @@ import { formatDocumentsAsString } from "langchain/util/document";
 import { PrismaVectorStore } from "langchain/vectorstores/prisma";
 import { difference } from "remeda";
 
-import { inngest } from "../client";
-import { createOpenAILangchainClient } from "../llm/openai";
+import { inngest } from "../inngest";
+import { createOpenAILangchainClient } from "../llm/langchain";
 import { embedWithCache } from "../utils/embeddings";
 
 const log = aiLogger("snippets");
diff --git a/packages/core/src/models/statistics.ts b/packages/core/src/models/statistics.ts
index 4ed6d4892..7a37061da 100644
--- a/packages/core/src/models/statistics.ts
+++ b/packages/core/src/models/statistics.ts
@@ -1,4 +1,5 @@
-import { Prisma, PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
+import { Prisma } from "@oakai/db";
 
 export class Statistics {
   constructor(private readonly prisma: PrismaClientWithAccelerate) {}
@@ -14,7 +15,7 @@ export class Statistics {
     const sql = this.getStatsUpsertSql(
       Prisma.raw("median-generation-total-duration-ms"),
       Prisma.raw(
-        `percentile_cont(0.5) WITHIN GROUP (ORDER BY (EXTRACT(EPOCH FROM (completed_at - created_at)) * 1000))::INT`,
+        "percentile_cont(0.5) WITHIN GROUP (ORDER BY (EXTRACT(EPOCH FROM (completed_at - created_at)) * 1000))::INT",
       ),
     );
     await this.prisma.$executeRaw(sql);
@@ -24,7 +25,7 @@ export class Statistics {
     const sql = this.getStatsUpsertSql(
       Prisma.raw("mean-generation-total-duration-ms"),
       Prisma.raw(
-        `AVG((EXTRACT(EPOCH FROM (completed_at - created_at)) * 1000))::INT`,
+        "AVG((EXTRACT(EPOCH FROM (completed_at - created_at)) * 1000))::INT",
       ),
     );
     await this.prisma.$executeRaw(sql);
@@ -34,7 +35,7 @@ export class Statistics {
     const sql = this.getStatsUpsertSql(
       Prisma.raw("median-generation-llm-duration-ms"),
       Prisma.raw(
-        `ROUND(percentile_cont(0.5) WITHIN GROUP (ORDER BY llm_time_taken))`,
+        "ROUND(percentile_cont(0.5) WITHIN GROUP (ORDER BY llm_time_taken))",
       ),
     );
     await this.prisma.$executeRaw(sql);
@@ -43,7 +44,7 @@ export class Statistics {
   async updateMeanGenerationLlmDurations() {
     const sql = this.getStatsUpsertSql(
       Prisma.raw("mean-generation-llm-duration-ms"),
-      Prisma.raw(`AVG(generations.llm_time_taken)::INT`),
+      Prisma.raw("AVG(generations.llm_time_taken)::INT"),
     );
     await this.prisma.$executeRaw(sql);
   }
diff --git a/packages/core/src/models/transcript.ts b/packages/core/src/models/transcript.ts
index b84d47cda..d6698e32c 100644
--- a/packages/core/src/models/transcript.ts
+++ b/packages/core/src/models/transcript.ts
@@ -1,4 +1,5 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
+import { aiLogger } from "@oakai/logger";
 import { Document } from "langchain/document";
 import { StructuredOutputParser } from "langchain/output_parsers";
 import { PromptTemplate } from "langchain/prompts";
@@ -6,10 +7,9 @@ import { RunnableSequence } from "langchain/schema/runnable";
 import { RecursiveCharacterTextSplitter } from "langchain/text_splitter";
 import { z } from "zod";
 
-import { createOpenAILangchainClient } from "../llm/openai";
-import { aiLogger } from "@oakai/logger";
+import { createOpenAILangchainClient } from "../llm/langchain";
 
-const log = aiLogger("transcripts")
+const log = aiLogger("transcripts");
 
 interface TranscriptWithRaw {
   raw: string;
diff --git a/packages/core/src/models/userBannedError.ts b/packages/core/src/models/userBannedError.ts
new file mode 100644
index 000000000..7541c2f88
--- /dev/null
+++ b/packages/core/src/models/userBannedError.ts
@@ -0,0 +1,5 @@
+export class UserBannedError extends Error {
+  constructor(userId: string) {
+    super(`User banned: ${userId}`);
+  }
+}
diff --git a/packages/core/src/prompts/lesson-assistant/index.ts b/packages/core/src/prompts/lesson-assistant/index.ts
index 2a9ec853a..bab6e9dba 100644
--- a/packages/core/src/prompts/lesson-assistant/index.ts
+++ b/packages/core/src/prompts/lesson-assistant/index.ts
@@ -1,6 +1,6 @@
 import crypto from "crypto";
 
-import { LooseLessonPlan } from "../../../../aila/src/protocol/schema";
+import type { LooseLessonPlan } from "../../../../aila/src/protocol/schema";
 import {
   americanToBritish,
   basedOn,
diff --git a/packages/core/src/prompts/lesson-assistant/parts/americanToBritish.ts b/packages/core/src/prompts/lesson-assistant/parts/americanToBritish.ts
index 636b44724..20496b259 100644
--- a/packages/core/src/prompts/lesson-assistant/parts/americanToBritish.ts
+++ b/packages/core/src/prompts/lesson-assistant/parts/americanToBritish.ts
@@ -1,4 +1,4 @@
-import { TemplateProps } from "..";
+import type { TemplateProps } from "..";
 
 export const americanToBritish = ({
   americanisms,
diff --git a/packages/core/src/prompts/lesson-assistant/parts/basedOn.ts b/packages/core/src/prompts/lesson-assistant/parts/basedOn.ts
index 886fff3f3..14be071fc 100644
--- a/packages/core/src/prompts/lesson-assistant/parts/basedOn.ts
+++ b/packages/core/src/prompts/lesson-assistant/parts/basedOn.ts
@@ -1,4 +1,4 @@
-import { TemplateProps } from "..";
+import type { TemplateProps } from "..";
 
 export const basedOn = ({
   baseLessonPlan,
diff --git a/packages/core/src/prompts/lesson-assistant/parts/body.ts b/packages/core/src/prompts/lesson-assistant/parts/body.ts
index 961412731..24ffc180c 100644
--- a/packages/core/src/prompts/lesson-assistant/parts/body.ts
+++ b/packages/core/src/prompts/lesson-assistant/parts/body.ts
@@ -1,4 +1,4 @@
-import { TemplateProps } from "..";
+import type { TemplateProps } from "..";
 
 export const body = ({ lessonPlan, responseMode }: TemplateProps) => {
   const { keyStage } = lessonPlan ?? {};
diff --git a/packages/core/src/prompts/lesson-assistant/parts/context.ts b/packages/core/src/prompts/lesson-assistant/parts/context.ts
index 3985a58e5..4ecebd096 100644
--- a/packages/core/src/prompts/lesson-assistant/parts/context.ts
+++ b/packages/core/src/prompts/lesson-assistant/parts/context.ts
@@ -1,4 +1,4 @@
-import { TemplateProps } from "..";
+import type { TemplateProps } from "..";
 
 const interactiveOnly = `You will receive instructions about which part of the schema to generate at each step of the process.
 This is because the lesson plan is a complex document that is best generated in stages, and you will be asked to create each stage in sequence with separate requests.`;
diff --git a/packages/core/src/prompts/lesson-assistant/parts/currentLessonPlan.ts b/packages/core/src/prompts/lesson-assistant/parts/currentLessonPlan.ts
index 078568f13..d443be7e6 100644
--- a/packages/core/src/prompts/lesson-assistant/parts/currentLessonPlan.ts
+++ b/packages/core/src/prompts/lesson-assistant/parts/currentLessonPlan.ts
@@ -1,4 +1,4 @@
-import { TemplateProps } from "..";
+import type { TemplateProps } from "..";
 
 export const currentLessonPlan = ({
   lessonPlan,
diff --git a/packages/core/src/prompts/lesson-assistant/parts/interactingWithTheUser.ts b/packages/core/src/prompts/lesson-assistant/parts/interactingWithTheUser.ts
index 25d9b2616..9c73d7347 100644
--- a/packages/core/src/prompts/lesson-assistant/parts/interactingWithTheUser.ts
+++ b/packages/core/src/prompts/lesson-assistant/parts/interactingWithTheUser.ts
@@ -1,8 +1,8 @@
 import { aiLogger } from "@oakai/logger";
 
-import { TemplateProps } from "..";
+import type { TemplateProps } from "..";
 import { allSectionsInOrder } from "../../../../../../apps/nextjs/src/lib/lessonPlan/sectionsInOrder";
-import {
+import type {
   LessonPlanKeys,
   LooseLessonPlan,
 } from "../../../../../aila/src/protocol/schema";
@@ -29,14 +29,14 @@ const lessonConstructionSteps = (
     lessonPlan.title && lessonPlan.keyStage && lessonPlan.subject
       ? undefined
       : {
-          title: `ENSURE YOU HAVE A TITLE, KEY STAGE, SUBJECT, AND TOPIC`,
+          title: "ENSURE YOU HAVE A TITLE, KEY STAGE, SUBJECT, AND TOPIC",
           content: `In order to start the lesson plan you need to be provided with title, keyStage, subject, topic (optionally) in the lesson plan.
 These values are not all present, so ask the user for the missing values.`,
         },
 
     hasRelevantLessons && !Object.keys(lessonPlan).includes("basedOn")
       ? {
-          title: `ASK THE USER IF THEY WANT TO BASE THEIR LESSON PLAN ON AN EXISTING LESSON`,
+          title: "ASK THE USER IF THEY WANT TO BASE THEIR LESSON PLAN ON AN EXISTING LESSON",
           content: `Ask if the user would like to adapt one of the Oak lessons as a starting point for their new lesson.
 Provide a list of lessons for the user as numbered options, with the title of each lesson.
 The user will then respond with the number of the lesson they would like to adapt.
@@ -56,7 +56,7 @@ END OF EXAMPLE RESPONSE`,
     !hasRelevantLessons
       ? {
           sections: ["learningOutcome", "learningCycles"] as LessonPlanKeys[],
-          title: `GENERATE SECTION GROUP [learningOutcome, learningCycles]`,
+          title: "GENERATE SECTION GROUP [learningOutcome, learningCycles]",
           content: `Generate learning outcomes and the learning cycles overview.
 Generate both of these sections together in one interaction with the user.
 Do not add any additional explanation about the content you have generated.
@@ -64,7 +64,7 @@ In some cases it is possible for the user to base their lesson on existing ones,
         }
       : {
           sections: ["learningOutcome", "learningCycles"] as LessonPlanKeys[],
-          title: `GENERATE SECTION GROUP [basedOn, learningOutcome, learningCycles]`,
+          title: "GENERATE SECTION GROUP [basedOn, learningOutcome, learningCycles]",
           content: `You need to generate three sections in one interaction with the user. Do these all in one interaction.
 * basedOn - store the reference to the basedOn lesson in the lesson plan unless it is already set.
 * learningOutcome - generate learning outcomes.
@@ -86,14 +86,14 @@ Generate all of these sections together and respond to the user within this one
         "misconceptions",
         "keywords",
       ],
-      title: `GENERATE SECTION GROUP [priorKnowledge, keyLearningPoints, misconceptions, keywords]`,
+      title: "GENERATE SECTION GROUP [priorKnowledge, keyLearningPoints, misconceptions, keywords]",
       content: `Generate these four sections together in one single interaction. 
 You should not ask the user for feedback after generating them one-by-one.
 Generate them all together in one response.`,
     },
     {
       sections: ["starterQuiz", "cycle1", "cycle2", "cycle3", "exitQuiz"],
-      title: `GENERATE SECTION GROUP [starterQuiz, cycle1, cycle2, cycle3, exitQuiz]`,
+      title: "GENERATE SECTION GROUP [starterQuiz, cycle1, cycle2, cycle3, exitQuiz]",
       content: `Generate the bulk of the lesson. Generate all of these sections in one interaction.
 Your response should include the starter quiz, each of the three learning cycles, and the exit quiz all within a single response.
 Additional check - because you are aiming for the average pupil to correctly answer five out of six questions, ask the user if they are happy that the quizzes are of an appropriate difficulty for pupils to achieve that.
@@ -105,7 +105,7 @@ END OF EXAMPLE RESPONSE`,
     },
     {
       sections: ["additionalMaterials"],
-      title: `GENERATE SECTION GROUP [additionalMaterials]`,
+      title: "GENERATE SECTION GROUP [additionalMaterials]",
       content: `Create any additional materials that may be helpful in the delivery of the lesson plan.
 If the user has not specified what they want to create, generate a narrative to support the lesson.
 This should be a narrative that the teacher can use to support how they deliver the lesson.
@@ -119,7 +119,7 @@ END OF EXAMPLE RESPONSE`,
     },
 
     {
-      title: `CONSISTENCY CHECK / LESSON COMPLETE`,
+      title: "CONSISTENCY CHECK / LESSON COMPLETE",
       content: `Go through the lesson plan and check for any inconsistencies in language or content.
 Ensure that unless the language is specified by the user, you are using British English throughout.
 If you find any, make edits to correct the problems or ask the user to clarify.
diff --git a/packages/core/src/prompts/lesson-assistant/parts/protocol.ts b/packages/core/src/prompts/lesson-assistant/parts/protocol.ts
index bc92bc84f..70e613f05 100644
--- a/packages/core/src/prompts/lesson-assistant/parts/protocol.ts
+++ b/packages/core/src/prompts/lesson-assistant/parts/protocol.ts
@@ -1,6 +1,6 @@
-import { TemplateProps } from "..";
+import type { TemplateProps } from "..";
 
-const responseFormatWithStructuredOutputs = `{"response":"llmMessage", patches:[{},{}...], prompt:{}}`;
+const responseFormatWithStructuredOutputs = "{\"response\":\"llmMessage\", patches:[{},{}...], prompt:{}}";
 const responseFormatWithoutStructuredOutputs = `A series of JSON documents separated using the JSON Text Sequences specification, where each row is separated by the ␞ character and ends with a new line character.
 Your response should be a series of patches followed by one and only one prompt to the user.`;
 
diff --git a/packages/core/src/prompts/lesson-assistant/parts/rag.ts b/packages/core/src/prompts/lesson-assistant/parts/rag.ts
index 29ab5f20e..363a904d5 100644
--- a/packages/core/src/prompts/lesson-assistant/parts/rag.ts
+++ b/packages/core/src/prompts/lesson-assistant/parts/rag.ts
@@ -1,4 +1,4 @@
-import { TemplateProps } from "..";
+import type { TemplateProps } from "..";
 
 export const rag = ({
   relevantLessonPlans,
diff --git a/packages/core/src/prompts/lesson-assistant/parts/schema.ts b/packages/core/src/prompts/lesson-assistant/parts/schema.ts
index 9a156e947..2c013d61e 100644
--- a/packages/core/src/prompts/lesson-assistant/parts/schema.ts
+++ b/packages/core/src/prompts/lesson-assistant/parts/schema.ts
@@ -1,6 +1,6 @@
-import { TemplateProps } from "..";
+import type { TemplateProps } from "..";
 
-const interactiveOnly = `This is a JSON object that should be generated through the patch instructions that you generate.`;
+const interactiveOnly = "This is a JSON object that should be generated through the patch instructions that you generate.";
 
 export const schema = ({
   responseMode,
diff --git a/packages/core/src/prompts/lesson-assistant/parts/signOff.ts b/packages/core/src/prompts/lesson-assistant/parts/signOff.ts
index fb818b687..b71c9187c 100644
--- a/packages/core/src/prompts/lesson-assistant/parts/signOff.ts
+++ b/packages/core/src/prompts/lesson-assistant/parts/signOff.ts
@@ -1,4 +1,4 @@
-import { TemplateProps } from "..";
+import type { TemplateProps } from "..";
 
 const interactiveOnlyErrorHandling = `If you are unable to respond for some reason, respond with {"type": "error", "message": "A user-facing error message"} consistent with the JSON schema provided previously.
 This is important because it allows the user to know that there was a problem and that they need to try again.
diff --git a/packages/core/src/prompts/lesson-assistant/parts/task.ts b/packages/core/src/prompts/lesson-assistant/parts/task.ts
index a6e491394..53bf86e58 100644
--- a/packages/core/src/prompts/lesson-assistant/parts/task.ts
+++ b/packages/core/src/prompts/lesson-assistant/parts/task.ts
@@ -1,4 +1,4 @@
-import { TemplateProps } from "..";
+import type { TemplateProps } from "..";
 
 const interactiveOnly = `Generate (or rewrite) sections within the lesson plan for a lesson to be delivered by a teacher in a UK school.
 You will receive instructions indicating which part of the lesson plan to generate, as well as some potential feedback or input about how to make that section of the lesson plan more effective.
diff --git a/packages/core/src/prompts/lesson-assistant/variants.ts b/packages/core/src/prompts/lesson-assistant/variants.ts
index 74632f8d1..beb06c26b 100644
--- a/packages/core/src/prompts/lesson-assistant/variants.ts
+++ b/packages/core/src/prompts/lesson-assistant/variants.ts
@@ -1,7 +1,8 @@
 import z from "zod";
 
-import { TemplateProps, getPromptParts } from ".";
-import { OakPromptDefinition, OakPromptVariant } from "../types";
+import type { TemplateProps} from ".";
+import { getPromptParts } from ".";
+import type { OakPromptDefinition, OakPromptVariant } from "../types";
 
 export const inputSchema = z.object({});
 
diff --git a/packages/core/src/prompts/lesson-planner/extend-lesson-plan-quiz/index.ts b/packages/core/src/prompts/lesson-planner/extend-lesson-plan-quiz/index.ts
index e78c2c72e..69110cc4a 100644
--- a/packages/core/src/prompts/lesson-planner/extend-lesson-plan-quiz/index.ts
+++ b/packages/core/src/prompts/lesson-planner/extend-lesson-plan-quiz/index.ts
@@ -1,4 +1,4 @@
-import { OakPromptDefinition } from "../../types";
+import type { OakPromptDefinition } from "../../types";
 import { inputSchema } from "./input.schema";
 import { outputSchema } from "./output.schema";
 import * as main from "./variants/main";
diff --git a/packages/core/src/prompts/lesson-planner/extend-lesson-plan-quiz/variants/main/parts/output.ts b/packages/core/src/prompts/lesson-planner/extend-lesson-plan-quiz/variants/main/parts/output.ts
index efd11e8a7..d7c09d256 100644
--- a/packages/core/src/prompts/lesson-planner/extend-lesson-plan-quiz/variants/main/parts/output.ts
+++ b/packages/core/src/prompts/lesson-planner/extend-lesson-plan-quiz/variants/main/parts/output.ts
@@ -1 +1 @@
-export default `Take the current lesson plan provided and return only JSON with the key "{quizType}".`;
+export default "Take the current lesson plan provided and return only JSON with the key \"{quizType}\".";
diff --git a/packages/core/src/prompts/lesson-planner/generate-lesson-plan/index.ts b/packages/core/src/prompts/lesson-planner/generate-lesson-plan/index.ts
index c3c99db98..5ee057276 100644
--- a/packages/core/src/prompts/lesson-planner/generate-lesson-plan/index.ts
+++ b/packages/core/src/prompts/lesson-planner/generate-lesson-plan/index.ts
@@ -1,4 +1,4 @@
-import { OakPromptDefinition } from "../../types";
+import type { OakPromptDefinition } from "../../types";
 import { inputSchema } from "./input.schema";
 import { outputSchema } from "./output.schema";
 import main from "./variants/main";
diff --git a/packages/core/src/prompts/lesson-planner/regenerate-lesson-plan/index.ts b/packages/core/src/prompts/lesson-planner/regenerate-lesson-plan/index.ts
index 866dc8ee3..1cfffc2bc 100644
--- a/packages/core/src/prompts/lesson-planner/regenerate-lesson-plan/index.ts
+++ b/packages/core/src/prompts/lesson-planner/regenerate-lesson-plan/index.ts
@@ -1,4 +1,4 @@
-import { OakPromptDefinition } from "../../types";
+import type { OakPromptDefinition } from "../../types";
 import { inputSchema } from "./input.schema";
 import { outputSchema } from "./output.schema";
 import * as main from "./variants/main";
diff --git a/packages/core/src/prompts/lesson-planner/regenerate-lesson-plan/variants/main/parts/output.ts b/packages/core/src/prompts/lesson-planner/regenerate-lesson-plan/variants/main/parts/output.ts
index d8fefab04..f566b3664 100644
--- a/packages/core/src/prompts/lesson-planner/regenerate-lesson-plan/variants/main/parts/output.ts
+++ b/packages/core/src/prompts/lesson-planner/regenerate-lesson-plan/variants/main/parts/output.ts
@@ -1 +1 @@
-export default `Take the current lesson plan provided and return only JSON with the key "{sectionName}".`;
+export default "Take the current lesson plan provided and return only JSON with the key \"{sectionName}\".";
diff --git a/packages/core/src/prompts/quiz-generator/generate-answers-and-distractors-rag/index.ts b/packages/core/src/prompts/quiz-generator/generate-answers-and-distractors-rag/index.ts
index 3e7f3b648..6d984a1d5 100644
--- a/packages/core/src/prompts/quiz-generator/generate-answers-and-distractors-rag/index.ts
+++ b/packages/core/src/prompts/quiz-generator/generate-answers-and-distractors-rag/index.ts
@@ -1,4 +1,4 @@
-import { OakPromptDefinition } from "../../types";
+import type { OakPromptDefinition } from "../../types";
 import { inputSchema } from "./input.schema";
 import { outputSchema } from "./output.schema";
 import * as main from "./variants/main";
diff --git a/packages/core/src/prompts/quiz-generator/generate-questions-rag/index.ts b/packages/core/src/prompts/quiz-generator/generate-questions-rag/index.ts
index 744e10bfb..34ba82f81 100644
--- a/packages/core/src/prompts/quiz-generator/generate-questions-rag/index.ts
+++ b/packages/core/src/prompts/quiz-generator/generate-questions-rag/index.ts
@@ -1,4 +1,4 @@
-import { OakPromptDefinition } from "../../types";
+import type { OakPromptDefinition } from "../../types";
 import { inputSchema } from "./input.schema";
 import { outputSchema } from "./output.schema";
 import * as main from "./variants/main";
diff --git a/packages/core/src/prompts/quiz-generator/regenerate-all-distractors/index.ts b/packages/core/src/prompts/quiz-generator/regenerate-all-distractors/index.ts
index 9e515c70f..7ee5d4555 100644
--- a/packages/core/src/prompts/quiz-generator/regenerate-all-distractors/index.ts
+++ b/packages/core/src/prompts/quiz-generator/regenerate-all-distractors/index.ts
@@ -1,4 +1,4 @@
-import { OakPromptDefinition } from "../../types";
+import type { OakPromptDefinition } from "../../types";
 import { inputSchema } from "./input.schema";
 import { outputSchema } from "./output.schema";
 import * as main from "./variants/main";
diff --git a/packages/core/src/prompts/quiz-generator/regenerate-answer-rag/index.ts b/packages/core/src/prompts/quiz-generator/regenerate-answer-rag/index.ts
index 70f4f08a2..bde34ae5c 100644
--- a/packages/core/src/prompts/quiz-generator/regenerate-answer-rag/index.ts
+++ b/packages/core/src/prompts/quiz-generator/regenerate-answer-rag/index.ts
@@ -1,4 +1,4 @@
-import { OakPromptDefinition } from "../../types";
+import type { OakPromptDefinition } from "../../types";
 import { inputSchema } from "./input.schema";
 import { outputSchema } from "./output.schema";
 import * as main from "./variants/main";
diff --git a/packages/core/src/prompts/quiz-generator/regenerate-distractor-rag/index.ts b/packages/core/src/prompts/quiz-generator/regenerate-distractor-rag/index.ts
index 6e367e735..aed380451 100644
--- a/packages/core/src/prompts/quiz-generator/regenerate-distractor-rag/index.ts
+++ b/packages/core/src/prompts/quiz-generator/regenerate-distractor-rag/index.ts
@@ -1,4 +1,4 @@
-import { OakPromptDefinition } from "../../types";
+import type { OakPromptDefinition } from "../../types";
 import { inputSchema } from "./input.schema";
 import { outputSchema } from "./output.schema";
 import * as main from "./variants/main";
diff --git a/packages/core/src/prompts/types.ts b/packages/core/src/prompts/types.ts
index 344ab23a3..dea74d9ed 100644
--- a/packages/core/src/prompts/types.ts
+++ b/packages/core/src/prompts/types.ts
@@ -1,4 +1,4 @@
-import { z } from "zod";
+import type { z } from "zod";
 
 export type OakPromptDefinition = {
   name: string;
diff --git a/packages/core/src/rag/categorisation.ts b/packages/core/src/rag/categorisation.ts
new file mode 100644
index 000000000..50a364e5c
--- /dev/null
+++ b/packages/core/src/rag/categorisation.ts
@@ -0,0 +1,16 @@
+import z from "zod";
+
+// Make a new Zod schema for a response from OpenAI for the categoriseKeyStageAndSubject function
+
+export const CategoriseKeyStageAndSubjectResponse = z.object({
+  keyStage: z.string().optional().nullable(),
+  subject: z.string().optional().nullable(),
+  title: z.string().optional().nullable(),
+  topic: z.string().optional().nullable(),
+  error: z.string().optional(),
+  reasoning: z.string().optional().nullable(),
+});
+
+export type CategorisedKeyStageAndSubject = z.infer<
+  typeof CategoriseKeyStageAndSubjectResponse
+>;
diff --git a/packages/core/src/rag/index.ts b/packages/core/src/rag/index.ts
index 1967a3d3f..ed115b234 100644
--- a/packages/core/src/rag/index.ts
+++ b/packages/core/src/rag/index.ts
@@ -1,80 +1,38 @@
 import { PrismaVectorStore } from "@langchain/community/vectorstores/prisma";
 import { OpenAIEmbeddings } from "@langchain/openai";
-import {
+import type {
   KeyStage,
   LessonPlanPart,
   PrismaClientWithAccelerate,
   Subject,
 } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
-import {
-  LessonPlan,
-  LessonSummary,
-  Prisma,
-  PrismaClient,
-  Snippet,
-} from "@prisma/client";
+import type { LessonPlan, LessonSummary, Snippet } from "@prisma/client";
+import { Prisma, PrismaClient } from "@prisma/client";
 import { withAccelerate } from "@prisma/extension-accelerate";
 import * as Sentry from "@sentry/nextjs";
 import { kv } from "@vercel/kv";
 import { CohereClient } from "cohere-ai";
-import { RerankResponse } from "cohere-ai/api";
-import { ChatCompletionMessageParam } from "openai/resources/chat/completions";
+import type { RerankResponse } from "cohere-ai/api";
+import type { ChatCompletionMessageParam } from "openai/resources/chat/completions";
 import { Md5 } from "ts-md5";
-import z from "zod";
 
 import { DEFAULT_CATEGORISE_MODEL } from "../../../aila/src/constants";
-import {
-  OpenAICompletionWithLogging,
-  OpenAICompletionWithLoggingOptions,
-} from "../../../aila/src/lib/openai/OpenAICompletionWithLogging";
-import { JsonValue } from "../models/prompts";
+import type { OpenAICompletionWithLoggingOptions } from "../../../aila/src/lib/openai/OpenAICompletionWithLogging";
+import { OpenAICompletionWithLogging } from "../../../aila/src/lib/openai/OpenAICompletionWithLogging";
+import type { JsonValue } from "../models/prompts";
 import { slugify } from "../utils/slugify";
 import { keyStages, subjects } from "../utils/subjects";
+import { CategoriseKeyStageAndSubjectResponse } from "./categorisation";
+import type {
+  FilterOptions,
+  KeyStageAndSubject,
+  LessonPlanWithPartialLesson,
+  SimilarityResultWithScore,
+} from "./types";
 
 const log = aiLogger("rag");
 
-interface FilterOptions {
-  key_stage_id?: object;
-  subject_id?: object;
-}
-
-export interface LessonPlanWithPartialLesson extends LessonPlan {
-  lesson: {
-    id: string;
-    slug: string;
-    title: string;
-  };
-}
-
-export type SimilarityResultWithScore = [
-  import("@langchain/core/documents").DocumentInterface<
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    Record<string, any>
-  >,
-  number,
-];
-
-export interface KeyStageAndSubject {
-  keyStage?: KeyStage;
-  subject?: Subject;
-}
-
-// Make a new Zod schema for a response from OpenAI for the categoriseKeyStageAndSubject function
-
-export const CategoriseKeyStageAndSubjectResponse = z.object({
-  keyStage: z.string().optional().nullable(),
-  subject: z.string().optional().nullable(),
-  title: z.string().optional().nullable(),
-  topic: z.string().optional().nullable(),
-  error: z.string().optional(),
-  reasoning: z.string().optional().nullable(),
-});
-
-export type CategorisedKeyStageAndSubject = z.infer<
-  typeof CategoriseKeyStageAndSubjectResponse
->;
-
 export class RAG {
   prisma: PrismaClientWithAccelerate;
   private _chatMeta: OpenAICompletionWithLoggingOptions;
diff --git a/packages/core/src/rag/types.ts b/packages/core/src/rag/types.ts
new file mode 100644
index 000000000..d3151fd8b
--- /dev/null
+++ b/packages/core/src/rag/types.ts
@@ -0,0 +1,27 @@
+import type { KeyStage, LessonPlan, Subject } from "@prisma/client";
+
+export interface FilterOptions {
+  key_stage_id?: object;
+  subject_id?: object;
+}
+
+export interface LessonPlanWithPartialLesson extends LessonPlan {
+  lesson: {
+    id: string;
+    slug: string;
+    title: string;
+  };
+}
+
+export type SimilarityResultWithScore = [
+  import("@langchain/core/documents").DocumentInterface<
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    Record<string, any>
+  >,
+  number,
+];
+
+export interface KeyStageAndSubject {
+  keyStage?: KeyStage;
+  subject?: Subject;
+}
diff --git a/packages/core/src/scripts/import-new-lessons/createSnippetsForNewLessons.ts b/packages/core/src/scripts/import-new-lessons/createSnippetsForNewLessons.ts
index 5ba4f6be5..469f38adf 100644
--- a/packages/core/src/scripts/import-new-lessons/createSnippetsForNewLessons.ts
+++ b/packages/core/src/scripts/import-new-lessons/createSnippetsForNewLessons.ts
@@ -1,4 +1,4 @@
-import { Snippet, SnippetVariant } from "@oakai/db";
+import type { Snippet, SnippetVariant } from "@oakai/db";
 import { prisma } from "@oakai/db";
 import { z } from "zod";
 
diff --git a/packages/core/src/scripts/import-new-lessons/importNewLessons.ts b/packages/core/src/scripts/import-new-lessons/importNewLessons.ts
index 63a4a248d..e810e92b9 100644
--- a/packages/core/src/scripts/import-new-lessons/importNewLessons.ts
+++ b/packages/core/src/scripts/import-new-lessons/importNewLessons.ts
@@ -1,4 +1,5 @@
-import { Quiz, prisma } from "@oakai/db";
+import type { Quiz } from "@oakai/db";
+import { prisma } from "@oakai/db";
 import { GraphQLClient, gql } from "graphql-request";
 
 const batchSize = parseInt(process.env.LESSON_QUERY_BATCH_SIZE || "");
@@ -61,7 +62,7 @@ type Lesson = {
 };
 
 const graphqlClient = new GraphQLClient(
-  `https://hasura.thenational.academy/v1/graphql`,
+  "https://hasura.thenational.academy/v1/graphql",
   {
     headers: {
       "x-oak-auth-key": process.env.OAK_GRAPHQL_SECRET as string,
diff --git a/packages/core/src/scripts/processLessons.ts b/packages/core/src/scripts/processLessons.ts
index 06e7c20c8..f45348a9b 100644
--- a/packages/core/src/scripts/processLessons.ts
+++ b/packages/core/src/scripts/processLessons.ts
@@ -1,7 +1,7 @@
 // Called with pnpm run process:lessons -- --keyStage=3 --subject=religious-education
 import invariant from "tiny-invariant";
 
-import { inngest } from "../client";
+import { inngest } from "../inngest";
 
 const main = async () => {
   try {
diff --git a/packages/core/src/scripts/setupPrompts.ts b/packages/core/src/scripts/setupPrompts.ts
index c29eddba3..1b8712f33 100644
--- a/packages/core/src/scripts/setupPrompts.ts
+++ b/packages/core/src/scripts/setupPrompts.ts
@@ -4,8 +4,32 @@ import { PromptVariants } from "../models/promptVariants";
 import { lessonPlannerPrompts, quizGeneratorPrompts } from "../prompts";
 import { ailaGenerate } from "../prompts/lesson-assistant/variants";
 
+export const apps = [
+  {
+    name: "Quiz Generator",
+    slug: "quiz-generator",
+    id: "quiz-generator",
+  },
+  {
+    name: "Lesson planner",
+    slug: "lesson-planner",
+    id: "lesson-planner",
+  },
+];
+
 const main = async () => {
   try {
+    // Ensure the apps exist in the database
+    await prisma.$transaction(
+      apps.map((app) =>
+        prisma.app.upsert({
+          where: { id: app.id },
+          create: app,
+          update: app,
+        }),
+      ),
+    );
+
     console.log("Setting up prompts");
     console.log("Aila");
     for (const variant of ailaGenerate.variants) {
diff --git a/packages/core/src/tracing/mockTracer.ts b/packages/core/src/tracing/mockTracer.ts
index 9b645708d..b94a7ca9d 100644
--- a/packages/core/src/tracing/mockTracer.ts
+++ b/packages/core/src/tracing/mockTracer.ts
@@ -1,4 +1,4 @@
-import { TracingSpan } from "./serverTracing";
+import type { TracingSpan } from "./serverTracing";
 
 class MockSpan implements TracingSpan {
   tags: Record<string, string | number | boolean | undefined> = {};
diff --git a/packages/core/src/utils/ailaModeration/helpers.ts b/packages/core/src/utils/ailaModeration/helpers.ts
index c5eb411ad..df54b56b1 100644
--- a/packages/core/src/utils/ailaModeration/helpers.ts
+++ b/packages/core/src/utils/ailaModeration/helpers.ts
@@ -1,5 +1,5 @@
 import moderationCategories from "./moderationCategories.json";
-import { ModerationBase, ModerationResult } from "./moderationSchema";
+import type { ModerationBase, ModerationResult } from "./moderationSchema";
 
 export function isToxic(result: ModerationBase): boolean {
   return result.categories.some((category) =>
diff --git a/packages/core/src/utils/ailaModeration/moderationSchema.ts b/packages/core/src/utils/ailaModeration/moderationSchema.ts
index fafe5b7e6..8c1bc6612 100644
--- a/packages/core/src/utils/ailaModeration/moderationSchema.ts
+++ b/packages/core/src/utils/ailaModeration/moderationSchema.ts
@@ -1,4 +1,4 @@
-import { JsonValue } from "@prisma/client/runtime/library";
+import type { JsonValue } from "@prisma/client/runtime/library";
 import { z } from "zod";
 
 export type ModerationBase = {
@@ -38,7 +38,7 @@ export const moderationCategoriesSchema = z.array(
       z.literal("t/encouragement-violence"),
     ])
     .describe(
-      `If the content scores less than 5 for any group, specify the categories on which it failed.`,
+      "If the content scores less than 5 for any group, specify the categories on which it failed.",
     ),
 );
 
@@ -57,7 +57,7 @@ export const moderationResponseSchema = z.object({
     p: likertScale.describe("Physical activity and safety score"),
     t: likertScale.describe("Toxic score"),
   }),
-  justification: z.string().describe(`Add justification for your scores.`),
+  justification: z.string().describe("Add justification for your scores."),
   categories: moderationCategoriesSchema,
 });
 
diff --git a/packages/core/src/utils/camelCaseConversion.ts b/packages/core/src/utils/camelCaseConversion.ts
new file mode 100644
index 000000000..e1a4ae6ac
--- /dev/null
+++ b/packages/core/src/utils/camelCaseConversion.ts
@@ -0,0 +1,13 @@
+export function camelCaseToSentenceCase(str: string) {
+  return str
+    .replace(/([A-Z0-9])/g, " $1")
+    .replace(/^./, (str) => str.toUpperCase())
+    .replace(/\s[A-Z]/g, (str) => str.toLowerCase());
+}
+
+export function camelCaseToTitleCase(str: string) {
+  return str
+    .replace(/([A-Z0-9])/g, " $1")
+    .replace(/^./, (str) => str.toUpperCase())
+    .replace(/\s./g, (str) => str.toUpperCase());
+}
diff --git a/packages/core/src/utils/getCaptionsFromFile.ts b/packages/core/src/utils/getCaptionsFromFile.ts
index ca934a4ca..96551c789 100644
--- a/packages/core/src/utils/getCaptionsFromFile.ts
+++ b/packages/core/src/utils/getCaptionsFromFile.ts
@@ -1,6 +1,7 @@
 import { Storage } from "@google-cloud/storage";
 import { aiLogger } from "@oakai/logger";
-import { Cue, WebVTTParser } from "webvtt-parser";
+import type { Cue } from "webvtt-parser";
+import { WebVTTParser } from "webvtt-parser";
 
 const log = aiLogger("transcripts");
 
diff --git a/packages/core/src/utils/moderation.ts b/packages/core/src/utils/moderation.ts
index 1ad35b08d..3fec874e1 100644
--- a/packages/core/src/utils/moderation.ts
+++ b/packages/core/src/utils/moderation.ts
@@ -5,7 +5,7 @@ import {
   englishDataset, // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   englishRecommendedTransformers, // @ts-ignore: Could not find declaration file
 } from "obscenity";
-import OpenAI from "openai";
+import type OpenAI from "openai";
 
 export const moderationConfig: Record<string, number | boolean | string> = {
   MODERATE_PROFANITY: false,
@@ -33,7 +33,7 @@ const ENGLISH_THRESHOLD =
 
 if (MODERATE_LANGUAGE && Number.isNaN(ENGLISH_THRESHOLD)) {
   throw new Error(
-    `Missing or invalid env var MODERATION_THRESHOLD_ENGLISH_LANGUAGE`,
+    "Missing or invalid env var MODERATION_THRESHOLD_ENGLISH_LANGUAGE",
   );
 }
 
diff --git a/packages/core/src/utils/rateLimiting/userBasedRateLimiter.ts b/packages/core/src/utils/rateLimiting/userBasedRateLimiter.ts
index 9225774d9..1931aeefc 100644
--- a/packages/core/src/utils/rateLimiting/userBasedRateLimiter.ts
+++ b/packages/core/src/utils/rateLimiting/userBasedRateLimiter.ts
@@ -1,6 +1,7 @@
-import { clerkClient, User } from "@clerk/nextjs/server";
+import type { User } from "@clerk/nextjs/server";
+import { clerkClient } from "@clerk/nextjs/server";
 import { aiLogger } from "@oakai/logger";
-import { Ratelimit } from "@upstash/ratelimit";
+import type { Ratelimit } from "@upstash/ratelimit";
 import { waitUntil } from "@vercel/functions";
 
 const log = aiLogger("rate-limiting");
diff --git a/packages/core/src/utils/sendQuizFeedbackEmail.ts b/packages/core/src/utils/sendQuizFeedbackEmail.ts
index 867c64a9a..5410b18af 100644
--- a/packages/core/src/utils/sendQuizFeedbackEmail.ts
+++ b/packages/core/src/utils/sendQuizFeedbackEmail.ts
@@ -1,4 +1,4 @@
-import { GenerationPart } from "../types";
+import type { GenerationPart } from "../types";
 import { sendEmail } from "./sendEmail";
 
 const NEXT_PUBLIC_GLEAP_FEEDBACK_EMAIL_ADDR =
diff --git a/packages/core/src/utils/slack.ts b/packages/core/src/utils/slack.ts
index 858d79217..c489e0fbf 100644
--- a/packages/core/src/utils/slack.ts
+++ b/packages/core/src/utils/slack.ts
@@ -1,4 +1,5 @@
-import { ActionsBlock, SectionBlock, WebClient } from "@slack/web-api";
+import type { ActionsBlock, SectionBlock} from "@slack/web-api";
+import { WebClient } from "@slack/web-api";
 import {
   uniqueNamesGenerator,
   adjectives,
diff --git a/packages/core/src/utils/textify.ts b/packages/core/src/utils/textify.ts
new file mode 100644
index 000000000..c3eefe420
--- /dev/null
+++ b/packages/core/src/utils/textify.ts
@@ -0,0 +1,12 @@
+import yaml from "yaml";
+
+// Simplifies the input to a string for embedding
+export function textify(input: string | string[] | object): string {
+  if (Array.isArray(input)) {
+    return input.map((row) => textify(row)).join("\n");
+  } else if (typeof input === "object") {
+    return yaml.stringify(input);
+  } else {
+    return input;
+  }
+}
diff --git a/packages/core/src/workers/generations/requestGeneration.ts b/packages/core/src/workers/generations/requestGeneration.ts
index da161792e..d35593610 100644
--- a/packages/core/src/workers/generations/requestGeneration.ts
+++ b/packages/core/src/workers/generations/requestGeneration.ts
@@ -1,19 +1,16 @@
-import { GenerationStatus, ModerationType, Prisma, prisma } from "@oakai/db";
-import {
-  structuredLogger as baseLogger,
-  aiLogger,
-  StructuredLogger,
-} from "@oakai/logger";
+import type { Prisma } from "@oakai/db";
+import { GenerationStatus, ModerationType, prisma } from "@oakai/db";
+import type { StructuredLogger } from "@oakai/logger";
+import { structuredLogger as baseLogger, aiLogger } from "@oakai/logger";
 import { Redis } from "@upstash/redis";
 import { NonRetriableError } from "inngest";
-import { z } from "zod";
+import type { z } from "zod";
 
 import { createOpenAIModerationsClient } from "../../llm/openai";
 import { SafetyViolations } from "../../models";
 import { Generations } from "../../models/generations";
+import type { CompletionResult, Json } from "../../models/prompts";
 import {
-  CompletionResult,
-  Json,
   LLMCompletionError,
   LLMRefusalError,
   Prompts,
@@ -86,7 +83,7 @@ export function requestGenerationWorker({
 
 async function invoke({ data, user }: RequestGenerationArgs) {
   baseLogger.info(
-    `Requesting generation for promptId %s`,
+    "Requesting generation for promptId %s",
     data?.promptId ?? "Unknown prompt",
   );
   baseLogger.debug({ eventData: data }, "Event data for generation");
@@ -285,7 +282,7 @@ async function invoke({ data, user }: RequestGenerationArgs) {
 
   let completion: CompletionResult | undefined = undefined;
   try {
-    logger.info(`Requesting completion for generationId=%s`, generationId);
+    logger.info("Requesting completion for generationId=%s", generationId);
 
     /**
      * Stream partial response JSON to redis as the new tokens come in,
@@ -337,7 +334,7 @@ async function invoke({ data, user }: RequestGenerationArgs) {
     }
   } catch (err) {
     const errorMessage =
-      err instanceof Error ? err.message : `Unknown generation error`;
+      err instanceof Error ? err.message : "Unknown generation error";
 
     logger.error(err, errorMessage);
 
@@ -383,7 +380,7 @@ async function invoke({ data, user }: RequestGenerationArgs) {
     );
 
     logger.info(
-      `Successfully completed generation, generationId=%s`,
+      "Successfully completed generation, generationId=%s",
       generationId,
     );
   }
diff --git a/packages/db/client/index.ts b/packages/db/client/index.ts
new file mode 100644
index 000000000..636ff043f
--- /dev/null
+++ b/packages/db/client/index.ts
@@ -0,0 +1,49 @@
+import { aiLogger } from "@oakai/logger";
+import { PrismaClient } from "@prisma/client";
+import { withAccelerate } from "@prisma/extension-accelerate";
+
+const log = aiLogger("db");
+
+const createPrismaClient = () => {
+  const client = new PrismaClient({
+    log: [
+      { emit: "stdout", level: "error" },
+      // Prisma supports DEBUG strings (eg: prisma*, prisma:client), but they're noisy debug messages.
+      // Instead, we forward the typical logs based on ai:db
+      { emit: "event", level: "query" },
+      { emit: "event", level: "warn" },
+    ],
+  });
+
+  client.$on("query", (e) => {
+    log.info(e.query);
+  });
+  client.$on("warn", (e) => {
+    log.info(e.message);
+  });
+
+  return client.$extends(withAccelerate());
+};
+
+// Create an instance to extract the type
+const extendedPrisma = createPrismaClient();
+export type PrismaClientWithAccelerate = typeof extendedPrisma;
+
+declare global {
+  // allow global `var` declarations
+  // eslint-disable-next-line no-var
+  var prisma: PrismaClientWithAccelerate | undefined;
+}
+
+let prisma: PrismaClientWithAccelerate;
+
+if (process.env.NODE_ENV === "production") {
+  prisma = createPrismaClient();
+} else {
+  if (!global.prisma) {
+    global.prisma = createPrismaClient();
+  }
+  prisma = global.prisma;
+}
+
+export { prisma };
diff --git a/packages/db/index.ts b/packages/db/index.ts
index 555228f7c..534b81b20 100644
--- a/packages/db/index.ts
+++ b/packages/db/index.ts
@@ -1,53 +1,4 @@
-import { aiLogger } from "@oakai/logger";
-import { PrismaClient } from "@prisma/client";
-import { withAccelerate } from "@prisma/extension-accelerate";
-
-const log = aiLogger("db");
-
-const createPrismaClient = () => {
-  const client = new PrismaClient({
-    log: [
-      { emit: "stdout", level: "error" },
-      // Prisma supports DEBUG strings (eg: prisma*, prisma:client), but they're noisy debug messages.
-      // Instead, we forward the typical logs based on ai:db
-      { emit: "event", level: "query" },
-      { emit: "event", level: "warn" },
-    ],
-  });
-
-  client.$on("query", (e) => {
-    log.info(e.query);
-  });
-  client.$on("warn", (e) => {
-    log.info(e.message);
-  });
-
-  return client.$extends(withAccelerate());
-};
-
-// Create an instance to extract the type
-const extendedPrisma = createPrismaClient();
-export type PrismaClientWithAccelerate = typeof extendedPrisma;
-
-declare global {
-  // allow global `var` declarations
-  // eslint-disable-next-line no-var
-  var prisma: PrismaClientWithAccelerate | undefined;
-}
-
-let prisma: PrismaClientWithAccelerate;
-
-if (process.env.NODE_ENV === "production") {
-  prisma = createPrismaClient();
-} else {
-  if (!global.prisma) {
-    global.prisma = createPrismaClient();
-  }
-  prisma = global.prisma;
-}
-
-export { prisma };
-
+export * from "./client";
 export * from "@prisma/client";
 export * from "./prisma/zod-schemas";
 export * from "./schemas";
diff --git a/packages/db/package.json b/packages/db/package.json
index 8eebfbbe1..0ea847800 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -16,8 +16,8 @@
     "db-export": "DB_ENV=dev doppler run --config dev -- bash scripts/import-export/db_export.sh",
     "db-export:prd": "DB_ENV=prd doppler run --config prd -- bash scripts/import-export/db_export.sh",
     "db-export:stg": "DB_ENV=stg doppler run --config stg -- bash scripts/import-export/db_export.sh",
-    "db-generate": "pnpm with-env prisma generate",
-    "db-generate:no-engine": "pnpm with-env prisma generate --no-engine",
+    "db-generate": "echo 'Running db-generate...' && pnpm with-env prisma generate --schema=./prisma/schema.prisma",
+    "db-generate:no-engine": "echo 'Running db-generate:no-engine...' && pnpm with-env prisma generate --no-engine --schema=./prisma/schema.prisma",
     "db-generate:dev": "pnpm with-env prisma generate",
     "db-migrate-deploy": "pnpm with-env prisma migrate deploy",
     "db-migrate": "pnpm with-env prisma migrate dev",
diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json
index e89d913bb..c4b45432a 100644
--- a/packages/db/tsconfig.json
+++ b/packages/db/tsconfig.json
@@ -1,4 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["index.ts", "prisma/**/*.ts"]
+  "include": ["index.ts", "prisma/**/*.ts", "client/index.ts"]
 }
diff --git a/packages/eslint-config-custom/index.js b/packages/eslint-config-custom/index.js
index 63e2d80c1..76d707d25 100644
--- a/packages/eslint-config-custom/index.js
+++ b/packages/eslint-config-custom/index.js
@@ -1,6 +1,6 @@
 module.exports = {
   extends: ["eslint:recommended", "prettier"],
-  plugins: ["turbo", "@typescript-eslint"],
+  plugins: ["turbo", "@typescript-eslint",],
   ignorePatterns: ["node_modules", "dist", "../../node_modules", "../../dist"],
   root: true,
   env: {
@@ -20,9 +20,30 @@ module.exports = {
       parser: "@typescript-eslint/parser",
       files: ["*.{ts,tsx}"],
       rules: {
-        "@typescript-eslint/quotes": ["error", "double"],
+        "no-console": "warn",
+        "no-extra-boolean-cast": "warn",
+        "no-useless-escape": "warn",
+        "no-unsafe-finally": "warn",
+        "no-constant-condition": "warn",
+        "no-prototype-builtins": "warn",
+        "no-inner-declarations": "warn",
+        "@typescript-eslint/no-unsafe-enum-comparison": "warn",
+        "@typescript-eslint/no-unnecessary-type-assertion": "warn",
+        "@typescript-eslint/consistent-type-imports": "warn",
         "@typescript-eslint/comma-dangle": "off",
         "@typescript-eslint/no-unused-vars": "warn",
+        "@typescript-eslint/require-await": "warn",
+        "@typescript-eslint/no-unsafe-return": "warn",
+        "@typescript-eslint/no-misused-promises": "warn",
+        "@typescript-eslint/no-unsafe-argument": "warn",
+        "@typescript-eslint/no-unsafe-assignment": "warn",
+        "@typescript-eslint/no-floating-promises": "warn",
+        "@typescript-eslint/unbound-method": "off",
+        "@typescript-eslint/no-unsafe-member-access": "warn",
+        "@typescript-eslint/restrict-template-expressions": "warn",
+        "@typescript-eslint/no-redundant-type-constituents": "warn",        
+        "@typescript-eslint/await-thenable": "warn",
+        "@typescript-eslint/no-unsafe-call": "warn",
         "@typescript-eslint/explicit-function-return-type": [
           "off",
           {
@@ -44,7 +65,4 @@ module.exports = {
       },
     },
   ],
-  rules: {
-    quotes: ["error", "double"],
-  },
 };
diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json
index 678aabdff..b4ca03cb0 100644
--- a/packages/eslint-config-custom/package.json
+++ b/packages/eslint-config-custom/package.json
@@ -14,15 +14,16 @@
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "@typescript-eslint/typescript-estree": "^7.18.0",
-    "eslint-config-next": "14.0.4",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-jest": "^27.6.0",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.5.0",
-    "eslint-plugin-turbo": "^1.11.2"
+    "eslint-config-next": "15.0.1",
+    "eslint-plugin-jest": "^28.8.3",
+    "eslint-plugin-react": "^7.37.2",
+    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint-plugin-turbo": "^2.2.3"
   },
   "devDependencies": {
     "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.2.1",
     "prettier": "^3.1.1",
     "typescript": "5.3.3"
   },
diff --git a/packages/exports/src/dataHelpers/prepLessonForSlides.ts b/packages/exports/src/dataHelpers/prepLessonForSlides.ts
index e3afe14fb..92dbd045f 100644
--- a/packages/exports/src/dataHelpers/prepLessonForSlides.ts
+++ b/packages/exports/src/dataHelpers/prepLessonForSlides.ts
@@ -1,9 +1,9 @@
-import { AdditionalMaterialsTemplateData } from "../schema/additionalMaterialsDoc.schema";
-import {
+import type { AdditionalMaterialsTemplateData } from "../schema/additionalMaterialsDoc.schema";
+import type {
   ExportableQuizAppState,
   LessonSlidesInputData,
 } from "../schema/input.schema";
-import { LessonSlidesTemplateData } from "../schema/lessonSlidesTemplate.schema";
+import type { LessonSlidesTemplateData } from "../schema/lessonSlidesTemplate.schema";
 import { camelCaseToTitleCase, processQuizAnswers } from "../utils";
 
 const processQuizAnswersForSlides = (
diff --git a/packages/exports/src/dataHelpers/prepLessonPlanForDocs.ts b/packages/exports/src/dataHelpers/prepLessonPlanForDocs.ts
index fa5913f12..69999fd7f 100644
--- a/packages/exports/src/dataHelpers/prepLessonPlanForDocs.ts
+++ b/packages/exports/src/dataHelpers/prepLessonPlanForDocs.ts
@@ -1,5 +1,5 @@
-import { LessonPlanDocInputData } from "../schema/input.schema";
-import { LessonPlanDocsTemplateData } from "../schema/lessonPlanDocsTemplate.schema";
+import type { LessonPlanDocInputData } from "../schema/input.schema";
+import type { LessonPlanDocsTemplateData } from "../schema/lessonPlanDocsTemplate.schema";
 import {
   camelCaseToTitleCase,
   processQuizAnswers,
diff --git a/packages/exports/src/dataHelpers/prepQuizForDocs.ts b/packages/exports/src/dataHelpers/prepQuizForDocs.ts
index 511c5880f..cf837593c 100644
--- a/packages/exports/src/dataHelpers/prepQuizForDocs.ts
+++ b/packages/exports/src/dataHelpers/prepQuizForDocs.ts
@@ -1,4 +1,4 @@
-import { Quiz } from "../schema/input.schema";
+import type { Quiz } from "../schema/input.schema";
 import { processQuizAnswers } from "../utils";
 
 function processQuizAnswersForQuiz(
diff --git a/packages/exports/src/dataHelpers/prepWorksheetForSlides.ts b/packages/exports/src/dataHelpers/prepWorksheetForSlides.ts
index 826ef76d0..c820f94be 100644
--- a/packages/exports/src/dataHelpers/prepWorksheetForSlides.ts
+++ b/packages/exports/src/dataHelpers/prepWorksheetForSlides.ts
@@ -1,4 +1,4 @@
-import { WorksheetSlidesInputData } from "../schema/input.schema";
+import type { WorksheetSlidesInputData } from "../schema/input.schema";
 
 export async function prepWorksheetForSlides(
   lessonPlan: Pick<
diff --git a/packages/exports/src/downloadDriveFile.ts b/packages/exports/src/downloadDriveFile.ts
index 88346d572..de9f88bfe 100644
--- a/packages/exports/src/downloadDriveFile.ts
+++ b/packages/exports/src/downloadDriveFile.ts
@@ -1,6 +1,6 @@
 import { googleDrive } from "./gSuite/drive/client";
 import { getExportFileStream } from "./gSuite/drive/getExportFileStream";
-import { Result } from "./types";
+import type { Result } from "./types";
 
 type OutputData = {
   stream: NodeJS.ReadableStream;
diff --git a/packages/exports/src/exportAdditionalMaterials.ts b/packages/exports/src/exportAdditionalMaterials.ts
index 85f93bf1f..4f8d3fe32 100644
--- a/packages/exports/src/exportAdditionalMaterials.ts
+++ b/packages/exports/src/exportAdditionalMaterials.ts
@@ -4,9 +4,9 @@ import { prepLessonForAdditionalMaterialsDoc } from "./dataHelpers/prepLessonFor
 import { exportGeneric } from "./exportGeneric";
 import { getDocsClient } from "./gSuite/docs/client";
 import { populateDoc } from "./gSuite/docs/populateDoc";
-import { LessonSlidesInputData } from "./schema/input.schema";
+import type { LessonSlidesInputData } from "./schema/input.schema";
 import { getSlidesTemplateIdAdditionalMaterials as getDocsTemplateIdAdditionalMaterials } from "./templates";
-import { OutputData, Result, State } from "./types";
+import type { OutputData, Result, State } from "./types";
 
 const log = aiLogger("exports");
 
diff --git a/packages/exports/src/exportDocLessonPlan.ts b/packages/exports/src/exportDocLessonPlan.ts
index a935f47b5..f329fdb7c 100644
--- a/packages/exports/src/exportDocLessonPlan.ts
+++ b/packages/exports/src/exportDocLessonPlan.ts
@@ -2,9 +2,9 @@ import { prepLessonPlanForDocs } from "./dataHelpers/prepLessonPlanForDocs";
 import { exportGeneric } from "./exportGeneric";
 import { getDocsClient } from "./gSuite/docs/client";
 import { populateDoc } from "./gSuite/docs/populateDoc";
-import { LessonPlanDocInputData } from "./schema/input.schema";
+import type { LessonPlanDocInputData } from "./schema/input.schema";
 import { getDocsTemplateIdLessonPlan } from "./templates";
-import { OutputData, Result, State } from "./types";
+import type { OutputData, Result, State } from "./types";
 
 export const exportDocLessonPlan = async ({
   snapshotId,
diff --git a/packages/exports/src/exportDocQuiz.ts b/packages/exports/src/exportDocQuiz.ts
index 9414026b6..bfa8a11c1 100644
--- a/packages/exports/src/exportDocQuiz.ts
+++ b/packages/exports/src/exportDocQuiz.ts
@@ -1,10 +1,10 @@
-import { ExportDocQuizData } from "..";
+import type { ExportDocQuizData } from "..";
 import { prepQuizForDocs } from "./dataHelpers/prepQuizForDocs";
 import { exportGeneric } from "./exportGeneric";
 import { getDocsClient } from "./gSuite/docs/client";
 import { populateDoc } from "./gSuite/docs/populateDoc";
 import { getDocsTemplateIdQuiz } from "./templates";
-import { OutputData, Result, State } from "./types";
+import type { OutputData, Result, State } from "./types";
 
 const QUIZ_TYPE_LABELS = {
   starter: "Starter quiz",
diff --git a/packages/exports/src/exportDocsWorksheet.ts b/packages/exports/src/exportDocsWorksheet.ts
index 84bfffc9e..90168b2d6 100644
--- a/packages/exports/src/exportDocsWorksheet.ts
+++ b/packages/exports/src/exportDocsWorksheet.ts
@@ -4,9 +4,9 @@ import { prepWorksheetForSlides } from "./dataHelpers/prepWorksheetForSlides";
 import { exportGeneric } from "./exportGeneric";
 import { getDocsClient } from "./gSuite/docs/client";
 import { populateDoc } from "./gSuite/docs/populateDoc";
-import { WorksheetSlidesInputData } from "./schema/input.schema";
+import type { WorksheetSlidesInputData } from "./schema/input.schema";
 import { getDocsTemplateIdWorksheet } from "./templates";
-import { OutputData, Result, State } from "./types";
+import type { OutputData, Result, State } from "./types";
 
 const log = aiLogger("exports");
 
diff --git a/packages/exports/src/exportGeneric.ts b/packages/exports/src/exportGeneric.ts
index 7f0fea661..2444f0757 100644
--- a/packages/exports/src/exportGeneric.ts
+++ b/packages/exports/src/exportGeneric.ts
@@ -2,7 +2,7 @@ import { addReader } from "./gSuite/drive/addReader";
 import { googleDrive } from "./gSuite/drive/client";
 import { copyTemplate } from "./gSuite/drive/copyTemplate";
 import { getLink } from "./gSuite/drive/getLink";
-import { OutputData, Result, State } from "./types";
+import type { OutputData, Result, State } from "./types";
 
 export const exportGeneric = async <InputData, TemplateData>({
   newFileName,
diff --git a/packages/exports/src/exportQuizDesignerSlides.ts b/packages/exports/src/exportQuizDesignerSlides.ts
index 8a9219558..52c71626b 100644
--- a/packages/exports/src/exportQuizDesignerSlides.ts
+++ b/packages/exports/src/exportQuizDesignerSlides.ts
@@ -3,9 +3,9 @@ import { exportGeneric } from "./exportGeneric";
 import { googleSlides } from "./gSuite/slides/client";
 import { deleteSlides } from "./gSuite/slides/deleteSlides";
 import { populateSlides } from "./gSuite/slides/populateSlides";
-import { ExportableQuizAppState } from "./schema/input.schema";
+import type { ExportableQuizAppState } from "./schema/input.schema";
 import { getQuizDesignerSlidesTemplateIdWorksheet } from "./templates";
-import { OutputData, Result, State } from "./types";
+import type { OutputData, Result, State } from "./types";
 
 type SpeakerNotesTag = string;
 
diff --git a/packages/exports/src/exportSlidesFullLesson.ts b/packages/exports/src/exportSlidesFullLesson.ts
index a440ee514..807124834 100644
--- a/packages/exports/src/exportSlidesFullLesson.ts
+++ b/packages/exports/src/exportSlidesFullLesson.ts
@@ -1,11 +1,12 @@
 import { prepLessonForSlides } from "./dataHelpers/prepLessonForSlides";
 import { exportGeneric } from "./exportGeneric";
 import { googleSlides } from "./gSuite/slides/client";
-import { SpeakerNotesTag, deleteSlides } from "./gSuite/slides/deleteSlides";
+import type { SpeakerNotesTag} from "./gSuite/slides/deleteSlides";
+import { deleteSlides } from "./gSuite/slides/deleteSlides";
 import { populateSlides } from "./gSuite/slides/populateSlides";
-import { LessonSlidesInputData } from "./schema/input.schema";
+import type { LessonSlidesInputData } from "./schema/input.schema";
 import { getSlidesTemplateIdFullLesson } from "./templates";
-import { OutputData, Result, State } from "./types";
+import type { OutputData, Result, State } from "./types";
 
 export const exportSlidesFullLesson = async ({
   snapshotId,
diff --git a/packages/exports/src/gSuite/docs/populateDoc.ts b/packages/exports/src/gSuite/docs/populateDoc.ts
index 389fd44a2..2af3b893d 100644
--- a/packages/exports/src/gSuite/docs/populateDoc.ts
+++ b/packages/exports/src/gSuite/docs/populateDoc.ts
@@ -1,7 +1,8 @@
-import { docs_v1 } from "@googleapis/docs";
+import type { docs_v1 } from "@googleapis/docs";
 
-import { Result } from "../../types";
-import { ValueToString, defaultValueToString } from "../../utils";
+import type { Result } from "../../types";
+import type { ValueToString} from "../../utils";
+import { defaultValueToString } from "../../utils";
 
 /**
  * @description Populates the template document with the given data.
diff --git a/packages/exports/src/gSuite/drive/addReader.ts b/packages/exports/src/gSuite/drive/addReader.ts
index c6ca454ab..053ee2742 100644
--- a/packages/exports/src/gSuite/drive/addReader.ts
+++ b/packages/exports/src/gSuite/drive/addReader.ts
@@ -1,6 +1,6 @@
-import { drive_v3 } from "@googleapis/drive";
+import type { drive_v3 } from "@googleapis/drive";
 
-import { Result } from "../../types";
+import type { Result } from "../../types";
 
 /**
  * @description Adds the specified user as a reader to the file.
diff --git a/packages/exports/src/gSuite/drive/copyTemplate.ts b/packages/exports/src/gSuite/drive/copyTemplate.ts
index d75849c2a..3cd567040 100644
--- a/packages/exports/src/gSuite/drive/copyTemplate.ts
+++ b/packages/exports/src/gSuite/drive/copyTemplate.ts
@@ -1,6 +1,6 @@
-import { drive_v3 } from "@googleapis/drive";
+import type { drive_v3 } from "@googleapis/drive";
 
-import { Result } from "../../types";
+import type { Result } from "../../types";
 
 const folderId = process.env.GOOGLE_DRIVE_OUTPUT_FOLDER_ID;
 
diff --git a/packages/exports/src/gSuite/drive/getExportFileStream.ts b/packages/exports/src/gSuite/drive/getExportFileStream.ts
index c4c51f612..e334a5a14 100644
--- a/packages/exports/src/gSuite/drive/getExportFileStream.ts
+++ b/packages/exports/src/gSuite/drive/getExportFileStream.ts
@@ -1,6 +1,6 @@
-import { drive_v3 } from "@googleapis/drive";
+import type { drive_v3 } from "@googleapis/drive";
 
-import { Result } from "../../types";
+import type { Result } from "../../types";
 
 const MIME_TYPES = {
   pdf: "application/pdf",
diff --git a/packages/exports/src/gSuite/drive/getLink.ts b/packages/exports/src/gSuite/drive/getLink.ts
index f2cdf1d56..3612a8594 100644
--- a/packages/exports/src/gSuite/drive/getLink.ts
+++ b/packages/exports/src/gSuite/drive/getLink.ts
@@ -1,6 +1,6 @@
-import { drive_v3 } from "@googleapis/drive";
+import type { drive_v3 } from "@googleapis/drive";
 
-import { Result } from "../../types";
+import type { Result } from "../../types";
 
 /**
  * @description Returns a link to the file.
diff --git a/packages/exports/src/gSuite/slides/deleteSlides.ts b/packages/exports/src/gSuite/slides/deleteSlides.ts
index e614b6a23..0e2370641 100644
--- a/packages/exports/src/gSuite/slides/deleteSlides.ts
+++ b/packages/exports/src/gSuite/slides/deleteSlides.ts
@@ -1,6 +1,6 @@
-import { slides_v1 } from "@googleapis/slides";
+import type { slides_v1 } from "@googleapis/slides";
 
-import { Result } from "../../types";
+import type { Result } from "../../types";
 
 export type SpeakerNotesTag = "cycle1" | "cycle2" | "cycle3" | string;
 
diff --git a/packages/exports/src/gSuite/slides/populateSlides.ts b/packages/exports/src/gSuite/slides/populateSlides.ts
index d635554eb..bdbb6038b 100644
--- a/packages/exports/src/gSuite/slides/populateSlides.ts
+++ b/packages/exports/src/gSuite/slides/populateSlides.ts
@@ -1,7 +1,8 @@
-import { slides_v1 } from "@googleapis/slides";
+import type { slides_v1 } from "@googleapis/slides";
 
-import { Result } from "../../types";
-import { ValueToString, defaultValueToString } from "../../utils";
+import type { Result } from "../../types";
+import type { ValueToString} from "../../utils";
+import { defaultValueToString } from "../../utils";
 
 /**
  * @description Populates the template presentation with the given data.
diff --git a/packages/exports/src/schema/input.schema.ts b/packages/exports/src/schema/input.schema.ts
index 0a5d9993e..ce7be09c7 100644
--- a/packages/exports/src/schema/input.schema.ts
+++ b/packages/exports/src/schema/input.schema.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-import { DeepPartial } from "../types";
+import type { DeepPartial } from "../types";
 
 export const quizQADSchema = z.object({
   question: z.string(),
diff --git a/packages/exports/src/templates.ts b/packages/exports/src/templates.ts
index 2477d944d..97358af9f 100644
--- a/packages/exports/src/templates.ts
+++ b/packages/exports/src/templates.ts
@@ -1,4 +1,4 @@
-import { LessonPlanDocInputData } from "./schema/input.schema";
+import type { LessonPlanDocInputData } from "./schema/input.schema";
 
 const GOOGLE_DOCS_LESSON_PLAN_TEMPLATE_ID =
   process.env.GOOGLE_DOCS_LESSON_PLAN_TEMPLATE_ID;
diff --git a/packages/ingest/src/captions/getCaptionsByFileName.ts b/packages/ingest/src/captions/getCaptionsByFileName.ts
index 8f3d45ba5..84a752fc7 100644
--- a/packages/ingest/src/captions/getCaptionsByFileName.ts
+++ b/packages/ingest/src/captions/getCaptionsByFileName.ts
@@ -1,6 +1,7 @@
 import { Storage } from "@google-cloud/storage";
 import { aiLogger } from "@oakai/logger";
-import { Cue, WebVTTParser } from "webvtt-parser";
+import type { Cue} from "webvtt-parser";
+import { WebVTTParser } from "webvtt-parser";
 
 const log = aiLogger("ingest");
 
diff --git a/packages/ingest/src/chunking/getLessonPlanParts.ts b/packages/ingest/src/chunking/getLessonPlanParts.ts
index 0ec5c67fc..eba97ad3c 100644
--- a/packages/ingest/src/chunking/getLessonPlanParts.ts
+++ b/packages/ingest/src/chunking/getLessonPlanParts.ts
@@ -1,4 +1,4 @@
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import yaml from "yaml";
 
 // Simplifies the input to a string for embedding
diff --git a/packages/ingest/src/config/ingestConfig.ts b/packages/ingest/src/config/ingestConfig.ts
index bbafead60..267d27ab8 100644
--- a/packages/ingest/src/config/ingestConfig.ts
+++ b/packages/ingest/src/config/ingestConfig.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-const DEFAULT_COMPLETION_TEMPERATURE = 0.7 as const;
+const DEFAULT_COMPLETION_TEMPERATURE = 0.7;
 
 export const IngestConfigSchema = z.object({
   completionModel: z.literal("gpt-4o-2024-08-06"),
diff --git a/packages/ingest/src/db-helpers/createCaptionsRecord.ts b/packages/ingest/src/db-helpers/createCaptionsRecord.ts
index 3d5d01530..5b7f6564a 100644
--- a/packages/ingest/src/db-helpers/createCaptionsRecord.ts
+++ b/packages/ingest/src/db-helpers/createCaptionsRecord.ts
@@ -1,7 +1,7 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { getDataHash } from "../utils/getDataHash";
-import { Captions } from "../zod-schema/zodSchema";
+import type { Captions } from "../zod-schema/zodSchema";
 
 export async function createCaptionsRecord({
   prisma,
diff --git a/packages/ingest/src/db-helpers/createErrorRecord.ts b/packages/ingest/src/db-helpers/createErrorRecord.ts
index 0c42adaf0..9022197ab 100644
--- a/packages/ingest/src/db-helpers/createErrorRecord.ts
+++ b/packages/ingest/src/db-helpers/createErrorRecord.ts
@@ -1,6 +1,6 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
-import { Step } from "./step";
+import type { Step } from "./step";
 
 export async function createErrorRecord({
   prisma,
diff --git a/packages/ingest/src/db-helpers/createIngestRecord.ts b/packages/ingest/src/db-helpers/createIngestRecord.ts
index 101be8ca3..581d88fdc 100644
--- a/packages/ingest/src/db-helpers/createIngestRecord.ts
+++ b/packages/ingest/src/db-helpers/createIngestRecord.ts
@@ -1,6 +1,6 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
-import { IngestConfig } from "../config/ingestConfig";
+import type { IngestConfig } from "../config/ingestConfig";
 
 export async function createIngestRecord({
   prisma,
diff --git a/packages/ingest/src/db-helpers/getIngestById.ts b/packages/ingest/src/db-helpers/getIngestById.ts
index f388482ad..2e922aa04 100644
--- a/packages/ingest/src/db-helpers/getIngestById.ts
+++ b/packages/ingest/src/db-helpers/getIngestById.ts
@@ -1,4 +1,4 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { IngestError } from "../IngestError";
 import { IngestConfigSchema } from "../config/ingestConfig";
diff --git a/packages/ingest/src/db-helpers/getLatestIngestId.ts b/packages/ingest/src/db-helpers/getLatestIngestId.ts
index c0a653e53..e4e96ba33 100644
--- a/packages/ingest/src/db-helpers/getLatestIngestId.ts
+++ b/packages/ingest/src/db-helpers/getLatestIngestId.ts
@@ -1,4 +1,4 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { IngestError } from "../IngestError";
 
diff --git a/packages/ingest/src/db-helpers/getLessonsByState.ts b/packages/ingest/src/db-helpers/getLessonsByState.ts
index 6fd982a74..556f50bd4 100644
--- a/packages/ingest/src/db-helpers/getLessonsByState.ts
+++ b/packages/ingest/src/db-helpers/getLessonsByState.ts
@@ -1,7 +1,7 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { RawLessonSchema } from "../zod-schema/zodSchema";
-import { Step, StepStatus } from "./step";
+import type { Step, StepStatus } from "./step";
 
 export async function getLessonsByState({
   prisma,
diff --git a/packages/ingest/src/db-helpers/loadLessonsAndUpdateState.ts b/packages/ingest/src/db-helpers/loadLessonsAndUpdateState.ts
index e6111f914..c72ba1dd0 100644
--- a/packages/ingest/src/db-helpers/loadLessonsAndUpdateState.ts
+++ b/packages/ingest/src/db-helpers/loadLessonsAndUpdateState.ts
@@ -1,7 +1,7 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { getLessonsByState } from "./getLessonsByState";
-import { Step } from "./step";
+import type { Step } from "./step";
 import { updateLessonsState } from "./updateLessonsState";
 
 export async function loadLessonsAndUpdateState({
diff --git a/packages/ingest/src/db-helpers/updateLessonsState.ts b/packages/ingest/src/db-helpers/updateLessonsState.ts
index 283f94385..caed07cc6 100644
--- a/packages/ingest/src/db-helpers/updateLessonsState.ts
+++ b/packages/ingest/src/db-helpers/updateLessonsState.ts
@@ -1,6 +1,6 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
-import { Step, StepStatus } from "./step";
+import type { Step, StepStatus } from "./step";
 
 export async function updateLessonsState({
   prisma,
diff --git a/packages/ingest/src/embedding/getPartEmbeddingBatchFileLine.ts b/packages/ingest/src/embedding/getPartEmbeddingBatchFileLine.ts
index ff96533d4..d9f9fbf12 100644
--- a/packages/ingest/src/embedding/getPartEmbeddingBatchFileLine.ts
+++ b/packages/ingest/src/embedding/getPartEmbeddingBatchFileLine.ts
@@ -1,4 +1,4 @@
-import { PersistedIngest } from "../db-helpers/getIngestById";
+import type { PersistedIngest } from "../db-helpers/getIngestById";
 import { batchLineEmbedding } from "../openai-batches/batchLineEmbedding";
 import { createCustomId } from "../openai-batches/customId";
 
diff --git a/packages/ingest/src/embedding/handleEmbeddingBatchSuccess.ts b/packages/ingest/src/embedding/handleEmbeddingBatchSuccess.ts
index 224a7910e..14a4b1246 100644
--- a/packages/ingest/src/embedding/handleEmbeddingBatchSuccess.ts
+++ b/packages/ingest/src/embedding/handleEmbeddingBatchSuccess.ts
@@ -1,4 +1,4 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 
 import { IngestError } from "../IngestError";
diff --git a/packages/ingest/src/embedding/startEmbedding.ts b/packages/ingest/src/embedding/startEmbedding.ts
index 593decedf..0807f71c3 100644
--- a/packages/ingest/src/embedding/startEmbedding.ts
+++ b/packages/ingest/src/embedding/startEmbedding.ts
@@ -1,7 +1,8 @@
 import { startBatch } from "../openai-batches/startBatch";
-import { OpenAiBatchSubmitCallback } from "../openai-batches/submitOpenAiBatch";
+import type { OpenAiBatchSubmitCallback } from "../openai-batches/submitOpenAiBatch";
+import type {
+  EmbeddingBatchLineProps} from "./getPartEmbeddingBatchFileLine";
 import {
-  EmbeddingBatchLineProps,
   getPartEmbeddingBatchFileLine,
 } from "./getPartEmbeddingBatchFileLine";
 
diff --git a/packages/ingest/src/generate-lesson-plans/getLessonPlanBatchFileLine.ts b/packages/ingest/src/generate-lesson-plans/getLessonPlanBatchFileLine.ts
index a486aa8f1..de0bc1c71 100644
--- a/packages/ingest/src/generate-lesson-plans/getLessonPlanBatchFileLine.ts
+++ b/packages/ingest/src/generate-lesson-plans/getLessonPlanBatchFileLine.ts
@@ -1,13 +1,14 @@
+import type {
+  LooseLessonPlan} from "@oakai/aila/src/protocol/schema";
 import {
-  CompletedLessonPlanSchema,
-  LooseLessonPlan,
+  CompletedLessonPlanSchema
 } from "@oakai/aila/src/protocol/schema";
 import { zodResponseFormat } from "openai/helpers/zod";
 
-import { PersistedIngest } from "../db-helpers/getIngestById";
+import type { PersistedIngest } from "../db-helpers/getIngestById";
 import { batchLineCompletion } from "../openai-batches/batchLineCompletion";
 import { createCustomId } from "../openai-batches/customId";
-import { Captions, RawLesson } from "../zod-schema/zodSchema";
+import type { Captions, RawLesson } from "../zod-schema/zodSchema";
 import { getSystemPrompt } from "./getSystemPrompt";
 import { getUserPrompt } from "./getUserPrompt";
 
diff --git a/packages/ingest/src/generate-lesson-plans/getSystemPrompt.ts b/packages/ingest/src/generate-lesson-plans/getSystemPrompt.ts
index 10bdae7ba..397bf8000 100644
--- a/packages/ingest/src/generate-lesson-plans/getSystemPrompt.ts
+++ b/packages/ingest/src/generate-lesson-plans/getSystemPrompt.ts
@@ -1,10 +1,11 @@
+import type {
+  LooseLessonPlan} from "@oakai/aila/src/protocol/schema";
 import {
-  LooseLessonPlan,
   LessonPlanJsonSchema,
 } from "@oakai/aila/src/protocol/schema";
 import { template } from "@oakai/core/src/prompts/lesson-assistant";
 
-import { RawLesson } from "../zod-schema/zodSchema";
+import type { RawLesson } from "../zod-schema/zodSchema";
 
 export function getSystemPrompt({ rawLesson }: { rawLesson: RawLesson }) {
   const { lessonTitle, keyStageSlug, subjectSlug } = rawLesson;
diff --git a/packages/ingest/src/generate-lesson-plans/getUserPrompt.test.ts b/packages/ingest/src/generate-lesson-plans/getUserPrompt.test.ts
index 21baaf22d..0587ab90c 100644
--- a/packages/ingest/src/generate-lesson-plans/getUserPrompt.test.ts
+++ b/packages/ingest/src/generate-lesson-plans/getUserPrompt.test.ts
@@ -1,7 +1,7 @@
 import fs from "node:fs";
 
 import rawLesson from "../fixtures/rawLesson.json";
-import { Captions } from "../zod-schema/zodSchema";
+import type { Captions } from "../zod-schema/zodSchema";
 import { getUserPrompt } from "./getUserPrompt";
 
 describe("getUserPrompt", () => {
diff --git a/packages/ingest/src/generate-lesson-plans/getUserPrompt.ts b/packages/ingest/src/generate-lesson-plans/getUserPrompt.ts
index d2abd5e36..38cc23ca5 100644
--- a/packages/ingest/src/generate-lesson-plans/getUserPrompt.ts
+++ b/packages/ingest/src/generate-lesson-plans/getUserPrompt.ts
@@ -1,7 +1,7 @@
 import { isTruthy } from "remeda";
 
 import { IngestError } from "../IngestError";
-import { RawLesson, Captions } from "../zod-schema/zodSchema";
+import type { RawLesson, Captions } from "../zod-schema/zodSchema";
 import { exitQuizPromptPart } from "./user-prompt-parts/exitQuiz.promptPart";
 import { keyLearningPointsPromptPart } from "./user-prompt-parts/keyLearningPoints.promptPart";
 import { lessonKeywordsPromptPart } from "./user-prompt-parts/keywords.promptPart";
diff --git a/packages/ingest/src/generate-lesson-plans/handleLessonPlanBatchSuccess.ts b/packages/ingest/src/generate-lesson-plans/handleLessonPlanBatchSuccess.ts
index c8edad819..5efb6e686 100644
--- a/packages/ingest/src/generate-lesson-plans/handleLessonPlanBatchSuccess.ts
+++ b/packages/ingest/src/generate-lesson-plans/handleLessonPlanBatchSuccess.ts
@@ -1,4 +1,4 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 
 import { IngestError } from "../IngestError";
diff --git a/packages/ingest/src/generate-lesson-plans/startGenerating.ts b/packages/ingest/src/generate-lesson-plans/startGenerating.ts
index 42be207bf..b4bc0d87e 100644
--- a/packages/ingest/src/generate-lesson-plans/startGenerating.ts
+++ b/packages/ingest/src/generate-lesson-plans/startGenerating.ts
@@ -1,7 +1,7 @@
-import { PersistedIngest } from "../db-helpers/getIngestById";
-import { PersistedIngestLesson } from "../db-helpers/getLessonsByState";
+import type { PersistedIngest } from "../db-helpers/getIngestById";
+import type { PersistedIngestLesson } from "../db-helpers/getLessonsByState";
 import { startBatch } from "../openai-batches/startBatch";
-import { OpenAiBatchSubmitCallback } from "../openai-batches/submitOpenAiBatch";
+import type { OpenAiBatchSubmitCallback } from "../openai-batches/submitOpenAiBatch";
 import { CaptionsSchema } from "../zod-schema/zodSchema";
 import { getLessonPlanBatchFileLine } from "./getLessonPlanBatchFileLine";
 
diff --git a/packages/ingest/src/generate-lesson-plans/transformQuiz.test.ts b/packages/ingest/src/generate-lesson-plans/transformQuiz.test.ts
index 9f7428bfd..5e7a175ec 100644
--- a/packages/ingest/src/generate-lesson-plans/transformQuiz.test.ts
+++ b/packages/ingest/src/generate-lesson-plans/transformQuiz.test.ts
@@ -1,4 +1,4 @@
-import { OakLessonQuiz } from "../zod-schema/zodSchema";
+import type { OakLessonQuiz } from "../zod-schema/zodSchema";
 import { transformQuiz } from "./transformQuiz";
 
 describe("transformQuiz", () => {
diff --git a/packages/ingest/src/generate-lesson-plans/transformQuiz.ts b/packages/ingest/src/generate-lesson-plans/transformQuiz.ts
index 6ce2dd248..9b320a6d5 100644
--- a/packages/ingest/src/generate-lesson-plans/transformQuiz.ts
+++ b/packages/ingest/src/generate-lesson-plans/transformQuiz.ts
@@ -1,8 +1,8 @@
-import { Quiz } from "@oakai/aila/src/protocol/schema";
+import type { Quiz } from "@oakai/aila/src/protocol/schema";
 import { isTruthy, partition } from "remeda";
 
 import { IngestError } from "../IngestError";
-import { OakLessonQuiz } from "../zod-schema/zodSchema";
+import type { OakLessonQuiz } from "../zod-schema/zodSchema";
 
 export function transformQuiz(oakQuiz: OakLessonQuiz): Quiz {
   const quiz: Quiz = [];
diff --git a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/exitQuiz.promptPart.ts b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/exitQuiz.promptPart.ts
index db834f537..25508ac94 100644
--- a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/exitQuiz.promptPart.ts
+++ b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/exitQuiz.promptPart.ts
@@ -1,4 +1,4 @@
-import { RawLesson } from "../../zod-schema/zodSchema";
+import type { RawLesson } from "../../zod-schema/zodSchema";
 import { transformQuiz } from "../transformQuiz";
 
 export function exitQuizPromptPart(rawLesson: RawLesson) {
diff --git a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/keyLearningPoints.promptPart.ts b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/keyLearningPoints.promptPart.ts
index 7f9182725..9d0514e1d 100644
--- a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/keyLearningPoints.promptPart.ts
+++ b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/keyLearningPoints.promptPart.ts
@@ -1,4 +1,4 @@
-import { RawLesson } from "../../zod-schema/zodSchema";
+import type { RawLesson } from "../../zod-schema/zodSchema";
 import { toMarkdownList } from "./toMarkdownList";
 
 export const keyLearningPointsPromptPart = ({
diff --git a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/keywords.promptPart.ts b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/keywords.promptPart.ts
index 44e65328f..4a68728bb 100644
--- a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/keywords.promptPart.ts
+++ b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/keywords.promptPart.ts
@@ -1,4 +1,4 @@
-import { RawLesson } from "../../zod-schema/zodSchema";
+import type { RawLesson } from "../../zod-schema/zodSchema";
 import { toMarkdownList } from "./toMarkdownList";
 
 export const lessonKeywordsPromptPart = ({ lessonKeywords }: RawLesson) =>
diff --git a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/learningOutcome.promptPart.ts b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/learningOutcome.promptPart.ts
index 5cbcbc1b8..a03199f25 100644
--- a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/learningOutcome.promptPart.ts
+++ b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/learningOutcome.promptPart.ts
@@ -1,4 +1,4 @@
-import { RawLesson } from "../../zod-schema/zodSchema";
+import type { RawLesson } from "../../zod-schema/zodSchema";
 
 export const learningOutcomePromptPart = ({ pupilLessonOutcome }: RawLesson) =>
   pupilLessonOutcome
diff --git a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/misconceptions.promptPart.ts b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/misconceptions.promptPart.ts
index 8912fa3fa..1bd7ccabd 100644
--- a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/misconceptions.promptPart.ts
+++ b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/misconceptions.promptPart.ts
@@ -1,4 +1,4 @@
-import { RawLesson } from "../../zod-schema/zodSchema";
+import type { RawLesson } from "../../zod-schema/zodSchema";
 import { toMarkdownList } from "./toMarkdownList";
 
 export const misconceptionsPromptPart = ({
diff --git a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/starterQuiz.promptPart.ts b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/starterQuiz.promptPart.ts
index 927e51d93..be125e68d 100644
--- a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/starterQuiz.promptPart.ts
+++ b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/starterQuiz.promptPart.ts
@@ -1,4 +1,4 @@
-import { RawLesson } from "../../zod-schema/zodSchema";
+import type { RawLesson } from "../../zod-schema/zodSchema";
 import { transformQuiz } from "../transformQuiz";
 
 export function starterQuizPromptPart(rawLesson: RawLesson) {
diff --git a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/titleSubjectKeyStage.promptPart.ts b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/titleSubjectKeyStage.promptPart.ts
index 19fdb4319..55bf54313 100644
--- a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/titleSubjectKeyStage.promptPart.ts
+++ b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/titleSubjectKeyStage.promptPart.ts
@@ -1,4 +1,4 @@
-import { RawLesson } from "../../zod-schema/zodSchema";
+import type { RawLesson } from "../../zod-schema/zodSchema";
 
 export const titleSubjectKeyStagePromptPart = ({
   lessonTitle,
diff --git a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/transcript.promptPart.ts b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/transcript.promptPart.ts
index 37ea3b55b..6b035f888 100644
--- a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/transcript.promptPart.ts
+++ b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/transcript.promptPart.ts
@@ -1,4 +1,4 @@
-import { Captions } from "../../zod-schema/zodSchema";
+import type { Captions } from "../../zod-schema/zodSchema";
 
 export const transcriptPromptPart = (
   captions: Captions,
diff --git a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/year.promptPart.ts b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/year.promptPart.ts
index 9425fa1aa..67e61958c 100644
--- a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/year.promptPart.ts
+++ b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/year.promptPart.ts
@@ -1,4 +1,4 @@
-import { RawLesson } from "../../zod-schema/zodSchema";
+import type { RawLesson } from "../../zod-schema/zodSchema";
 
 export const yearPromptPart = ({ yearTitle }: RawLesson) =>
   yearTitle ? `The lesson is intended for ${yearTitle}.` : null;
diff --git a/packages/ingest/src/import-lessons/graphql/client.ts b/packages/ingest/src/import-lessons/graphql/client.ts
index 52ba7e6ab..643f04b58 100644
--- a/packages/ingest/src/import-lessons/graphql/client.ts
+++ b/packages/ingest/src/import-lessons/graphql/client.ts
@@ -5,7 +5,7 @@ if (!process.env.OAK_GRAPHQL_SECRET) {
 }
 
 export const graphqlClient = new GraphQLClient(
-  `https://hasura.thenational.academy/v1/graphql`,
+  "https://hasura.thenational.academy/v1/graphql",
   {
     headers: {
       "x-oak-auth-key": process.env.OAK_GRAPHQL_SECRET,
diff --git a/packages/ingest/src/import-lessons/importLessons.ts b/packages/ingest/src/import-lessons/importLessons.ts
index 85afffb6b..6d14ba1cd 100644
--- a/packages/ingest/src/import-lessons/importLessons.ts
+++ b/packages/ingest/src/import-lessons/importLessons.ts
@@ -3,7 +3,8 @@ import { aiLogger } from "@oakai/logger";
 
 import { IngestError } from "../IngestError";
 import { getDataHash } from "../utils/getDataHash";
-import { RawLesson, RawLessonSchema } from "../zod-schema/zodSchema";
+import type { RawLesson } from "../zod-schema/zodSchema";
+import { RawLessonSchema } from "../zod-schema/zodSchema";
 import { graphqlClient } from "./graphql/client";
 import { query } from "./graphql/query";
 
diff --git a/packages/ingest/src/import-lessons/importLessonsFromCSV.ts b/packages/ingest/src/import-lessons/importLessonsFromCSV.ts
index 0c674e0b0..b503db7a7 100644
--- a/packages/ingest/src/import-lessons/importLessonsFromCSV.ts
+++ b/packages/ingest/src/import-lessons/importLessonsFromCSV.ts
@@ -6,7 +6,8 @@ import fs from "node:fs";
 import { IngestError } from "../IngestError";
 import { chunkAndPromiseAll } from "../utils/chunkAndPromiseAll";
 import { getDataHash } from "../utils/getDataHash";
-import { RawLesson, RawLessonSchema } from "../zod-schema/zodSchema";
+import type { RawLesson} from "../zod-schema/zodSchema";
+import { RawLessonSchema } from "../zod-schema/zodSchema";
 
 const log = aiLogger("ingest");
 
diff --git a/packages/ingest/src/import-lessons/importLessonsFromOakDB.ts b/packages/ingest/src/import-lessons/importLessonsFromOakDB.ts
index 1ba873b0c..c6c3d9132 100644
--- a/packages/ingest/src/import-lessons/importLessonsFromOakDB.ts
+++ b/packages/ingest/src/import-lessons/importLessonsFromOakDB.ts
@@ -1,9 +1,10 @@
 import { prisma } from "@oakai/db";
 
 import { IngestError } from "../IngestError";
-import { IngestLogger } from "../types";
+import type { IngestLogger } from "../types";
 import { getDataHash } from "../utils/getDataHash";
-import { RawLesson, RawLessonSchema } from "../zod-schema/zodSchema";
+import type { RawLesson } from "../zod-schema/zodSchema";
+import { RawLessonSchema } from "../zod-schema/zodSchema";
 import { graphqlClient } from "./graphql/client";
 import { query } from "./graphql/query";
 
diff --git a/packages/ingest/src/openai-batches/batchLineCompletion.ts b/packages/ingest/src/openai-batches/batchLineCompletion.ts
index d71bdc7b0..cfc51634e 100644
--- a/packages/ingest/src/openai-batches/batchLineCompletion.ts
+++ b/packages/ingest/src/openai-batches/batchLineCompletion.ts
@@ -1,4 +1,4 @@
-import { zodResponseFormat } from "openai/helpers/zod";
+import type { zodResponseFormat } from "openai/helpers/zod";
 
 export function batchLineCompletion({
   customId,
diff --git a/packages/ingest/src/openai-batches/handleOpenAiBatchErrorFile.ts b/packages/ingest/src/openai-batches/handleOpenAiBatchErrorFile.ts
index e204a3429..ce17ba4d6 100644
--- a/packages/ingest/src/openai-batches/handleOpenAiBatchErrorFile.ts
+++ b/packages/ingest/src/openai-batches/handleOpenAiBatchErrorFile.ts
@@ -1,9 +1,10 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
-import { Step } from "../db-helpers/step";
+import type { Step } from "../db-helpers/step";
 import { updateLessonsState } from "../db-helpers/updateLessonsState";
 import { jsonlToArray } from "../utils/jsonlToArray";
-import { BatchTask, getLessonIdFromCustomId } from "./customId";
+import type { BatchTask } from "./customId";
+import { getLessonIdFromCustomId } from "./customId";
 import { downloadOpenAiFile } from "./downloadOpenAiFile";
 
 function getStepFromTask(task: BatchTask): Step {
@@ -33,9 +34,16 @@ export async function handleOpenAiBatchErrorFile({
   });
   const text = await file.text();
   const jsonArray = jsonlToArray(text);
-  const lessonIds = jsonArray.map((json) =>
-    getLessonIdFromCustomId(json.custom_id),
-  );
+  const lessonIds = jsonArray
+    .map((json) =>
+      typeof json === "object" &&
+      json !== null &&
+      "custom_id" in json &&
+      typeof json.custom_id === "string"
+        ? getLessonIdFromCustomId(json.custom_id)
+        : undefined,
+    )
+    .filter((lessonId): lessonId is string => lessonId !== undefined);
 
   await updateLessonsState({
     ingestId,
diff --git a/packages/ingest/src/openai-batches/startBatch.ts b/packages/ingest/src/openai-batches/startBatch.ts
index 4569dead4..16e21e12a 100644
--- a/packages/ingest/src/openai-batches/startBatch.ts
+++ b/packages/ingest/src/openai-batches/startBatch.ts
@@ -3,12 +3,11 @@ import { aiLogger } from "@oakai/logger";
 import { splitJsonlByRowsOrSize } from "../utils/splitJsonlByRowsOrSize";
 import { OPEN_AI_BATCH_MAX_ROWS, OPEN_AI_BATCH_MAX_SIZE_MB } from "./constants";
 import { getCustomIdsFromJsonlFile } from "./getCustomIdsFromJsonlFile";
-import {
-  OpenAiBatchSubmitCallback,
-  submitOpenAiBatch,
-} from "./submitOpenAiBatch";
+import type { OpenAiBatchSubmitCallback } from "./submitOpenAiBatch";
+import { submitOpenAiBatch } from "./submitOpenAiBatch";
 import { uploadOpenAiBatchFile } from "./uploadOpenAiBatchFile";
-import { GetBatchFileLine, writeBatchFile } from "./writeBatchFile";
+import type { GetBatchFileLine } from "./writeBatchFile";
+import { writeBatchFile } from "./writeBatchFile";
 
 const log = aiLogger("ingest");
 
diff --git a/packages/ingest/src/openai-batches/submitOpenAiBatch.ts b/packages/ingest/src/openai-batches/submitOpenAiBatch.ts
index deb863666..b8df4bdd6 100644
--- a/packages/ingest/src/openai-batches/submitOpenAiBatch.ts
+++ b/packages/ingest/src/openai-batches/submitOpenAiBatch.ts
@@ -1,4 +1,4 @@
-import { OpenAI } from "openai";
+import type { OpenAI } from "openai";
 
 import { openai } from "./openai";
 
diff --git a/packages/ingest/src/steps/0-start.ts b/packages/ingest/src/steps/0-start.ts
index aa7eccdb0..1754afe6c 100644
--- a/packages/ingest/src/steps/0-start.ts
+++ b/packages/ingest/src/steps/0-start.ts
@@ -1,11 +1,11 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { IngestError } from "../IngestError";
-import { IngestConfig } from "../config/ingestConfig";
+import type { IngestConfig } from "../config/ingestConfig";
 import { createIngestRecord } from "../db-helpers/createIngestRecord";
 import { importLessonsFromCSV } from "../import-lessons/importLessonsFromCSV";
 import { importLessonsFromOakDB } from "../import-lessons/importLessonsFromOakDB";
-import { IngestLogger } from "../types";
+import type { IngestLogger } from "../types";
 
 const config: IngestConfig = {
   completionModel: "gpt-4o-2024-08-06",
@@ -45,7 +45,7 @@ export async function ingestStart({
     case "csv":
       if (config.sourcePartsToInclude !== "title-subject-key-stage") {
         throw new IngestError(
-          `sourcePartsToInclude must be "title-subject-key-stage" when importing from a CSV file`,
+          "sourcePartsToInclude must be title-subject-key-stage when importing from a CSV file",
         );
       }
       await importLessonsFromCSV({
@@ -55,7 +55,7 @@ export async function ingestStart({
       });
       break;
     default:
-      throw new IngestError(`Unsupported source type: ${config.source}`);
+      throw new IngestError("Unsupported source type");
   }
 
   log.info(`Ingest started with id: ${ingestId}`);
diff --git a/packages/ingest/src/steps/1-captions.ts b/packages/ingest/src/steps/1-captions.ts
index 2c022e876..f611b990d 100644
--- a/packages/ingest/src/steps/1-captions.ts
+++ b/packages/ingest/src/steps/1-captions.ts
@@ -1,4 +1,4 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { IngestError } from "../IngestError";
 import { getCaptionsByFileName } from "../captions/getCaptionsByFileName";
@@ -7,10 +7,11 @@ import { createCaptionsRecord } from "../db-helpers/createCaptionsRecord";
 import { createErrorRecord } from "../db-helpers/createErrorRecord";
 import { getIngestById } from "../db-helpers/getIngestById";
 import { loadLessonsAndUpdateState } from "../db-helpers/loadLessonsAndUpdateState";
-import { Step, getPrevStep } from "../db-helpers/step";
+import type { Step } from "../db-helpers/step";
+import { getPrevStep } from "../db-helpers/step";
 import { updateLessonsState } from "../db-helpers/updateLessonsState";
-import { IngestLogger } from "../types";
-import { Captions } from "../zod-schema/zodSchema";
+import type { IngestLogger } from "../types";
+import type { Captions } from "../zod-schema/zodSchema";
 
 const currentStep: Step = "captions_fetch";
 const prevStep = getPrevStep(currentStep);
diff --git a/packages/ingest/src/steps/2-lp-batch-start.ts b/packages/ingest/src/steps/2-lp-batch-start.ts
index 2b3efe80f..2cb66eaa4 100644
--- a/packages/ingest/src/steps/2-lp-batch-start.ts
+++ b/packages/ingest/src/steps/2-lp-batch-start.ts
@@ -1,11 +1,12 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { getIngestById } from "../db-helpers/getIngestById";
 import { loadLessonsAndUpdateState } from "../db-helpers/loadLessonsAndUpdateState";
-import { Step, getPrevStep } from "../db-helpers/step";
+import type { Step} from "../db-helpers/step";
+import { getPrevStep } from "../db-helpers/step";
 import { updateLessonsState } from "../db-helpers/updateLessonsState";
 import { startGenerating } from "../generate-lesson-plans/startGenerating";
-import { IngestLogger } from "../types";
+import type { IngestLogger } from "../types";
 
 const currentStep: Step = "lesson_plan_generation";
 const prevStep = getPrevStep(currentStep);
diff --git a/packages/ingest/src/steps/3-lp-batch-sync.ts b/packages/ingest/src/steps/3-lp-batch-sync.ts
index 7bf8c9620..8b6db42a8 100644
--- a/packages/ingest/src/steps/3-lp-batch-sync.ts
+++ b/packages/ingest/src/steps/3-lp-batch-sync.ts
@@ -1,9 +1,9 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { handleLessonPlanBatchSuccess } from "../generate-lesson-plans/handleLessonPlanBatchSuccess";
 import { handleOpenAiBatchErrorFile } from "../openai-batches/handleOpenAiBatchErrorFile";
 import { retrieveOpenAiBatch } from "../openai-batches/retrieveOpenAiBatch";
-import { IngestLogger } from "../types";
+import type { IngestLogger } from "../types";
 
 /**
  * Check status of lesson plan generation batches and action
diff --git a/packages/ingest/src/steps/4-lp-chunking.ts b/packages/ingest/src/steps/4-lp-chunking.ts
index 1718cf158..f34f11f50 100644
--- a/packages/ingest/src/steps/4-lp-chunking.ts
+++ b/packages/ingest/src/steps/4-lp-chunking.ts
@@ -1,14 +1,13 @@
-import {
-  CompletedLessonPlan,
-  CompletedLessonPlanSchema,
-} from "@oakai/aila/src/protocol/schema";
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { CompletedLessonPlan } from "@oakai/aila/src/protocol/schema";
+import { CompletedLessonPlanSchema } from "@oakai/aila/src/protocol/schema";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { getLessonPlanParts } from "../chunking/getLessonPlanParts";
 import { loadLessonsAndUpdateState } from "../db-helpers/loadLessonsAndUpdateState";
-import { Step, getPrevStep } from "../db-helpers/step";
+import type { Step } from "../db-helpers/step";
+import { getPrevStep } from "../db-helpers/step";
 import { updateLessonsState } from "../db-helpers/updateLessonsState";
-import { IngestLogger } from "../types";
+import type { IngestLogger } from "../types";
 
 const currentStep: Step = "chunking";
 const prevStep = getPrevStep(currentStep);
diff --git a/packages/ingest/src/steps/5-lp-parts-embed-start.ts b/packages/ingest/src/steps/5-lp-parts-embed-start.ts
index 8aea6fb4d..d32a97d27 100644
--- a/packages/ingest/src/steps/5-lp-parts-embed-start.ts
+++ b/packages/ingest/src/steps/5-lp-parts-embed-start.ts
@@ -1,11 +1,12 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { getIngestById } from "../db-helpers/getIngestById";
 import { loadLessonsAndUpdateState } from "../db-helpers/loadLessonsAndUpdateState";
-import { Step, getPrevStep } from "../db-helpers/step";
+import type { Step } from "../db-helpers/step";
+import { getPrevStep } from "../db-helpers/step";
 import { startEmbedding } from "../embedding/startEmbedding";
 import { parseCustomId } from "../openai-batches/customId";
-import { IngestLogger } from "../types";
+import type { IngestLogger } from "../types";
 import { chunkAndPromiseAll } from "../utils/chunkAndPromiseAll";
 
 const currentStep: Step = "embedding";
diff --git a/packages/ingest/src/steps/6-lp-parts-embed-sync.ts b/packages/ingest/src/steps/6-lp-parts-embed-sync.ts
index 69727ab22..8940465d8 100644
--- a/packages/ingest/src/steps/6-lp-parts-embed-sync.ts
+++ b/packages/ingest/src/steps/6-lp-parts-embed-sync.ts
@@ -1,9 +1,9 @@
-import { PrismaClientWithAccelerate } from "@oakai/db";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { handleEmbeddingBatchSuccess } from "../embedding/handleEmbeddingBatchSuccess";
 import { handleOpenAiBatchErrorFile } from "../openai-batches/handleOpenAiBatchErrorFile";
 import { retrieveOpenAiBatch } from "../openai-batches/retrieveOpenAiBatch";
-import { IngestLogger } from "../types";
+import type { IngestLogger } from "../types";
 
 /**
  * Check status of lesson plan generation batches and action
diff --git a/packages/ingest/src/types.ts b/packages/ingest/src/types.ts
index 66f91c873..469453d9f 100644
--- a/packages/ingest/src/types.ts
+++ b/packages/ingest/src/types.ts
@@ -1,4 +1,4 @@
-import { StructuredLogger } from "@oakai/logger";
+import type { StructuredLogger } from "@oakai/logger";
 
 export type IngestLogger = {
   info: (...args: unknown[]) => void;
diff --git a/packages/logger/index.ts b/packages/logger/index.ts
index 4d3238a44..fcc81e334 100644
--- a/packages/logger/index.ts
+++ b/packages/logger/index.ts
@@ -1,9 +1,13 @@
 import debug from "debug";
+import invariant from "tiny-invariant";
 
-import structuredLogger, { StructuredLogger } from "./structuredLogger";
+import browserLogger from "./browser";
+import type { StructuredLogger } from "./structuredLogger";
+import structuredLogger from "./structuredLogger";
 
 if (typeof window !== "undefined") {
-  debug.enable("ai:*");
+  invariant(process.env.NEXT_PUBLIC_DEBUG, "NEXT_PUBLIC_DEBUG is not set");
+  debug.enable(process.env.NEXT_PUBLIC_DEBUG);
 }
 
 const debugBase = debug("ai");
@@ -14,13 +18,16 @@ type ChildKey =
   | "admin"
   | "aila"
   | "aila:analytics"
+  | "aila:categorisation"
   | "aila:errors"
+  | "aila:lesson"
   | "aila:llm"
   | "aila:moderation"
   | "aila:moderation:response"
   | "aila:persistence"
   | "aila:prompt"
   | "aila:protocol"
+  | "aila:stream"
   | "aila:rag"
   | "aila:testing"
   | "analytics"
@@ -53,6 +60,11 @@ type ChildKey =
   | "trpc"
   | "ui";
 
+const errorLogger =
+  typeof window === "undefined"
+    ? structuredLogger.error.bind(structuredLogger)
+    : browserLogger.error.bind(browserLogger);
+
 /**
  * The AI logger uses namespaces so that we can selectively toggle noisy logs.
  * Logs are selected with the DEBUG environment variable.
@@ -73,7 +85,7 @@ export function aiLogger(childKey: ChildKey) {
   return {
     info: debugLogger,
     warn: debugLogger,
-    error: structuredLogger.error.bind(structuredLogger),
+    error: errorLogger.bind(structuredLogger),
   };
 }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7003340a9..d2cd61e20 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -44,6 +44,9 @@ importers:
       eslint-config-custom:
         specifier: 0.0.0
         version: link:packages/eslint-config-custom
+      eslint-plugin-turbo:
+        specifier: ^2.2.3
+        version: 2.2.3(eslint@8.56.0)
       husky:
         specifier: ^8.0.3
         version: 8.0.3
@@ -58,7 +61,7 @@ importers:
         version: 8.4.35
       prettier:
         specifier: ^3.1.1
-        version: 3.2.5
+        version: 3.3.3
       semantic-release:
         specifier: ^21.1.1
         version: 21.1.2(typescript@5.3.3)
@@ -159,8 +162,8 @@ importers:
         specifier: ^6.21.3
         version: 6.21.3
       '@sentry/nextjs':
-        specifier: ^8.19.0
-        version: 8.19.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.52.1)(@opentelemetry/sdk-trace-base@1.26.0)(next@14.2.5)(react@18.2.0)(webpack@5.93.0)
+        specifier: ^8.35.0
+        version: 8.35.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.53.0)(@opentelemetry/sdk-trace-base@1.26.0)(next@14.2.5)(react@18.2.0)(webpack@5.93.0)
       '@storybook/testing-react':
         specifier: ^2.0.1
         version: 2.0.1(@storybook/client-logger@7.6.20)(@storybook/preview-api@7.6.20)(@storybook/react@8.2.7)(@storybook/types@7.6.20)(react@18.2.0)
@@ -439,8 +442,8 @@ importers:
         specifier: ^8.56.0
         version: 8.56.0
       eslint-config-next:
-        specifier: 14.0.4
-        version: 14.0.4(eslint@8.56.0)(typescript@5.3.3)
+        specifier: 15.0.1
+        version: 15.0.1(eslint@8.56.0)(typescript@5.3.3)
       eslint-plugin-storybook:
         specifier: ^0.8.0
         version: 0.8.0(eslint@8.56.0)(typescript@5.3.3)
@@ -487,8 +490,8 @@ importers:
         specifier: '*'
         version: link:../logger
       '@sentry/nextjs':
-        specifier: ^8.19.0
-        version: 8.19.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.52.1)(@opentelemetry/sdk-trace-base@1.26.0)(next@14.2.5)(react@18.2.0)(webpack@5.93.0)
+        specifier: ^8.35.0
+        version: 8.35.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.53.0)(@opentelemetry/sdk-trace-base@1.26.0)(next@14.2.5)(react@18.2.0)(webpack@5.93.0)
       '@vercel/kv':
         specifier: ^0.2.2
         version: 0.2.2
@@ -547,6 +550,9 @@ importers:
       eslint:
         specifier: ^8.56.0
         version: 8.56.0
+      eslint-plugin-turbo:
+        specifier: ^2.2.3
+        version: 2.2.3(eslint@8.56.0)
       jest:
         specifier: ^29.7.0
         version: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
@@ -773,30 +779,33 @@ importers:
         specifier: ^7.18.0
         version: 7.18.0(typescript@5.3.3)
       eslint-config-next:
-        specifier: 14.0.4
-        version: 14.0.4(eslint@8.56.0)(typescript@5.3.3)
-      eslint-config-prettier:
-        specifier: ^9.1.0
-        version: 9.1.0(eslint@8.56.0)
+        specifier: 15.0.1
+        version: 15.0.1(eslint@8.56.0)(typescript@5.3.3)
       eslint-plugin-jest:
-        specifier: ^27.6.0
-        version: 27.9.0(@typescript-eslint/eslint-plugin@7.18.0)(eslint@8.56.0)(typescript@5.3.3)
+        specifier: ^28.8.3
+        version: 28.8.3(@typescript-eslint/eslint-plugin@7.18.0)(eslint@8.56.0)(typescript@5.3.3)
       eslint-plugin-react:
-        specifier: ^7.33.2
-        version: 7.33.2(eslint@8.56.0)
+        specifier: ^7.37.2
+        version: 7.37.2(eslint@8.56.0)
       eslint-plugin-react-hooks:
-        specifier: ^4.5.0
-        version: 4.6.0(eslint@8.56.0)
+        specifier: ^5.0.0
+        version: 5.0.0(eslint@8.56.0)
       eslint-plugin-turbo:
-        specifier: ^1.11.2
-        version: 1.12.4(eslint@8.56.0)
+        specifier: ^2.2.3
+        version: 2.2.3(eslint@8.56.0)
     devDependencies:
       eslint:
         specifier: ^8.56.0
         version: 8.56.0
+      eslint-config-prettier:
+        specifier: ^9.1.0
+        version: 9.1.0(eslint@8.56.0)
+      eslint-plugin-prettier:
+        specifier: ^5.2.1
+        version: 5.2.1(eslint-config-prettier@9.1.0)(eslint@8.56.0)(prettier@3.3.3)
       prettier:
         specifier: ^3.1.1
-        version: 3.2.5
+        version: 3.3.3
       typescript:
         specifier: 5.3.3
         version: 5.3.3
@@ -2587,6 +2596,7 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.14.1
+    dev: false
 
   /@babel/runtime@7.23.9:
     resolution: {integrity: sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==}
@@ -3264,7 +3274,6 @@ packages:
   /@eslint-community/regexpp@4.11.0:
     resolution: {integrity: sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
-    dev: false
 
   /@eslint-community/regexpp@4.6.2:
     resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
@@ -4941,10 +4950,10 @@ packages:
   /@next/env@14.2.5:
     resolution: {integrity: sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA==}
 
-  /@next/eslint-plugin-next@14.0.4:
-    resolution: {integrity: sha512-U3qMNHmEZoVmHA0j/57nRfi3AscXNvkOnxDmle/69Jz/G0o/gWjXTDdlgILZdrxQ0Lw/jv2mPW8PGy0EGIHXhQ==}
+  /@next/eslint-plugin-next@15.0.1:
+    resolution: {integrity: sha512-bKWsMaGPbiFAaGqrDJvbE8b4Z0uKicGVcgOI77YM2ui3UfjHMr4emFPrZTLeZVchi7fT1mooG2LxREfUUClIKw==}
     dependencies:
-      glob: 7.1.7
+      fast-glob: 3.3.1
 
   /@next/swc-darwin-arm64@14.2.5:
     resolution: {integrity: sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==}
@@ -5190,6 +5199,13 @@ packages:
       '@opentelemetry/api': 1.9.0
     dev: false
 
+  /@opentelemetry/api-logs@0.53.0:
+    resolution: {integrity: sha512-8HArjKx+RaAI8uEIgcORbZIPklyh1YLjPSBus8hjRmvLi6DeFzgOcdZ7KwPabKj8mXF8dX0hyfAyGfycz0DbFw==}
+    engines: {node: '>=14'}
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+    dev: false
+
   /@opentelemetry/api@1.8.0:
     resolution: {integrity: sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==}
     engines: {node: '>=8.0.0'}
@@ -5238,243 +5254,331 @@ packages:
       '@opentelemetry/semantic-conventions': 1.27.0
     dev: false
 
-  /@opentelemetry/instrumentation-connect@0.38.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-2/nRnx3pjYEmdPIaBwtgtSviTKHWnDZN3R+TkRUnhIVrvBKVcq+I5B2rtd6mr6Fe9cHlZ9Ojcuh7pkNh/xdWWg==}
+  /@opentelemetry/instrumentation-amqplib@0.42.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-fiuU6OKsqHJiydHWgTRQ7MnIrJ2lEqsdgFtNIH4LbAUJl/5XmrIeoDzDnox+hfkgWK65jsleFuQDtYb5hW1koQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.27.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@opentelemetry/instrumentation-connect@0.39.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-pGBiKevLq7NNglMgqzmeKczF4XQMTOUOTkK8afRHMZMnrK3fcETyTH7lVaSozwiOM3Ws+SuEmXZT7DYrrhxGlg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
       '@types/connect': 3.4.36
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-express@0.41.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-/B7fbMdaf3SYe5f1P973tkqd6s7XZirjpfkoJ63E7nltU30qmlgm9tY5XwZOzAFI0rHS9tbrFI2HFPAvQUFe/A==}
+  /@opentelemetry/instrumentation-dataloader@0.12.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-pnPxatoFE0OXIZDQhL2okF//dmbiWFzcSc8pUg9TqofCLYZySSxDCgQc69CJBo5JnI3Gz1KP+mOjS4WAeRIH4g==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@opentelemetry/instrumentation-express@0.43.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-bxTIlzn9qPXJgrhz8/Do5Q3jIlqfpoJrSUtVGqH+90eM1v2PkPHc+SdE+zSqe4q9Y1UQJosmZ4N4bm7Zj/++MA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-fastify@0.38.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-HBVLpTSYpkQZ87/Df3N0gAw7VzYZV3n28THIBrJWfuqw3Or7UqdhnjeuMIPQ04BKk3aZc0cWn2naSQObbh5vXw==}
+  /@opentelemetry/instrumentation-fastify@0.40.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-74qj4nG3zPtU7g2x4sm2T4R3/pBMyrYstTsqSZwdlhQk1SD4l8OSY9sPRX1qkhfxOuW3U4KZQAV/Cymb3fB6hg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-graphql@0.42.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-N8SOwoKL9KQSX7z3gOaw5UaTeVQcfDO1c21csVHnmnmGUoqsXbArK2B8VuwPWcv6/BC/i3io+xTo7QGRZ/z28Q==}
+  /@opentelemetry/instrumentation-fs@0.15.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-JWVKdNLpu1skqZQA//jKOcKdJC66TWKqa2FUFq70rKohvaSq47pmXlnabNO+B/BvLfmidfiaN35XakT5RyMl2Q==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-hapi@0.40.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-8U/w7Ifumtd2bSN1OLaSwAAFhb9FyqWUki3lMMB0ds+1+HdSxYBe9aspEJEgvxAqOkrQnVniAPTEGf1pGM7SOw==}
+  /@opentelemetry/instrumentation-generic-pool@0.39.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-y4v8Y+tSfRB3NNBvHjbjrn7rX/7sdARG7FuK6zR8PGb28CTa0kHpEGCJqvL9L8xkTNvTXo+lM36ajFGUaK1aNw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@opentelemetry/instrumentation-graphql@0.43.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-aI3YMmC2McGd8KW5du1a2gBA0iOMOGLqg4s9YjzwbjFwjlmMNFSK1P3AIg374GWg823RPUGfVTIgZ/juk9CVOA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@opentelemetry/instrumentation-hapi@0.41.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-jKDrxPNXDByPlYcMdZjNPYCvw0SQJjN+B1A+QH+sx+sAHsKSAf9hwFiJSrI6C4XdOls43V/f/fkp9ITkHhKFbQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-http@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-dG/aevWhaP+7OLv4BQQSEKMJv8GyeOp3Wxl31NHqE8xo9/fYMfEljiZphUHIfyg4gnZ9swMyWjfOQs5GUQe54Q==}
+  /@opentelemetry/instrumentation-http@0.53.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-H74ErMeDuZfj7KgYCTOFGWF5W9AfaPnqLQQxeFq85+D29wwV2yqHbz2IKLYpkOh7EI6QwDEl7rZCIxjJLyc/CQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.25.1
-      semver: 7.6.2
+      '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.27.0
+      semver: 7.6.3
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-ioredis@0.42.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-P11H168EKvBB9TUSasNDOGJCSkpT44XgoM6d3gRIWAa9ghLpYhl0uRkS8//MqPzcJVHr3h3RmfXIpiYLjyIZTw==}
+  /@opentelemetry/instrumentation-ioredis@0.43.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-i3Dke/LdhZbiUAEImmRG3i7Dimm/BD7t8pDDzwepSvIQ6s2X6FPia7561gw+64w+nx0+G9X14D7rEfaMEmmjig==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/redis-common': 0.36.2
       '@opentelemetry/semantic-conventions': 1.27.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-koa@0.42.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-H1BEmnMhho8o8HuNRq5zEI4+SIHDIglNB7BPKohZyWG4fWNuR7yM4GTlR01Syq21vODAS7z5omblScJD/eZdKw==}
+  /@opentelemetry/instrumentation-kafkajs@0.3.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-UnkZueYK1ise8FXQeKlpBd7YYUtC7mM8J0wzUSccEfc/G8UqHQqAzIyYCUOUPUKp8GsjLnWOOK/3hJc4owb7Jg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.27.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@opentelemetry/instrumentation-koa@0.43.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-lDAhSnmoTIN6ELKmLJBplXzT/Jqs5jGZehuG22EdSMaTwgjMpxMDI1YtlKEhiWPWkrz5LUsd0aOO0ZRc9vn3AQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-mongodb@0.46.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-VF/MicZ5UOBiXrqBslzwxhN7TVqzu1/LN/QDpkskqM0Zm0aZ4CVRbUygL8d7lrjLn15x5kGIe8VsSphMfPJzlA==}
+  /@opentelemetry/instrumentation-lru-memoizer@0.40.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-21xRwZsEdMPnROu/QsaOIODmzw59IYpGFmuC4aFWvMj6stA8+Ei1tX67nkarJttlNjoM94um0N4X26AD7ff54A==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@opentelemetry/instrumentation-mongodb@0.47.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-yqyXRx2SulEURjgOQyJzhCECSh5i1uM49NUaq9TqLd6fA7g26OahyJfsr9NE38HFqGRHpi4loyrnfYGdrsoVjQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-metrics': 1.25.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-mongoose@0.40.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-niRi5ZUnkgzRhIGMOozTyoZIvJKNJyhijQI4nF4iFSb+FUx2v5fngfR+8XLmdQAO7xmsD8E5vEGdDVYVtKbZew==}
+  /@opentelemetry/instrumentation-mongoose@0.42.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-AnWv+RaR86uG3qNEMwt3plKX1ueRM7AspfszJYVkvkehiicC3bHQA6vWdb6Zvy5HAE14RyFbu9+2hUUjR2NSyg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-mysql2@0.40.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-0xfS1xcqUmY7WE1uWjlmI67Xg3QsSUlNT+AcXHeA4BDUPwZtWqF4ezIwLgpVZfHOnkAEheqGfNSWd1PIu3Wnfg==}
+  /@opentelemetry/instrumentation-mysql2@0.41.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-REQB0x+IzVTpoNgVmy5b+UnH1/mDByrneimP6sbDHkp1j8QOl1HyWOrBH/6YWR0nrbU3l825Em5PlybjT3232g==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
       '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-mysql@0.40.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-d7ja8yizsOCNMYIJt5PH/fKZXjb/mS48zLROO4BzZTtDfhNCl2UM/9VIomP2qkGIFVouSJrGr/T00EzY7bPtKA==}
+  /@opentelemetry/instrumentation-mysql@0.41.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-jnvrV6BsQWyHS2qb2fkfbfSb1R/lmYwqEZITwufuRl37apTopswu9izc0b1CYRp/34tUG/4k/V39PND6eyiNvw==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
-      '@types/mysql': 2.15.22
+      '@types/mysql': 2.15.26
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-nestjs-core@0.39.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-mewVhEXdikyvIZoMIUry8eb8l3HUjuQjSjVbmLVTt4NQi35tkpnHQrG9bTRBrl3403LoWZ2njMPJyg4l6HfKvA==}
+  /@opentelemetry/instrumentation-nestjs-core@0.40.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-WF1hCUed07vKmf5BzEkL0wSPinqJgH7kGzOjjMAiTGacofNXjb/y4KQ8loj2sNsh5C/NN7s1zxQuCgbWbVTGKg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-pg@0.43.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-og23KLyoxdnAeFs1UWqzSonuCkePUzCX30keSYigIzJe/6WSYA8rnEI5lobcxPEzg+GcU06J7jzokuEHbjVJNw==}
+  /@opentelemetry/instrumentation-pg@0.44.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-oTWVyzKqXud1BYEGX1loo2o4k4vaU1elr3vPO8NZolrBtFvQ34nx4HgUaexUDuEog00qQt+MLR5gws/p+JXMLQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
       '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
       '@types/pg': 8.6.1
-      '@types/pg-pool': 2.0.4
+      '@types/pg-pool': 2.0.6
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation-redis-4@0.41.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-H7IfGTqW2reLXqput4yzAe8YpDC0fmVNal95GHMLOrS89W+qWUKIqxolSh63hJyfmwPSFwXASzj7wpSk8Az+Dg==}
+  /@opentelemetry/instrumentation-redis-4@0.42.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-NaD+t2JNcOzX/Qa7kMy68JbmoVIV37fT/fJYzLKu2Wwd+0NCxt+K2OOsOakA8GVg8lSpFdbx4V/suzZZ2Pvdjg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/redis-common': 0.36.2
       '@opentelemetry/semantic-conventions': 1.27.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@opentelemetry/instrumentation@0.46.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-a9TijXZZbk0vI5TGLZl+0kxyFfrXHhX6Svtz7Pp2/VBlCSKrazuULEyoJQrOknJyFWNMEmbbJgOciHCCpQcisw==}
+  /@opentelemetry/instrumentation-undici@0.6.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-ABJBhm5OdhGmbh0S/fOTE4N69IZ00CsHC5ijMYfzbw3E5NwLgpQk5xsljaECrJ8wz1SfXbO03FiSuu5AyRAkvQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.7.0
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==}
     engines: {node: '>=14'}
-    requiresBuild: true
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.52.1
       '@types/shimmer': 1.2.0
-      import-in-the-middle: 1.7.1
+      import-in-the-middle: 1.10.0
       require-in-the-middle: 7.3.0
       semver: 7.6.3
       shimmer: 1.2.1
     transitivePeerDependencies:
       - supports-color
     dev: false
-    optional: true
 
-  /@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==}
+  /@opentelemetry/instrumentation@0.53.0(@opentelemetry/api@1.9.0):
+    resolution: {integrity: sha512-DMwg0hy4wzf7K73JJtl95m/e0boSoWhH07rfvHvYzQtBD3Bmv0Wc1x733vyZBqmFm8OjJD0/pfiUg1W3JjFX0A==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.52.1
+      '@opentelemetry/api-logs': 0.53.0
       '@types/shimmer': 1.2.0
       import-in-the-middle: 1.10.0
       require-in-the-middle: 7.3.0
@@ -5588,6 +5692,11 @@ packages:
     dev: false
     optional: true
 
+  /@pkgr/core@0.1.1:
+    resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==}
+    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
+    dev: true
+
   /@pkgr/utils@2.3.1:
     resolution: {integrity: sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
@@ -5833,8 +5942,8 @@ packages:
     dependencies:
       '@prisma/debug': 5.21.1
 
-  /@prisma/instrumentation@5.17.0:
-    resolution: {integrity: sha512-c1Sle4ji8aasMcYfBBHFM56We4ljfenVtRmS8aY06BllS7SoU6SmJBwG7vil+GHiR0Yrh+t9iBwt4AY0Jr4KNQ==}
+  /@prisma/instrumentation@5.19.1:
+    resolution: {integrity: sha512-VLnzMQq7CWroL5AeaW0Py2huiNKeoMfCH3SUxstdzPrlWQi6UQ9UrfcbUkNHlVFqOMacqy8X/8YtE0kuKDpD9w==}
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
@@ -7395,7 +7504,7 @@ packages:
     resolution: {integrity: sha512-Javneu5lsuhwNCryN+pXH93VPQ8g0dBX7wItHFgYiwQmzE1sVdg5tWHiOgHywzL2W21XQopa7IwIEnNbmeUJYA==}
     dev: true
 
-  /@rollup/plugin-commonjs@26.0.1(rollup@3.29.4):
+  /@rollup/plugin-commonjs@26.0.1(rollup@3.29.5):
     resolution: {integrity: sha512-UnsKoZK6/aGIH6AdkptXhNvhaqftcjq3zZdT+LY5Ftms6JR06nADcDsYp5hTU9E2lbJUEOhdlY5J4DNTneM+jQ==}
     engines: {node: '>=16.0.0 || 14 >= 14.17'}
     peerDependencies:
@@ -7404,16 +7513,16 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
+      '@rollup/pluginutils': 5.1.0(rollup@3.29.5)
       commondir: 1.0.1
       estree-walker: 2.0.2
       glob: 10.4.5
       is-reference: 1.2.1
       magic-string: 0.30.10
-      rollup: 3.29.4
+      rollup: 3.29.5
     dev: false
 
-  /@rollup/pluginutils@5.1.0(rollup@3.29.4):
+  /@rollup/pluginutils@5.1.0(rollup@3.29.5):
     resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -7425,11 +7534,18 @@ packages:
       '@types/estree': 1.0.5
       estree-walker: 2.0.2
       picomatch: 2.3.1
-      rollup: 3.29.4
+      rollup: 3.29.5
     dev: false
 
+  /@rtsao/scc@1.1.0:
+    resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
+
+  /@rushstack/eslint-patch@1.10.4:
+    resolution: {integrity: sha512-WJgX9nzTqknM393q1QJDJmoW28kUfEnybeTfVNcNAPnIx210RXm2DiXiHzfNPJNIUUb1tJnz/l4QGtJ30PgWmA==}
+
   /@rushstack/eslint-patch@1.7.2:
     resolution: {integrity: sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA==}
+    dev: false
 
   /@sanity/client@6.21.3:
     resolution: {integrity: sha512-oE2+4kKRTZhFCc4IIsojkzKF0jIhsSYSRxkPZjScZ1k/EQ3Y2tEcQYiKwvvotzaXoaWsIL3RTpulE+R4iBYiBw==}
@@ -7598,47 +7714,42 @@ packages:
       - supports-color
     dev: false
 
-  /@sentry-internal/browser-utils@8.19.0:
-    resolution: {integrity: sha512-kM/2KlikKuBR63nFi2q7MGS3V9K9hakjvUknhr/jHZqDVfEuBKmp1ZlHFAdJtglKHHJy07gPj/XqDH7BbYh5yg==}
+  /@sentry-internal/browser-utils@8.35.0:
+    resolution: {integrity: sha512-uj9nwERm7HIS13f/Q52hF/NUS5Al8Ma6jkgpfYGeppYvU0uSjPkwMogtqoJQNbOoZg973tV8qUScbcWY616wNA==}
     engines: {node: '>=14.18'}
     dependencies:
-      '@sentry/core': 8.19.0
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
+      '@sentry/core': 8.35.0
+      '@sentry/types': 8.35.0
+      '@sentry/utils': 8.35.0
     dev: false
 
-  /@sentry-internal/feedback@8.19.0:
-    resolution: {integrity: sha512-Jc77H8fEaGcBhERc2U/o7Q8CZHvlZLT9vAlzq0ZZR20v/1vwYcJW1ysKfTuvmw22hCR6ukhFNl6pqJocXFVhvA==}
+  /@sentry-internal/feedback@8.35.0:
+    resolution: {integrity: sha512-7bjSaUhL0bDArozre6EiIhhdWdT/1AWNWBC1Wc5w1IxEi5xF7nvF/FfvjQYrONQzZAI3HRxc45J2qhLUzHBmoQ==}
     engines: {node: '>=14.18'}
     dependencies:
-      '@sentry/core': 8.19.0
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
+      '@sentry/core': 8.35.0
+      '@sentry/types': 8.35.0
+      '@sentry/utils': 8.35.0
     dev: false
 
-  /@sentry-internal/replay-canvas@8.19.0:
-    resolution: {integrity: sha512-l4pKJDHrXEctxrK7Xme/+fKToXpGwr/G2t77BzeE1WEw9LwSwADz/hi8HoMdZzuKWriM2BNbz20tpVS84sODxA==}
+  /@sentry-internal/replay-canvas@8.35.0:
+    resolution: {integrity: sha512-TUrH6Piv19kvHIiRyIuapLdnuwxk/Un/l1WDCQfq7mK9p1Pac0FkQ7Uufjp6zY3lyhDDZQ8qvCS4ioCMibCwQg==}
     engines: {node: '>=14.18'}
     dependencies:
-      '@sentry-internal/replay': 8.19.0
-      '@sentry/core': 8.19.0
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
+      '@sentry-internal/replay': 8.35.0
+      '@sentry/core': 8.35.0
+      '@sentry/types': 8.35.0
+      '@sentry/utils': 8.35.0
     dev: false
 
-  /@sentry-internal/replay@8.19.0:
-    resolution: {integrity: sha512-EW9e1J6XbqXUXQST1AfSIzT9O8OwPyeFOkhkn9/gqOQv08TJvQEIBtWJEoJS+XFMEUuB8IqIzVWNVko/DnGt9A==}
+  /@sentry-internal/replay@8.35.0:
+    resolution: {integrity: sha512-3wkW03vXYMyWtTLxl9yrtkV+qxbnKFgfASdoGWhXzfLjycgT6o4/04eb3Gn71q9aXqRwH17ISVQbVswnRqMcmA==}
     engines: {node: '>=14.18'}
     dependencies:
-      '@sentry-internal/browser-utils': 8.19.0
-      '@sentry/core': 8.19.0
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
-    dev: false
-
-  /@sentry/babel-plugin-component-annotate@2.20.1:
-    resolution: {integrity: sha512-4mhEwYTK00bIb5Y9UWIELVUfru587Vaeg0DQGswv4aIRHIiMKLyNqCEejaaybQ/fNChIZOKmvyqXk430YVd7Qg==}
-    engines: {node: '>= 14'}
+      '@sentry-internal/browser-utils': 8.35.0
+      '@sentry/core': 8.35.0
+      '@sentry/types': 8.35.0
+      '@sentry/utils': 8.35.0
     dev: false
 
   /@sentry/babel-plugin-component-annotate@2.21.1:
@@ -7646,25 +7757,30 @@ packages:
     engines: {node: '>= 14'}
     dev: true
 
-  /@sentry/browser@8.19.0:
-    resolution: {integrity: sha512-ZC1HxIFm4TIGONyy9MkPG6Dw8IAhzq43t5mq9PqrB1ehuWj8GX6Vk3E26kuc2sydAm4AXbj0562OmvZHsAJpUA==}
+  /@sentry/babel-plugin-component-annotate@2.22.3:
+    resolution: {integrity: sha512-OlHA+i+vnQHRIdry4glpiS/xTOtgjmpXOt6IBOUqynx5Jd/iK1+fj+t8CckqOx9wRacO/hru2wfW/jFq0iViLg==}
+    engines: {node: '>= 14'}
+    dev: false
+
+  /@sentry/browser@8.35.0:
+    resolution: {integrity: sha512-WHfI+NoZzpCsmIvtr6ChOe7yWPLQyMchPnVhY3Z4UeC70bkYNdKcoj/4XZbX3m0D8+71JAsm0mJ9s9OC3Ue6MQ==}
     engines: {node: '>=14.18'}
     dependencies:
-      '@sentry-internal/browser-utils': 8.19.0
-      '@sentry-internal/feedback': 8.19.0
-      '@sentry-internal/replay': 8.19.0
-      '@sentry-internal/replay-canvas': 8.19.0
-      '@sentry/core': 8.19.0
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
+      '@sentry-internal/browser-utils': 8.35.0
+      '@sentry-internal/feedback': 8.35.0
+      '@sentry-internal/replay': 8.35.0
+      '@sentry-internal/replay-canvas': 8.35.0
+      '@sentry/core': 8.35.0
+      '@sentry/types': 8.35.0
+      '@sentry/utils': 8.35.0
     dev: false
 
-  /@sentry/bundler-plugin-core@2.20.1:
-    resolution: {integrity: sha512-6ipbmGzHekxeRCbp7eoefr6bdd/lW4cNA9eNnrmd9+PicubweGaZZbH2NjhFHsaxzgOezwipDHjrTaap2kTHgw==}
+  /@sentry/bundler-plugin-core@2.21.1:
+    resolution: {integrity: sha512-F8FdL/bS8cy1SY1Gw0Mfo3ROTqlrq9Lvt5QGvhXi22dpVcDkWmoTWE2k+sMEnXOa8SdThMc/gyC8lMwHGd3kFQ==}
     engines: {node: '>= 14'}
     dependencies:
       '@babel/core': 7.24.5
-      '@sentry/babel-plugin-component-annotate': 2.20.1
+      '@sentry/babel-plugin-component-annotate': 2.21.1
       '@sentry/cli': 2.33.0
       dotenv: 16.4.5
       find-up: 5.0.0
@@ -7674,15 +7790,15 @@ packages:
     transitivePeerDependencies:
       - encoding
       - supports-color
-    dev: false
+    dev: true
 
-  /@sentry/bundler-plugin-core@2.21.1:
-    resolution: {integrity: sha512-F8FdL/bS8cy1SY1Gw0Mfo3ROTqlrq9Lvt5QGvhXi22dpVcDkWmoTWE2k+sMEnXOa8SdThMc/gyC8lMwHGd3kFQ==}
+  /@sentry/bundler-plugin-core@2.22.3:
+    resolution: {integrity: sha512-DeoUl0WffcqZZRl5Wy9aHvX4WfZbbWt0QbJ7NJrcEViq+dRAI2FQTYECFLwdZi5Gtb3oyqZICO+P7k8wDnzsjQ==}
     engines: {node: '>= 14'}
     dependencies:
       '@babel/core': 7.24.5
-      '@sentry/babel-plugin-component-annotate': 2.21.1
-      '@sentry/cli': 2.33.0
+      '@sentry/babel-plugin-component-annotate': 2.22.3
+      '@sentry/cli': 2.38.0
       dotenv: 16.4.5
       find-up: 5.0.0
       glob: 9.3.5
@@ -7691,13 +7807,22 @@ packages:
     transitivePeerDependencies:
       - encoding
       - supports-color
-    dev: true
+    dev: false
 
   /@sentry/cli-darwin@2.33.0:
     resolution: {integrity: sha512-LQFvD7uCOQ2P/vYru7IBKqJDHwJ9Rr2vqqkdjbxe2YCQS/N3NPXvi3eVM9hDJ284oyV/BMZ5lrmVTuIicf/hhw==}
     engines: {node: '>=10'}
     os: [darwin]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@sentry/cli-darwin@2.38.0:
+    resolution: {integrity: sha512-OvOaV9Vg4+b9ObK2z1oFj3zbRoqOSpD/wSz9t/mtSWwMQi7wlUXj88XGGsL5ZwF7VGBYL+kX59X3Ygl+dHFPlg==}
+    engines: {node: '>=10'}
+    os: [darwin]
+    requiresBuild: true
+    dev: false
     optional: true
 
   /@sentry/cli-linux-arm64@2.33.0:
@@ -7706,6 +7831,16 @@ packages:
     cpu: [arm64]
     os: [linux, freebsd]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@sentry/cli-linux-arm64@2.38.0:
+    resolution: {integrity: sha512-oUiRTyek0Ixe30zoqNlEFsLY07B9hK3FRXKv5lw341rim9PiTteh5tk5ewpuD63K+QjbEAJqp4f3zM19DEASlg==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux, freebsd]
+    requiresBuild: true
+    dev: false
     optional: true
 
   /@sentry/cli-linux-arm@2.33.0:
@@ -7714,6 +7849,16 @@ packages:
     cpu: [arm]
     os: [linux, freebsd]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@sentry/cli-linux-arm@2.38.0:
+    resolution: {integrity: sha512-lXMSEX1Sv9F2wXnnAlsS+kwy09iLQTfK10n08xzeJLIvUCLua/OFInwH6WUxNT3tIBPfBVQZPR7iQMRycH4Ilw==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux, freebsd]
+    requiresBuild: true
+    dev: false
     optional: true
 
   /@sentry/cli-linux-i686@2.33.0:
@@ -7722,6 +7867,16 @@ packages:
     cpu: [x86, ia32]
     os: [linux, freebsd]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@sentry/cli-linux-i686@2.38.0:
+    resolution: {integrity: sha512-+luFmbQymDON16O7R/A7bmnkUjtnq1nRSehnnRJjuFCtDABCKatZzBjWvan0KNgzHhCquMSvEqHKzfVSptHeHw==}
+    engines: {node: '>=10'}
+    cpu: [x86, ia32]
+    os: [linux, freebsd]
+    requiresBuild: true
+    dev: false
     optional: true
 
   /@sentry/cli-linux-x64@2.33.0:
@@ -7730,6 +7885,16 @@ packages:
     cpu: [x64]
     os: [linux, freebsd]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@sentry/cli-linux-x64@2.38.0:
+    resolution: {integrity: sha512-yY593xXbf2W+afyHKDvO4QJwoWQX97/K0NYUAqnpg3TVmIfLV9DNVid+M1w6vKIif6n8UQgAFWtR1Ys4P75mBg==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux, freebsd]
+    requiresBuild: true
+    dev: false
     optional: true
 
   /@sentry/cli-win32-i686@2.33.0:
@@ -7738,6 +7903,16 @@ packages:
     cpu: [x86, ia32]
     os: [win32]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@sentry/cli-win32-i686@2.38.0:
+    resolution: {integrity: sha512-ipDnBvXaMqi0ZbkT/pqB11F4AaicVz5YRoidn5oxi1IJPDUd8qF0mnqabALLH3mAd5TOtKBliY5pllCFG/TvzA==}
+    engines: {node: '>=10'}
+    cpu: [x86, ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: false
     optional: true
 
   /@sentry/cli-win32-x64@2.33.0:
@@ -7746,6 +7921,16 @@ packages:
     cpu: [x64]
     os: [win32]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@sentry/cli-win32-x64@2.38.0:
+    resolution: {integrity: sha512-NqlKOqNF8i239mygARkNZK9BPzwWK91j+HPEfCKoHsZKHeBT1JauoipgPykO21qn04erq5pJkA0MsiuNRNQnMA==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: false
     optional: true
 
   /@sentry/cli@2.33.0:
@@ -7770,40 +7955,66 @@ packages:
     transitivePeerDependencies:
       - encoding
       - supports-color
+    dev: true
 
-  /@sentry/core@8.19.0:
-    resolution: {integrity: sha512-MrgjsZCEjOJgQjIznnDSrLEy7qL+4LVpNieAvr49cV1rzBNSwGmWRnt/puVaPsLyCUgupVx/43BPUHB/HtKNUw==}
+  /@sentry/cli@2.38.0:
+    resolution: {integrity: sha512-ld9+1GdPkDaFr6T4SGocxoMcrBB/K6Z37TvBx8IMrDQC+eJDkBFiyqmHnzrj/8xoj5O220pqjPZCfvqzH268sQ==}
+    engines: {node: '>= 10'}
+    hasBin: true
+    requiresBuild: true
+    dependencies:
+      https-proxy-agent: 5.0.1
+      node-fetch: 2.7.0
+      progress: 2.0.3
+      proxy-from-env: 1.1.0
+      which: 2.0.2
+    optionalDependencies:
+      '@sentry/cli-darwin': 2.38.0
+      '@sentry/cli-linux-arm': 2.38.0
+      '@sentry/cli-linux-arm64': 2.38.0
+      '@sentry/cli-linux-i686': 2.38.0
+      '@sentry/cli-linux-x64': 2.38.0
+      '@sentry/cli-win32-i686': 2.38.0
+      '@sentry/cli-win32-x64': 2.38.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
+  /@sentry/core@8.35.0:
+    resolution: {integrity: sha512-Ci0Nmtw5ETWLqQJGY4dyF+iWh7PWKy6k303fCEoEmqj2czDrKJCp7yHBNV0XYbo00prj2ZTbCr6I7albYiyONA==}
     engines: {node: '>=14.18'}
     dependencies:
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
+      '@sentry/types': 8.35.0
+      '@sentry/utils': 8.35.0
     dev: false
 
-  /@sentry/nextjs@8.19.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.52.1)(@opentelemetry/sdk-trace-base@1.26.0)(next@14.2.5)(react@18.2.0)(webpack@5.93.0):
-    resolution: {integrity: sha512-WafL2zXKEp1jQJ0bC8H15zEUGT4m6bDiCwlaP8xAI3dz5E1e6f29OFlStvgzU3Tpx/Wi6qNTs5AGuwV3wK9qdg==}
+  /@sentry/nextjs@8.35.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.53.0)(@opentelemetry/sdk-trace-base@1.26.0)(next@14.2.5)(react@18.2.0)(webpack@5.93.0):
+    resolution: {integrity: sha512-7V6Yd0llWvarebVhtK2UyIqkfw/BzKn/hQxJAob/FQ6V9wKFjF5W0EFtE2n/T0RCetL2JPF8iHu3/b4/TVREmg==}
     engines: {node: '>=14.18'}
     peerDependencies:
       next: ^13.2.0 || ^14.0 || ^15.0.0-rc.0
-      webpack: '>= 5.0.0'
+      webpack: '>=5.0.0'
     peerDependenciesMeta:
       webpack:
         optional: true
     dependencies:
-      '@opentelemetry/instrumentation-http': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.25.1
-      '@rollup/plugin-commonjs': 26.0.1(rollup@3.29.4)
-      '@sentry/core': 8.19.0
-      '@sentry/node': 8.19.0
-      '@sentry/opentelemetry': 8.19.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.52.1)(@opentelemetry/sdk-trace-base@1.26.0)(@opentelemetry/semantic-conventions@1.25.1)
-      '@sentry/react': 8.19.0(react@18.2.0)
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
-      '@sentry/vercel-edge': 8.19.0
-      '@sentry/webpack-plugin': 2.20.1(webpack@5.93.0)
+      '@opentelemetry/instrumentation-http': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.27.0
+      '@rollup/plugin-commonjs': 26.0.1(rollup@3.29.5)
+      '@sentry-internal/browser-utils': 8.35.0
+      '@sentry/core': 8.35.0
+      '@sentry/node': 8.35.0
+      '@sentry/opentelemetry': 8.35.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.53.0)(@opentelemetry/sdk-trace-base@1.26.0)(@opentelemetry/semantic-conventions@1.27.0)
+      '@sentry/react': 8.35.0(react@18.2.0)
+      '@sentry/types': 8.35.0
+      '@sentry/utils': 8.35.0
+      '@sentry/vercel-edge': 8.35.0
+      '@sentry/webpack-plugin': 2.22.3(webpack@5.93.0)
       chalk: 3.0.0
       next: 14.2.5(@babel/core@7.24.5)(@opentelemetry/api@1.9.0)(@playwright/test@1.47.2)(react-dom@18.2.0)(react@18.2.0)
       resolve: 1.22.8
-      rollup: 3.29.4
+      rollup: 3.29.5
       stacktrace-parser: 0.1.10
       webpack: 5.93.0(esbuild@0.21.5)
     transitivePeerDependencies:
@@ -7816,147 +8027,133 @@ packages:
       - supports-color
     dev: false
 
-  /@sentry/node@8.19.0:
-    resolution: {integrity: sha512-r7AeKxfB9eE/UW0NZT3AMh+hNA65NFEwtsMYO6iI52FPLFZh0DLOvzVOeNsmsJqPpyetooUGTtUYpBdinZldWA==}
+  /@sentry/node@8.35.0:
+    resolution: {integrity: sha512-B0FLOcZEfYe3CJ2t0l1N0HJcHXcIrLlGENQ2kf5HqR2zcOcOzRxyITJTSV5brCnmzVNgkz9PG8VWo3w0HXZQpA==}
     engines: {node: '>=14.18'}
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/context-async-hooks': 1.25.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-connect': 0.38.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-express': 0.41.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-fastify': 0.38.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-graphql': 0.42.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-hapi': 0.40.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-http': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-ioredis': 0.42.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-koa': 0.42.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mongodb': 0.46.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mongoose': 0.40.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mysql': 0.40.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mysql2': 0.40.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-nestjs-core': 0.39.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-pg': 0.43.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-redis-4': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-amqplib': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-connect': 0.39.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-dataloader': 0.12.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-express': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fastify': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fs': 0.15.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-generic-pool': 0.39.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-graphql': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-hapi': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-http': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-ioredis': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-kafkajs': 0.3.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-koa': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-lru-memoizer': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongodb': 0.47.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongoose': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql2': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-nestjs-core': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-pg': 0.44.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-redis-4': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-undici': 0.6.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/resources': 1.26.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base': 1.26.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
-      '@prisma/instrumentation': 5.17.0
-      '@sentry/core': 8.19.0
-      '@sentry/opentelemetry': 8.19.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.52.1)(@opentelemetry/sdk-trace-base@1.26.0)(@opentelemetry/semantic-conventions@1.27.0)
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
-    optionalDependencies:
-      opentelemetry-instrumentation-fetch-node: 1.2.3(@opentelemetry/api@1.9.0)
+      '@prisma/instrumentation': 5.19.1
+      '@sentry/core': 8.35.0
+      '@sentry/opentelemetry': 8.35.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.53.0)(@opentelemetry/sdk-trace-base@1.26.0)(@opentelemetry/semantic-conventions@1.27.0)
+      '@sentry/types': 8.35.0
+      '@sentry/utils': 8.35.0
+      import-in-the-middle: 1.11.2
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@sentry/opentelemetry@8.19.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.52.1)(@opentelemetry/sdk-trace-base@1.26.0)(@opentelemetry/semantic-conventions@1.25.1):
-    resolution: {integrity: sha512-L1aSxO/aJJ7D3pIlTaVOgbiZJAnUHXezobTc8j5pqFCQACjxnLMSDrt53QfFV52CcjbliDWCYe4IB8umu4DgpA==}
+  /@sentry/opentelemetry@8.35.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.53.0)(@opentelemetry/sdk-trace-base@1.26.0)(@opentelemetry/semantic-conventions@1.27.0):
+    resolution: {integrity: sha512-2mWMpEiIFop/omia9BqTJa+0Khe+tSsiZSUrxbnSpxM0zgw8DFIzJMHbiqw/I7Qaluz9pnO2HZXqgUTwNPsU8A==}
     engines: {node: '>=14.18'}
     peerDependencies:
       '@opentelemetry/api': ^1.9.0
       '@opentelemetry/core': ^1.25.1
-      '@opentelemetry/instrumentation': ^0.52.1
-      '@opentelemetry/sdk-trace-base': ^1.25.1
-      '@opentelemetry/semantic-conventions': ^1.25.1
+      '@opentelemetry/instrumentation': ^0.53.0
+      '@opentelemetry/sdk-trace-base': ^1.26.0
+      '@opentelemetry/semantic-conventions': ^1.27.0
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 1.26.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.25.1
-      '@sentry/core': 8.19.0
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
-    dev: false
-
-  /@sentry/opentelemetry@8.19.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0)(@opentelemetry/instrumentation@0.52.1)(@opentelemetry/sdk-trace-base@1.26.0)(@opentelemetry/semantic-conventions@1.27.0):
-    resolution: {integrity: sha512-L1aSxO/aJJ7D3pIlTaVOgbiZJAnUHXezobTc8j5pqFCQACjxnLMSDrt53QfFV52CcjbliDWCYe4IB8umu4DgpA==}
-    engines: {node: '>=14.18'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.9.0
-      '@opentelemetry/core': ^1.25.1
-      '@opentelemetry/instrumentation': ^0.52.1
-      '@opentelemetry/sdk-trace-base': ^1.25.1
-      '@opentelemetry/semantic-conventions': ^1.25.1
-    dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base': 1.26.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.27.0
-      '@sentry/core': 8.19.0
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
+      '@sentry/core': 8.35.0
+      '@sentry/types': 8.35.0
+      '@sentry/utils': 8.35.0
     dev: false
 
-  /@sentry/react@8.19.0(react@18.2.0):
-    resolution: {integrity: sha512-MzuMy4AEdSuIrBEyp3W7c4+v215+2MiU9ba7Y0KBKcC/Nrf1cGfRFRbjl9OYm/JIuxkaop7kgYs6sPMrVJVlrQ==}
+  /@sentry/react@8.35.0(react@18.2.0):
+    resolution: {integrity: sha512-8Y+s4pE9hvT2TwSo5JS/Enw2cNFlwiLcJDNGCj/Hho+FePFYA59hbN06ouTHWARnO+swANHKZQj24Wp57p1/tg==}
     engines: {node: '>=14.18'}
     peerDependencies:
       react: ^16.14.0 || 17.x || 18.x || 19.x
     dependencies:
-      '@sentry/browser': 8.19.0
-      '@sentry/core': 8.19.0
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
+      '@sentry/browser': 8.35.0
+      '@sentry/core': 8.35.0
+      '@sentry/types': 8.35.0
+      '@sentry/utils': 8.35.0
       hoist-non-react-statics: 3.3.2
       react: 18.2.0
     dev: false
 
-  /@sentry/types@8.19.0:
-    resolution: {integrity: sha512-52C8X5V7mK2KIxMJt8MV5TxXAFHqrQR1RKm1oPTwKVWm8hKr1ZYJXINymNrWvpAc3oVIKLC/sa9WFYgXQh+YlA==}
+  /@sentry/types@8.35.0:
+    resolution: {integrity: sha512-AVEZjb16MlYPifiDDvJ19dPQyDn0jlrtC1PHs6ZKO+Rzyz+2EX2BRdszvanqArldexPoU1p5Bn2w81XZNXThBA==}
     engines: {node: '>=14.18'}
     dev: false
 
-  /@sentry/utils@8.19.0:
-    resolution: {integrity: sha512-8dWJJKaUN6Hf92Oxw2TBmHchGua2W3ZmonrZTTwLvl06jcAigbiQD0MGuF5ytZP8PHx860orV+SbTGKFzfU3Pg==}
+  /@sentry/utils@8.35.0:
+    resolution: {integrity: sha512-MdMb6+uXjqND7qIPWhulubpSeHzia6HtxeJa8jYI09OCvIcmNGPydv/Gx/LZBwosfMHrLdTWcFH7Y7aCxrq7cg==}
     engines: {node: '>=14.18'}
     dependencies:
-      '@sentry/types': 8.19.0
+      '@sentry/types': 8.35.0
     dev: false
 
-  /@sentry/vercel-edge@8.19.0:
-    resolution: {integrity: sha512-I1G19SGWKcwUo1VT57xD/c/ZBnl8qkz6V+6j+vCbms4i0GTFw3eASnUIAOd25kc59/Wih2tUVj5mfV6aX5/DFg==}
+  /@sentry/vercel-edge@8.35.0:
+    resolution: {integrity: sha512-Wp5HCkBb6hA1oE4gETzi4laMsPsc7UBqKCMY4H/UOkuD6HzgpyWuHZeS6nrs2A3MJWcoNoFZ2sJD1hdo4apzGQ==}
     engines: {node: '>=14.18'}
     dependencies:
-      '@sentry/core': 8.19.0
-      '@sentry/types': 8.19.0
-      '@sentry/utils': 8.19.0
+      '@sentry/core': 8.35.0
+      '@sentry/types': 8.35.0
+      '@sentry/utils': 8.35.0
     dev: false
 
-  /@sentry/webpack-plugin@2.20.1(webpack@5.93.0):
-    resolution: {integrity: sha512-U6LzoE09Ndt0OCWROoRaZqqIHGxyMRdKpBhbqoBqyyfVwXN/zGW3I/cWZ1e8rreiKFj+2+c7+X0kOS+NGMTUrg==}
+  /@sentry/webpack-plugin@2.21.1(webpack@5.93.0):
+    resolution: {integrity: sha512-mhKWQq7/eC35qrhhD8oXm/37vZ1BQqmCD8dUngFIr4D24rc7dwlGwPGOYv59yiBqjTS0fGJ+o0xC5PTRKljGQQ==}
     engines: {node: '>= 14'}
     peerDependencies:
       webpack: '>=4.40.0'
     dependencies:
-      '@sentry/bundler-plugin-core': 2.20.1
+      '@sentry/bundler-plugin-core': 2.21.1
       unplugin: 1.0.1
       uuid: 9.0.1
       webpack: 5.93.0(esbuild@0.21.5)
     transitivePeerDependencies:
       - encoding
       - supports-color
-    dev: false
+    dev: true
 
-  /@sentry/webpack-plugin@2.21.1(webpack@5.93.0):
-    resolution: {integrity: sha512-mhKWQq7/eC35qrhhD8oXm/37vZ1BQqmCD8dUngFIr4D24rc7dwlGwPGOYv59yiBqjTS0fGJ+o0xC5PTRKljGQQ==}
+  /@sentry/webpack-plugin@2.22.3(webpack@5.93.0):
+    resolution: {integrity: sha512-Sq1S6bL3nuoTP5typkj+HPjQ13dqftIE8kACAq4tKkXOpWO9bf6HtqcruEQCxMekbWDTdljsrknQ17ZBx2q66Q==}
     engines: {node: '>= 14'}
     peerDependencies:
       webpack: '>=4.40.0'
     dependencies:
-      '@sentry/bundler-plugin-core': 2.21.1
+      '@sentry/bundler-plugin-core': 2.22.3
       unplugin: 1.0.1
       uuid: 9.0.1
       webpack: 5.93.0(esbuild@0.21.5)
     transitivePeerDependencies:
       - encoding
       - supports-color
-    dev: true
+    dev: false
 
   /@sinclair/typebox@0.27.8:
     resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
@@ -8242,7 +8439,7 @@ packages:
       magic-string: 0.30.10
       path-browserify: 1.0.1
       process: 0.11.10
-      semver: 7.6.2
+      semver: 7.6.3
       storybook: 8.2.7
       style-loader: 3.3.4(webpack@5.93.0)
       terser-webpack-plugin: 5.3.10(esbuild@0.21.5)(webpack@5.93.0)
@@ -8294,7 +8491,7 @@ packages:
       globby: 14.0.1
       jscodeshift: 0.15.2(@babel/preset-env@7.25.3)
       lodash: 4.17.21
-      prettier: 3.2.5
+      prettier: 3.3.3
       recast: 0.23.9
       tiny-invariant: 1.3.3
     transitivePeerDependencies:
@@ -8508,7 +8705,7 @@ packages:
       react-docgen: 7.0.3
       react-dom: 18.2.0(react@18.2.0)
       resolve: 1.22.8
-      semver: 7.6.2
+      semver: 7.6.3
       storybook: 8.2.7
       tsconfig-paths: 4.2.0
       typescript: 5.3.3
@@ -9159,8 +9356,8 @@ packages:
   /@types/ms@0.7.33:
     resolution: {integrity: sha512-AuHIyzR5Hea7ij0P9q7vx7xu4z0C28ucwjAZC0ja7JhINyCnOw8/DnvAPQQ9TfOlCtZAmCERKQX9+o1mgQhuOQ==}
 
-  /@types/mysql@2.15.22:
-    resolution: {integrity: sha512-wK1pzsJVVAjYCSZWQoWHziQZbNggXFDUEIGf54g4ZM/ERuP86uGdWeKZWMYlqTPMZfHJJvLPyogXGvCOg87yLQ==}
+  /@types/mysql@2.15.26:
+    resolution: {integrity: sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==}
     dependencies:
       '@types/node': 18.18.5
     dev: false
@@ -9197,8 +9394,8 @@ packages:
     resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
     dev: true
 
-  /@types/pg-pool@2.0.4:
-    resolution: {integrity: sha512-qZAvkv1K3QbmHHFYSNRYPkRjOWRLBYrL4B9c+wG0GSVGBw0NtJwPcgx/DSddeDJvRGMHCEQ4VMEVfuJ/0gZ3XQ==}
+  /@types/pg-pool@2.0.6:
+    resolution: {integrity: sha512-TaAUE5rq2VQYxab5Ts7WZhKNmuN78Q6PiFonTDdpbx8a1H0M1vhy3rhiMjl+e2iHmogyMw7jZF4FrE6eJUy5HQ==}
     dependencies:
       '@types/pg': 8.6.1
     dev: false
@@ -9362,27 +9559,6 @@ packages:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
-    dev: false
-
-  /@typescript-eslint/parser@6.20.0(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/scope-manager': 6.20.0
-      '@typescript-eslint/types': 6.20.0
-      '@typescript-eslint/typescript-estree': 6.20.0(typescript@5.3.3)
-      '@typescript-eslint/visitor-keys': 6.20.0
-      debug: 4.3.7(supports-color@5.5.0)
-      eslint: 8.56.0
-      typescript: 5.3.3
-    transitivePeerDependencies:
-      - supports-color
 
   /@typescript-eslint/parser@7.18.0(eslint@8.56.0)(typescript@5.3.3):
     resolution: {integrity: sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==}
@@ -9403,7 +9579,6 @@ packages:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
   /@typescript-eslint/scope-manager@5.62.0:
     resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==}
@@ -9411,13 +9586,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 5.62.0
       '@typescript-eslint/visitor-keys': 5.62.0
-
-  /@typescript-eslint/scope-manager@6.20.0:
-    resolution: {integrity: sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    dependencies:
-      '@typescript-eslint/types': 6.20.0
-      '@typescript-eslint/visitor-keys': 6.20.0
+    dev: true
 
   /@typescript-eslint/scope-manager@7.18.0:
     resolution: {integrity: sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==}
@@ -9425,7 +9594,6 @@ packages:
     dependencies:
       '@typescript-eslint/types': 7.18.0
       '@typescript-eslint/visitor-keys': 7.18.0
-    dev: false
 
   /@typescript-eslint/type-utils@7.18.0(eslint@8.56.0)(typescript@5.3.3):
     resolution: {integrity: sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==}
@@ -9445,20 +9613,15 @@ packages:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
   /@typescript-eslint/types@5.62.0:
     resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  /@typescript-eslint/types@6.20.0:
-    resolution: {integrity: sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==}
-    engines: {node: ^16.0.0 || >=18.0.0}
+    dev: true
 
   /@typescript-eslint/types@7.18.0:
     resolution: {integrity: sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==}
     engines: {node: ^18.18.0 || >=20.0.0}
-    dev: false
 
   /@typescript-eslint/typescript-estree@5.62.0(typescript@5.3.3):
     resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==}
@@ -9479,27 +9642,7 @@ packages:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
-
-  /@typescript-eslint/typescript-estree@6.20.0(typescript@5.3.3):
-    resolution: {integrity: sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/types': 6.20.0
-      '@typescript-eslint/visitor-keys': 6.20.0
-      debug: 4.3.7(supports-color@5.5.0)
-      globby: 11.1.0
-      is-glob: 4.0.3
-      minimatch: 9.0.3
-      semver: 7.6.3
-      ts-api-utils: 1.3.0(typescript@5.3.3)
-      typescript: 5.3.3
-    transitivePeerDependencies:
-      - supports-color
+    dev: true
 
   /@typescript-eslint/typescript-estree@7.18.0(typescript@5.3.3):
     resolution: {integrity: sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==}
@@ -9521,7 +9664,6 @@ packages:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
   /@typescript-eslint/utils@5.62.0(eslint@8.56.0)(typescript@5.3.3):
     resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==}
@@ -9541,6 +9683,7 @@ packages:
     transitivePeerDependencies:
       - supports-color
       - typescript
+    dev: true
 
   /@typescript-eslint/utils@7.18.0(eslint@8.56.0)(typescript@5.3.3):
     resolution: {integrity: sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==}
@@ -9556,7 +9699,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
       - typescript
-    dev: false
 
   /@typescript-eslint/visitor-keys@5.62.0:
     resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==}
@@ -9564,13 +9706,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 5.62.0
       eslint-visitor-keys: 3.4.3
-
-  /@typescript-eslint/visitor-keys@6.20.0:
-    resolution: {integrity: sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    dependencies:
-      '@typescript-eslint/types': 6.20.0
-      eslint-visitor-keys: 3.4.3
+    dev: true
 
   /@typescript-eslint/visitor-keys@7.18.0:
     resolution: {integrity: sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==}
@@ -9578,7 +9714,6 @@ packages:
     dependencies:
       '@typescript-eslint/types': 7.18.0
       eslint-visitor-keys: 3.4.3
-    dev: false
 
   /@uidotdev/usehooks@2.4.1(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-1I+RwWyS+kdv3Mv0Vmc+p0dPYH0DTRAo04HLyXReYBL9AeseDWUJyi4THuksBJcu9F0Pih69Ak150VDnqbVnXg==}
@@ -9930,16 +10065,6 @@ packages:
       acorn-walk: 8.2.0
     dev: false
 
-  /acorn-import-assertions@1.9.0(acorn@8.12.1):
-    resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==}
-    requiresBuild: true
-    peerDependencies:
-      acorn: ^8
-    dependencies:
-      acorn: 8.12.1
-    dev: false
-    optional: true
-
   /acorn-import-attributes@1.9.5(acorn@8.12.1):
     resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==}
     peerDependencies:
@@ -10296,6 +10421,10 @@ packages:
     dependencies:
       dequal: 2.0.3
 
+  /aria-query@5.3.2:
+    resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
+    engines: {node: '>= 0.4'}
+
   /array-buffer-byte-length@1.0.1:
     resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
     engines: {node: '>= 0.4'}
@@ -10310,23 +10439,14 @@ packages:
     resolution: {integrity: sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==}
     dev: false
 
-  /array-includes@3.1.6:
-    resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
-      es-abstract: 1.20.5
-      get-intrinsic: 1.2.4
-      is-string: 1.0.7
-
-  /array-includes@3.1.7:
-    resolution: {integrity: sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==}
+  /array-includes@3.1.8:
+    resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
       get-intrinsic: 1.2.4
       is-string: 1.0.7
 
@@ -10334,24 +10454,26 @@ packages:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
 
-  /array.prototype.filter@1.0.3:
-    resolution: {integrity: sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==}
+  /array.prototype.findlast@1.2.5:
+    resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
-      es-array-method-boxes-properly: 1.0.0
-      is-string: 1.0.7
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
+      es-shim-unscopables: 1.0.2
 
-  /array.prototype.findlastindex@1.2.4:
-    resolution: {integrity: sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==}
+  /array.prototype.findlastindex@1.2.5:
+    resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-abstract: 1.23.3
       es-errors: 1.3.0
+      es-object-atoms: 1.0.0
       es-shim-unscopables: 1.0.2
 
   /array.prototype.flat@1.3.2:
@@ -10363,15 +10485,6 @@ packages:
       es-abstract: 1.22.4
       es-shim-unscopables: 1.0.2
 
-  /array.prototype.flatmap@1.3.1:
-    resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
-      es-abstract: 1.20.5
-      es-shim-unscopables: 1.0.0
-
   /array.prototype.flatmap@1.3.2:
     resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
     engines: {node: '>= 0.4'}
@@ -10381,14 +10494,15 @@ packages:
       es-abstract: 1.22.4
       es-shim-unscopables: 1.0.2
 
-  /array.prototype.tosorted@1.1.1:
-    resolution: {integrity: sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==}
+  /array.prototype.tosorted@1.1.4:
+    resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
       es-shim-unscopables: 1.0.2
-      get-intrinsic: 1.2.4
 
   /arraybuffer.prototype.slice@1.0.3:
     resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
@@ -10478,11 +10592,6 @@ packages:
     resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
     dev: false
 
-  /asynciterator.prototype@1.0.0:
-    resolution: {integrity: sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==}
-    dependencies:
-      has-symbols: 1.0.3
-
   /asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
     dev: false
@@ -10554,8 +10663,8 @@ packages:
       - supports-color
     dev: true
 
-  /axe-core@4.7.0:
-    resolution: {integrity: sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==}
+  /axe-core@4.10.2:
+    resolution: {integrity: sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==}
     engines: {node: '>=4'}
 
   /axios@1.6.8:
@@ -10568,16 +10677,9 @@ packages:
       - debug
     dev: false
 
-  /axobject-query@3.2.1:
-    resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==}
-    dependencies:
-      dequal: 2.0.3
-
-  /axobject-query@4.0.0:
-    resolution: {integrity: sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==}
-    dependencies:
-      dequal: 2.0.3
-    dev: false
+  /axobject-query@4.1.0:
+    resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
+    engines: {node: '>= 0.4'}
 
   /b4a@1.6.6:
     resolution: {integrity: sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==}
@@ -11838,7 +11940,7 @@ packages:
       handlebars: 4.7.8
       json-stringify-safe: 5.0.1
       meow: 8.1.2
-      semver: 7.6.2
+      semver: 7.6.3
       split: 1.0.1
     dev: false
 
@@ -12135,7 +12237,7 @@ packages:
       postcss-modules-scope: 3.2.0(postcss@8.4.38)
       postcss-modules-values: 4.0.0(postcss@8.4.38)
       postcss-value-parser: 4.2.0
-      semver: 7.6.2
+      semver: 7.6.3
       webpack: 5.93.0(esbuild@0.21.5)
     dev: true
 
@@ -12231,6 +12333,30 @@ packages:
       whatwg-url: 11.0.0
     dev: false
 
+  /data-view-buffer@1.0.1:
+    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
+  /data-view-byte-length@1.0.1:
+    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
+  /data-view-byte-offset@1.0.0:
+    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
   /dataloader@2.2.2:
     resolution: {integrity: sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==}
     dev: true
@@ -12336,7 +12462,6 @@ packages:
         optional: true
     dependencies:
       ms: 2.1.2
-    dev: false
 
   /debug@4.3.7(supports-color@5.5.0):
     resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
@@ -12490,13 +12615,6 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /define-properties@1.1.4:
-    resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-property-descriptors: 1.0.2
-      object-keys: 1.1.1
-
   /define-properties@1.2.1:
     resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
     engines: {node: '>= 0.4'}
@@ -12783,7 +12901,6 @@ packages:
   /dotenv@16.0.3:
     resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
     engines: {node: '>=12'}
-    dev: false
 
   /dotenv@16.4.5:
     resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==}
@@ -12882,13 +12999,6 @@ packages:
       objectorarray: 1.0.5
     dev: true
 
-  /enhanced-resolve@5.15.0:
-    resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==}
-    engines: {node: '>=10.13.0'}
-    dependencies:
-      graceful-fs: 4.2.11
-      tapable: 2.2.1
-
   /enhanced-resolve@5.17.1:
     resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==}
     engines: {node: '>=10.13.0'}
@@ -12938,47 +13048,67 @@ packages:
       stackframe: 1.3.4
     dev: true
 
-  /es-abstract@1.20.5:
-    resolution: {integrity: sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==}
+  /es-abstract@1.22.4:
+    resolution: {integrity: sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==}
     engines: {node: '>= 0.4'}
     dependencies:
+      array-buffer-byte-length: 1.0.1
+      arraybuffer.prototype.slice: 1.0.3
+      available-typed-arrays: 1.0.7
       call-bind: 1.0.7
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      es-set-tostringtag: 2.0.2
       es-to-primitive: 1.2.1
-      function-bind: 1.1.2
-      function.prototype.name: 1.1.5
+      function.prototype.name: 1.1.6
       get-intrinsic: 1.2.4
-      get-symbol-description: 1.0.0
+      get-symbol-description: 1.0.2
+      globalthis: 1.0.3
       gopd: 1.0.1
-      has: 1.0.3
       has-property-descriptors: 1.0.2
+      has-proto: 1.0.1
       has-symbols: 1.0.3
+      hasown: 2.0.1
       internal-slot: 1.0.7
+      is-array-buffer: 3.0.4
       is-callable: 1.2.7
       is-negative-zero: 2.0.2
       is-regex: 1.1.4
       is-shared-array-buffer: 1.0.2
       is-string: 1.0.7
+      is-typed-array: 1.1.13
       is-weakref: 1.0.2
       object-inspect: 1.13.1
       object-keys: 1.1.1
       object.assign: 4.1.5
       regexp.prototype.flags: 1.5.2
-      safe-regex-test: 1.0.0
-      string.prototype.trimend: 1.0.6
-      string.prototype.trimstart: 1.0.6
+      safe-array-concat: 1.1.0
+      safe-regex-test: 1.0.3
+      string.prototype.trim: 1.2.8
+      string.prototype.trimend: 1.0.7
+      string.prototype.trimstart: 1.0.7
+      typed-array-buffer: 1.0.2
+      typed-array-byte-length: 1.0.0
+      typed-array-byte-offset: 1.0.1
+      typed-array-length: 1.0.4
       unbox-primitive: 1.0.2
+      which-typed-array: 1.1.14
 
-  /es-abstract@1.22.4:
-    resolution: {integrity: sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==}
+  /es-abstract@1.23.3:
+    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
     engines: {node: '>= 0.4'}
     dependencies:
       array-buffer-byte-length: 1.0.1
       arraybuffer.prototype.slice: 1.0.3
       available-typed-arrays: 1.0.7
       call-bind: 1.0.7
+      data-view-buffer: 1.0.1
+      data-view-byte-length: 1.0.1
+      data-view-byte-offset: 1.0.0
       es-define-property: 1.0.0
       es-errors: 1.3.0
-      es-set-tostringtag: 2.0.2
+      es-object-atoms: 1.0.0
+      es-set-tostringtag: 2.0.3
       es-to-primitive: 1.2.1
       function.prototype.name: 1.1.6
       get-intrinsic: 1.2.4
@@ -12986,15 +13116,16 @@ packages:
       globalthis: 1.0.3
       gopd: 1.0.1
       has-property-descriptors: 1.0.2
-      has-proto: 1.0.1
+      has-proto: 1.0.3
       has-symbols: 1.0.3
-      hasown: 2.0.1
+      hasown: 2.0.2
       internal-slot: 1.0.7
       is-array-buffer: 3.0.4
       is-callable: 1.2.7
-      is-negative-zero: 2.0.2
+      is-data-view: 1.0.1
+      is-negative-zero: 2.0.3
       is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.2
+      is-shared-array-buffer: 1.0.3
       is-string: 1.0.7
       is-typed-array: 1.1.13
       is-weakref: 1.0.2
@@ -13002,20 +13133,17 @@ packages:
       object-keys: 1.1.1
       object.assign: 4.1.5
       regexp.prototype.flags: 1.5.2
-      safe-array-concat: 1.1.0
+      safe-array-concat: 1.1.2
       safe-regex-test: 1.0.3
-      string.prototype.trim: 1.2.8
-      string.prototype.trimend: 1.0.7
-      string.prototype.trimstart: 1.0.7
-      typed-array-buffer: 1.0.2
-      typed-array-byte-length: 1.0.0
-      typed-array-byte-offset: 1.0.1
-      typed-array-length: 1.0.4
+      string.prototype.trim: 1.2.9
+      string.prototype.trimend: 1.0.8
+      string.prototype.trimstart: 1.0.8
+      typed-array-buffer: 1.0.2
+      typed-array-byte-length: 1.0.1
+      typed-array-byte-offset: 1.0.2
+      typed-array-length: 1.0.6
       unbox-primitive: 1.0.2
-      which-typed-array: 1.1.14
-
-  /es-array-method-boxes-properly@1.0.0:
-    resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==}
+      which-typed-array: 1.1.15
 
   /es-define-property@1.0.0:
     resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
@@ -13041,29 +13169,34 @@ packages:
       stop-iteration-iterator: 1.0.0
     dev: false
 
-  /es-iterator-helpers@1.0.17:
-    resolution: {integrity: sha512-lh7BsUqelv4KUbR5a/ZTaGGIMLCjPGPqJ6q+Oq24YP0RdyptX1uzm4vvaqzk7Zx3bpl/76YLTTDj9L7uYQ92oQ==}
+  /es-iterator-helpers@1.1.0:
+    resolution: {integrity: sha512-/SurEfycdyssORP/E+bj4sEu1CWw4EmLDsHynHwSXQ7utgbrMRWW195pTrCjFgFCddf/UkYm3oqKPRq5i8bJbw==}
     engines: {node: '>= 0.4'}
     dependencies:
-      asynciterator.prototype: 1.0.0
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-abstract: 1.23.3
       es-errors: 1.3.0
-      es-set-tostringtag: 2.0.2
+      es-set-tostringtag: 2.0.3
       function-bind: 1.1.2
       get-intrinsic: 1.2.4
-      globalthis: 1.0.3
+      globalthis: 1.0.4
       has-property-descriptors: 1.0.2
-      has-proto: 1.0.1
+      has-proto: 1.0.3
       has-symbols: 1.0.3
       internal-slot: 1.0.7
-      iterator.prototype: 1.1.2
-      safe-array-concat: 1.1.0
+      iterator.prototype: 1.1.3
+      safe-array-concat: 1.1.2
 
   /es-module-lexer@1.5.4:
     resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
 
+  /es-object-atoms@1.0.0:
+    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      es-errors: 1.3.0
+
   /es-set-tostringtag@2.0.2:
     resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==}
     engines: {node: '>= 0.4'}
@@ -13072,10 +13205,13 @@ packages:
       has-tostringtag: 1.0.2
       hasown: 2.0.1
 
-  /es-shim-unscopables@1.0.0:
-    resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
+  /es-set-tostringtag@2.0.3:
+    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      has: 1.0.3
+      get-intrinsic: 1.2.4
+      has-tostringtag: 1.0.2
+      hasown: 2.0.2
 
   /es-shim-unscopables@1.0.2:
     resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
@@ -13178,25 +13314,26 @@ packages:
     optionalDependencies:
       source-map: 0.6.1
 
-  /eslint-config-next@14.0.4(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-9/xbOHEQOmQtqvQ1UsTQZpnA7SlDMBtuKJ//S4JnoyK3oGLhILKXdBgu/UO7lQo/2xOykQULS1qQ6p2+EpHgAQ==}
+  /eslint-config-next@15.0.1(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-3cYCrgbH6GS/ufApza7XCKz92vtq4dAdYhx++rMFNlH2cAV+/GsAKkrr4+bohYOACmzG2nAOR+uWprKC1Uld6A==}
     peerDependencies:
-      eslint: ^7.23.0 || ^8.0.0
+      eslint: ^7.23.0 || ^8.0.0 || ^9.0.0
       typescript: '>=3.3.1'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@next/eslint-plugin-next': 14.0.4
-      '@rushstack/eslint-patch': 1.7.2
-      '@typescript-eslint/parser': 6.20.0(eslint@8.56.0)(typescript@5.3.3)
+      '@next/eslint-plugin-next': 15.0.1
+      '@rushstack/eslint-patch': 1.10.4
+      '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0)(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 7.18.0(eslint@8.56.0)(typescript@5.3.3)
       eslint: 8.56.0
-      eslint-import-resolver-node: 0.3.6
-      eslint-import-resolver-typescript: 3.5.2(eslint-plugin-import@2.29.1)(eslint@8.56.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.20.0)(eslint-import-resolver-typescript@3.5.2)(eslint@8.56.0)
-      eslint-plugin-jsx-a11y: 6.8.0(eslint@8.56.0)
-      eslint-plugin-react: 7.33.2(eslint@8.56.0)
-      eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0)
+      eslint-import-resolver-node: 0.3.9
+      eslint-import-resolver-typescript: 3.5.2(eslint-plugin-import@2.31.0)(eslint@8.56.0)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0)(eslint-import-resolver-typescript@3.5.2)(eslint@8.56.0)
+      eslint-plugin-jsx-a11y: 6.10.2(eslint@8.56.0)
+      eslint-plugin-react: 7.37.2(eslint@8.56.0)
+      eslint-plugin-react-hooks: 5.0.0(eslint@8.56.0)
       typescript: 5.3.3
     transitivePeerDependencies:
       - eslint-import-resolver-webpack
@@ -13209,26 +13346,18 @@ packages:
       eslint: '>=7.0.0'
     dependencies:
       eslint: 8.56.0
-    dev: false
-
-  /eslint-import-resolver-node@0.3.6:
-    resolution: {integrity: sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==}
-    dependencies:
-      debug: 3.2.7
-      resolve: 1.22.4
-    transitivePeerDependencies:
-      - supports-color
+    dev: true
 
   /eslint-import-resolver-node@0.3.9:
     resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
     dependencies:
       debug: 3.2.7
-      is-core-module: 2.13.1
+      is-core-module: 2.15.1
       resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
 
-  /eslint-import-resolver-typescript@3.5.2(eslint-plugin-import@2.29.1)(eslint@8.56.0):
+  /eslint-import-resolver-typescript@3.5.2(eslint-plugin-import@2.31.0)(eslint@8.56.0):
     resolution: {integrity: sha512-zX4ebnnyXiykjhcBvKIf5TNvt8K7yX6bllTRZ14MiurKPjDpCAZujlszTdB8pcNXhZcOf+god4s9SjQa5GnytQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -13236,19 +13365,19 @@ packages:
       eslint-plugin-import: '*'
     dependencies:
       debug: 4.3.7(supports-color@5.5.0)
-      enhanced-resolve: 5.15.0
+      enhanced-resolve: 5.17.1
       eslint: 8.56.0
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.20.0)(eslint-import-resolver-typescript@3.5.2)(eslint@8.56.0)
-      get-tsconfig: 4.2.0
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0)(eslint-import-resolver-typescript@3.5.2)(eslint@8.56.0)
+      get-tsconfig: 4.7.5
       globby: 13.1.2
-      is-core-module: 2.13.1
+      is-core-module: 2.15.1
       is-glob: 4.0.3
       synckit: 0.8.4
     transitivePeerDependencies:
       - supports-color
 
-  /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.20.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.5.2)(eslint@8.56.0):
-    resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
+  /eslint-module-utils@2.12.0(@typescript-eslint/parser@7.18.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.5.2)(eslint@8.56.0):
+    resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==}
     engines: {node: '>=4'}
     peerDependencies:
       '@typescript-eslint/parser': '*'
@@ -13268,54 +13397,56 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 6.20.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 7.18.0(eslint@8.56.0)(typescript@5.3.3)
       debug: 3.2.7
       eslint: 8.56.0
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.5.2(eslint-plugin-import@2.29.1)(eslint@8.56.0)
+      eslint-import-resolver-typescript: 3.5.2(eslint-plugin-import@2.31.0)(eslint@8.56.0)
     transitivePeerDependencies:
       - supports-color
 
-  /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.20.0)(eslint-import-resolver-typescript@3.5.2)(eslint@8.56.0):
-    resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
+  /eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0)(eslint-import-resolver-typescript@3.5.2)(eslint@8.56.0):
+    resolution: {integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==}
     engines: {node: '>=4'}
     peerDependencies:
       '@typescript-eslint/parser': '*'
-      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
     peerDependenciesMeta:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 6.20.0(eslint@8.56.0)(typescript@5.3.3)
-      array-includes: 3.1.7
-      array.prototype.findlastindex: 1.2.4
+      '@rtsao/scc': 1.1.0
+      '@typescript-eslint/parser': 7.18.0(eslint@8.56.0)(typescript@5.3.3)
+      array-includes: 3.1.8
+      array.prototype.findlastindex: 1.2.5
       array.prototype.flat: 1.3.2
       array.prototype.flatmap: 1.3.2
       debug: 3.2.7
       doctrine: 2.1.0
       eslint: 8.56.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.20.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.5.2)(eslint@8.56.0)
-      hasown: 2.0.1
-      is-core-module: 2.13.1
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.18.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.5.2)(eslint@8.56.0)
+      hasown: 2.0.2
+      is-core-module: 2.15.1
       is-glob: 4.0.3
       minimatch: 3.1.2
-      object.fromentries: 2.0.7
-      object.groupby: 1.0.2
-      object.values: 1.1.7
+      object.fromentries: 2.0.8
+      object.groupby: 1.0.3
+      object.values: 1.2.0
       semver: 6.3.1
+      string.prototype.trimend: 1.0.8
       tsconfig-paths: 3.15.0
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
       - supports-color
 
-  /eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0)(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /eslint-plugin-jest@28.8.3(@typescript-eslint/eslint-plugin@7.18.0)(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-HIQ3t9hASLKm2IhIOqnu+ifw7uLZkIlR7RYNv7fMcEi/p0CIiJmfriStQS2LDkgtY4nyLbIZAD+JL347Yc2ETQ==}
+    engines: {node: ^16.10.0 || ^18.12.0 || >=20.0.0}
     peerDependencies:
-      '@typescript-eslint/eslint-plugin': ^5.0.0 || ^6.0.0 || ^7.0.0
-      eslint: ^7.0.0 || ^8.0.0
+      '@typescript-eslint/eslint-plugin': ^6.0.0 || ^7.0.0 || ^8.0.0
+      eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
       jest: '*'
     peerDependenciesMeta:
       '@typescript-eslint/eslint-plugin':
@@ -13324,68 +13455,90 @@ packages:
         optional: true
     dependencies:
       '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0)(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 7.18.0(eslint@8.56.0)(typescript@5.3.3)
       eslint: 8.56.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: false
 
-  /eslint-plugin-jsx-a11y@6.8.0(eslint@8.56.0):
-    resolution: {integrity: sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==}
+  /eslint-plugin-jsx-a11y@6.10.2(eslint@8.56.0):
+    resolution: {integrity: sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==}
     engines: {node: '>=4.0'}
     peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
     dependencies:
-      '@babel/runtime': 7.23.2
-      aria-query: 5.3.0
-      array-includes: 3.1.7
+      aria-query: 5.3.2
+      array-includes: 3.1.8
       array.prototype.flatmap: 1.3.2
       ast-types-flow: 0.0.8
-      axe-core: 4.7.0
-      axobject-query: 3.2.1
+      axe-core: 4.10.2
+      axobject-query: 4.1.0
       damerau-levenshtein: 1.0.8
       emoji-regex: 9.2.2
-      es-iterator-helpers: 1.0.17
       eslint: 8.56.0
-      hasown: 2.0.1
+      hasown: 2.0.2
       jsx-ast-utils: 3.3.5
       language-tags: 1.0.9
       minimatch: 3.1.2
-      object.entries: 1.1.7
-      object.fromentries: 2.0.7
+      object.fromentries: 2.0.8
+      safe-regex-test: 1.0.3
+      string.prototype.includes: 2.0.1
+
+  /eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0)(eslint@8.56.0)(prettier@3.3.3):
+    resolution: {integrity: sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      '@types/eslint': '>=8.0.0'
+      eslint: '>=8.0.0'
+      eslint-config-prettier: '*'
+      prettier: '>=3.0.0'
+    peerDependenciesMeta:
+      '@types/eslint':
+        optional: true
+      eslint-config-prettier:
+        optional: true
+    dependencies:
+      eslint: 8.56.0
+      eslint-config-prettier: 9.1.0(eslint@8.56.0)
+      prettier: 3.3.3
+      prettier-linter-helpers: 1.0.0
+      synckit: 0.9.2
+    dev: true
 
-  /eslint-plugin-react-hooks@4.6.0(eslint@8.56.0):
-    resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==}
+  /eslint-plugin-react-hooks@5.0.0(eslint@8.56.0):
+    resolution: {integrity: sha512-hIOwI+5hYGpJEc4uPRmz2ulCjAGD/N13Lukkh8cLV0i2IRk/bdZDYjgLVHj+U9Z704kLIdIO6iueGvxNur0sgw==}
     engines: {node: '>=10'}
     peerDependencies:
-      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
+      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0
     dependencies:
       eslint: 8.56.0
 
-  /eslint-plugin-react@7.33.2(eslint@8.56.0):
-    resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==}
+  /eslint-plugin-react@7.37.2(eslint@8.56.0):
+    resolution: {integrity: sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==}
     engines: {node: '>=4'}
     peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
     dependencies:
-      array-includes: 3.1.6
-      array.prototype.flatmap: 1.3.1
-      array.prototype.tosorted: 1.1.1
+      array-includes: 3.1.8
+      array.prototype.findlast: 1.2.5
+      array.prototype.flatmap: 1.3.2
+      array.prototype.tosorted: 1.1.4
       doctrine: 2.1.0
-      es-iterator-helpers: 1.0.17
+      es-iterator-helpers: 1.1.0
       eslint: 8.56.0
       estraverse: 5.3.0
-      jsx-ast-utils: 3.3.3
+      hasown: 2.0.2
+      jsx-ast-utils: 3.3.5
       minimatch: 3.1.2
-      object.entries: 1.1.6
-      object.fromentries: 2.0.6
-      object.hasown: 1.1.2
-      object.values: 1.1.6
+      object.entries: 1.1.8
+      object.fromentries: 2.0.8
+      object.values: 1.2.0
       prop-types: 15.8.1
-      resolve: 2.0.0-next.4
+      resolve: 2.0.0-next.5
       semver: 6.3.1
-      string.prototype.matchall: 4.0.8
+      string.prototype.matchall: 4.0.11
+      string.prototype.repeat: 1.0.0
 
   /eslint-plugin-storybook@0.8.0(eslint@8.56.0)(typescript@5.3.3):
     resolution: {integrity: sha512-CZeVO5EzmPY7qghO2t64oaFM+8FTaD4uzOEjHKp516exyTKo+skKAL9GI3QALS2BXhyALJjNtwbmr1XinGE8bA==}
@@ -13403,14 +13556,13 @@ packages:
       - typescript
     dev: true
 
-  /eslint-plugin-turbo@1.12.4(eslint@8.56.0):
-    resolution: {integrity: sha512-3AGmXvH7E4i/XTWqBrcgu+G7YKZJV/8FrEn79kTd50ilNsv+U3nS2IlcCrQB6Xm2m9avGD9cadLzKDR1/UF2+g==}
+  /eslint-plugin-turbo@2.2.3(eslint@8.56.0):
+    resolution: {integrity: sha512-LHt35VwxthdGVO6hQRfvmFb6ee8/exAzAYWCy4o87Bnp7urltP8qg7xMd4dPSLAhtfnI2xSo1WgeVaR3MeItxw==}
     peerDependencies:
       eslint: '>6.6.0'
     dependencies:
       dotenv: 16.0.3
       eslint: 8.56.0
-    dev: false
 
   /eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
@@ -13695,6 +13847,10 @@ packages:
   /fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
+  /fast-diff@1.3.0:
+    resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
+    dev: true
+
   /fast-fifo@1.3.2:
     resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==}
     dev: false
@@ -14165,15 +14321,6 @@ packages:
   /function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
-  /function.prototype.name@1.1.5:
-    resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.22.4
-      functions-have-names: 1.2.3
-
   /function.prototype.name@1.1.6:
     resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
     engines: {node: '>= 0.4'}
@@ -14297,13 +14444,6 @@ packages:
     resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
     engines: {node: '>=16'}
 
-  /get-symbol-description@1.0.0:
-    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-
   /get-symbol-description@1.0.2:
     resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
     engines: {node: '>= 0.4'}
@@ -14312,14 +14452,10 @@ packages:
       es-errors: 1.3.0
       get-intrinsic: 1.2.4
 
-  /get-tsconfig@4.2.0:
-    resolution: {integrity: sha512-X8u8fREiYOE6S8hLbq99PeykTDoLVnxvF4DjWKJmz9xy2nNRdUcV8ZN9tniJFeKyTU3qnC9lL8n4Chd6LmVKHg==}
-
   /get-tsconfig@4.7.5:
     resolution: {integrity: sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==}
     dependencies:
       resolve-pkg-maps: 1.0.0
-    dev: false
 
   /giget@1.2.3:
     resolution: {integrity: sha512-8EHPljDvs7qKykr6uw8b+lqLiUc/vUg+KVTI0uND4s63TdsZM2Xus3mflvF0DDG9SiM4RlCkFGL+7aAjRmV7KA==}
@@ -14394,16 +14530,6 @@ packages:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
-  /glob@7.1.7:
-    resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==}
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 3.1.2
-      once: 1.4.0
-      path-is-absolute: 1.0.1
-
   /glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     deprecated: Glob versions prior to v9 are no longer supported
@@ -14460,6 +14586,13 @@ packages:
     dependencies:
       define-properties: 1.2.1
 
+  /globalthis@1.0.4:
+    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-properties: 1.2.1
+      gopd: 1.0.1
+
   /globalyzer@0.1.0:
     resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
 
@@ -14730,6 +14863,10 @@ packages:
     resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
     engines: {node: '>= 0.4'}
 
+  /has-proto@1.0.3:
+    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
+    engines: {node: '>= 0.4'}
+
   /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
@@ -14745,12 +14882,6 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: true
 
-  /has@1.0.3:
-    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
-    engines: {node: '>= 0.4.0'}
-    dependencies:
-      function-bind: 1.1.2
-
   /hash-base@3.0.4:
     resolution: {integrity: sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==}
     engines: {node: '>=4'}
@@ -14780,6 +14911,12 @@ packages:
     dependencies:
       function-bind: 1.1.2
 
+  /hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      function-bind: 1.1.2
+
   /hast-util-heading-rank@3.0.0:
     resolution: {integrity: sha512-EJKb8oMUXVHcWZTDepnr+WNbfnXKFNf9duMesmr4S8SXTJBJ9M4Yok08pu9vxdJwdlGRhVumk9mEhkEvKGifwA==}
     dependencies:
@@ -15155,16 +15292,14 @@ packages:
       module-details-from-path: 1.0.3
     dev: false
 
-  /import-in-the-middle@1.7.1:
-    resolution: {integrity: sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==}
-    requiresBuild: true
+  /import-in-the-middle@1.11.2:
+    resolution: {integrity: sha512-gK6Rr6EykBcc6cVWRSBR5TWf8nn6hZMYSRYqCcHa0l0d1fPK7JSYo6+Mlmck76jIX9aL/IZ71c06U2VpFwl1zA==}
     dependencies:
       acorn: 8.12.1
-      acorn-import-assertions: 1.9.0(acorn@8.12.1)
+      acorn-import-attributes: 1.9.5(acorn@8.12.1)
       cjs-module-lexer: 1.3.1
       module-details-from-path: 1.0.3
     dev: false
-    optional: true
 
   /import-lazy@4.0.0:
     resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
@@ -15331,14 +15466,6 @@ packages:
     resolution: {integrity: sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA==}
     dev: false
 
-  /internal-slot@1.0.3:
-    resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      get-intrinsic: 1.2.4
-      has: 1.0.3
-      side-channel: 1.0.4
-
   /internal-slot@1.0.7:
     resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
     engines: {node: '>= 0.4'}
@@ -15477,6 +15604,18 @@ packages:
     dependencies:
       hasown: 2.0.1
 
+  /is-core-module@2.15.1:
+    resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      hasown: 2.0.2
+
+  /is-data-view@1.0.1:
+    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      is-typed-array: 1.1.13
+
   /is-date-object@1.0.5:
     resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
     engines: {node: '>= 0.4'}
@@ -15613,6 +15752,10 @@ packages:
     resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
     engines: {node: '>= 0.4'}
 
+  /is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
+
   /is-npm@6.0.0:
     resolution: {integrity: sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -15698,6 +15841,12 @@ packages:
     dependencies:
       call-bind: 1.0.7
 
+  /is-shared-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+
   /is-stream@1.1.0:
     resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
     engines: {node: '>=0.10.0'}
@@ -15915,8 +16064,9 @@ packages:
     resolution: {integrity: sha512-RaKa8RHmSay1GvkTLOYRT8Ju9/Cf0DRK9z7YzS14sID4e2hkP4eknzDhTtzTboO8shZIysbVEEnmjJEHxOVIMQ==}
     dev: false
 
-  /iterator.prototype@1.1.2:
-    resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==}
+  /iterator.prototype@1.1.3:
+    resolution: {integrity: sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==}
+    engines: {node: '>= 0.4'}
     dependencies:
       define-properties: 1.2.1
       get-intrinsic: 1.2.4
@@ -16639,21 +16789,14 @@ packages:
       semver: 7.6.2
     dev: true
 
-  /jsx-ast-utils@3.3.3:
-    resolution: {integrity: sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==}
-    engines: {node: '>=4.0'}
-    dependencies:
-      array-includes: 3.1.7
-      object.assign: 4.1.4
-
   /jsx-ast-utils@3.3.5:
     resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
     engines: {node: '>=4.0'}
     dependencies:
-      array-includes: 3.1.7
+      array-includes: 3.1.8
       array.prototype.flat: 1.3.2
       object.assign: 4.1.5
-      object.values: 1.1.7
+      object.values: 1.2.0
 
   /jszip@3.10.1:
     resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==}
@@ -18146,12 +18289,6 @@ packages:
     dependencies:
       brace-expansion: 2.0.1
 
-  /minimatch@9.0.3:
-    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    dependencies:
-      brace-expansion: 2.0.1
-
   /minimatch@9.0.5:
     resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -18800,15 +18937,6 @@ packages:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
     engines: {node: '>= 0.4'}
 
-  /object.assign@4.1.4:
-    resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      has-symbols: 1.0.3
-      object-keys: 1.1.1
-
   /object.assign@4.1.5:
     resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
     engines: {node: '>= 0.4'}
@@ -18818,68 +18946,38 @@ packages:
       has-symbols: 1.0.3
       object-keys: 1.1.1
 
-  /object.entries@1.1.6:
-    resolution: {integrity: sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==}
+  /object.entries@1.1.8:
+    resolution: {integrity: sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-object-atoms: 1.0.0
 
-  /object.entries@1.1.7:
-    resolution: {integrity: sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==}
+  /object.fromentries@2.0.8:
+    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
-
-  /object.fromentries@2.0.6:
-    resolution: {integrity: sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
-      es-abstract: 1.20.5
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
 
-  /object.fromentries@2.0.7:
-    resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==}
+  /object.groupby@1.0.3:
+    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
-
-  /object.groupby@1.0.2:
-    resolution: {integrity: sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==}
-    dependencies:
-      array.prototype.filter: 1.0.3
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.22.4
-      es-errors: 1.3.0
-
-  /object.hasown@1.1.2:
-    resolution: {integrity: sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==}
-    dependencies:
-      define-properties: 1.2.1
-      es-abstract: 1.22.4
-
-  /object.values@1.1.6:
-    resolution: {integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
-      es-abstract: 1.20.5
+      es-abstract: 1.23.3
 
-  /object.values@1.1.7:
-    resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==}
+  /object.values@1.2.0:
+    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-object-atoms: 1.0.0
 
   /objectorarray@1.0.5:
     resolution: {integrity: sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==}
@@ -18983,21 +19081,6 @@ packages:
     resolution: {integrity: sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==}
     dev: false
 
-  /opentelemetry-instrumentation-fetch-node@1.2.3(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-Qb11T7KvoCevMaSeuamcLsAD+pZnavkhDnlVL0kRozfhl42dKG5Q3anUklAFKJZjY3twLR+BnRa6DlwwkIE/+A==}
-    engines: {node: '>18.0.0'}
-    requiresBuild: true
-    peerDependencies:
-      '@opentelemetry/api': ^1.6.0
-    dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.46.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.27.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-    optional: true
-
   /opentracing@0.14.7:
     resolution: {integrity: sha512-vz9iS7MJ5+Bp1URw8Khvdyw1H/hGvzHWlKQ7eRrQojSCDL1/SrWfrY9QebLw97n2deyRtzHRC3MkQfVNUCo91Q==}
     engines: {node: '>=0.10'}
@@ -19747,7 +19830,7 @@ packages:
       cosmiconfig: 9.0.0(typescript@5.3.3)
       jiti: 1.21.6
       postcss: 8.4.38
-      semver: 7.6.2
+      semver: 7.6.3
       webpack: 5.93.0(esbuild@0.21.5)
     transitivePeerDependencies:
       - typescript
@@ -19909,6 +19992,13 @@ packages:
     resolution: {integrity: sha512-D5n2lCfmACTpARhHPFh9eqpQCGjLor3khMkqzi/EhYeZ8+Xe3Q+6c5oZIpNMZQybsRm4ijn2ihQniue61juQhg==}
     dev: true
 
+  /prettier-linter-helpers@1.0.0:
+    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      fast-diff: 1.3.0
+    dev: true
+
   /prettier-plugin-tailwindcss@0.5.11(@trivago/prettier-plugin-sort-imports@4.3.0)(prettier@3.2.5):
     resolution: {integrity: sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==}
     engines: {node: '>=14.21.3'}
@@ -19967,6 +20057,11 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
+  /prettier@3.3.3:
+    resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==}
+    engines: {node: '>=14'}
+    hasBin: true
+
   /pretty-error@4.0.0:
     resolution: {integrity: sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==}
     dependencies:
@@ -20681,14 +20776,6 @@ packages:
     resolution: {integrity: sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==}
     dev: true
 
-  /regexp.prototype.flags@1.4.3:
-    resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      functions-have-names: 1.2.3
-
   /regexp.prototype.flags@1.5.2:
     resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
     engines: {node: '>= 0.4'}
@@ -20887,7 +20974,6 @@ packages:
 
   /resolve-pkg-maps@1.0.0:
     resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
-    dev: false
 
   /resolve-url-loader@5.0.0:
     resolution: {integrity: sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==}
@@ -20920,8 +21006,8 @@ packages:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  /resolve@2.0.0-next.4:
-    resolution: {integrity: sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==}
+  /resolve@2.0.0-next.5:
+    resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==}
     hasBin: true
     dependencies:
       is-core-module: 2.13.1
@@ -21000,8 +21086,8 @@ packages:
       inherits: 2.0.4
     dev: true
 
-  /rollup@3.29.4:
-    resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==}
+  /rollup@3.29.5:
+    resolution: {integrity: sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
@@ -21059,19 +21145,21 @@ packages:
       has-symbols: 1.0.3
       isarray: 2.0.5
 
+  /safe-array-concat@1.1.2:
+    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
+    engines: {node: '>=0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+      has-symbols: 1.0.3
+      isarray: 2.0.5
+
   /safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
 
   /safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  /safe-regex-test@1.0.0:
-    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-      is-regex: 1.1.4
-
   /safe-regex-test@1.0.3:
     resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
     engines: {node: '>= 0.4'}
@@ -21360,7 +21448,7 @@ packages:
     dependencies:
       color: 4.2.3
       detect-libc: 2.0.3
-      semver: 7.6.2
+      semver: 7.6.3
     optionalDependencies:
       '@img/sharp-darwin-arm64': 0.33.4
       '@img/sharp-darwin-x64': 0.33.4
@@ -21740,7 +21828,7 @@ packages:
       jscodeshift: 0.15.2(@babel/preset-env@7.25.3)
       leven: 3.1.0
       ora: 5.4.1
-      prettier: 3.2.5
+      prettier: 3.3.3
       prompts: 2.4.2
       semver: 7.6.2
       strip-json-comments: 3.1.1
@@ -21859,17 +21947,36 @@ packages:
       strip-ansi: 7.1.0
     dev: false
 
-  /string.prototype.matchall@4.0.8:
-    resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==}
+  /string.prototype.includes@2.0.1:
+    resolution: {integrity: sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-abstract: 1.23.3
+
+  /string.prototype.matchall@4.0.11:
+    resolution: {integrity: sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
       get-intrinsic: 1.2.4
+      gopd: 1.0.1
       has-symbols: 1.0.3
-      internal-slot: 1.0.3
-      regexp.prototype.flags: 1.4.3
-      side-channel: 1.0.4
+      internal-slot: 1.0.7
+      regexp.prototype.flags: 1.5.2
+      set-function-name: 2.0.2
+      side-channel: 1.0.6
+
+  /string.prototype.repeat@1.0.0:
+    resolution: {integrity: sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==}
+    dependencies:
+      define-properties: 1.2.1
+      es-abstract: 1.22.4
 
   /string.prototype.trim@1.2.8:
     resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==}
@@ -21879,12 +21986,14 @@ packages:
       define-properties: 1.2.1
       es-abstract: 1.22.4
 
-  /string.prototype.trimend@1.0.6:
-    resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
+  /string.prototype.trim@1.2.9:
+    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
 
   /string.prototype.trimend@1.0.7:
     resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==}
@@ -21893,12 +22002,12 @@ packages:
       define-properties: 1.2.1
       es-abstract: 1.22.4
 
-  /string.prototype.trimstart@1.0.6:
-    resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
+  /string.prototype.trimend@1.0.8:
+    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-object-atoms: 1.0.0
 
   /string.prototype.trimstart@1.0.7:
     resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}
@@ -21907,6 +22016,14 @@ packages:
       define-properties: 1.2.1
       es-abstract: 1.22.4
 
+  /string.prototype.trimstart@1.0.8:
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
   /string_decoder@1.1.1:
     resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
     dependencies:
@@ -22123,8 +22240,8 @@ packages:
       '@jridgewell/trace-mapping': 0.3.25
       '@types/estree': 1.0.5
       acorn: 8.12.1
-      aria-query: 5.3.0
-      axobject-query: 4.0.0
+      aria-query: 5.3.2
+      axobject-query: 4.1.0
       code-red: 1.0.4
       css-tree: 2.3.1
       estree-walker: 3.0.3
@@ -22184,6 +22301,14 @@ packages:
       '@pkgr/utils': 2.3.1
       tslib: 2.7.0
 
+  /synckit@0.9.2:
+    resolution: {integrity: sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    dependencies:
+      '@pkgr/core': 0.1.1
+      tslib: 2.7.0
+    dev: true
+
   /tailwind-merge@2.2.1:
     resolution: {integrity: sha512-o+2GTLkthfa5YUt4JxPfzMIpQzZ3adD1vLVkvKE1Twl9UAhGsEbIZhHHZVRttyW177S8PDJI3bTQNaebyofK3Q==}
     dependencies:
@@ -22670,6 +22795,7 @@ packages:
     dependencies:
       tslib: 1.14.1
       typescript: 5.3.3
+    dev: true
 
   /tsx@4.16.0:
     resolution: {integrity: sha512-MPgN+CuY+4iKxGoJNPv+1pyo5YWZAQ5XfsyobUG+zoKG7IkvCPLZDEyoIb8yLS2FcWci1nlxAqmvPlFWD5AFiQ==}
@@ -22841,6 +22967,16 @@ packages:
       has-proto: 1.0.1
       is-typed-array: 1.1.13
 
+  /typed-array-byte-length@1.0.1:
+    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+
   /typed-array-byte-offset@1.0.1:
     resolution: {integrity: sha512-tcqKMrTRXjqvHN9S3553NPCaGL0VPgFI92lXszmrE8DMhiDPLBYLlvo8Uu4WZAAX/aGqp/T1sbA4ph8EWjDF9Q==}
     engines: {node: '>= 0.4'}
@@ -22852,6 +22988,17 @@ packages:
       has-proto: 1.0.1
       is-typed-array: 1.1.13
 
+  /typed-array-byte-offset@1.0.2:
+    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+
   /typed-array-length@1.0.4:
     resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
     dependencies:
@@ -22859,6 +23006,17 @@ packages:
       for-each: 0.3.3
       is-typed-array: 1.1.13
 
+  /typed-array-length@1.0.6:
+    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+      possible-typed-array-names: 1.0.0
+
   /typedarray-to-buffer@3.1.5:
     resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
     dependencies:
@@ -23593,6 +23751,16 @@ packages:
       gopd: 1.0.1
       has-tostringtag: 1.0.2
 
+  /which-typed-array@1.1.15:
+    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.2
+
   /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
diff --git a/turbo.json b/turbo.json
index 7e3581d11..77afe9df6 100644
--- a/turbo.json
+++ b/turbo.json
@@ -3,6 +3,10 @@
   "ui": "tui",
 
   "tasks": {
+    "db-generate:no-engine": {
+      "inputs": ["prisma/schema.prisma"],
+      "cache": false
+    },
     "db-generate": {
       "inputs": ["prisma/schema.prisma"],
       "cache": false
@@ -21,15 +25,21 @@
       "interactive": false,
       "cache": false
     },
-    "dev-turbo": {
-      "dependsOn": ["^db-generate"],
-      "persistent": true,
-      "interactive": false,
-      "cache": false
+    "build:dev": {
+      "cache": true,
+      "dependsOn": ["^db-generate", "^prompts:dev"],
+      "outputs": [
+        ".next/**",
+        "!.next/cache/**",
+        "apps/nextjs/.next/**",
+        "apps/openai/.next/**",
+        "!apps/nextjs/.next/cache/**",
+        "!apps/openai/.next/cache/**"
+      ]
     },
     "build": {
       "cache": true,
-      "dependsOn": ["^build", "^db-generate"],
+      "dependsOn": ["^db-generate:no-engine"],
       "outputs": [
         ".next/**",
         "!.next/cache/**",
@@ -49,9 +59,11 @@
       "cache": false
     },
     "prompts": {
+      "dependsOn": ["^db-generate:no-engine"],
       "cache": false
     },
     "prompts:dev": {
+      "dependsOn": ["^db-generate"],
       "cache": false
     },
     "type-check": {